@entelligentsia/forgecli 0.10.1 → 0.11.2

package/dist/extensions/forgecli/store-query.js

@@ -0,0 +1,107 @@
+// store-query.ts — native atomic handler for /forge:store-query (FORGE-S23-T10)
+//
+// Dispatches to store-cli query (flags path) or store-cli nlp (intent path)
+// and emits raw stdout via ctx.ui.notify.
+//
+// Archetype: Atomic (no LLM in loop — pack-04 §Atomic).
+// Iron Laws:
+//   IL1 — new code lives in forge-cli/ only
+//   IL6 — no shell-string interpolation (argv-array throughout)
+//   IL7 — silent continuation past failures is never acceptable
+import { execFile } from "node:child_process";
+import * as path from "node:path";
+import { promisify } from "node:util";
+import { resolveToolDir } from "./store-resolver.js";
+const execFileAsync = promisify(execFile);
+// ── Usage message ─────────────────────────────────────────────────────────────
+const USAGE = `Usage: /forge:store-query <intent or flags>
+
+Examples:
+  /forge:store-query open bugs in S12
+  /forge:store-query FORGE-BUG-047
+  /forge:store-query --sprint FORGE-S12 --status in-progress
+  /forge:store-query --keyword auth
+  /forge:store-query schema`;
+/**
+ * Run store-cli in query or nlp mode.
+ * - Args starting with "--" → query branch: `store-cli query ...flags`
+ * - Otherwise → nlp branch: `store-cli nlp "<args>"`
+ *
+ * Returns raw stdout for display. Does NOT JSON-parse — caller renders as-is.
+ * Exported so orchestrators can call directly without going through sendUserMessage.
+ */
+export async function runStoreQuery(args, forgeRoot, cwd) {
+    const trimmed = args.trim();
+    const toolDir = resolveToolDir(forgeRoot);
+    const storeCliPath = path.join(toolDir, "store-cli.cjs");
+    let argv;
+    let timeoutMs;
+    if (trimmed.startsWith("--")) {
+        // Query branch: pass flags verbatim as argv tokens
+        const tokens = trimmed.split(/\s+/).filter(Boolean);
+        argv = ["query", ...tokens];
+        timeoutMs = 10_000;
+    }
+    else {
+        // NLP branch: pass entire trimmed arg string as single argument
+        argv = ["nlp", trimmed];
+        timeoutMs = 30_000;
+    }
+    try {
+        const result = await execFileAsync("node", [storeCliPath, ...argv], {
+            cwd,
+            encoding: "utf8",
+            timeout: timeoutMs,
+        });
+        return { stdout: result.stdout, ok: true };
+    }
+    catch (err) {
+        const e = err;
+        // execFile rejects on non-zero exit; stdout may still contain partial results
+        const stderr = e.stderr || e.message || String(err);
+        const stdout = e.stdout || "";
+        return {
+            stdout,
+            ok: false,
+            errorMessage: stderr.slice(0, 500),
+        };
+    }
+}
+// ── Register ─────────────────────────────────────────────────────────────────
+/**
+ * Register /forge:store-query.
+ * forgeRoot is nullable — null means we're outside a Forge project.
+ */
+export function registerStoreQuery(pi, opts) {
+    pi.registerCommand("forge:store-query", {
+        description: "Query the Forge store by natural language or exact flags. " +
+            "Use flags (--sprint, --task, --keyword) for exact queries; " +
+            "use plain text for NLP intent queries.",
+        async handler(args, ctx) {
+            const cwd = process.cwd();
+            // Outside-project guard
+            if (!opts.forgeRoot) {
+                ctx.ui.notify("× forge:store-query — not inside a Forge project. Run /forge:init first.", "error");
+                return;
+            }
+            const trimmed = args.trim();
+            if (!trimmed) {
+                ctx.ui.notify(USAGE, "info");
+                return;
+            }
+            ctx.ui.setStatus?.("forge:store-query", "Querying store…");
+            const result = await runStoreQuery(trimmed, opts.forgeRoot, cwd);
+            ctx.ui.setStatus?.("forge:store-query", undefined);
+            if (!result.ok && result.errorMessage) {
+                ctx.ui.notify(`× forge:store-query — ${result.errorMessage}`, "error");
+                // Still show partial stdout if available
+                if (result.stdout.trim()) {
+                    ctx.ui.notify(result.stdout.trim(), "info");
+                }
+                return;
+            }
+            ctx.ui.notify(result.stdout.trim() || "(no results)", "info");
+        },
+    });
+}
+//# sourceMappingURL=store-query.js.map

package/dist/extensions/forgecli/store-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"store-query.js","sourceRoot":"","sources":["../../../src/extensions/forgecli/store-query.ts"],"names":[],"mappings":"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"}

package/dist/extensions/forgecli/store-repair.d.ts

@@ -0,0 +1,17 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+export interface ParsedStoreRepairArgs {
+    dryRun: boolean;
+    seed: string;
+    sourceLabel: string;
+}
+export declare function parseStoreRepairArgs(rawArgs: string, cwd: string): ParsedStoreRepairArgs;
+export interface ComposeStoreRepairKickoffOpts {
+    commandMd: string;
+    parsed: ParsedStoreRepairArgs;
+}
+export declare function composeStoreRepairKickoff(opts: ComposeStoreRepairKickoffOpts): string;
+export interface RegisterStoreRepairOptions {
+    forgeRoot: string | null;
+    cwd?: string;
+}
+export declare function registerStoreRepair(pi: ExtensionAPI, options: RegisterStoreRepairOptions): void;

package/dist/extensions/forgecli/store-repair.js

@@ -0,0 +1,123 @@
+// forge:store-repair — native kickoff handler (FORGE-S23-T11).
+//
+// Replaces the auto-generated stub previously installed by
+// registerAllForgeCommands (forge-commands.ts). Kickoff Shim archetype
+// (Pack-04 + Pack-06): single LLM handoff in current context, no fork.
+//
+// --dry-run flag is forwarded in the kickoff body so the LLM calls
+// validate-store --dry-run and skips write phases accordingly.
+//
+// Workflow source: <forgeRoot>/commands/store-repair.md (command file).
+// File-existence check only — command files lack Pack-06 workflow markers.
+//
+// Iron Laws:
+//   IL1 — code only under forge-cli/src/extensions/forgecli/.
+//   IL4 — no JSON.stringify-into-subagent dispatch.
+//   IL6 — no shell-string interpolation; no spawn calls here.
+//   IL7 — every failure path emits ctx.ui.notify and returns; no silent
+//         continuation.
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { sendKickoff } from "./kickoff.js";
+export function parseStoreRepairArgs(rawArgs, cwd) {
+    const trimmed = (rawArgs ?? "").trim();
+    const result = {
+        dryRun: false,
+        seed: "",
+        sourceLabel: "",
+    };
+    if (!trimmed) {
+        result.sourceLabel = "(no args — full repair run)";
+        return result;
+    }
+    const tokens = trimmed.split(/\s+/);
+    const remaining = [];
+    for (const tok of tokens) {
+        if (tok === "--dry-run") {
+            result.dryRun = true;
+        }
+        else {
+            remaining.push(tok);
+        }
+    }
+    const tail = remaining.join(" ").trim();
+    if (tail.startsWith("@")) {
+        const ref = tail.slice(1).trim();
+        const filePath = path.isAbsolute(ref) ? ref : path.resolve(cwd, ref);
+        result.seed = fs.readFileSync(filePath, "utf8");
+        result.sourceLabel = `(seed from file: ${ref})`;
+    }
+    else if (tail) {
+        result.seed = tail;
+        result.sourceLabel = "(seed from inline text)";
+    }
+    else {
+        result.sourceLabel = result.dryRun ? "(--dry-run mode)" : "(no args — full repair run)";
+    }
+    return result;
+}
+export function composeStoreRepairKickoff(opts) {
+    const { commandMd, parsed } = opts;
+    const sections = ["# /forge:store-repair", ""];
+    sections.push("## Dispatch", "");
+    sections.push("Diagnose and repair the Forge JSON store. Run the repair workflow below. Specifically:");
+    sections.push("");
+    if (parsed.dryRun) {
+        sections.push("**`--dry-run` mode.** Preview all repairs without writing anything. " +
+            "In Phase 2 (LLM repair) and Phase 3 (final validation), show what would change but skip all writes. " +
+            "Skip Phase 4 verification (nothing changed).");
+    }
+    else {
+        sections.push("Full repair mode: diagnose, propose fixes, apply approved repairs, verify.");
+    }
+    sections.push("", "Use `forge_store` for all store reads and writes (never raw file writes to `.forge/store/`).");
+    sections.push("", "---", "", "## Command", "", commandMd.trim(), "", "---");
+    if (parsed.seed) {
+        sections.push("", `## Additional Context — ${parsed.sourceLabel}`, "", parsed.seed.trim());
+    }
+    return sections.join("\n");
+}
+// ── Registration ──────────────────────────────────────────────────────────
+const COMMAND_NAME = "store-repair";
+export function registerStoreRepair(pi, options) {
+    pi.registerCommand("forge:store-repair", {
+        description: "Diagnose and repair corrupted Forge store records. " +
+            "Usage: /forge:store-repair [--dry-run]. " +
+            "--dry-run shows what would be repaired without making changes.",
+        async handler(args, ctx) {
+            const { forgeRoot } = options;
+            const cwd = options.cwd ?? process.cwd();
+            if (!forgeRoot) {
+                ctx.ui.notify("× forge:store-repair — no Forge project at cwd; run /forge:init to bootstrap", "warning");
+                return;
+            }
+            const commandPath = path.join(forgeRoot, "commands", `${COMMAND_NAME}.md`);
+            let commandMd;
+            try {
+                commandMd = fs.readFileSync(commandPath, "utf8");
+            }
+            catch (err) {
+                const e = err;
+                if (e.code === "ENOENT") {
+                    ctx.ui.notify(`× forge:store-repair — command file not found at commands/${COMMAND_NAME}.md; run /forge:init or /forge:regenerate first.`, "error");
+                }
+                else {
+                    ctx.ui.notify(`× forge:store-repair — failed to read command file: ${e.message ?? "unknown error"}`, "error");
+                }
+                return;
+            }
+            let parsed;
+            try {
+                parsed = parseStoreRepairArgs(args, cwd);
+            }
+            catch (err) {
+                const e = err;
+                ctx.ui.notify(`× forge:store-repair — failed to parse args: ${e.message ?? "unknown"}`, "error");
+                return;
+            }
+            const kickoff = composeStoreRepairKickoff({ commandMd, parsed });
+            sendKickoff(pi, kickoff);
+        },
+    });
+}
+//# sourceMappingURL=store-repair.js.map

package/dist/extensions/forgecli/store-repair.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"store-repair.js","sourceRoot":"","sources":["../../../src/extensions/forgecli/store-repair.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,EAAE;AACF,2DAA2D;AAC3D,uEAAuE;AACvE,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,+DAA+D;AAC/D,EAAE;AACF,wEAAwE;AACxE,2EAA2E;AAC3E,EAAE;AACF,aAAa;AACb,8DAA8D;AAC9D,oDAAoD;AACpD,8DAA8D;AAC9D,wEAAwE;AACxE,wBAAwB;AAExB,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAU3C,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,GAAW;IAChE,MAAM,OAAO,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,MAAM,GAA0B;QACrC,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,EAAE;KACf,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,MAAM,CAAC,WAAW,GAAG,6BAA6B,CAAC;QACnD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACzB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,CAAC;YACP,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrE,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,GAAG,oBAAoB,GAAG,GAAG,CAAC;IACjD,CAAC;SAAM,IAAI,IAAI,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,MAAM,CAAC,WAAW,GAAG,yBAAyB,CAAC;IAChD,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,6BAA6B,CAAC;IACzF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AASD,MAAM,UAAU,yBAAyB,CAAC,IAAmC;IAC5E,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEnC,MAAM,QAAQ,GAAa,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACzD,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACjC,QAAQ,CAAC,IAAI,CAAC,wFAAwF,CAAC,CAAC;IACxG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,QAAQ,CAAC,IAAI,CACZ,sEAAsE;YACrE,sGAAsG;YACtG,8CAA8C,CAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACP,QAAQ,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;IAC7F,CAAC;IACD,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,8FAA8F,CAAC,CAAC;IAElH,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IAE5E,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,2BAA2B,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAED,6EAA6E;AAE7E,MAAM,YAAY,GAAG,cAAc,CAAC;AAOpC,MAAM,UAAU,mBAAmB,CAAC,EAAgB,EAAE,OAAmC;IACxF,EAAE,CAAC,eAAe,CAAC,oBAAoB,EAAE;QACxC,WAAW,EACV,qDAAqD;YACrD,0CAA0C;YAC1C,gEAAgE;QACjE,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,GAA4B;YACvD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;YAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAEzC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,GAAG,CAAC,EAAE,CAAC,MAAM,CACZ,8EAA8E,EAC9E,SAAS,CACT,CAAC;gBACF,OAAO;YACR,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAiB,CAAC;YACtB,IAAI,CAAC;gBACJ,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAClD,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACvB,MAAM,CAAC,GAAG,GAA0C,CAAC;gBACrD,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACzB,GAAG,CAAC,EAAE,CAAC,MAAM,CACZ,6DAA6D,YAAY,kDAAkD,EAC3H,OAAO,CACP,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,EAAE,CAAC,MAAM,CACZ,uDAAuD,CAAC,CAAC,OAAO,IAAI,eAAe,EAAE,EACrF,OAAO,CACP,CAAC;gBACH,CAAC;gBACD,OAAO;YACR,CAAC;YAED,IAAI,MAA6B,CAAC;YAClC,IAAI,CAAC;gBACJ,MAAM,GAAG,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACvB,MAAM,CAAC,GAAG,GAA2B,CAAC;gBACtC,GAAG,CAAC,EAAE,CAAC,MAAM,CACZ,gDAAgD,CAAC,CAAC,OAAO,IAAI,SAAS,EAAE,EACxE,OAAO,CACP,CAAC;gBACF,OAAO;YACR,CAAC;YAED,MAAM,OAAO,GAAG,yBAAyB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;YACjE,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1B,CAAC;KACD,CAAC,CAAC;AACJ,CAAC"}

package/dist/extensions/forgecli/thread-switcher.js

@@ -130,11 +130,16 @@ class ViewportFooterComponent {
         };
     }
     render(width) {
+        // Only show the footer when an orchestrator session is active.
+        // When all sessions are terminal (completed/failed/cancelled) or
+        // when no session exists, hide the footer — main viewport has no
+        // subagent aggregate to display.
+        const sessions = this.registry.listSessions();
+        const hasActive = sessions.some((s) => s.status === "running" || s.status === "cancelling");
+        if (!hasActive)
+            return [];
         const tokens = fmtTokenFooter(this.registry.getAggregateUsage());
         const orchModel = fmtModelLabel(this.getOrchestratorModel?.());
-        // Cold-start: hide the row entirely (no model + no usage) so the
-        // editor area doesn't carry a permanent blank line. As soon as we
-        // know the orchestrator model OR have observed any usage, render.
         if (!tokens && !orchModel)
             return [];
         const left = orchModel ? `⌂ ${orchModel}` : "";
@@ -160,6 +165,9 @@ class ChipStripComponent {
     focusedChipId = "main";
     stripActive = false;
     invalidationCb;
+    /** When non-null, the strip shows a cancellation confirmation prompt
+     *  for this chip instead of the normal chip view. */
+    cancelTarget = null;
     constructor(registry, theme) {
         this.registry = registry;
         this.theme = theme;
@@ -230,11 +238,20 @@ class ChipStripComponent {
     chipGlyph(chip) {
         if (chip.id === "main")
             return this.focusedChipId === "main" ? "●" : "○";
+        const session = this.activeSession();
         const p = this.chipPhase(chip);
         if (!p)
             return "·";
         if (this.focusedChipId === chip.id)
             return "●";
+        // Cancelling/cancelled glyphs are session-level, not phase-level.
+        // Show ⏳ for any phase when the session is cancelling, ⊘ when cancelled.
+        if (session?.status === "cancelled" && p.status !== "completed" && p.status !== "failed")
+            return "⊘";
+        if (session?.status === "cancelling" && p.status === "running")
+            return "⏳";
+        if (p.status === "cancelled")
+            return "⊘";
         if (p.status === "completed")
             return "✓";
         if (p.status === "failed")
@@ -253,7 +270,7 @@ class ChipStripComponent {
         return session.phases[session.phases.length - 1]?.role;
     }
     spinnerFrame(session) {
-        if (session.status !== "running")
+        if (session.status !== "running" && session.status !== "cancelling")
             return "";
         const idx = Math.floor(Date.now() / SPINNER_INTERVAL_MS) % SPINNER_FRAMES.length;
         return SPINNER_FRAMES[idx];
@@ -262,6 +279,10 @@ class ChipStripComponent {
         const session = this.activeSession();
         if (!session)
             return []; // UX-B: hide entirely when no session.
+        // If user is confirming cancellation, show the confirmation prompt.
+        if (this.cancelTarget) {
+            return this.renderCancelPrompt(width, this.cancelTarget);
+        }
         const chips = this.chips();
         // Clamp cursor.
         if (this.cursorIdx >= chips.length)
@@ -273,29 +294,47 @@ class ChipStripComponent {
     renderInactive(width, session) {
         const dim = (s) => this.theme.fg("dim", s);
         const accent = (s) => this.theme.fg("accent", s);
-        const spin = this.spinnerFrame(session);
         const chips = this.chips();
-        // Orchestrator chip stays bracketed + accent-colored (anchor identity).
-        // Subagent chips render after it as `<glyph> <role>`, dimmed —
-        // completed phases show ✓, failed ✗, live ◇ (or ◆ with unread).
-        // This makes phase progression visible at a glance without expanding
-        // the strip.
+        const spin = this.spinnerFrame(session);
+        // Orchestrator chip: bracketed + accent-colored (anchor identity).
+        // Subagent chips: <glyph> <role>, dimmed.
         const orchChip = accent(`[${session.taskId}]`);
         const phaseChips = chips
             .filter((c) => c.id !== "main")
             .map((c) => dim(`${this.chipGlyph(c)} ${c.label}`));
         const chipsLine = [orchChip, ...phaseChips].join("  ");
-        const prefix = dim("threads ─ ");
-        const hint = dim("  ↓ to navigate");
+        // Right-side: status · spinner · command hints.
+        // Cancelled sessions show "r resume" affordance; all others show "↓ to navigate".
+        const statusLabel = session.status === "cancelled" ? "cancelled"
+            : session.status === "cancelling" ? "cancelling…"
+                : "";
+        const statusPart = statusLabel ? dim(`  ${statusLabel}`) : "";
         const spinPart = spin ? `  ${spin}` : "";
-        const previewText = session.currentTurnPreview ? `  "${session.currentTurnPreview}"` : "";
-        const fixedWidth = visibleWidth(prefix) +
-            visibleWidth(chipsLine) +
-            visibleWidth(spinPart) +
-            visibleWidth(hint);
-        const previewBudget = Math.max(0, width - fixedWidth);
-        const preview = previewText ? dim(truncateToWidth(previewText, previewBudget)) : "";
-        let line = `${prefix}${chipsLine}${spinPart}${preview}${hint}`;
+        const hint = session.status === "cancelled"
+            ? dim("  ↓ nav · r resume")
+            : dim("  ↓ to navigate");
+        // Truncate preview text from the MIDDLE of the line to keep chips and hints visible.
+        const previewText = session.currentTurnPreview ? `"${session.currentTurnPreview}"` : "";
+        // Priority: chips + status + spinner + hint are fixed.
+        // Truncate preview first, then truncate from the right as fallback.
+        const fixedRight = visibleWidth(statusPart) + visibleWidth(spinPart) + visibleWidth(hint);
+        const previewBudget = Math.max(0, width - fixedRight - 4); // 4 = safety margin
+        let preview = "";
+        if (previewText) {
+            // Truncate the preview text itself to fit the budget
+            const truncated = truncateToWidth(previewText, previewBudget);
+            if (visibleWidth(truncated) > 0)
+                preview = dim(`  ${truncated}`);
+        }
+        // Build line; truncate from the right (preview tail) if still over-width.
+        let line = `${chipsLine}${statusPart}${spinPart}${preview}${hint}`;
+        if (visibleWidth(line) > width) {
+            // Truncate preview tail first (not chips)
+            const budget = Math.max(0, width - visibleWidth(chipsLine) - fixedRight);
+            const previewOnly = truncateToWidth(previewText, budget);
+            preview = previewOnly ? dim(`  ${previewOnly}`) : "";
+            line = `${chipsLine}${statusPart}${spinPart}${preview}${hint}`;
+        }
         if (visibleWidth(line) > width)
             line = truncateToWidth(line, width);
         return [line];
@@ -315,8 +354,18 @@ class ChipStripComponent {
                 return bold(inner);
             return dim(inner);
         });
-        const prefix = accent("threads ─ ");
-        const hint = dim("  ←→ · enter · ↑ back · esc back+main");
+        const prefix = "";
+        // "r resume" shown only for cancelled sessions; "x cancel" for running ones.
+        const cancelWord = session.status === "cancelled" ? dim("r resume") : dim("x cancel");
+        const navHints = dim(" ←→ · enter · ↑ back · esc back+main");
+        // Show status-based text for non-running sessions
+        let statusPart = "";
+        if (session.status === "cancelling") {
+            statusPart = "  cancelling…";
+        }
+        else if (session.status === "cancelled") {
+            statusPart = "  cancelled";
+        }
         const spin = this.spinnerFrame(session);
         const spinPart = spin ? `  ${spin}` : "";
         const previewText = session.currentTurnPreview ? `  "${session.currentTurnPreview}"` : "";
@@ -325,15 +374,44 @@ class ChipStripComponent {
         const fixed = visibleWidth(prefix) +
             visibleWidth(chipsJoined) +
             visibleWidth(spinPart) +
-            visibleWidth(hint);
+            visibleWidth(statusPart) +
+            visibleWidth(cancelWord) +
+            visibleWidth(navHints);
         const previewBudget = Math.max(0, width - fixed);
         const preview = previewText ? dim(truncateToWidth(previewText, previewBudget)) : "";
-        let line = `${prefix}${chipsJoined}${spinPart}${preview}${hint}`;
+        let line = `${prefix}${chipsJoined}${spinPart}${statusPart}${preview}   ${cancelWord}  ${navHints}`;
         // Hard cap as last-resort defence (visibleWidth is best-effort).
         if (visibleWidth(line) > width)
             line = truncateToWidth(line, width);
         return [line];
     }
+    /**
+     * Render the cancellation confirmation prompt. Replaces the normal
+     * chip strip when cancelTarget is non-null.
+     *   ⚠ Cancel [taskId] → [phaseRole]?  y/n · esc to abort
+     */
+    renderCancelPrompt(width, target) {
+        const dim = (s) => this.theme.fg("dim", s);
+        const warning = (s) => this.theme.fg("warning", s);
+        const bold = (s) => this.theme.bold(s);
+        const taskLabel = target.taskId ?? target.label;
+        const phaseLabel = target.id === "main" ? "session" : target.label;
+        // "cancel" sits right after the prompt — most visible position.
+        // Truncation sacrifices the dim dismiss-hints from the END, keeping
+        // the action word and the warning always readable.
+        const actionWord = dim("cancel");
+        const hints = dim(" · n/esc dismiss · y confirm");
+        const prompt = warning(`⚠ Cancel ${bold(taskLabel)} → ${bold(phaseLabel)}? `);
+        const budget = Math.max(0, width - visibleWidth(prompt) - visibleWidth(actionWord));
+        const tail = budget > 0 ? dim(` · n/esc dismiss · y confirm`) : "";
+        const budgetedTail = visibleWidth(tail) > budget
+            ? dim(truncateToWidth(` · n/esc dismiss · y confirm`, budget))
+            : tail;
+        let line = `${prompt}${actionWord}${budgetedTail}`;
+        if (visibleWidth(line) > width)
+            line = truncateToWidth(line, width);
+        return [line];
+    }
     invalidate() {
         // Re-render driven by external invalidationCb → tui.requestRender().
     }
@@ -345,6 +423,47 @@ class ChipStripComponent {
         this.stripActive = active;
         this.invalidationCb?.();
     }
+    /** Initiate cancel confirmation for a chip. Sets cancelTarget so the
+     *  next render shows the confirmation prompt. */
+    requestCancelChip(chip) {
+        this.cancelTarget = chip;
+        this.invalidationCb?.();
+    }
+    /** Confirm the pending cancellation (user pressed y). */
+    confirmCancel() {
+        const target = this.cancelTarget;
+        this.cancelTarget = null;
+        this.invalidationCb?.();
+        return target;
+    }
+    /** Dismiss the cancel prompt (user pressed n/Esc). */
+    dismissCancel() {
+        this.cancelTarget = null;
+        this.invalidationCb?.();
+    }
+    /** Whether a cancel confirmation prompt is active. */
+    isCancelPromptActive() {
+        return this.cancelTarget !== null;
+    }
+    /** Check if the chip at the current cursor is a running phase that can be cancelled. */
+    isCursorCancellable() {
+        const chip = this.cursorChip();
+        if (!chip)
+            return false;
+        if (chip.id === "main") {
+            const session = this.activeSession();
+            return (session?.status ?? "") === "running";
+        }
+        const p = this.chipPhase(chip);
+        if (!p)
+            return false;
+        return p.status === "running";
+    }
+    /** True when the current session is cancelled — r key triggers resume. */
+    isCursorResumable() {
+        const session = this.activeSession();
+        return session?.status === "cancelled";
+    }
     getStripActive() {
         return this.stripActive;
     }
@@ -411,6 +530,18 @@ function isEsc(d) {
     // by the arrow checks above first.
     return d === "\x1b";
 }
+function isXKey(d) {
+    return d === "x";
+}
+function isRKey(d) {
+    return d === "r" || d === "R";
+}
+function isYKey(d) {
+    return d === "y" || d === "Y";
+}
+function isNKey(d) {
+    return d === "n" || d === "N";
+}
 // ── Registrar ───────────────────────────────────────────────────────────────
 /**
  * Custom renderer for the `forge:turn` chat-history rows we append on every
@@ -459,14 +590,14 @@ export function registerThreadSwitcher(pi) {
     // session_start and on every forge:threads command invocation.
     let currentCtx;
     function ensureSpinnerTimer() {
-        // Tick re-renders while any session is "running" so the spinner
-        // glyph animates and the preview text refreshes between user input.
+        // Tick re-renders while any session is "running" or "cancelling" so the
+        // spinner glyph animates and the preview text refreshes between user input.
         // When all sessions are terminal, the timer stops itself.
         if (spinnerTimer)
             return;
         spinnerTimer = setInterval(() => {
-            const anyRunning = registry.listSessions().some((s) => s.status === "running");
-            if (!anyRunning) {
+            const anyActive = registry.listSessions().some((s) => s.status === "running" || s.status === "cancelling");
+            if (!anyActive) {
                 if (spinnerTimer)
                     clearInterval(spinnerTimer);
                 spinnerTimer = undefined;
@@ -569,6 +700,60 @@ export function registerThreadSwitcher(pi) {
                     stripRef.parkCursorOnCurrentPhase();
                     return { consume: true };
                 }
+                // ── Cancel-confirmation handling (cancelTarget active) ────────
+                // When the strip shows a cancel prompt, y/Enter confirms,
+                // n/Esc dismisses. All other keys are consumed (no passthrough).
+                if (stripRef.isCancelPromptActive()) {
+                    if (isYKey(data) || isEnter(data)) {
+                        const target = stripRef.confirmCancel();
+                        if (target?.taskId) {
+                            registry.requestCancel(target.taskId);
+                        }
+                        stripRef.setStripActive(false);
+                        setFocusToMain(live);
+                        return { consume: true };
+                    }
+                    // Dismiss: n, Esc
+                    if (isNKey(data) || isEsc(data)) {
+                        stripRef.dismissCancel();
+                        stripRef.setStripActive(false);
+                        return { consume: true };
+                    }
+                    // Any other key in cancel-confirmation mode is consumed silently.
+                    return { consume: true };
+                }
+                if (isXKey(data)) {
+                    const chip = stripRef.cursorChip();
+                    if (chip && stripRef.isCursorCancellable()) {
+                        stripRef.requestCancelChip(chip);
+                        return { consume: true };
+                    }
+                    return undefined;
+                }
+                if (isRKey(data)) {
+                    // Resume a cancelled session. The state file is preserved on cancel
+                    // (ADR-S21-01). Write the slash command to the editor and simulate
+                    // Enter — exactly mirrors how a user types and submits the command.
+                    const session = registry.listSessions()[0];
+                    if (session && stripRef.isCursorResumable()) {
+                        const entityId = session.taskId;
+                        const cmd = entityId.startsWith("FORGE-BUG-")
+                            ? `forge:fix-bug ${entityId}`
+                            : `forge:run-task ${entityId}`;
+                        stripRef.setStripActive(false);
+                        try {
+                            live.ui.setEditorText(`/${cmd}`);
+                        }
+                        catch {
+                            // Non-fatal — editor may not be accessible in all contexts.
+                            live.ui.notify(`↻ Resume: /${cmd}`, "info");
+                        }
+                        // Return Enter to submit the command. The router dispatches 
+                        // normally; pi processes it as a slash-command submit.
+                        return { data: "\r" };
+                    }
+                    return undefined;
+                }
                 if (isLeftArrow(data)) {
                     stripRef.moveCursor(-1);
                     return { consume: true };