@opengsd/gsd-pi 1.0.1 → 1.0.2

package/README.md

@@ -14,10 +14,47 @@ Older release history has been archived outside the active changelog so new work
 
 ## Install
 
+Install from npm (not by cloning this repo):
+
+```bash
+npm install -g @opengsd/gsd-pi@latest
+```
+
+Source: [`open-gsd/gsd-pi`](https://github.com/open-gsd/gsd-pi).
+
+## Migrate From Older Installs
+
+GSD Pi now installs from the scoped npm package `@opengsd/gsd-pi`. If you previously installed the older unscoped `gsd-pi` package, remove it first so the old global binary does not shadow the new package.
+
+macOS / Linux:
+
+```bash
+npm uninstall -g gsd-pi
+rm -f ~/.gsd/.update-check ~/.gsd/agent/managed-resources.json
+npm install -g @opengsd/gsd-pi@latest
+which gsd
+gsd --version
+```
+
+Windows PowerShell:
+
+```powershell
+npm uninstall -g gsd-pi
+Remove-Item "$env:USERPROFILE\.gsd\.update-check" -Force -ErrorAction SilentlyContinue
+Remove-Item "$env:USERPROFILE\.gsd\agent\managed-resources.json" -Force -ErrorAction SilentlyContinue
+npm install -g @opengsd/gsd-pi@latest
+where.exe gsd
+gsd --version
+```
+
+After migration, routine upgrades use:
+
 ```bash
-npm i @opengsd/gsd-pi
+gsd upgrade
 ```
 
+You can also run `npx @opengsd/gsd-pi@latest` to launch the installer from the new package. For deeper recovery steps, see [Upgrade GSD Pi](./docs/user-docs/getting-started.md#upgrade-gsd-pi) and [Upgrade from older gsd-pi installs](./docs/user-docs/troubleshooting.md#upgrade-from-older-gsd-pi-installs).
+
 ## Quick Start
 
 ```bash
@@ -26,7 +63,7 @@ gsd
 
 Run the setup flow, choose your preferred model provider, and open a project directory. GSD stores project planning and runtime state in `.gsd/`.
 
-For a full first-run walkthrough, see [Getting Started With GSD2](./docs/user-docs/getting-started.md).
+For a full first-run walkthrough, see [Getting Started With gsd-pi](./docs/user-docs/getting-started.md).
 
 ## Common Session Commands
 
@@ -78,7 +115,8 @@ npm test
 Before opening a pull request, run:
 
 ```bash
-npm run verify:pr
+npm run verify:fast   # CI fast-gates locally (scans + policy)
+npm run verify:pr     # build + typecheck + unit tests
 ```
 
 ## Versioning
@@ -91,6 +129,16 @@ Historical tags and archived refs may exist for traceability, but active release
 
 Join the [GSD Discord community](https://discord.com/invite/nKXTsAcmbT).
 
+## Star History
+
+<a href="https://www.star-history.com/?repos=open-gsd%2Fgsd-pi&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=open-gsd/gsd-pi&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=open-gsd/gsd-pi&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=open-gsd/gsd-pi&type=date&legend=top-left" />
+ </picture>
+</a>
+
 ## License
 
 MIT

package/dist/claude-cli-check.js

@@ -1,4 +1,4 @@
-// GSD2 — Claude CLI binary detection for onboarding
+// gsd-pi — Claude CLI binary detection for onboarding
 // Lightweight check used at onboarding time (before extensions load).
 // The full readiness check with caching lives in the claude-code-cli extension.
 //

package/dist/cli-policy.d.ts

@@ -3,7 +3,7 @@
  *
  * When the synced resource manifest claims a newer gsd version than the
  * running binary, exitIfManagedResourcesAreNewer() blocks every command
- * with a "Version mismatch detected" diagnostic. The `update` subcommand
+ * with a "Version mismatch detected" diagnostic. The `update`/`upgrade` subcommands
  * MUST bypass that gate so the user can recover by upgrading the binary —
  * otherwise they're stuck in a broken state with no escape hatch.
  *

package/dist/cli-policy.js

@@ -5,7 +5,7 @@
  *
  * When the synced resource manifest claims a newer gsd version than the
  * running binary, exitIfManagedResourcesAreNewer() blocks every command
- * with a "Version mismatch detected" diagnostic. The `update` subcommand
+ * with a "Version mismatch detected" diagnostic. The `update`/`upgrade` subcommands
  * MUST bypass that gate so the user can recover by upgrading the binary —
  * otherwise they're stuck in a broken state with no escape hatch.
  *
@@ -13,5 +13,5 @@
  * predicate before calling exitIfManagedResourcesAreNewer().
  */
 export function shouldBypassManagedResourceMismatchGate(firstMessage) {
-    return firstMessage === 'update';
+    return firstMessage === 'update' || firstMessage === 'upgrade';
 }

package/dist/cli.js

@@ -39,7 +39,7 @@ function exitIfManagedResourcesAreNewer(currentAgentDir) {
     }
     process.stderr.write(`[gsd] ${chalk.yellow('Version mismatch detected')}\n` +
         `[gsd] Synced resources are from ${chalk.bold(`v${managedVersion}`)}, but this \`gsd\` binary is ${chalk.dim(`v${currentVersion}`)}.\n` +
-        `[gsd] Run ${chalk.bold('npm install -g @opengsd/gsd-pi@latest')} or ${chalk.bold('gsd update')}, then try again.\n`);
+        `[gsd] Run ${chalk.bold('npm install -g @opengsd/gsd-pi@latest')} or ${chalk.bold('gsd upgrade')}, then try again.\n`);
     process.exit(1);
 }
 // ---------------------------------------------------------------------------
@@ -192,10 +192,10 @@ function ensureRtkBootstrap() {
     }
     return rtkBootstrapPromise;
 }
-// `gsd update` — update to the latest version via npm.
+// `gsd update` / `gsd upgrade` — update to the latest version via npm.
 // MUST run before exitIfManagedResourcesAreNewer(): when the bundled resource
 // manifest is from a newer version than the running binary, every other
-// command is blocked — only `update` should bypass the gate so the user can
+// command is blocked — only self-upgrade commands should bypass the gate so the user can
 // actually upgrade out of the broken state. See shouldBypassManagedResourceMismatchGate.
 if (shouldBypassManagedResourceMismatchGate(cliFlags.messages[0])) {
     const { runUpdate } = await import('./update-cmd.js');
@@ -305,6 +305,7 @@ const subcommandsExemptFromEarlyTtyCheck = new Set([
     'remove',
     'sessions',
     'update',
+    'upgrade',
     'web',
     'worktree',
     'wt',

package/dist/extension-sort.js

@@ -1,4 +1,4 @@
-// GSD-2 — Extension Sort: Topological dependency ordering
+// gsd-pi — Extension Sort: Topological dependency ordering
 // Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
 import { readManifestFromEntryPath } from './extension-registry.js';
 /**

package/dist/extension-validator.js

@@ -1,4 +1,4 @@
-// GSD-2 — Extension Package Format Validator
+// gsd-pi — Extension Package Format Validator
 // Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
 // ─── Individual Check Functions ───────────────────────────────────────────────
 /**

package/dist/help-text.js

@@ -20,6 +20,13 @@ const SUBCOMMAND_HELP = {
         '',
         'Equivalent to: npm install -g @opengsd/gsd-pi@latest',
     ].join('\n'),
+    upgrade: [
+        'Usage: gsd upgrade',
+        '',
+        'Upgrade GSD to the latest @opengsd package.',
+        '',
+        'Equivalent to: npm install -g @opengsd/gsd-pi@latest',
+    ].join('\n'),
     sessions: [
         'Usage: gsd sessions',
         '',
@@ -184,6 +191,7 @@ export function printHelp(version) {
     process.stdout.write('  remove <source>          Remove an installed package source\n');
     process.stdout.write('  list                     List installed package sources\n');
     process.stdout.write('  update                   Update GSD to the latest version\n');
+    process.stdout.write('  upgrade                  Alias for update\n');
     process.stdout.write('  sessions                 List and resume a past session\n');
     process.stdout.write('  worktree <cmd>           Manage worktrees (list, merge, clean, remove)\n');
     process.stdout.write('  auto [args]              Run auto-mode without TUI (pipeable)\n');

package/dist/loader-entrypoint.js

@@ -1,4 +1,4 @@
-// GSD-2 - Loader child-process entrypoint resolution helpers.
+// gsd-pi - Loader child-process entrypoint resolution helpers.
 import { existsSync as defaultExistsSync } from "node:fs";
 import { join, resolve } from "node:path";
 export function resolveLoaderCliEntrypoint({ gsdRoot, invokedBinPath, env = process.env, existsSync = defaultExistsSync, }) {

package/dist/resource-loader.js

@@ -14,7 +14,7 @@ function loadPiCodingAgentModule() {
 // Resolve resources directory — prefer dist/resources/ (stable, set at build time)
 // over src/resources/ (live working tree, changes with git branch).
 //
-// Why this matters: with `npm link`, src/resources/ points into the gsd-2 repo's
+// Why this matters: with `npm link`, src/resources/ points into the gsd-pi repo's
 // working tree. Switching branches there changes src/resources/ for ALL projects
 // that use gsd — causing stale/broken extensions to be synced to ~/.gsd/agent/.
 // dist/resources/ is populated by the build step (`npm run copy-resources`) and
@@ -48,6 +48,15 @@ function getBundledGsdVersion() {
         return '0.0.0';
     }
 }
+function getBundledPackageName() {
+    try {
+        const pkg = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf-8'));
+        return typeof pkg?.name === 'string' ? pkg.name : '@opengsd/gsd-pi';
+    }
+    catch {
+        return '@opengsd/gsd-pi';
+    }
+}
 function writeManagedResourceManifest(agentDir) {
     // Record root-level files and subdirectory extension names currently in the
     // bundled extensions source so that future upgrades can detect and prune any
@@ -77,6 +86,7 @@ function writeManagedResourceManifest(agentDir) {
     catch { /* non-fatal */ }
     const manifest = {
         gsdVersion: getBundledGsdVersion(),
+        packageName: getBundledPackageName(),
         syncedAt: Date.now(),
         contentHash: getCurrentResourceFingerprint(),
         installedExtensionRootFiles,
@@ -87,12 +97,17 @@ function writeManagedResourceManifest(agentDir) {
 export function readManagedResourceVersion(agentDir) {
     try {
         const manifest = JSON.parse(readFileSync(getManagedResourceManifestPath(agentDir), 'utf-8'));
+        if (!isCurrentPackageManifest(manifest))
+            return null;
         return typeof manifest?.gsdVersion === 'string' ? manifest.gsdVersion : null;
     }
     catch {
         return null;
     }
 }
+function isCurrentPackageManifest(manifest) {
+    return manifest?.packageName === getBundledPackageName();
+}
 function readManagedResourceManifest(agentDir) {
     try {
         return JSON.parse(readFileSync(getManagedResourceManifestPath(agentDir), 'utf-8'));
@@ -165,7 +180,11 @@ function collectFileEntries(dir, root, out) {
     }
 }
 export function getNewerManagedResourceVersion(agentDir, currentVersion) {
-    const managedVersion = readManagedResourceVersion(agentDir);
+    const manifest = readManagedResourceManifest(agentDir);
+    if (!isCurrentPackageManifest(manifest)) {
+        return null;
+    }
+    const managedVersion = typeof manifest?.gsdVersion === 'string' ? manifest.gsdVersion : null;
     if (!managedVersion) {
         return null;
     }
@@ -563,7 +582,7 @@ export function initResources(agentDir, skillsDir = join(homedir(), '.agents', '
     // Skip the full copy when both version AND content fingerprint match.
     // Version-only checks miss same-version content changes (npm link dev workflow,
     // hotfixes within a release). The content hash catches those at ~1ms cost.
-    if (manifest && manifest.gsdVersion === currentVersion) {
+    if (manifest && isCurrentPackageManifest(manifest) && manifest.gsdVersion === currentVersion) {
         // Version matches — check content fingerprint for same-version staleness.
         const currentHash = getCurrentResourceFingerprint();
         const hasStaleExtensionFiles = hasStaleCompiledExtensionSiblings(extensionsDir, bundledExtensionsDir);

package/dist/resources/.managed-resources-content-hash

@@ -1 +1 @@
-b5fb534fa3c310cb
+0906122b4e5a43de

package/dist/resources/extensions/claude-code-cli/stream-adapter.js

@@ -1,4 +1,4 @@
-// GSD2 - Claude Code CLI provider stream adapter
+// gsd-pi - Claude Code CLI provider stream adapter
 /**
  * Stream adapter: bridges the Claude Agent SDK into GSD's streamSimple contract.
  *
@@ -1237,7 +1237,7 @@ function extractStructuredDetailsFromBlock(block) {
  * (extracted separately by `extractStructuredDetailsFromBlock`) and must NOT
  * leak into the visible content rendered to the user — otherwise the renderer
  * stringifies the JSON pseudo-block and shows it next to the actual tool
- * output. See PR #4477 review (CodeRabbit, post-fix-round).
+ * output. See PR #4477 review (post-fix-round).
  */
 function isStructuredContentPseudoBlock(item) {
     if (!item || typeof item !== "object")

package/dist/resources/extensions/github-sync/templates.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Markdown formatters for GitHub sync issues, PR bodies, and comments.
 /**
  * Markdown formatters for GitHub issue bodies, PR descriptions,

package/dist/resources/extensions/gsd/auto/contracts.js

@@ -1,3 +1,3 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Auto Orchestration module interfaces and ADR-015 invariant adapter contracts.
 export {};

package/dist/resources/extensions/gsd/auto/custom-verify-retry-store.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Persistence adapter for custom workflow verification retry counts.
 import { readFileSync, mkdirSync, unlinkSync } from "node:fs";
 import { join } from "node:path";

package/dist/resources/extensions/gsd/auto/lease-conflict-notice.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Formats user-facing auto-mode milestone lease conflict notices.
 const LEASE_HELD_RE = /^Milestone\s+(\S+)\s+is held by worker\s+(.+?)\s+until\s+(.+?)\.?$/;
 function formatRelativeDuration(ms) {

package/dist/resources/extensions/gsd/auto/loop.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Main auto-mode execution loop.
 /**
  * auto/loop.ts — Main auto-mode execution loop.
@@ -1133,7 +1133,7 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                 // Carry the blocked unit identity into the turn-result observer:
                 // the throw originated inside dispatch, so observedUnitType/Id were
                 // not assigned by the success path at lines 453/631/647 — but the
-                // typed error already names the unit (#4959 / CodeRabbit).
+                // typed error already names the unit (#4959).
                 observedUnitType = loopErr.unitType;
                 observedUnitId = loopErr.unitId;
                 await deps.pauseAuto(ctx, pi);

package/dist/resources/extensions/gsd/auto/orchestrator.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Auto Orchestration module implementation and ADR-015 invariant pipeline owner.
 function now() {
     return Date.now();

package/dist/resources/extensions/gsd/auto/phases.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Auto-loop pipeline phases, merge closeout, and finalize handling.
 /**
  * auto/phases.ts — Pipeline phases for the auto-loop.
@@ -53,6 +53,11 @@ import { getConsecutiveDispatchBlocker } from "../dispatch-guard.js";
 import { captureRootDirtySnapshot, detectRootWriteLeak, formatRootWriteLeakMessage, } from "../root-write-leak-guard.js";
 export const STUCK_WINDOW_SIZE = 6;
 const STUCK_RECOVERY_ATTEMPTS_KEY = "stuck_recovery_attempts";
+export function resolveDispatchRecoveryAttempts(unitRecoveryCount, unitType, unitId) {
+    return (unitRecoveryCount.get(`${unitType}/${unitId}`) ?? 0) > 0
+        ? 0
+        : undefined;
+}
 // ─── Path Comparison Helper ───────────────────────────────────────────────
 /** Compare two paths for physical identity, tolerating trailing slashes and symlinks. */
 function isSamePathLocal(a, b) {
@@ -619,6 +624,7 @@ export async function runPreDispatch(ic, loopState) {
     s.lastBaselineCharCount = undefined;
     // Pre-dispatch health gate
     try {
+        const expectedCurrentUnit = null;
         const healthGate = await deps.preDispatchHealthGate(s.basePath);
         if (healthGate.fixesApplied.length > 0) {
             ctx.ui.notify(`Pre-dispatch: ${healthGate.fixesApplied.join(", ")}`, "info");
@@ -633,7 +639,7 @@ export async function runPreDispatch(ic, loopState) {
                 findings: healthGate.reason,
             });
             ctx.ui.notify(healthGate.reason || "Pre-dispatch health check failed — run /gsd doctor for details.", "error");
-            await deps.pauseAuto(ctx, pi);
+            await deps.pauseAuto(ctx, pi, undefined, { expectedCurrentUnit });
             debugLog("autoLoop", { phase: "exit", reason: "health-gate-failed" });
             return { action: "break", reason: "health-gate-failed" };
         }
@@ -1724,7 +1730,7 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         lastProgressAt: unitStartedAt,
         progressCount: 0,
         lastProgressKind: "dispatch",
-        recoveryAttempts: 0, // Reset so re-dispatched units get full recovery budget (#2322)
+        recoveryAttempts: resolveDispatchRecoveryAttempts(s.unitRecoveryCount, unitType, unitId),
     });
     // Progress widget + preconditions — deferred to after model selection so the
     // widget's first render tick shows the correct model (#2899).

package/dist/resources/extensions/gsd/auto/run-unit.js

@@ -1,4 +1,4 @@
-// GSD-2 + src/resources/extensions/gsd/auto/run-unit.ts - Runs one GSD auto-mode unit from session creation through agent completion.
+// gsd-pi + src/resources/extensions/gsd/auto/run-unit.ts - Runs one GSD auto-mode unit from session creation through agent completion.
 import { NEW_SESSION_TIMEOUT_MS } from "./session.js";
 import { _clearCurrentResolve, _consumePendingSwitchCancellation, _markSessionSwitchAbortGraceWindow, _setCurrentResolve, _setSessionSwitchInFlight, } from "./resolve.js";
 import { getCurrentTurnGeneration, runWithTurnGeneration, } from "./turn-epoch.js";
@@ -6,8 +6,11 @@ import { debugLog } from "../debug-logger.js";
 import { logWarning } from "../workflow-logger.js";
 import { resolveAutoSupervisorConfig } from "../preferences.js";
 import { readUnitRuntimeRecord } from "../unit-runtime.js";
+import { consumeAutoWakeup } from "./schedule-wakeup.js";
 const UNIT_FAILSAFE_BUFFER_MS = 30_000;
 const UNIT_FAILSAFE_RECHECK_MS = 30_000;
+const WAKEUP_SLEEP_CHUNK_MS = 1_000;
+const MAX_WAKEUPS_PER_UNIT = 100;
 export function shouldDeferUnitFailsafeTimeout(runtime, opts) {
     if (!runtime)
         return false;
@@ -30,6 +33,15 @@ export function shouldDeferUnitFailsafeTimeout(runtime, opts) {
         return true;
     return progressAgeMs >= 0 && progressAgeMs <= opts.freshProgressMs;
 }
+async function sleepForScheduledWakeup(s, delayMs) {
+    const deadline = Date.now() + Math.max(0, delayMs);
+    while (Date.now() < deadline) {
+        if (!s.active || s.paused)
+            return false;
+        await new Promise((resolve) => setTimeout(resolve, Math.min(WAKEUP_SLEEP_CHUNK_MS, deadline - Date.now())));
+    }
+    return s.active && !s.paused;
+}
 // Tracks the latest session-switch attempt so a late timeout settlement from an
 // older runUnit() call cannot clear the guard for a newer one.
 let sessionSwitchGeneration = 0;
@@ -174,51 +186,105 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
     let unitTimeoutHandle;
     let result;
     try {
+        const awaitAgentEndWithTimeout = (agentEndPromise) => {
+            const timeoutResult = new Promise((resolve) => {
+                const settleOrDefer = () => {
+                    let runtime;
+                    try {
+                        runtime = readUnitRuntimeRecord(s.basePath, unitType, unitId);
+                    }
+                    catch (error) {
+                        debugLog("runUnit", {
+                            phase: "unit-failsafe-runtime-read-failed",
+                            unitType,
+                            unitId,
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                        resolve({
+                            status: "cancelled",
+                            errorContext: {
+                                message: "Unit hard timeout — supervision may have failed; runtime progress could not be read",
+                                category: "timeout",
+                                isTransient: true,
+                            },
+                        });
+                        return;
+                    }
+                    if (shouldDeferUnitFailsafeTimeout(runtime, {
+                        nowMs: Date.now(),
+                        currentUnitStartedAt: s.currentUnit?.startedAt,
+                        freshProgressMs,
+                    })) {
+                        debugLog("runUnit", {
+                            phase: "unit-failsafe-deferred",
+                            unitType,
+                            unitId,
+                            runtimePhase: runtime?.phase,
+                            lastProgressKind: runtime?.lastProgressKind,
+                        });
+                        unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_FAILSAFE_RECHECK_MS);
+                        return;
+                    }
+                    resolve({ status: "cancelled", errorContext: { message: "Unit hard timeout — supervision may have failed", category: "timeout", isTransient: true } });
+                };
+                unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_HARD_TIMEOUT_MS);
+            });
+            return runWithTurnGeneration(capturedTurnGen, () => Promise.race([agentEndPromise, timeoutResult]));
+        };
         pi.sendMessage({ customType: "gsd-auto", content: prompt, display: s.verbose }, { triggerTurn: true });
         debugLog("runUnit", { phase: "awaiting-agent-end", unitType, unitId });
-        const timeoutResult = new Promise((resolve) => {
-            const settleOrDefer = () => {
-                let runtime;
-                try {
-                    runtime = readUnitRuntimeRecord(s.basePath, unitType, unitId);
-                }
-                catch (error) {
-                    debugLog("runUnit", {
-                        phase: "unit-failsafe-runtime-read-failed",
-                        unitType,
-                        unitId,
-                        error: error instanceof Error ? error.message : String(error),
-                    });
-                    resolve({
-                        status: "cancelled",
-                        errorContext: {
-                            message: "Unit hard timeout — supervision may have failed; runtime progress could not be read",
-                            category: "timeout",
-                            isTransient: true,
-                        },
-                    });
-                    return;
-                }
-                if (shouldDeferUnitFailsafeTimeout(runtime, {
-                    nowMs: Date.now(),
-                    currentUnitStartedAt: s.currentUnit?.startedAt,
-                    freshProgressMs,
-                })) {
-                    debugLog("runUnit", {
-                        phase: "unit-failsafe-deferred",
-                        unitType,
-                        unitId,
-                        runtimePhase: runtime?.phase,
-                        lastProgressKind: runtime?.lastProgressKind,
-                    });
-                    unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_FAILSAFE_RECHECK_MS);
-                    return;
-                }
-                resolve({ status: "cancelled", errorContext: { message: "Unit hard timeout — supervision may have failed", category: "timeout", isTransient: true } });
-            };
-            unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_HARD_TIMEOUT_MS);
-        });
-        result = await runWithTurnGeneration(capturedTurnGen, () => Promise.race([unitPromise, timeoutResult]));
+        result = await awaitAgentEndWithTimeout(unitPromise);
+        if (unitTimeoutHandle) {
+            clearTimeout(unitTimeoutHandle);
+            unitTimeoutHandle = undefined;
+        }
+        let wakeupCount = 0;
+        while (result.status === "completed" && s.active && !s.paused) {
+            const wakeup = consumeAutoWakeup(s.basePath, unitType, unitId);
+            if (!wakeup)
+                break;
+            wakeupCount += 1;
+            if (wakeupCount > MAX_WAKEUPS_PER_UNIT) {
+                result = {
+                    status: "cancelled",
+                    errorContext: {
+                        message: `ScheduleWakeup limit exceeded for ${unitType} ${unitId}`,
+                        category: "timeout",
+                        isTransient: false,
+                    },
+                };
+                break;
+            }
+            debugLog("runUnit", {
+                phase: "schedule-wakeup-wait",
+                unitType,
+                unitId,
+                delayMs: wakeup.delayMs,
+                reason: wakeup.reason,
+            });
+            const slept = await sleepForScheduledWakeup(s, wakeup.delayMs);
+            if (!slept) {
+                result = {
+                    status: "cancelled",
+                    errorContext: {
+                        message: `ScheduleWakeup interrupted for ${unitType} ${unitId}`,
+                        category: "aborted",
+                        isTransient: true,
+                    },
+                };
+                break;
+            }
+            const continuationPromise = new Promise((resolve) => {
+                _setCurrentResolve(resolve);
+            });
+            pi.sendMessage({ customType: "gsd-auto", content: wakeup.prompt, display: s.verbose }, { triggerTurn: true });
+            debugLog("runUnit", { phase: "schedule-wakeup-awaiting-agent-end", unitType, unitId });
+            result = await awaitAgentEndWithTimeout(continuationPromise);
+            if (unitTimeoutHandle) {
+                clearTimeout(unitTimeoutHandle);
+                unitTimeoutHandle = undefined;
+            }
+        }
     }
     finally {
         if (unitTimeoutHandle)

package/dist/resources/extensions/gsd/auto/schedule-wakeup.js

@@ -0,0 +1,18 @@
+// Project/App: gsd-pi
+// File Purpose: Auto-mode ScheduleWakeup state shared between the tool and runUnit.
+function wakeupKey(basePath, unitType, unitId) {
+    return `${basePath}\0${unitType}\0${unitId}`;
+}
+const pendingWakeups = new Map();
+export function scheduleAutoWakeup(wakeup) {
+    pendingWakeups.set(wakeupKey(wakeup.basePath, wakeup.unitType, wakeup.unitId), wakeup);
+}
+export function consumeAutoWakeup(basePath, unitType, unitId) {
+    const key = wakeupKey(basePath, unitType, unitId);
+    const wakeup = pendingWakeups.get(key) ?? null;
+    pendingWakeups.delete(key);
+    return wakeup;
+}
+export function _resetAutoWakeupsForTest() {
+    pendingWakeups.clear();
+}

package/dist/resources/extensions/gsd/auto/session.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Mutable auto-mode session state container.
 /**
  * AutoSession — encapsulates all mutable auto-mode state into a single instance.

package/dist/resources/extensions/gsd/auto/unit-runner-events.js

@@ -1,4 +1,4 @@
-// GSD-2 + src/resources/extensions/gsd/auto/unit-runner-events.ts - Classifies agent lifecycle events before Unit settlement.
+// gsd-pi + src/resources/extensions/gsd/auto/unit-runner-events.ts - Classifies agent lifecycle events before Unit settlement.
 export function isInternalSessionTransitionAbortEvent(event) {
     return event.abortOrigin === "session-transition";
 }

package/dist/resources/extensions/gsd/auto/verification-retry-policy.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Central retry policy for auto-mode verification redispatches.
 import { createHash } from "node:crypto";
 export const VERIFICATION_RETRY_BASE_DELAY_MS = 2_000;

package/dist/resources/extensions/gsd/auto/workflow-custom-engine-dispatch-outcome.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Applies custom-engine dispatch decisions to auto-mode loop side effects.
 export async function handleCustomEngineDispatchOutcome(input) {
     if (input.decision.action === "stop") {

package/dist/resources/extensions/gsd/auto/workflow-custom-engine-iteration.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Custom-engine iteration-data adapter for auto-mode loop.
 export async function buildCustomEngineIterationData(input) {
     const gsdState = await input.deriveState(input.canonicalProjectRoot);

package/dist/resources/extensions/gsd/auto/workflow-custom-engine-reconcile-outcome.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Applies custom-engine reconcile outcomes to auto-mode loop side effects.
 export async function handleCustomEngineReconcileOutcome(input) {
     const details = {

package/dist/resources/extensions/gsd/auto/workflow-custom-engine-reconcile.js

@@ -1,4 +1,4 @@
-// Project/App: GSD-2
+// Project/App: gsd-pi
 // File Purpose: Custom-engine successful verification reconcile adapter for auto-mode loop.
 import { decideEngineReconcile, } from "./workflow-kernel.js";
 export async function handleCustomEngineReconcile(input) {