@mu-crew/mu 2.0.0 → 3.1.0

package/dist/cli.js

@@ -1823,6 +1823,7 @@ INSERT INTO _op_clock (now_ms)
         "local_id",
         "title",
         "status",
+        "substate",
         "impact",
         "effort_days",
         "owner_id",
@@ -1837,6 +1838,54 @@ INSERT INTO _op_clock (now_ms)
   }
 });
 
+// src/tasks/status.ts
+function isTaskStatus(s) {
+  return TASK_STATUSES.includes(s);
+}
+function isValidPair(status, substate) {
+  if (!isTaskStatus(status)) return false;
+  return TASK_SUBSTATES[status].includes(substate);
+}
+function mapLegacyStatus(value) {
+  const pair = LEGACY_STATUS_PAIRS[value];
+  return pair ? { ...pair } : null;
+}
+function resolvePair(status, substate) {
+  const legacy = mapLegacyStatus(status);
+  if (legacy) return legacy;
+  if (!isTaskStatus(status)) return null;
+  if (typeof substate === "string" && isValidPair(status, substate)) {
+    return { status, substate };
+  }
+  return { status, substate: DEFAULT_SUBSTATE[status] };
+}
+function formatPair(pair) {
+  return pair.substate === DEFAULT_SUBSTATE[pair.status] ? pair.status : `${pair.status}/${pair.substate}`;
+}
+var TASK_STATUSES, TASK_STATUS_LIST, TASK_SUBSTATES, DEFAULT_SUBSTATE, TASK_SUBSTATE_ROWS, LEGACY_STATUS_PAIRS;
+var init_status = __esm({
+  "src/tasks/status.ts"() {
+    "use strict";
+    TASK_STATUSES = ["OPEN", "IN_PROGRESS", "CLOSED"];
+    TASK_STATUS_LIST = TASK_STATUSES.join(" | ");
+    TASK_SUBSTATES = {
+      OPEN: ["todo", "parked"],
+      IN_PROGRESS: ["active"],
+      CLOSED: ["done", "rejected", "wontfix", "duplicate", "superseded"]
+    };
+    DEFAULT_SUBSTATE = { OPEN: "todo", IN_PROGRESS: "active", CLOSED: "done" };
+    TASK_SUBSTATE_ROWS = TASK_STATUSES.flatMap(
+      (status) => TASK_SUBSTATES[status].map(
+        (substate) => [status, substate, substate === DEFAULT_SUBSTATE[status] ? 1 : 0]
+      )
+    );
+    LEGACY_STATUS_PAIRS = {
+      REJECTED: { status: "CLOSED", substate: "rejected" },
+      DEFERRED: { status: "OPEN", substate: "parked" }
+    };
+  }
+});
+
 // src/db.ts
 import { randomUUID } from "crypto";
 import { mkdirSync } from "fs";
@@ -1862,6 +1911,13 @@ function openDb(options = {}) {
     db.pragma("foreign_keys = ON");
     db.pragma("busy_timeout = 5000");
     const detectedVersion = detectExistingSchemaVersion(db);
+    if (detectedVersion !== null && detectedVersion > CURRENT_SCHEMA_VERSION) {
+      try {
+        db.close();
+      } catch {
+      }
+      throw new SchemaTooNewError(detectedVersion, CURRENT_SCHEMA_VERSION);
+    }
     if (detectedVersion !== null && detectedVersion < MIN_ACCEPTED_SCHEMA_VERSION) {
       try {
         db.close();
@@ -1920,6 +1976,12 @@ function applySchema(db) {
   db.exec("BEGIN IMMEDIATE");
   try {
     db.exec(CURRENT_SCHEMA);
+    const seed = db.prepare(
+      "INSERT OR IGNORE INTO task_substates (status, substate, is_default) VALUES (?, ?, ?)"
+    );
+    for (const [status, substate, isDefault] of TASK_SUBSTATE_ROWS) {
+      seed.run(status, substate, isDefault);
+    }
     db.exec("COMMIT");
   } catch (err) {
     db.exec("ROLLBACK");
@@ -1930,11 +1992,12 @@ function applySchema(db) {
     CURRENT_SCHEMA_VERSION
   );
 }
-var WorkstreamNotFoundError, SchemaTooOldError, CURRENT_SCHEMA_VERSION, MIN_ACCEPTED_SCHEMA_VERSION, EXPECTED_TABLES, SYNCED_ENTITIES, MACHINE_LOCAL_ENTITIES, READY_VIEW_SQL, BLOCKED_VIEW_SQL, GOALS_VIEW_SQL, CURRENT_SCHEMA;
+var WorkstreamNotFoundError, SchemaTooOldError, SchemaTooNewError, CURRENT_SCHEMA_VERSION, MIN_ACCEPTED_SCHEMA_VERSION, EXPECTED_TABLES, SYNCED_ENTITIES, MACHINE_LOCAL_ENTITIES, READY_VIEW_SQL, BLOCKED_VIEW_SQL, GOALS_VIEW_SQL, CURRENT_SCHEMA;
 var init_db = __esm({
   "src/db.ts"() {
     "use strict";
     init_capture();
+    init_status();
     WorkstreamNotFoundError = class extends Error {
       constructor(workstream) {
         super(`no such workstream: ${workstream}`);
@@ -1974,7 +2037,7 @@ var init_db = __esm({
             command: `mv "\${MU_DB_PATH:-$HOME/.local/state/mu/mu.db}" "\${MU_DB_PATH:-$HOME/.local/state/mu/mu.db}.old"`
           },
           {
-            intent: `Migrate the preserved DB into a fresh v${this.requiredVersion} file`,
+            intent: `Migrate the old DB into a fresh v${this.requiredVersion} DB`,
             command: `npx tsx scripts/migrate.ts "\${MU_DB_PATH:-$HOME/.local/state/mu/mu.db}.old" --out /tmp/mu-v${this.requiredVersion}.db`
           },
           {
@@ -1984,8 +2047,21 @@ var init_db = __esm({
         ];
       }
     };
-    CURRENT_SCHEMA_VERSION = 10;
-    MIN_ACCEPTED_SCHEMA_VERSION = 10;
+    SchemaTooNewError = class extends Error {
+      constructor(detectedVersion, supportedVersion) {
+        super(`DB is v${detectedVersion}; this mu understands up to v${supportedVersion}. Upgrade mu.`);
+        this.detectedVersion = detectedVersion;
+        this.supportedVersion = supportedVersion;
+      }
+      detectedVersion;
+      supportedVersion;
+      name = "SchemaTooNewError";
+      errorNextSteps() {
+        return [{ intent: "Check which mu is on PATH", command: "which mu && mu --version" }];
+      }
+    };
+    CURRENT_SCHEMA_VERSION = 11;
+    MIN_ACCEPTED_SCHEMA_VERSION = 11;
     EXPECTED_TABLES = [
       "agents",
       "machine_identity",
@@ -1994,6 +2070,7 @@ var init_db = __esm({
       "sync_peers",
       "task_edges",
       "task_notes",
+      "task_substates",
       "tasks",
       "vcs_workspaces",
       "workstreams"
@@ -2006,6 +2083,7 @@ CREATE VIEW ready AS
   SELECT t.*
     FROM tasks t
    WHERE t.status = 'OPEN'
+     AND t.substate <> 'parked'
      AND NOT EXISTS (
        SELECT 1
          FROM task_edges e
@@ -2101,6 +2179,19 @@ CREATE TABLE IF NOT EXISTS agents (
 CREATE INDEX IF NOT EXISTS idx_agents_workstream ON agents (workstream_id);
 CREATE INDEX IF NOT EXISTS idx_agents_status ON agents (status);
 
+-- task_substates: the legal (status, substate) pairs. Seeded from
+-- TASK_SUBSTATE_ROWS (src/tasks/status.ts) by applySchema; exactly one
+-- default per status.
+CREATE TABLE IF NOT EXISTS task_substates (
+  status     TEXT NOT NULL,
+  substate   TEXT NOT NULL,
+  is_default INTEGER NOT NULL DEFAULT 0 CHECK (is_default IN (0, 1)),
+  PRIMARY KEY (status, substate)
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_task_substates_one_default
+  ON task_substates (status) WHERE is_default = 1;
+
 -- tasks: per-workstream unique on local_id (TRULY local now \u2014
 -- different workstreams may reuse the same local_id).
 CREATE TABLE IF NOT EXISTS tasks (
@@ -2110,6 +2201,9 @@ CREATE TABLE IF NOT EXISTS tasks (
   title         TEXT NOT NULL,
   status        TEXT NOT NULL DEFAULT 'OPEN',
   -- OPEN | IN_PROGRESS | CLOSED \u2014 see VOCABULARY.md.
+  substate      TEXT NOT NULL,
+  -- Qualifies status. No DEFAULT on purpose: a writer that forgets it
+  -- must fail loudly rather than silently pick one.
   impact        INTEGER NOT NULL,
   effort_days   REAL NOT NULL,
   owner_id      INTEGER REFERENCES agents (id) ON DELETE SET NULL,
@@ -2118,7 +2212,8 @@ CREATE TABLE IF NOT EXISTS tasks (
   UNIQUE (workstream_id, local_id),
   CHECK (impact BETWEEN 1 AND 100),
   CHECK (effort_days > 0),
-  CHECK (status IN ('OPEN', 'IN_PROGRESS', 'CLOSED'))
+  FOREIGN KEY (status, substate) REFERENCES task_substates (status, substate)
+    DEFERRABLE INITIALLY DEFERRED
 );
 
 CREATE INDEX IF NOT EXISTS idx_tasks_workstream ON tasks (workstream_id);
@@ -2282,6 +2377,9 @@ var init_glyphs = __esm({
       /** Task is blocked by an incoming edge. */
       blocked: "\uF0C1",
       // nf-fa-link (chain)
+      /** Task is parked (OPEN/parked): open, but set aside on purpose. */
+      parked: "\uF04C",
+      // nf-fa-pause
       /** Track whose roots merged (diamond dependency). */
       merge: "\uF074",
       // nf-fa-random
@@ -4963,6 +5061,7 @@ function rowFromDb3(row2) {
     workstreamName: row2.workstream,
     title: row2.title,
     status: row2.status,
+    substate: row2.substate,
     impact: row2.impact,
     effortDays: row2.effort_days,
     ownerName: row2.owner,
@@ -5006,6 +5105,7 @@ var init_core2 = __esm({
   ws.name AS workstream,
   t.title AS title,
   t.status AS status,
+  t.substate AS substate,
   t.impact AS impact,
   t.effort_days AS effort_days,
   ag.name AS owner,
@@ -5034,6 +5134,10 @@ function getTask(db, localId, workstream) {
   ).get(wsId, localId);
   return row2 ? rowFromDb3(row2) : void 0;
 }
+function asList(v) {
+  if (v === void 0) return void 0;
+  return typeof v === "string" ? [v] : v;
+}
 function listTasks(db, workstream, opts = {}) {
   const statuses = opts.status === void 0 ? void 0 : Array.isArray(opts.status) ? opts.status : [opts.status];
   const where = [];
@@ -5048,6 +5152,11 @@ function listTasks(db, workstream, opts = {}) {
     where.push(`t.status IN (${statuses.map(() => "?").join(", ")})`);
     params.push(...statuses);
   }
+  const substates = asList(opts.substate);
+  if (substates !== void 0 && substates.length > 0) {
+    where.push(`t.substate IN (${substates.map(() => "?").join(", ")})`);
+    params.push(...substates);
+  }
   const sql = where.length === 0 ? `SELECT ${SELECT_TASK_COLS} ${TASK_FROM_JOIN} ORDER BY t.local_id` : `SELECT ${SELECT_TASK_COLS} ${TASK_FROM_JOIN} WHERE ${where.join(" AND ")} ORDER BY t.local_id`;
   const rows = db.prepare(sql).all(...params);
   return rows.map(rowFromDb3);
@@ -5062,6 +5171,11 @@ function listReady(db, workstream, opts = {}) {
     where.push(`v.status IN (${statuses.map(() => "?").join(", ")})`);
     params.push(...statuses);
   }
+  const substates = asList(opts.substate);
+  if (substates !== void 0 && substates.length > 0) {
+    where.push(`v.substate IN (${substates.map(() => "?").join(", ")})`);
+    params.push(...substates);
+  }
   const rows = db.prepare(
     `SELECT ${SELECT_VIEW_COLS} ${VIEW_FROM_JOIN("ready")} WHERE ${where.join(" AND ")} ORDER BY v.local_id`
   ).all(...params);
@@ -5154,6 +5268,7 @@ var init_queries = __esm({
   ws.name AS workstream,
   v.title AS title,
   v.status AS status,
+  v.substate AS substate,
   v.impact AS impact,
   v.effort_days AS effort_days,
   ag.name AS owner,
@@ -5216,12 +5331,13 @@ var init_id = __esm({
 });
 
 // src/tasks/errors.ts
-var TaskNotFoundError, TaskIdInvalidError, TaskExistsError, TaskNotInWorkstreamError, TaskAlreadyOwnedError, ClaimerNotRegisteredError, TaskClaimStaleWorkspaceError, CycleError, ReaperDetectedDuringWaitError, StallDetectedDuringWaitError, CrossWorkstreamEdgeError;
+var TaskNotFoundError, TaskIdInvalidError, TaskExistsError, TaskNotInWorkstreamError, TaskAlreadyOwnedError, ClaimerNotRegisteredError, TaskClaimStaleWorkspaceError, CycleError, ReaperDetectedDuringWaitError, StallDetectedDuringWaitError, CrossWorkstreamEdgeError, SubstateReasonRequiredError, TaskParkStateError, TaskParkedError, InvalidSubstateError;
 var init_errors2 = __esm({
   "src/tasks/errors.ts"() {
     "use strict";
     init_workspace();
     init_id();
+    init_status();
     TaskNotFoundError = class extends Error {
       constructor(taskId) {
         super(`no such task: ${taskId}`);
@@ -5512,6 +5628,84 @@ var init_errors2 = __esm({
         ];
       }
     };
+    SubstateReasonRequiredError = class extends Error {
+      constructor(verb, substate, taskId) {
+        super(
+          verb === "close" ? `closing ${taskId} as ${substate} needs a reason (--why "...")` : `parking ${taskId} needs a reason (--why "...")`
+        );
+        this.verb = verb;
+        this.substate = substate;
+        this.taskId = taskId;
+      }
+      verb;
+      substate;
+      taskId;
+      name = "SubstateReasonRequiredError";
+      errorNextSteps() {
+        const cmd = this.verb === "close" ? `mu task close ${this.taskId} --as ${this.substate} --why "<reason>"` : `mu task park ${this.taskId} --why "<reason>"`;
+        return [{ intent: "Retry with a reason", command: cmd }];
+      }
+    };
+    TaskParkStateError = class extends Error {
+      constructor(taskId, status, workstream) {
+        super(
+          status === "IN_PROGRESS" ? `cannot park ${taskId}: it is IN_PROGRESS (release it first)` : `cannot park ${taskId}: it is CLOSED (open it first)`
+        );
+        this.taskId = taskId;
+        this.status = status;
+        this.workstream = workstream;
+      }
+      taskId;
+      status;
+      workstream;
+      name = "TaskParkStateError";
+      errorNextSteps() {
+        const ws = this.workstream;
+        const first = this.status === "IN_PROGRESS" ? { intent: "Release the claim first", command: `mu task release ${this.taskId} -w ${ws}` } : { intent: "Reopen the task first", command: `mu task open ${this.taskId} -w ${ws}` };
+        return [
+          first,
+          {
+            intent: "Then park it",
+            command: `mu task park ${this.taskId} --why "<reason>" -w ${ws}`
+          }
+        ];
+      }
+    };
+    TaskParkedError = class extends Error {
+      constructor(taskId, workstream) {
+        super(`task ${taskId} is parked (OPEN/parked); unpark it or claim with --force`);
+        this.taskId = taskId;
+        this.workstream = workstream;
+      }
+      taskId;
+      workstream;
+      name = "TaskParkedError";
+      errorNextSteps() {
+        const ws = this.workstream;
+        return [
+          { intent: "Unpark it, then claim", command: `mu task unpark ${this.taskId} -w ${ws}` },
+          { intent: "Claim it anyway", command: `mu task claim ${this.taskId} --force -w ${ws}` }
+        ];
+      }
+    };
+    InvalidSubstateError = class extends Error {
+      constructor(status, substate) {
+        super(
+          `invalid substate for ${status}: ${JSON.stringify(substate)} (expected one of: ${TASK_SUBSTATES[status].join(", ")})`
+        );
+        this.status = status;
+        this.substate = substate;
+      }
+      status;
+      substate;
+      name = "InvalidSubstateError";
+      errorNextSteps() {
+        return TASK_SUBSTATES[this.status].map((s) => ({
+          intent: `Use ${this.status}/${s}`,
+          command: this.status === "CLOSED" ? `mu task close <id> --as ${s}` : `mu task list --substate ${s}`
+        }));
+      }
+    };
   }
 });
 
@@ -5551,12 +5745,12 @@ function getTaskEdgesWithStatus(db, taskLocalId, workstream) {
   const taskId = taskIdFor(db, taskLocalId, workstream);
   if (taskId === null) return { blockers: [], dependents: [] };
   const blockers = db.prepare(
-    `SELECT t.local_id AS name, t.status AS status FROM task_edges e
+    `SELECT t.local_id AS name, t.status AS status, t.substate AS substate FROM task_edges e
          JOIN tasks t ON t.id = e.from_task_id
         WHERE e.to_task_id = ? ORDER BY t.local_id`
   ).all(taskId);
   const dependents = db.prepare(
-    `SELECT t.local_id AS name, t.status AS status FROM task_edges e
+    `SELECT t.local_id AS name, t.status AS status, t.substate AS substate FROM task_edges e
          JOIN tasks t ON t.id = e.to_task_id
         WHERE e.from_task_id = ? ORDER BY t.local_id`
   ).all(taskId);
@@ -6038,8 +6232,8 @@ function addTaskImpl(db, opts) {
     }
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const insertResult = db.prepare(
-      `INSERT INTO tasks (workstream_id, local_id, title, status, impact, effort_days, created_at, updated_at)
-         VALUES (?, ?, ?, 'OPEN', ?, ?, ?, ?)`
+      `INSERT INTO tasks (workstream_id, local_id, title, status, substate, impact, effort_days, created_at, updated_at)
+         VALUES (?, ?, ?, 'OPEN', 'todo', ?, ?, ?, ?)`
     ).run(wsId, opts.localId, opts.title, opts.impact, opts.effortDays, now, now);
     const newTaskId = Number(insertResult.lastInsertRowid);
     if (opts.blockedBy && opts.blockedBy.length > 0) {
@@ -6088,10 +6282,10 @@ function addNote(db, taskLocalId, content, opts) {
   return withOpContext(
     db,
     { intent: "task.note", actor: opts.author, group: "new" },
-    () => addNoteImpl(db, taskLocalId, content, opts)
+    () => insertNote(db, taskLocalId, content, opts)
   );
 }
-function addNoteImpl(db, taskLocalId, content, opts) {
+function insertNote(db, taskLocalId, content, opts) {
   const task = getTask(db, taskLocalId, opts.workstream);
   if (!task) {
     throw new TaskNotFoundError(taskLocalId);
@@ -6216,19 +6410,32 @@ function setTaskStatus(db, localId, status, opts) {
   );
 }
 function setTaskStatusImpl(db, localId, status, opts) {
+  const substate = opts.substate ?? DEFAULT_SUBSTATE[status];
+  if (!isValidPair(status, substate)) throw new InvalidSubstateError(status, substate);
   const before = getTask(db, localId, opts.workstream);
   if (!before) throw new TaskNotFoundError(localId);
-  if (before.status === status) {
-    return { previousStatus: before.status, status, changed: false };
+  const base = {
+    previousStatus: before.status,
+    status,
+    previousSubstate: before.substate,
+    substate
+  };
+  if (before.status === status && before.substate === substate) {
+    return { ...base, changed: false };
   }
   db.prepare(
-    `UPDATE tasks SET status = ?, updated_at = ?
+    `UPDATE tasks SET status = ?, substate = ?, updated_at = ?
       WHERE local_id = ?
         AND workstream_id = (SELECT id FROM workstreams WHERE name = ?)`
-  ).run(status, (/* @__PURE__ */ new Date()).toISOString(), localId, before.workstreamName);
-  return { previousStatus: before.status, status, changed: true };
+  ).run(status, substate, (/* @__PURE__ */ new Date()).toISOString(), localId, before.workstreamName);
+  return { ...base, changed: true };
 }
 function closeTask(db, localId, opts) {
+  const as = opts.as ?? "done";
+  if (!isValidPair("CLOSED", as)) throw new InvalidSubstateError("CLOSED", as);
+  if (as !== "done" && (opts.why === void 0 || opts.why.trim() === "")) {
+    throw new SubstateReasonRequiredError("close", as, localId);
+  }
   return withOpContext(
     db,
     { intent: "task.close", actor: opts.author, group: "new" },
@@ -6236,6 +6443,7 @@ function closeTask(db, localId, opts) {
   );
 }
 function closeTaskImpl(db, localId, opts) {
+  const as = opts.as ?? "done";
   const before = getTask(db, localId, opts.workstream);
   if (opts.ifReady && before) {
     const edges = getTaskEdgesWithStatus(db, localId, before.workstreamName);
@@ -6245,14 +6453,43 @@ function closeTaskImpl(db, localId, opts) {
         skipped: "not_ready",
         previousStatus: before.status,
         status: before.status,
+        previousSubstate: before.substate,
+        substate: before.substate,
         changed: false,
         blockingIds: blocking
       };
     }
   }
-  const r = setTaskStatus(db, localId, "CLOSED", opts);
-  if (r.changed && before) recordEvidenceNote(db, localId, before.workstreamName, "CLOSE", opts);
-  return r;
+  return db.transaction(() => {
+    const track = as !== "done" && before !== void 0;
+    const readyBefore = track ? readyDependents(db, localId, before.workstreamName) : [];
+    const r = setTaskStatus(db, localId, "CLOSED", {
+      workstream: opts.workstream,
+      substate: as,
+      ...opts.evidence !== void 0 ? { evidence: opts.evidence } : {}
+    });
+    if (!r.changed || !before) return { ...r, unblocked: [] };
+    recordReasonNote(db, localId, before.workstreamName, as, opts.why, opts.author);
+    recordEvidenceNote(db, localId, before.workstreamName, "CLOSE", opts);
+    const unblocked = track ? readyDependents(db, localId, before.workstreamName).filter((n) => !readyBefore.includes(n)) : [];
+    return { ...r, unblocked };
+  })();
+}
+function readyDependents(db, localId, workstream) {
+  const id = taskIdFor(db, localId, workstream);
+  if (id === null) return [];
+  const rows = db.prepare(
+    `SELECT r.local_id AS name FROM task_edges e
+         JOIN ready r ON r.id = e.to_task_id
+        WHERE e.from_task_id = ? ORDER BY r.local_id`
+  ).all(id);
+  return rows.map((r) => r.name);
+}
+function recordReasonNote(db, localId, workstream, substate, why, author) {
+  if (why === void 0 || why.trim() === "") return;
+  const noteOpts = { workstream };
+  if (author !== void 0 && author !== "") noteOpts.author = author;
+  insertNote(db, localId, `${substate.toUpperCase()}: ${why}`, noteOpts);
 }
 function openTask(db, localId, opts) {
   return withOpContext(db, { intent: "task.open", group: "new" }, () => {
@@ -6262,14 +6499,61 @@ function openTask(db, localId, opts) {
     return r;
   });
 }
+function parkTask(db, localId, opts) {
+  if (opts.why.trim() === "") throw new SubstateReasonRequiredError("park", "parked", localId);
+  return withOpContext(
+    db,
+    { intent: "task.park", actor: opts.author, group: "new" },
+    () => db.transaction(() => {
+      const before = getTask(db, localId, opts.workstream);
+      if (!before) throw new TaskNotFoundError(localId);
+      if (before.status !== "OPEN") {
+        throw new TaskParkStateError(localId, before.status, before.workstreamName);
+      }
+      const r = setTaskStatus(db, localId, "OPEN", {
+        workstream: opts.workstream,
+        substate: "parked"
+      });
+      if (r.changed) {
+        recordReasonNote(db, localId, before.workstreamName, "parked", opts.why, opts.author);
+        recordEvidenceNote(db, localId, before.workstreamName, "PARK", opts);
+      }
+      return r;
+    })()
+  );
+}
+function unparkTask(db, localId, opts) {
+  return withOpContext(
+    db,
+    { intent: "task.unpark", group: "new" },
+    () => db.transaction(() => {
+      const before = getTask(db, localId, opts.workstream);
+      if (!before) throw new TaskNotFoundError(localId);
+      if (before.status !== "OPEN" || before.substate !== "parked") {
+        return {
+          previousStatus: before.status,
+          status: before.status,
+          previousSubstate: before.substate,
+          substate: before.substate,
+          changed: false
+        };
+      }
+      const r = setTaskStatus(db, localId, "OPEN", { workstream: opts.workstream });
+      recordEvidenceNote(db, localId, before.workstreamName, "UNPARK", opts);
+      return r;
+    })()
+  );
+}
 var init_lifecycle = __esm({
   "src/tasks/lifecycle.ts"() {
     "use strict";
     init_op_context();
+    init_core2();
     init_edges();
     init_edit();
     init_errors2();
     init_queries();
+    init_status();
   }
 });
 
@@ -6296,10 +6580,16 @@ function releaseTaskImpl(db, localId, opts) {
     };
   }
   db.prepare(
-    `UPDATE tasks SET owner_id = NULL, status = ?, updated_at = ?
+    `UPDATE tasks SET owner_id = NULL, status = ?, substate = ?, updated_at = ?
       WHERE local_id = ?
         AND workstream_id = (SELECT id FROM workstreams WHERE name = ?)`
-  ).run(newStatus, (/* @__PURE__ */ new Date()).toISOString(), localId, before.workstreamName);
+  ).run(
+    newStatus,
+    statusChanges ? DEFAULT_SUBSTATE[newStatus] : before.substate,
+    (/* @__PURE__ */ new Date()).toISOString(),
+    localId,
+    before.workstreamName
+  );
   recordEvidenceNote(db, localId, before.workstreamName, "RELEASE", opts);
   return {
     previousOwnerName: before.ownerName,
@@ -6340,11 +6630,15 @@ async function claimTaskImpl(db, localId, opts) {
     () => db.transaction(() => {
       const before = getTask(db, localId, opts.workstream);
       if (!before) throw new TaskNotFoundError(localId);
+      assertNotParked(before, opts);
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const result = db.prepare(
         `UPDATE tasks
             SET owner_id = ?,
                 status = CASE WHEN status = 'OPEN' THEN 'IN_PROGRESS' ELSE status END,
+                -- SQLite evaluates every SET expression against the OLD
+                -- row, so this CASE still sees the pre-claim status.
+                substate = CASE WHEN status = 'OPEN' THEN 'active' ELSE substate END,
                 updated_at = ?
           WHERE local_id = ?
             AND workstream_id = (SELECT id FROM workstreams WHERE name = ?)
@@ -6366,6 +6660,11 @@ async function claimTaskImpl(db, localId, opts) {
     })()
   );
 }
+function assertNotParked(task, opts) {
+  if (task.status === "OPEN" && task.substate === "parked" && opts.force !== true) {
+    throw new TaskParkedError(task.name, task.workstreamName);
+  }
+}
 async function resolveActorIdentity() {
   const worker = await resolveWorkerIdentity();
   if (worker !== void 0) return worker;
@@ -6391,10 +6690,12 @@ async function claimSelf(db, localId, opts) {
     () => db.transaction(() => {
       const before = getTask(db, localId, opts.workstream);
       if (!before) throw new TaskNotFoundError(localId);
+      assertNotParked(before, opts);
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const result = db.prepare(
         `UPDATE tasks
             SET status = CASE WHEN status = 'OPEN' THEN 'IN_PROGRESS' ELSE status END,
+                substate = CASE WHEN status = 'OPEN' THEN 'active' ELSE substate END,
                 updated_at = ?
           WHERE local_id = ?
             AND workstream_id = (SELECT id FROM workstreams WHERE name = ?)
@@ -6424,23 +6725,7 @@ var init_claim = __esm({
     init_errors2();
     init_lifecycle();
     init_queries();
-  }
-});
-
-// src/tasks/status.ts
-function isTaskStatus(s) {
-  return TASK_STATUSES.includes(s);
-}
-function normalizeTaskStatus(value) {
-  return RETIRED_STATUSES.has(value) ? "OPEN" : value;
-}
-var TASK_STATUSES, RETIRED_STATUSES, TASK_STATUS_LIST;
-var init_status = __esm({
-  "src/tasks/status.ts"() {
-    "use strict";
-    TASK_STATUSES = ["OPEN", "IN_PROGRESS", "CLOSED"];
-    RETIRED_STATUSES = /* @__PURE__ */ new Set(["REJECTED", "DEFERRED"]);
-    TASK_STATUS_LIST = TASK_STATUSES.join(" | ");
+    init_status();
   }
 });
 
@@ -6492,6 +6777,7 @@ async function waitForTasks(db, input, opts) {
     for (const ref of refs) {
       const row2 = getTask(db, ref.name, ref.workstreamName);
       const status = row2?.status ?? "OPEN";
+      const substate = row2?.substate ?? DEFAULT_SUBSTATE[status];
       const owner = row2?.ownerName ?? null;
       const ageMs2 = await stuckAgeMs(status, owner, ref.workstreamName);
       const stuck = ageMs2 !== null;
@@ -6520,6 +6806,7 @@ async function waitForTasks(db, input, opts) {
         workstreamName: ref.workstreamName,
         name: ref.name,
         status,
+        substate,
         owner,
         reachedTarget: status === target,
         stuck
@@ -6559,6 +6846,7 @@ var init_wait = __esm({
     init_logs();
     init_errors2();
     init_queries();
+    init_status();
     currentWaitSleep = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     pollCount = 0;
     defaultStuckWarn = (msg) => {
@@ -7021,10 +7309,9 @@ function deleteAgent(db, name, workstream) {
       const result = db.prepare("DELETE FROM agents WHERE id = ?").run(agentId);
       if (result.changes === 0) return false;
       for (const t of stuck) {
-        db.prepare("UPDATE tasks SET status = 'OPEN', updated_at = ? WHERE id = ?").run(
-          (/* @__PURE__ */ new Date()).toISOString(),
-          t.taskId
-        );
+        db.prepare(
+          "UPDATE tasks SET status = 'OPEN', substate = 'todo', updated_at = ? WHERE id = ?"
+        ).run((/* @__PURE__ */ new Date()).toISOString(), t.taskId);
         addNote(
           db,
           t.localId,
@@ -7275,9 +7562,20 @@ function filterAppliable(table, entries) {
 }
 function applyTaskPut(db, op) {
   const { workstream, localId } = parseTaskKey(op.key);
-  const entries = filterAppliable("tasks", decodePayload(op.payload)).map(
-    ([field, value]) => field === "status" && typeof value === "string" ? [field, normalizeTaskStatus(value)] : [field, value]
-  );
+  const entries = [];
+  for (const entry of filterAppliable("tasks", decodePayload(op.payload))) {
+    const [field, value] = entry;
+    if (field === "substate") continue;
+    if (field === "status") {
+      if (typeof value !== "string") continue;
+      const legacy = mapLegacyStatus(value);
+      if (legacy) entries.push(["status", legacy.status]);
+      else if (isTaskStatus(value)) entries.push(entry);
+      continue;
+    }
+    entries.push(entry);
+  }
+  const pending2 = { hlc: op.hlc, substate: carriedSubstate(JSON.parse(op.payload)) };
   const existing = taskRowId(db, op.key);
   if (existing === null) {
     const tomb = tombstoneHlc(db, op);
@@ -7287,18 +7585,60 @@ function applyTaskPut(db, op) {
     const wsId = ensureWorkstreamRow(db, workstream);
     const now = (/* @__PURE__ */ new Date()).toISOString();
     db.prepare(
-      `INSERT INTO tasks (workstream_id, local_id, title, status, impact, effort_days,
+      `INSERT INTO tasks (workstream_id, local_id, title, status, substate, impact, effort_days,
                           owner_id, created_at, updated_at)
-       VALUES (?, ?, ?, 'OPEN', 50, 1, NULL, ?, ?)`
+       VALUES (?, ?, ?, 'OPEN', 'todo', 50, 1, NULL, ?, ?)`
     ).run(wsId, localId, localId, now, now);
     const rowId = taskRowId(db, op.key);
     if (rowId === null) throw new Error(`failed to create task row for ${op.key}`);
     const applied2 = applyFieldLww(db, op, "tasks", rowId, entries);
+    if (repairTaskPair(db, rowId, pending2)) applied2.push("substate");
     return { changed: true, appliedFields: applied2 };
   }
   const applied = applyFieldLww(db, op, "tasks", existing, entries);
+  if (repairTaskPair(db, existing, pending2)) applied.push("substate");
   return applied.length > 0 ? { changed: true, appliedFields: applied } : { changed: false, appliedFields: [], skipped: "older-than-current" };
 }
+function carriedSubstate(payload) {
+  if (payload === null || typeof payload !== "object") return null;
+  const { status, substate } = payload;
+  if (typeof status === "string") {
+    const legacy = mapLegacyStatus(status);
+    if (legacy) return legacy.substate;
+    if (typeof substate !== "string" && isTaskStatus(status)) return DEFAULT_SUBSTATE[status];
+  }
+  return typeof substate === "string" ? substate : null;
+}
+function repairTaskPair(db, rowId, pending2) {
+  const row2 = db.prepare(
+    `SELECT t.status, t.substate, w.name || '/' || t.local_id AS key
+         FROM tasks t JOIN workstreams w ON w.id = t.workstream_id
+        WHERE t.id = ?`
+  ).get(rowId);
+  if (!row2) return false;
+  let winner = null;
+  const writers = db.prepare(
+    `SELECT hlc, payload FROM ops
+        WHERE entity = 'task' AND key = ? AND op = 'put' AND hlc <> ?
+          AND ${LEGACY_LOG_ONLY_SQL_EXCLUSION}
+          AND (json_type(payload, '$.substate') IS NOT NULL
+               OR json_type(payload, '$.status') IS NOT NULL)
+        ORDER BY hlc DESC`
+  ).iterate(row2.key, pending2?.hlc ?? "");
+  for (const w of writers) {
+    const substate = carriedSubstate(JSON.parse(w.payload));
+    if (substate === null) continue;
+    winner = { hlc: w.hlc, substate };
+    break;
+  }
+  if (pending2 && pending2.substate !== null && wins(pending2.hlc, winner?.hlc ?? null)) {
+    winner = { hlc: pending2.hlc, substate: pending2.substate };
+  }
+  const target = resolvePair(row2.status, winner?.substate ?? row2.substate);
+  if (target === null || target.substate === row2.substate) return false;
+  db.prepare("UPDATE tasks SET substate = ? WHERE id = ?").run(target.substate, rowId);
+  return true;
+}
 function applyWorkstreamPut(db, op) {
   const name = op.key;
   if (name.length === 0) throw new OpKeyMalformedError("workstream", name);
@@ -7440,7 +7780,7 @@ function applyOp(db, op) {
       case "workstream":
         return applyWorkstreamPut(db, op);
       case "task":
-        return applyTaskPut(db, op);
+        return db.transaction(() => applyTaskPut(db, op))();
       case "note":
         return applyNotePut(db, op);
       case "edge":
@@ -7574,7 +7914,7 @@ var init_apply = __esm({
     };
     NEVER_APPLY = /* @__PURE__ */ new Set(["owner_id", "local_id", "name", "id", "workstream_id", "task_id"]);
     APPLIABLE_COLUMNS = {
-      tasks: ["title", "status", "impact", "effort_days", "created_at", "updated_at"],
+      tasks: ["title", "status", "substate", "impact", "effort_days", "created_at", "updated_at"],
       workstreams: ["created_at"]
     };
   }
@@ -7944,7 +8284,7 @@ var init_drift = __esm({
     DRIFT_REPORT_CAP = 20;
     COMPARED = {
       workstreams: ["created_at"],
-      tasks: ["title", "status", "impact", "effort_days", "created_at", "updated_at"],
+      tasks: ["title", "status", "substate", "impact", "effort_days", "created_at", "updated_at"],
       task_notes: ["author", "content", "created_at"],
       task_edges: ["created_at"]
     };
@@ -7952,7 +8292,7 @@ var init_drift = __esm({
       workstreams: `SELECT w.name AS key, w.created_at
                   FROM workstreams w`,
       tasks: `SELECT w.name || '/' || t.local_id AS key,
-                 t.title, t.status, t.impact, t.effort_days, t.created_at, t.updated_at
+                 t.title, t.status, t.substate, t.impact, t.effort_days, t.created_at, t.updated_at
             FROM tasks t JOIN workstreams w ON w.id = t.workstream_id`,
       // Notes are a GROW-ONLY SET whose local surrogate id is not portable,
       // so identity for diffing is (task, author, content) — exactly the
@@ -8554,7 +8894,8 @@ function getParallelTracks(db, workstream) {
              FROM reach r
              JOIN task_edges e ON e.to_task_id = r.node_id
          )
-       SELECT goal.local_id AS goal_id, node.local_id AS task_id
+       SELECT goal.local_id AS goal_id, node.local_id AS task_id,
+              node.status AS status, node.substate AS substate
          FROM reach r
          JOIN tasks goal ON goal.id = r.goal_id
          JOIN tasks node ON node.id = r.node_id`
@@ -8562,7 +8903,9 @@ function getParallelTracks(db, workstream) {
   const subgraphs = new Map(goals.map((goal) => [goal.name, /* @__PURE__ */ new Set()]));
   const uf = new UnionFind(goals.map((goal) => goal.name));
   const firstGoalByTask = /* @__PURE__ */ new Map();
+  const openSubstate = /* @__PURE__ */ new Map();
   for (const row2 of reach) {
+    if (row2.status !== "CLOSED") openSubstate.set(row2.task_id, row2.substate);
     subgraphs.get(row2.goal_id)?.add(row2.task_id);
     const firstGoal = firstGoalByTask.get(row2.task_id);
     if (firstGoal === void 0) firstGoalByTask.set(row2.task_id, row2.goal_id);
@@ -8589,8 +8932,17 @@ function getParallelTracks(db, workstream) {
   for (const [root, taskIds] of componentTaskIds) {
     const trackRoots = componentRoots.get(root) ?? [];
     let readyCount = 0;
-    for (const id of taskIds) if (readyIds.has(id)) readyCount++;
-    tracks.push({ roots: trackRoots, taskIds, readyCount });
+    let openCount = 0;
+    let parkedCount = 0;
+    for (const id of taskIds) {
+      if (readyIds.has(id)) readyCount++;
+      const sub = openSubstate.get(id);
+      if (sub === void 0) continue;
+      openCount++;
+      if (sub === "parked") parkedCount++;
+    }
+    const parked = openCount > 0 && parkedCount === openCount;
+    tracks.push({ roots: trackRoots, taskIds, readyCount, parked });
   }
   tracks.sort((a, b) => {
     const an = a.roots[0]?.name ?? "";
@@ -8705,6 +9057,7 @@ async function loadWorkstreamSnapshotFast(db, workstream, opts = {}) {
     inProgress: listInProgress(db, workstream),
     blocked: listBlocked(db, workstream),
     recentClosed: listRecentClosed(db, workstream),
+    parkedCount: listTasks(db, workstream, { status: "OPEN", substate: "parked" }).length,
     allTasks: opts.withAllTasks === true ? listTasks(db, workstream) : [],
     workspaces: listWorkspaces2(db, workstream),
     workspaceOrphans: listWorkspaceOrphans(db, workstream),
@@ -8777,6 +9130,7 @@ function minimalSnapshot(workstream) {
     inProgress: [],
     blocked: [],
     recentClosed: [],
+    parkedCount: 0,
     allTasks: [],
     workspaces: [],
     workspaceOrphans: [],
@@ -8855,7 +9209,7 @@ var init_state = __esm({
 import pc2 from "picocolors";
 function loadFullDag(db, workstream, opts = {}) {
   const tasks = listTasks(db, workstream).filter(
-    (t) => opts.statuses === void 0 || opts.statuses.has(t.status)
+    (t) => (opts.statuses === void 0 || opts.statuses.has(t.status)) && (opts.include === void 0 || opts.include(t))
   );
   const byName = new Map(tasks.map((t) => [t.name, t]));
   const incoming = /* @__PURE__ */ new Set();
@@ -9801,7 +10155,16 @@ function renderKnown(row2, intent) {
     case "task.reject":
     case "task.defer": {
       const status = str(bag, "status");
-      return { verb: VERBS[intent], subject, detail: status === void 0 ? "" : `\u2192 ${status}` };
+      return {
+        verb: VERBS[intent],
+        subject,
+        detail: status === void 0 ? "" : `\u2192 ${pairText(bag, status)}`
+      };
+    }
+    case "task.park":
+    case "task.unpark": {
+      const detail = str(bag, "substate") === void 0 ? "" : `\u2192 ${pairText(bag, "OPEN")}`;
+      return { verb: VERBS[intent], subject, detail };
     }
     case "task.claim": {
       const by = row2.source === "" ? "" : `by ${row2.source}`;
@@ -9860,6 +10223,10 @@ function renderKnown(row2, intent) {
     }
   }
 }
+function pairText(bag, status) {
+  const pair = resolvePair(status, str(bag, "substate"));
+  return pair === null ? status : formatPair(pair);
+}
 function oneLine(text2, max = 60) {
   const flat = text2.replace(/\s+/g, " ").trim();
   return flat.length <= max ? flat : `${flat.slice(0, max - 1)}\u2026`;
@@ -9886,6 +10253,7 @@ var NOISE_FIELDS, VERBS, KNOWN_INTENTS, KNOWN_VERBS;
 var init_log_render = __esm({
   "src/log-render.ts"() {
     "use strict";
+    init_status();
     NOISE_FIELDS = /* @__PURE__ */ new Set(["updated_at", "created_at"]);
     VERBS = {
       "task.add": "task add",
@@ -9894,6 +10262,8 @@ var init_log_render = __esm({
       "task.delete": "task delete",
       "task.close": "task close",
       "task.open": "task open",
+      "task.park": "task park",
+      "task.unpark": "task unpark",
       "task.reject": "task reject",
       "task.defer": "task defer",
       "task.claim": "task claim",
@@ -9925,6 +10295,17 @@ var init_log_render = __esm({
 function statusIcon(state) {
   return STATUS_COLORS[state](agentStateGlyph(state));
 }
+function colorPair(pair) {
+  const text2 = formatPair(pair);
+  switch (pair.status) {
+    case "OPEN":
+      return pair.substate === "parked" ? pc.dim(text2) : pc.cyan(text2);
+    case "IN_PROGRESS":
+      return pc.yellow(text2);
+    case "CLOSED":
+      return pair.substate === "done" ? pc.green(text2) : pc.red(text2);
+  }
+}
 function colorStatus(status) {
   switch (status) {
     case "OPEN":
@@ -9935,14 +10316,14 @@ function colorStatus(status) {
       return pc.green(status);
   }
 }
-function inkColorForStatus(status) {
-  switch (status) {
+function inkColorForPair(pair) {
+  switch (pair.status) {
     case "OPEN":
-      return "cyan";
+      return pair.substate === "parked" ? "gray" : "cyan";
     case "IN_PROGRESS":
       return "yellow";
     case "CLOSED":
-      return "green";
+      return pair.substate === "done" ? "green" : "red";
   }
 }
 function terminalWidth() {
@@ -10056,8 +10437,9 @@ function formatTracks(tracks) {
   tracks.forEach((track, i) => {
     const rootNames = track.roots.map((r) => r.name).join(", ");
     const verb = track.roots.length > 1 ? "merged" : "track";
+    const parked = track.parked ? ` ${pc.dim("(parked)")}` : "";
     lines.push(
-      `  Track ${i + 1}: ${pc.bold(rootNames)} ${pc.dim(`(${track.taskIds.size} tasks, ${track.readyCount} ready, ${verb})`)}`
+      `  Track ${i + 1}: ${pc.bold(rootNames)} ${pc.dim(`(${track.taskIds.size} tasks, ${track.readyCount} ready, ${verb})`)}${parked}`
     );
   });
   return lines.join("\n");
@@ -10191,7 +10573,7 @@ function formatTaskListTable(tasks, opts = {}) {
     const baseRow = opts.withWorkstream ? [
       t.name,
       t.workstreamName,
-      colorStatus(t.status),
+      colorPair(t),
       title,
       String(t.impact),
       String(t.effortDays),
@@ -10199,7 +10581,7 @@ function formatTaskListTable(tasks, opts = {}) {
       t.ownerName ?? pc.dim("\u2014")
     ] : [
       t.name,
-      colorStatus(t.status),
+      colorPair(t),
       title,
       String(t.impact),
       String(t.effortDays),
@@ -10219,6 +10601,7 @@ var init_format = __esm({
     init_glyphs();
     init_log_render();
     init_output();
+    init_status();
     STATUS_COLORS = {
       busy: pc.cyan,
       needs_input: pc.dim,
@@ -11117,7 +11500,8 @@ function BlockedCard({
     (t) => stillGating(getTaskEdgesWithStatus(db, t.name, workstream).blockers)
   );
   const topBlocker = pickTopBlocker(blockerLists);
-  const subtitle = formatSubtitle(blocked.length, topBlocker);
+  const topEdge = blockerLists.flat().find((b) => b.name === topBlocker);
+  const subtitle = formatSubtitle(blocked.length, topEdge ? blockerLabel(topEdge) : topBlocker);
   const meta = shown.map((t) => {
     const bucket = roiBucket(t.impact, t.effortDays);
     const roiText = formatRoi(t.impact, t.effortDays);
@@ -11126,7 +11510,7 @@ function BlockedCard({
   const rows = shown.map((t, i) => [
     GLYPH2,
     t.name,
-    t.status,
+    formatPair(t),
     String(blockerLists[i]?.length ?? 0),
     meta[i]?.roiText ?? "",
     t.title
@@ -11151,7 +11535,7 @@ function BlockedCard({
           // glyph
           { bold: true },
           // id
-          { color: inkColorForStatus(t.status) },
+          { color: inkColorForPair(t) },
           // status
           { color: "yellow" },
           // blocks
@@ -11168,6 +11552,9 @@ function BlockedCard({
 function stillGating(blockers) {
   return blockers.filter((b) => b.status !== "CLOSED");
 }
+function blockerLabel(b) {
+  return b.status === "OPEN" && b.substate === "parked" ? `${b.name} (parked)` : b.name;
+}
 function pickTopBlocker(blockerLists) {
   const counts = /* @__PURE__ */ new Map();
   for (const list of blockerLists) {
@@ -11198,6 +11585,7 @@ var init_blocked = __esm({
     "use strict";
     init_glyphs();
     init_state();
+    init_status();
     init_tasks();
     init_format();
     init_columns();
@@ -11473,7 +11861,7 @@ function InProgressCard({ snapshot: snapshot2, rowBudget, cols }) {
   const rows = shown.map((t, i) => [
     GLYPH3,
     t.name,
-    t.status,
+    formatPair(t),
     formatAgentRefDisplayName(t.ownerName, agentLookup),
     formatSinceClaim(ages[i] ?? null),
     t.title
@@ -11499,7 +11887,7 @@ function InProgressCard({ snapshot: snapshot2, rowBudget, cols }) {
           // glyph
           { bold: true },
           // id
-          { color: inkColorForStatus(t.status) },
+          { color: inkColorForPair(t) },
           // status
           { dimColor: true },
           // owner
@@ -11525,6 +11913,7 @@ var cardConfig5, GLYPH3, STALE_CLAIM_THRESHOLD_MS, COLUMN_SPECS5;
 var init_inprogress = __esm({
   "src/cli/tui/cards/inprogress.tsx"() {
     "use strict";
+    init_status();
     init_format();
     init_agent_display();
     init_columns();
@@ -11661,7 +12050,11 @@ function ReadyCard({ snapshot: snapshot2, rowBudget, cols }) {
       config: cardConfig7,
       rowBudget,
       cols,
-      children: /* @__PURE__ */ jsx12(Text8, { dimColor: true, children: "(no ready tasks) every blocker is OPEN/IN_PROGRESS or every task is closed" })
+      children: (
+        // truncate-end: a wrapped second line would spill over the
+        // card's top border and erase its title.
+        /* @__PURE__ */ jsx12(Text8, { dimColor: true, wrap: "truncate-end", children: snapshot2.parkedCount > 0 ? `(no ready tasks) ${snapshot2.parkedCount} parked \xB7 the rest are blocked or closed` : "(no ready tasks) every blocker is OPEN/IN_PROGRESS or every task is closed" })
+      )
     });
   }
   const shown = ready.slice(0, rowBudget ?? cardConfig7.maxRows);
@@ -11675,7 +12068,7 @@ function ReadyCard({ snapshot: snapshot2, rowBudget, cols }) {
   const agentLookup = agentByName(snapshot2);
   const rows = shown.map((t, i) => [
     t.name,
-    t.status,
+    formatPair(t),
     `ROI ${meta[i]?.roiText ?? ""}`,
     t.title,
     formatAgentRefDisplayName(t.ownerName, agentLookup)
@@ -11698,7 +12091,7 @@ function ReadyCard({ snapshot: snapshot2, rowBudget, cols }) {
         const colors = [
           { bold: true },
           // name
-          { color: inkColorForStatus(t.status) },
+          { color: inkColorForPair(t) },
           // status
           { color: colorForBucket(m.bucket) },
           // roi
@@ -11717,6 +12110,7 @@ var init_ready = __esm({
   "src/cli/tui/cards/ready.tsx"() {
     "use strict";
     init_state();
+    init_status();
     init_format();
     init_agent_display();
     init_columns();
@@ -11772,7 +12166,13 @@ function RecentCard({ snapshot: snapshot2, rowBudget, cols }) {
   const shown = recentClosed.slice(0, rowBudget ?? cardConfig8.maxRows);
   const more = recentClosed.length - shown.length;
   const bottomLabel = more > 0 ? `+${more} more \xB7 Shift+8` : void 0;
-  const rows = shown.map((t, i) => [GLYPH4, t.name, t.status, formatWhen(ages[i] ?? null), t.title]);
+  const rows = shown.map((t, i) => [
+    GLYPH4,
+    t.name,
+    formatPair(t),
+    formatWhen(ages[i] ?? null),
+    t.title
+  ]);
   const widths = layoutColumns(rows, COLUMN_SPECS8, contentWidth);
   return /* @__PURE__ */ jsx13(
     TitledBox,
@@ -11792,7 +12192,7 @@ function RecentCard({ snapshot: snapshot2, rowBudget, cols }) {
           // glyph
           { bold: true },
           // id
-          { color: inkColorForStatus(t.status) },
+          { color: inkColorForPair(t) },
           // status
           { dimColor: true },
           // when
@@ -11814,6 +12214,7 @@ var init_recent = __esm({
   "src/cli/tui/cards/recent.tsx"() {
     "use strict";
     init_glyphs();
+    init_status();
     init_format();
     init_columns();
     init_format_helpers();
@@ -11876,7 +12277,8 @@ function TracksCard({ snapshot: snapshot2, rowBudget, cols }) {
     const goalNames = t.roots.slice(0, 2).map((r) => r.name).join(", ");
     const diamond = t.roots.length > 1 ? GLYPH.merge : " ";
     const taskNoun = t.taskIds.size === 1 ? "task" : "tasks";
-    const counts = `(${t.taskIds.size} ${taskNoun} \xB7 ${t.readyCount} ready)`;
+    const parked = t.parked ? " (parked)" : "";
+    const counts = `(${t.taskIds.size} ${taskNoun} \xB7 ${t.readyCount} ready)${parked}`;
     return [`Track ${i + 1}`, diamond, goalNames, counts];
   });
   const widths = layoutColumns(rows, COLUMN_SPECS9, contentWidth);
@@ -12139,7 +12541,7 @@ var init_keymap_spec = __esm({
     DAG_HINTS = [
       label("drill", "magenta"),
       hint("j/k", "scroll", ["j", "k"]),
-      hint("o/i/c", "filter", ["o", "i", "c"]),
+      hint("o/i/c/p/w", "filter", ["o", "i", "c", "p", "w"]),
       hint("y", "yank", ["y"]),
       hint("?", "help", ["?"]),
       hint("Esc", "back", ["Esc"])
@@ -12147,7 +12549,7 @@ var init_keymap_spec = __esm({
     ALL_TASKS_HINTS = [
       label("drill", "magenta"),
       hint("j/k", "nav", ["j", "k"]),
-      hint("o/i/c", "filter", ["o", "i", "c"]),
+      hint("o/i/c/p/w", "filter", ["o", "i", "c", "p", "w"]),
       hint("s", "sort", ["s"]),
       hint("/", "search", ["/"]),
       hint("Enter", "drill", ["Enter"]),
@@ -12223,7 +12625,11 @@ var init_keymap_spec = __esm({
       {
         title: "keys \xB7 DAG / all-tasks",
         rows: [
-          row("o/i/c", "toggle OPEN / IN_PROGRESS / CLOSED status filters", ["o", "i", "c"]),
+          row(
+            "o/i/c/p/w",
+            "toggle OPEN / IN_PROGRESS / CLOSED status filters; p parked; w won't do (closed, not done)",
+            ["o", "i", "c", "p", "w"]
+          ),
           row("b", "all-tasks blocked filter cycle (all \u2192 only \u2192 hide)", ["b"]),
           row("s", "all-tasks sort cycle (roi \u2192 recency \u2192 age \u2192 id)", ["s"]),
           row("/", "all-tasks row search", ["/"])
@@ -13481,23 +13887,48 @@ function statusForToggleKey(input, key) {
   if (key.ctrl === true || key.meta === true) return void 0;
   return STATUS_BY_KEY[input.toLowerCase()];
 }
+function substateToggleForKey(input, key) {
+  if (key.ctrl === true || key.meta === true) return void 0;
+  return SUBSTATE_BY_KEY[input.toLowerCase()];
+}
+function passesFilter(t, f) {
+  if (!f.statuses.has(t.status)) return false;
+  if (!f.showParked && t.status === "OPEN" && t.substate === "parked") return false;
+  if (!f.showNotDone && t.status === "CLOSED" && t.substate !== "done") return false;
+  return true;
+}
 function useStatusFilter() {
   const [statuses, setStatuses] = useState6(() => new Set(TASK_STATUSES));
+  const [showParked, setShowParked] = useState6(true);
+  const [showNotDone, setShowNotDone] = useState6(true);
   const toggle = useCallback4((status) => {
     setStatuses((prev) => toggleStatusSet(prev, status));
   }, []);
   const onKey = useCallback4(
     (input, key) => {
       const status = statusForToggleKey(input, key);
-      if (status === void 0) return false;
-      toggle(status);
-      return true;
+      if (status !== void 0) {
+        toggle(status);
+        return true;
+      }
+      const sub = substateToggleForKey(input, key);
+      if (sub === "parked") setShowParked((v) => !v);
+      else if (sub === "notDone") setShowNotDone((v) => !v);
+      return sub !== void 0;
     },
     [toggle]
   );
-  return { statuses, toggle, onKey };
+  return { statuses, showParked, showNotDone, toggle, onKey };
 }
-function StatusFilterStrip({ statuses }) {
+function StatusFilterStrip({
+  statuses,
+  showParked = true,
+  showNotDone = true
+}) {
+  const substateOn = {
+    parked: showParked,
+    notDone: showNotDone
+  };
   return /* @__PURE__ */ jsxs11(Box8, { children: [
     /* @__PURE__ */ jsx22(Text15, { dimColor: true, children: "filters: " }),
     TASK_STATUSES.map((status, i) => {
@@ -13512,10 +13943,22 @@ function StatusFilterStrip({ statuses }) {
         /* @__PURE__ */ jsx22(Text15, { children: " " }),
         /* @__PURE__ */ jsx22(Text15, { color: enabled ? "green" : "gray", children: enabled ? GLYPH.on : GLYPH.off })
       ] }, status);
+    }),
+    SUBSTATE_LABELS.map((label2, i) => {
+      const enabled = substateOn[label2.id];
+      return /* @__PURE__ */ jsxs11(Text15, { children: [
+        i === 0 ? "   " : "  ",
+        /* @__PURE__ */ jsx22(Text15, { children: "[" }),
+        /* @__PURE__ */ jsx22(Text15, { color: label2.color, children: label2.key }),
+        /* @__PURE__ */ jsx22(Text15, { children: "]" }),
+        /* @__PURE__ */ jsx22(Text15, { children: label2.rest }),
+        /* @__PURE__ */ jsx22(Text15, { children: " " }),
+        /* @__PURE__ */ jsx22(Text15, { color: enabled ? "green" : "gray", children: enabled ? GLYPH.on : GLYPH.off })
+      ] }, label2.id);
     })
   ] });
 }
-var STATUS_BY_KEY, STATUS_LABELS;
+var STATUS_BY_KEY, STATUS_LABELS, SUBSTATE_BY_KEY, SUBSTATE_LABELS;
 var init_use_status_filter = __esm({
   "src/cli/tui/use-status-filter.tsx"() {
     "use strict";
@@ -13532,6 +13975,12 @@ var init_use_status_filter = __esm({
       IN_PROGRESS: { key: "I", rest: "n_progress" },
       CLOSED: { key: "C", rest: "losed" }
     };
+    SUBSTATE_BY_KEY = { p: "parked", w: "notDone" };
+    SUBSTATE_LABELS = [
+      { id: "parked", key: "P", rest: "arked", color: "gray" },
+      // Covers every non-done close (rejected, wontfix, duplicate, superseded).
+      { id: "notDone", key: "W", rest: "on't do", color: "red" }
+    ];
   }
 });
 
@@ -13558,6 +14007,8 @@ function AllTasksPopup({
   const [sortKey, setSortKey] = useState7("roi");
   const flt = usePopupFilter({ onEditingChange: onFilterEditingChange });
   const statusFilter = useStatusFilter();
+  const { statuses, showParked, showNotDone } = statusFilter;
+  const filterStrip = /* @__PURE__ */ jsx23(StatusFilterStrip, { statuses, showParked, showNotDone });
   const sourceTasks = useMemo5(
     () => allTasksFromSnapshotOrDb(snapshot2, db, workstream),
     [snapshot2, db, workstream]
@@ -13568,15 +14019,26 @@ function AllTasksPopup({
   );
   const [blockedFilter, setBlockedFilter] = useState7("all");
   const visibleTasks = useMemo5(() => {
-    const filteredByStatus = sourceTasks.filter((t) => statusFilter.statuses.has(t.status));
+    const filteredByStatus = sourceTasks.filter(
+      (t) => passesFilter(t, { statuses, showParked, showNotDone })
+    );
     const filteredByBlocked = applyBlockedFilter(filteredByStatus, blockedNames, blockedFilter);
     const filteredByText = applyFilter(
       filteredByBlocked,
       flt.query,
-      (t) => `${t.name} ${t.title} ${t.status} ${t.ownerName ?? ""}`
+      (t) => `${t.name} ${t.title} ${formatPair(t)} ${t.ownerName ?? ""}`
     );
     return sortTasks(filteredByText, sortKey);
-  }, [sourceTasks, statusFilter.statuses, blockedFilter, blockedNames, flt.query, sortKey]);
+  }, [
+    sourceTasks,
+    statuses,
+    showParked,
+    showNotDone,
+    blockedFilter,
+    blockedNames,
+    flt.query,
+    sortKey
+  ]);
   const safeCursor = visibleTasks.length === 0 ? 0 : Math.min(cursor, visibleTasks.length - 1);
   const focused = visibleTasks[safeCursor];
   const [drilledTask, setDrilledTask] = useState7(null);
@@ -13646,7 +14108,7 @@ function AllTasksPopup({
   }
   if (sourceTasks.length === 0) {
     return /* @__PURE__ */ jsx23(PopupShell, { title: "All tasks \xB7 popup", children: /* @__PURE__ */ jsxs12(Box9, { flexDirection: "column", flexGrow: 1, children: [
-      /* @__PURE__ */ jsx23(StatusFilterStrip, { statuses: statusFilter.statuses }),
+      filterStrip,
       /* @__PURE__ */ jsx23(BlockedFilterStrip, { mode: blockedFilter }),
       /* @__PURE__ */ jsx23(SortStrip, { sortKey, visible: 0, total: 0 }),
       /* @__PURE__ */ jsx23(Text16, { dimColor: true, children: "(no tasks)" })
@@ -13655,7 +14117,7 @@ function AllTasksPopup({
   if (visibleTasks.length === 0) {
     return /* @__PURE__ */ jsxs12(PopupShell, { title: "All tasks \xB7 popup", children: [
       /* @__PURE__ */ jsxs12(Box9, { flexDirection: "column", flexGrow: 1, children: [
-        /* @__PURE__ */ jsx23(StatusFilterStrip, { statuses: statusFilter.statuses }),
+        filterStrip,
         /* @__PURE__ */ jsx23(BlockedFilterStrip, { mode: blockedFilter }),
         /* @__PURE__ */ jsx23(SortStrip, { sortKey, visible: 0, total: sourceTasks.length }),
         /* @__PURE__ */ jsx23(Text16, { dimColor: true, children: flt.query === "" ? "(no tasks match status filter)" : `(no matches for "${flt.query}")` })
@@ -13682,7 +14144,7 @@ function AllTasksPopup({
   const agentLookup = agentByName(snapshot2);
   const rows = windowed.map((t) => [
     t.name,
-    blockedNames.has(t.name) ? `${t.status} ${GLYPH.blocked}` : t.status,
+    statusCell(t, blockedNames.has(t.name)),
     formatAgentRefDisplayName(t.ownerName, agentLookup),
     formatRoi(t.impact, t.effortDays),
     t.title
@@ -13695,7 +14157,7 @@ function AllTasksPopup({
       hint: focused ? allTasksYankCommand(focused.name, workstream) : void 0,
       children: [
         /* @__PURE__ */ jsxs12(Box9, { flexDirection: "column", flexGrow: 1, children: [
-          /* @__PURE__ */ jsx23(StatusFilterStrip, { statuses: statusFilter.statuses }),
+          filterStrip,
           /* @__PURE__ */ jsx23(BlockedFilterStrip, { mode: blockedFilter }),
           /* @__PURE__ */ jsx23(SortStrip, { sortKey, visible: visibleTasks.length, total: sourceTasks.length }),
           windowed.map((t, i) => {
@@ -13706,7 +14168,7 @@ function AllTasksPopup({
             const colors = [
               { bold: true },
               // id
-              { color: isBlocked ? "yellow" : inkColorForStatus(t.status) },
+              { color: isBlocked ? "yellow" : inkColorForPair(t) },
               // status + blocked glyph
               { dimColor: true },
               // owner
@@ -13732,6 +14194,11 @@ function AllTasksPopup({
     }
   );
 }
+function statusCell(t, blocked) {
+  const pair = formatPair(t);
+  const parked = t.status === "OPEN" && t.substate === "parked" ? `${GLYPH.parked} ` : "";
+  return `${parked}${pair}${blocked ? ` ${GLYPH.blocked}` : ""}`;
+}
 function allTasksFromSnapshotOrDb(snapshot2, db, workstream) {
   if (snapshot2?.allTasks && snapshot2.allTasks.length > 0) return snapshot2.allTasks;
   return listTasks(db, workstream);
@@ -13806,6 +14273,7 @@ var init_all_tasks = __esm({
     "use strict";
     init_glyphs();
     init_sort();
+    init_status();
     init_tasks();
     init_format();
     init_agent_display();
@@ -14013,10 +14481,7 @@ function BlockedPopup(props) {
     const m = /* @__PURE__ */ new Map();
     for (const t of sourceTasks) {
       const gating = stillGating(getTaskEdgesWithStatus(db, t.name, workstream).blockers);
-      m.set(
-        t.name,
-        gating.map((b) => b.name)
-      );
+      m.set(t.name, gating.map(blockerLabel));
     }
     return m;
   }, [sourceTasks, db, workstream]);
@@ -14041,7 +14506,7 @@ function BlockedPopup(props) {
           cells: [
             GLYPH2,
             t.name,
-            t.status,
+            formatPair(t),
             String(blockers.length),
             top,
             formatRoi(t.impact, t.effortDays),
@@ -14052,7 +14517,7 @@ function BlockedPopup(props) {
             // glyph
             { bold: true },
             // name
-            { color: inkColorForStatus(t.status) },
+            { color: inkColorForPair(t) },
             // status
             { color: "yellow" },
             // nblock
@@ -14075,6 +14540,7 @@ var init_blocked2 = __esm({
   "src/cli/tui/popups/blocked.tsx"() {
     "use strict";
     init_state();
+    init_status();
     init_tasks();
     init_format();
     init_blocked();
@@ -14473,12 +14939,13 @@ function DagPopup({
 }) {
   const viewport = usePopupViewport();
   const statusFilter = useStatusFilter();
+  const { statuses, showParked, showNotDone } = statusFilter;
   const { cols } = useTerminalSize();
   const contentWidth = contentWidthFromCols(cols);
   const { body, roots } = useMemo7(() => {
     void fastTickNonce;
-    return buildDagBody(db, workstream, statusFilter.statuses, contentWidth);
-  }, [db, workstream, statusFilter.statuses, contentWidth, fastTickNonce]);
+    return buildDagBody(db, workstream, { statuses, showParked, showNotDone }, contentWidth);
+  }, [db, workstream, statuses, showParked, showNotDone, contentWidth, fastTickNonce]);
   const [focusedRoot, setFocusedRoot] = useState10(() => roots[0] ?? null);
   const lineToRootRef = useRef5([]);
   const rootsRef = useRef5([]);
@@ -14507,12 +14974,19 @@ function DagPopup({
   });
   if (roots.length === 0) {
     return /* @__PURE__ */ jsx27(PopupShell, { title: `DAG \xB7 ${workstream}`, children: /* @__PURE__ */ jsxs15(Box12, { flexDirection: "column", flexGrow: 1, children: [
-      /* @__PURE__ */ jsx27(StatusFilterStrip, { statuses: statusFilter.statuses }),
+      /* @__PURE__ */ jsx27(
+        StatusFilterStrip,
+        {
+          statuses,
+          showParked,
+          showNotDone
+        }
+      ),
       /* @__PURE__ */ jsx27(Text19, { dimColor: true, children: "(no tasks)" })
     ] }) });
   }
   return /* @__PURE__ */ jsx27(PopupShell, { title: `DAG \xB7 ${workstream}`, hint: "y yanks `mu task tree <root-id>`", children: /* @__PURE__ */ jsxs15(Box12, { flexDirection: "column", flexGrow: 1, children: [
-    /* @__PURE__ */ jsx27(StatusFilterStrip, { statuses: statusFilter.statuses }),
+    /* @__PURE__ */ jsx27(StatusFilterStrip, { statuses, showParked, showNotDone }),
     /* @__PURE__ */ jsx27(
       DrillScrollView,
       {
@@ -14530,9 +15004,10 @@ function DagPopup({
 function dagYankCommand(taskId, workstream) {
   return `mu task tree ${taskId} -w ${workstream}`;
 }
-function buildDagBody(db, workstream, statuses, contentWidth = contentWidthFromCols(80)) {
-  const dag = loadFullDag(db, workstream, { statuses });
-  const body = renderForest(dag.roots, dag.edges, (task) => colorStatus(task.status), dag.tasks, {
+function buildDagBody(db, workstream, filter, contentWidth = contentWidthFromCols(80)) {
+  const f = "statuses" in filter ? filter : { statuses: filter, showParked: true, showNotDone: true };
+  const dag = loadFullDag(db, workstream, { include: (t) => passesFilter(t, f) });
+  const body = renderForest(dag.roots, dag.edges, (task) => colorPair(task), dag.tasks, {
     includeTitle: false
   });
   return {
@@ -14768,6 +15243,7 @@ var COLUMN_SPECS16, config;
 var init_inprogress2 = __esm({
   "src/cli/tui/popups/inprogress.tsx"() {
     "use strict";
+    init_status();
     init_format();
     init_agent_display();
     init_inprogress();
@@ -14808,7 +15284,7 @@ var init_inprogress2 = __esm({
             cells: [
               GLYPH3,
               t.name,
-              t.status,
+              formatPair(t),
               formatAgentRefDisplayName(t.ownerName, agentLookup),
               formatSinceClaim(age),
               formatRoi(t.impact, t.effortDays),
@@ -14819,7 +15295,7 @@ var init_inprogress2 = __esm({
               // glyph
               { bold: true },
               // id
-              { color: inkColorForStatus(t.status) },
+              { color: inkColorForPair(t) },
               // status
               { dimColor: true },
               // owner
@@ -15032,6 +15508,7 @@ function ReadyPopup(props) {
 function yankCommandForTask2(t, ws) {
   switch (t.status) {
     case "OPEN":
+      if (t.substate === "parked") return `mu task unpark ${t.name} -w ${ws}`;
       return t.ownerName === null ? `mu task claim ${t.name} -w ${ws}` : `mu task release ${t.name} -w ${ws}`;
     case "IN_PROGRESS":
       return `mu task close ${t.name} -w ${ws} --evidence "..."`;
@@ -15045,6 +15522,7 @@ var COLUMN_SPECS18, config2;
 var init_ready2 = __esm({
   "src/cli/tui/popups/ready.tsx"() {
     "use strict";
+    init_status();
     init_format();
     init_agent_display();
     init_task_list_popup();
@@ -15062,18 +15540,18 @@ var init_ready2 = __esm({
       label: "Tasks",
       sourceTasks: (snapshot2) => [...snapshot2.ready, ...snapshot2.inProgress],
       columnSpecs: COLUMN_SPECS18,
-      filterBlob: (t) => `${t.name} ${t.title} ${t.status} ${t.ownerName ?? ""}`,
+      filterBlob: (t) => `${t.name} ${t.title} ${formatPair(t)} ${t.ownerName ?? ""}`,
       emptyText: "(no open / in-progress tasks)",
       yankCommand: (t, ws) => yankCommandForTask2(t, ws),
       dynamicHint: (focused, ws) => yankCommandForTask2(focused, ws),
       renderRows: (visible, _start, snapshot2) => {
         const agentLookup = agentByName(snapshot2);
         return visible.map((t) => ({
-          cells: [t.name, t.status, formatAgentRefDisplayName(t.ownerName, agentLookup), t.title],
+          cells: [t.name, formatPair(t), formatAgentRefDisplayName(t.ownerName, agentLookup), t.title],
           colors: [
             { bold: true },
             // name
-            { color: inkColorForStatus(t.status) },
+            { color: inkColorForPair(t) },
             // status
             { dimColor: true },
             // owner
@@ -15098,6 +15576,7 @@ var COLUMN_SPECS19, config3;
 var init_recent2 = __esm({
   "src/cli/tui/popups/recent.tsx"() {
     "use strict";
+    init_status();
     init_format();
     init_recent();
     init_format_helpers();
@@ -15135,7 +15614,7 @@ var init_recent2 = __esm({
           cells: [
             GLYPH4,
             t.name,
-            t.status,
+            formatPair(t),
             formatWhen(ageMs(t, now)),
             String(t.impact),
             String(t.effortDays),
@@ -15147,7 +15626,7 @@ var init_recent2 = __esm({
             // glyph
             { bold: true },
             // id
-            { color: inkColorForStatus(t.status) },
+            { color: inkColorForPair(t) },
             // status
             { dimColor: true },
             // when
@@ -15170,6 +15649,16 @@ var init_recent2 = __esm({
 import { Box as Box15, Text as Text22, useInput as useInput9 } from "ink";
 import { useEffect as useEffect8, useMemo as useMemo8, useState as useState13 } from "react";
 import { jsx as jsx33, jsxs as jsxs18 } from "react/jsx-runtime";
+function drillColors(t) {
+  return [
+    { bold: true },
+    // name
+    { color: inkColorForPair(t) },
+    // status
+    void 0
+    // title
+  ];
+}
 function TracksPopup({
   yank: yank2,
   onClose,
@@ -15204,7 +15693,7 @@ function TracksPopup({
   const drillTasks = useMemo8(() => {
     if (mode !== "drill" || !focusedTrack) return [];
     const out = listTasks(db, workstream).filter((task) => focusedTrack.taskIds.has(task.name));
-    out.sort((a, b) => statusRank(a.status) - statusRank(b.status) || a.name.localeCompare(b.name));
+    out.sort((a, b) => statusRank(a) - statusRank(b) || a.name.localeCompare(b.name));
     return out;
   }, [mode, focusedTrack, db, workstream]);
   const focusedTask = drillTasks[drillCursor];
@@ -15330,7 +15819,7 @@ function TracksPopup({
       return /* @__PURE__ */ jsx33(PopupShell, { title: `${trackLabel} \xB7 ${goalSummary}`, children: /* @__PURE__ */ jsx33(Text22, { dimColor: true, children: "(no tasks resolved)" }) });
     }
     const { visible: visible2 } = centredVisibleSlice(drillTasks, drillCursor, viewport);
-    const rows2 = visible2.map((t) => [t.name, t.status, t.title]);
+    const rows2 = visible2.map((t) => [t.name, formatPair(t), t.title]);
     const widths2 = layoutColumns(rows2, DRILL_COLUMN_SPECS, contentWidth);
     return /* @__PURE__ */ jsxs18(
       PopupShell,
@@ -15347,7 +15836,7 @@ function TracksPopup({
               {
                 cells: padded,
                 contentWidth,
-                colors: DRILL_COLORS,
+                colors: drillColors(t),
                 selected: sel
               },
               t.name
@@ -15363,7 +15852,7 @@ function TracksPopup({
     const absoluteIndex = start + i;
     const goalNames = t.roots.map((r) => r.name).join(", ");
     const diamond = t.roots.length > 1 ? GLYPH.merge : " ";
-    const counts = `(${t.taskIds.size} tasks \xB7 ${t.readyCount} ready)`;
+    const counts = `(${t.taskIds.size} tasks \xB7 ${t.readyCount} ready)${t.parked ? " (parked)" : ""}`;
     return [`Track ${absoluteIndex + 1}`, diamond, goalNames, counts];
   });
   const widths = layoutColumns(rows, COLUMN_SPECS20, contentWidth);
@@ -15394,24 +15883,24 @@ function TracksPopup({
     }
   );
 }
-function statusRank(status) {
-  switch (status) {
+function statusRank(pair) {
+  switch (pair.status) {
     case "IN_PROGRESS":
       return 0;
     case "OPEN":
-      return 1;
+      return pair.substate === "parked" ? 2 : 1;
     case "CLOSED":
-      return 2;
-    default:
       return 3;
   }
 }
-var COLUMN_SPECS20, DRILL_COLUMN_SPECS, TRACK_COLORS, DRILL_COLORS;
+var COLUMN_SPECS20, DRILL_COLUMN_SPECS, TRACK_COLORS;
 var init_tracks3 = __esm({
   "src/cli/tui/popups/tracks.tsx"() {
     "use strict";
     init_glyphs();
+    init_status();
     init_tasks();
+    init_format();
     init_columns();
     init_keys();
     init_list_row();
@@ -15451,14 +15940,6 @@ var init_tracks3 = __esm({
       { dimColor: true }
       // counts
     ];
-    DRILL_COLORS = [
-      { bold: true },
-      // name
-      { dimColor: true },
-      // status
-      void 0
-      // title
-    ];
   }
 });
 
@@ -16078,6 +16559,7 @@ function snapshotKey(s) {
     tracks: s.tracks.map((t) => ({
       roots: t.roots.map((r) => r.name),
       readyCount: t.readyCount,
+      parked: t.parked,
       // Set → sorted array; deterministic JSON.
       taskIds: [...t.taskIds].sort()
     })),
@@ -16085,6 +16567,7 @@ function snapshotKey(s) {
     inProgress: s.inProgress.map(taskKey2),
     blocked: s.blocked.map(taskKey2),
     recentClosed: s.recentClosed.map(taskKey2),
+    parkedCount: s.parkedCount,
     allTasks: s.allTasks.map(taskKey2),
     commitsBackend: s.commitsBackend ?? null,
     recentCommits: s.recentCommits.map((c) => [c.sha, c.subject, c.author, c.relTime]),
@@ -16107,6 +16590,7 @@ function taskKey2(t) {
   return [
     t.name,
     t.status,
+    t.substate,
     t.impact,
     t.effortDays,
     t.ownerName ?? "",
@@ -17093,7 +17577,7 @@ function partitionEdges(edges) {
 function formatEdgeList(edges, dim) {
   if (edges.length === 0) return pc.dim("\u2014");
   const parts = edges.map((e) => {
-    const piece = `${e.name} [${colorStatus(e.status)}]`;
+    const piece = `${e.name} [${colorPair(e)}]`;
     return dim ? pc.dim(piece) : piece;
   });
   return parts.join(", ");
@@ -17231,7 +17715,7 @@ async function cmdTaskShow(db, rawId, opts = {}) {
   const roi = task.effortDays > 0 ? (task.impact / task.effortDays).toFixed(1) : "\u221E";
   console.log(pc.bold(`${task.name}  \u2014  ${task.title}`));
   console.log(`  workstream : ${task.workstreamName}`);
-  console.log(`  status     : ${task.status}`);
+  console.log(`  status     : ${colorPair(task)}`);
   const ownerLine = task.ownerName !== null ? task.ownerName : lastActor !== null ? pc.dim(`(self: ${lastActor})`) : pc.dim("(unowned)");
   console.log(`  owner      : ${ownerLine}`);
   console.log(`  impact     : ${task.impact}`);
@@ -17261,6 +17745,14 @@ async function cmdTaskShow(db, rawId, opts = {}) {
   } else {
     for (const n of notes) printNote(n);
   }
+  const ref = `${task.name} -w ${task.workstreamName}`;
+  if (task.substate === "parked") {
+    console.log("");
+    printNextSteps([{ intent: "Return it to next", command: `mu task unpark ${ref}` }]);
+  } else if (task.status === "CLOSED" && task.substate !== "done") {
+    console.log("");
+    printNextSteps([{ intent: "Reopen it", command: `mu task open ${ref}` }]);
+  }
 }
 async function cmdTaskNotes(db, rawId, opts = {}) {
   if (opts.since !== void 0 && opts.sinceClaim === true) {
@@ -17368,6 +17860,8 @@ async function cmdTaskList(db, opts) {
   if (statuses !== void 0) {
     listOpts.status = statuses;
   }
+  const substates = parseSubstatesOption(opts.substate);
+  if (substates !== void 0) listOpts.substate = substates;
   const sortKey = opts.sort === void 0 ? "id" : parseSortOption(opts.sort);
   const tasks = sortTasks(listTasks(db, workstream, listOpts), sortKey);
   if (opts.json) {
@@ -17389,6 +17883,8 @@ async function cmdTaskNext(db, opts) {
   if (statuses !== void 0) {
     readyOpts.status = statuses;
   }
+  const substates = parseSubstatesOption(opts.substate);
+  if (substates !== void 0) readyOpts.substate = substates;
   const sorted = sortTasks(listReady(db, workstream, readyOpts), sortKey);
   const tasks = k === 0 ? sorted : sorted.slice(0, k);
   if (opts.json) {
@@ -17396,7 +17892,18 @@ async function cmdTaskNext(db, opts) {
     return;
   }
   if (tasks.length === 0) {
-    console.log(pc.dim("(no ready tasks)"));
+    const parked = listTasks(db, workstream, { substate: "parked" }).length;
+    if (parked === 0) {
+      console.log(pc.dim("(no ready tasks)"));
+      return;
+    }
+    console.log(pc.dim(`(no ready tasks; ${parked} parked)`));
+    printNextSteps([
+      {
+        intent: "List parked tasks",
+        command: `mu task list --substate parked -w ${workstream}`
+      }
+    ]);
     return;
   }
   const tableOpts = {};
@@ -17419,6 +17926,7 @@ async function cmdTaskOwnedBy(db, agent, opts = {}) {
 }
 
 // src/cli/tasks/wire.ts
+init_status();
 init_tasks();
 
 // src/cli/tasks/claim.ts
@@ -17502,6 +18010,7 @@ async function cmdClaim(db, rawId, opts) {
   }
   const sdkOpts = { workstream: ws };
   if (forName !== void 0) sdkOpts.agentName = forName;
+  if (opts.force) sdkOpts.force = true;
   if (forWorkstream !== void 0) sdkOpts.agentWorkstream = forWorkstream;
   if (opts.self) sdkOpts.self = true;
   if (opts.actor !== void 0) sdkOpts.actor = opts.actor;
@@ -17567,6 +18076,9 @@ async function cmdClaim(db, rawId, opts) {
 function qualifiedId(ref) {
   return `${ref.workstreamName}/${ref.name}`;
 }
+function isUndelivered(ref) {
+  return ref.status === "CLOSED" && ref.substate !== "done";
+}
 function cherryPickCommandForCommits(commits) {
   const first = commits[0];
   if (first === void 0) return null;
@@ -17680,7 +18192,12 @@ async function cmdTaskWait(db, ids, opts) {
   const reachedRefs = result.refs.filter((t) => t.reachedTarget);
   const unmetRefs = result.refs.filter((t) => !t.reachedTarget);
   const nextSteps3 = [];
-  if (!result.timedOut && firingRef !== null) {
+  if (!result.timedOut && firingRef !== null && isUndelivered(firingRef)) {
+    nextSteps3.push({
+      intent: `Read why ${firingRef.name} closed ${formatPair(firingRef)} (no deliverable)`,
+      command: `mu task notes ${firingRef.name} -w ${firingRef.workstreamName}`
+    });
+  } else if (!result.timedOut && firingRef !== null) {
     const owner = firingRef.owner;
     if (owner !== null) {
       nextSteps3.push(await nextStepForFiringOwner(db, owner, firingRef.workstreamName));
@@ -17728,6 +18245,7 @@ async function cmdTaskWait(db, ids, opts) {
       name: firingRef.name,
       qualifiedId: qualifiedId(firingRef),
       status: firingRef.status,
+      substate: firingRef.substate,
       owner: firingRef.owner
     };
     const timedOutArray = result.timedOut ? unmetRefs.map((t) => ({ ...t, qualifiedId: qualifiedId(t) })) : [];
@@ -17755,7 +18273,7 @@ async function cmdTaskWait(db, ids, opts) {
   for (const t of result.refs) {
     const marker = t.reachedTarget ? pc.green(GLYPH.ok) : pc.dim("\u2022");
     const label2 = workstreamSet.size > 1 ? qualifiedId(t) : t.name;
-    console.log(`  ${marker} ${pc.bold(label2)} ${pc.dim(`(${t.status})`)}`);
+    console.log(`  ${marker} ${pc.bold(label2)} ${pc.dim(`(${formatPair(t)})`)}`);
   }
   printNextSteps(nextSteps3);
   if (result.timedOut) throw new CliExitError(5);
@@ -17932,6 +18450,7 @@ async function cmdTaskDelete(db, rawId, opts = {}) {
 // src/cli/tasks/lifecycle.ts
 init_agents();
 init_output();
+init_status();
 init_tasks();
 init_vcs2();
 init_workspace();
@@ -17943,6 +18462,9 @@ async function cmdTaskClose(db, rawId, opts = {}) {
   const sdkOpts = { workstream: ws };
   if (opts.evidence !== void 0) sdkOpts.evidence = opts.evidence;
   if (opts.ifReady) sdkOpts.ifReady = true;
+  if (opts.as !== void 0) sdkOpts.as = opts.as.toLowerCase();
+  if (opts.why !== void 0) sdkOpts.why = opts.why;
+  if (opts.why !== void 0 && opts.why !== "") sdkOpts.author = actor;
   if (opts.evidence !== void 0 && opts.evidence !== "") {
     sdkOpts.author = actor;
   }
@@ -17976,9 +18498,16 @@ async function cmdTaskClose(db, rawId, opts = {}) {
     return;
   }
   if (r.changed && taskRow?.ownerName) await refreshAgentTitle(db, taskRow.ownerName, ws);
+  const pickNext = {
+    intent: r.unblocked.length > 0 ? "Pick up an unblocked task" : "Pick the next ready task",
+    command: `mu task next -w ${ws}`
+  };
+  const reopen = {
+    intent: "Reopen if needed",
+    command: `mu task open ${localId} -w ${ws}`
+  };
   const nextSteps3 = [
-    { intent: "Reopen if needed", command: `mu task open ${localId} -w ${ws}` },
-    { intent: "Pick the next ready task", command: `mu task next -w ${ws}` },
+    ...r.unblocked.length > 0 ? [pickNext, reopen] : [reopen, pickNext],
     { intent: "See full state", command: `mu state -w ${ws}` }
   ];
   if (r.changed && r.status === "CLOSED") {
@@ -17994,10 +18523,15 @@ async function cmdTaskClose(db, rawId, opts = {}) {
     return;
   }
   const ev = opts.evidence ? pc.dim(`  evidence: ${opts.evidence}`) : "";
-  console.log(`Closed ${pc.bold(localId)} ${pc.dim(`(${r.previousStatus} \u2192 ${r.status})`)}`);
+  console.log(`Closed ${pc.bold(localId)} ${pc.dim(`(${transition(r)})`)}`);
   if (ev) console.log(ev);
+  if (r.unblocked.length > 0) console.log(`Unblocked: ${r.unblocked.join(", ")}`);
   printNextSteps(nextSteps3);
 }
+function transition(r) {
+  const from = formatPair({ status: r.previousStatus, substate: r.previousSubstate });
+  return `${from} \u2192 ${formatPair({ status: r.status, substate: r.substate })}`;
+}
 async function maybeAppendDirtyWorkspaceCommitHint(db, nextSteps3, actor, workstream, taskTitle) {
   if (actor.length === 0) return;
   try {
@@ -18040,10 +18574,62 @@ async function cmdTaskOpen(db, rawId, opts = {}) {
     return;
   }
   const ev = opts.evidence ? pc.dim(`  evidence: ${opts.evidence}`) : "";
-  console.log(`Reopened ${pc.bold(localId)} ${pc.dim(`(${r.previousStatus} \u2192 ${r.status})`)}`);
+  console.log(`Reopened ${pc.bold(localId)} ${pc.dim(`(${transition(r)})`)}`);
   if (ev) console.log(ev);
   printNextSteps(nextSteps3);
 }
+async function cmdTaskPark(db, rawId, opts) {
+  const { name: localId } = await resolveEntityRef(db, rawId, opts, "task");
+  assertTaskInWorkstream(db, localId, opts.workstream);
+  const ws = await resolveWorkstream(opts.workstream);
+  const sdkOpts = {
+    workstream: ws,
+    why: opts.why,
+    author: await resolveActorIdentity()
+  };
+  if (opts.evidence !== void 0) sdkOpts.evidence = opts.evidence;
+  const r = parkTask(db, localId, sdkOpts);
+  const nextSteps3 = [
+    { intent: "Unpark it later", command: `mu task unpark ${localId} -w ${ws}` },
+    { intent: "List parked tasks", command: `mu task list --substate parked -w ${ws}` }
+  ];
+  if (opts.json) {
+    emitJson({ taskName: localId, ...r, nextSteps: nextSteps3 });
+    return;
+  }
+  if (!r.changed) {
+    console.log(pc.dim(`${localId} already OPEN/parked (no-op)`));
+  } else {
+    console.log(`Parked ${pc.bold(localId)} ${pc.dim(`(${transition(r)})`)}`);
+  }
+  printNextSteps(nextSteps3);
+}
+async function cmdTaskUnpark(db, rawId, opts = {}) {
+  const { name: localId } = await resolveEntityRef(db, rawId, opts, "task");
+  assertTaskInWorkstream(db, localId, opts.workstream);
+  const ws = await resolveWorkstream(opts.workstream);
+  const sdkOpts = { workstream: ws };
+  if (opts.evidence !== void 0) sdkOpts.evidence = opts.evidence;
+  const r = unparkTask(db, localId, sdkOpts);
+  const nextSteps3 = [
+    {
+      intent: "Claim it",
+      command: `mu task claim ${localId} -w ${ws}  (--self / --for <worker>)`
+    },
+    { intent: "Pick the next ready task", command: `mu task next -w ${ws}` }
+  ];
+  if (opts.json) {
+    emitJson({ taskName: localId, ...r, nextSteps: nextSteps3 });
+    return;
+  }
+  if (!r.changed) {
+    const pair = formatPair({ status: r.status, substate: r.substate });
+    console.log(pc.dim(`${localId} is ${pair}, not parked (no-op)`));
+  } else {
+    console.log(`Unparked ${pc.bold(localId)} ${pc.dim(`(${transition(r)})`)}`);
+  }
+  printNextSteps(nextSteps3);
+}
 
 // src/cli/tasks/tree.ts
 init_dag();
@@ -18068,13 +18654,7 @@ async function cmdTaskTree(db, rawId, opts) {
   const swapHint = down ? "swap to --no-down for blockers" : "--down for dependents";
   console.log(pc.bold(`Tree of ${rootId}  ${pc.dim(`(${direction} below; ${swapHint})`)}`));
   console.log(
-    renderTaskTree(
-      db,
-      ws,
-      root,
-      down ? "dependents" : "blockers",
-      (task) => colorStatus(task.status)
-    )
+    renderTaskTree(db, ws, root, down ? "dependents" : "blockers", (task) => colorPair(task))
   );
 }
 function buildJsonTree(db, workstream, taskId, down, seen) {
@@ -18107,10 +18687,11 @@ function wireTaskCommands(program) {
     return handle((db) => cmdTaskAdd(db, id, opts), this)();
   });
   const SORT_OPT_DESC = `sort key (${TASK_SORT_KEYS.join(" | ")})`;
+  const SUBSTATE_OPT_DESC = `filter by substate (${[...new Set(Object.values(TASK_SUBSTATES).flat())].join(" | ")}; repeat or comma-separate)`;
   task.command("list").description("List every task in the current workstream (id, status, ROI, owner)").option(...WORKSTREAM_OPT).option(
     "--status <status...>",
     `filter by lifecycle status (${TASK_STATUS_LIST}; case-insensitive; repeat or comma-separate; or both)`
-  ).option("--sort <key>", `${SORT_OPT_DESC} (default id)`).option(...JSON_OPT).action(function() {
+  ).option("--substate <substate...>", SUBSTATE_OPT_DESC).option("--sort <key>", `${SORT_OPT_DESC} (default id)`).option(...JSON_OPT).action(function() {
     const opts = this.opts();
     return handle((db) => cmdTaskList(db, opts), this)();
   });
@@ -18123,7 +18704,7 @@ function wireTaskCommands(program) {
   ).option(...WORKSTREAM_OPT).option("--sort <key>", `${SORT_OPT_DESC} (default roi)`).option(
     "--status <status...>",
     `filter by lifecycle status (${TASK_STATUS_LIST}; case-insensitive; repeat or comma-separate; or both)`
-  ).option(...JSON_OPT).action(function() {
+  ).option("--substate <substate...>", SUBSTATE_OPT_DESC).option(...JSON_OPT).action(function() {
     const opts = this.opts();
     return handle((db) => cmdTaskNext(db, opts), this)();
   });
@@ -18185,8 +18766,11 @@ function wireTaskCommands(program) {
     "record what the caller observed (e.g. 'tests pass: npm test exit 0'); appears verbatim in the event log"
   ];
   task.command("close <id>").description(
-    "Mark a task CLOSED (idempotent). --if-ready no-ops unless every blocker is CLOSED \u2014 the umbrella-on-wave-done pattern."
+    "Mark a task CLOSED (idempotent). --as records why it closed (not every close is done work); any CLOSED substate satisfies blockers. --if-ready no-ops unless every blocker is CLOSED \u2014 the umbrella-on-wave-done pattern."
   ).option(
+    "--as <substate>",
+    `closing substate (${TASK_SUBSTATES.CLOSED.join(" | ")}; default done)`
+  ).option("--why <text>", "reason, stored as a note; required unless --as done").option(
     "--if-ready",
     "only close when every blocker is CLOSED; otherwise no-op + list the still-blocking ids"
   ).option(...WORKSTREAM_OPT).option(...EVIDENCE_OPT).option(...JSON_OPT).action(function(id) {
@@ -18197,6 +18781,16 @@ function wireTaskCommands(program) {
     const opts = this.opts();
     return handle((db) => cmdTaskOpen(db, id, opts), this)();
   });
+  task.command("park <id>").description(
+    "Park an OPEN task (OPEN/parked): it leaves `next` and `claim` refuses it without --force. Dependents stay blocked. Idempotent."
+  ).requiredOption("--why <text>", "why it is parked; stored as a note").option(...WORKSTREAM_OPT).option(...EVIDENCE_OPT).option(...JSON_OPT).action(function(id) {
+    const opts = this.opts();
+    return handle((db) => cmdTaskPark(db, id, opts), this)();
+  });
+  task.command("unpark <id>").description("Return a parked task to OPEN (back in `next`). No-op on any other state.").option(...WORKSTREAM_OPT).option(...EVIDENCE_OPT).option(...JSON_OPT).action(function(id) {
+    const opts = this.opts();
+    return handle((db) => cmdTaskUnpark(db, id, opts), this)();
+  });
   task.command("release <id>").description(
     "Clear a task's owner. IN_PROGRESS auto-flips to OPEN so the task re-enters the ready set; other statuses preserved. Use --reopen to force OPEN from CLOSED. Idempotent."
   ).option(
@@ -18217,7 +18811,7 @@ function wireTaskCommands(program) {
   ).option(
     "--actor <name>",
     "override the actor name used for the log (only valid with --self; defaults to pane title or $USER)"
-  ).option(
+  ).option("--force", "claim even when the task is parked (OPEN/parked)").option(
     "--strict-staleness",
     "refuse --for dispatch when the target agent's workspace is stale (default: warn and proceed)"
   ).option(...WORKSTREAM_OPT).option(...EVIDENCE_OPT).option(...JSON_OPT).action(function(taskId) {
@@ -18859,6 +19453,7 @@ init_tasks();
 import { CommanderError } from "commander";
 
 // src/undo.ts
+init_apply();
 init_db();
 init_legacy_ops();
 init_logs();
@@ -19037,13 +19632,13 @@ function planUndo(db, groupId) {
       if (Object.keys(fields3).length === 0) fields3 = payloadFields(row2.payload);
       if (Object.keys(fields3).length === 0 && row2.entity === "note") {
         const recovered = recoverLegacyNoteContents(db, row2.key, row2.hlc, seenLegacyNoteTasks);
-        for (const legacy of recovered) {
+        for (const legacy2 of recovered) {
           inverses.push({
             entity: "note",
-            key: legacy.key,
+            key: legacy2.key,
             op: "put",
-            fields: legacy.fields,
-            summary: `note ${legacy.key} (recovered from legacy history)`,
+            fields: legacy2.fields,
+            summary: `note ${legacy2.key} (recovered from legacy history)`,
             supersededBy: []
           });
         }
@@ -19051,7 +19646,11 @@ function planUndo(db, groupId) {
         continue;
       }
       const status = fields3.status;
-      if (typeof status === "string") fields3.status = normalizeTaskStatus(status);
+      const legacy = typeof status === "string" ? mapLegacyStatus(status) : null;
+      if (legacy) {
+        fields3.status = legacy.status;
+        fields3.substate = legacy.substate;
+      }
       const conflicts = laterRowWriters(db, row2.entity, row2.key, row2.hlc, groupId).map((w) => ({
         field: "<row>",
         groupId: w.groupId,
@@ -19271,15 +19870,23 @@ function restoreRow(db, inverse, table) {
       if (id === null) {
         const wsId = ensureWorkstream2(db, parsed.workstream);
         const now = (/* @__PURE__ */ new Date()).toISOString();
+        const pair = resolvePair(
+          String(inverse.fields.status ?? "OPEN"),
+          inverse.fields.substate
+        ) ?? {
+          status: "OPEN",
+          substate: "todo"
+        };
         db.prepare(
-          `INSERT INTO tasks (workstream_id, local_id, title, status, impact, effort_days,
-                              owner_id, created_at, updated_at)
-           VALUES (?, ?, ?, ?, ?, ?, NULL, ?, ?)`
+          `INSERT INTO tasks (workstream_id, local_id, title, status, substate, impact,
+                              effort_days, owner_id, created_at, updated_at)
+           VALUES (?, ?, ?, ?, ?, ?, ?, NULL, ?, ?)`
         ).run(
           wsId,
           parsed.localId,
           String(inverse.fields.title ?? parsed.localId),
-          String(inverse.fields.status ?? "OPEN"),
+          pair.status,
+          pair.substate,
           Number(inverse.fields.impact ?? 50),
           Number(inverse.fields.effort_days ?? 1),
           String(inverse.fields.created_at ?? now),
@@ -19287,7 +19894,8 @@ function restoreRow(db, inverse, table) {
         );
         return true;
       }
-      return updateFields(db, "tasks", "id", id, inverse.fields);
+      const updated = updateFields(db, "tasks", "id", id, inverse.fields);
+      return repairTaskPair(db, id) || updated;
     }
     case "note": {
       const parsed = parseNoteKey2(inverse.key);
@@ -19443,7 +20051,9 @@ function classifyError(err) {
   if (err instanceof AgentNotFoundError || err instanceof TaskNotFoundError || err instanceof WorkstreamNotFoundError || err instanceof WorkspaceNotFoundError) {
     return { label: "not found", exitCode: 3 };
   }
-  if (err instanceof NameAmbiguousError || err instanceof AgentExistsError || err instanceof TaskExistsError || err instanceof TaskAlreadyOwnedError || err instanceof TaskClaimStaleWorkspaceError || err instanceof TaskNotInWorkstreamError || err instanceof AgentNotInWorkstreamError || err instanceof CycleError || err instanceof CrossWorkstreamEdgeError || err instanceof WorkspaceExistsError || err instanceof WorkspacePathNotEmptyError || err instanceof WorkspacePreservedError || err instanceof HomeDirAsProjectRootError || err instanceof WorkspaceVcsRequiredError || err instanceof WorkspaceDirtyError || err instanceof ClaimerNotRegisteredError || err instanceof SchemaTooOldError || err instanceof TaskIdInvalidError || err instanceof WorkstreamExistsError || // Rebuild refuses to overwrite an existing target or to write onto
+  if (err instanceof NameAmbiguousError || err instanceof AgentExistsError || err instanceof TaskExistsError || err instanceof TaskAlreadyOwnedError || // Substate refusals (ts_4): a missing --why, a park from the wrong
+  // phase, a claim on a parked task, a pair outside TASK_SUBSTATES.
+  err instanceof SubstateReasonRequiredError || err instanceof TaskParkStateError || err instanceof TaskParkedError || err instanceof InvalidSubstateError || err instanceof TaskClaimStaleWorkspaceError || err instanceof TaskNotInWorkstreamError || err instanceof AgentNotInWorkstreamError || err instanceof CycleError || err instanceof CrossWorkstreamEdgeError || err instanceof WorkspaceExistsError || err instanceof WorkspacePathNotEmptyError || err instanceof WorkspacePreservedError || err instanceof HomeDirAsProjectRootError || err instanceof WorkspaceVcsRequiredError || err instanceof WorkspaceDirtyError || err instanceof ClaimerNotRegisteredError || err instanceof SchemaTooOldError || err instanceof SchemaTooNewError || err instanceof TaskIdInvalidError || err instanceof WorkstreamExistsError || // Rebuild refuses to overwrite an existing target or to write onto
   // the source DB: both are name/state collisions, not usage errors.
   err instanceof RebuildTargetExistsError || err instanceof RebuildTargetIsSourceError || // An abbreviated group id matching several groups: the operator must
   // disambiguate. Guessing would be catastrophic for `mu undo`.
@@ -22053,6 +22663,7 @@ function wireWorkstreamCommands(program) {
 // src/cli.ts
 init_db();
 init_sort();
+init_status();
 init_tasks();
 init_workstream();
 init_format();
@@ -22150,6 +22761,23 @@ function parseStatusesOption(values, flag = "--status") {
   }
   return out;
 }
+var ALL_SUBSTATES = [...new Set(Object.values(TASK_SUBSTATES).flat())];
+function parseSubstatesOption(values, flag = "--substate") {
+  const fragments = parseCsvFlag(values, flag);
+  if (fragments.length === 0) return void 0;
+  const out = /* @__PURE__ */ new Set();
+  for (const raw of fragments) {
+    const lower = raw.toLowerCase();
+    const match = ALL_SUBSTATES.find((s) => s === lower);
+    if (match === void 0) {
+      throw new UsageError(
+        `${flag} must be one of ${ALL_SUBSTATES.join(" | ")} (got ${JSON.stringify(raw)})`
+      );
+    }
+    out.add(match);
+  }
+  return [...out];
+}
 function resolveSelfOptional(db) {
   const paneId = process.env.TMUX_PANE;
   if (!paneId) return null;
@@ -22425,6 +23053,7 @@ export {
   buildProgram,
   byRoiDesc,
   classifyError,
+  colorPair,
   colorStatus,
   emitJson,
   emitJsonCollection,
@@ -22449,6 +23078,7 @@ export {
   parseSortOption,
   parseStatusOption,
   parseStatusesOption,
+  parseSubstatesOption,
   printLogRow,
   relTime,
   relTimeBasisForSort,