@ordewell/cli 0.5.2 → 0.5.3

package/dist/main.js

@@ -390,10 +390,15 @@ var WorkspaceInitNeededError = class extends Error {
   }
   workspace;
 };
-var ApiClient = class {
+var SESSION_PATH = /^\/api\/(?:plans|sessions)\/([^/?]+)/;
+var ApiClient = class _ApiClient {
+  /** Where a CLI invocation's sessions live, when a client is built without one: `--workspace`, else the cwd. */
+  static defaultWorkspace;
   port;
-  constructor(port) {
+  workspace;
+  constructor(port, workspace) {
     this.port = port || DEFAULT_PORT;
+    this.workspace = workspace ?? _ApiClient.defaultWorkspace ?? process.cwd();
   }
   /**
    * Read at call time rather than at construction: a daemon restarted mid-run
@@ -403,7 +408,23 @@ var ApiClient = class {
   token() {
     return (0, import_core3.readDaemonToken)(this.port);
   }
-  httpRequest(method, urlPath, body) {
+  /**
+   * A daemon holds only the sessions adopted since it started, so after a
+   * restart every session-scoped call answered "Session not found" until the
+   * user ran `ordewell sessions load`. The saved session is adopted here
+   * instead — idempotent for one the daemon still holds — and the call made
+   * once more; a 404 means the first attempt never ran, so the retry cannot
+   * act twice.
+   */
+  async httpRequest(method, urlPath, body) {
+    const res = await this.rawRequest(method, urlPath, body);
+    const sessionId = urlPath.match(SESSION_PATH)?.[1];
+    const missing = res.status === 404 && res.data?.error === "Session not found";
+    if (!missing || !sessionId || urlPath.split("?")[0].endsWith("/load")) return res;
+    const adopted2 = await this.rawRequest("POST", `/api/sessions/${sessionId}/load?workspace=${encodeURIComponent(this.workspace)}`);
+    return adopted2.status === 200 ? this.rawRequest(method, urlPath, body) : res;
+  }
+  rawRequest(method, urlPath, body) {
     return new Promise((resolve3, reject) => {
       const url = new URL(urlPath, `http://127.0.0.1:${this.port}`);
       const configuredTimeout = Number.parseInt(process.env.ORDEWELL_HTTP_TIMEOUT_MS || "", 10);
@@ -1065,7 +1086,7 @@ function isTransient(event) {
 // src/commands/plan.ts
 var import_core6 = require("@ordewell/core");
 function planTasks(plan) {
-  return plan?.tasks || [];
+  return plan ? allTasksOf(plan) : [];
 }
 function hasCommittedPlan(plan) {
   return planTasks(plan).length > 0;
@@ -1133,7 +1154,7 @@ function printPlan(plan, sessionId, runners2, models) {
     return rp ? ` (${task.assignedModel.modelLabel} \xB7 ${label})` : ` (${task.assignedModel.modelLabel})`;
   };
   console.log(`
-Plan: ${tasks.length} tasks (${aiCount} AI, ${manCount} Manual) \u2014 ${(plan.runners || runners2).join(", ")}`);
+Plan: ${tasks.length} task${tasks.length === 1 ? "" : "s"} (${aiCount} AI, ${manCount} Manual) \u2014 ${(plan.runners || runners2).join(", ")}`);
   console.log(`Session: ${sessionId}
 `);
   for (const t of tasks) {
@@ -7210,7 +7231,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
   const targetPort = explicitPort ? resolvePort(subArgs) : await findFreePort();
   const { port, owned: ownedAtLaunch } = await ensureDaemonOwned(targetPort, { detached: false });
   let owned = ownedAtLaunch;
-  const api = new ApiClient(port);
+  const api = new ApiClient(port, workspace);
   const conversationQueue = new ConversationQueue();
   let terminal;
   const autoMode = process.env.ORDEWELL_AUTONOMOUS_MODE;
@@ -7358,6 +7379,7 @@ async function main() {
     console.log(cliVersion());
     return;
   }
+  ApiClient.defaultWorkspace = flag(argv, "--workspace") || void 0;
   const sessionAt = argv.indexOf("--session-id");
   if (sessionAt > 0 && argv[sessionAt + 1]) {
     argv[sessionAt + 1] = expandSessionId(argv[sessionAt + 1], flag(argv, "--workspace") || process.cwd());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",
@@ -48,8 +48,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ordewell/core": "^0.5.2",
-    "@ordewell/web": "^0.5.2",
+    "@ordewell/core": "^0.5.3",
+    "@ordewell/web": "^0.5.3",
     "string-width": "^7.2.0",
     "ws": "^8.18.0"
   },