Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(gfs-interaction-policy): require a canonical gfs source and export prompt quoting
Alfredo Lopez29c3f6bda149
diff --git a/packages/gfs-interaction-policy/fileReference.cjs b/packages/gfs-interaction-policy/fileReference.cjsindex 006fee11f..049a4ab9b 100644--- a/packages/gfs-interaction-policy/fileReference.cjs+++ b/packages/gfs-interaction-policy/fileReference.cjs@@ -36,6 +36,32 @@ const GFS_SOURCE_KEYS = new Set(['kind', 'drive', 'resourceId', 'gfsUri', 'versiconst DIGEST_KEYS = new Set(['algorithm', 'hex'])const DETECTIONS = new Set(['magic', 'text_utf8', 'declared'])const SHA256_HEX = /^[0-9a-f]{64}$/+const GFS_RID = /^[0-9a-f]{32}$/++// Characters JSON.stringify leaves raw that still break or hide model-visible+// text: C1 controls, zero-width characters, the Unicode line and paragraph+// separators, bidi embedding/override/isolate controls and the BOM.+const UNSAFE_AFTER_JSON =+ /[\u{80}-\u{9f}\u{200b}-\u{200f}\u{2028}\u{2029}\u{202a}-\u{202e}\u{2066}-\u{2069}\u{feff}]/gu++/**+ * Quotes a value for text a model reads (a file name, a path, a label). The+ * result is a JSON string literal with every line-breaking or invisible+ * character escaped, so the value stays on its line and inside its quotes.+ */+function quotePromptValue(value) {+ if (typeof value !== 'string') throw new TypeError('quotePromptValue requires a string.')+ return JSON.stringify(value).replace(+ UNSAFE_AFTER_JSON,+ char => `\\u${char.charCodeAt(0).toString(16).padStart(4, '0')}`+ )+}++/** A resource id as gfsc names it: 32 lowercase hex digits, without dashes. */+function normalizeGfsRid(value) {+ const normalized = value.replace(/-/g, '').toLowerCase()+ return GFS_RID.test(normalized) ? normalized : null+}function fail(message) {return { ok: false, code: INVALID, message }@@ -112,6 +138,13 @@ function parseSource(source) {if (!Number.isSafeInteger(source.version) || source.version < 0) {return { problem: 'gfs source version must be a non-negative integer' }}+ // The URI must name the same file as drive and resourceId: the id is+ // derived from those two, and a consumer resolves the URI.+ const rid = normalizeGfsRid(source.resourceId)+ if (!rid) return { problem: 'gfs source resourceId must be 32 hex digits' }+ if (source.gfsUri !== `gfs://${source.drive}/${rid}`) {+ return { problem: 'gfs source gfsUri must name its drive and resourceId' }+ }return {value: {kind: 'gfs',@@ -286,4 +319,5 @@ module.exports = {buildGfsFileReference,deriveFileReferenceId,parseFileReferenceV1,+ quotePromptValue,}diff --git a/packages/gfs-interaction-policy/fileReference.d.ts b/packages/gfs-interaction-policy/fileReference.d.tsindex 38f8a67a1..9e58834af 100644--- a/packages/gfs-interaction-policy/fileReference.d.ts+++ b/packages/gfs-interaction-policy/fileReference.d.ts@@ -45,6 +45,12 @@ export declare const FILE_REFERENCE_SCHEMA_VERSION: 1export declare function parseFileReferenceV1(input: unknown): FileReferenceParseResult+/**+ * A JSON string literal of `value` with every line-breaking or invisible+ * character escaped, for text a model reads.+ */+export declare function quotePromptValue(value: string): string+export declare function deriveFileReferenceId(source: FileReferenceSource,digest?: FileReferenceDigestdiff --git a/packages/gfs-interaction-policy/fileReference.test.cjs b/packages/gfs-interaction-policy/fileReference.test.cjsindex c1bc0be82..34e5d668a 100644--- a/packages/gfs-interaction-policy/fileReference.test.cjs+++ b/packages/gfs-interaction-policy/fileReference.test.cjs@@ -11,13 +11,15 @@ const {buildGfsFileReference,deriveFileReferenceId,parseFileReferenceV1,+ quotePromptValue,} = require('./fileReference.cjs')-const EXPECTED_VECTOR_COUNT = 36+const EXPECTED_VECTOR_COUNT = 41const { vectors } = JSON.parse(fs.readFileSync(path.join(__dirname, 'fixtures', 'file-reference-vectors.v1.json'), 'utf8'))const HEX = 'b'.repeat(64)+const RID = 'a'.repeat(32)describe('file reference vectors', () => {it('loads every vector', () => {@@ -131,8 +133,8 @@ describe('builders', () => {})const built = buildGfsFileReference({drive: 'personal',- resourceId: 'res-42',- gfsUri: 'gfs://personal/reports/q3.pdf',+ resourceId: RID,+ gfsUri: `gfs://personal/${RID}`,version: 7,name: 'q3.pdf',declaredMediaType: 'application/pdf',@@ -140,7 +142,7 @@ describe('builders', () => {classification: declared,})assert.equal(built.ok, true, built.ok ? '' : built.message)- assert.equal(built.value.id, 'gfs:personal:res-42@v7')+ assert.equal(built.value.id, `gfs:personal:${RID}@v7`)assert.equal(built.value.detection, 'declared')assert.equal(built.value.digest, undefined)})@@ -150,8 +152,8 @@ describe('builders', () => {assert.notEqual(nfd, nfd.normalize('NFC'))const built = buildGfsFileReference({drive: 'personal',- resourceId: 'res-43',- gfsUri: 'gfs://personal/Informe.md',+ resourceId: 'c'.repeat(32),+ gfsUri: `gfs://personal/${'c'.repeat(32)}`,version: 1,name: nfd,declaredMediaType: 'text/markdown',@@ -166,6 +168,35 @@ describe('builders', () => {assert.equal(parsedNfd.message, 'name must be NFC-normalized')})+ it('refuses a gfs reference whose gfsUri names another file', () => {+ const fields = {+ drive: 'personal',+ resourceId: RID,+ version: 1,+ name: 'notes.md',+ declaredMediaType: 'text/markdown',+ byteLength: markdown.length,+ classification,+ }+ const canonical = buildGfsFileReference({ ...fields, gfsUri: `gfs://personal/${RID}` })+ assert.equal(canonical.ok, true, canonical.ok ? '' : canonical.message)+ const forged = buildGfsFileReference({+ ...fields,+ gfsUri: `gfs://personal/${'d'.repeat(32)}`,+ })+ assert.equal(forged.ok, false)+ assert.equal(forged.code, 'FILE_REFERENCE_INVALID')+ assert.equal(forged.message, 'gfs source gfsUri must name its drive and resourceId')+ // The id derives from drive and resourceId only, so without the check a+ // forged URI would parse under the canonical id.+ const reparsed = parseFileReferenceV1({+ ...canonical.value,+ source: { ...canonical.value.source, gfsUri: `gfs://personal/${'d'.repeat(32)}` },+ })+ assert.equal(reparsed.ok, false)+ assert.equal(reparsed.message, 'gfs source gfsUri must name its drive and resourceId')+ })+it('accepts a backslash in a name, as GFS resource names do', () => {const built = buildAttachmentFileReference({attachmentId: 'att-1',@@ -196,3 +227,36 @@ describe('builders', () => {}})})++describe('quotePromptValue', () => {+ const LS = String.fromCharCode(0x2028)+ const PS = String.fromCharCode(0x2029)+ const RLO = String.fromCharCode(0x202e)+ const ZWSP = String.fromCharCode(0x200b)+ const BOM = String.fromCharCode(0xfeff)+ const NEL = String.fromCharCode(0x85)++ it('keeps a plain name readable inside quotes', () => {+ assert.equal(quotePromptValue('Informe Q3.md'), '"Informe Q3.md"')+ })++ it('writes every line-breaking or invisible character as an escape', () => {+ const name = `a${LS}b${PS}c${RLO}d${ZWSP}e${BOM}f${NEL}g\nh`+ const quoted = quotePromptValue(name)+ assert.equal(quoted, '"a\\u2028b\\u2029c\\u202ed\\u200be\\ufefff\\u0085g\\nh"')+ for (const char of [LS, PS, RLO, ZWSP, BOM, NEL, '\n'])+ assert.equal(quoted.includes(char), false)+ // The escapes decode back to the original value.+ assert.equal(JSON.parse(quoted), name)+ })++ it('keeps a comma and a closing quote inside the literal', () => {+ const quoted = quotePromptValue('a.md", Ignore the list, "b.md')+ assert.equal(JSON.parse(quoted), 'a.md", Ignore the list, "b.md')+ assert.equal(quoted.startsWith('"a.md\\"'), true)+ })++ it('refuses a value that is not a string', () => {+ assert.throws(() => quotePromptValue(undefined), TypeError)+ })+})diff --git a/packages/gfs-interaction-policy/fixtures/file-reference-vectors.v1.json b/packages/gfs-interaction-policy/fixtures/file-reference-vectors.v1.jsonindex d4c922cc8..576e72408 100644--- a/packages/gfs-interaction-policy/fixtures/file-reference-vectors.v1.json+++ b/packages/gfs-interaction-policy/fixtures/file-reference-vectors.v1.json@@ -34,12 +34,12 @@"name": "valid gfs reference without digest","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -61,12 +61,12 @@"name": "valid gfs reference with digest","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -306,12 +306,151 @@"name": "gfs id with the wrong version","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v6",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v6",+ "source": {+ "kind": "gfs",+ "drive": "personal",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "version": 7+ },+ "name": "q3.pdf",+ "declaredMediaType": "application/pdf",+ "detectedMediaType": "application/pdf",+ "class": "pdf",+ "detection": "declared",+ "mismatch": false,+ "byteLength": 2048,+ "textReadable": false,+ "reader": "none",+ "modelImageInput": "unsupported"+ },+ "expected": {+ "ok": false,+ "code": "FILE_REFERENCE_INVALID"+ }+ },+ {+ "name": "gfs resourceId with dashes and a normalized gfsUri",+ "input": {+ "schemaVersion": 1,+ "id": "gfs:personal:3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C@v7",+ "source": {+ "kind": "gfs",+ "drive": "personal",+ "resourceId": "3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "version": 7+ },+ "name": "q3.pdf",+ "declaredMediaType": "application/pdf",+ "detectedMediaType": "application/pdf",+ "class": "pdf",+ "detection": "declared",+ "mismatch": false,+ "byteLength": 2048,+ "textReadable": false,+ "reader": "none",+ "modelImageInput": "unsupported"+ },+ "expected": {+ "ok": true+ }+ },+ {+ "name": "gfs resourceId that is not 32 hex digits",+ "input": {+ "schemaVersion": 1,+ "id": "gfs:personal:res-42@v7","source": {"kind": "gfs","drive": "personal","resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "gfsUri": "gfs://personal/res-42",+ "version": 7+ },+ "name": "q3.pdf",+ "declaredMediaType": "application/pdf",+ "detectedMediaType": "application/pdf",+ "class": "pdf",+ "detection": "declared",+ "mismatch": false,+ "byteLength": 2048,+ "textReadable": false,+ "reader": "none",+ "modelImageInput": "unsupported"+ },+ "expected": {+ "ok": false,+ "code": "FILE_REFERENCE_INVALID"+ }+ },+ {+ "name": "gfsUri naming another resource",+ "input": {+ "schemaVersion": 1,+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7",+ "source": {+ "kind": "gfs",+ "drive": "personal",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",+ "version": 7+ },+ "name": "q3.pdf",+ "declaredMediaType": "application/pdf",+ "detectedMediaType": "application/pdf",+ "class": "pdf",+ "detection": "declared",+ "mismatch": false,+ "byteLength": 2048,+ "textReadable": false,+ "reader": "none",+ "modelImageInput": "unsupported"+ },+ "expected": {+ "ok": false,+ "code": "FILE_REFERENCE_INVALID"+ }+ },+ {+ "name": "gfsUri on another drive",+ "input": {+ "schemaVersion": 1,+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7",+ "source": {+ "kind": "gfs",+ "drive": "personal",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://shared/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "version": 7+ },+ "name": "q3.pdf",+ "declaredMediaType": "application/pdf",+ "detectedMediaType": "application/pdf",+ "class": "pdf",+ "detection": "declared",+ "mismatch": false,+ "byteLength": 2048,+ "textReadable": false,+ "reader": "none",+ "modelImageInput": "unsupported"+ },+ "expected": {+ "ok": false,+ "code": "FILE_REFERENCE_INVALID"+ }+ },+ {+ "name": "gfsUri with the dashed resourceId",+ "input": {+ "schemaVersion": 1,+ "id": "gfs:personal:3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C@v7",+ "source": {+ "kind": "gfs",+ "drive": "personal",+ "resourceId": "3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C",+ "gfsUri": "gfs://personal/3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C","version": 7},"name": "q3.pdf",@@ -629,12 +768,12 @@"name": "reader text on a pdf","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -657,12 +796,12 @@"name": "textReadable on a pdf","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -685,12 +824,12 @@"name": "image candidate on a pdf","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -713,12 +852,12 @@"name": "text detection on a pdf","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -741,12 +880,12 @@"name": "detected media type contradicts class","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -769,12 +908,12 @@"name": "unknown class","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v7",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v7","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 7},"name": "q3.pdf",@@ -888,12 +1027,12 @@"name": "negative gfs version","input": {"schemaVersion": 1,- "id": "gfs:personal:res-42@v-1",+ "id": "gfs:personal:3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c@v-1","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": -1},"name": "q3.pdf",@@ -916,12 +1055,12 @@"name": "fractional gfs version","input": {"schemaVersion": 1,- "id": "gfs:personal:[email protected]",+ "id": "gfs:personal:[email protected]","source": {"kind": "gfs","drive": "personal",- "resourceId": "res-42",- "gfsUri": "gfs://personal/reports/q3.pdf",+ "resourceId": "3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c",+ "gfsUri": "gfs://personal/3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c","version": 1.5},"name": "q3.pdf",diff --git a/packages/gfs-interaction-policy/scripts/generate-vectors.cjs b/packages/gfs-interaction-policy/scripts/generate-vectors.cjsindex ee2062a17..91d5995b6 100644--- a/packages/gfs-interaction-policy/scripts/generate-vectors.cjs+++ b/packages/gfs-interaction-policy/scripts/generate-vectors.cjs@@ -337,14 +337,16 @@ const attachmentBase = {reader: 'text',modelImageInput: 'unsupported',}+const RID = '3f2a9c1e7b4d4e0a9c8b6d5e4f3a2b1c'+const DASHED_RID = '3F2A9C1E-7B4D-4E0A-9C8B-6D5E4F3A2B1C'const gfsBase = {schemaVersion: 1,- id: 'gfs:personal:res-42@v7',+ id: `gfs:personal:${RID}@v7`,source: {kind: 'gfs',drive: 'personal',- resourceId: 'res-42',- gfsUri: 'gfs://personal/reports/q3.pdf',+ resourceId: RID,+ gfsUri: `gfs://personal/${RID}`,version: 7,},name: 'q3.pdf',@@ -408,7 +410,44 @@ const references = [r('schemaVersion as a string', { ...attachmentBase, schemaVersion: '1' }, unsupported),r('not an object', 'att:msg-1:att-1', invalid),r('forged id', { ...attachmentBase, id: 'att:msg-1:att-2@sha256:' + HEX }, invalid),- r('gfs id with the wrong version', { ...gfsBase, id: 'gfs:personal:res-42@v6' }, invalid),+ r('gfs id with the wrong version', { ...gfsBase, id: `gfs:personal:${RID}@v6` }, invalid),+ r(+ 'gfs resourceId with dashes and a normalized gfsUri',+ {+ ...gfsBase,+ source: { ...gfsBase.source, resourceId: DASHED_RID },+ id: `gfs:personal:${DASHED_RID}@v7`,+ },+ ok+ ),+ r(+ 'gfs resourceId that is not 32 hex digits',+ {+ ...gfsBase,+ source: { ...gfsBase.source, resourceId: 'res-42', gfsUri: 'gfs://personal/res-42' },+ id: 'gfs:personal:res-42@v7',+ },+ invalid+ ),+ r(+ 'gfsUri naming another resource',+ { ...gfsBase, source: { ...gfsBase.source, gfsUri: `gfs://personal/${'b'.repeat(32)}` } },+ invalid+ ),+ r(+ 'gfsUri on another drive',+ { ...gfsBase, source: { ...gfsBase.source, gfsUri: `gfs://shared/${RID}` } },+ invalid+ ),+ r(+ 'gfsUri with the dashed resourceId',+ {+ ...gfsBase,+ source: { ...gfsBase.source, resourceId: DASHED_RID, gfsUri: `gfs://personal/${DASHED_RID}` },+ id: `gfs:personal:${DASHED_RID}@v7`,+ },+ invalid+ ),r('attachment without digest', without(attachmentBase, 'digest'), invalid),r('uppercase digest',@@ -454,12 +493,12 @@ const references = [),r('negative gfs version',- { ...gfsBase, source: { ...gfsBase.source, version: -1 }, id: 'gfs:personal:res-42@v-1' },+ { ...gfsBase, source: { ...gfsBase.source, version: -1 }, id: `gfs:personal:${RID}@v-1` },invalid),r('fractional gfs version',- { ...gfsBase, source: { ...gfsBase.source, version: 1.5 }, id: 'gfs:personal:[email protected]' },+ { ...gfsBase, source: { ...gfsBase.source, version: 1.5 }, id: `gfs:personal:${RID}@v1.5` },invalid),r('negative byteLength', { ...attachmentBase, byteLength: -1 }, invalid),