@opengsd/gsd-pi 1.0.1 → 1.0.2

package/src/resources/extensions/gsd/auto.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Auto-mode orchestration, session lifecycle, and stop handling.
 /**
  * GSD Auto Mode — Fresh Session Per Unit
@@ -241,7 +241,7 @@ import { bootstrapAutoSession, openProjectDbIfPresent, type BootstrapDeps } from
 import { initHealthWidget } from "./health-widget.js";
 import { runLegacyAutoLoop, runUokKernelLoop } from "./auto/loop.js";
 import { resolveAgentEnd, resolveAgentEndCancelled, _resetPendingResolve, isSessionSwitchInFlight } from "./auto/resolve.js";
-import type { LoopDeps, StopAutoOptions } from "./auto/loop-deps.js";
+import type { LoopDeps, PauseAutoOptions, PauseAutoUnitIdentity, StopAutoOptions } from "./auto/loop-deps.js";
 import type { ErrorContext } from "./auto/types.js";
 import { runAutoLoopWithUok } from "./uok/kernel.js";
 import { resolveUokFlags } from "./uok/flags.js";
@@ -1039,6 +1039,23 @@ function currentUnitLabel(): string | null {
   return `${unitVerb(s.currentUnit.type)} ${s.currentUnit.id}`;
 }
 
+export function capturePauseAutoUnitIdentity(): PauseAutoUnitIdentity | null {
+  if (!s.currentUnit) return null;
+  return {
+    type: s.currentUnit.type,
+    id: s.currentUnit.id,
+    startedAt: s.currentUnit.startedAt,
+  };
+}
+
+function pauseAutoUnitIdentityMatches(expected: PauseAutoUnitIdentity | null): boolean {
+  if (!s.currentUnit) return expected === null;
+  return expected !== null &&
+    s.currentUnit.type === expected.type &&
+    s.currentUnit.id === expected.id &&
+    s.currentUnit.startedAt === expected.startedAt;
+}
+
 function setLifecycleOutcome(
   ctx: ExtensionContext | undefined,
   input: {
@@ -1714,7 +1731,7 @@ export async function stopAuto(
     // Drop the active-tool baseline so a subsequent /gsd auto run on the
     // same `pi` instance recaptures from the live tool set rather than
     // restoring this session's snapshot and silently undoing any tool
-    // changes the user made between sessions (#4959 / CodeRabbit).
+    // changes the user made between sessions (#4959).
     if (pi) clearToolBaseline(pi);
 
     try {
@@ -1759,8 +1776,19 @@ export async function pauseAuto(
   ctx?: ExtensionContext,
   _pi?: ExtensionAPI,
   _errorContext?: ErrorContext,
+  options: PauseAutoOptions = {},
 ): Promise<void> {
   if (!s.active) return;
+  if (
+    Object.prototype.hasOwnProperty.call(options, "expectedCurrentUnit") &&
+    !pauseAutoUnitIdentityMatches(options.expectedCurrentUnit ?? null)
+  ) {
+    debugLog("pause-auto-stale-unit-guard", {
+      expectedCurrentUnit: options.expectedCurrentUnit ?? null,
+      currentUnit: s.currentUnit,
+    });
+    return;
+  }
   s.active = false;
   clearUnitTimeout();
   stopAutoCommandPolling();
@@ -1850,11 +1878,15 @@ export async function pauseAuto(
 
   if (s.workerId) {
     try {
+      if (s.currentMilestoneId && s.milestoneLeaseToken) {
+        releaseMilestoneLease(s.workerId, s.currentMilestoneId, s.milestoneLeaseToken);
+      }
       markWorkerStopping(s.workerId);
     } catch (err) {
       logWarning("engine", `pause worker cleanup failed: ${getErrorMessage(err)}`, { file: "auto.ts" });
     }
     s.workerId = null;
+    s.milestoneLeaseToken = null;
   }
 
   deregisterSigtermHandler();
@@ -2521,7 +2553,7 @@ export async function startAuto(
   // leaves the last provider-trimmed active tools in place, so clearing here
   // would let the next selectAndApplyModel recapture that already-narrowed
   // set as the new baseline — exactly the cross-unit poisoning this PR is
-  // fixing (#4959 / CodeRabbit Major).  The pre-pause baseline survives in
+  // fixing (#4959).  The pre-pause baseline survives in
   // the WeakMap keyed by `pi`.
   if (!s.paused) clearToolBaseline(pi);
 

package/src/resources/extensions/gsd/bootstrap/agent-end-recovery.ts

@@ -1,4 +1,4 @@
-// GSD-2 + src/resources/extensions/gsd/bootstrap/agent-end-recovery.ts - Handles provider and agent-end recovery for GSD auto-mode.
+// gsd-pi + src/resources/extensions/gsd/bootstrap/agent-end-recovery.ts - Handles provider and agent-end recovery for GSD auto-mode.
 
 import type { ExtensionAPI, ExtensionContext } from "@gsd/pi-coding-agent";
 
@@ -172,10 +172,9 @@ export function isBareClaudeCodeStreamAbortPlaceholder(lastMsg: unknown): boolea
  * "Auto-mode stopped — Unit aborted: Claude Code process aborted by user"
  * even though no user input occurred.
  *
- * Claude Code abort markers are intentionally ignored when the abort fires
- * while the session-switch is in flight: the abort is the expected side-effect
- * of the transition, not a user signal. Other branches (genuine `stopReason
- * === "aborted"` with explicit errorMessage) preserve the prior behavior.
+ * Abort markers are intentionally ignored when the abort fires while the
+ * session-switch is in flight: the abort belongs to the old turn being torn
+ * down by newSession(), not to the next unit.
  */
 export function _handleSessionSwitchAgentEnd(
   lastMsg: unknown,
@@ -199,10 +198,7 @@ export function _handleSessionSwitchAgentEnd(
   }
 
   if (m.stopReason === "aborted") {
-    const hasErrorMessage = !!m.errorMessage;
-    if (hasErrorMessage) {
-      resolveCancelled(_buildAbortedPauseContext(m as { errorMessage?: unknown }));
-    }
+    return;
   }
 }
 

package/src/resources/extensions/gsd/bootstrap/db-tools.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers DB-backed GSD workflow tools and compatibility aliases.
 import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/bootstrap/dynamic-tools.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers workspace-aware dynamic filesystem and shell tools.
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";

package/src/resources/extensions/gsd/bootstrap/exec-tools.ts

@@ -1,6 +1,6 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers Context Mode execution tools.
-// GSD2 — Exec (context-mode) tool registration.
+// gsd-pi — Exec (context-mode) tool registration.
 //
 // Exposes the Context Mode runtime tools in-process. Default-on; opt out with
 // `context_mode.enabled: false` in preferences.

package/src/resources/extensions/gsd/bootstrap/journal-tools.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers journal query tools.
 import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/bootstrap/memory-tools.ts

@@ -1,6 +1,6 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers memory-layer tools.
-// GSD2 — Memory tool registration
+// gsd-pi — Memory tool registration
 //
 // Exposes the memory-layer tools (capture_thought, memory_query, gsd_graph)
 // to the LLM over MCP. All three degrade gracefully when the GSD database

package/src/resources/extensions/gsd/bootstrap/query-tools.ts

@@ -1,6 +1,6 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers read-only DB query tools.
-// GSD2 — Read-only query tools exposing DB state to the LLM via the WAL connection
+// gsd-pi — Read-only query tools exposing DB state to the LLM via the WAL connection
 
 import { Type } from "@sinclair/typebox";
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/bootstrap/register-extension.ts

@@ -1,4 +1,4 @@
-// GSD2 — Extension registration: wires all GSD tools, commands, and hooks into pi
+// gsd-pi — Extension registration: wires all GSD tools, commands, and hooks into pi
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";
 
@@ -11,6 +11,7 @@ import { registerExecTools } from "./exec-tools.js";
 import { registerJournalTools } from "./journal-tools.js";
 import { registerMemoryTools } from "./memory-tools.js";
 import { registerQueryTools } from "./query-tools.js";
+import { registerScheduleWakeupTool } from "./schedule-wakeup-tool.js";
 import { registerHooks } from "./register-hooks.js";
 import { registerShortcuts } from "./register-shortcuts.js";
 import { writeCrashLog } from "./crash-log.js";
@@ -123,6 +124,7 @@ export function registerGsdExtension(pi: ExtensionAPI): void {
     ["query-tools", () => registerQueryTools(pi)],
     ["memory-tools", () => registerMemoryTools(pi)],
     ["exec-tools", () => registerExecTools(pi)],
+    ["schedule-wakeup-tool", () => registerScheduleWakeupTool(pi)],
     ["shortcuts", () => registerShortcuts(pi)],
     // cmux is a library (no pi), so gsd sets up the event listeners on its
     // behalf using the shared event channel contract. Registration is

package/src/resources/extensions/gsd/bootstrap/register-hooks.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers GSD extension runtime hooks and token-saving tool policies.
 
 import { existsSync } from "node:fs";
@@ -844,6 +844,9 @@ export function registerHooks(
     // subagent dispatch. Closes the b23 bug class where a discuss-milestone
     // turn used the host Edit tool to modify user source files.
     const dash = getAutoRuntimeSnapshot();
+
+    // ScheduleWakeup is registered by the GSD extension so auto-mode can
+    // continue the same unit session after long external waits.
     const guidedUnit = getGuidedUnitContext(discussionBasePath);
     const activeUnitType = dash.currentUnit?.type ?? guidedUnit?.unitType;
     if (activeUnitType) {

package/src/resources/extensions/gsd/bootstrap/register-shortcuts.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Registers GSD keyboard shortcuts for dashboard, notifications, and parallel overlays.
 
 import { existsSync } from "node:fs";

package/src/resources/extensions/gsd/bootstrap/schedule-wakeup-tool.ts

@@ -0,0 +1,81 @@
+// Project/App: gsd-pi
+// File Purpose: Registers the auto-mode ScheduleWakeup continuation tool.
+
+import { Type } from "@sinclair/typebox";
+import type { ExtensionAPI } from "@gsd/pi-coding-agent";
+
+import { getAutoRuntimeSnapshot } from "../auto-runtime-state.js";
+import { scheduleAutoWakeup } from "../auto/schedule-wakeup.js";
+import { resolveCtxCwd } from "./dynamic-tools.js";
+
+const MAX_WAKEUP_DELAY_SECONDS = 24 * 60 * 60;
+
+export function registerScheduleWakeupTool(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "ScheduleWakeup",
+    label: "Schedule Wakeup",
+    description:
+      "In GSD auto-mode, pause the current unit and continue the same session after a delay. " +
+      "Use this for long external processes that need polling without ending the unit as no-artifact.",
+    promptSnippet: "Schedule a same-session auto-mode wakeup after a delay.",
+    promptGuidelines: [
+      "Use ScheduleWakeup at the end of an execute-task turn when waiting for a long external process.",
+      "Include a prompt that says exactly what external state to check next and what artifact to write when done.",
+      "Re-arm ScheduleWakeup on each polling turn if the external process is still running.",
+    ],
+    parameters: Type.Object({
+      delaySeconds: Type.Number({
+        minimum: 1,
+        maximum: MAX_WAKEUP_DELAY_SECONDS,
+        description: "How many seconds to wait before continuing the same auto-mode session.",
+      }),
+      prompt: Type.String({
+        minLength: 1,
+        description: "Prompt to send when the session wakes up.",
+      }),
+      reason: Type.Optional(Type.String({
+        description: "Why this delay is appropriate.",
+      })),
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const dash = getAutoRuntimeSnapshot();
+      const currentUnit = dash.currentUnit;
+      const basePath = dash.basePath || resolveCtxCwd(ctx);
+
+      if (!dash.active || !currentUnit) {
+        return {
+          content: [{ type: "text", text: "ScheduleWakeup is only available during an active GSD auto-mode unit." }],
+          details: { operation: "schedule_wakeup", error: "auto_mode_inactive" },
+          isError: true,
+        };
+      }
+
+      const delaySeconds = Math.max(
+        1,
+        Math.min(MAX_WAKEUP_DELAY_SECONDS, Math.floor(params.delaySeconds)),
+      );
+      scheduleAutoWakeup({
+        basePath,
+        unitType: currentUnit.type,
+        unitId: currentUnit.id,
+        delayMs: delaySeconds * 1000,
+        prompt: params.prompt,
+        reason: params.reason ?? "",
+        createdAt: Date.now(),
+      });
+
+      return {
+        content: [{
+          type: "text",
+          text: `Wakeup scheduled for ${delaySeconds}s. Auto-mode will continue ${currentUnit.type} ${currentUnit.id} in the same session.`,
+        }],
+        details: {
+          operation: "schedule_wakeup",
+          delaySeconds,
+          unitType: currentUnit.type,
+          unitId: currentUnit.id,
+        },
+      };
+    },
+  });
+}

package/src/resources/extensions/gsd/bootstrap/system-context.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: System prompt and hidden context bootstrap for GSD sessions.
 import { existsSync, readFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";

package/src/resources/extensions/gsd/bootstrap/tests/write-gate-basepath.test.ts

@@ -1,4 +1,4 @@
-// GSD-2 write-gate bootstrap — regression test for required basePath (commit A3)
+// gsd-pi write-gate bootstrap — regression test for required basePath (commit A3)
 //
 // Verifies that persistWriteGateSnapshot / loadWriteGateSnapshot are pinned to
 // the basePath argument and do not silently fall back to process.cwd(). The

package/src/resources/extensions/gsd/bootstrap/tests/write-gate-shouldblock-basepath.test.ts

@@ -1,4 +1,4 @@
-// GSD-2 write-gate bootstrap — regression tests for basePath threading on
+// gsd-pi write-gate bootstrap — regression tests for basePath threading on
 // shouldBlockContextWrite / shouldBlockPendingGate (R1).
 //
 // The underlying bug: readers defaulted to process.cwd() and so missed the

package/src/resources/extensions/gsd/bootstrap/write-gate.ts

@@ -1,4 +1,4 @@
-// GSD2 - Write gate runtime persistence and policy guards.
+// gsd-pi - Write gate runtime persistence and policy guards.
 import { copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, realpathSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { isAbsolute, join, relative, resolve, sep } from "node:path";
 

package/src/resources/extensions/gsd/browser-evidence.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Shared browser-observable UAT requirement and evidence detection.
 
 export const BROWSER_REQUIREMENT_RE = /\b(?:browser|file:\/\/|localhost|dom|localstorage|click(?:ing|ed)?|button|visible|screenshot|snapshot|reload(?:ed)?|page refresh|user-visible|strikethrough|search box)\b/i;

package/src/resources/extensions/gsd/closeout-recovery.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Closeout git failure discovery, retry, and manual resolution helpers.
 
 import { execFileSync } from "node:child_process";

package/src/resources/extensions/gsd/commands/catalog.ts

@@ -14,7 +14,7 @@ export interface GsdCommandDefinition {
 type CompletionMap = Record<string, readonly GsdCommandDefinition[]>;
 
 export const GSD_COMMAND_DESCRIPTION =
-  "GSD — Get Shit Done: /gsd help|start|templates|next|auto|stop|pause|status|widget|visualize|brief|report|queue|quick|discuss|capture|triage|dispatch|verdict|history|undo|undo-task|reset-slice|rate|skip|export|cleanup|closeout|model|mode|prefs|config|keys|hooks|run-hook|skill-health|doctor|debug|logs|forensics|changelog|migrate|remote|steer|knowledge|new-milestone|new-project|parallel|cmux|park|unpark|init|setup|onboarding|inspect|extensions|update|fast|mcp|rethink|workflow|codebase|notifications|ship|do|session-report|backlog|pr-branch|add-tests|scan|language|worktree|eval-review";
+  "GSD — Get Shit Done: /gsd help|start|templates|next|auto|stop|pause|status|widget|visualize|brief|report|queue|quick|discuss|capture|triage|dispatch|verdict|history|undo|undo-task|reset-slice|rate|skip|export|cleanup|closeout|model|mode|prefs|config|keys|hooks|run-hook|skill-health|doctor|debug|logs|forensics|changelog|migrate|remote|steer|knowledge|new-milestone|new-project|parallel|cmux|park|unpark|init|setup|onboarding|inspect|extensions|update|upgrade|fast|mcp|rethink|workflow|codebase|notifications|ship|do|session-report|backlog|pr-branch|add-tests|scan|language|worktree|eval-review";
 
 export const TOP_LEVEL_SUBCOMMANDS: readonly GsdCommandDefinition[] = [
   { cmd: "help", desc: "Categorized command reference with descriptions" },
@@ -72,6 +72,7 @@ export const TOP_LEVEL_SUBCOMMANDS: readonly GsdCommandDefinition[] = [
   { cmd: "park", desc: "Park a milestone — skip without deleting" },
   { cmd: "unpark", desc: "Reactivate a parked milestone" },
   { cmd: "update", desc: "Update GSD to the latest version" },
+  { cmd: "upgrade", desc: "Alias for update; installs the latest @opengsd package" },
   { cmd: "start", desc: "Start a workflow template (bugfix, spike, feature, etc.)" },
   { cmd: "templates", desc: "List available workflow templates" },
   { cmd: "extensions", desc: "Manage extensions (list, enable, disable, info)" },

package/src/resources/extensions/gsd/commands/dispatcher.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Routes /gsd commands through global guards and command handlers.
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/commands/handlers/core.ts

@@ -147,6 +147,7 @@ export function showHelp(ctx: ExtensionCommandContext, args = ""): void {
     "  /gsd remote         Control remote auto-mode  [slack|discord|status|disconnect]",
     "  /gsd inspect        Show SQLite DB diagnostics (schema, row counts, recent entries)",
     "  /gsd update         Update GSD to the latest version via npm",
+    "  /gsd upgrade        Alias for /gsd update",
     "  /gsd language       Set or clear the global response language  [off|clear|<language>]",
   ];
   const full = ["full", "--full", "all"].includes(args.trim().toLowerCase());

package/src/resources/extensions/gsd/commands/handlers/notifications-handler.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Handles /gsd notifications commands and opens the notification history overlay.
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/commands/handlers/ops.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Handles operational /gsd subcommands.
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";
 
@@ -278,7 +278,7 @@ Examples:
     await handleInspect(ctx);
     return true;
   }
-  if (trimmed === "update") {
+  if (trimmed === "update" || trimmed === "upgrade") {
     await handleUpdate(ctx);
     return true;
   }

package/src/resources/extensions/gsd/commands-bootstrap.ts

@@ -45,6 +45,7 @@ const TOP_LEVEL_SUBCOMMANDS = [
   { cmd: "park", desc: "Park a milestone" },
   { cmd: "unpark", desc: "Reactivate a parked milestone" },
   { cmd: "update", desc: "Update GSD to the latest version" },
+  { cmd: "upgrade", desc: "Alias for update; installs the latest @opengsd package" },
   { cmd: "start", desc: "Start a workflow template" },
   { cmd: "templates", desc: "List available workflow templates" },
   { cmd: "extensions", desc: "Manage extensions" },

package/src/resources/extensions/gsd/commands-closeout.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Handles /gsd closeout recovery commands for failed git closeout.
 
 import type { ExtensionCommandContext } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/commands-ship.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Ship command for creating pull requests from GSD milestone evidence.
 
 /**

package/src/resources/extensions/gsd/commands-verdict.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Handles manual milestone validation verdict overrides.
 
 import type { ExtensionCommandContext } from "@gsd/pi-coding-agent";

package/src/resources/extensions/gsd/commands-workflow-templates.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Workflow template commands for starting, listing, and dispatching workflows.
 
 /**

package/src/resources/extensions/gsd/commands-worktree.ts

@@ -1,4 +1,4 @@
-// GSD-2 — In-TUI handler for /gsd worktree commands (list, merge, clean, remove).
+// gsd-pi — In-TUI handler for /gsd worktree commands (list, merge, clean, remove).
 //
 // Mirrors the CLI subcommands in src/worktree-cli.ts but emits results via
 // ctx.ui.notify() instead of writing colored output to stderr. Reuses the

package/src/resources/extensions/gsd/component-loader.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Loads modern component.yaml definitions and legacy skill/agent formats.
 
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';

package/src/resources/extensions/gsd/db/auto-workers.ts

@@ -1,4 +1,4 @@
-// gsd-2 + Auto-mode worker process registry (DB-backed coordination, Phase B)
+// gsd-pi + Auto-mode worker process registry (DB-backed coordination, Phase B)
 //
 // IMPORTANT — naming clarification (codex review LOW N1):
 // This module is the AUTO-MODE PROCESS REGISTRY. It tracks long-running

package/src/resources/extensions/gsd/db/command-queue.ts

@@ -1,4 +1,4 @@
-// gsd-2 + Worker IPC command queue (DB-backed coordination, Phase B)
+// gsd-pi + Worker IPC command queue (DB-backed coordination, Phase B)
 //
 // New infrastructure for dispatcher-to-worker IPC (cancel signals, pause
 // requests, etc.). NOT a replacement for any existing on-disk queue and

package/src/resources/extensions/gsd/db/milestone-leases.ts

@@ -1,4 +1,4 @@
-// gsd-2 + Milestone leases with fencing tokens (DB-backed coordination, Phase B)
+// gsd-pi + Milestone leases with fencing tokens (DB-backed coordination, Phase B)
 //
 // One worker at a time may hold a lease on a given milestone. Leases carry a
 // monotonic fencing token that increments on every successful takeover, so
@@ -123,10 +123,13 @@ export function claimMilestoneLease(
     }
 
     // Step 2: takeover. Conditional UPDATE — only succeeds if the existing
-    // lease is expired or explicitly released. Fencing token is incremented
-    // by SQL (`fencing_token + 1`) so the new holder's token monotonically
-    // exceeds the prior holder's. db.changes() === 1 confirms the takeover
-    // actually happened (vs. losing the race to another worker).
+    // lease is expired/released, or if the claimant is a re-entrant worker row
+    // for the same live host/PID/project. The latter prevents a single
+    // orchestrator process from blocking on its own previous worker token.
+    // Fencing token is incremented by SQL (`fencing_token + 1`) so the new
+    // holder's token monotonically exceeds the prior holder's. db.changes()
+    // === 1 confirms the takeover actually happened (vs. losing the race to
+    // another worker).
     const updateResult = db.prepare(
       `UPDATE milestone_leases
        SET worker_id = :worker_id,
@@ -136,7 +139,18 @@ export function claimMilestoneLease(
            status = 'held'
        WHERE milestone_id = :milestone_id
          AND (status IN ('expired','released')
-              OR datetime(expires_at) < datetime('now'))`,
+              OR datetime(expires_at) < datetime('now')
+              OR EXISTS (
+                SELECT 1
+                FROM workers holder
+                JOIN workers claimant ON claimant.worker_id = :worker_id
+                WHERE holder.worker_id = milestone_leases.worker_id
+                  AND holder.status = 'active'
+                  AND claimant.status = 'active'
+                  AND holder.host = claimant.host
+                  AND holder.pid = claimant.pid
+                  AND holder.project_root_realpath = claimant.project_root_realpath
+              ))`,
     ).run({
       ":milestone_id": milestoneId,
       ":worker_id": workerId,

package/src/resources/extensions/gsd/db/runtime-kv.ts

@@ -1,4 +1,4 @@
-// gsd-2 + Non-correctness-critical key-value storage (Phase C — file-state migration)
+// gsd-pi + Non-correctness-critical key-value storage (Phase C — file-state migration)
 //
 // STRICT INVARIANT (re-stated from gsd-db.ts createRuntimeKvTableV25):
 // runtime_kv is for SOFT state only. UI cursors, dashboard caches,

package/src/resources/extensions/gsd/db/unit-dispatches.ts

@@ -1,4 +1,4 @@
-// gsd-2 + Unit dispatch ledger (DB-backed coordination, Phase B)
+// gsd-pi + Unit dispatch ledger (DB-backed coordination, Phase B)
 //
 // Records every auto-mode unit dispatch (plan-slice, run-task, summarize, …)
 // with worker_id, fencing token, status lifecycle, and retry metadata. The

package/src/resources/extensions/gsd/db-adapter.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Normalized SQLite adapter wrapper used by the GSD database facade.
 
 export interface DbStatement {

package/src/resources/extensions/gsd/db-base-schema.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Base table, index, and view DDL for the GSD database facade.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-connection-cache.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Workspace-scoped database connection cache helpers for the GSD database facade.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-coordination-schema.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Auto-mode coordination SQLite schema helper for the GSD database facade.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-decision-requirement-rows.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Decision and requirement row mappers for the GSD database facade.
 
 import type { Decision, DecisionMadeBy, Requirement, RequirementCounts } from "./types.js";

package/src/resources/extensions/gsd/db-gate-rows.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Quality gate row mapper for the GSD database facade.
 
 import type { GateId, GateRow, GateScope, GateStatus, GateVerdict } from "./types.js";

package/src/resources/extensions/gsd/db-lightweight-query-rows.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Lightweight DB query row mappers for hot-path status reads.
 
 type DbRow = Record<string, unknown>;

package/src/resources/extensions/gsd/db-memory-fts-schema.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Memory FTS5 SQLite schema helpers for the GSD database facade.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-migration-backup.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Pre-migration backup helper for GSD database schema upgrades.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-migration-steps.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Schema migration DDL steps for the GSD database facade.
 
 import type { DbAdapter } from "./db-adapter.js";

package/src/resources/extensions/gsd/db-milestone-artifact-rows.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Milestone and artifact row mappers for the GSD database facade.
 
 export interface MilestoneRow {

package/src/resources/extensions/gsd/db-open-state.ts

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Tracks database open attempt and error status for the GSD database facade.
 
 export type DbOpenPhase = "open" | "initSchema" | "vacuum-recovery";