gsd-pi 2.77.0-dev.c9c8932c6 → 2.77.0-dev.cfd69e714

package/dist/resources/extensions/gsd/uok/gate-runner.js

@@ -24,7 +24,8 @@ export class UokGateRunner {
     async run(id, ctx) {
         const gate = this.registry.get(id);
         if (!gate) {
-            return {
+            const now = new Date().toISOString();
+            const unknownResult = {
                 gateId: id,
                 gateType: "unknown",
                 outcome: "manual-attention",
@@ -33,16 +34,63 @@ export class UokGateRunner {
                 attempt: 1,
                 maxAttempts: 1,
                 retryable: false,
-                evaluatedAt: new Date().toISOString(),
+                evaluatedAt: now,
             };
+            insertGateRun({
+                traceId: ctx.traceId,
+                turnId: ctx.turnId,
+                gateId: unknownResult.gateId,
+                gateType: unknownResult.gateType,
+                unitType: ctx.unitType,
+                unitId: ctx.unitId,
+                milestoneId: ctx.milestoneId,
+                sliceId: ctx.sliceId,
+                taskId: ctx.taskId,
+                outcome: unknownResult.outcome,
+                failureClass: unknownResult.failureClass,
+                rationale: unknownResult.rationale,
+                findings: unknownResult.findings,
+                attempt: unknownResult.attempt,
+                maxAttempts: unknownResult.maxAttempts,
+                retryable: unknownResult.retryable,
+                evaluatedAt: unknownResult.evaluatedAt,
+            });
+            emitUokAuditEvent(ctx.basePath, buildAuditEnvelope({
+                traceId: ctx.traceId,
+                turnId: ctx.turnId,
+                category: "gate",
+                type: "gate-run",
+                payload: {
+                    gateId: unknownResult.gateId,
+                    gateType: unknownResult.gateType,
+                    outcome: unknownResult.outcome,
+                    failureClass: unknownResult.failureClass,
+                    attempt: unknownResult.attempt,
+                    maxAttempts: unknownResult.maxAttempts,
+                    retryable: unknownResult.retryable,
+                },
+            }));
+            return unknownResult;
         }
         let attempt = 0;
         let final = null;
         const maxAttemptsByFailureClass = RETRY_MATRIX;
-        while (attempt < 3) {
+        const maxAttemptsCeiling = Math.max(...Object.values(RETRY_MATRIX)) + 1;
+        while (attempt < maxAttemptsCeiling) {
             attempt += 1;
             const now = new Date().toISOString();
-            const result = await gate.execute(ctx, attempt);
+            let result;
+            try {
+                result = await gate.execute(ctx, attempt);
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                result = {
+                    outcome: "fail",
+                    failureClass: "unknown",
+                    rationale: message,
+                };
+            }
             const failureClass = result.failureClass ?? (result.outcome === "pass" ? "none" : "unknown");
             const retryBudget = maxAttemptsByFailureClass[failureClass] ?? 0;
             const retryable = result.outcome !== "pass" && attempt <= retryBudget;
@@ -54,7 +102,7 @@ export class UokGateRunner {
                 rationale: result.rationale,
                 findings: result.findings,
                 attempt,
-                maxAttempts: Math.max(1, retryBudget),
+                maxAttempts: retryBudget + 1,
                 retryable,
                 evaluatedAt: now,
             };

package/dist/resources/extensions/gsd/uok/gitops.js

@@ -32,7 +32,7 @@ export function writeTurnGitTransaction(args) {
         },
     }));
 }
-export function writeTurnCloseoutGitRecord(basePath, record) {
+export function writeTurnCloseoutGitRecord(basePath, record, metadata) {
     writeTurnGitTransaction({
         basePath,
         traceId: record.traceId,
@@ -45,6 +45,7 @@ export function writeTurnCloseoutGitRecord(basePath, record) {
         status: record.failureClass === "git" ? "failed" : "ok",
         error: record.failureClass === "git" ? "git closeout failure" : undefined,
         metadata: {
+            ...(metadata ?? {}),
             turnStatus: record.status,
             finishedAt: record.finishedAt,
             activityFile: record.activityFile,

package/dist/resources/extensions/gsd/uok/loop-adapter.js

@@ -1,12 +1,35 @@
 import { buildAuditEnvelope, emitUokAuditEvent } from "./audit.js";
 import { writeTurnCloseoutGitRecord, writeTurnGitTransaction } from "./gitops.js";
+import { acquireWriterToken, nextWriteRecord, releaseWriterToken } from "./writer.js";
 export function createTurnObserver(options) {
     let current = null;
+    let writerToken = null;
     const phaseResults = [];
+    function nextSequenceMetadata(category, operation, metadata) {
+        if (!writerToken)
+            return metadata ?? {};
+        const record = nextWriteRecord({
+            basePath: options.basePath,
+            token: writerToken,
+            category,
+            operation,
+            metadata,
+        });
+        return {
+            ...(metadata ?? {}),
+            writeSequence: record.sequence.sequence,
+            writerTokenId: record.writerToken.tokenId,
+        };
+    }
     return {
         onTurnStart(contract) {
             current = contract;
             phaseResults.length = 0;
+            writerToken = acquireWriterToken({
+                basePath: options.basePath,
+                traceId: contract.traceId,
+                turnId: contract.turnId,
+            });
             if (options.enableGitops) {
                 writeTurnGitTransaction({
                     basePath: options.basePath,
@@ -18,10 +41,10 @@ export function createTurnObserver(options) {
                     action: options.gitAction,
                     push: options.gitPush,
                     status: "ok",
-                    metadata: {
+                    metadata: nextSequenceMetadata("gitops", "insert", {
                         iteration: contract.iteration,
                         sidecarKind: contract.sidecarKind,
-                    },
+                    }),
                 });
             }
             if (options.enableAudit) {
@@ -30,12 +53,12 @@ export function createTurnObserver(options) {
                     turnId: contract.turnId,
                     category: "orchestration",
                     type: "turn-start",
-                    payload: {
+                    payload: nextSequenceMetadata("audit", "append", {
                         iteration: contract.iteration,
                         unitType: contract.unitType,
                         unitId: contract.unitId,
                         sidecarKind: contract.sidecarKind,
-                    },
+                    }),
                 }));
             }
         },
@@ -59,7 +82,7 @@ export function createTurnObserver(options) {
                     action: options.gitAction,
                     push: options.gitPush,
                     status: "ok",
-                    metadata: { action },
+                    metadata: nextSequenceMetadata("gitops", "update", { action }),
                 });
             }
             if (phase === "unit") {
@@ -73,7 +96,7 @@ export function createTurnObserver(options) {
                     action: options.gitAction,
                     push: options.gitPush,
                     status: "ok",
-                    metadata: { action },
+                    metadata: nextSequenceMetadata("gitops", "update", { action }),
                 });
             }
             if (phase === "finalize") {
@@ -87,7 +110,7 @@ export function createTurnObserver(options) {
                     action: options.gitAction,
                     push: options.gitPush,
                     status: "ok",
-                    metadata: { action },
+                    metadata: nextSequenceMetadata("gitops", "update", { action }),
                 });
             }
         },
@@ -102,14 +125,14 @@ export function createTurnObserver(options) {
                     turnId: merged.turnId,
                     category: "orchestration",
                     type: "turn-result",
-                    payload: {
+                    payload: nextSequenceMetadata("audit", "append", {
                         unitType: merged.unitType,
                         unitId: merged.unitId,
                         status: merged.status,
                         failureClass: merged.failureClass,
                         error: merged.error,
                         phaseCount: merged.phaseResults.length,
-                    },
+                    }),
                 }));
             }
             if (options.enableGitops) {
@@ -124,8 +147,12 @@ export function createTurnObserver(options) {
                     gitPushed: options.gitPush,
                     finishedAt: merged.finishedAt,
                 };
-                writeTurnCloseoutGitRecord(options.basePath, closeout);
+                writeTurnCloseoutGitRecord(options.basePath, closeout, nextSequenceMetadata("gitops", "update", { action: "record" }));
+            }
+            if (writerToken) {
+                releaseWriterToken(options.basePath, writerToken);
             }
+            writerToken = null;
             current = null;
             phaseResults.length = 0;
         },

package/dist/resources/extensions/gsd/uok/parity-report.js

@@ -0,0 +1,58 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { gsdRoot } from "../paths.js";
+function parityLogPath(basePath) {
+    return join(gsdRoot(basePath), "runtime", "uok-parity.jsonl");
+}
+function reportPath(basePath) {
+    return join(gsdRoot(basePath), "runtime", "uok-parity-report.json");
+}
+function increment(bucket, key) {
+    const normalized = key && key.trim().length > 0 ? key : "unknown";
+    bucket[normalized] = (bucket[normalized] ?? 0) + 1;
+}
+export function parseParityEvents(raw) {
+    return raw
+        .split("\n")
+        .filter(Boolean)
+        .map((line) => {
+        try {
+            return JSON.parse(line);
+        }
+        catch {
+            return { status: "error", error: "invalid parity json line" };
+        }
+    });
+}
+export function buildParityReport(events, sourcePath) {
+    const paths = {};
+    const statuses = {};
+    const criticalMismatches = [];
+    let fallbackInvocations = 0;
+    for (const event of events) {
+        increment(paths, event.path);
+        increment(statuses, event.status);
+        if (event.path === "legacy-fallback")
+            fallbackInvocations += 1;
+        if (event.status === "error") {
+            criticalMismatches.push(event.error ?? "parity event reported error");
+        }
+    }
+    return {
+        generatedAt: new Date().toISOString(),
+        sourcePath,
+        totalEvents: events.length,
+        paths,
+        statuses,
+        criticalMismatches,
+        fallbackInvocations,
+    };
+}
+export function writeParityReport(basePath) {
+    const sourcePath = parityLogPath(basePath);
+    const raw = existsSync(sourcePath) ? readFileSync(sourcePath, "utf-8") : "";
+    const report = buildParityReport(parseParityEvents(raw), sourcePath);
+    mkdirSync(join(gsdRoot(basePath), "runtime"), { recursive: true });
+    writeFileSync(reportPath(basePath), JSON.stringify(report, null, 2) + "\n", "utf-8");
+    return report;
+}

package/dist/resources/extensions/gsd/uok/plan-v2.js

@@ -3,12 +3,15 @@ import { join } from "node:path";
 import { gsdRoot, resolveMilestoneFile, resolveSliceFile } from "../paths.js";
 import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "../gsd-db.js";
 const PLAN_V2_CLARIFY_ROUND_LIMIT = 3;
-const EXECUTION_ENTRY_PHASES = new Set([
+export const EXECUTION_ENTRY_PHASES = new Set([
     "executing",
     "summarizing",
     "validating-milestone",
     "completing-milestone",
 ]);
+export function isExecutionEntryPhase(phase) {
+    return EXECUTION_ENTRY_PHASES.has(phase);
+}
 function graphOutputPath(basePath) {
     return join(gsdRoot(basePath), "runtime", "uok-plan-v2-graph.json");
 }
@@ -39,6 +42,12 @@ function hasMilestoneFileContent(basePath, milestoneId, suffix) {
     }
     return false;
 }
+export function hasFinalizedMilestoneContext(basePath, milestoneId) {
+    return hasMilestoneFileContent(basePath, milestoneId, "CONTEXT");
+}
+export function isMissingFinalizedContextResult(result) {
+    return !result.ok && result.finalizedContextIncluded === false;
+}
 function countSliceResearchArtifacts(basePath, milestoneId, slices) {
     let count = 0;
     for (const slice of slices) {
@@ -48,9 +57,6 @@ function countSliceResearchArtifacts(basePath, milestoneId, slices) {
     }
     return count;
 }
-function isExecutionEntryPhase(phase) {
-    return EXECUTION_ENTRY_PHASES.has(phase);
-}
 export function compileUnitGraphFromState(basePath, state) {
     const mid = state.activeMilestone?.id;
     if (!mid)

package/dist/resources/extensions/gsd/uok/writer.js

@@ -0,0 +1,82 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { randomUUID } from "node:crypto";
+import { atomicWriteSync } from "../atomic-write.js";
+import { gsdRoot } from "../paths.js";
+const activeTokens = new Map();
+function tokenKey(basePath, turnId) {
+    return `${basePath}:${turnId}`;
+}
+function sequencePath(basePath) {
+    return join(gsdRoot(basePath), "runtime", "uok-writer-sequence.json");
+}
+function readSequenceState(basePath) {
+    const path = sequencePath(basePath);
+    if (!existsSync(path)) {
+        return { lastSequence: 0, updatedAt: new Date(0).toISOString() };
+    }
+    try {
+        const parsed = JSON.parse(readFileSync(path, "utf-8"));
+        return {
+            lastSequence: Number.isInteger(parsed.lastSequence) ? Number(parsed.lastSequence) : 0,
+            updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : new Date(0).toISOString(),
+        };
+    }
+    catch {
+        return { lastSequence: 0, updatedAt: new Date(0).toISOString() };
+    }
+}
+function writeSequenceState(basePath, state) {
+    atomicWriteSync(sequencePath(basePath), JSON.stringify(state, null, 2) + "\n", "utf-8");
+}
+export function acquireWriterToken(args) {
+    const key = tokenKey(args.basePath, args.turnId);
+    const existing = activeTokens.get(key);
+    if (existing) {
+        throw new Error(`Writer token already active for turn ${args.turnId}`);
+    }
+    const token = {
+        tokenId: randomUUID(),
+        traceId: args.traceId,
+        turnId: args.turnId,
+        acquiredAt: new Date().toISOString(),
+        owner: args.owner ?? "uok",
+    };
+    activeTokens.set(key, token);
+    return token;
+}
+export function releaseWriterToken(basePath, token) {
+    const key = tokenKey(basePath, token.turnId);
+    const current = activeTokens.get(key);
+    if (current?.tokenId === token.tokenId) {
+        activeTokens.delete(key);
+    }
+}
+export function hasActiveWriterToken(basePath, turnId) {
+    return activeTokens.has(tokenKey(basePath, turnId));
+}
+export function nextWriteRecord(args) {
+    if (!hasActiveWriterToken(args.basePath, args.token.turnId)) {
+        throw new Error(`Writer token is not active for turn ${args.token.turnId}`);
+    }
+    const state = readSequenceState(args.basePath);
+    const sequence = state.lastSequence + 1;
+    const updatedAt = new Date().toISOString();
+    writeSequenceState(args.basePath, { lastSequence: sequence, updatedAt });
+    return {
+        writerToken: args.token,
+        sequence: {
+            traceId: args.token.traceId,
+            turnId: args.token.turnId,
+            sequence,
+        },
+        category: args.category,
+        operation: args.operation,
+        path: args.path,
+        ts: updatedAt,
+        metadata: args.metadata,
+    };
+}
+export function resetWriterTokensForTests() {
+    activeTokens.clear();
+}

package/dist/resources/extensions/gsd/workflow-logger.js

@@ -15,8 +15,9 @@
 // a process. The auto-loop must call _resetLogs() (or drainAndSummarize()) at
 // the start of each unit to prevent log bleed between units running in the same
 // Node process.
-import { appendFileSync, readFileSync, existsSync, mkdirSync } from "node:fs";
+import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, } from "node:fs";
 import { join } from "node:path";
+import { withFileLockSync } from "./file-lock.js";
 import { appendNotification } from "./notification-store.js";
 import { buildAuditEnvelope, emitUokAuditEvent } from "./uok/audit.js";
 import { isUnifiedAuditEnabled } from "./uok/audit-toggle.js";
@@ -231,8 +232,15 @@ function _push(severity, component, message, context) {
         try {
             const auditDir = join(_auditBasePath, ".gsd");
             mkdirSync(auditDir, { recursive: true });
+            const auditPath = join(auditDir, "audit-log.jsonl");
             const sanitized = _sanitizeForAudit(entry);
-            appendFileSync(join(auditDir, "audit-log.jsonl"), JSON.stringify(sanitized) + "\n", "utf-8");
+            // Ensure file exists so proper-lockfile can acquire a lock against it.
+            if (!existsSync(auditPath))
+                closeSync(openSync(auditPath, "a"));
+            // onLocked: "skip" — never block error logging on lock contention.
+            withFileLockSync(auditPath, () => {
+                appendFileSync(auditPath, JSON.stringify(sanitized) + "\n", "utf-8");
+            }, { onLocked: "skip" });
         }
         catch (auditErr) {
             // Best-effort — never let audit write failures bubble up

package/dist/resources/extensions/gsd/workflow-mcp.js

@@ -15,6 +15,7 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_journal_query",
     "gsd_milestone_complete",
     "gsd_milestone_generate_id",
+    "gsd_milestone_reopen",
     "gsd_checkpoint_db",
     "gsd_milestone_status",
     "gsd_milestone_validate",
@@ -23,6 +24,9 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_plan_slice",
     "gsd_replan_slice",
     "gsd_reassess_roadmap",
+    "gsd_reopen_milestone",
+    "gsd_reopen_slice",
+    "gsd_reopen_task",
     "gsd_requirement_save",
     "gsd_requirement_update",
     "gsd_roadmap_reassess",
@@ -32,9 +36,11 @@ const MCP_WORKFLOW_TOOL_SURFACE = new Set([
     "gsd_skip_slice",
     "gsd_slice_replan",
     "gsd_slice_complete",
+    "gsd_slice_reopen",
     "gsd_summary_save",
     "gsd_task_plan",
     "gsd_task_complete",
+    "gsd_task_reopen",
     "gsd_update_requirement",
     "gsd_validate_milestone",
 ]);

package/dist/resources/extensions/gsd/worktree-manager.js

@@ -19,7 +19,8 @@ import { execFileSync } from "node:child_process";
 import { join, resolve, sep } from "node:path";
 import { GSDError, GSD_PARSE_ERROR, GSD_STALE_STATE, GSD_LOCK_HELD, GSD_GIT_ERROR, GSD_MERGE_CONFLICT } from "./errors.js";
 import { logWarning } from "./workflow-logger.js";
-import { nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeLogOneline, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
+import { nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeIsAncestor, nativeLogOneline, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
+import { emitCanonicalRootRedirect } from "./worktree-telemetry.js";
 // ─── Path Helpers ──────────────────────────────────────────────────────────
 function normalizePathForComparison(path) {
     const normalized = path
@@ -84,6 +85,56 @@ export function isInsideWorktreesDir(basePath, targetPath) {
     // not merely be a prefix match (e.g. ".gsd/worktrees-extra" must not match).
     return resolved === wtDir || resolved.startsWith(wtDir + sep);
 }
+/**
+ * Return the canonical path from which a milestone's artifacts should be read.
+ *
+ * If a live git worktree exists for this milestone at `.gsd/worktrees/<MID>/`
+ * (directory present AND a `.git` file indicating a registered worktree),
+ * returns that worktree path. Otherwise returns `basePath` unchanged.
+ *
+ * Readers that cross the session/worktree boundary (validators, the bootstrap
+ * audit, cross-session state queries) should route through this helper so they
+ * don't silently read stale project-root state while live work sits in the
+ * worktree. Writers and tools whose contract is "operate on the path I was
+ * given" should NOT use this helper — they preserve the legacy behavior.
+ *
+ * A stale worktree directory (no `.git` file) is treated as absent. The
+ * createWorktree() path already cleans these up, but readers must not trust
+ * them in the window before cleanup runs.
+ *
+ * Fixes #4761. Used by the #4762 audit for the pre-completion orphan case.
+ */
+export function resolveCanonicalMilestoneRoot(basePath, milestoneId) {
+    if (!milestoneId || /[\/\\]|\.\./.test(milestoneId))
+        return basePath;
+    const wtPath = worktreePath(basePath, milestoneId);
+    if (!existsSync(wtPath))
+        return basePath;
+    // A registered git worktree has a .git *file* (not directory) containing
+    // "gitdir: <path>". A standalone .git directory indicates a copied repo
+    // or nested standalone repo — not a worktree registered with this project —
+    // and must not be treated as the canonical root.
+    const gitPath = join(wtPath, ".git");
+    if (!existsSync(gitPath))
+        return basePath;
+    try {
+        const stat = lstatSync(gitPath);
+        if (!stat.isFile())
+            return basePath;
+    }
+    catch {
+        return basePath;
+    }
+    // #4764 — record the redirect so we can measure how often the #4761 fix
+    // would have mattered. Best-effort; emit is silent on any failure.
+    try {
+        emitCanonicalRootRedirect(basePath, milestoneId, wtPath);
+    }
+    catch (err) {
+        logWarning("worktree", `canonical-root-redirect telemetry failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    return wtPath;
+}
 // ─── Core Operations ───────────────────────────────────────────────────────
 /**
  * Create a new git worktree under .gsd/worktrees/<name>/ with branch worktree/<name>.
@@ -120,6 +171,13 @@ export function createWorktree(basePath, name, opts = {}) {
     // Use the explicit start point (e.g. integration branch) if provided,
     // otherwise fall back to the repo's detected main branch.
     const startPoint = opts.startPoint ?? nativeDetectMainBranch(basePath);
+    // Reject early if startPoint resolves to an empty/invalid ref. On an
+    // unborn branch (zero-commit repo) nativeDetectMainBranch returns "",
+    // which would flow into `git worktree add ... ""` and crash with
+    // `fatal: not a valid object name`. (Issue #4980 HIGH-9)
+    if (!startPoint || startPoint.length === 0) {
+        throw new GSDError(GSD_GIT_ERROR, "Repository has no commits yet (unborn branch). Make an initial commit before creating worktrees.");
+    }
     // Check if the branch already exists (leftover from a previous worktree)
     const branchAlreadyExists = nativeBranchExists(basePath, branch);
     if (branchAlreadyExists) {
@@ -137,6 +195,18 @@ export function createWorktree(basePath, name, opts = {}) {
             nativeWorktreeAdd(basePath, wtPath, branch);
         }
         else {
+            // Ancestry guard: refuse to force-reset a branch that has commits not
+            // reachable from startPoint. A crash-then-resume cycle that didn't
+            // write the resume file would silently orphan prior-session commits
+            // (recoverable from reflog for 90d, then gone — branch is also
+            // deleted at teardown). (Issue #4980 HIGH-3)
+            const branchIsAncestor = nativeIsAncestor(basePath, branch, startPoint);
+            if (!branchIsAncestor) {
+                throw new GSDError(GSD_GIT_ERROR, `Branch "${branch}" already exists with commits not reachable from "${startPoint}". ` +
+                    `Refusing to force-reset — would orphan prior work. ` +
+                    `If you intend to keep those commits, retry with reuseExistingBranch=true. ` +
+                    `If you intend to discard, run \`git branch -D ${branch}\` manually first.`);
+            }
             // Reset the stale branch to the start point, then attach worktree to it
             nativeBranchForceReset(basePath, branch, startPoint);
             nativeWorktreeAdd(basePath, wtPath, branch);
@@ -368,15 +438,22 @@ export function removeWorktree(basePath, name, opts = {}) {
             // Lines starting with '+' indicate uncommitted submodule changes
             hasSubmoduleChanges = submoduleStatus.split("\n").some((line) => line.startsWith("+") || line.startsWith("-"));
             if (hasSubmoduleChanges) {
-                // Stash submodule changes so they are not lost during force removal.
-                // The stash is created in the worktree before it's torn down.
+                // Save submodule changes to a labeled rescue branch instead of the
+                // shared stash list. Stash is per-repo (not per-worktree), so an
+                // entry created here would appear in the user's main-tree stash
+                // list and reference paths that disappear after worktree removal.
+                // A branch persists in the shared .git refs after worktree removal
+                // and is discoverable via `git branch --list 'gsd/submodule-rescue/*'`.
+                // (Issue #4980 HIGH-11)
+                const rescueBranch = `gsd/submodule-rescue/${name}-${Date.now()}`;
                 try {
-                    execFileSync("git", ["stash", "push", "-m", "gsd: auto-stash submodule changes before worktree teardown"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
-                    logWarning("reconcile", `Stashed uncommitted submodule changes before worktree teardown`, { worktree: name, path: resolvedWtPath });
+                    execFileSync("git", ["add", "-A"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    execFileSync("git", ["commit", "-m", `gsd: rescue submodule changes from worktree ${name}`, "--allow-empty"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    execFileSync("git", ["branch", rescueBranch, "HEAD"], { cwd: resolvedWtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" });
+                    logWarning("reconcile", `Saved uncommitted submodule changes to rescue branch ${rescueBranch}`, { worktree: name, path: resolvedWtPath, rescueBranch });
                 }
-                catch {
-                    // Stash failed — warn the user that submodule changes may be lost
-                    logWarning("reconcile", `Submodule changes detected — stash failed, changes may be lost during force removal`, { worktree: name, path: resolvedWtPath });
+                catch (err) {
+                    logWarning("reconcile", `Submodule rescue branch creation failed — changes may be lost during force removal: ${err instanceof Error ? err.message : String(err)}`, { worktree: name, path: resolvedWtPath });
                 }
             }
         }
@@ -479,6 +556,7 @@ const SKIP_PATHS = [
     ".gsd/worktrees/",
     ".gsd/runtime/",
     ".gsd/activity/",
+    ".gsd/audit/",
     ".gsd/forensics/",
     ".gsd/parallel/",
     ".gsd/journal/",