Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,7 @@ const makeInstructionCompactionHarness = Effect.fnUntraced(function* (
endpoint: "http://127.0.0.1:43123/mcp",
authorizationHeader: "Bearer instruction-compaction-token",
browserToolsAvailable: true,
capabilities: new Set(["preview"]),
});
type Runtime = AcpSessionRuntime.AcpSessionRuntime["Service"];
let sessionUpdate: Parameters<Runtime["handleSessionUpdate"]>[0] | undefined;
Expand Down Expand Up @@ -2403,7 +2404,7 @@ describe("AcpAdapterV2", () => {
const firstDefault = yield* runTurn(2, defaultPolicy, "First default request.");
assert.equal(firstDefault.textBlockCount, 2);
assert.include(firstDefault.prompt, "T3 Code interaction mode: Default");
assert.include(firstDefault.prompt, "## T3 Code browser");
assert.notInclude(firstDefault.prompt, "## T3 Code browser");
assert.include(firstDefault.prompt, "T3 Code orchestration");
assert.include(firstDefault.prompt, "<runtime_info>");
assert.notInclude(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,12 @@ describe("AcpRegistryAdapterV2", () => {
ordinal === 1
? t3AcpPromptWithInstructions({
prompt: "test prompt",
state: { interactionMode: "default", hasT3Mcp: false, hasDeviceTools: false },
state: {
interactionMode: "default",
hasT3Mcp: false,
hasDeviceTools: false,
hasBrowserTools: false,
},
})
: "test prompt",
},
Expand Down
70 changes: 61 additions & 9 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ import { attachmentRelativePath } from "../../attachmentStore.ts";
import { WorkflowAgentTranscriptReadObserver } from "../workflowAgentTranscript.ts";
import * as ServerConfig from "../../config.ts";
import * as McpProviderSession from "@t3tools/provider-core/server/mcpSession";
import { T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH } from "@t3tools/provider-core/server/orchestrationInstructions";
import {
T3_CODE_BROWSER_TOOL_INSTRUCTIONS,
T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH,
} from "@t3tools/provider-core/server/orchestrationInstructions";
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
import { PreviewControlsToolkit } from "../../mcp/toolkits/previewControls/tools.ts";
import { HtmlToolkit } from "../../mcp/toolkits/html/tools.ts";
Expand Down Expand Up @@ -832,7 +835,13 @@ describe("ClaudeAdapterV2 native protocol logging", () => {
});

describe("ClaudeAdapterV2 device instructions", () => {
const options = (input: { readonly mcp: boolean; readonly deviceToolsAvailable: boolean }) =>
const NOT_INSTALLED_BROWSER_RULE =
"A browser tool that project docs name but that is not installed is no reason to switch: use preview, and do not install it.";
const options = (input: {
readonly mcp: boolean;
readonly deviceToolsAvailable: boolean;
readonly browserToolsAvailable?: boolean;
}) =>
ClaudeAdapterV2.makeClaudeQueryOptions({
modelSelection: {
instanceId: ProviderInstanceId.make("claudeAgent"),
Expand All @@ -845,26 +854,43 @@ describe("ClaudeAdapterV2 device instructions", () => {
? { mcpServers: { "t3-code": { type: "http" as const, url: "http://127.0.0.1/mcp" } } }
: {}),
deviceToolsAvailable: input.deviceToolsAvailable,
browserToolsAvailable: input.browserToolsAvailable ?? false,
environment: {},
});
const append = (input: { readonly mcp: boolean; readonly deviceToolsAvailable: boolean }) =>
(options(input).systemPrompt as { readonly append?: string }).append ?? "";
const append = (input: {
readonly mcp: boolean;
readonly deviceToolsAvailable: boolean;
readonly browserToolsAvailable?: boolean;
}) => (options(input).systemPrompt as { readonly append?: string }).append ?? "";

it("gives a session with device access the device block and the ToolSearch line to load it", () => {
it("gives a session with device or browser access that block, and the ToolSearch line for devices", () => {
const text = append({ mcp: true, deviceToolsAvailable: true });
assert.include(text, T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH);
assert.include(text, "Use `delegate_task`");
assert.include(
append({ mcp: true, deviceToolsAvailable: false, browserToolsAvailable: true }),
`${T3_CODE_BROWSER_TOOL_INSTRUCTIONS.trim()} ${NOT_INSTALLED_BROWSER_RULE}`,
);
});

it("leaves the device block out without device access or without T3 tools", () => {
assert.notInclude(append({ mcp: true, deviceToolsAvailable: false }), "## T3 Code devices");
assert.notInclude(append({ mcp: false, deviceToolsAvailable: true }), "## T3 Code devices");
it("leaves the device and browser blocks out without that access or without T3 tools", () => {
const withoutAccess = append({ mcp: true, deviceToolsAvailable: false });
assert.notInclude(withoutAccess, "## T3 Code devices");
assert.notInclude(withoutAccess, "## T3 Code browser");
const withoutMcp = append({
mcp: false,
deviceToolsAvailable: true,
browserToolsAvailable: true,
});
assert.notInclude(withoutMcp, "## T3 Code devices");
assert.notInclude(withoutMcp, "## T3 Code browser");
});

it("gives native subagents the device block only in a session with device access", async () => {
it("gives native subagents browser and device blocks only with the corresponding access", async () => {
// Subagents start from their task prompt, not the parent's system prompt.
const subagentContext = (input: {
readonly mcp: boolean;
readonly browserToolsAvailable?: boolean;
readonly deviceToolsAvailable: boolean;
}) =>
Promise.all(
Expand Down Expand Up @@ -893,7 +919,33 @@ describe("ClaudeAdapterV2 device instructions", () => {
},
},
]);
for (const deviceToolsAvailable of [false, true]) {
const result = await subagentContext({
mcp: true,
deviceToolsAvailable,
browserToolsAvailable: true,
});
assert.deepEqual(result, [
{
hookSpecificOutput: {
hookEventName: "SubagentStart",
additionalContext: [
`${T3_CODE_BROWSER_TOOL_INSTRUCTIONS.trim()} ${NOT_INSTALLED_BROWSER_RULE}`,
...(deviceToolsAvailable ? [T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH] : []),
].join("\n\n"),
},
},
]);
}
assert.deepEqual(await subagentContext({ mcp: true, deviceToolsAvailable: false }), []);
assert.deepEqual(
await subagentContext({
mcp: false,
deviceToolsAvailable: true,
browserToolsAvailable: true,
}),
[],
);
assert.deepEqual(await subagentContext({ mcp: false, deviceToolsAvailable: true }), []);
});
});
Expand Down
47 changes: 37 additions & 10 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ import {
} from "../../provider/claudeUsageLimits.ts";
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
import {
T3_CODE_BROWSER_TOOL_INSTRUCTIONS,
T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH,
T3_CODE_ORCHESTRATION_INSTRUCTIONS,
} from "@t3tools/provider-core/server/orchestrationInstructions";
Expand Down Expand Up @@ -2100,14 +2101,19 @@ const CLAUDE_SEND_TO_USER_INSTRUCTIONS = `
Text you write before a tool call may reach the user only as a one-line summary. When the user must read something in full before your turn ends, such as a draft, a code block, or what a question you're about to ask refers to, send it with \`send_to_user\`. Put everything else in your final reply.
`;

// Claude reads a CLAUDE.md that names a missing browser CLI as the user asking for it, and installs it.
const CLAUDE_BROWSER_INSTRUCTIONS = `${T3_CODE_BROWSER_TOOL_INSTRUCTIONS.trim()} A browser tool that project docs name but that is not installed is no reason to switch: use preview, and do not install it.`;

// Native subagents start from their task, not this session's system prompt.
const subagentDeviceInstructions: HookCallback = () =>
Promise.resolve({
hookSpecificOutput: {
hookEventName: "SubagentStart",
additionalContext: T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH,
},
});
const subagentInstructions =
(additionalContext: string): HookCallback =>
() =>
Promise.resolve({
hookSpecificOutput: {
hookEventName: "SubagentStart",
additionalContext,
},
});

export function makeClaudeQueryOptions(input: {
readonly modelSelection: ModelSelection;
Expand All @@ -2123,6 +2129,8 @@ export function makeClaudeQueryOptions(input: {
readonly sdkSettings?: string | ClaudeSdkSettings;
readonly environment?: NodeJS.ProcessEnv;
readonly mcpServers?: ClaudeQueryOptions["mcpServers"];
/** The thread's T3 MCP session holds the `preview` capability. */
readonly browserToolsAvailable?: boolean;
/** The thread's T3 MCP session holds the `device` capability. */
readonly deviceToolsAvailable?: boolean;
readonly tools?: ClaudeAgentSdkQueryTools;
Expand Down Expand Up @@ -2219,6 +2227,8 @@ export function makeClaudeQueryOptions(input: {
: { ENABLE_TOOL_SEARCH: input.toolSearchOverride }),
},
} as ClaudeSdkSettings);
const browserInstructions =
input.mcpServers !== undefined && input.browserToolsAvailable === true;
const deviceInstructions = input.mcpServers !== undefined && input.deviceToolsAvailable === true;
const options: ClaudeAgentSdkQueryOptions = {
model: compiledSelection.apiModelId,
Expand Down Expand Up @@ -2279,17 +2289,33 @@ export function makeClaudeQueryOptions(input: {
: T3_CODE_ORCHESTRATION_INSTRUCTIONS +
CLAUDE_BACKGROUND_WAIT_INSTRUCTIONS +
CLAUDE_SEND_TO_USER_INSTRUCTIONS +
(browserInstructions ? `\n${CLAUDE_BROWSER_INSTRUCTIONS}\n` : "") +
(deviceInstructions
? `\n${T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH}\n`
: "")),
...launchAppendSystemPrompt,
].join("\n\n"),
},
...(deviceInstructions || input.onStop !== undefined
...(deviceInstructions || browserInstructions || input.onStop !== undefined
? {
hooks: {
...(deviceInstructions
? { SubagentStart: [{ hooks: [subagentDeviceInstructions] }] }
...(deviceInstructions || browserInstructions
? {
SubagentStart: [
{
hooks: [
subagentInstructions(
[
...(browserInstructions ? [CLAUDE_BROWSER_INSTRUCTIONS] : []),
...(deviceInstructions
? [T3_CODE_DEVICE_TOOL_INSTRUCTIONS_WITH_TOOL_SEARCH]
: []),
].join("\n\n"),
),
],
},
],
}
: {}),
...(input.onStop === undefined ? {} : { Stop: [{ hooks: [input.onStop] }] }),
},
Expand Down Expand Up @@ -12661,6 +12687,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
...(mcpOverrides.mcpServers === undefined
? {}
: { mcpServers: mcpOverrides.mcpServers }),
browserToolsAvailable: mcpSession?.capabilities?.has("preview") === true,
deviceToolsAvailable: mcpSession?.capabilities?.has("device") === true,
permissionMode: queryPolicy.permissionMode,
...(queryPolicy.allowDangerouslySkipPermissions === undefined
Expand Down
Loading
Loading