gsd-pi 2.24.0 → 2.26.0

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

@@ -14,10 +14,11 @@
 
 import { sep } from "node:path";
 
-import { GitServiceImpl, writeIntegrationBranch } from "./git-service.js";
+import { GitServiceImpl, writeIntegrationBranch, type TaskCommitContext } from "./git-service.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 
 export { MergeConflictError } from "./git-service.js";
+export type { TaskCommitContext } from "./git-service.js";
 
 // ─── Lazy GitServiceImpl Cache ─────────────────────────────────────────────
 
@@ -162,12 +163,18 @@ export function getCurrentBranch(basePath: string): string {
 
 /**
  * Auto-commit any dirty files in the current working tree.
+ *
+ * When `taskContext` is provided, generates a meaningful conventional commit
+ * message from the task summary (one-liner, inferred type, key files).
+ * Falls back to a generic `chore()` message for non-task commits.
+ *
  * Returns the commit message used, or null if already clean.
  */
 export function autoCommitCurrentBranch(
   basePath: string, unitType: string, unitId: string,
+  taskContext?: TaskCommitContext,
 ): string | null {
-  return getService(basePath).autoCommit(unitType, unitId);
+  return getService(basePath).autoCommit(unitType, unitId, [], taskContext);
 }
 
 

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

@@ -14,6 +14,11 @@ 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"]);
 
+/** When true, skip native web search injection and keep Brave/custom tools active on Anthropic. */
+export function preferBraveSearch(): boolean {
+  return process.env.PREFER_BRAVE_SEARCH === "1" || process.env.PREFER_BRAVE_SEARCH === "true";
+}
+
 /** Minimal interface matching the subset of ExtensionAPI we use */
 export interface NativeSearchPI {
   on(event: string, handler: (...args: any[]) => any): void;
@@ -71,9 +76,9 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
 
     const hasBrave = !!process.env.BRAVE_API_KEY;
 
-    // When Anthropic: disable all custom search tools — native web_search is
-    // server-side and more reliable. Custom tools cause confusion and failures.
-    if (isAnthropicProvider) {
+    // When Anthropic (and not preferring Brave): disable custom search tools —
+    // native web_search is server-side and more reliable.
+    if (isAnthropicProvider && !preferBraveSearch()) {
       const active = pi.getActiveTools();
       pi.setActiveTools(
         active.filter((t: string) => !CUSTOM_SEARCH_TOOL_NAMES.includes(t))
@@ -90,8 +95,10 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     }
 
     // Show provider-aware diagnostics on first selection or provider change
-    if (isAnthropicProvider && !wasAnthropic && event.source !== "restore") {
+    if (isAnthropicProvider && !preferBraveSearch() && !wasAnthropic && event.source !== "restore") {
       ctx.ui.notify("Native Anthropic web search active", "info");
+    } else if (isAnthropicProvider && preferBraveSearch() && !wasAnthropic && event.source !== "restore") {
+      ctx.ui.notify("Brave search active (PREFER_BRAVE_SEARCH)", "info");
     } else if (!isAnthropicProvider && !hasBrave) {
       ctx.ui.notify(
         "Web search: Set BRAVE_API_KEY or use an Anthropic model for built-in search",
@@ -129,6 +136,9 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
       stripThinkingFromHistory(messages);
     }
 
+    // When preferring Brave, skip native search injection entirely
+    if (preferBraveSearch()) return;
+
     if (!Array.isArray(payload.tools)) payload.tools = [];
 
     let tools = payload.tools as Array<Record<string, unknown>>;
@@ -136,7 +146,7 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     // Don't double-inject if already present
     if (tools.some((t) => t.type === "web_search_20250305")) return;
 
-    // Always remove custom search tool definitions from Anthropic requests.
+    // Remove custom search tool definitions from Anthropic requests.
     // Native web_search is server-side and more reliable — keeping both confuses
     // the model and causes it to pick custom tools which can fail with network errors.
     tools = tools.filter(
@@ -147,6 +157,10 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     tools.push({
       type: "web_search_20250305",
       name: "web_search",
+      // Cap server-side searches per response to prevent the model from
+      // looping on web_search without synthesizing results (#817).
+      // 5 searches is generous — most queries need 1-2.
+      max_uses: 5,
     });
 
     return payload;

package/src/resources/extensions/shared/path-display.ts

@@ -0,0 +1,19 @@
+/**
+ * Cross-platform path display for LLM-visible text.
+ *
+ * Paths injected into prompts, tool results, or extension messages must use
+ * forward slashes. Windows backslash paths cause bash failures when the model
+ * copies them into shell commands — bash interprets backslashes as escape chars.
+ *
+ * Use this ONLY for paths entering text the LLM or shell sees.
+ * Filesystem operations (fs.readFile, path.join, spawn cwd) handle native
+ * separators correctly and should NOT be normalized.
+ */
+
+/**
+ * Convert a filesystem path to forward-slash form for display in LLM text.
+ * No-op on Unix. On Windows converts `C:\Users\name` to `C:/Users/name`.
+ */
+export function toPosixPath(fsPath: string): string {
+  return fsPath.replaceAll("\\", "/");
+}