@gajae-code/ai 0.16.7 → 0.17.1

package/src/types.d.ts

@@ -4,6 +4,7 @@ import type { AnthropicOptions } from "./providers/anthropic";
 import type { AzureOpenAIResponsesOptions } from "./providers/azure-openai-responses";
 import type { CursorOptions } from "./providers/cursor";
 import type { DeleteArgs, DeleteResult, DiagnosticsArgs, DiagnosticsResult, GrepArgs, GrepResult, LsArgs, LsResult, McpResult, PiBashExecArgs, PiBashExecResult, PiEditExecArgs, PiEditExecResult, PiFindExecArgs, PiFindExecResult, PiGrepExecArgs, PiGrepExecResult, PiLsExecArgs, PiLsExecResult, PiReadExecArgs, PiReadExecResult, PiWriteExecArgs, PiWriteExecResult, ReadArgs, ReadResult, ShellArgs, ShellResult, WriteArgs, WriteResult } from "./providers/cursor/gen/agent_pb";
+import type { DevinAcpConfig, DevinAcpOptions } from "./providers/devin-acp";
 import type { GoogleOptions } from "./providers/google";
 import type { GoogleGeminiCliOptions } from "./providers/google-gemini-cli";
 import type { GoogleVertexOptions } from "./providers/google-vertex";
@@ -16,7 +17,7 @@ import type { AssistantMessageEventStream } from "./utils/event-stream";
 import type { FallbackAttemptToken, TransportFailureFacts } from "./utils/fallback-transport";
 import type { UnicodeEscapeEvidence } from "./utils/json-parse";
 export type { AssistantMessageEventStream } from "./utils/event-stream";
-export type KnownApi = "openai-completions" | "openai-responses" | "openai-codex-responses" | "azure-openai-responses" | "anthropic-messages" | "bedrock-converse-stream" | "google-generative-ai" | "google-gemini-cli" | "google-vertex" | "ollama-chat" | "cursor-agent" | "kiro-codewhisperer-stream";
+export type KnownApi = "openai-completions" | "openai-responses" | "openai-codex-responses" | "azure-openai-responses" | "anthropic-messages" | "bedrock-converse-stream" | "google-generative-ai" | "google-gemini-cli" | "google-vertex" | "ollama-chat" | "cursor-agent" | "devin-acp" | "kiro-codewhisperer-stream";
 export type Api = KnownApi | (string & {});
 export interface ApiOptionsMap {
     "anthropic-messages": AnthropicOptions;
@@ -30,6 +31,7 @@ export interface ApiOptionsMap {
     "google-vertex": GoogleVertexOptions;
     "ollama-chat": OllamaChatOptions;
     "cursor-agent": CursorOptions;
+    "devin-acp": DevinAcpOptions;
     "kiro-codewhisperer-stream": KiroCodeWhispererOptions;
 }
 export type OptionsForApi<TApi extends Api> = StreamOptions | (TApi extends keyof ApiOptionsMap ? ApiOptionsMap[TApi] : never);
@@ -54,7 +56,7 @@ export interface ThinkingConfig {
     /** Provider-specific transport used to encode the selected effort. */
     mode: ThinkingControlMode;
 }
-export declare const KNOWN_PROVIDERS: readonly ["alibaba-token-plan", "amazon-bedrock", "kiro", "azure-openai", "anthropic", "google", "google-gemini-cli", "google-antigravity", "google-vertex", "openai", "openai-codex", "opencodex", "kimi-code", "minimax-code", "minimax-code-cn", "github-copilot", "fireworks", "firepass", "fugu", "gitlab-duo", "cursor", "jetbrains-junie", "deepseek", "deepinfra", "xai", "groq", "cerebras", "openrouter", "kilo", "vercel-ai-gateway", "zai", "glm-zcode", "mistral", "minimax", "opencode-go", "commandcode-goat", "opencode-zen", "opengateway", "bizrouter", "mara", "synthetic", "cloudflare-ai-gateway", "huggingface", "litellm", "moonshot", "nvidia", "nanogpt", "ollama", "ollama-cloud", "qianfan", "qwen-portal", "sglang", "together", "venice", "vllm", "xiaomi", "xiaomi-token-plan-sgp", "xiaomi-token-plan-ams", "xiaomi-token-plan-cn", "zenmux", "lm-studio", "omlx"];
+export declare const KNOWN_PROVIDERS: readonly ["alibaba-token-plan", "amazon-bedrock", "kiro", "azure-openai", "anthropic", "google", "google-gemini-cli", "google-antigravity", "google-vertex", "openai", "openai-codex", "opencodex", "kimi-code", "minimax-code", "minimax-code-cn", "github-copilot", "fireworks", "firepass", "fugu", "gitlab-duo", "cursor", "devin", "jetbrains-junie", "deepseek", "deepinfra", "xai", "groq", "cerebras", "openrouter", "kilo", "vercel-ai-gateway", "zai", "glm-zcode", "mistral", "minimax", "opencode-go", "commandcode-goat", "opencode-zen", "opengateway", "bizrouter", "mara", "synthetic", "cloudflare-ai-gateway", "huggingface", "litellm", "moonshot", "nvidia", "nanogpt", "ollama", "ollama-cloud", "qianfan", "qwen-portal", "sglang", "together", "venice", "vllm", "xiaomi", "xiaomi-token-plan-sgp", "xiaomi-token-plan-ams", "xiaomi-token-plan-cn", "zenmux", "lm-studio", "omlx"];
 export type KnownProvider = (typeof KNOWN_PROVIDERS)[number];
 export declare function isKnownProvider(provider: string): provider is KnownProvider;
 export type Provider = KnownProvider | string;
@@ -251,6 +253,13 @@ export interface StreamOptions {
      * Providers can use this to persist transport/session state between turns.
      */
     providerSessionState?: Map<string, ProviderSessionState>;
+    /**
+     * Set by GJC for internal maintenance/one-shot work (context compaction,
+     * handoff and branch summaries, utility generations) rather than an
+     * interactive user turn. Agent-level providers use it to refuse requests they
+     * cannot serve instead of forwarding them to a billed upstream agent.
+     */
+    maintenanceCall?: boolean;
     /**
      * Optional callback for inspecting or replacing provider payloads before sending.
      * Return undefined to keep the payload unchanged.
@@ -306,6 +315,12 @@ export interface StreamOptions {
     authCredentialType?: "api_key" | "oauth";
     /** Cursor exec/MCP tool handlers (cursor-agent only). */
     execHandlers?: CursorExecHandlers;
+    /**
+     * Devin CLI ACP provider configuration (devin-acp only). When absent, the
+     * provider spawns `devin acp` from PATH (or `GJC_DEVIN_CLI_PATH`) in the
+     * current working directory and applies the default permission policy.
+     */
+    devinAcp?: DevinAcpConfig;
     /** Per-attempt identity for execution attribution. Threaded into onPayload/onResponse calls. */
     attemptScope?: AttemptScopeRef;
 }
@@ -550,6 +565,14 @@ export interface AssistantMessage {
     usage: Usage;
     stopReason: StopReason;
     errorMessage?: string;
+    /**
+     * Bounded, redaction-safe failure classifier for a terminal provider/runtime
+     * failure (a safe token matching `[A-Za-z0-9._-]{1,64}`), e.g.
+     * `upstream_stream_interrupted`. Set by the provider/agent that owns the
+     * classifier; never raw provider text and never a retry-admission fact (retry
+     * policy keys on `transportFailure`, not on this diagnostic).
+     */
+    errorCode?: string;
     errorKind?: AssistantErrorKind;
     /**
      * Structured, shape-only diagnostic for a terminal local staging-buffer
@@ -612,17 +635,35 @@ export interface CursorShellStreamCallbacks {
 export interface CursorPiCall<TArgs> {
     args: TArgs;
     toolCallId: string;
+    /** Per-exec cancellation signal; aborted when the caller aborts or the local exec deadline fires. */
+    signal?: AbortSignal;
+    /** Marks a started mutation that must settle before Cursor can terminalize the exec. */
+    markNonAbortable?: () => void;
 }
 export interface CursorExecHandlers {
-    read?: (args: ReadArgs) => Promise<CursorExecHandlerResult<ReadResult>>;
-    ls?: (args: LsArgs) => Promise<CursorExecHandlerResult<LsResult>>;
-    grep?: (args: GrepArgs) => Promise<CursorExecHandlerResult<GrepResult>>;
-    write?: (args: WriteArgs) => Promise<CursorExecHandlerResult<WriteResult>>;
-    delete?: (args: DeleteArgs) => Promise<CursorExecHandlerResult<DeleteResult>>;
-    shell?: (args: ShellArgs) => Promise<CursorExecHandlerResult<ShellResult>>;
-    shellStream?: (args: ShellArgs, callbacks: CursorShellStreamCallbacks) => Promise<CursorExecHandlerResult<ShellResult>>;
-    diagnostics?: (args: DiagnosticsArgs) => Promise<CursorExecHandlerResult<DiagnosticsResult>>;
-    mcp?: (call: CursorMcpCall) => Promise<CursorExecHandlerResult<McpResult>>;
+    read?: (args: ReadArgs, signal?: AbortSignal, 
+    /** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<ReadResult>>;
+    ls?: (args: LsArgs, signal?: AbortSignal, 
+    /** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<LsResult>>;
+    grep?: (args: GrepArgs, signal?: AbortSignal) => Promise<CursorExecHandlerResult<GrepResult>>;
+    write?: (args: WriteArgs, signal?: AbortSignal, 
+    /** Marks a started non-abortable mutation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<WriteResult>>;
+    delete?: (args: DeleteArgs, signal?: AbortSignal, 
+    /** Marks a started non-abortable mutation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<DeleteResult>>;
+    shell?: (args: ShellArgs, signal?: AbortSignal, 
+    /** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<ShellResult>>;
+    shellStream?: (args: ShellArgs, callbacks: CursorShellStreamCallbacks, signal?: AbortSignal, 
+    /** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<ShellResult>>;
+    diagnostics?: (args: DiagnosticsArgs, signal?: AbortSignal) => Promise<CursorExecHandlerResult<DiagnosticsResult>>;
+    mcp?: (call: CursorMcpCall, signal?: AbortSignal, 
+    /** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+    markNonAbortable?: () => void) => Promise<CursorExecHandlerResult<McpResult>>;
     piRead?: (call: CursorPiCall<PiReadExecArgs>) => Promise<CursorExecHandlerResult<PiReadExecResult>>;
     piBash?: (call: CursorPiCall<PiBashExecArgs>) => Promise<CursorExecHandlerResult<PiBashExecResult>>;
     piEdit?: (call: CursorPiCall<PiEditExecArgs>) => Promise<CursorExecHandlerResult<PiEditExecResult>>;

package/src/types.ts

@@ -34,6 +34,7 @@ import type {
 	WriteArgs,
 	WriteResult,
 } from "./providers/cursor/gen/agent_pb";
+import type { DevinAcpConfig, DevinAcpOptions } from "./providers/devin-acp";
 import type { GoogleOptions } from "./providers/google";
 import type { GoogleGeminiCliOptions } from "./providers/google-gemini-cli";
 import type { GoogleVertexOptions } from "./providers/google-vertex";
@@ -60,6 +61,7 @@ export type KnownApi =
 	| "google-vertex"
 	| "ollama-chat"
 	| "cursor-agent"
+	| "devin-acp"
 	| "kiro-codewhisperer-stream";
 export type Api = KnownApi | (string & {});
 export interface ApiOptionsMap {
@@ -74,6 +76,7 @@ export interface ApiOptionsMap {
 	"google-vertex": GoogleVertexOptions;
 	"ollama-chat": OllamaChatOptions;
 	"cursor-agent": CursorOptions;
+	"devin-acp": DevinAcpOptions;
 	"kiro-codewhisperer-stream": KiroCodeWhispererOptions;
 }
 // Compile-time exhaustiveness check - this will fail if ApiOptionsMap doesn't have all KnownApi keys
@@ -153,6 +156,7 @@ export const KNOWN_PROVIDERS = [
 	"fugu",
 	"gitlab-duo",
 	"cursor",
+	"devin",
 	"jetbrains-junie",
 	"deepseek",
 	"deepinfra",
@@ -455,6 +459,13 @@ export interface StreamOptions {
 	 * Providers can use this to persist transport/session state between turns.
 	 */
 	providerSessionState?: Map<string, ProviderSessionState>;
+	/**
+	 * Set by GJC for internal maintenance/one-shot work (context compaction,
+	 * handoff and branch summaries, utility generations) rather than an
+	 * interactive user turn. Agent-level providers use it to refuse requests they
+	 * cannot serve instead of forwarding them to a billed upstream agent.
+	 */
+	maintenanceCall?: boolean;
 	/**
 	 * Optional callback for inspecting or replacing provider payloads before sending.
 	 * Return undefined to keep the payload unchanged.
@@ -520,6 +531,12 @@ export interface StreamOptions {
 	authCredentialType?: "api_key" | "oauth";
 	/** Cursor exec/MCP tool handlers (cursor-agent only). */
 	execHandlers?: CursorExecHandlers;
+	/**
+	 * Devin CLI ACP provider configuration (devin-acp only). When absent, the
+	 * provider spawns `devin acp` from PATH (or `GJC_DEVIN_CLI_PATH`) in the
+	 * current working directory and applies the default permission policy.
+	 */
+	devinAcp?: DevinAcpConfig;
 	/** Per-attempt identity for execution attribution. Threaded into onPayload/onResponse calls. */
 	attemptScope?: AttemptScopeRef;
 }
@@ -786,6 +803,14 @@ export interface AssistantMessage {
 	usage: Usage;
 	stopReason: StopReason;
 	errorMessage?: string;
+	/**
+	 * Bounded, redaction-safe failure classifier for a terminal provider/runtime
+	 * failure (a safe token matching `[A-Za-z0-9._-]{1,64}`), e.g.
+	 * `upstream_stream_interrupted`. Set by the provider/agent that owns the
+	 * classifier; never raw provider text and never a retry-admission fact (retry
+	 * policy keys on `transportFailure`, not on this diagnostic).
+	 */
+	errorCode?: string;
 	errorKind?: AssistantErrorKind;
 	/**
 	 * Structured, shape-only diagnostic for a terminal local staging-buffer
@@ -854,21 +879,58 @@ export interface CursorShellStreamCallbacks {
 export interface CursorPiCall<TArgs> {
 	args: TArgs;
 	toolCallId: string;
+	/** Per-exec cancellation signal; aborted when the caller aborts or the local exec deadline fires. */
+	signal?: AbortSignal;
+	/** Marks a started mutation that must settle before Cursor can terminalize the exec. */
+	markNonAbortable?: () => void;
 }
 
 export interface CursorExecHandlers {
-	read?: (args: ReadArgs) => Promise<CursorExecHandlerResult<ReadResult>>;
-	ls?: (args: LsArgs) => Promise<CursorExecHandlerResult<LsResult>>;
-	grep?: (args: GrepArgs) => Promise<CursorExecHandlerResult<GrepResult>>;
-	write?: (args: WriteArgs) => Promise<CursorExecHandlerResult<WriteResult>>;
-	delete?: (args: DeleteArgs) => Promise<CursorExecHandlerResult<DeleteResult>>;
-	shell?: (args: ShellArgs) => Promise<CursorExecHandlerResult<ShellResult>>;
+	read?: (
+		args: ReadArgs,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<ReadResult>>;
+	ls?: (
+		args: LsArgs,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<LsResult>>;
+	grep?: (args: GrepArgs, signal?: AbortSignal) => Promise<CursorExecHandlerResult<GrepResult>>;
+	write?: (
+		args: WriteArgs,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable mutation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<WriteResult>>;
+	delete?: (
+		args: DeleteArgs,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable mutation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<DeleteResult>>;
+	shell?: (
+		args: ShellArgs,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<ShellResult>>;
 	shellStream?: (
 		args: ShellArgs,
 		callbacks: CursorShellStreamCallbacks,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
 	) => Promise<CursorExecHandlerResult<ShellResult>>;
-	diagnostics?: (args: DiagnosticsArgs) => Promise<CursorExecHandlerResult<DiagnosticsResult>>;
-	mcp?: (call: CursorMcpCall) => Promise<CursorExecHandlerResult<McpResult>>;
+	diagnostics?: (args: DiagnosticsArgs, signal?: AbortSignal) => Promise<CursorExecHandlerResult<DiagnosticsResult>>;
+	mcp?: (
+		call: CursorMcpCall,
+		signal?: AbortSignal,
+		/** Marks a started non-abortable operation so the exec terminal waits for settlement. */
+		markNonAbortable?: () => void,
+	) => Promise<CursorExecHandlerResult<McpResult>>;
 	piRead?: (call: CursorPiCall<PiReadExecArgs>) => Promise<CursorExecHandlerResult<PiReadExecResult>>;
 	piBash?: (call: CursorPiCall<PiBashExecArgs>) => Promise<CursorExecHandlerResult<PiBashExecResult>>;
 	piEdit?: (call: CursorPiCall<PiEditExecArgs>) => Promise<CursorExecHandlerResult<PiEditExecResult>>;

package/src/utils/block-symbols.d.ts

@@ -1,6 +1,16 @@
-export declare const kCursorExecResolved: unique symbol;
-export type CursorExecResolvedCarrier = object & {
-    [kCursorExecResolved]?: true;
+/**
+ * Provider-resolved tool-call markers.
+ *
+ * A provider that executes a tool call itself (Cursor exec-owned calls, or an
+ * agent-level ACP provider such as Devin, whose agent runs its own tools) marks
+ * the emitted `toolCall` block with this symbol. The agent loop then treats the
+ * call as display-only and never dispatches it to a GJC tool. Symbols are used
+ * instead of a wire field so the marker exists only in-process and can never
+ * round-trip through a transcript or a provider payload.
+ */
+export declare const kProviderResolvedToolCall: unique symbol;
+export type ProviderResolvedCarrier = object & {
+    [kProviderResolvedToolCall]?: true;
 };
-export declare function isCursorExecResolved(block: CursorExecResolvedCarrier | null | undefined): boolean;
-export declare function copyCursorExecResolved(target: CursorExecResolvedCarrier, source: CursorExecResolvedCarrier): void;
+export declare function isProviderResolvedToolCall(block: ProviderResolvedCarrier | null | undefined): boolean;
+export declare function copyProviderResolvedToolCall(target: ProviderResolvedCarrier, source: ProviderResolvedCarrier): void;

package/src/utils/block-symbols.ts

@@ -1,11 +1,21 @@
-export const kCursorExecResolved = Symbol("provider.block.cursorExecResolved");
+/**
+ * Provider-resolved tool-call markers.
+ *
+ * A provider that executes a tool call itself (Cursor exec-owned calls, or an
+ * agent-level ACP provider such as Devin, whose agent runs its own tools) marks
+ * the emitted `toolCall` block with this symbol. The agent loop then treats the
+ * call as display-only and never dispatches it to a GJC tool. Symbols are used
+ * instead of a wire field so the marker exists only in-process and can never
+ * round-trip through a transcript or a provider payload.
+ */
+export const kProviderResolvedToolCall: unique symbol = Symbol.for("@gajae-code/ai.provider-resolved-tool-call.v1");
 
-export type CursorExecResolvedCarrier = object & { [kCursorExecResolved]?: true };
+export type ProviderResolvedCarrier = object & { [kProviderResolvedToolCall]?: true };
 
-export function isCursorExecResolved(block: CursorExecResolvedCarrier | null | undefined): boolean {
-	return block?.[kCursorExecResolved] === true;
+export function isProviderResolvedToolCall(block: ProviderResolvedCarrier | null | undefined): boolean {
+	return block?.[kProviderResolvedToolCall] === true;
 }
 
-export function copyCursorExecResolved(target: CursorExecResolvedCarrier, source: CursorExecResolvedCarrier): void {
-	if (source[kCursorExecResolved] === true) target[kCursorExecResolved] = true;
+export function copyProviderResolvedToolCall(target: ProviderResolvedCarrier, source: ProviderResolvedCarrier): void {
+	if (source[kProviderResolvedToolCall] === true) target[kProviderResolvedToolCall] = true;
 }

package/src/utils/discovery/cursor.ts

@@ -5,6 +5,7 @@ import { getBundledModels } from "../../models";
 import { CURSOR_CLIENT_VERSION } from "../../providers/cursor/client-version";
 import { GetUsableModelsRequestSchema, GetUsableModelsResponseSchema } from "../../providers/cursor/gen/agent_pb";
 import type { Model } from "../../types";
+import { isSafeCatalogModelId } from "./openai-compatible";
 
 const CURSOR_DEFAULT_BASE_URL = "https://api2.cursor.sh";
 const CURSOR_GET_USABLE_MODELS_PATH = "/agent.v1.AgentService/GetUsableModels";
@@ -331,10 +332,10 @@ function normalizeCursorModel(
 	}
 
 	const details = parsedModel.data;
-	const id = details.modelId.trim();
-	if (!id) {
+	if (!isSafeCatalogModelId(details.modelId)) {
 		return null;
 	}
+	const id = details.modelId.trim();
 
 	const name = pickModelDisplayName(details, id);
 	const reference = references.get(id);

package/src/utils/fallback-transport.d.ts

@@ -1,4 +1,4 @@
-export type FallbackTriggerClass = "rate_limit" | "quota" | "auth" | "server" | "unknown" | "other";
+export type FallbackTriggerClass = "rate_limit" | "quota" | "auth" | "credential" | "server" | "unknown" | "other";
 /**
  * Refinement of an `auth` trigger.
  *
@@ -50,6 +50,8 @@ export interface TransportFailureFacts {
     anthropicErrorType?: string;
     /** OpenAI's typed `error.code`, preserved separately at the transport boundary. */
     openaiErrorCode?: string;
+    /** Provider-authoritative model rejection that is specific to the active credential. */
+    credentialModelUnavailable?: true;
     headers?: Record<string, string>;
     /** Safe request-size observation for retry amplification policy. Never contains body content. */
     requestBytes?: number;
@@ -84,6 +86,7 @@ export interface FallbackTriggerInput {
     status?: number;
     providerCode?: string;
     code?: string;
+    credentialModelUnavailable?: boolean;
     headers?: TransportHeaders;
     response?: {
         status?: number;

package/src/utils/fallback-transport.ts

@@ -1,4 +1,4 @@
-export type FallbackTriggerClass = "rate_limit" | "quota" | "auth" | "server" | "unknown" | "other";
+export type FallbackTriggerClass = "rate_limit" | "quota" | "auth" | "credential" | "server" | "unknown" | "other";
 
 /**
  * Refinement of an `auth` trigger.
@@ -55,6 +55,8 @@ export interface TransportFailureFacts {
 	anthropicErrorType?: string;
 	/** OpenAI's typed `error.code`, preserved separately at the transport boundary. */
 	openaiErrorCode?: string;
+	/** Provider-authoritative model rejection that is specific to the active credential. */
+	credentialModelUnavailable?: true;
 	headers?: Record<string, string>;
 	/** Safe request-size observation for retry amplification policy. Never contains body content. */
 	requestBytes?: number;
@@ -109,6 +111,7 @@ export interface FallbackTriggerInput {
 	status?: number;
 	providerCode?: string;
 	code?: string;
+	credentialModelUnavailable?: boolean;
 	headers?: TransportHeaders;
 	response?: { status?: number; headers?: TransportHeaders };
 	error?: { code?: string; type?: string };
@@ -239,6 +242,7 @@ export function transportFailureFacts(
 	const endpointClassValue = propertyOf(value, "endpointClass");
 	const endpointClass =
 		endpointClassValue === "canonical" || endpointClassValue === "custom" ? endpointClassValue : undefined;
+	const credentialModelUnavailable = propertyOf(value, "credentialModelUnavailable") === true;
 	if (
 		status === undefined &&
 		headers === undefined &&
@@ -253,6 +257,7 @@ export function transportFailureFacts(
 		// must not materialize facts that would disqualify an unrelated
 		// bare-default retry.
 		providerCode !== SERVER_OVERLOADED_PROVIDER_CODE &&
+		!credentialModelUnavailable &&
 		requestBytes === undefined &&
 		firstEventElapsedMs === undefined &&
 		firstEventTimeoutMs === undefined &&
@@ -267,6 +272,7 @@ export function transportFailureFacts(
 		providerCode,
 		anthropicErrorType,
 		openaiErrorCode,
+		...(credentialModelUnavailable ? { credentialModelUnavailable: true as const } : {}),
 		headers,
 		...(requestBytes === undefined ? {} : { requestBytes }),
 		...(firstEventElapsedMs === undefined ? {} : { firstEventElapsedMs }),
@@ -379,10 +385,11 @@ export function classifyFallbackTrigger(
 	// classify without a status, so it is matched case-sensitively — the same
 	// exactness the parser and the session admission use.
 	const rawCode = rawCodes[0] ?? rawCodes[1] ?? rawCodes[2];
-	const triggerClass: FallbackTriggerClass =
-		code === STREAM_FIRST_EVENT_TIMEOUT_PROVIDER_CODE ||
-		code === EMPTY_RESPONSE_PROVIDER_CODE ||
-		(facts.status === undefined && rawCode === SERVER_OVERLOADED_PROVIDER_CODE)
+	const triggerClass: FallbackTriggerClass = facts.credentialModelUnavailable
+		? "credential"
+		: code === STREAM_FIRST_EVENT_TIMEOUT_PROVIDER_CODE ||
+				code === EMPTY_RESPONSE_PROVIDER_CODE ||
+				(facts.status === undefined && rawCode === SERVER_OVERLOADED_PROVIDER_CODE)
 			? "server"
 			: isQuotaCode(code)
 				? "quota"

package/src/utils.d.ts

@@ -7,6 +7,19 @@ export declare function toNumber(value: unknown): number | undefined;
 export declare function toPositiveNumber(value: unknown, fallback: number): number;
 export declare function toBoolean(value: unknown): boolean | undefined;
 export declare function normalizeToolCallId(id: string): string;
+/**
+ * Wire-facing tool call id for a canonical ToolCall served to a foreign client.
+ *
+ * Responses-backed upstreams (Codex, OpenAI Responses) encode the tool call as
+ * `${call_id}|${item_id}` in `ToolCall.id` so their own replay can recover the
+ * item id. That encoding is gjc-internal: a downstream OpenAI-format client
+ * (OpenCodex, another gjc) truncates the compound value at its own 64-char
+ * limit and can no longer pair its tool output with the call it echoed back,
+ * so the whole chained turn is rejected with "No tool output found". Emit only
+ * the `call_id` half on the wire; the item id travels separately as the item
+ * `id` where the wire format has one.
+ */
+export declare function wireToolCallId(id: string): string;
 type ResponsesToolItemIdPrefix = "fc" | "ctc";
 export declare function normalizeResponsesToolCallId(id: string, itemPrefix?: ResponsesToolItemIdPrefix): {
     callId: string;

package/src/utils.ts

@@ -64,6 +64,23 @@ export function normalizeToolCallId(id: string): string {
 	return sanitized.length > 64 ? sanitized.slice(0, 64) : sanitized;
 }
 
+/**
+ * Wire-facing tool call id for a canonical ToolCall served to a foreign client.
+ *
+ * Responses-backed upstreams (Codex, OpenAI Responses) encode the tool call as
+ * `${call_id}|${item_id}` in `ToolCall.id` so their own replay can recover the
+ * item id. That encoding is gjc-internal: a downstream OpenAI-format client
+ * (OpenCodex, another gjc) truncates the compound value at its own 64-char
+ * limit and can no longer pair its tool output with the call it echoed back,
+ * so the whole chained turn is rejected with "No tool output found". Emit only
+ * the `call_id` half on the wire; the item id travels separately as the item
+ * `id` where the wire format has one.
+ */
+export function wireToolCallId(id: string): string {
+	const separator = id.indexOf("|");
+	return separator === -1 ? id : id.slice(0, separator);
+}
+
 type ResponsesToolItemIdPrefix = "fc" | "ctc";
 
 export function normalizeResponsesToolCallId(

package/dist/types/utils/codex-entitlement.d.ts

@@ -1,22 +0,0 @@
-/**
- * Model entitlement facts shared by Codex credential selection and provider
- * error presentation.
- *
- * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
- * authority for the account tier; this module only names the model policy and
- * keeps the provider's deterministic rejection wording in one place.
- */
-export type OpenAICodexProEntitlement = "entitled" | "denied" | "unknown";
-/**
- * Classify a ChatGPT `plan_type` for strict Pro-tier Codex models.
- *
- * The usage endpoint remains authoritative: only exact, documented tier names
- * are classified. Known Free/Plus tiers can be rejected locally, while missing
- * or unfamiliar values stay unknown and reach the provider instead of being
- * guessed from a substring.
- */
-export declare function classifyOpenAICodexProEntitlement(planType: string | undefined): OpenAICodexProEntitlement;
-export declare function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
-export declare function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
-export declare function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean;
-export declare function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string;

package/src/utils/codex-entitlement.d.ts

@@ -1,22 +0,0 @@
-/**
- * Model entitlement facts shared by Codex credential selection and provider
- * error presentation.
- *
- * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
- * authority for the account tier; this module only names the model policy and
- * keeps the provider's deterministic rejection wording in one place.
- */
-export type OpenAICodexProEntitlement = "entitled" | "denied" | "unknown";
-/**
- * Classify a ChatGPT `plan_type` for strict Pro-tier Codex models.
- *
- * The usage endpoint remains authoritative: only exact, documented tier names
- * are classified. Known Free/Plus tiers can be rejected locally, while missing
- * or unfamiliar values stay unknown and reach the provider instead of being
- * guessed from a substring.
- */
-export declare function classifyOpenAICodexProEntitlement(planType: string | undefined): OpenAICodexProEntitlement;
-export declare function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
-export declare function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean;
-export declare function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean;
-export declare function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string;

package/src/utils/codex-entitlement.ts

@@ -1,57 +0,0 @@
-/**
- * Model entitlement facts shared by Codex credential selection and provider
- * error presentation.
- *
- * GPT-5.6 Sol is a Pro-tier ChatGPT Codex model. The usage endpoint is the
- * authority for the account tier; this module only names the model policy and
- * keeps the provider's deterministic rejection wording in one place.
- */
-
-const OPENAI_CODEX_PRO_ENTITLED_PLAN_TYPES = new Set(["pro", "business", "enterprise", "team"]);
-const OPENAI_CODEX_PRO_DENIED_PLAN_TYPES = new Set(["free", "plus"]);
-
-export type OpenAICodexProEntitlement = "entitled" | "denied" | "unknown";
-
-/**
- * Classify a ChatGPT `plan_type` for strict Pro-tier Codex models.
- *
- * The usage endpoint remains authoritative: only exact, documented tier names
- * are classified. Known Free/Plus tiers can be rejected locally, while missing
- * or unfamiliar values stay unknown and reach the provider instead of being
- * guessed from a substring.
- */
-export function classifyOpenAICodexProEntitlement(planType: string | undefined): OpenAICodexProEntitlement {
-	const normalized = planType?.trim().toLowerCase();
-	if (!normalized) return "unknown";
-	if (OPENAI_CODEX_PRO_ENTITLED_PLAN_TYPES.has(normalized)) return "entitled";
-	if (OPENAI_CODEX_PRO_DENIED_PLAN_TYPES.has(normalized)) return "denied";
-	return "unknown";
-}
-
-export function requiresOpenAICodexProModel(provider: string, modelId: string | undefined): boolean {
-	return (
-		provider === "openai-codex" &&
-		typeof modelId === "string" &&
-		(modelId.toLowerCase().includes("-spark") || modelId.toLowerCase() === "gpt-5.6-sol")
-	);
-}
-
-export function requiresStrictOpenAICodexProModel(provider: string, modelId: string | undefined): boolean {
-	return provider === "openai-codex" && modelId?.toLowerCase() === "gpt-5.6-sol";
-}
-
-export function isOpenAICodexChatGPTEntitlementError(message: string | undefined, code?: string): boolean {
-	return (
-		/\bnot supported when using codex with a chatgpt account\b/i.test(message ?? "") &&
-		(code === undefined || code.toLowerCase() === "invalid_request_error")
-	);
-}
-
-export function formatOpenAICodexChatGPTEntitlementError(modelId: string | undefined): string {
-	const safeModelId = modelId
-		?.replace(/[\x00-\x1f\x7f-\x9f]+/gu, " ")
-		.trim()
-		.slice(0, 128);
-	const model = safeModelId ? ` model "${safeModelId}"` : " model";
-	return `This ChatGPT Codex account cannot use${model}. Select a model available to this ChatGPT account, such as "gpt-5.5", or use an API-key credential that supports the model.`;
-}