@opengsd/gsd-pi 1.2.0-dev.0b870afa → 1.2.0-dev.23d85b63

package/dist/resources/extensions/claude-code-cli/turn-assembler.js

@@ -153,6 +153,38 @@ export function attachExternalResultsToToolBlocks(toolBlocks, toolResultsById) {
         block.externalResult = externalResult;
     }
 }
+function textFromExternalResult(result) {
+    return (result?.content ?? [])
+        .map((block) => typeof block.text === "string" ? block.text : "")
+        .join("\n");
+}
+function isEmptyToolArguments(value) {
+    return !!value
+        && typeof value === "object"
+        && !Array.isArray(value)
+        && Object.keys(value).length === 0;
+}
+function sameToolSurface(a, b) {
+    return a.name === b.name
+        && a.mcpServer === b.mcpServer;
+}
+export function shouldSuppressDuplicateToolUnavailableBlock(block, allBlocks) {
+    if (block.type !== "toolCall")
+        return false;
+    const externalResult = block.externalResult;
+    if (!externalResult?.isError)
+        return false;
+    if (!isEmptyToolArguments(block.arguments))
+        return false;
+    if (!/No such tool available:/i.test(textFromExternalResult(externalResult)))
+        return false;
+    return allBlocks.some((candidate) => {
+        if (candidate.type !== "toolCall" || candidate.id === block.id)
+            return false;
+        const candidateResult = candidate.externalResult;
+        return candidateResult?.isError === false && sameToolSurface(block, candidate);
+    });
+}
 /**
  * Build the final assistant content that Agent Core consumes in
  * `externalToolExecution` mode. This preserves tool-call blocks, attaches any
@@ -165,7 +197,7 @@ export function buildFinalAssistantContent(params) {
         mergePendingToolCalls(mergedToolBlocks, params.pendingContent);
     }
     attachExternalResultsToToolBlocks(mergedToolBlocks, params.toolResultsById);
-    const finalContent = [...mergedToolBlocks];
+    const finalContent = mergedToolBlocks.filter((block) => !shouldSuppressDuplicateToolUnavailableBlock(block, mergedToolBlocks));
     if (params.pendingContent && params.pendingContent.length > 0) {
         for (const block of params.pendingContent) {
             if (block.type === "text" || block.type === "thinking") {

package/dist/resources/extensions/google-cli/stream-adapter.js

@@ -158,6 +158,21 @@ function emitText(stream, message, text) {
     stream.push({ type: "done", reason: "stop", message });
     stream.end(message);
 }
+function isGeminiCliDeprecatedCliOutput(text) {
+    return (/IneligibleTierError/i.test(text)
+        || /UNSUPPORTED_CLIENT/i.test(text)
+        || /no longer supported for Gemini Code Assist for individuals/i.test(text)
+        || /migrate to the Antigravity suite/i.test(text));
+}
+const GEMINI_CLI_DEPRECATION_HINT = "Gemini CLI is no longer supported for individual users. Install Antigravity CLI " +
+    "(curl -fsSL https://antigravity.google/cli/install.sh | bash), run `agy` to authenticate, " +
+    "then use /login → Antigravity or restart GSD to auto-migrate.";
+function formatGoogleCliError(detail, provider) {
+    if (provider === "google-gemini-cli" && isGeminiCliDeprecatedCliOutput(detail)) {
+        return `${detail}\n\n${GEMINI_CLI_DEPRECATION_HINT}`;
+    }
+    return detail;
+}
 function emitError(stream, model, error) {
     const message = error instanceof Error ? error.message : String(error);
     const output = buildAssistantMessage(model, "", "error", message);
@@ -175,7 +190,7 @@ export function streamViaGoogleCli(model, context, options) {
             const result = await runCli(command, args, options);
             if (result.code !== 0) {
                 const detail = (result.stderr || result.stdout || `CLI exited with code ${result.code}`).trim();
-                throw new Error(detail);
+                throw new Error(formatGoogleCliError(detail, provider));
             }
             const text = provider === "google-gemini-cli"
                 ? extractGeminiJsonResponse(result.stdout)

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

@@ -0,0 +1,215 @@
+// Project/App: gsd-pi
+// File Purpose: Auto-loop closeout, milestone report, and merge helpers.
+import { importExtensionModule } from "@gsd/pi-coding-agent";
+import { MergeConflictError } from "../git-service.js";
+import { findUnmergedCompletedMilestones } from "../unmerged-milestone-guard.js";
+import { getIsolationMode } from "../preferences.js";
+import { isDbAvailable, getMilestone } from "../gsd-db.js";
+import { refreshWorkflowDatabaseFromDisk } from "../db-workspace.js";
+import { isClosedStatus } from "../status-guards.js";
+import { logWarning, logError } from "../workflow-logger.js";
+import { debugLog } from "../debug-logger.js";
+import { _resolveReportBasePath } from "./phase-helpers.js";
+/**
+ * If a unit is in-flight, close it out, then stop auto-mode.
+ */
+export async function closeoutAndStop(ctx, pi, s, deps, reason) {
+    if (s.currentUnit) {
+        await deps.closeoutUnit(ctx, s.basePath, s.currentUnit.type, s.currentUnit.id, s.currentUnit.startedAt, deps.buildSnapshotOpts(s.currentUnit.type, s.currentUnit.id));
+        s.clearCurrentUnit();
+    }
+    await deps.stopAuto(ctx, pi, reason);
+}
+export async function stopOnPostflightRecoveryNeeded(ic, result, milestoneId) {
+    if (!result.needsManualRecovery)
+        return null;
+    const { ctx, pi, deps } = ic;
+    const reason = `Post-merge stash restore failed for milestone ${milestoneId}`;
+    ctx.ui.notify(`${reason}. Resolve the working tree before resuming auto-mode. ${result.message}`, "error");
+    await deps.stopAuto(ctx, pi, reason);
+    return { action: "break", reason: "postflight-stash-restore-failed" };
+}
+export async function restorePreflightStashOrStop(ic, preflight, milestoneId) {
+    if (!preflight.stashPushed)
+        return null;
+    const { s, deps } = ic;
+    const result = deps.postflightPopStash(s.originalBasePath || s.basePath, milestoneId, preflight.stashMarker, ic.ctx.ui.notify.bind(ic.ctx.ui));
+    return stopOnPostflightRecoveryNeeded(ic, result, milestoneId);
+}
+/**
+ * Run a milestone merge surrounded by preflight stash + always-on postflight
+ * pop. The previous code popped the stash only after a successful merge, which
+ * leaked `gsd-preflight-stash:M00x:*` entries whenever `mergeAndExit` threw —
+ * leaving the user's pre-merge working tree silently stashed away after a
+ * merge-conflict or other merge error. This helper restores the stash on
+ * every exit path, then surfaces the merge or stash failure (in priority
+ * order) as the loop's stop reason.
+ *
+ * Returns a `break` action when auto-mode must stop, or `null` when the merge
+ * succeeded and the stash (if any) was restored cleanly.
+ */
+export async function _runMilestoneMergeWithStashRestore(ic, milestoneId, options = {}) {
+    const { ctx, pi, s, deps } = ic;
+    const preflight = deps.preflightCleanRoot(s.originalBasePath || s.basePath, milestoneId, ctx.ui.notify.bind(ctx.ui));
+    if (preflight.blocked) {
+        const reason = preflight.blockedReason === "unmerged-conflicts"
+            ? `Pre-merge unresolved Git conflicts block milestone ${milestoneId}`
+            : `Pre-merge dirty working tree overlaps milestone ${milestoneId}`;
+        await deps.stopAuto(ctx, pi, reason, {
+            preserveCompletedMilestoneBranch: true,
+            preserveCloseoutTranscript: options.preserveCloseoutTranscript,
+        });
+        return {
+            action: "break",
+            reason: preflight.blockedReason === "unmerged-conflicts"
+                ? "preflight-unmerged-conflicts"
+                : "preflight-dirty-overlap",
+        };
+    }
+    let mergeError = null;
+    const exitResult = deps.lifecycle.exitMilestone(milestoneId, { merge: true }, ctx.ui);
+    if (exitResult.ok) {
+        s.milestoneMergedInPhases = true;
+        try {
+            const projectRoot = s.originalBasePath || s.canonicalProjectRoot || s.basePath;
+            const { rebuildMarkdownProjectionsFromDb } = await import("../commands-maintenance.js");
+            await rebuildMarkdownProjectionsFromDb(projectRoot);
+        }
+        catch (err) {
+            logWarning("engine", `markdown projection rebuild after milestone merge failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    else {
+        mergeError = exitResult.cause ?? new Error(`exit ${exitResult.reason}`);
+    }
+    // Always attempt to restore the stashed working tree, even on merge error.
+    // postflightPopStash itself does not throw; failures surface via the
+    // PostflightResult.needsManualRecovery flag.
+    let stashResult = null;
+    if (preflight.stashPushed) {
+        stashResult = deps.postflightPopStash(s.originalBasePath || s.basePath, milestoneId, preflight.stashMarker, ctx.ui.notify.bind(ctx.ui));
+    }
+    // Merge failure takes priority over stash recovery — the merge is the
+    // authoritative gate. If the stash also needed manual recovery, the user
+    // already saw the postflightPopStash notify above.
+    if (mergeError) {
+        if (mergeError instanceof MergeConflictError) {
+            // A merge conflict is a recoverable human checkpoint, not an
+            // infrastructure failure — the user resolves the conflict and runs
+            // `/gsd auto` to resume. Pause (don't stop): stopAuto tears down the
+            // session and, because `milestoneMergedInPhases` stays false here,
+            // re-runs the already-failed worktree merge in its cleanup step
+            // (#2645), then drops the user out of the interactive TUI onto a
+            // "stopped" surface.
+            const conflictReason = `Merge conflict on milestone ${milestoneId}: ${mergeError.conflictedFiles.join(", ")}. Resolve conflicts manually and run /gsd auto to resume.`;
+            ctx.ui.notify(conflictReason, "error");
+            await deps.pauseAuto(ctx, pi, {
+                message: conflictReason,
+                category: "unknown",
+            });
+            return { action: "break", reason: "merge-conflict" };
+        }
+        logError("engine", "Milestone merge failed with non-conflict error", {
+            milestone: milestoneId,
+            error: String(mergeError),
+        });
+        // Like a merge conflict, a non-conflict merge failure (index lock,
+        // network, permissions) is recoverable — the user fixes the cause and
+        // runs `/gsd auto` to resume. Pause (don't stop) so the session stays
+        // resumable and stopAuto's teardown does not re-run the failed merge.
+        const mergeFailReason = `Merge error on milestone ${milestoneId}: ${mergeError instanceof Error ? mergeError.message : String(mergeError)}. Resolve and run /gsd auto to resume.`;
+        ctx.ui.notify(mergeFailReason, "error");
+        await deps.pauseAuto(ctx, pi, {
+            message: mergeFailReason,
+            category: "unknown",
+        });
+        return { action: "break", reason: "merge-failed" };
+    }
+    if (stashResult) {
+        return stopOnPostflightRecoveryNeeded(ic, stashResult, milestoneId);
+    }
+    return null;
+}
+export async function _runMilestoneMergeOnceWithStashRestore(ic, milestoneId, options = {}) {
+    if (ic.s.milestoneMergedInPhases) {
+        debugLog("autoLoop", {
+            phase: "milestone-merge-skip",
+            reason: "already-merged-in-phases",
+            milestoneId,
+        });
+        return null;
+    }
+    return _runMilestoneMergeWithStashRestore(ic, milestoneId, options);
+}
+export async function shouldSkipTerminalMilestoneCloseout(s, state, mid) {
+    const closeoutMilestoneId = mid ?? s.currentMilestoneId ?? state.lastCompletedMilestone?.id;
+    if (s.completionStopInProgress) {
+        return { skip: true, milestoneId: closeoutMilestoneId };
+    }
+    if (!closeoutMilestoneId) {
+        return { skip: false };
+    }
+    if (isDbAvailable())
+        refreshWorkflowDatabaseFromDisk();
+    const closeoutBasePath = s.originalBasePath || s.canonicalProjectRoot || s.basePath;
+    let closeoutMergePending = false;
+    if (getIsolationMode(closeoutBasePath) !== "none") {
+        try {
+            const blockers = await findUnmergedCompletedMilestones(closeoutBasePath);
+            closeoutMergePending = blockers.some((blocker) => blocker.milestoneId === closeoutMilestoneId);
+        }
+        catch {
+            // Fail open: without git/DB inspection we cannot safely treat closeout as done.
+            closeoutMergePending = true;
+        }
+    }
+    const milestoneAlreadyClosedOut = isDbAvailable()
+        && isClosedStatus(getMilestone(closeoutMilestoneId)?.status ?? "")
+        && !closeoutMergePending;
+    if (milestoneAlreadyClosedOut) {
+        return { skip: true, milestoneId: closeoutMilestoneId };
+    }
+    return { skip: false, milestoneId: closeoutMilestoneId };
+}
+/**
+ * Generate and write an HTML milestone report snapshot.
+ */
+export async function generateMilestoneReport(s, ctx, milestoneId) {
+    const { loadVisualizerData } = await importExtensionModule(import.meta.url, "../visualizer-data.js");
+    const { generateHtmlReport } = await importExtensionModule(import.meta.url, "../export-html.js");
+    const { writeReportSnapshot } = await importExtensionModule(import.meta.url, "../reports.js");
+    const { basename } = await import("node:path");
+    const reportBasePath = _resolveReportBasePath(s);
+    const snapData = await loadVisualizerData(reportBasePath);
+    const completedMs = snapData.milestones.find((m) => m.id === milestoneId);
+    const msTitle = completedMs?.title ?? milestoneId;
+    const gsdVersion = process.env.GSD_VERSION ?? "0.0.0";
+    const projName = basename(reportBasePath);
+    const doneSlices = snapData.milestones.reduce((acc, m) => acc + m.slices.filter((sl) => sl.done).length, 0);
+    const totalSlices = snapData.milestones.reduce((acc, m) => acc + m.slices.length, 0);
+    const outPath = writeReportSnapshot({
+        basePath: reportBasePath,
+        html: generateHtmlReport(snapData, {
+            projectName: projName,
+            projectPath: reportBasePath,
+            gsdVersion,
+            milestoneId,
+            indexRelPath: "index.html",
+        }),
+        milestoneId,
+        milestoneTitle: msTitle,
+        kind: "milestone",
+        projectName: projName,
+        projectPath: reportBasePath,
+        gsdVersion,
+        totalCost: snapData.totals?.cost ?? 0,
+        totalTokens: snapData.totals?.tokens.total ?? 0,
+        totalDuration: snapData.totals?.duration ?? 0,
+        doneSlices,
+        totalSlices,
+        doneMilestones: snapData.milestones.filter((m) => m.status === "complete").length,
+        totalMilestones: snapData.milestones.length,
+        phase: snapData.phase,
+    });
+    ctx.ui.notify(`Report saved: .gsd/reports/${basename(outPath)} — open index.html to browse progression.`, "info");
+}

package/dist/resources/extensions/gsd/auto/dispatch-history.js

@@ -26,7 +26,7 @@
  * grammar itself lives in auto/dispatch-key.ts and is re-exported here for
  * import stability.
  */
-import { buildDispatchKey, normalizeDispatchKey } from "./dispatch-key.js";
+import { buildDispatchKey, normalizeDispatchKey, parseDispatchKey } from "./dispatch-key.js";
 import { detectStuck } from "./detect-stuck.js";
 import { getLatestForUnit, getRecentUnitKeysForProjectRoot, } from "../db/unit-dispatches.js";
 import { debugLog } from "../debug-logger.js";
@@ -37,12 +37,18 @@ export { buildDispatchKey, normalizeDispatchKey, parseDispatchKey } from "./disp
  * cutover (issue #5791).
  */
 export const STUCK_WINDOW_SIZE = 6;
-function lookupLatestLedgerError(unitType, unitId) {
+/**
+ * Fetch the latest dispatch ledger error for a unit, the single canonical
+ * lookup shared by the DispatchHistory window and the legacy
+ * `loopState.recentUnits` path in dispatch.ts. The ledger keys rows by the
+ * bare unit id with the unit type in its own column, so the lookup must use
+ * the bare id and require a unit_type match (a compound `type/id` key would
+ * miss the row, and another unit type's error on the same id must never be
+ * attached — it would trip the repeat-error rule spuriously).
+ */
+export function lookupLatestLedgerError(unitType, unitId) {
     try {
         const row = getLatestForUnit(unitId);
-        // The ledger keys rows by bare unit id; require a unit_type match so
-        // another unit type's error on the same id is never attached (it would
-        // trip the repeat-error rule spuriously).
         if (!row || row.unit_type !== unitType)
             return undefined;
         return row.error_summary ?? undefined;
@@ -85,7 +91,16 @@ export function createDispatchHistory(options) {
                 const persisted = getRecentUnitKeysForProjectRoot(scopeId, windowSize);
                 if (persisted.length === 0)
                     return 0;
-                window = persisted.map(({ key }) => ({ key: normalizeDispatchKey(key) }));
+                const rebuilt = [];
+                for (const { key } of persisted) {
+                    const normalized = normalizeDispatchKey(key);
+                    const parsed = parseDispatchKey(normalized);
+                    const error = parsed && rebuilt.some((entry) => entry.key === normalized)
+                        ? lookupLatestLedgerError(parsed.unitType, parsed.unitId)
+                        : undefined;
+                    rebuilt.push({ key: normalized, error });
+                }
+                window = rebuilt;
                 while (window.length > windowSize)
                     window.shift();
                 return window.length;