@todoforai/cli 0.1.42 → 0.1.43

package/README.md

@@ -97,7 +97,7 @@ Pick **TODOforAI** from the agent dropdown in AI Chat.
 
 **VS Code** — no built-in ACP client yet; install a community ACP client extension (e.g. [`strato-space.acp-plugin`](https://marketplace.visualstudio.com/items?itemName=strato-space.acp-plugin)) and add the same `agent_servers` entry to `settings.json`.
 
-Options like `--agent`, `--project`, `--path`, `--api-url` apply to `acp` as well (e.g. `"args": ["acp", "--agent", "backend"]`). If `todoforai-cli` is not on the editor's `PATH`, use its absolute path (`which todoforai-cli`).
+`--agent`, `--project` and `--api-url` apply to `acp` as well (e.g. `"args": ["acp", "--agent", "backend"]`). If `todoforai-cli` is not on the editor's `PATH`, use its absolute path (`which todoforai-cli`).
 
 ## All Options
 

package/dist/todoforai-cli.js

@@ -43177,8 +43177,7 @@ class FrontendWebSocket {
       });
       this.ws.on("close", () => {
         this.connected = false;
-        for (const [todoId, ev] of [...this.completionEvents])
-          ev.resolve({ type: "socket:closed", payload: { todoId, status: "DISCONNECTED" }, success: false });
+        this.settleAll();
       });
       this.ws.on("error", (err) => {
         log("error", "WS error:", err.message);
@@ -43187,8 +43186,13 @@ class FrontendWebSocket {
       });
     });
   }
+  settleAll() {
+    for (const [todoId, ev] of [...this.completionEvents])
+      ev.resolve({ type: "socket:closed", payload: { todoId, status: "DISCONNECTED" }, success: false });
+  }
   async close() {
     this.connected = false;
+    this.settleAll();
     this.ws?.close();
     this.ws = null;
     this.callbacks.clear();
@@ -43197,6 +43201,10 @@ class FrontendWebSocket {
     this.pendingBlocks.clear();
     this.lastReadyPayload.clear();
   }
+  forget(todoId) {
+    for (const m of [this.callbacks, this.completionEvents, this.completionResults, this.pendingBlocks, this.lastReadyPayload])
+      m.delete(todoId);
+  }
   handleMessage(data) {
     const msgType = data.type || "";
     const payload = data.payload || {};
@@ -43326,11 +43334,14 @@ class FrontendWebSocket {
     if (!await this.subscribe(todoId, callback)) {
       throw new Error(`Failed to subscribe to todo ${todoId}`);
     }
+    return this.completion(todoId);
+  }
+  completion(todoId) {
     const early = this.completionResults.get(todoId);
     if (early) {
       this.completionResults.delete(todoId);
       this.callbacks.delete(todoId);
-      return early;
+      return Promise.resolve(early);
     }
     return new Promise((resolve) => {
       this.completionEvents.set(todoId, {
@@ -44429,7 +44440,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@todoforai/cli",
-  version: "0.1.42",
+  version: "0.1.43",
   type: "module",
   bin: {
     "todoforai-cli": "bin/todoforai-cli.js",
@@ -52549,12 +52560,14 @@ class TodoforaiAgent {
   api;
   ws;
   projectId;
+  agentQuery;
   sessions = new Map;
-  constructor(conn, api, ws, projectId) {
+  constructor(conn, api, ws, projectId, agentQuery) {
     this.conn = conn;
     this.api = api;
     this.ws = ws;
     this.projectId = projectId;
+    this.agentQuery = agentQuery;
   }
   async initialize() {
     return { protocolVersion: PROTOCOL_VERSION, agentCapabilities: { promptCapabilities: { embeddedContext: true } }, authMethods: [] };
@@ -52569,10 +52582,19 @@ class TodoforaiAgent {
       throw RequestError.internalError("no project on this account");
     return this.projectId = id;
   }
+  async resolveAgent(cwd) {
+    if (this.agentQuery) {
+      const { match, ambiguous } = resolveAgentMatch(await this.api.listAgentSettings(), this.agentQuery);
+      if (!match)
+        throw RequestError.invalidParams(`agent '${this.agentQuery}' ${ambiguous?.length ? "is ambiguous" : "not found"}`);
+      return match;
+    }
+    return (await this.api.listAgentSettings({ workspacePath: cwd }))[0] ?? await autoCreateAgent(this.api, cwd);
+  }
   async newSession(p) {
     const projectId = await this.resolveProject();
     const cwd = realpathSync(p.cwd);
-    const agent = (await this.api.listAgentSettings({ workspacePath: cwd }))[0] ?? await autoCreateAgent(this.api, cwd);
+    const agent = await this.resolveAgent(cwd);
     const todoId = crypto.randomUUID();
     this.sessions.set(todoId, { todoId, projectId, agent });
     log2(`session ${todoId} agent=${agent.name} cwd=${cwd}`);
@@ -52672,13 +52694,17 @@ ${b.resource.text}
     };
     try {
       const msg = await this.api.addMessage(s.projectId, text, s.agent, s.todoId, undefined, NEVER_SCHEDULED_TIMESTAMP);
-      const done = this.ws.waitForCompletion(s.todoId, onEvent);
+      if (!await this.ws.subscribe(s.todoId, onEvent))
+        throw new Error("subscribe failed");
+      const done = this.ws.completion(s.todoId);
       if (turn.cancelled)
         return { stopReason: "cancelled" };
       await this.api.updateAndStart(s.todoId, s.agent, msg.messages?.at(-1)?.id);
       turn.started = true;
-      const result = await done;
       if (turn.cancelled)
+        await this.ws.sendInterrupt(s.projectId, s.todoId);
+      const result = await done;
+      if (turn.cancelled || /^CANCELLED/.test(result?.payload?.status))
         return { stopReason: "cancelled" };
       if (!result?.success)
         throw RequestError.internalError(`todo ended with status ${result?.payload?.status ?? "unknown"}`);
@@ -52689,7 +52715,7 @@ ${b.resource.text}
       throw RequestError.internalError(String(e?.message || e));
     } finally {
       turn.done = true;
-      this.ws.setCallback(s.todoId);
+      this.ws.forget(s.todoId);
     }
   }
 }
@@ -52702,7 +52728,7 @@ async function runAcp(apiUrl, apiKey, opts) {
   if (!wsOk)
     throw new Error("frontend websocket connect failed");
   const stream2 = ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin));
-  new AgentSideConnection((conn) => new TodoforaiAgent(conn, api, ws, opts.projectId), stream2);
+  new AgentSideConnection((conn) => new TodoforaiAgent(conn, api, ws, opts.projectId, opts.agent), stream2);
   log2(`ready (${apiUrl})`);
   await new Promise((resolve3) => {
     process.stdin.once("end", resolve3);
@@ -52977,7 +53003,7 @@ Cancelled by user (Ctrl+C)
 `);
         process.exit(2);
       }
-    await runAcp(apiUrl, apiKey, { projectId: args.project || getEnv("PROJECT_ID") || cfgScope.data.default_project_id, noBridge: !!args["no-bridge"] });
+    await runAcp(apiUrl, apiKey, { projectId: args.project || getEnv("PROJECT_ID") || cfgScope.data.default_project_id, agent: args.agent, noBridge: !!args["no-bridge"] });
     return;
   }
   if (positionals[0] === "status") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todoforai/cli",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "type": "module",
   "bin": {
     "todoforai-cli": "bin/todoforai-cli.js",