@opengsd/gsd-pi 1.0.2-dev.867e002 → 1.0.2-dev.aed3486

package/src/resources/extensions/gsd/unit-context-manifest.ts

@@ -13,6 +13,8 @@
 //
 // Phased rollout tracking:
 //   - Phase 1 (this PR): schema + manifests + coverage test.
+//   - Phase 1b (skill token savings): skills policy wired via skill-scope.ts
+//     and setVisibleSkills(); allowlists derived from skill-manifest.ts.
 //   - Phase 2: add composeSystemPromptForUnit(); migrate one low-risk
 //     unit type (e.g. reassess-roadmap) as the pilot.
 //   - Phase 3: migrate remaining unit types, tighten manifests per
@@ -277,11 +279,20 @@ export interface UnitContextManifest {
 
 // ─── Manifests ────────────────────────────────────────────────────────────
 
-// Phase 1 policy: every manifest encodes today's behavior. Skills = "all"
-// unless the unit type was already narrowed via the existing skill-manifest
-// resolver (#4779). Memory/knowledge policies reflect the defaults in
-// `bootstrap/system-context.ts`. Artifact classifications follow what
-// `auto-prompts.ts` inlines today for each unit type.
+// Phase 1 policy: skills policy is derived from skill-manifest.ts allowlists
+// via `skillPolicyForUnit()`; units without an allowlist keep mode "all".
+// Explicit mode "none" remains for lightweight config units.
+
+import { resolveSkillManifest } from "./skill-manifest.js";
+
+/** Derive skills policy from skill-manifest allowlists; default to full catalog. */
+function skillPolicyForUnit(unitType: string): SkillsPolicy {
+  const allowlist = resolveSkillManifest(unitType);
+  if (allowlist) {
+    return { mode: "allowlist", skills: allowlist };
+  }
+  return { mode: "all" };
+}
 
 const COMMON_BUDGET_LARGE = 1_500_000;  // ~400K tokens
 const COMMON_BUDGET_MEDIUM = 750_000;   // ~200K tokens
@@ -360,7 +371,7 @@ export type UnitType = typeof KNOWN_UNIT_TYPES[number];
 export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // ─── Milestone-scoped ────────────────────────────────────────────────
   "research-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -377,7 +388,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "plan-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("plan-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -392,7 +403,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "discuss-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -407,7 +418,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "validate-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("validate-milestone"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -424,7 +435,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "complete-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("complete-milestone"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -446,7 +457,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Slice-scoped ────────────────────────────────────────────────────
   "research-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-slice"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -463,7 +474,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "plan-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("plan-slice"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -481,7 +492,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "refine-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("refine-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -499,7 +510,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "replan-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("replan-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -514,7 +525,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "complete-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("complete-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -535,7 +546,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "reassess-roadmap": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("reassess-roadmap"),
     knowledge: "scoped",
     memory: "critical-only",
     codebaseMap: false,
@@ -552,7 +563,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Task-scoped ─────────────────────────────────────────────────────
   "execute-task": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("execute-task"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -567,7 +578,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "reactive-execute": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("reactive-execute"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -584,7 +595,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Ancillary units ─────────────────────────────────────────────────
   "run-uat": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("run-uat"),
     knowledge: "critical-only",
     memory: "critical-only",
     codebaseMap: false,
@@ -599,7 +610,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_SMALL,
   },
   "gate-evaluate": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("gate-evaluate"),
     knowledge: "critical-only",
     memory: "critical-only",
     codebaseMap: false,
@@ -616,7 +627,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_SMALL,
   },
   "rewrite-docs": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("rewrite-docs"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -631,7 +642,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "triage-captures": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("triage-captures"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -646,7 +657,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "quick-task": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("quick-task"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -684,7 +695,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // discussion runs before any milestone exists, so milestone artifacts are
   // not loaded. Keeps templates available for PROJECT.md scaffolding.
   "discuss-project": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-project"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -701,7 +712,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // discuss-requirements: REQUIREMENTS.md interview. PROJECT.md is the
   // primary context input; templates carry the requirements format.
   "discuss-requirements": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-requirements"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -737,7 +748,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // planning-dispatch policy to dispatch them. PROJECT.md + REQUIREMENTS.md
   // give the orchestrator the framing context.
   "research-project": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-project"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,

package/src/resources/extensions/gsd/user-input-boundary.ts

@@ -39,7 +39,7 @@ function extractTextFromMessage(msg: unknown): string {
   return parts.join("\n");
 }
 
-function lastAssistantText(messages: unknown[] | undefined): string {
+export function lastAssistantText(messages: unknown[] | null | undefined): string {
   if (!Array.isArray(messages)) return "";
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];

package/src/resources/extensions/gsd/vision-ask.ts

@@ -0,0 +1,28 @@
+/**
+ * Natural-language openers for milestone discussion.
+ *
+ * Keep these short and conversational. They are often the user's first prompt
+ * when GSD starts shaping a project or milestone, so they should feel like a
+ * collaborator starting a working session rather than a form field.
+ */
+import { randomInt } from "node:crypto";
+
+export const VISION_ASK_VARIANTS = [
+  "What are we building?",
+  "What do you want to make next?",
+  "What should this become?",
+  "What are you picturing?",
+  "Where should we take this?",
+  "What should this milestone unlock?",
+  "Tell me what you want to build.",
+  "What should GSD help you shape?",
+] as const;
+
+export type VisionAskVariant = typeof VISION_ASK_VARIANTS[number];
+
+export function chooseVisionAskVariant(
+  pickIndex: (exclusiveMax: number) => number = randomInt,
+): VisionAskVariant {
+  const index = pickIndex(VISION_ASK_VARIANTS.length);
+  return VISION_ASK_VARIANTS[index] ?? VISION_ASK_VARIANTS[0];
+}

package/src/resources/extensions/gsd/visualizer-overlay.ts

@@ -1,5 +1,5 @@
 import type { Theme } from "@gsd/pi-coding-agent";
-import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { loadVisualizerData, type VisualizerData } from "./visualizer-data.js";
 import {
   renderProgressView,
@@ -19,6 +19,7 @@ import { join } from "node:path";
 import { writeExportFile } from "./export.js";
 import { gsdRoot } from "./paths.js";
 import { stripAnsi } from "../shared/mod.js";
+import { renderDialogFrame, renderKeyHints } from "./tui/render-kit.js";
 
 export const TAB_COUNT = 10;
 const TAB_LABELS = [
@@ -500,8 +501,7 @@ export class GSDVisualizerOverlay {
 
     // Apply scroll
     const viewportHeight = Math.max(5, process.stdout.rows ? process.stdout.rows - 8 : 24);
-    const chromeHeight = 2;
-    const visibleContentRows = Math.max(1, viewportHeight - chromeHeight);
+    const visibleContentRows = Math.max(1, viewportHeight - 4);
     this.lastVisibleRows = visibleContentRows;
     const totalLines = content.length;
     const maxScroll = Math.max(0, content.length - visibleContentRows);
@@ -509,49 +509,21 @@ export class GSDVisualizerOverlay {
     const offset = this.scrollOffsets[this.activeTab];
     const visibleContent = content.slice(offset, offset + visibleContentRows);
 
-    const lines = this.wrapInBox(visibleContent, width, offset, visibleContentRows, totalLines);
-
-    // Footer hint
-    const hint = th.fg("dim", "Tab/Shift+Tab/1-9,0 switch \u00b7 / filter \u00b7 PgUp/PgDn scroll \u00b7 ? help \u00b7 esc close");
-    const hintVis = visibleWidth(hint);
-    const hintPad = Math.max(0, Math.floor((width - hintVis) / 2));
-    lines.push(" ".repeat(hintPad) + hint);
+    const footer = renderKeyHints(
+      th,
+      ["Tab/Shift+Tab/1-9,0 switch", "/ filter", "PgUp/PgDn scroll", "? help", "esc close"],
+      Math.max(1, width - 4),
+    );
+    const lines = renderDialogFrame(th, "GSD Visualizer", visibleContent, width, {
+      footer,
+      scroll: { offset, visibleRows: visibleContentRows, totalRows: totalLines },
+    });
 
     this.cachedWidth = width;
     this.cachedLines = lines;
     return lines;
   }
 
-  private wrapInBox(inner: string[], width: number, offset?: number, visibleRows?: number, totalLines?: number): string[] {
-    const th = this.theme;
-    const border = (s: string) => th.fg("borderAccent", s);
-    const innerWidth = width - 4;
-    const lines: string[] = [];
-    lines.push(border("\u256d" + "\u2500".repeat(width - 2) + "\u256e"));
-
-    // Compute scroll indicator positions
-    const scrollable = totalLines !== undefined && visibleRows !== undefined && totalLines > visibleRows;
-    let thumbStart = -1;
-    let thumbLen = 0;
-    const innerRows = inner.length;
-    if (scrollable && innerRows > 0 && totalLines! > 0) {
-      thumbStart = Math.round(((offset ?? 0) / totalLines!) * innerRows);
-      thumbLen = Math.max(1, Math.round((visibleRows! / totalLines!) * innerRows));
-    }
-
-    for (let i = 0; i < inner.length; i++) {
-      const line = inner[i];
-      const truncated = truncateToWidth(line, innerWidth);
-      const padWidth = Math.max(0, innerWidth - visibleWidth(truncated));
-      const rightBorder = scrollable && i >= thumbStart && i < thumbStart + thumbLen
-        ? border("\u2503")
-        : border("\u2502");
-      lines.push(border("\u2502") + " " + truncated + " ".repeat(padWidth) + " " + rightBorder);
-    }
-    lines.push(border("\u2570" + "\u2500".repeat(width - 2) + "\u256f"));
-    return lines;
-  }
-
   invalidate(): void {
     this.cachedWidth = undefined;
     this.cachedLines = undefined;

package/src/resources/extensions/gsd/worktree-lifecycle.ts

@@ -216,6 +216,10 @@ export type EnterResult =
       cause?: unknown;
     };
 
+export interface StrandedMilestoneAdoptionOptions {
+  mode: "worktree" | "branch";
+}
+
 export type ExitResult =
   | { ok: true; merged: boolean; codeFilesChanged: boolean }
   | { ok: false; reason: "merge-conflict" | "teardown-failed"; cause?: unknown };
@@ -237,6 +241,8 @@ export interface MergeContext {
    */
   worktreeBasePath: string;
   milestoneId: string;
+  /** Temporary override used while recovering stranded work. */
+  isolationModeOverride?: "worktree" | "branch" | "none";
   /**
    * When true, `mergeMilestoneStandalone` returns `{ merged: false,
    * mode: "skipped" }` immediately (mirrors the single-loop guard). Default
@@ -533,6 +539,7 @@ export function _enterMilestoneCore(
   deps: WorktreeLifecycleDeps,
   milestoneId: string,
   ctx: NotifyCtx,
+  opts: { modeOverride?: "worktree" | "branch" } = {},
 ): EnterResult {
   if (!isValidMilestoneId(milestoneId)) {
     debugLog("WorktreeLifecycle", {
@@ -653,7 +660,7 @@ export function _enterMilestoneCore(
   // Handles the case where originalBasePath is falsy and basePath is itself
   // a worktree path — prevents double-nested worktree paths (#3729).
   const basePath = resolveWorktreeProjectRoot(s.basePath, s.originalBasePath);
-  const mode = getIsolationMode(basePath);
+  const mode = opts.modeOverride ?? getIsolationMode(basePath);
 
   if (s.isolationDegraded) {
     if (mode === "worktree") {
@@ -1298,7 +1305,9 @@ export function mergeMilestoneStandalone(
     };
   }
 
-  const mode = getIsolationMode(originalBasePath || worktreeBasePath);
+  const mode =
+    mctx.isolationModeOverride ??
+    getIsolationMode(originalBasePath || worktreeBasePath);
   debugLog("WorktreeLifecycle", {
     action: "mergeAndExit",
     milestoneId,
@@ -1637,6 +1646,7 @@ export class WorktreeLifecycle {
         originalBasePath: this.s.originalBasePath,
         worktreeBasePath: this.s.basePath,
         milestoneId,
+        isolationModeOverride: this.s.strandedRecoveryIsolationMode ?? undefined,
         isolationDegraded: this.s.isolationDegraded,
         notify: ctx.notify,
       });
@@ -1740,6 +1750,7 @@ export class WorktreeLifecycle {
       // Rebuild GitService after merge (branch HEAD changed)
       rebuildGitService(this.s, this.deps);
     }
+    this.s.strandedRecoveryIsolationMode = null;
     return result;
   }
 
@@ -1876,6 +1887,30 @@ export class WorktreeLifecycle {
     this.s.basePath = resolvePausedResumeBasePath(base, persistedWorktreePath);
   }
 
+  /**
+   * Adopt in-progress stranded work during bootstrap.
+   *
+   * Unlike completed-orphan recovery, this does not merge, delete, or commit.
+   * It only moves the live session onto the branch/worktree proven by the
+   * audit evidence, while preserving that mode for the eventual merge.
+   */
+  adoptStrandedMilestone(
+    milestoneId: string,
+    base: string,
+    ctx: NotifyCtx,
+    opts: StrandedMilestoneAdoptionOptions,
+  ): EnterResult {
+    this.adoptSessionRoot(base);
+    this.s.strandedRecoveryIsolationMode = opts.mode;
+    const result = _enterMilestoneCore(this.s, this.deps, milestoneId, ctx, {
+      modeOverride: opts.mode,
+    });
+    if (!result.ok) {
+      this.s.strandedRecoveryIsolationMode = null;
+    }
+    return result;
+  }
+
   /**
    * Adopt an orphan worktree for a bootstrap-time merge (ADR-016 phase 2 / B4,
    * issue #5622).

package/src/resources/extensions/search-the-web/native-search.ts

@@ -16,6 +16,47 @@ export const CUSTOM_SEARCH_TOOL_NAMES = ["search-the-web", "search_and_read", "g
 
 /** Thinking block types that require signature validation by the API */
 const THINKING_TYPES = new Set(["thinking", "redacted_thinking"]);
+const NATIVE_SERVER_TOOL_USE_TYPES = new Set([
+  "server_tool_use",
+  "serverToolUse",
+]);
+const NATIVE_WEB_SEARCH_RESULT_TYPES = new Set([
+  "web_search_tool_result",
+  "webSearchResult",
+]);
+
+function nativeServerToolId(block: any): string | undefined {
+  if (!NATIVE_SERVER_TOOL_USE_TYPES.has(block?.type)) return undefined;
+  return typeof block.id === "string" ? block.id : undefined;
+}
+
+function nativeWebSearchResultId(block: any): string | undefined {
+  if (!NATIVE_WEB_SEARCH_RESULT_TYPES.has(block?.type)) return undefined;
+  const id = block.type === "webSearchResult" ? block.toolUseId : block.tool_use_id;
+  return typeof id === "string" ? id : undefined;
+}
+
+function hasCompleteNativeServerToolReplay(content: any[]): boolean {
+  const pendingToolUseIds = new Set<string>();
+  let sawNativeServerToolUse = false;
+
+  for (const block of content) {
+    const toolUseId = nativeServerToolId(block);
+    if (toolUseId !== undefined) {
+      if (pendingToolUseIds.has(toolUseId)) return false;
+      sawNativeServerToolUse = true;
+      pendingToolUseIds.add(toolUseId);
+      continue;
+    }
+
+    const resultId = nativeWebSearchResultId(block);
+    if (resultId !== undefined) {
+      if (!pendingToolUseIds.delete(resultId)) return false;
+    }
+  }
+
+  return sawNativeServerToolUse && pendingToolUseIds.size === 0;
+}
 
 /**
  * Providers whose Anthropic-Messages endpoint is known to accept the native
@@ -36,6 +77,11 @@ const NATIVE_WEB_SEARCH_PROVIDERS = new Set([
   "vercel-ai-gateway",
 ]);
 
+function looksLikeAnthropicModelName(modelName: string): boolean {
+  const normalized = modelName.trim().toLowerCase();
+  return normalized.startsWith("claude-") || normalized.startsWith("anthropic/claude-");
+}
+
 /**
  * True when the model is an Anthropic-shaped transport AND the provider is
  * known to accept the native `web_search_20250305` tool. Gate both on api
@@ -89,11 +135,10 @@ export interface NativeSearchPI {
  * those blocks. The Anthropic API detects the modification and rejects the
  * request with "thinking blocks cannot be modified."
  *
- * Fix: Remove thinking blocks from all assistant messages in the history.
- * In Anthropic's Messages API, the messages array always ends with a user
- * message, so every assistant message is from a previous turn that has been
- * through a store/replay cycle. The model generates fresh thinking for the
- * current turn regardless.
+ * Fix: Remove thinking blocks only from assistant messages that do not carry
+ * native server-tool blocks. Complete native server-tool histories can be
+ * replayed as-is; stripping thinking from those messages is itself a latest
+ * assistant message modification.
  */
 export function stripThinkingFromHistory(
   messages: Array<Record<string, unknown>>
@@ -103,6 +148,9 @@ export function stripThinkingFromHistory(
 
     const content = msg.content;
     if (!Array.isArray(content)) continue;
+    if (hasCompleteNativeServerToolReplay(content)) {
+      continue;
+    }
 
     msg.content = content.filter(
       (block: any) => !THINKING_TYPES.has(block?.type)
@@ -180,6 +228,8 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     // The model name heuristic is needed for session restores where
     // modelsAreEqual suppresses model_select AND the SDK doesn't pass model.
     const eventModel = event.model as { provider?: string; api?: string } | undefined;
+    const payloadModelName = typeof payload.model === "string" ? payload.model : "";
+    const payloadLooksAnthropic = payloadModelName ? looksLikeAnthropicModelName(payloadModelName) : undefined;
     let isAnthropic: boolean;
     if (eventModel?.api || eventModel?.provider) {
       // Preferred path: gate on api shape + provider allowlist. Both fields
@@ -188,12 +238,14 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
       // (#444 regression) or minimax-served Claude-compat as Anthropic (#4492).
       isAnthropic = supportsNativeWebSearch(eventModel);
     } else if (modelSelectFired) {
-      isAnthropic = isAnthropicProvider;
+      // The model_select flag can be stale if the next request omits event.model
+      // after a provider switch. A concrete non-Claude payload must win so an
+      // Anthropic-only tool never leaks into OpenAI Responses requests.
+      isAnthropic = isAnthropicProvider && payloadLooksAnthropic !== false;
     } else {
       // Last resort: session-restore paths where the SDK doesn't pass model.
       // The model-name prefix is best-effort and assumes direct Anthropic.
-      const modelName = typeof payload.model === "string" ? payload.model : "";
-      isAnthropic = modelName.startsWith("claude-");
+      isAnthropic = payloadLooksAnthropic === true;
     }
     if (!isAnthropic) return;
 

package/src/resources/extensions/shared/confirm-ui.ts

@@ -18,6 +18,7 @@
 import type { ExtensionContext } from "@gsd/pi-coding-agent";
 import { type Theme } from "@gsd/pi-coding-agent";
 import { Key, matchesKey, truncateToWidth, type TUI } from "@gsd/pi-tui";
+import { renderSharedDialogFrame } from "./dialog-frame.js";
 import { makeUI, GLYPH } from "./ui.js";
 
 export interface ConfirmOptions {
@@ -83,20 +84,18 @@ export async function showConfirm(
 		function render(width: number): string[] {
 			if (cachedLines) return cachedLines;
 
-			const ui = makeUI(theme, width);
+			const contentWidth = Math.max(1, width - 4);
+			const ui = makeUI(theme, contentWidth);
 			const lines: string[] = [];
 			const push = (...rows: string[][]) => { for (const r of rows) lines.push(...r); };
 
 			push(
-				ui.bar(),
-				ui.blank(),
-				ui.header(`  ${opts.title}`),
 				ui.blank(),
 				ui.subtitle(`  ${opts.message}`),
 				ui.blank(),
 			);
 
-			const add = (s: string) => truncateToWidth(s, width);
+			const add = (s: string) => truncateToWidth(s, contentWidth);
 			const option = (num: number, label: string, selected: boolean) => {
 				if (selected) {
 					return add(`  ${theme.fg("accent", GLYPH.cursor)} ${theme.fg("accent", `${num}. ${label}`)}`);
@@ -107,14 +106,11 @@ export async function showConfirm(
 			lines.push(option(1, yesLabel, cursor === 0));
 			lines.push(option(2, noLabel, cursor === 1));
 
-			push(
-				ui.blank(),
-				ui.hints(["↑/↓ to choose", "y/n to quick-select", "enter to confirm"]),
-				ui.bar(),
-			);
+			push(ui.blank());
+			const footer = ui.hints(["↑/↓ to choose", "y/n to quick-select", "enter to confirm"])[0] ?? "";
 
-			cachedLines = lines;
-			return lines;
+			cachedLines = renderSharedDialogFrame(theme, opts.title, lines, width, { footer });
+			return cachedLines;
 		}
 
 		return {

package/src/resources/extensions/shared/dialog-frame.ts

@@ -0,0 +1,71 @@
+import { type Theme } from "@gsd/pi-coding-agent";
+import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
+
+type ThemeColor = Parameters<Theme["fg"]>[0];
+
+export interface SharedDialogFrameOptions {
+	borderColor?: ThemeColor;
+	footer?: string | string[];
+	paddingX?: number;
+}
+
+function safeLine(text: string, width: number): string {
+	return truncateToWidth(text, width, "");
+}
+
+function padVisible(text: string, width: number): string {
+	const clipped = safeLine(text, width);
+	return clipped + " ".repeat(Math.max(0, width - visibleWidth(clipped)));
+}
+
+function renderTopBorder(
+	theme: Theme,
+	title: string,
+	width: number,
+	border: (text: string) => string,
+): string {
+	const trimmedTitle = title.trim();
+	if (!trimmedTitle || width < 10) {
+		return border("╭" + "─".repeat(width - 2) + "╮");
+	}
+
+	const safeTitle = safeLine(trimmedTitle, Math.max(0, width - 7));
+	const fill = Math.max(0, width - visibleWidth(safeTitle) - 5);
+	return border("╭─ ") + theme.bold(theme.fg("accent", safeTitle)) + border(" " + "─".repeat(fill) + "╮");
+}
+
+export function renderSharedDialogFrame(
+	theme: Theme,
+	title: string,
+	inner: string[],
+	width: number,
+	options: SharedDialogFrameOptions = {},
+): string[] {
+	if (width < 4) return inner.map((line) => safeLine(line, width));
+
+	const paddingX = Math.max(0, options.paddingX ?? 1);
+	const contentWidth = Math.max(0, width - 2 - paddingX * 2);
+	const border = (text: string) => theme.fg(options.borderColor ?? "borderAccent", text);
+	const pad = " ".repeat(paddingX);
+	const lines = [renderTopBorder(theme, title, width, border)];
+
+	for (const line of inner) {
+		lines.push(border("│") + pad + padVisible(line, contentWidth) + pad + border("│"));
+	}
+
+	const footer = Array.isArray(options.footer)
+		? options.footer
+		: options.footer
+			? [options.footer]
+			: [];
+	if (footer.length > 0) {
+		lines.push(border("├" + "─".repeat(width - 2) + "┤"));
+		for (const line of footer) {
+			lines.push(border("│") + pad + padVisible(line, contentWidth) + pad + border("│"));
+		}
+	}
+
+	lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
+	return lines;
+}
+