@ordewell/cli 0.5.2 → 0.5.4

package/README.md

@@ -1,56 +1,49 @@
 # @ordewell/cli
 
-The command line and terminal UI for **[Ordewell](https://ordewell.ai)** — turn one
-goal into an ordered plan of coding-agent tasks, each with its own runner, model
-and mode, then execute and verify it.
+The command line and terminal UI for **[Ordewell](https://ordewell.ai)**, task
+orchestration for coding agents. One goal becomes an ordered plan of tasks, each on
+its own runner, model and branch. Ordewell executes the plan, verifies every task
+from evidence, and leaves the final merge to you.
 
-```bash
-npm install -g @ordewell/cli              # or: npm install -g ordewell
-
-export OPENROUTER_API_KEY="sk-or-..."     # any one provider key — auto-detected
-
-ordewell                                  # the TUI
-```
-
-Bare `ordewell` opens the full-screen terminal UI. On first run it tells you
-what it still needs — a planner and at least one runner — both settable from
-inside it with `/planner`, `/runners` and `/key`. Or drive it as a CLI:
+## Installation
 
 ```bash
-ordewell plan --goal "Add rate limiting to the public API"
-ordewell run
+npm install -g @ordewell/cli        # or: npm install -g ordewell
 ```
 
-No API key? Plan on a coding agent you already have installed — it's what
-executes the tasks anyway:
+**Requirements:** Node.js 20 or newer, at least one of Claude Code, Codex or
+OpenCode, git for task isolation, and tmux for the terminal UI. Linux, macOS and
+Windows are supported; on Windows, run the terminal UI under WSL.
 
-```bash
-export AI_PROVIDER="claude-code"          # or codex, or opencode
-ordewell plan --goal "Add rate limiting to the public API"
-```
+## Usage
 
-## The two surfaces in this package
+Run `ordewell` in your project to open the terminal UI: the conversation on the
+left, the live plan on the right. The first run lets you pick a planner and runners
+with `/planner` and `/runners`, and no API key is needed if you plan with a coding
+agent you already use.
 
-```bash
-ordewell            # full-screen terminal UI: chat on the left, plan on the right
-ordewell --help     # every slash command is also a subcommand
-```
+Every command in the terminal UI is also a subcommand:
 
-`ordewell setup` walks through first-run configuration interactively.
+```bash
+export AI_PROVIDER=claude-code      # plan with Claude Code, Codex or OpenCode
 
-## Requirements
+ordewell plan --goal "Add rate limiting to the public API"
+ordewell run
+ordewell handoff review             # read the diff
+ordewell handoff merge              # bring it onto your branch
+```
 
-Node.js ≥ 20, and **tmux** for the TUI on every platform — it is what backs each
-task's live terminal (`apt install tmux`, `brew install tmux`). Linux, macOS and
-Windows are all supported; on Windows, run the TUI under WSL.
+Run `ordewell --help` for the full list, or `ordewell setup` for guided
+configuration.
 
-Installing this package also installs `@ordewell/web`, the local API server the
-CLI and TUI drive over `127.0.0.1`. It starts on demand — you don't need to run
-it yourself.
+This package also installs `@ordewell/web`, the local API server that the CLI and
+terminal UI talk to over `127.0.0.1`. It starts on demand.
 
 ## Documentation
 
-Full documentation, including the VS Code extension, is at
-**[github.com/ordewell/ordewell](https://github.com/ordewell/ordewell)**.
+Full documentation is at **[ordewell.ai/docs](https://ordewell.ai/docs)**, and the
+source is at **[github.com/ordewell/ordewell](https://github.com/ordewell/ordewell)**.
+
+## License
 
-Licensed under the [Apache License 2.0](./LICENSE).
+[Apache License 2.0](./LICENSE)

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.4",
   "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.4",
+    "@ordewell/web": "^0.5.4",
     "string-width": "^7.2.0",
     "ws": "^8.18.0"
   },