claude-code-controller 0.5.0 → 0.6.0

package/dist/api/index.d.cts

@@ -1,5 +1,5 @@
 import { Hono } from 'hono';
-import { C as ClaudeCodeController, j as PermissionPreset, E as TaskStatus, a as LogLevel, d as AgentType } from '../claude-CSXlMCvP.cjs';
+import { C as ClaudeCodeController, k as PermissionPreset, F as TaskStatus, b as LogLevel, e as AgentType } from '../claude-B7-oBjuE.cjs';
 import 'node:events';
 
 interface PendingApproval {

package/dist/api/index.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from 'hono';
-import { C as ClaudeCodeController, j as PermissionPreset, E as TaskStatus, a as LogLevel, d as AgentType } from '../claude-CSXlMCvP.js';
+import { C as ClaudeCodeController, k as PermissionPreset, F as TaskStatus, b as LogLevel, e as AgentType } from '../claude-B7-oBjuE.js';
 import 'node:events';
 
 interface PendingApproval {

package/dist/api/index.js

@@ -106,9 +106,11 @@ var ActionTracker = class {
 import { Hono } from "hono";
 
 // src/controller.ts
-import { EventEmitter } from "events";
+import { EventEmitter as EventEmitter2 } from "events";
 import { execSync as execSync2 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
+import { mkdirSync as mkdirSync2, existsSync as existsSync5, writeFileSync as writeFileSync2, readFileSync as readFileSync2 } from "fs";
+import { join as join3 } from "path";
 
 // src/team-manager.ts
 import { readFile, writeFile, mkdir, rm } from "fs/promises";
@@ -441,6 +443,8 @@ if pid == 0:
 else:
     signal.signal(signal.SIGTERM, lambda *a: (os.kill(pid, signal.SIGTERM), sys.exit(0)))
     signal.signal(signal.SIGINT, lambda *a: (os.kill(pid, signal.SIGTERM), sys.exit(0)))
+    buf = b""
+    trust_sent = False
     try:
         while True:
             r, _, _ = select.select([fd, 0], [], [], 1.0)
@@ -450,6 +454,12 @@ else:
                     if not data:
                         break
                     os.write(1, data)
+                    if not trust_sent:
+                        buf += data
+                        if b"Yes" in buf and b"trust" in buf:
+                            os.write(fd, b"\\r")
+                            trust_sent = True
+                            buf = b""
                 except OSError:
                     break
             if 0 in r:
@@ -789,6 +799,135 @@ function createLogger(level = "info") {
   };
 }
 
+// src/statusline-capture.ts
+import { EventEmitter } from "events";
+import { watch, existsSync as existsSync4, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { join as join2 } from "path";
+function statusLineDir(teamName) {
+  return join2(teamDir(teamName), "statusline");
+}
+function statusLineLogPath(teamName, agentName) {
+  return join2(statusLineDir(teamName), `${agentName}.jsonl`);
+}
+function buildStatusLineCommand(logFilePath) {
+  const escapedPath = logFilePath.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+  return [
+    "python3 -c",
+    `'import sys,json;`,
+    `d=json.load(sys.stdin);`,
+    `open("${escapedPath}","a").write(json.dumps(d)+"\\n");`,
+    `print(d.get("model",{}).get("display_name",""))'`
+  ].join(" ");
+}
+function buildStatusLineSettings(logFilePath) {
+  return {
+    statusLine: {
+      type: "command",
+      command: buildStatusLineCommand(logFilePath)
+    }
+  };
+}
+var StatusLineWatcher = class extends EventEmitter {
+  teamName;
+  log;
+  watchers = /* @__PURE__ */ new Map();
+  fileOffsets = /* @__PURE__ */ new Map();
+  stopped = false;
+  constructor(teamName, logger) {
+    super();
+    this.teamName = teamName;
+    this.log = logger;
+  }
+  /**
+   * Ensure the statusline directory exists.
+   */
+  ensureDir() {
+    const dir = statusLineDir(this.teamName);
+    if (!existsSync4(dir)) {
+      mkdirSync(dir, { recursive: true });
+    }
+  }
+  /**
+   * Start watching a specific agent's statusLine log file.
+   */
+  watchAgent(agentName) {
+    if (this.stopped) return;
+    const filePath = statusLineLogPath(this.teamName, agentName);
+    if (!existsSync4(filePath)) {
+      writeFileSync(filePath, "");
+    }
+    try {
+      const stats = readFileSync(filePath);
+      this.fileOffsets.set(filePath, stats.length);
+    } catch {
+      this.fileOffsets.set(filePath, 0);
+    }
+    try {
+      const watcher = watch(filePath, (eventType) => {
+        if (eventType === "change") {
+          this.readNewLines(agentName, filePath);
+        }
+      });
+      this.watchers.set(agentName, watcher);
+      this.log.debug(`Watching statusLine for agent "${agentName}" at ${filePath}`);
+    } catch (err) {
+      this.log.error(`Failed to watch statusLine for "${agentName}": ${err}`);
+    }
+  }
+  /**
+   * Stop watching a specific agent.
+   */
+  unwatchAgent(agentName) {
+    const watcher = this.watchers.get(agentName);
+    if (watcher) {
+      watcher.close();
+      this.watchers.delete(agentName);
+    }
+    const filePath = statusLineLogPath(this.teamName, agentName);
+    this.fileOffsets.delete(filePath);
+  }
+  /**
+   * Stop all watchers.
+   */
+  stop() {
+    this.stopped = true;
+    for (const [, watcher] of this.watchers) {
+      watcher.close();
+    }
+    this.watchers.clear();
+    this.fileOffsets.clear();
+  }
+  /**
+   * Read new lines appended to the log file since last read.
+   */
+  readNewLines(agentName, filePath) {
+    try {
+      const content = readFileSync(filePath, "utf-8");
+      const offset = this.fileOffsets.get(filePath) ?? 0;
+      const newContent = content.slice(offset);
+      this.fileOffsets.set(filePath, content.length);
+      if (!newContent.trim()) return;
+      const lines = newContent.trim().split("\n");
+      for (const line of lines) {
+        if (!line.trim()) continue;
+        try {
+          const data = JSON.parse(line);
+          const event = {
+            agentName,
+            data,
+            timestamp: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          this.emit("update", event);
+        } catch (parseErr) {
+          this.log.debug(`Failed to parse statusLine JSON: ${line}`);
+        }
+      }
+    } catch (err) {
+      this.log.debug(`Error reading statusLine file: ${err}`);
+    }
+  }
+};
+
 // src/controller.ts
 var PROTOCOL_ONLY_TYPES = /* @__PURE__ */ new Set([
   "shutdown_approved",
@@ -808,12 +947,13 @@ var AGENT_COLORS = [
   "#FF69B4",
   "#7B68EE"
 ];
-var ClaudeCodeController = class extends EventEmitter {
+var ClaudeCodeController = class extends EventEmitter2 {
   teamName;
   team;
   tasks;
   processes;
   poller;
+  statusLineWatcher;
   log;
   cwd;
   claudeBinary;
@@ -835,7 +975,11 @@ var ClaudeCodeController = class extends EventEmitter {
       "controller",
       this.log
     );
+    this.statusLineWatcher = new StatusLineWatcher(this.teamName, this.log);
     this.poller.onMessages((events) => this.handlePollEvents(events));
+    this.statusLineWatcher.on("update", (event) => {
+      this.emit("agent:statusline", event.agentName, event.data);
+    });
   }
   // ─── Lifecycle ───────────────────────────────────────────────────────
   /**
@@ -846,6 +990,7 @@ var ClaudeCodeController = class extends EventEmitter {
     if (this.initialized) return this;
     await this.team.create({ cwd: this.cwd });
     await this.tasks.init();
+    this.statusLineWatcher.ensureDir();
     this.poller.start();
     this.initialized = true;
     this.log.info(
@@ -886,6 +1031,7 @@ var ClaudeCodeController = class extends EventEmitter {
     }
     await this.processes.killAll();
     this.poller.stop();
+    this.statusLineWatcher.stop();
     await this.team.destroy();
     this.initialized = false;
     this.log.info("Controller shut down");
@@ -914,6 +1060,8 @@ var ClaudeCodeController = class extends EventEmitter {
       subscriptions: []
     };
     await this.team.addMember(member);
+    this.ensureWorkspaceTrusted(cwd, opts.name);
+    this.statusLineWatcher.watchAgent(opts.name);
     const env = Object.keys(this.defaultEnv).length > 0 || opts.env ? { ...this.defaultEnv, ...opts.env } : void 0;
     const proc = this.processes.spawn({
       teamName: this.teamName,
@@ -1120,6 +1268,7 @@ var ClaudeCodeController = class extends EventEmitter {
    * Kill a specific agent.
    */
   async killAgent(name) {
+    this.statusLineWatcher.unwatchAgent(name);
     await this.processes.kill(name);
     await this.team.removeMember(name);
   }
@@ -1181,6 +1330,32 @@ var ClaudeCodeController = class extends EventEmitter {
       }
     }
   }
+  /**
+   * Ensure the agent's cwd has a .claude/settings.local.json so the
+   * CLI skips the interactive workspace trust prompt.
+   * Also injects statusLine capture configuration.
+   */
+  ensureWorkspaceTrusted(cwd, agentName) {
+    const claudeDir = join3(cwd, ".claude");
+    const settingsPath = join3(claudeDir, "settings.local.json");
+    mkdirSync2(claudeDir, { recursive: true });
+    let settings = {};
+    if (existsSync5(settingsPath)) {
+      try {
+        settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
+      } catch {
+        settings = {};
+      }
+    }
+    if (agentName && !settings.statusLine) {
+      const logPath = statusLineLogPath(this.teamName, agentName);
+      const statusLineSettings = buildStatusLineSettings(logPath);
+      settings = { ...settings, ...statusLineSettings };
+      this.log.debug(`Injected statusLine capture for "${agentName}"`);
+    }
+    writeFileSync2(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+    this.log.debug(`Updated ${settingsPath}`);
+  }
   ensureInitialized() {
     if (!this.initialized) {
       throw new Error(
@@ -1194,7 +1369,7 @@ function sleep2(ms) {
 }
 
 // src/claude.ts
-import { EventEmitter as EventEmitter2 } from "events";
+import { EventEmitter as EventEmitter3 } from "events";
 import { randomUUID as randomUUID3 } from "crypto";
 Symbol.asyncDispose ??= /* @__PURE__ */ Symbol("Symbol.asyncDispose");
 function buildEnv(opts) {
@@ -1267,7 +1442,7 @@ function waitForReady(controller, agentName, timeoutMs = 15e3) {
     controller.on("agent:exited", onExit);
   });
 }
-var Agent = class _Agent extends EventEmitter2 {
+var Agent = class _Agent extends EventEmitter3 {
   controller;
   handle;
   ownsController;
@@ -1360,14 +1535,22 @@ var Agent = class _Agent extends EventEmitter2 {
     this.ensureNotDisposed();
     const timeout = opts?.timeout ?? 12e4;
     const responsePromise = new Promise((resolve, reject) => {
+      let gotMessage = false;
       const timer = setTimeout(() => {
         cleanup();
         reject(new Error(`Timeout (${timeout}ms) waiting for response`));
       }, timeout);
       const onMsg = (text) => {
+        gotMessage = true;
         cleanup();
         resolve(text);
       };
+      const onIdle = () => {
+        if (!gotMessage) {
+          cleanup();
+          resolve("");
+        }
+      };
       const onExit = (code) => {
         cleanup();
         reject(new Error(`Agent exited (code=${code}) before responding`));
@@ -1375,9 +1558,11 @@ var Agent = class _Agent extends EventEmitter2 {
       const cleanup = () => {
         clearTimeout(timer);
         this.removeListener("message", onMsg);
+        this.removeListener("idle", onIdle);
         this.removeListener("exit", onExit);
       };
       this.on("message", onMsg);
+      this.on("idle", onIdle);
       this.on("exit", onExit);
     });
     const wrapped = `${question}
@@ -1396,14 +1581,22 @@ IMPORTANT: You MUST send your complete answer back using the SendMessage tool. D
     this.ensureNotDisposed();
     const timeout = opts?.timeout ?? 12e4;
     return new Promise((resolve, reject) => {
+      let gotMessage = false;
       const timer = setTimeout(() => {
         cleanup();
         reject(new Error(`Timeout (${timeout}ms) waiting for response`));
       }, timeout);
       const onMsg = (text) => {
+        gotMessage = true;
         cleanup();
         resolve(text);
       };
+      const onIdle = () => {
+        if (!gotMessage) {
+          cleanup();
+          resolve("");
+        }
+      };
       const onExit = (code) => {
         cleanup();
         reject(new Error(`Agent exited (code=${code}) before responding`));
@@ -1411,9 +1604,11 @@ IMPORTANT: You MUST send your complete answer back using the SendMessage tool. D
       const cleanup = () => {
         clearTimeout(timer);
         this.removeListener("message", onMsg);
+        this.removeListener("idle", onIdle);
         this.removeListener("exit", onExit);
       };
       this.on("message", onMsg);
+      this.on("idle", onIdle);
       this.on("exit", onExit);
     });
   }
@@ -1447,6 +1642,9 @@ IMPORTANT: You MUST send your complete answer back using the SendMessage tool. D
     const onIdle = (name, _details) => {
       if (name === agentName) this.emit("idle");
     };
+    const onStatusLine = (name, data) => {
+      if (name === agentName) this.emit("statusline", data);
+    };
     const onPermission = (name, parsed) => {
       if (name !== agentName) return;
       let handled = false;
@@ -1495,6 +1693,7 @@ IMPORTANT: You MUST send your complete answer back using the SendMessage tool. D
     };
     this.controller.on("message", onMessage);
     this.controller.on("idle", onIdle);
+    this.controller.on("agent:statusline", onStatusLine);
     this.controller.on("permission:request", onPermission);
     this.controller.on("plan:approval_request", onPlan);
     this.controller.on("agent:exited", onExit);
@@ -1502,6 +1701,7 @@ IMPORTANT: You MUST send your complete answer back using the SendMessage tool. D
     this.boundListeners = [
       { event: "message", fn: onMessage },
       { event: "idle", fn: onIdle },
+      { event: "agent:statusline", fn: onStatusLine },
       { event: "permission:request", fn: onPermission },
       { event: "plan:approval_request", fn: onPlan },
       { event: "agent:exited", fn: onExit },