gsd-pi 2.11.0 → 2.13.0

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

@@ -185,3 +185,112 @@ export interface GSDState {
     tasks?: { done: number; total: number };
   };
 }
+
+// ─── Post-Unit Hook Types ─────────────────────────────────────────────────
+
+export interface PostUnitHookConfig {
+  /** Unique hook identifier — used in idempotency keys and logging. */
+  name: string;
+  /** Unit types that trigger this hook (e.g., ["execute-task"]). */
+  after: string[];
+  /** Prompt sent to the LLM session. Supports {milestoneId}, {sliceId}, {taskId} substitutions. */
+  prompt: string;
+  /** Max times this hook can fire for the same trigger unit. Default 1, max 10. */
+  max_cycles?: number;
+  /** Model override for hook sessions. */
+  model?: string;
+  /** Expected output file name (relative to task/slice dir). Used for idempotency — skip if exists. */
+  artifact?: string;
+  /** If this file is produced instead of artifact, re-run the trigger unit then re-run hooks. */
+  retry_on?: string;
+  /** Agent definition file to use. */
+  agent?: string;
+  /** Set false to disable without removing config. Default true. */
+  enabled?: boolean;
+}
+
+export interface HookExecutionState {
+  /** Hook name. */
+  hookName: string;
+  /** The unit type that triggered this hook. */
+  triggerUnitType: string;
+  /** The unit ID that triggered this hook. */
+  triggerUnitId: string;
+  /** Current cycle (1-based). */
+  cycle: number;
+  /** Whether the hook completed with a retry signal (retry_on artifact found). */
+  pendingRetry: boolean;
+}
+
+export interface HookDispatchResult {
+  /** Hook name for display. */
+  hookName: string;
+  /** The prompt to send. */
+  prompt: string;
+  /** Model override, if configured. */
+  model?: string;
+  /** Synthetic unit type, e.g. "hook/code-review". */
+  unitType: string;
+  /** The trigger unit's ID, reused for the hook. */
+  unitId: string;
+}
+
+// ─── Pre-Dispatch Hook Types ──────────────────────────────────────────────
+
+export interface PreDispatchHookConfig {
+  /** Unique hook identifier. */
+  name: string;
+  /** Unit types this hook intercepts before dispatch (e.g., ["execute-task"]). */
+  before: string[];
+  /** Action to take: "modify" mutates the prompt, "skip" skips the unit, "replace" swaps it. */
+  action: 'modify' | 'skip' | 'replace';
+  /** For "modify": text prepended to the unit prompt. Supports {milestoneId}, {sliceId}, {taskId}. */
+  prepend?: string;
+  /** For "modify": text appended to the unit prompt. Supports {milestoneId}, {sliceId}, {taskId}. */
+  append?: string;
+  /** For "replace": the replacement prompt. Supports {milestoneId}, {sliceId}, {taskId}. */
+  prompt?: string;
+  /** For "replace": override the unit type label. */
+  unit_type?: string;
+  /** For "skip": optional condition file — only skip if this file exists (relative to unit dir). */
+  skip_if?: string;
+  /** Model override when this hook fires. */
+  model?: string;
+  /** Set false to disable without removing config. Default true. */
+  enabled?: boolean;
+}
+
+export interface PreDispatchResult {
+  /** What happened: the unit proceeds with modifications, was skipped, or was replaced. */
+  action: 'proceed' | 'skip' | 'replace';
+  /** Modified/replacement prompt (for "proceed" and "replace"). */
+  prompt?: string;
+  /** Override unit type (for "replace"). */
+  unitType?: string;
+  /** Model override. */
+  model?: string;
+  /** Names of hooks that fired, for logging. */
+  firedHooks: string[];
+}
+
+// ─── Hook State Persistence Types ─────────────────────────────────────────
+
+export interface PersistedHookState {
+  /** Cycle counts keyed as "hookName/triggerUnitType/triggerUnitId". */
+  cycleCounts: Record<string, number>;
+  /** Timestamp of last state save. */
+  savedAt: string;
+}
+
+export interface HookStatusEntry {
+  /** Hook name. */
+  name: string;
+  /** Hook type: "post" or "pre". */
+  type: 'post' | 'pre';
+  /** Whether hook is enabled. */
+  enabled: boolean;
+  /** What unit types it targets. */
+  targets: string[];
+  /** Current cycle counts for active triggers. */
+  activeCycles: Record<string, number>;
+}

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

@@ -120,15 +120,17 @@ export function worktreeBranchName(name: string): string {
 /**
  * Create a new git worktree under .gsd/worktrees/<name>/ with branch worktree/<name>.
  * The branch is created from the current HEAD of the main branch.
+ *
+ * @param opts.branch — override the default `worktree/<name>` branch name
  */
-export function createWorktree(basePath: string, name: string): WorktreeInfo {
+export function createWorktree(basePath: string, name: string, opts: { branch?: string } = {}): WorktreeInfo {
   // Validate name: alphanumeric, hyphens, underscores only
   if (!/^[a-zA-Z0-9_-]+$/.test(name)) {
     throw new Error(`Invalid worktree name "${name}". Use only letters, numbers, hyphens, and underscores.`);
   }
 
   const wtPath = worktreePath(basePath, name);
-  const branch = worktreeBranchName(name);
+  const branch = opts.branch ?? worktreeBranchName(name);
 
   if (existsSync(wtPath)) {
     throw new Error(`Worktree "${name}" already exists at ${wtPath}`);
@@ -260,11 +262,11 @@ export function listWorktrees(basePath: string): WorktreeInfo[] {
 export function removeWorktree(
   basePath: string,
   name: string,
-  opts: { deleteBranch?: boolean; force?: boolean } = {},
+  opts: { deleteBranch?: boolean; force?: boolean; branch?: string } = {},
 ): void {
   const wtPath = worktreePath(basePath, name);
   const resolvedWtPath = existsSync(wtPath) ? realpathSync(wtPath) : wtPath;
-  const branch = worktreeBranchName(name);
+  const branch = opts.branch ?? worktreeBranchName(name);
   const { deleteBranch = true, force = false } = opts;
 
   // If we're inside the worktree, move out first — git can't remove an in-use directory

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

@@ -13,16 +13,18 @@ import type { AutocompleteItem } from '@gsd/pi-tui'
 import {
   getTavilyApiKey,
   getBraveApiKey,
+  getOllamaApiKey,
   getSearchProviderPreference,
   setSearchProviderPreference,
   resolveSearchProvider,
   type SearchProviderPreference,
 } from './provider.ts'
 
-const VALID_PREFERENCES: SearchProviderPreference[] = ['tavily', 'brave', 'auto']
+const VALID_PREFERENCES: SearchProviderPreference[] = ['tavily', 'brave', 'ollama', 'auto']
 
-function keyStatus(provider: 'tavily' | 'brave'): string {
+function keyStatus(provider: 'tavily' | 'brave' | 'ollama'): string {
   if (provider === 'tavily') return getTavilyApiKey() ? '✓' : '✗'
+  if (provider === 'ollama') return getOllamaApiKey() ? '✓' : '✗'
   return getBraveApiKey() ? '✓' : '✗'
 }
 
@@ -30,6 +32,7 @@ function buildSelectOptions(): string[] {
   return [
     `tavily (key: ${keyStatus('tavily')})`,
     `brave (key: ${keyStatus('brave')})`,
+    `ollama (key: ${keyStatus('ollama')})`,
     `auto`,
   ]
 }
@@ -37,12 +40,13 @@ function buildSelectOptions(): string[] {
 function parseSelectChoice(choice: string): SearchProviderPreference {
   if (choice.startsWith('tavily')) return 'tavily'
   if (choice.startsWith('brave')) return 'brave'
+  if (choice.startsWith('ollama')) return 'ollama'
   return 'auto'
 }
 
 export function registerSearchProviderCommand(pi: ExtensionAPI): void {
   pi.registerCommand('search-provider', {
-    description: 'Switch search provider (tavily, brave, auto)',
+    description: 'Switch search provider (tavily, brave, ollama, auto)',
 
     getArgumentCompletions(prefix: string): AutocompleteItem[] | null {
       const trimmed = prefix.trim().toLowerCase()
@@ -51,7 +55,7 @@ export function registerSearchProviderCommand(pi: ExtensionAPI): void {
         .map((p) => {
           let description: string
           if (p === 'auto') {
-            description = `Auto-select (tavily: ${keyStatus('tavily')}, brave: ${keyStatus('brave')})`
+            description = `Auto-select (tavily: ${keyStatus('tavily')}, brave: ${keyStatus('brave')}, ollama: ${keyStatus('ollama')})`
           } else {
             description = `key: ${keyStatus(p)}`
           }

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

@@ -105,16 +105,21 @@ export function registerNativeSearchHooks(pi: NativeSearchPI): { getIsAnthropic:
     const payload = event.payload as Record<string, unknown>;
     if (!payload) return;
 
-    // Detect Anthropic provider. Prefer the model_select flag when available,
-    // but fall back to checking the model name in the payload. model_select
-    // may not fire when the session restores with the same model already set
-    // (modelsAreEqual guard in the SDK suppresses the event). When model_select
-    // HAS fired and said "not Anthropic" (e.g. Copilot serving claude-*),
-    // respect that — don't override with model name heuristic.
-    const modelName = typeof payload.model === "string" ? payload.model : "";
-    const isAnthropic = modelSelectFired
-      ? isAnthropicProvider
-      : modelName.startsWith("claude-");
+    // Detect Anthropic provider. Use the model object from the event (most
+    // reliable — comes directly from the resolved Model), then fall back to
+    // the model_select flag, then to the model name heuristic (last resort).
+    // 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 } | undefined;
+    let isAnthropic: boolean;
+    if (eventModel?.provider) {
+      isAnthropic = eventModel.provider === "anthropic";
+    } else if (modelSelectFired) {
+      isAnthropic = isAnthropicProvider;
+    } else {
+      const modelName = typeof payload.model === "string" ? payload.model : "";
+      isAnthropic = modelName.startsWith("claude-");
+    }
     if (!isAnthropic) return;
 
     // Strip thinking blocks from history to avoid signature validation errors

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

@@ -18,10 +18,10 @@ import { join } from 'path'
 // where the relative import '../../../app-paths.ts' doesn't resolve.
 const authFilePath = join(homedir(), '.gsd', 'agent', 'auth.json')
 
-export type SearchProvider = 'tavily' | 'brave'
+export type SearchProvider = 'tavily' | 'brave' | 'ollama'
 export type SearchProviderPreference = SearchProvider | 'auto'
 
-const VALID_PREFERENCES = new Set<string>(['tavily', 'brave', 'auto'])
+const VALID_PREFERENCES = new Set<string>(['tavily', 'brave', 'ollama', 'auto'])
 const PREFERENCE_KEY = 'search_provider'
 
 /** Returns the Tavily API key from the environment, or empty string if not set. */
@@ -34,6 +34,11 @@ export function getBraveApiKey(): string {
   return process.env.BRAVE_API_KEY || ''
 }
 
+/** Returns the Ollama API key from the environment, or empty string if not set. */
+export function getOllamaApiKey(): string {
+  return process.env.OLLAMA_API_KEY || ''
+}
+
 /**
  * Read the user's search provider preference from auth.json.
  * Returns 'auto' if no preference is stored or the stored value is invalid.
@@ -78,9 +83,11 @@ export function setSearchProviderPreference(pref: SearchProviderPreference, auth
 export function resolveSearchProvider(overridePreference?: string): SearchProvider | null {
   const tavilyKey = getTavilyApiKey()
   const braveKey = getBraveApiKey()
+  const ollamaKey = getOllamaApiKey()
 
   const hasTavily = tavilyKey.length > 0
   const hasBrave = braveKey.length > 0
+  const hasOllama = ollamaKey.length > 0
 
   // Determine effective preference
   let pref: SearchProviderPreference
@@ -100,18 +107,28 @@ export function resolveSearchProvider(overridePreference?: string): SearchProvid
   if (pref === 'auto') {
     if (hasTavily) return 'tavily'
     if (hasBrave) return 'brave'
+    if (hasOllama) return 'ollama'
     return null
   }
 
   if (pref === 'tavily') {
     if (hasTavily) return 'tavily'
     if (hasBrave) return 'brave'
+    if (hasOllama) return 'ollama'
     return null
   }
 
   if (pref === 'brave') {
     if (hasBrave) return 'brave'
     if (hasTavily) return 'tavily'
+    if (hasOllama) return 'ollama'
+    return null
+  }
+
+  if (pref === 'ollama') {
+    if (hasOllama) return 'ollama'
+    if (hasTavily) return 'tavily'
+    if (hasBrave) return 'brave'
     return null
   }
 

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

@@ -17,6 +17,7 @@ import { LRUTTLCache } from "./cache.js";
 import { fetchSimple, HttpError } from "./http.js";
 import { extractDomain } from "./url-utils.js";
 import { formatPageContent, type FormatPageOptions } from "./format.js";
+import { getOllamaApiKey } from "./provider.js";
 
 // =============================================================================
 // Cache
@@ -173,6 +174,43 @@ async function fetchDirectFallback(
   return { content: text, title, contentType };
 }
 
+// =============================================================================
+// Ollama Web Fetch
+// =============================================================================
+
+interface OllamaWebFetchResponse {
+  title?: string;
+  content?: string;
+  links?: string[];
+}
+
+/**
+ * Fetch page content via Ollama web_fetch API.
+ * Returns content + metadata, or throws on failure.
+ */
+async function fetchViaOllama(
+  url: string,
+  signal?: AbortSignal,
+): Promise<{ content: string; title?: string }> {
+  const response = await fetchSimple("https://ollama.com/api/web_fetch", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": `Bearer ${getOllamaApiKey()}`,
+    },
+    body: JSON.stringify({ url }),
+    signal,
+    timeoutMs: 20_000,
+  });
+
+  const data: OllamaWebFetchResponse = await response.json();
+
+  const content = (data.content || "").trim();
+  const title = data.title?.trim() || undefined;
+
+  return { content, title };
+}
+
 // =============================================================================
 // Smart Truncation
 // =============================================================================
@@ -252,6 +290,30 @@ async function fetchOnePage(
     jinaError = err instanceof HttpError
       ? `Jina HTTP ${err.statusCode}`
       : (err as Error).message ?? String(err);
+
+    // Try Ollama web_fetch as intermediate fallback if API key is available
+    const ollamaKey = getOllamaApiKey();
+    if (ollamaKey) {
+      try {
+        const ollamaResult = await fetchViaOllama(url, options.signal);
+        if (ollamaResult.content && ollamaResult.content.length >= 50) {
+          pageContent = ollamaResult.content;
+          pageTitle = ollamaResult.title;
+          source = "direct";
+          return {
+            content: pageContent,
+            title: pageTitle,
+            source,
+            jinaError,
+            contentType,
+            originalChars: pageContent.length,
+          };
+        }
+      } catch {
+        // Ollama fetch failed too — fall through to direct
+      }
+    }
+
     source = "direct";
 
     const result = await fetchDirectFallback(url, options.signal);

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

@@ -27,7 +27,7 @@ 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";
+import { getTavilyApiKey, getOllamaApiKey, resolveSearchProvider } from "./provider.js";
 
 // =============================================================================
 // Types
@@ -79,7 +79,7 @@ interface LLMContextDetails {
   errorKind?: string;
   error?: string;
   retryAfterMs?: number;
-  provider?: 'tavily' | 'brave';
+  provider?: 'tavily' | 'brave' | 'ollama';
 }
 
 // =============================================================================
@@ -230,6 +230,57 @@ async function executeTavilyLLMContext(
   return { cached, latencyMs: timed.latencyMs, rateLimit: timed.rateLimit };
 }
 
+// =============================================================================
+// Ollama LLM Context Execution
+// =============================================================================
+
+interface OllamaWebSearchResult {
+  title: string;
+  url: string;
+  content: string;
+}
+
+interface OllamaWebSearchResponse {
+  results: OllamaWebSearchResult[];
+}
+
+/**
+ * Execute a search_and_read query against the Ollama web_search API.
+ *
+ * Uses the same web_search endpoint as tool-search, then applies
+ * budgetContent() for client-side token budgeting (similar to Tavily path).
+ */
+async function executeOllamaLLMContext(
+  params: { query: string; maxTokens: number; count: number; threshold: string },
+  signal?: AbortSignal,
+): Promise<{ cached: CachedLLMContext; latencyMs: number; rateLimit?: RateLimitInfo }> {
+  const scoreThreshold = THRESHOLD_TO_SCORE[params.threshold] ?? 0.5;
+
+  const timed = await fetchWithRetryTimed("https://ollama.com/api/web_search", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": `Bearer ${getOllamaApiKey()}`,
+    },
+    body: JSON.stringify({ query: params.query, max_results: params.count }),
+    signal,
+  }, 2);
+
+  const data: OllamaWebSearchResponse = await timed.response.json();
+
+  // Convert Ollama results to TavilyResult-compatible format for budgetContent
+  const tavilyLikeResults: TavilyResult[] = (data.results || []).map(r => ({
+    title: r.title || "(untitled)",
+    url: r.url,
+    content: r.content || "",
+    score: 1.0, // Ollama doesn't provide scores, assume all are relevant
+  }));
+
+  const cached = budgetContent(tavilyLikeResults, params.maxTokens, scoreThreshold);
+
+  return { cached, latencyMs: timed.latencyMs, rateLimit: timed.rateLimit };
+}
+
 // =============================================================================
 // Tool Registration
 // =============================================================================
@@ -295,7 +346,7 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
       const provider = resolveSearchProvider();
       if (!provider) {
         return {
-          content: [{ type: "text", text: "search_and_read unavailable: No search API key is set. Use secure_env_collect to set TAVILY_API_KEY or BRAVE_API_KEY." }],
+          content: [{ type: "text", text: "search_and_read unavailable: No search API key is set. Use secure_env_collect to set TAVILY_API_KEY, BRAVE_API_KEY, or OLLAMA_API_KEY." }],
           isError: true,
           details: { errorKind: "auth_error", error: "No search API key set" } satisfies Partial<LLMContextDetails>,
         };
@@ -358,6 +409,14 @@ export function registerLLMContextTool(pi: ExtensionAPI) {
           result = tavilyResult.cached;
           latencyMs = tavilyResult.latencyMs;
           rateLimit = tavilyResult.rateLimit;
+        } else if (provider === "ollama") {
+          const ollamaResult = await executeOllamaLLMContext(
+            { query: params.query, maxTokens, count, threshold },
+            signal,
+          );
+          result = ollamaResult.cached;
+          latencyMs = ollamaResult.latencyMs;
+          rateLimit = ollamaResult.rateLimit;
         } else {
           // ================================================================
           // BRAVE PATH (unchanged API logic)

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

@@ -20,7 +20,7 @@ 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 { getTavilyApiKey, getOllamaApiKey, resolveSearchProvider } from "./provider.js";
 import { normalizeTavilyResult, mapFreshnessToTavily, type TavilySearchResponse } from "./tavily.js";
 
 // =============================================================================
@@ -93,7 +93,7 @@ interface SearchDetails {
   errorKind?: string;
   error?: string;
   retryAfterMs?: number;
-  provider?: 'tavily' | 'brave';
+  provider?: 'tavily' | 'brave' | 'ollama';
 }
 
 // =============================================================================
@@ -245,6 +245,57 @@ async function executeTavilySearch(
   };
 }
 
+// =============================================================================
+// Ollama API execution
+// =============================================================================
+
+interface OllamaWebSearchResult {
+  title: string;
+  url: string;
+  content: string;
+}
+
+interface OllamaWebSearchResponse {
+  results: OllamaWebSearchResult[];
+}
+
+/**
+ * Execute a search against the Ollama web_search API.
+ * Returns a CachedSearchResult with normalized, deduplicated results.
+ */
+async function executeOllamaSearch(
+  params: { query: string; count: number },
+  signal?: AbortSignal
+): Promise<{ results: CachedSearchResult; latencyMs: number; rateLimit?: RateLimitInfo }> {
+  const timed = await fetchWithRetryTimed("https://ollama.com/api/web_search", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": `Bearer ${getOllamaApiKey()}`,
+    },
+    body: JSON.stringify({ query: params.query, max_results: params.count }),
+    signal,
+  }, 2);
+
+  const data: OllamaWebSearchResponse = await timed.response.json();
+  const normalized: SearchResultFormatted[] = (data.results || []).map(r => ({
+    title: r.title || "(untitled)",
+    url: r.url,
+    description: r.content || "",
+  }));
+  const deduplicated = deduplicateResults(normalized);
+
+  return {
+    results: {
+      results: deduplicated,
+      queryCorrected: false,
+      moreResultsAvailable: false,
+    },
+    latencyMs: timed.latencyMs,
+    rateLimit: timed.rateLimit,
+  };
+}
+
 // =============================================================================
 // Tool Registration
 // =============================================================================
@@ -300,7 +351,7 @@ export function registerSearchTool(pi: ExtensionAPI) {
       const provider = resolveSearchProvider();
       if (!provider) {
         return {
-          content: [{ type: "text", text: "Web search unavailable: No search API key is set. Use secure_env_collect to set TAVILY_API_KEY or BRAVE_API_KEY." }],
+          content: [{ type: "text", text: "Web search unavailable: No search API key is set. Use secure_env_collect to set TAVILY_API_KEY, BRAVE_API_KEY, or OLLAMA_API_KEY." }],
           isError: true,
           details: { errorKind: "auth_error", error: "No search API key set" } satisfies Partial<SearchDetails>,
         };
@@ -405,6 +456,14 @@ export function registerSearchTool(pi: ExtensionAPI) {
           searchResult = tavilyResult.results;
           latencyMs = tavilyResult.latencyMs;
           rateLimit = tavilyResult.rateLimit;
+        } else if (provider === "ollama") {
+          const ollamaResult = await executeOllamaSearch(
+            { query: params.query, count: 10 },
+            signal
+          );
+          searchResult = ollamaResult.results;
+          latencyMs = ollamaResult.latencyMs;
+          rateLimit = ollamaResult.rateLimit;
         } else {
           // ================================================================
           // BRAVE PATH (unchanged API logic)