@todoforai/cli 0.1.14 → 0.1.15

package/README.md

@@ -1,4 +1,4 @@
-# todoai CLI
+# todoforai-cli CLI
 
 CLI for [TODOforAI](https://todofor.ai) — create, watch, and inspect AI-powered todos.
 
@@ -10,11 +10,11 @@ bun install -g @todoforai/cli
 
 ## Setup
 
-Just run `todoai` — on first use it opens a browser for **device login** and saves the API key to `~/.todoforai/credentials.json` (shared with the edge daemon).
+Just run `todoforai-cli` — on first use it opens a browser for **device login** and saves the API key to `~/.todoforai/credentials.json` (shared with the edge daemon).
 
 ```bash
-todoai                # prompts device login if no key found
-todoai login          # explicit login
+todoforai-cli                # prompts device login if no key found
+todoforai-cli login          # explicit login
 ```
 
 API URL resolution: `--api-url` flag → `TODOFORAI_API_URL` env → `https://api.todofor.ai`.
@@ -25,7 +25,7 @@ Project, agent, and last-todo state are stored **per API URL** under `per_api_ur
 
 ## Edge daemon
 
-The CLI talks to the backend over WebSocket; **shell execution, file I/O, and tool calls happen in the edge daemon** running locally. On every run `todoai` spawns a detached edge process if none is running (PID-locked at `~/.todoforai/edge-<hash>.lock`, logs at `~/.todoforai/edge.log`). It keeps running after the CLI exits, so long-running tasks survive `Ctrl+D`.
+The CLI talks to the backend over WebSocket; **shell execution, file I/O, and tool calls happen in the edge daemon** running locally. On every run `todoforai-cli` spawns a detached edge process if none is running (PID-locked at `~/.todoforai/edge-<hash>.lock`, logs at `~/.todoforai/edge.log`). It keeps running after the CLI exits, so long-running tasks survive `Ctrl+D`.
 
 Disable with `--no-edge` if you manage the edge yourself (e.g. systemd, separate terminal).
 
@@ -34,18 +34,18 @@ Disable with `--no-edge` if you manage the edge yourself (e.g. systemd, separate
 ### Create a todo from a prompt
 
 ```bash
-todoai "Fix the login bug"
-todoai -n "Quick task"                    # non-interactive (run and exit)
-echo "content" | todoai                   # pipe from stdin
-todoai --path /my/project "Fix bug"       # explicit workspace
+todoforai-cli "Fix the login bug"
+todoforai-cli -n "Quick task"                    # non-interactive (run and exit)
+echo "content" | todoforai-cli                   # pipe from stdin
+todoforai-cli --path /my/project "Fix bug"       # explicit workspace
 ```
 
 ### Start from a registry template
 
 ```bash
-todoai --template alternativeto-listing                          # interactive input prompts
-todoai --template f5bot-monitoring-setup --input "monitoring_details=My Brand"  # with inputs
-todoai --template f5bot-monitoring-setup --no-watch --json       # create only
+todoforai-cli --template alternativeto-listing                          # interactive input prompts
+todoforai-cli --template f5bot-monitoring-setup --input "monitoring_details=My Brand"  # with inputs
+todoforai-cli --template f5bot-monitoring-setup --no-watch --json       # create only
 ```
 
 When inputs are missing, the CLI prompts interactively (unless `-n`).
@@ -53,7 +53,7 @@ When inputs are missing, the CLI prompts interactively (unless `-n`).
 ### Inspect a todo (read-only)
 
 ```bash
-todoai --inspect <todo-id>
+todoforai-cli --inspect <todo-id>
 ```
 
 Prints the full chat log: messages, tool calls (type, status, path/cmd), results, and errors. No logo, no interactive mode.
@@ -61,8 +61,8 @@ Prints the full chat log: messages, tool calls (type, status, path/cmd), results
 ### Resume / continue
 
 ```bash
-todoai -c                     # continue most recent todo
-todoai --resume <todo-id>     # resume specific todo
+todoforai-cli -c                     # continue most recent todo
+todoforai-cli --resume <todo-id>     # resume specific todo
 ```
 
 ## All Options

package/dist/todoai.js

@@ -42752,6 +42752,27 @@ class ApiClient {
       throw new Error(`API ${method} ${endpoint} failed: ${res.status} ${await res.text()}`);
     return res.json();
   }
+  async trpcQuery(path2, input) {
+    const base = this.apiUrl.replace(/\/api\/v1\/?$/, "").replace(/\/$/, "");
+    const params = new URLSearchParams({
+      batch: "1",
+      input: JSON.stringify({ 0: input })
+    });
+    const res = await fetch(`${base}/trpc/api/${path2}?${params}`, {
+      method: "GET",
+      headers: this.headers,
+      signal: AbortSignal.timeout(30000)
+    });
+    const text = await res.text();
+    if (!res.ok)
+      throw new Error(`API tRPC ${path2} failed: ${res.status} ${text}`);
+    const payload = JSON.parse(text);
+    const item = Array.isArray(payload) ? payload[0] : payload;
+    if (item?.error)
+      throw new Error(`API tRPC ${path2} failed: ${item.error.message || JSON.stringify(item.error)}`);
+    const data = item?.result?.data;
+    return data?.json !== undefined ? data.json : data;
+  }
   async validateApiKey() {
     if (!this.apiKey)
       return { valid: false, error: "No API key provided" };
@@ -42790,9 +42811,10 @@ class ApiClient {
   createTodo(projectId, content, agentSettings) {
     return this.request("POST", `/api/v1/projects/${projectId}/todos`, { content, agentSettings });
   }
-  listTodos(projectId) {
-    const endpoint = projectId ? `/api/v1/projects/${projectId}/todos` : "/api/v1/todos";
-    return this.request("GET", endpoint);
+  listTodos(projectId, opts) {
+    if (!projectId)
+      return this.request("GET", "/api/v1/todos");
+    return this.trpcQuery("todo.list", { projectId, ...opts });
   }
   getTodo(todoId) {
     return this.request("GET", `/api/v1/todos/${todoId}`);
@@ -43107,8 +43129,8 @@ var package_default = {
   version: "0.1.3",
   type: "module",
   bin: {
-    todoai: "dist/todoai.js",
-    "todoforai-cli": "dist/todoai.js"
+    "todoforai-cli": "dist/todoai.js",
+    todoai: "dist/todoai.js"
   },
   files: ["dist/todoai.js"],
   scripts: {
@@ -43147,6 +43169,7 @@ var TodoStatus;
   TodoStatus2["POSTPONED"] = "POSTPONED";
   TodoStatus2["REVIEW_REQUESTED"] = "REVIEW_REQUESTED";
   TodoStatus2["RUNNING"] = "RUNNING";
+  TodoStatus2["WAITING_FOR_USER"] = "WAITING_FOR_USER";
   TodoStatus2["COMPACTING"] = "COMPACTING";
   TodoStatus2["STOPPING"] = "STOPPING";
   TodoStatus2["READY"] = "READY";
@@ -43451,6 +43474,15 @@ var SERVER_TO_FRONTENDS = {
   },
   functions: {}
 };
+// ../packages/shared-fbe/src/templateBody.ts
+var USER_HEADINGS = new Set([
+  "your task",
+  "your tasks",
+  "tasks",
+  "task",
+  "steps",
+  "data needed"
+]);
 // ../packages/shared-fbe/src/bashPatterns.ts
 function splitShellCommands(input) {
   const parts = [];
@@ -43940,24 +43972,24 @@ function getEnv(name) {
 }
 function printUsage() {
   process.stderr.write(`
-todoai \u2014 TODOforAI CLI (Bun)
+todoforai-cli \u2014 TODOforAI CLI (Bun)
 
 Usage:
-  todoai login                          # Browser-based device auth
-  todoai "prompt text"                  # Prompt as argument
-  todoai -n "Quick task"               # Non-interactive (run and exit)
-  echo "content" | todoai              # Pipe from stdin
-  todoai --path /my/project "Fix bug"  # Explicit workspace path
-  todoai -c ["prompt"]                 # Resume last todo (optional prompt sent on attach)
-  todoai --resume <todo-id> ["prompt"] # Resume specific todo (optional prompt sent on attach)
-  todoai --inspect <todo-id>[@<slice>] # Read chat log. <slice> = -3:, :1, 5:10, 7  (Python-style)
-  todoai --template <id> [--input k=v] # Start from a registry template
-  todoai --list-agents                 # List available agents and exit
-  todoai agent update <agent> model=<model>    # Update agent settings (see 'agent --help')
-  todoai list [-n 30] [--all] [--status S]   # List todos (open + recent first); see 'list --help'
-  todoai status <todo-id> <STATUS>     # Update a todo's status (run 'status --help' for the full list)
-  todoai delete <todo-id>              # Permanently delete a todo
-  todoai addmessage <todo-id> "text"  # Add a message to an existing todo
+  todoforai-cli login                          # Browser-based device auth
+  todoforai-cli "prompt text"                  # Prompt as argument
+  todoforai-cli -n "Quick task"               # Non-interactive (run and exit)
+  echo "content" | todoforai-cli              # Pipe from stdin
+  todoforai-cli --path /my/project "Fix bug"  # Explicit workspace path
+  todoforai-cli -c ["prompt"]                 # Resume last todo (optional prompt sent on attach)
+  todoforai-cli --resume <todo-id> ["prompt"] # Resume specific todo (optional prompt sent on attach)
+  todoforai-cli --inspect <todo-id>[@<slice>] # Read chat log. <slice> = -3:, :1, 5:10, 7  (Python-style)
+  todoforai-cli --template <id> [--input k=v] # Start from a registry template
+  todoforai-cli --list-agents                 # List available agents and exit
+  todoforai-cli agent update <agent> model=<model>    # Update agent settings (see 'agent --help')
+  todoforai-cli list [-n 30] [--cursor N] [--all] [--status S]  # List todos (paginated); see 'list --help'
+  todoforai-cli status <todo-id> <STATUS>     # Update a todo's status (run 'status --help' for the full list)
+  todoforai-cli delete <todo-id>              # Permanently delete a todo
+  todoforai-cli addmessage <todo-id> "text"  # Add a message to an existing todo
 
 Options:
   --path <dir>                    Workspace path (default: cwd)
@@ -43999,7 +44031,7 @@ var STATUS_HELP = {
 };
 function printStatusHelp() {
   process.stderr.write(`
-todoai status <todo-id> <STATUS>
+todoforai-cli status <todo-id> <STATUS>
 
 Common statuses:
 ${Object.entries(STATUS_HELP).map(([s, d]) => `  ${s.padEnd(18)}${d}`).join(`
@@ -45027,6 +45059,28 @@ function getItemId(item) {
     return item.project.id;
   return item?.id || "";
 }
+function resolveAgentMatch(agents, query) {
+  const byId = agents.find((a) => getItemId(a) === query);
+  if (byId)
+    return { match: byId };
+  const q = query.toLowerCase();
+  const esc = q.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const boundary = new RegExp(`\\b${esc}`);
+  const name = (a) => getDisplayName(a).toLowerCase();
+  const tiers = [
+    agents.filter((a) => name(a) === q),
+    agents.filter((a) => name(a).startsWith(q)),
+    agents.filter((a) => boundary.test(name(a))),
+    agents.filter((a) => name(a).includes(q))
+  ];
+  for (const tier of tiers) {
+    if (tier.length === 1)
+      return { match: tier[0] };
+    if (tier.length > 1)
+      return { ambiguous: tier };
+  }
+  return {};
+}
 function terminalLine(prompt) {
   const rl = createInterface2({ input: process.stdin, output: process.stderr });
   return new Promise((resolve3) => {
@@ -45758,12 +45812,12 @@ async function listAgentsCommand(api, opts) {
 // src/agent-command.ts
 function printAgentHelp() {
   process.stderr.write(`
-todoai agent \u2014 inspect and update agent settings
+todoforai-cli agent \u2014 inspect and update agent settings
 
 Usage:
-  todoai agent list                            List agents (name, model, id, paths)
-  todoai agent get <agent>                     Show a single agent's settings
-  todoai agent update <agent> <field=value>\u2026   Update one or more settings
+  todoforai-cli agent list                            List agents (name, model, id, paths)
+  todoforai-cli agent get <agent>                     Show a single agent's settings
+  todoforai-cli agent update <agent> <field=value>\u2026   Update one or more settings
 
 <agent> is a name or id (unique partial name also works).
 Fields map directly to agent settings; values are parsed as JSON when possible
@@ -45776,9 +45830,9 @@ Fields map directly to agent settings; values are parsed as JSON when possible
   name            agent display name
 
 Examples:
-  todoai agent update <agent> model=claude
-  todoai agent update <agent> model=anthropic:anthropic/claude-opus-4.8 temperature=0.5
-  todoai agent update <agent> sysmsg="You are a terse video editor."
+  todoforai-cli agent update <agent> model=claude
+  todoforai-cli agent update <agent> model=anthropic:anthropic/claude-opus-4.8 temperature=0.5
+  todoforai-cli agent update <agent> sysmsg="You are a terse video editor."
 `);
 }
 var FIELD_ALIASES = {
@@ -45804,20 +45858,13 @@ function parseAssignment(arg) {
   }
 }
 function resolveAgent(agents, query) {
-  const byId = agents.find((a) => getItemId(a) === query);
-  if (byId)
-    return byId;
-  const q = query.toLowerCase();
-  const exact = agents.filter((a) => getDisplayName(a).toLowerCase() === q);
-  if (exact.length === 1)
-    return exact[0];
-  const partial = agents.filter((a) => getDisplayName(a).toLowerCase().includes(q));
-  if (partial.length === 1)
-    return partial[0];
-  if (partial.length > 1) {
-    process.stderr.write(`${RED}Ambiguous agent '${query}', matches:${RESET}
+  const { match, ambiguous } = resolveAgentMatch(agents, query);
+  if (match)
+    return match;
+  if (ambiguous) {
+    process.stderr.write(`${RED}Ambiguous agent '${query}' \u2014 ${ambiguous.length} matches. Re-run with the exact id:${RESET}
 `);
-    for (const a of partial)
+    for (const a of ambiguous)
       process.stderr.write(`  ${getDisplayName(a)}  ${DIM}${getItemId(a)}${RESET}
 `);
     process.exit(2);
@@ -45853,7 +45900,7 @@ async function agentCommand(api, positionals, args, formatPath) {
     const query = positionals[2];
     const assignments = positionals.slice(3);
     if (!query || !assignments.length) {
-      process.stderr.write(`${RED}Usage: todoai agent update <name|id> <field=value>\u2026${RESET}
+      process.stderr.write(`${RED}Usage: todoforai-cli agent update <name|id> <field=value>\u2026${RESET}
 `);
       process.exit(2);
     }
@@ -45907,34 +45954,87 @@ var CLOSED = new Set([
 ]);
 var VALID_STATUS = new Set(Object.values(TodoStatus));
 var isOpen = (s) => !CLOSED.has(s);
-function printHelp() {
+function printListTodosHelp() {
   process.stderr.write(`
-todoai list \u2014 list todos in a project (recent first)
+todoforai-cli list \u2014 list todos in a project (recent first)
 
 Usage:
-  todoai list [flags]
+  todoforai-cli list [flags]
 
 Flags:
   -n, --limit <n>          Max rows to show (default: 30)
+      --cursor <n>         Fetch todos older than this cursor (lastActivityAt)
+      --page-size <n>      Backend page size per request (default: min(limit, 100), max: 100)
+      --search <text>      Search content/status on the backend
   -s, --status <S[,S2]>    Filter by status (comma-separated, union).
   -A, --all                Include DONE (also CANCELLED, ARCHIVED, \u2026)
       --project <id>       Project ID (default: current default project)
-      --json               Output raw JSON
+      --json               Output { items, nextCursor } as JSON
   -h, --help               Show this help
 
 Examples:
-  todoai list                       # 30 most recent open todos
-  todoai list -n 50                 # last 50 open
-  todoai list --all                 # include DONE
-  todoai list -s RUNNING,REVIEW_REQUESTED
-  todoai list --json | jq '.[].id'
+  todoforai-cli list                         # 30 most recent open todos
+  todoforai-cli list -n 50                   # last 50 open
+  todoforai-cli list --cursor 1719234567890  # next page
+  todoforai-cli list --all                   # include DONE
+  todoforai-cli list -s RUNNING,REVIEW_REQUESTED
+  todoforai-cli list --search bug --json | jq '.items[].id'
+`);
+}
+function positiveInt(value, name) {
+  if (value === undefined)
+    return;
+  const n = Number(value);
+  if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1) {
+    process.stderr.write(`${RED}Error: ${name} must be a positive integer${RESET}
+`);
+    process.exit(2);
+  }
+  return n;
+}
+function cursorValue(value) {
+  if (value === undefined)
+    return;
+  const n = Number(value);
+  if (!Number.isFinite(n) || n < 0) {
+    process.stderr.write(`${RED}Error: --cursor must be a non-negative number${RESET}
 `);
+    process.exit(2);
+  }
+  return n;
+}
+function toItemsPage(response) {
+  if (Array.isArray(response))
+    return { items: response };
+  return {
+    items: Array.isArray(response?.items) ? response.items : [],
+    nextCursor: typeof response?.nextCursor === "number" ? response.nextCursor : undefined
+  };
+}
+function rowTime(t) {
+  return Number(t.lastActivityAt ?? t.createdAt ?? 0);
+}
+function printStatusError(unknown) {
+  process.stderr.write(`${RED}Error: unknown status ${unknown.map((s) => `'${s}'`).join(", ")}${RESET}
+`);
+  process.stderr.write(`${DIM}Use OPEN or one of: ${Object.values(TodoStatus).join(", ")}${RESET}
+`);
+  process.exit(2);
+}
+function matchesRequestedStatus(t, requested, wanted, wantOpen) {
+  if (!requested)
+    return true;
+  const s = String(t.status).toUpperCase();
+  return wantOpen && isOpen(s) || (wanted?.has(s) ?? false);
 }
 async function listTodosCommand(api, defaultProjectId, argv) {
   const { values } = parseArgs2({
     args: argv,
     options: {
       limit: { type: "string", short: "n" },
+      cursor: { type: "string" },
+      "page-size": { type: "string" },
+      search: { type: "string" },
       status: { type: "string", short: "s" },
       all: { type: "boolean", short: "A", default: false },
       project: { type: "string" },
@@ -45944,7 +46044,7 @@ async function listTodosCommand(api, defaultProjectId, argv) {
     strict: true
   });
   if (values.help) {
-    printHelp();
+    printListTodosHelp();
     return;
   }
   const projectId = values.project || defaultProjectId;
@@ -45953,38 +46053,68 @@ async function listTodosCommand(api, defaultProjectId, argv) {
 `);
     process.exit(1);
   }
-  const limit = values.limit ? Math.max(1, Number(values.limit)) : 30;
+  const limit = positiveInt(values.limit, "--limit") ?? 30;
+  const pageSize = Math.min(positiveInt(values["page-size"], "--page-size") ?? Math.min(Math.max(limit, 1), 100), 100);
+  let cursor = cursorValue(values.cursor);
+  const search = values.search ? String(values.search) : undefined;
   const requested = values.status ? String(values.status).split(",").map((s) => s.trim().toUpperCase()).filter(Boolean) : null;
-  const wantOpen = !!requested?.some((s) => s === "OPEN" || !VALID_STATUS.has(s));
+  const unknown = requested?.filter((s) => s !== "OPEN" && !VALID_STATUS.has(s)) ?? [];
+  if (unknown.length)
+    printStatusError(unknown);
+  const wantOpen = !!requested?.some((s) => s === "OPEN");
   const wanted = requested ? new Set(requested.filter((s) => VALID_STATUS.has(s))) : null;
   const includeClosed = !!values.all || !!wanted && wanted.size > 0;
-  const todos = await api.listTodos(projectId);
-  let rows = todos.filter((t) => includeClosed || !CLOSED.has(String(t.status).toUpperCase())).filter((t) => {
-    if (!requested)
-      return true;
-    const s = String(t.status).toUpperCase();
-    return wantOpen && isOpen(s) || (wanted?.has(s) ?? false);
-  }).sort((a, b) => (b.lastActivityAt ?? b.createdAt ?? 0) - (a.lastActivityAt ?? a.createdAt ?? 0)).slice(0, limit);
+  const rows = [];
+  let backendNextCursor;
+  while (rows.length < limit) {
+    const requestLimit = Math.min(pageSize, limit - rows.length);
+    const page = toItemsPage(await api.listTodos(projectId, { limit: requestLimit, cursor, search }));
+    backendNextCursor = page.nextCursor;
+    for (const t of page.items) {
+      const status = String(t.status).toUpperCase();
+      if (!includeClosed && CLOSED.has(status))
+        continue;
+      if (!matchesRequestedStatus(t, requested, wanted, wantOpen))
+        continue;
+      rows.push(t);
+      if (rows.length >= limit)
+        break;
+    }
+    if (!backendNextCursor || page.items.length === 0)
+      break;
+    cursor = backendNextCursor;
+  }
+  rows.sort((a, b) => rowTime(b) - rowTime(a));
+  const visible = rows.slice(0, limit);
+  const hasBufferedRows = rows.length > visible.length;
+  const nextCursor = visible.length && (backendNextCursor !== undefined || hasBufferedRows) ? rowTime(visible[visible.length - 1]) : undefined;
   if (values.json) {
-    process.stdout.write(JSON.stringify(rows, null, 2) + `
+    process.stdout.write(JSON.stringify({ items: visible, nextCursor }, null, 2) + `
 `);
     return;
   }
-  if (!rows.length) {
+  if (!visible.length) {
     process.stderr.write(`${DIM}(no todos)${RESET}
+`);
+    if (nextCursor !== undefined)
+      process.stderr.write(`${DIM}Next cursor: ${nextCursor} (re-run with the same filters plus --cursor ${nextCursor})${RESET}
 `);
     return;
   }
-  const statusW = rows.reduce((n, r) => Math.max(n, String(r.status).length), 0);
-  for (const t of rows) {
-    const sc = STATUS_COLOR[t.status] || DIM;
-    const ts = new Date(t.lastActivityAt ?? t.createdAt).toISOString().slice(0, 16).replace("T", " ");
+  const statusW = visible.reduce((n, r) => Math.max(n, String(r.status).length), 0);
+  for (const t of visible) {
+    const status = String(t.status).toUpperCase();
+    const sc = STATUS_COLOR[status] || DIM;
+    const ts = new Date(rowTime(t)).toISOString().slice(0, 16).replace("T", " ");
     const title = String(t.content ?? "").split(`
 `)[0].slice(0, 100);
-    process.stdout.write(`${sc}${String(t.status).padEnd(statusW)}${RESET}  ${DIM}${ts}${RESET}  ${t.id}  ${title}
+    process.stdout.write(`${sc}${status.padEnd(statusW)}${RESET}  ${DIM}${ts}${RESET}  ${t.id}  ${title}
 `);
   }
-  process.stderr.write(`${DIM}${rows.length} todo(s)${RESET}
+  process.stderr.write(`${DIM}${visible.length} todo(s)${RESET}
+`);
+  if (nextCursor !== undefined)
+    process.stderr.write(`${DIM}Next cursor: ${nextCursor} (re-run with the same filters plus --cursor ${nextCursor})${RESET}
 `);
 }
 
@@ -46139,6 +46269,10 @@ Cancelled by user (Ctrl+C)
     printAgentHelp();
     process.exit(0);
   }
+  if ((positionals[0] === "list" || positionals[0] === "ls") && args.help) {
+    printListTodosHelp();
+    process.exit(0);
+  }
   if (args.help && !["list", "ls", "agent"].includes(positionals[0])) {
     printUsage();
     process.exit(0);
@@ -46234,7 +46368,7 @@ Cancelled by user (Ctrl+C)
   if (positionals[0] === "delete") {
     const todoId = positionals[1];
     if (!todoId) {
-      process.stderr.write(`${RED}Usage: todoai delete <todo-id>${RESET}
+      process.stderr.write(`${RED}Usage: todoforai-cli delete <todo-id>${RESET}
 `);
       process.exit(2);
     }
@@ -46247,7 +46381,7 @@ Cancelled by user (Ctrl+C)
     const [, todoId, ...rest] = positionals;
     const content2 = rest.join(" ") || await readStdin();
     if (!todoId || !content2) {
-      process.stderr.write(`${RED}Usage: todoai addmessage <todo-id> "content"${RESET}
+      process.stderr.write(`${RED}Usage: todoforai-cli addmessage <todo-id> "content"${RESET}
 `);
       process.exit(2);
     }
@@ -46440,14 +46574,22 @@ Resumed: ${CYAN}${getFrontendUrl(apiUrl, projectId2, todoId)}${RESET}
   let preMatchedAgent = null;
   let agents = null;
   if (args.agent) {
-    const matches = await api.listAgentSettings({ name: args.agent });
-    if (matches.length > 0) {
-      preMatchedAgent = matches[0];
-    } else {
+    agents = await api.listAgentSettings();
+    const { match, ambiguous } = resolveAgentMatch(agents, args.agent);
+    if (ambiguous) {
+      process.stderr.write(`Error: Ambiguous agent '${args.agent}' \u2014 ${ambiguous.length} matches. Re-run with the exact id:
+`);
+      for (const a of ambiguous)
+        process.stderr.write(`  ${getDisplayName(a)}  ${DIM}${getItemId(a)}${RESET}
+`);
+      process.exit(1);
+    }
+    if (!match) {
       process.stderr.write(`Error: Agent '${args.agent}' not found
 `);
       process.exit(1);
     }
+    preMatchedAgent = match;
     cfgScope.setDefaultAgent(getDisplayName(preMatchedAgent), preMatchedAgent);
   } else {
     const pathArg = args.path || ".";

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@todoforai/cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "type": "module",
   "bin": {
-    "todoai": "dist/todoai.js",
-    "todoforai-cli": "dist/todoai.js"
+    "todoforai-cli": "dist/todoai.js",
+    "todoai": "dist/todoai.js"
   },
   "files": [
     "dist/todoai.js"