gsd-pi 2.76.0-dev.fe143342a → 2.77.0-dev.1594b263e

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

@@ -16,8 +16,33 @@ import { existsSync, unlinkSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { debugLog } from "./debug-logger.js";
-import { MergeConflictError } from "./git-service.js";
 import { emitJournalEvent } from "./journal.js";
+import { emitWorktreeCreated, emitWorktreeMerged } from "./worktree-telemetry.js";
+import { getCollapseCadence, getMilestoneResquash, resquashMilestoneOnMain } from "./slice-cadence.js";
+import { loadEffectiveGSDPreferences } from "./preferences.js";
+// ─── Path Helpers ──────────────────────────────────────────────────────────
+/**
+ * Worktree marker segment — present in any path produced by worktreePath().
+ * Used to strip the worktree suffix and recover the project root (#3729).
+ */
+const WORKTREE_MARKER = "/.gsd/worktrees/";
+/**
+ * Resolve the project root from session path state.
+ *
+ * Prefers `originalBasePath` (always the project root when set), but falls
+ * back to `basePath` when `originalBasePath` is falsy (e.g. fresh AutoSession
+ * with default empty string). If `basePath` itself is inside a worktree
+ * directory (contains `/.gsd/worktrees/`), strip that suffix to recover the
+ * actual project root — preventing double-nested worktree paths (#3729).
+ */
+export function resolveProjectRoot(originalBasePath, basePath) {
+    let resolved = originalBasePath || basePath;
+    const markerIdx = resolved.indexOf(WORKTREE_MARKER);
+    if (markerIdx !== -1) {
+        resolved = resolved.slice(0, markerIdx);
+    }
+    return resolved;
+}
 // ─── WorktreeResolver ──────────────────────────────────────────────────────
 export class WorktreeResolver {
     s;
@@ -33,11 +58,11 @@ export class WorktreeResolver {
     }
     /** Original project root — always the non-worktree path. */
     get projectRoot() {
-        return this.s.originalBasePath || this.s.basePath;
+        return resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
     }
     /** Path for auto.lock file — same as the old lockBase(). */
     get lockPath() {
-        return this.s.originalBasePath || this.s.basePath;
+        return resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
     }
     // ── Private Helpers ────────────────────────────────────────────────────
     rebuildGitService() {
@@ -99,7 +124,10 @@ export class WorktreeResolver {
             });
             return;
         }
-        const basePath = this.s.originalBasePath || this.s.basePath;
+        // Resolve the project root for worktree operations via shared helper.
+        // Handles the case where originalBasePath is falsy and basePath is itself
+        // a worktree path — prevents double-nested worktree paths (#3729).
+        const basePath = resolveProjectRoot(this.s.originalBasePath, this.s.basePath);
         debugLog("WorktreeResolver", {
             action: "enterMilestone",
             milestoneId,
@@ -169,6 +197,20 @@ export class WorktreeResolver {
                 eventType: "worktree-enter",
                 data: { milestoneId, wtPath, created: !existingPath },
             });
+            // #4764 — record creation/enter as a lifecycle event so the telemetry
+            // aggregator can pair it with the eventual worktree-merged event.
+            try {
+                emitWorktreeCreated(this.s.originalBasePath || this.s.basePath, milestoneId, {
+                    reason: existingPath ? "enter-milestone" : "create-milestone",
+                });
+            }
+            catch (telemetryErr) {
+                debugLog("WorktreeResolver", {
+                    action: "enterMilestone",
+                    phase: "telemetry-emit",
+                    error: telemetryErr instanceof Error ? telemetryErr.message : String(telemetryErr),
+                });
+            }
             ctx.notify(`Entered worktree for ${milestoneId} at ${wtPath}`, "info");
         }
         catch (err) {
@@ -264,6 +306,9 @@ export class WorktreeResolver {
      */
     mergeAndExit(milestoneId, ctx) {
         this.validateMilestoneId(milestoneId);
+        // #4764 — telemetry: record start timestamp so we can emit merge duration.
+        const mergeStartedAt = new Date().toISOString();
+        const mergeStartMs = Date.now();
         // If worktree creation failed earlier, skip merge — work is on current branch (#2483)
         if (this.s.isolationDegraded) {
             debugLog("WorktreeResolver", {
@@ -303,14 +348,68 @@ export class WorktreeResolver {
             });
             return;
         }
+        let actuallyMerged = false;
         if (mode === "worktree" || inWorktree) {
-            this._mergeWorktreeMode(milestoneId, ctx);
+            actuallyMerged = this._mergeWorktreeMode(milestoneId, ctx);
         }
         else if (mode === "branch") {
-            this._mergeBranchMode(milestoneId, ctx);
+            actuallyMerged = this._mergeBranchMode(milestoneId, ctx);
+        }
+        // The remainder of this function emits telemetry and runs re-squash.
+        // Both are gated on actuallyMerged — if the _merge* helper took a
+        // no-merge path (missing originalBase, no roadmap, wrong branch) the
+        // milestone branch was intentionally left unmerged and we must not
+        // emit a worktree-merged event or collapse commits on main.
+        if (!actuallyMerged) {
+            // Always clear the start-SHA tracker to avoid leaking across sessions.
+            this.s.milestoneStartShas.delete(milestoneId);
+            return;
+        }
+        // #4765 — when collapse_cadence=slice AND milestone_resquash=true, the
+        // N per-slice commits on main should be collapsed into one milestone
+        // commit. Done AFTER the primary merge-and-teardown so the branch and
+        // worktree are already cleaned up; we operate on main directly.
+        try {
+            const startSha = this.s.milestoneStartShas.get(milestoneId);
+            if (startSha) {
+                const prefs = loadEffectiveGSDPreferences(this.s.originalBasePath || this.s.basePath)?.preferences;
+                if (getCollapseCadence(prefs) === "slice" && getMilestoneResquash(prefs)) {
+                    const result = resquashMilestoneOnMain(this.s.originalBasePath || this.s.basePath, milestoneId, startSha);
+                    if (result.resquashed) {
+                        ctx.notify(`slice-cadence: re-squashed slice commits for ${milestoneId} into a single milestone commit.`, "info");
+                    }
+                }
+                this.s.milestoneStartShas.delete(milestoneId);
+            }
+        }
+        catch (err) {
+            debugLog("WorktreeResolver", {
+                action: "mergeAndExit",
+                milestoneId,
+                phase: "resquash",
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+        // #4764 — record merge completion. Only reaches here when an actual
+        // merge ran; failure paths throw out of _merge* before this point and
+        // no-merge paths returned above.
+        try {
+            emitWorktreeMerged(this.s.originalBasePath || this.s.basePath, milestoneId, {
+                reason: "milestone-complete",
+                startedAt: mergeStartedAt,
+                durationMs: Date.now() - mergeStartMs,
+            });
+        }
+        catch (telemetryErr) {
+            debugLog("WorktreeResolver", {
+                action: "mergeAndExit",
+                phase: "telemetry-emit",
+                error: telemetryErr instanceof Error ? telemetryErr.message : String(telemetryErr),
+            });
         }
     }
-    /** Worktree-mode merge: read roadmap, merge, teardown, reset paths. */
+    /** Worktree-mode merge: read roadmap, merge, teardown, reset paths.
+     *  Returns true when a squash-merge actually ran (false on skip paths). */
     _mergeWorktreeMode(milestoneId, ctx) {
         const originalBase = this.s.originalBasePath;
         if (!originalBase) {
@@ -321,8 +420,9 @@ export class WorktreeResolver {
                 skipped: true,
                 reason: "missing-original-base",
             });
-            return;
+            return false;
         }
+        let merged = false;
         try {
             const { synced } = this.deps.syncWorktreeStateBack(originalBase, this.s.basePath, milestoneId);
             if (synced.length > 0) {
@@ -353,6 +453,7 @@ export class WorktreeResolver {
             if (roadmapPath) {
                 const roadmapContent = this.deps.readFileSync(roadmapPath, "utf-8");
                 const mergeResult = this.deps.mergeMilestoneToMain(originalBase, milestoneId, roadmapContent);
+                merged = true;
                 // #2945 Bug 3: mergeMilestoneToMain performs best-effort worktree
                 // cleanup internally (step 12), but it can silently fail on Windows
                 // or when the worktree directory is locked. Perform a secondary
@@ -429,11 +530,13 @@ export class WorktreeResolver {
                     /* best-effort */
                 }
             }
-            // Re-throw MergeConflictError so the auto loop can detect real code
-            // conflicts and stop instead of retrying forever (#2330).
-            if (err instanceof MergeConflictError) {
-                throw err;
-            }
+            // Restore state before re-throwing so callers always get a consistent
+            // session (#4380).
+            this.restoreToProjectRoot();
+            // Re-throw: MergeConflictError stops the auto loop (#2330); non-conflict
+            // errors (permission denied, filesystem failures) must also propagate so
+            // broken states are diagnosable (#4380).
+            throw err;
         }
         // Always restore basePath and rebuild — whether merge succeeded or failed
         this.restoreToProjectRoot();
@@ -443,8 +546,10 @@ export class WorktreeResolver {
             result: "done",
             basePath: this.s.basePath,
         });
+        return merged;
     }
-    /** Branch-mode merge: check current branch, merge if on milestone branch. */
+    /** Branch-mode merge: check current branch, merge if on milestone branch.
+     *  Returns true when a merge actually ran (false on skip paths). */
     _mergeBranchMode(milestoneId, ctx) {
         try {
             const currentBranch = this.deps.getCurrentBranch(this.s.basePath);
@@ -459,7 +564,7 @@ export class WorktreeResolver {
                     currentBranch,
                     milestoneBranch,
                 });
-                return;
+                return false;
             }
             const roadmapPath = this.deps.resolveMilestoneFile(this.s.basePath, milestoneId, "ROADMAP");
             if (!roadmapPath) {
@@ -470,7 +575,7 @@ export class WorktreeResolver {
                     skipped: true,
                     reason: "no-roadmap",
                 });
-                return;
+                return false;
             }
             const roadmapContent = this.deps.readFileSync(roadmapPath, "utf-8");
             const mergeResult = this.deps.mergeMilestoneToMain(this.s.basePath, milestoneId, roadmapContent);
@@ -489,6 +594,7 @@ export class WorktreeResolver {
                 mode: "branch",
                 result: "success",
             });
+            return true;
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -500,6 +606,8 @@ export class WorktreeResolver {
                 error: msg,
             });
             ctx.notify(`Milestone merge failed (branch mode): ${msg}`, "warning");
+            // Re-throw all errors so callers can apply their own recovery logic (#4380).
+            throw err;
         }
     }
     // ── Merge and Enter Next ───────────────────────────────────────────────
@@ -516,7 +624,18 @@ export class WorktreeResolver {
             currentMilestoneId,
             nextMilestoneId,
         });
-        this.mergeAndExit(currentMilestoneId, ctx);
+        try {
+            this.mergeAndExit(currentMilestoneId, ctx);
+        }
+        catch (err) {
+            // mergeAndExit emits a warning and restores state when it fails during
+            // merge/cleanup. But if it throws before recovery runs (e.g., in
+            // validateMilestoneId or emitJournalEvent), basePath won't be restored
+            // to projectRoot — re-throw so we don't enter the next milestone with
+            // the current one unmerged.
+            if (this.s.basePath !== this.projectRoot)
+                throw err;
+        }
         this.enterMilestone(nextMilestoneId, ctx);
     }
 }

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

@@ -0,0 +1,198 @@
+/**
+ * Worktree telemetry — #4764
+ *
+ * Thin emit helpers + aggregator on top of the existing journal. Separate
+ * module so callers import a tiny surface and don't have to assemble
+ * JournalEntry records by hand. Kernighan: the underlying emit path
+ * (emitJournalEvent) is already battle-tested; this module is just
+ * structured call sites + a summarizer.
+ *
+ * Emitted event types (see journal.ts):
+ *   - worktree-created           worktree entered/created for a milestone
+ *   - worktree-merged            worktree merge back to main completed
+ *   - worktree-orphaned          audit detected an orphaned branch/worktree
+ *   - auto-exit                  auto-mode exited (pause/stop/blocked/error)
+ *   - worktree-sync              syncStateToProjectRoot snapshot
+ *   - canonical-root-redirect    resolveCanonicalMilestoneRoot redirected
+ *
+ * These events are purely observational. They never block, never throw,
+ * and never carry code content — only IDs, counts, durations, and reasons.
+ */
+import { randomUUID } from "node:crypto";
+import { emitJournalEvent, queryJournal } from "./journal.js";
+function now() {
+    return new Date().toISOString();
+}
+function baseEntry(eventType, data) {
+    return {
+        ts: now(),
+        flowId: (typeof data.flowId === "string" ? data.flowId : undefined) ?? randomUUID(),
+        seq: typeof data.seq === "number" ? data.seq : 0,
+        eventType,
+        data,
+    };
+}
+// ─── Emitters ────────────────────────────────────────────────────────────
+export function emitWorktreeCreated(projectRoot, milestoneId, meta = {}) {
+    emitJournalEvent(projectRoot, baseEntry("worktree-created", {
+        milestoneId,
+        startedAt: now(),
+        flowId: meta.flowId,
+        reason: meta.reason ?? "enter-milestone",
+    }));
+}
+export function emitWorktreeMerged(projectRoot, milestoneId, meta = {}) {
+    emitJournalEvent(projectRoot, baseEntry("worktree-merged", {
+        milestoneId,
+        endedAt: now(),
+        flowId: meta.flowId,
+        reason: meta.reason ?? "other",
+        startedAt: meta.startedAt,
+        durationMs: meta.durationMs,
+        sliceCount: meta.sliceCount,
+        taskCount: meta.taskCount,
+        conflict: meta.conflict ?? false,
+        conflictedFiles: meta.conflictedFiles ?? 0,
+    }));
+}
+export function emitWorktreeOrphaned(projectRoot, milestoneId, meta) {
+    emitJournalEvent(projectRoot, baseEntry("worktree-orphaned", {
+        milestoneId,
+        flowId: meta.flowId,
+        reason: meta.reason,
+        commitsAhead: meta.commitsAhead,
+        worktreeDirExists: meta.worktreeDirExists ?? false,
+        detectedAt: now(),
+    }));
+}
+export function emitAutoExit(projectRoot, meta) {
+    emitJournalEvent(projectRoot, baseEntry("auto-exit", {
+        reason: meta.reason,
+        flowId: meta.flowId,
+        milestoneId: meta.milestoneId,
+        milestoneMerged: meta.milestoneMerged,
+        exitedAt: now(),
+    }));
+}
+export function emitWorktreeSync(projectRoot, milestoneId, meta) {
+    emitJournalEvent(projectRoot, baseEntry("worktree-sync", {
+        milestoneId,
+        flowId: meta.flowId,
+        filesCopied: meta.filesCopied,
+        bytesCopied: meta.bytesCopied,
+        commitsAhead: meta.commitsAhead,
+        worktreeAgeMs: meta.worktreeAgeMs,
+    }));
+}
+export function emitCanonicalRootRedirect(projectRoot, milestoneId, redirectedTo, meta = {}) {
+    emitJournalEvent(projectRoot, baseEntry("canonical-root-redirect", {
+        milestoneId,
+        redirectedTo,
+        flowId: meta.flowId,
+    }));
+}
+// #4765 — slice-cadence collapse events
+export function emitSliceMerged(projectRoot, milestoneId, sliceId, meta = {}) {
+    emitJournalEvent(projectRoot, baseEntry("slice-merged", {
+        milestoneId,
+        sliceId,
+        mergedAt: now(),
+        durationMs: meta.durationMs,
+        conflict: meta.conflict ?? false,
+        commitSha: meta.commitSha,
+        flowId: meta.flowId,
+    }));
+}
+export function emitMilestoneResquash(projectRoot, milestoneId, meta = { sliceCount: 0 }) {
+    emitJournalEvent(projectRoot, baseEntry("milestone-resquash", {
+        milestoneId,
+        sliceCount: meta.sliceCount,
+        startSha: meta.startSha,
+        endSha: meta.endSha,
+        resquashedAt: now(),
+        flowId: meta.flowId,
+    }));
+}
+/**
+ * Summarize worktree telemetry across the journal. Optional time window
+ * via filters.after / filters.before (ISO-8601).
+ */
+export function summarizeWorktreeTelemetry(projectRoot, filters) {
+    const entries = queryJournal(projectRoot, filters);
+    const summary = {
+        worktreesCreated: 0,
+        worktreesMerged: 0,
+        orphansDetected: 0,
+        orphansByReason: {},
+        mergeDurationsMs: [],
+        mergeConflicts: 0,
+        exitsByReason: {},
+        exitsWithUnmergedWork: 0,
+        canonicalRedirects: 0,
+        slicesMerged: 0,
+        sliceMergeConflicts: 0,
+        milestoneResquashes: 0,
+    };
+    for (const e of entries) {
+        const d = e.data ?? {};
+        switch (e.eventType) {
+            case "worktree-created":
+                summary.worktreesCreated++;
+                break;
+            case "worktree-merged":
+                summary.worktreesMerged++;
+                if (typeof d.durationMs === "number")
+                    summary.mergeDurationsMs.push(d.durationMs);
+                if (d.conflict === true)
+                    summary.mergeConflicts++;
+                break;
+            case "worktree-orphaned": {
+                summary.orphansDetected++;
+                const reason = typeof d.reason === "string" ? d.reason : "unknown";
+                summary.orphansByReason[reason] = (summary.orphansByReason[reason] ?? 0) + 1;
+                break;
+            }
+            case "auto-exit": {
+                const reason = typeof d.reason === "string" ? d.reason : "unknown";
+                summary.exitsByReason[reason] = (summary.exitsByReason[reason] ?? 0) + 1;
+                if (d.milestoneMerged === false)
+                    summary.exitsWithUnmergedWork++;
+                break;
+            }
+            case "canonical-root-redirect":
+                summary.canonicalRedirects++;
+                break;
+            case "slice-merged":
+                summary.slicesMerged++;
+                if (d.conflict === true)
+                    summary.sliceMergeConflicts++;
+                break;
+            case "milestone-resquash":
+                summary.milestoneResquashes++;
+                break;
+            default:
+                break;
+        }
+    }
+    summary.mergeDurationsMs.sort((a, b) => a - b);
+    return summary;
+}
+/**
+ * Return the p{quantile} of a sorted array using the nearest-rank method.
+ * Quantile in [0,1].
+ *
+ * Prior implementation used Math.floor(q*n), which overstates exact-rank
+ * quantiles by one sample (e.g. p95 of 20 values returned the max instead
+ * of the 19th value). The nearest-rank index is ceil(q*n) - 1, clamped to
+ * [0, n-1].
+ */
+export function percentile(sortedValues, q) {
+    if (sortedValues.length === 0)
+        return null;
+    if (q <= 0)
+        return sortedValues[0];
+    if (q >= 1)
+        return sortedValues[sortedValues.length - 1];
+    const idx = Math.min(sortedValues.length - 1, Math.max(0, Math.ceil(q * sortedValues.length) - 1));
+    return sortedValues[idx];
+}

package/dist/resources/extensions/mcp-client/auth.js

@@ -10,7 +10,16 @@
 // ─── Env resolution ───────────────────────────────────────────────────────────
 /** Resolve `${VAR}` references in a string against `process.env`. */
 function resolveEnvValue(value) {
-    return value.replace(/\$\{([^}]+)\}/g, (_match, varName) => process.env[varName] ?? "");
+    return value.replace(/\$\{([^}]+)\}/g, (_match, varName) => {
+        const resolved = process.env[varName];
+        if (resolved === undefined || resolved === "") {
+            // eslint-disable-next-line no-console
+            console.warn(`[mcp-client auth] Environment variable "${varName}" referenced in MCP server config is unset. ` +
+                `Requests will go out with a malformed header and the remote server will likely reject them with 401.`);
+            return "";
+        }
+        return resolved;
+    });
 }
 function resolveHeaders(raw) {
     const resolved = {};