gsd-pi 2.8.2 → 2.9.0

package/src/resources/extensions/gsd/tests/worktree.test.ts

@@ -5,17 +5,21 @@ import { execSync } from "node:child_process";
 
 import {
   autoCommitCurrentBranch,
+  captureIntegrationBranch,
   detectWorktreeName,
   ensureSliceBranch,
   getActiveSliceBranch,
   getCurrentBranch,
+  getMainBranch,
   getSliceBranchName,
   isOnSliceBranch,
   mergeSliceToMain,
   parseSliceBranch,
+  setActiveMilestoneId,
   SLICE_BRANCH_RE,
   switchToMain,
 } from "../worktree.ts";
+import { readIntegrationBranch } from "../git-service.ts";
 import { deriveState } from "../state.ts";
 import { indexWorkspace } from "../workspace-index.ts";
 
@@ -252,6 +256,354 @@ async function main(): Promise<void> {
 
   rmSync(base3, { recursive: true, force: true });
 
+  // ═══════════════════════════════════════════════════════════════════════
+  // Integration branch — facade-level tests
+  //
+  // These exercise the same codepath auto.ts uses:
+  //   captureIntegrationBranch() → setActiveMilestoneId() → getMainBranch()
+  //   → switchToMain() → mergeSliceToMain()
+  // ═══════════════════════════════════════════════════════════════════════
+
+  // ── captureIntegrationBranch on a feature branch ──────────────────────
+
+  console.log("\n=== captureIntegrationBranch: records current branch ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-facade-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    run("git checkout -b f-123-thing", repo);
+    assertEq(getCurrentBranch(repo), "f-123-thing", "on feature branch");
+
+    captureIntegrationBranch(repo, "M001");
+    assertEq(readIntegrationBranch(repo, "M001"), "f-123-thing",
+      "captureIntegrationBranch records the current branch");
+
+    // Verify it was committed (not just written to disk)
+    const logOut = run("git log --oneline -1", repo);
+    assert(logOut.includes("integration branch"), "metadata committed to git");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── captureIntegrationBranch is idempotent on same lineage ──────────
+
+  console.log("\n=== captureIntegrationBranch: idempotent ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-idem-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+    run("git checkout -b f-first", repo);
+
+    captureIntegrationBranch(repo, "M001");
+    setActiveMilestoneId(repo, "M001");
+    assertEq(readIntegrationBranch(repo, "M001"), "f-first",
+      "first capture records f-first");
+
+    // Capture again on the same branch (simulates restart/resume) — should NOT overwrite
+    captureIntegrationBranch(repo, "M001");
+    assertEq(readIntegrationBranch(repo, "M001"), "f-first",
+      "second capture on same branch does not overwrite");
+
+    // After creating a slice branch (which inherits the metadata commit),
+    // capture should still be idempotent
+    ensureSliceBranch(repo, "M001", "S01");
+    // Now on gsd/M001/S01 — capture should be no-op (slice branch rejected)
+    captureIntegrationBranch(repo, "M001");
+    switchToMain(repo);
+    assertEq(readIntegrationBranch(repo, "M001"), "f-first",
+      "capture from slice branch is no-op, original preserved");
+    assertEq(getCurrentBranch(repo), "f-first",
+      "switchToMain returns to feature branch, confirming integration branch works");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── captureIntegrationBranch skips slice branches ─────────────────────
+
+  console.log("\n=== captureIntegrationBranch: skips slice branches ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-skip-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    run("git checkout -b gsd/M001/S01", repo);
+    captureIntegrationBranch(repo, "M001");
+
+    assertEq(readIntegrationBranch(repo, "M001"), null,
+      "capture from slice branch is a no-op");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── setActiveMilestoneId makes getMainBranch return integration branch ─
+
+  console.log("\n=== setActiveMilestoneId + getMainBranch ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-main-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    run("git checkout -b my-feature", repo);
+    captureIntegrationBranch(repo, "M001");
+
+    // Without milestone set, getMainBranch returns "main"
+    setActiveMilestoneId(repo, null);
+    assertEq(getMainBranch(repo), "main",
+      "getMainBranch returns main without milestone set");
+
+    // With milestone set, getMainBranch returns feature branch
+    setActiveMilestoneId(repo, "M001");
+    assertEq(getMainBranch(repo), "my-feature",
+      "getMainBranch returns integration branch with milestone set");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── Full multi-slice lifecycle on a feature branch ────────────────────
+  //
+  // Simulates what auto.ts does: start on feature branch, capture it,
+  // create S01, work, merge S01 back to feature branch, then S02 branches
+  // from feature branch (not main), works, merges to feature branch.
+  // Main stays untouched throughout.
+
+  console.log("\n=== Multi-slice lifecycle on feature branch ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-multi-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "base\n");
+    run("git add -A && git commit -m init", repo);
+
+    // User creates feature branch
+    run("git checkout -b feature/big-change", repo);
+    writeFileSync(join(repo, "setup.txt"), "feature setup\n");
+    run("git add -A && git commit -m 'feat: initial setup'", repo);
+
+    // auto.ts startup: capture + set milestone
+    captureIntegrationBranch(repo, "M001");
+    setActiveMilestoneId(repo, "M001");
+
+    assertEq(getMainBranch(repo), "feature/big-change",
+      "multi: getMainBranch returns feature branch");
+
+    // ── S01 lifecycle ──────────────────────────────────────────────────
+    ensureSliceBranch(repo, "M001", "S01");
+    assertEq(getCurrentBranch(repo), "gsd/M001/S01", "multi: on S01");
+
+    // Verify S01 has feature branch content
+    assert(existsSync(join(repo, "setup.txt")),
+      "multi: S01 inherited feature branch content");
+
+    writeFileSync(join(repo, "s01-work.txt"), "s01 output\n");
+    run("git add -A && git commit -m 'feat(S01): work'", repo);
+
+    switchToMain(repo);
+    assertEq(getCurrentBranch(repo), "feature/big-change",
+      "multi: switchToMain goes to feature branch");
+
+    const s01merge = mergeSliceToMain(repo, "M001", "S01", "First slice");
+    assertEq(getCurrentBranch(repo), "feature/big-change",
+      "multi: after S01 merge, on feature branch");
+    assert(existsSync(join(repo, "s01-work.txt")),
+      "multi: S01 work merged to feature branch");
+    assert(s01merge.deletedBranch, "multi: S01 branch deleted");
+
+    // Main should NOT have S01 work
+    run("git stash", repo); // stash any .gsd changes
+    run("git checkout main", repo);
+    assert(!existsSync(join(repo, "s01-work.txt")),
+      "multi: main does NOT have S01 work");
+    run("git checkout feature/big-change", repo);
+    run("git stash pop || true", repo);
+
+    // ── S02 lifecycle ──────────────────────────────────────────────────
+    // S02 should branch from feature/big-change which now has S01's work
+    ensureSliceBranch(repo, "M001", "S02");
+    assertEq(getCurrentBranch(repo), "gsd/M001/S02", "multi: on S02");
+
+    // S02 should have S01's merged output (branched from feature branch)
+    assert(existsSync(join(repo, "s01-work.txt")),
+      "multi: S02 has S01 output (inherited via feature branch)");
+
+    writeFileSync(join(repo, "s02-work.txt"), "s02 output\n");
+    run("git add -A && git commit -m 'feat(S02): work'", repo);
+
+    switchToMain(repo);
+    assertEq(getCurrentBranch(repo), "feature/big-change",
+      "multi: switchToMain goes to feature branch after S02");
+
+    const s02merge = mergeSliceToMain(repo, "M001", "S02", "Second slice");
+    assertEq(getCurrentBranch(repo), "feature/big-change",
+      "multi: after S02 merge, on feature branch");
+    assert(existsSync(join(repo, "s02-work.txt")),
+      "multi: S02 work merged to feature branch");
+    assert(existsSync(join(repo, "s01-work.txt")),
+      "multi: S01 work still on feature branch after S02 merge");
+    assert(s02merge.deletedBranch, "multi: S02 branch deleted");
+
+    // Final check: main still untouched
+    run("git stash", repo);
+    run("git checkout main", repo);
+    assert(!existsSync(join(repo, "s01-work.txt")),
+      "multi: main still lacks S01 work at end");
+    assert(!existsSync(join(repo, "s02-work.txt")),
+      "multi: main still lacks S02 work at end");
+    assertEq(readFileSync(join(repo, "README.md"), "utf-8").trim(), "base",
+      "multi: main README unchanged");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── Resume scenario: milestone ID re-set after restart ────────────────
+  //
+  // Simulates crash + restart: the cached GitServiceImpl is lost, but the
+  // metadata file persists on disk. Re-calling setActiveMilestoneId should
+  // restore integration branch resolution.
+
+  console.log("\n=== Resume: milestone ID re-set restores integration branch ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-resume-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    run("git checkout -b my-feature", repo);
+    captureIntegrationBranch(repo, "M001");
+    setActiveMilestoneId(repo, "M001");
+
+    // Create a slice and do some work
+    ensureSliceBranch(repo, "M001", "S01");
+    writeFileSync(join(repo, "work.txt"), "wip\n");
+    run("git add -A && git commit -m 'wip'", repo);
+
+    // Simulate "restart" — clear milestone ID (fresh service instance)
+    setActiveMilestoneId(repo, null);
+    assertEq(getMainBranch(repo), "main",
+      "resume: getMainBranch returns main when milestone cleared");
+
+    // Re-set milestone ID (what auto.ts does on resume)
+    setActiveMilestoneId(repo, "M001");
+    assertEq(getMainBranch(repo), "my-feature",
+      "resume: getMainBranch returns feature branch after re-set");
+
+    // Full lifecycle still works after resume
+    switchToMain(repo);
+    assertEq(getCurrentBranch(repo), "my-feature",
+      "resume: switchToMain goes to feature branch after re-set");
+
+    const result = mergeSliceToMain(repo, "M001", "S01", "Resume slice");
+    assertEq(getCurrentBranch(repo), "my-feature",
+      "resume: merge lands on feature branch after re-set");
+    assert(existsSync(join(repo, "work.txt")),
+      "resume: merged work exists on feature branch");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── Backward compat: no metadata file, plain main workflow ────────────
+  //
+  // Simulates existing projects that were created before this feature.
+  // No metadata file exists, milestone ID is set — getMainBranch should
+  // still return "main" and the entire slice lifecycle works unchanged.
+
+  console.log("\n=== Backward compat: no metadata, main workflow ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-compat-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    // Set milestone but DON'T capture integration branch (simulates old project)
+    setActiveMilestoneId(repo, "M001");
+
+    assertEq(getMainBranch(repo), "main",
+      "compat: getMainBranch returns main without metadata");
+
+    // Full lifecycle on main still works
+    ensureSliceBranch(repo, "M001", "S01");
+    writeFileSync(join(repo, "feature.txt"), "new\n");
+    run("git add -A && git commit -m 'feat: work'", repo);
+
+    switchToMain(repo);
+    assertEq(getCurrentBranch(repo), "main",
+      "compat: switchToMain goes to main");
+
+    const result = mergeSliceToMain(repo, "M001", "S01", "Compat slice");
+    assertEq(getCurrentBranch(repo), "main",
+      "compat: merge lands on main");
+    assert(existsSync(join(repo, "feature.txt")),
+      "compat: merged work exists on main");
+    assert(result.deletedBranch, "compat: branch deleted");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
+  // ── ensureSliceBranch from another slice with integration branch ──────
+  //
+  // When on gsd/M001/S01 and creating S02, the code falls back to
+  // getMainBranch() (not the current slice). With integration branch set,
+  // S02 should branch from the feature branch.
+
+  console.log("\n=== ensureSliceBranch: S02 from S01 uses integration branch as base ===");
+
+  {
+    const repo = mkdtempSync(join(tmpdir(), "gsd-integ-chain-"));
+    run("git init -b main", repo);
+    run("git config user.name 'Pi Test'", repo);
+    run("git config user.email 'pi@example.com'", repo);
+    writeFileSync(join(repo, "README.md"), "init\n");
+    run("git add -A && git commit -m init", repo);
+
+    run("git checkout -b dev-branch", repo);
+    writeFileSync(join(repo, "dev-only.txt"), "from dev\n");
+    run("git add -A && git commit -m 'dev setup'", repo);
+
+    captureIntegrationBranch(repo, "M001");
+    setActiveMilestoneId(repo, "M001");
+
+    // Create S01 (from dev-branch)
+    ensureSliceBranch(repo, "M001", "S01");
+    writeFileSync(join(repo, "s01.txt"), "s01\n");
+    run("git add -A && git commit -m 's01 work'", repo);
+
+    // While on S01, create S02 — should fall back to integration branch
+    ensureSliceBranch(repo, "M001", "S02");
+    assertEq(getCurrentBranch(repo), "gsd/M001/S02", "chain: on S02");
+
+    // S02 should be based on dev-branch (the integration branch)
+    assert(existsSync(join(repo, "dev-only.txt")),
+      "chain: S02 has dev-branch content");
+    assert(!existsSync(join(repo, "s01.txt")),
+      "chain: S02 does NOT have S01 content (not chained from S01)");
+
+    rmSync(repo, { recursive: true, force: true });
+  }
+
   rmSync(base, { recursive: true, force: true });
   console.log(`\nResults: ${passed} passed, ${failed} failed`);
   if (failed > 0) process.exit(1);

package/src/resources/extensions/gsd/types.ts

@@ -176,6 +176,7 @@ export interface GSDState {
   blockers: string[];
   nextAction: string;
   activeBranch?: string;
+  activeWorkspace?: string;
   registry: MilestoneRegistryEntry[];
   requirements?: RequirementCounts;
   progress?: {

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

@@ -17,7 +17,7 @@
 
 import { sep } from "node:path";
 
-import { GitServiceImpl } from "./git-service.ts";
+import { GitServiceImpl, writeIntegrationBranch } from "./git-service.ts";
 import { loadEffectiveGSDPreferences } from "./preferences.ts";
 
 // Re-export MergeSliceResult from the canonical source (D014 — type-only re-export)
@@ -43,6 +43,25 @@ function getService(basePath: string): GitServiceImpl {
   return cachedService;
 }
 
+/**
+ * Set the active milestone ID on the cached GitServiceImpl.
+ * This enables integration branch resolution in getMainBranch().
+ */
+export function setActiveMilestoneId(basePath: string, milestoneId: string | null): void {
+  getService(basePath).setMilestoneId(milestoneId);
+}
+
+/**
+ * Record the current branch as the integration branch for a milestone.
+ * Called once when auto-mode starts — captures where slice branches should
+ * merge back to. No-op if already recorded or if on a GSD slice branch.
+ */
+export function captureIntegrationBranch(basePath: string, milestoneId: string): void {
+  const svc = getService(basePath);
+  const current = svc.getCurrentBranch();
+  writeIntegrationBranch(basePath, milestoneId, current);
+}
+
 // ─── Pure Utility Functions (unchanged) ────────────────────────────────────
 
 /**

package/src/resources/extensions/mac-tools/index.ts

@@ -123,7 +123,7 @@ function execMacAgent(command: string, params?: Record<string, any>): MacAgentRe
 			stdio: ["pipe", "pipe", "pipe"],
 			maxBuffer: 5 * 1024 * 1024, // 5MB — needed for retina screenshot base64 payloads
 		});
-		stdout = typeof result === "string" ? result : result.toString();
+		stdout = typeof result === "string" ? result : String(result);
 	} catch (err: any) {
 		stderr = err.stderr?.toString() || "";
 		const isTimeout = err.killed || err.signal === "SIGTERM";

package/src/resources/extensions/search-the-web/command-search-provider.ts

@@ -81,7 +81,7 @@ export function registerSearchProviderCommand(pi: ExtensionAPI): void {
           return
         }
 
-        chosen = parseSelectChoice(result)
+        chosen = parseSelectChoice(Array.isArray(result) ? result[0] : result)
       }
 
       setSearchProviderPreference(chosen)

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

@@ -3,7 +3,7 @@
  * and LLM context responses.
  */
 
-import { extractDomain } from "./url-utils";
+import { extractDomain } from "./url-utils.js";
 
 export interface SearchResultFormatted {
   title: string;

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

@@ -45,11 +45,11 @@
  */
 
 import type { ExtensionAPI } from "@gsd/pi-coding-agent";
-import { registerSearchTool } from "./tool-search";
-import { registerFetchPageTool } from "./tool-fetch-page";
-import { registerLLMContextTool } from "./tool-llm-context";
-import { registerSearchProviderCommand } from "./command-search-provider.ts";
-import { registerNativeSearchHooks } from "./native-search";
+import { registerSearchTool } from "./tool-search.js";
+import { registerFetchPageTool } from "./tool-fetch-page.js";
+import { registerLLMContextTool } from "./tool-llm-context.js";
+import { registerSearchProviderCommand } from "./command-search-provider.js";
+import { registerNativeSearchHooks } from "./native-search.js";
 
 export default function (pi: ExtensionAPI) {
   registerSearchTool(pi);

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

@@ -99,12 +99,11 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     const payload = event.payload as Record<string, unknown>;
     if (!payload) return;
 
-    // Detect Anthropic by model name prefix (works even before model_select fires)
-    const model = payload.model as string | undefined;
-    if (!model || !model.startsWith("claude")) return;
-
-    // Keep provider tracking in sync
-    isAnthropicProvider = true;
+    // Only inject native web search for confirmed Anthropic provider.
+    // model_select sets isAnthropicProvider via the provider field.
+    // Model name prefix is NOT sufficient — other providers (GitHub Copilot,
+    // AWS Bedrock, etc.) serve claude-* models through non-Anthropic APIs.
+    if (!isAnthropicProvider) return;
 
     // Strip thinking blocks from history to avoid signature validation errors
     // caused by the SDK dropping server_tool_use/web_search_tool_result blocks.

package/src/resources/extensions/search-the-web/tool-fetch-page.ts

@@ -13,10 +13,10 @@ import { truncateHead, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES } from "@gsd/pi-codi
 import { Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
 
-import { LRUTTLCache } from "./cache";
-import { fetchSimple, HttpError } from "./http";
-import { extractDomain } from "./url-utils";
-import { formatPageContent, type FormatPageOptions } from "./format";
+import { LRUTTLCache } from "./cache.js";
+import { fetchSimple, HttpError } from "./http.js";
+import { extractDomain } from "./url-utils.js";
+import { formatPageContent, type FormatPageOptions } from "./format.js";
 
 // =============================================================================
 // Cache
@@ -336,7 +336,7 @@ export function registerFetchPageTool(pi: ExtensionAPI) {
 
     async execute(toolCallId, params, signal, onUpdate, ctx) {
       if (signal?.aborted) {
-        return { content: [{ type: "text", text: "Fetch cancelled." }] };
+        return { content: [{ type: "text", text: "Fetch cancelled." }], details: undefined as unknown };
       }
 
       const maxChars = params.maxChars ?? 8000;
@@ -392,7 +392,7 @@ export function registerFetchPageTool(pi: ExtensionAPI) {
       }
 
       const domain = extractDomain(url);
-      onUpdate?.({ content: [{ type: "text", text: `Fetching ${domain}...` }] });
+      onUpdate?.({ content: [{ type: "text", text: `Fetching ${domain}...` }], details: undefined as unknown });
 
       // ------------------------------------------------------------------
       // Fetch page content
@@ -439,7 +439,7 @@ export function registerFetchPageTool(pi: ExtensionAPI) {
       const finalTruncation = truncateHead(output, { maxLines: DEFAULT_MAX_LINES, maxBytes: DEFAULT_MAX_BYTES });
       let content = finalTruncation.content;
       if (finalTruncation.truncated) {
-        const tempFile = await pi.writeTempFile(output, { prefix: "fetch-page-" });
+        const tempFile = await (pi as any).writeTempFile(output, { prefix: "fetch-page-" });
         content += `\n\n[Truncated to fit context. Full content: ${tempFile}]`;
       }
 

package/src/resources/extensions/search-the-web/tool-llm-context.ts

@@ -21,13 +21,13 @@ import { Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { StringEnum } from "@gsd/pi-ai";
 
-import { LRUTTLCache } from "./cache";
-import { fetchWithRetryTimed, HttpError, classifyError, type RateLimitInfo } from "./http";
-import { normalizeQuery, extractDomain } from "./url-utils";
-import { formatLLMContext, type LLMContextSnippet, type LLMContextSource } from "./format";
-import type { TavilyResult, TavilySearchResponse } from "./tavily";
-import { publishedDateToAge } from "./tavily";
-import { getTavilyApiKey, resolveSearchProvider } from "./provider";
+import { LRUTTLCache } from "./cache.js";
+import { fetchWithRetryTimed, HttpError, classifyError, type RateLimitInfo } from "./http.js";
+import { normalizeQuery, extractDomain } from "./url-utils.js";
+import { formatLLMContext, type LLMContextSnippet, type LLMContextSource } from "./format.js";
+import type { TavilyResult, TavilySearchResponse } from "./tavily.js";
+import { publishedDateToAge } from "./tavily.js";
+import { getTavilyApiKey, resolveSearchProvider } from "./provider.js";
 
 // =============================================================================
 // Types
@@ -286,7 +286,7 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
 
     async execute(toolCallId, params, signal, onUpdate, ctx) {
       if (signal?.aborted) {
-        return { content: [{ type: "text", text: "Search cancelled." }] };
+        return { content: [{ type: "text", text: "Search cancelled." }], details: undefined as unknown };
       }
 
       // ------------------------------------------------------------------
@@ -321,7 +321,7 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
         const truncation = truncateHead(output, { maxLines: DEFAULT_MAX_LINES, maxBytes: DEFAULT_MAX_BYTES });
         let content = truncation.content;
         if (truncation.truncated) {
-          const tempFile = await pi.writeTempFile(output, { prefix: "llm-context-" });
+          const tempFile = await (pi as any).writeTempFile(output, { prefix: "llm-context-" });
           content += `\n\n[Truncated. Full content: ${tempFile}]`;
         }
 
@@ -340,7 +340,7 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
         return { content: [{ type: "text", text: content }], details };
       }
 
-      onUpdate?.({ content: [{ type: "text", text: `Searching & reading about "${params.query}"...` }] });
+      onUpdate?.({ content: [{ type: "text", text: `Searching & reading about "${params.query}"...` }], details: undefined as unknown });
 
       try {
         // ------------------------------------------------------------------
@@ -483,7 +483,7 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
         let content = truncation.content;
 
         if (truncation.truncated) {
-          const tempFile = await pi.writeTempFile(output, { prefix: "llm-context-" });
+          const tempFile = await (pi as any).writeTempFile(output, { prefix: "llm-context-" });
           content += `\n\n[Truncated. Full content: ${tempFile}]`;
         }
 

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

@@ -16,12 +16,12 @@ import { Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { StringEnum } from "@gsd/pi-ai";
 
-import { LRUTTLCache } from "./cache";
-import { fetchWithRetryTimed, fetchWithRetry, classifyError, type RateLimitInfo } from "./http";
-import { normalizeQuery, toDedupeKey, detectFreshness } from "./url-utils";
-import { formatSearchResults, type SearchResultFormatted, type FormatSearchOptions } from "./format";
-import { getTavilyApiKey, resolveSearchProvider } from "./provider";
-import { normalizeTavilyResult, mapFreshnessToTavily, type TavilySearchResponse } from "./tavily";
+import { LRUTTLCache } from "./cache.js";
+import { fetchWithRetryTimed, fetchWithRetry, classifyError, type RateLimitInfo } from "./http.js";
+import { normalizeQuery, toDedupeKey, detectFreshness } from "./url-utils.js";
+import { formatSearchResults, type SearchResultFormatted, type FormatSearchOptions } from "./format.js";
+import { getTavilyApiKey, resolveSearchProvider } from "./provider.js";
+import { normalizeTavilyResult, mapFreshnessToTavily, type TavilySearchResponse } from "./tavily.js";
 
 // =============================================================================
 // Types
@@ -291,7 +291,7 @@ export function registerSearchTool(pi: ExtensionAPI) {
 
     async execute(toolCallId, params, signal, onUpdate, ctx) {
       if (signal?.aborted) {
-        return { content: [{ type: "text", text: "Search cancelled." }] };
+        return { content: [{ type: "text", text: "Search cancelled." }], details: undefined as unknown };
       }
 
       // ------------------------------------------------------------------
@@ -365,7 +365,7 @@ export function registerSearchTool(pi: ExtensionAPI) {
         const truncation = truncateHead(output, { maxLines: DEFAULT_MAX_LINES, maxBytes: DEFAULT_MAX_BYTES });
         let content = truncation.content;
         if (truncation.truncated) {
-          const tempFile = await pi.writeTempFile(output, { prefix: "web-search-" });
+          const tempFile = await (pi as any).writeTempFile(output, { prefix: "web-search-" });
           content += `\n\n[Truncated: ${truncation.outputLines}/${truncation.totalLines} lines (${formatSize(truncation.outputBytes)}/${formatSize(truncation.totalBytes)}). Full results: ${tempFile}]`;
         }
 
@@ -387,7 +387,7 @@ export function registerSearchTool(pi: ExtensionAPI) {
         return { content: [{ type: "text", text: content }], details };
       }
 
-      onUpdate?.({ content: [{ type: "text", text: `Searching for "${params.query}"...` }] });
+      onUpdate?.({ content: [{ type: "text", text: `Searching for "${params.query}"...` }], details: undefined as unknown });
 
       try {
         // ------------------------------------------------------------------
@@ -484,7 +484,7 @@ export function registerSearchTool(pi: ExtensionAPI) {
         let content = truncation.content;
 
         if (truncation.truncated) {
-          const tempFile = await pi.writeTempFile(output, { prefix: "web-search-" });
+          const tempFile = await (pi as any).writeTempFile(output, { prefix: "web-search-" });
           content += `\n\n[Truncated: ${truncation.outputLines}/${truncation.totalLines} lines (${formatSize(truncation.outputBytes)}/${formatSize(truncation.totalBytes)}). Full results: ${tempFile}]`;
         }
 

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

@@ -105,7 +105,7 @@ export interface WrapUpOptions {
 // ─── Constants ────────────────────────────────────────────────────────────────
 
 const OTHER_OPTION_LABEL = "None of the above";
-const OTHER_OPTION_DESCRIPTION = "Optionally, add details in notes below.";
+const OTHER_OPTION_DESCRIPTION = "Press TAB to add optional notes.";
 
 // ─── Wrap-up screen ───────────────────────────────────────────────────────────
 
@@ -593,7 +593,7 @@ export async function showInterviewRound(
 				hints.push("tab to add notes");
 				hints.push(isLast && allAnswered() ? "enter to review" : "enter to next");
 			} else {
-				if (st.committedIndex !== null || !isMultiQuestion) hints.push("tab to add notes");
+				hints.push("tab to add notes");
 				if (isMultiQuestion) hints.push("←/→ navigate");
 				hints.push(isLast && allAnswered() ? "enter to review" : "enter to next");
 			}