@opengsd/gsd-pi 1.0.2-dev.e9a1b49 → 1.0.2-dev.fb7ddf1

package/dist/resources/extensions/gsd/unit-context-manifest.js

@@ -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
@@ -60,11 +62,18 @@ export const ARTIFACT_KEYS = [
     "templates",
 ];
 // ─── 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) {
+    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
 const COMMON_BUDGET_SMALL = 250_000; // ~65K tokens
@@ -136,7 +145,7 @@ export const KNOWN_UNIT_TYPES = [
 export const UNIT_MANIFESTS = {
     // ─── Milestone-scoped ────────────────────────────────────────────────
     "research-milestone": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("research-milestone"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -153,7 +162,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "plan-milestone": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("plan-milestone"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -168,7 +177,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_LARGE,
     },
     "discuss-milestone": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("discuss-milestone"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -183,7 +192,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "validate-milestone": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("validate-milestone"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: false,
@@ -200,7 +209,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_LARGE,
     },
     "complete-milestone": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("complete-milestone"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: false,
@@ -221,7 +230,7 @@ export const UNIT_MANIFESTS = {
     },
     // ─── Slice-scoped ────────────────────────────────────────────────────
     "research-slice": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("research-slice"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -238,7 +247,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "plan-slice": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("plan-slice"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -256,7 +265,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_LARGE,
     },
     "refine-slice": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("refine-slice"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -274,7 +283,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "replan-slice": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("replan-slice"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -289,7 +298,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "complete-slice": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("complete-slice"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: false,
@@ -310,7 +319,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_LARGE,
     },
     "reassess-roadmap": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("reassess-roadmap"),
         knowledge: "scoped",
         memory: "critical-only",
         codebaseMap: false,
@@ -326,7 +335,7 @@ export const UNIT_MANIFESTS = {
     },
     // ─── Task-scoped ─────────────────────────────────────────────────────
     "execute-task": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("execute-task"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -341,7 +350,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_LARGE,
     },
     "reactive-execute": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("reactive-execute"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -357,7 +366,7 @@ export const UNIT_MANIFESTS = {
     },
     // ─── Ancillary units ─────────────────────────────────────────────────
     "run-uat": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("run-uat"),
         knowledge: "critical-only",
         memory: "critical-only",
         codebaseMap: false,
@@ -372,7 +381,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_SMALL,
     },
     "gate-evaluate": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("gate-evaluate"),
         knowledge: "critical-only",
         memory: "critical-only",
         codebaseMap: false,
@@ -389,7 +398,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_SMALL,
     },
     "rewrite-docs": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("rewrite-docs"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -404,7 +413,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "triage-captures": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("triage-captures"),
         knowledge: "scoped",
         memory: "prompt-relevant",
         codebaseMap: false,
@@ -419,7 +428,7 @@ export const UNIT_MANIFESTS = {
         maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
     },
     "quick-task": {
-        skills: { mode: "all" },
+        skills: skillPolicyForUnit("quick-task"),
         knowledge: "full",
         memory: "prompt-relevant",
         codebaseMap: true,
@@ -456,7 +465,7 @@ export const UNIT_MANIFESTS = {
     // 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,
@@ -473,7 +482,7 @@ export const UNIT_MANIFESTS = {
     // 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,
@@ -509,7 +518,7 @@ export const UNIT_MANIFESTS = {
     // 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/dist/resources/extensions/gsd/user-input-boundary.js

@@ -29,7 +29,7 @@ function extractTextFromMessage(msg) {
     }
     return parts.join("\n");
 }
-function lastAssistantText(messages) {
+export function lastAssistantText(messages) {
     if (!Array.isArray(messages))
         return "";
     for (let i = messages.length - 1; i >= 0; i--) {

package/dist/resources/extensions/gsd/vision-ask.js

@@ -0,0 +1,22 @@
+/**
+ * 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?",
+];
+export function chooseVisionAskVariant(pickIndex = randomInt) {
+    const index = pickIndex(VISION_ASK_VARIANTS.length);
+    return VISION_ASK_VARIANTS[index] ?? VISION_ASK_VARIANTS[0];
+}

package/dist/resources/extensions/gsd/visualizer-overlay.js

@@ -1,4 +1,4 @@
-import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { loadVisualizerData } from "./visualizer-data.js";
 import { renderProgressView, renderDepsView, renderMetricsView, renderTimelineView, renderAgentView, renderChangelogView, renderExportView, renderKnowledgeView, renderCapturesView, renderHealthView, } from "./visualizer-views.js";
 import { writeFileSync, mkdirSync } from "node:fs";
@@ -6,6 +6,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 = [
     "1 Progress",
@@ -440,51 +441,22 @@ 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);
         this.scrollOffsets[this.activeTab] = Math.min(this.scrollOffsets[this.activeTab], maxScroll);
         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;
     }
-    wrapInBox(inner, width, offset, visibleRows, totalLines) {
-        const th = this.theme;
-        const border = (s) => th.fg("borderAccent", s);
-        const innerWidth = width - 4;
-        const lines = [];
-        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() {
         this.cachedWidth = undefined;
         this.cachedLines = undefined;

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

@@ -203,7 +203,7 @@ function validateMilestoneId(milestoneId) {
  *   - emits worktree-created telemetry on successful entry
  *   - notifies the caller via `ctx.notify` for every user-visible outcome
  */
-export function _enterMilestoneCore(s, deps, milestoneId, ctx) {
+export function _enterMilestoneCore(s, deps, milestoneId, ctx, opts = {}) {
     if (!isValidMilestoneId(milestoneId)) {
         debugLog("WorktreeLifecycle", {
             action: "enterMilestone",
@@ -305,7 +305,7 @@ export function _enterMilestoneCore(s, deps, milestoneId, ctx) {
     // 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") {
             try {
@@ -841,7 +841,8 @@ export function mergeMilestoneStandalone(deps, mctx) {
             pushed: false,
         };
     }
-    const mode = getIsolationMode(originalBasePath || worktreeBasePath);
+    const mode = mctx.isolationModeOverride ??
+        getIsolationMode(originalBasePath || worktreeBasePath);
     debugLog("WorktreeLifecycle", {
         action: "mergeAndExit",
         milestoneId,
@@ -1137,6 +1138,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,
             });
@@ -1223,6 +1225,7 @@ export class WorktreeLifecycle {
             // Rebuild GitService after merge (branch HEAD changed)
             rebuildGitService(this.s, this.deps);
         }
+        this.s.strandedRecoveryIsolationMode = null;
         return result;
     }
     // ── Removed: _mergeWorktreeMode / _mergeBranchMode bodies ────────────
@@ -1345,6 +1348,24 @@ export class WorktreeLifecycle {
     resumeFromPausedSession(base, persistedWorktreePath) {
         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, base, ctx, opts) {
+        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/dist/resources/extensions/gsd/worktree-post-create-hook.js

@@ -0,0 +1,117 @@
+// Project/App: gsd-pi
+// File Purpose: Lightweight worktree post-create hook runner.
+import { execFileSync } from "node:child_process";
+import { existsSync, readFileSync, realpathSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join } from "node:path";
+import { parse as parseYaml } from "yaml";
+import { gsdHome } from "./gsd-home.js";
+import { gsdRoot } from "./paths.js";
+function readPreferencesObject(path) {
+    if (!existsSync(path))
+        return null;
+    const content = readFileSync(path, "utf-8");
+    try {
+        const startMarker = content.startsWith("---\r\n") ? "---\r\n" : "---\n";
+        if (content.startsWith(startMarker)) {
+            const searchStart = startMarker.length;
+            const endIdx = content.indexOf("\n---", searchStart);
+            if (endIdx === -1)
+                return null;
+            const parsed = parseYaml(content.slice(searchStart, endIdx).replace(/\r/g, ""));
+            return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+                ? parsed
+                : null;
+        }
+        const gitLines = [];
+        let inGitSection = false;
+        for (const rawLine of content.split("\n")) {
+            const line = rawLine.replace(/\r$/, "");
+            const heading = line.match(/^##\s+(.+)$/);
+            if (heading) {
+                inGitSection = heading[1].trim().toLowerCase().replace(/\s+/g, "_") === "git";
+                continue;
+            }
+            if (inGitSection && line.trim() && !line.trimStart().startsWith("#")) {
+                gitLines.push(line.replace(/^\s*-\s*/, ""));
+            }
+        }
+        if (gitLines.length === 0)
+            return null;
+        const parsed = parseYaml(gitLines.join("\n"));
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+            ? { git: parsed }
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+function extractHookPath(preferences) {
+    const git = preferences?.git;
+    if (!git || typeof git !== "object" || Array.isArray(git))
+        return null;
+    const hookPath = git.worktree_post_create;
+    return typeof hookPath === "string" && hookPath.trim() ? hookPath : null;
+}
+function resolveConfiguredHookPath(sourceDir) {
+    const paths = [
+        join(homedir(), ".pi", "agent", "gsd-preferences.md"),
+        join(gsdHome(), "preferences.md"),
+        join(gsdHome(), "PREFERENCES.md"),
+        join(gsdRoot(sourceDir), "preferences.md"),
+        join(gsdRoot(sourceDir), "PREFERENCES.md"),
+    ];
+    let hookPath = null;
+    for (const path of paths) {
+        hookPath = extractHookPath(readPreferencesObject(path)) ?? hookPath;
+    }
+    return hookPath;
+}
+/**
+ * Run the user-configured post-create hook script after worktree creation.
+ * The script receives SOURCE_DIR and WORKTREE_DIR as environment variables.
+ * Failure is non-fatal -- returns the error message or null on success.
+ *
+ * Reads git.worktree_post_create from effective global/project preferences
+ * unless hookPath is provided directly.
+ */
+export function runWorktreePostCreateHook(sourceDir, worktreeDir, hookPath) {
+    if (hookPath === undefined) {
+        hookPath = resolveConfiguredHookPath(sourceDir) ?? undefined;
+    }
+    if (!hookPath)
+        return null;
+    let resolved = isAbsolute(hookPath) ? hookPath : join(sourceDir, hookPath);
+    if (!existsSync(resolved)) {
+        return `Worktree post-create hook not found: ${resolved}`;
+    }
+    if (process.platform === "win32") {
+        try {
+            resolved = realpathSync.native(resolved);
+        }
+        catch {
+            // Keep the original path; the exec error below will include the failure.
+        }
+    }
+    try {
+        const needsShell = process.platform === "win32" && /\.(bat|cmd)$/i.test(resolved);
+        execFileSync(resolved, [], {
+            cwd: worktreeDir,
+            env: {
+                ...process.env,
+                SOURCE_DIR: sourceDir,
+                WORKTREE_DIR: worktreeDir,
+            },
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+            timeout: 30_000,
+            shell: needsShell,
+        });
+        return null;
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return `Worktree post-create hook failed: ${msg}`;
+    }
+}

package/dist/resources/extensions/gsd/worktree-state-projection.js

@@ -137,6 +137,32 @@ const ROOT_DIAGNOSTIC_FILES = [
     "completed-units.json",
     "metrics.json",
 ];
+/**
+ * Root-level .gsd/ projections copied from project root into worktrees for
+ * compatibility reads. Project root remains authoritative; copy-back still
+ * excludes these markdown projections.
+ */
+const ROOT_FORWARD_PROJECTION_FILES = [
+    "DECISIONS.md",
+    "REQUIREMENTS.md",
+    "PROJECT.md",
+    "KNOWLEDGE.md",
+    "OVERRIDES.md",
+    "QUEUE.md",
+    "completed-units.json",
+    "metrics.json",
+    "mcp.json",
+];
+function syncRootProjectionFilesToWorktree(prGsd, wtGsd) {
+    mkdirSync(wtGsd, { recursive: true });
+    for (const file of ROOT_FORWARD_PROJECTION_FILES) {
+        const src = join(prGsd, file);
+        const dst = join(wtGsd, file);
+        if (!existsSync(src) || existsSync(dst))
+            continue;
+        safeCopy(src, dst, { force: false });
+    }
+}
 // ─── Implementation cores ────────────────────────────────────────────────
 //
 // The `_*Impl` exports take raw paths so the deprecated path-string
@@ -164,6 +190,9 @@ export function _projectRootToWorktreeImpl(projectRoot, worktreePath_, milestone
     // Compare realpaths and skip when they resolve to the same physical path (#2184).
     if (isSamePath(prGsd, wtGsd))
         return;
+    // Root PROJECT/REQUIREMENTS/DECISIONS projections must be readable from a
+    // worktree-bound unit; the project root remains authoritative.
+    syncRootProjectionFilesToWorktree(prGsd, wtGsd);
     // Copy milestone directory from project root to worktree — additive only.
     // force:false prevents cpSync from overwriting existing worktree files.
     // Without this, worktree-local files (e.g. VALIDATION.md written

package/dist/resources/extensions/search-the-web/native-search.js

@@ -12,6 +12,45 @@ export const BRAVE_TOOL_NAMES = ["search-the-web", "search_and_read"];
 export const CUSTOM_SEARCH_TOOL_NAMES = ["search-the-web", "search_and_read", "google_search"];
 /** 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) {
+    if (!NATIVE_SERVER_TOOL_USE_TYPES.has(block?.type))
+        return undefined;
+    return typeof block.id === "string" ? block.id : undefined;
+}
+function nativeWebSearchResultId(block) {
+    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) {
+    const pendingToolUseIds = new Set();
+    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
  * `web_search_20250305` server tool. Anthropic-shaped transports NOT in this
@@ -30,6 +69,10 @@ const NATIVE_WEB_SEARCH_PROVIDERS = new Set([
     "anthropic-vertex",
     "vercel-ai-gateway",
 ]);
+function looksLikeAnthropicModelName(modelName) {
+    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
@@ -74,11 +117,10 @@ export function preferBraveSearch() {
  * 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) {
     for (const msg of messages) {
@@ -87,6 +129,9 @@ export function stripThinkingFromHistory(messages) {
         const content = msg.content;
         if (!Array.isArray(content))
             continue;
+        if (hasCompleteNativeServerToolReplay(content)) {
+            continue;
+        }
         msg.content = content.filter((block) => !THINKING_TYPES.has(block?.type));
     }
 }
@@ -152,6 +197,8 @@ export function registerNativeSearchHooks(pi) {
         // 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;
+        const payloadModelName = typeof payload.model === "string" ? payload.model : "";
+        const payloadLooksAnthropic = payloadModelName ? looksLikeAnthropicModelName(payloadModelName) : undefined;
         let isAnthropic;
         if (eventModel?.api || eventModel?.provider) {
             // Preferred path: gate on api shape + provider allowlist. Both fields
@@ -161,13 +208,15 @@ export function registerNativeSearchHooks(pi) {
             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;