llm-cli-gateway 2.13.2 → 2.14.0

package/dist/index.js

@@ -10,15 +10,18 @@ import { z } from "zod/v3";
 import { executeCli, killAllProcessGroups, providerCommandName } from "./executor.js";
 import { parseStreamJson } from "./stream-json-parser.js";
 import { parseCodexJsonStream, codexDisplayText, codexFrResponse } from "./codex-json-parser.js";
+import { grokDisplayText } from "./grok-json-parser.js";
+import { extractProviderOutputMetadata } from "./provider-output-metadata.js";
 import { parseGeminiJson, parseGeminiStreamJson } from "./gemini-json-parser.js";
 import { parseVibeMetaJson } from "./mistral-meta-json-parser.js";
 import { homedir } from "os";
 import { CLI_TYPES, PROVIDER_TYPES, createSessionManager, callerIsRemote, remoteSafeSession, } from "./session-manager.js";
 import { createWorktree, createWorktreeSessionCleanupHook, } from "./worktree-manager.js";
 import { ResourceProvider } from "./resources.js";
+import { generateResourceDescriptors, generateProviderAcpDescriptors, } from "./provider-surface-generator.js";
 import { PerformanceMetrics } from "./metrics.js";
 import { estimateTokens, optimizePrompt as optimizePromptText, optimizeResponse as optimizeResponseText, } from "./optimizer.js";
-import { loadConfig, loadPersistenceConfig, loadCacheAwarenessConfig, loadProvidersConfig, loadAcpConfig, loadLimitsConfig, defaultGatewayConfigPath, isXaiProviderEnabled, enabledApiProviders, minStableTokensForModel, } from "./config.js";
+import { loadConfig, loadPersistenceConfig, loadCacheAwarenessConfig, loadProvidersConfig, loadAcpConfig, loadAdminConfig, loadLimitsConfig, defaultGatewayConfigPath, isXaiProviderEnabled, enabledApiProviders, minStableTokensForModel, } from "./config.js";
 import { runAcpRequest } from "./acp/runtime.js";
 import { isAcpError } from "./acp/errors.js";
 import { redactSecrets } from "./secret-redaction.js";
@@ -27,12 +30,15 @@ import { prepareApiRequest, apiProviderCatalogEntry, ApiModelNotAllowedError, }
 import { checkHealth } from "./health.js";
 import { clearModelRegistryCache, getAvailableCliInfo, getCliInfo, resolveModelAlias, } from "./model-registry.js";
 import { getProviderToolCapabilities } from "./provider-tool-capabilities.js";
+import { getProviderDefinition, DEVIN_ACP_AGENT_TYPES, } from "./provider-definitions.js";
+import { buildProviderDiscoveredView, peekProviderCapabilitySet, warmProviderCapabilities, } from "./provider-capability-resolver.js";
+import { registerProviderAdminTools } from "./provider-admin-tools.js";
 import { AsyncJobManager, JobSaturationError, isAsyncJobInProgress, extractApiHttpStatus, extractApiErrorBody, } from "./async-job-manager.js";
 import { createJobStore } from "./job-store.js";
 import { ApprovalManager, bypassAllowedByOperator, } from "./approval-manager.js";
 import { checkReviewIntegrity } from "./review-integrity.js";
 import { buildClaudeMcpConfig, CLAUDE_MCP_SERVER_NAMES, } from "./claude-mcp-config.js";
-import { resolveGrokSessionArgs, resolveMistralSessionArgs, resolveCodexSessionArgs, sanitizeCliArgValues, prepareMistralRequest as buildMistralCliInvocation, GATEWAY_SESSION_PREFIX, resolveClaudePermissionFlags, resolveCodexSandboxFlags, CLAUDE_PERMISSION_MODES, GEMINI_APPROVAL_MODES, CODEX_SANDBOX_MODES, CODEX_ASK_FOR_APPROVAL_MODES, CLAUDE_EFFORT_LEVELS, prepareClaudeHighImpactFlags, validateClaudeAgentsMap, prepareCodexHighImpactFlags, prepareCodexForkRequest, CODEX_CONFIG_OVERRIDES_SCHEMA, resolveGeminiSessionPlan, GEMINI_HIGH_IMPACT_PARAMS_SCHEMA, } from "./request-helpers.js";
+import { resolveGrokSessionArgs, resolveMistralSessionArgs, resolveCodexSessionArgs, sanitizeCliArgValues, prepareMistralRequest as buildMistralCliInvocation, GATEWAY_SESSION_PREFIX, resolveClaudePermissionFlags, resolveCodexSandboxFlags, CLAUDE_PERMISSION_MODES, GEMINI_APPROVAL_MODES, CODEX_SANDBOX_MODES, CODEX_ASK_FOR_APPROVAL_MODES, CODEX_LOCAL_PROVIDERS, CODEX_COLOR_MODES, CLAUDE_EFFORT_LEVELS, prepareClaudeHighImpactFlags, validateClaudeAgentsMap, prepareCodexHighImpactFlags, prepareCodexForkRequest, CODEX_CONFIG_OVERRIDES_SCHEMA, resolveGeminiSessionPlan, GEMINI_HIGH_IMPACT_PARAMS_SCHEMA, } from "./request-helpers.js";
 import { createFlightRecorder } from "./flight-recorder.js";
 import { resolvePromptInput, PromptPartsSchema, assembleClaudeCacheBlocks, } from "./prompt-parts.js";
 import { computeSessionCacheStats, computeTtlRemaining, readPersistedRequest, PERSISTED_REQUEST_DEFAULT_MAX_CHARS, } from "./cache-stats.js";
@@ -237,6 +243,7 @@ let persistenceConfig = null;
 let cacheAwarenessConfig = null;
 let providersConfig = null;
 let acpConfig = null;
+let adminConfig = null;
 let limitsConfig = null;
 let jobStore = null;
 let jobStoreInitialized = false;
@@ -258,6 +265,10 @@ function getAcpConfig(runtimeLogger = logger) {
     acpConfig ??= loadAcpConfig(runtimeLogger);
     return acpConfig;
 }
+function getAdminConfig(runtimeLogger = logger) {
+    adminConfig ??= loadAdminConfig(runtimeLogger);
+    return adminConfig;
+}
 function getCacheAwarenessConfig(runtimeLogger = logger) {
     cacheAwarenessConfig ??= loadCacheAwarenessConfig(runtimeLogger);
     return cacheAwarenessConfig;
@@ -280,9 +291,17 @@ function getJobStore(runtimeLogger = logger) {
     return jobStore;
 }
 function newAsyncJobManager(metrics, runtimeLogger, store = getJobStore(runtimeLogger), fr = getFlightRecorder(runtimeLogger)) {
+    const pc = getPersistenceConfig(runtimeLogger);
     return new AsyncJobManager(runtimeLogger, (cli, durationMs, success) => {
         metrics.recordRequest(cli, durationMs, success);
-    }, store, fr, getLimitsConfig(runtimeLogger).jobs);
+    }, store, fr, getLimitsConfig(runtimeLogger).jobs, true, {
+        instanceHeartbeatMs: pc.instanceHeartbeatMs,
+        instanceLeaseTtlMs: pc.instanceLeaseTtlMs,
+        httpJobGraceMs: pc.httpJobGraceMs,
+        orphanSweepIntervalMs: pc.orphanSweepIntervalMs,
+        instanceGcMs: pc.instanceGcMs,
+        role: process.argv.includes("--transport=http") ? "http" : "stdio",
+    });
 }
 function getAsyncJobManager(runtimeLogger = logger) {
     asyncJobManager ??= newAsyncJobManager(performanceMetrics, runtimeLogger);
@@ -299,6 +318,91 @@ function mcpServerEnum() {
 }
 const CLI_TYPE_ENUM = z.enum(CLI_TYPES);
 export const MAX_TURNS_SCHEMA = z.number().int().positive().safe().max(10_000);
+const CLAUDE_PART_A_FIELDS = {
+    includeHookEvents: z
+        .boolean()
+        .optional()
+        .describe("Claude --include-hook-events: include all hook lifecycle events in the output stream. Only takes effect with outputFormat=stream-json (the default)."),
+    replayUserMessages: z
+        .boolean()
+        .optional()
+        .describe("Claude --replay-user-messages: re-emit user messages from stdin back on stdout for acknowledgment. Only works with input-format=stream-json and outputFormat=stream-json (the cacheControl path)."),
+    systemPromptFile: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Claude --system-prompt-file: replace the system prompt from a file path (path variant of systemPrompt)."),
+    appendSystemPromptFile: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Claude --append-system-prompt-file: append a system prompt from a file path (path variant of appendSystemPrompt)."),
+    name: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Claude --name: display name for this session (shown in pickers/titles)."),
+    pluginDir: z
+        .array(z.string())
+        .optional()
+        .describe("Claude --plugin-dir: load a plugin from a directory or .zip for this session only. One --plugin-dir instance per entry."),
+    pluginUrl: z
+        .array(z.string())
+        .optional()
+        .describe("Claude --plugin-url: load a plugin .zip from a URL for this session only. One --plugin-url instance per entry."),
+    safeMode: z
+        .boolean()
+        .optional()
+        .describe("Claude --safe-mode: start with all customizations (CLAUDE.md, skills, plugins, hooks, MCP, commands, agents) disabled for troubleshooting. Explicit opt-in."),
+    bare: z
+        .boolean()
+        .optional()
+        .describe("Claude --bare: minimal mode (skip hooks, LSP, plugin sync, attribution, auto-memory, keychain reads, CLAUDE.md auto-discovery). Explicit opt-in."),
+    debug: z
+        .union([z.string(), z.boolean()])
+        .optional()
+        .describe('Claude -d/--debug: enable debug mode. true emits a bare --debug; a string emits --debug <filter> (e.g. "api,hooks"). Debug output goes to stderr only.'),
+    debugFile: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Claude --debug-file: write debug logs to a specific file path (enables debug mode)."),
+};
+const CODEX_PART_A_FIELDS = {
+    enable: z
+        .array(z.string())
+        .optional()
+        .describe("Codex --enable <FEATURE> (repeatable): enable a feature for this run (equivalent to -c features.<name>=true). Accepted on resume."),
+    disable: z
+        .array(z.string())
+        .optional()
+        .describe("Codex --disable <FEATURE> (repeatable): disable a feature for this run (equivalent to -c features.<name>=false). Accepted on resume."),
+    strictConfig: z
+        .boolean()
+        .optional()
+        .describe("Codex --strict-config: error out when config.toml contains fields not recognized by this Codex version. New sessions only."),
+    oss: z
+        .boolean()
+        .optional()
+        .describe("Codex --oss: use the open-source provider. New sessions only."),
+    localProvider: z
+        .enum(CODEX_LOCAL_PROVIDERS)
+        .optional()
+        .describe("Codex --local-provider: local OSS provider (lmstudio|ollama), used with oss. New sessions only."),
+    color: z
+        .enum(CODEX_COLOR_MODES)
+        .optional()
+        .describe("Codex --color: output color mode (always|never|auto). New sessions only."),
+    outputLastMessage: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Codex -o/--output-last-message <FILE>: write the agent's last message to a file. New sessions only."),
+    dangerouslyBypassHookTrust: z
+        .boolean()
+        .optional()
+        .describe("Codex --dangerously-bypass-hook-trust: run enabled hooks without persisted hook trust for this invocation. DANGEROUS. Explicit opt-in; never defaulted on."),
+};
 const GROK_GENERATED_SHAPE = deriveZodShapeFromGeneration(UPSTREAM_CLI_CONTRACTS.grok, GROK_FLAG_GENERATION);
 export const MAX_TOKENS_SCHEMA = z.number().int().positive().safe().max(100_000_000);
 export const MAX_PRICE_SCHEMA = z.number().positive().finite().min(1e-6).max(10_000);
@@ -367,7 +471,7 @@ export function resolveGatewayServerRuntime(deps = {}, options = {}) {
         sessionManager: runtimeSessionManager,
         resourceProvider: deps.resourceProvider ??
             (options.isolateState
-                ? new ResourceProvider(runtimeSessionManager, runtimePerformanceMetrics, runtimeFlightRecorder, deps.cacheAwareness ?? getCacheAwarenessConfig(runtimeLogger), deps.providers ?? getProvidersConfig(runtimeLogger))
+                ? new ResourceProvider(runtimeSessionManager, runtimePerformanceMetrics, runtimeFlightRecorder, deps.cacheAwareness ?? getCacheAwarenessConfig(runtimeLogger), deps.providers ?? getProvidersConfig(runtimeLogger), undefined, deps.acpConfig ?? getAcpConfig(runtimeLogger))
                 : resourceProvider),
         db: "db" in deps ? (deps.db ?? null) : db,
         performanceMetrics: runtimePerformanceMetrics,
@@ -379,6 +483,7 @@ export function resolveGatewayServerRuntime(deps = {}, options = {}) {
         cacheAwareness: deps.cacheAwareness ?? getCacheAwarenessConfig(runtimeLogger),
         providers: deps.providers ?? getProvidersConfig(runtimeLogger),
         acpConfig: deps.acpConfig ?? getAcpConfig(runtimeLogger),
+        adminConfig: deps.adminConfig ?? getAdminConfig(runtimeLogger),
         workspaces: deps.workspaces ?? loadWorkspaceRegistry(runtimeLogger),
     };
 }
@@ -419,12 +524,28 @@ export async function runAcpTransport(deps, params) {
             model: params.model,
             sessionId: params.sessionId,
             correlationId: corrId,
+            agentType: params.agentType,
         });
+        const stop = result.stopReason;
+        const normalStop = stop === null || stop === "end_turn";
+        let warning = null;
+        if (!normalStop) {
+            warning =
+                `provider ended the turn with stop_reason=${stop}` +
+                    (result.text.trim().length === 0 ? " and produced no output" : "") +
+                    "; the response may be partial or refused.";
+        }
+        else if (result.text.trim().length === 0) {
+            warning =
+                "provider produced no assistant output (possible no-op, guardrail, or awaited input).";
+        }
+        const banner = `[gateway] transport=acp session=${result.gatewaySessionId}` +
+            (warning ? `\n[gateway] warning: ${warning}` : "");
         return {
             content: [
                 {
                     type: "text",
-                    text: `[gateway] transport=acp session=${result.gatewaySessionId}\n${result.text}`,
+                    text: `${banner}\n${result.text}`,
                 },
             ],
         };
@@ -460,7 +581,7 @@ async function awaitJobOrDefer(cli, args, corrId, idleTimeoutMs, outputFormat, f
     }
     const deferralAvailable = runtime.persistence.backend !== "none" &&
         runtime.persistence.asyncJobsEnabled &&
-        runtime.asyncJobManager.hasStore();
+        runtime.asyncJobManager.canAdmitDurableJobs();
     if (SYNC_DEADLINE_MS === 0 || !deferralAvailable) {
         const command = providerCommandName(cli);
         let slot;
@@ -549,7 +670,7 @@ async function awaitApiJobOrDefer(provider, apiRequest, corrId, runtime = resolv
     };
     const deferralAvailable = runtime.persistence.backend !== "none" &&
         runtime.persistence.asyncJobsEnabled &&
-        runtime.asyncJobManager.hasStore();
+        runtime.asyncJobManager.canAdmitDurableJobs();
     if (SYNC_DEADLINE_MS === 0 || !deferralAvailable || forceInline) {
         let slot;
         try {
@@ -1153,7 +1274,7 @@ function resolveClaudeMcpConfig(operation, correlationId, requestedMcpServers, s
     }
     return { config: mcpConfig };
 }
-function registerBaseResources(server, runtime) {
+export function registerBaseResources(server, runtime) {
     for (const skill of loadedSkills) {
         server.registerResource(`skill-${skill.name}`, `skills://${skill.name}`, {
             title: skill.name,
@@ -1179,96 +1300,30 @@ function registerBaseResources(server, runtime) {
         const contents = await runtime.resourceProvider.readResource(uri.href);
         return { contents: contents ? [contents] : [] };
     });
-    server.registerResource("claude-sessions", "sessions://claude", {
-        title: "🤖 Claude Sessions",
-        description: "Claude conversation sessions",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Claude sessions resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("codex-sessions", "sessions://codex", {
-        title: "💻 Codex Sessions",
-        description: "Codex conversation sessions",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Codex sessions resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("gemini-sessions", "sessions://gemini", {
-        title: "✨ Gemini Sessions",
-        description: "Gemini conversation sessions",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Gemini sessions resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("grok-sessions", "sessions://grok", {
-        title: "⚡ Grok Sessions",
-        description: "Grok conversation sessions",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Grok sessions resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("mistral-sessions", "sessions://mistral", {
-        title: "🌬 Mistral Sessions",
-        description: "Mistral Vibe conversation sessions",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Mistral sessions resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("claude-models", "models://claude", {
-        title: "🧠 Claude Models",
-        description: "Claude models and capabilities",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Claude models resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("codex-models", "models://codex", {
-        title: "🔧 Codex Models",
-        description: "Codex models and capabilities",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Codex models resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("gemini-models", "models://gemini", {
-        title: "🌟 Gemini Models",
-        description: "Gemini models and capabilities",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Gemini models resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("grok-models", "models://grok", {
-        title: "⚡ Grok Models",
-        description: "Grok models and capabilities",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Grok models resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
-    server.registerResource("mistral-models", "models://mistral", {
-        title: "🌬 Mistral Models",
-        description: "Mistral Vibe models and capabilities",
-        mimeType: "application/json",
-    }, async (uri) => {
-        runtime.logger.debug("Reading Mistral models resource");
-        const contents = await runtime.resourceProvider.readResource(uri.href);
-        return { contents: contents ? [contents] : [] };
-    });
+    for (const descriptor of generateResourceDescriptors()) {
+        if (descriptor.exposesSessionsResource) {
+            server.registerResource(`${descriptor.provider}-sessions`, descriptor.sessionsUri, {
+                title: `${descriptor.icon} ${descriptor.sessionLabel}s`,
+                description: `${descriptor.displayName} conversation sessions`,
+                mimeType: "application/json",
+            }, async (uri) => {
+                runtime.logger.debug(`Reading ${descriptor.sessionsUri} resource`);
+                const contents = await runtime.resourceProvider.readResource(uri.href);
+                return { contents: contents ? [contents] : [] };
+            });
+        }
+        if (descriptor.exposesModelsResource) {
+            server.registerResource(`${descriptor.provider}-models`, descriptor.modelsUri, {
+                title: `${descriptor.icon} ${descriptor.displayName} Models & Capabilities`,
+                description: `${descriptor.displayName} models and capabilities`,
+                mimeType: "application/json",
+            }, async (uri) => {
+                runtime.logger.debug(`Reading ${descriptor.modelsUri} resource`);
+                const contents = await runtime.resourceProvider.readResource(uri.href);
+                return { contents: contents ? [contents] : [] };
+            });
+        }
+    }
     server.registerResource("performance-metrics", "metrics://performance", {
         title: "📈 Performance Metrics",
         description: "Request counts, latency, success/failure rates",
@@ -1380,9 +1435,30 @@ function registerBaseResources(server, runtime) {
         const contents = await runtime.resourceProvider.readResource(uri.href);
         return { contents: contents ? [contents] : [] };
     });
-    const validationReceiptStore = runtime.persistence.backend === "sqlite"
-        ? runtime.asyncJobManager.getValidationRunStore()
-        : null;
+    for (const descriptor of generateProviderAcpDescriptors()) {
+        server.registerResource(`${descriptor.provider}-provider-acp`, descriptor.acpUri, {
+            title: `${descriptor.icon} ${descriptor.displayName} ACP Capabilities`,
+            description: `Native ACP entrypoint, negotiated capabilities, supported session methods, and host-service policy for ${descriptor.displayName}`,
+            mimeType: "application/json",
+        }, async (uri) => {
+            runtime.logger.debug(`Reading ${descriptor.acpUri} resource`);
+            const contents = await runtime.resourceProvider.readResource(uri.href);
+            return { contents: contents ? [contents] : [] };
+        });
+    }
+    server.registerResource("provider-acp", new ResourceTemplate("provider-acp://{provider}", { list: undefined }), {
+        title: "Provider ACP Capabilities",
+        description: "Read-only negotiated ACP capability record for one provider CLI (native: false for providers with no native ACP entrypoint)",
+        mimeType: "application/json",
+    }, async (uri, variables) => {
+        const provider = Array.isArray(variables.provider)
+            ? variables.provider[0]
+            : variables.provider;
+        runtime.logger.debug(`Reading provider-acp://${provider}`);
+        const contents = await runtime.resourceProvider.readResource(uri.href);
+        return { contents: contents ? [contents] : [] };
+    });
+    const validationReceiptStore = runtime.asyncJobManager?.getValidationRunStore();
     if (validationReceiptStore) {
         server.registerResource("validation-receipt", new ResourceTemplate("validation-receipt://{validationId}", { list: undefined }), {
             title: "Validation Receipt",
@@ -1428,10 +1504,33 @@ function resolvePromptOrPartsForPrep(args) {
         stablePrefixTokens: resolved.stablePrefixTokens,
     };
 }
+function remoteHostPathFieldError(operation, corrId, fields) {
+    const ctx = getRequestContext();
+    const isRemote = ctx?.transport === "http" || ctx?.authKind === "oauth";
+    if (!isRemote)
+        return null;
+    const present = Object.entries(fields)
+        .filter(([, v]) => (Array.isArray(v) ? v.length > 0 : v !== undefined && v !== null))
+        .map(([k]) => k);
+    if (present.length === 0)
+        return null;
+    return createErrorResponse(operation, 1, `Remote HTTP/OAuth requests may not use host-path or plugin fields: ${present.join(", ")}. ` +
+        `These are restricted to local callers; supply content inline or reference a registered workspace.`, corrId);
+}
 export function prepareClaudeRequest(params, runtime = resolveGatewayServerRuntime()) {
     const corrId = params.correlationId || randomUUID();
     const cliInfo = getCliInfo();
     const resolvedModel = resolveModelAlias("claude", params.model, cliInfo);
+    const remoteFieldErr = remoteHostPathFieldError(params.operation, corrId, {
+        settings: params.settings,
+        systemPromptFile: params.systemPromptFile,
+        appendSystemPromptFile: params.appendSystemPromptFile,
+        pluginDir: params.pluginDir,
+        pluginUrl: params.pluginUrl,
+        debugFile: params.debugFile,
+    });
+    if (remoteFieldErr)
+        return remoteFieldErr;
     const inputResolution = resolvePromptOrPartsForPrep({
         prompt: params.prompt,
         promptParts: params.promptParts,
@@ -1651,6 +1750,17 @@ export function prepareClaudeRequest(params, runtime = resolveGatewayServerRunti
         settingSources: params.settingSources,
         settings: params.settings,
         tools: params.tools,
+        includeHookEvents: params.includeHookEvents,
+        replayUserMessages: params.replayUserMessages,
+        systemPromptFile: params.systemPromptFile,
+        appendSystemPromptFile: params.appendSystemPromptFile,
+        name: params.name,
+        pluginDir: params.pluginDir,
+        pluginUrl: params.pluginUrl,
+        safeMode: params.safeMode,
+        bare: params.bare,
+        debug: params.debug,
+        debugFile: params.debugFile,
     }));
     return {
         corrId,
@@ -1673,6 +1783,13 @@ export function prepareCodexRequest(params, runtime = resolveGatewayServerRuntim
     const corrId = params.correlationId || randomUUID();
     const cliInfo = getCliInfo();
     const resolvedModel = resolveModelAlias("codex", params.model, cliInfo);
+    const remoteFieldErr = remoteHostPathFieldError(params.operation, corrId, {
+        outputSchema: typeof params.outputSchema === "string" ? params.outputSchema : undefined,
+        images: params.images,
+        outputLastMessage: params.outputLastMessage,
+    });
+    if (remoteFieldErr)
+        return remoteFieldErr;
     const inputResolution = resolvePromptOrPartsForPrep({
         prompt: params.prompt,
         promptParts: params.promptParts,
@@ -1751,6 +1868,9 @@ export function prepareCodexRequest(params, runtime = resolveGatewayServerRuntim
     if (params.dangerouslyBypassApprovalsAndSandbox) {
         args.push("--dangerously-bypass-approvals-and-sandbox");
     }
+    if (params.dangerouslyBypassHookTrust) {
+        args.push("--dangerously-bypass-hook-trust");
+    }
     args.push("--json");
     args.push("--skip-git-repo-check");
     let highImpactCleanup;
@@ -1763,6 +1883,21 @@ export function prepareCodexRequest(params, runtime = resolveGatewayServerRuntim
                 args.push("--add-dir", dir);
             }
         }
+        if (params.oss) {
+            args.push("--oss");
+        }
+        if (params.localProvider) {
+            args.push("--local-provider", params.localProvider);
+        }
+        if (params.strictConfig) {
+            args.push("--strict-config");
+        }
+        if (params.color) {
+            args.push("--color", params.color);
+        }
+        if (params.outputLastMessage !== undefined) {
+            args.push("--output-last-message", params.outputLastMessage);
+        }
         const high = prepareCodexHighImpactFlags({
             outputSchema: params.outputSchema,
             search: params.search,
@@ -1772,6 +1907,8 @@ export function prepareCodexRequest(params, runtime = resolveGatewayServerRuntim
             images: params.images,
             ignoreUserConfig: params.ignoreUserConfig,
             ignoreRules: params.ignoreRules,
+            enable: params.enable,
+            disable: params.disable,
         });
         if (high.missingImagePath) {
             return createErrorResponse(params.operation, 1, "", corrId, new Error(`images: path does not exist: ${high.missingImagePath}`));
@@ -1795,6 +1932,8 @@ export function prepareCodexRequest(params, runtime = resolveGatewayServerRuntim
             images: params.images,
             ignoreUserConfig: params.ignoreUserConfig,
             ignoreRules: params.ignoreRules,
+            enable: params.enable,
+            disable: params.disable,
         });
         if (high.missingImagePath) {
             return createErrorResponse(params.operation, 1, "", corrId, new Error(`images: path does not exist: ${high.missingImagePath}`));
@@ -1924,6 +2063,9 @@ export function prepareGeminiRequest(params, runtime = resolveGatewayServerRunti
     if (params.newProject) {
         args.push("--new-project");
     }
+    if (params.printTimeout !== undefined && params.printTimeout !== "") {
+        args.push("--print-timeout", params.printTimeout);
+    }
     return {
         corrId,
         effectivePrompt,
@@ -1940,6 +2082,14 @@ export function prepareGrokRequest(params, runtime = resolveGatewayServerRuntime
     const corrId = params.correlationId || randomUUID();
     const cliInfo = getCliInfo();
     const resolvedModel = resolveModelAlias("grok", params.model, cliInfo);
+    const remoteFieldErr = remoteHostPathFieldError(params.operation, corrId, {
+        promptFile: params.promptFile,
+        leaderSocket: params.leaderSocket,
+        rules: params.rules,
+        agent: params.agent,
+    });
+    if (remoteFieldErr)
+        return remoteFieldErr;
     const inputResolution = resolvePromptOrPartsForPrep({
         prompt: params.prompt,
         promptParts: params.promptParts,
@@ -2202,6 +2352,9 @@ export function buildCliResponse(cli, stdout, optimizeResponse, corrId, sessionI
     if (cli === "codex" && outputFormat !== "json") {
         finalStdout = codexDisplayText(stdout);
     }
+    if (cli === "grok") {
+        finalStdout = grokDisplayText(outputFormat, stdout);
+    }
     if (optimizeResponse && outputFormat !== "json") {
         const optimized = optimizeResponseText(finalStdout);
         logOptimizationTokens("response", corrId, finalStdout, optimized);
@@ -2217,11 +2370,11 @@ export function buildCliResponse(cli, stdout, optimizeResponse, corrId, sessionI
     }
     const derivedWarnings = [];
     const extraStructured = {};
-    let claudeResultError = false;
+    let resultError = false;
     if (cli === "claude") {
         const parsedResult = parseStreamJson(stdout);
         if (parsedResult.isError) {
-            claudeResultError = true;
+            resultError = true;
             extraStructured.resultIsError = true;
             derivedWarnings.push({
                 code: "claude_result_error",
@@ -2234,8 +2387,27 @@ export function buildCliResponse(cli, stdout, optimizeResponse, corrId, sessionI
         if (parsedCodex.threadId) {
             extraStructured.codexSessionId = parsedCodex.threadId;
         }
+        if (parsedCodex.error) {
+            resultError = true;
+            extraStructured.resultIsError = true;
+            derivedWarnings.push({
+                code: "codex_result_error",
+                message: `Codex exited 0 but reported a failed turn: ${parsedCodex.error}. The returned text may be partial.`,
+            });
+        }
     }
-    if (!claudeResultError && finalStdout.trim().length === 0) {
+    if (cli === "gemini") {
+        const parsedGemini = outputFormat === "stream-json" ? parseGeminiStreamJson(stdout) : parseGeminiJson(stdout);
+        if (parsedGemini?.stopReason === "error") {
+            resultError = true;
+            extraStructured.resultIsError = true;
+            derivedWarnings.push({
+                code: "gemini_result_error",
+                message: "Gemini exited 0 but the result event reported status:error. The returned text may be partial.",
+            });
+        }
+    }
+    if (!resultError && finalStdout.trim().length === 0) {
         extraStructured.emptyOutput = true;
         derivedWarnings.push({
             code: "empty_output",
@@ -2973,6 +3145,7 @@ export async function handleGeminiRequest(deps, params) {
         yolo: params.yolo,
         project: params.project,
         newProject: params.newProject,
+        printTimeout: params.printTimeout,
     }, runtime);
     if (!("args" in prep))
         return prep;
@@ -3061,6 +3234,7 @@ export async function handleGeminiRequest(deps, params) {
             }
         }
         const geminiUsage = extractUsageAndCost("gemini", stdout, params.outputFormat);
+        const geminiMeta = extractProviderOutputMetadata("gemini", stdout, params.outputFormat);
         safeFlightComplete(corrId, {
             response: stdout,
             durationMs,
@@ -3075,6 +3249,8 @@ export async function handleGeminiRequest(deps, params) {
             cacheReadTokens: geminiUsage.cacheReadTokens,
             cacheCreationTokens: geminiUsage.cacheCreationTokens,
             costUsd: geminiUsage.costUsd,
+            providerSessionId: geminiMeta.sessionId,
+            stopReason: geminiMeta.stopReason,
         }, runtime);
         return response;
     }
@@ -3122,6 +3298,7 @@ export async function handleGeminiRequestAsync(deps, params) {
         yolo: params.yolo,
         project: params.project,
         newProject: params.newProject,
+        printTimeout: params.printTimeout,
     }, runtime);
     if (!("args" in prep))
         return prep;
@@ -3343,6 +3520,7 @@ export async function handleGrokRequest(deps, params) {
                 first.text = formatWorktreePrefix(worktreeResolution.worktreePath) + first.text;
             }
         }
+        const grokMeta = extractProviderOutputMetadata("grok", stdout, params.outputFormat);
         safeFlightComplete(corrId, {
             response: stdout,
             durationMs,
@@ -3352,6 +3530,8 @@ export async function handleGrokRequest(deps, params) {
             optimizationApplied: params.optimizePrompt || (params.optimizeResponse ?? false),
             exitCode: 0,
             status: "completed",
+            providerSessionId: grokMeta.sessionId,
+            stopReason: grokMeta.stopReason,
         }, runtime);
         return response;
     }
@@ -3506,6 +3686,14 @@ export async function handleGrokRequestAsync(deps, params) {
 }
 export function prepareDevinRequest(params, _runtime) {
     const corrId = params.correlationId ?? randomUUID();
+    const remoteFieldErr = remoteHostPathFieldError(params.operation, corrId, {
+        promptFile: params.promptFile,
+        config: params.config,
+        agentConfig: params.agentConfig,
+        exportSession: typeof params.exportSession === "string" ? params.exportSession : undefined,
+    });
+    if (remoteFieldErr)
+        return remoteFieldErr;
     let prompt = (params.prompt ?? "").trim();
     if (!prompt) {
         return createErrorResponse(params.operation, 1, "prompt is required and cannot be empty", corrId);
@@ -3520,6 +3708,21 @@ export function prepareDevinRequest(params, _runtime) {
         args.push("--permission-mode", params.permissionMode);
     if (params.promptFile)
         args.push("--prompt-file", params.promptFile);
+    if (params.config)
+        args.push("--config", params.config);
+    if (params.sandbox)
+        args.push("--sandbox");
+    if (typeof params.exportSession === "string") {
+        args.push("--export", params.exportSession);
+    }
+    else if (params.exportSession === true) {
+        args.push("--export");
+    }
+    if (params.respectWorkspaceTrust !== undefined) {
+        args.push("--respect-workspace-trust", params.respectWorkspaceTrust ? "true" : "false");
+    }
+    if (params.agentConfig)
+        args.push("--agent-config", params.agentConfig);
     return {
         corrId,
         effectivePrompt: prompt,
@@ -3539,6 +3742,7 @@ export async function handleDevinRequest(deps, params) {
             model: params.model,
             sessionId: params.sessionId,
             correlationId: params.correlationId,
+            agentType: params.agentType,
         });
     }
     const runtime = resolveHandlerRuntime(deps);
@@ -3548,6 +3752,11 @@ export async function handleDevinRequest(deps, params) {
         model: params.model,
         permissionMode: params.permissionMode,
         promptFile: params.promptFile,
+        config: params.config,
+        sandbox: params.sandbox,
+        exportSession: params.exportSession,
+        respectWorkspaceTrust: params.respectWorkspaceTrust,
+        agentConfig: params.agentConfig,
         correlationId: params.correlationId,
         optimizePrompt: params.optimizePrompt,
         operation: "devin_request",
@@ -3651,6 +3860,11 @@ export async function handleDevinRequestAsync(deps, params) {
         model: params.model,
         permissionMode: params.permissionMode,
         promptFile: params.promptFile,
+        config: params.config,
+        sandbox: params.sandbox,
+        exportSession: params.exportSession,
+        respectWorkspaceTrust: params.respectWorkspaceTrust,
+        agentConfig: params.agentConfig,
         correlationId: params.correlationId,
         optimizePrompt: params.optimizePrompt,
         operation: "devin_request_async",
@@ -4355,6 +4569,14 @@ export async function handleCodexRequestAsync(deps, params) {
         ignoreRules: params.ignoreRules,
         workingDir: params.workingDir,
         addDir: params.addDir,
+        enable: params.enable,
+        disable: params.disable,
+        strictConfig: params.strictConfig,
+        oss: params.oss,
+        localProvider: params.localProvider,
+        color: params.color,
+        outputLastMessage: params.outputLastMessage,
+        dangerouslyBypassHookTrust: params.dangerouslyBypassHookTrust,
     }, runtime);
     if (!("args" in prep))
         return prep;
@@ -4459,9 +4681,14 @@ export function createGatewayServer(deps = {}) {
     registerValidationTools(server, {
         asyncJobManager,
         apiProviders: enabledApiProviders(providers),
-        validationRunStore: persistence.backend === "sqlite" ? asyncJobManager.getValidationRunStore() : null,
+        validationRunStore: asyncJobManager.getValidationRunStore(),
     });
     registerWorkspaceTools(server, runtime);
+    registerProviderAdminTools(server, {
+        approvalManager: runtime.approvalManager,
+        logger: runtime.logger,
+        allowMutatingCliAdminOps: runtime.adminConfig.allowMutatingCliAdminOps,
+    });
     const apiProviderTools = registerApiProviderTools(server, runtime, providers, asyncJobsEnabled);
     if (apiProviderTools.length > 0) {
         runtime.logger.info(`Registered API provider tools: ${apiProviderTools.join(", ")}`);
@@ -4650,6 +4877,7 @@ export function createGatewayServer(deps = {}) {
             .array(z.string())
             .optional()
             .describe('Claude --tools: restrict the available built-in tool set (distinct from allowedTools permission gating). Pass [""] to disable all tools.'),
+        ...CLAUDE_PART_A_FIELDS,
         workspace: providerWorkspaceAliasSchema(),
         worktree: WORKTREE_SCHEMA.optional(),
         approvalStrategy: z
@@ -4685,7 +4913,7 @@ export function createGatewayServer(deps = {}) {
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: true,
-    }, async ({ prompt, promptParts, model, outputFormat, sessionId, continueSession, createNewSession, allowedTools, disallowedTools, dangerouslySkipPermissions, permissionMode, agent, agents, forkSession, systemPrompt, appendSystemPrompt, maxBudgetUsd, maxTurns, effort, excludeDynamicSystemPromptSections, fallbackModel, jsonSchema, addDir, noSessionPersistence, settingSources, settings, tools, workspace, worktree, approvalStrategy, approvalPolicy, mcpServers, strictMcpConfig, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, }) => {
+    }, async ({ prompt, promptParts, model, outputFormat, sessionId, continueSession, createNewSession, allowedTools, disallowedTools, dangerouslySkipPermissions, permissionMode, agent, agents, forkSession, systemPrompt, appendSystemPrompt, maxBudgetUsd, maxTurns, effort, excludeDynamicSystemPromptSections, fallbackModel, jsonSchema, addDir, noSessionPersistence, settingSources, settings, tools, includeHookEvents, replayUserMessages, systemPromptFile, appendSystemPromptFile, name, pluginDir, pluginUrl, safeMode, bare, debug, debugFile, workspace, worktree, approvalStrategy, approvalPolicy, mcpServers, strictMcpConfig, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, }) => {
         const startTime = Date.now();
         if (systemPrompt !== undefined && appendSystemPrompt !== undefined) {
             return createErrorResponse("claude", 1, "", correlationId, new Error("systemPrompt and appendSystemPrompt are mutually exclusive; use one or the other (not both)."));
@@ -4722,6 +4950,17 @@ export function createGatewayServer(deps = {}) {
             settingSources,
             settings,
             tools,
+            includeHookEvents,
+            replayUserMessages,
+            systemPromptFile,
+            appendSystemPromptFile,
+            name,
+            pluginDir,
+            pluginUrl,
+            safeMode,
+            bare,
+            debug,
+            debugFile,
         }, runtime);
         if (!("args" in prep))
             return prep;
@@ -4849,6 +5088,8 @@ export function createGatewayServer(deps = {}) {
                     optimizationApplied: optimizePrompt || optimizeResponse,
                     exitCode: 0,
                     status: "completed",
+                    providerSessionId: parsed.sessionId ?? undefined,
+                    stopReason: parsed.stopReason ?? undefined,
                 }, runtime);
                 const streamResponse = buildCliResponse("claude", parsed.text, optimizeResponse, corrId, effectiveSessionId, prep, durationMs, undefined, outputFormat, warnings);
                 if (worktreeResolution.worktreePath) {
@@ -4859,6 +5100,7 @@ export function createGatewayServer(deps = {}) {
                 }
                 return streamResponse;
             }
+            const claudeMeta = extractProviderOutputMetadata("claude", stdout, outputFormat);
             safeFlightComplete(corrId, {
                 response: stdout,
                 durationMs,
@@ -4867,6 +5109,8 @@ export function createGatewayServer(deps = {}) {
                 optimizationApplied: optimizePrompt || optimizeResponse,
                 exitCode: 0,
                 status: "completed",
+                providerSessionId: claudeMeta.sessionId,
+                stopReason: claudeMeta.stopReason,
             }, runtime);
             const nonStreamResponse = buildCliResponse("claude", stdout, optimizeResponse, corrId, effectiveSessionId, prep, durationMs, undefined, outputFormat, warnings);
             if (worktreeResolution.worktreePath) {
@@ -5005,6 +5249,7 @@ export function createGatewayServer(deps = {}) {
             .optional()
             .describe("Codex --add-dir <DIR>: additional writable workspace directories. Emitted once per entry on new sessions only; resume inherits the original session's writable-dir policy." +
             LOCAL_ADD_DIR_FIELD_SUFFIX),
+        ...CODEX_PART_A_FIELDS,
         workspace: providerWorkspaceAliasSchema(),
         worktree: WORKTREE_SCHEMA.optional(),
     }, {
@@ -5013,7 +5258,7 @@ export function createGatewayServer(deps = {}) {
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: true,
-    }, async ({ prompt, promptParts, model, fullAuto, sandboxMode, askForApproval, useLegacyFullAutoFlag, dangerouslyBypassApprovalsAndSandbox, approvalStrategy, approvalPolicy, mcpServers, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, outputFormat, outputSchema, search, profile, configOverrides, ephemeral, images, ignoreUserConfig, ignoreRules, workingDir, addDir, workspace, worktree, }) => {
+    }, async ({ prompt, promptParts, model, fullAuto, sandboxMode, askForApproval, useLegacyFullAutoFlag, dangerouslyBypassApprovalsAndSandbox, approvalStrategy, approvalPolicy, mcpServers, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, outputFormat, outputSchema, search, profile, configOverrides, ephemeral, images, ignoreUserConfig, ignoreRules, workingDir, addDir, enable, disable, strictConfig, oss, localProvider, color, outputLastMessage, dangerouslyBypassHookTrust, workspace, worktree, }) => {
         const startTime = Date.now();
         const prep = prepareCodexRequest({
             prompt,
@@ -5044,6 +5289,14 @@ export function createGatewayServer(deps = {}) {
             ignoreRules,
             workingDir,
             addDir,
+            enable,
+            disable,
+            strictConfig,
+            oss,
+            localProvider,
+            color,
+            outputLastMessage,
+            dangerouslyBypassHookTrust,
         }, runtime);
         if (!("args" in prep))
             return prep;
@@ -5102,7 +5355,12 @@ export function createGatewayServer(deps = {}) {
                     errorMessage: stderr || `Exit code ${code}`,
                     status: "failed",
                 }, runtime);
-                const codexErrorDetail = stderr && stderr.trim().length > 0 ? stderr : codexDisplayText(stdout);
+                const parsedCodexError = parseCodexJsonStream(stdout).error;
+                const codexErrorDetail = stderr && stderr.trim().length > 0
+                    ? stderr
+                    : parsedCodexError && parsedCodexError.trim().length > 0
+                        ? parsedCodexError
+                        : codexDisplayText(stdout);
                 const codexResumeHint = sessionId &&
                     /not found|no such|unknown session|does not exist|invalid session/i.test(codexErrorDetail)
                     ? `\n\nSession ${sessionId} could not be resumed. Codex session IDs are UUIDs under ~/.codex/sessions/; verify the id, omit sessionId, or set createNewSession:true.`
@@ -5130,6 +5388,7 @@ export function createGatewayServer(deps = {}) {
             }
             logger.info(`[${corrId}] codex_request completed successfully in ${durationMs}ms`);
             const codexUsage = extractUsageAndCost("codex", stdout, outputFormat);
+            const codexMeta = extractProviderOutputMetadata("codex", stdout, outputFormat);
             safeFlightComplete(corrId, {
                 response: codexFrResponse(outputFormat, stdout),
                 durationMs,
@@ -5143,6 +5402,8 @@ export function createGatewayServer(deps = {}) {
                 cacheReadTokens: codexUsage.cacheReadTokens,
                 cacheCreationTokens: codexUsage.cacheCreationTokens,
                 costUsd: codexUsage.costUsd,
+                providerSessionId: codexMeta.sessionId,
+                stopReason: codexMeta.stopReason,
             }, runtime);
             const codexResponse = buildCliResponse("codex", stdout, optimizeResponse, corrId, effectiveSessionId, prep, durationMs, undefined, outputFormat);
             if (worktreeResolution.worktreePath) {
@@ -5264,7 +5525,12 @@ export function createGatewayServer(deps = {}) {
             const { stdout, stderr, code } = result;
             durationMs = Math.max(0, Date.now() - startTime);
             if (code !== 0) {
-                const codexErrorDetail = stderr && stderr.trim().length > 0 ? stderr : codexDisplayText(stdout);
+                const parsedCodexError = parseCodexJsonStream(stdout).error;
+                const codexErrorDetail = stderr && stderr.trim().length > 0
+                    ? stderr
+                    : parsedCodexError && parsedCodexError.trim().length > 0
+                        ? parsedCodexError
+                        : codexDisplayText(stdout);
                 const codexResumeHint = sessionId &&
                     /not found|no such|unknown session|does not exist|invalid session/i.test(codexErrorDetail)
                     ? `\n\nSession ${sessionId} could not be resumed. Codex session IDs are UUIDs under ~/.codex/sessions/; verify the id, omit sessionId, or set createNewSession:true.`
@@ -5368,6 +5634,11 @@ export function createGatewayServer(deps = {}) {
             .boolean()
             .optional()
             .describe("Antigravity 1.0.13 --new-project: create a new project for this session. Mutually exclusive with project."),
+        printTimeout: z
+            .string()
+            .min(1)
+            .optional()
+            .describe("Antigravity --print-timeout <DURATION>: print-mode wait timeout as a Go duration string (e.g. '5m0s', '30s')."),
         workspace: providerWorkspaceAliasSchema(),
         worktree: WORKTREE_SCHEMA.optional(),
     }, {
@@ -5376,7 +5647,7 @@ export function createGatewayServer(deps = {}) {
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: true,
-    }, async ({ prompt, promptParts, model, sessionId, resumeLatest, createNewSession, approvalMode, approvalStrategy, approvalPolicy, mcpServers, allowedTools, includeDirs, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, outputFormat, sandbox, policyFiles, adminPolicyFiles, attachments, skipTrust, yolo, project, newProject, workspace, worktree, }) => {
+    }, async ({ prompt, promptParts, model, sessionId, resumeLatest, createNewSession, approvalMode, approvalStrategy, approvalPolicy, mcpServers, allowedTools, includeDirs, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, outputFormat, sandbox, policyFiles, adminPolicyFiles, attachments, skipTrust, yolo, project, newProject, printTimeout, workspace, worktree, }) => {
         return handleGeminiRequest({ sessionManager, logger, runtime }, {
             prompt,
             promptParts,
@@ -5404,6 +5675,7 @@ export function createGatewayServer(deps = {}) {
             yolo,
             project,
             newProject,
+            printTimeout,
             workspace,
             worktree,
         });
@@ -5577,6 +5849,27 @@ export function createGatewayServer(deps = {}) {
             .string()
             .optional()
             .describe("Load the initial prompt from a file (--prompt-file)"),
+        config: z.string().optional().describe("Config file path (Devin --config <PATH>)"),
+        sandbox: z
+            .boolean()
+            .optional()
+            .describe("Run the Devin session in a sandbox (Devin --sandbox). Safety control: never defaulted on; pass true to opt in."),
+        exportSession: z
+            .union([z.boolean(), z.string()])
+            .optional()
+            .describe("Export the session (Devin --export [<PATH>]). true emits a bare --export; a string path emits --export <path>."),
+        respectWorkspaceTrust: z
+            .boolean()
+            .optional()
+            .describe("Respect workspace trust (Devin --respect-workspace-trust <bool>). Devin defaults true for interactive and false for print mode; set explicitly to override."),
+        agentConfig: z
+            .string()
+            .optional()
+            .describe("Agent config file path (Devin --agent-config <FILE>)"),
+        agentType: z
+            .enum(DEVIN_ACP_AGENT_TYPES)
+            .optional()
+            .describe("ACP agent variant for transport=acp (`devin acp --agent-type`): 'summarizer' (no tools, text summary) or 'review' (read-only + shell code-review). Ignored for the CLI transport."),
         sessionId: z
             .string()
             .optional()
@@ -5606,13 +5899,19 @@ export function createGatewayServer(deps = {}) {
         destructiveHint: true,
         idempotentHint: false,
         openWorldHint: true,
-    }, async ({ prompt, model, transport, permissionMode, promptFile, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, }) => {
+    }, async ({ prompt, model, transport, permissionMode, promptFile, config, sandbox, exportSession, respectWorkspaceTrust, agentConfig, agentType, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, }) => {
         return handleDevinRequest({ sessionManager, logger, runtime }, {
             prompt,
             model,
             transport,
             permissionMode,
             promptFile,
+            config,
+            sandbox,
+            exportSession,
+            respectWorkspaceTrust,
+            agentConfig,
+            agentType,
             sessionId,
             resumeLatest,
             createNewSession,
@@ -5959,6 +6258,7 @@ export function createGatewayServer(deps = {}) {
                 .array(z.string())
                 .optional()
                 .describe('Claude --tools: restrict the available built-in tool set (distinct from allowedTools permission gating). Pass [""] to disable all tools.'),
+            ...CLAUDE_PART_A_FIELDS,
             workspace: providerWorkspaceAliasSchema(),
             worktree: WORKTREE_SCHEMA.optional(),
             approvalStrategy: z
@@ -5993,7 +6293,7 @@ export function createGatewayServer(deps = {}) {
             destructiveHint: true,
             idempotentHint: false,
             openWorldHint: true,
-        }, async ({ prompt, promptParts, model, outputFormat, sessionId, continueSession, createNewSession, allowedTools, disallowedTools, dangerouslySkipPermissions, permissionMode, agent, agents, forkSession, systemPrompt, appendSystemPrompt, maxBudgetUsd, maxTurns, effort, excludeDynamicSystemPromptSections, fallbackModel, jsonSchema, addDir, noSessionPersistence, settingSources, settings, tools, workspace, worktree, approvalStrategy, approvalPolicy, mcpServers, strictMcpConfig, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, }) => {
+        }, async ({ prompt, promptParts, model, outputFormat, sessionId, continueSession, createNewSession, allowedTools, disallowedTools, dangerouslySkipPermissions, permissionMode, agent, agents, forkSession, systemPrompt, appendSystemPrompt, maxBudgetUsd, maxTurns, effort, excludeDynamicSystemPromptSections, fallbackModel, jsonSchema, addDir, noSessionPersistence, settingSources, settings, tools, includeHookEvents, replayUserMessages, systemPromptFile, appendSystemPromptFile, name, pluginDir, pluginUrl, safeMode, bare, debug, debugFile, workspace, worktree, approvalStrategy, approvalPolicy, mcpServers, strictMcpConfig, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, }) => {
             if (systemPrompt !== undefined && appendSystemPrompt !== undefined) {
                 return createErrorResponse("claude", 1, "", correlationId, new Error("systemPrompt and appendSystemPrompt are mutually exclusive; use one or the other (not both)."));
             }
@@ -6029,6 +6329,17 @@ export function createGatewayServer(deps = {}) {
                 settingSources,
                 settings,
                 tools,
+                includeHookEvents,
+                replayUserMessages,
+                systemPromptFile,
+                appendSystemPromptFile,
+                name,
+                pluginDir,
+                pluginUrl,
+                safeMode,
+                bare,
+                debug,
+                debugFile,
             }, runtime);
             if (!("args" in prep))
                 return prep;
@@ -6216,6 +6527,7 @@ export function createGatewayServer(deps = {}) {
                 .optional()
                 .describe("Codex --add-dir <DIR>: additional writable workspace directories (repeat per entry). New sessions only." +
                 LOCAL_ADD_DIR_FIELD_SUFFIX),
+            ...CODEX_PART_A_FIELDS,
             workspace: providerWorkspaceAliasSchema(),
             worktree: WORKTREE_SCHEMA.optional(),
         }, {
@@ -6224,7 +6536,7 @@ export function createGatewayServer(deps = {}) {
             destructiveHint: true,
             idempotentHint: false,
             openWorldHint: true,
-        }, async ({ prompt, promptParts, model, fullAuto, sandboxMode, askForApproval, useLegacyFullAutoFlag, dangerouslyBypassApprovalsAndSandbox, approvalStrategy, approvalPolicy, mcpServers, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, outputFormat, outputSchema, search, profile, configOverrides, ephemeral, images, ignoreUserConfig, ignoreRules, workingDir, addDir, workspace, worktree, }) => {
+        }, async ({ prompt, promptParts, model, fullAuto, sandboxMode, askForApproval, useLegacyFullAutoFlag, dangerouslyBypassApprovalsAndSandbox, approvalStrategy, approvalPolicy, mcpServers, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, outputFormat, outputSchema, search, profile, configOverrides, ephemeral, images, ignoreUserConfig, ignoreRules, workingDir, addDir, enable, disable, strictConfig, oss, localProvider, color, outputLastMessage, dangerouslyBypassHookTrust, workspace, worktree, }) => {
             return handleCodexRequestAsync({ sessionManager, asyncJobManager, logger, runtime }, {
                 prompt,
                 promptParts,
@@ -6255,6 +6567,14 @@ export function createGatewayServer(deps = {}) {
                 ignoreRules,
                 workingDir,
                 addDir,
+                enable,
+                disable,
+                strictConfig,
+                oss,
+                localProvider,
+                color,
+                outputLastMessage,
+                dangerouslyBypassHookTrust,
                 workspace,
                 worktree,
             });
@@ -6343,6 +6663,11 @@ export function createGatewayServer(deps = {}) {
                 .boolean()
                 .optional()
                 .describe("Antigravity 1.0.13 --new-project: create a new project for this session. Mutually exclusive with project."),
+            printTimeout: z
+                .string()
+                .min(1)
+                .optional()
+                .describe("Antigravity --print-timeout <DURATION>: print-mode wait timeout as a Go duration string (e.g. '5m0s', '30s')."),
             workspace: providerWorkspaceAliasSchema(),
             worktree: WORKTREE_SCHEMA.optional(),
         }, {
@@ -6351,7 +6676,7 @@ export function createGatewayServer(deps = {}) {
             destructiveHint: true,
             idempotentHint: false,
             openWorldHint: true,
-        }, async ({ prompt, promptParts, model, sessionId, resumeLatest, createNewSession, approvalMode, approvalStrategy, approvalPolicy, mcpServers, allowedTools, includeDirs, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, outputFormat, sandbox, policyFiles, adminPolicyFiles, attachments, skipTrust, yolo, project, newProject, workspace, worktree, }) => {
+        }, async ({ prompt, promptParts, model, sessionId, resumeLatest, createNewSession, approvalMode, approvalStrategy, approvalPolicy, mcpServers, allowedTools, includeDirs, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, outputFormat, sandbox, policyFiles, adminPolicyFiles, attachments, skipTrust, yolo, project, newProject, printTimeout, workspace, worktree, }) => {
             return handleGeminiRequestAsync({ sessionManager, asyncJobManager, logger, runtime }, {
                 prompt,
                 promptParts,
@@ -6378,6 +6703,7 @@ export function createGatewayServer(deps = {}) {
                 yolo,
                 project,
                 newProject,
+                printTimeout,
                 workspace,
                 worktree,
             });
@@ -6653,6 +6979,23 @@ export function createGatewayServer(deps = {}) {
                 .string()
                 .optional()
                 .describe("Load the initial prompt from a file (--prompt-file)"),
+            config: z.string().optional().describe("Config file path (Devin --config <PATH>)"),
+            sandbox: z
+                .boolean()
+                .optional()
+                .describe("Run the Devin session in a sandbox (Devin --sandbox). Safety control: never defaulted on; pass true to opt in."),
+            exportSession: z
+                .union([z.boolean(), z.string()])
+                .optional()
+                .describe("Export the session (Devin --export [<PATH>]). true emits a bare --export; a string path emits --export <path>."),
+            respectWorkspaceTrust: z
+                .boolean()
+                .optional()
+                .describe("Respect workspace trust (Devin --respect-workspace-trust <bool>). Devin defaults true for interactive and false for print mode; set explicitly to override."),
+            agentConfig: z
+                .string()
+                .optional()
+                .describe("Agent config file path (Devin --agent-config <FILE>)"),
             sessionId: z
                 .string()
                 .optional()
@@ -6681,12 +7024,17 @@ export function createGatewayServer(deps = {}) {
             destructiveHint: true,
             idempotentHint: false,
             openWorldHint: true,
-        }, async ({ prompt, model, permissionMode, promptFile, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, }) => {
+        }, async ({ prompt, model, permissionMode, promptFile, config, sandbox, exportSession, respectWorkspaceTrust, agentConfig, sessionId, resumeLatest, createNewSession, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, }) => {
             return handleDevinRequestAsync({ sessionManager, asyncJobManager, logger, runtime }, {
                 prompt,
                 model,
                 permissionMode,
                 promptFile,
+                config,
+                sandbox,
+                exportSession,
+                respectWorkspaceTrust,
+                agentConfig,
                 sessionId,
                 resumeLatest,
                 createNewSession,
@@ -6989,6 +7337,18 @@ export function createGatewayServer(deps = {}) {
                 result.stdout) {
                 result.stdout = codexDisplayText(result.stdout);
             }
+            if (callerIsRemote()) {
+                const leakedId = result.providerSessionId;
+                delete result.providerSessionId;
+                if (leakedId) {
+                    if (result.stdout && result.stdout.includes(leakedId)) {
+                        result.stdout = result.stdout.split(leakedId).join("[redacted-session-id]");
+                    }
+                    if (result.stderr && result.stderr.includes(leakedId)) {
+                        result.stderr = result.stderr.split(leakedId).join("[redacted-session-id]");
+                    }
+                }
+            }
             return {
                 content: [
                     {
@@ -7232,10 +7592,7 @@ export function createGatewayServer(deps = {}) {
             .max(500)
             .default(50)
             .describe("Max number of approval records"),
-        cli: z
-            .enum(["claude", "codex", "gemini", "grok", "mistral"])
-            .optional()
-            .describe("Optional CLI filter"),
+        cli: CLI_TYPE_ENUM.optional().describe("Optional CLI filter (any gateway CLI provider, derived from CLI_TYPES)"),
     }, {
         title: "Approval decisions",
         readOnlyHint: true,
@@ -7273,9 +7630,19 @@ export function createGatewayServer(deps = {}) {
     }, async ({ cli }) => {
         const cliInfo = getAvailableCliInfo();
         const apiRuntimes = enabledApiProviders(providers);
+        const buildDiscoveredMap = (clis) => {
+            const out = {};
+            for (const c of clis) {
+                out[c] = buildProviderDiscoveredView(getProviderDefinition(c), cliInfo[c], peekProviderCapabilitySet);
+            }
+            return out;
+        };
         let result;
         if (cli && CLI_TYPES.includes(cli)) {
-            result = { [cli]: cliInfo[cli] };
+            result = {
+                [cli]: cliInfo[cli],
+                discovered: buildDiscoveredMap([cli]),
+            };
         }
         else if (cli) {
             const runtime = apiRuntimes.find(p => p.name === cli);
@@ -7283,7 +7650,11 @@ export function createGatewayServer(deps = {}) {
         }
         else {
             const apiProviders = apiRuntimes.map(apiProviderCatalogEntry);
-            result = { ...cliInfo, ...(apiProviders.length > 0 ? { apiProviders } : {}) };
+            result = {
+                ...cliInfo,
+                discovered: buildDiscoveredMap(CLI_TYPES),
+                ...(apiProviders.length > 0 ? { apiProviders } : {}),
+            };
         }
         return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
     });
@@ -7330,6 +7701,7 @@ export function createGatewayServer(deps = {}) {
             includePaths,
             refresh,
             providersConfig: providers,
+            acpConfig: runtime.acpConfig,
         });
         return { content: [{ type: "text", text: JSON.stringify(capabilities, null, 2) }] };
     });
@@ -7875,7 +8247,7 @@ async function initializeSessionManager() {
         });
         logger.info("File-based session manager initialized");
     }
-    resourceProvider = new ResourceProvider(sessionManager, performanceMetrics, getFlightRecorder(logger), getCacheAwarenessConfig(logger), getProvidersConfig(logger));
+    resourceProvider = new ResourceProvider(sessionManager, performanceMetrics, getFlightRecorder(logger), getCacheAwarenessConfig(logger), getProvidersConfig(logger), undefined, getAcpConfig(logger));
 }
 function registerHealthResource(server) {
     if (db) {
@@ -7918,6 +8290,15 @@ function registerHealthResource(server) {
 async function shutdown(signal) {
     logger.info(`Received ${signal}, shutting down gracefully...`);
     try {
+        if (asyncJobManager) {
+            try {
+                await asyncJobManager.dispose({ timeoutMs: 5000 });
+                logger.info("Async job manager disposed");
+            }
+            catch (err) {
+                logger.error("Async job manager dispose failed", err);
+            }
+        }
         await killAllProcessGroups();
         logger.info("All process groups terminated");
         if (activeHttpGateway) {
@@ -8331,6 +8712,7 @@ async function main() {
         "stdio";
     logger.info(`Starting llm-cli-gateway MCP server with ${transportMode} transport`);
     await initializeSessionManager();
+    void warmProviderCapabilities({ logger }).catch(() => undefined);
     const serverDeps = {
         sessionManager,
         resourceProvider,