@ordewell/cli 0.4.7 → 0.4.8

package/dist/main.js

@@ -205,15 +205,16 @@ var import_fs2 = require("fs");
 var import_os2 = require("os");
 var import_path2 = require("path");
 var import_http = __toESM(require("http"));
+var import_core = require("@ordewell/core");
 var DEFAULT_PORT = 3742;
 var CONFIG_DIR = (0, import_path2.join)((0, import_os2.homedir)(), ".config", "ordewell");
 var LEGACY_PID_FILE = (0, import_path2.join)(CONFIG_DIR, "server.pid");
 function pidFileFor(port) {
   return port === DEFAULT_PORT ? LEGACY_PID_FILE : (0, import_path2.join)(CONFIG_DIR, `server-${port}.pid`);
 }
-function httpGet(url, timeoutMs = 2e3) {
+function httpGet(url, timeoutMs = 2e3, headers = {}) {
   return new Promise((resolve3, reject) => {
-    const req = import_http.default.get(url, { timeout: timeoutMs }, (res) => {
+    const req = import_http.default.get(url, { timeout: timeoutMs, headers }, (res) => {
       let data = "";
       res.on("data", (chunk) => {
         data += chunk.toString();
@@ -242,9 +243,14 @@ function getWebServerPath() {
   );
 }
 async function isDaemonRunning(port = DEFAULT_PORT) {
+  const token = (0, import_core.readDaemonToken)(port);
   try {
-    const res = await httpGet(`http://127.0.0.1:${port}/api/workspaces`);
-    return res.status === 200;
+    const res = await httpGet(
+      `http://127.0.0.1:${port}/api/workspaces`,
+      2e3,
+      token ? { Authorization: (0, import_core.bearerHeaderValue)(token) } : {}
+    );
+    return res.status === 200 || res.status === 401;
   } catch {
     return false;
   }
@@ -292,6 +298,7 @@ async function stopDaemon(port = DEFAULT_PORT) {
     const pid = parseInt(pidStr, 10);
     if (!pid || isNaN(pid)) {
       (0, import_fs2.unlinkSync)(pidFile);
+      (0, import_core.clearDaemonToken)(port);
       return false;
     }
     process.kill(pid, "SIGTERM");
@@ -304,6 +311,7 @@ async function stopDaemon(port = DEFAULT_PORT) {
         (0, import_fs2.unlinkSync)(pidFile);
       } catch {
       }
+      (0, import_core.clearDaemonToken)(port);
       console.log("Server was not running (stale PID removed).");
       return true;
     }
@@ -344,22 +352,35 @@ function resolvePort(args = []) {
 // src/apiClient.ts
 var import_http2 = __toESM(require("http"));
 var import_ws = __toESM(require("ws"));
+var import_core2 = require("@ordewell/core");
 var DEFAULT_HTTP_TIMEOUT_MS = 15 * 60 * 1e3;
 var ApiClient = class {
   port;
   constructor(port) {
     this.port = port || DEFAULT_PORT;
   }
+  /**
+   * Read at call time rather than at construction: a daemon restarted mid-run
+   * mints a new token, and a client built before that restart must pick it up.
+   * A missing file is not an error here — the daemon's own 401 names the path.
+   */
+  token() {
+    return (0, import_core2.readDaemonToken)(this.port);
+  }
   httpRequest(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);
+      const token = this.token();
       const options = {
         hostname: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
         method,
-        headers: body ? { "Content-Type": "application/json" } : {},
+        headers: {
+          ...body ? { "Content-Type": "application/json" } : {},
+          ...token ? { Authorization: (0, import_core2.bearerHeaderValue)(token) } : {}
+        },
         // Planner research on a real repository regularly exceeds two minutes.
         // The benchmark harness uses the same 15-minute default explicitly;
         // keep the env override for callers that need a tighter/looser bound.
@@ -387,7 +408,7 @@ var ApiClient = class {
       req.end();
     });
   }
-  async generatePlan(goal, runners2, workspace, sessionId = `session-${Date.now()}`) {
+  async generatePlan(goal, runners2, workspace, sessionId = (0, import_core2.mintSessionId)()) {
     const res = await this.httpRequest("POST", `/api/plans/${sessionId}/generate`, {
       goal,
       runners: runners2 || void 0,
@@ -579,10 +600,38 @@ var ApiClient = class {
     }
     return res.data;
   }
+  /**
+   * The one place a session socket is built, so the token travels on both
+   * stream paths. It rides as a subprotocol rather than a query parameter, so
+   * it never reaches an access log.
+   */
+  openSessionSocket(sessionId) {
+    const token = this.token();
+    const socket = new import_ws.default(
+      `ws://127.0.0.1:${this.port}/ws/session/${sessionId}`,
+      token ? (0, import_core2.tokenSubprotocols)(token) : void 0
+    );
+    socket.on("unexpected-response", (_req, res) => {
+      let body = "";
+      res.on("data", (chunk) => {
+        body += chunk.toString();
+      });
+      res.on("end", () => {
+        let reason = "";
+        try {
+          reason = JSON.parse(body).error ?? "";
+        } catch {
+          reason = body.trim();
+        }
+        socket.emit("error", new Error(reason || `Unexpected server response: ${res.statusCode}`));
+        socket.emit("close", res.statusCode ?? 1006, Buffer.from(""));
+      });
+    });
+    return socket;
+  }
   streamExecution(sessionId, onEvent, onReady) {
     return new Promise((resolve3, reject) => {
-      const wsUrl = `ws://127.0.0.1:${this.port}/ws/session/${sessionId}`;
-      const socket = new import_ws.default(wsUrl);
+      const socket = this.openSessionSocket(sessionId);
       let resolved = false;
       let opened = false;
       socket.on("open", () => {
@@ -633,8 +682,7 @@ var ApiClient = class {
    * completion signal, not a terminal WS message like execution has.
    */
   streamPlanning(sessionId, onEvent) {
-    const wsUrl = `ws://127.0.0.1:${this.port}/ws/session/${sessionId}`;
-    const socket = new import_ws.default(wsUrl);
+    const socket = this.openSessionSocket(sessionId);
     socket.on("message", (data) => {
       try {
         onEvent(JSON.parse(data.toString()));
@@ -866,6 +914,7 @@ function isTransient(event) {
 }
 
 // src/commands/plan.ts
+var import_core3 = require("@ordewell/core");
 function planTasks(plan) {
   return plan?.tasks || [];
 }
@@ -987,7 +1036,7 @@ async function handlePlan(subArgs, deps = {}) {
     runners2 = runnerFlags;
   }
   console.error(`Generating plan for: "${goal}"...`);
-  const sessionId = `session-${Date.now()}`;
+  const sessionId = (0, import_core3.mintSessionId)();
   const isTty = !!process.stderr.isTTY;
   let lastLineLength = 0;
   function renderStep(event) {
@@ -1318,10 +1367,10 @@ async function handleWeb(subArgs) {
 }
 
 // src/commands/models.ts
-var import_core2 = require("@ordewell/core");
+var import_core5 = require("@ordewell/core");
 
 // src/commands/model.ts
-var import_core = require("@ordewell/core");
+var import_core4 = require("@ordewell/core");
 
 // src/catalog.ts
 function normalizeCatalog(result) {
@@ -1425,7 +1474,7 @@ async function handleModel(subArgs, injectedApi) {
   if (!modelId) fail(USAGE);
   const settings = await api.getSettings();
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
-  const runner = (0, import_core.runnerForProvider)(provider);
+  const runner = (0, import_core4.runnerForProvider)(provider);
   if (runner) {
     const known = (await fetchCatalog(api)).models.filter((m) => m.runners?.includes(runner));
     if (known.length > 0 && !known.some((m) => m.id === modelId)) {
@@ -1444,7 +1493,7 @@ async function showModels(api) {
   const [settings, catalog] = await Promise.all([api.getSettings(), fetchCatalog(api)]);
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   const current = typeof settings.orchestratorModel === "string" ? settings.orchestratorModel : "";
-  const runner = (0, import_core.runnerForProvider)(provider);
+  const runner = (0, import_core4.runnerForProvider)(provider);
   const options = runner ? catalog.models.filter((m) => m.runners?.includes(runner)) : catalog.orchestratorModels;
   console.log(`
 Planner model: ${current || "(backend default)"}`);
@@ -1478,8 +1527,8 @@ async function handleModels(subArgs) {
     const rest = subArgs.filter((_, i) => i !== setIdx && i !== setIdx + 1);
     return handleModel(["set", subArgs[setIdx + 1], ...rest]);
   }
-  const config = new import_core2.EnvConfig();
-  const providers = (0, import_core2.configuredProviders)(config);
+  const config = new import_core5.EnvConfig();
+  const providers = (0, import_core5.configuredProviders)(config);
   if (providers.length === 0) {
     console.error("No providers configured. Set an API key for a provider, e.g.:");
     console.error("  OPENROUTER_API_KEY=...   (OpenRouter)");
@@ -1488,19 +1537,19 @@ async function handleModels(subArgs) {
     console.error("  OPENAI_COMPATIBLE_BASE_URL=...  (self-hosted / OpenAI-compatible)");
     process.exit(1);
   }
-  const { apiKeys, baseUrls } = (0, import_core2.collectProviderCredentials)(config);
+  const { apiKeys, baseUrls } = (0, import_core5.collectProviderCredentials)(config);
   let models;
   let errors;
   try {
-    const result = await (0, import_core2.fetchAllProviderModels)({ apiKeys, baseUrls });
-    models = (0, import_core2.toOrchestratorOptions)(result.models, import_core2.ORCHESTRATOR_SHORTCUTS);
+    const result = await (0, import_core5.fetchAllProviderModels)({ apiKeys, baseUrls });
+    models = (0, import_core5.toOrchestratorOptions)(result.models, import_core5.ORCHESTRATOR_SHORTCUTS);
     errors = result.errors;
   } catch (err) {
     console.error(`Failed to fetch models: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
     return;
   }
-  const providerLabel = (p) => (0, import_core2.getProviderMeta)(p)?.label ?? p;
+  const providerLabel = (p) => (0, import_core5.getProviderMeta)(p)?.label ?? p;
   console.log(
     `
 Available models (${models.length}) across ${providers.length} configured provider(s):`
@@ -1617,9 +1666,9 @@ function handleSetup(subArgs) {
 }
 
 // src/commands/plugins.ts
-var import_core3 = require("@ordewell/core");
+var import_core6 = require("@ordewell/core");
 function handlePlugins(subArgs) {
-  const registry = new import_core3.RunnerRegistry();
+  const registry = new import_core6.RunnerRegistry();
   registry.loadUserPlugins();
   const sub = subArgs[0];
   if (sub === "list" || !sub) {
@@ -1655,13 +1704,8 @@ ${plugins.length} plugin(s):
       process.exit(1);
     }
     try {
-      let manifest;
-      if (source.startsWith("github:") || source.startsWith("https://github.com/")) {
-        const url = source.startsWith("github:") ? `https://github.com/${source.slice(7)}.git` : source;
-        manifest = registry.installFromGit(url);
-      } else {
-        manifest = registry.installFromPath(source);
-      }
+      const resolved = (0, import_core6.classifyPluginSource)(source);
+      const manifest = resolved.kind === "git" ? registry.installFromGit(resolved.url) : registry.installFromPath(resolved.path);
       console.log(`Installed plugin: ${manifest.name} v${manifest.version}`);
     } catch (err) {
       console.error(`Install failed: ${err.message}`);
@@ -2132,7 +2176,7 @@ async function handleSessions(subArgs, injectedApi) {
 }
 
 // src/commands/planner.ts
-var import_core4 = require("@ordewell/core");
+var import_core7 = require("@ordewell/core");
 
 // src/plannerModelSwitch.ts
 function describePlannerSwitch(settings, provider) {
@@ -2151,7 +2195,7 @@ function rememberedModelFor(settings, provider) {
 }
 
 // src/commands/planner.ts
-var KNOWN_PROVIDERS = Object.keys(import_core4.ALL_PROVIDERS);
+var KNOWN_PROVIDERS = Object.keys(import_core7.ALL_PROVIDERS);
 async function handlePlanner(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
   const [wanted] = positionals(subArgs);
@@ -2166,13 +2210,13 @@ async function handlePlanner(subArgs, injectedApi) {
   const settings = await persistEnv(api, { AI_PROVIDER: provider });
   const recall2 = describePlannerSwitch(settings, provider);
   writeEnv({ ORCHESTRATOR_MODEL: recall2.model, ORDEWELL_PLANNER_EFFORT: recall2.effort });
-  const meta = import_core4.ALL_PROVIDERS[provider];
+  const meta = import_core7.ALL_PROVIDERS[provider];
   const catalog = await fetchCatalog(api);
   console.log(
-    (0, import_core4.isCliProvider)(provider) ? `Planning with ${meta.label} \u2014 no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
+    (0, import_core7.isCliProvider)(provider) ? `Planning with ${meta.label} \u2014 no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
   );
   console.log(plannerModelLine(recall2));
-  if (!(0, import_core4.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
+  if (!(0, import_core7.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
     console.log(`  No ${meta.apiKeyEnvVar} configured yet \u2014 set one with \`ordewell key set ${provider} <key>\`.`);
   }
 }
@@ -2190,15 +2234,15 @@ async function showPlanners(api) {
   const [settings, catalog] = await Promise.all([api.getSettings(), fetchCatalog(api)]);
   const current = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   console.log("\nCoding agents (no API key \u2014 they use their own subscription)");
-  for (const id of import_core4.CLI_PROVIDERS) {
-    const runner = (0, import_core4.runnerForProvider)(id);
+  for (const id of import_core7.CLI_PROVIDERS) {
+    const runner = (0, import_core7.runnerForProvider)(id);
     const discovered = runner ? catalog.models.some((m) => m.runners?.includes(runner)) : false;
-    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core4.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
+    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core7.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
   }
   console.log("\nAPI providers");
-  for (const id of import_core4.PROVIDER_PRIORITY) {
+  for (const id of import_core7.PROVIDER_PRIORITY) {
     const configured = catalog.providers.includes(id);
-    const meta = import_core4.ALL_PROVIDERS[id];
+    const meta = import_core7.ALL_PROVIDERS[id];
     console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${meta.label}${configured ? "" : `  (no ${meta.apiKeyEnvVar})`}`);
   }
   console.log(`
@@ -2215,7 +2259,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   const modelId = typeof settings.orchestratorModel === "string" ? settings.orchestratorModel : "";
   const currentEffort = typeof settings.plannerThinkingEffort === "string" ? settings.plannerThinkingEffort : "";
-  const runner = (0, import_core4.runnerForProvider)(provider);
+  const runner = (0, import_core7.runnerForProvider)(provider);
   if (!runner) {
     fail(
       "Thinking effort applies to a coding-agent planner.",
@@ -2255,7 +2299,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
 }
 
 // src/commands/key.ts
-var import_core5 = require("@ordewell/core");
+var import_core8 = require("@ordewell/core");
 var USAGE4 = "Usage: ordewell key [list | set <provider> <key>]";
 async function handleKey(subArgs, injectedApi) {
   const [action, provider, ...keyParts] = positionals(subArgs);
@@ -2266,8 +2310,8 @@ async function handleKey(subArgs, injectedApi) {
   if (action !== "set") {
     const catalog = await fetchCatalog(api);
     console.log("\nAPI provider keys\n");
-    for (const id2 of import_core5.PROVIDER_PRIORITY) {
-      const meta2 = import_core5.ALL_PROVIDERS[id2];
+    for (const id2 of import_core8.PROVIDER_PRIORITY) {
+      const meta2 = import_core8.ALL_PROVIDERS[id2];
       const configured = catalog.providers.includes(id2);
       console.log(`  ${configured ? "\u2713" : " "} ${id2.padEnd(14)} ${meta2.apiKeyEnvVar.padEnd(28)} ${meta2.label}`);
     }
@@ -2277,7 +2321,7 @@ async function handleKey(subArgs, injectedApi) {
   }
   if (!provider) fail(USAGE4);
   const id = provider.toLowerCase();
-  const meta = import_core5.ALL_PROVIDERS[id];
+  const meta = import_core8.ALL_PROVIDERS[id];
   if (!meta) {
     fail(`Unknown provider: ${provider}`, "Run `ordewell key` to see the list.");
   }
@@ -2357,7 +2401,7 @@ async function handleApprove(subArgs, injectedApi) {
 // src/tui/terminalLauncher.ts
 var import_child_process3 = require("child_process");
 var import_util = require("util");
-var import_core6 = require("@ordewell/core");
+var import_core9 = require("@ordewell/core");
 var execFileAsync = (0, import_util.promisify)(import_child_process3.execFile);
 var defaultExecFile = async (command, args) => {
   const { stdout, stderr } = await execFileAsync(command, args);
@@ -2377,16 +2421,16 @@ var defaultWhich = (bin) => {
 async function openTaskTerminal(port, planSessionId, taskId, deps = {}) {
   const platform = deps.platform ?? process.platform;
   const env = deps.env ?? process.env;
-  const hasTmuxImpl = deps.hasTmuxImpl ?? import_core6.hasTmux;
+  const hasTmuxImpl = deps.hasTmuxImpl ?? import_core9.hasTmux;
   const execFileImpl = deps.execFileImpl ?? defaultExecFile;
   const spawnImpl = deps.spawnImpl ?? defaultSpawn;
   const which = deps.which ?? defaultWhich;
   if (!hasTmuxImpl()) {
     return { ok: false, message: "tmux is not installed \u2014 install it to get a real terminal per task." };
   }
-  const session = (0, import_core6.tmuxSessionName)(port);
-  const socket = (0, import_core6.tmuxSocketName)(port);
-  const base = (0, import_core6.tmuxWindowName)(taskId, planSessionId);
+  const session = (0, import_core9.tmuxSessionName)(port);
+  const socket = (0, import_core9.tmuxSocketName)(port);
+  const base = (0, import_core9.tmuxWindowName)(taskId, planSessionId);
   let windows;
   try {
     const { stdout } = await execFileImpl("tmux", ["-L", socket, "list-windows", "-t", session, "-F", "#{window_name}"]);
@@ -2680,7 +2724,7 @@ Dependencies \xB7 #${task.order} ${task.title}
 }
 
 // src/tui/index.ts
-var import_core10 = require("@ordewell/core");
+var import_core13 = require("@ordewell/core");
 
 // src/tui/ansi.ts
 var import_string_width = __toESM(require("string-width"));
@@ -3212,7 +3256,7 @@ function initialState(overrides = {}) {
 }
 
 // src/tui/layout.ts
-var import_core7 = require("@ordewell/core");
+var import_core10 = require("@ordewell/core");
 var CHROME_ROWS = 4;
 function chatInputWrap(state) {
   const active = state.focus === "chat" && !state.overlay;
@@ -3348,9 +3392,9 @@ function chatScrollMax(state) {
 }
 function plannerSetup(state) {
   const provider = state.plannerProvider;
-  const registration = import_core7.ALL_PROVIDERS[provider];
+  const registration = import_core10.ALL_PROVIDERS[provider];
   if (!registration) return { label: "not set", ready: false };
-  const runner = (0, import_core7.runnerForProvider)(provider);
+  const runner = (0, import_core10.runnerForProvider)(provider);
   const ready = runner ? state.runners.some((r) => r.id === runner) : state.configuredProviders.includes(provider);
   return { label: registration.label, ready };
 }
@@ -3844,9 +3888,9 @@ function frame(title, body, rows, cols) {
 }
 
 // src/tui/reducer.ts
-var import_core8 = require("@ordewell/core");
+var import_core11 = require("@ordewell/core");
 var import_plan_utils3 = require("@ordewell/core/plan-utils");
-var KNOWN_PROVIDERS2 = Object.keys(import_core8.ALL_PROVIDERS);
+var KNOWN_PROVIDERS2 = Object.keys(import_core11.ALL_PROVIDERS);
 var DEFAULT_EFFORT = "__runner_default__";
 function step(state, effects = []) {
   return { state, effects };
@@ -4115,11 +4159,11 @@ function modelDetail(m) {
 function providerErrorHint(state) {
   const failed = Object.keys(state.providerErrors ?? {});
   if (failed.length === 0) return void 0;
-  const names = failed.map((p) => import_core8.ALL_PROVIDERS[p]?.label ?? p);
+  const names = failed.map((p) => import_core11.ALL_PROVIDERS[p]?.label ?? p);
   return `\u26A0 Unavailable (key or fetch failed): ${names.join(", ")} \u2014 showing working providers only.`;
 }
 function plannerModelItems(state) {
-  const runner = (0, import_core8.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core11.runnerForProvider)(state.plannerProvider);
   if (!runner) return state.orchestratorModels.map((m) => ({ id: m.id, label: m.label, detail: modelDetail(m) }));
   const items = state.models.filter((m) => m.runners?.includes(runner)).map((m) => ({
     id: m.id,
@@ -4130,7 +4174,7 @@ function plannerModelItems(state) {
   return items.length > 0 ? items : [{ id: "", label: `No ${runner} models discovered yet`, detail: "run /refresh", disabled: true }];
 }
 function plannerEffortItems(state) {
-  const runner = (0, import_core8.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core11.runnerForProvider)(state.plannerProvider);
   if (!runner) {
     return [{ id: "", label: "Thinking effort applies to a coding-agent planner", detail: "switch with /planner", disabled: true }];
   }
@@ -4768,7 +4812,7 @@ function newSession(state) {
 }
 function setModel(state, args) {
   if (args[0] === "set" && args[1]) {
-    const runner = (0, import_core8.runnerForProvider)(state.plannerProvider);
+    const runner = (0, import_core11.runnerForProvider)(state.plannerProvider);
     const known = runner ? modelsForRunner(state.models, runner) : [];
     if (runner && known.length > 0 && !known.some((m) => m.id === args[1])) {
       return fail2(state, `${args[1]} was not discovered for ${runner}.`);
@@ -4790,21 +4834,21 @@ function setModel(state, args) {
 }
 function plannerItems(state) {
   const installed = new Set(state.runners.map((r) => r.id));
-  const agents = import_core8.CLI_PROVIDERS.map((id) => {
-    const runner = (0, import_core8.runnerForProvider)(id);
+  const agents = import_core11.CLI_PROVIDERS.map((id) => {
+    const runner = (0, import_core11.runnerForProvider)(id);
     const ready = installed.has(runner);
     return {
       id,
-      label: import_core8.ALL_PROVIDERS[id].label,
+      label: import_core11.ALL_PROVIDERS[id].label,
       detail: ready ? "coding agent \xB7 no API key needed" : "CLI not installed or not on PATH",
       selected: state.plannerProvider === id,
       disabled: !ready
     };
   });
-  const vendors = import_core8.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
+  const vendors = import_core11.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
     id,
-    label: import_core8.ALL_PROVIDERS[id].label,
-    detail: import_core8.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core11.ALL_PROVIDERS[id].label,
+    detail: import_core11.ALL_PROVIDERS[id].apiKeyEnvVar,
     selected: state.plannerProvider === id
   }));
   return vendors.length > 0 ? [...agents, ...vendors] : [...agents, { id: "", label: "No API providers configured", detail: "add a key with /key", disabled: true }];
@@ -4862,16 +4906,16 @@ function setKey(state, args) {
     }
     return step(state, [{ type: "setApiKey", provider, key: args.slice(2).join(" ") }]);
   }
-  const items = import_core8.PROVIDER_PRIORITY.map((id) => ({
+  const items = import_core11.PROVIDER_PRIORITY.map((id) => ({
     id,
-    label: import_core8.ALL_PROVIDERS[id].label,
-    detail: import_core8.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core11.ALL_PROVIDERS[id].label,
+    detail: import_core11.ALL_PROVIDERS[id].apiKeyEnvVar,
     selected: state.configuredProviders.includes(id)
   }));
   return step({ ...state, overlay: { kind: "picker", picker: picker("API provider key", items, { kind: "set-key" }) } });
 }
 function keyPrompt(provider) {
-  const meta = import_core8.ALL_PROVIDERS[provider];
+  const meta = import_core11.ALL_PROVIDERS[provider];
   return {
     kind: "prompt",
     title: `${meta.label} API key`,
@@ -5229,7 +5273,7 @@ function createApp(deps) {
 
 // src/tui/effects.ts
 var import_child_process4 = require("child_process");
-var import_core9 = require("@ordewell/core");
+var import_core12 = require("@ordewell/core");
 var import_plan_utils4 = require("@ordewell/core/plan-utils");
 var ConversationQueue = class {
   tail = Promise.resolve();
@@ -5396,7 +5440,7 @@ async function perform(effect, deps) {
       dispatch({ type: "notice", message: `Orchestrator model set to ${effect.modelId}.` });
       return;
     case "setPlanner": {
-      const meta = import_core9.ALL_PROVIDERS[effect.provider];
+      const meta = import_core12.ALL_PROVIDERS[effect.provider];
       if (!meta) throw new Error(`Unknown planner: ${effect.provider}`);
       const env = { AI_PROVIDER: effect.provider };
       const settings = await api.updateSettings({ env });
@@ -5408,7 +5452,7 @@ async function perform(effect, deps) {
       });
       dispatch({
         type: "notice",
-        message: `${(0, import_core9.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
+        message: `${(0, import_core12.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
       });
       await loadModels(deps);
       return;
@@ -5420,7 +5464,7 @@ async function perform(effect, deps) {
       dispatch({ type: "notice", message: `Planner effort set to ${effect.effort || "the runner default"}.` });
       return;
     case "setApiKey": {
-      const meta = import_core9.ALL_PROVIDERS[effect.provider];
+      const meta = import_core12.ALL_PROVIDERS[effect.provider];
       if (!meta) throw new Error(`Unknown provider: ${effect.provider}`);
       await api.updateSettings({ env: { [meta.apiKeyEnvVar]: effect.key } });
       deps.setEnvVar(meta.apiKeyEnvVar, effect.key);
@@ -5508,7 +5552,7 @@ function osc52(text) {
 function copySelection(deps, text) {
   if (!text) return;
   const lines = text.split("\n").length;
-  const command = (0, import_core9.clipboardCopyCommand)(deps.hasBin);
+  const command = (0, import_core12.clipboardCopyCommand)(deps.hasBin);
   if (command) {
     try {
       (deps.pipeToClipboard ?? pipeToClipboardDefault)(command, text);
@@ -5982,7 +6026,7 @@ async function handleTui(subArgs) {
   }
   const workspace = flag(subArgs, "--workspace") || process.cwd();
   try {
-    (0, import_core10.assertWorkspaceExists)(workspace);
+    (0, import_core13.assertWorkspaceExists)(workspace);
   } catch {
     console.error(
       `Workspace "${workspace}" does not exist.
@@ -6007,7 +6051,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
       conversationQueue,
       port,
       dispatch: (action) => app.dispatch(action),
-      newSessionId: () => `session-${Date.now()}`,
+      newSessionId: () => (0, import_core13.mintSessionId)(),
       setEnvVar: (key, value) => {
         writeEnvVar(findEnvFile(), key, value);
         process.env[key] = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",