@ai-sdk/harness-codex 1.0.126 → 1.0.129

package/dist/index.js

@@ -15,6 +15,7 @@ import {
   createSandboxCredentialEnvironment,
   createBridgeErrorHandler,
   createBridgeStartupError,
+  experimental_createBridgeUserMessageSubmitter,
   drainBridgeProcessStream,
   forwardBridgeProcessStream,
   getRestrictedSandboxSession,
@@ -27,6 +28,9 @@ import {
   withBridgeToken,
   writeSkills
 } from "@ai-sdk/harness/utils";
+import {
+  tool
+} from "@ai-sdk/provider-utils";
 import { WebSocket } from "ws";
 import { z as z2 } from "zod/v4";
 
@@ -516,10 +520,10 @@ var startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   codexConfig: z.record(z.string(), z.unknown()).optional(),
   mcpServers: z.record(z.string(), z.unknown()).optional(),
   headers: z.record(z.string(), z.string()).optional(),
-  // Resume signal. When supplied, the bridge calls
-  // `codex.resumeThread(resumeThreadId, …)` instead of starting a fresh thread.
-  // The host sources the id from lifecycle state `data` cached from a prior
-  // `agent.detach`.
+  /*
+   * The host carries this app-server thread ID in lifecycle state. Supplying it
+   * makes the bridge call `thread/resume` instead of starting a fresh thread.
+   */
   resumeThreadId: z.string().optional(),
   restartThread: z.boolean().optional()
 });
@@ -528,11 +532,8 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
   ...harnessV1BridgeInboundCommandSchemas
 ]);
 
-// src/bridge/cli-relay.ts
-var CLI_SHIM_FILENAME = "harness-tool.mjs";
-
 // src/version.ts
-var VERSION = true ? "1.0.126" : "0.0.0-test";
+var VERSION = true ? "1.0.129" : "0.0.0-test";
 
 // src/codex-harness.ts
 var DEFAULT_CODEX_MODEL = "gpt-5.5";
@@ -549,7 +550,25 @@ var CODEX_BUILTIN_TOOLS = {
     toolUseKind: "readonly",
     description: "Search the web",
     inputSchema: z2.object({ query: z2.string() })
-  })
+  }),
+  apply_patch: {
+    ...tool({
+      description: "Apply a patch to files",
+      inputSchema: z2.string()
+    }),
+    toolUseKind: "edit"
+  },
+  view_image: {
+    ...tool({
+      description: "View a local image file",
+      inputSchema: z2.object({
+        path: z2.string(),
+        detail: z2.enum(["high", "original"]).optional(),
+        environment_id: z2.string().optional()
+      })
+    }),
+    toolUseKind: "readonly"
+  }
 };
 var codexBridgeCoordsSchema = z2.object({
   port: z2.number(),
@@ -568,17 +587,12 @@ function createCodex(settings = {}) {
     specificationVersion: "harness-v1",
     harnessId: "codex",
     builtinTools: CODEX_BUILTIN_TOOLS,
+    supportsBuiltinToolFiltering: true,
     supportsBuiltinToolApprovals: false,
     lifecycleStateSchema: codexResumeStateSchema,
     getBootstrap: getCodexBootstrap,
     doStart: async (startOpts) => {
       const model = DEFAULT_CODEX_MODEL;
-      if (startOpts.builtinToolFiltering != null) {
-        throw new HarnessCapabilityUnsupportedError({
-          message: "Harness 'codex' does not support built-in tool filtering controls.",
-          harnessId: "codex"
-        });
-      }
       if (startOpts.permissionMode != null && startOpts.permissionMode !== "allow-all") {
         throw new HarnessCapabilityUnsupportedError({
           message: "Harness 'codex' does not support built-in tool approval requests; use permissionMode: 'allow-all'.",
@@ -654,8 +668,6 @@ function createCodex(settings = {}) {
         sessionId: startOpts.sessionId
       });
       const bridgeStateDir = `${sessionDataDir}/bridge`;
-      const cliShimDir = `${sessionDataDir}/codex`;
-      const cliShimPath = `${cliShimDir}/${CLI_SHIM_FILENAME}`;
       const timeoutMs = settings.startupTimeoutMs ?? 12e4;
       const report = startOpts.observability?.report;
       const onDiagnostic = report ? (frame) => report(
@@ -691,12 +703,12 @@ function createCodex(settings = {}) {
           return createSession({
             sessionId: startOpts.sessionId,
             channel: attachChannel,
-            cliShimPath,
             // The live bridge was spawned by another process; no process handle.
             proc: void 0,
             model,
             reasoningEffort: settings.reasoningEffort,
             webSearch: settings.webSearch,
+            builtinToolFiltering: startOpts.builtinToolFiltering,
             codexConfig: settings.codexConfig,
             mcpServers: settings.mcpServers,
             headers: startOpts.headers,
@@ -766,7 +778,7 @@ function createCodex(settings = {}) {
         abortSignal: startOpts.abortSignal
       });
       const proc = await toolSafeSandboxSession.spawn({
-        command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --cli-shim-dir ${shellQuote(cliShimDir)}`,
+        command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)}`,
         env,
         abortSignal: startOpts.abortSignal
       });
@@ -823,11 +835,11 @@ function createCodex(settings = {}) {
       return createSession({
         sessionId: startOpts.sessionId,
         channel,
-        cliShimPath,
         proc,
         model,
         reasoningEffort: settings.reasoningEffort,
         webSearch: settings.webSearch,
+        builtinToolFiltering: startOpts.builtinToolFiltering,
         codexConfig: settings.codexConfig,
         mcpServers: settings.mcpServers,
         headers: startOpts.headers,
@@ -949,11 +961,11 @@ function openWebSocket({
 function createSession({
   sessionId,
   channel,
-  cliShimPath,
   proc,
   model,
   reasoningEffort,
   webSearch,
+  builtinToolFiltering,
   codexConfig,
   mcpServers,
   headers,
@@ -974,7 +986,6 @@ function createSession({
   let stopped = false;
   let stopPromise;
   let pendingResumeThreadId = seedResumeThreadOnFirstPrompt ? resumeThreadId : void 0;
-  let initialPromptGuidanceApplied = isResume;
   let latestThreadId = resumeThreadId;
   let latestTurnConfigurationFingerprint = turnConfigurationFingerprint;
   channel.on("bridge-thread", (msg) => {
@@ -1002,7 +1013,6 @@ function createSession({
     const restartThread = latestThreadId != null && (skillsResult.changed || latestTurnConfigurationFingerprint != null && latestTurnConfigurationFingerprint !== nextFingerprint);
     latestTurnConfigurationFingerprint = nextFingerprint;
     if (restartThread) {
-      initialPromptGuidanceApplied = false;
       pendingResumeThreadId = void 0;
     }
     return { restartThread };
@@ -1014,6 +1024,11 @@ function createSession({
       pendingResolve = resolve2;
       pendingReject = reject;
     });
+    const userMessageSubmitter = experimental_createBridgeUserMessageSubmitter({
+      send: (message) => channel.send(message),
+      onResponse: (listener) => channel.on("user-message-response", listener),
+      onReconnect: (listener) => channel.onReconnect(listener)
+    });
     const unsubs = [];
     const forward = (event) => {
       try {
@@ -1040,12 +1055,14 @@ function createSession({
     const settleSuccess = () => {
       if (isSettled) return;
       isSettled = true;
+      userMessageSubmitter.close();
       for (const u of unsubs) u();
       pendingResolve();
     };
     const settleError = (err) => {
       if (isSettled) return;
       isSettled = true;
+      userMessageSubmitter.close(err);
       for (const u of unsubs) u();
       pendingReject(err);
     };
@@ -1113,6 +1130,9 @@ function createSession({
           reason: input.reason
         });
       },
+      submitUserMessage: async (text) => {
+        await userMessageSubmitter.submit(text);
+      },
       done
     };
     return {
@@ -1155,26 +1175,16 @@ function createSession({
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal
       });
-      let promptText = extractUserText(promptOpts.prompt);
-      if (!initialPromptGuidanceApplied) {
-        promptText = frameInitialPromptGuidance({
-          toolUsageBlock: tools.length > 0 ? composeToolUsageInstructions({
-            tools,
-            cliShimPath
-          }) : void 0,
-          userText: promptText
-        });
-      }
-      initialPromptGuidanceApplied = true;
       const startMessage = {
         type: "start",
-        prompt: promptText,
+        prompt: extractUserText(promptOpts.prompt),
         tools,
         ...promptOpts.responseFormat == null ? {} : { responseFormat: promptOpts.responseFormat },
         ...promptOpts.instructions ? { instructions: promptOpts.instructions } : {},
         model: promptOpts.model ?? model,
         reasoningEffort,
         webSearch,
+        ...builtinToolFiltering == null ? {} : { builtinToolFiltering },
         ...codexConfig == null ? {} : { codexConfig },
         ...mcpServers == null ? {} : { mcpServers },
         ...headers == null ? {} : { headers },
@@ -1229,6 +1239,7 @@ function createSession({
             model: continueOpts.model ?? model,
             reasoningEffort,
             webSearch,
+            ...builtinToolFiltering == null ? {} : { builtinToolFiltering },
             ...codexConfig == null ? {} : { codexConfig },
             ...mcpServers == null ? {} : { mcpServers },
             ...headers == null ? {} : { headers },
@@ -1409,44 +1420,6 @@ function fingerprintCodexTurnConfiguration({
 }) {
   return createHash2("sha256").update(JSON.stringify({ instructions: instructions ?? null, tools })).digest("hex");
 }
-function frameInitialPromptGuidance({
-  toolUsageBlock,
-  userText
-}) {
-  const blocks = [];
-  if (toolUsageBlock) blocks.push(toolUsageBlock);
-  if (blocks.length === 0) return userText;
-  return `${blocks.join("\n\n")}
-
-<user-message>
-${userText}
-</user-message>`;
-}
-function composeToolUsageInstructions({
-  tools,
-  cliShimPath
-}) {
-  const lines = [
-    "<host-tool-instructions>",
-    "You have access to the following host-provided tools. To use one, run the following command via your built-in `bash` tool:",
-    "",
-    `  node ${cliShimPath} <toolName> '<jsonInput>'`,
-    "",
-    "The script prints the JSON result to stdout. Do not invent another way to call these tools \u2014 only this CLI invocation will work. Pass the JSON input as a single-quoted argument.",
-    "For every user request that depends on a host-provided tool, run a separate CLI invocation for each needed tool call in the current turn before answering. Do not reuse previous tool results, and do not say you used a host tool unless the command has completed in the current turn.",
-    ""
-  ];
-  for (const toolSpec of tools) {
-    lines.push(
-      `- **${toolSpec.name}**${toolSpec.description ? ": " + toolSpec.description : ""}`
-    );
-    lines.push(
-      `  - Input schema: \`${JSON.stringify(toolSpec.inputSchema ?? {})}\``
-    );
-  }
-  lines.push("</host-tool-instructions>");
-  return lines.join("\n");
-}
 function extractUserText(prompt) {
   if (typeof prompt === "string") return prompt;
   const { content } = prompt;