@agentproto/driver-agent-cli 2.2.1 → 2.3.0

package/dist/{chunk-F2ROGR3O.mjs → chunk-774L5IO5.mjs}

@@ -324,7 +324,7 @@ var printConfigSchema = z.object({
     flag: z.string(),
     kind: z.enum(["value", "boolean"])
   }).strict().optional(),
-  event_schema: z.enum(["claude-stream-json", "mastra-jsonl", "antigravity-stream-json"]).optional()
+  event_schema: z.enum(["claude-stream-json", "mastra-jsonl", "antigravity-stream-json", "jcode-ndjson"]).optional()
 }).strict().optional();
 var agentCliFrontmatterSchema = z.object({
   name: z.string().min(1).max(80),
@@ -691,6 +691,22 @@ function createPrintSession(opts) {
         stdio: ["ignore", "pipe", "pipe"]
       });
       activeChild = child;
+      let spawnFailure;
+      await new Promise((resolve) => {
+        child.once("spawn", () => resolve());
+        child.once("error", (err) => {
+          spawnFailure = err;
+          resolve();
+        });
+      });
+      if (spawnFailure) {
+        activeChild = null;
+        yield {
+          kind: "error",
+          error: { message: `failed to spawn '${execBin} ${execArgs.join(" ")}': ${spawnFailure.message}` }
+        };
+        return;
+      }
       const stderrLines = [];
       const STDERR_KEEP = 80;
       child.stderr?.setEncoding("utf8");
@@ -706,6 +722,7 @@ function createPrintSession(opts) {
           throw new Error("print-arm: child has no stdout pipe");
         let capturedSessionId = "";
         const mastraState = eventSchema === "mastra-jsonl" ? createMastraMapperState() : void 0;
+        const jcodeState = eventSchema === "jcode-ndjson" ? createJcodeMapperState() : void 0;
         const rl = createInterface({ input: child.stdout, crlfDelay: Infinity });
         const queue = new EventQueue();
         rl.on("line", (line) => {
@@ -719,7 +736,7 @@ function createPrintSession(opts) {
           const csid = captureSessionId(evt, eventSchema);
           if (csid) capturedSessionId = csid;
           const sid = capturedSessionId || sessionId || "";
-          const mapped = mapEvent(evt, sid, stderrLines, eventSchema, mastraState);
+          const mapped = mapEvent(evt, sid, stderrLines, eventSchema, mastraState, jcodeState);
           if (Array.isArray(mapped)) {
             for (const m of mapped) queue.push(m);
           } else if (mapped) {
@@ -733,7 +750,7 @@ function createPrintSession(opts) {
         const exitCode = await waitForExit(child);
         if (capturedSessionId) sessionId = capturedSessionId;
         if (exitCode !== 0 && exitCode !== null) {
-          const binLabel = eventSchema === "mastra-jsonl" ? "mastracode" : eventSchema === "antigravity-stream-json" ? "agy" : "claude";
+          const binLabel = eventSchema === "mastra-jsonl" ? "mastracode" : eventSchema === "antigravity-stream-json" ? "agy" : eventSchema === "jcode-ndjson" ? "jcode" : "claude";
           const errEvt = {
             kind: "error",
             error: {
@@ -882,9 +899,13 @@ function captureSessionId(evt, schema) {
       if (evt.type === "result" && typeof evt.threadId === "string" && evt.threadId)
         return evt.threadId;
       return null;
+    case "jcode-ndjson":
+      if ((evt.type === "start" || evt.type === "done") && typeof evt.session_id === "string" && evt.session_id)
+        return evt.session_id;
+      return null;
   }
 }
-function mapEvent(evt, sessionId, stderrLines, schema, mastraState) {
+function mapEvent(evt, sessionId, stderrLines, schema, mastraState, jcodeState) {
   switch (schema) {
     case "claude-stream-json":
       return mapClaudeEvent(evt, sessionId, stderrLines);
@@ -896,6 +917,8 @@ function mapEvent(evt, sessionId, stderrLines, schema, mastraState) {
       }
       return mapMastraEvent(evt, sessionId, stderrLines, mastraState);
     }
+    case "jcode-ndjson":
+      return mapJcodeEvent(evt, sessionId, jcodeState ?? createJcodeMapperState());
     default:
       return mapClaudeEvent(evt, sessionId, stderrLines);
   }
@@ -1031,6 +1054,74 @@ function mapAntigravityUsage(usage, sessionId) {
     ...tokensOut !== void 0 ? { tokensOut } : {}
   };
 }
+function createJcodeMapperState() {
+  return {};
+}
+function mapJcodeEvent(evt, sessionId, state) {
+  switch (evt.type) {
+    case "text_delta":
+      return typeof evt.text === "string" ? { kind: "text-delta", sessionId, text: evt.text } : null;
+    case "tool_start":
+      state.pending = {
+        id: typeof evt.id === "string" ? evt.id : "",
+        name: typeof evt.name === "string" ? evt.name : "?",
+        input: ""
+      };
+      return null;
+    case "tool_input":
+      if (state.pending && typeof evt.delta === "string")
+        state.pending.input += evt.delta;
+      return null;
+    case "tool_exec":
+      return flushPendingJcodeCall(state, sessionId);
+    case "tool_done": {
+      const call = flushPendingJcodeCall(state, sessionId);
+      const result = {
+        kind: "tool-result",
+        sessionId,
+        toolCallId: typeof evt.id === "string" ? evt.id : "",
+        result: evt.output ?? null,
+        isError: evt.error !== null && evt.error !== void 0
+      };
+      return call ? [call, result] : result;
+    }
+    case "tokens": {
+      const tokensIn = typeof evt.input === "number" ? evt.input : void 0;
+      const tokensOut = typeof evt.output === "number" ? evt.output : void 0;
+      if (tokensIn === void 0 && tokensOut === void 0) return null;
+      return {
+        kind: "usage_update",
+        sessionId,
+        size: 0,
+        used: 0,
+        ...tokensIn !== void 0 ? { tokensIn } : {},
+        ...tokensOut !== void 0 ? { tokensOut } : {}
+      };
+    }
+    case "done":
+      return { kind: "turn-end", sessionId, reason: "completed" };
+    default:
+      return null;
+  }
+}
+function flushPendingJcodeCall(state, sessionId) {
+  const pending = state.pending;
+  state.pending = void 0;
+  if (!pending) return null;
+  let args;
+  try {
+    args = JSON.parse(pending.input);
+  } catch {
+    args = { raw: pending.input };
+  }
+  return {
+    kind: "tool-call",
+    sessionId,
+    toolCallId: pending.id,
+    toolName: pending.name,
+    arguments: args
+  };
+}
 function createMastraMapperState() {
   return { lastTextLength: 0 };
 }
@@ -1618,11 +1709,15 @@ var defineAgentCli = createDoctype(
     }
   }
 );
+function resolveSpawnBin(bin) {
+  return bin === "node" ? process.execPath : bin;
+}
 function createAgentCliRuntime(definition) {
   return {
     definition,
     async start(opts) {
       const cwd = opts?.cwd ?? process.cwd();
+      const resolvedBin = resolveSpawnBin(definition.bin);
       const contextMode = opts?.contextProfile ? (definition.modes ?? []).find(
         (mode) => mode.id === opts.contextProfile && mode.kind === "context"
       ) : void 0;
@@ -1664,12 +1759,26 @@ function createAgentCliRuntime(definition) {
       const isolateClaudeCodeConfig = definition.id === "claude-code";
       let claudeConfigDir;
       if (isolateClaudeCodeConfig) {
-        claudeConfigDir = mkdtempSync(
-          join(tmpdir(), "agentproto-claude-config-")
-        );
+        if (opts?.configDir) {
+          claudeConfigDir = opts.configDir;
+          mkdirSync(claudeConfigDir, { recursive: true });
+        } else {
+          claudeConfigDir = mkdtempSync(
+            join(tmpdir(), "agentproto-claude-config-")
+          );
+        }
+        const globalConfigPath = join(claudeConfigDir, ".claude.json");
+        let priorGlobalConfig = {};
+        try {
+          const parsed = JSON.parse(readFileSync(globalConfigPath, "utf8"));
+          if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            priorGlobalConfig = parsed;
+          }
+        } catch {
+        }
         writeFileSync(
-          join(claudeConfigDir, ".claude.json"),
-          JSON.stringify({ mcpServers: {} })
+          globalConfigPath,
+          JSON.stringify({ ...priorGlobalConfig, mcpServers: {} })
         );
         const isolatedSettings = {
           attribution: { commit: "", pr: "", sessionUrl: false }
@@ -1685,7 +1794,7 @@ function createAgentCliRuntime(definition) {
       }
       if (definition.protocol === "print") {
         return createPrintSession({
-          bin: definition.bin,
+          bin: resolvedBin,
           baseArgs: composed.binArgs,
           cwd,
           env,
@@ -1700,7 +1809,7 @@ function createAgentCliRuntime(definition) {
       const stderrBuf = [];
       if (definition.protocol !== "proprietary") {
         const [execBin, execArgs] = await wrapAgentCliSpawn(
-          definition.bin,
+          resolvedBin,
           composed.binArgs,
           {
             mode: opts?.commandSandbox,
@@ -1709,12 +1818,32 @@ function createAgentCliRuntime(definition) {
             label: definition.id
           }
         );
-        child = spawn(execBin, execArgs, {
+        const spawned = spawn(execBin, execArgs, {
           cwd,
           env,
           stdio: ["pipe", "pipe", "pipe"],
           signal: opts?.signal
         });
+        child = spawned;
+        let spawnFailure;
+        await new Promise((resolve) => {
+          spawned.once("spawn", () => resolve());
+          spawned.once("error", (err) => {
+            spawnFailure = err;
+            resolve();
+          });
+        });
+        if (spawnFailure) {
+          const isEnoent = spawnFailure.code === "ENOENT";
+          const enoentHint = isEnoent ? `
+'${execBin}' was not found on the daemon's PATH. If it works in your own terminal, the daemon's environment may be stale \u2014 try \`agentproto daemon restart\`.` : "";
+          throw new Error(
+            `agent-cli '${definition.id}': failed to spawn '${execBin} ${execArgs.join(" ")}': ${spawnFailure.message}${enoentHint}`
+          );
+        }
+        spawned.on("error", (err) => {
+          stderrBuf.push(`[spawn error] ${err.message}`);
+        });
         const STDERR_KEEP_LINES = 80;
         child.stderr?.setEncoding("utf8");
         child.stderr?.on("data", (chunk) => {
@@ -1871,6 +2000,6 @@ function filterStringEnv(env) {
   return out;
 }
 
-export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, inferLegacyModeKind, isLegacyExtractedModeId, mapMastraEvent, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
-//# sourceMappingURL=chunk-F2ROGR3O.mjs.map
-//# sourceMappingURL=chunk-F2ROGR3O.mjs.map
+export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createJcodeMapperState, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, inferLegacyModeKind, isLegacyExtractedModeId, mapJcodeEvent, mapMastraEvent, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
+//# sourceMappingURL=chunk-774L5IO5.mjs.map
+//# sourceMappingURL=chunk-774L5IO5.mjs.map