gsd-pi 2.77.0-dev.1d17f366c → 2.77.0-dev.58d3d4d6c

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

@@ -105,6 +105,11 @@ export class AutoSession {
     /** Set to true after phases.ts successfully calls mergeAndExit, so that
      *  stopAuto does not attempt the same merge a second time (#2645). */
     milestoneMergedInPhases = false;
+    // #4765 — slice-cadence collapse: main-branch SHAs at the moment each
+    // milestone's first slice merge began. Used by resquashMilestoneOnMain at
+    // milestone completion to collapse N slice commits into one. Cleared when
+    // the milestone finishes (or resquash runs).
+    milestoneStartShas = new Map();
     // ── Dispatch circuit breakers ──────────────────────────────────────
     rewriteAttemptCount = 0;
     /** Tracks consecutive bootstrap attempts that found phase === "complete".
@@ -221,6 +226,7 @@ export class AutoSession {
         this.lastGitActionStatus = null;
         this.isolationDegraded = false;
         this.milestoneMergedInPhases = false;
+        this.milestoneStartShas = new Map();
         this.checkpointSha = null;
         // Signal handler
         this.sigtermHandler = null;

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

@@ -521,6 +521,85 @@ export async function postUnitPreVerification(pctx, opts) {
                     clearReactiveState(s.basePath, mid, sid);
                 }
             });
+            // #4765 — slice-cadence collapse. When `git.collapse_cadence: "slice"`
+            // is set, squash-merge the slice's commits from the milestone branch
+            // onto main right here, so orphan risk shrinks from milestone-size to
+            // slice-size. Only runs in worktree isolation mode — the feature needs
+            // a milestone branch to squash from.
+            let sliceMergeStopped = false;
+            await runSafely("postUnit", "slice-cadence-merge", async () => {
+                const prefsResult = loadEffectiveGSDPreferences(s.basePath);
+                const prefs = prefsResult?.preferences;
+                const { getCollapseCadence, mergeSliceToMain } = await import("./slice-cadence.js");
+                if (getCollapseCadence(prefs) !== "slice")
+                    return;
+                if (prefs?.git?.isolation !== "worktree")
+                    return;
+                if (s.isolationDegraded)
+                    return;
+                const projectRoot = s.originalBasePath || s.basePath;
+                const { milestone: mid, slice: sid } = parseUnitId(unit.id);
+                if (!mid || !sid)
+                    return;
+                // Record the milestone start SHA before the first slice merge, so
+                // resquashMilestoneOnMain has a target at milestone completion.
+                // Resolve main branch dynamically — hard-coding "main" breaks repos
+                // that use "master" or a custom default branch.
+                if (!s.milestoneStartShas.has(mid)) {
+                    try {
+                        const { nativeDetectMainBranch } = await import("./native-git-bridge.js");
+                        const mainBranch = nativeDetectMainBranch(projectRoot);
+                        const { execFileSync } = await import("node:child_process");
+                        const sha = execFileSync("git", ["rev-parse", mainBranch], {
+                            cwd: projectRoot, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8",
+                        }).trim();
+                        if (sha)
+                            s.milestoneStartShas.set(mid, sha);
+                    }
+                    catch (err) {
+                        logWarning("engine", `slice-cadence: failed to record milestone start SHA: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                }
+                try {
+                    const result = mergeSliceToMain(projectRoot, mid, sid);
+                    if (result.skipped) {
+                        logWarning("engine", `slice-cadence: merge skipped for ${sid} — ${result.skippedReason}`);
+                        return;
+                    }
+                    ctx.ui.notify(`slice-cadence: ${sid} merged to main (${result.durationMs}ms).`, "info");
+                }
+                catch (err) {
+                    const { MergeConflictError } = await import("./git-service.js");
+                    if (err instanceof MergeConflictError) {
+                        ctx.ui.notify(`slice-cadence merge conflict in ${sid}: ${err.conflictedFiles.join(", ")}. ` +
+                            `Resolve manually on main and run \`/gsd auto\` to resume.`, "error");
+                        // Stop auto AND signal the outer postUnit flow to exit early.
+                        // Without the flag, subsequent hooks (triage, rogue detection,
+                        // DB writes) would keep running against a conflicted main
+                        // checkout after the loop was already told to stop.
+                        const { stopAuto } = await import("./auto.js");
+                        await stopAuto(ctx, undefined, `slice-merge-conflict on ${sid}`);
+                        sliceMergeStopped = true;
+                        return;
+                    }
+                    logError("engine", `slice-cadence merge failed for ${sid}`, {
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                    // Non-conflict failures (dirty main, rev-walk error, etc.) can
+                    // leave the checkout in an unexpected state. Stop auto-mode so
+                    // the next slice doesn't dispatch on top of it.
+                    const { stopAuto } = await import("./auto.js");
+                    await stopAuto(ctx, undefined, `slice-merge-error on ${sid}`);
+                    sliceMergeStopped = true;
+                }
+            });
+            // Exit early after stopAuto so the rest of post-unit processing
+            // (triage, rogue detection, hook dispatch, DB writes) doesn't run
+            // against a conflicted main checkout. Return "dispatched" to match
+            // the convention used by other stop/pauseAuto paths in this function
+            // (see signal handling earlier: stop/pause also return "dispatched").
+            if (sliceMergeStopped)
+                return "dispatched";
         }
         // Post-triage: execute actionable resolutions
         if (s.currentUnit.type === "triage-captures") {

package/dist/resources/extensions/gsd/auto-prompts.js

@@ -446,6 +446,40 @@ export async function inlineKnowledgeScoped(base, keywords) {
         return null;
     return `### Project Knowledge (scoped)\nSource: \`${relGsdRootFile("KNOWLEDGE")}\`\n\n${scoped.trim()}`;
 }
+/**
+ * Budget-capped knowledge inline for milestone-level prompt assembly.
+ *
+ * Addresses issue #4719: the six milestone-phase prompts (research-milestone,
+ * plan-milestone, complete-slice, complete-milestone, validate-milestone,
+ * reassess-roadmap) previously injected the full KNOWLEDGE.md (~226KB for a
+ * real project) on every invocation. This helper scopes by caller-supplied
+ * keywords and caps the payload at `maxChars` (default 30,000 chars).
+ *
+ * Returns null when no KNOWLEDGE.md exists or no entries match any keyword.
+ */
+export async function inlineKnowledgeBudgeted(base, keywords, options) {
+    const DEFAULT_MAX_CHARS = 30_000;
+    const HARD_MAX_CHARS = 100_000;
+    const raw = Number(options?.maxChars ?? DEFAULT_MAX_CHARS);
+    const maxChars = Number.isFinite(raw)
+        ? Math.max(0, Math.min(Math.floor(raw), HARD_MAX_CHARS))
+        : DEFAULT_MAX_CHARS;
+    const knowledgePath = resolveGsdRootFile(base, "KNOWLEDGE");
+    if (!existsSync(knowledgePath))
+        return null;
+    const content = await loadFile(knowledgePath);
+    if (!content)
+        return null;
+    const { queryKnowledge } = await import("./context-store.js");
+    const scoped = await queryKnowledge(content, keywords);
+    if (!scoped)
+        return null;
+    const trimmed = scoped.trim();
+    const truncated = trimmed.length > maxChars
+        ? `${trimmed.slice(0, maxChars)}\n\n[...truncated ${trimmed.length - maxChars} chars; rerun with narrower scope if needed]`
+        : trimmed;
+    return `### Project Knowledge (scoped)\nSource: \`${relGsdRootFile("KNOWLEDGE")}\`\n\n${truncated}`;
+}
 /**
  * Inline a roadmap excerpt for a specific slice.
  * Reads full roadmap, extracts minimal excerpt with header + predecessor + target row.
@@ -958,7 +992,8 @@ export async function buildResearchMilestonePrompt(mid, midTitle, base) {
     const decisionsInline = await inlineDecisionsFromDb(base, mid);
     if (decisionsInline)
         inlined.push(decisionsInline);
-    const knowledgeInlineRM = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719
+    const knowledgeInlineRM = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInlineRM)
         inlined.push(knowledgeInlineRM);
     inlined.push(inlineTemplate("research", "Research"));
@@ -1015,7 +1050,8 @@ export async function buildPlanMilestonePrompt(mid, midTitle, base, level) {
         const queueInline = await inlineFileSmart(queuePath, relGsdRootFile("QUEUE"), "Project Queue", `${mid} ${midTitle}`);
         inlined.push(queueInline);
     }
-    const knowledgeInlinePM = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719
+    const knowledgeInlinePM = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInlinePM)
         inlined.push(knowledgeInlinePM);
     inlined.push(inlineTemplate("roadmap", "Roadmap"));
@@ -1417,7 +1453,7 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
         }),
     });
 }
-export async function buildCompleteSlicePrompt(mid, _midTitle, sid, sTitle, base, level) {
+export async function buildCompleteSlicePrompt(mid, midTitle, sid, sTitle, base, level) {
     const inlineLevel = level ?? resolveInlineLevel();
     const roadmapPath = resolveMilestoneFile(base, mid, "ROADMAP");
     const roadmapRel = relMilestoneFile(base, mid, "ROADMAP");
@@ -1436,7 +1472,9 @@ export async function buildCompleteSlicePrompt(mid, _midTitle, sid, sTitle, base
         if (requirementsInline)
             inlined.push(requirementsInline);
     }
-    const knowledgeInlineCS = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719. Slice context is richer than
+    // milestone context at complete-slice time, so combine both title sources.
+    const knowledgeInlineCS = await inlineKnowledgeBudgeted(base, [...extractKeywords(midTitle), ...extractKeywords(sTitle)]);
     if (knowledgeInlineCS)
         inlined.push(knowledgeInlineCS);
     // Inline all task summaries for this slice
@@ -1532,7 +1570,8 @@ export async function buildCompleteMilestonePrompt(mid, midTitle, base, level) {
         if (projectInline)
             inlined.push(projectInline);
     }
-    const knowledgeInlineCM = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719
+    const knowledgeInlineCM = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInlineCM)
         inlined.push(knowledgeInlineCM);
     // Inline milestone context file (milestone-level, not GSD root)
@@ -1671,7 +1710,8 @@ export async function buildValidateMilestonePrompt(mid, midTitle, base, level) {
         if (projectInline)
             inlined.push(projectInline);
     }
-    const knowledgeInline = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719
+    const knowledgeInline = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInline)
         inlined.push(knowledgeInline);
     // Inline milestone context file
@@ -1841,7 +1881,8 @@ export async function buildReassessRoadmapPrompt(mid, midTitle, completedSliceId
         if (decisionsInline)
             inlined.push(decisionsInline);
     }
-    const knowledgeInlineRA = await inlineGsdRootFile(base, "knowledge.md", "Project Knowledge");
+    // Scoped + budgeted — see issue #4719
+    const knowledgeInlineRA = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInlineRA)
         inlined.push(knowledgeInlineRA);
     const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);

package/dist/resources/extensions/gsd/auto-start.js

@@ -19,12 +19,13 @@ import { invalidateAllCaches } from "./cache.js";
 import { writeLock, clearLock } from "./crash-recovery.js";
 import { acquireSessionLock, releaseSessionLock, updateSessionLock, } from "./session-lock.js";
 import { ensureGitignore, untrackRuntimeFiles } from "./gitignore.js";
-import { nativeIsRepo, nativeInit, nativeAddAll, nativeCommit, nativeGetCurrentBranch, nativeDetectMainBranch, nativeCheckoutBranch, nativeBranchList, nativeBranchListMerged, nativeBranchDelete, nativeWorktreeRemove, } from "./native-git-bridge.js";
+import { nativeIsRepo, nativeInit, nativeAddAll, nativeCommit, nativeGetCurrentBranch, nativeDetectMainBranch, nativeCheckoutBranch, nativeBranchList, nativeBranchListMerged, nativeBranchDelete, nativeWorktreeRemove, nativeCommitCountBetween, } from "./native-git-bridge.js";
 import { GitServiceImpl } from "./git-service.js";
 import { captureIntegrationBranch, detectWorktreeName, setActiveMilestoneId, } from "./worktree.js";
 import { getAutoWorktreePath } from "./auto-worktree.js";
 import { readResourceVersion, cleanStaleRuntimeUnits } from "./auto-worktree.js";
 import { worktreePath as getWorktreeDir, isInsideWorktreesDir } from "./worktree-manager.js";
+import { emitWorktreeOrphaned } from "./worktree-telemetry.js";
 import { initMetrics } from "./metrics.js";
 import { initRoutingHistory } from "./routing-history.js";
 import { restoreHookState, resetHookState } from "./post-unit-hooks.js";
@@ -120,10 +121,58 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode) {
     for (const branch of milestoneBranches) {
         const milestoneId = branch.replace(/^milestone\//, "");
         const milestone = getMilestone(milestoneId);
-        // Only audit completed milestones
-        if (!milestone || milestone.status !== "complete")
+        if (!milestone)
             continue;
         const isMerged = mergedBranches.has(branch);
+        // #4762 — in-progress milestone branch with unmerged commits ahead of
+        // main. This is the pre-completion orphan case: auto-mode exited without
+        // completing the milestone (pause, stop, crash, merge error, blocker) and
+        // work is stranded on the branch or in the worktree. Data safety first:
+        // we never delete or touch; we just surface a warning so the user knows
+        // where to look.
+        //
+        // Gate on isClosedStatus so we only warn about genuinely open milestones.
+        // Parked/other closed statuses go through the legacy complete/unmerged
+        // path below where appropriate.
+        if (!isClosedStatus(milestone.status)) {
+            if (isMerged)
+                continue; // nothing to recover
+            let commitsAhead = 0;
+            try {
+                commitsAhead = nativeCommitCountBetween(basePath, mainBranch, branch);
+            }
+            catch {
+                // Rev-walk failure — skip rather than noise
+                continue;
+            }
+            if (commitsAhead === 0)
+                continue;
+            const wtDir = getWorktreeDir(basePath, milestoneId);
+            const wtDirExists = existsSync(wtDir);
+            const wtSuffix = wtDirExists
+                ? ` Worktree directory at .gsd/worktrees/${milestoneId}/ holds the live work.`
+                : "";
+            warnings.push(`Branch ${branch} has ${commitsAhead} commit(s) ahead of ${mainBranch} for in-progress milestone ${milestoneId}.` +
+                wtSuffix +
+                ` Run \`/gsd auto\` to resume, or merge manually if abandoning.`);
+            // #4764 telemetry
+            try {
+                emitWorktreeOrphaned(basePath, milestoneId, {
+                    reason: "in-progress-unmerged",
+                    commitsAhead,
+                    worktreeDirExists: wtDirExists,
+                });
+            }
+            catch (err) {
+                logWarning("engine", `worktree-orphaned telemetry failed for ${milestoneId}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            continue;
+        }
+        // Only the "complete" status participates in the merged/unmerged cleanup
+        // paths below — other closed statuses (parked, etc.) are intentionally
+        // left alone.
+        if (milestone.status !== "complete")
+            continue;
         if (isMerged) {
             // Branch is merged — safe to delete branch and clean up worktree dir
             try {
@@ -170,6 +219,16 @@ export function auditOrphanedMilestoneBranches(basePath, isolationMode) {
             // Branch is NOT merged — preserve for safety, warn the user
             warnings.push(`Branch ${branch} exists for completed milestone ${milestoneId} but is NOT merged into ${mainBranch}. ` +
                 `This may contain unmerged work. Merge manually or run \`/gsd health --fix\` to resolve.`);
+            // #4764 telemetry
+            try {
+                emitWorktreeOrphaned(basePath, milestoneId, {
+                    reason: "complete-unmerged",
+                    worktreeDirExists: existsSync(getWorktreeDir(basePath, milestoneId)),
+                });
+            }
+            catch (err) {
+                logWarning("engine", `worktree-orphaned telemetry failed for ${milestoneId}: ${err instanceof Error ? err.message : String(err)}`);
+            }
         }
     }
     return { recovered, warnings };

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

@@ -528,6 +528,40 @@ export async function stopAuto(ctx, pi, reason) {
         return;
     const loadedPreferences = loadEffectiveGSDPreferences(s.basePath || undefined)?.preferences;
     const reasonSuffix = reason ? ` — ${reason}` : "";
+    // #4764 — telemetry: record the exit reason and whether the current milestone
+    // was merged before we entered stopAuto. This is the producer-side signal for
+    // the #4761 orphan class: milestoneMerged=false + currentMilestoneId present
+    // is exactly the pattern that strands work.
+    try {
+        const { emitAutoExit } = await import("./worktree-telemetry.js");
+        // Normalize the free-form reason to a closed set so the telemetry
+        // aggregator buckets stably. Raw detail is preserved in the phases.ts
+        // notification and the notify'd error string.
+        const rawReason = reason ?? "stop";
+        const normalizedReason = rawReason.startsWith("Blocked:")
+            ? "blocked"
+            : rawReason.startsWith("Merge conflict")
+                ? "merge-conflict"
+                : rawReason.startsWith("Merge error") || rawReason.startsWith("Merge failed")
+                    ? "merge-failed"
+                    : rawReason.startsWith("slice-merge-conflict")
+                        ? "slice-merge-conflict"
+                        : rawReason === "All milestones complete"
+                            ? "all-complete"
+                            : rawReason === "No active milestone"
+                                ? "no-active-milestone"
+                                : rawReason === "stop" || rawReason === "pause"
+                                    ? rawReason
+                                    : "other";
+        emitAutoExit(s.originalBasePath || s.basePath, {
+            reason: normalizedReason,
+            milestoneId: s.currentMilestoneId ?? undefined,
+            milestoneMerged: s.milestoneMergedInPhases === true,
+        });
+    }
+    catch (err) {
+        logWarning("engine", `auto-exit telemetry failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     try {
         // ── Step 1: Timers and locks ──
         try {

package/dist/resources/extensions/gsd/context-store.js

@@ -180,7 +180,13 @@ export function queryProject() {
 // ─── Knowledge Query ───────────────────────────────────────────────────────
 /**
  * Filter KNOWLEDGE.md sections by keyword matching.
- * Uses H2 sections, matches keywords case-insensitively against:
+ *
+ * Structure-adaptive (issue #4719): files that organise entries as H3 items
+ * under one or more H2 topics are filtered at H3 granularity. Files with only
+ * H2 topic headers (no H3) fall back to H2-level filtering for backwards
+ * compatibility.
+ *
+ * Matches keywords case-insensitively against:
  * 1. Section header text
  * 2. First paragraph of section content (up to first blank line or next heading)
  *
@@ -189,28 +195,38 @@ export function queryProject() {
  *
  * @param content - Full KNOWLEDGE.md content
  * @param keywords - Keywords to match (case-insensitive)
- * @returns Concatenated matching sections with H2 headers, or empty string
+ * @returns Concatenated matching sections with their original heading prefix, or empty string
  */
 export async function queryKnowledge(content, keywords) {
     if (!content || keywords.length === 0)
         return '';
     // Lazy import to avoid circular dependency
     const { extractAllSections } = await import('./files.js');
-    const sections = extractAllSections(content, 2);
+    // Prefer H3 granularity when available; fall back to H2 for H2-only files.
+    // This prevents single-H2-with-many-H3 layouts from returning the entire
+    // file on a keyword match against the H2 header or its first paragraph.
+    const h3Sections = extractAllSections(content, 3);
+    const useH3 = h3Sections.size > 0;
+    const sections = useH3 ? h3Sections : extractAllSections(content, 2);
     if (sections.size === 0)
         return '';
-    // Normalize keywords for case-insensitive matching
-    const normalizedKeywords = keywords.map(k => k.toLowerCase());
+    const prefix = useH3 ? '###' : '##';
+    // Trim, lowercase, drop empties, and de-dupe so callers can pass raw
+    // user-provided strings without risking empty-string / whitespace matches.
+    const normalizedKeywords = [...new Set(keywords
+            .map(k => k.trim().toLowerCase())
+            .filter(k => k.length > 0))];
+    if (normalizedKeywords.length === 0)
+        return '';
     const matchingSections = [];
     for (const [header, body] of sections) {
         // Extract first paragraph: everything up to first blank line or next heading
         const firstParagraph = body.split(/\n\s*\n|\n#/)[0] || '';
-        // Check if any keyword matches header or first paragraph
         const headerLower = header.toLowerCase();
         const paragraphLower = firstParagraph.toLowerCase();
         const matches = normalizedKeywords.some(kw => headerLower.includes(kw) || paragraphLower.includes(kw));
         if (matches) {
-            matchingSections.push(`## ${header}\n\n${body}`);
+            matchingSections.push(`${prefix} ${header}\n\n${body}`);
         }
     }
     return matchingSections.join('\n\n');

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

@@ -29,6 +29,7 @@ import { getAutoWorktreePath } from "./auto-worktree.js";
 import { loadEffectiveGSDPreferences, loadGlobalGSDPreferences, getGlobalGSDPreferencesPath } from "./preferences.js";
 import { showNextAction } from "../shared/tui.js";
 import { ensurePreferencesFile, serializePreferencesToFrontmatter } from "./commands-prefs-wizard.js";
+import { summarizeWorktreeTelemetry, percentile } from "./worktree-telemetry.js";
 // ─── Duplicate Detection ──────────────────────────────────────────────────────
 const DEDUP_PROMPT_SECTION = `
 ## Pre-Investigation: Duplicate Check (REQUIRED)
@@ -214,6 +215,16 @@ export async function buildForensicReport(basePath) {
     detectCrash(crashLock, anomalies);
     detectDoctorIssues(doctorIssues, anomalies);
     detectErrorTraces(unitTraces, anomalies);
+    // 11b. #4764 — worktree lifecycle telemetry
+    let worktreeTelemetry = null;
+    try {
+        worktreeTelemetry = summarizeWorktreeTelemetry(basePath);
+        detectWorktreeOrphans(worktreeTelemetry, anomalies);
+    }
+    catch {
+        // Telemetry is best-effort — do not let an aggregator failure block the
+        // rest of the forensic report.
+    }
     detectJournalAnomalies(journalSummary, anomalies);
     return {
         gsdVersion,
@@ -232,6 +243,7 @@ export async function buildForensicReport(basePath) {
         recentUnits,
         journalSummary,
         activityLogMeta,
+        worktreeTelemetry,
     };
 }
 // ─── Activity Log Scanner ─────────────────────────────────────────────────────
@@ -630,6 +642,45 @@ function detectMissingArtifacts(completedKeys, basePath, activeMilestone, anomal
         }
     }
 }
+/**
+ * #4764 — surface worktree lifecycle and orphan signals in the forensic report.
+ *
+ * Consumes only the aggregated summary (not raw journal events) to respect
+ * the forensics memory-bloat guard in forensics-journal.test.ts — per-event
+ * detail stays in the journal itself where the LLM can query it on demand.
+ */
+function detectWorktreeOrphans(summary, anomalies) {
+    // 1. Orphan aggregate — severity depends on reason. In-progress orphans are
+    // the #4761 consumer-side signal (live work sitting on an unmerged branch).
+    for (const [reason, count] of Object.entries(summary.orphansByReason)) {
+        if (count <= 0)
+            continue;
+        const severity = reason === "in-progress-unmerged" ? "warning" : "info";
+        anomalies.push({
+            type: "worktree-orphan",
+            severity,
+            summary: `${count} worktree orphan(s) detected (${reason})`,
+            details: reason === "in-progress-unmerged"
+                ? "Auto-mode exited without completing a milestone; live work sits on an unmerged milestone branch. Run `/gsd auto` to resume, or merge manually."
+                : reason === "complete-unmerged"
+                    ? "A completed milestone's branch was never merged back to main. Run `/gsd health --fix` to resolve."
+                    : `Reason: ${reason}.`,
+        });
+    }
+    // 2. Auto-exit producer signal — #4761's upstream cause.
+    if (summary.exitsWithUnmergedWork > 0) {
+        const reasonBreakdown = Object.entries(summary.exitsByReason)
+            .filter(([, n]) => n > 0)
+            .map(([r, n]) => `${r}=${n}`)
+            .join(", ");
+        anomalies.push({
+            type: "worktree-unmerged-exit",
+            severity: "warning",
+            summary: `${summary.exitsWithUnmergedWork} auto-exit(s) left milestone work unmerged`,
+            details: `Exit reasons: ${reasonBreakdown || "(none)"} · Producer-side signal for #4761-class orphans. Inspect .gsd/journal/*.jsonl with eventType:"auto-exit" for per-exit detail.`,
+        });
+    }
+}
 function detectCrash(crashLock, anomalies) {
     if (!crashLock)
         return;
@@ -808,6 +859,39 @@ function saveForensicReport(basePath, report, problemDescription) {
             sections.push(`- Newest: ${meta.newestFile}`);
         sections.push(``);
     }
+    // #4764 — Worktree telemetry summary
+    if (report.worktreeTelemetry) {
+        const t = report.worktreeTelemetry;
+        const p50 = percentile(t.mergeDurationsMs, 0.5);
+        const p95 = percentile(t.mergeDurationsMs, 0.95);
+        sections.push(`## Worktree Telemetry`, ``);
+        sections.push(`- Worktrees created: ${t.worktreesCreated}`);
+        sections.push(`- Worktrees merged: ${t.worktreesMerged}`);
+        sections.push(`- Orphans detected: ${t.orphansDetected}`);
+        if (t.orphansDetected > 0) {
+            const breakdown = Object.entries(t.orphansByReason)
+                .map(([r, n]) => `${r}=${n}`).join(", ");
+            sections.push(`  - By reason: ${breakdown}`);
+        }
+        sections.push(`- Merge conflicts: ${t.mergeConflicts}`);
+        if (t.mergeDurationsMs.length > 0) {
+            sections.push(`- Merge duration p50 / p95: ${p50 ?? "-"} / ${p95 ?? "-"} ms (n=${t.mergeDurationsMs.length})`);
+        }
+        sections.push(`- Auto-exits leaving unmerged work: ${t.exitsWithUnmergedWork}`);
+        if (Object.keys(t.exitsByReason).length > 0) {
+            const breakdown = Object.entries(t.exitsByReason)
+                .sort((a, b) => b[1] - a[1])
+                .map(([r, n]) => `${r}=${n}`).join(", ");
+            sections.push(`  - Exit reasons: ${breakdown}`);
+        }
+        sections.push(`- Canonical-root redirects (#4761 fix fired): ${t.canonicalRedirects}`);
+        // #4765 slice-cadence counters
+        if (t.slicesMerged + t.sliceMergeConflicts + t.milestoneResquashes > 0) {
+            sections.push(`- Slices merged: ${t.slicesMerged} · Slice merge conflicts: ${t.sliceMergeConflicts}`);
+            sections.push(`- Milestone re-squashes: ${t.milestoneResquashes}`);
+        }
+        sections.push(``);
+    }
     // Journal summary
     if (report.journalSummary) {
         const js = report.journalSummary;
@@ -940,6 +1024,28 @@ function formatReportForPrompt(report) {
         sections.push(`- Total duration: ${formatDuration(totals.duration)}`);
         sections.push("");
     }
+    // #4764 — worktree telemetry (compact prompt form)
+    if (report.worktreeTelemetry) {
+        const t = report.worktreeTelemetry;
+        const hasSignal = t.worktreesCreated + t.worktreesMerged + t.orphansDetected +
+            t.exitsWithUnmergedWork + t.canonicalRedirects +
+            t.slicesMerged + t.milestoneResquashes > 0;
+        if (hasSignal) {
+            sections.push("### Worktree Telemetry");
+            sections.push(`- Created: ${t.worktreesCreated} · Merged: ${t.worktreesMerged} · Conflicts: ${t.mergeConflicts}`);
+            sections.push(`- Orphans: ${t.orphansDetected} · Unmerged exits: ${t.exitsWithUnmergedWork} · Redirects (#4761): ${t.canonicalRedirects}`);
+            if (t.orphansDetected > 0) {
+                const breakdown = Object.entries(t.orphansByReason)
+                    .map(([r, n]) => `${r}=${n}`).join(", ");
+                sections.push(`- Orphan reasons: ${breakdown}`);
+            }
+            // #4765 — slice-cadence counters (only shown when the feature was exercised)
+            if (t.slicesMerged + t.sliceMergeConflicts + t.milestoneResquashes > 0) {
+                sections.push(`- Slices merged: ${t.slicesMerged} · Slice conflicts: ${t.sliceMergeConflicts} · Re-squashes: ${t.milestoneResquashes}`);
+            }
+            sections.push("");
+        }
+    }
     // Activity log metadata
     if (report.activityLogMeta) {
         const meta = report.activityLogMeta;

package/dist/resources/extensions/gsd/preferences-validation.js

@@ -1031,6 +1031,29 @@ export function validatePreferences(preferences) {
         if (g.merge_to_main !== undefined) {
             warnings.push("git.merge_to_main is deprecated — milestone-level merge is now always used. Remove this setting.");
         }
+        // #4765 — collapse cadence + milestone resquash
+        if (g.collapse_cadence !== undefined) {
+            const validCadence = new Set(["milestone", "slice"]);
+            if (typeof g.collapse_cadence === "string" && validCadence.has(g.collapse_cadence)) {
+                git.collapse_cadence = g.collapse_cadence;
+            }
+            else {
+                errors.push("git.collapse_cadence must be one of: milestone, slice");
+            }
+        }
+        if (g.milestone_resquash !== undefined) {
+            if (typeof g.milestone_resquash === "boolean") {
+                git.milestone_resquash = g.milestone_resquash;
+                const cadence = git.collapse_cadence
+                    ?? (typeof g.collapse_cadence === "string" ? g.collapse_cadence : undefined);
+                if (cadence !== "slice") {
+                    warnings.push('git.milestone_resquash is ignored unless git.collapse_cadence is "slice"');
+                }
+            }
+            else {
+                errors.push("git.milestone_resquash must be a boolean");
+            }
+        }
         if (Object.keys(git).length > 0) {
             validated.git = git;
         }

package/dist/resources/extensions/gsd/prompt-cache-optimizer.js

@@ -24,6 +24,10 @@ const SEMI_STATIC_LABELS = new Set([
     "prior-summaries",
     "project-context",
     "overrides",
+    // KNOWLEDGE is milestone-scoped (stable within a session), so it belongs
+    // in the cacheable prefix. See issue #4719.
+    "knowledge",
+    "project-knowledge",
 ]);
 /** Labels that change per-task */
 const DYNAMIC_LABELS = new Set([