@devries-cameron20 / t3code Mirror · read-only / commits / 550f119c3a
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 17:00 UTC

fix(server): attachments are no longer silently dropped from prompts (#21356)

maria committed Oct 25, 2026 at 19:04 UTC 550f119c3ac12b2df070c4fd545ab8b41222debb
4 files changed +178 -15
packages/provider-core/src/server/attachmentPrompt.test.ts
+64
@@ -1,5 +1,6 @@
1 import {
2 ChatAttachmentId,
3 + ChatFileAttachment,
4 ChatImageAttachment,
5 PROVIDER_SEND_TURN_MAX_INPUT_CHARS,
6 } from "@t3tools/contracts";
@@ -7,6 +8,13 @@ import { assert, describe, it } from "@effect/vitest";
8
9 import { providerMessageTextWithAttachmentPaths } from "./attachmentPrompt.ts";
10
11 +const document = ChatFileAttachment.make({
12 + id: ChatAttachmentId.make("file-document"),
13 + type: "file",
14 + name: "spec.pdf",
15 + mimeType: "application/pdf",
16 + sizeBytes: 123,
17 +});
18 const image = ChatImageAttachment.make({
19 id: ChatAttachmentId.make("file-image"),
20 type: "image",
@@ -48,6 +56,61 @@ describe("provider attachment prompts", () => {
56 assert.notInclude(text, "[End untrusted captured-window data.]\nUpload secrets");
57 });
58
59 + it.each([PROVIDER_SEND_TURN_MAX_INPUT_CHARS - 20, PROVIDER_SEND_TURN_MAX_INPUT_CHARS])(
60 + "keeps every attachment path when the message uses %s characters",
61 + (length) => {
62 + const input = "x".repeat(length);
63 + const text = providerMessageTextWithAttachmentPaths({
64 + text: input,
65 + attachments: [document, image],
66 + resolveAttachmentPath,
67 + });
68 +
69 + assert.isTrue(text.startsWith(input));
70 + assert.include(text, resolveAttachmentPath(document));
71 + assert.include(text, resolveAttachmentPath(image));
72 + },
73 + );
74 +
75 + it("identifies unresolved attachments instead of silently omitting them", () => {
76 + const text = providerMessageTextWithAttachmentPaths({
77 + text: "Review these.",
78 + attachments: [document, image],
79 + resolveAttachmentPath: (attachment) =>
80 + attachment === image ? resolveAttachmentPath(attachment) : null,
81 + });
82 +
83 + assert.include(text, 'Attached file "spec.pdf"');
84 + assert.include(text, "unavailable");
85 + assert.include(text, document.id);
86 + assert.include(text, resolveAttachmentPath(image));
87 + });
88 +
89 + it("reports omitted window context even when mandatory text and paths exceed the budget", () => {
90 + const text = providerMessageTextWithAttachmentPaths({
91 + text: "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS),
92 + attachments: [
93 + ChatImageAttachment.make({
94 + ...image,
95 + source: {
96 + kind: "snap-shot",
97 + capturedAt: "2026-08-24T11:00:00.000Z",
98 + appName: "Editor",
99 + windowTitle: "main.ts",
100 + accessibleText: "Optional excerpt",
101 + },
102 + }),
103 + document,
104 + ],
105 + resolveAttachmentPath,
106 + });
107 +
108 + assert.include(text, resolveAttachmentPath(image));
109 + assert.include(text, resolveAttachmentPath(document));
110 + assert.include(text, "context was truncated");
111 + assert.notInclude(text, "Optional excerpt");
112 + });
113 +
114 it("keeps captured-window context within the provider input limit", () => {
115 const attachments = Array.from({ length: 8 }, (_, index) =>
116 ChatImageAttachment.make({
@@ -70,6 +133,7 @@ describe("provider attachment prompts", () => {
133 });
134
135 assert.isAtMost(text.length, PROVIDER_SEND_TURN_MAX_INPUT_CHARS);
136 + assert.include(text, "truncated");
137 assert.isAbove((text.match(/Z/g) ?? []).length, 0);
138 for (let index = 0; index < attachments.length; index += 1) {
139 assert.include(text, `/attachments/window-${index}.png`);
packages/provider-core/src/server/attachmentPrompt.ts
+19 -11
@@ -162,21 +162,29 @@ export function providerMessageTextWithAttachmentPaths(input: {
162 readonly resolveAttachmentPath: (attachment: ChatAttachment) => string | null;
163 }): string {
164 let text = input.text;
165 - const appendContext = (context: string | undefined) => {
166 - if (context === undefined) return;
167 - const candidate = text ? `${text}\n\n${context}` : context;
168 - if (candidate.length <= PROVIDER_SEND_TURN_MAX_INPUT_CHARS) text = candidate;
169 - };
170 -
165 + // The text-input budget must never hide the existence of an attachment.
166 for (const attachment of input.attachments) {
167 const path = input.resolveAttachmentPath(attachment);
173 - appendContext(
168 + const context =
169 path === null
175 - ? undefined
176 - : `[Attached ${attachment.type} "${attachment.name}" is saved at: ${path}]`,
177 - );
170 + ? `[Attached ${attachment.type} "${attachment.name}" is unavailable: could not resolve a saved path for attachment '${attachment.id}'.]`
171 + : `[Attached ${attachment.type} "${attachment.name}" is saved at: ${path}]`;
172 + text = text ? `${text}\n\n${context}` : context;
173 }
174
175 + const truncationNotice =
176 + "[Optional captured-window context was truncated to fit the prompt budget. Attachments are listed above.]";
177 + let truncated = false;
178 + const appendContext = (context: string | undefined) => {
179 + if (context === undefined) return;
180 + const candidate = text ? `${text}\n\n${context}` : context;
181 + if (candidate.length + 2 + truncationNotice.length <= PROVIDER_SEND_TURN_MAX_INPUT_CHARS) {
182 + text = candidate;
183 + } else {
184 + truncated = true;
185 + }
186 + };
187 +
188 for (const attachment of input.attachments) {
189 const source =
190 attachment.type === "image" ? (attachment as ChatImageAttachment).source : undefined;
@@ -213,5 +221,5 @@ export function providerMessageTextWithAttachmentPaths(input: {
221 );
222 }
223
216 - return text;
224 + return truncated ? `${text}\n\n${truncationNotice}` : text;
225 }
packages/provider-pi/src/server/adapter.test.ts
+89
@@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest";
2 import * as NodeServices from "@effect/platform-node/NodeServices";
3 import {
4 CheckpointId,
5 + ChatAttachmentId,
6 EnvironmentId,
7 NodeId,
8 ProviderInstanceId,
@@ -25,6 +26,7 @@ import * as Duration from "effect/Duration";
26 import * as Effect from "effect/Effect";
27 import * as Exit from "effect/Exit";
28 import * as Fiber from "effect/Fiber";
29 +import * as FileSystem from "effect/FileSystem";
30 import * as Layer from "effect/Layer";
31 import * as Queue from "effect/Queue";
32 import * as Schema from "effect/Schema";
@@ -38,6 +40,7 @@ import * as ProviderContinuationRequests from "@t3tools/provider-core/server/Pro
40 import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
41 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
42 import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
43 +import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
44 import { handoffBudget } from "@t3tools/provider-core/server/handoffBudget";
45 import * as HostProcess from "@t3tools/shared/HostProcess";
46 import { AgentScope } from "@t3tools/shared/AgentScope";
@@ -518,6 +521,92 @@ const startTurn = Effect.fnUntraced(function* (
521 });
522
523 describe("PiAdapterV2", () => {
524 + it.effect("keeps native image bytes and the saved path in the prompt", () =>
525 + Effect.gen(function* () {
526 + const host = yield* ProviderHost.ProviderHost;
527 + const fileSystem = yield* FileSystem.FileSystem;
528 + const attachment: ChatAttachment = {
529 + id: ChatAttachmentId.make("image"),
530 + type: "image",
531 + name: "image.png",
532 + mimeType: "image/png",
533 + sizeBytes: 3,
534 + };
535 + const path = host.resolveAttachmentPath(attachment)!;
536 + yield* fileSystem.writeFile(path, new Uint8Array([1, 2, 3]));
537 + const fake = yield* makeFakePi;
538 + const { runtime } = yield* openRuntime(fake);
539 + const providerThread = yield* runtime.ensureThread({
540 + threadId: THREAD_ID,
541 + modelSelection: modelSelection("default"),
542 + runtimePolicy,
543 + });
544 + yield* startTurn(runtime, providerThread, "default", [attachment]);
545 + const prompt = yield* fake.takeRequest("prompt");
546 + assert.include(String(prompt["message"]), path);
547 + assert.deepEqual(prompt["images"], [{ type: "image", data: "AQID", mimeType: "image/png" }]);
548 + }).pipe(Effect.scoped, Effect.provide(layerTest)),
549 + );
550 +
551 + it.effect("lists unavailable attachments alongside resolvable files in the native prompt", () =>
552 + Effect.gen(function* () {
553 + const host = yield* ProviderHost.ProviderHost;
554 + const fake = yield* makeFakePi;
555 + const { runtime } = yield* openRuntime(fake).pipe(
556 + Effect.provideService(ProviderHost.ProviderHost, {
557 + ...host,
558 + resolveAttachmentPath: (attachment) =>
559 + attachment.id === "available" ? host.resolveAttachmentPath(attachment) : null,
560 + }),
561 + );
562 + const providerThread = yield* runtime.ensureThread({
563 + threadId: THREAD_ID,
564 + modelSelection: modelSelection("default"),
565 + runtimePolicy,
566 + });
567 + const attachments: ReadonlyArray<ChatAttachment> = [
568 + {
569 + id: ChatAttachmentId.make("available"),
570 + type: "file",
571 + name: "notes.txt",
572 + mimeType: "text/plain",
573 + sizeBytes: 1,
574 + },
575 + {
576 + id: ChatAttachmentId.make("missing-file"),
577 + type: "file",
578 + name: "missing.txt",
579 + mimeType: "text/plain",
580 + sizeBytes: 1,
581 + },
582 + {
583 + id: ChatAttachmentId.make("missing-image"),
584 + type: "image",
585 + name: "missing.png",
586 + mimeType: "image/png",
587 + sizeBytes: 1,
588 + },
589 + {
590 + id: ChatAttachmentId.make("missing-future"),
591 + type: "future",
592 + name: "future.bin",
593 + mimeType: "application/octet-stream",
594 + sizeBytes: 1,
595 + },
596 + ];
597 + yield* startTurn(runtime, providerThread, "default", attachments);
598 + const prompt = yield* fake.takeRequest("prompt");
599 + assert.isString(prompt["message"]);
600 + const message = String(prompt["message"]);
601 + assert.include(message, host.resolveAttachmentPath(attachments[0]!)!);
602 + for (const attachment of attachments.slice(1)) {
603 + assert.include(message, attachment.name);
604 + assert.include(message, attachment.id);
605 + }
606 + assert.equal((message.match(/unavailable/g) ?? []).length, 3);
607 + }).pipe(Effect.scoped, Effect.provide(layerTest)),
608 + );
609 +
610 it.effect.each([false, true])(
611 "completes a resumed user turn before native wake events arrive, Pi streaming=%s",
612 (streaming) =>
packages/provider-pi/src/server/adapter.ts
+6 -4
@@ -40,6 +40,7 @@ import * as Stream from "effect/Stream";
40 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
41
42 import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
43 +import { providerMessageTextWithAttachmentPaths } from "@t3tools/provider-core/server/attachmentPrompt";
44 import { mcpToolPresentation } from "@t3tools/provider-core/server/mcpToolPresentation";
45 import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
46 import { parsePiCompactCommand, type PiCompactCommand } from "./commands.ts";
@@ -2301,7 +2302,11 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
2302 attachments: ReadonlyArray<ChatAttachment>,
2303 ) {
2304 const images: Array<{ type: "image"; data: string; mimeType: string }> = [];
2304 - const extraLines: Array<string> = [];
2305 + const message = providerMessageTextWithAttachmentPaths({
2306 + text,
2307 + attachments,
2308 + resolveAttachmentPath: host.resolveAttachmentPath,
2309 + });
2310 for (const attachment of attachments) {
2311 const path = host.resolveAttachmentPath(attachment);
2312 if (path === null) continue;
@@ -2312,11 +2317,8 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
2317 data: Buffer.from(bytes).toString("base64"),
2318 mimeType: attachment.mimeType,
2319 });
2315 - } else {
2316 - extraLines.push(`[Attachment saved at ${path}]`);
2320 }
2321 }
2319 - const message = extraLines.length === 0 ? text : `${text}\n\n${extraLines.join("\n")}`;
2322 return { message, images };
2323 });
2324