@gajae-code/coding-agent 0.14.2 → 0.15.0

package/src/sdk/host/session-runtime.ts

@@ -14,6 +14,7 @@ import { resolveModelChainWithAuth, splitSelectorThinkingSuffix } from "../../co
 import { type ModelSelectorValue, normalizeModelSelectorValue } from "../../config/model-selector-value";
 import { type Settings, validateSettingPatch } from "../../config/settings";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "../../extensibility/extensions";
+import { normalizeGoal } from "../../goals/state";
 import {
 	boundTerminalRetentionState,
 	findOwnedRegistrationsForTurn,
@@ -45,6 +46,7 @@ import {
 import { type ControlSurface, controlRequestFromFrame, dispatchControl } from "./control";
 import { BROKER_RUNTIME_CLOSE_CAPABILITY_FIELD } from "./control/runtime-gate";
 import { SessionSdkHost, type SessionSdkHostOptions } from "./host";
+import { clearAutoroutingInactive, isAutoroutingInactive, markAutoroutingInactive } from "./internal-autorouting-state";
 import { CursorRegistry, QueryHandlers, RevisionStore, type SessionSurface } from "./query";
 import {
 	createSdkCapabilities,
@@ -385,9 +387,10 @@ export interface CreateSdkSessionRuntimeOptions {
 		stateRoot: string;
 		token: string;
 	}): SessionSdkTransport | Promise<SessionSdkTransport>;
-	onSdkRequest?: SessionSdkHostOptions["onRequest"];
 	/** Session settings; enables `config.patch` application on this runtime. */
 	settings?: Settings;
+	/** Callback for diagnostics and lifecycle request observation. */
+	onSdkRequest?: SessionSdkHostOptions["onRequest"];
 	/** Mutable shadow of patched config values merged into query readback. */
 	configOverrides?: Map<string, unknown>;
 	/** Private session-owned terminal-abort capabilities; never exposed on ExtensionContext. */
@@ -869,6 +872,48 @@ function createQuerySurface(
 			throw error;
 		}
 	};
+	const getDurableGoalState = (): { kind: "state"; state: unknown } | { kind: "empty" } | { kind: "unavailable" } => {
+		// A recreated SDK host can observe the session before its in-memory goal
+		// projection is hydrated. The latest mode_change is the durable authority;
+		// never borrow a goal from another session or an older branch.
+		let branch: ReturnType<ExtensionContext["sessionManager"]["getBranch"]>;
+		try {
+			branch = ctx.sessionManager.getBranch();
+		} catch {
+			return { kind: "unavailable" };
+		}
+		for (const entry of branch.toReversed()) {
+			if (entry.type !== "mode_change") continue;
+			if (entry.mode !== "goal" && entry.mode !== "goal_paused") return { kind: "empty" };
+			const goal = normalizeGoal(entry.data?.goal);
+			if (!goal) return { kind: "unavailable" };
+			return { kind: "state", state: { enabled: entry.mode === "goal", mode: "active", goal } };
+		}
+		return { kind: "empty" };
+	};
+	const getGoalState = (): unknown => {
+		const liveState =
+			typeof (ctx as Partial<ExtensionContext>).getGoalState === "function" ? ctx.getGoalState() : undefined;
+		if (liveState !== undefined) return liveState;
+		const durableState = getDurableGoalState();
+		if (durableState.kind === "state") return durableState.state;
+		if (durableState.kind === "unavailable")
+			return {
+				enabled: false,
+				goal: null,
+				reason: "goal_state_unavailable",
+				recoverable: true,
+				message:
+					"The authoritative goal state could not be recovered from this session. Reconnect or resume the session before retrying.",
+			};
+		return {
+			enabled: false,
+			goal: null,
+			reason: "no_active_goal",
+			message:
+				"No goal is active in this session: goal mode has not created or resumed a goal, so no goal snapshot exists yet.",
+		};
+	};
 	return {
 		getTranscriptEntries: () =>
 			typeof (ctx as Partial<ExtensionContext>).getTranscript === "function" ? ctx.getTranscript() : [],
@@ -877,8 +922,7 @@ function createQuerySurface(
 			systemPrompt: ctx.getSystemPrompt(),
 			...getLiveState(),
 		}),
-		getGoalState: () =>
-			typeof (ctx as Partial<ExtensionContext>).getGoalState === "function" ? ctx.getGoalState() : undefined,
+		getGoalState,
 		getTodoState: () =>
 			typeof (ctx as Partial<ExtensionContext>).getTodoState === "function" ? ctx.getTodoState() : [],
 		getDiff,
@@ -1222,6 +1266,7 @@ function createControlSurface(
 	settings?: Settings,
 	configOverrides?: Map<string, unknown>,
 	configRevision: { current: number } = { current: 0 },
+	getRuntimeHost: () => SessionSdkHost | undefined = () => undefined,
 	terminalAbortSeams?: SdkOnlyTerminalAbortSeams,
 	terminalPublicationCapture?: { resolvers?: Array<(observed: boolean) => void> },
 	activePromptOwnerHolder?: { connectionIds?: ReadonlySet<string> },
@@ -2351,8 +2396,8 @@ function createControlSurface(
 				// Follow-ups never start inline; ownership correlates at promotion.
 				true,
 			),
-		abort: () => {
-			ctx.abort();
+		abort: async () => {
+			await Promise.resolve(ctx.abort()).catch(() => undefined);
 			return { aborted: true };
 		},
 		abortTerminal: terminalAbort,
@@ -2477,10 +2522,24 @@ function createControlSurface(
 			}
 			if (!settings) return unavailable("config.patch")();
 			const applyPatch = async () => {
+				const wasAutoroutingInactive =
+					settings.get("task.autorouting.enabled") === true && !settings.getEffectiveAutorouting().active;
 				const entries = Object.entries(patch as Record<string, unknown>);
 				for (const [key, value] of entries) settings.set(key as never, value as never);
 				if (configOverrides) for (const [key, value] of entries) configOverrides.set(key, value);
 				configRevision.current += 1;
+				const isAutoroutingInactiveNow =
+					settings.get("task.autorouting.enabled") === true && !settings.getEffectiveAutorouting().active;
+				if (isAutoroutingInactiveNow && !wasAutoroutingInactive) {
+					const host = getRuntimeHost();
+					if (host) {
+						markAutoroutingInactive(host);
+						if (host.started) host.emitAutoroutingInactiveNotice();
+					}
+				} else if (!isAutoroutingInactiveNow && wasAutoroutingInactive) {
+					const host = getRuntimeHost();
+					if (host) clearAutoroutingInactive(host);
+				}
 				return { patched: entries.map(([key]) => key), revision: String(configRevision.current) };
 			};
 			// Serialize config mutations against synthetic profile activation and
@@ -2573,6 +2632,13 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 				waitForGateResolutionQuiescence: () => Promise<void>;
 				activeInvocation?: { kind: InvocationKind; correlation: InvocationCorrelation };
 				drainedInvocations?: Array<{ kind: InvocationKind; correlation: InvocationCorrelation }>;
+				openLifecycleBatches: Array<{
+					invocations: Array<{
+						kind: InvocationKind;
+						correlation: InvocationCorrelation;
+						connectionId: string | undefined;
+					}>;
+				}>;
 				disposeGate?: () => void;
 		  }
 		| undefined;
@@ -2594,6 +2660,28 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 	const emitLifecycle = async (type: "agent_start" | "agent_end", ctx: ExtensionContext): Promise<void> => {
 		const current = active;
 		if (!current) return;
+		const adoptLifecycleBatch = (
+			batch:
+				| Array<{
+						kind: InvocationKind;
+						correlation: InvocationCorrelation;
+						connectionId: string | undefined;
+				  }>
+				| undefined,
+		): void => {
+			if (!batch || batch.length === 0) {
+				current.activeInvocation = undefined;
+				current.drainedInvocations = undefined;
+				activePromptOwnerHolder.connectionIds = undefined;
+				return;
+			}
+			current.activeInvocation = batch[0];
+			current.drainedInvocations = batch.map(({ kind, correlation }) => ({ kind, correlation }));
+			const owners = new Set<string>();
+			for (const entry of batch) if (entry.connectionId !== undefined) owners.add(entry.connectionId);
+			activePromptOwnerHolder.connectionIds = owners;
+		};
+		let transitions: Array<{ kind: InvocationKind; correlation: InvocationCorrelation }> = [];
 		if (type === "agent_start") {
 			// Drain EVERY entry admitted for this run: a continuation may promote
 			// several follow-ups (each with its own requester correlation) into one
@@ -2603,19 +2691,24 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			// continuation agent_start with an empty queue leaves the current owner
 			// untouched (review thread P1).
 			const drained = current.pending.splice(0);
-			current.activeInvocation = drained[0];
 			if (drained.length > 0) {
-				const owners = new Set<string>();
-				for (const entry of drained) if (entry.connectionId !== undefined) owners.add(entry.connectionId);
-				activePromptOwnerHolder.connectionIds = owners;
-				// A single run may drain several follow-ups promoted together; each
-				// has its own durable record that must reach terminal state, so keep
-				// the full batch for the transition pass below (review thread P1).
-				current.drainedInvocations = drained.map(({ kind, correlation }) => ({ kind, correlation }));
-			}
-			if (current.activeInvocation?.kind === "prompt") {
-				current.deadlineManager.onAccepted(current.activeInvocation.correlation);
+				current.openLifecycleBatches.push({ invocations: drained });
+				adoptLifecycleBatch(drained);
+				if (current.activeInvocation?.kind === "prompt") {
+					current.deadlineManager.onAccepted(current.activeInvocation.correlation);
+				}
 			}
+			transitions = drained.map(({ kind, correlation }) => ({ kind, correlation }));
+		} else {
+			// Pair this agent_end with the oldest unmatched start. A delayed
+			// aborted-turn end that lands after a successor agent_start must
+			// terminalize the aborted invocation, never the successor.
+			const ended = current.openLifecycleBatches[0];
+			transitions = ended
+				? ended.invocations.map(({ kind, correlation }) => ({ kind, correlation }))
+				: current.activeInvocation
+					? [current.activeInvocation]
+					: [];
 		}
 		// Observe whether the lifecycle publication actually landed: a terminal
 		// abort awaits this result so its durable row only claims
@@ -2624,12 +2717,6 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 		// recorded as observed=false, never rethrown into the api handler.
 		let observed = true;
 		try {
-			const transitions =
-				current.drainedInvocations && current.drainedInvocations.length > 0
-					? current.drainedInvocations
-					: current.activeInvocation
-						? [current.activeInvocation]
-						: [];
 			for (const invocation of transitions) {
 				await current.reconciliation.noteTransition(invocation.kind, invocation.correlation, { type } as never);
 				if ((type as string) === "agent_end" || (type as string) === "agent_failed") {
@@ -2641,20 +2728,10 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			observed = false;
 		}
 		if (type === "agent_end") {
-			if (current.activeInvocation?.kind === "prompt") {
-				current.deadlineManager.clear(current.activeInvocation.correlation);
-			} else if (current.drainedInvocations) {
-				for (const inv of current.drainedInvocations)
-					if (inv.kind === "prompt") current.deadlineManager.clear(inv.correlation);
-			}
-			current.activeInvocation = undefined;
-			current.drainedInvocations = undefined;
-			// The turn is over: no connection owns it anymore. Clearing here means
-			// an abort against a later agent-initiated turn (monitor/cron
-			// follow-up) finds no owner and fails closed, instead of letting the
-			// previous prompt's owner stop a turn it did not submit (review
-			// thread P1).
-			activePromptOwnerHolder.connectionIds = undefined;
+			if (current.openLifecycleBatches.length > 0) current.openLifecycleBatches.shift();
+			for (const invocation of transitions)
+				if (invocation.kind === "prompt") current.deadlineManager.clear(invocation.correlation);
+			adoptLifecycleBatch(current.openLifecycleBatches[0]?.invocations);
 			// Resolve EVERY concurrent waiter for the aborted turn: the turn emits
 			// exactly one agent_end, and each admitted abort of it must observe the
 			// same publication result rather than a single latest-wins slot (review
@@ -2728,6 +2805,13 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			correlation: InvocationCorrelation;
 			connectionId: string | undefined;
 		}> = [];
+		const openLifecycleBatches: Array<{
+			invocations: Array<{
+				kind: InvocationKind;
+				correlation: InvocationCorrelation;
+				connectionId: string | undefined;
+			}>;
+		}> = [];
 		const configRevision = { current: 0 };
 		let acceptingGateResolutions = true;
 		const inFlightGateResolutions = new Set<Promise<unknown>>();
@@ -2754,6 +2838,7 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			settings: options.settings,
 		});
 		const queryHandlers = new QueryHandlers(surfaceFactory.query, sessionId, revisions, cursors);
+		let runtime: SessionSdkSessionRuntime;
 		const controlSurface = createControlSurface(
 			ctx,
 			api,
@@ -2778,6 +2863,7 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			options.settings,
 			options.configOverrides,
 			configRevision,
+			() => runtime?.host,
 			options.terminalAbortSeams,
 			terminalPublicationCapture,
 			activePromptOwnerHolder,
@@ -2793,7 +2879,6 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			() => acceptingGateResolutions,
 			trackGateResolution,
 		);
-		let runtime: SessionSdkSessionRuntime;
 		const installProviderDefinitions = (capability: string, definitions: unknown): void => {
 			if (capability === "permission") {
 				ctx.setSdkPermissionProvider?.(async (toolCall, permissionOptions, signal) => {
@@ -2969,6 +3054,7 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 				if (request.operation === "session.close" && response.ok === true) ctx.shutdown();
 			},
 		});
+		if (isAutoroutingInactive(api)) markAutoroutingInactive(runtime.host);
 		const disposeGate = ctx.workflowGate?.onGateEmitted?.(gate =>
 			runtime.emitEvent({ kind: "workflow_gate", payload: gate }),
 		);
@@ -3003,6 +3089,7 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 			steerReconciliation,
 			deadlineManager,
 			pending,
+			openLifecycleBatches,
 			registerBroker,
 			fenceGateResolutions: () => {
 				acceptingGateResolutions = false;
@@ -3031,6 +3118,7 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 					steerReconciliation,
 					deadlineManager,
 					pending,
+					openLifecycleBatches,
 					registerBroker,
 					fenceGateResolutions: () => {
 						acceptingGateResolutions = false;

package/src/sdk/lifecycle/service.ts

@@ -421,7 +421,9 @@ function sessionResult(value: unknown, expectedSessionId?: string): SessionLifec
 		note?: string;
 	} = { sessionId };
 	if (typeof record.cwd === "string") result.cwd = record.cwd;
-	if (typeof record.endpointGeneration === "number") result.endpointGeneration = record.endpointGeneration;
+	const endpointGeneration = record.endpointGeneration;
+	if (typeof endpointGeneration === "number" && Number.isSafeInteger(endpointGeneration) && endpointGeneration > 0)
+		result.endpointGeneration = endpointGeneration;
 	if (typeof record.reused === "boolean") result.reused = record.reused;
 	if (typeof record.note === "string") result.note = record.note;
 	return result;

package/src/sdk/lifecycle-session.ts

@@ -1,3 +1,4 @@
+import { parseModelString } from "../config/model-resolver";
 import type { AgentSession } from "../session/agent-session";
 import { type CreateAgentSessionOptions, createAgentSession } from "./session";
 import {
@@ -29,6 +30,19 @@ export type CreateLifecycleAgentSessionResult =
  * unbounded LLM work, so deferral is an invariant rather than a caller choice.
  */
 export type CreateLifecycleAgentSessionOptions = Omit<CreateAgentSessionOptions, "deferMemoryBackendStartup"> & {
+	/**
+	 * Explicit model pin (#4707): the coordinator-resolved `provider/model`
+	 * selector, forwarded as {@link CreateAgentSessionOptions.modelPattern} so
+	 * the session resolves it through the same staged selector resolver the CLI
+	 * `--model` flag uses (after extension providers register).
+	 *
+	 * Resolution is strict: if this child's registry cannot resolve the pin to
+	 * exactly this model, construction fails and the partial session is
+	 * disposed instead of continuing into startup profile application, which
+	 * would otherwise activate `modelProfile.default`/`mpreset` while the
+	 * coordinator reports the requested pin.
+	 */
+	modelId?: string;
 	/**
 	 * Startup budget for ACP lifecycle MCP launches, in milliseconds. Set only
 	 * when the lifecycle request supplies `mcpServers`; ordinary consumers keep
@@ -50,9 +64,13 @@ export async function createLifecycleAgentSession(
 	const rollback = new SdkStartupRollbackTracker();
 	const capability = new SdkStartupCapability(rollback, options.readiness ?? "immediate");
 	try {
-		const { mcpStartupTimeoutMs, readiness: _readiness, ...sessionOptions } = options;
+		const { modelId, mcpStartupTimeoutMs, readiness: _readiness, ...sessionOptions } = options;
 		const internalOptions = {
 			...sessionOptions,
+			// Explicit model pin (#4707): resolve through the staged selector
+			// resolver after extension providers register (modelPattern), so the
+			// pin matches CLI `--model` semantics instead of bypassing them.
+			...(modelId !== undefined ? { modelPattern: modelId } : {}),
 			// Memory startup (rollout summarisation) issues one LLM request per
 			// claimed rollout, so its duration scales with the backlog. Keeping it
 			// inside the broker's readiness window is what kills the child at the
@@ -65,6 +83,29 @@ export async function createLifecycleAgentSession(
 			[lifecycleMcpStartupTimeoutOption]?: number;
 		};
 		const result = await createAgentSession(internalOptions);
+		// Explicit model pin (#4707) is a guarantee, not a preference. The
+		// coordinator validated the selector against its own registry; this child
+		// owns the registry that actually serves requests, and the two can drift
+		// (a model removed, a provider disabled, an extension that failed to
+		// register). On drift `createAgentSession` returns a session with no model
+		// plus a fallback warning, and the startup profile pass that runs next
+		// would activate `modelProfile.default`/`mpreset` instead — publishing
+		// success on a model the caller never asked for. Fail before readiness and
+		// before any profile application, and dispose the partial session.
+		if (modelId !== undefined) {
+			const active = result.session.model;
+			const activeSelector = active ? `${active.provider}/${active.id}` : undefined;
+			const expected = parseModelString(modelId);
+			const expectedSelector = expected ? `${expected.provider}/${expected.id}` : modelId;
+			if (!activeSelector || activeSelector.toLowerCase() !== expectedSelector.toLowerCase()) {
+				await result.session.dispose().catch(() => {});
+				throw new Error(
+					`Model "${modelId}" not found. Use --list-models to see available models.${
+						activeSelector ? ` Session resolved ${activeSelector} instead.` : ""
+					}`,
+				);
+			}
+		}
 		if (!result.session.extensionRunner)
 			capability.settleFailure(capability.normalizeFailure("registration", "runner_absent"));
 		if (!result.startDeferredMemoryBackend)

package/src/sdk/protocol/operation-inventory.generated.json

@@ -1854,6 +1854,17 @@
 			"packages/coding-agent/test/sdk-operation-inventory.test.ts"
 		]
 	},
+	{
+		"sourceId": "slash_command:routing",
+		"sourceFile": "packages/coding-agent/src/slash-commands/builtin-registry.ts",
+		"sourceKind": "slash_command",
+		"decision": "exclude",
+		"rationale": "visual/local-only autorouting settings toggle and smart-routing panel entry, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
 	{
 		"sourceId": "slash_command:export",
 		"sourceFile": "packages/coding-agent/src/slash-commands/builtin-registry.ts",
@@ -2446,6 +2457,39 @@
 			"testIds": "not_applicable"
 		}
 	},
+	{
+		"sourceId": "agent_session:getEffectiveActiveWorkflowSkillState",
+		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
+		"sourceKind": "agent_session",
+		"decision": "exclude",
+		"rationale": "internal restored-or-live workflow guard for session rescope, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
+	{
+		"sourceId": "agent_session:replaceOwnedMcpManager",
+		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
+		"sourceKind": "agent_session",
+		"decision": "exclude",
+		"rationale": "internal cwd-rebinding helper for owned MCP authority after move_session, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
+	{
+		"sourceId": "agent_session:replaceNamedCustomTools",
+		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
+		"sourceKind": "agent_session",
+		"decision": "exclude",
+		"rationale": "internal cwd-rebinding helper for named custom tools after move_session, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
 	{
 		"sourceId": "agent_session:getActiveSkillPhase",
 		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
@@ -3693,6 +3737,28 @@
 			"testIds": "not_applicable"
 		}
 	},
+	{
+		"sourceId": "agent_session:replaceSkills",
+		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
+		"sourceKind": "agent_session",
+		"decision": "exclude",
+		"rationale": "internal cwd-rebinding helper for session skills after move_session, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
+	{
+		"sourceId": "agent_session:retireWorkspaceTreeForRescope",
+		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",
+		"sourceKind": "agent_session",
+		"decision": "exclude",
+		"rationale": "internal cwd-rebinding helper that retires the cached workspace tree after move_session, not a user-facing SDK control seam",
+		"exclusionMetadata": {
+			"adapterMappings": "not_applicable",
+			"testIds": "not_applicable"
+		}
+	},
 	{
 		"sourceId": "agent_session:getTodoPhases",
 		"sourceFile": "packages/coding-agent/src/session/agent-session.ts",