@todoforai/cli 0.1.62 → 0.1.63

package/dist/todoforai-cli.js

@@ -42675,25 +42675,53 @@ var require_dist = __commonJS((exports) => {
 });
 
 // src/index.ts
-import { realpathSync as realpathSync2, readFileSync as readFileSync3, existsSync as existsSync2 } from "fs";
-import { resolve as resolve4 } from "path";
+import { realpathSync as realpathSync2, readFileSync as readFileSync5, existsSync as existsSync4 } from "fs";
+import { resolve as resolve5 } from "path";
 import { fileURLToPath } from "url";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir5 } from "os";
 import path4 from "path";
 
 // node_modules/@todoforai/update-notifier/src/index.ts
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
-function isLinkedInstall() {
+import { spawn, spawnSync } from "node:child_process";
+function installer() {
+  let real;
   try {
-    return !fs.realpathSync(process.argv[1] || "").includes(`${path.sep}node_modules${path.sep}`);
+    real = fs.realpathSync(process.argv[1] || "");
   } catch {
-    return false;
+    return null;
   }
+  if (!real.includes(`${path.sep}node_modules${path.sep}`))
+    return null;
+  return real.includes(path.join(".bun", "install", "global")) ? "bun" : "npm";
 }
 var TTL_MS = 24 * 60 * 60 * 1000;
 var CACHE_DIR = path.join(os.homedir(), ".config", "todoforai");
+var cacheFileFor = (name) => path.join(CACHE_DIR, `notifier-${encodeURIComponent(name)}.json`);
+function readCache(name) {
+  try {
+    return JSON.parse(fs.readFileSync(cacheFileFor(name), "utf8"));
+  } catch {
+    return {};
+  }
+}
+function writeCache(name, cache) {
+  try {
+    fs.mkdirSync(CACHE_DIR, { recursive: true });
+    fs.writeFileSync(cacheFileFor(name), JSON.stringify(cache));
+  } catch {}
+}
+function refreshCache(name, cache) {
+  if (Date.now() - (cache.ts ?? 0) <= TTL_MS)
+    return;
+  writeCache(name, { ...cache, ts: Date.now() });
+  fetch(`https://registry.npmjs.org/${name}/latest`, { signal: AbortSignal.timeout(3000) }).then((r) => r.ok ? r.json() : null).then((j) => {
+    if (j?.version)
+      writeCache(name, { ...cache, ts: Date.now(), latest: j.version });
+  }).catch(() => {});
+}
 function cmpVer(a, b) {
   const pa = a.split("-")[0].split(".").map((n) => parseInt(n, 10) || 0);
   const pb = b.split("-")[0].split(".").map((n) => parseInt(n, 10) || 0);
@@ -42705,13 +42733,11 @@ function cmpVer(a, b) {
   return 0;
 }
 function checkForUpdates(pkg) {
-  if (!process.stderr.isTTY || process.env.CI || process.env.NO_UPDATE_NOTIFIER || isLinkedInstall())
+  if (!process.stderr.isTTY || process.env.CI || process.env.NO_UPDATE_NOTIFIER || !installer())
     return;
-  const cacheFile = path.join(CACHE_DIR, `notifier-${encodeURIComponent(pkg.name)}.json`);
-  let cache = {};
-  try {
-    cache = JSON.parse(fs.readFileSync(cacheFile, "utf8"));
-  } catch {}
+  if (process.argv.includes("--json"))
+    return;
+  const cache = readCache(pkg.name);
   if (cache.latest && cmpVer(cache.latest, pkg.version) > 0) {
     process.stderr.write(`
 \x1B[33m  Update available: \x1B[2m${pkg.version}\x1B[22m → \x1B[1m${cache.latest}\x1B[0m
@@ -42719,18 +42745,68 @@ function checkForUpdates(pkg) {
 
 `);
   }
-  if (Date.now() - (cache.ts ?? 0) > TTL_MS) {
+  refreshCache(pkg.name, cache);
+}
+function backgroundUpdate(pkg) {
+  const mgr = installer();
+  if (process.env.CI || process.env.NO_UPDATE_NOTIFIER || !mgr)
+    return;
+  const cache = readCache(pkg.name);
+  const latest = cache.latest;
+  if (latest && cmpVer(latest, pkg.version) > 0 && cache.tried !== latest) {
+    const next = { ...cache, tried: latest };
+    writeCache(pkg.name, next);
     try {
-      fs.mkdirSync(CACHE_DIR, { recursive: true });
-      fs.writeFileSync(cacheFile, JSON.stringify({ ...cache, ts: Date.now() }));
+      const args = mgr === "bun" ? ["add", "-g", `${pkg.name}@${latest}`] : ["i", "-g", `${pkg.name}@${latest}`];
+      const win = process.platform === "win32";
+      spawn(win ? `${mgr}.cmd` : mgr, args, { detached: true, stdio: "ignore", shell: win, windowsHide: true }).unref();
     } catch {}
-    fetch(`https://registry.npmjs.org/${pkg.name}/latest`, { signal: AbortSignal.timeout(3000) }).then((r) => r.ok ? r.json() : null).then((j) => {
-      if (!j?.version)
-        return;
-      fs.writeFileSync(cacheFile, JSON.stringify({ ts: Date.now(), latest: j.version }));
-    }).catch(() => {});
+    refreshCache(pkg.name, next);
+    return;
+  }
+  checkForUpdates(pkg);
+}
+var log = (msg) => process.stderr.write(msg + `
+`);
+function install(pkg, mgr, latest) {
+  log(`\x1B[33m  Updating ${pkg.name} ${pkg.version} → ${latest} ...\x1B[0m`);
+  const cmd = process.platform === "win32" ? `${mgr}.cmd` : mgr;
+  const args = mgr === "bun" ? ["add", "-g", `${pkg.name}@${latest}`] : ["i", "-g", `${pkg.name}@${latest}`];
+  const r = spawnSync(cmd, args, { stdio: "inherit", timeout: 120000 });
+  if (r.status !== 0) {
+    writeCache(pkg.name, { ...readCache(pkg.name), failed: latest });
+    log(`\x1B[31m  Update to ${latest} failed — run manually: ${mgr} ${args.join(" ")}\x1B[0m`);
+    return "failed";
+  }
+  log(`\x1B[32m  ✓ Updated to ${latest}\x1B[0m (active from the next start)`);
+  writeCache(pkg.name, { ts: Date.now(), latest });
+  return "updated";
+}
+async function fetchLatest(name, timeoutMs) {
+  try {
+    const r = await fetch(`https://registry.npmjs.org/${name}/latest`, { signal: AbortSignal.timeout(timeoutMs) });
+    return r.ok ? (await r.json())?.version : undefined;
+  } catch {
+    return;
   }
 }
+async function selfUpdate(pkg) {
+  const mgr = installer();
+  if (!mgr) {
+    log(`\x1B[33mNot a package-manager install — update manually: npm i -g ${pkg.name}\x1B[0m`);
+    return "unsupported";
+  }
+  const latest = await fetchLatest(pkg.name, 1e4);
+  if (!latest) {
+    log("\x1B[31mCould not reach the npm registry.\x1B[0m");
+    return "failed";
+  }
+  if (cmpVer(latest, pkg.version) <= 0) {
+    log(`\x1B[32m✓ Already up to date (${pkg.version}).\x1B[0m`);
+    return "current";
+  }
+  return install(pkg, mgr, latest);
+}
 
 // src/tips.ts
 var TIPS = [
@@ -42981,6 +43057,9 @@ class ApiClient {
   getAgentSettings(id) {
     return this.request("GET", `/api/v1/agents/${id}`);
   }
+  importSession(input) {
+    return this.request("POST", "/api/v1/todos/import", input, 120000);
+  }
   addMessage(projectId, content, agentSettings, todoId, attachments, scheduledTimestamp, groupTag, groupName) {
     const payload = { content, agentSettings, attachments: attachments || [] };
     if (todoId)
@@ -43245,7 +43324,7 @@ function writeCredential(apiUrl, apiKey) {
 }
 
 // ../packages/shared-api/src/frontend-ws.ts
-var log = (level, ...args) => console.log(`[frontend-ws:${level}]`, ...args);
+var log2 = (level, ...args) => console.log(`[frontend-ws:${level}]`, ...args);
 
 class FrontendWebSocket {
   apiUrl;
@@ -43327,7 +43406,7 @@ class FrontendWebSocket {
         resolve(false);
       });
       sock.on("error", (err) => {
-        log("error", "WS error:", err.message);
+        log2("error", "WS error:", err.message);
         if (current())
           this.connected = false;
         resolve(false);
@@ -43764,6 +43843,75 @@ var NON_SHELL_TYPES = new Set([
   "IOS" /* IOS */
 ]);
 // ../packages/shared-fbe/src/blocks/index.ts
+var ToolType;
+((ToolType2) => {
+  ToolType2["Read"] = "read";
+  ToolType2["Create"] = "create";
+  ToolType2["Write"] = "write";
+  ToolType2["Edit"] = "edit";
+  ToolType2["ModifyFile"] = "modify_file";
+  ToolType2["Bash"] = "bash";
+  ToolType2["Grep"] = "grep";
+  ToolType2["List"] = "list";
+  ToolType2["Skill"] = "skill";
+  ToolType2["ApiGetCurrentContext"] = "api_get_current_context";
+  ToolType2["ApiGetTodo"] = "api_get_todo";
+  ToolType2["ApiAddTodoMessage"] = "api_add_todo_message";
+  ToolType2["ApiUpdateTodoStatus"] = "api_update_todo_status";
+  ToolType2["ApiDeleteTodo"] = "api_delete_todo";
+  ToolType2["ApiListProjects"] = "api_list_projects";
+  ToolType2["ApiGetProject"] = "api_get_project";
+  ToolType2["ApiCreateProject"] = "api_create_project";
+  ToolType2["ApiListProjectTodos"] = "api_list_project_todos";
+  ToolType2["ApiCreateTodo"] = "api_create_todo";
+  ToolType2["ApiListAgents"] = "api_list_agents";
+  ToolType2["ApiGetAgent"] = "api_get_agent";
+  ToolType2["ApiUpdateAgent"] = "api_update_agent";
+  ToolType2["ApiListBusinessContexts"] = "api_list_business_contexts";
+  ToolType2["ApiGetContextItem"] = "api_get_context_item";
+  ToolType2["ApiCreateContextItem"] = "api_create_context_item";
+  ToolType2["ApiUpdateContextItem"] = "api_update_context_item";
+  ToolType2["ApiDeleteContextItem"] = "api_delete_context_item";
+  ToolType2["ApiListEdges"] = "api_list_edges";
+  ToolType2["ApiGetEdge"] = "api_get_edge";
+  ToolType2["ApiListMcps"] = "api_list_mcps";
+  ToolType2["ApiGetUsage"] = "api_get_usage";
+  ToolType2["ApiGetBalance"] = "api_get_balance";
+  ToolType2["ApiGetApiSchema"] = "api_get_api_schema";
+  ToolType2["ApiListBoard"] = "api_list_board";
+  ToolType2["ApiUpsertGroup"] = "api_upsert_group";
+  ToolType2["ApiCreateTemplate"] = "api_create_template";
+  ToolType2["ApiRecommendTemplate"] = "api_recommend_template";
+  ToolType2["ImageGen"] = "image_gen";
+  ToolType2["HtmlSnippet"] = "html_snippet";
+  ToolType2["LivePreview"] = "live_preview";
+  ToolType2["OpenBrowser"] = "open_browser";
+  ToolType2["Show"] = "show";
+  ToolType2["Text"] = "text";
+  ToolType2["Reason"] = "reason";
+  ToolType2["Error"] = "error";
+  ToolType2["Compact"] = "compact";
+  ToolType2["Question"] = "question";
+  ToolType2["Login"] = "login_prompt";
+  ToolType2["BusinessOnboarding"] = "business_onboarding";
+  ToolType2["RequestMcpAccess"] = "request_mcp_access";
+  ToolType2["EdgeNotRunning"] = "edge_not_running";
+  ToolType2["WebFetch"] = "webfetch";
+  ToolType2["GoogleSearch"] = "google_search";
+  ToolType2["WebSearch"] = "web_search";
+  ToolType2["VaultSearch"] = "vault_search";
+  ToolType2["VaultResolve"] = "vault_resolve";
+  ToolType2["VaultWrite"] = "vault_write";
+  ToolType2["VaultWriteBatch"] = "vault_write_batch";
+  ToolType2["VaultUpdate"] = "vault_update";
+  ToolType2["Explore"] = "explore";
+  ToolType2["Plan"] = "plan";
+  ToolType2["Review"] = "review";
+  ToolType2["DeviceList"] = "device_list";
+  ToolType2["Mcp"] = "mcp";
+  ToolType2["NamedTool"] = "named_tool";
+})(ToolType ||= {});
+var TOOL_TYPE_VALUES = new Set(Object.values(ToolType));
 var USER_INPUT_BLOCK_TYPES = new Set([
   "question" /* Question */,
   "login_prompt" /* Login */,
@@ -44445,7 +44593,7 @@ var tool_catalog_default = {
     installer: "npm",
     label: "Gmail",
     summary: "Read and send Gmail from your own account.",
-    statusCmd: "zele whoami 2>/dev/null | grep 'email:' | grep -m1 .",
+    statusCmd: "zele whoami 2>/dev/null | grep -o 'email: *[^ ]*' | tr -d ' ' | paste -sd ' ' - | grep -m1 .",
     loginNeedsPty: true,
     loginCmd: "zele login --method google",
     oauthUrlPattern: "(https://accounts\\.google\\.com\\S+)",
@@ -44464,7 +44612,7 @@ var tool_catalog_default = {
     binName: "zele",
     label: "Google Calendar",
     summary: "See your Google Calendar and book, move or cancel events.",
-    statusCmd: "zele whoami 2>/dev/null | grep 'email:' | grep -m1 .",
+    statusCmd: "zele whoami 2>/dev/null | grep -o 'email: *[^ ]*' | tr -d ' ' | paste -sd ' ' - | grep -m1 .",
     loginNeedsPty: true,
     loginCmd: "zele login --method google",
     oauthUrlPattern: "(https://accounts\\.google\\.com\\S+)",
@@ -44690,7 +44838,7 @@ var tool_catalog_default = {
     preinstallCloud: true,
     label: "GitHub",
     summary: "Work with your GitHub repos, pull requests and issues.",
-    statusCmd: "gh auth status 2>&1 | grep 'Logged in to' | grep -m1 .",
+    statusCmd: "gh auth status 2>&1 | grep -o 'Logged in to [^ ]* [a-z]* [^ ]*' | paste -sd ' ' - | grep -m1 .",
     loginCmd: "gh auth login --hostname github.com --git-protocol https",
     oauthUrlPattern: "(https://github\\.com/login/device\\S*)",
     deviceCodePattern: "one-time code:\\s*([A-Z0-9]{4}-[A-Z0-9]{4})",
@@ -44707,8 +44855,8 @@ var tool_catalog_default = {
     installer: "npm",
     label: "MCP (mcporter)",
     summary: "Use tools from any MCP server.",
-    statusCmd: "mcporter list 2>/dev/null | grep -v 'No MCP servers' | grep -m1 .",
-    description: "MCP servers as CLI: `mcporter list [server] [--schema]`, `mcporter call <server>.<tool> key=value` (`key=@file`), `mcporter config add <name> <cmd-or-url>`, `mcporter auth <server>`. `--help` for more.",
+    statusCmd: 'mcporter config list --json 2>/dev/null | node -e \'let d="";process.stdin.on("data",c=>d+=c).on("end",()=>{const s=JSON.parse(d||"{}").servers||[];if(!s.length)process.exit(1);console.log("Configured MCP servers (one line each; run `mcporter list <name>` before first use):");for(const x of s)console.log(`- ${x.name} — ${x.description?x.description+" ":""}(${x.baseUrl?new URL(x.baseUrl).host:x.command})`)})\'',
+    description: "MCP servers as CLI: `mcporter list <server>` (its tools), `mcporter call <server>.<tool> key=value` (`key=@file`), `mcporter auth <server>`, `mcporter config add <name> <cmd-or-url>`.",
     versionCmd: "mcporter --version 2>/dev/null | sed -n 1p",
     preinstallJarvis: true,
     preinstallCloud: true
@@ -44722,7 +44870,7 @@ var tool_catalog_default = {
     installer: "binary",
     label: "GitLab",
     summary: "Work with your GitLab repos, merge requests and pipelines.",
-    statusCmd: "glab auth status 2>&1 | grep 'Logged in to' | grep -m1 .",
+    statusCmd: "glab auth status 2>&1 | grep -o 'Logged in to [^ ]* [a-z]* [^ ]*' | paste -sd ' ' - | grep -m1 .",
     loginCmd: "glab auth login --device",
     credentialPaths: ["~/.config/glab-cli/config.yml"],
     description: "GitLab equivalent of `gh`.",
@@ -44785,7 +44933,7 @@ var tool_catalog_default = {
     installer: "npm",
     label: "Firebase",
     summary: "Deploy and manage Firebase hosting, database and functions.",
-    statusCmd: "firebase login:list 2>&1 | grep -oiE '[[:alnum:]._%+-]+@[[:alnum:].-]+\\.[[:alpha:]]{2,}' | grep -m1 .",
+    statusCmd: "firebase login:list 2>&1 | grep -oiE '[[:alnum:]._%+-]+@[[:alnum:].-]+\\.[[:alpha:]]{2,}' | sort -u | paste -sd ' ' - | grep -m1 .",
     loginCmd: "firebase login --no-localhost --reauth",
     loginNeedsPty: true,
     stdinPaste: true,
@@ -44825,9 +44973,7 @@ var tool_catalog_default = {
     credentialPaths: ["~/.config/stripe/config.toml"],
     description: "`stripe listen` forwards webhooks locally; `stripe get/post /v1/...` for raw API.",
     versionCmd: "stripe --version 2>/dev/null | sed -n 1p",
-    deviceCodePattern: "verification code:\\s*([A-Z0-9]{4}-[A-Z0-9]{4})",
-    oauthUrlPattern: "(https://access\\.stripe\\.com/stripecli/\\S+)",
-    canStreamLogin: true
+    oauthUrlPattern: "(https://dashboard\\.stripe\\.com/stripecli/confirm_auth\\S+)"
   },
   flyctl: {
     preinstallCloud: true,
@@ -45678,6 +45824,7 @@ var tool_catalog_default = {
     label: "Mailchimp",
     summary: "Manage Mailchimp audiences, contacts, email campaigns and reports.",
     loginCmd: "mailchimp-api auth --api-key <api_key>",
+    oauthBroker: true,
     statusCmd: `mailchimp-api whoami 2>/dev/null | sed -n 's/.*"account_name"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/p' | grep -m1 .`,
     credentialPaths: [
       "~/.config/mailchimp-api/credentials.json"
@@ -46196,7 +46343,13 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@todoforai/cli",
-  version: "0.1.62",
+  description: "TODOforAI CLI — create and manage tasks with tfa-cli.",
+  homepage: "https://todofor.ai",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/todoforai/cli.git"
+  },
+  version: "0.1.63",
   type: "module",
   bin: {
     "todoforai-cli": "bin/todoforai-cli.js",
@@ -46216,7 +46369,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@todoforai/update-notifier": "^0.1.0",
+    "@todoforai/update-notifier": "^0.4.0",
     chalk: "^6.0.0",
     "cli-highlight": "^2.1.11",
     "diff-match-patch": "^1.0.5",
@@ -46258,6 +46411,7 @@ Examples:
   tfa-cli device list|rename|wallpaper …        # Paired machines
   tfa-cli list [-n 30] [--cursor N] [--all] [--status S]  # List todos (paginated)
   tfa-cli status <todo-id> <STATUS>     # Update a todo's status
+  tfa-cli update                        # Update tfa-cli itself (also auto-updates in background; NO_UPDATE_NOTIFIER=1 disables)
   tfa-cli delete <todo-id>              # Permanently delete a todo
   tfa-cli addmessage <todo-id> "text"  # Send a message and exit (like -r, no watch/bridge)
   tfa-cli show <file|-> [todo-id]     # Render a local file (image/pdf/html…) in the chat; - = stdin
@@ -46269,6 +46423,7 @@ Examples:
   tfa-cli notify [--to <email>] "Title" "message" [--href /t/<id>]  # Note to your own user, or --to a project member (Messages tab + phone push)
   tfa-cli claim mint --seed <projectId> [--emails a@x,b@y] [--ttl <sec>]  # Mint /claim/<token> links for a project you own
   tfa-cli next [--direction "<text>"]  # Analyzer growth recommendation cards
+  tfa-cli import [claude|codex|<file>...] [--dry-run]  # Import Claude Code / Codex sessions as todos
   tfa-cli <command> help                # Details per command
 
 Options:
@@ -46359,7 +46514,7 @@ var WORD_FLAGS = {
   agents: "list-agents",
   config: "show-config"
 };
-var HELP_SUBCOMMANDS = ["agent", "todo", "project", "brand", "device", "list", "ls", "status", "show", "open", "inbox", "notify"];
+var HELP_SUBCOMMANDS = ["agent", "todo", "project", "brand", "device", "list", "ls", "status", "show", "open", "inbox", "notify", "import"];
 function parseCliArgs() {
   const { values, positionals } = parseArgs({
     args: process.argv.slice(2),
@@ -46399,6 +46554,7 @@ function parseCliArgs() {
       to: { type: "string" },
       unread: { type: "boolean", default: false },
       limit: { type: "string" },
+      days: { type: "string" },
       resume: { type: "string", short: "r" },
       continue: { type: "boolean", short: "c", default: false },
       "non-interactive": { type: "boolean", short: "n", default: false },
@@ -46771,7 +46927,7 @@ Cancelled
 import { resolve, basename } from "path";
 
 // src/ensure-bridge.ts
-import { spawn, spawnSync } from "child_process";
+import { spawn as spawn2, spawnSync as spawnSync2 } from "child_process";
 import fs2 from "fs";
 import path2 from "path";
 import os2 from "os";
@@ -46781,7 +46937,7 @@ var INSTALL_TIMEOUT_MS = 90000;
 var bridgeBin = "todoforai-bridge";
 var bridgeBinary = () => bridgeBin;
 function probeBridge(bin) {
-  return spawnSync(bin, ["--version"], { stdio: "ignore" }).status === 0;
+  return spawnSync2(bin, ["--version"], { stdio: "ignore" }).status === 0;
 }
 function hasBridge() {
   if (probeBridge(bridgeBin))
@@ -46796,7 +46952,7 @@ function installBridge() {
   if (process.platform !== "linux" && process.platform !== "darwin")
     return false;
   console.error(`\x1B[2mInstalling TODOforAI Bridge (${INSTALLER_URL})...\x1B[0m`);
-  const r = spawnSync("sh", ["-c", `curl -fsSL --connect-timeout 10 --max-time 30 ${INSTALLER_URL} | sh`], { stdio: ["ignore", "ignore", "inherit"], timeout: INSTALL_TIMEOUT_MS, killSignal: "SIGKILL" });
+  const r = spawnSync2("sh", ["-c", `curl -fsSL --connect-timeout 10 --max-time 30 ${INSTALLER_URL} | sh`], { stdio: ["ignore", "ignore", "inherit"], timeout: INSTALL_TIMEOUT_MS, killSignal: "SIGKILL" });
   if (r.error?.code === "ETIMEDOUT")
     console.error("\x1B[33mBridge install timed out\x1B[0m");
   return r.status === 0 && hasBridge();
@@ -46849,7 +47005,7 @@ function bridgeWhoamiArgs(apiUrl) {
   return withProfile(["whoami"], apiUrl);
 }
 function bridgeDeviceId(apiUrl) {
-  const r = spawnSync(bridgeBin, bridgeWhoamiArgs(apiUrl), { encoding: "utf-8" });
+  const r = spawnSync2(bridgeBin, bridgeWhoamiArgs(apiUrl), { encoding: "utf-8" });
   if (r.status !== 0)
     return null;
   const m = (r.stdout || "").match(/^Device:.*\(id:\s*([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\)/im);
@@ -46875,11 +47031,11 @@ async function enrollBridgeWithApiKey(apiUrl, apiKey) {
     console.error(`\x1B[33mBridge enroll: mint failed (${e?.message || e})\x1B[0m`);
     return false;
   }
-  const login = spawnSync(bridgeBin, [...bridgeLoginArgs(apiUrl), "--token", token], { stdio: ["ignore", "ignore", "inherit"], timeout: 30000, killSignal: "SIGKILL" });
+  const login = spawnSync2(bridgeBin, [...bridgeLoginArgs(apiUrl), "--token", token], { stdio: ["ignore", "ignore", "inherit"], timeout: 30000, killSignal: "SIGKILL" });
   return login.status === 0;
 }
 function ensureBridgeCredentials(apiUrl, opts = {}) {
-  const whoami = spawnSync(bridgeBin, bridgeWhoamiArgs(apiUrl), { stdio: "ignore" });
+  const whoami = spawnSync2(bridgeBin, bridgeWhoamiArgs(apiUrl), { stdio: "ignore" });
   if (whoami.status === 0)
     return true;
   if (opts.interactive === false) {
@@ -46887,7 +47043,7 @@ function ensureBridgeCredentials(apiUrl, opts = {}) {
     return false;
   }
   console.error("\x1B[2mBridge credentials not found. Starting `todoforai-bridge login`...\x1B[0m");
-  const login = spawnSync(bridgeBin, bridgeLoginArgs(apiUrl), { stdio: "inherit" });
+  const login = spawnSync2(bridgeBin, bridgeLoginArgs(apiUrl), { stdio: "inherit" });
   return login.status === 0;
 }
 async function bridgeState(apiUrl, apiKey, deviceId) {
@@ -46913,7 +47069,7 @@ async function ensureBridgeRunning(apiUrl, apiKey, opts = {}) {
     console.error(`\x1B[2mBridge not started: \`todoforai-bridge\` was not found on PATH. Install it (curl -fsSL ${INSTALLER_URL} | sh), or pass --no-bridge (or deprecated --no-edge) to silence this.\x1B[0m`);
     return false;
   }
-  const hasCreds = spawnSync(bridgeBin, bridgeWhoamiArgs(apiUrl), { stdio: "ignore" }).status === 0 || await enrollBridgeWithApiKey(apiUrl, apiKey) || ensureBridgeCredentials(apiUrl, opts);
+  const hasCreds = spawnSync2(bridgeBin, bridgeWhoamiArgs(apiUrl), { stdio: "ignore" }).status === 0 || await enrollBridgeWithApiKey(apiUrl, apiKey) || ensureBridgeCredentials(apiUrl, opts);
   if (!hasCreds) {
     console.error("\x1B[33mBridge not started: `todoforai-bridge login` did not complete successfully.\x1B[0m");
     return false;
@@ -46930,7 +47086,7 @@ async function ensureBridgeRunning(apiUrl, apiKey, opts = {}) {
   fs2.mkdirSync(logDir, { recursive: true });
   const logFile = path2.join(logDir, "bridge.log");
   const out = fs2.openSync(logFile, "a");
-  const child = spawn(bridgeBin, bridgeRunArgs(apiUrl), {
+  const child = spawn2(bridgeBin, bridgeRunArgs(apiUrl), {
     detached: true,
     stdio: ["ignore", out, out]
   });
@@ -47164,7 +47320,7 @@ class ScopedConfig {
   }
 }
 // src/device-login.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 class DeviceLoginError extends Error {
 }
 async function runDeviceLogin(apiUrl) {
@@ -47182,7 +47338,7 @@ async function runDeviceLogin(apiUrl) {
 `);
   try {
     const [cmd, args] = process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : [process.platform === "darwin" ? "open" : "xdg-open", [url]];
-    const child = spawn2(cmd, args, { stdio: "ignore", detached: true });
+    const child = spawn3(cmd, args, { stdio: "ignore", detached: true });
     child.on("error", () => {});
     child.unref();
   } catch {}
@@ -50780,11 +50936,442 @@ ${message}`).digest("hex").slice(0, 16);
 `);
 }
 
+// src/import-command.ts
+import { statSync as statSync3 } from "fs";
+import { basename as basename3, dirname as dirname3, resolve as resolve4 } from "path";
+
+// src/import/claude.ts
+import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3, statSync } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join3 } from "path";
+
+// src/import/common.ts
+import { createHash as createHash2 } from "crypto";
+var NOTE_MAX_LEN = 2000;
+var TOOL_RESULT_MAX_LEN = 4000;
+var SESSION_TITLE_MAX_LEN = 120;
+var clip = (s, max) => s.length > max ? `${s.slice(0, max)}…` : s;
+var hashContent = (s) => createHash2("sha256").update(s).digest("hex");
+function noteToolCall(name, input) {
+  const lines = [`[external_agent_tool_call: ${typeof name === "string" ? name : "tool"}]`];
+  const inp = input && typeof input === "object" ? input : null;
+  let shown = false;
+  if (inp) {
+    for (const [label, keys] of [["description", ["description"]], ["command", ["command", "cmd"]], ["file", ["file_path", "path", "notebook_path"]]]) {
+      const v = keys.map((k) => inp[k]).find((x) => typeof x === "string" && x);
+      if (v) {
+        lines.push(`${label}: ${clip(v, NOTE_MAX_LEN)}`);
+        shown = true;
+      }
+    }
+  }
+  if (!shown && input !== undefined)
+    lines.push(`input: ${clip(typeof input === "string" ? input : JSON.stringify(input), NOTE_MAX_LEN)}`);
+  lines.push("[/external_agent_tool_call]");
+  return lines.join(`
+`);
+}
+function noteToolResult(output, isError) {
+  const head = isError ? "[external_agent_tool_result: error]" : "[external_agent_tool_result]";
+  return `${head}
+${clip(output.trim(), TOOL_RESULT_MAX_LEN)}
+[/external_agent_tool_result]`;
+}
+function titleFromMessages(messages, fallback = "Imported session") {
+  const first = messages.find((m) => m.role === "user" && !m.content.startsWith("[external_agent_tool"))?.content ?? "";
+  const line = first.split(`
+`).map((l) => l.trim()).find(Boolean) ?? "";
+  return line ? clip(line, SESSION_TITLE_MAX_LEN) : fallback;
+}
+
+// src/import/claude.ts
+var claudeHome = () => process.env.CLAUDE_CONFIG_DIR || join3(homedir3(), ".claude");
+function listClaudeSessionFiles(home = claudeHome()) {
+  const root = join3(home, "projects");
+  if (!existsSync2(root))
+    return [];
+  const files = [];
+  for (const slug of readdirSync(root, { withFileTypes: true })) {
+    if (!slug.isDirectory())
+      continue;
+    const dir = join3(root, slug.name);
+    for (const f of readdirSync(dir))
+      if (f.endsWith(".jsonl"))
+        files.push(join3(dir, f));
+  }
+  return files;
+}
+var parseTs = (r) => {
+  if (typeof r.timestamp === "string") {
+    const t = Date.parse(r.timestamp);
+    if (!Number.isNaN(t))
+      return t;
+  }
+  if (typeof r.timestamp_ms === "number")
+    return r.timestamp_ms;
+  return;
+};
+var stripUserQuery = (s) => {
+  const m = s.match(/^\s*<user_query>\s*([\s\S]*?)\s*<\/user_query>\s*$/);
+  return m ? m[1] : s;
+};
+var isHarnessUserText = (s) => /^\s*<(command-name|local-command-caveat|local-command-stdout|local-command-stderr|system-reminder)>/.test(s);
+function flattenContent(content) {
+  if (typeof content === "string")
+    return { text: content, onlyToolResults: false };
+  if (!Array.isArray(content))
+    return { text: "", onlyToolResults: false };
+  const parts = [];
+  let toolResults = 0;
+  for (const b of content) {
+    if (!b || typeof b !== "object")
+      continue;
+    switch (b.type) {
+      case "text":
+        if (typeof b.text === "string" && b.text.trim())
+          parts.push(b.text);
+        break;
+      case "tool_use":
+        parts.push(noteToolCall(b.name, b.input));
+        break;
+      case "tool_result": {
+        toolResults++;
+        const inner = typeof b.content === "string" ? b.content : Array.isArray(b.content) ? b.content.map((c3) => c3?.type === "text" ? c3.text : `[${c3?.type ?? "block"}]`).join(`
+`) : "";
+        parts.push(noteToolResult(inner, b.is_error === true));
+        break;
+      }
+      case "thinking":
+      case "redacted_thinking":
+        break;
+      default:
+        parts.push(`[external unsupported block: ${b.type}]`);
+    }
+  }
+  return { text: parts.join(`
+
+`), onlyToolResults: toolResults > 0 && toolResults === content.length };
+}
+function parseClaudeSession(path3) {
+  const raw = readFileSync3(path3, "utf8");
+  const messages = [];
+  let cwd;
+  let customTitle;
+  let aiTitle;
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let r;
+    try {
+      r = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (!cwd && typeof r.cwd === "string" && r.cwd)
+      cwd = r.cwd;
+    if (r.type === "custom-title" && typeof r.customTitle === "string")
+      customTitle = r.customTitle;
+    if (r.type === "ai-title" && typeof r.aiTitle === "string")
+      aiTitle = r.aiTitle;
+    if (r.type !== "user" && r.type !== "assistant")
+      continue;
+    if (r.isMeta === true || r.isSidechain === true)
+      continue;
+    const { text, onlyToolResults } = flattenContent(r.message?.content);
+    const role = r.type === "user" && !onlyToolResults ? "user" : "assistant";
+    const content = (role === "user" ? stripUserQuery(text) : text).trim();
+    if (!content || role === "user" && isHarnessUserText(content))
+      continue;
+    messages.push({ role, content, timestamp: parseTs(r) });
+  }
+  if (!cwd || !messages.some((m) => m.role === "user"))
+    return null;
+  const st = statSync(path3);
+  return {
+    kind: "claude",
+    path: path3,
+    cwd,
+    messages,
+    title: customTitle?.trim() || aiTitle?.trim() || titleFromMessages(messages),
+    sha256: hashContent(raw),
+    modifiedAt: st.mtimeMs
+  };
+}
+
+// src/import/codex.ts
+import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
+var codexHome = () => process.env.CODEX_HOME || join4(homedir4(), ".codex");
+function listCodexSessionFiles(home = codexHome()) {
+  const root = join4(home, "sessions");
+  if (!existsSync3(root))
+    return [];
+  const out = [];
+  const walk = (dir) => {
+    for (const e of readdirSync2(dir, { withFileTypes: true })) {
+      const p = join4(dir, e.name);
+      if (e.isDirectory())
+        walk(p);
+      else if (e.name.startsWith("rollout-") && e.name.endsWith(".jsonl"))
+        out.push(p);
+    }
+  };
+  walk(root);
+  return out;
+}
+function readCodexTitles(home = codexHome()) {
+  const titles = new Map;
+  const idx = join4(home, "session_index.jsonl");
+  if (!existsSync3(idx))
+    return titles;
+  for (const line of readFileSync4(idx, "utf8").split(`
+`)) {
+    try {
+      const r = JSON.parse(line);
+      if (r?.id && typeof r.thread_name === "string")
+        titles.set(r.id, r.thread_name);
+    } catch {}
+  }
+  return titles;
+}
+var HARNESS_TAGS = ["environment_context", "recommended_plugins", "user_instructions", "permissions_instructions", "turn_aborted", "collaboration_mode_instructions"];
+var isHarnessBlock = (s) => {
+  const m = /^\s*<([a-z_]+)>[\s\S]*<\/\1>\s*$/.exec(s);
+  return !!m && HARNESS_TAGS.includes(m[1]);
+};
+var partsText = (content, dropHarness = false) => Array.isArray(content) ? content.map((c3) => typeof c3?.text === "string" ? c3.text : "").filter((t) => t.trim() && !(dropHarness && isHarnessBlock(t))).join(`
+
+`) : typeof content === "string" ? content : "";
+var outputText = (output) => {
+  if (typeof output === "string") {
+    try {
+      const parsed = JSON.parse(output);
+      if (Array.isArray(parsed))
+        return partsText(parsed);
+    } catch {}
+    return output;
+  }
+  return partsText(output);
+};
+function parseCodexSession(path3, titles = readCodexTitles()) {
+  const raw = readFileSync4(path3, "utf8");
+  const messages = [];
+  let cwd;
+  let sessionId;
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let r;
+    try {
+      r = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const ts = typeof r.timestamp === "string" ? Date.parse(r.timestamp) : NaN;
+    const timestamp = Number.isNaN(ts) ? undefined : ts;
+    if (r.type === "session_meta") {
+      cwd = cwd || r.payload?.cwd;
+      sessionId = sessionId || r.payload?.session_id || r.payload?.id;
+      continue;
+    }
+    if (r.type !== "response_item")
+      continue;
+    const p = r.payload ?? {};
+    switch (p.type) {
+      case "message": {
+        if (p.role !== "user" && p.role !== "assistant")
+          break;
+        const content = partsText(p.content, p.role === "user").trim();
+        if (content)
+          messages.push({ role: p.role, content, timestamp });
+        break;
+      }
+      case "function_call":
+      case "custom_tool_call": {
+        let input = p.arguments ?? p.input;
+        if (typeof input === "string") {
+          try {
+            input = JSON.parse(input);
+          } catch {}
+        }
+        messages.push({ role: "assistant", content: noteToolCall(p.name, input), timestamp });
+        break;
+      }
+      case "function_call_output":
+      case "custom_tool_call_output":
+        messages.push({ role: "assistant", content: noteToolResult(outputText(p.output), false), timestamp });
+        break;
+      default:
+        break;
+    }
+  }
+  if (!cwd || !messages.some((m) => m.role === "user"))
+    return null;
+  const st = statSync2(path3);
+  return {
+    kind: "codex",
+    path: path3,
+    cwd,
+    messages,
+    title: sessionId && titles.get(sessionId)?.trim() || titleFromMessages(messages),
+    sha256: hashContent(raw),
+    modifiedAt: st.mtimeMs
+  };
+}
+
+// src/import-command.ts
+var DEFAULT_MAX_AGE_DAYS = 30;
+var DEFAULT_MAX_COUNT = 50;
+var SOURCES = ["claude", "codex"];
+function printImportHelp() {
+  process.stderr.write(`
+tfa-cli import — import Claude Code / Codex sessions as todos
+
+Usage:
+  tfa-cli import [claude|codex] [flags]
+  tfa-cli import <session.jsonl>... [flags]
+
+Flags:
+      --project <id>      Target project (default: current default project)
+  -a, --agent <id|name>   Agent for every imported todo (default: match the session cwd, else your default agent)
+      --days <n>          Only sessions modified in the last n days (default: ${DEFAULT_MAX_AGE_DAYS}; 0 = all)
+      --limit <n>         Max sessions per source, newest first (default: ${DEFAULT_MAX_COUNT}; 0 = all)
+      --dry-run           Parse and list, write nothing (no login needed)
+      --json              Machine-readable output
+  -h, --help              Show this help
+
+Sources on this machine:
+  Claude Code  ${claudeHome()}/projects/*/*.jsonl
+  Codex        ${codexHome()}/sessions/**/rollout-*.jsonl
+`);
+}
+var codexTitles;
+function safeParse(kind, file) {
+  try {
+    return kind === "claude" ? parseClaudeSession(file) : parseCodexSession(file, codexTitles ??= readCodexTitles());
+  } catch {
+    return null;
+  }
+}
+function collect(kinds, days, limit) {
+  const cutoff = days > 0 ? Date.now() - days * 86400000 : 0;
+  return kinds.flatMap((kind) => {
+    const files = kind === "claude" ? listClaudeSessionFiles() : listCodexSessionFiles();
+    const sessions = files.map((f) => ({ f, mtime: statSync3(f).mtimeMs })).filter((x) => x.mtime >= cutoff).sort((a, b) => b.mtime - a.mtime).map((x) => safeParse(kind, x.f)).filter((s) => !!s);
+    return limit > 0 ? sessions.slice(0, limit) : sessions;
+  });
+}
+async function agentForCwd(api, cwd, fallback, cache) {
+  for (let dir = cwd;; dir = dirname3(dir)) {
+    const hit = cache.get(dir);
+    if (hit)
+      return hit;
+    const matches = await api.listAgentSettings({ workspacePath: dir }).catch(() => []);
+    if (matches.length) {
+      cache.set(dir, matches[0].id);
+      return matches[0].id;
+    }
+    if (dirname3(dir) === dir)
+      break;
+  }
+  cache.set(cwd, fallback);
+  return fallback;
+}
+async function importCommand(api, positionals, args, scopedProject, defaultAgentId) {
+  const days = args.days !== undefined ? Number(args.days) : DEFAULT_MAX_AGE_DAYS;
+  const limit = args.limit !== undefined ? Number(args.limit) : DEFAULT_MAX_COUNT;
+  const json = !!args.json;
+  const ops = positionals.slice(1);
+  const named = ops.filter((o) => SOURCES.includes(o));
+  const files = ops.filter((o) => !SOURCES.includes(o)).map((f) => resolve4(f));
+  const skipped = [];
+  const sessions = files.length ? files.flatMap((f) => {
+    const kind = named[0] ?? (basename3(f).startsWith("rollout-") ? "codex" : "claude");
+    const s = safeParse(kind, f);
+    if (!s)
+      skipped.push(f);
+    return s ? [s] : [];
+  }) : collect(named.length ? named : SOURCES, days, limit);
+  if (!json)
+    for (const f of skipped)
+      process.stderr.write(`${YELLOW}skip ${f}: not a readable session${RESET}
+`);
+  if (args["dry-run"]) {
+    const rows = sessions.map((s) => ({ kind: s.kind, title: s.title, cwd: s.cwd, messages: s.messages.length, path: s.path, modifiedAt: s.modifiedAt }));
+    if (json) {
+      console.log(JSON.stringify({ sessions: rows, skipped }));
+      return;
+    }
+    for (const r of rows)
+      process.stderr.write(`${CYAN}${r.kind.padEnd(7)}${RESET} ${r.title}  ${DIM}${r.messages} msgs · ${r.cwd}${RESET}
+`);
+    process.stderr.write(`${DIM}${rows.length} session(s) — dry run, nothing written${RESET}
+`);
+    return;
+  }
+  if (!api)
+    throw new Error("import: not authenticated");
+  const projectId = args.project || scopedProject;
+  if (!projectId) {
+    process.stderr.write(`${RED}No project — pass --project <id>${RESET}
+`);
+    process.exit(2);
+  }
+  let fallbackAgent = defaultAgentId;
+  if (args.agent || !fallbackAgent) {
+    const agents = await api.listAgentSettings();
+    fallbackAgent = args.agent ? agents.find((a) => a.id === args.agent || a.name === args.agent)?.id : agents[0]?.id;
+    if (!fallbackAgent) {
+      process.stderr.write(`${RED}Agent not found — pass --agent <id>${RESET}
+`);
+      process.exit(2);
+    }
+  }
+  const agentCache = new Map;
+  const results = [];
+  for (const s of sessions) {
+    const agentSettingsId = args.agent ? fallbackAgent : await agentForCwd(api, s.cwd, fallbackAgent, agentCache);
+    try {
+      const r = await api.importSession({
+        projectId,
+        agentSettingsId,
+        title: s.title,
+        messages: s.messages,
+        source: { kind: s.kind, path: s.path, sha256: s.sha256, cwd: s.cwd }
+      });
+      results.push({ ...r, kind: s.kind, title: s.title, path: s.path });
+      if (!json) {
+        const mark = r.outcome === "unchanged" ? `${DIM}=` : `${GREEN}✓`;
+        process.stderr.write(`${mark} ${r.outcome.padEnd(9)}${RESET} ${s.title}  ${DIM}${r.messageCount} msgs · ${r.todoId}${RESET}
+`);
+      }
+    } catch (e) {
+      results.push({ kind: s.kind, title: s.title, path: s.path, error: e.message });
+      if (!json)
+        process.stderr.write(`${RED}✗ failed    ${RESET} ${s.title}  ${DIM}${e.message}${RESET}
+`);
+    }
+  }
+  const failed = results.filter((r) => r.error).length;
+  if (json)
+    console.log(JSON.stringify({ imported: results, total: results.length, skipped }));
+  else {
+    const count = (o) => results.filter((r) => r.outcome === o).length;
+    process.stderr.write(`${GREEN}Imported ${count("created")} new, ${count("updated")} updated${failed ? `, ${RED}${failed} failed` : ""}${RESET}
+`);
+  }
+  if (failed)
+    process.exitCode = 1;
+}
+
 // src/index.ts
 import { randomUUID as randomUUID3 } from "crypto";
 
 // src/ensure-bridge.ts
-import { spawn as spawn3, spawnSync as spawnSync2 } from "child_process";
+import { spawn as spawn4, spawnSync as spawnSync3 } from "child_process";
 import fs3 from "fs";
 import path3 from "path";
 import os4 from "os";
@@ -50793,7 +51380,7 @@ var INSTALL_PREFIX2 = process.env.TODOFORAI_PREFIX || path3.join(os4.homedir(),
 var INSTALL_TIMEOUT_MS2 = 90000;
 var bridgeBin2 = "todoforai-bridge";
 function probeBridge2(bin) {
-  return spawnSync2(bin, ["--version"], { stdio: "ignore" }).status === 0;
+  return spawnSync3(bin, ["--version"], { stdio: "ignore" }).status === 0;
 }
 function hasBridge2() {
   if (probeBridge2(bridgeBin2))
@@ -50808,7 +51395,7 @@ function installBridge2() {
   if (process.platform !== "linux" && process.platform !== "darwin")
     return false;
   console.error(`\x1B[2mInstalling TODOforAI Bridge (${INSTALLER_URL2})...\x1B[0m`);
-  const r = spawnSync2("sh", ["-c", `curl -fsSL --connect-timeout 10 --max-time 30 ${INSTALLER_URL2} | sh`], { stdio: ["ignore", "ignore", "inherit"], timeout: INSTALL_TIMEOUT_MS2, killSignal: "SIGKILL" });
+  const r = spawnSync3("sh", ["-c", `curl -fsSL --connect-timeout 10 --max-time 30 ${INSTALLER_URL2} | sh`], { stdio: ["ignore", "ignore", "inherit"], timeout: INSTALL_TIMEOUT_MS2, killSignal: "SIGKILL" });
   if (r.error?.code === "ETIMEDOUT")
     console.error("\x1B[33mBridge install timed out\x1B[0m");
   return r.status === 0 && hasBridge2();
@@ -50861,7 +51448,7 @@ function bridgeWhoamiArgs2(apiUrl) {
   return withProfile2(["whoami"], apiUrl);
 }
 function bridgeDeviceId2(apiUrl) {
-  const r = spawnSync2(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { encoding: "utf-8" });
+  const r = spawnSync3(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { encoding: "utf-8" });
   if (r.status !== 0)
     return null;
   const m = (r.stdout || "").match(/^Device:.*\(id:\s*([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\)/im);
@@ -50887,11 +51474,11 @@ async function enrollBridgeWithApiKey2(apiUrl, apiKey) {
     console.error(`\x1B[33mBridge enroll: mint failed (${e?.message || e})\x1B[0m`);
     return false;
   }
-  const login = spawnSync2(bridgeBin2, [...bridgeLoginArgs2(apiUrl), "--token", token], { stdio: ["ignore", "ignore", "inherit"], timeout: 30000, killSignal: "SIGKILL" });
+  const login = spawnSync3(bridgeBin2, [...bridgeLoginArgs2(apiUrl), "--token", token], { stdio: ["ignore", "ignore", "inherit"], timeout: 30000, killSignal: "SIGKILL" });
   return login.status === 0;
 }
 function ensureBridgeCredentials2(apiUrl, opts = {}) {
-  const whoami = spawnSync2(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { stdio: "ignore" });
+  const whoami = spawnSync3(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { stdio: "ignore" });
   if (whoami.status === 0)
     return true;
   if (opts.interactive === false) {
@@ -50899,7 +51486,7 @@ function ensureBridgeCredentials2(apiUrl, opts = {}) {
     return false;
   }
   console.error("\x1B[2mBridge credentials not found. Starting `todoforai-bridge login`...\x1B[0m");
-  const login = spawnSync2(bridgeBin2, bridgeLoginArgs2(apiUrl), { stdio: "inherit" });
+  const login = spawnSync3(bridgeBin2, bridgeLoginArgs2(apiUrl), { stdio: "inherit" });
   return login.status === 0;
 }
 async function bridgeState2(apiUrl, apiKey, deviceId) {
@@ -50916,7 +51503,7 @@ async function waitForBridgeOnline2(apiUrl, apiKey, deviceId, timeoutMs = 5000)
     const state = await bridgeState2(apiUrl, apiKey, deviceId);
     if (state !== "offline")
       return state === "online";
-    await new Promise((resolve4) => setTimeout(resolve4, 150));
+    await new Promise((resolve5) => setTimeout(resolve5, 150));
   } while (Date.now() < deadline);
   return false;
 }
@@ -50925,7 +51512,7 @@ async function ensureBridgeRunning2(apiUrl, apiKey, opts = {}) {
     console.error(`\x1B[2mBridge not started: \`todoforai-bridge\` was not found on PATH. Install it (curl -fsSL ${INSTALLER_URL2} | sh), or pass --no-bridge (or deprecated --no-edge) to silence this.\x1B[0m`);
     return false;
   }
-  const hasCreds = spawnSync2(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { stdio: "ignore" }).status === 0 || await enrollBridgeWithApiKey2(apiUrl, apiKey) || ensureBridgeCredentials2(apiUrl, opts);
+  const hasCreds = spawnSync3(bridgeBin2, bridgeWhoamiArgs2(apiUrl), { stdio: "ignore" }).status === 0 || await enrollBridgeWithApiKey2(apiUrl, apiKey) || ensureBridgeCredentials2(apiUrl, opts);
   if (!hasCreds) {
     console.error("\x1B[33mBridge not started: `todoforai-bridge login` did not complete successfully.\x1B[0m");
     return false;
@@ -50942,7 +51529,7 @@ async function ensureBridgeRunning2(apiUrl, apiKey, opts = {}) {
   fs3.mkdirSync(logDir, { recursive: true });
   const logFile = path3.join(logDir, "bridge.log");
   const out = fs3.openSync(logFile, "a");
-  const child = spawn3(bridgeBin2, bridgeRunArgs2(apiUrl), {
+  const child = spawn4(bridgeBin2, bridgeRunArgs2(apiUrl), {
     detached: true,
     stdio: ["ignore", out, out]
   });
@@ -50967,7 +51554,7 @@ async function ensureBridgeRunning2(apiUrl, apiKey, opts = {}) {
 }
 
 // src/isolated.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 async function mintMayflyToken(apiUrl, apiKey, todoId) {
   const res = await fetch(`${apiUrl}${restBasePath(apiKey)}/cli/mayfly/token`, {
     method: "POST",
@@ -50998,7 +51585,7 @@ async function spawnMayflyBridge(apiUrl, todoId, workspace, opts = {}) {
         delete env2[p + n];
     env2.TODOFORAI_MAYFLY_TOKEN = sessionToken;
   }
-  const child = spawn4(bridgeBinary(), args, { stdio: ["ignore", "pipe", "pipe"], env: env2 });
+  const child = spawn5(bridgeBinary(), args, { stdio: ["ignore", "pipe", "pipe"], env: env2 });
   let stopped = false;
   const stop = () => {
     if (stopped)
@@ -51092,9 +51679,7 @@ var CLIENT_METHODS = {
   terminal_release: "terminal/release",
   terminal_wait_for_exit: "terminal/wait_for_exit",
   terminal_kill: "terminal/kill",
-  mcp_connect: "mcp/connect",
   mcp_message: "mcp/message",
-  mcp_disconnect: "mcp/disconnect",
   elicitation_create: "elicitation/create",
   elicitation_complete: "elicitation/complete"
 };
@@ -51147,7 +51732,7 @@ __export(exports_external, {
   setErrorMap: () => setErrorMap,
   set: () => set,
   safeParseAsync: () => safeParseAsync2,
-  safeParse: () => safeParse2,
+  safeParse: () => safeParse3,
   safeEncodeAsync: () => safeEncodeAsync2,
   safeEncode: () => safeEncode2,
   safeDecodeAsync: () => safeDecodeAsync2,
@@ -51384,7 +51969,7 @@ __export(exports_core2, {
   stripTabAndNewline: () => stripTabAndNewline,
   standardProps: () => standardProps,
   safeParseAsync: () => safeParseAsync,
-  safeParse: () => safeParse,
+  safeParse: () => safeParse2,
   safeEncodeAsync: () => safeEncodeAsync,
   safeEncode: () => safeEncode,
   safeDecodeAsync: () => safeDecodeAsync,
@@ -52880,7 +53465,7 @@ var _safeParse = (_Err) => (schema, value, _ctx) => {
   }
   return result.issues.length ? failure(_Err, result.issues, ctx) : { success: true, data: result.value };
 };
-var safeParse = /* @__PURE__ */ _safeParse($ZodRealError);
+var safeParse2 = /* @__PURE__ */ _safeParse($ZodRealError);
 function failure(Err, issues, ctx) {
   let error;
   return {
@@ -55068,7 +55653,7 @@ function handleIntersectionResults(result, left, right) {
   const unrecKeys = new Map;
   let unrecIssue;
   const keyIssues = new Map;
-  const collect = (iss, side) => {
+  const collect2 = (iss, side) => {
     let keys;
     if (iss.code === "unrecognized_keys" && !iss.path?.length) {
       unrecIssue ?? (unrecIssue = iss);
@@ -55089,11 +55674,11 @@ function handleIntersectionResults(result, left, right) {
     return true;
   };
   for (const iss of left.issues) {
-    if (!collect(iss, "l"))
+    if (!collect2(iss, "l"))
       result.issues.push(iss);
   }
   for (const iss of right.issues) {
-    if (!collect(iss, "r"))
+    if (!collect2(iss, "r"))
       result.issues.push(iss);
   }
   const bothKeys = [...unrecKeys].filter(([, f]) => f.l && f.r).map(([k]) => k);
@@ -56109,7 +56694,7 @@ var recursive = /* @__PURE__ */ new WeakMap;
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve4) {
+function isRecursive(inst, stack, resolve5) {
   const cached2 = recursive.get(inst);
   if (cached2 !== undefined)
     return cached2 ? PROVEN : NONE;
@@ -56119,7 +56704,7 @@ function isRecursive(inst, stack, resolve4) {
   let result = NONE;
   const check = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve4);
+      const answer = isRecursive(child, stack, resolve5);
       if (answer > result)
         result = answer;
     }
@@ -56130,7 +56715,7 @@ function isRecursive(inst, stack, resolve4) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve4) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve5) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -56193,7 +56778,7 @@ function isRecursive(inst, stack, resolve4) {
       check(def.output);
       break;
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : undefined);
+      const inner = def._cachedInner ?? (resolve5 ? inst._zod.innerType : undefined);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -68039,7 +68624,7 @@ var ZodRealError = /* @__PURE__ */ $constructor("ZodError", initializer2, undefi
 // node_modules/zod/v4/classic/parse.js
 var parse3 = /* @__PURE__ */ _parse(ZodRealError);
 var parseAsync2 = /* @__PURE__ */ _parseAsync(ZodRealError);
-var safeParse2 = /* @__PURE__ */ _safeParse(ZodRealError);
+var safeParse3 = /* @__PURE__ */ _safeParse(ZodRealError);
 var safeParseAsync2 = /* @__PURE__ */ _safeParseAsync(ZodRealError);
 var encode2 = /* @__PURE__ */ _encode(ZodRealError);
 var decode2 = /* @__PURE__ */ _decode(ZodRealError);
@@ -68179,7 +68764,7 @@ var ZodType = /* @__PURE__ */ $constructor("ZodType", (inst, def) => {
     return await parseAsync2(this, data, params, { callee: _parseAsync2 });
   },
   safeParse(data, params) {
-    return safeParse2(this, data, params);
+    return safeParse3(this, data, params);
   },
   async safeParseAsync(data, params) {
     return safeParseAsync2(this, data, params);
@@ -71043,27 +71628,16 @@ var zCreateElicitationRequest = preserveCustomPayload(intersection(union([
   })
 })), "mode", ["form", "url"]);
 var zMcpServerAcpId = string2();
-var zConnectMcpRequest = object({
-  serverId: zMcpServerAcpId,
-  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
-  })
-});
-var zMcpConnectionId = string2();
+var zMcpRequestId = string2();
 var zMessageMcpRequest = object({
-  connectionId: zMcpConnectionId,
+  serverId: zMcpServerAcpId,
+  requestId: zMcpRequestId,
   method: string2(),
   params: record(string2(), unknown()).nullish(),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
     return;
   })
 });
-var zDisconnectMcpRequest = object({
-  connectionId: zMcpConnectionId,
-  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
-  })
-});
 var zExtRequest = unknown();
 var zAgentRequest = object({
   id: zRequestId,
@@ -71078,9 +71652,7 @@ var zAgentRequest = object({
     zWaitForTerminalExitRequest,
     zKillTerminalRequest,
     zCreateElicitationRequest,
-    zConnectMcpRequest,
     zMessageMcpRequest,
-    zDisconnectMcpRequest,
     zExtRequest
   ]).nullish()
 });
@@ -71776,7 +72348,6 @@ var zCloseNesResponse = object({
   })
 });
 var zExtResponse = unknown();
-var zMessageMcpResponse = unknown();
 var zErrorCode = union([
   literal(-32700),
   literal(-32600),
@@ -71822,8 +72393,7 @@ var zAgentResponse = union([
       zStartNesResponse,
       zSuggestNesResponse,
       zCloseNesResponse,
-      zExtResponse,
-      zMessageMcpResponse
+      zExtResponse
     ])
   }),
   object({
@@ -72041,6 +72611,108 @@ var zCompactionSummaryChunk = object({
     return;
   })
 });
+var zSessionCancelCapabilities = object({
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zSubagentSessionCapabilities = object({
+  cancel: defaultOnError(zSessionCancelCapabilities.nullish(), () => {
+    return;
+  }),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zRunningStateUpdate = object({
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zIdleStateUpdate = object({
+  stopReason: defaultOnError(zStopReason.nullish(), () => {
+    return;
+  }),
+  usage: defaultOnError(zUsage.nullish(), () => {
+    return;
+  }),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zRequiresActionStateUpdate = object({
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zUnknownStateUpdate = object({
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zStateUpdate = preserveCustomPayload(union([
+  zRunningStateUpdate.and(object({
+    state: literal("running")
+  })),
+  zIdleStateUpdate.and(object({
+    state: literal("idle")
+  })),
+  zRequiresActionStateUpdate.and(object({
+    state: literal("requires_action")
+  })),
+  zUnknownStateUpdate.and(object({
+    state: literal("unknown")
+  })),
+  excludeKnownTags(object({
+    state: string2()
+  }), "state", ["idle", "requires_action", "running", "unknown"])
+]), "state", ["idle", "requires_action", "running", "unknown"]);
+var zSubagentUpdate = object({
+  sessionId: zSessionId,
+  title: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
+  description: defaultOnError(string2().nullish(), () => {
+    return;
+  }),
+  capabilities: defaultOnError(zSubagentSessionCapabilities.nullish(), () => {
+    return;
+  }),
+  state: defaultOnError(zStateUpdate.nullish(), () => {
+    return;
+  }),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zSessionMessage = object({
+  messageId: zMessageId,
+  senderSessionId: defaultOnError(zSessionId.nullish(), () => {
+    return;
+  }),
+  recipientSessionId: defaultOnError(zSessionId.nullish(), () => {
+    return;
+  }),
+  content: defaultOnError(vecSkipError(zContentBlock).nullish(), () => {
+    return;
+  }),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
+var zSessionMessageChunk = object({
+  messageId: zMessageId,
+  senderSessionId: defaultOnError(zSessionId.nullish(), () => {
+    return;
+  }),
+  recipientSessionId: defaultOnError(zSessionId.nullish(), () => {
+    return;
+  }),
+  content: zContentBlock,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
 var zSessionUpdate = union([
   zContentChunk.and(object({
     sessionUpdate: literal("user_message_chunk")
@@ -72089,6 +72761,15 @@ var zSessionUpdate = union([
   })),
   zCompactionSummaryChunk.and(object({
     sessionUpdate: literal("compaction_summary_chunk")
+  })),
+  zSubagentUpdate.and(object({
+    sessionUpdate: literal("subagent_update")
+  })),
+  zSessionMessage.and(object({
+    sessionUpdate: literal("session_message")
+  })),
+  zSessionMessageChunk.and(object({
+    sessionUpdate: literal("session_message_chunk")
   }))
 ]);
 var zSessionNotification = object({
@@ -72104,23 +72785,12 @@ var zCompleteElicitationNotification = object({
     return;
   })
 });
-var zMessageMcpNotification = object({
-  connectionId: zMcpConnectionId,
-  method: string2(),
-  params: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
-  }),
-  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
-  })
-});
 var zExtNotification = unknown();
 var zAgentNotification = object({
   method: string2(),
   params: union([
     zSessionNotification,
     zCompleteElicitationNotification,
-    zMessageMcpNotification,
     zExtNotification
   ]).nullish()
 });
@@ -72160,6 +72830,11 @@ var zClientSessionCapabilities = object({
     return;
   })
 });
+var zSubagentCapabilities = object({
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
 var zPlanCapabilities = object({
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
     return;
@@ -72227,6 +72902,9 @@ var zClientCapabilities = object({
   session: defaultOnError(zClientSessionCapabilities.nullish(), () => {
     return;
   }),
+  subagents: defaultOnError(zSubagentCapabilities.nullish(), () => {
+    return;
+  }),
   plan: defaultOnError(zPlanCapabilities.nullish(), () => {
     return;
   }),
@@ -72580,7 +73258,6 @@ var zClientRequest = object({
     zStartNesRequest,
     zSuggestNesRequest,
     zCloseNesRequest,
-    zMessageMcpRequest,
     zExtRequest
   ]).nullish()
 });
@@ -72695,17 +73372,29 @@ var zCreateElicitationResponse = preserveCustomPayload(intersection(union([
     return;
   })
 })), "action", ["accept", "cancel", "decline"]);
-var zConnectMcpResponse = object({
-  connectionId: zMcpConnectionId,
-  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
-  })
+var zMcpError = looseObject({
+  code: int().min(-2147483648, {
+    error: "Invalid value: Expected int32 to be >= -2147483648"
+  }).max(2147483647, {
+    error: "Invalid value: Expected int32 to be <= 2147483647"
+  }),
+  message: string2(),
+  data: unknown().optional()
 });
-var zDisconnectMcpResponse = object({
-  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
-    return;
+var zMessageMcpResponse = union([
+  object({
+    result: unknown(),
+    _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+      return;
+    })
+  }),
+  object({
+    error: zMcpError,
+    _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+      return;
+    })
   })
-});
+]);
 var zClientResponse = union([
   object({
     id: zRequestId,
@@ -72719,8 +73408,6 @@ var zClientResponse = union([
       zWaitForTerminalExitResponse,
       zKillTerminalResponse,
       zCreateElicitationResponse,
-      zConnectMcpResponse,
-      zDisconnectMcpResponse,
       zMessageMcpResponse,
       zExtResponse
     ])
@@ -72809,6 +73496,15 @@ var zRejectNesNotification = object({
     return;
   })
 });
+var zMessageMcpNotification = object({
+  serverId: zMcpServerAcpId,
+  requestId: zMcpRequestId,
+  method: string2(),
+  params: record(string2(), unknown()).nullish(),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => {
+    return;
+  })
+});
 var zClientNotification = object({
   method: string2(),
   params: union([
@@ -73176,11 +73872,11 @@ class Connection {
   prepareRequest(method, params, mapResponse, options = {}) {
     const id = this.nextRequestId++;
     let cancel = () => {};
-    const response = new Promise((resolve4, reject) => {
+    const response = new Promise((resolve5, reject) => {
       const pendingResponse = {
         resolve: (value) => {
           try {
-            resolve4(mapResponse ? mapResponse(value) : value);
+            resolve5(mapResponse ? mapResponse(value) : value);
           } catch (error62) {
             reject(error62);
           }
@@ -73231,8 +73927,8 @@ class Connection {
     this.stream = stream;
     this.staticHandlers = handlers;
     this.allowBatches = options?.allowBatches ?? true;
-    this.closedPromise = new Promise((resolve4) => {
-      this.abortController.signal.addEventListener("abort", () => resolve4());
+    this.closedPromise = new Promise((resolve5) => {
+      this.abortController.signal.addEventListener("abort", () => resolve5());
     });
     this.receive();
   }
@@ -73826,6 +74522,10 @@ var zGuardElicitationPropertySchemaInteger = zIntegerPropertySchema.and(object({
 var zGuardElicitationPropertySchemaBoolean = zBooleanPropertySchema.and(object({ type: literal("boolean") }));
 var zGuardElicitationPropertySchemaArray = zMultiSelectPropertySchema.and(object({ type: literal("array") }));
 var zGuardMultiSelectItemsString = zStringMultiSelectItems.and(object({ type: literal("string") }));
+var zGuardStateUpdateRunning = zRunningStateUpdate.and(object({ state: literal("running") }));
+var zGuardStateUpdateIdle = zIdleStateUpdate.and(object({ state: literal("idle") }));
+var zGuardStateUpdateRequiresAction = zRequiresActionStateUpdate.and(object({ state: literal("requires_action") }));
+var zGuardStateUpdateUnknown = zUnknownStateUpdate.and(object({ state: literal("unknown") }));
 var zGuardCreateElicitationResponseAccept = zElicitationAcceptAction.and(object({ action: literal("accept") }));
 var zGuardCreateElicitationResponseDecline = object({
   action: literal("decline")
@@ -74120,8 +74820,8 @@ class AsyncQueue {
     if (this.failed) {
       return Promise.reject(this.failure);
     }
-    return new Promise((resolve4, reject) => {
-      this.waiters.push({ resolve: resolve4, reject });
+    return new Promise((resolve5, reject) => {
+      this.waiters.push({ resolve: resolve5, reject });
     });
   }
 }
@@ -74849,7 +75549,7 @@ function classifyBlock2(info) {
 }
 
 // src/device-login.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 class DeviceLoginError2 extends Error {
 }
 async function runDeviceLogin2(apiUrl) {
@@ -74867,7 +75567,7 @@ async function runDeviceLogin2(apiUrl) {
 `);
   try {
     const [cmd, args] = process.platform === "win32" ? ["cmd", ["/c", "start", "", url2]] : [process.platform === "darwin" ? "open" : "xdg-open", [url2]];
-    const child = spawn5(cmd, args, { stdio: "ignore", detached: true });
+    const child = spawn6(cmd, args, { stdio: "ignore", detached: true });
     child.on("error", () => {});
     child.unref();
   } catch {}
@@ -74897,7 +75597,7 @@ async function runDeviceLogin2(apiUrl) {
 }
 
 // src/acp.ts
-var log2 = (...a) => process.stderr.write(`[acp] ${a.join(" ")}
+var log3 = (...a) => process.stderr.write(`[acp] ${a.join(" ")}
 `);
 var ACP_KIND = { create: "edit", edit: "edit", read: "read", search: "search", shell: "execute" };
 var toolTitle = (info) => {
@@ -74973,7 +75673,7 @@ class TodoforaiAgent {
       }
       this.api = new ApiClient(this.apiUrl, this.apiKey);
       this.ws = ws;
-      log2(`ready (${this.apiUrl})`);
+      log3(`ready (${this.apiUrl})`);
     })();
   }
   async requireAuth() {
@@ -75018,7 +75718,7 @@ class TodoforaiAgent {
     const agent2 = await this.resolveAgent(cwd);
     const todoId = randomUUID2();
     this.sessions.set(todoId, { todoId, projectId, agent: agent2 });
-    log2(`session ${todoId} agent=${agent2.name} cwd=${cwd}`);
+    log3(`session ${todoId} agent=${agent2.name} cwd=${cwd}`);
     return { sessionId: todoId, modes: await this.modes(agent2) };
   }
   async setSessionMode(p) {
@@ -75029,7 +75729,7 @@ class TodoforaiAgent {
     if (!agent2)
       throw RequestError.invalidParams(`unknown agent ${p.modeId}`);
     s.agent = agent2;
-    log2(`session ${s.todoId} agent=${agent2.name}`);
+    log3(`session ${s.todoId} agent=${agent2.name}`);
     this.conn.sessionUpdate({ sessionId: p.sessionId, update: { sessionUpdate: "current_mode_update", currentModeId: agent2.id } });
     return {};
   }
@@ -75039,7 +75739,7 @@ class TodoforaiAgent {
       return;
     s.turn.cancelled = true;
     if (s.turn.started && !await this.ws.sendInterrupt(s.projectId, s.todoId))
-      log2("interrupt not delivered (socket down)");
+      log3("interrupt not delivered (socket down)");
   }
   async prompt(p) {
     const s = this.sessions.get(p.sessionId);
@@ -75054,7 +75754,7 @@ ${b.resource.text}
 </file>
 ` : "").join("");
     const sessionId = p.sessionId;
-    const update = (u) => this.conn.sessionUpdate({ sessionId, update: u }).catch((e) => log2("update failed", e?.message));
+    const update = (u) => this.conn.sessionUpdate({ sessionId, update: u }).catch((e) => log3("update failed", e?.message));
     const blocks4 = new Map;
     const view = (id) => blocks4.get(id) ?? blocks4.set(id, new BlockView).get(id);
     const announce = (id, b) => {
@@ -75088,9 +75788,9 @@ ${b.resource.text}
           return;
         const ok = choice === "allow_once" || choice === "allow_remember" ? await this.ws.sendBlockApproval(s.todoId, messageId, id, choice, choice === "allow_remember" ? patterns : undefined) : await this.ws.sendBlockDeny(s.todoId, messageId, id);
         if (!ok)
-          log2(`approval for ${id} not delivered (socket down)`);
+          log3(`approval for ${id} not delivered (socket down)`);
       } catch (e) {
-        log2("permission request failed", e?.message);
+        log3("permission request failed", e?.message);
       }
     };
     const onEvent = (type, payload) => {
@@ -75166,18 +75866,18 @@ ${b.resource.text}
 async function runAcp(apiUrl, apiKey, opts) {
   console.log = (...a) => process.stderr.write(a.map(String).join(" ") + `
 `);
-  const eof = new Promise((resolve4) => {
-    process.stdin.once("end", resolve4);
-    process.stdin.once("close", resolve4);
-    process.stdin.once("error", resolve4);
+  const eof = new Promise((resolve5) => {
+    process.stdin.once("end", resolve5);
+    process.stdin.once("close", resolve5);
+    process.stdin.once("error", resolve5);
   });
   const stream = ndJsonStream2(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin));
   let agent2;
   new AgentSideConnection((conn) => agent2 = new TodoforaiAgent(conn, apiUrl, apiKey, opts), stream);
   if (apiKey)
-    agent2.connect().catch((e) => log2("connect failed:", e?.message));
+    agent2.connect().catch((e) => log3("connect failed:", e?.message));
   else
-    log2("not logged in — waiting for authenticate");
+    log3("not logged in — waiting for authenticate");
   await eof;
   await agent2.close();
 }
@@ -75270,13 +75970,15 @@ function installSignalHandlers() {
 }
 
 // src/index.ts
+var ownPkg;
 try {
-  const pkgPath = path4.resolve(fileURLToPath(import.meta.url), "../../package.json");
-  checkForUpdates(JSON.parse(readFileSync3(pkgPath, "utf-8")));
+  ownPkg = JSON.parse(readFileSync5(path4.resolve(fileURLToPath(import.meta.url), "../../package.json"), "utf-8"));
+  if (process.argv[2] !== "update")
+    backgroundUpdate(ownPkg);
 } catch {}
 var aliasTodoId = (alias) => typeof alias === "string" && alias.includes(":") ? alias.slice(0, alias.indexOf(":")) : undefined;
 function formatPathWithTilde(path5) {
-  const home = homedir3();
+  const home = homedir5();
   return path5.startsWith(home) ? path5.replace(home, "~") : path5;
 }
 function promptArg(words) {
@@ -75386,6 +76088,10 @@ async function main() {
     console.log(VERSION);
     process.exit(0);
   }
+  if (positionals[0] === "update") {
+    const r = ownPkg ? await selfUpdate(ownPkg) : "unsupported";
+    process.exit(r === "updated" || r === "current" ? 0 : 1);
+  }
   if (positionals[0] === "status" && args.help) {
     printStatusHelp();
     process.exit(0);
@@ -75422,11 +76128,19 @@ async function main() {
     printNotifyHelp();
     process.exit(0);
   }
+  if (positionals[0] === "import" && args.help) {
+    printImportHelp();
+    process.exit(0);
+  }
+  if (positionals[0] === "import" && args["dry-run"]) {
+    await importCommand(null, positionals, args);
+    return;
+  }
   if ((positionals[0] === "list" || positionals[0] === "ls") && args.help) {
     printListTodosHelp();
     process.exit(0);
   }
-  if (args.help && !["list", "ls", "agent", "todo", "project", "brand", "device", "inbox", "notify"].includes(positionals[0])) {
+  if (args.help && !["list", "ls", "agent", "todo", "project", "brand", "device", "inbox", "notify", "import"].includes(positionals[0])) {
     printUsage();
     process.exit(0);
   }
@@ -75455,7 +76169,7 @@ async function main() {
   }
   if (args["reset-config"]) {
     const { unlinkSync } = await import("fs");
-    if (existsSync2(cfg.path)) {
+    if (existsSync4(cfg.path)) {
       unlinkSync(cfg.path);
       console.log(`Configuration reset: ${formatPathWithTilde(cfg.path)}`);
     } else
@@ -75565,6 +76279,10 @@ async function main() {
     await notifyCommand(api2, positionals, args, scopedProject);
     return;
   }
+  if (positionals[0] === "import") {
+    await importCommand(api2, positionals, args, scopedProject, cfgScope.data.default_agent_settings?.id);
+    return;
+  }
   if (positionals[0] === "delete") {
     const todoId = positionals[1];
     if (!todoId) {
@@ -75678,13 +76396,13 @@ async function main() {
       }
       name = "stdin";
     } else {
-      const abs = resolve4(filePath);
-      if (!existsSync2(abs)) {
+      const abs = resolve5(filePath);
+      if (!existsSync4(abs)) {
         process.stderr.write(`${RED3}File not found: ${filePath}${RESET2}
 `);
         process.exit(1);
       }
-      blob = new Blob([readFileSync3(abs)], { type: getMimeTypeFromFilename(abs) || undefined });
+      blob = new Blob([readFileSync5(abs)], { type: getMimeTypeFromFilename(abs) || undefined });
       name = path4.basename(filePath);
     }
     const res = await api2.showFile(todoId, blob, name, {
@@ -76016,7 +76734,7 @@ Resumed: ${CYAN2}${getFrontendUrl(apiUrl, todoId)}${RESET2}
   const wsReady = ws ? ws.connect() : null;
   const bridgeReady = !args["no-bridge"] && !args["no-watch"] && !args.isolated ? ensureBridgeRunning2(apiUrl, apiKey) : null;
   const isolatedTodoId = args.isolated ? randomUUID3() : undefined;
-  const mayfly = isolatedTodoId ? await spawnMayflyBridge(apiUrl, isolatedTodoId, realpathSync2(resolve4(args.path || ".")), { debug: !!args.debug, apiKey }) : null;
+  const mayfly = isolatedTodoId ? await spawnMayflyBridge(apiUrl, isolatedTodoId, realpathSync2(resolve5(args.path || ".")), { debug: !!args.debug, apiKey }) : null;
   if (mayfly) {
     process.stderr.write(`${DIM2}Isolated bridge:${RESET2} ${CYAN2}mayfly-${isolatedTodoId}${RESET2}
 `);
@@ -76048,7 +76766,7 @@ Resumed: ${CYAN2}${getFrontendUrl(apiUrl, todoId)}${RESET2}
     cfgScope.setDefaultAgent(getDisplayName(preMatchedAgent), preMatchedAgent);
   } else {
     const pathArg = args.path || ".";
-    const resolved = realpathSync2(resolve4(pathArg));
+    const resolved = realpathSync2(resolve5(pathArg));
     const matches = await api2.listAgentSettings({ workspacePath: resolved });
     if (matches.length > 0) {
       preMatchedAgent = matches[0];
@@ -76121,7 +76839,7 @@ Resumed: ${CYAN2}${getFrontendUrl(apiUrl, todoId)}${RESET2}
   if (args.model)
     agent2 = { ...agent2, model: args.model };
   if (args["raw-sysmsg"]) {
-    const sysmsg = readFileSync3(resolve4(args["raw-sysmsg"]), "utf-8");
+    const sysmsg = readFileSync5(resolve5(args["raw-sysmsg"]), "utf-8");
     agent2 = { ...agent2, systemMessage: sysmsg, systemMessageMode: "raw" };
   }
   if (args["allow-all"]) {