codeam-cli 2.27.16 → 2.28.0

package/dist/index.js

@@ -498,7 +498,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.27.16",
+  version: "2.28.0",
   description: "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device \u2014 async. The terminal companion for CodeAgent Mobile.",
   type: "commonjs",
   main: "dist/index.js",
@@ -573,6 +573,7 @@ var package_default = {
     "@agentclientprotocol/sdk": "^0.25.0",
     "@clack/prompts": "^1.2.0",
     chokidar: "^3.6.0",
+    ignore: "^5.3.2",
     picocolors: "^1.1.0",
     "qrcode-terminal": "^0.12.0",
     which: "^5.0.0",
@@ -712,6 +713,20 @@ async function requestCode(pluginId) {
     return null;
   }
 }
+async function fetchCurrentPluginAuthToken(sessionId, pluginId) {
+  try {
+    const result = await _transport.postJson(
+      `${API_BASE}/api/pairing/reconnect`,
+      { sessionId, pluginId }
+    );
+    const data = result?.data;
+    if (!data?.paired) return null;
+    const token = data.pluginAuthToken;
+    return typeof token === "string" && token.length > 0 ? token : null;
+  } catch {
+    return null;
+  }
+}
 function pollStatus(pluginId, onPaired, onTimeout) {
   let stopped = false;
   let pollTimer = null;
@@ -5873,7 +5888,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.27.16" : "0.0.0-dev",
+    cliVersion: true ? "2.28.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -14973,9 +14988,10 @@ var AcpPublisher = class {
         this.envelope(body)
       );
       if (statusCode < 200 || statusCode >= 300) {
+        const tok = this.opts.pluginAuthToken;
         log.warn(
           "acpPublisher",
-          `output type=${String(body.type)} done=${body.done === true} status=${statusCode} body=${resBody.slice(0, 200)}`
+          `output type=${String(body.type)} done=${body.done === true} status=${statusCode} body=${resBody.slice(0, 200)} | sentSessionId=${this.opts.sessionId} sentPluginId=${this.opts.pluginId} tokenLen=${tok.length} tokenHead=${tok.slice(0, 12)} tokenTail=${tok.slice(-8)}`
         );
       }
     } catch (err) {
@@ -15113,122 +15129,391 @@ var AcpPublisher = class {
   }
 };
 
-// src/agents/acp/mappers.ts
-var import_node_crypto5 = require("crypto");
-function mapSessionUpdate(notification) {
-  const update = notification.update;
-  switch (update.sessionUpdate) {
-    case "agent_message_chunk": {
-      const text = extractText2(update.content);
-      if (!text) return [];
-      return [{ chunkId: messageChunkId(update.messageId), kind: "text", delta: text }];
-    }
-    case "agent_thought_chunk": {
-      const text = extractText2(update.content);
-      if (!text) return [];
-      return [{ chunkId: messageChunkId(update.messageId), kind: "thinking", delta: text }];
-    }
-    case "tool_call": {
-      const summary = describeToolCall(update);
-      if (!summary) return [];
-      return [{ chunkId: update.toolCallId, kind: "tool_use", delta: summary }];
-    }
-    case "tool_call_update": {
-      if (update.status !== "completed" && update.status !== "failed") {
-        return [];
-      }
-      const body = describeToolCallUpdate(update);
-      if (!body) return [];
-      const prefix = update.status === "failed" ? "[failed] " : "";
-      return [{ chunkId: update.toolCallId, kind: "tool_result", delta: prefix + body }];
+// src/services/terminal-ops.service.ts
+var import_child_process8 = require("child_process");
+var import_crypto2 = require("crypto");
+var import_path3 = __toESM(require("path"));
+var MAX_CONCURRENT_SESSIONS = 4;
+var nodePtyModule;
+function loadNodePty2() {
+  if (nodePtyModule !== void 0) return nodePtyModule;
+  const vendoredPath = import_path3.default.join(__dirname, "vendor", "node-pty");
+  try {
+    nodePtyModule = require(vendoredPath);
+    return nodePtyModule;
+  } catch {
+    try {
+      nodePtyModule = require("node-pty");
+      return nodePtyModule;
+    } catch {
+      nodePtyModule = null;
+      return nodePtyModule;
     }
-    case "user_message_chunk":
-      return [];
-    case "plan":
-    case "plan_update":
-    case "plan_removed":
-    case "available_commands_update":
-    case "current_mode_update":
-    case "config_option_update":
-    case "session_info_update":
-    case "usage_update":
-      return [];
-    default:
-      return [];
-  }
-}
-function mapPermissionRequest(request) {
-  const prompt = describeToolCall(request.toolCall) ?? "The agent requested permission to continue.";
-  const optionIdByLabel = {};
-  const kindByLabel = {};
-  const labels = [];
-  for (const opt of request.options) {
-    const label = opt.name?.trim() || humanizeKind(opt.kind);
-    if (label in optionIdByLabel) continue;
-    optionIdByLabel[label] = opt.optionId;
-    kindByLabel[label] = opt.kind;
-    labels.push(label);
   }
-  return {
-    event: {
-      questionId: (0, import_node_crypto5.randomUUID)(),
-      prompt,
-      options: labels.length > 0 ? labels : void 0
-    },
-    optionIdByLabel,
-    kindByLabel
-  };
 }
-function messageChunkId(messageId) {
-  if (typeof messageId === "string" && messageId.length > 0) return messageId;
-  return (0, import_node_crypto5.randomUUID)();
+var sessions = /* @__PURE__ */ new Map();
+var onDataHandler = null;
+var onExitHandler = null;
+function registerTerminalHandlers(opts) {
+  onDataHandler = opts.onData;
+  onExitHandler = opts.onExit;
 }
-function extractText2(content) {
-  if (!content || typeof content !== "object") return null;
-  if ("type" in content && content.type === "text") {
-    const t2 = content.text;
-    return typeof t2 === "string" && t2.length > 0 ? t2 : null;
+function defaultShell() {
+  if (process.platform === "win32") {
+    return process.env.COMSPEC ?? "powershell.exe";
   }
-  return null;
+  return process.env.SHELL ?? "/bin/bash";
 }
-function describeToolCall(call) {
-  const title = call.title?.trim();
-  const kind = call.kind?.trim();
-  if (title && title.length > 0) return title;
-  if (kind && kind.length > 0) return kind;
-  if (call.rawInput && typeof call.rawInput === "object") {
+var PYTHON_TERMINAL_HELPER = `import os,pty,sys,select,signal,struct,fcntl,termios,errno,re
+m,s=pty.openpty()
+try:
+    cols=int(os.environ.get('COLUMNS','80'))
+    rows=int(os.environ.get('LINES','24'))
+    fcntl.ioctl(s,termios.TIOCSWINSZ,struct.pack('HHHH',rows,cols,0,0))
+except Exception:pass
+pid=os.fork()
+if pid==0:
+    os.close(m)
+    os.setsid()
+    try:fcntl.ioctl(s,termios.TIOCSCTTY,0)
+    except Exception:pass
+    for fd in[0,1,2]:os.dup2(s,fd)
+    if s>2:os.close(s)
+    os.execvp(sys.argv[1],sys.argv[1:])
+    sys.exit(127)
+os.close(s)
+done=[False]
+def onchld(n,f):
+    try:os.waitpid(pid,os.WNOHANG)
+    except Exception:pass
+    done[0]=True
+signal.signal(signal.SIGCHLD,onchld)
+signal.signal(signal.SIGHUP,signal.SIG_IGN)
+i=sys.stdin.fileno()
+o=sys.stdout.fileno()
+in_buf=b''
+resize_re=re.compile(rb'\\x00CW (\\d+) (\\d+)\\n')
+while not done[0]:
+    try:r,_,_=select.select([i,m],[],[],0.1)
+    except OSError as e:
+        if e.errno==errno.EINTR:continue
+        break
+    if i in r:
+        try:
+            d=os.read(i,4096)
+            if not d:break
+            in_buf+=d
+            while True:
+                mo=resize_re.search(in_buf)
+                if not mo:break
+                try:
+                    rows=int(mo.group(1));cols=int(mo.group(2))
+                    fcntl.ioctl(m,termios.TIOCSWINSZ,struct.pack('HHHH',rows,cols,0,0))
+                except Exception:pass
+                in_buf=in_buf[:mo.start()]+in_buf[mo.end():]
+            if in_buf:
+                # Don't forward a dangling NUL that might be the
+                # start of an incomplete resize marker \u2014 hold it
+                # until the next read so the regex matches.
+                nul=in_buf.rfind(b'\\x00')
+                if nul>=0 and len(in_buf)-nul<32:
+                    tail=in_buf[nul:];body=in_buf[:nul]
+                    if body:os.write(m,body)
+                    in_buf=tail
+                else:
+                    os.write(m,in_buf);in_buf=b''
+        except OSError:break
+    if m in r:
+        try:
+            d=os.read(m,4096)
+            if d:os.write(o,d)
+        except OSError:done[0]=True
+try:os.kill(pid,signal.SIGTERM)
+except Exception:pass
+try:
+    _,st=os.waitpid(pid,0)
+    sys.exit((st>>8)&0xFF)
+except Exception:sys.exit(0)
+`;
+function findPython3() {
+  for (const name of ["python3", "python"]) {
     try {
-      const summary = JSON.stringify(call.rawInput);
-      if (summary.length > 240) return `${summary.slice(0, 240)}\u2026`;
-      return summary;
+      const out2 = require("child_process").spawnSync("which", [name], { encoding: "utf8" });
+      if (out2.status === 0 && out2.stdout?.trim()) return out2.stdout.trim();
     } catch {
-      return null;
     }
   }
   return null;
 }
-function describeToolCallUpdate(update) {
-  const parts = [];
-  if (Array.isArray(update.content)) {
-    for (const item of update.content) {
-      if (!item || typeof item !== "object") continue;
-      if (item.type === "content" && item.content) {
-        const text = extractText2(item.content);
-        if (text) parts.push(text);
-      } else if (item.type === "diff") {
-        const p2 = item.path;
-        parts.push(p2 ? `diff: ${p2}` : "diff");
-      } else if (item.type === "terminal") {
-        const id = item.terminalId;
-        parts.push(id ? `terminal: ${id}` : "terminal");
+function createPythonSession(id, shell, cwd, env, cols, rows) {
+  const python = findPython3();
+  if (!python) {
+    return { error: "python3 not found on PATH \u2014 required for terminal sessions on Linux/macOS without node-pty." };
+  }
+  log.trace("terminal", `python helper spawn python=${python} shell=${shell} cwd=${cwd}`);
+  let child;
+  try {
+    child = (0, import_child_process8.spawn)(python, ["-c", PYTHON_TERMINAL_HELPER, shell], {
+      cwd,
+      env: { ...env, COLUMNS: String(cols), LINES: String(rows) },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : "python spawn failed";
+    log.warn("terminal", `python helper spawn failed: ${msg}`);
+    return { error: msg };
+  }
+  child.stdout.on("data", (buf) => {
+    onDataHandler?.({ sessionId: id, data: buf.toString("utf8") });
+  });
+  child.stderr.on("data", (buf) => {
+    onDataHandler?.({ sessionId: id, data: buf.toString("utf8") });
+  });
+  child.on("exit", (code) => {
+    onExitHandler?.({ sessionId: id, exitCode: code ?? 0 });
+    sessions.delete(id);
+  });
+  return {
+    id,
+    write(data) {
+      try {
+        child.stdin.write(data);
+      } catch {
+      }
+    },
+    resize(cs, rs) {
+      try {
+        child.stdin.write(`\0CW ${rs} ${cs}
+`);
+      } catch {
+      }
+    },
+    kill() {
+      try {
+        child.kill("SIGTERM");
+      } catch {
       }
     }
-  }
-  if (parts.length > 0) return parts.join("\n");
-  const title = update.title?.trim();
-  return title && title.length > 0 ? title : null;
+  };
 }
-function humanizeKind(kind) {
+function openTerminal(opts) {
+  if (sessions.size >= MAX_CONCURRENT_SESSIONS) {
+    return { error: `Too many open terminals (max ${MAX_CONCURRENT_SESSIONS})` };
+  }
+  const shell = opts.shell ?? defaultShell();
+  const cwd = opts.cwd ?? process.cwd();
+  const env = {
+    ...process.env,
+    TERM: "xterm-256color",
+    COLORTERM: "truecolor",
+    FORCE_COLOR: "1"
+  };
+  const cols = Math.max(1, Math.min(opts.cols ?? 80, 500));
+  const rows = Math.max(1, Math.min(opts.rows ?? 24, 200));
+  const id = (0, import_crypto2.randomUUID)();
+  const ptyMod = loadNodePty2();
+  if (ptyMod) {
+    try {
+      log.trace("terminal", `node-pty spawn shell=${shell} cwd=${cwd} cols=${cols} rows=${rows}`);
+      const term = ptyMod.spawn(shell, [], {
+        name: "xterm-256color",
+        cols,
+        rows,
+        cwd,
+        env,
+        useConpty: process.platform === "win32" ? true : void 0
+      });
+      const dataListener = term.onData((data) => {
+        onDataHandler?.({ sessionId: id, data });
+      });
+      const exitListener = term.onExit(({ exitCode }) => {
+        onExitHandler?.({ sessionId: id, exitCode });
+        sessions.delete(id);
+      });
+      sessions.set(id, {
+        id,
+        write: (d3) => term.write(d3),
+        resize: (cs, rs) => term.resize(cs, rs),
+        kill: () => {
+          dataListener.dispose();
+          exitListener.dispose();
+          term.kill();
+        }
+      });
+      return { sessionId: id };
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : "spawn failed";
+      log.warn("terminal", `node-pty spawn failed: ${msg} (falling back to Python helper on ${process.platform})`);
+      if (process.platform === "win32") {
+        return { error: msg };
+      }
+    }
+  } else {
+    log.warn("terminal", `node-pty unavailable on ${process.platform}-${process.arch}; falling back to Python helper`);
+    if (process.platform === "win32") {
+      return {
+        error: `node-pty native module unavailable on ${process.platform}-${process.arch}; terminal feature disabled for this platform`
+      };
+    }
+  }
+  const sess = createPythonSession(id, shell, cwd, env, cols, rows);
+  if ("error" in sess) {
+    log.warn("terminal", `createPythonSession failed: ${sess.error}`);
+    return { error: sess.error };
+  }
+  sessions.set(id, sess);
+  return { sessionId: id };
+}
+function writeTerminal(sessionId, data) {
+  const s = sessions.get(sessionId);
+  if (!s) return { ok: false, error: "No such session" };
+  try {
+    s.write(data);
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : "write failed" };
+  }
+}
+function resizeTerminal(sessionId, cols, rows) {
+  const s = sessions.get(sessionId);
+  if (!s) return { ok: false, error: "No such session" };
+  try {
+    s.resize?.(Math.max(1, Math.min(cols, 500)), Math.max(1, Math.min(rows, 200)));
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : "resize failed" };
+  }
+}
+function closeTerminal(sessionId) {
+  const s = sessions.get(sessionId);
+  if (!s) return { ok: true };
+  try {
+    s.kill();
+  } catch {
+  }
+  sessions.delete(sessionId);
+  return { ok: true };
+}
+function closeAllTerminals() {
+  for (const id of Array.from(sessions.keys())) closeTerminal(id);
+}
+
+// src/agents/acp/mappers.ts
+var import_node_crypto5 = require("crypto");
+function mapSessionUpdate(notification) {
+  const update = notification.update;
+  switch (update.sessionUpdate) {
+    case "agent_message_chunk": {
+      const text = extractText2(update.content);
+      if (!text) return [];
+      return [{ chunkId: messageChunkId(update.messageId), kind: "text", delta: text }];
+    }
+    case "agent_thought_chunk": {
+      const text = extractText2(update.content);
+      if (!text) return [];
+      return [{ chunkId: messageChunkId(update.messageId), kind: "thinking", delta: text }];
+    }
+    case "tool_call": {
+      const summary = describeToolCall(update);
+      if (!summary) return [];
+      return [{ chunkId: update.toolCallId, kind: "tool_use", delta: summary }];
+    }
+    case "tool_call_update": {
+      if (update.status !== "completed" && update.status !== "failed") {
+        return [];
+      }
+      const body = describeToolCallUpdate(update);
+      if (!body) return [];
+      const prefix = update.status === "failed" ? "[failed] " : "";
+      return [{ chunkId: update.toolCallId, kind: "tool_result", delta: prefix + body }];
+    }
+    case "user_message_chunk":
+      return [];
+    case "plan":
+    case "plan_update":
+    case "plan_removed":
+    case "available_commands_update":
+    case "current_mode_update":
+    case "config_option_update":
+    case "session_info_update":
+    case "usage_update":
+      return [];
+    default:
+      return [];
+  }
+}
+function mapPermissionRequest(request) {
+  const prompt = describeToolCall(request.toolCall) ?? "The agent requested permission to continue.";
+  const optionIdByLabel = {};
+  const kindByLabel = {};
+  const labels = [];
+  for (const opt of request.options) {
+    const label = opt.name?.trim() || humanizeKind(opt.kind);
+    if (label in optionIdByLabel) continue;
+    optionIdByLabel[label] = opt.optionId;
+    kindByLabel[label] = opt.kind;
+    labels.push(label);
+  }
+  return {
+    event: {
+      questionId: (0, import_node_crypto5.randomUUID)(),
+      prompt,
+      options: labels.length > 0 ? labels : void 0
+    },
+    optionIdByLabel,
+    kindByLabel
+  };
+}
+function messageChunkId(messageId) {
+  if (typeof messageId === "string" && messageId.length > 0) return messageId;
+  return (0, import_node_crypto5.randomUUID)();
+}
+function extractText2(content) {
+  if (!content || typeof content !== "object") return null;
+  if ("type" in content && content.type === "text") {
+    const t2 = content.text;
+    return typeof t2 === "string" && t2.length > 0 ? t2 : null;
+  }
+  return null;
+}
+function describeToolCall(call) {
+  const title = call.title?.trim();
+  const kind = call.kind?.trim();
+  if (title && title.length > 0) return title;
+  if (kind && kind.length > 0) return kind;
+  if (call.rawInput && typeof call.rawInput === "object") {
+    try {
+      const summary = JSON.stringify(call.rawInput);
+      if (summary.length > 240) return `${summary.slice(0, 240)}\u2026`;
+      return summary;
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+function describeToolCallUpdate(update) {
+  const parts = [];
+  if (Array.isArray(update.content)) {
+    for (const item of update.content) {
+      if (!item || typeof item !== "object") continue;
+      if (item.type === "content" && item.content) {
+        const text = extractText2(item.content);
+        if (text) parts.push(text);
+      } else if (item.type === "diff") {
+        const p2 = item.path;
+        parts.push(p2 ? `diff: ${p2}` : "diff");
+      } else if (item.type === "terminal") {
+        const id = item.terminalId;
+        parts.push(id ? `terminal: ${id}` : "terminal");
+      }
+    }
+  }
+  if (parts.length > 0) return parts.join("\n");
+  const title = update.title?.trim();
+  return title && title.length > 0 ? title : null;
+}
+function humanizeKind(kind) {
   switch (kind) {
     case "allow_once":
       return "Allow once";
@@ -15420,7 +15705,7 @@ function parsePayload2(schema, raw) {
 
 // src/services/file-ops.service.ts
 var fs22 = __toESM(require("fs/promises"));
-var path26 = __toESM(require("path"));
+var path27 = __toESM(require("path"));
 var MAX_FILE_BYTES = 5 * 1024 * 1024;
 var MAX_WALK_DEPTH = 6;
 var MAX_VISITED_DIRS = 5e3;
@@ -15455,8 +15740,8 @@ var SUBDIR_IGNORE = /* @__PURE__ */ new Set([
   "__pycache__"
 ]);
 function isUnder(parent, candidate) {
-  const rel = path26.relative(parent, candidate);
-  return rel === "" || !rel.startsWith("..") && !path26.isAbsolute(rel);
+  const rel = path27.relative(parent, candidate);
+  return rel === "" || !rel.startsWith("..") && !path27.isAbsolute(rel);
 }
 async function isExistingFile(absPath) {
   try {
@@ -15479,7 +15764,7 @@ async function walkForSuffix(dir, needleVariants, depth, ctx) {
   }
   for (const e of entries) {
     if (!e.isFile()) continue;
-    const full = path26.join(dir, e.name);
+    const full = path27.join(dir, e.name);
     if (needleVariants.some((needle) => full.endsWith(needle))) {
       ctx.matches.push(full);
       if (ctx.matches.length >= ctx.cap) return;
@@ -15489,21 +15774,21 @@ async function walkForSuffix(dir, needleVariants, depth, ctx) {
     if (!e.isDirectory()) continue;
     if (SUBDIR_IGNORE.has(e.name)) continue;
     if (e.name.startsWith(".") && SUBDIR_IGNORE.has(e.name)) continue;
-    await walkForSuffix(path26.join(dir, e.name), needleVariants, depth + 1, ctx);
+    await walkForSuffix(path27.join(dir, e.name), needleVariants, depth + 1, ctx);
     if (ctx.matches.length >= ctx.cap) return;
   }
 }
 async function findFile(rawPath) {
   const cwd = process.cwd();
-  if (path26.isAbsolute(rawPath)) {
-    const abs = path26.normalize(rawPath);
+  if (path27.isAbsolute(rawPath)) {
+    const abs = path27.normalize(rawPath);
     if (isUnder(cwd, abs) && await isExistingFile(abs)) return abs;
   }
-  const direct = path26.resolve(cwd, rawPath);
+  const direct = path27.resolve(cwd, rawPath);
   if (isUnder(cwd, direct) && await isExistingFile(direct)) return direct;
-  const normalized = path26.normalize(rawPath).replace(/^[./\\]+/, "");
+  const normalized = path27.normalize(rawPath).replace(/^[./\\]+/, "");
   const needles = [
-    `${path26.sep}${normalized}`,
+    `${path27.sep}${normalized}`,
     `/${normalized}`
   ].filter((v, i, a) => a.indexOf(v) === i);
   const ctx = { visited: 0, matches: [], cap: 16 };
@@ -15517,7 +15802,7 @@ async function findWriteTarget(rawPath) {
   const found = await findFile(rawPath);
   if (found) return found;
   const cwd = process.cwd();
-  const fallback = path26.isAbsolute(rawPath) ? path26.normalize(rawPath) : path26.resolve(cwd, rawPath);
+  const fallback = path27.isAbsolute(rawPath) ? path27.normalize(rawPath) : path27.resolve(cwd, rawPath);
   if (!isUnder(cwd, fallback)) return null;
   return fallback;
 }
@@ -15557,7 +15842,7 @@ async function writeProjectFile(rawPath, content) {
     if (Buffer.byteLength(content, "utf-8") > MAX_FILE_BYTES) {
       return { error: "Content too large." };
     }
-    await fs22.mkdir(path26.dirname(abs), { recursive: true });
+    await fs22.mkdir(path27.dirname(abs), { recursive: true });
     await fs22.writeFile(abs, content, "utf-8");
     return { ok: true };
   } catch (e) {
@@ -15567,11 +15852,11 @@ async function writeProjectFile(rawPath, content) {
 }
 
 // src/services/project-ops.service.ts
-var import_child_process8 = require("child_process");
+var import_child_process9 = require("child_process");
 var import_util2 = require("util");
 var fs23 = __toESM(require("fs/promises"));
-var path27 = __toESM(require("path"));
-var execFileP3 = (0, import_util2.promisify)(import_child_process8.execFile);
+var path28 = __toESM(require("path"));
+var execFileP3 = (0, import_util2.promisify)(import_child_process9.execFile);
 var PROJECT_IGNORE = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -15628,12 +15913,12 @@ async function listProjectFiles(opts = {}) {
         return;
       }
       if (PROJECT_IGNORE.has(e.name)) continue;
-      const full = path27.join(dir, e.name);
+      const full = path28.join(dir, e.name);
       if (e.isDirectory()) {
         if (depth >= 12) continue;
         await walk(full, depth + 1);
       } else if (e.isFile()) {
-        const rel = path27.relative(root, full);
+        const rel = path28.relative(root, full);
         if (q2 && !rel.toLowerCase().includes(q2) && !e.name.toLowerCase().includes(q2)) {
           continue;
         }
@@ -15741,7 +16026,7 @@ async function gitStatus(cwd) {
   let hasMergeInProgress = false;
   try {
     const gitDir = (await git(["rev-parse", "--git-dir"], root)).stdout.trim();
-    const mergeHead = path27.isAbsolute(gitDir) ? path27.join(gitDir, "MERGE_HEAD") : path27.join(root, gitDir, "MERGE_HEAD");
+    const mergeHead = path28.isAbsolute(gitDir) ? path28.join(gitDir, "MERGE_HEAD") : path28.join(root, gitDir, "MERGE_HEAD");
     await fs23.access(mergeHead);
     hasMergeInProgress = true;
   } catch {
@@ -15790,381 +16075,124 @@ async function gitCommit(message, files, cwd) {
     return { error: "Commit message is required." };
   }
   if (files && files.length > 0) {
-    const r2 = await git(["add", "--", ...files], cwd);
-    if (r2.code !== 0) return { error: `git add failed: ${r2.stderr.trim()}` };
-  } else {
-    const r2 = await git(["add", "-A"], cwd);
-    if (r2.code !== 0) return { error: `git add failed: ${r2.stderr.trim()}` };
-  }
-  const r = await git(["commit", "-m", message], cwd);
-  if (r.code !== 0) {
-    return { error: r.stderr.trim() || "git commit failed" };
-  }
-  const head = await git(["rev-parse", "HEAD"], cwd);
-  return { ok: true, commit: head.stdout.trim() };
-}
-async function gitPush(cwd) {
-  const r = await git(["push"], cwd);
-  if (r.code !== 0) return { error: r.stderr.trim() || "git push failed" };
-  return { ok: true, output: (r.stdout + r.stderr).trim() };
-}
-async function gitPull(cwd) {
-  const r = await git(["pull", "--ff-only"], cwd);
-  if (r.code !== 0) return { error: r.stderr.trim() || "git pull failed" };
-  return { ok: true, output: (r.stdout + r.stderr).trim() };
-}
-async function gitResolve(file, side, cwd) {
-  const r = await git(["checkout", `--${side}`, "--", file], cwd);
-  if (r.code !== 0) return { error: r.stderr.trim() || `git checkout --${side} failed` };
-  const add = await git(["add", "--", file], cwd);
-  if (add.code !== 0) return { error: add.stderr.trim() || "git add (resolve) failed" };
-  return { ok: true };
-}
-var MAX_SEARCH_HITS = 500;
-var MAX_SEARCH_BYTES = 256 * 1024;
-async function searchFiles(opts) {
-  const cwd = opts.cwd ?? process.cwd();
-  const cap = Math.min(opts.maxResults ?? MAX_SEARCH_HITS, MAX_SEARCH_HITS);
-  if (!opts.query.trim()) return { hits: [], total: 0, truncated: false };
-  const args2 = ["grep", "-n", "--column", "-I"];
-  if (!opts.caseSensitive) args2.push("-i");
-  if (opts.wholeWord) args2.push("-w");
-  if (opts.regex) args2.push("-E");
-  else args2.push("-F");
-  args2.push(opts.query);
-  if (opts.include && opts.include.length > 0) {
-    args2.push("--");
-    for (const p2 of opts.include) args2.push(p2);
-  } else if (opts.exclude && opts.exclude.length > 0) {
-    args2.push("--");
-    args2.push(".");
-  }
-  for (const p2 of opts.exclude ?? []) args2.push(`:!${p2}`);
-  const r = await git(args2, cwd);
-  if (r.code !== 0 && r.code !== 1) {
-    return jsSearchFiles(opts, cwd, cap);
-  }
-  const hits = [];
-  const lines = r.stdout.split("\n");
-  let truncated = false;
-  let byteBudget = MAX_SEARCH_BYTES;
-  for (const line of lines) {
-    if (!line) continue;
-    if (hits.length >= cap) {
-      truncated = true;
-      break;
-    }
-    if (byteBudget <= 0) {
-      truncated = true;
-      break;
-    }
-    byteBudget -= line.length;
-    const m = line.match(/^([^]+?):(\d+):(\d+):(.*)$/);
-    if (!m) continue;
-    const filePath = m[1] ?? "";
-    const lineNo = parseInt(m[2] ?? "0", 10);
-    const col = parseInt(m[3] ?? "1", 10);
-    const text = (m[4] ?? "").slice(0, 400);
-    if (!filePath) continue;
-    hits.push({
-      path: filePath,
-      line: lineNo,
-      column: col,
-      text,
-      matchLength: opts.query.length
-    });
-  }
-  return { hits, total: hits.length, truncated };
-}
-async function jsSearchFiles(opts, cwd, cap) {
-  const files = await listProjectFiles({ cwd, cap: 2e3 });
-  const hits = [];
-  const needle = opts.caseSensitive ? opts.query : opts.query.toLowerCase();
-  let truncated = files.truncated;
-  for (const f of files.files) {
-    if (hits.length >= cap) {
-      truncated = true;
-      break;
-    }
-    let content = "";
-    try {
-      content = await fs23.readFile(path27.join(cwd, f.path), "utf8");
-    } catch {
-      continue;
-    }
-    const lines = content.split("\n");
-    for (let i = 0; i < lines.length && hits.length < cap; i++) {
-      const line = lines[i] ?? "";
-      const hay = opts.caseSensitive ? line : line.toLowerCase();
-      const idx = hay.indexOf(needle);
-      if (idx === -1) continue;
-      hits.push({
-        path: f.path,
-        line: i + 1,
-        column: idx + 1,
-        text: line.slice(0, 400),
-        matchLength: opts.query.length
-      });
-    }
-  }
-  return { hits, total: hits.length, truncated };
-}
-
-// src/services/terminal-ops.service.ts
-var import_child_process9 = require("child_process");
-var import_crypto2 = require("crypto");
-var import_path3 = __toESM(require("path"));
-var MAX_CONCURRENT_SESSIONS = 4;
-var nodePtyModule;
-function loadNodePty2() {
-  if (nodePtyModule !== void 0) return nodePtyModule;
-  const vendoredPath = import_path3.default.join(__dirname, "vendor", "node-pty");
-  try {
-    nodePtyModule = require(vendoredPath);
-    return nodePtyModule;
-  } catch {
-    try {
-      nodePtyModule = require("node-pty");
-      return nodePtyModule;
-    } catch {
-      nodePtyModule = null;
-      return nodePtyModule;
-    }
-  }
-}
-var sessions = /* @__PURE__ */ new Map();
-var onDataHandler = null;
-var onExitHandler = null;
-function registerTerminalHandlers(opts) {
-  onDataHandler = opts.onData;
-  onExitHandler = opts.onExit;
-}
-function defaultShell() {
-  if (process.platform === "win32") {
-    return process.env.COMSPEC ?? "powershell.exe";
-  }
-  return process.env.SHELL ?? "/bin/bash";
-}
-var PYTHON_TERMINAL_HELPER = `import os,pty,sys,select,signal,struct,fcntl,termios,errno,re
-m,s=pty.openpty()
-try:
-    cols=int(os.environ.get('COLUMNS','80'))
-    rows=int(os.environ.get('LINES','24'))
-    fcntl.ioctl(s,termios.TIOCSWINSZ,struct.pack('HHHH',rows,cols,0,0))
-except Exception:pass
-pid=os.fork()
-if pid==0:
-    os.close(m)
-    os.setsid()
-    try:fcntl.ioctl(s,termios.TIOCSCTTY,0)
-    except Exception:pass
-    for fd in[0,1,2]:os.dup2(s,fd)
-    if s>2:os.close(s)
-    os.execvp(sys.argv[1],sys.argv[1:])
-    sys.exit(127)
-os.close(s)
-done=[False]
-def onchld(n,f):
-    try:os.waitpid(pid,os.WNOHANG)
-    except Exception:pass
-    done[0]=True
-signal.signal(signal.SIGCHLD,onchld)
-signal.signal(signal.SIGHUP,signal.SIG_IGN)
-i=sys.stdin.fileno()
-o=sys.stdout.fileno()
-in_buf=b''
-resize_re=re.compile(rb'\\x00CW (\\d+) (\\d+)\\n')
-while not done[0]:
-    try:r,_,_=select.select([i,m],[],[],0.1)
-    except OSError as e:
-        if e.errno==errno.EINTR:continue
-        break
-    if i in r:
-        try:
-            d=os.read(i,4096)
-            if not d:break
-            in_buf+=d
-            while True:
-                mo=resize_re.search(in_buf)
-                if not mo:break
-                try:
-                    rows=int(mo.group(1));cols=int(mo.group(2))
-                    fcntl.ioctl(m,termios.TIOCSWINSZ,struct.pack('HHHH',rows,cols,0,0))
-                except Exception:pass
-                in_buf=in_buf[:mo.start()]+in_buf[mo.end():]
-            if in_buf:
-                # Don't forward a dangling NUL that might be the
-                # start of an incomplete resize marker \u2014 hold it
-                # until the next read so the regex matches.
-                nul=in_buf.rfind(b'\\x00')
-                if nul>=0 and len(in_buf)-nul<32:
-                    tail=in_buf[nul:];body=in_buf[:nul]
-                    if body:os.write(m,body)
-                    in_buf=tail
-                else:
-                    os.write(m,in_buf);in_buf=b''
-        except OSError:break
-    if m in r:
-        try:
-            d=os.read(m,4096)
-            if d:os.write(o,d)
-        except OSError:done[0]=True
-try:os.kill(pid,signal.SIGTERM)
-except Exception:pass
-try:
-    _,st=os.waitpid(pid,0)
-    sys.exit((st>>8)&0xFF)
-except Exception:sys.exit(0)
-`;
-function findPython3() {
-  for (const name of ["python3", "python"]) {
-    try {
-      const out2 = require("child_process").spawnSync("which", [name], { encoding: "utf8" });
-      if (out2.status === 0 && out2.stdout?.trim()) return out2.stdout.trim();
-    } catch {
-    }
-  }
-  return null;
-}
-function createPythonSession(id, shell, cwd, env, cols, rows) {
-  const python = findPython3();
-  if (!python) {
-    return { error: "python3 not found on PATH \u2014 required for terminal sessions on Linux/macOS without node-pty." };
-  }
-  let child;
-  try {
-    child = (0, import_child_process9.spawn)(python, ["-c", PYTHON_TERMINAL_HELPER, shell], {
-      cwd,
-      env: { ...env, COLUMNS: String(cols), LINES: String(rows) },
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-  } catch (e) {
-    return { error: e instanceof Error ? e.message : "python spawn failed" };
-  }
-  child.stdout.on("data", (buf) => {
-    onDataHandler?.({ sessionId: id, data: buf.toString("utf8") });
-  });
-  child.stderr.on("data", (buf) => {
-    onDataHandler?.({ sessionId: id, data: buf.toString("utf8") });
-  });
-  child.on("exit", (code) => {
-    onExitHandler?.({ sessionId: id, exitCode: code ?? 0 });
-    sessions.delete(id);
-  });
-  return {
-    id,
-    write(data) {
-      try {
-        child.stdin.write(data);
-      } catch {
-      }
-    },
-    resize(cs, rs) {
-      try {
-        child.stdin.write(`\0CW ${rs} ${cs}
-`);
-      } catch {
-      }
-    },
-    kill() {
-      try {
-        child.kill("SIGTERM");
-      } catch {
-      }
-    }
-  };
-}
-function openTerminal(opts) {
-  if (sessions.size >= MAX_CONCURRENT_SESSIONS) {
-    return { error: `Too many open terminals (max ${MAX_CONCURRENT_SESSIONS})` };
-  }
-  const shell = opts.shell ?? defaultShell();
-  const cwd = opts.cwd ?? process.cwd();
-  const env = {
-    ...process.env,
-    TERM: "xterm-256color",
-    COLORTERM: "truecolor",
-    FORCE_COLOR: "1"
-  };
-  const cols = Math.max(1, Math.min(opts.cols ?? 80, 500));
-  const rows = Math.max(1, Math.min(opts.rows ?? 24, 200));
-  const id = (0, import_crypto2.randomUUID)();
-  const ptyMod = loadNodePty2();
-  if (ptyMod) {
-    try {
-      const term = ptyMod.spawn(shell, [], {
-        name: "xterm-256color",
-        cols,
-        rows,
-        cwd,
-        env,
-        useConpty: process.platform === "win32" ? true : void 0
-      });
-      const dataListener = term.onData((data) => {
-        onDataHandler?.({ sessionId: id, data });
-      });
-      const exitListener = term.onExit(({ exitCode }) => {
-        onExitHandler?.({ sessionId: id, exitCode });
-        sessions.delete(id);
-      });
-      sessions.set(id, {
-        id,
-        write: (d3) => term.write(d3),
-        resize: (cs, rs) => term.resize(cs, rs),
-        kill: () => {
-          dataListener.dispose();
-          exitListener.dispose();
-          term.kill();
-        }
-      });
-      return { sessionId: id };
-    } catch (e) {
-      if (process.platform === "win32") {
-        return { error: e instanceof Error ? e.message : "spawn failed" };
-      }
-    }
-  } else if (process.platform === "win32") {
-    return {
-      error: `node-pty native module unavailable on ${process.platform}-${process.arch}; terminal feature disabled for this platform`
-    };
+    const r2 = await git(["add", "--", ...files], cwd);
+    if (r2.code !== 0) return { error: `git add failed: ${r2.stderr.trim()}` };
+  } else {
+    const r2 = await git(["add", "-A"], cwd);
+    if (r2.code !== 0) return { error: `git add failed: ${r2.stderr.trim()}` };
   }
-  const sess = createPythonSession(id, shell, cwd, env, cols, rows);
-  if ("error" in sess) return { error: sess.error };
-  sessions.set(id, sess);
-  return { sessionId: id };
-}
-function writeTerminal(sessionId, data) {
-  const s = sessions.get(sessionId);
-  if (!s) return { ok: false, error: "No such session" };
-  try {
-    s.write(data);
-    return { ok: true };
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : "write failed" };
+  const r = await git(["commit", "-m", message], cwd);
+  if (r.code !== 0) {
+    return { error: r.stderr.trim() || "git commit failed" };
   }
+  const head = await git(["rev-parse", "HEAD"], cwd);
+  return { ok: true, commit: head.stdout.trim() };
 }
-function resizeTerminal(sessionId, cols, rows) {
-  const s = sessions.get(sessionId);
-  if (!s) return { ok: false, error: "No such session" };
-  try {
-    s.resize?.(Math.max(1, Math.min(cols, 500)), Math.max(1, Math.min(rows, 200)));
-    return { ok: true };
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : "resize failed" };
-  }
+async function gitPush(cwd) {
+  const r = await git(["push"], cwd);
+  if (r.code !== 0) return { error: r.stderr.trim() || "git push failed" };
+  return { ok: true, output: (r.stdout + r.stderr).trim() };
 }
-function closeTerminal(sessionId) {
-  const s = sessions.get(sessionId);
-  if (!s) return { ok: true };
-  try {
-    s.kill();
-  } catch {
-  }
-  sessions.delete(sessionId);
+async function gitPull(cwd) {
+  const r = await git(["pull", "--ff-only"], cwd);
+  if (r.code !== 0) return { error: r.stderr.trim() || "git pull failed" };
+  return { ok: true, output: (r.stdout + r.stderr).trim() };
+}
+async function gitResolve(file, side, cwd) {
+  const r = await git(["checkout", `--${side}`, "--", file], cwd);
+  if (r.code !== 0) return { error: r.stderr.trim() || `git checkout --${side} failed` };
+  const add = await git(["add", "--", file], cwd);
+  if (add.code !== 0) return { error: add.stderr.trim() || "git add (resolve) failed" };
   return { ok: true };
 }
-function closeAllTerminals() {
-  for (const id of Array.from(sessions.keys())) closeTerminal(id);
+var MAX_SEARCH_HITS = 500;
+var MAX_SEARCH_BYTES = 256 * 1024;
+async function searchFiles(opts) {
+  const cwd = opts.cwd ?? process.cwd();
+  const cap = Math.min(opts.maxResults ?? MAX_SEARCH_HITS, MAX_SEARCH_HITS);
+  if (!opts.query.trim()) return { hits: [], total: 0, truncated: false };
+  const args2 = ["grep", "-n", "--column", "-I"];
+  if (!opts.caseSensitive) args2.push("-i");
+  if (opts.wholeWord) args2.push("-w");
+  if (opts.regex) args2.push("-E");
+  else args2.push("-F");
+  args2.push(opts.query);
+  if (opts.include && opts.include.length > 0) {
+    args2.push("--");
+    for (const p2 of opts.include) args2.push(p2);
+  } else if (opts.exclude && opts.exclude.length > 0) {
+    args2.push("--");
+    args2.push(".");
+  }
+  for (const p2 of opts.exclude ?? []) args2.push(`:!${p2}`);
+  const r = await git(args2, cwd);
+  if (r.code !== 0 && r.code !== 1) {
+    return jsSearchFiles(opts, cwd, cap);
+  }
+  const hits = [];
+  const lines = r.stdout.split("\n");
+  let truncated = false;
+  let byteBudget = MAX_SEARCH_BYTES;
+  for (const line of lines) {
+    if (!line) continue;
+    if (hits.length >= cap) {
+      truncated = true;
+      break;
+    }
+    if (byteBudget <= 0) {
+      truncated = true;
+      break;
+    }
+    byteBudget -= line.length;
+    const m = line.match(/^([^]+?):(\d+):(\d+):(.*)$/);
+    if (!m) continue;
+    const filePath = m[1] ?? "";
+    const lineNo = parseInt(m[2] ?? "0", 10);
+    const col = parseInt(m[3] ?? "1", 10);
+    const text = (m[4] ?? "").slice(0, 400);
+    if (!filePath) continue;
+    hits.push({
+      path: filePath,
+      line: lineNo,
+      column: col,
+      text,
+      matchLength: opts.query.length
+    });
+  }
+  return { hits, total: hits.length, truncated };
+}
+async function jsSearchFiles(opts, cwd, cap) {
+  const files = await listProjectFiles({ cwd, cap: 2e3 });
+  const hits = [];
+  const needle = opts.caseSensitive ? opts.query : opts.query.toLowerCase();
+  let truncated = files.truncated;
+  for (const f of files.files) {
+    if (hits.length >= cap) {
+      truncated = true;
+      break;
+    }
+    let content = "";
+    try {
+      content = await fs23.readFile(path28.join(cwd, f.path), "utf8");
+    } catch {
+      continue;
+    }
+    const lines = content.split("\n");
+    for (let i = 0; i < lines.length && hits.length < cap; i++) {
+      const line = lines[i] ?? "";
+      const hay = opts.caseSensitive ? line : line.toLowerCase();
+      const idx = hay.indexOf(needle);
+      if (idx === -1) continue;
+      hits.push({
+        path: f.path,
+        line: i + 1,
+        column: idx + 1,
+        text: line.slice(0, 400),
+        matchLength: opts.query.length
+      });
+    }
+  }
+  return { hits, total: hits.length, truncated };
 }
 
 // src/services/apply-file-review.service.ts
@@ -17876,6 +17904,7 @@ var import_child_process13 = require("child_process");
 var fs30 = __toESM(require("fs"));
 var os24 = __toESM(require("os"));
 var path35 = __toESM(require("path"));
+var import_ignore = __toESM(require("ignore"));
 
 // src/services/file-watcher/diff-parser.ts
 var HUNK_HEADER_RE = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
@@ -18099,6 +18128,17 @@ var FileWatcherService = class {
    * doesn't hammer `fs.statSync` for every event.
    */
   gitRootByDir = /* @__PURE__ */ new Map();
+  /**
+   * Per-repo `.gitignore` matcher. On first encounter of a git root we
+   * collect every `.gitignore` file under it, parse them through the
+   * `ignore` package, and store the resulting matcher here keyed by
+   * absolute repo path. Subsequent file events in the same repo reuse
+   * the matcher in O(1). The hard-coded IGNORED_PATH_PATTERN above
+   * catches conventional dirs (node_modules, dist, Pods, …); this
+   * matcher layers the repo's own ignore rules on top so per-project
+   * artifacts (ios/, .env*, build outputs) stop polluting the queue.
+   */
+  gitIgnoreMatcherByRoot = /* @__PURE__ */ new Map();
   stopped = false;
   /**
    * Cross-file coalescing buffer. Keyed by absPath so multiple
@@ -18324,9 +18364,17 @@ var FileWatcherService = class {
       );
       return;
     }
-    this.opts.onRepoDirty?.(gitRoot);
     const relPathInRepo = path35.relative(gitRoot, absPath);
     if (!relPathInRepo || relPathInRepo.startsWith("..")) return;
+    const matcher = this.getGitIgnoreMatcher(gitRoot);
+    if (matcher && matcher.ignores(relPathInRepo)) {
+      log.trace(
+        "fileWatcher",
+        `${relPathInRepo} ignored by ${path35.basename(gitRoot)}/.gitignore \u2014 suppressing emit`
+      );
+      return;
+    }
+    this.opts.onRepoDirty?.(gitRoot);
     const repoPath = path35.relative(this.opts.workingDir, gitRoot);
     const repoName = path35.basename(gitRoot);
     let diffText = "";
@@ -18462,6 +18510,79 @@ var FileWatcherService = class {
   async postReviewBlame(body) {
     await this.postWithRetries(`${this.apiBase}/api/review/blame`, body);
   }
+  /**
+   * Lazily build and cache a per-repo `.gitignore` matcher. We walk the
+   * repo collecting every `.gitignore` file (skipping the same dirs
+   * IGNORED_PATH_PATTERN already filters at chokidar level, so we
+   * don't read inside node_modules / Pods / etc.) and feed each file
+   * into a single `ignore` matcher anchored at the git root. Subsequent
+   * calls return the cached matcher; failures fall back to `null`,
+   * which the caller treats as "no extra filtering" — so a malformed
+   * .gitignore degrades to the prior pre-fix behaviour rather than
+   * silently dropping every event.
+   */
+  getGitIgnoreMatcher(gitRoot) {
+    if (this.gitIgnoreMatcherByRoot.has(gitRoot)) {
+      return this.gitIgnoreMatcherByRoot.get(gitRoot) ?? null;
+    }
+    const matcher = (0, import_ignore.default)();
+    let added = 0;
+    try {
+      this.collectGitignoreFiles(gitRoot, gitRoot, matcher);
+      added = 1;
+    } catch (err) {
+      log.warn(
+        "fileWatcher",
+        `failed to build gitignore matcher for ${gitRoot}: ${err.message}`
+      );
+    }
+    const result = added > 0 ? matcher : null;
+    this.gitIgnoreMatcherByRoot.set(gitRoot, result);
+    return result;
+  }
+  /**
+   * Walk the repo recursively collecting every `.gitignore` file and
+   * add its rules to `matcher`, with the path prefix that anchors them
+   * to the right subdirectory (so a `.gitignore` inside `apps/api`
+   * scopes to `apps/api/*`, not the whole repo). Skips heavy dirs the
+   * static IGNORED_PATH_PATTERN already filters — we don't want to
+   * stat into `node_modules/` looking for buried .gitignore files.
+   */
+  collectGitignoreFiles(repoRoot, dir, matcher) {
+    let entries;
+    try {
+      entries = fs30.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    const gitignoreEntry = entries.find(
+      (e) => e.isFile() && e.name === ".gitignore"
+    );
+    if (gitignoreEntry) {
+      try {
+        const body = fs30.readFileSync(path35.join(dir, ".gitignore"), "utf8");
+        const rel = path35.relative(repoRoot, dir).replace(/\\/g, "/");
+        const prefixed = body.split(/\r?\n/).map((line) => {
+          const trimmed = line.trim();
+          if (!trimmed || trimmed.startsWith("#")) return line;
+          if (!rel) return line;
+          if (trimmed.startsWith("!")) {
+            return "!" + path35.posix.join(rel, trimmed.slice(1));
+          }
+          return path35.posix.join(rel, trimmed);
+        }).join("\n");
+        matcher.add(prefixed);
+      } catch {
+      }
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      if (entry.name === ".git") continue;
+      const childAbs = path35.join(dir, entry.name);
+      if (isIgnoredFilePath(childAbs)) continue;
+      this.collectGitignoreFiles(repoRoot, childAbs, matcher);
+    }
+  }
   async postWithRetries(url, body) {
     const payload = JSON.stringify(body);
     const headers = {
@@ -19425,6 +19546,24 @@ async function runAcpSession(opts) {
     pluginAuthToken: opts.pluginAuthToken
   });
   const streaming = new StreamingState(publisher);
+  registerTerminalHandlers({
+    onData: ({ sessionId, data }) => {
+      void publisher.publishOutput({
+        type: "terminal_data",
+        terminalSessionId: sessionId,
+        data,
+        done: false
+      });
+    },
+    onExit: ({ sessionId, exitCode }) => {
+      void publisher.publishOutput({
+        type: "terminal_exit",
+        terminalSessionId: sessionId,
+        exitCode,
+        done: true
+      });
+    }
+  });
   let updateCount = 0;
   const client2 = new AcpClient({
     adapter: opts.adapter,
@@ -19502,20 +19641,37 @@ async function runAcpSession(opts) {
   const runtime = createInteractiveAgentStrategy(opts.agent, createOsStrategy());
   const models = await runtime.listModels();
   const history = new AcpHistory(publisher, { agent: opts.agent, acpSessionId });
-  const fileWatcher = new FileWatcherService({
+  const turnFiles = new TurnFileAggregator({
     workingDir: opts.cwd,
     sessionId: opts.sessionId,
     pluginId: opts.pluginId,
-    pluginAuthToken: opts.pluginAuthToken
+    pluginAuthToken: opts.pluginAuthToken,
+    agentId: opts.agent
   });
-  const turnFiles = new TurnFileAggregator({
+  const REPO_DIRTY_FLUSH_DEBOUNCE_MS = 2e3;
+  let repoDirtyTimer = null;
+  const fileWatcher = new FileWatcherService({
     workingDir: opts.cwd,
     sessionId: opts.sessionId,
     pluginId: opts.pluginId,
     pluginAuthToken: opts.pluginAuthToken,
-    agentId: opts.agent
+    onRepoDirty: () => {
+      if (repoDirtyTimer) clearTimeout(repoDirtyTimer);
+      repoDirtyTimer = setTimeout(() => {
+        repoDirtyTimer = null;
+        log.info("acpRunner", "onRepoDirty debounce fired \u2014 running flushTurn");
+        turnFiles.flushTurn().catch((err) => {
+          log.warn("acpRunner", `flushTurn from onRepoDirty failed: ${describeError(err)}`);
+        });
+      }, REPO_DIRTY_FLUSH_DEBOUNCE_MS);
+    }
   });
-  fileWatcher.start().catch((err) => {
+  fileWatcher.start().then(() => {
+    log.info(
+      "acpRunner",
+      `fileWatcher started \u2014 watching cwd=${opts.cwd} for file changes (debounce ${REPO_DIRTY_FLUSH_DEBOUNCE_MS}ms before flushTurn)`
+    );
+  }).catch((err) => {
     log.warn("acpRunner", `fileWatcher.start failed: ${describeError(err)}`);
   });
   const relay = new CommandRelayService(
@@ -19542,6 +19698,7 @@ async function runAcpSession(opts) {
     relay.stop();
     void fileWatcher.stop();
     turnFiles.stop();
+    closeAllTerminals();
     await client2.stop();
     process.exit(0);
   };
@@ -19756,6 +19913,7 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
         }
       }
       relay.stop();
+      closeAllTerminals();
       await client2.stop();
       process.exit(0);
       return;
@@ -19765,26 +19923,58 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
     case "preview_stop":
     case "save_preview_config": {
       const runtime = createInteractiveAgentStrategy(opts.agent, createOsStrategy());
-      const ctx = buildLegacyContextForACP(opts, relay, runtime);
+      let previewHandlerAcked = false;
+      const ackingRelay = new Proxy(relay, {
+        get(target, prop, receiver) {
+          if (prop === "sendResult") {
+            return (commandId, status2, result) => {
+              if (commandId === cmd.id) previewHandlerAcked = true;
+              return target.sendResult(commandId, status2, result);
+            };
+          }
+          return Reflect.get(target, prop, receiver);
+        }
+      });
+      const ctx = buildLegacyContextForACP(opts, ackingRelay, runtime);
       try {
         await dispatchCommand(ctx, cmd);
-        await relay.sendResult(cmd.id, "completed", {});
+        if (!previewHandlerAcked) {
+          await relay.sendResult(cmd.id, "completed", {});
+        }
       } catch (err) {
         log.warn("acpRunner", `${cmd.type} failed: ${describeError(err)}`);
-        await relay.sendResult(cmd.id, "failed", { error: describeError(err) });
+        if (!previewHandlerAcked) {
+          await relay.sendResult(cmd.id, "failed", { error: describeError(err) });
+        }
       }
       return;
     }
     default:
       if (handlers[cmd.type]) {
         const runtime = createInteractiveAgentStrategy(opts.agent, createOsStrategy());
-        const legacyCtx = buildLegacyContextForACP(opts, relay, runtime);
+        let handlerAcked = false;
+        const ackingRelay = new Proxy(relay, {
+          get(target, prop, receiver) {
+            if (prop === "sendResult") {
+              return (commandId, status2, result) => {
+                if (commandId === cmd.id) handlerAcked = true;
+                return target.sendResult(commandId, status2, result);
+              };
+            }
+            return Reflect.get(target, prop, receiver);
+          }
+        });
+        const legacyCtx = buildLegacyContextForACP(opts, ackingRelay, runtime);
         try {
           await dispatchCommand(legacyCtx, cmd);
-          await relay.sendResult(cmd.id, "completed", {});
+          if (!handlerAcked) {
+            await relay.sendResult(cmd.id, "completed", {});
+          }
         } catch (err) {
           log.warn("acpRunner", `legacy handler "${cmd.type}" threw: ${describeError(err)}`);
-          await relay.sendResult(cmd.id, "failed", { error: describeError(err) });
+          if (!handlerAcked) {
+            await relay.sendResult(cmd.id, "failed", { error: describeError(err) });
+          }
         }
         return;
       }
@@ -21551,6 +21741,19 @@ async function start(requestedAgent) {
     requestedAgent: requestedAgent ?? null
   });
   const cwd = process.cwd();
+  const refreshed = await fetchCurrentPluginAuthToken(session.id, pluginId);
+  if (refreshed && refreshed !== session.pluginAuthToken) {
+    addSession({ ...session, pluginAuthToken: refreshed });
+    session.pluginAuthToken = refreshed;
+    showInfo("Reconnected \u2014 refreshed plugin auth token.");
+  } else if (refreshed) {
+    showInfo("Reconnected previous session.");
+  }
+  const tokenForLog = session.pluginAuthToken ?? "(unset)";
+  log.trace(
+    "pluginAuth",
+    `boot triple sessionId=${session.id} pluginId=${pluginId} tokenLen=${tokenForLog.length} tokenHead=${tokenForLog.slice(0, 12)} tokenTail=${tokenForLog.slice(-8)} mintedEqualsCached=${refreshed === session.pluginAuthToken}`
+  );
   const acpDisabled = process.env.CODEAM_ACP_DISABLED === "1";
   if (!acpDisabled && session.pluginAuthToken) {
     const adapter = getAcpAdapter(session.agent);
@@ -24467,7 +24670,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.27.16" : "0.0.0-dev";
+  const cliVersion = true ? "2.28.0" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto8.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -24666,7 +24869,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.27.16" : "unknown";
+  const v = true ? "2.28.0" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -24798,6 +25001,7 @@ var fs35 = __toESM(require("fs"));
 var os27 = __toESM(require("os"));
 var path44 = __toESM(require("path"));
 var https7 = __toESM(require("https"));
+var import_node_child_process12 = require("child_process");
 var import_picocolors16 = __toESM(require("picocolors"));
 var PKG_NAME = "codeam-cli";
 var REGISTRY_URL = `https://registry.npmjs.org/${PKG_NAME}/latest`;
@@ -24889,17 +25093,74 @@ function notifyIfStale(currentVersion, latest) {
   ];
   process.stderr.write(lines.join("\n"));
 }
+function isLinkedInstall() {
+  try {
+    const root = (0, import_node_child_process12.execSync)("npm root -g", {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 2e3
+    }).trim();
+    if (!root) return false;
+    const pkgPath = path44.join(root, PKG_NAME);
+    return fs35.lstatSync(pkgPath).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+function maybeAutoUpdate(currentVersion, latest) {
+  if (compareSemver(latest, currentVersion) <= 0) return;
+  if (process.env.CODEAM_NO_AUTO_UPDATE === "1") {
+    notifyIfStale(currentVersion, latest);
+    return;
+  }
+  if (isLinkedInstall()) {
+    notifyIfStale(currentVersion, latest);
+    return;
+  }
+  process.stderr.write(
+    `
+  ${import_picocolors16.default.yellow("\u25CF")} ${import_picocolors16.default.bold("Updating codeam-cli")} ${import_picocolors16.default.dim(currentVersion)} ${import_picocolors16.default.dim("\u2192")} ${import_picocolors16.default.green(latest)}...
+
+`
+  );
+  const install = (0, import_node_child_process12.spawnSync)("npm", ["install", "-g", `${PKG_NAME}@latest`], {
+    stdio: "inherit",
+    env: process.env
+  });
+  if (install.status !== 0) {
+    process.stderr.write(
+      `
+  ${import_picocolors16.default.red("!")} Update failed (exit ${install.status ?? "?"}). Continuing on ${currentVersion}.
+    Run ${import_picocolors16.default.cyan("npm install -g codeam-cli")} manually to retry.
+
+`
+    );
+    return;
+  }
+  try {
+    fs35.unlinkSync(cachePath());
+  } catch {
+  }
+  process.stderr.write(`  ${import_picocolors16.default.green("\u2713")} Updated. Resuming session...
+
+`);
+  const child = (0, import_node_child_process12.spawnSync)("codeam", process.argv.slice(2), {
+    stdio: "inherit",
+    env: process.env
+  });
+  process.exit(child.status ?? 0);
+}
 function checkForUpdates() {
   if (process.env.NODE_ENV === "test") return;
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current = true ? "2.27.16" : null;
+  const current = true ? "2.28.0" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
   if (fresh && cache) {
-    notifyIfStale(current, cache.latest);
+    maybeAutoUpdate(current, cache.latest);
     return;
   }
   void fetchLatest().then((latest) => {