@@ -515,19 +515,19 @@ function rawProtocolRequestParam(
515515 return typeof params === "object" && params !== null ? Reflect.get(params, key) : undefined;
516516}
517517
518- function rawProtocolPromptText(event: EffectAcpProtocol.AcpProtocolLogEvent): string {
518+ function rawProtocolPromptTextBlocks(
519+ event: EffectAcpProtocol.AcpProtocolLogEvent,
520+ ): Array<{ type: "text"; text: string }> {
519521 const prompt = rawProtocolRequestParam(event, "prompt");
520- if (!Array.isArray(prompt)) return "";
521- return prompt
522- .flatMap((block) =>
523- typeof block === "object" &&
524- block !== null &&
525- Reflect.get(block, "type") === "text" &&
526- typeof Reflect.get(block, "text") === "string"
527- ? [Reflect.get(block, "text") as string]
528- : [],
529- )
530- .join("\n");
522+ if (!Array.isArray(prompt)) return [];
523+ return prompt.flatMap((block) =>
524+ typeof block === "object" &&
525+ block !== null &&
526+ Reflect.get(block, "type") === "text" &&
527+ typeof Reflect.get(block, "text") === "string"
528+ ? [{ type: "text" as const, text: Reflect.get(block, "text") as string }]
529+ : [],
530+ );
531531}
532532
533533const pollProtocolMethods = (events: Queue.Queue<EffectAcpProtocol.AcpProtocolLogEvent>) =>
@@ -846,15 +846,26 @@ describe("AcpAdapterV2", () => {
846846 if (method === undefined) continue;
847847 methods.push(method);
848848 if (method === "session/prompt") {
849- return { methods, prompt: rawProtocolPromptText(event) };
849+ const promptBlocks = rawProtocolPromptTextBlocks(event);
850+ return {
851+ methods,
852+ prompt: promptBlocks.map((block) => block.text).join("\n"),
853+ textBlockCount: promptBlocks.length,
854+ };
850855 }
851856 }
852857 });
853858
854859 const command = yield* runTurn(0, defaultPolicy, "/compact");
855860 assert.isTrue(command.prompt.startsWith("/compact"));
856861 assert.notInclude(command.prompt, "<t3_code_instructions>");
857- const firstDefault = yield* runTurn(1, defaultPolicy, "First default request.");
862+ assert.equal(command.textBlockCount, 1);
863+ const whitespaceCommand = yield* runTurn(1, defaultPolicy, " /repro-skill");
864+ assert.equal(whitespaceCommand.prompt, " /repro-skill");
865+ assert.equal(whitespaceCommand.textBlockCount, 1);
866+ assert.notInclude(whitespaceCommand.prompt, "<t3_code_instructions>");
867+ const firstDefault = yield* runTurn(2, defaultPolicy, "First default request.");
868+ assert.equal(firstDefault.textBlockCount, 2);
858869 assert.include(firstDefault.prompt, "T3 Code interaction mode: Default");
859870 assert.include(firstDefault.prompt, "T3 Code collaborative browser");
860871 assert.include(firstDefault.prompt, "T3 Code orchestration");
@@ -864,19 +875,19 @@ describe("AcpAdapterV2", () => {
864875 "Build should preserve the agent's advertised mode default",
865876 );
866877 assert.include(
867- (yield* runTurn(2 , defaultPolicy, "Second default request.")).prompt,
878+ (yield* runTurn(3 , defaultPolicy, "Second default request.")).prompt,
868879 "Second default request.",
869880 );
870881
871882 const planPolicy = policy("plan");
872- const firstPlan = yield* runTurn(3 , planPolicy, "Plan this change.");
883+ const firstPlan = yield* runTurn(4 , planPolicy, "Plan this change.");
873884 assert.include(firstPlan.prompt, "T3 Code interaction mode: Plan");
874885 assert.include(firstPlan.methods, "session/set_config_option");
875886 assert.include(
876- (yield* runTurn(4 , planPolicy, "Continue planning.")).prompt,
887+ (yield* runTurn(5 , planPolicy, "Continue planning.")).prompt,
877888 "Continue planning.",
878889 );
879- const restoredBuild = yield* runTurn(5 , defaultPolicy, "Implement the change.");
890+ const restoredBuild = yield* runTurn(6 , defaultPolicy, "Implement the change.");
880891 assert.include(restoredBuild.prompt, "T3 Code interaction mode: Default");
881892 assert.include(
882893 restoredBuild.methods,
0 commit comments