@ordewell/web 0.7.2 → 0.8.1

package/README.md

@@ -1,6 +1,6 @@
 # @ordewell/web
 
-The local API server for **[Ordewell](https://ordewell.ai)** — a Hono HTTP +
+The local API server for **[Ordewell](https://ordewell.ai)**: a Hono HTTP +
 WebSocket daemon bound to `127.0.0.1:3742` that the Ordewell CLI, terminal UI
 and VS Code extension all drive.
 
@@ -8,7 +8,7 @@ and VS Code extension all drive.
 port in a browser will show you an API response, not a dashboard. A browser UI
 may come later; it does not exist today.
 
-You almost certainly do not need to install this directly —
+You almost certainly do not need to install this directly.
 [@ordewell/cli](https://www.npmjs.com/package/@ordewell/cli) depends on it and
 starts it on demand.
 
@@ -23,12 +23,15 @@ ordewell web --daemon   # background; logs to ~/.config/ordewell/server.log
 `/api/commands`, `/api/workspaces`, `/api/approvals`, plus a WebSocket stream
 for live planner and execution events.
 
+Skills are read by the planner and the task orchestrator, not served as a
+route; the format is in [Writing skills](https://github.com/ordewell/ordewell/blob/main/docs/skills.md).
+
 ## Security
 
 The server is **unauthenticated by design** and binds the loopback interface
 only, on the assumption that local access is trusted. Do not expose it to a
 network. If you find a way to reach it off-host, or from a browser page, that's
-a vulnerability — see
+a vulnerability; see
 [SECURITY.md](https://github.com/ordewell/ordewell/blob/main/SECURITY.md).
 
 Licensed under the [Apache License 2.0](./LICENSE).

package/dist/server/main.js

@@ -336,20 +336,22 @@ ${err}` : out;
     return { success: true, output: combined || "(no output)", truncated: combined.length > 2e4 };
   }
 };
+
+// server/adapters/PoolAwareRunner.ts
 var PoolAwareRunner = class {
   constructor(sessionId, broadcast, inner) {
     this.sessionId = sessionId;
     this.broadcast = broadcast;
-    this.inner = inner ?? new core.HeadlessRunner();
+    this.inner = inner;
   }
   sessionId;
   broadcast;
   inner;
   /**
-   * Sessions this plan spawned. The inner runner may be shared by every plan
-   * in the pool (one tmux session per daemon), so "stop everything" and
-   * "how many are running" must be answered from this set, never delegated —
-   * delegating would let one plan's /stop kill another plan's tasks.
+   * Sessions this plan spawned. The inner runner is shared by every plan in
+   * the pool, so "stop everything" and "how many are running" must be
+   * answered from this set, never delegated — delegating would let one plan's
+   * /stop kill another plan's tasks.
    */
   owned = /* @__PURE__ */ new Set();
   get activeCount() {
@@ -374,65 +376,22 @@ var PoolAwareRunner = class {
     this.owned.clear();
   }
 };
-var TMUX_MISSING_ADVICE = "tmux is not installed, so terminal-transport tasks run without a terminal window you can open or type into. Install tmux, or keep the structured transport (/transport structured).";
-function startTerminalHost(port2, deps = {}) {
-  const hasTmuxImpl = deps.hasTmuxImpl ?? core.hasTmux;
-  if (!hasTmuxImpl()) return { advice: TMUX_MISSING_ADVICE };
-  const runner = (deps.createTmuxRunner ?? ((p) => new core.TmuxRunner({ port: p })))(port2);
-  runner.ensureSession().catch((err) => {
-    console.error(`[web] tmux session setup failed (will retry on next task spawn): ${err?.message ?? err}`);
-  });
-  return { runner };
-}
-var AdvisingRunner = class {
-  constructor(inner, advice, advise) {
-    this.inner = inner;
-    this.advice = advice;
-    this.advise = advise;
-  }
-  inner;
-  advice;
-  advise;
-  advised = false;
-  get activeCount() {
-    return this.inner.activeCount;
-  }
-  spawn(opts) {
-    if (!this.advised) {
-      this.advised = true;
-      this.advise(this.advice);
-    }
-    return this.inner.spawn(opts);
-  }
-  stop(sessionId) {
-    this.inner.stop(sessionId);
-  }
-  stopAll() {
-    this.inner.stopAll();
-  }
-};
 
 // server/pool/orchestratorPool.ts
 var OrchestratorPool = class {
   sessions = /* @__PURE__ */ new Map();
   clients = /* @__PURE__ */ new Map();
-  registry = (() => {
-    const r = new core.RunnerRegistry();
-    r.loadUserPlugins();
-    return r;
-  })();
+  registry = new core.RunnerRegistry();
   modelResolver;
   runnerInstallation = new core.RunnerInstallation(this.registry);
   cachedProviderLists;
   settingsService = new core.SettingsService();
   plannerModelMemory = new core.PlannerModelMemory(this.settingsService);
-  sharedRunner;
-  structuredRunner;
-  terminalAdvice;
+  runner;
   constructor(deps = {}) {
-    this.sharedRunner = deps.runner;
-    this.structuredRunner = deps.structuredRunner ?? new core.StructuredRunner();
-    this.terminalAdvice = deps.terminalAdvice;
+    const pluginNotice = core.removedPluginNotice();
+    if (pluginNotice) console.warn(pluginNotice);
+    this.runner = deps.runner ?? new core.StructuredRunner();
     this.modelResolver = deps.modelResolver ?? new core.ModelResolver(this.registry, new WebConfig());
   }
   subscribe(sessionId, ws) {
@@ -498,12 +457,7 @@ var OrchestratorPool = class {
     });
     const fsAdapter = new PoolFileSystem(workspace);
     const broadcast = (msg) => this.broadcast(sessionId, msg);
-    const terminal = this.sharedRunner ?? new core.HeadlessRunner();
-    const router = new core.TransportRouter({
-      terminal: this.terminalAdvice ? new AdvisingRunner(terminal, this.terminalAdvice, (message) => this.broadcast(sessionId, { type: "notice", level: "warn", message })) : terminal,
-      structured: this.structuredRunner
-    });
-    const runner = new PoolAwareRunner(sessionId, broadcast, router);
+    const runner = new PoolAwareRunner(sessionId, broadcast, this.runner);
     return core.createSession({
       config,
       notifications: { info() {
@@ -557,14 +511,10 @@ var OrchestratorPool = class {
       // for a planner that is running at "high".
       plannerThinkingEffort: config.plannerThinkingEffort ?? "",
       maxParallel: config.maxParallelSessions,
-      tdd: userSettings.tdd,
-      verification: userSettings.verification,
       modelAllowlist: userSettings.modelAllowlist,
       // The model remembered per planner backend (this task), so a surface can
       // render what's remembered without a second round-trip.
-      plannerModels: userSettings.plannerModels,
-      // ADR-0018; a run copies it when it starts.
-      runnerTransport: userSettings.runnerTransport
+      plannerModels: userSettings.plannerModels
     };
   }
   /**
@@ -592,22 +542,18 @@ var OrchestratorPool = class {
     const envChanges = admission2 ? admission2.accepted : void 0;
     const incomingAiProvider = typeof envChanges?.AI_PROVIDER === "string" ? envChanges.AI_PROVIDER : void 0;
     const switchedToProvider = incomingAiProvider && incomingAiProvider !== providerBefore ? incomingAiProvider : void 0;
-    const switchRecall = switchedToProvider ? this.plannerModelMemory.recall(switchedToProvider, this.plannerCatalogFor(switchedToProvider)) : void 0;
+    const requestedModel = envChanges?.ORCHESTRATOR_MODEL ?? changes.orchestratorModel;
+    const explicitModel = typeof requestedModel === "string" && requestedModel.trim().length > 0;
+    const switchRecall = switchedToProvider && !explicitModel ? this.plannerModelMemory.recall(switchedToProvider, this.plannerCatalogFor(switchedToProvider)) : void 0;
+    if (switchedToProvider && explicitModel && typeof changes.plannerThinkingEffort !== "string" && envChanges?.ORDEWELL_PLANNER_EFFORT === void 0) {
+      process.env.ORDEWELL_PLANNER_EFFORT = "";
+    }
     if (typeof changes.orchestratorModel === "string") {
       process.env.ORCHESTRATOR_MODEL = changes.orchestratorModel;
     }
     if (typeof changes.plannerThinkingEffort === "string") {
       process.env.ORDEWELL_PLANNER_EFFORT = changes.plannerThinkingEffort;
     }
-    if (changes.tdd && typeof changes.tdd.enabled === "boolean") {
-      this.settingsService.setTdd(changes.tdd.enabled);
-    }
-    if (changes.verification && typeof changes.verification.enabled === "boolean") {
-      this.settingsService.setVerification(changes.verification.enabled);
-    }
-    if (core.isRunnerTransport(changes.runnerTransport)) {
-      this.settingsService.setRunnerTransport(changes.runnerTransport);
-    }
     if (envChanges) {
       let touched = false;
       for (const [key, value] of Object.entries(envChanges)) {
@@ -640,7 +586,7 @@ var OrchestratorPool = class {
         }
       }
     }
-    const envCarriesModelOrEffort = envChanges?.AI_PROVIDER === void 0 && (typeof envChanges?.ORCHESTRATOR_MODEL === "string" || typeof envChanges?.ORDEWELL_PLANNER_EFFORT === "string");
+    const envCarriesModelOrEffort = (envChanges?.AI_PROVIDER === void 0 || explicitModel) && (typeof envChanges?.ORCHESTRATOR_MODEL === "string" || typeof envChanges?.ORDEWELL_PLANNER_EFFORT === "string");
     if (typeof changes.orchestratorModel === "string" || typeof changes.plannerThinkingEffort === "string" || envCarriesModelOrEffort) {
       const rememberProvider = switchedToProvider ?? new WebConfig({
         enabledRunners: this.enabledRunnerOverride(),
@@ -707,11 +653,11 @@ var OrchestratorPool = class {
   async getInstalledRunners() {
     const config = new WebConfig({ enabledRunners: this.enabledRunnerOverride() });
     const enabled = new Set(config.enabledRunners);
-    const plugins = this.registry.list();
+    const runners = this.registry.list();
     const installedIds = new Set(
-      await this.runnerInstallation.filterInstalled(plugins.map((p) => p.manifest.name))
+      await this.runnerInstallation.filterInstalled(runners.map((p) => p.manifest.name))
     );
-    return plugins.filter((p) => installedIds.has(p.manifest.name)).map((p) => ({
+    return runners.filter((p) => installedIds.has(p.manifest.name)).map((p) => ({
       id: p.manifest.name,
       name: p.manifest.displayName,
       enabled: enabled.has(p.manifest.name)
@@ -857,14 +803,14 @@ function sessionsRoute(pool2) {
     const id = c.req.param("id");
     const saved = core.loadSessionPlanState(id, ws);
     if (!saved) return refuse(c, 404, "Session not found", "session_not_found");
-    return c.json({ meta: saved.meta, plan: pool2.getPlanState(id) ?? saved.plan });
+    return c.json({ meta: saved.meta, plan: core.surfacePlanState(pool2.getPlanState(id) ?? saved.plan) });
   });
   router.post("/:id/load", (c) => {
     const ws = c.req.query("workspace") || process.cwd();
     try {
       const id = c.req.param("id");
       const plan = pool2.adoptSavedSession(id, ws);
-      return c.json({ ok: true, plan, goal: pool2.getGoal(id) });
+      return c.json({ ok: true, plan: core.surfacePlan(plan), goal: pool2.getGoal(id) });
     } catch (err) {
       return failure(c, err, "load session", { message: "Failed to load session" });
     }
@@ -877,7 +823,7 @@ function sessionsRoute(pool2) {
     const ws = c.req.query("workspace") || process.cwd();
     const attempt = Number(c.req.param("attempt"));
     if (!Number.isInteger(attempt) || attempt < 1) return refuse(c, 400, "attempt must be a positive integer");
-    return c.json({ attempt, events: core.readTaskLog({ baseDir: ws, sessionId: c.req.param("id") }, c.req.param("taskId"), attempt) });
+    return c.json({ attempt, events: core.taskLogForSurface(core.readTaskLog({ baseDir: ws, sessionId: c.req.param("id") }, c.req.param("taskId"), attempt)) });
   });
   router.delete("/:id", (c) => {
     const ws = c.req.query("workspace") || process.cwd();
@@ -902,7 +848,8 @@ function plansRoute(pool2) {
       const runnerList = Array.isArray(runners) ? runners : runners ? [runners] : queryRunners ? queryRunners.split(",").map((s) => s.trim()).filter(Boolean) : pool2.getRunnerState().enabledRunners;
       const plan = await pool2.generatePlan(c.req.param("sessionId"), goal, runnerList, ws, model, { allowInit });
       const { models, modelsByRunner } = await pool2.getProviderModels();
-      return c.json({ plan, models, modelsByRunner });
+      const notes = (pool2.session(c.req.param("sessionId")).planState?.conversationHistory ?? []).filter((e) => e.kind === "system").map((e) => e.content);
+      return c.json({ plan: core.surfacePlanState(plan), models, modelsByRunner, ...notes.length > 0 ? { notes } : {} });
     } catch (err) {
       return failure(c, err, "generate", { message: "Plan generation failed" });
     }
@@ -1071,7 +1018,7 @@ function plansRoute(pool2) {
   router.post("/:sessionId/tasks/:taskId/resolve-conflict", async (c) => {
     try {
       const plan = await pool2.session(c.req.param("sessionId")).resolveConflictAsTask(c.req.param("taskId"));
-      return c.json({ plan });
+      return c.json({ plan: plan && core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "task edit");
     }
@@ -1121,7 +1068,7 @@ function plansRoute(pool2) {
   router.post("/:sessionId/review/approve", async (c) => {
     try {
       const plan = await pool2.session(c.req.param("sessionId")).approveReview();
-      return c.json({ plan });
+      return c.json({ plan: core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "review approve");
     }
@@ -1133,7 +1080,7 @@ function plansRoute(pool2) {
         return c.json({ error: "taskIds array with at least two ids is required" }, 400);
       }
       const plan = await pool2.session(c.req.param("sessionId")).requestMerge(taskIds);
-      return c.json({ plan });
+      return c.json({ plan: core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "merge", { fallback: 400 });
     }
@@ -1141,7 +1088,7 @@ function plansRoute(pool2) {
   router.post("/:sessionId/tasks/:taskId/split", async (c) => {
     try {
       const plan = await pool2.session(c.req.param("sessionId")).requestSplit(c.req.param("taskId"));
-      return c.json({ plan });
+      return c.json({ plan: core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "split", { fallback: 400 });
     }
@@ -1153,7 +1100,7 @@ function plansRoute(pool2) {
       const ws = workspace || c.req.query("workspace") || process.cwd();
       const runnerList = Array.isArray(runners) ? runners : runners ? [runners] : pool2.getRunnerState().enabledRunners;
       const plan = await pool2.startPlanning(c.req.param("sessionId"), goal, runnerList, ws, model, { allowInit });
-      return c.json({ plan });
+      return c.json({ plan: core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "converse start", { message: "Planning failed" });
     }
@@ -1163,14 +1110,15 @@ function plansRoute(pool2) {
       const { message } = await c.req.json();
       if (!message) return c.json({ error: "message is required" }, 400);
       const plan = await pool2.continuePlanning(c.req.param("sessionId"), message);
-      return c.json({ plan });
+      return c.json({ plan: core.surfacePlan(plan) });
     } catch (err) {
       return failure(c, err, "conversation message");
     }
   });
   router.post("/:sessionId/conversation/fork", (c) => {
     try {
-      return c.json(pool2.forkConversation(c.req.param("sessionId")));
+      const fork = pool2.forkConversation(c.req.param("sessionId"));
+      return c.json({ ...fork, plan: core.surfacePlan(fork.plan) });
     } catch (err) {
       return failure(c, err, "conversation edit");
     }
@@ -1186,14 +1134,16 @@ function plansRoute(pool2) {
     try {
       const { index } = await c.req.json();
       if (!Number.isInteger(index) || index < 0) return c.json({ error: "index must be a non-negative integer" }, 400);
-      return c.json(pool2.rewindConversation(c.req.param("sessionId"), index));
+      const rewound = pool2.rewindConversation(c.req.param("sessionId"), index);
+      return c.json({ ...rewound, plan: core.surfacePlan(rewound.plan) });
     } catch (err) {
       return failure(c, err, "conversation edit");
     }
   });
   router.post("/:sessionId/conversation/compact", async (c) => {
     try {
-      return c.json(await pool2.compactConversation(c.req.param("sessionId")));
+      const compacted = await pool2.compactConversation(c.req.param("sessionId"));
+      return c.json({ ...compacted, plan: core.surfacePlan(compacted.plan) });
     } catch (err) {
       return failure(c, err, "conversation edit");
     }
@@ -1286,44 +1236,14 @@ function settingsRoute(pool2) {
   });
   return router;
 }
-var COMMANDS = [
-  { name: "tdd", description: "Toggle Test-Driven Development mode (on|off|status)" },
-  { name: "verify", description: "Toggle verification mode \u2014 adds a final evidence-based verification task that runs the full suite (on|off|status)" },
-  { name: "transport", description: "Drive tasks through each runner's protocol (structured) or a terminal, from the next run (terminal|structured|status)" }
-];
-var BOOLEAN_TOGGLES = { tdd: "tdd", verify: "verification" };
-function commandsRoute(pool2) {
+var COMMANDS = [];
+function commandsRoute() {
   const router = new hono.Hono();
   router.get("/", (c) => {
     return c.json({ commands: COMMANDS });
   });
-  router.post("/:name", async (c) => {
+  router.post("/:name", (c) => {
     const name = c.req.param("name");
-    const body = await c.req.json().catch(() => ({}));
-    const args2 = body?.args || {};
-    const command = COMMANDS.find((cmd) => cmd.name === name);
-    if (!command) {
-      return refuse(c, 404, `Unknown command: ${name}`);
-    }
-    const toggle = BOOLEAN_TOGGLES[name];
-    if (toggle) {
-      const action = args2.action || "status";
-      if (action === "on") {
-        pool2.updateSettings({ [toggle]: { enabled: true } });
-      } else if (action === "off") {
-        pool2.updateSettings({ [toggle]: { enabled: false } });
-      }
-      return c.json({ ok: true, settings: pool2.getSettings() });
-    }
-    if (name === "transport") {
-      const action = args2.action || "status";
-      if (action === "terminal" || action === "structured") {
-        pool2.updateSettings({ runnerTransport: action });
-      } else if (action !== "status") {
-        return refuse(c, 400, `Unknown transport: ${action} (terminal|structured)`);
-      }
-      return c.json({ ok: true, settings: pool2.getSettings() });
-    }
     return refuse(c, 404, `Unknown command: ${name}`);
   });
   return router;
@@ -1430,7 +1350,7 @@ function createApp(pool2, admission2) {
   app2.route("/api/runners", runnersRoute(pool2));
   app2.route("/api/models", modelsRoute(pool2));
   app2.route("/api/settings", settingsRoute(pool2));
-  app2.route("/api/commands", commandsRoute(pool2));
+  app2.route("/api/commands", commandsRoute());
   app2.route("/api/workspaces", workspacesRoute());
   app2.route("/api/approvals", approvalsRoute(pool2));
   return app2;
@@ -1518,10 +1438,9 @@ if (portIdx !== -1 && args[portIdx + 1]) {
 }
 var watchParentIdx = args.indexOf("--watch-parent");
 var watchParentPid = watchParentIdx !== -1 ? parseInt(args[watchParentIdx + 1], 10) : void 0;
-var { runner: tmuxRunner, advice: terminalAdvice } = startTerminalHost(port);
 var { token, file: tokenFile } = core.mintDaemonToken(port);
 var admission = { port, token, tokenFile };
-var pool = new OrchestratorPool({ runner: tmuxRunner, terminalAdvice, structuredRunner: new core.StructuredRunner() });
+var pool = new OrchestratorPool({ runner: new core.StructuredRunner() });
 var app = createApp(pool, admission);
 pool.getProviderModels().catch((err) => {
   console.error(`[web] model discovery warmup failed: ${err?.message ?? err}`);
@@ -1532,11 +1451,9 @@ attachWsHandler(server, pool, admission);
 server.listen(port, "127.0.0.1", () => {
   console.error(`[web] Ordewell API server: http://localhost:${port}`);
 });
-async function shutdown() {
+function shutdown() {
   core.clearDaemonToken(port);
   pool.destroyAll();
-  if (tmuxRunner) await tmuxRunner.killSession().catch(() => {
-  });
   server.close();
   process.exit(0);
 }