@gajae-code/coding-agent 0.15.5 → 0.15.6

package/src/sdk/session.ts

@@ -70,6 +70,7 @@ import { Settings, type SkillsSettings } from "../config/settings";
 import { resolveEagerTaskDelegation } from "../config/task-delegation";
 import { CursorExecHandlers } from "../cursor";
 import { EditTool } from "../edit";
+import { describeFoldReceipt } from "../session/fold-coordinator";
 import type { BashRestrictionProfile } from "../tools/bash-allowed-prefixes";
 import { SearchTool } from "../tools/search";
 import "../discovery";
@@ -1345,14 +1346,19 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const startupAuthConfig = hasInjectedAuth
 		? undefined
 		: (options.startupAuthConfig ?? (await resolveStartupAuthConfig(agentDir)));
+	const ownsModelRegistry = options.modelRegistry === undefined;
 	const ownsAuthStorage = options.modelRegistry === undefined && options.authStorage === undefined;
 	const modelRegistry =
 		options.modelRegistry ??
 		new ModelRegistry(
 			options.authStorage ??
 				(await logger.time("discoverModels", () => discoverAuthStorage(agentDir, startupAuthConfig))),
+			path.join(agentDir, "models.yml"),
+			undefined,
+			{ agentDir },
 		);
 	const authStorage = modelRegistry.authStorage;
+	const authStorageOwner = modelRegistry.getAuthStorageOwner();
 	if (options.authStorage && options.authStorage !== authStorage) {
 		throw new Error(
 			"options.authStorage and options.modelRegistry.authStorage must be the same instance when both are provided",
@@ -1390,7 +1396,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	let credentialScopeId: string | undefined;
 	let credentialScopeLeased = false;
 	let closeOwnedSettings: () => Promise<void> = async () => {};
-	const closeOwnedAuthStorage = (): void => {
+	const closeOwnedAuthStorage = async (): Promise<void> => {
+		if (ownsModelRegistry) await modelRegistry.dispose();
 		if (!hasSession && credentialScopeLeased && credentialScopeId) {
 			authStorage.releaseCredentialScope(credentialScopeId);
 			credentialScopeLeased = false;
@@ -1422,10 +1429,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			}
 		});
 		const applyCredentialSelector = (scopeId: string, provider: string, selector: AuthCredentialSelector): void => {
-			authStorage.setSessionCredentialSelector(scopeId, provider, selector);
+			authStorage.setSessionCredentialSelector(scopeId, provider, selector, authStorageOwner);
 		};
 		const ownsScopedSettings = options.settings === undefined;
 		const settings = options.settings ?? (await logger.time("settings", Settings.loadForScope, { cwd, agentDir }));
+		if (ownsModelRegistry) modelRegistry.setScopedSettings(settings);
 		const autoroutingInactive =
 			settings.get("task.autorouting.enabled") === true && !settings.getEffectiveAutorouting().active;
 		closeOwnedSettings = async (): Promise<void> => {
@@ -1695,10 +1703,15 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 					) {
 						throw new Error("Durable numeric credential pin authority changed");
 					}
-					authStorage.setSessionCredentialSelector(credentialSessionId, record.provider, {
-						kind: pin.kind,
-						value: pin.value,
-					});
+					authStorage.setSessionCredentialSelector(
+						credentialSessionId,
+						record.provider,
+						{
+							kind: pin.kind,
+							value: pin.value,
+						},
+						authStorageOwner,
+					);
 					staleDurableCredentialPins.delete(resolveOAuthStorageProvider(record.provider));
 				}
 			} catch {
@@ -2066,13 +2079,49 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 							if (asyncJobManager!.isDeliverySuppressed(jobId, job?.generation)) return;
 							const deniedOwnedDelivery =
 								ownedCompletion !== undefined && !isOwnedCompletionEnvelopeAllowed(ownedCompletion);
+							// Fold disposition is decided by the coordinator's durable slot state.
+							// `parked` means the fold transaction has not finished capturing its
+							// receipt yet; it replays this completion itself, so enqueuing here
+							// would double-deliver.
+							const foldDisposition = job
+								? session.foldCoordinator.onDelivery(job, result)
+								: ({ kind: "ordinary" } as const);
+							if (foldDisposition.kind === "parked") {
+								if (job) asyncJobManager?.retainParkedDelivery(job, result);
+								return;
+							}
 							const formattedResult = await formatAsyncResultForFollowUp(result, !deniedOwnedDelivery);
+							if (
+								foldDisposition.kind === "receipt" &&
+								job &&
+								!session.foldCoordinator.claimCompletionDelivery(job)
+							)
+								return;
+							// A folded job's result must arrive with its receipt so the wake turn
+							// completes the original task rather than merely reporting output.
+							const deliveredResult =
+								foldDisposition.kind === "receipt"
+									? `${formattedResult}\n\n${describeFoldReceipt(foldDisposition.receipt)}`
+									: formattedResult;
+							// Exactly one transcript notice per completion: a retried delivery
+							// reuses the same job object, so the claim guards against repeats.
+							if (
+								foldDisposition.kind === "receipt" &&
+								job &&
+								session.foldCoordinator.claimCompletionNotice(job)
+							) {
+								session.emitNotice(
+									"info",
+									`Folded job ${foldDisposition.receipt.jobId} (${foldDisposition.receipt.label}) finished.`,
+									"fold",
+								);
+							}
 
 							const durationMs = job ? jobElapsedMs(job) : undefined;
 							session.yieldQueue.enqueue<AsyncResultEntry>("async-result", {
 								jobId,
 								generation: job?.generation ?? "",
-								result: formattedResult,
+								result: deliveredResult,
 								job,
 								durationMs,
 								...(ownedCompletion
@@ -2085,6 +2134,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 										}
 									: {}),
 							});
+							if (job) asyncJobManager?.retainDeliveryClaim(job);
 						},
 					})
 				: options.inheritedAsyncJobManager;
@@ -2540,6 +2590,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			// (review thread P1). For a top-level session this equals the
 			// session id.
 			getSessionId: () => AsyncJobManager.endpointIdOf(asyncJobManager) ?? asyncJobEndpointId,
+			registerForegroundFoldParticipant: adapter =>
+				session?.registerForegroundFoldParticipant(adapter) ?? (() => {}),
+			hasForegroundBashBackgroundRequestHandler: () => session?.hasForegroundBashBackgroundRequestHandler() ?? false,
+			requestForegroundBashBackground: () => Promise.resolve(session?.requestForegroundBashBackground() ?? false),
+
 			getCredentialSessionId: () => session?.credentialSessionId ?? credentialSessionId,
 			getMcpManager: () => mcpManager ?? options.inheritedMcpManager,
 			isManagedSessionDestination: () => sessionManager.isManagedDestination(),
@@ -4086,18 +4141,24 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				const requestStartedAt = performance.now();
 				let stream: Awaited<ReturnType<typeof streamSimple>>;
 				try {
+					const effectiveApiKey = await modelRegistry.getApiKey(streamModel, credentialSessionId);
 					stream = await streamSimple(streamModel, context, {
 						...streamOptions,
+						apiKey: effectiveApiKey,
+						authCredentialType: modelRegistry.getSessionCredentialType(streamModel.provider, credentialSessionId),
 						onAuthError: async (provider, oldKey, error) => {
 							await modelRegistry.authStorage.invalidateCredentialMatching(provider, oldKey, {
 								signal: streamOptions?.signal,
 								sessionId: credentialSessionId,
+								owner: modelRegistry.getAuthStorageOwner(),
 							});
 							logger.debug("Retrying provider request after credential invalidation", {
 								provider,
 								error: error instanceof Error ? error.message : String(error),
 							});
-							return modelRegistry.getApiKeyForProvider(provider, credentialSessionId);
+							return modelRegistry.getApiKey(streamModel, credentialSessionId, {
+								signal: streamOptions?.signal,
+							});
 						},
 					});
 				} catch (error) {
@@ -4285,7 +4346,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		const sessionAsyncJobManager = asyncJobManager;
 		if (sessionAsyncJobManager) {
 			session.yieldQueue.register<AsyncResultEntry>("async-result", {
-				isStale: entry => sessionAsyncJobManager.isDeliverySuppressed(entry.jobId, entry.generation),
+				isStale: entry => {
+					const stale = sessionAsyncJobManager.isDeliverySuppressed(entry.jobId, entry.generation);
+					if (stale) sessionAsyncJobManager.releaseDeliveryClaim(entry.generation);
+					return stale;
+				},
 				// Build one message per ownership origin so an owned-scope drop of
 				// one turn's message never suppresses other turns'/ordinary
 				// completions batched in the same flush (review thread P2).
@@ -4293,7 +4358,13 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 					entry.ownedCompletion
 						? `${entry.ownedCompletion.lineageIdHash}\u0000${entry.ownedCompletion.promptAttemptEpoch}`
 						: "ordinary",
-				build: buildAsyncResultBatchMessage,
+				build: entries => {
+					try {
+						return buildAsyncResultBatchMessage(entries);
+					} finally {
+						for (const entry of entries) sessionAsyncJobManager.releaseDeliveryClaim(entry.generation);
+					}
+				},
 			});
 		}
 		session.yieldQueue.register<McpNotificationEntry>("mcp-notification", {
@@ -4329,7 +4400,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 							);
 							AsyncJobManager.unregisterManager(asyncJobManager);
 						}
-						closeOwnedAuthStorage();
+						await closeOwnedAuthStorage();
 						await closeOwnedSettings();
 					}
 				}
@@ -4599,7 +4670,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			}
 			releaseLocalProtocolOverride();
 			try {
-				closeOwnedAuthStorage();
+				await closeOwnedAuthStorage();
 			} catch (authCleanupError) {
 				logger.warn("Failed to close owned auth storage after startup error", { error: authCleanupError });
 			}

package/src/session/account-inventory.ts

@@ -76,6 +76,7 @@ export interface AccountInventoryInput {
 	modelRegistry?: {
 		getAvailable?: () => Array<{ provider: string }>;
 		getProviderBaseUrl?: (provider: string) => string | undefined;
+		getAuthStorageOwner?: () => object;
 	};
 	sessionId?: string;
 	provider?: string;
@@ -323,8 +324,8 @@ function freshUsageCache(report: CachedUsageReport["report"]): AccountUsageCache
 	};
 }
 
-function canPinStoredOAuth(authStorage: AuthStorage, provider: string): boolean {
-	if (authStorage.hasRuntimeApiKey(provider) || authStorage.hasConfigApiKey(provider)) return false;
+function canPinStoredOAuth(authStorage: AuthStorage, provider: string, owner?: object): boolean {
+	if (authStorage.hasRuntimeApiKey(provider) || authStorage.hasConfigApiKey(provider, owner)) return false;
 	return !getEnvApiKey(provider);
 }
 
@@ -368,6 +369,7 @@ function addStoredRows(
 	inventory: CredentialInventoryRecord[],
 	sessionId: string | undefined,
 	baseUrlResolver?: (provider: string) => string | undefined,
+	authStorageOwner?: object,
 ): void {
 	const removalTargetIds = new Set(
 		(typeof authStorage.listCredentialRemovalTargets === "function"
@@ -382,7 +384,9 @@ function addStoredRows(
 			typeof record.provider === "string" &&
 			authStorage.getSessionCredentialRowId(record.provider, sessionId) === record.id;
 		const canPin =
-			record.credentialKind === "oauth" && !record.disabled && canPinStoredOAuth(authStorage, record.provider);
+			record.credentialKind === "oauth" &&
+			!record.disabled &&
+			canPinStoredOAuth(authStorage, record.provider, authStorageOwner);
 		const canRemove = removalTargetIds.has(record.id);
 		rows.push({
 			id: sourceId(record.provider, "stored", record.id),
@@ -417,12 +421,17 @@ function addSyntheticRows(
 	authStorage: AuthStorage,
 	providers: Set<string>,
 	sessionId: string | undefined,
+	authStorageOwner?: object,
 ): void {
 	for (const provider of [...providers].sort((a, b) => a.localeCompare(b))) {
 		const runtime = authStorage.hasRuntimeApiKey(provider);
-		const config = authStorage.hasConfigApiKey(provider);
+		const config = authStorage.hasConfigApiKey(provider, authStorageOwner);
 		const env = Boolean(getEnvApiKey(provider));
-		const effectiveType = authStorage.getEffectiveCredentialType(provider, sessionId);
+		const effectiveType = authStorage.getEffectiveCredentialType(
+			provider,
+			sessionId,
+			authStorageOwner ? { owner: authStorageOwner } : undefined,
+		);
 
 		const add = (source: AccountInventorySource): void => {
 			const selected =
@@ -469,10 +478,16 @@ export function buildAccountInventorySnapshot(input: AccountInventoryInput): Acc
 	const nowMs = input.nowMs ?? Date.now();
 	const inventory = input.authStorage.listCredentialInventory();
 	const rows: AccountInventoryRow[] = [];
-	addStoredRows(rows, input.authStorage, inventory, input.sessionId, provider =>
-		input.modelRegistry?.getProviderBaseUrl?.(provider),
+	const authStorageOwner = input.modelRegistry?.getAuthStorageOwner?.();
+	addStoredRows(
+		rows,
+		input.authStorage,
+		inventory,
+		input.sessionId,
+		provider => input.modelRegistry?.getProviderBaseUrl?.(provider),
+		authStorageOwner,
 	);
-	addSyntheticRows(rows, input.authStorage, providerSet(input, inventory), input.sessionId);
+	addSyntheticRows(rows, input.authStorage, providerSet(input, inventory), input.sessionId, authStorageOwner);
 	rows.sort((left, right) => left.id.localeCompare(right.id));
 	return { generatedAt: nowMs, generation: input.authStorage.getGeneration(), rows };
 }
@@ -518,6 +533,7 @@ export async function checkAccountInventory(input: AccountInventoryInput): Promi
 	const rows = input.provider ? fullSnapshot.rows.filter(row => row.provider === input.provider) : fullSnapshot.rows;
 	const snapshot: AccountInventorySnapshot = { ...fullSnapshot, rows };
 	const authStorage = input.authStorage;
+	const authStorageOwner = input.modelRegistry?.getAuthStorageOwner?.();
 	applyStoredCheck(
 		rows,
 		await authStorage.checkCredentials({
@@ -530,13 +546,13 @@ export async function checkAccountInventory(input: AccountInventoryInput): Promi
 		let key: string | undefined;
 		if (row.source === "env") key = getEnvApiKey(row.provider);
 		else if (row.source === "runtime" && authStorage.hasRuntimeApiKey(row.provider))
-			key = await authStorage.peekApiKey(row.provider);
+			key = await authStorage.peekApiKey(row.provider, authStorageOwner ? { owner: authStorageOwner } : undefined);
 		else if (
 			row.source === "config" &&
-			authStorage.hasConfigApiKey(row.provider) &&
+			authStorage.hasConfigApiKey(row.provider, authStorageOwner) &&
 			!authStorage.hasRuntimeApiKey(row.provider)
 		) {
-			key = await authStorage.peekApiKey(row.provider);
+			key = await authStorage.peekApiKey(row.provider, authStorageOwner ? { owner: authStorageOwner } : undefined);
 		}
 		const result = key
 			? await authStorage.checkApiKeyCredential(row.provider as Provider, key, {