@ycodium-ai/agent-claude 0.2.3064 → 0.2.3072

package/dist/index.js

@@ -22173,16 +22173,16 @@ function tokenizeShellWords(value) {
   if (!input) return [];
   const tokens = [];
   let current = "";
-  let quote;
+  let quote2;
   let quoted = false;
   for (let index = 0; index < input.length; index++) {
     const char = input[index];
     if (char === void 0) continue;
-    if (quote) {
-      if (char === quote) {
-        quote = void 0;
+    if (quote2) {
+      if (char === quote2) {
+        quote2 = void 0;
         quoted = true;
-      } else if (char === "\\" && quote === '"') {
+      } else if (char === "\\" && quote2 === '"') {
         const next = input[index + 1];
         if (next !== void 0 && ['"', "\\", "$", "`"].includes(next)) {
           current += next;
@@ -22196,7 +22196,7 @@ function tokenizeShellWords(value) {
       continue;
     }
     if (char === "'" || char === '"') {
-      quote = char;
+      quote2 = char;
       quoted = true;
     } else if (/\s/.test(char)) {
       if (current || quoted) {
@@ -23532,6 +23532,7 @@ var makeSessionLifecycle = (deps) => {
         await completeTurn(context, "interrupted", "Session stopped.");
       }
       if (closeFailure) throw closeFailure;
+      context.cliProcess.clear();
       context.promptQueue.terminate();
       const streamFiber = context.streamFiber;
       context.streamFiber = void 0;
@@ -23650,6 +23651,106 @@ var makeSessionLifecycle = (deps) => {
   };
 };
 
+// src/claudeProcess.ts
+import * as NodeEvents from "node:events";
+import * as NodeStream from "node:stream";
+import { adoptChildStdin, nodeWritableFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
+var asError = (cause) => cause instanceof Error ? cause : new Error(String(cause));
+var ClaudeProcess = class extends NodeEvents.EventEmitter {
+  stdin;
+  stdout;
+  killed = false;
+  exitCode = null;
+  handle;
+  ended = false;
+  constructor(host, options, stderr) {
+    super();
+    const env2 = {
+      ...Object.fromEntries(Object.keys(process.env).map((key) => [key, void 0])),
+      ...options.env
+    };
+    const ready = host.process.spawn({
+      program: options.command,
+      args: options.args,
+      ...options.cwd === void 0 ? {} : { cwd: options.cwd },
+      env: env2,
+      owner: { bindingId: host.bindingId }
+    });
+    this.stdin = nodeWritableFromHandle({
+      writeStdin: (chunk) => ready.then((handle) => handle.writeStdin(chunk)),
+      closeStdin: () => ready.then((handle) => handle.closeStdin())
+    });
+    this.stdout = NodeStream.Readable.from(
+      (async function* () {
+        const handle = await ready.catch(() => void 0);
+        if (handle) yield* handle.stdout;
+      })(),
+      { objectMode: false }
+    );
+    adoptChildStdin(this.stdin, {
+      onError: (error) => {
+        this.emit("error", error);
+      }
+    });
+    this.stdout.on("error", (error) => this.emit("error", error));
+    this.requestKill = (signal) => {
+      void ready.then((handle) => this.ended ? void 0 : handle.kill(signal)).catch((cause) => this.emit("error", asError(cause)));
+    };
+    const abort = () => {
+      this.kill("SIGTERM");
+    };
+    options.signal.addEventListener("abort", abort, { once: true });
+    if (options.signal.aborted) abort();
+    void ready.then(async (handle) => {
+      this.handle = handle;
+      const drainStderr = (async () => {
+        const decoder = new TextDecoder();
+        for await (const chunk of handle.stderr) stderr(decoder.decode(chunk, { stream: true }));
+        const tail = decoder.decode();
+        if (tail) stderr(tail);
+      })();
+      void drainStderr.catch((cause) => this.emit("error", asError(cause)));
+      try {
+        const code = await handle.exited;
+        this.ended = true;
+        this.handle = void 0;
+        this.exitCode = code;
+        this.emit("exit", code, null);
+      } finally {
+        options.signal.removeEventListener("abort", abort);
+      }
+    }).catch((cause) => {
+      this.ended = true;
+      this.handle = void 0;
+      options.signal.removeEventListener("abort", abort);
+      this.emit("error", asError(cause));
+    });
+  }
+  requestKill;
+  kill(signal) {
+    if (this.ended || signal !== "SIGTERM" && signal !== "SIGKILL") return false;
+    this.killed = true;
+    this.requestKill(signal);
+    return true;
+  }
+};
+function makeClaudeProcessSpawner(host, stderr) {
+  let process2;
+  let launch;
+  return {
+    spawn: (options) => {
+      launch = options;
+      process2 = new ClaudeProcess(host, options, stderr);
+      return process2;
+    },
+    current: () => process2?.handle && launch ? { handle: process2.handle, command: launch.command, args: launch.args } : void 0,
+    clear: () => {
+      process2 = void 0;
+      launch = void 0;
+    }
+  };
+}
+
 // src/readOnlyDirectories.ts
 var GLOB_METACHARACTERS = /[*?[\]{}]/;
 function toClaudeAbsolutePath(directory) {
@@ -23832,7 +23933,9 @@ var makeStartSession = (deps) => {
       querySettings.permissions = { allow: [...readAllowRules] };
     }
     const stderrTail = createOutputTail(CLAUDE_STDERR_TAIL_CHARS);
+    const cliProcess = makeClaudeProcessSpawner(deps.host, stderrTail.append);
     const queryOptions = {
+      spawnClaudeCodeProcess: cliProcess.spawn,
       ...input.cwd ? { cwd: input.cwd } : {},
       ...apiModelId ? { model: apiModelId } : {},
       pathToClaudeCodeExecutable: claudeSdkExecutablePath,
@@ -23847,7 +23950,6 @@ var makeStartSession = (deps) => {
       ...existingResumeSessionId ? { resume: existingResumeSessionId } : {},
       ...newSessionId ? { sessionId: newSessionId } : {},
       includePartialMessages: true,
-      stderr: stderrTail.append,
       canUseTool,
       onUserDialog,
       hooks: {
@@ -23878,6 +23980,7 @@ var makeStartSession = (deps) => {
         options: queryOptions
       });
     } catch (cause) {
+      cliProcess.clear();
       throw new Error("Failed to start Claude runtime session.", { cause });
     }
     const session = {
@@ -23906,6 +24009,7 @@ var makeStartSession = (deps) => {
       },
       promptQueue,
       query: queryRuntime,
+      cliProcess,
       stderrTail,
       streamFiber: void 0,
       startedAt,
@@ -23925,6 +24029,7 @@ var makeStartSession = (deps) => {
       pendingUserInputs,
       turns: [],
       inFlightTools,
+      openBashTools: /* @__PURE__ */ new Map(),
       claudeTasks,
       taskAgents,
       pendingTaskModels,
@@ -24107,6 +24212,7 @@ var makeStreamEventHandler = (deps) => {
         };
         const nextFingerprint = parsedInput && Object.keys(parsedInput).length > 0 ? toolInputFingerprint(parsedInput) : void 0;
         context.inFlightTools.set(event.index, nextTool);
+        if (nextTool.toolName === "Bash") context.openBashTools.set(nextTool.itemId, nextTool);
         if (!parsedInput || !nextFingerprint || tool.lastEmittedInputFingerprint === nextFingerprint) {
           return;
         }
@@ -24183,7 +24289,9 @@ var makeStreamEventHandler = (deps) => {
       const inputFingerprint = Object.keys(toolInput).length > 0 ? toolInputFingerprint(toolInput) : void 0;
       const parentToolUseId = message.parent_tool_use_id ?? void 0;
       const owningAgentId = agentIdForParentToolUse(context.taskAgents, parentToolUseId);
+      const stamp = await makeEventStamp();
       const tool = {
+        startedAtMs: Date.parse(stamp.createdAt),
         itemId,
         itemType,
         toolName,
@@ -24196,7 +24304,7 @@ var makeStreamEventHandler = (deps) => {
         ...parentToolUseId ? { parentToolUseId } : {}
       };
       context.inFlightTools.set(index, tool);
-      const stamp = await makeEventStamp();
+      if (toolName === "Bash") context.openBashTools.set(itemId, tool);
       offerRuntimeEvent(context, {
         type: "item.started",
         ...eventHeader(context, stamp),
@@ -25079,6 +25187,7 @@ var makeTurnLifecycle = (deps) => {
       context.inFlightTools.delete(index);
     }
     context.inFlightTools.clear();
+    context.openBashTools.clear();
     for (const block of turnState.assistantTextBlockOrder) {
       await completeAssistantTextBlock(context, block, {
         force: true,
@@ -25149,6 +25258,7 @@ var makeTurnMessageHandlers = (deps) => {
       return;
     }
     for (const toolResult of toolResultBlocksFromUserMessage(message)) {
+      context.openBashTools.delete(toolResult.toolUseId);
       const toolEntry = Array.from(context.inFlightTools.entries()).find(
         ([, tool2]) => tool2.itemId === toolResult.toolUseId
       );
@@ -27594,6 +27704,54 @@ var createClaudeUsage = (input) => {
   };
 };
 
+// src/openCommands.ts
+import { sameArgv } from "@ycodium-ai/plugin-api/executor";
+var quote = (command) => "'" + command.replaceAll("'", `'"'"'`) + "'";
+var basename = (path) => path.split(/[\\/]/).at(-1)?.toLowerCase() ?? "";
+function claudeCommandMatches(command, argv) {
+  if (argv.length !== 3 || !["bash.exe", "bash"].includes(basename(argv[0] ?? "")) || argv[1] !== "-c")
+    return false;
+  const script = argv[2] ?? "";
+  const source = /^source \S+\/shell-snapshots\/snapshot-bash-\d+-[a-zA-Z0-9]+\.sh /;
+  const prefix = source.exec(script);
+  if (!prefix) return false;
+  const body = script.slice(prefix[0].length);
+  if (!body.startsWith("2>/dev/null || true && ")) return false;
+  const evalPrefix = " && eval ";
+  const marker = evalPrefix + quote(command) + " < /dev/null && pwd -P >| ";
+  const index = body.indexOf(marker);
+  if (index < 0 || body.indexOf(evalPrefix) !== index || body.indexOf(evalPrefix, index + evalPrefix.length) !== -1)
+    return false;
+  return /^\S+\/claude-[a-fA-F0-9]{4}-cwd$/.test(body.slice(index + marker.length));
+}
+function openCommandsOf(context) {
+  if (!context || context.stopped || !context.turnState) return void 0;
+  const current = context.cliProcess.current();
+  if (!current) return void 0;
+  const commands = [...context.openBashTools.values()].flatMap((tool) => {
+    const command = tool.input.command;
+    return typeof command !== "string" || tool.input.run_in_background === true ? [] : [
+      {
+        toolCallId: tool.itemId,
+        startedAtMs: tool.startedAtMs,
+        matches: (argv, _platform) => claudeCommandMatches(command, argv)
+      }
+    ];
+  });
+  if (commands.length === 0) return void 0;
+  return {
+    rootPid: current.handle.pid,
+    sessionProcess: (argv, platform2) => {
+      const normalize2 = (value) => platform2 === "win32" ? value.replaceAll("\\", "/").toLowerCase() : value;
+      const expected = normalize2(current.command);
+      const actual = normalize2(argv[0] ?? "");
+      const sameProgram = expected.includes("/") ? actual === expected : platform2 === "win32" ? basename(actual).replace(/\.exe$/, "") === expected.replace(/\.exe$/, "") : actual.split("/").at(-1) === expected;
+      return sameProgram && sameArgv(argv.slice(1), current.args);
+    },
+    commands
+  };
+}
+
 // src/claudeInstance.ts
 function createClaudeAdapter(recipe, host, options) {
   const boundInstanceId = options?.instanceId ?? host.instanceId ?? "claudeAgent";
@@ -27709,6 +27867,7 @@ function createClaudeAdapter(recipe, host, options) {
     emitProposedPlanCompleted
   });
   const { startSession } = makeStartSession({
+    host,
     emitter,
     recipe,
     log: options?.log ?? host.log,
@@ -27768,6 +27927,7 @@ function createClaudeAdapter(recipe, host, options) {
     setRuntimeMode,
     setNativeMode,
     stopSession,
+    openCommandProcesses: async (threadId) => openCommandsOf(sessions.get(threadId)),
     events: runtimeEventQueue,
     dispose: async () => {
       const results = await Promise.allSettled(
@@ -27818,6 +27978,7 @@ function createClaudeInstance(config, host, attachments, overrides, usageCache)
     setNativeMode: adapter.setNativeMode,
     compactContext: adapter.compactContext,
     stopSession: adapter.stopSession,
+    openCommandProcesses: adapter.openCommandProcesses,
     readThread: adapter.readThread,
     events: adapter.events,
     dispose: adapter.dispose,
@@ -27885,7 +28046,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 11,
+  apiVersion: 12,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3064",
+  "version": "0.2.3072",
   "description": "Claude executor: Claude Code CLI via @anthropic-ai/claude-agent-sdk.",
   "keywords": [
     "ycodium",
@@ -24,10 +24,10 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
+    "@ycodium-ai/plugin-api": "0.2.3072",
     "ycodium-composer-tokens": "0.0.0",
-    "ycodium-executor-testing": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.3064",
-    "ycodium-jsonl-stream": "0.0.0"
+    "ycodium-jsonl-stream": "0.0.0",
+    "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",