@oh-my-pi/pi-coding-agent 15.5.4 → 15.5.7

package/src/lib/xai-http.ts

@@ -0,0 +1,124 @@
+// Ported from NousResearch/hermes-agent (MIT) — tools/xai_http.py.
+
+import { getBundledModels } from "@oh-my-pi/pi-ai";
+import { $env } from "@oh-my-pi/pi-utils";
+import type { ModelRegistry } from "../config/model-registry";
+
+const DEFAULT_BASE_URL = "https://api.x.ai/v1";
+
+interface XAICredentials {
+	provider: "xai-oauth" | "xai";
+	apiKey: string;
+	baseURL: string;
+}
+
+export function ohMyPiXAIUserAgent(): string {
+	return "oh-my-pi/xai";
+}
+
+type XAIProvider = "xai-oauth" | "xai";
+
+/**
+ * Resolve the HTTP base URL for an xAI tool call.
+ *
+ * Precedence:
+ *   1. `model.baseUrl` from the registry IF the user pinned a per-model
+ *      override — i.e. `merged.baseUrl` differs from the seeded/bundled
+ *      default for the (provider, id) pair. Mirrors the chat path's per-model
+ *      contract (`openai-responses.ts: model.baseUrl`).
+ *   2. `ModelRegistry.getProviderBaseUrl(provider)` — provider-level override
+ *      (e.g. `providers.xai-oauth.baseUrl` from models.yml). Reached when the
+ *      modelId does not appear in the registry under this provider, which
+ *      happens for tool-only ids like `grok-imagine-image` that
+ *      `applyXAIOAuthCuration` filters out via `XAI_NON_CHAT_PREFIXES`.
+ *      Without this leg, a registry-configured proxy is silently bypassed for
+ *      image/TTS traffic.
+ *   3. `XAI_BASE_URL` env var (legacy global override, preserved).
+ *   4. `DEFAULT_BASE_URL = "https://api.x.ai/v1"`.
+ *
+ * The override gate at step 1 uses `bundled?.baseUrl ?? DEFAULT_BASE_URL` as
+ * the canonical default sentinel. For xai (which has bundled entries) this
+ * compares against the bundled value; for xai-oauth (no bundled entries —
+ * models.json carries no xai-oauth records when the seed is absent, the
+ * picker is seeded statically from `xaiOAuthModelManagerOptions` with
+ * `baseUrl: DEFAULT_BASE_URL`) the sentinel falls back to DEFAULT_BASE_URL
+ * so the env leg remains reachable. Without that fallback, every xai-oauth
+ * model id forces `!bundled === true` and short-circuits XAI_BASE_URL
+ * silently. Lookup is scoped to (provider, id); matching by id alone would
+ * let xai-oauth entries hijack a xai tool call (or vice versa) when the
+ * same model id ships under both descriptors.
+ */
+function resolveXAIBaseURL(modelRegistry: ModelRegistry, provider: XAIProvider, modelId: string | undefined): string {
+	if (modelId) {
+		const merged = modelRegistry.getAll().find(m => m.id === modelId && m.provider === provider);
+		if (merged?.baseUrl) {
+			const bundled = getBundledModels(provider as Parameters<typeof getBundledModels>[0]).find(
+				m => m.id === modelId,
+			);
+			const providerDefault = bundled?.baseUrl ?? DEFAULT_BASE_URL;
+			if (merged.baseUrl !== providerDefault) {
+				return merged.baseUrl.replace(/\/$/, "");
+			}
+		}
+	}
+	const providerBaseUrl = modelRegistry.getProviderBaseUrl(provider);
+	if (providerBaseUrl) {
+		const normalized = providerBaseUrl.replace(/\/$/, "");
+		if (normalized !== DEFAULT_BASE_URL) return normalized;
+	}
+	return ($env.XAI_BASE_URL || DEFAULT_BASE_URL).replace(/\/$/, "");
+}
+
+/**
+ * Resolve xAI credentials for HTTP tool calls.
+ *
+ * Credential priority:
+ *   1. xai-oauth — only when a *dedicated* xai-oauth source exists. Composed
+ *      of two checks against the registry layer:
+ *        a. `authStorage.hasNonEnvCredential("xai-oauth")` covers stored
+ *           credentials (OAuth or api_key), runtime overrides (CLI
+ *           `--api-key` for xai-oauth), config overrides (models.yml
+ *           `providers.xai-oauth.apiKey`), and fallback resolvers.
+ *        b. `$env.XAI_OAUTH_TOKEN` covers the xai-oauth-specific env var.
+ *      `XAI_API_KEY` is intentionally NOT a signal here, even though the
+ *      env-fallback map (`stream.ts: "xai-oauth"`) lets xai-oauth borrow it
+ *      as a back-compat convenience: the borrow lets API-key-only setups
+ *      satisfy the xai-oauth branch and then resolve baseUrl under
+ *      xai-oauth instead of xai, silently bypassing `providers.xai.baseUrl`
+ *      overrides for image/TTS traffic. The gate routes the borrow case to
+ *      step 2 while preserving every dedicated xai-oauth path.
+ *   2. xai (plain API key). Delegates to ModelRegistry.getApiKeyForProvider
+ *      which runs AuthStorage.getApiKey's full cascade: runtime override →
+ *      models.yml config override → stored api_key credential → OAuth
+ *      resolution → XAI_API_KEY env var → custom fallback resolver.
+ *
+ * baseURL: see `resolveXAIBaseURL` above. Resolved AFTER the credential
+ * decision so the scoped (provider, id) lookup is unambiguous. `modelId`
+ * is optional; probes / tool-availability checks pass `undefined` and fall
+ * through to env/default.
+ *
+ * Returns null when neither credential is available. Caller is responsible
+ * for surfacing an actionable error message in that case.
+ */
+export async function resolveXAIHttpCredentials(
+	modelRegistry: ModelRegistry,
+	modelId?: string,
+): Promise<XAICredentials | null> {
+	const hasDedicatedXaiOAuth =
+		modelRegistry.authStorage.hasNonEnvCredential("xai-oauth") || Boolean($env.XAI_OAUTH_TOKEN);
+	if (hasDedicatedXaiOAuth) {
+		const oauthKey = await modelRegistry.getApiKeyForProvider("xai-oauth");
+		if (oauthKey) {
+			const baseURL = resolveXAIBaseURL(modelRegistry, "xai-oauth", modelId);
+			return { provider: "xai-oauth", apiKey: oauthKey, baseURL };
+		}
+	}
+
+	const apiKey = await modelRegistry.getApiKeyForProvider("xai");
+	if (apiKey) {
+		const baseURL = resolveXAIBaseURL(modelRegistry, "xai", modelId);
+		return { provider: "xai", apiKey, baseURL };
+	}
+
+	return null;
+}

package/src/main.ts

@@ -9,6 +9,7 @@ import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
+import { keepaliveWhile } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import {
 	$env,
@@ -315,7 +316,7 @@ async function runInteractiveMode(
 	}
 
 	while (true) {
-		const input = await mode.getUserInput();
+		const input = await keepaliveWhile(mode.getUserInput());
 		await submitInteractiveInput(mode, session, input);
 	}
 }

package/src/modes/controllers/selector-controller.ts

@@ -29,7 +29,12 @@ import {
 import type { InteractiveModeContext } from "../../modes/types";
 import { type SessionInfo, SessionManager } from "../../session/session-manager";
 import { FileSessionStorage } from "../../session/session-storage";
-import { isSearchProviderPreference, setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
+import {
+	isImageProviderPreference,
+	isSearchProviderPreference,
+	setPreferredImageProvider,
+	setPreferredSearchProvider,
+} from "../../tools";
 import { setSessionTerminalTitle } from "../../utils/title-generator";
 import { AgentDashboard } from "../components/agent-dashboard";
 import { AssistantMessageComponent } from "../components/assistant-message";
@@ -374,7 +379,7 @@ export class SelectorController {
 				}
 				break;
 			case "providers.image":
-				if (value === "auto" || value === "openai" || value === "gemini" || value === "openrouter") {
+				if (isImageProviderPreference(value)) {
 					setPreferredImageProvider(value);
 				}
 				break;

package/src/modes/interactive-mode.ts

@@ -1012,7 +1012,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	async #getPlanFilePath(): Promise<string> {
-		return "local://PLAN.md";
+		return this.session.getPlanReferencePath() || "local://PLAN.md";
 	}
 
 	#resolvePlanFilePath(planFilePath: string): string {

package/src/modes/rpc/rpc-client.ts

@@ -3,6 +3,8 @@
  *
  * Spawns the agent in RPC mode and provides a typed API for all operations.
  */
+
+import { isPromise } from "node:util/types";
 import type { AgentEvent, AgentMessage, AgentToolResult, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
 import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
@@ -790,7 +792,7 @@ export class RpcClient {
 		const stdin = this.#process.stdin as import("bun").FileSink;
 		stdin.write(`${JSON.stringify(frame)}\n`);
 		const flushResult = stdin.flush();
-		if (flushResult instanceof Promise) {
+		if (isPromise(flushResult)) {
 			flushResult.catch((err: Error) => {
 				onError?.(err);
 			});

package/src/prompts/tools/find.md

@@ -5,17 +5,18 @@ Finds files and directories using fast pattern matching that works with any code
 - Pass multiple targets as **separate array elements** (`paths: ["a", "b"]`), NEVER as a single comma-joined string (`paths: ["a,b"]` is rejected)
 - `gitignore` defaults to `true` and hides files matched by `.gitignore`. Set `gitignore: false` to find `.env*`, `*.log`, freshly-created build outputs, or anything else your repo ignores
 - `hidden` defaults to `true`; combine with `gitignore: false` to surface dotfiles that are also gitignored
+- `limit` is clamped to 1-200 (default 200). Narrow the pattern instead of raising the limit
 - `timeout` is in seconds (default 5, clamped to 0.5–60). On timeout, find returns whatever partial matches it has collected with `truncated: true` and a notice — increase `timeout` or narrow the pattern instead of retrying blindly
 - You SHOULD perform multiple searches in parallel when potentially useful
 </instruction>
 
 <output>
-Matching file and directory paths sorted by modification time (most recent first). Directories are suffixed with `/`. Truncated at 1000 entries or 50KB (configurable via `limit`).
+Matching file and directory paths sorted by modification time (most recent first), grouped by directory to reduce token usage. Each group starts with `# <dir>/` followed by basenames (one per line); directory entries get a trailing `/`. Root-level entries have no header. Truncated at 200 entries or 50KB.
 </output>
 
 <examples>
 # Find files
-`{"paths": ["src/**/*.ts"], "limit": 1000}`
+`{"paths": ["src/**/*.ts"]}`
 # Multiple targets — separate array elements
 `{"paths": ["src/**/*.ts", "test/**/*.ts"]}`
 # Find gitignored files like .env

package/src/sdk.ts

@@ -129,6 +129,7 @@ import {
 	FindTool,
 	getSearchTools,
 	HIDDEN_TOOLS,
+	isImageProviderPreference,
 	isSearchProviderPreference,
 	type LspStartupServerInfo,
 	loadSshTool,
@@ -148,6 +149,7 @@ import { ToolContextStore } from "./tools/context";
 import { getImageGenTools } from "./tools/image-gen";
 import { wrapToolWithMetaNotice } from "./tools/output-meta";
 import { queueResolveHandler } from "./tools/resolve";
+import { ttsTool } from "./tools/tts";
 import { EventBus } from "./utils/event-bus";
 import { buildNamedToolChoice } from "./utils/tool-choice";
 import { buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
@@ -893,12 +895,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	}
 
 	const imageProvider = settings.get("providers.image");
-	if (
-		imageProvider === "auto" ||
-		imageProvider === "openai" ||
-		imageProvider === "gemini" ||
-		imageProvider === "openrouter"
-	) {
+	if (isImageProviderPreference(imageProvider)) {
 		setPreferredImageProvider(imageProvider);
 	}
 
@@ -1319,6 +1316,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			customTools.push(...(imageGenTools as unknown as CustomTool[]));
 		}
 
+		if (settings.get("tts.enabled")) {
+			customTools.push(ttsTool as unknown as CustomTool);
+		}
+
 		// Add web search tools
 		if (options.toolNames?.includes("web_search")) {
 			customTools.push(...getSearchTools());
@@ -1876,9 +1877,13 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				}
 				return key;
 			},
-			streamFn: (streamModel, context, streamOptions) =>
-				streamSimple(streamModel, context, {
+			streamFn: (streamModel, context, streamOptions) => {
+				const openrouterRoutingPreset = settings.get("providers.openrouterVariant");
+				const openrouterVariant =
+					openrouterRoutingPreset && openrouterRoutingPreset !== "default" ? openrouterRoutingPreset : undefined;
+				return streamSimple(streamModel, context, {
 					...streamOptions,
+					openrouterVariant: streamOptions?.openrouterVariant ?? openrouterVariant,
 					onAuthError: async (provider, oldKey, error) => {
 						await modelRegistry.authStorage.invalidateCredentialMatching(provider, oldKey, {
 							signal: streamOptions?.signal,
@@ -1890,7 +1895,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 						});
 						return modelRegistry.getApiKeyForProvider(provider, agent.sessionId);
 					},
-				}),
+				});
+			},
 			cursorExecHandlers,
 			transformToolCallArguments: (args, _toolName) => {
 				let result = args;

package/src/session/agent-session.ts

@@ -17,6 +17,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { scheduler } from "node:timers/promises";
+import { isPromise } from "node:util/types";
 import {
 	type AfterToolCallContext,
 	type AfterToolCallResult,
@@ -1307,10 +1308,25 @@ export class AgentSession {
 
 	/** Emit an event to all listeners */
 	#emit(event: AgentSessionEvent): void {
-		// Copy array before iteration to avoid mutation during iteration
+		// Copy array before iteration to avoid mutation during iteration.
 		const listeners = [...this.#eventListeners];
 		for (const l of listeners) {
-			l(event);
+			try {
+				const result = l(event) as unknown;
+				// Listener may be an async function whose returned Promise we don't await;
+				// attach a catch so a rejection does not become an unhandled rejection.
+				if (isPromise(result)) {
+					result.catch(err => {
+						logger.warn("AgentSession listener rejected", {
+							error: err instanceof Error ? err.message : String(err),
+						});
+					});
+				}
+			} catch (err) {
+				logger.warn("AgentSession listener threw", {
+					error: err instanceof Error ? err.message : String(err),
+				});
+			}
 		}
 	}
 
@@ -3615,9 +3631,17 @@ export class AgentSession {
 		const sessionOnResponse = this.#onResponse;
 		const sessionMetadata = this.agent.metadataForProvider(provider);
 		const sessionOnSseEvent = this.#onSseEvent;
-		if (!sessionOnPayload && !sessionOnResponse && !sessionMetadata && !sessionOnSseEvent) return options;
-
-		const preparedOptions: SimpleStreamOptions = { ...options };
+		const openrouterRoutingPreset =
+			provider === "openrouter" ? this.settings.get("providers.openrouterVariant") : "default";
+		const openrouterVariant =
+			openrouterRoutingPreset !== "default" && options.openrouterVariant === undefined
+				? openrouterRoutingPreset
+				: undefined;
+		if (!sessionOnPayload && !sessionOnResponse && !sessionMetadata && !sessionOnSseEvent && !openrouterVariant)
+			return options;
+
+		const preparedOptions: SimpleStreamOptions =
+			openrouterVariant === undefined ? { ...options } : { ...options, openrouterVariant };
 
 		// Stamp session metadata (e.g. user_id={session_id}) onto direct-call requests so
 		// they share the same session bucket as Agent.prompt-routed requests on Anthropic
@@ -3742,6 +3766,10 @@ export class AgentSession {
 		this.#planReferencePath = path;
 	}
 
+	getPlanReferencePath(): string {
+		return this.#planReferencePath;
+	}
+
 	get clientBridge(): ClientBridge | undefined {
 		return this.#clientBridge;
 	}
@@ -5559,6 +5587,11 @@ export class AgentSession {
 					initiatorOverride: "agent",
 					metadata: this.agent.metadataForProvider(model.provider),
 					telemetry: resolveTelemetry(this.agent.telemetry, this.sessionId),
+					// Honor the user's /model thinking selection on the handoff
+					// path. Clamped per-model inside generateHandoff via
+					// resolveCompactionEffort so unsupported-effort models don't
+					// trip requireSupportedEffort.
+					thinkingLevel: this.thinkingLevel,
 				},
 				handoffSignal,
 			);
@@ -6329,6 +6362,11 @@ export class AgentSession {
 					metadata: this.agent.metadataForProvider(candidate.provider),
 					convertToLlm,
 					telemetry,
+					// Honor the user's /model thinking selection (incl. `off`) on
+					// the manual `/compact` path. Clamped per-model inside compact()
+					// via resolveCompactionEffort so unsupported-effort models
+					// (xai-oauth/grok-build) don't trip requireSupportedEffort.
+					thinkingLevel: this.thinkingLevel,
 				});
 			} catch (error) {
 				if (!this.#isCompactionAuthFailure(error)) {
@@ -6601,6 +6639,11 @@ export class AgentSession {
 								initiatorOverride: "agent",
 								convertToLlm,
 								telemetry,
+								// Honor the user's /model thinking selection on the
+								// auto-compaction path — the most-fired compaction
+								// site. Clamped per-model inside compact() via
+								// resolveCompactionEffort.
+								thinkingLevel: this.thinkingLevel,
 							});
 							break;
 						} catch (error) {