Skip to content

Commit 66783f7

Browse files
committed
fix(acp): preserve native slash command prompt shape
1 parent 519d64f commit 66783f7

2 files changed

Lines changed: 39 additions & 25 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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

533533
const 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,

‎packages/provider-acp/src/server/adapter.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6801,6 +6801,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
68016801
attachments: turnInput.message.attachments,
68026802
resolveAttachmentPath: host.resolveAttachmentPath,
68036803
});
6804+
const isNativeSlashCommand = turnInput.message.text.trimStart().startsWith("/");
68046805
const text = t3AcpPromptWithInstructions({
68056806
prompt: messageText,
68066807
state: instructionState,
@@ -6850,13 +6851,15 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
68506851
detail: "ACP turn requires non-empty text or attachments",
68516852
});
68526853
}
6853-
prompt.push({
6854-
type: "text",
6855-
text: buildRuntimeInstructions({
6856-
harness: flavor.runtimeHarness ?? driver,
6857-
model: turnInput.modelSelection.model,
6858-
}),
6859-
});
6854+
if (!isNativeSlashCommand) {
6855+
prompt.push({
6856+
type: "text",
6857+
text: buildRuntimeInstructions({
6858+
harness: flavor.runtimeHarness ?? driver,
6859+
model: turnInput.modelSelection.model,
6860+
}),
6861+
});
6862+
}
68606863
return { prompt, instructionState: text === messageText ? undefined : instructionState };
68616864
});
68626865

0 commit comments

Comments
 (0)