gsd-pi 2.75.0-dev.063e5a3 → 2.75.0-dev.fd2382b9f

package/dist/resources/extensions/gsd/gsd-db.js

@@ -135,7 +135,7 @@ function openRawDb(path) {
     const Database = providerModule;
     return new Database(path);
 }
-const SCHEMA_VERSION = 15;
+const SCHEMA_VERSION = 17;
 function indexExists(db, name) {
     return !!db.prepare("SELECT 1 as present FROM sqlite_master WHERE type = 'index' AND name = ?").get(name);
 }
@@ -189,6 +189,7 @@ function initSchema(db, fileBacked) {
         rationale TEXT NOT NULL DEFAULT '',
         revisable TEXT NOT NULL DEFAULT '',
         made_by TEXT NOT NULL DEFAULT 'agent',
+        source TEXT NOT NULL DEFAULT 'discussion', -- ADR-011 P2: 'discussion' | 'planning' | 'escalation'
         superseded_by TEXT DEFAULT NULL
       )
     `);
@@ -282,6 +283,8 @@ function initSchema(db, fileBacked) {
         observability_impact TEXT NOT NULL DEFAULT '',
         sequence INTEGER DEFAULT 0, -- Ordering hint: tools may set this to control execution order
         replan_triggered_at TEXT DEFAULT NULL,
+        is_sketch INTEGER NOT NULL DEFAULT 0, -- ADR-011: 1 = slice is a sketch awaiting refinement
+        sketch_scope TEXT NOT NULL DEFAULT '', -- ADR-011: 2-3 sentence rough scope from plan-milestone
         PRIMARY KEY (milestone_id, id),
         FOREIGN KEY (milestone_id) REFERENCES milestones(id)
       )
@@ -299,6 +302,11 @@ function initSchema(db, fileBacked) {
         duration TEXT NOT NULL DEFAULT '',
         completed_at TEXT DEFAULT NULL,
         blocker_discovered INTEGER DEFAULT 0,
+        blocker_source TEXT NOT NULL DEFAULT '', -- ADR-011 P2: provenance for blocker_discovered (e.g. 'reject-escalation')
+        escalation_pending INTEGER NOT NULL DEFAULT 0, -- ADR-011 P2: pause-on-escalation flag
+        escalation_awaiting_review INTEGER NOT NULL DEFAULT 0, -- ADR-011 P2: artifact exists but continueWithDefault=true (no pause)
+        escalation_artifact_path TEXT DEFAULT NULL, -- ADR-011 P2: path to T##-ESCALATION.json
+        escalation_override_applied_at TEXT DEFAULT NULL, -- ADR-011 P2: DB claim lock for idempotent override injection
         deviations TEXT NOT NULL DEFAULT '',
         known_issues TEXT NOT NULL DEFAULT '',
         key_files TEXT NOT NULL DEFAULT '[]',
@@ -460,6 +468,9 @@ function initSchema(db, fileBacked) {
         db.exec("CREATE INDEX IF NOT EXISTS idx_turn_git_tx_turn ON turn_git_transactions(trace_id, turn_id)");
         db.exec("CREATE INDEX IF NOT EXISTS idx_audit_events_trace ON audit_events(trace_id, ts)");
         db.exec("CREATE INDEX IF NOT EXISTS idx_audit_events_turn ON audit_events(trace_id, turn_id, ts)");
+        // ADR-011 Phase 2 — also created by the v17 migration; fresh installs
+        // skip migrations so the index must be created here too.
+        db.exec("CREATE INDEX IF NOT EXISTS idx_tasks_escalation_pending ON tasks(milestone_id, slice_id, escalation_pending)");
         db.exec(`CREATE VIEW IF NOT EXISTS active_decisions AS SELECT * FROM decisions WHERE superseded_by IS NULL`);
         db.exec(`CREATE VIEW IF NOT EXISTS active_requirements AS SELECT * FROM requirements WHERE superseded_by IS NULL`);
         db.exec(`CREATE VIEW IF NOT EXISTS active_memories AS SELECT * FROM memories WHERE superseded_by IS NULL`);
@@ -861,6 +872,30 @@ function migrateSchema(db) {
                 ":applied_at": new Date().toISOString(),
             });
         }
+        if (currentVersion < 16) {
+            // ADR-011 Phase 1: sketch-then-refine progressive planning — sketch columns on slices.
+            ensureColumn(db, "slices", "is_sketch", `ALTER TABLE slices ADD COLUMN is_sketch INTEGER NOT NULL DEFAULT 0`);
+            ensureColumn(db, "slices", "sketch_scope", `ALTER TABLE slices ADD COLUMN sketch_scope TEXT NOT NULL DEFAULT ''`);
+            // ADR-011 Phase 2: decisions can now be sourced from escalation resolutions.
+            ensureColumn(db, "decisions", "source", `ALTER TABLE decisions ADD COLUMN source TEXT NOT NULL DEFAULT 'discussion'`);
+            db.prepare("INSERT INTO schema_version (version, applied_at) VALUES (:version, :applied_at)").run({
+                ":version": 16,
+                ":applied_at": new Date().toISOString(),
+            });
+        }
+        if (currentVersion < 17) {
+            // ADR-011 Phase 2: mid-execution escalation — columns on the tasks table.
+            ensureColumn(db, "tasks", "blocker_source", `ALTER TABLE tasks ADD COLUMN blocker_source TEXT NOT NULL DEFAULT ''`);
+            ensureColumn(db, "tasks", "escalation_pending", `ALTER TABLE tasks ADD COLUMN escalation_pending INTEGER NOT NULL DEFAULT 0`);
+            ensureColumn(db, "tasks", "escalation_awaiting_review", `ALTER TABLE tasks ADD COLUMN escalation_awaiting_review INTEGER NOT NULL DEFAULT 0`);
+            ensureColumn(db, "tasks", "escalation_artifact_path", `ALTER TABLE tasks ADD COLUMN escalation_artifact_path TEXT DEFAULT NULL`);
+            ensureColumn(db, "tasks", "escalation_override_applied_at", `ALTER TABLE tasks ADD COLUMN escalation_override_applied_at TEXT DEFAULT NULL`);
+            db.exec("CREATE INDEX IF NOT EXISTS idx_tasks_escalation_pending ON tasks(milestone_id, slice_id, escalation_pending)");
+            db.prepare("INSERT INTO schema_version (version, applied_at) VALUES (:version, :applied_at)").run({
+                ":version": 17,
+                ":applied_at": new Date().toISOString(),
+            });
+        }
         db.exec("COMMIT");
     }
     catch (err) {
@@ -984,6 +1019,17 @@ export function vacuumDatabase() {
         logWarning("db", `VACUUM failed: ${e.message}`);
     }
 }
+/** Flush WAL into gsd.db so `git add .gsd/gsd.db` stages current state — safe while DB is open. */
+export function checkpointDatabase() {
+    if (!currentDb)
+        return;
+    try {
+        currentDb.exec('PRAGMA wal_checkpoint(TRUNCATE)');
+    }
+    catch (e) {
+        logWarning("db", `WAL checkpoint failed: ${e.message}`);
+    }
+}
 let _txDepth = 0;
 export function transaction(fn) {
     if (!currentDb)
@@ -1061,8 +1107,8 @@ export function readTransaction(fn) {
 export function insertDecision(d) {
     if (!currentDb)
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
-    currentDb.prepare(`INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by)
-     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :superseded_by)`).run({
+    currentDb.prepare(`INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, source, superseded_by)
+     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :source, :superseded_by)`).run({
         ":id": d.id,
         ":when_context": d.when_context,
         ":scope": d.scope,
@@ -1071,6 +1117,7 @@ export function insertDecision(d) {
         ":rationale": d.rationale,
         ":revisable": d.revisable,
         ":made_by": d.made_by ?? "agent",
+        ":source": d.source ?? "discussion",
         ":superseded_by": d.superseded_by,
     });
 }
@@ -1090,6 +1137,7 @@ export function getDecisionById(id) {
         rationale: row["rationale"],
         revisable: row["revisable"],
         made_by: row["made_by"] ?? "agent",
+        source: row["source"] ?? "discussion",
         superseded_by: row["superseded_by"] ?? null,
     };
 }
@@ -1107,6 +1155,7 @@ export function getActiveDecisions() {
         rationale: row["rationale"],
         revisable: row["revisable"],
         made_by: row["made_by"] ?? "agent",
+        source: row["source"] ?? "discussion",
         superseded_by: null,
     }));
 }
@@ -1189,8 +1238,8 @@ export function upsertDecision(d) {
     // Use ON CONFLICT DO UPDATE instead of INSERT OR REPLACE to preserve the
     // seq column. INSERT OR REPLACE deletes then reinserts, resetting seq and
     // corrupting decision ordering in DECISIONS.md after reconcile replay.
-    currentDb.prepare(`INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by)
-     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :superseded_by)
+    currentDb.prepare(`INSERT INTO decisions (id, when_context, scope, decision, choice, rationale, revisable, made_by, source, superseded_by)
+     VALUES (:id, :when_context, :scope, :decision, :choice, :rationale, :revisable, :made_by, :source, :superseded_by)
      ON CONFLICT(id) DO UPDATE SET
        when_context = excluded.when_context,
        scope = excluded.scope,
@@ -1199,6 +1248,7 @@ export function upsertDecision(d) {
        rationale = excluded.rationale,
        revisable = excluded.revisable,
        made_by = excluded.made_by,
+       source = excluded.source,
        superseded_by = excluded.superseded_by`).run({
         ":id": d.id,
         ":when_context": d.when_context,
@@ -1208,6 +1258,7 @@ export function upsertDecision(d) {
         ":rationale": d.rationale,
         ":revisable": d.revisable,
         ":made_by": d.made_by ?? "agent",
+        ":source": d.source ?? "discussion",
         ":superseded_by": d.superseded_by ?? null,
     });
 }
@@ -1327,10 +1378,12 @@ export function insertSlice(s) {
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
     currentDb.prepare(`INSERT INTO slices (
       milestone_id, id, title, status, risk, depends, demo, created_at,
-      goal, success_criteria, proof_level, integration_closure, observability_impact, sequence
+      goal, success_criteria, proof_level, integration_closure, observability_impact, sequence,
+      is_sketch, sketch_scope
     ) VALUES (
       :milestone_id, :id, :title, :status, :risk, :depends, :demo, :created_at,
-      :goal, :success_criteria, :proof_level, :integration_closure, :observability_impact, :sequence
+      :goal, :success_criteria, :proof_level, :integration_closure, :observability_impact, :sequence,
+      :is_sketch, :sketch_scope
     )
     ON CONFLICT (milestone_id, id) DO UPDATE SET
       title = CASE WHEN :raw_title IS NOT NULL THEN excluded.title ELSE slices.title END,
@@ -1343,7 +1396,9 @@ export function insertSlice(s) {
       proof_level = CASE WHEN :raw_proof_level IS NOT NULL THEN excluded.proof_level ELSE slices.proof_level END,
       integration_closure = CASE WHEN :raw_integration_closure IS NOT NULL THEN excluded.integration_closure ELSE slices.integration_closure END,
       observability_impact = CASE WHEN :raw_observability_impact IS NOT NULL THEN excluded.observability_impact ELSE slices.observability_impact END,
-      sequence = CASE WHEN :raw_sequence IS NOT NULL THEN excluded.sequence ELSE slices.sequence END`).run({
+      sequence = CASE WHEN :raw_sequence IS NOT NULL THEN excluded.sequence ELSE slices.sequence END,
+      is_sketch = CASE WHEN :raw_is_sketch IS NOT NULL THEN excluded.is_sketch ELSE slices.is_sketch END,
+      sketch_scope = CASE WHEN :raw_sketch_scope IS NOT NULL THEN excluded.sketch_scope ELSE slices.sketch_scope END`).run({
         ":milestone_id": s.milestoneId,
         ":id": s.id,
         ":title": s.title ?? "",
@@ -1358,6 +1413,8 @@ export function insertSlice(s) {
         ":integration_closure": s.planning?.integrationClosure ?? "",
         ":observability_impact": s.planning?.observabilityImpact ?? "",
         ":sequence": s.sequence ?? 0,
+        ":is_sketch": s.isSketch ? 1 : 0,
+        ":sketch_scope": s.sketchScope ?? "",
         // Raw sentinel params: NULL when caller omitted the field, used in ON CONFLICT guards
         ":raw_title": s.title ?? null,
         ":raw_risk": s.risk ?? null,
@@ -1368,8 +1425,47 @@ export function insertSlice(s) {
         ":raw_integration_closure": s.planning?.integrationClosure ?? null,
         ":raw_observability_impact": s.planning?.observabilityImpact ?? null,
         ":raw_sequence": s.sequence ?? null,
+        ":raw_is_sketch": s.isSketch === undefined ? null : (s.isSketch ? 1 : 0),
+        // NOTE: use !== undefined (not ??) so an explicit empty string "" is treated
+        // as a present value and correctly clears the existing sketch_scope on
+        // CONFLICT. ?? would incorrectly preserve the stale value.
+        ":raw_sketch_scope": s.sketchScope !== undefined ? s.sketchScope : null,
     });
 }
+// ADR-011: sketch-then-refine helpers
+export function setSliceSketchFlag(milestoneId, sliceId, isSketch) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    currentDb.prepare(`UPDATE slices SET is_sketch = :is_sketch WHERE milestone_id = :mid AND id = :sid`).run({ ":is_sketch": isSketch ? 1 : 0, ":mid": milestoneId, ":sid": sliceId });
+}
+/**
+ * ADR-011 auto-heal: reconcile stale is_sketch=1 rows whose PLAN already exists.
+ *
+ * Callers pass a predicate that resolves whether a plan file exists for a slice.
+ * The predicate MUST use the canonical path resolver (`resolveSliceFile`, etc.)
+ * to keep path logic in one place — do not hand-roll the path inside the callback.
+ *
+ * Recovers from two scenarios:
+ *   1. Crash between `gsd_plan_slice` write and the sketch flag flip.
+ *   2. Flag-OFF downgrade path: when `progressive_planning` is off, the dispatch
+ *      rule routes sketch slices to plan-slice, which writes PLAN.md but leaves
+ *      `is_sketch=1` — the next state derivation auto-heals it to 0 here.
+ *
+ * Not aggressive in practice: PLAN.md is only written via the DB-backed
+ * `gsd_plan_slice` tool (which also inserts tasks), so a "stale PLAN.md with
+ * is_sketch=1" is extremely unlikely to indicate anything other than the two
+ * recovery scenarios above.
+ */
+export function autoHealSketchFlags(milestoneId, hasPlanFile) {
+    if (!currentDb)
+        return;
+    const rows = currentDb.prepare(`SELECT id FROM slices WHERE milestone_id = :mid AND is_sketch = 1`).all({ ":mid": milestoneId });
+    for (const row of rows) {
+        if (hasPlanFile(row.id)) {
+            setSliceSketchFlag(milestoneId, row.id, false);
+        }
+    }
+}
 export function upsertSlicePlanning(milestoneId, sliceId, planning) {
     if (!currentDb)
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
@@ -1516,6 +1612,8 @@ function rowToSlice(row) {
         observability_impact: row["observability_impact"] ?? "",
         sequence: row["sequence"] ?? 0,
         replan_triggered_at: row["replan_triggered_at"] ?? null,
+        is_sketch: row["is_sketch"] ?? 0,
+        sketch_scope: row["sketch_scope"] ?? "",
     };
 }
 export function getSlice(milestoneId, sliceId) {
@@ -1616,6 +1714,11 @@ function rowToTask(row) {
         observability_impact: row["observability_impact"] ?? "",
         full_plan_md: row["full_plan_md"] ?? "",
         sequence: row["sequence"] ?? 0,
+        blocker_source: row["blocker_source"] ?? "",
+        escalation_pending: row["escalation_pending"] ?? 0,
+        escalation_awaiting_review: row["escalation_awaiting_review"] ?? 0,
+        escalation_artifact_path: row["escalation_artifact_path"] ?? null,
+        escalation_override_applied_at: row["escalation_override_applied_at"] ?? null,
     };
 }
 export function getTask(milestoneId, sliceId, taskId) {
@@ -1632,6 +1735,95 @@ export function getSliceTasks(milestoneId, sliceId) {
     const rows = currentDb.prepare("SELECT * FROM tasks WHERE milestone_id = :mid AND slice_id = :sid ORDER BY sequence, id").all({ ":mid": milestoneId, ":sid": sliceId });
     return rows.map(rowToTask);
 }
+// ─── ADR-011 Phase 2 escalation helpers ──────────────────────────────────
+/** Set pause-on-escalation state on a completed task. Mutually exclusive with awaiting_review. */
+export function setTaskEscalationPending(milestoneId, sliceId, taskId, artifactPath) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    currentDb.prepare(`UPDATE tasks
+       SET escalation_pending = 1,
+           escalation_awaiting_review = 0,
+           escalation_artifact_path = :path
+     WHERE milestone_id = :mid AND slice_id = :sid AND id = :tid`).run({ ":path": artifactPath, ":mid": milestoneId, ":sid": sliceId, ":tid": taskId });
+}
+/** Set awaiting-review state (artifact exists but continueWithDefault=true, no pause). Mutually exclusive with pending. */
+export function setTaskEscalationAwaitingReview(milestoneId, sliceId, taskId, artifactPath) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    currentDb.prepare(`UPDATE tasks
+       SET escalation_awaiting_review = 1,
+           escalation_pending = 0,
+           escalation_artifact_path = :path
+     WHERE milestone_id = :mid AND slice_id = :sid AND id = :tid`).run({ ":path": artifactPath, ":mid": milestoneId, ":sid": sliceId, ":tid": taskId });
+}
+/** Clear escalation-pending and awaiting-review flags once the user has resolved it. */
+export function clearTaskEscalationFlags(milestoneId, sliceId, taskId) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    currentDb.prepare(`UPDATE tasks
+       SET escalation_pending = 0,
+           escalation_awaiting_review = 0
+     WHERE milestone_id = :mid AND slice_id = :sid AND id = :tid`).run({ ":mid": milestoneId, ":sid": sliceId, ":tid": taskId });
+}
+/**
+ * Atomically claim a resolved escalation override for injection into a downstream
+ * task's prompt. Returns true if this caller claimed it (must inject), false if
+ * another caller already claimed it (must skip).
+ */
+export function claimEscalationOverride(milestoneId, sliceId, sourceTaskId) {
+    if (!currentDb)
+        return false;
+    const now = new Date().toISOString();
+    const result = currentDb.prepare(`UPDATE tasks
+       SET escalation_override_applied_at = :now
+     WHERE milestone_id = :mid AND slice_id = :sid AND id = :tid
+       AND escalation_override_applied_at IS NULL
+       AND escalation_artifact_path IS NOT NULL`).run({ ":now": now, ":mid": milestoneId, ":sid": sliceId, ":tid": sourceTaskId });
+    // node:sqlite + better-sqlite3 both surface `changes` on the run result.
+    const changes = result.changes ?? 0;
+    return changes > 0;
+}
+/** Find the most recent resolved-but-unapplied escalation override in a slice. */
+export function findUnappliedEscalationOverride(milestoneId, sliceId) {
+    if (!currentDb)
+        return null;
+    // Filter BOTH flags: escalation_pending=0 AND escalation_awaiting_review=0
+    // ensures we only claim overrides the user has explicitly resolved.
+    // Without the awaiting_review filter, continueWithDefault=true artifacts
+    // (not yet responded to) would be prematurely claimed, causing the override
+    // to be lost when the user later resolves (#ADR-011 Phase 2 peer-review Bug 2).
+    const row = currentDb.prepare(`SELECT id, escalation_artifact_path AS path
+       FROM tasks
+      WHERE milestone_id = :mid AND slice_id = :sid
+        AND escalation_artifact_path IS NOT NULL
+        AND escalation_override_applied_at IS NULL
+        AND escalation_pending = 0
+        AND escalation_awaiting_review = 0
+      ORDER BY sequence DESC, id DESC
+      LIMIT 1`).get({ ":mid": milestoneId, ":sid": sliceId });
+    if (!row || !row.path)
+        return null;
+    return { taskId: row.id, artifactPath: row.path };
+}
+/** Set the blocker_source provenance field (used when rejecting an escalation). */
+export function setTaskBlockerSource(milestoneId, sliceId, taskId, source) {
+    if (!currentDb)
+        throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
+    currentDb.prepare(`UPDATE tasks
+       SET blocker_discovered = 1,
+           blocker_source = :src
+     WHERE milestone_id = :mid AND slice_id = :sid AND id = :tid`).run({ ":src": source, ":mid": milestoneId, ":sid": sliceId, ":tid": taskId });
+}
+/** List tasks with active escalation artifacts across a milestone (for /gsd escalate list). */
+export function listEscalationArtifacts(milestoneId, includeResolved = false) {
+    if (!currentDb)
+        return [];
+    const filter = includeResolved
+        ? "escalation_artifact_path IS NOT NULL"
+        : "(escalation_pending = 1 OR escalation_awaiting_review = 1) AND escalation_artifact_path IS NOT NULL";
+    const rows = currentDb.prepare(`SELECT * FROM tasks WHERE milestone_id = :mid AND ${filter} ORDER BY slice_id, sequence, id`).all({ ":mid": milestoneId });
+    return rows.map(rowToTask);
+}
 export function insertVerificationEvidence(e) {
     if (!currentDb)
         throw new GSDError(GSD_STALE_STATE, "gsd-db: No database open");
@@ -1862,6 +2054,19 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
         try {
             const wtInfo = adapter.prepare("PRAGMA wt.table_info('decisions')").all();
             const hasMadeBy = wtInfo.some((col) => col["name"] === "made_by");
+            // ADR-011: worktree may predate schema v16/v17. For missing columns we
+            // fall through to the main DB's existing value (not a literal default)
+            // so reconcile never silently clears state the main tree has recorded.
+            const hasDecisionSource = wtInfo.some((col) => col["name"] === "source");
+            const wtSliceInfo = adapter.prepare("PRAGMA wt.table_info('slices')").all();
+            const hasIsSketch = wtSliceInfo.some((col) => col["name"] === "is_sketch");
+            const hasSketchScope = wtSliceInfo.some((col) => col["name"] === "sketch_scope");
+            const wtTaskInfo = adapter.prepare("PRAGMA wt.table_info('tasks')").all();
+            const hasBlockerSource = wtTaskInfo.some((col) => col["name"] === "blocker_source");
+            const hasEscalationPending = wtTaskInfo.some((col) => col["name"] === "escalation_pending");
+            const hasEscalationAwaiting = wtTaskInfo.some((col) => col["name"] === "escalation_awaiting_review");
+            const hasEscalationArtifact = wtTaskInfo.some((col) => col["name"] === "escalation_artifact_path");
+            const hasEscalationOverride = wtTaskInfo.some((col) => col["name"] === "escalation_override_applied_at");
             const decConf = adapter.prepare(`SELECT m.id FROM decisions m INNER JOIN wt.decisions w ON m.id = w.id WHERE m.decision != w.decision OR m.choice != w.choice OR m.rationale != w.rationale OR ${hasMadeBy ? "m.made_by != w.made_by" : "'agent' != 'agent'"} OR m.superseded_by IS NOT w.superseded_by`).all();
             for (const row of decConf)
                 conflicts.push(`decision ${row["id"]}: modified in both`);
@@ -1874,11 +2079,16 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
             }
             adapter.exec("BEGIN");
             try {
+                // Join the target decisions so we can prefer an existing main.source
+                // when the worktree predates v16 — otherwise a write-through reconcile
+                // would clobber 'escalation'-sourced decisions with the literal default.
                 merged.decisions = countChanges(adapter.prepare(`
           INSERT OR REPLACE INTO decisions (
-            id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by
+            id, when_context, scope, decision, choice, rationale, revisable, made_by, source, superseded_by
           )
-          SELECT id, when_context, scope, decision, choice, rationale, revisable, ${hasMadeBy ? "made_by" : "'agent'"}, superseded_by FROM wt.decisions
+          SELECT w.id, w.when_context, w.scope, w.decision, w.choice, w.rationale, w.revisable, ${hasMadeBy ? "w.made_by" : "COALESCE(m.made_by, 'agent')"}, ${hasDecisionSource ? "w.source" : "COALESCE(m.source, 'discussion')"}, w.superseded_by
+          FROM wt.decisions w
+          LEFT JOIN decisions m ON m.id = w.id
         `).run());
                 merged.requirements = countChanges(adapter.prepare(`
           INSERT OR REPLACE INTO requirements (
@@ -1911,13 +2121,15 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
           FROM wt.milestones
         `).run());
                 // Merge slices — preserve worktree progress but never downgrade completed status (#2558).
-                // Uses INSERT OR REPLACE with a subquery that picks the best status — if the main DB
-                // already has a completed slice, keep that status even if the worktree copy is stale.
+                // ADR-011 Phase 1: carry is_sketch + sketch_scope so reconcile doesn't
+                // silently clear sketch metadata. When the worktree predates v16,
+                // fall back to the main DB's existing value rather than a literal 0/''.
                 merged.slices = countChanges(adapter.prepare(`
           INSERT OR REPLACE INTO slices (
             milestone_id, id, title, status, risk, depends, demo, created_at, completed_at,
             full_summary_md, full_uat_md, goal, success_criteria, proof_level,
-            integration_closure, observability_impact, sequence, replan_triggered_at
+            integration_closure, observability_impact, sequence, replan_triggered_at,
+            is_sketch, sketch_scope
           )
           SELECT w.milestone_id, w.id, w.title,
                  CASE
@@ -1930,18 +2142,24 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
                    THEN m.completed_at ELSE w.completed_at
                  END,
                  w.full_summary_md, w.full_uat_md, w.goal, w.success_criteria, w.proof_level,
-                 w.integration_closure, w.observability_impact, w.sequence, w.replan_triggered_at
+                 w.integration_closure, w.observability_impact, w.sequence, w.replan_triggered_at,
+                 ${hasIsSketch ? "w.is_sketch" : "COALESCE(m.is_sketch, 0)"},
+                 ${hasSketchScope ? "w.sketch_scope" : "COALESCE(m.sketch_scope, '')"}
           FROM wt.slices w
           LEFT JOIN slices m ON m.milestone_id = w.milestone_id AND m.id = w.id
         `).run());
-                // Merge tasks — preserve execution results, never downgrade completed status (#2558)
+                // Merge tasks — preserve execution results, never downgrade completed status (#2558).
+                // ADR-011 P2: carry blocker_source + escalation_* columns so worktree reconcile
+                // doesn't silently clear escalation state back to defaults.
                 merged.tasks = countChanges(adapter.prepare(`
           INSERT OR REPLACE INTO tasks (
             milestone_id, slice_id, id, title, status, one_liner, narrative,
             verification_result, duration, completed_at, blocker_discovered,
             deviations, known_issues, key_files, key_decisions, full_summary_md,
             description, estimate, files, verify, inputs, expected_output,
-            observability_impact, full_plan_md, sequence
+            observability_impact, full_plan_md, sequence,
+            blocker_source, escalation_pending, escalation_awaiting_review,
+            escalation_artifact_path, escalation_override_applied_at
           )
           SELECT w.milestone_id, w.slice_id, w.id, w.title,
                  CASE
@@ -1957,7 +2175,12 @@ export function reconcileWorktreeDb(mainDbPath, worktreeDbPath) {
                  w.blocker_discovered,
                  w.deviations, w.known_issues, w.key_files, w.key_decisions, w.full_summary_md,
                  w.description, w.estimate, w.files, w.verify, w.inputs, w.expected_output,
-                 w.observability_impact, w.full_plan_md, w.sequence
+                 w.observability_impact, w.full_plan_md, w.sequence,
+                 ${hasBlockerSource ? "w.blocker_source" : "COALESCE(m.blocker_source, '')"},
+                 ${hasEscalationPending ? "w.escalation_pending" : "COALESCE(m.escalation_pending, 0)"},
+                 ${hasEscalationAwaiting ? "w.escalation_awaiting_review" : "COALESCE(m.escalation_awaiting_review, 0)"},
+                 ${hasEscalationArtifact ? "w.escalation_artifact_path" : "m.escalation_artifact_path"},
+                 ${hasEscalationOverride ? "w.escalation_override_applied_at" : "m.escalation_override_applied_at"}
           FROM wt.tasks w
           LEFT JOIN tasks m ON m.milestone_id = w.milestone_id AND m.slice_id = w.slice_id AND m.id = w.id
         `).run());
@@ -2489,30 +2712,32 @@ export function restoreManifest(manifest) {
         for (const m of manifest.milestones) {
             msStmt.run(m.id, m.title, m.status, JSON.stringify(m.depends_on), m.created_at, m.completed_at, m.vision, JSON.stringify(m.success_criteria), JSON.stringify(m.key_risks), JSON.stringify(m.proof_strategy), m.verification_contract, m.verification_integration, m.verification_operational, m.verification_uat, JSON.stringify(m.definition_of_done), m.requirement_coverage, m.boundary_map_markdown);
         }
-        // Restore slices
+        // Restore slices (ADR-011 Phase 1: includes is_sketch + sketch_scope)
         const slStmt = db.prepare(`INSERT INTO slices (milestone_id, id, title, status, risk, depends, demo,
         created_at, completed_at, full_summary_md, full_uat_md,
         goal, success_criteria, proof_level, integration_closure, observability_impact,
-        sequence, replan_triggered_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+        sequence, replan_triggered_at, is_sketch, sketch_scope)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
         for (const s of manifest.slices) {
-            slStmt.run(s.milestone_id, s.id, s.title, s.status, s.risk, JSON.stringify(s.depends), s.demo, s.created_at, s.completed_at, s.full_summary_md, s.full_uat_md, s.goal, s.success_criteria, s.proof_level, s.integration_closure, s.observability_impact, s.sequence, s.replan_triggered_at);
+            slStmt.run(s.milestone_id, s.id, s.title, s.status, s.risk, JSON.stringify(s.depends), s.demo, s.created_at, s.completed_at, s.full_summary_md, s.full_uat_md, s.goal, s.success_criteria, s.proof_level, s.integration_closure, s.observability_impact, s.sequence, s.replan_triggered_at, s.is_sketch ?? 0, s.sketch_scope ?? "");
         }
-        // Restore tasks
+        // Restore tasks (ADR-011 P2: includes blocker_source + escalation_* columns)
         const tkStmt = db.prepare(`INSERT INTO tasks (milestone_id, slice_id, id, title, status,
         one_liner, narrative, verification_result, duration, completed_at,
         blocker_discovered, deviations, known_issues, key_files, key_decisions,
         full_summary_md, description, estimate, files, verify,
-        inputs, expected_output, observability_impact, sequence)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+        inputs, expected_output, observability_impact, sequence,
+        blocker_source, escalation_pending, escalation_awaiting_review,
+        escalation_artifact_path, escalation_override_applied_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
         for (const t of manifest.tasks) {
-            tkStmt.run(t.milestone_id, t.slice_id, t.id, t.title, t.status, t.one_liner, t.narrative, t.verification_result, t.duration, t.completed_at, t.blocker_discovered ? 1 : 0, t.deviations, t.known_issues, JSON.stringify(t.key_files), JSON.stringify(t.key_decisions), t.full_summary_md, t.description, t.estimate, JSON.stringify(t.files), t.verify, JSON.stringify(t.inputs), JSON.stringify(t.expected_output), t.observability_impact, t.sequence);
+            tkStmt.run(t.milestone_id, t.slice_id, t.id, t.title, t.status, t.one_liner, t.narrative, t.verification_result, t.duration, t.completed_at, t.blocker_discovered ? 1 : 0, t.deviations, t.known_issues, JSON.stringify(t.key_files), JSON.stringify(t.key_decisions), t.full_summary_md, t.description, t.estimate, JSON.stringify(t.files), t.verify, JSON.stringify(t.inputs), JSON.stringify(t.expected_output), t.observability_impact, t.sequence, t.blocker_source ?? "", t.escalation_pending ?? 0, t.escalation_awaiting_review ?? 0, t.escalation_artifact_path ?? null, t.escalation_override_applied_at ?? null);
         }
-        // Restore decisions
-        const dcStmt = db.prepare(`INSERT INTO decisions (seq, id, when_context, scope, decision, choice, rationale, revisable, made_by, superseded_by)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+        // Restore decisions (ADR-011 P2: include source so escalation decisions survive)
+        const dcStmt = db.prepare(`INSERT INTO decisions (seq, id, when_context, scope, decision, choice, rationale, revisable, made_by, source, superseded_by)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
         for (const d of manifest.decisions) {
-            dcStmt.run(d.seq, d.id, d.when_context, d.scope, d.decision, d.choice, d.rationale, d.revisable, d.made_by, d.superseded_by);
+            dcStmt.run(d.seq, d.id, d.when_context, d.scope, d.decision, d.choice, d.rationale, d.revisable, d.made_by, d.source ?? "discussion", d.superseded_by);
         }
         // Restore verification evidence
         const evStmt = db.prepare(`INSERT INTO verification_evidence (task_id, slice_id, milestone_id, command, exit_code, verdict, duration_ms, created_at)

package/dist/resources/extensions/gsd/health-widget-core.js

@@ -43,47 +43,75 @@ function truncateMessage(msg, maxLen) {
 }
 /**
  * Build compact health lines for the widget.
- * Returns a string array suitable for setWidget().
+ * When `width` is provided, system + budget render left and last-commit
+ * right-aligned. Without width, all parts are joined inline (RPC fallback).
  */
-export function buildHealthLines(data) {
+export function buildHealthLines(data, width) {
     if (data.projectState === "none") {
         return ["  GSD  No project loaded — run /gsd to start"];
     }
     if (data.projectState === "initialized") {
         return ["  GSD  Project initialized — run /gsd to continue setup"];
     }
-    const parts = [];
+    const leftParts = [];
     const totalIssues = data.environmentErrorCount + data.environmentWarningCount + (data.providerIssue ? 1 : 0);
     if (totalIssues === 0) {
-        parts.push("● System OK");
+        leftParts.push("● System OK");
     }
     else if (data.environmentErrorCount > 0 || data.providerIssue?.includes("✗")) {
-        parts.push(`✗ ${totalIssues} issue${totalIssues > 1 ? "s" : ""}`);
+        leftParts.push(`✗ ${totalIssues} issue${totalIssues > 1 ? "s" : ""}`);
     }
     else {
-        parts.push(`⚠ ${totalIssues} warning${totalIssues > 1 ? "s" : ""}`);
+        leftParts.push(`⚠ ${totalIssues} warning${totalIssues > 1 ? "s" : ""}`);
     }
     if (data.budgetCeiling !== undefined && data.budgetCeiling > 0) {
         const pct = Math.min(100, (data.budgetSpent / data.budgetCeiling) * 100);
-        parts.push(`Budget: ${formatCost(data.budgetSpent)}/${formatCost(data.budgetCeiling)} (${pct.toFixed(0)}%)`);
+        leftParts.push(`Budget: ${formatCost(data.budgetSpent)}/${formatCost(data.budgetCeiling)} (${pct.toFixed(0)}%)`);
     }
     else if (data.budgetSpent > 0) {
-        parts.push(`Spent: ${formatCost(data.budgetSpent)}`);
+        leftParts.push(`Spent: ${formatCost(data.budgetSpent)}`);
     }
     if (data.providerIssue) {
-        parts.push(data.providerIssue);
+        leftParts.push(data.providerIssue);
     }
     if (data.environmentErrorCount > 0) {
-        parts.push(`Env: ${data.environmentErrorCount} error${data.environmentErrorCount > 1 ? "s" : ""}`);
+        leftParts.push(`Env: ${data.environmentErrorCount} error${data.environmentErrorCount > 1 ? "s" : ""}`);
     }
     else if (data.environmentWarningCount > 0) {
-        parts.push(`Env: ${data.environmentWarningCount} warning${data.environmentWarningCount > 1 ? "s" : ""}`);
+        leftParts.push(`Env: ${data.environmentWarningCount} warning${data.environmentWarningCount > 1 ? "s" : ""}`);
     }
-    // Always-on last commit display — shows relative time + truncated message
+    // Last commit goes on the right-hand side when width is known.
+    let rightText = "";
     if (data.lastCommitEpoch !== null && data.lastCommitEpoch > 0) {
         const relTime = formatRelativeTime(data.lastCommitEpoch);
         const msg = data.lastCommitMessage ? ` — ${truncateMessage(data.lastCommitMessage, 50)}` : "";
-        parts.push(`Last commit: ${relTime}${msg}`);
+        rightText = `Last commit: ${relTime}${msg}`;
     }
-    return [`  ${parts.join("  │  ")}`];
+    const leftText = leftParts.join("  │  ");
+    if (width === undefined) {
+        const inline = rightText ? `${leftText}  │  ${rightText}` : leftText;
+        return [`  ${inline}`];
+    }
+    const prefix = "  ";
+    const innerWidth = Math.max(0, width - prefix.length);
+    const leftVis = leftText.length;
+    const rightVis = rightText.length;
+    if (!rightText)
+        return [`${prefix}${truncateMessage(leftText, innerWidth)}`];
+    const MIN_GAP = 2;
+    if (leftVis + MIN_GAP + rightVis > innerWidth) {
+        // Preserve the left (status + budget) and truncate the right side
+        // (last commit) with an ellipsis so the combined line never exceeds
+        // innerWidth. If even the left alone overflows, clamp it too.
+        const leftRoom = Math.max(1, Math.min(leftVis, innerWidth - MIN_GAP - 1));
+        const clampedLeft = truncateMessage(leftText, leftRoom);
+        const rightRoom = Math.max(0, innerWidth - clampedLeft.length - MIN_GAP);
+        const clampedRight = rightRoom > 0 ? truncateMessage(rightText, rightRoom) : "";
+        if (!clampedRight)
+            return [`${prefix}${clampedLeft}`];
+        const pad = " ".repeat(Math.max(MIN_GAP, innerWidth - clampedLeft.length - clampedRight.length));
+        return [`${prefix}${clampedLeft}${pad}${clampedRight}`];
+    }
+    const padding = " ".repeat(innerWidth - leftVis - rightVis);
+    return [`${prefix}${leftText}${padding}${rightText}`];
 }

package/dist/resources/extensions/gsd/health-widget.js

@@ -111,13 +111,16 @@ export function initHealthWidget(ctx) {
         const refreshTimer = setInterval(() => {
             void refresh();
         }, REFRESH_INTERVAL_MS);
+        let cachedWidth;
         return {
-            render(_width) {
-                if (!cachedLines)
-                    cachedLines = buildHealthLines(data);
+            render(width) {
+                if (!cachedLines || cachedWidth !== width) {
+                    cachedLines = buildHealthLines(data, width);
+                    cachedWidth = width;
+                }
                 return cachedLines;
             },
-            invalidate() { cachedLines = undefined; },
+            invalidate() { cachedLines = undefined; cachedWidth = undefined; },
             dispose() {
                 clearInterval(refreshTimer);
             },

package/dist/resources/extensions/gsd/metrics.js

@@ -33,6 +33,7 @@ export function classifyUnitPhase(unitType) {
             return "discussion";
         case "plan-milestone":
         case "plan-slice":
+        case "refine-slice":
             return "planning";
         case "execute-task":
             return "execution";

package/dist/resources/extensions/gsd/model-cost-table.js

@@ -10,7 +10,8 @@
  */
 export const BUNDLED_COST_TABLE = [
     // Anthropic
-    { id: "claude-opus-4-6", inputPer1k: 0.015, outputPer1k: 0.075, updatedAt: "2025-03-15" },
+    { id: "claude-opus-4-6", inputPer1k: 0.005, outputPer1k: 0.025, updatedAt: "2026-04-16" },
+    { id: "claude-opus-4-7", inputPer1k: 0.005, outputPer1k: 0.025, updatedAt: "2026-04-16" },
     { id: "claude-sonnet-4-6", inputPer1k: 0.003, outputPer1k: 0.015, updatedAt: "2025-03-15" },
     { id: "claude-haiku-4-5", inputPer1k: 0.0008, outputPer1k: 0.004, updatedAt: "2025-03-15" },
     { id: "claude-sonnet-4-5-20250514", inputPer1k: 0.003, outputPer1k: 0.015, updatedAt: "2025-03-15" },
@@ -41,6 +42,7 @@ export const BUNDLED_COST_TABLE = [
     { id: "gpt-5.3-codex", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
     { id: "gpt-5.3-codex-spark", inputPer1k: 0.0003, outputPer1k: 0.0012, updatedAt: "2026-03-29" },
     { id: "gpt-5.4", inputPer1k: 0.005, outputPer1k: 0.02, updatedAt: "2026-03-29" },
+    { id: "gpt-5.4-mini", inputPer1k: 0.00075, outputPer1k: 0.0045, updatedAt: "2026-04-18" },
     // Google
     { id: "gemini-2.0-flash", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2025-03-15" },
     { id: "gemini-flash-2.0", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2025-03-15" },