@ordewell/cli 0.4.9 → 0.4.11

package/dist/main.js

@@ -23,12 +23,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// src/main.ts
+var import_core18 = require("@ordewell/core");
+
 // src/utils/env.ts
 var import_fs = require("fs");
 var import_path = require("path");
-var import_os = require("os");
+var import_core = require("@ordewell/core");
 function findEnvFile() {
-  return (0, import_path.join)((0, import_os.homedir)(), ".config", "ordewell", ".env");
+  return (0, import_path.join)((0, import_core.globalDataDir)(), ".env");
 }
 function loadEnvFile() {
   const filePath = findEnvFile();
@@ -83,7 +86,7 @@ an id.
 Planning:
   ordewell                        Full-screen terminal UI (everything the VS Code extension does)
   ordewell tui                    The same thing, named \u2014 for scripts and aliases
-  ordewell plan --goal "text"     Plan a goal conversationally (honours grill-me/PRD/review)
+  ordewell plan --goal "text"     Plan a goal conversationally (honours verify)
   ordewell run                    Execute the last generated plan (streams status)
   ordewell approve                Sign off a plan paused for review, and continue it
   ordewell stop                   Stop execution of the last session (or --server)
@@ -121,12 +124,8 @@ Planner, models and runners:
   ordewell models                 List every provider's catalog (works without a server)
 
 Modes:
-  ordewell grill-me [on|off]    Toggle Grill-Me challenge mode (or show status)
   ordewell tdd [on|off]         Toggle Test-Driven Development mode (or show status)
-  ordewell prd [on|off]         Toggle PRD mode (planner writes a PRD before the plan)
-  ordewell review [on|off]    Toggle review mode \u2014 adds a final opinion-review task, human sign-off (or show status)
   ordewell verify [on|off]    Toggle verification mode \u2014 adds a final evidence-based task that runs the full suite (or show status)
-  ordewell research-subagents [on|off]  Toggle parallel read-only research subagents during planning (or show status)
 
 Other:
   ordewell web                    Start the API server (foreground; --daemon for background)
@@ -202,16 +201,21 @@ Environment:
 // src/daemon.ts
 var import_child_process = require("child_process");
 var import_fs2 = require("fs");
-var import_os2 = require("os");
+var import_os = require("os");
 var import_path2 = require("path");
 var import_http = __toESM(require("http"));
-var import_core = require("@ordewell/core");
+var import_net = require("net");
+var import_core2 = require("@ordewell/core");
 var DEFAULT_PORT = 3742;
-var CONFIG_DIR = (0, import_path2.join)((0, import_os2.homedir)(), ".config", "ordewell");
+var CONFIG_DIR = (0, import_core2.globalDataDir)();
 var LEGACY_PID_FILE = (0, import_path2.join)(CONFIG_DIR, "server.pid");
+var OLD_CONFIG_DIR = (0, import_path2.join)((0, import_os.homedir)(), ".config", "ordewell");
 function pidFileFor(port) {
   return port === DEFAULT_PORT ? LEGACY_PID_FILE : (0, import_path2.join)(CONFIG_DIR, `server-${port}.pid`);
 }
+function oldPidFileFor(port) {
+  return port === DEFAULT_PORT ? (0, import_path2.join)(OLD_CONFIG_DIR, "server.pid") : (0, import_path2.join)(OLD_CONFIG_DIR, `server-${port}.pid`);
+}
 function httpGet(url, timeoutMs = 2e3, headers = {}) {
   return new Promise((resolve3, reject) => {
     const req = import_http.default.get(url, { timeout: timeoutMs, headers }, (res) => {
@@ -243,12 +247,12 @@ function getWebServerPath() {
   );
 }
 async function isDaemonRunning(port = DEFAULT_PORT) {
-  const token = (0, import_core.readDaemonToken)(port);
+  const token = (0, import_core2.readDaemonToken)(port);
   try {
     const res = await httpGet(
       `http://127.0.0.1:${port}/api/workspaces`,
       2e3,
-      token ? { Authorization: (0, import_core.bearerHeaderValue)(token) } : {}
+      token ? { Authorization: (0, import_core2.bearerHeaderValue)(token) } : {}
     );
     return res.status === 200 || res.status === 401;
   } catch {
@@ -268,7 +272,12 @@ async function startDaemon(port = DEFAULT_PORT, opts) {
   }
   const logFd = (0, import_fs2.openSync)((0, import_path2.join)(CONFIG_DIR, "server.log"), "a");
   const detached = opts?.detached ?? true;
-  const child = (0, import_child_process.spawn)(process.execPath, [serverPath, "--port", String(port)], {
+  const child = (0, import_child_process.spawn)(process.execPath, [
+    serverPath,
+    "--port",
+    String(port),
+    ...detached ? [] : ["--watch-parent", String(process.pid)]
+  ], {
     detached,
     stdio: ["ignore", logFd, logFd],
     env: { ...process.env }
@@ -288,7 +297,8 @@ async function startDaemon(port = DEFAULT_PORT, opts) {
   process.exit(1);
 }
 async function stopDaemon(port = DEFAULT_PORT) {
-  const pidFile = pidFileFor(port);
+  let pidFile = pidFileFor(port);
+  if (!(0, import_fs2.existsSync)(pidFile) && (0, import_fs2.existsSync)(oldPidFileFor(port))) pidFile = oldPidFileFor(port);
   if (!(0, import_fs2.existsSync)(pidFile)) {
     console.error(`No server PID file found for port ${port}. Is the server running?`);
     return false;
@@ -298,7 +308,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);
+      (0, import_core2.clearDaemonToken)(port);
       return false;
     }
     process.kill(pid, "SIGTERM");
@@ -311,7 +321,7 @@ async function stopDaemon(port = DEFAULT_PORT) {
         (0, import_fs2.unlinkSync)(pidFile);
       } catch {
       }
-      (0, import_core.clearDaemonToken)(port);
+      (0, import_core2.clearDaemonToken)(port);
       console.log("Server was not running (stale PID removed).");
       return true;
     }
@@ -338,6 +348,18 @@ function isConnectionRefused(err) {
 function describeConnectionRefused(port) {
   return `No Ordewell server is listening on port ${port}. It may have been stopped, or it may have crashed \u2014 check ${(0, import_path2.join)(CONFIG_DIR, "server.log")}. Start one with \`ordewell web --daemon\`.`;
 }
+function findFreePort() {
+  return new Promise((resolvePromise, reject) => {
+    const srv = (0, import_net.createServer)();
+    srv.unref();
+    srv.on("error", reject);
+    srv.listen(0, "127.0.0.1", () => {
+      const address = srv.address();
+      const port = typeof address === "object" && address ? address.port : 0;
+      srv.close(() => resolvePromise(port));
+    });
+  });
+}
 function resolvePort(args = []) {
   const idx = args.indexOf("--port");
   if (idx !== -1) {
@@ -352,7 +374,7 @@ 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 import_core3 = require("@ordewell/core");
 var DEFAULT_HTTP_TIMEOUT_MS = 15 * 60 * 1e3;
 var ApiClient = class {
   port;
@@ -365,7 +387,7 @@ var ApiClient = class {
    * A missing file is not an error here — the daemon's own 401 names the path.
    */
   token() {
-    return (0, import_core2.readDaemonToken)(this.port);
+    return (0, import_core3.readDaemonToken)(this.port);
   }
   httpRequest(method, urlPath, body) {
     return new Promise((resolve3, reject) => {
@@ -379,7 +401,7 @@ var ApiClient = class {
         method,
         headers: {
           ...body ? { "Content-Type": "application/json" } : {},
-          ...token ? { Authorization: (0, import_core2.bearerHeaderValue)(token) } : {}
+          ...token ? { Authorization: (0, import_core3.bearerHeaderValue)(token) } : {}
         },
         // Planner research on a real repository regularly exceeds two minutes.
         // The benchmark harness uses the same 15-minute default explicitly;
@@ -408,7 +430,7 @@ var ApiClient = class {
       req.end();
     });
   }
-  async generatePlan(goal, runners2, workspace, sessionId = (0, import_core2.mintSessionId)()) {
+  async generatePlan(goal, runners2, workspace, sessionId = (0, import_core3.mintSessionId)()) {
     const res = await this.httpRequest("POST", `/api/plans/${sessionId}/generate`, {
       goal,
       runners: runners2 || void 0,
@@ -421,7 +443,7 @@ var ApiClient = class {
   }
   /**
    * Open the ADR-0002 planner dialogue. Unlike `generatePlan`, this path honours
-   * the grill-me / PRD / review toggles, so the returned plan may be a question
+   * the verify toggle, so the returned plan may be a question
    * (empty `tasks`, last word in `conversationHistory`) rather than a committed plan.
    */
   async startConversation(sessionId, goal, runners2, workspace) {
@@ -609,7 +631,7 @@ var ApiClient = class {
     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
+      token ? (0, import_core3.tokenSubprotocols)(token) : void 0
     );
     socket.on("unexpected-response", (_req, res) => {
       let body = "";
@@ -773,6 +795,7 @@ function positionals(args) {
 }
 
 // src/utils/tasks.ts
+var import_core4 = require("@ordewell/core");
 function allTasksOf(plan) {
   const tasks = plan?.pendingTasks || plan?.tasks || [];
   const executionLog = plan?.executionLog || [];
@@ -780,6 +803,10 @@ function allTasksOf(plan) {
 }
 function resolveTaskId(plan, identifier) {
   const allTasks = allTasksOf(plan);
+  if (identifier.includes(".")) {
+    const subtask = (0, import_core4.resolveOrderLabel)(allTasks, identifier);
+    return subtask?.id;
+  }
   const order = parseInt(identifier, 10);
   if (!isNaN(order)) {
     const task = allTasks.find((t) => t.order === order);
@@ -795,20 +822,24 @@ function resolveTaskId(plan, identifier) {
 // src/utils/session.ts
 var import_fs3 = require("fs");
 var import_path3 = require("path");
-var import_os3 = require("os");
-var LAST_SESSION_FILE = (0, import_path3.join)((0, import_os3.homedir)(), ".config", "ordewell", "last-session.json");
+var import_core5 = require("@ordewell/core");
+var LAST_SESSION_FILENAME = "last-session.json";
+function lastSessionFile(workspace) {
+  return (0, import_path3.join)((0, import_core5.getStateDir)(workspace), LAST_SESSION_FILENAME);
+}
 function saveLastSession(sessionId, goal, runners2, workspace) {
-  const dir = (0, import_path3.join)((0, import_os3.homedir)(), ".config", "ordewell");
+  const dir = (0, import_core5.getStateDir)(workspace);
   if (!(0, import_fs3.existsSync)(dir)) (0, import_fs3.mkdirSync)(dir, { recursive: true });
   (0, import_fs3.writeFileSync)(
-    LAST_SESSION_FILE,
+    lastSessionFile(workspace),
     JSON.stringify({ sessionId, goal, runners: runners2, workspace, createdAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2)
   );
 }
-function readLastSession() {
+function readLastSession(workspace) {
   try {
-    if ((0, import_fs3.existsSync)(LAST_SESSION_FILE)) {
-      return JSON.parse((0, import_fs3.readFileSync)(LAST_SESSION_FILE, "utf8"));
+    const file = lastSessionFile(workspace);
+    if ((0, import_fs3.existsSync)(file)) {
+      return JSON.parse((0, import_fs3.readFileSync)(file, "utf8"));
     }
   } catch {
   }
@@ -914,7 +945,7 @@ function isTransient(event) {
 }
 
 // src/commands/plan.ts
-var import_core3 = require("@ordewell/core");
+var import_core6 = require("@ordewell/core");
 function planTasks(plan) {
   return plan?.tasks || [];
 }
@@ -976,21 +1007,26 @@ function printPlan(plan, sessionId, runners2, models) {
   const tasks = planTasks(plan);
   const aiCount = tasks.filter((t) => t.type !== "user").length;
   const manCount = tasks.filter((t) => t.type === "user").length;
+  const modelSuffix = (task) => {
+    if (!task.assignedModel) return "";
+    const found = models.find((m) => m.modelId === task.assignedModel?.modelId);
+    const rp = found?.runnerProvider;
+    const label = rp ? rp.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ") : "";
+    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(", ")}`);
   console.log(`Session: ${sessionId}
 `);
   for (const t of tasks) {
     const typeIcon = t.type === "user" ? "[MAN]" : "[ AI]";
-    let model = "";
-    if (t.assignedModel) {
-      const found = models.find((m) => m.modelId === t.assignedModel?.modelId);
-      const rp = found?.runnerProvider;
-      const label = rp ? rp.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ") : "";
-      model = rp ? ` (${t.assignedModel.modelLabel} \xB7 ${label})` : ` (${t.assignedModel.modelLabel})`;
-    }
     const deps = t.dependencies?.length ? ` \u2190 ${t.dependencies.join(", ")}` : "";
-    console.log(`  ${String(t.order).padStart(2)}. ${typeIcon} ${t.title}${model}${deps}`);
+    console.log(`  ${(0, import_core6.taskOrderLabel)(t).padStart(2)}. ${typeIcon} ${t.title}${modelSuffix(t)}${deps}`);
+    for (const sub of t.subtasks || []) {
+      const subTypeIcon = sub.type === "user" ? "[MAN]" : "[ AI]";
+      const subDeps = sub.dependencies?.length ? ` \u2190 ${sub.dependencies.join(", ")}` : "";
+      console.log(`    ${(0, import_core6.taskOrderLabel)(sub, t)}. ${subTypeIcon} ${sub.title}${modelSuffix(sub)}${subDeps}`);
+    }
   }
   if (manCount > 0) {
     console.log("\n  [MAN] = manual step \u2014 run `ordewell tui` to work through it");
@@ -1036,7 +1072,7 @@ async function handlePlan(subArgs, deps = {}) {
     runners2 = runnerFlags;
   }
   console.error(`Generating plan for: "${goal}"...`);
-  const sessionId = (0, import_core3.mintSessionId)();
+  const sessionId = (0, import_core6.mintSessionId)();
   const isTty = !!process.stderr.isTTY;
   let lastLineLength = 0;
   function renderStep(event) {
@@ -1148,9 +1184,10 @@ function iconFor(status) {
 function resolveSessionId(subArgs) {
   const explicit = flag(subArgs, "--session-id");
   if (explicit) return explicit;
-  const last = readLastSession();
+  const workspace = flag(subArgs, "--workspace") || process.cwd();
+  const last = readLastSession(workspace);
   if (!last) {
-    console.error("No session specified. Use --session-id <id> or run `ordewell plan` first.");
+    console.error(`No session specified. Use --session-id <id> or run \`ordewell plan\` in ${workspace} first.`);
     process.exit(1);
   }
   console.error(`Using last session: ${last.sessionId} ("${last.goal}")`);
@@ -1224,51 +1261,29 @@ async function handleRun(subArgs) {
 
 // src/commands/status.ts
 var import_fs4 = require("fs");
+var import_core7 = require("@ordewell/core");
 async function handleStatus(subArgs, injectedApi) {
   const sessionId = flag(subArgs, "--session-id");
-  const explicitWorkspace = flag(subArgs, "--workspace");
-  let workspace = explicitWorkspace || process.cwd();
+  const workspace = flag(subArgs, "--workspace") || process.cwd();
   const outputPath = flag(subArgs, "--output");
   const asJson = hasFlag(subArgs, "--json") || Boolean(outputPath);
   const port = injectedApi ? resolvePort(subArgs) : await ensureDaemon(resolvePort(subArgs));
   const api = injectedApi || new ApiClient(port);
   if (sessionId) {
-    let session;
-    try {
-      session = await api.getSession(sessionId, workspace);
-    } catch (err) {
-      const last = readLastSession();
-      if (!explicitWorkspace && last?.workspace && last.workspace !== workspace) {
-        session = await api.getSession(sessionId, last.workspace);
-      } else {
-        throw err;
-      }
-    }
+    const session = await api.getSession(sessionId, workspace);
     if (asJson) {
       emitJson(session, outputPath);
       return;
     }
     printOneSession(sessionId, session.meta, session.plan);
   } else {
-    let sessions = await api.getSessions(workspace);
-    if (sessions.length === 0 && !explicitWorkspace) {
-      const last2 = readLastSession();
-      if (last2?.workspace && last2.workspace !== workspace) {
-        const fallback = await api.getSessions(last2.workspace);
-        if (fallback.length > 0) {
-          workspace = last2.workspace;
-          sessions = fallback;
-          console.log(`(no sessions in ${process.cwd()} \u2014 showing ${workspace})
-`);
-        }
-      }
-    }
+    const sessions = await api.getSessions(workspace);
     if (asJson) {
       emitJson(sessions, outputPath);
       return;
     }
     if (sessions.length === 0) {
-      console.log("No sessions found.");
+      console.log(`No sessions found in ${workspace}.`);
       return;
     }
     console.log(`${sessions.length} session(s):
@@ -1276,7 +1291,7 @@ async function handleStatus(subArgs, injectedApi) {
     for (const s of sessions) {
       console.log(`  ${s.id.slice(-8)}  ${s.status.padEnd(10)}  ${s.taskCount} tasks  ${(s.runners || []).join(",").padEnd(12)}  ${s.goal.slice(0, 60)}`);
     }
-    const last = readLastSession();
+    const last = readLastSession(workspace);
     if (last) {
       console.log(`
   Last active: ${last.sessionId.slice(-8)} ("${last.goal.slice(0, 50)}")`);
@@ -1317,7 +1332,13 @@ function printOneSession(sessionId, meta, plan) {
     const icon = iconFor(t.status);
     const model = t.assignedModel ? ` (${t.assignedModel.modelLabel})` : "";
     const shortId = (t.id ?? "").slice(-8);
-    console.log(`  ${String(t.order).padStart(2)}. ${icon} [${shortId}] ${t.title}${model}`);
+    console.log(`  ${(0, import_core7.taskOrderLabel)(t).padStart(2)}. ${icon} [${shortId}] ${t.title}${model}`);
+    for (const sub of t.subtasks || []) {
+      const subIcon = iconFor(sub.status);
+      const subModel = sub.assignedModel ? ` (${sub.assignedModel.modelLabel})` : "";
+      const subShortId = (sub.id ?? "").slice(-8);
+      console.log(`    ${(0, import_core7.taskOrderLabel)(sub, t)}. ${subIcon} [${subShortId}] ${sub.title}${subModel}`);
+    }
   }
 }
 
@@ -1330,7 +1351,8 @@ async function handleStop(subArgs) {
   }
   let sessionId = flag(subArgs, "--session-id");
   if (!sessionId) {
-    const last = readLastSession();
+    const workspace = flag(subArgs, "--workspace") || process.cwd();
+    const last = readLastSession(workspace);
     if (!last) {
       console.error("No session specified. Use --session-id <id> or --server to stop the server.");
       process.exit(1);
@@ -1367,10 +1389,10 @@ async function handleWeb(subArgs) {
 }
 
 // src/commands/models.ts
-var import_core5 = require("@ordewell/core");
+var import_core9 = require("@ordewell/core");
 
 // src/commands/model.ts
-var import_core4 = require("@ordewell/core");
+var import_core8 = require("@ordewell/core");
 
 // src/catalog.ts
 function normalizeCatalog(result) {
@@ -1452,7 +1474,8 @@ function toTaskView(task) {
     dependencies: task.dependencies ?? [],
     assignedRunner: task.assignedRunner || void 0,
     taskMode: task.taskMode || void 0,
-    assignedModel: task.assignedModel ?? void 0
+    assignedModel: task.assignedModel ?? void 0,
+    subtasks: [...task.subtasks ?? []].sort((a, b) => a.order - b.order).map(toTaskView)
   };
 }
 function taskViews(plan) {
@@ -1475,7 +1498,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_core4.runnerForProvider)(provider);
+  const runner = (0, import_core8.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)) {
@@ -1494,7 +1517,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_core4.runnerForProvider)(provider);
+  const runner = (0, import_core8.runnerForProvider)(provider);
   const options = runner ? catalog.models.filter((m) => m.runners?.includes(runner)) : catalog.orchestratorModels;
   console.log(`
 Planner model: ${current || "(backend default)"}`);
@@ -1528,8 +1551,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_core5.EnvConfig();
-  const providers = (0, import_core5.configuredProviders)(config);
+  const config = new import_core9.EnvConfig();
+  const providers = (0, import_core9.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)");
@@ -1538,19 +1561,19 @@ async function handleModels(subArgs) {
     console.error("  OPENAI_COMPATIBLE_BASE_URL=...  (self-hosted / OpenAI-compatible)");
     process.exit(1);
   }
-  const { apiKeys, baseUrls } = (0, import_core5.collectProviderCredentials)(config);
+  const { apiKeys, baseUrls } = (0, import_core9.collectProviderCredentials)(config);
   let models;
   let errors;
   try {
-    const result = await (0, import_core5.fetchAllProviderModels)({ apiKeys, baseUrls });
-    models = (0, import_core5.toOrchestratorOptions)(result.models, import_core5.ORCHESTRATOR_SHORTCUTS);
+    const result = await (0, import_core9.fetchAllProviderModels)({ apiKeys, baseUrls });
+    models = (0, import_core9.toOrchestratorOptions)(result.models, import_core9.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_core5.getProviderMeta)(p)?.label ?? p;
+  const providerLabel = (p) => (0, import_core9.getProviderMeta)(p)?.label ?? p;
   console.log(
     `
 Available models (${models.length}) across ${providers.length} configured provider(s):`
@@ -1667,9 +1690,9 @@ function handleSetup(subArgs) {
 }
 
 // src/commands/plugins.ts
-var import_core6 = require("@ordewell/core");
+var import_core10 = require("@ordewell/core");
 function handlePlugins(subArgs) {
-  const registry = new import_core6.RunnerRegistry();
+  const registry = new import_core10.RunnerRegistry();
   registry.loadUserPlugins();
   const sub = subArgs[0];
   if (sub === "list" || !sub) {
@@ -1705,7 +1728,7 @@ ${plugins.length} plugin(s):
       process.exit(1);
     }
     try {
-      const resolved = (0, import_core6.classifyPluginSource)(source);
+      const resolved = (0, import_core10.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) {
@@ -1746,23 +1769,6 @@ ${plugins.length} plugin(s):
   process.exit(1);
 }
 
-// src/commands/grillMe.ts
-async function handleGrillMe(subArgs) {
-  const action = subArgs[0];
-  const port = await ensureDaemon(resolvePort(subArgs));
-  const api = new ApiClient(port);
-  if (action === "on" || action === "off") {
-    const result = await api.sendCommand("grill-me", { action });
-    const state = result.settings?.grillMe;
-    console.log(`Grill-Me: ${state?.enabled ? "ON" : "OFF"}`);
-  } else {
-    const settings = await api.getSettings();
-    const grillMe = settings.grillMe;
-    console.log(`Grill-Me: ${grillMe?.enabled ? "ON" : "OFF"}`);
-    console.log("Usage: ordewell grill-me [on|off]");
-  }
-}
-
 // src/commands/tdd.ts
 async function handleTdd(subArgs) {
   const action = subArgs[0];
@@ -1780,24 +1786,6 @@ async function handleTdd(subArgs) {
   }
 }
 
-// src/commands/prd.ts
-async function handlePrd(subArgs) {
-  const action = subArgs[0];
-  const port = await ensureDaemon(resolvePort(subArgs));
-  const api = new ApiClient(port);
-  if (action === "on" || action === "off") {
-    const result = await api.sendCommand("prd", { action });
-    const state = result.settings?.prd;
-    console.log(`PRD mode: ${state?.enabled ? "ON" : "OFF"}`);
-  } else {
-    const settings = await api.getSettings();
-    const prd = settings.prd;
-    console.log(`PRD mode: ${prd?.enabled ? "ON" : "OFF"}`);
-    console.log("Usage: ordewell prd [on|off]");
-    console.log("When ON, the planner previews and writes a markdown PRD (saved to .scratch/<slug>/PRD.md) before the task plan.");
-  }
-}
-
 // src/commands/allowlist.ts
 var USAGE2 = `Usage:
   ordewell allowlist set <runner> <id1,id2,\u2026>    Set allowlist for a runner
@@ -1884,23 +1872,6 @@ async function handleShow(args, api) {
   }
 }
 
-// src/commands/review.ts
-async function handleReview(subArgs, api) {
-  const action = subArgs[0];
-  const port = api ? void 0 : await ensureDaemon(resolvePort(subArgs));
-  const client = api || new ApiClient(port);
-  if (action === "on" || action === "off") {
-    const result = await client.sendCommand("review", { action });
-    const state = result.settings?.review;
-    console.log(`Review mode: ${state?.enabled ? "ON" : "OFF"}`);
-  } else {
-    const settings = await client.getSettings();
-    const review = settings.review;
-    console.log(`Review mode: ${review?.enabled ? "ON" : "OFF"}`);
-    console.log("Usage: ordewell review [on|off]");
-  }
-}
-
 // src/commands/verify.ts
 async function handleVerify(subArgs, api) {
   const action = subArgs[0];
@@ -1918,23 +1889,6 @@ async function handleVerify(subArgs, api) {
   }
 }
 
-// src/commands/researchSubagents.ts
-async function handleResearchSubagents(subArgs, api) {
-  const action = subArgs[0];
-  const port = api ? void 0 : await ensureDaemon();
-  const client = api || new ApiClient(port);
-  if (action === "on" || action === "off") {
-    const result = await client.sendCommand("research-subagents", { action });
-    const state = result.settings?.researchSubagents;
-    console.log(`Research subagents: ${state?.enabled ? "ON" : "OFF"}`);
-  } else {
-    const settings = await client.getSettings();
-    const researchSubagents = settings.researchSubagents;
-    console.log(`Research subagents: ${researchSubagents?.enabled ? "ON" : "OFF"}`);
-    console.log("Usage: ordewell research-subagents [on|off]");
-  }
-}
-
 // src/commands/task-control.ts
 var PAST_TENSE = {
   run: "Task started.",
@@ -1943,11 +1897,12 @@ var PAST_TENSE = {
   cancel: "Task cancelled."
 };
 async function withResolvedTask(subArgs, usage, injectedApi, run) {
-  const last = readLastSession();
+  const workspace = flag(subArgs, "--workspace") || process.cwd();
   let sessionId = flag(subArgs, "--session-id");
   if (!sessionId) {
+    const last = readLastSession(workspace);
     if (!last) {
-      console.error("No session specified. Use --session-id <id> or run `ordewell plan` first.");
+      console.error(`No session specified. Use --session-id <id> or run \`ordewell plan\` in ${workspace} first.`);
       process.exit(1);
     }
     sessionId = last.sessionId;
@@ -1958,22 +1913,12 @@ async function withResolvedTask(subArgs, usage, injectedApi, run) {
     process.exit(1);
   }
   const api = injectedApi || new ApiClient(await ensureDaemon(resolvePort(subArgs)));
-  const explicitWorkspace = flag(subArgs, "--workspace");
   let plan;
   try {
-    plan = (await api.getSession(sessionId, explicitWorkspace || process.cwd())).plan;
+    plan = (await api.getSession(sessionId, workspace)).plan;
   } catch (err) {
-    if (!explicitWorkspace && last?.workspace && last.workspace !== process.cwd()) {
-      try {
-        plan = (await api.getSession(sessionId, last.workspace)).plan;
-      } catch {
-        console.error(`Failed to load session: ${err.message}`);
-        process.exit(1);
-      }
-    } else {
-      console.error(`Failed to load session: ${err.message}`);
-      process.exit(1);
-    }
+    console.error(`Failed to load session: ${err.message}`);
+    process.exit(1);
   }
   const taskId = resolveTaskId(plan, identifier);
   if (!taskId) {
@@ -1986,7 +1931,7 @@ function makeHandler(action, command = action) {
   return async function handle(subArgs, injectedApi) {
     await withResolvedTask(
       subArgs,
-      `Usage: ordewell ${command} <task-id-or-order> [--session-id <id>]`,
+      `Usage: ordewell ${command} <task-id-or-order> [--session-id <id>] [--workspace /path]`,
       injectedApi,
       async (api, sessionId, taskId) => {
         try {
@@ -2059,14 +2004,15 @@ async function handleSkip(subArgs, api) {
 async function handleAddTask(subArgs, injectedApi) {
   const title = flag(subArgs, "--title");
   if (!title) {
-    console.error('Usage: ordewell add-task --title "..." [--description "..."] [--prompt "..."] [--type ai|user] [--depends-on <task-id> ...] [--session-id <id>]');
+    console.error('Usage: ordewell add-task --title "..." [--description "..."] [--prompt "..."] [--type ai|user] [--depends-on <task-id> ...] [--session-id <id>] [--workspace /path]');
     process.exit(1);
   }
   let sessionId = flag(subArgs, "--session-id");
   if (!sessionId) {
-    const last = readLastSession();
+    const workspace = flag(subArgs, "--workspace") || process.cwd();
+    const last = readLastSession(workspace);
     if (!last) {
-      console.error("No session specified. Use --session-id <id> or run `ordewell plan` first.");
+      console.error(`No session specified. Use --session-id <id> or run \`ordewell plan\` in ${workspace} first.`);
       process.exit(1);
     }
     sessionId = last.sessionId;
@@ -2096,7 +2042,7 @@ async function handleAddTask(subArgs, injectedApi) {
 async function handleRemoveTask(subArgs, api) {
   await withResolvedTask(
     subArgs,
-    "Usage: ordewell remove-task <task-id-or-order> [--session-id <id>]",
+    "Usage: ordewell remove-task <task-id-or-order> [--session-id <id>] [--workspace /path]",
     api,
     async (client, sessionId, taskId) => {
       try {
@@ -2127,7 +2073,7 @@ async function handleSessions(subArgs, injectedApi) {
       console.log(`No sessions found in ${workspace}.`);
       return;
     }
-    const last = readLastSession();
+    const last = readLastSession(workspace);
     console.log(`${sessions.length} session(s) in ${workspace}:
 `);
     for (const s of sessions) {
@@ -2177,7 +2123,7 @@ async function handleSessions(subArgs, injectedApi) {
 }
 
 // src/commands/planner.ts
-var import_core7 = require("@ordewell/core");
+var import_core11 = require("@ordewell/core");
 
 // src/plannerModelSwitch.ts
 function describePlannerSwitch(settings, provider) {
@@ -2196,7 +2142,7 @@ function rememberedModelFor(settings, provider) {
 }
 
 // src/commands/planner.ts
-var KNOWN_PROVIDERS = Object.keys(import_core7.ALL_PROVIDERS);
+var KNOWN_PROVIDERS = Object.keys(import_core11.ALL_PROVIDERS);
 async function handlePlanner(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
   const [wanted] = positionals(subArgs);
@@ -2211,13 +2157,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_core7.ALL_PROVIDERS[provider];
+  const meta = import_core11.ALL_PROVIDERS[provider];
   const catalog = await fetchCatalog(api);
   console.log(
-    (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}.`
+    (0, import_core11.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_core7.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
+  if (!(0, import_core11.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
     console.log(`  No ${meta.apiKeyEnvVar} configured yet \u2014 set one with \`ordewell key set ${provider} <key>\`.`);
   }
 }
@@ -2235,15 +2181,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_core7.CLI_PROVIDERS) {
-    const runner = (0, import_core7.runnerForProvider)(id);
+  for (const id of import_core11.CLI_PROVIDERS) {
+    const runner = (0, import_core11.runnerForProvider)(id);
     const discovered = runner ? catalog.models.some((m) => m.runners?.includes(runner)) : false;
-    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core7.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
+    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core11.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
   }
   console.log("\nAPI providers");
-  for (const id of import_core7.PROVIDER_PRIORITY) {
+  for (const id of import_core11.PROVIDER_PRIORITY) {
     const configured = catalog.providers.includes(id);
-    const meta = import_core7.ALL_PROVIDERS[id];
+    const meta = import_core11.ALL_PROVIDERS[id];
     console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${meta.label}${configured ? "" : `  (no ${meta.apiKeyEnvVar})`}`);
   }
   console.log(`
@@ -2260,7 +2206,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_core7.runnerForProvider)(provider);
+  const runner = (0, import_core11.runnerForProvider)(provider);
   if (!runner) {
     fail(
       "Thinking effort applies to a coding-agent planner.",
@@ -2300,7 +2246,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
 }
 
 // src/commands/key.ts
-var import_core8 = require("@ordewell/core");
+var import_core12 = require("@ordewell/core");
 var USAGE4 = "Usage: ordewell key [list | set <provider> <key>]";
 async function handleKey(subArgs, injectedApi) {
   const [action, provider, ...keyParts] = positionals(subArgs);
@@ -2311,8 +2257,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_core8.PROVIDER_PRIORITY) {
-      const meta2 = import_core8.ALL_PROVIDERS[id2];
+    for (const id2 of import_core12.PROVIDER_PRIORITY) {
+      const meta2 = import_core12.ALL_PROVIDERS[id2];
       const configured = catalog.providers.includes(id2);
       console.log(`  ${configured ? "\u2713" : " "} ${id2.padEnd(14)} ${meta2.apiKeyEnvVar.padEnd(28)} ${meta2.label}`);
     }
@@ -2322,7 +2268,7 @@ async function handleKey(subArgs, injectedApi) {
   }
   if (!provider) fail(USAGE4);
   const id = provider.toLowerCase();
-  const meta = import_core8.ALL_PROVIDERS[id];
+  const meta = import_core12.ALL_PROVIDERS[id];
   if (!meta) {
     fail(`Unknown provider: ${provider}`, "Run `ordewell key` to see the list.");
   }
@@ -2402,7 +2348,7 @@ async function handleApprove(subArgs, injectedApi) {
 // src/tui/terminalLauncher.ts
 var import_child_process3 = require("child_process");
 var import_util = require("util");
-var import_core9 = require("@ordewell/core");
+var import_core13 = 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);
@@ -2422,16 +2368,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_core9.hasTmux;
+  const hasTmuxImpl = deps.hasTmuxImpl ?? import_core13.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_core9.tmuxSessionName)(port);
-  const socket = (0, import_core9.tmuxSocketName)(port);
-  const base = (0, import_core9.tmuxWindowName)(taskId, planSessionId);
+  const session = (0, import_core13.tmuxSessionName)(port);
+  const socket = (0, import_core13.tmuxSocketName)(port);
+  const base = (0, import_core13.tmuxWindowName)(taskId, planSessionId);
   let windows;
   try {
     const { stdout } = await execFileImpl("tmux", ["-L", socket, "list-windows", "-t", session, "-F", "#{window_name}"]);
@@ -2725,13 +2671,25 @@ Dependencies \xB7 #${task.order} ${task.title}
 }
 
 // src/tui/index.ts
-var import_core13 = require("@ordewell/core");
+var import_core17 = require("@ordewell/core");
 
 // src/tui/ansi.ts
 var import_string_width = __toESM(require("string-width"));
-var ANSI = /\x1b\[[0-9;]*m/g;
+var ESCAPE = /\x1b(?:\][\s\S]*?(?:\x07|\x1b\\|$)|[P^_][\s\S]*?(?:\x1b\\|$)|\[[0-?]*[ -/]*[@-~]?|[ -/]*[0-~]?)/g;
+var ESCAPE_SPLIT = new RegExp(`(${ESCAPE.source})`);
+var CONTROL = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g;
+var CONTROL_IN_ROW = /[\x00-\x1f\x7f-\x9f]/g;
+var HAS_CONTROL = /[\x00-\x1f\x7f-\x9f]/;
+var PAINT_ESCAPE = /^\x1b\[[0-9;]*[mGK]$/;
 function stripAnsi(text) {
-  return text.replace(ANSI, "");
+  return text.replace(ESCAPE, "");
+}
+function sanitize(text) {
+  return text.replace(ESCAPE, "").replace(/\r\n?/g, "\n").replace(/\t/g, " ").replace(CONTROL, "");
+}
+function paintOnly(line) {
+  if (!HAS_CONTROL.test(line)) return line;
+  return line.split(ESCAPE_SPLIT).map((piece) => piece.startsWith("\x1B") ? PAINT_ESCAPE.test(piece) ? piece : "" : piece.replace(CONTROL_IN_ROW, "")).join("");
 }
 function width(text) {
   return (0, import_string_width.default)(stripAnsi(text));
@@ -2749,9 +2707,6 @@ function truncate(text, max) {
   }
   return out + "\u2026";
 }
-function stripTabs(text) {
-  return text.replace(/\t/g, " ");
-}
 function pad(text, target) {
   const current = width(text);
   if (current > target) return truncate(text, target);
@@ -3021,12 +2976,8 @@ var SLASH_COMMANDS = [
   { name: "auto", usage: "/auto [on|off]", description: "Autonomous permission mode for new plans", category: "models" },
   { name: "refresh", usage: "/refresh", description: "Re-discover runners and model catalogs", category: "models" },
   // Skills
-  { name: "grill-me", usage: "/grill-me [on|off]", description: "Grill-Me challenge mode \u2014 the planner interrogates the goal", category: "skills" },
   { name: "tdd", usage: "/tdd [on|off]", description: "Test-Driven Development mode", category: "skills" },
-  { name: "prd", usage: "/prd [on|off]", description: "PRD mode \u2014 write a PRD before the plan", category: "skills" },
-  { name: "review", usage: "/review [on|off]", description: "Review mode \u2014 final opinion-review task with human sign-off", category: "skills" },
   { name: "verify", usage: "/verify [on|off]", description: "Verification mode \u2014 final evidence-based task that runs the suite", category: "skills" },
-  { name: "research-subagents", usage: "/research-subagents [on|off]", description: "Parallel read-only research subagents during planning", category: "skills" },
   // Sessions
   { name: "sessions", usage: "/sessions", description: "List saved sessions", category: "session" },
   { name: "new", usage: "/new", description: "Start a new session", category: "session" },
@@ -3039,6 +2990,23 @@ var SLASH_COMMANDS = [
   { name: "quit", usage: "/quit", description: "Exit the TUI", category: "system" }
 ];
 var BY_NAME = new Map(SLASH_COMMANDS.map((c) => [c.name, c]));
+var skillCommands = [];
+var skillByName = /* @__PURE__ */ new Map();
+function registerSkillCommands(skills) {
+  const map = /* @__PURE__ */ new Map();
+  for (const skill of skills) {
+    if (BY_NAME.has(skill.name)) continue;
+    map.set(skill.name, {
+      name: skill.name,
+      usage: `/${skill.name}`,
+      description: skill.description,
+      category: "skills",
+      source: "skill"
+    });
+  }
+  skillByName = map;
+  skillCommands = [...map.values()];
+}
 function parseSlash(text) {
   const trimmed = text.trim();
   if (!trimmed.startsWith("/")) return null;
@@ -3047,14 +3015,15 @@ function parseSlash(text) {
   return { name: parts[0].toLowerCase(), args: parts.slice(1) };
 }
 function findCommand(name) {
-  return BY_NAME.get(name.replace(/^\//, "").toLowerCase());
+  const key = name.replace(/^\//, "").toLowerCase();
+  return BY_NAME.get(key) ?? skillByName.get(key);
 }
 function completions(text) {
   if (!text.startsWith("/")) return [];
   const typed = text.slice(1);
   if (/\s/.test(typed)) return [];
   const prefix = typed.toLowerCase();
-  return SLASH_COMMANDS.filter((c) => c.name.startsWith(prefix));
+  return [...SLASH_COMMANDS, ...skillCommands].filter((c) => c.name.startsWith(prefix));
 }
 
 // src/tui/markdown.ts
@@ -3199,9 +3168,9 @@ function chatEditorRoom(cols, active) {
 }
 
 // src/tui/state.ts
-var SKILL_IDS = ["grill-me", "tdd", "prd", "review", "verify", "research-subagents"];
+var SKILL_IDS = ["tdd", "verify"];
 function noSkills() {
-  return { "grill-me": false, tdd: false, prd: false, review: false, verify: false, "research-subagents": false };
+  return { tdd: false, verify: false };
 }
 function visibleItems(picker2) {
   const filter = picker2.filter.trim().toLowerCase();
@@ -3212,6 +3181,21 @@ function visibleItems(picker2) {
 }
 var isTaskRunning = (task) => task.status === "in_progress" || task.status === "running";
 var anyTaskRunning = (state) => state.tasks.some(isTaskRunning);
+function planRows(state) {
+  const rows = [];
+  for (const task of state.tasks) {
+    rows.push({ task, parent: null });
+    const subtasks = task.subtasks ?? [];
+    const open = state.expandedTaskId === task.id || subtasks.some((s) => s.id === state.expandedTaskId);
+    if (open) {
+      for (const subtask of subtasks) rows.push({ task: subtask, parent: task });
+    }
+  }
+  return rows;
+}
+function selectedPlanRow(state) {
+  return planRows(state)[state.selectedTask] ?? null;
+}
 function initialState(overrides = {}) {
   return {
     editor: emptyEditor(),
@@ -3257,7 +3241,7 @@ function initialState(overrides = {}) {
 }
 
 // src/tui/layout.ts
-var import_core10 = require("@ordewell/core");
+var import_core14 = require("@ordewell/core");
 var CHROME_ROWS = 4;
 function chatInputWrap(state) {
   const active = state.focus === "chat" && !state.overlay;
@@ -3265,7 +3249,7 @@ function chatInputWrap(state) {
   return wrapLines(state.editor.text, chatEditorRoom(state.cols, true));
 }
 function footerHints(state) {
-  const markHint = state.tasks[state.selectedTask]?.status === "completed" ? "m undone" : "m done";
+  const markHint = selectedPlanRow(state)?.task.status === "completed" ? "m undone" : "m done";
   const planning = state.status === "planning" || state.status === "researching";
   const escHint = planning ? "esc stop planning" : null;
   if (state.focus === "plan") {
@@ -3393,9 +3377,9 @@ function chatScrollMax(state) {
 }
 function plannerSetup(state) {
   const provider = state.plannerProvider;
-  const registration = import_core10.ALL_PROVIDERS[provider];
+  const registration = import_core14.ALL_PROVIDERS[provider];
   if (!registration) return { label: "not set", ready: false };
-  const runner = (0, import_core10.runnerForProvider)(provider);
+  const runner = (0, import_core14.runnerForProvider)(provider);
   const ready = runner ? state.runners.some((r) => r.id === runner) : state.configuredProviders.includes(provider);
   return { label: registration.label, ready };
 }
@@ -3502,16 +3486,17 @@ var STATUS_ICON = {
   approved: "\xB7",
   pending: "\xB7"
 };
+var IDLE_ICON = "~";
 function planLayout(state, rows, cols) {
   const done = state.tasks.filter((t) => t.status === "completed").length;
   const lines = [style.bold(`Plan ${done}/${state.tasks.length}`), ""];
   let selectedLine = 2;
   let editorLine;
-  state.tasks.forEach((task, i) => {
+  planRows(state).forEach((row, i) => {
     const taskStart = lines.length;
     if (i === state.selectedTask) selectedLine = taskStart;
-    const renderedTask = taskLines(state, task, i, cols);
-    if (task.id === state.expandedTaskId && renderedTask.editorLine !== void 0) {
+    const renderedTask = taskLines(state, row, i, cols);
+    if (row.task.id === state.expandedTaskId && renderedTask.editorLine !== void 0) {
       editorLine = taskStart + renderedTask.editorLine;
     }
     lines.push(...renderedTask.lines);
@@ -3530,16 +3515,20 @@ function planScrollExtent(state) {
   const { followOffset, maxScroll } = planLayout(state, bodyRows(state), cols);
   return { followOffset, maxScroll };
 }
-function taskLines(state, task, index, cols) {
+function taskLines(state, row, index, cols) {
+  const { task, parent } = row;
   const selected = state.focus === "plan" && index === state.selectedTask;
   const expanded = state.expandedTaskId === task.id;
   const running = isTaskRunning(task);
-  const paint = STATUS_MARK[task.status] ?? ((t) => t);
-  const rawIcon = running ? SPINNER[state.spinnerFrame % SPINNER.length] : STATUS_ICON[task.status] ?? "\xB7";
+  const idle = running && task.status === "in_progress" && task.idleSince != null;
+  const paint = idle ? style.cyan : STATUS_MARK[task.status] ?? ((t) => t);
+  const rawIcon = idle ? IDLE_ICON : running ? SPINNER[state.spinnerFrame % SPINNER.length] : STATUS_ICON[task.status] ?? "\xB7";
   const icon = paint(rawIcon);
   const kind = running ? style.yellow("RUN") : task.type === "user" ? style.yellow("MAN") : style.grey(" AI");
   const caret = selected ? style.cyan("\u276F") : " ";
-  const head = `${caret} ${icon} ${String(task.order).padStart(2)} ${kind} `;
+  const orderLabel = parent ? (0, import_core14.taskOrderLabel)(task, parent) : String(task.order).padStart(2);
+  const indent = parent ? "  " : "";
+  const head = `${indent}${caret} ${icon} ${orderLabel} ${kind} `;
   const titleRoom = Math.max(1, cols - width(head));
   const wrappedTitle = wrap(task.title, titleRoom);
   const shownTitle = expanded ? wrappedTitle : wrappedTitle.slice(0, 2);
@@ -3557,50 +3546,51 @@ function taskLines(state, task, index, cols) {
   const modeInfo = task.type === "ai" ? modesForTask(state.modesByRunner, task).find((m) => m.id === task.taskMode) : void 0;
   const mode = task.type === "ai" ? `mode: ${task.taskMode ?? "default"}${modeInfo?.autonomous ? style.yellow(" \u26A1") : ""}` : "";
   const runner = task.assignedRunner ?? "";
+  const bodyPad = parent ? "      " : "    ";
   const meta = [running ? "working" : "", runner, model].filter(Boolean).join(" \xB7 ");
-  if (meta) lines.push(style.grey(truncate(`    ${meta}`, cols)));
-  if (effort || mode) lines.push(style.grey(truncate(`    ${[effort, mode].filter(Boolean).join(" \xB7 ")}`, cols)));
+  if (meta) lines.push(style.grey(truncate(`${bodyPad}${meta}`, cols)));
+  if (effort || mode) lines.push(style.grey(truncate(`${bodyPad}${[effort, mode].filter(Boolean).join(" \xB7 ")}`, cols)));
   let editorLine;
   if (expanded) {
-    lines.push(style.grey(`    ${task.status.replace(/_/g, " ")}`));
+    lines.push(style.grey(`${bodyPad}${task.status.replace(/_/g, " ")}`));
     if (modeInfo?.autonomous) {
-      lines.push(...taskText("Autonomy", "Runs without permission prompts. Toggle with /auto.", cols));
+      lines.push(...taskText("Autonomy", "Runs without permission prompts. Toggle with /auto.", cols, bodyPad));
     }
     const editableSeed = task.prompt ?? task.description ?? task.title;
     if (task.description && task.description !== task.title && task.description !== editableSeed) {
-      lines.push(...taskText("Description", task.description, cols));
+      lines.push(...taskText("Description", task.description, cols, bodyPad));
     }
     if (state.taskEditor) {
-      const room = paneTextRoom(cols);
+      const room = Math.max(1, cols - width(bodyPad));
       const wrapped = wrapLines(state.taskEditor.text, room);
       const cp = cursorInLines(wrapped, state.taskEditor.cursor, state.taskEditor.text.length);
       editorLine = lines.length + 1 + cp.line;
-      lines.push(...taskPromptLines(wrapped, cp));
+      lines.push(...taskPromptLines(wrapped, cp, bodyPad));
     }
     if (task.dependencies.length > 0) {
       const orderById = new Map(state.tasks.map((candidate) => [candidate.id, candidate.order]));
       const dependencies = task.dependencies.map((id) => orderById.has(id) ? `#${orderById.get(id)}` : id).join(", ");
-      lines.push(...taskText("Depends on", dependencies, cols));
+      lines.push(...taskText("Depends on", dependencies, cols, bodyPad));
     }
-    lines.push(style.grey("    enter save \xB7 esc cancel"));
-    lines.push(style.grey(truncate("    then R runner \xB7 o model \xB7 e effort \xB7 M mode \xB7 D deps", cols)));
+    lines.push(style.grey(`${bodyPad}enter save \xB7 esc cancel`));
+    lines.push(style.grey(truncate(`${bodyPad}then R runner \xB7 o model \xB7 e effort \xB7 M mode \xB7 D deps`, cols)));
   }
   return { lines, editorLine };
 }
-function taskText(label, text, cols) {
-  const room = paneTextRoom(cols);
+function taskText(label, text, cols, pad2 = "    ") {
+  const room = Math.max(1, cols - width(pad2));
   return [
-    style.grey(`    ${label}`),
-    ...wrap(text, room).map((line) => `    ${line}`)
+    style.grey(`${pad2}${label}`),
+    ...wrap(text, room).map((line) => `${pad2}${line}`)
   ];
 }
-function taskPromptLines(wrapped, cursor) {
+function taskPromptLines(wrapped, cursor, pad2 = "    ") {
   return [
-    style.grey("    Prompt"),
+    style.grey(`${pad2}Prompt`),
     ...wrapped.map(({ line }, i) => {
-      if (i !== cursor.line) return `    ${line}`;
+      if (i !== cursor.line) return `${pad2}${line}`;
       const col = cursor.col;
-      return `    ${line.slice(0, col)}${style.inverse(line.slice(col, col + 1) || " ")}${line.slice(col + 1)}`;
+      return `${pad2}${line.slice(0, col)}${style.inverse(line.slice(col, col + 1) || " ")}${line.slice(col + 1)}`;
     })
   ];
 }
@@ -3676,13 +3666,16 @@ function cells(line) {
 }
 var INVERSE_ON = "\x1B[7m";
 var INVERSE_OFF = "\x1B[27m";
-var SGR_SPLIT = /(\x1b\[[0-9;]*m)/;
+var ESCAPE_SPLIT2 = /(\x1b\[[0-9;]*[A-Za-z])/;
+var CURSOR_COLUMN = /^\x1b\[([0-9]*)G$/;
 function invertCells(line, from, to) {
   let out = "";
   let col = 1;
   let inside = false;
-  for (const piece of line.split(SGR_SPLIT)) {
-    if (SGR_SPLIT.test(piece)) {
+  for (const piece of line.split(ESCAPE_SPLIT2)) {
+    if (ESCAPE_SPLIT2.test(piece)) {
+      const jump = CURSOR_COLUMN.exec(piece);
+      if (jump) col = Number(jump[1] || "1");
       out += piece + (inside ? INVERSE_ON : "");
       continue;
     }
@@ -3750,15 +3743,29 @@ function renderStatus(state, cols) {
   const tail = thinking.length > room ? `\u2026${thinking.slice(-(room - 1)).trimStart()}` : thinking;
   return truncate(`${head}${style.grey(` \xB7 ${tail}`)}`, cols);
 }
+var LEADING_TOKEN = /^\/\S*/;
+function skillTokenLength(text) {
+  const match = LEADING_TOKEN.exec(text);
+  if (!match) return 0;
+  return findCommand(match[0])?.source === "skill" ? match[0].length : 0;
+}
+function paintRange(text, base, tokenEnd) {
+  const localEnd = Math.max(0, Math.min(text.length, tokenEnd - base));
+  if (localEnd <= 0) return text;
+  if (localEnd >= text.length) return style.cyan(text);
+  return style.cyan(text.slice(0, localEnd)) + text.slice(localEnd);
+}
 function renderInput(state, cols) {
   const prompt = state.focus === "plan" ? style.grey("\u276F ") : style.cyan("\u276F ");
   const lines = chatInputWrap(state);
   const room = chatEditorRoom(cols, lines !== null);
   const { text, cursor } = state.editor;
   const continuation = " ".repeat(width(prompt));
+  const tokenEnd = skillTokenLength(text);
   if (!lines) {
     const visible = text.replace(/\n/g, "\xB6").replace(/\t/g, " ");
-    return [prompt + visible + suggest(state, room - width(visible))];
+    const painted = tokenEnd > 0 ? paintRange(visible, 0, tokenEnd) : visible;
+    return [prompt + painted + suggest(state, room - width(visible))];
   }
   const { line: lineIndex, col } = cursorInLines(lines, cursor, text.length);
   const rawLines = lines.map((l) => l.line);
@@ -3766,7 +3773,8 @@ function renderInput(state, cols) {
     const prefix = i === 0 ? prompt : continuation;
     const line = raw.replace(/\t/g, " ");
     const isCursorLine = i === lineIndex;
-    const rendered = isCursorLine ? line.slice(0, col) + style.inverse(line.slice(col, col + 1) || " ") + line.slice(col + 1) : line;
+    const lineTokenEnd = i === 0 ? tokenEnd : 0;
+    const rendered = isCursorLine ? paintRange(line.slice(0, col), 0, lineTokenEnd) + style.inverse(line.slice(col, col + 1) || " ") + paintRange(line.slice(col + 1), col + 1, lineTokenEnd) : paintRange(line, 0, lineTokenEnd);
     const used = width(line) + (isCursorLine && col >= line.length ? 1 : 0);
     const hint = i === rawLines.length - 1 ? suggest(state, room - used) : "";
     return prefix + rendered + hint;
@@ -3782,15 +3790,18 @@ function suggest(state, room) {
 function renderFooter(state, cols) {
   return packHints(footerHints(state), cols).map((line) => truncate(style.grey(line), cols));
 }
+var ERASE_TO_END = "\x1B[K";
+var atColumn = (col) => `\x1B[${col}G`;
 function renderBody(state, rows, cols) {
   const planCols = planPaneWidth(state);
   if (planCols === 0) return renderChat(state, rows, cols);
   const chatCols = chatPaneWidth(state);
   const chat = renderChat(state, rows, chatCols);
   const plan = renderPlan(state, rows, planCols);
+  const divider = `${ERASE_TO_END}${atColumn(chatCols + 1)}${style.grey("\u2502")}`;
   return Array.from(
     { length: rows },
-    (_, i) => `${pad(chat[i] ?? "", chatCols)}${style.grey("\u2502")}${pad(plan[i] ?? "", planCols)}`
+    (_, i) => `${pad(chat[i] ?? "", chatCols)}${divider}${pad(plan[i] ?? "", planCols)}`
   );
 }
 function renderChat(state, rows, cols) {
@@ -3893,21 +3904,27 @@ function frame(title, body, rows, cols) {
 }
 
 // src/tui/reducer.ts
-var import_core11 = require("@ordewell/core");
+var import_core15 = require("@ordewell/core");
 var import_plan_utils3 = require("@ordewell/core/plan-utils");
-var KNOWN_PROVIDERS2 = Object.keys(import_core11.ALL_PROVIDERS);
+var KNOWN_PROVIDERS2 = Object.keys(import_core15.ALL_PROVIDERS);
 var DEFAULT_EFFORT = "__runner_default__";
 function step(state, effects = []) {
   return { state, effects };
 }
-function say(state, role, content, research) {
-  const message = { role, content: stripTabs(content), timestamp: (/* @__PURE__ */ new Date()).toISOString(), ...research ? { research } : {} };
+function say(state, role, content, research, extra) {
+  const message = {
+    role,
+    content: sanitize(content),
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    ...research ? { research } : {},
+    ...extra
+  };
   return { ...state, messages: [...state.messages, message], scroll: 0 };
 }
 function restoredMessages(history) {
   return history.map((entry) => ({
     role: entry.kind === "plan_generated" ? "system" : entry.kind === "system" ? "system" : entry.role,
-    content: stripTabs(entry.kind === "plan_generated" ? "Plan generated." : entry.content),
+    content: sanitize(entry.kind === "plan_generated" ? "Plan generated." : entry.content),
     timestamp: entry.timestamp
   }));
 }
@@ -3921,13 +3938,13 @@ function researchLabel(messages, summary) {
   return others > 0 ? `${summary} (+${others} more)` : summary;
 }
 function settleResearchStep(messages, action) {
-  const summary = stripTabs(action.summary);
+  const summary = sanitize(action.summary);
   const index = findLastIndex(messages, (m) => isPendingResearch(m) && (action.toolCallId ? m.research?.toolCallId === action.toolCallId : m.content === summary));
   if (index < 0) return messages;
   const next = [...messages];
   next[index] = {
     ...next[index],
-    research: { ...next[index].research, outcome: action.outcome, result: stripTabs(action.result) }
+    research: { ...next[index].research, outcome: action.outcome, result: sanitize(action.result) }
   };
   return next;
 }
@@ -3971,27 +3988,45 @@ function reduce(state, action) {
     case "planUpdated": {
       if (stale(state, action.sessionId)) return step(state);
       const tasks = normalizeTasks(action.plan);
-      return step({
+      const expandedTaskId = tasks.some((task) => task.id === state.expandedTaskId) ? state.expandedTaskId : null;
+      const next = {
         ...state,
         tasks,
         status: state.status === "planning" || state.status === "researching" ? "idle" : state.status,
         busyLabel: "",
         thinkingLine: "",
-        selectedTask: Math.min(state.selectedTask, Math.max(0, tasks.length - 1)),
-        expandedTaskId: tasks.some((task) => task.id === state.expandedTaskId) ? state.expandedTaskId : null,
-        taskEditor: tasks.some((task) => task.id === state.expandedTaskId) ? state.taskEditor : null
-      });
+        expandedTaskId,
+        taskEditor: expandedTaskId !== null ? state.taskEditor : null
+      };
+      return step({ ...next, selectedTask: Math.min(state.selectedTask, Math.max(0, planRows(next).length - 1)) });
     }
     case "plannerMessage": {
       if (stale(state, action.sessionId)) return step(state);
       const settled = { ...state, status: "idle", busyLabel: "", thinkingLine: "" };
-      const content = stripTabs(action.content);
+      const content = sanitize(action.content);
+      const last = state.messages.at(-1);
+      if (last?.role === "assistant" && last.streaming) {
+        const messages = [...state.messages];
+        messages[messages.length - 1] = { ...last, content, streaming: void 0 };
+        return step({ ...settled, messages });
+      }
       if (alreadySpoken(state.messages, content)) return step(settled);
       return step(say(settled, "assistant", content));
     }
+    case "plannerToken": {
+      if (stale(state, action.sessionId)) return step(state);
+      const text = sanitize(action.text);
+      const last = state.messages.at(-1);
+      if (last?.role === "assistant" && last.streaming) {
+        const messages = [...state.messages];
+        messages[messages.length - 1] = { ...last, content: last.content + text };
+        return step({ ...state, messages });
+      }
+      return step(say(state, "assistant", text, void 0, { streaming: true }));
+    }
     case "researchStep": {
       if (stale(state, action.sessionId)) return step(state);
-      const summary = stripTabs(action.summary);
+      const summary = sanitize(action.summary);
       const spoken = say(state, "research", summary, { toolCallId: action.toolCallId });
       const status = state.status === "planning" ? "researching" : state.status;
       return step({ ...spoken, status, busyLabel: researchLabel(spoken.messages, summary) });
@@ -4010,7 +4045,7 @@ function reduce(state, action) {
     }
     case "plannerThinking": {
       if (stale(state, action.sessionId)) return step(state);
-      return step({ ...state, thinkingLine: (state.thinkingLine + action.text).slice(-THINKING_TAIL) });
+      return step({ ...state, thinkingLine: (state.thinkingLine + sanitize(action.text)).slice(-THINKING_TAIL) });
     }
     case "taskStatus": {
       if (stale(state, action.sessionId) || !state.tasks.some((t) => t.id === action.taskId)) return step(state);
@@ -4025,10 +4060,12 @@ function reduce(state, action) {
       const updates = action.updates;
       let changed = false;
       const tasks = state.tasks.map((t) => {
-        const status = updates[t.id];
-        if (status !== void 0 && status !== t.status) {
+        const update = updates[t.id];
+        if (update === void 0) return t;
+        const idleSince = update.idleSince ?? null;
+        if (update.status !== t.status || idleSince !== (t.idleSince ?? null)) {
           changed = true;
-          return { ...t, status };
+          return { ...t, status: update.status, idleSince };
         }
         return t;
       });
@@ -4099,6 +4136,8 @@ function reduce(state, action) {
       return step({ ...state, spinnerFrame: (state.spinnerFrame + 1) % 10 });
   }
 }
+var planText = (value, fallback = "") => sanitize(String(value ?? fallback));
+var planLabel = (value, fallback = "") => planText(value, fallback).replace(/\n+/g, " ");
 function normalizeTasks(plan) {
   const source = plan;
   const byId = /* @__PURE__ */ new Map();
@@ -4108,34 +4147,34 @@ function normalizeTasks(plan) {
     }
   }
   const raw = byId.size > 0 ? [...byId.values()].sort((a, b) => (a.order ?? 0) - (b.order ?? 0)) : source?.tasks ?? [];
-  return raw.map((t, i) => ({
-    id: String(t.id ?? `task-${i + 1}`),
-    order: typeof t.order === "number" ? t.order : i + 1,
-    title: String(t.title ?? "Untitled task"),
-    description: String(t.description ?? t.title ?? ""),
-    prompt: typeof t.prompt === "string" ? t.prompt : void 0,
+  return raw.map((t, i) => toTaskView2(t, i));
+}
+function toTaskView2(t, index) {
+  return {
+    id: String(t.id ?? `task-${index + 1}`),
+    order: typeof t.order === "number" ? t.order : index + 1,
+    title: planLabel(t.title, "Untitled task"),
+    description: planText(t.description ?? t.title),
+    prompt: typeof t.prompt === "string" ? sanitize(t.prompt) : void 0,
     type: t.type === "user" ? "user" : "ai",
-    status: String(t.status ?? "pending"),
-    dependencies: Array.isArray(t.dependencies) ? t.dependencies.map(String) : [],
-    assignedRunner: typeof t.assignedRunner === "string" ? t.assignedRunner : void 0,
-    taskMode: typeof t.taskMode === "string" ? t.taskMode : void 0,
+    status: planLabel(t.status, "pending"),
+    dependencies: Array.isArray(t.dependencies) ? t.dependencies.map((id) => planLabel(id)) : [],
+    assignedRunner: typeof t.assignedRunner === "string" ? planLabel(t.assignedRunner) : void 0,
+    taskMode: typeof t.taskMode === "string" ? planLabel(t.taskMode) : void 0,
     assignedModel: t.assignedModel && typeof t.assignedModel === "object" ? {
-      modelId: String(t.assignedModel.modelId ?? ""),
-      modelLabel: String(t.assignedModel.modelLabel ?? t.assignedModel.modelId ?? ""),
-      thinkingEffort: typeof t.assignedModel.thinkingEffort === "string" ? t.assignedModel.thinkingEffort : typeof t.thinkingEffort === "string" ? t.thinkingEffort : void 0,
-      availableVariants: Array.isArray(t.assignedModel.availableVariants) ? t.assignedModel.availableVariants.map(String) : void 0
-    } : void 0
-  }));
+      modelId: planLabel(t.assignedModel.modelId),
+      modelLabel: planLabel(t.assignedModel.modelLabel ?? t.assignedModel.modelId),
+      thinkingEffort: typeof t.assignedModel.thinkingEffort === "string" ? planLabel(t.assignedModel.thinkingEffort) : typeof t.thinkingEffort === "string" ? planLabel(t.thinkingEffort) : void 0,
+      availableVariants: Array.isArray(t.assignedModel.availableVariants) ? t.assignedModel.availableVariants.map((variant) => planLabel(variant)) : void 0
+    } : void 0,
+    subtasks: Array.isArray(t.subtasks) ? [...t.subtasks].sort((a, b) => (a.order ?? 0) - (b.order ?? 0)).map((s, i) => toTaskView2(s, i)) : void 0
+  };
 }
 var enabledFlag = (value) => typeof value?.enabled === "boolean" ? value.enabled : void 0;
 function applySettings(state, settings) {
   const sources = {
-    "grill-me": settings.grillMe,
     tdd: settings.tdd,
-    prd: settings.prd,
-    review: settings.review,
-    verify: settings.verification,
-    "research-subagents": settings.researchSubagents
+    verify: settings.verification
   };
   const skills = { ...state.skills };
   for (const id of SKILL_IDS) {
@@ -4164,11 +4203,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_core11.ALL_PROVIDERS[p]?.label ?? p);
+  const names = failed.map((p) => import_core15.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_core11.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core15.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,
@@ -4179,7 +4218,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_core11.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core15.runnerForProvider)(state.plannerProvider);
   if (!runner) {
     return [{ id: "", label: "Thinking effort applies to a coding-agent planner", detail: "switch with /planner", disabled: true }];
   }
@@ -4392,20 +4431,20 @@ function handlePlanKey(state, key) {
   if (editingTask && state.taskEditor) return handleTaskEditKey(state, editingTask, state.taskEditor, key);
   if (key.name === "escape") return step({ ...state, focus: "chat" });
   if (key.name === "up") {
-    return step({ ...state, selectedTask: Math.max(0, state.selectedTask - 1), expandedTaskId: null, planScroll: null });
+    return step({ ...state, selectedTask: Math.max(0, state.selectedTask - 1), planScroll: null });
   }
   if (key.name === "down") {
     return step({
       ...state,
-      selectedTask: Math.min(state.tasks.length - 1, state.selectedTask + 1),
-      expandedTaskId: null,
+      selectedTask: Math.min(planRows(state).length - 1, state.selectedTask + 1),
       planScroll: null
     });
   }
   const scroll = scrollDelta(key, state);
   if (scroll !== null) return scrollPlan(state, scroll);
-  const task = state.tasks[state.selectedTask];
-  if (!task) return step(state);
+  const row = selectedPlanRow(state);
+  if (!row) return step(state);
+  const task = row.task;
   if (key.name === "enter" || key.name === "right") {
     const text = task.prompt ?? task.description ?? task.title;
     return step({
@@ -4655,7 +4694,7 @@ function submit(state) {
   if (!text) return step(state);
   const cleared = { ...state, editor: commit(state.editor) };
   const command = parseSlash(text);
-  if (command) return runCommand(cleared, command);
+  if (command && findCommand(command.name)?.source !== "skill") return runCommand(cleared, command);
   const spoken = say(cleared, "user", text);
   const effect = state.sessionId ? { type: "sendMessage", sessionId: state.sessionId, message: text } : { type: "startConversation", goal: text };
   return step({ ...spoken, status: "planning" }, [effect]);
@@ -4817,7 +4856,7 @@ function newSession(state) {
 }
 function setModel(state, args) {
   if (args[0] === "set" && args[1]) {
-    const runner = (0, import_core11.runnerForProvider)(state.plannerProvider);
+    const runner = (0, import_core15.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}.`);
@@ -4839,21 +4878,21 @@ function setModel(state, args) {
 }
 function plannerItems(state) {
   const installed = new Set(state.runners.map((r) => r.id));
-  const agents = import_core11.CLI_PROVIDERS.map((id) => {
-    const runner = (0, import_core11.runnerForProvider)(id);
+  const agents = import_core15.CLI_PROVIDERS.map((id) => {
+    const runner = (0, import_core15.runnerForProvider)(id);
     const ready = installed.has(runner);
     return {
       id,
-      label: import_core11.ALL_PROVIDERS[id].label,
+      label: import_core15.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_core11.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
+  const vendors = import_core15.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
     id,
-    label: import_core11.ALL_PROVIDERS[id].label,
-    detail: import_core11.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core15.ALL_PROVIDERS[id].label,
+    detail: import_core15.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 }];
@@ -4911,16 +4950,16 @@ function setKey(state, args) {
     }
     return step(state, [{ type: "setApiKey", provider, key: args.slice(2).join(" ") }]);
   }
-  const items = import_core11.PROVIDER_PRIORITY.map((id) => ({
+  const items = import_core15.PROVIDER_PRIORITY.map((id) => ({
     id,
-    label: import_core11.ALL_PROVIDERS[id].label,
-    detail: import_core11.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core15.ALL_PROVIDERS[id].label,
+    detail: import_core15.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_core11.ALL_PROVIDERS[provider];
+  const meta = import_core15.ALL_PROVIDERS[provider];
   return {
     kind: "prompt",
     title: `${meta.label} API key`,
@@ -5278,7 +5317,7 @@ function createApp(deps) {
 
 // src/tui/effects.ts
 var import_child_process4 = require("child_process");
-var import_core12 = require("@ordewell/core");
+var import_core16 = require("@ordewell/core");
 var import_plan_utils4 = require("@ordewell/core/plan-utils");
 var ConversationQueue = class {
   tail = Promise.resolve();
@@ -5445,7 +5484,7 @@ async function perform(effect, deps) {
       dispatch({ type: "notice", message: `Orchestrator model set to ${effect.modelId}.` });
       return;
     case "setPlanner": {
-      const meta = import_core12.ALL_PROVIDERS[effect.provider];
+      const meta = import_core16.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 });
@@ -5457,7 +5496,7 @@ async function perform(effect, deps) {
       });
       dispatch({
         type: "notice",
-        message: `${(0, import_core12.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
+        message: `${(0, import_core16.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
       });
       await loadModels(deps);
       return;
@@ -5469,7 +5508,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_core12.ALL_PROVIDERS[effect.provider];
+      const meta = import_core16.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);
@@ -5557,7 +5596,7 @@ function osc52(text) {
 function copySelection(deps, text) {
   if (!text) return;
   const lines = text.split("\n").length;
-  const command = (0, import_core12.clipboardCopyCommand)(deps.hasBin);
+  const command = (0, import_core16.clipboardCopyCommand)(deps.hasBin);
   if (command) {
     try {
       (deps.pipeToClipboard ?? pipeToClipboardDefault)(command, text);
@@ -5590,7 +5629,28 @@ async function withExecutionStream(deps, sessionId, request) {
 }
 async function converse(deps, sessionId, call) {
   let streamed = null;
+  const TOKEN_DEBOUNCE_MS = 75;
+  let tokenBuffer = "";
+  let tokenTimer = null;
+  const flushTokens = () => {
+    if (tokenTimer !== null) {
+      clearTimeout(tokenTimer);
+      tokenTimer = null;
+    }
+    if (!tokenBuffer) return;
+    const text = tokenBuffer;
+    tokenBuffer = "";
+    deps.dispatch({ type: "plannerToken", text, sessionId });
+  };
   const stream = deps.api.streamPlanning(sessionId, (event) => {
+    if (event?.type === "plan_token" && event.token) {
+      tokenBuffer += event.token;
+      if (tokenTimer === null) {
+        tokenTimer = setTimeout(flushTokens, TOKEN_DEBOUNCE_MS);
+      }
+      return;
+    }
+    flushTokens();
     if (event?.type === "approval_request") {
       deps.dispatch({
         type: "approvalRequested",
@@ -5647,6 +5707,7 @@ async function converse(deps, sessionId, call) {
       deps.dispatch({ type: "plannerMessage", content: question, sessionId });
     }
   } finally {
+    if (tokenTimer !== null) clearTimeout(tokenTimer);
     stream.close();
   }
 }
@@ -5666,7 +5727,7 @@ function onExecutionEvent(dispatch, event, sessionId) {
     case "status_update": {
       const updates = {};
       for (const task of event.tasks ?? []) {
-        updates[String(task.id)] = String(task.status);
+        updates[String(task.id)] = { status: String(task.status), idleSince: task.idleSince ?? null };
       }
       dispatch({ type: "tasksStatus", updates, sessionId });
       return;
@@ -5745,7 +5806,7 @@ async function loadSettings(deps) {
 }
 
 // src/tui/keys.ts
-var CONTROL = {
+var CONTROL2 = {
   "\r": "enter",
   "\n": "enter",
   "	": "tab",
@@ -5850,7 +5911,7 @@ function decodeMouse(seq) {
 function decodeKey(seq) {
   const escaped = ESCAPES[seq];
   if (escaped) return { name: escaped };
-  const control = CONTROL[seq];
+  const control = CONTROL2[seq];
   if (control) return { name: control };
   if (seq.startsWith("\x1B[")) {
     const mouse = decodeMouse(seq);
@@ -5862,8 +5923,7 @@ function decodeKey(seq) {
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
 function pasteKey(raw) {
-  const text = stripTabs(raw.replace(/\r\n?/g, "\n").replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, ""));
-  return { name: "paste", text };
+  return { name: "paste", text: sanitize(raw) };
 }
 function createKeyDecoder() {
   let paste = null;
@@ -5997,7 +6057,7 @@ function openTerminal(options) {
     draw(frame2) {
       if (closed) return;
       const { cols } = size();
-      const rows = frame2.map((line, i) => `\x1B[${i + 1};1H${clampToCols(line, cols)}\x1B[K`).join("");
+      const rows = frame2.map((line, i) => `\x1B[${i + 1};1H${clampToCols(paintOnly(line), cols)}\x1B[K`).join("");
       output.write(AUTOWRAP_OFF + rows + AUTOWRAP_ON);
     },
     setMouse(enabled) {
@@ -6031,7 +6091,7 @@ async function handleTui(subArgs) {
   }
   const workspace = flag(subArgs, "--workspace") || process.cwd();
   try {
-    (0, import_core13.assertWorkspaceExists)(workspace);
+    (0, import_core17.assertWorkspaceExists)(workspace);
   } catch {
     console.error(
       `Workspace "${workspace}" does not exist.
@@ -6040,7 +6100,10 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
     );
     process.exit(1);
   }
-  const { port, owned: ownedAtLaunch } = await ensureDaemonOwned(resolvePort(subArgs), { detached: false });
+  registerSkillCommands((0, import_core17.createSkillsService)(workspace).listSkills());
+  const explicitPort = flag(subArgs, "--port") || process.env.ORDEWELL_PORT;
+  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 conversationQueue = new ConversationQueue();
@@ -6056,7 +6119,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
       conversationQueue,
       port,
       dispatch: (action) => app.dispatch(action),
-      newSessionId: () => (0, import_core13.mintSessionId)(),
+      newSessionId: () => (0, import_core17.mintSessionId)(),
       setEnvVar: (key, value) => {
         writeEnvVar(findEnvFile(), key, value);
         process.env[key] = value;
@@ -6125,14 +6188,8 @@ var COMMANDS = {
   refresh: handleRefresh,
   setup: handleSetup,
   plugins: handlePlugins,
-  "grill-me": handleGrillMe,
   "tdd": handleTdd,
-  "prd": handlePrd,
-  "review": handleReview,
-  // 'verify' was once a legacy alias for review; it now toggles the
-  // evidence-based verification mode.
   "verify": handleVerify,
-  "research-subagents": handleResearchSubagents,
   "mark-complete": handleMarkComplete,
   complete: handleMarkComplete,
   uncomplete: handleUncomplete,
@@ -6168,6 +6225,7 @@ function cliVersion() {
 
 // src/main.ts
 async function main() {
+  (0, import_core18.migrateOldConfigDir)();
   loadEnvFile();
   const argv = process.argv.slice(2);
   const command = argv[0] ?? (process.stdin.isTTY ? "tui" : "--help");