@agentproto/driver-agent-cli 2.7.0 → 2.8.0

package/dist/{chunk-D4NQQ2C7.mjs → chunk-E45SX7GU.mjs}

@@ -242,6 +242,13 @@ var capabilitiesSchema = z.object({
    * as a PTY session. Distinct from ACP-level `resumable`.
    */
   nativeTerminalResume: z.boolean().optional(),
+  /**
+   * Harness defers mounted MCP tools behind its own native search tool
+   * (Claude Code `ToolSearch`). Makes the daemon's `/mcp` self-mount default
+   * to eager for this adapter instead of double-deferring behind the
+   * daemon's `tool_search`. Defaults to false (conservative).
+   */
+  nativeToolSearch: z.boolean().optional(),
   /**
    * Adapter can ingest a filesystem path that the host UI just placed
    * on disk (host-side drag-drop into a terminal pastes the path
@@ -504,6 +511,7 @@ function createAcpProtocolArm(options) {
   let client = null;
   let session = null;
   const pendingByTurn = /* @__PURE__ */ new Map();
+  const earlyDisconnectListeners = [];
   return {
     get sessionId() {
       return session?.sessionId;
@@ -520,6 +528,13 @@ function createAcpProtocolArm(options) {
     get currentModeId() {
       return session?.currentModeId;
     },
+    isConnected() {
+      return client?.isConnected() ?? true;
+    },
+    onDisconnect(listener) {
+      if (client) client.onDisconnect(listener);
+      else earlyDisconnectListeners.push(listener);
+    },
     async connect(opts) {
       const permissionHandler = options.onPermissionRequest ?? defaultPermissionHandlerForMode(options.requestedMode);
       client = await createAcpClient({
@@ -546,6 +561,9 @@ function createAcpProtocolArm(options) {
           requestPermission: async (params) => permissionHandler(params)
         }
       });
+      for (const listener of earlyDisconnectListeners.splice(0)) {
+        client.onDisconnect(listener);
+      }
       if (opts.resumeSessionId) {
         session = await client.loadSession({
           sessionId: opts.resumeSessionId,
@@ -1899,18 +1917,93 @@ async function applyModelCommand(arm, modelId) {
   }
   return { applied: true, model: modelId };
 }
-async function* promptTurn(arm, turnId, message) {
-  await arm.send(turnId, message);
+function parseLogfmtLine(line) {
+  const out = {};
+  const re = /([A-Za-z0-9_.-]+)=("(?:[^"\\]|\\.)*"|\S+)/g;
+  let m;
+  while ((m = re.exec(line)) !== null) {
+    const key = m[1];
+    let value = m[2];
+    if (value.startsWith('"')) {
+      value = value.slice(1, -1).replace(/\\(.)/g, "$1");
+    }
+    out[key] = value;
+  }
+  return out;
+}
+function providerMessageFromError(raw) {
+  const m = raw.match(/^[A-Za-z_][\w.]*(?:Error|Exception)\s*:\s*([\s\S]+)$/);
+  return (m ? m[1] : raw).trim();
+}
+function parseStderrStreamError(line) {
+  if (!line.includes("stream error")) return void 0;
+  const fields = parseLogfmtLine(line);
+  if ((fields.level ?? "").toUpperCase() !== "ERROR") return void 0;
+  if (fields.message !== "stream error") return void 0;
+  if (fields.small === "true") return void 0;
+  if (fields.agent === "title") return void 0;
+  const raw = fields["error.error"] ?? fields.error;
+  if (!raw) return void 0;
+  return providerMessageFromError(raw);
+}
+async function* promptTurn(arm, turnId, message, stderrTurnError) {
   const stderrTail = arm._stderrTail;
-  for await (const evt of arm.events()) {
-    if (evt.kind === "error" && typeof stderrTail === "function") {
-      const tail = stderrTail();
-      if (tail) {
-        const existing = evt.error.data ?? {};
-        evt.error.data = { ...existing, stderr: tail };
+  const pendingErrors = [];
+  let wake;
+  const unsubscribe = stderrTurnError && arm._onStderrLine ? arm._onStderrLine((line) => {
+    const parsed = stderrTurnError(line);
+    if (parsed === void 0) return;
+    pendingErrors.push(parsed);
+    wake?.();
+    wake = void 0;
+  }) : void 0;
+  let iterator;
+  try {
+    await arm.send(turnId, message);
+    iterator = arm.events()[Symbol.asyncIterator]();
+    while (true) {
+      if (pendingErrors.length > 0) {
+        await arm.cancel(turnId).catch(() => {
+        });
+        yield {
+          kind: "error",
+          sessionId: arm.sessionId,
+          error: {
+            message: pendingErrors.join("\n"),
+            data: { stderr: stderrTail?.() ?? "" }
+          }
+        };
+        yield {
+          kind: "turn-end",
+          sessionId: arm.sessionId ?? "",
+          reason: "error"
+        };
+        return;
       }
+      const nextEvent = iterator.next();
+      const stderrArrived = new Promise((resolve2) => {
+        wake = resolve2;
+      });
+      const winner = await Promise.race([
+        nextEvent.then((result) => ({ source: "event", result })),
+        stderrArrived.then(() => ({ source: "stderr" }))
+      ]);
+      if (winner.source === "stderr") continue;
+      if (winner.result.done) return;
+      const evt = winner.result.value;
+      if (evt.kind === "error" && typeof stderrTail === "function") {
+        const tail = stderrTail();
+        if (tail) {
+          const existing = evt.error.data ?? {};
+          evt.error.data = { ...existing, stderr: tail };
+        }
+      }
+      yield evt;
     }
-    yield evt;
+  } finally {
+    unsubscribe?.();
+    void iterator?.return?.()?.catch?.(() => {
+    });
   }
 }
 function npxCacheKey(packages) {
@@ -2139,6 +2232,7 @@ function createAgentCliRuntime(definition) {
       }
       let child;
       const stderrBuf = [];
+      const stderrLineListeners = /* @__PURE__ */ new Set();
       if (definition.protocol !== "proprietary") {
         const [execBin, execArgs] = await wrapAgentCliSpawn(
           finalBin,
@@ -2194,6 +2288,7 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
             if (!line) continue;
             stderrBuf.push(line);
             if (stderrBuf.length > STDERR_KEEP_LINES) stderrBuf.shift();
+            for (const listener of stderrLineListeners) listener(line);
           }
         });
       }
@@ -2205,6 +2300,10 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
         opts?.permissionHold ?? false
       );
       arm._stderrTail = () => stderrBuf.join("\n");
+      arm._onStderrLine = (listener) => {
+        stderrLineListeners.add(listener);
+        return () => stderrLineListeners.delete(listener);
+      };
       const abortController = new AbortController();
       if (opts?.signal) {
         opts.signal.addEventListener("abort", () => abortController.abort(), {
@@ -2257,6 +2356,12 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
       return {
         sessionId,
         pid: child?.pid,
+        // Transport liveness, delegated to the arm (see the fields' docs on
+        // AgentCliRuntimeSession). An arm that models no long-lived
+        // connection reports nothing, which reads as "connected" — there is
+        // no stream for it to have lost, and nothing to subscribe to.
+        isConnected: () => arm.isConnected?.() ?? true,
+        ...arm.onDisconnect ? { onDisconnect: (listener) => arm.onDisconnect(listener) } : {},
         // Live model/mode/effort switches + the capability read-surface,
         // all pure arm delegation — shared with every host that builds
         // its own session over another transport. See session-controls.ts.
@@ -2265,7 +2370,8 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
         send(message) {
           const turnId = randomUUID();
           currentTurnId = turnId;
-          return promptTurn(arm, turnId, message);
+          const stderrTurnError = definition.id === "opencode" ? parseStderrStreamError : void 0;
+          return promptTurn(arm, turnId, message, stderrTurnError);
         },
         /**
          * Cancel the in-flight turn — the wire equivalent of Ctrl-C at the
@@ -2381,5 +2487,5 @@ function derivedModelRefusalError(definition, requested, reason) {
 }
 
 export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, agentCliSupportsHostContextIsolation, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createJcodeMapperState, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, hostContextExcludes, inferLegacyModeKind, isLegacyExtractedModeId, isModelSwitchAcknowledgement, mapJcodeEvent, mapMastraEvent, parseModelSwitchCommand, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
-//# sourceMappingURL=chunk-D4NQQ2C7.mjs.map
-//# sourceMappingURL=chunk-D4NQQ2C7.mjs.map
+//# sourceMappingURL=chunk-E45SX7GU.mjs.map
+//# sourceMappingURL=chunk-E45SX7GU.mjs.map