gsd-pi 2.62.1 → 2.63.0-dev.351157b

package/dist/resources/extensions/mcp-client/auth.js

@@ -0,0 +1,101 @@
+/**
+ * MCP Client OAuth / Auth helpers
+ *
+ * Builds transport options (headers, OAuthClientProvider) from MCP server
+ * config entries so that HTTP transports can authenticate with remote
+ * servers (Sentry, Linear, etc.).
+ *
+ * Fixes #2160 — MCP HTTP transport lacked an OAuth auth provider.
+ */
+// ─── Env resolution ───────────────────────────────────────────────────────────
+/** Resolve `${VAR}` references in a string against `process.env`. */
+function resolveEnvValue(value) {
+    return value.replace(/\$\{([^}]+)\}/g, (_match, varName) => process.env[varName] ?? "");
+}
+function resolveHeaders(raw) {
+    const resolved = {};
+    for (const [key, value] of Object.entries(raw)) {
+        resolved[key] = typeof value === "string" ? resolveEnvValue(value) : value;
+    }
+    return resolved;
+}
+// ─── OAuth provider (minimal CLI-friendly implementation) ─────────────────────
+/**
+ * Creates a minimal `OAuthClientProvider` suitable for CLI / headless use.
+ *
+ * This provider supports:
+ *  - Pre-configured client credentials (client_id, optional client_secret)
+ *  - Token storage in memory (per-session)
+ *  - Scopes
+ *
+ * For full interactive OAuth flows (browser redirect), a richer provider would
+ * be needed, but for server-to-server and pre-authed scenarios this is
+ * sufficient.
+ */
+function createCliOAuthProvider(config) {
+    let storedTokens;
+    let storedCodeVerifier = "";
+    return {
+        get redirectUrl() {
+            return config.redirectUrl ?? "http://localhost:0/callback";
+        },
+        get clientMetadata() {
+            return {
+                redirect_uris: [config.redirectUrl ?? "http://localhost:0/callback"],
+                client_name: "gsd",
+                ...(config.scopes ? { scope: config.scopes.join(" ") } : {}),
+            };
+        },
+        clientInformation() {
+            return {
+                client_id: config.clientId,
+                ...(config.clientSecret ? { client_secret: config.clientSecret } : {}),
+            };
+        },
+        tokens() {
+            return storedTokens;
+        },
+        saveTokens(tokens) {
+            storedTokens = tokens;
+        },
+        redirectToAuthorization(authorizationUrl) {
+            // In a CLI context we can't open a browser automatically.
+            // Log the URL so the user can manually visit it.
+            // eslint-disable-next-line no-console
+            console.error(`[MCP OAuth] Authorization required. Visit:\n  ${authorizationUrl.toString()}`);
+        },
+        saveCodeVerifier(codeVerifier) {
+            storedCodeVerifier = codeVerifier;
+        },
+        codeVerifier() {
+            return storedCodeVerifier;
+        },
+    };
+}
+// ─── Public API ───────────────────────────────────────────────────────────────
+/**
+ * Build `StreamableHTTPClientTransportOptions` from an MCP server config's
+ * auth-related fields.
+ *
+ * Supports two auth strategies:
+ *  1. **`headers`** — static Authorization (or other) headers, with `${VAR}` env resolution.
+ *  2. **`oauth`**  — full OAuthClientProvider for servers that implement MCP OAuth.
+ *
+ * When both are provided, `oauth` takes precedence (the SDK's built-in OAuth
+ * flow handles token refresh automatically).
+ */
+export function buildHttpTransportOpts(authConfig) {
+    const opts = {};
+    // OAuth takes precedence
+    if (authConfig.oauth) {
+        opts.authProvider = createCliOAuthProvider(authConfig.oauth);
+        return opts;
+    }
+    // Static headers (with env var resolution)
+    if (authConfig.headers && Object.keys(authConfig.headers).length > 0) {
+        opts.requestInit = {
+            headers: resolveHeaders(authConfig.headers),
+        };
+    }
+    return opts;
+}

package/dist/resources/extensions/mcp-client/index.js

@@ -18,6 +18,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { readFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
+import { buildHttpTransportOpts } from "./auth.js";
 // ─── Connection Manager ───────────────────────────────────────────────────────
 const connections = new Map();
 let configCache = null;
@@ -51,6 +52,8 @@ function readConfigs() {
                     : hasUrl
                         ? "http"
                         : "unknown";
+                const hasHeaders = hasUrl && config.headers && typeof config.headers === "object";
+                const hasOAuth = hasUrl && config.oauth && typeof config.oauth === "object";
                 servers.push({
                     name,
                     transport,
@@ -63,6 +66,8 @@ function readConfigs() {
                         cwd: typeof config.cwd === "string" ? config.cwd : undefined,
                     }),
                     ...(hasUrl && { url: config.url }),
+                    headers: hasHeaders ? config.headers : undefined,
+                    oauth: hasOAuth ? config.oauth : undefined,
                 });
             }
         }
@@ -113,7 +118,11 @@ async function getOrConnect(name, signal) {
     }
     else if (config.transport === "http" && config.url) {
         const resolvedUrl = config.url.replace(/\$\{([^}]+)\}/g, (_, varName) => process.env[varName] ?? "");
-        transport = new StreamableHTTPClientTransport(new URL(resolvedUrl));
+        const httpOpts = buildHttpTransportOpts({
+            headers: config.headers,
+            oauth: config.oauth,
+        });
+        transport = new StreamableHTTPClientTransport(new URL(resolvedUrl), httpOpts);
     }
     else {
         throw new Error(`Server "${config.name}" has unsupported transport: ${config.transport}`);

package/dist/resources/extensions/ollama/index.js

@@ -17,16 +17,9 @@
  */
 import { importExtensionModule } from "@gsd/pi-coding-agent";
 import * as client from "./ollama-client.js";
-import { discoverModels, getOllamaOpenAIBaseUrl } from "./ollama-discovery.js";
+import { discoverModels } from "./ollama-discovery.js";
 import { registerOllamaCommands } from "./ollama-commands.js";
-/** Default compat settings for Ollama models via OpenAI-compat endpoint */
-const OLLAMA_COMPAT = {
-    supportsDeveloperRole: false,
-    supportsReasoningEffort: false,
-    supportsUsageInStreaming: false,
-    maxTokensField: "max_tokens",
-    supportsStore: false,
-};
+import { streamOllamaChat } from "./ollama-chat-provider.js";
 let toolsPromise = null;
 async function registerOllamaTools(pi) {
     if (!toolsPromise) {
@@ -58,11 +51,12 @@ async function probeAndRegister(pi) {
     const models = await discoverModels();
     if (models.length === 0)
         return true; // Running but no models pulled
-    const baseUrl = getOllamaOpenAIBaseUrl();
+    const baseUrl = client.getOllamaHost();
     pi.registerProvider("ollama", {
         authMode: "none",
         baseUrl,
-        api: "openai-completions",
+        api: "ollama-chat",
+        streamSimple: streamOllamaChat,
         isReady: () => true,
         models: models.map((m) => ({
             id: m.id,
@@ -72,7 +66,7 @@ async function probeAndRegister(pi) {
             cost: m.cost,
             contextWindow: m.contextWindow,
             maxTokens: m.maxTokens,
-            compat: OLLAMA_COMPAT,
+            providerOptions: (m.ollamaOptions ?? {}),
         })),
     });
     providerRegistered = true;

package/dist/resources/extensions/ollama/model-capabilities.js

@@ -4,50 +4,53 @@
  * Keys are matched as prefixes against the model name (before the colon/tag).
  * More specific entries should appear first.
  */
+// Note: ollamaOptions.num_ctx is set for known model families where the context
+// window is authoritative. For unknown/estimated models, num_ctx is NOT sent
+// to avoid OOM risk — Ollama uses its own safe default instead.
 const KNOWN_MODELS = [
     // ─── Reasoning models ───────────────────────────────────────────────
-    ["deepseek-r1", { contextWindow: 131072, reasoning: true }],
-    ["qwq", { contextWindow: 131072, reasoning: true }],
+    ["deepseek-r1", { contextWindow: 131072, reasoning: true, ollamaOptions: { num_ctx: 131072 } }],
+    ["qwq", { contextWindow: 131072, reasoning: true, ollamaOptions: { num_ctx: 131072 } }],
     // ─── Vision models ──────────────────────────────────────────────────
-    ["llava", { contextWindow: 4096, input: ["text", "image"] }],
-    ["bakllava", { contextWindow: 4096, input: ["text", "image"] }],
-    ["moondream", { contextWindow: 8192, input: ["text", "image"] }],
-    ["llama3.2-vision", { contextWindow: 131072, input: ["text", "image"] }],
-    ["minicpm-v", { contextWindow: 4096, input: ["text", "image"] }],
+    ["llava", { contextWindow: 4096, input: ["text", "image"], ollamaOptions: { num_ctx: 4096 } }],
+    ["bakllava", { contextWindow: 4096, input: ["text", "image"], ollamaOptions: { num_ctx: 4096 } }],
+    ["moondream", { contextWindow: 8192, input: ["text", "image"], ollamaOptions: { num_ctx: 8192 } }],
+    ["llama3.2-vision", { contextWindow: 131072, input: ["text", "image"], ollamaOptions: { num_ctx: 131072 } }],
+    ["minicpm-v", { contextWindow: 4096, input: ["text", "image"], ollamaOptions: { num_ctx: 4096 } }],
     // ─── Code models ────────────────────────────────────────────────────
-    ["codestral", { contextWindow: 262144, maxTokens: 32768 }],
-    ["qwen2.5-coder", { contextWindow: 131072, maxTokens: 32768 }],
-    ["deepseek-coder-v2", { contextWindow: 131072, maxTokens: 16384 }],
-    ["starcoder2", { contextWindow: 16384, maxTokens: 8192 }],
-    ["codegemma", { contextWindow: 8192, maxTokens: 8192 }],
-    ["codellama", { contextWindow: 16384, maxTokens: 8192 }],
-    ["devstral", { contextWindow: 131072, maxTokens: 32768 }],
+    ["codestral", { contextWindow: 262144, maxTokens: 32768, ollamaOptions: { num_ctx: 262144 } }],
+    ["qwen2.5-coder", { contextWindow: 131072, maxTokens: 32768, ollamaOptions: { num_ctx: 131072 } }],
+    ["deepseek-coder-v2", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["starcoder2", { contextWindow: 16384, maxTokens: 8192, ollamaOptions: { num_ctx: 16384 } }],
+    ["codegemma", { contextWindow: 8192, maxTokens: 8192, ollamaOptions: { num_ctx: 8192 } }],
+    ["codellama", { contextWindow: 16384, maxTokens: 8192, ollamaOptions: { num_ctx: 16384 } }],
+    ["devstral", { contextWindow: 131072, maxTokens: 32768, ollamaOptions: { num_ctx: 131072 } }],
     // ─── Llama family ───────────────────────────────────────────────────
-    ["llama3.3", { contextWindow: 131072, maxTokens: 16384 }],
-    ["llama3.2", { contextWindow: 131072, maxTokens: 16384 }],
-    ["llama3.1", { contextWindow: 131072, maxTokens: 16384 }],
-    ["llama3", { contextWindow: 8192, maxTokens: 8192 }],
-    ["llama2", { contextWindow: 4096, maxTokens: 4096 }],
+    ["llama3.3", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["llama3.2", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["llama3.1", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["llama3", { contextWindow: 8192, maxTokens: 8192, ollamaOptions: { num_ctx: 8192 } }],
+    ["llama2", { contextWindow: 4096, maxTokens: 4096, ollamaOptions: { num_ctx: 4096 } }],
     // ─── Qwen family ────────────────────────────────────────────────────
-    ["qwen3", { contextWindow: 131072, maxTokens: 32768 }],
-    ["qwen2.5", { contextWindow: 131072, maxTokens: 32768 }],
-    ["qwen2", { contextWindow: 131072, maxTokens: 32768 }],
+    ["qwen3", { contextWindow: 131072, maxTokens: 32768, ollamaOptions: { num_ctx: 131072 } }],
+    ["qwen2.5", { contextWindow: 131072, maxTokens: 32768, ollamaOptions: { num_ctx: 131072 } }],
+    ["qwen2", { contextWindow: 131072, maxTokens: 32768, ollamaOptions: { num_ctx: 131072 } }],
     // ─── Gemma family ───────────────────────────────────────────────────
-    ["gemma3", { contextWindow: 131072, maxTokens: 16384 }],
-    ["gemma2", { contextWindow: 8192, maxTokens: 8192 }],
+    ["gemma3", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["gemma2", { contextWindow: 8192, maxTokens: 8192, ollamaOptions: { num_ctx: 8192 } }],
     // ─── Mistral family ─────────────────────────────────────────────────
-    ["mistral-large", { contextWindow: 131072, maxTokens: 16384 }],
-    ["mistral-small", { contextWindow: 131072, maxTokens: 16384 }],
-    ["mistral-nemo", { contextWindow: 131072, maxTokens: 16384 }],
-    ["mistral", { contextWindow: 32768, maxTokens: 8192 }],
-    ["mixtral", { contextWindow: 32768, maxTokens: 8192 }],
+    ["mistral-large", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["mistral-small", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["mistral-nemo", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["mistral", { contextWindow: 32768, maxTokens: 8192, ollamaOptions: { num_ctx: 32768 } }],
+    ["mixtral", { contextWindow: 32768, maxTokens: 8192, ollamaOptions: { num_ctx: 32768 } }],
     // ─── Phi family ─────────────────────────────────────────────────────
-    ["phi4", { contextWindow: 16384, maxTokens: 16384 }],
-    ["phi3.5", { contextWindow: 131072, maxTokens: 16384 }],
-    ["phi3", { contextWindow: 131072, maxTokens: 4096 }],
+    ["phi4", { contextWindow: 16384, maxTokens: 16384, ollamaOptions: { num_ctx: 16384 } }],
+    ["phi3.5", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["phi3", { contextWindow: 131072, maxTokens: 4096, ollamaOptions: { num_ctx: 131072 } }],
     // ─── Command R ──────────────────────────────────────────────────────
-    ["command-r-plus", { contextWindow: 131072, maxTokens: 16384 }],
-    ["command-r", { contextWindow: 131072, maxTokens: 16384 }],
+    ["command-r-plus", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
+    ["command-r", { contextWindow: 131072, maxTokens: 16384, ollamaOptions: { num_ctx: 131072 } }],
 ];
 /**
  * Look up capabilities for a model by name.

package/dist/resources/extensions/ollama/ndjson-stream.js

@@ -0,0 +1,54 @@
+// GSD2 — Ollama Extension: NDJSON streaming parser
+/**
+ * Parses a streaming NDJSON (newline-delimited JSON) response body into
+ * typed objects. Used for Ollama's /api/chat and /api/pull endpoints.
+ *
+ * @param strict When true, malformed JSON lines throw instead of being skipped.
+ *   Use strict mode for inference streams where silent data loss is unacceptable.
+ *   Use permissive mode (default) for progress endpoints like /api/pull.
+ */
+export async function* parseNDJsonStream(body, signal, strict = false) {
+    const reader = body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+    try {
+        while (true) {
+            if (signal?.aborted)
+                break;
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            buffer += decoder.decode(value, { stream: true });
+            const lines = buffer.split("\n");
+            buffer = lines.pop() ?? "";
+            for (const line of lines) {
+                const trimmed = line.trim();
+                if (!trimmed)
+                    continue;
+                try {
+                    yield JSON.parse(trimmed);
+                }
+                catch (err) {
+                    if (strict) {
+                        throw new Error(`Malformed NDJSON line from Ollama: ${trimmed.slice(0, 200)}`);
+                    }
+                    // Permissive mode: skip malformed lines
+                }
+            }
+        }
+        // Flush remaining buffer (skip if aborted)
+        if (buffer.trim() && !signal?.aborted) {
+            try {
+                yield JSON.parse(buffer.trim());
+            }
+            catch (err) {
+                if (strict) {
+                    throw new Error(`Malformed NDJSON line from Ollama: ${buffer.trim().slice(0, 200)}`);
+                }
+            }
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+}