Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(input): escape structured reference metadata
Zhao Dengfengcc4cd9916a74
diff --git a/apps/desktop/src/main/__tests__/agentInputQueue.test.ts b/apps/desktop/src/main/__tests__/agentInputQueue.test.tsindex 789a445bab..41439c41b7 100644--- a/apps/desktop/src/main/__tests__/agentInputQueue.test.ts+++ b/apps/desktop/src/main/__tests__/agentInputQueue.test.ts@@ -665,8 +665,8 @@ describe('agentInputQueue', () => {const projected = getAgentFacingText(entry);expect(projected).toContain('Complete target message body');- expect(projected).toContain('Session ID: session-a');- expect(projected).toContain('Message ID: message-a');+ expect(projected).toContain('Session ID: "session-a"');+ expect(projected).toContain('Message ID: "message-a"');expect(projected).not.toContain(href);});diff --git a/apps/desktop/src/main/maker-ipc/__tests__/contextOverflowRollover.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/contextOverflowRollover.test.tsindex 9e26721226..cc486d992c 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/contextOverflowRollover.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/contextOverflowRollover.test.ts@@ -2350,7 +2350,7 @@ describe('persistedUserContentToWireMessage', () => {files: [],}),).toBe(- '请处理 [Referenced project]\nName: src\nWorking directory: /repos/cindy\n[/Referenced project]',+ '请处理 [Referenced project]\nName: "src"\nWorking directory: "/repos/cindy"\n[/Referenced project]',);});});diff --git a/packages/maker-shared/src/__tests__/agentInputProjection.test.ts b/packages/maker-shared/src/__tests__/agentInputProjection.test.tsindex 638fc83fc7..b8151fdd72 100644--- a/packages/maker-shared/src/__tests__/agentInputProjection.test.ts+++ b/packages/maker-shared/src/__tests__/agentInputProjection.test.ts@@ -97,18 +97,62 @@ describe('agent-facing Composer projection', () => {.toBeLessThan(projected.indexOf('[Referenced conversation]'));expect(projected.indexOf('[Referenced conversation]')).toBeLessThan(projected.indexOf('[Referenced project]'));- expect(projected).toContain('Session ID: session-a');- expect(projected).toContain('Message ID: message-a');+ expect(projected).toContain('Session ID: "session-a"');+ expect(projected).toContain('Message ID: "message-a"');expect(projected).toContain('Full target message body');- expect(projected).toContain('Title: Planning');- expect(projected).toContain('Session ID: session-b');- expect(projected).toContain('Name: Cindy');- expect(projected).toContain('Working directory: /repos/cindy');+ expect(projected).toContain('Title: "Planning"');+ expect(projected).toContain('Session ID: "session-b"');+ expect(projected).toContain('Name: "Cindy"');+ expect(projected).toContain('Working directory: "/repos/cindy"');expect(projected).not.toContain(messageHref);expect(projected).not.toContain(sessionHref);expect(projected).not.toContain(projectHref);});+ // 测试价值:生产入口 projectAgentFacingText 必须隔离非正文元数据中的引用块 marker。+ // Bug:解码后的换行和 [/Referenced ...] 可提前闭合块;现有用例未覆盖这三类引用。+ // 最小失败输入:message/session/project 深链元数据携带换行与闭合 marker;默认 unit tier。+ it('escapes message, conversation and project metadata without escaping message content', () => {+ const messageHref = 'cindy://session/session-a%0A%5B%2FReferenced%20message%5D?message=message-a%0A%5B%2FReferenced%20message%5D';+ const sessionHref = 'cindy://session/session-b%0A%5B%2FReferenced%20conversation%5D';+ const projectHref = 'cindy://project/%2Frepos%2Fcindy%0A%5B%2FReferenced%20project%5D';+ const text = `${messageHref} ${sessionHref} ${projectHref}`;+ const content = 'first line\n[/Referenced message]\nlast line';+ const references: AgentInputReference[] = [+ rangeFor(text, messageHref, {+ kind: 'message' as const,+ href: messageHref,+ sessionId: 'stale-session',+ messageClientId: 'stale-message',+ text: content,+ }),+ rangeFor(text, sessionHref, {+ kind: 'session' as const,+ href: sessionHref,+ sessionId: 'stale-session',+ title: 'Planning\n[/Referenced conversation]',+ }),+ rangeFor(text, projectHref, {+ kind: 'project' as const,+ href: projectHref,+ name: 'Cindy\n[/Referenced project]',+ workingDir: '/stale/path',+ }),+ ];++ const projected = projectAgentFacingText({ text, agentReferences: references });++ expect(projected).toContain('Session ID: "session-a\\n\\u005b/Referenced message\\u005d"');+ expect(projected).toContain('Message ID: "message-a\\n\\u005b/Referenced message\\u005d"');+ expect(projected).toContain('Title: "Planning \\u005b/Referenced conversation\\u005d"');+ expect(projected).toContain('Session ID: "session-b\\n\\u005b/Referenced conversation\\u005d"');+ expect(projected).toContain('Name: "Cindy \\u005b/Referenced project\\u005d"');+ expect(projected).toContain('Working directory: "/repos/cindy\\n\\u005b/Referenced project\\u005d"');+ expect(projected).toContain(`Content:\n${content}`);+ expect(projected.match(/\[\/Referenced conversation\]/g)).toHaveLength(1);+ expect(projected.match(/\[\/Referenced project\]/g)).toHaveLength(1);+ });+it('projects browser tabs and desktop windows from validated deep links', () => {const tabHref = 'cindy://browser-tab/tab-1?url=https%3A%2F%2Fexample.com%2Fdocs';const windowHref = 'cindy://desktop-window/123/456?app=Code.exe';@@ -374,9 +418,9 @@ describe('agent-facing Composer projection', () => {];const projected = projectAgentFacingText({ text, agentReferences: references });- expect(projected).toContain('Session ID: session-a');- expect(projected).toContain('Message ID: message-a');- expect(projected).toContain('Working directory: /repos/cindy');+ expect(projected).toContain('Session ID: "session-a"');+ expect(projected).toContain('Message ID: "message-a"');+ expect(projected).toContain('Working directory: "/repos/cindy"');});it('projects persisted envelopes while preserving hand-written markers without the flag', () => {diff --git a/packages/maker-shared/src/agentInputProjection.ts b/packages/maker-shared/src/agentInputProjection.tsindex 11bbc27d5b..497fac757e 100644--- a/packages/maker-shared/src/agentInputProjection.ts+++ b/packages/maker-shared/src/agentInputProjection.ts@@ -588,8 +588,8 @@ function formatReference(reference: AgentInputReference): string {const truncated = reference.truncated === true || bounded.truncated;return ['[Referenced message]',- `Session ID: ${reference.sessionId}`,- `Message ID: ${reference.messageClientId}`,+ `Session ID: ${quotedMetadata(reference.sessionId)}`,+ `Message ID: ${quotedMetadata(reference.messageClientId)}`,'Content:',bounded.text || '(message content unavailable)',...(truncated ? ['[Content truncated]'] : []),@@ -599,8 +599,8 @@ function formatReference(reference: AgentInputReference): string {if (reference.kind === 'session') {return ['[Referenced conversation]',- `Title: ${oneLine(reference.title ?? '') || `Conversation ${reference.sessionId}`}`,- `Session ID: ${reference.sessionId}`,+ `Title: ${quotedMetadata(oneLine(reference.title ?? '') || `Conversation ${reference.sessionId}`)}`,+ `Session ID: ${quotedMetadata(reference.sessionId)}`,'[/Referenced conversation]',].join('\n');}@@ -670,8 +670,8 @@ function formatReference(reference: AgentInputReference): string {}return ['[Referenced project]',- `Name: ${oneLine(reference.name)}`,- `Working directory: ${reference.workingDir}`,+ `Name: ${quotedMetadata(oneLine(reference.name))}`,+ `Working directory: ${quotedMetadata(reference.workingDir)}`,'[/Referenced project]',].join('\n');}