gsd-pi 2.75.0 → 2.76.0-dev.b072ebb73

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

@@ -6,12 +6,14 @@
  * AssistantMessageEvents for TUI rendering, then strips tool-call blocks from
  * the final AssistantMessage so GSD's agent loop doesn't try to dispatch them.
  */
-import { EventStream, mapThinkingLevelToEffort, supportsAdaptiveThinking } from "@gsd/pi-ai";
+import { EventStream } from "@gsd/pi-ai";
 import { execSync } from "node:child_process";
 import { PartialMessageBuilder, ZERO_USAGE, mapUsage } from "./partial-builder.js";
 import { buildWorkflowMcpServers } from "../gsd/workflow-mcp.js";
 import { showInterviewRound } from "../shared/tui.js";
+/** Label used for the free-text fallback option in single-choice elicitation questions. */
 const OTHER_OPTION_LABEL = "None of the above";
+/** Regex pattern that identifies field names and descriptions that should be treated as sensitive/secure inputs. */
 const SENSITIVE_FIELD_PATTERN = /(password|passphrase|secret|token|api[_\s-]*key|private[_\s-]*key|credential)/i;
 // ---------------------------------------------------------------------------
 // Stream factory
@@ -29,6 +31,7 @@ function createAssistantStream() {
         throw new Error("Unexpected event type for final result");
     });
 }
+/** Extract a human-readable error string from an SDK result message. */
 export function getResultErrorMessage(result) {
     if ("errors" in result && Array.isArray(result.errors) && result.errors.length > 0) {
         return result.errors.join("; ");
@@ -41,10 +44,13 @@ export function getResultErrorMessage(result) {
 // ---------------------------------------------------------------------------
 // Claude binary resolution
 // ---------------------------------------------------------------------------
+/** Cached result of the `which`/`where claude` lookup so the shell is only spawned once per process. */
 let cachedClaudePath = null;
+/** Return the shell command used to locate the `claude` binary on the given platform. */
 export function getClaudeLookupCommand(platform = process.platform) {
     return platform === "win32" ? "where claude" : "which claude";
 }
+/** Extract the first line of `which`/`where` output as the resolved binary path. */
 export function parseClaudeLookupOutput(output) {
     return output
         .toString()
@@ -123,6 +129,7 @@ export function buildPromptFromContext(context) {
     }
     return parts.join("\n\n");
 }
+/** Strip the `data:<mime>;base64,` prefix from a data URI, returning only the raw base64 payload. */
 function stripDataUriPrefix(value) {
     const commaIndex = value.indexOf(",");
     if (value.startsWith("data:") && commaIndex !== -1) {
@@ -130,10 +137,12 @@ function stripDataUriPrefix(value) {
     }
     return value;
 }
+/** Extract the MIME type from a data URI string, or return `null` if the value is not a valid data URI. */
 function inferMimeTypeFromDataUri(value) {
     const match = /^data:([^;,]+);base64,/.exec(value);
     return match?.[1] ?? null;
 }
+/** Collect all base64 image blocks from user messages in the context for inclusion in the SDK prompt. */
 export function extractImageBlocksFromContext(context) {
     const imageBlocks = [];
     for (const msg of context.messages) {
@@ -162,6 +171,7 @@ export function extractImageBlocksFromContext(context) {
     }
     return imageBlocks;
 }
+/** Build the SDK query prompt, wrapping image blocks into an async iterable user message when present. */
 export function buildSdkQueryPrompt(context, textPrompt = buildPromptFromContext(context)) {
     const imageBlocks = extractImageBlocksFromContext(context);
     if (imageBlocks.length === 0) {
@@ -183,6 +193,7 @@ export function buildSdkQueryPrompt(context, textPrompt = buildPromptFromContext
 // ---------------------------------------------------------------------------
 // Error helper
 // ---------------------------------------------------------------------------
+/** Build a minimal error `AssistantMessage` with the given model ID and error text. */
 function makeErrorMessage(model, errorMsg) {
     return {
         role: "assistant",
@@ -209,6 +220,7 @@ export function makeStreamExhaustedErrorMessage(model, lastTextContent) {
     }
     return message;
 }
+/** Extract the string labels from an array of SDK elicitation option objects, filtering out blank entries. */
 function readElicitationChoices(options) {
     if (!Array.isArray(options))
         return [];
@@ -216,6 +228,7 @@ function readElicitationChoices(options) {
         .map((option) => (typeof option?.const === "string" ? option.const : typeof option?.title === "string" ? option.title : ""))
         .filter((option) => option.length > 0);
 }
+/** Parse an SDK elicitation request into structured multiple-choice questions, or null if the schema is unsupported. */
 export function parseAskUserQuestionsElicitation(request) {
     if (request.mode && request.mode !== "form")
         return null;
@@ -265,6 +278,7 @@ export function parseAskUserQuestionsElicitation(request) {
     }
     return questions.length > 0 ? questions : null;
 }
+/** Return true if the elicitation field should be treated as sensitive and rendered as a secure/password input. */
 function isSecureElicitationField(requestMessage, fieldId, field) {
     if (field.format === "password")
         return true;
@@ -283,6 +297,7 @@ function isSecureElicitationField(requestMessage, fieldId, field) {
         .toLowerCase();
     return SENSITIVE_FIELD_PATTERN.test(haystack);
 }
+/** Parse an SDK elicitation request into free-text input field descriptors, or null if unsupported. */
 export function parseTextInputElicitation(request) {
     if (request.mode && request.mode !== "form")
         return null;
@@ -315,6 +330,7 @@ export function parseTextInputElicitation(request) {
     }
     return fields.length > 0 ? fields : null;
 }
+/** Convert a TUI interview round result into the SDK elicitation content map. */
 export function roundResultToElicitationContent(questions, result) {
     const content = {};
     for (const question of questions) {
@@ -334,6 +350,7 @@ export function roundResultToElicitationContent(questions, result) {
     }
     return content;
 }
+/** Build the dialog title string for a multiple-choice elicitation question, combining server name, header, and question text. */
 function buildElicitationPromptTitle(request, question) {
     const parts = [
         request.serverName ? `[${request.serverName}]` : "",
@@ -342,6 +359,7 @@ function buildElicitationPromptTitle(request, question) {
     ].filter((part) => part && part.trim().length > 0);
     return parts.join("\n\n");
 }
+/** Drive each multiple-choice elicitation question through the extension UI's `select` dialog, collecting answers into an SDK result. */
 async function promptElicitationWithDialogs(request, questions, ui, signal) {
     const content = {};
     for (const question of questions) {
@@ -379,6 +397,7 @@ async function promptElicitationWithDialogs(request, questions, ui, signal) {
     }
     return { action: "accept", content };
 }
+/** Build the dialog title string for a free-text input field, combining server name, field title, and description. */
 function buildTextInputPromptTitle(request, field) {
     const parts = [
         request.serverName ? `[${request.serverName}]` : "",
@@ -387,6 +406,7 @@ function buildTextInputPromptTitle(request, field) {
     ].filter((part) => typeof part === "string" && part.trim().length > 0);
     return parts.join("\n\n");
 }
+/** Derive a placeholder hint for a free-text input field from its description, falling back to "Required" or "Leave empty to skip". */
 function buildTextInputPlaceholder(field) {
     const desc = field.description.trim();
     if (!desc)
@@ -400,6 +420,7 @@ function buildTextInputPlaceholder(field) {
     const hint = formatLine.replace(/^format:\s*/i, "").trim();
     return hint.length > 0 ? hint : field.required ? "Required" : "Leave empty to skip";
 }
+/** Collect each free-text input field via the extension UI's `input` dialog, returning the filled SDK elicitation result. */
 async function promptTextInputElicitation(request, fields, ui, signal) {
     const content = {};
     for (const field of fields) {
@@ -411,6 +432,7 @@ async function promptTextInputElicitation(request, fields, ui, signal) {
     }
     return { action: "accept", content };
 }
+/** Create an SDK elicitation handler that routes requests through the extension UI dialogs, or undefined if no UI is available. */
 export function createClaudeCodeElicitationHandler(ui) {
     if (!ui)
         return undefined;
@@ -482,6 +504,42 @@ export async function resolveClaudePermissionMode(env = process.env) {
     }
     return "bypassPermissions";
 }
+// NOTE: These helpers intentionally mirror @gsd/pi-ai anthropic-shared
+// behavior so this extension remains typecheck-stable even when the published
+// @gsd/pi-ai barrel lags behind monorepo source exports.
+/** Return true for model IDs that support the adaptive thinking API (Opus 4.6/4.7, Sonnet 4.6/4.7, Haiku 4.5). */
+function modelSupportsAdaptiveThinking(modelId) {
+    return (modelId.includes("opus-4-6")
+        || modelId.includes("opus-4.6")
+        || modelId.includes("opus-4-7")
+        || modelId.includes("opus-4.7")
+        || modelId.includes("sonnet-4-6")
+        || modelId.includes("sonnet-4.6")
+        || modelId.includes("sonnet-4-7")
+        || modelId.includes("sonnet-4.7")
+        || modelId.includes("haiku-4-5")
+        || modelId.includes("haiku-4.5"));
+}
+/** Map a GSD thinking level to the Anthropic effort value, clamping xhigh to max for models that lack native xhigh support. */
+function mapThinkingLevelToAnthropicEffort(level, modelId) {
+    switch (level) {
+        case "minimal":
+        case "low":
+            return "low";
+        case "medium":
+            return "medium";
+        case "high":
+            return "high";
+        case "xhigh":
+            if (modelId.includes("opus-4-7") || modelId.includes("opus-4.7"))
+                return "xhigh";
+            if (modelId.includes("opus-4-6") || modelId.includes("opus-4.6"))
+                return "max";
+            return "high";
+        default:
+            return "high";
+    }
+}
 /**
  * Build the options object passed to the Claude Agent SDK's `query()` call.
  *
@@ -513,8 +571,17 @@ export function buildSdkOptions(modelId, prompt, overrides, extraOptions = {}) {
         "Bash(pwd)",
         ...(mcpServers ? Object.keys(mcpServers).map((serverName) => `mcp__${serverName}__*`) : []),
     ];
-    const effort = reasoning && supportsAdaptiveThinking(modelId)
-        ? mapThinkingLevelToEffort(reasoning, modelId)
+    const supportsAdaptive = modelSupportsAdaptiveThinking(modelId);
+    const effort = reasoning && supportsAdaptive
+        ? mapThinkingLevelToAnthropicEffort(reasoning, modelId)
+        : undefined;
+    // Bug B: SDK requires thinking:{type:"adaptive"} alongside effort for adaptive thinking to activate.
+    // Bug C: SDK requires thinking:{type:"disabled"} to actually stop adaptive thinking when reasoning is off;
+    //        omitting the field leaves the SDK in its adaptive default (or persisted session state).
+    const thinkingConfig = supportsAdaptive
+        ? effort
+            ? { thinking: { type: "adaptive" } }
+            : { thinking: { type: "disabled" } }
         : undefined;
     return {
         pathToClaudeCodeExecutable: getClaudePath(),
@@ -529,11 +596,13 @@ export function buildSdkOptions(modelId, prompt, overrides, extraOptions = {}) {
         disallowedTools,
         ...(allowedTools.length > 0 ? { allowedTools } : {}),
         ...(mcpServers ? { mcpServers } : {}),
-        betas: modelId.includes("sonnet") ? ["context-1m-2025-08-07"] : [],
+        betas: (modelId.includes("sonnet") || modelId.includes("opus-4-7") || modelId.includes("opus-4.7")) ? ["context-1m-2025-08-07"] : [],
+        ...(thinkingConfig ?? {}),
         ...(effort ? { effort } : {}),
         ...sdkExtraOptions,
     };
 }
+/** Normalise heterogeneous SDK tool-result content (string, array, or object) into a uniform `ExternalToolResultContentBlock[]`. */
 function normalizeToolResultContent(content) {
     if (typeof content === "string") {
         return [{ type: "text", text: content }];
@@ -568,6 +637,7 @@ function normalizeToolResultContent(content) {
     }
     return blocks.length > 0 ? blocks : [{ type: "text", text: "" }];
 }
+/** Extract tool result payloads from an SDK synthetic user message, keyed by tool-use ID. */
 export function extractToolResultsFromSdkUserMessage(message) {
     const extracted = [];
     const seen = new Set();
@@ -612,6 +682,7 @@ export function extractToolResultsFromSdkUserMessage(message) {
     }
     return extracted;
 }
+/** Attach external tool results from the SDK synthetic user message to their corresponding tool-call blocks by ID. */
 function attachExternalResultsToToolBlocks(toolBlocks, toolResultsById) {
     for (const block of toolBlocks) {
         if (block.type !== "toolCall" && block.type !== "serverToolUse")
@@ -659,6 +730,7 @@ export function streamViaClaudeCode(model, context, options) {
     void pumpSdkMessages(model, context, options, stream);
     return stream;
 }
+/** Async pump that drives the Claude Agent SDK's async-iterable message stream and pushes events into `stream`. */
 async function pumpSdkMessages(model, context, options, stream) {
     const modelId = model.id;
     let builder = null;

package/dist/resources/extensions/gsd/auto/detect-stuck.js

@@ -16,6 +16,7 @@ const ENOENT_PATH_RE = /ENOENT[^']*'([^']+)'/;
  *
  * Rule 1: Same error string twice in a row → stuck immediately.
  * Rule 2: Same unit key 3+ consecutive times → stuck (preserves prior behavior).
+ * Rule 2b: Same unit key appears 3+ times anywhere in the active window → stuck.
  * Rule 3: Oscillation A→B→A→B in last 4 entries → stuck.
  * Rule 4: Same ENOENT path in any 2 entries within the window → stuck (#3575).
  *         Missing files don't self-heal between retries — retrying wastes budget.
@@ -48,6 +49,14 @@ export function detectStuck(window) {
             };
         }
     }
+    // Rule 2b: Same unit key 3+ times anywhere in the active window
+    const countInWindow = window.filter((entry) => entry.key === last.key).length;
+    if (countInWindow >= 3) {
+        return {
+            stuck: true,
+            reason: `${last.key} derived ${countInWindow} times in last ${window.length} attempts without progress${suffix}`,
+        };
+    }
     // Rule 3: Oscillation (A→B→A→B in last 4)
     if (window.length >= 4) {
         const w = window.slice(-4);

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

@@ -17,6 +17,7 @@ import { logWarning } from "../workflow-logger.js";
 import { gsdRoot } from "../paths.js";
 import { resolveUokFlags } from "../uok/flags.js";
 import { scheduleSidecarQueue } from "../uok/execution-graph.js";
+import { ExecutionGraphScheduler } from "../uok/execution-graph.js";
 import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 // ── Stuck detection persistence (#3704) ──────────────────────────────────
@@ -78,17 +79,73 @@ function checkMemoryPressure() {
     const pct = heapMB / limitMB;
     return { pressured: pct > MEMORY_PRESSURE_THRESHOLD, heapMB, limitMB, pct };
 }
+function resolveDispatchNodeKind(unitType, sidecarItem) {
+    if (sidecarItem?.kind === "hook")
+        return "hook";
+    if (sidecarItem?.kind === "triage")
+        return "verification";
+    if (sidecarItem?.kind === "quick-task")
+        return "team-worker";
+    if (unitType.startsWith("hook/"))
+        return "hook";
+    if (unitType === "reactive-execute")
+        return "subagent";
+    if (unitType === "gate-evaluate"
+        || unitType === "validate-milestone"
+        || unitType === "run-uat"
+        || unitType === "complete-slice") {
+        return "verification";
+    }
+    if (unitType === "replan-slice" || unitType === "reassess-roadmap") {
+        return "reprocess";
+    }
+    return "unit";
+}
+async function runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem) {
+    if (dispatchContract === "legacy-direct") {
+        return runUnitPhase(ic, iterData, loopState, sidecarItem);
+    }
+    const scheduler = new ExecutionGraphScheduler();
+    let outcome = null;
+    const executeNode = async () => {
+        outcome = await runUnitPhase(ic, iterData, loopState, sidecarItem);
+    };
+    const kinds = [
+        "unit",
+        "hook",
+        "subagent",
+        "team-worker",
+        "verification",
+        "reprocess",
+    ];
+    for (const kind of kinds)
+        scheduler.registerHandler(kind, executeNode);
+    const nodeId = `dispatch:${ic.iteration}:${iterData.unitType}:${iterData.unitId}`;
+    await scheduler.run([
+        {
+            id: nodeId,
+            kind: resolveDispatchNodeKind(iterData.unitType, sidecarItem),
+            dependsOn: [],
+            metadata: {
+                unitType: iterData.unitType,
+                unitId: iterData.unitId,
+            },
+        },
+    ], { parallel: false, maxWorkers: 1 });
+    return outcome ?? { action: "break", reason: "scheduler-dispatch-missing-result" };
+}
 /**
  * Main auto-mode execution loop. Iterates: derive → dispatch → guards →
  * runUnit → finalize → repeat. Exits when s.active becomes false or a
  * terminal condition is reached.
  *
  * This is the linear replacement for the recursive
- * dispatchNextUnit → handleAgentEnd → dispatchNextUnit chain.
+ * dispatchNextUnit → resolveAgentEnd → dispatchNextUnit chain.
  */
-export async function autoLoop(ctx, pi, s, deps) {
+export async function autoLoop(ctx, pi, s, deps, options) {
     debugLog("autoLoop", { phase: "enter" });
     let iteration = 0;
+    const dispatchContract = options?.dispatchContract ?? "legacy-direct";
     // Load persisted stuck state so counters survive session restarts (#3704)
     const persisted = loadStuckState(s.basePath);
     const loopState = {
@@ -273,7 +330,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                     break;
                 }
                 // ── Unit execution (shared with dev path) ──
-                const unitPhaseResult = await runUnitPhase(ic, iterData, loopState);
+                const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState);
                 deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
                     unitType: iterData.unitType,
                     unitId: iterData.unitId,
@@ -410,7 +467,7 @@ export async function autoLoop(ctx, pi, s, deps) {
                     sidecarKind: sidecarItem.kind,
                 });
             }
-            const unitPhaseResult = await runUnitPhase(ic, iterData, loopState, sidecarItem);
+            const unitPhaseResult = await runUnitPhaseViaContract(dispatchContract, ic, iterData, loopState, sidecarItem);
             deps.uokObserver?.onPhaseResult("unit", unitPhaseResult.action, {
                 unitType: iterData.unitType,
                 unitId: iterData.unitId,
@@ -528,3 +585,9 @@ export async function autoLoop(ctx, pi, s, deps) {
     _clearCurrentResolve();
     debugLog("autoLoop", { phase: "exit", totalIterations: iteration });
 }
+export async function runUokKernelLoop(ctx, pi, s, deps) {
+    return autoLoop(ctx, pi, s, deps, { dispatchContract: "uok-scheduler" });
+}
+export async function runLegacyAutoLoop(ctx, pi, s, deps) {
+    return autoLoop(ctx, pi, s, deps, { dispatchContract: "legacy-direct" });
+}