@gajae-code/agent-core 0.11.11 → 0.12.1

package/src/agent.ts

@@ -25,6 +25,7 @@ import { agentLoop, agentLoopContinue } from "./agent-loop";
 import type { AppendOnlyContextManager } from "./append-only-context";
 import type { HarmonyAuditEvent } from "./harmony-leak";
 import { assertImagePlaceholdersHavePayload } from "./image-placeholder-guard";
+import { createRunResourceLedger } from "./run-resource-ledger";
 import type {
 	AgentContext,
 	AgentEvent,
@@ -38,6 +39,7 @@ import type {
 	ManagedAttemptDecision,
 	ManagedAttemptOutcome,
 	ManagedLogicalRunId,
+	RunResourceLedger,
 	RunTerminalRequest,
 	StreamFn,
 	ToolCallContext,
@@ -235,6 +237,8 @@ export interface AgentOptions {
 	requestMaxRetries?: number;
 	/** Provider stream replay retry budget. Counts retries, not the initial attempt. */
 	streamMaxRetries?: number;
+	/** Explicit first-event stream watchdog override in milliseconds. Set to 0 to disable. */
+	streamFirstEventTimeoutMs?: number;
 
 	/**
 	 * Provides tool execution context, resolved per tool call.
@@ -354,6 +358,7 @@ export class Agent {
 	#maxRetryDelayMs?: number;
 	#requestMaxRetries?: number;
 	#streamMaxRetries?: number;
+	#streamFirstEventTimeoutMs?: number;
 	#getToolContext?: (toolCall?: ToolCallContext) => AgentToolContext | undefined;
 	#cursorExecHandlers?: CursorExecHandlers;
 	#cursorOnToolResult?: CursorToolResultHandler;
@@ -361,6 +366,7 @@ export class Agent {
 	#resolveRunningPrompt?: () => void;
 	#runSequence = 0;
 	#activeRunId?: number;
+	#activeResourceRunId?: string;
 	#continuationGeneration = 0;
 	#activeFallbackManaged = false;
 	#kimiApiFormat?: "openai" | "anthropic";
@@ -388,6 +394,7 @@ export class Agent {
 	#cursorToolResultBuffer: CursorToolResultEntry[] = [];
 	#terminalizedLogicalRunIds = new Set<ManagedLogicalRunId>();
 	#managedLogicalRunOwner?: ManagedLogicalRunId;
+	readonly resourceLedger: RunResourceLedger = createRunResourceLedger();
 
 	streamFn: StreamFn;
 	getApiKey?: (provider: string) => Promise<string | undefined> | string | undefined;
@@ -426,6 +433,7 @@ export class Agent {
 		this.#maxRetryDelayMs = opts.maxRetryDelayMs;
 		this.#requestMaxRetries = opts.requestMaxRetries;
 		this.#streamMaxRetries = opts.streamMaxRetries;
+		this.#streamFirstEventTimeoutMs = opts.streamFirstEventTimeoutMs;
 		this.getApiKey = opts.getApiKey;
 		this.getAuthCredentialType = opts.getAuthCredentialType;
 		this.#onPayload = opts.onPayload;
@@ -671,6 +679,14 @@ export class Agent {
 		this.#streamMaxRetries = value;
 	}
 
+	get streamFirstEventTimeoutMs(): number | undefined {
+		return this.#streamFirstEventTimeoutMs;
+	}
+
+	set streamFirstEventTimeoutMs(value: number | undefined) {
+		this.#streamFirstEventTimeoutMs = value;
+	}
+
 	get state(): AgentState {
 		return this.#state;
 	}
@@ -1152,12 +1168,14 @@ export class Agent {
 		this.#state.pendingToolCalls = new Set<string>();
 		this.#abortController = undefined;
 		this.#cursorToolResultBuffer = [];
+		this.resourceLedger.quarantine(this.#activeResourceRunId ?? String(managedLogicalRunId ?? runId));
 		this.#managedLogicalRunOwner = undefined;
 
 		const resolve = this.#resolveRunningPrompt;
 		this.#runningPrompt = undefined;
 		this.#resolveRunningPrompt = undefined;
 		this.#activeRunId = undefined;
+		this.#activeResourceRunId = undefined;
 		resolve?.();
 		if (this.#activeFallbackManaged) {
 			this.requestRunTerminal(managedLogicalRunId ?? runId, { stopReason: "cancelled" });
@@ -1175,6 +1193,10 @@ export class Agent {
 	get activeRunId(): number | undefined {
 		return this.#activeRunId;
 	}
+	/** Stable resource ownership identifier for the active prompt run. */
+	get activeResourceRunId(): string | undefined {
+		return this.#activeResourceRunId;
+	}
 
 	/**
 	 * Stable identifier for the active managed logical run, shared by every retry
@@ -1196,6 +1218,9 @@ export class Agent {
 	 */
 	requestRunTerminal(logicalRunId: ManagedLogicalRunId, request: RunTerminalRequest): boolean {
 		if (this.#terminalizedLogicalRunIds.has(logicalRunId)) return false;
+		if (this.#managedLogicalRunOwner === logicalRunId) {
+			this.#managedLogicalRunOwner = undefined;
+		}
 		this.#finalizeRun(
 			logicalRunId,
 			{
@@ -1339,11 +1364,13 @@ export class Agent {
 		this.#state.isStreaming = true;
 		this.#state.streamMessage = null;
 		this.#state.error = undefined;
-		options?.onRunAccepted?.();
 
 		const fallbackManaged = options?.fallbackManaged === true;
 		const managedLogicalRunOwner = fallbackManaged ? (this.#managedLogicalRunOwner ?? runId) : undefined;
 		const startsManagedLogicalRun = fallbackManaged && this.#managedLogicalRunOwner === undefined;
+		this.#activeResourceRunId = String(managedLogicalRunOwner ?? runId);
+		this.resourceLedger.open(this.#activeResourceRunId);
+		options?.onRunAccepted?.();
 		if (startsManagedLogicalRun) {
 			this.#managedLogicalRunOwner = managedLogicalRunOwner;
 			this.#emit({ type: "agent_start" });
@@ -1355,6 +1382,7 @@ export class Agent {
 			this.#state.isStreaming = false;
 			this.#abortController = undefined;
 			this.#activeRunId = undefined;
+			this.#activeResourceRunId = undefined;
 			this.#runningPrompt = undefined;
 			this.#resolveRunningPrompt = undefined;
 			resolve();
@@ -1428,6 +1456,7 @@ export class Agent {
 			maxRetryDelayMs: this.#maxRetryDelayMs,
 			requestMaxRetries: this.#requestMaxRetries,
 			streamMaxRetries: this.#streamMaxRetries,
+			streamFirstEventTimeoutMs: this.#streamFirstEventTimeoutMs,
 			...(fallbackManaged
 				? {
 						fallbackManaged: true,
@@ -1451,6 +1480,8 @@ export class Agent {
 			onResponse: this.#onResponse,
 			onSseEvent: this.#onSseEvent,
 			signal: abortController.signal,
+			resourceLedger: this.resourceLedger,
+			resourceRunId: this.#activeResourceRunId,
 			getApiKey: this.getApiKey,
 			getAuthCredentialType: this.getAuthCredentialType,
 			getToolContext: this.#getToolContext,
@@ -1697,6 +1728,7 @@ export class Agent {
 				this.#state.pendingToolCalls = new Set<string>();
 				this.#abortController = undefined;
 				this.#activeRunId = undefined;
+				this.#activeResourceRunId = undefined;
 				this.#activeFallbackManaged = false;
 				this.#resolveRunningPrompt?.();
 				this.#runningPrompt = undefined;
@@ -1755,8 +1787,13 @@ export class Agent {
 		if (this.#terminalizedLogicalRunIds.size > 256) {
 			this.#terminalizedLogicalRunIds.delete(this.#terminalizedLogicalRunIds.values().next().value!);
 		}
-		beforeEvent?.();
-		if (event) this.#emit(event);
+		try {
+			beforeEvent?.();
+			if (event) this.#emit(event);
+		} finally {
+			// Publish terminal lifecycle synchronously before sealing the stable handle.
+			this.resourceLedger.seal(String(logicalRunId));
+		}
 	}
 
 	#getAssistantTextLength(message: AgentMessage | null): number {

package/src/compaction/openai.ts

@@ -28,7 +28,7 @@ import {
 	neutralizeResponsesInputControlTokens,
 	normalizeResponsesToolCallId,
 } from "@gajae-code/ai/utils";
-import { $env, logger } from "@gajae-code/utils";
+import { $credentialEnv, logger } from "@gajae-code/utils";
 
 const OPENAI_DEFAULT_BASE_URL = "https://api.openai.com/v1";
 
@@ -81,7 +81,8 @@ function resolveOpenAiCompactEndpoint(model: Model, authCredentialType?: "api_ke
 		return resolveOpenAiCodexCompactEndpoint(model.baseUrl);
 	}
 
-	const envBaseUrl = $env.OPENAI_BASE_URL?.trim();
+	// Trusted sources only: the compaction endpoint carries the OpenAI credential.
+	const envBaseUrl = $credentialEnv("OPENAI_BASE_URL");
 	const configuredBaseUrl = model.baseUrl?.trim();
 	const rawBase =
 		authCredentialType === "oauth"
@@ -94,6 +95,11 @@ function resolveOpenAiCompactEndpoint(model: Model, authCredentialType?: "api_ke
 	return `${normalizedBase}/v1/responses/compact`;
 }
 
+/** Test seam: the compaction endpoint as resolved from trusted env. */
+export function resolveOpenAiCompactEndpointForTest(model: Model, authCredentialType?: "api_key" | "oauth"): string {
+	return resolveOpenAiCompactEndpoint(model, authCredentialType);
+}
+
 function resolveOpenAiCodexCompactEndpoint(baseUrl: string | undefined): string {
 	const rawBase = baseUrl && baseUrl.length > 0 ? baseUrl : CODEX_BASE_URL;
 	const normalizedBase = rawBase.endsWith("/") ? rawBase.slice(0, -1) : rawBase;