agent-yes 1.43.0 → 1.44.0

package/dist/cli.js

@@ -20719,6 +20719,7 @@ class PidStore {
             cli TEXT NOT NULL,
             args TEXT NOT NULL,
             prompt TEXT,
+            cwd TEXT NOT NULL,
             logFile TEXT NOT NULL,
             fifoFile TEXT NOT NULL,
             status TEXT NOT NULL DEFAULT 'active',
@@ -20740,7 +20741,8 @@ class PidStore {
     pid,
     cli,
     args,
-    prompt
+    prompt,
+    cwd
   }) {
     const now = Date.now();
     const argsJson = JSON.stringify(args);
@@ -20748,16 +20750,16 @@ class PidStore {
     const fifoFile = this.getFifoPath(pid);
     try {
       this.db.run(`
-        INSERT INTO pid_records (pid, cli, args, prompt, logFile, fifoFile, status, exitReason, startedAt, updatedAt)
-        VALUES (?, ?, ?, ?, ?, ?, 'active', '', ?, ?)
-      `, [pid, cli, argsJson, prompt, logFile, fifoFile, now, now]);
+        INSERT INTO pid_records (pid, cli, args, prompt, cwd, logFile, fifoFile, status, exitReason, startedAt, updatedAt)
+        VALUES (?, ?, ?, ?, ?, ?, ?, 'active', '', ?, ?)
+      `, [pid, cli, argsJson, prompt, cwd, logFile, fifoFile, now, now]);
     } catch (error) {
       if (error.code === "SQLITE_CONSTRAINT_UNIQUE") {
         this.db.run(`
           UPDATE pid_records
-          SET cli = ?, args = ?, prompt = ?, logFile = ?, fifoFile = ?, status = 'active', exitReason = '', startedAt = ?, updatedAt = ?
+          SET cli = ?, args = ?, prompt = ?, cwd = ?, logFile = ?, fifoFile = ?, status = 'active', exitReason = '', startedAt = ?, updatedAt = ?
           WHERE pid = ?
-        `, [cli, argsJson, prompt, logFile, fifoFile, now, now, pid]);
+        `, [cli, argsJson, prompt, cwd, logFile, fifoFile, now, now, pid]);
       } else {
         throw error;
       }
@@ -20782,6 +20784,9 @@ class PidStore {
     }
     logger.debug(`[pidStore] Updated process ${pid} status=${status}`);
   }
+  getAllRecords() {
+    return this.db.query("SELECT * FROM pid_records");
+  }
   getLogDir() {
     return path10.resolve(this.storeDir, "logs");
   }
@@ -21237,83 +21242,7 @@ class AgentContext {
 }
 var init_context = () => {};
 
-// ts/core/responders.ts
-async function createAutoResponseHandler(line, lineIndex, options) {
-  const { ctx, conf, cli, workingDir, exitAgent } = options;
-  logger.debug(`stdout|${line}`);
-  if (conf.ready?.some((rx) => line.match(rx))) {
-    logger.debug(`ready |${line}`);
-    if (cli === "gemini" && lineIndex <= 80)
-      return;
-    ctx.stdinReady.ready();
-    ctx.stdinFirstReady.ready();
-  }
-  if (conf.enter?.some((rx) => line.match(rx))) {
-    logger.debug(`sendEnter matched|${line}`);
-    return await sendEnter(ctx.messageContext, 400);
-  }
-  const typingResponded = await src_default(Object.entries(conf.typingRespond ?? {})).filter(([_sendString, onThePatterns]) => onThePatterns.some((rx) => line.match(rx))).map(async ([sendString]) => await sendMessage3(ctx.messageContext, sendString, { waitForReady: false })).toCount();
-  if (typingResponded)
-    return;
-  if (conf.fatal?.some((rx) => line.match(rx))) {
-    logger.debug(`fatal |${line}`);
-    ctx.isFatal = true;
-    await exitAgent();
-  }
-  if (conf.restartWithoutContinueArg?.some((rx) => line.match(rx))) {
-    logger.debug(`restart-without-continue|${line}`);
-    ctx.shouldRestartWithoutContinue = true;
-    ctx.isFatal = true;
-    await exitAgent();
-  }
-  if (cli === "codex") {
-    const sessionId = extractSessionId(line);
-    if (sessionId) {
-      logger.debug(`session|captured session ID: ${sessionId}`);
-      await storeSessionForCwd(workingDir, sessionId);
-    }
-  }
-}
-var init_responders = __esm(() => {
-  init_dist4();
-  init_logger();
-  init_messaging();
-  init_codexSessionManager();
-});
-
 // ts/core/streamHelpers.ts
-function handleConsoleControlCodes(text, shell, terminalRender, cli, verbose) {
-  terminalRender.write(text);
-  if (text.includes("\x1B[c") || text.includes("\x1B[0c")) {
-    shell.write("\x1B[?1;2c");
-    if (verbose) {
-      logger.debug("device|respond DA: VT100 with Advanced Video Option");
-    }
-    return;
-  }
-  if (process.stdin.isTTY)
-    return;
-  if (!text.includes("\x1B[6n"))
-    return;
-  const { col, row } = terminalRender.getCursorPosition();
-  shell.write(`\x1B[${row};${col}R`);
-  logger.debug(`cursor|respond position: row=${String(row)}, col=${String(col)}`);
-}
-function createTerminateSignalHandler(stdinReady, onAbort) {
-  let aborted2 = false;
-  return (chunk) => {
-    if (!aborted2 && chunk === "\x1A") {
-      return "";
-    }
-    if (!aborted2 && !stdinReady.isReady && chunk === "\x03") {
-      logger.error("User aborted: SIGINT");
-      onAbort(130);
-      aborted2 = true;
-      return chunk;
-    }
-    return chunk;
-  };
-}
 function createTerminatorStream(exitPromise) {
   return new TransformStream({
     start: function terminator(ctrl) {
@@ -21323,8 +21252,48 @@ function createTerminatorStream(exitPromise) {
     flush: (ctrl) => ctrl.terminate()
   });
 }
-var init_streamHelpers = __esm(() => {
-  init_logger();
+
+// ts/agentRegistry.ts
+class AgentRegistry {
+  agents = new Map;
+  register(pid, instance) {
+    this.agents.set(pid, instance);
+  }
+  unregister(pid) {
+    this.agents.delete(pid);
+  }
+  get(pid) {
+    return this.agents.get(pid);
+  }
+  list() {
+    return Array.from(this.agents.values());
+  }
+  appendStdout(pid, data) {
+    const instance = this.agents.get(pid);
+    if (!instance) {
+      return;
+    }
+    const lines2 = data.split(`
+`);
+    instance.stdoutBuffer.push(...lines2);
+    if (instance.stdoutBuffer.length > MAX_BUFFER_SIZE) {
+      instance.stdoutBuffer = instance.stdoutBuffer.slice(-MAX_BUFFER_SIZE);
+    }
+  }
+  getStdout(pid, tail) {
+    const instance = this.agents.get(pid);
+    if (!instance) {
+      return [];
+    }
+    if (tail !== undefined) {
+      return instance.stdoutBuffer.slice(-tail);
+    }
+    return instance.stdoutBuffer;
+  }
+}
+var MAX_BUFFER_SIZE = 1000, globalAgentRegistry;
+var init_agentRegistry = __esm(() => {
+  globalAgentRegistry = new AgentRegistry;
 });
 
 // ts/defineConfig.ts
@@ -21367,6 +21336,7 @@ function getDefaultConfig() {
     clis: {
       claude: {
         promptArg: "last-arg",
+        systemPrompt: "--append-system-prompt",
         install: {
           powershell: "irm https://claude.ai/install.ps1 | iex",
           bash: "curl -fsSL https://claude.ai/install.sh | bash",
@@ -21379,6 +21349,7 @@ function getDefaultConfig() {
           /^>[ \u00A0]/,
           /──────────+/
         ],
+        working: [/esc to interrupt/, /to run in background/],
         typingRespond: {
           "1\n": [/│ Do you want to use this API key\?/]
         },
@@ -21534,16 +21505,385 @@ var require_get_caller_file = __commonJS((exports, module) => {
   };
 });
 
+// ts/mcp-server.ts
+var exports_mcp_server = {};
+__export(exports_mcp_server, {
+  startMcpServer: () => startMcpServer
+});
+import { Server } from "@modelcontextprotocol/sdk/server";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio";
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema
+} from "@modelcontextprotocol/sdk/types";
+import { readFile as readFile4 } from "fs/promises";
+function getTerminalDimensions() {
+  if (!process.stdout.isTTY)
+    return { cols: 80, rows: 24 };
+  return {
+    cols: Math.max(20, process.stdout.columns),
+    rows: process.stdout.rows
+  };
+}
+async function startMcpServer() {
+  try {
+    const config2 = await init_agent_yes_config().then(() => exports_agent_yes_config);
+    CLIS_CONFIG2 = config2.default.clis;
+  } catch (error) {
+    console.error("[MCP] Failed to load agent-yes.config.ts:", error);
+    process.exit(1);
+  }
+  const server = new Server({ name: "agent-yes-mcp-server", version: "1.0.0" }, { capabilities: { tools: {} } });
+  const tools = [
+    {
+      name: "spawn-agent",
+      description: "Spawn a new AI agent with specified CLI and prompt",
+      inputSchema: {
+        type: "object",
+        properties: {
+          cwd: {
+            type: "string",
+            description: "Working directory for the agent"
+          },
+          cli: {
+            type: "string",
+            enum: Object.keys(CLIS_CONFIG2),
+            description: "AI CLI to spawn (e.g., 'claude', 'codex', 'gemini')"
+          },
+          prompt: {
+            type: "string",
+            description: "Initial prompt to send to the agent (optional)"
+          }
+        },
+        required: ["cwd", "cli"]
+      }
+    },
+    {
+      name: "kill-agent",
+      description: "Terminate a running agent by PID",
+      inputSchema: {
+        type: "object",
+        properties: {
+          pid: {
+            type: "number",
+            description: "Process ID of the agent to kill"
+          }
+        },
+        required: ["pid"]
+      }
+    },
+    {
+      name: "read-stdout",
+      description: "Read stdout output from an agent (live or historical)",
+      inputSchema: {
+        type: "object",
+        properties: {
+          pid: {
+            type: "number",
+            description: "Process ID of the agent"
+          },
+          tail: {
+            type: "number",
+            description: "Number of lines to return from the end (default: 100)"
+          }
+        },
+        required: ["pid"]
+      }
+    },
+    {
+      name: "write-stdin",
+      description: "Send a message to an agent's stdin",
+      inputSchema: {
+        type: "object",
+        properties: {
+          pid: {
+            type: "number",
+            description: "Process ID of the agent"
+          },
+          message: {
+            type: "string",
+            description: "Message to send to the agent"
+          }
+        },
+        required: ["pid", "message"]
+      }
+    },
+    {
+      name: "list-agents",
+      description: "List all agents in a working directory (live and historical)",
+      inputSchema: {
+        type: "object",
+        properties: {
+          cwd: {
+            type: "string",
+            description: "Working directory to list agents from (defaults to current directory)"
+          }
+        }
+      }
+    }
+  ];
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({
+    tools
+  }));
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    try {
+      switch (name) {
+        case "spawn-agent":
+          return await handleSpawnAgent(args);
+        case "kill-agent":
+          return await handleKillAgent(args);
+        case "read-stdout":
+          return await handleReadStdout(args);
+        case "write-stdin":
+          return await handleWriteStdin(args);
+        case "list-agents":
+          return await handleListAgents(args);
+        default:
+          throw new Error(`Unknown tool: ${name}`);
+      }
+    } catch (error) {
+      console.error(`[MCP] Error handling tool ${name}:`, error);
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({ error: error.message || String(error) })
+          }
+        ]
+      };
+    }
+  });
+  const transport = new StdioServerTransport;
+  await server.connect(transport);
+  console.error("[agent-yes-mcp] Server started on stdio");
+}
+async function handleSpawnAgent(args) {
+  const { cwd, cli, prompt } = args;
+  if (!CLIS_CONFIG2[cli]) {
+    throw new Error(`Unknown CLI: ${cli}. Available: ${Object.keys(CLIS_CONFIG2).join(", ")}`);
+  }
+  const cliConf = CLIS_CONFIG2[cli];
+  const ptyOptions = {
+    name: "xterm-color",
+    ...getTerminalDimensions(),
+    cwd,
+    env: { ...process.env, AGENT_YES_MCP: "true" }
+  };
+  const shell = spawnAgent({
+    cli,
+    cliConf,
+    cliArgs: [],
+    verbose: false,
+    install: false,
+    ptyOptions
+  });
+  const pidStore = new PidStore(cwd);
+  await pidStore.init();
+  try {
+    await pidStore.registerProcess({ pid: shell.pid, cli, args: [], prompt, cwd });
+  } catch (error) {
+    console.error(`[MCP] Failed to register process ${shell.pid}:`, error);
+  }
+  const logPaths = await initializeLogPaths(pidStore, shell.pid);
+  setupDebugLogging(logPaths.debuggingLogsPath);
+  const ctx = new AgentContext({
+    shell,
+    pidStore,
+    logPaths,
+    cli,
+    cliConf,
+    verbose: false,
+    robust: false
+  });
+  const pendingExitCode = Promise.withResolvers();
+  const outputStream = src_default(createTerminatorStream(pendingExitCode.promise)).writable;
+  const outputWriter = outputStream.getWriter();
+  shell.onData(async (data) => {
+    await outputWriter.write(data);
+    globalAgentRegistry.appendStdout(shell.pid, data);
+  });
+  shell.onExit(async ({ exitCode }) => {
+    globalAgentRegistry.unregister(shell.pid);
+    try {
+      await pidStore.updateStatus(shell.pid, "exited", {
+        exitReason: exitCode === 0 ? "normal" : "crash",
+        exitCode: exitCode ?? undefined
+      });
+    } catch (error) {
+      console.error(`[MCP] Failed to update status for PID ${shell.pid}:`, error);
+    }
+    pendingExitCode.resolve(exitCode);
+  });
+  try {
+    globalAgentRegistry.register(shell.pid, {
+      pid: shell.pid,
+      context: ctx,
+      cwd,
+      cli,
+      prompt,
+      startTime: Date.now(),
+      stdoutBuffer: []
+    });
+  } catch (error) {
+    console.error(`[MCP] Failed to register agent ${shell.pid} in registry:`, error);
+  }
+  if (prompt) {
+    shell.write(prompt + `
+`);
+  }
+  return {
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify({ pid: shell.pid, status: "spawned", cli, cwd })
+      }
+    ]
+  };
+}
+async function handleKillAgent(args) {
+  const { pid } = args;
+  const instance = globalAgentRegistry.get(pid);
+  if (!instance) {
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ status: "not_running", pid })
+        }
+      ]
+    };
+  }
+  instance.context.shell.kill("SIGTERM");
+  globalAgentRegistry.unregister(pid);
+  return {
+    content: [{ type: "text", text: JSON.stringify({ status: "killed", pid }) }]
+  };
+}
+async function handleReadStdout(args) {
+  const { pid, tail = 100 } = args;
+  const instance = globalAgentRegistry.get(pid);
+  if (instance) {
+    const lines2 = instance.stdoutBuffer.slice(-tail);
+    return {
+      content: [{ type: "text", text: lines2.join(`
+`) }]
+    };
+  }
+  try {
+    const possibleDirs = [process.cwd(), args.cwd || process.cwd()];
+    for (const dir of possibleDirs) {
+      const pidStore = new PidStore(dir);
+      await pidStore.init();
+      const record = pidStore.getAllRecords().find((r) => r.pid === pid);
+      if (record && record.logFile) {
+        const content = await readFile4(record.logFile, "utf8");
+        const lines2 = content.split(`
+`);
+        const tailedLines = lines2.slice(-tail);
+        return {
+          content: [{ type: "text", text: tailedLines.join(`
+`) }]
+        };
+      }
+    }
+    return {
+      content: [{ type: "text", text: "" }]
+    };
+  } catch (error) {
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ error: `Failed to read stdout: ${error.message}` })
+        }
+      ]
+    };
+  }
+}
+async function handleWriteStdin(args) {
+  const { pid, message } = args;
+  const instance = globalAgentRegistry.get(pid);
+  if (!instance) {
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ error: `Agent with PID ${pid} not found (not running)` })
+        }
+      ]
+    };
+  }
+  try {
+    await sendMessage3(instance.context.messageContext, message);
+    return {
+      content: [{ type: "text", text: JSON.stringify({ status: "sent", pid, message }) }]
+    };
+  } catch (error) {
+    return {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ error: `Failed to send message: ${error.message}` })
+        }
+      ]
+    };
+  }
+}
+async function handleListAgents(args) {
+  const cwd = args.cwd || process.cwd();
+  const liveAgents = globalAgentRegistry.list().filter((a2) => a2.cwd === cwd).map((a2) => ({
+    pid: a2.pid,
+    cli: a2.cli,
+    cwd: a2.cwd,
+    status: "running",
+    startTime: a2.startTime,
+    prompt: a2.prompt
+  }));
+  const pidStore = new PidStore(cwd);
+  await pidStore.init();
+  const dbAgents = pidStore.getAllRecords().filter((r) => r.cwd === cwd).map((r) => ({
+    pid: r.pid,
+    cli: r.cli,
+    cwd: r.cwd,
+    status: r.status,
+    exitCode: r.exitCode,
+    startTime: r.startedAt,
+    prompt: r.prompt
+  }));
+  const allAgents = [...liveAgents];
+  const livePids = new Set(liveAgents.map((a2) => a2.pid));
+  for (const dbAgent of dbAgents) {
+    if (!livePids.has(dbAgent.pid)) {
+      allAgents.push(dbAgent);
+    }
+  }
+  return {
+    content: [{ type: "text", text: JSON.stringify({ agents: allAgents, cwd }) }]
+  };
+}
+var CLIS_CONFIG2;
+var init_mcp_server = __esm(async () => {
+  init_agentRegistry();
+  init_pidStore();
+  init_messaging();
+  init_logging();
+  init_context();
+  init_dist4();
+  await init_spawner();
+});
+
 // ts/index.ts
 var exports_ts = {};
 __export(exports_ts, {
   removeControlCharacters: () => removeControlCharacters,
   default: () => agentYes2,
   config: () => config2,
-  CLIS_CONFIG: () => CLIS_CONFIG2
+  CLIS_CONFIG: () => CLIS_CONFIG3,
+  AgentContext: () => AgentContext
 });
-import { fromReadable as fromReadable2, fromWritable as fromWritable2 } from "from-node-stream";
-import { mkdir as mkdir9, readFile as readFile4, writeFile as writeFile8 } from "fs/promises";
+import { fromWritable as fromWritable2 } from "from-node-stream";
+import { mkdir as mkdir9, readFile as readFile5, writeFile as writeFile8 } from "fs/promises";
 import path15 from "path";
 async function agentYes2({
   cli,
@@ -21564,7 +21904,7 @@ async function agentYes2({
 }) {
   if (!cli)
     throw new Error(`cli is required`);
-  const conf = CLIS_CONFIG2[cli] || phpdie_default(`Unsupported cli tool: ${cli}, current process.argv: ${process.argv.join(" ")}`);
+  const conf = CLIS_CONFIG3[cli] || phpdie_default(`Unsupported cli tool: ${cli}, current process.argv: ${process.argv.join(" ")}`);
   const workingDir = cwd ?? process.cwd();
   if (queue) {
     if (queue && shouldUseLock(workingDir)) {
@@ -21603,14 +21943,18 @@ async function agentYes2({
       stdinFirstReady.ready();
   });
   const nextStdout = new ReadyManager;
+  if (verbose)
+    logger.debug(`[stdin] isTTY: ${process.stdin.isTTY}, setRawMode available: ${!!process.stdin.setRawMode}`);
   process.stdin.setRawMode?.(true);
+  if (verbose)
+    logger.debug(`[stdin] Raw mode set, isRaw: ${process.stdin.isRaw}`);
   const shellOutputStream = new TransformStream;
   const outputWriter = shellOutputStream.writable.getWriter();
   logger.debug(`Using ${ptyPackage} for pseudo terminal management.`);
   const isSubAgent = !!process.env.CLAUDE_PPID;
   if (isSubAgent)
     logger.info(`[${cli}-yes] Running as sub-agent (CLAUDE_PPID=${process.env.CLAUDE_PPID})`);
-  const cliConf = CLIS_CONFIG2[cli] || {};
+  const cliConf = CLIS_CONFIG3[cli] || {};
   cliArgs = cliConf.defaultArgs ? [...cliConf.defaultArgs, ...cliArgs] : cliArgs;
   try {
     const workingDir2 = cwd ?? process.cwd();
@@ -21630,7 +21974,7 @@ async function agentYes2({
       const searchLimit = gitRoot || path15.parse(currentDir).root;
       while (true) {
         const skillPath = path15.resolve(currentDir, "SKILL.md");
-        const md = await readFile4(skillPath, "utf8").catch(() => null);
+        const md = await readFile5(skillPath, "utf8").catch(() => null);
         if (md) {
           const headerMatch = md.match(/^[\s\S]*?(?=\n##\s)/);
           const headerRaw = (headerMatch ? headerMatch[0] : md).trim();
@@ -21708,7 +22052,7 @@ ${prompt}` : prefix;
   const ptyEnv = { ...env2 ?? process.env };
   const ptyOptions = {
     name: "xterm-color",
-    ...getTerminalDimensions(),
+    ...getTerminalDimensions2(),
     cwd: cwd ?? process.cwd(),
     env: ptyEnv
   };
@@ -21720,7 +22064,11 @@ ${prompt}` : prefix;
     install,
     ptyOptions
   });
-  await pidStore.registerProcess({ pid: shell.pid, cli, args: cliArgs, prompt });
+  try {
+    await pidStore.registerProcess({ pid: shell.pid, cli, args: cliArgs, prompt, cwd: workingDir });
+  } catch (error) {
+    logger.warn(`[pidStore] Failed to register process ${shell.pid}:`, error);
+  }
   const logPaths = await initializeLogPaths(pidStore, shell.pid);
   setupDebugLogging(logPaths.debuggingLogsPath);
   const ctx = new AgentContext({
@@ -21732,6 +22080,19 @@ ${prompt}` : prefix;
     verbose,
     robust
   });
+  try {
+    globalAgentRegistry.register(shell.pid, {
+      pid: shell.pid,
+      context: ctx,
+      cwd: workingDir,
+      cli,
+      prompt,
+      startTime: Date.now(),
+      stdoutBuffer: []
+    });
+  } catch (error) {
+    logger.warn(`[agentRegistry] Failed to register agent ${shell.pid}:`, error);
+  }
   sleep3(1e4).then(() => {
     if (!ctx.stdinReady.isReady)
       ctx.stdinReady.ready();
@@ -21741,16 +22102,22 @@ ${prompt}` : prefix;
   const pendingExitCode = Promise.withResolvers();
   async function onData(data) {
     await outputWriter.write(data);
+    globalAgentRegistry.appendStdout(shell.pid, data);
   }
   shell.onData(onData);
   shell.onExit(async function onExit2({ exitCode: exitCode2 }) {
+    globalAgentRegistry.unregister(shell.pid);
     ctx.stdinReady.unready();
     const agentCrashed = exitCode2 !== 0;
     if (ctx.shouldRestartWithoutContinue) {
-      await pidStore.updateStatus(shell.pid, "exited", {
-        exitReason: "restarted",
-        exitCode: exitCode2 ?? undefined
-      });
+      try {
+        await pidStore.updateStatus(shell.pid, "exited", {
+          exitReason: "restarted",
+          exitCode: exitCode2 ?? undefined
+        });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+      }
       ctx.shouldRestartWithoutContinue = false;
       ctx.isFatal = false;
       const cliCommand = cliConf?.binary || cli;
@@ -21761,32 +22128,58 @@ ${prompt}` : prefix;
       logger.info(`Restarting ${cli} ${JSON.stringify([bin, ...args])}`);
       const restartPtyOptions = {
         name: "xterm-color",
-        ...getTerminalDimensions(),
+        ...getTerminalDimensions2(),
         cwd: cwd ?? process.cwd(),
         env: ptyEnv
       };
       shell = pty_default.spawn(bin, args, restartPtyOptions);
-      await pidStore.registerProcess({ pid: shell.pid, cli, args, prompt });
+      try {
+        await pidStore.registerProcess({ pid: shell.pid, cli, args, prompt, cwd: workingDir });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to register restarted process ${shell.pid}:`, error);
+      }
+      ctx.shell = shell;
+      try {
+        globalAgentRegistry.register(shell.pid, {
+          pid: shell.pid,
+          context: ctx,
+          cwd: workingDir,
+          cli,
+          prompt,
+          startTime: Date.now(),
+          stdoutBuffer: []
+        });
+      } catch (error) {
+        logger.warn(`[agentRegistry] Failed to register restarted agent ${shell.pid}:`, error);
+      }
       shell.onData(onData);
       shell.onExit(onExit2);
       return;
     }
     if (agentCrashed && robust && conf?.restoreArgs) {
       if (!conf.restoreArgs) {
-        logger.warn(`robust is only supported for ${Object.entries(CLIS_CONFIG2).filter(([_, v]) => v.restoreArgs).map(([k]) => k).join(", ")} currently, not ${cli}`);
+        logger.warn(`robust is only supported for ${Object.entries(CLIS_CONFIG3).filter(([_, v]) => v.restoreArgs).map(([k]) => k).join(", ")} currently, not ${cli}`);
         return;
       }
       if (ctx.isFatal) {
+        try {
+          await pidStore.updateStatus(shell.pid, "exited", {
+            exitReason: "fatal",
+            exitCode: exitCode2 ?? undefined
+          });
+        } catch (error) {
+          logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+        }
+        return pendingExitCode.resolve(exitCode2);
+      }
+      try {
         await pidStore.updateStatus(shell.pid, "exited", {
-          exitReason: "fatal",
+          exitReason: "restarted",
           exitCode: exitCode2 ?? undefined
         });
-        return pendingExitCode.resolve(exitCode2);
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
       }
-      await pidStore.updateStatus(shell.pid, "exited", {
-        exitReason: "restarted",
-        exitCode: exitCode2 ?? undefined
-      });
       logger.info(`${cli} crashed, restarting...`);
       let restoreArgs = conf.restoreArgs;
       if (cli === "codex") {
@@ -21800,45 +22193,155 @@ ${prompt}` : prefix;
       }
       const restorePtyOptions = {
         name: "xterm-color",
-        ...getTerminalDimensions(),
+        ...getTerminalDimensions2(),
         cwd: cwd ?? process.cwd(),
         env: ptyEnv
       };
       shell = pty_default.spawn(cli, restoreArgs, restorePtyOptions);
-      await pidStore.registerProcess({ pid: shell.pid, cli, args: restoreArgs, prompt });
+      try {
+        await pidStore.registerProcess({ pid: shell.pid, cli, args: restoreArgs, prompt, cwd: workingDir });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to register restored process ${shell.pid}:`, error);
+      }
+      ctx.shell = shell;
+      try {
+        globalAgentRegistry.register(shell.pid, {
+          pid: shell.pid,
+          context: ctx,
+          cwd: workingDir,
+          cli,
+          prompt,
+          startTime: Date.now(),
+          stdoutBuffer: []
+        });
+      } catch (error) {
+        logger.warn(`[agentRegistry] Failed to register restored agent ${shell.pid}:`, error);
+      }
       shell.onData(onData);
       shell.onExit(onExit2);
       return;
     }
     const exitReason = agentCrashed ? "crash" : "normal";
-    await pidStore.updateStatus(shell.pid, "exited", {
-      exitReason,
-      exitCode: exitCode2 ?? undefined
-    });
+    try {
+      await pidStore.updateStatus(shell.pid, "exited", {
+        exitReason,
+        exitCode: exitCode2 ?? undefined
+      });
+    } catch (error) {
+      logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+    }
     return pendingExitCode.resolve(exitCode2);
   });
   process.stdout.on("resize", () => {
-    const { cols, rows } = getTerminalDimensions();
+    const { cols, rows } = getTerminalDimensions2();
     shell.resize(cols, rows);
   });
   const terminalRender = new TerminalTextRender;
-  const isStillWorkingQ = () => terminalRender.render().replace(/\s+/g, " ").match(/esc to interrupt|to run in background/);
+  const isStillWorkingQ = () => {
+    const rendered = terminalRender.tail(24).replace(/\s+/g, " ");
+    return conf.working?.some((rgx) => rgx.test(rendered));
+  };
+  let lastHeartbeatRendered = "";
+  const heartbeatInterval = setInterval(async () => {
+    try {
+      const rendered = removeControlCharacters(terminalRender.tail(12));
+      if (rendered === lastHeartbeatRendered)
+        return;
+      lastHeartbeatRendered = rendered;
+      const lines2 = rendered.split(`
+`).filter((line) => line.trim());
+      for (const line of lines2) {
+        if (conf.ready?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|ready |${line}`);
+          ctx.stdinReady.ready();
+          ctx.stdinFirstReady.ready();
+        }
+        if (conf.enter?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|sendEnter matched|${line}`);
+          await sendEnter(ctx.messageContext, 400);
+          continue;
+        }
+        const typeingRespondMatched = Object.entries(conf.typingRespond ?? {}).filter(([_sendString, onThePatterns]) => onThePatterns.some((rx) => rx.test(line)));
+        if (typeingRespondMatched.length) {
+          await src_default(typeingRespondMatched).map(async ([sendString]) => await sendMessage3(ctx.messageContext, sendString, { waitForReady: false })).toCount();
+          continue;
+        }
+        if (conf.fatal?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|fatal |${line}`);
+          ctx.isFatal = true;
+          await exitAgent();
+          break;
+        }
+        if (conf.restartWithoutContinueArg?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|restart-without-continue|${line}`);
+          ctx.shouldRestartWithoutContinue = true;
+          ctx.isFatal = true;
+          await exitAgent();
+          break;
+        }
+        if (cli === "codex") {
+          const sessionId = extractSessionId(line);
+          if (sessionId) {
+            logger.debug(`heartbeat|session|captured session ID: ${sessionId}`);
+            await storeSessionForCwd(workingDir, sessionId);
+          }
+        }
+      }
+    } catch (error) {
+      logger.debug(`heartbeat|error: ${error}`);
+    }
+  }, 800);
+  const cleanupHeartbeat = () => clearInterval(heartbeatInterval);
+  shell.onExit(cleanupHeartbeat);
   if (exitOnIdle)
     ctx.idleWaiter.wait(exitOnIdle).then(async () => {
       await pidStore.updateStatus(shell.pid, "idle").catch(() => null);
       if (isStillWorkingQ()) {
-        logger.warn("[${cli}-yes] ${cli} is idle, but seems still working, not exiting yet");
+        logger.warn(`[${cli}-yes] ${cli} is idle, but seems still working, not exiting yet`);
         return;
       }
-      logger.info("[${cli}-yes] ${cli} is idle, exiting...");
+      logger.info(`[${cli}-yes] ${cli} is idle, exiting...`);
       await exitAgent();
     });
-  await src_default(fromReadable2(process.stdin)).map((buffer2) => buffer2.toString()).forkTo(function handleTerminateSignals(s) {
-    const handler = createTerminateSignalHandler(ctx.stdinReady, (exitCode2) => {
+  const stdinStream = new ReadableStream({
+    start(controller) {
+      process.stdin.resume();
+      const dataHandler = (chunk) => {
+        try {
+          controller.enqueue(chunk);
+        } catch (err) {}
+      };
+      const endHandler = () => {
+        controller.close();
+      };
+      const errorHandler = (err) => {
+        controller.error(err);
+      };
+      process.stdin.on("data", dataHandler);
+      process.stdin.on("end", endHandler);
+      process.stdin.on("close", endHandler);
+      process.stdin.on("error", errorHandler);
+    },
+    cancel(reason) {
+      process.stdin.pause();
+    }
+  });
+  let aborted2 = false;
+  await src_default(stdinStream).map((buffer2) => {
+    const str = buffer2.toString();
+    const CTRL_Z = "\x1A";
+    const CTRL_C = "\x03";
+    if (!aborted2 && str === CTRL_Z) {
+      return "";
+    }
+    if (!aborted2 && !ctx.stdinReady.isReady && str === CTRL_C) {
+      logger.error("User aborted: SIGINT");
       shell.kill("SIGINT");
-      pendingExitCode.resolve(exitCode2);
-    });
-    return s.map(handler);
+      pendingExitCode.resolve(130);
+      aborted2 = true;
+      return str;
+    }
+    return str;
   }).onStart(async function promptOnStart() {
     logger.debug("Sending prompt message: " + JSON.stringify(prompt));
     if (prompt)
@@ -21866,15 +22369,62 @@ ${prompt}` : prefix;
       }).run();
     }).catch(() => f.run());
   }).by(function consoleResponder(e) {
-    if (cli === "codex")
-      shell.write(`\x1B[1;1R`);
-    return e.forEach((text) => handleConsoleControlCodes(text, shell, terminalRender, cli, verbose));
-  }).forkTo(function autoResponse(e) {
-    return e.map((e2) => removeControlCharacters(e2)).by((s) => {
-      if (conf.noEOL)
-        return s;
-      return s.lines({ EOL: "NONE" });
-    }).forEach(async (line, lineIndex) => createAutoResponseHandler(line, lineIndex, { ctx, conf, cli, workingDir, exitAgent })).run();
+    let lastRendered = "";
+    return e.forEach((chunk) => {
+      terminalRender.write(chunk);
+      if (chunk.includes("\x1B[c") || chunk.includes("\x1B[0c")) {
+        shell.write("\x1B[?1;2c");
+        if (verbose) {
+          logger.debug("device|respond DA: VT100 with Advanced Video Option");
+        }
+        return;
+      }
+      if (process.stdin.isTTY)
+        return;
+      if (!chunk.includes("\x1B[6n"))
+        return;
+      const { col, row } = terminalRender.getCursorPosition();
+      shell.write(`\x1B[${row};${col}R`);
+      logger.debug(`cursor|respond position: row=${String(row)}, col=${String(col)}`);
+    }).forEach(async (line, lineIndex) => {
+      const rendered = terminalRender.tail(24);
+      if (rendered === lastRendered)
+        return;
+      logger.debug(`stdout|${line}`);
+      if (conf.ready?.some((rx) => line.match(rx))) {
+        logger.debug(`ready |${line}`);
+        if (cli === "gemini" && lineIndex <= 80)
+          return;
+        ctx.stdinReady.ready();
+        ctx.stdinFirstReady.ready();
+      }
+      if (conf.enter?.some((rx) => line.match(rx))) {
+        logger.debug(`sendEnter matched|${line}`);
+        return await sendEnter(ctx.messageContext, 400);
+      }
+      const typeingRespondMatched = Object.entries(conf.typingRespond ?? {}).filter(([_sendString, onThePatterns]) => onThePatterns.some((rx) => line.match(rx)));
+      const typingResponded = typeingRespondMatched.length && await src_default(typeingRespondMatched).map(async ([sendString]) => await sendMessage3(ctx.messageContext, sendString, { waitForReady: false })).toCount();
+      if (typingResponded)
+        return;
+      if (conf.fatal?.some((rx) => line.match(rx))) {
+        logger.debug(`fatal |${line}`);
+        ctx.isFatal = true;
+        await exitAgent();
+      }
+      if (conf.restartWithoutContinueArg?.some((rx) => line.match(rx))) {
+        logger.debug(`restart-without-continue|${line}`);
+        ctx.shouldRestartWithoutContinue = true;
+        ctx.isFatal = true;
+        await exitAgent();
+      }
+      if (cli === "codex") {
+        const sessionId = extractSessionId(line);
+        if (sessionId) {
+          logger.debug(`session|captured session ID: ${sessionId}`);
+          await storeSessionForCwd(workingDir, sessionId);
+        }
+      }
+    });
   }).by((s) => removeControlCharactersFromStdout ? s.map((e) => removeControlCharacters(e)) : s).by(createTerminatorStream(pendingExitCode.promise)).to(fromWritable2(process.stdout));
   await saveLogFile(ctx.logPaths.logPath, terminalRender.render());
   const exitCode = await pendingExitCode.promise;
@@ -21898,7 +22448,7 @@ ${prompt}` : prefix;
       }, 5000))
     ]);
   }
-  function getTerminalDimensions() {
+  function getTerminalDimensions2() {
     if (!process.stdout.isTTY)
       return { cols: 80, rows: 24 };
     return {
@@ -21910,7 +22460,7 @@ ${prompt}` : prefix;
 function sleep3(ms2) {
   return new Promise((resolve5) => setTimeout(resolve5, ms2));
 }
-var config2, CLIS_CONFIG2;
+var config2, CLIS_CONFIG3;
 var init_ts = __esm(async () => {
   init_execa();
   init_dist();
@@ -21923,14 +22473,13 @@ var init_ts = __esm(async () => {
   init_messaging();
   init_logging();
   init_context();
-  init_responders();
-  init_streamHelpers();
+  init_agentRegistry();
   await __promiseAll([
     init_pty(),
     init_spawner()
   ]);
   config2 = await init_agent_yes_config().then(() => exports_agent_yes_config).then((mod) => mod.default || mod);
-  CLIS_CONFIG2 = config2.clis;
+  CLIS_CONFIG3 = config2.clis;
 });
 
 // ts/index.ts
@@ -21945,13 +22494,12 @@ init_pidStore();
 init_messaging();
 init_logging();
 init_context();
-init_responders();
-init_streamHelpers();
+init_agentRegistry();
 await __promiseAll([
   init_pty(),
   init_spawner()
 ]);
-import { fromReadable, fromWritable } from "from-node-stream";
+import { fromWritable } from "from-node-stream";
 import { mkdir as mkdir7, readFile as readFile3, writeFile as writeFile5 } from "fs/promises";
 import path13 from "path";
 var config = await init_agent_yes_config().then(() => exports_agent_yes_config).then((mod) => mod.default || mod);
@@ -22014,7 +22562,11 @@ async function agentYes({
       stdinFirstReady.ready();
   });
   const nextStdout = new ReadyManager;
+  if (verbose)
+    logger.debug(`[stdin] isTTY: ${process.stdin.isTTY}, setRawMode available: ${!!process.stdin.setRawMode}`);
   process.stdin.setRawMode?.(true);
+  if (verbose)
+    logger.debug(`[stdin] Raw mode set, isRaw: ${process.stdin.isRaw}`);
   const shellOutputStream = new TransformStream;
   const outputWriter = shellOutputStream.writable.getWriter();
   logger.debug(`Using ${ptyPackage} for pseudo terminal management.`);
@@ -22131,7 +22683,11 @@ ${prompt}` : prefix;
     install,
     ptyOptions
   });
-  await pidStore.registerProcess({ pid: shell.pid, cli, args: cliArgs, prompt });
+  try {
+    await pidStore.registerProcess({ pid: shell.pid, cli, args: cliArgs, prompt, cwd: workingDir });
+  } catch (error) {
+    logger.warn(`[pidStore] Failed to register process ${shell.pid}:`, error);
+  }
   const logPaths = await initializeLogPaths(pidStore, shell.pid);
   setupDebugLogging(logPaths.debuggingLogsPath);
   const ctx = new AgentContext({
@@ -22143,6 +22699,19 @@ ${prompt}` : prefix;
     verbose,
     robust
   });
+  try {
+    globalAgentRegistry.register(shell.pid, {
+      pid: shell.pid,
+      context: ctx,
+      cwd: workingDir,
+      cli,
+      prompt,
+      startTime: Date.now(),
+      stdoutBuffer: []
+    });
+  } catch (error) {
+    logger.warn(`[agentRegistry] Failed to register agent ${shell.pid}:`, error);
+  }
   sleep2(1e4).then(() => {
     if (!ctx.stdinReady.isReady)
       ctx.stdinReady.ready();
@@ -22152,16 +22721,22 @@ ${prompt}` : prefix;
   const pendingExitCode = Promise.withResolvers();
   async function onData(data) {
     await outputWriter.write(data);
+    globalAgentRegistry.appendStdout(shell.pid, data);
   }
   shell.onData(onData);
   shell.onExit(async function onExit2({ exitCode: exitCode2 }) {
+    globalAgentRegistry.unregister(shell.pid);
     ctx.stdinReady.unready();
     const agentCrashed = exitCode2 !== 0;
     if (ctx.shouldRestartWithoutContinue) {
-      await pidStore.updateStatus(shell.pid, "exited", {
-        exitReason: "restarted",
-        exitCode: exitCode2 ?? undefined
-      });
+      try {
+        await pidStore.updateStatus(shell.pid, "exited", {
+          exitReason: "restarted",
+          exitCode: exitCode2 ?? undefined
+        });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+      }
       ctx.shouldRestartWithoutContinue = false;
       ctx.isFatal = false;
       const cliCommand = cliConf?.binary || cli;
@@ -22177,7 +22752,25 @@ ${prompt}` : prefix;
         env: ptyEnv
       };
       shell = pty_default.spawn(bin, args, restartPtyOptions);
-      await pidStore.registerProcess({ pid: shell.pid, cli, args, prompt });
+      try {
+        await pidStore.registerProcess({ pid: shell.pid, cli, args, prompt, cwd: workingDir });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to register restarted process ${shell.pid}:`, error);
+      }
+      ctx.shell = shell;
+      try {
+        globalAgentRegistry.register(shell.pid, {
+          pid: shell.pid,
+          context: ctx,
+          cwd: workingDir,
+          cli,
+          prompt,
+          startTime: Date.now(),
+          stdoutBuffer: []
+        });
+      } catch (error) {
+        logger.warn(`[agentRegistry] Failed to register restarted agent ${shell.pid}:`, error);
+      }
       shell.onData(onData);
       shell.onExit(onExit2);
       return;
@@ -22188,16 +22781,24 @@ ${prompt}` : prefix;
         return;
       }
       if (ctx.isFatal) {
+        try {
+          await pidStore.updateStatus(shell.pid, "exited", {
+            exitReason: "fatal",
+            exitCode: exitCode2 ?? undefined
+          });
+        } catch (error) {
+          logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+        }
+        return pendingExitCode.resolve(exitCode2);
+      }
+      try {
         await pidStore.updateStatus(shell.pid, "exited", {
-          exitReason: "fatal",
+          exitReason: "restarted",
           exitCode: exitCode2 ?? undefined
         });
-        return pendingExitCode.resolve(exitCode2);
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
       }
-      await pidStore.updateStatus(shell.pid, "exited", {
-        exitReason: "restarted",
-        exitCode: exitCode2 ?? undefined
-      });
       logger.info(`${cli} crashed, restarting...`);
       let restoreArgs = conf.restoreArgs;
       if (cli === "codex") {
@@ -22216,16 +22817,38 @@ ${prompt}` : prefix;
         env: ptyEnv
       };
       shell = pty_default.spawn(cli, restoreArgs, restorePtyOptions);
-      await pidStore.registerProcess({ pid: shell.pid, cli, args: restoreArgs, prompt });
+      try {
+        await pidStore.registerProcess({ pid: shell.pid, cli, args: restoreArgs, prompt, cwd: workingDir });
+      } catch (error) {
+        logger.warn(`[pidStore] Failed to register restored process ${shell.pid}:`, error);
+      }
+      ctx.shell = shell;
+      try {
+        globalAgentRegistry.register(shell.pid, {
+          pid: shell.pid,
+          context: ctx,
+          cwd: workingDir,
+          cli,
+          prompt,
+          startTime: Date.now(),
+          stdoutBuffer: []
+        });
+      } catch (error) {
+        logger.warn(`[agentRegistry] Failed to register restored agent ${shell.pid}:`, error);
+      }
       shell.onData(onData);
       shell.onExit(onExit2);
       return;
     }
     const exitReason = agentCrashed ? "crash" : "normal";
-    await pidStore.updateStatus(shell.pid, "exited", {
-      exitReason,
-      exitCode: exitCode2 ?? undefined
-    });
+    try {
+      await pidStore.updateStatus(shell.pid, "exited", {
+        exitReason,
+        exitCode: exitCode2 ?? undefined
+      });
+    } catch (error) {
+      logger.warn(`[pidStore] Failed to update status for PID ${shell.pid}:`, error);
+    }
     return pendingExitCode.resolve(exitCode2);
   });
   process.stdout.on("resize", () => {
@@ -22233,23 +22856,111 @@ ${prompt}` : prefix;
     shell.resize(cols, rows);
   });
   const terminalRender = new TerminalTextRender;
-  const isStillWorkingQ = () => terminalRender.render().replace(/\s+/g, " ").match(/esc to interrupt|to run in background/);
+  const isStillWorkingQ = () => {
+    const rendered = terminalRender.tail(24).replace(/\s+/g, " ");
+    return conf.working?.some((rgx) => rgx.test(rendered));
+  };
+  let lastHeartbeatRendered = "";
+  const heartbeatInterval = setInterval(async () => {
+    try {
+      const rendered = removeControlCharacters(terminalRender.tail(12));
+      if (rendered === lastHeartbeatRendered)
+        return;
+      lastHeartbeatRendered = rendered;
+      const lines2 = rendered.split(`
+`).filter((line) => line.trim());
+      for (const line of lines2) {
+        if (conf.ready?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|ready |${line}`);
+          ctx.stdinReady.ready();
+          ctx.stdinFirstReady.ready();
+        }
+        if (conf.enter?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|sendEnter matched|${line}`);
+          await sendEnter(ctx.messageContext, 400);
+          continue;
+        }
+        const typeingRespondMatched = Object.entries(conf.typingRespond ?? {}).filter(([_sendString, onThePatterns]) => onThePatterns.some((rx) => rx.test(line)));
+        if (typeingRespondMatched.length) {
+          await src_default(typeingRespondMatched).map(async ([sendString]) => await sendMessage3(ctx.messageContext, sendString, { waitForReady: false })).toCount();
+          continue;
+        }
+        if (conf.fatal?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|fatal |${line}`);
+          ctx.isFatal = true;
+          await exitAgent();
+          break;
+        }
+        if (conf.restartWithoutContinueArg?.some((rx) => rx.test(line))) {
+          logger.debug(`heartbeat|restart-without-continue|${line}`);
+          ctx.shouldRestartWithoutContinue = true;
+          ctx.isFatal = true;
+          await exitAgent();
+          break;
+        }
+        if (cli === "codex") {
+          const sessionId = extractSessionId(line);
+          if (sessionId) {
+            logger.debug(`heartbeat|session|captured session ID: ${sessionId}`);
+            await storeSessionForCwd(workingDir, sessionId);
+          }
+        }
+      }
+    } catch (error) {
+      logger.debug(`heartbeat|error: ${error}`);
+    }
+  }, 800);
+  const cleanupHeartbeat = () => clearInterval(heartbeatInterval);
+  shell.onExit(cleanupHeartbeat);
   if (exitOnIdle)
     ctx.idleWaiter.wait(exitOnIdle).then(async () => {
       await pidStore.updateStatus(shell.pid, "idle").catch(() => null);
       if (isStillWorkingQ()) {
-        logger.warn("[${cli}-yes] ${cli} is idle, but seems still working, not exiting yet");
+        logger.warn(`[${cli}-yes] ${cli} is idle, but seems still working, not exiting yet`);
         return;
       }
-      logger.info("[${cli}-yes] ${cli} is idle, exiting...");
+      logger.info(`[${cli}-yes] ${cli} is idle, exiting...`);
       await exitAgent();
     });
-  await src_default(fromReadable(process.stdin)).map((buffer2) => buffer2.toString()).forkTo(function handleTerminateSignals(s) {
-    const handler = createTerminateSignalHandler(ctx.stdinReady, (exitCode2) => {
+  const stdinStream = new ReadableStream({
+    start(controller) {
+      process.stdin.resume();
+      const dataHandler = (chunk) => {
+        try {
+          controller.enqueue(chunk);
+        } catch (err) {}
+      };
+      const endHandler = () => {
+        controller.close();
+      };
+      const errorHandler = (err) => {
+        controller.error(err);
+      };
+      process.stdin.on("data", dataHandler);
+      process.stdin.on("end", endHandler);
+      process.stdin.on("close", endHandler);
+      process.stdin.on("error", errorHandler);
+    },
+    cancel(reason) {
+      process.stdin.pause();
+    }
+  });
+  let aborted2 = false;
+  await src_default(stdinStream).map((buffer2) => {
+    const str = buffer2.toString();
+    const CTRL_Z = "\x1A";
+    const CTRL_C = "\x03";
+    if (!aborted2 && str === CTRL_Z) {
+      return "";
+    }
+    if (!aborted2 && !ctx.stdinReady.isReady && str === CTRL_C) {
+      logger.error("User aborted: SIGINT");
       shell.kill("SIGINT");
-      pendingExitCode.resolve(exitCode2);
-    });
-    return s.map(handler);
+      pendingExitCode.resolve(130);
+      aborted2 = true;
+      return str;
+    }
+    return str;
   }).onStart(async function promptOnStart() {
     logger.debug("Sending prompt message: " + JSON.stringify(prompt));
     if (prompt)
@@ -22277,15 +22988,62 @@ ${prompt}` : prefix;
       }).run();
     }).catch(() => f.run());
   }).by(function consoleResponder(e) {
-    if (cli === "codex")
-      shell.write(`\x1B[1;1R`);
-    return e.forEach((text) => handleConsoleControlCodes(text, shell, terminalRender, cli, verbose));
-  }).forkTo(function autoResponse(e) {
-    return e.map((e2) => removeControlCharacters(e2)).by((s) => {
-      if (conf.noEOL)
-        return s;
-      return s.lines({ EOL: "NONE" });
-    }).forEach(async (line, lineIndex) => createAutoResponseHandler(line, lineIndex, { ctx, conf, cli, workingDir, exitAgent })).run();
+    let lastRendered = "";
+    return e.forEach((chunk) => {
+      terminalRender.write(chunk);
+      if (chunk.includes("\x1B[c") || chunk.includes("\x1B[0c")) {
+        shell.write("\x1B[?1;2c");
+        if (verbose) {
+          logger.debug("device|respond DA: VT100 with Advanced Video Option");
+        }
+        return;
+      }
+      if (process.stdin.isTTY)
+        return;
+      if (!chunk.includes("\x1B[6n"))
+        return;
+      const { col, row } = terminalRender.getCursorPosition();
+      shell.write(`\x1B[${row};${col}R`);
+      logger.debug(`cursor|respond position: row=${String(row)}, col=${String(col)}`);
+    }).forEach(async (line, lineIndex) => {
+      const rendered = terminalRender.tail(24);
+      if (rendered === lastRendered)
+        return;
+      logger.debug(`stdout|${line}`);
+      if (conf.ready?.some((rx) => line.match(rx))) {
+        logger.debug(`ready |${line}`);
+        if (cli === "gemini" && lineIndex <= 80)
+          return;
+        ctx.stdinReady.ready();
+        ctx.stdinFirstReady.ready();
+      }
+      if (conf.enter?.some((rx) => line.match(rx))) {
+        logger.debug(`sendEnter matched|${line}`);
+        return await sendEnter(ctx.messageContext, 400);
+      }
+      const typeingRespondMatched = Object.entries(conf.typingRespond ?? {}).filter(([_sendString, onThePatterns]) => onThePatterns.some((rx) => line.match(rx)));
+      const typingResponded = typeingRespondMatched.length && await src_default(typeingRespondMatched).map(async ([sendString]) => await sendMessage3(ctx.messageContext, sendString, { waitForReady: false })).toCount();
+      if (typingResponded)
+        return;
+      if (conf.fatal?.some((rx) => line.match(rx))) {
+        logger.debug(`fatal |${line}`);
+        ctx.isFatal = true;
+        await exitAgent();
+      }
+      if (conf.restartWithoutContinueArg?.some((rx) => line.match(rx))) {
+        logger.debug(`restart-without-continue|${line}`);
+        ctx.shouldRestartWithoutContinue = true;
+        ctx.isFatal = true;
+        await exitAgent();
+      }
+      if (cli === "codex") {
+        const sessionId = extractSessionId(line);
+        if (sessionId) {
+          logger.debug(`session|captured session ID: ${sessionId}`);
+          await storeSessionForCwd(workingDir, sessionId);
+        }
+      }
+    });
   }).by((s) => removeControlCharactersFromStdout ? s.map((e) => removeControlCharacters(e)) : s).by(createTerminatorStream(pendingExitCode.promise)).to(fromWritable(process.stdout));
   await saveLogFile(ctx.logPaths.logPath, terminalRender.render());
   const exitCode = await pendingExitCode.promise;
@@ -27688,7 +28446,7 @@ var package_default = {
     registry: "https://registry.npmjs.org/"
   },
   scripts: {
-    build: "bun build ./ts/cli.ts ./ts/index.ts --outdir=dist --target=node --sourcemap --external=@snomiao/bun-pty --external=bun-pty --external=node-pty --external=from-node-stream --external=bun",
+    build: "bun build ./ts/cli.ts ./ts/index.ts --outdir=dist --target=node --sourcemap --external=@snomiao/bun-pty --external=bun-pty --external=node-pty --external=from-node-stream --external=bun --external=@modelcontextprotocol/sdk",
     postbuild: "bun ./ts/postbuild.ts",
     demo: "bun run build && bun link && claude-yes -- demo",
     dev: "bun ts/index.ts",
@@ -27702,10 +28460,12 @@ var package_default = {
   },
   dependencies: {
     "@snomiao/bun-pty": "^0.3.4",
+    "@snomiao/keyv-sqlite": "^5.0.4",
     "bun-pty": "^0.4.8",
     "from-node-stream": "^0.1.2"
   },
   devDependencies: {
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "@semantic-release/exec": "^7.1.0",
     "@types/bun": "^1.3.6",
     "@types/jest": "^30.0.0",
@@ -27728,7 +28488,8 @@ var package_default = {
     "terminal-render": "^1.3.0",
     vitest: "^4.0.17",
     winston: "^3.19.0",
-    yargs: "^18.0.0"
+    yargs: "^18.0.0",
+    zod: "^3.23.0"
   },
   peerDependencies: {
     "node-pty": "latest",
@@ -27930,6 +28691,7 @@ class PidStore2 {
             cli TEXT NOT NULL,
             args TEXT NOT NULL,
             prompt TEXT,
+            cwd TEXT NOT NULL,
             logFile TEXT NOT NULL,
             fifoFile TEXT NOT NULL,
             status TEXT NOT NULL DEFAULT 'active',
@@ -27951,7 +28713,8 @@ class PidStore2 {
     pid,
     cli,
     args,
-    prompt
+    prompt,
+    cwd
   }) {
     const now = Date.now();
     const argsJson = JSON.stringify(args);
@@ -27959,16 +28722,16 @@ class PidStore2 {
     const fifoFile = this.getFifoPath(pid);
     try {
       this.db.run(`
-        INSERT INTO pid_records (pid, cli, args, prompt, logFile, fifoFile, status, exitReason, startedAt, updatedAt)
-        VALUES (?, ?, ?, ?, ?, ?, 'active', '', ?, ?)
-      `, [pid, cli, argsJson, prompt, logFile, fifoFile, now, now]);
+        INSERT INTO pid_records (pid, cli, args, prompt, cwd, logFile, fifoFile, status, exitReason, startedAt, updatedAt)
+        VALUES (?, ?, ?, ?, ?, ?, ?, 'active', '', ?, ?)
+      `, [pid, cli, argsJson, prompt, cwd, logFile, fifoFile, now, now]);
     } catch (error) {
       if (error.code === "SQLITE_CONSTRAINT_UNIQUE") {
         this.db.run(`
           UPDATE pid_records
-          SET cli = ?, args = ?, prompt = ?, logFile = ?, fifoFile = ?, status = 'active', exitReason = '', startedAt = ?, updatedAt = ?
+          SET cli = ?, args = ?, prompt = ?, cwd = ?, logFile = ?, fifoFile = ?, status = 'active', exitReason = '', startedAt = ?, updatedAt = ?
           WHERE pid = ?
-        `, [cli, argsJson, prompt, logFile, fifoFile, now, now, pid]);
+        `, [cli, argsJson, prompt, cwd, logFile, fifoFile, now, now, pid]);
       } else {
         throw error;
       }
@@ -27993,6 +28756,9 @@ class PidStore2 {
     }
     logger.debug(`[pidStore] Updated process ${pid} status=${status}`);
   }
+  getAllRecords() {
+    return this.db.query("SELECT * FROM pid_records");
+  }
   getLogDir() {
     return path14.resolve(this.storeDir, "logs");
   }
@@ -28072,6 +28838,12 @@ fifo/
 }
 
 // ts/cli.ts
+var rawArgs = process.argv.slice(2);
+if (rawArgs[0] === "mcp" && rawArgs[1] === "serve") {
+  const { startMcpServer: startMcpServer2 } = await init_mcp_server().then(() => exports_mcp_server);
+  await startMcpServer2();
+  process.exit(0);
+}
 var config3 = parseCliArgs(process.argv);
 if (config3.appendPrompt) {
   const ipcPath = await PidStore2.findActiveFifo(process.cwd());
@@ -28126,5 +28898,5 @@ var { exitCode } = await cliYes(config3);
 console.log("exiting process");
 process.exit(exitCode ?? 1);
 
-//# debugId=5E51725C76510FBE64756E2164756E21
+//# debugId=138DDE1799AB280064756E2164756E21
 //# sourceMappingURL=cli.js.map