gsd-pi 2.11.0 → 2.13.0

package/dist/cli.js

@@ -2,12 +2,27 @@ import { AuthStorage, DefaultResourceLoader, ModelRegistry, SettingsManager, Ses
 import { existsSync, readdirSync, renameSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { agentDir, sessionsDir, authFilePath } from './app-paths.js';
-import { initResources, buildResourceLoader } from './resource-loader.js';
+import { initResources, buildResourceLoader, getNewerManagedResourceVersion } from './resource-loader.js';
 import { ensureManagedTools } from './tool-bootstrap.js';
 import { loadStoredEnvKeys } from './wizard.js';
 import { getPiDefaultModelAndProvider, migratePiCredentials } from './pi-migration.js';
 import { shouldRunOnboarding, runOnboarding } from './onboarding.js';
 import { checkForUpdates } from './update-check.js';
+function exitIfManagedResourcesAreNewer(currentAgentDir) {
+    const currentVersion = process.env.GSD_VERSION || '0.0.0';
+    const managedVersion = getNewerManagedResourceVersion(currentAgentDir, currentVersion);
+    if (!managedVersion) {
+        return;
+    }
+    const yellow = '\x1b[33m';
+    const dim = '\x1b[2m';
+    const reset = '\x1b[0m';
+    const bold = '\x1b[1m';
+    process.stderr.write(`[gsd] ${yellow}Version mismatch detected${reset}\n` +
+        `[gsd] Synced resources are from ${bold}v${managedVersion}${reset}, but this \`gsd\` binary is ${dim}v${currentVersion}${reset}.\n` +
+        `[gsd] Run ${bold}npm install -g gsd-pi@latest${reset} or ${bold}gsd update${reset}, then try again.\n`);
+    process.exit(1);
+}
 function parseCliArgs(argv) {
     const flags = { extensions: [], messages: [] };
     const args = argv.slice(2); // skip node + script
@@ -199,6 +214,7 @@ if (isPrintMode) {
             appendSystemPrompt = cliFlags.appendSystemPrompt;
         }
     }
+    exitIfManagedResourcesAreNewer(agentDir);
     initResources(agentDir);
     const resourceLoader = new DefaultResourceLoader({
         agentDir,
@@ -272,6 +288,7 @@ if (existsSync(sessionsDir)) {
 const sessionManager = cliFlags.continue
     ? SessionManager.continueRecent(cwd, projectSessionsDir)
     : SessionManager.create(cwd, projectSessionsDir);
+exitIfManagedResourcesAreNewer(agentDir);
 initResources(agentDir);
 const resourceLoader = buildResourceLoader(agentDir);
 await resourceLoader.reload();

package/dist/onboarding.js

@@ -48,6 +48,7 @@ const LLM_PROVIDER_IDS = [
     'xai',
     'openrouter',
     'mistral',
+    'ollama-cloud',
     'custom-openai',
 ];
 /** API key prefix validation — loose checks to catch obvious mistakes */
@@ -61,6 +62,7 @@ const OTHER_PROVIDERS = [
     { value: 'xai', label: 'xAI (Grok)' },
     { value: 'openrouter', label: 'OpenRouter' },
     { value: 'mistral', label: 'Mistral' },
+    { value: 'ollama-cloud', label: 'Ollama Cloud' },
     { value: 'custom-openai', label: 'Custom (OpenAI-compatible)' },
 ];
 // ─── Dynamic imports ──────────────────────────────────────────────────────────
@@ -755,6 +757,7 @@ export function loadStoredEnvKeys(authStorage) {
         ['slack_bot', 'SLACK_BOT_TOKEN'],
         ['discord_bot', 'DISCORD_BOT_TOKEN'],
         ['groq', 'GROQ_API_KEY'],
+        ['ollama-cloud', 'OLLAMA_API_KEY'],
         ['custom-openai', 'CUSTOM_OPENAI_API_KEY'],
     ];
     for (const [provider, envVar] of providers) {

package/dist/resource-loader.d.ts

@@ -1,5 +1,7 @@
 import { DefaultResourceLoader } from '@gsd/pi-coding-agent';
 export declare function discoverExtensionEntryPaths(extensionsDir: string): string[];
+export declare function readManagedResourceVersion(agentDir: string): string | null;
+export declare function getNewerManagedResourceVersion(agentDir: string, currentVersion: string): string | null;
 /**
  * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
  *

package/dist/resource-loader.js

@@ -1,8 +1,9 @@
 import { DefaultResourceLoader } from '@gsd/pi-coding-agent';
 import { homedir } from 'node:os';
-import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { compareSemver } from './update-check.js';
 // Resolve resources directory — prefer dist/resources/ (stable, set at build time)
 // over src/resources/ (live working tree, changes with git branch).
 //
@@ -16,6 +17,7 @@ const distResources = join(packageRoot, 'dist', 'resources');
 const srcResources = join(packageRoot, 'src', 'resources');
 const resourcesDir = existsSync(distResources) ? distResources : srcResources;
 const bundledExtensionsDir = join(resourcesDir, 'extensions');
+const resourceVersionManifestName = 'managed-resources.json';
 function isExtensionFile(name) {
     return name.endsWith('.ts') || name.endsWith('.js');
 }
@@ -70,6 +72,38 @@ function getExtensionKey(entryPath, extensionsDir) {
     const relPath = relative(extensionsDir, entryPath);
     return relPath.split(/[\\/]/)[0];
 }
+function getManagedResourceManifestPath(agentDir) {
+    return join(agentDir, resourceVersionManifestName);
+}
+function getBundledGsdVersion() {
+    try {
+        const pkg = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf-8'));
+        return typeof pkg?.version === 'string' ? pkg.version : '0.0.0';
+    }
+    catch {
+        return process.env.GSD_VERSION || '0.0.0';
+    }
+}
+function writeManagedResourceManifest(agentDir) {
+    const manifest = { gsdVersion: getBundledGsdVersion() };
+    writeFileSync(getManagedResourceManifestPath(agentDir), JSON.stringify(manifest));
+}
+export function readManagedResourceVersion(agentDir) {
+    try {
+        const manifest = JSON.parse(readFileSync(getManagedResourceManifestPath(agentDir), 'utf-8'));
+        return typeof manifest?.gsdVersion === 'string' ? manifest.gsdVersion : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function getNewerManagedResourceVersion(agentDir, currentVersion) {
+    const managedVersion = readManagedResourceVersion(agentDir);
+    if (!managedVersion) {
+        return null;
+    }
+    return compareSemver(managedVersion, currentVersion) > 0 ? managedVersion : null;
+}
 /**
  * Syncs all bundled resources to agentDir (~/.gsd/agent/) on every launch.
  *
@@ -101,6 +135,7 @@ export function initResources(agentDir) {
     if (existsSync(srcSkills)) {
         cpSync(srcSkills, destSkills, { recursive: true, force: true });
     }
+    writeManagedResourceManifest(agentDir);
 }
 /**
  * Constructs a DefaultResourceLoader that loads extensions from both

package/dist/resources/extensions/bg-shell/index.ts

@@ -574,6 +574,7 @@ interface StartOptions {
 	type?: ProcessType;
 	readyPattern?: string;
 	readyPort?: number;
+	readyTimeout?: number;
 	group?: string;
 	env?: Record<string, string>;
 }
@@ -689,7 +690,7 @@ function startProcess(opts: StartOptions): BgProcess {
 
 	// Port probing for server-type processes
 	if (bg.readyPort) {
-		startPortProbing(bg, bg.readyPort);
+		startPortProbing(bg, bg.readyPort, opts.readyTimeout);
 	}
 
 	// Shell sessions are ready immediately after spawn
@@ -707,9 +708,17 @@ function startProcess(opts: StartOptions): BgProcess {
 
 // ── Port Probing Loop ──────────────────────────────────────────────────────
 
-function startPortProbing(bg: BgProcess, port: number): void {
+function startPortProbing(bg: BgProcess, port: number, customTimeout?: number): void {
+	const timeout = customTimeout || DEFAULT_READY_TIMEOUT;
 	const interval = setInterval(async () => {
-		if (!bg.alive || bg.status !== "starting") {
+		if (!bg.alive) {
+			clearInterval(interval);
+			const stderrLines = bg.output.filter(l => l.stream === "stderr").slice(-10).map(l => l.line);
+			const detail = `Process exited (code ${bg.exitCode}) before port ${port} opened${stderrLines.length > 0 ? ` — ${stderrLines.join("; ").slice(0, 200)}` : ""}`;
+			addEvent(bg, { type: "port_timeout", detail, data: { port, exitCode: bg.exitCode } });
+			return;
+		}
+		if (bg.status !== "starting") {
 			clearInterval(interval);
 			return;
 		}
@@ -722,8 +731,18 @@ function startPortProbing(bg: BgProcess, port: number): void {
 		}
 	}, READY_POLL_INTERVAL);
 
-	// Stop probing after timeout
-	setTimeout(() => clearInterval(interval), DEFAULT_READY_TIMEOUT);
+	// Stop probing after timeout — transition to error state so the process
+	// doesn't stay in "starting" forever (fixes #428)
+	setTimeout(() => {
+		clearInterval(interval);
+		if (bg.alive && bg.status === "starting") {
+			const stderrLines = bg.output.filter(l => l.stream === "stderr").slice(-10).map(l => l.line);
+			const detail = `Port ${port} not open after ${timeout}ms${stderrLines.length > 0 ? ` — ${stderrLines.join("; ").slice(0, 200)}` : ""}`;
+			bg.status = "error";
+			addEvent(bg, { type: "port_timeout", detail, data: { port, timeout } });
+			pushAlert(bg, `Port ${port} readiness timeout after ${timeout / 1000}s`);
+		}
+	}, timeout);
 }
 
 // ── Process Kill ───────────────────────────────────────────────────────────
@@ -864,9 +883,19 @@ async function waitForReady(bg: BgProcess, timeout: number, signal?: AbortSignal
 			return { ready: false, detail: "Cancelled" };
 		}
 		if (!bg.alive) {
+			const stderrLines = bg.output.filter(l => l.stream === "stderr").slice(-5).map(l => l.line);
+			const stderrContext = stderrLines.length > 0 ? `\nstderr:\n${stderrLines.join("\n").slice(0, 500)}` : "";
+			return {
+				ready: false,
+				detail: `Process exited before becoming ready (code ${bg.exitCode})${bg.recentErrors.length > 0 ? ` — ${bg.recentErrors.slice(-1)[0]}` : ""}${stderrContext}`,
+			};
+		}
+		if (bg.status === "error") {
+			const stderrLines = bg.output.filter(l => l.stream === "stderr").slice(-5).map(l => l.line);
+			const stderrContext = stderrLines.length > 0 ? `\nstderr:\n${stderrLines.join("\n").slice(0, 500)}` : "";
 			return {
 				ready: false,
-				detail: `Process exited before becoming ready (code ${bg.exitCode})${bg.recentErrors.length > 0 ? ` — ${bg.recentErrors.slice(-1)[0]}` : ""}`,
+				detail: `Process entered error state${bg.readyPort ? ` (port ${bg.readyPort} never opened)` : ""}${stderrContext}`,
 			};
 		}
 		if (bg.status === "ready") {
@@ -887,7 +916,9 @@ async function waitForReady(bg: BgProcess, timeout: number, signal?: AbortSignal
 		}
 	}
 
-	return { ready: false, detail: `Timed out after ${timeout}ms waiting for ready signal` };
+	const stderrLines = bg.output.filter(l => l.stream === "stderr").slice(-5).map(l => l.line);
+	const stderrContext = stderrLines.length > 0 ? `\nstderr:\n${stderrLines.join("\n").slice(0, 500)}` : "";
+	return { ready: false, detail: `Timed out after ${timeout}ms waiting for ready signal${stderrContext}` };
 }
 
 // ── Query Shell Environment ────────────────────────────────────────────────
@@ -1234,6 +1265,15 @@ export default function (pi: ExtensionAPI) {
 		cleanupAll();
 	});
 
+	// Register signal handlers to clean up bg processes on unexpected exit (fixes #428)
+	// This prevents orphan processes and helps the parent restore terminal state
+	const signalCleanup = () => {
+		cleanupAll();
+	};
+	process.on("SIGTERM", signalCleanup);
+	process.on("SIGINT", signalCleanup);
+	process.on("beforeExit", signalCleanup);
+
 	// ── Compaction Awareness: Survive Context Resets ───────────────────
 
 	/** Build a compact state summary of all alive processes for context re-injection */
@@ -1424,6 +1464,9 @@ export default function (pi: ExtensionAPI) {
 			ready_port: Type.Optional(
 				Type.Number({ description: "Port to probe for readiness (for start). When open, process is considered ready." }),
 			),
+			ready_timeout: Type.Optional(
+				Type.Number({ description: "Max milliseconds to wait for ready_port/ready_pattern before marking as error (default: 30000)" }),
+			),
 			group: Type.Optional(
 				Type.String({ description: "Group name for related processes (for start, group_status)" }),
 			),
@@ -1449,6 +1492,7 @@ export default function (pi: ExtensionAPI) {
 						type: params.type as ProcessType | undefined,
 						readyPattern: params.ready_pattern,
 						readyPort: params.ready_port,
+						readyTimeout: params.ready_timeout,
 						group: params.group,
 					});