@sayknow-cli/coding-agent 0.5.10 → 0.5.11

package/src/cli/telegram-cli.ts

@@ -148,7 +148,7 @@ export async function runTelegramCommand(cmd: TelegramCommandArgs): Promise<void
 		case "__gateway": {
 			// Hidden entrypoint: run the Telegram Remote gateway in-process. Reached
 			// only via the self-spawn from runStart()/autostart, never by users.
-			const { loadConfigFromEnv, runService } = await import("../../../telegram-remote/src/index");
+			const { loadConfigFromEnv, runService } = await import("@sayknow-cli/telegram-remote");
 			await runService(loadConfigFromEnv(process.env));
 			return;
 		}

package/src/config/model-profile-activation.ts

@@ -2,11 +2,8 @@ import { ThinkingLevel } from "@sayknow-cli/agent-core";
 import type { Api, Model } from "@sayknow-cli/ai";
 import type { AgentSession } from "../session/agent-session";
 import { formatClampedModelSelector } from "../thinking";
-import {
-	aggregateModelProfileRequiredProviders,
-	formatAvailableProfileNames,
-	resolveProfileBindings,
-} from "./model-profiles";
+import { UnknownModelProfileError, validateModelProfileName } from "./model-profile-contract";
+import { aggregateModelProfileRequiredProviders, resolveProfileBindings } from "./model-profiles";
 import {
 	isAuthenticated,
 	kNoAuth,
@@ -49,7 +46,7 @@ export interface PrepareModelProfileActivationOptions {
 		| "resolveCanonicalModel"
 		| "getCanonicalVariants"
 		| "getCanonicalId"
-	>;
+	> & { getError?: ModelRegistry["getError"] };
 	settings: Pick<Settings, "get">;
 	profileName: string;
 }
@@ -347,12 +344,11 @@ export async function prepareModelProfileActivation(
 	options: PrepareModelProfileActivationOptions,
 ): Promise<PreparedModelProfileActivation> {
 	const profiles = options.modelRegistry.getModelProfiles();
-	const profileName = resolveModelProfileName(options.profileName, profiles);
+	// Typed contract errors (`unknown_model_profile` / `model_profile_registry_error`)
+	// so SDK lifecycle readiness and BrokerResponse preserve the code and details.
+	const profileName = validateModelProfileName(options.profileName, profiles, options.modelRegistry.getError?.());
 	const profile = profiles.get(profileName) ?? options.modelRegistry.getModelProfile(profileName);
-	if (!profile) {
-		const available = formatAvailableProfileNames(profiles);
-		throw new Error(`Unknown model profile "${options.profileName}". Available profiles: ${available}`);
-	}
+	if (!profile) throw new UnknownModelProfileError(options.profileName, profiles);
 	const profileLabel = options.profileName;
 
 	const requiredProviders = aggregateModelProfileRequiredProviders(profile.requiredProviders, profile);

package/src/config/model-registry.ts

@@ -69,6 +69,36 @@ import { type Settings, settings } from "./settings";
 
 export type { CanonicalModelIndex, CanonicalModelRecord, CanonicalModelVariant, ModelEquivalenceConfig };
 
+/**
+ * Strip userinfo and query strings from a discovery URL before it is surfaced
+ * in an error message, so credentials embedded in the URL never reach logs or UI.
+ */
+function redactDiscoveryUrl(value: string | URL): string {
+	try {
+		const url = typeof value === "string" ? new URL(value) : value;
+		return `${url.origin}${url.pathname}`;
+	} catch {
+		return "(invalid URL)";
+	}
+}
+
+/**
+ * Fingerprint of the environment variables that can change provider
+ * availability without touching AuthStorage. Keys the `getAvailable()` cache
+ * so a process.env mutation invalidates it.
+ */
+function envAvailabilityFingerprint(): string {
+	return Object.entries(process.env)
+		.filter(
+			([name]) =>
+				/(?:_API_KEY|_OAUTH_TOKEN|_ACCESS_TOKEN)$/.test(name) ||
+				/^(?:GH_TOKEN|GITHUB_TOKEN|HF_TOKEN|COPILOT_GITHUB_TOKEN)$/.test(name),
+		)
+		.sort(([left], [right]) => left.localeCompare(right))
+		.map(([name, value]) => `${name}=${value ?? ""}`)
+		.join("\u0000");
+}
+
 export const kNoAuth = "N/A";
 
 export function isAuthenticated(apiKey: string | undefined | null): apiKey is string {
@@ -544,6 +574,8 @@ export interface ProviderDiscoveryState {
 export interface CanonicalModelQueryOptions {
 	availableOnly?: boolean;
 	candidates?: readonly Model<Api>[];
+	/** Session whose canonical stickiness should scope the lookup, when the caller has one. */
+	sessionId?: string;
 }
 
 /** Result of loading custom models from models.json */
@@ -1021,6 +1053,9 @@ export class ModelRegistry {
 	#providerWebSearchModes: Map<string, WebSearchMode> = new Map();
 	#keylessProviders: Set<string> = new Set();
 	#discoverableProviders: DiscoveryProviderConfig[] = [];
+	#availableModelsCache: Model<Api>[] | undefined;
+	#availableModelsDisabledProviders: string | undefined;
+	#availableModelsEnvFingerprint: string | undefined;
 	#customModelOverlays: CustomModelOverlay[] = [];
 	#providerOverrides: Map<string, ProviderOverride> = new Map();
 	#modelOverrides: Map<string, Map<string, ModelOverride>> = new Map();
@@ -1074,6 +1109,8 @@ export class ModelRegistry {
 			const keyConfig = this.#customProviderApiKeys.get(provider);
 			return keyConfig;
 		});
+		// Any credential mutation (runtime/config keys, OAuth refresh) changes availability.
+		this.authStorage.onGenerationChanged(() => this.#invalidateAvailableModels());
 		// Load models synchronously in constructor
 		this.#loadModels();
 	}
@@ -2232,7 +2269,17 @@ export class ModelRegistry {
 			headers,
 			signal: AbortSignal.timeout(providerConfig.provider === "sglang" ? 500 : 250),
 			fetch: (input, init) => fetch(input, { ...init, redirect: "error" }),
-			throwOnStatus: response => new Error(`HTTP ${response.status} from ${baseUrl}/models`),
+			throwOnStatus: response => {
+				const modelsUrl = redactDiscoveryUrl(`${baseUrl}/models`);
+				if (response.status === 401 || response.status === 403) {
+					// Redacted by construction: name the provider, endpoint, and the
+					// config surface to fix, never the resolved key.
+					return new Error(
+						`HTTP ${response.status} from ${modelsUrl}: provider "${providerConfig.provider}" credential was rejected for OpenAI models-list discovery; check providers.${providerConfig.provider}.apiKey/apiKeyEnv.`,
+					);
+				}
+				return new Error(`HTTP ${response.status} from ${modelsUrl}`);
+			},
 			mapModel: (item, defaults) => ({
 				...defaults,
 				reasoning: isOmlx,
@@ -2434,6 +2481,9 @@ export class ModelRegistry {
 	}
 
 	#rebuildCanonicalIndex(): void {
+		// #models has already changed by the time a rebuild is requested; drop the
+		// availability cache even when the index rebuild itself is deferred.
+		this.#invalidateAvailableModels();
 		if (this.#rebuildSuspended > 0) {
 			this.#rebuildPending = true;
 			return;
@@ -2442,6 +2492,12 @@ export class ModelRegistry {
 		this.#rebuildPending = false;
 	}
 
+	#invalidateAvailableModels(): void {
+		this.#availableModelsCache = undefined;
+		this.#availableModelsDisabledProviders = undefined;
+		this.#availableModelsEnvFingerprint = undefined;
+	}
+
 	#suspendRebuild(): void {
 		this.#rebuildSuspended += 1;
 	}
@@ -2453,6 +2509,7 @@ export class ModelRegistry {
 		if (this.#rebuildSuspended === 0 && this.#rebuildPending) {
 			this.#rebuildPending = false;
 			this.#canonicalIndex = buildCanonicalModelIndex(this.#models, this.#equivalenceConfig);
+			this.#invalidateAvailableModels();
 		}
 	}
 
@@ -2503,8 +2560,10 @@ export class ModelRegistry {
 		return this.#models;
 	}
 
-	#isModelAvailable(model: Model<Api>): boolean {
-		const disabledProviders = getDisabledProviderIdsFromSettings();
+	#isModelAvailable(
+		model: Model<Api>,
+		disabledProviders: ReadonlySet<string> = getDisabledProviderIdsFromSettings(),
+	): boolean {
 		return (
 			!disabledProviders.has(model.provider) &&
 			(this.#keylessProviders.has(model.provider) || this.authStorage.hasAuth(model.provider))
@@ -2643,7 +2702,20 @@ export class ModelRegistry {
 	 * This is a fast check that doesn't refresh OAuth tokens.
 	 */
 	getAvailable(): Model<Api>[] {
-		return this.#models.filter(model => this.#isModelAvailable(model));
+		const disabledProviders = getDisabledProviderIdsFromSettings();
+		const disabledProviderKey = [...disabledProviders].sort().join("\u0000");
+		const envFingerprint = envAvailabilityFingerprint();
+		if (
+			this.#availableModelsCache &&
+			this.#availableModelsDisabledProviders === disabledProviderKey &&
+			this.#availableModelsEnvFingerprint === envFingerprint
+		) {
+			return this.#availableModelsCache;
+		}
+		this.#availableModelsCache = this.#models.filter(model => this.#isModelAvailable(model, disabledProviders));
+		this.#availableModelsDisabledProviders = disabledProviderKey;
+		this.#availableModelsEnvFingerprint = envFingerprint;
+		return this.#availableModelsCache;
 	}
 
 	/**

package/src/config/model-resolver.ts

@@ -355,7 +355,7 @@ function findExactCanonicalModelMatch(
 	modelReference: string,
 	availableModels: Model<Api>[],
 	modelRegistry: CanonicalModelRegistry | undefined,
-	_sessionId?: string,
+	sessionId?: string,
 ): Model<Api> | undefined {
 	if (!modelRegistry) {
 		return undefined;
@@ -367,6 +367,7 @@ function findExactCanonicalModelMatch(
 	return modelRegistry.resolveCanonicalModel?.(trimmedReference, {
 		availableOnly: false,
 		candidates: availableModels,
+		sessionId,
 	});
 }
 
@@ -378,7 +379,7 @@ function findExactEquivalentModelMatch(
 	modelReference: string,
 	availableModels: Model<Api>[],
 	modelRegistry: CanonicalModelRegistry | undefined,
-	_sessionId?: string,
+	sessionId?: string,
 ): Model<Api> | undefined {
 	if (!modelRegistry?.getCanonicalId || !modelRegistry.resolveCanonicalModel) return undefined;
 	const trimmedReference = modelReference.trim();
@@ -394,6 +395,7 @@ function findExactEquivalentModelMatch(
 	return modelRegistry.resolveCanonicalModel([...canonicalIds][0]!, {
 		availableOnly: false,
 		candidates: availableModels,
+		sessionId,
 	});
 }
 

package/src/defaults/skc/skills/deep-interview/SKILL.md

@@ -635,6 +635,18 @@ A transition occurs whenever the band changes versus the prior scored round —
 
 **Bookkeeping:** record each convened panel in `state.lateral_reviews` (round, milestone transition or pre-answer trigger, personas dispatched, findings folded). On panel spawn or validation failure, fall back silently to the normal generated question and increment `lateral_panel_failures`; do not expose tool noise unless it changes the next user-facing question. The panel is a prompt-budgeted assist layer — summarize oversized context before dispatch.
 
+### Per-question advisory fanout lanes (distinct from the milestone panel)
+
+Separate from the milestone-triggered lateral panel above, a lightweight **advisory fanout** may assist any single question the main session is about to synthesize or route — especially when the user is terse, uncertain, or would benefit from selectable options instead of another open-ended prompt. Adopted from ouroboros's ooo interview, the standard lanes are:
+
+- `code_context` — inspect repo-local facts and reuse existing exploration before asking the user.
+- `web_context` — browse/search only when current external facts genuinely affect the answer.
+- `ambiguity_contrarian` — find hidden assumptions, vague terms, missing decisions, and risky defaults.
+- `answer_simplifier` — turn the question into 2-3 easy choices or one concise draft answer.
+- `architecture_implications` — check whether the answer changes ownership, interfaces, rollout, or system shape.
+
+Advisory fanout is an assist layer, not a decision maker: it never replaces or delays the single user-facing question, never adds a second question, and never forwards a synthesized answer without the user's approval, edit, or explicit auto-confirm request. It differs from the milestone panel in trigger (per-question, not band-transition) and intent (help the human answer this one question). When both would fire on the same round, run the milestone panel and fold advisory lanes into the same single question. Runtimes without a parallel subagent primitive process lanes sequentially; on lane failure, fall back silently to the normal generated question.
+
 ## Phase 4: Crystallize Spec
 
 When ambiguity ≤ threshold (or hard cap / early exit):

package/src/modes/components/settings-selector.ts

@@ -204,6 +204,10 @@ const TIME_FORMAT_OPTIONS: SelectItem[] = [
 	{ value: "24h", label: "24h" },
 	{ value: "12h", label: "12h" },
 ];
+const USAGE_MODE_OPTIONS: SelectItem[] = [
+	{ value: "used", label: "Used" },
+	{ value: "remaining", label: "Remaining" },
+];
 const USAGE_MODE_VALUES = ["used", "remaining"] as const;
 type UsageMode = (typeof USAGE_MODE_VALUES)[number];
 
@@ -220,6 +224,7 @@ function mergeSegmentOptions(
 		path: base?.path || overrides?.path ? { ...(base?.path ?? {}), ...(overrides?.path ?? {}) } : undefined,
 		git: base?.git || overrides?.git ? { ...(base?.git ?? {}), ...(overrides?.git ?? {}) } : undefined,
 		time: base?.time || overrides?.time ? { ...(base?.time ?? {}), ...(overrides?.time ?? {}) } : undefined,
+		usage: base?.usage || overrides?.usage ? { ...(base?.usage ?? {}), ...(overrides?.usage ?? {}) } : undefined,
 	};
 }
 
@@ -279,8 +284,6 @@ function segmentPlacement(
 class StatusLineCustomEditor extends Container {
 	#list!: SettingsList;
 	#draft: StatusLineDraft;
-	#currentWidthPreviewText!: Text;
-	#narrowWidthPreviewText!: Text;
 	#previewHighlightSegment: StatusLineSegmentId | undefined;
 
 	constructor(
@@ -312,13 +315,6 @@ class StatusLineCustomEditor extends Container {
 		this.clear();
 		this.addChild(new Text(theme.bold(theme.fg("accent", "Status Line Custom Editor")), 0, 0));
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.fg("muted", "Current width preview:"), 0, 0));
-		this.#currentWidthPreviewText = new Text(this.#statusLinePreview(), 0, 0);
-		this.addChild(this.#currentWidthPreviewText);
-		this.addChild(new Text(theme.fg("muted", "Narrow width preview:"), 0, 0));
-		this.#narrowWidthPreviewText = new Text(this.#statusLinePreview(40), 0, 0);
-		this.addChild(this.#narrowWidthPreviewText);
-		this.addChild(new Spacer(1));
 		this.#list = new SettingsList(
 			this.#items(),
 			14,
@@ -326,27 +322,17 @@ class StatusLineCustomEditor extends Container {
 			(id, value) => this.#handleChange(id, value),
 			() => this.#cancel(),
 			item => this.#setSelectedItem(item),
+			2,
 		);
 		this.addChild(this.#list);
 	}
 
 	#refresh(): void {
-		this.#refreshPreview();
 		this.#list.setItems(this.#items());
 	}
-
-	#refreshPreview(): void {
-		this.#currentWidthPreviewText.setText(this.#statusLinePreview());
-		this.#narrowWidthPreviewText.setText(this.#statusLinePreview(40));
-	}
-
-	#statusLinePreview(width?: number): string {
-		return this.callbacks.getStatusLinePreview?.(width) ?? theme.fg("dim", "(preview not available)");
-	}
 	#setSelectedItem(item: SettingItem | undefined): void {
 		this.#previewHighlightSegment = this.#highlightSegmentForItem(item);
 		this.#preview();
-		this.#refreshPreview();
 	}
 
 	#highlightSegmentForItem(item: SettingItem | undefined): StatusLineSegmentId | undefined {
@@ -432,6 +418,22 @@ class StatusLineCustomEditor extends Container {
 					},
 				);
 			}
+			if (id === "usage") {
+				items.push({
+					id: "option.usage.mode",
+					label: "Usage: mode",
+					currentValue: this.#draft.segmentOptions.usage?.mode ?? "used",
+					submenu: (currentValue, done) =>
+						new SelectSubmenu(
+							"Usage mode",
+							"Show used quota or remaining quota in the usage segment.",
+							USAGE_MODE_OPTIONS,
+							currentValue,
+							done,
+							() => done(),
+						),
+				});
+			}
 		}
 
 		items.push(
@@ -596,6 +598,12 @@ class StatusLineCustomEditor extends Container {
 			case "time.showSeconds":
 				this.#draft.segmentOptions.time = { ...(this.#draft.segmentOptions.time ?? {}), showSeconds: bool };
 				break;
+			case "usage.mode":
+				this.#draft.segmentOptions.usage = {
+					...(this.#draft.segmentOptions.usage ?? {}),
+					mode: value === "remaining" ? "remaining" : "used",
+				};
+				break;
 		}
 	}
 
@@ -606,6 +614,8 @@ class StatusLineCustomEditor extends Container {
 			rightSegments: [...this.#draft.rightSegments],
 			separator: this.#draft.separator,
 			segmentOptions: cloneSegmentOptions(this.#draft.segmentOptions),
+			sessionAccent: settings.get("statusLine.sessionAccent"),
+			maxRows: settings.get("statusLine.maxRows"),
 			previewHighlightSegment: this.#previewHighlightSegment,
 		});
 	}
@@ -618,6 +628,7 @@ class StatusLineCustomEditor extends Container {
 			separator: settings.get("statusLine.separator"),
 			segmentOptions: cloneSegmentOptions(settings.get("statusLine.segmentOptions") as StatusLineSegmentOptions),
 			sessionAccent: settings.get("statusLine.sessionAccent"),
+			maxRows: settings.get("statusLine.maxRows"),
 			previewHighlightSegment: undefined,
 		});
 	}
@@ -1197,13 +1208,20 @@ export class SettingsSelectorComponent extends Container {
 	#buildItemsForTab(defs: SettingDef[], tabId: SettingTab): SettingItem[] {
 		const items = this.#buildItemsForDefs(defs);
 		if (tabId === "appearance") {
+			const customEditorCallbacks: SettingsCallbacks = {
+				...this.callbacks,
+				onStatusLinePreview: previewSettings => {
+					this.callbacks.onStatusLinePreview?.(previewSettings);
+					this.#updateStatusPreview();
+				},
+			};
 			const customEditorItem: SettingItem = {
 				id: STATUS_LINE_CUSTOM_EDITOR_ID,
 				label: "Status Line Custom Editor",
 				description:
 					"Edit custom status line segments, placement, separator, and typed segment options with live previews.",
 				currentValue: "open",
-				submenu: (_currentValue, done) => new StatusLineCustomEditor(this.callbacks, done),
+				submenu: (_currentValue, done) => new StatusLineCustomEditor(customEditorCallbacks, done),
 			};
 			const presetIndex = items.findIndex(item => item.id === "statusLine.preset");
 			if (presetIndex >= 0) {

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

@@ -5,7 +5,7 @@ import type { OAuthProvider } from "@sayknow-cli/ai/utils/oauth/types";
 import type { Component, OverlayHandle, SlashCommand } from "@sayknow-cli/tui";
 import { Input, isPetMode, Loader, Spacer, Text } from "@sayknow-cli/tui";
 import { getAgentDbPath, getProjectDir, logger, VERSION } from "@sayknow-cli/utils";
-import { type AppKeybinding, formatKeyHints } from "../../config/keybindings";
+import type { AppKeybinding } from "../../config/keybindings";
 import {
 	activateModelProfile,
 	materializeActiveModelProfileAssignment,
@@ -27,6 +27,7 @@ import {
 	getPluginsCacheDir,
 	MarketplaceManager,
 } from "../../extensibility/plugins/marketplace";
+import { INTERACTIVE_SELECTOR_RESUME_ORIGIN } from "../../extensibility/shared-events";
 import {
 	getAvailableThemes,
 	getCurrentThemeName,
@@ -832,7 +833,7 @@ export class SelectorController {
 				id: `action:${action.id}`,
 				label: action.label,
 				description: action.id,
-				keybinding: formatKeyHints(this.ctx.keybindings.getKeys(action.id as AppKeybinding)) || undefined,
+				keybinding: this.ctx.keybindings.getDisplayString(action.id as AppKeybinding) || undefined,
 				searchText: action.id,
 				handler: action.handler,
 			})),
@@ -1042,13 +1043,18 @@ export class SelectorController {
 			const selector = new ThinkingSelectorComponent(
 				this.ctx.session.thinkingLevel,
 				availableLevels,
-				selection => {
-					done();
-
+				async selection => {
 					const { level, persistDefault } = selection;
 					const configuredDefault = this.ctx.settings.get("defaultThinkingLevel");
 					const levelToApply = level === ThinkingLevel.Inherit ? configuredDefault : level;
-					this.ctx.session.setThinkingLevel(levelToApply, persistDefault);
+					try {
+						await this.ctx.session.setThinkingLevelForControl(level, persistDefault);
+					} catch (error) {
+						this.ctx.showError(error instanceof Error ? error.message : String(error));
+						return;
+					}
+					done();
+
 					const effectiveLevel = this.ctx.session.thinkingLevel ?? ThinkingLevel.Off;
 					const requestedLabel =
 						level === ThinkingLevel.Inherit ? `${level} (configured default: ${configuredDefault})` : level;
@@ -1959,10 +1965,7 @@ export class SelectorController {
 	}
 
 	async showSessionSelector(): Promise<void> {
-		const sessions = await SessionManager.listForResumePickerReadOnly(
-			this.ctx.sessionManager.getCwd(),
-			this.ctx.sessionManager.getSessionDir(),
-		);
+		const sessions = await this.ctx.sessionManager.listForResumePickerReadOnly();
 		this.showSelector(done => {
 			const selector = new SessionSelectorComponent(
 				sessions,
@@ -2064,13 +2067,30 @@ export class SelectorController {
 			const previousSessionId = this.ctx.sessionManager.getSessionId();
 			const migrationPolicy =
 				this.ctx.settings?.get("session.directoryMigration") === "disabled" ? "disabled" : "copy-retain";
-			const writableSessionPath = await this.ctx.sessionManager.prepareManagedCandidateForWrite(
-				sessionPath,
-				migrationPolicy,
-			);
+			let writableSessionPath = sessionPath;
+			if (this.ctx.sessionManager.isManagedDestination()) {
+				// Managed candidates are prepared against their inspected identity so a
+				// replacement race fails closed before adoption. Explicit `--session-dir`
+				// selections never enter the managed migration fence (preparation would
+				// reject a non-managed destination authority outright).
+				const inspection = await SessionManager.inspectSessionTailReadOnly(sessionPath);
+				if (inspection.kind === "error")
+					throw new Error(`Could not inspect selected session: ${inspection.reason}`);
+				writableSessionPath = await this.ctx.sessionManager.prepareManagedCandidateForStrictAdoption(
+					sessionPath,
+					migrationPolicy,
+					inspection.identity,
+				);
+			}
 
 			// Switch session via AgentSession (emits hook and tool session events)
-			if (!(await this.ctx.session.switchSession(writableSessionPath, options))) return false;
+			if (
+				!(await this.ctx.session.switchSession(writableSessionPath, {
+					...options,
+					transition: { origin: INTERACTIVE_SELECTOR_RESUME_ORIGIN },
+				}))
+			)
+				return false;
 			onSwitched?.();
 			this.#clearTransientSessionUi();
 			const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();

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

@@ -288,11 +288,27 @@ class StdioRpcTransport implements RpcTransport {
 			} else {
 				onClose(new Error("RPC stdio transport closed"));
 			}
-		})().catch((err: Error) => {
-			if (!readySettled) {
-				readySettled = true;
+		})().catch(async (err: Error) => {
+			if (readySettled) {
+				onClose(err);
+				return;
+			}
+			// Non-JSONL stdout before `ready` usually means the CLI refused to start
+			// (for example a usage error such as the removed `--mode rpc`). When the
+			// child is already gone, report its exit code and stderr instead of the
+			// parse noise so callers see the actual refusal.
+			const proc = this.#process;
+			const exitCode = proc
+				? await Promise.race([proc.exited.catch(() => proc.exitCode ?? -1), Bun.sleep(1_000).then(() => undefined)])
+				: undefined;
+			if (readySettled) return;
+			readySettled = true;
+			if (exitCode === undefined) {
 				readyReject(err);
-			} else onClose(err);
+				return;
+			}
+			const stderr = await getStartupStderr();
+			readyReject(new Error(`Agent process exited with code ${exitCode} before ready. Stderr: ${stderr}`));
 		});
 		void this.#process.exited.then(async (exitCode: number) => {
 			if (!readySettled) {

package/src/sdk/bus/index.ts

@@ -3217,9 +3217,7 @@ export function createNotificationsExtension(
 		let serverStopped = rt.serverStopped;
 		if (!serverStopped) {
 			try {
-				// fork's NotificationServer.stop() is synchronous; stopAndWait is upstream v0.11.x's
-				// async variant. TODO(port): add stop_and_wait to pi-natives/src/notifications.rs.
-				rt.server.stop();
+				await rt.server.stopAndWait();
 				serverStopped = true;
 				rt.serverStopped = true;
 			} catch (e) {