factory-factory 0.3.18 → 0.3.20

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-adapter-parsing.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.d.ts

@@ -52,17 +52,14 @@ export declare class CodexAppServerAcpAdapter implements Agent {
     private handleCodexNotification;
     private emitReasoningThoughtChunkFromItem;
     private shouldHoldTurnForPlanApproval;
-    private buildPlanApprovalInput;
-    private extractPlanApprovalText;
-    private getPlanExitModePriority;
-    private comparePlanExitModePreference;
-    private resolveCollaborationModeLabel;
-    private buildPlanApprovalOptions;
     private holdTurnUntilPlanApprovalResolves;
     private hasPendingPlanApprovals;
-    private releaseTurnHoldForPlanApproval;
     private maybeRequestPlanApproval;
     private buildToolCallState;
+    private resolveToolCallDisplay;
+    private resolveCommandExecutionDisplay;
+    private resolveCodexFunctionCallDisplay;
+    private parseToolCallArguments;
     private handleCodexServerRequest;
     private handleCodexExit;
     private settleTurn;

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-server-acp-adapter.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-app-server-acp-adapter.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.js

@@ -1,178 +1,19 @@
 import { Readable, Writable } from 'node:stream';
 import { AgentSideConnection, ndJsonStream, PROTOCOL_VERSION, RequestError, } from '@agentclientprotocol/sdk';
-import { asString, dedupeStrings, extractLocations, isRecord, resolveToolCallId, } from './acp-adapter-utils.js';
+import { asString, extractLocations, isRecord, resolveToolCallId } from './acp-adapter-utils.js';
+import { extractReasoningText, parseTextFromPromptBlock, toCodexMcpConfigMap, } from './codex-adapter-parsing.js';
 import { CodexRequestError, CodexRpcClient } from './codex-rpc-client.js';
 import { turnStartResponseSchema } from './codex-zod.js';
 import { resolveCommandDisplay } from './command-metadata.js';
+import { hasPendingPlanApprovals, holdTurnUntilPlanApprovalResolves, maybeRequestPlanApproval, shouldHoldTurnForPlanApproval, } from './plan-approval-handler.js';
 import { handleCodexServerPermissionRequest } from './protocol-permission-handler.js';
 import { attachCloseWatcherWithRetry } from './retry-logic.js';
-import { buildConfigOptions, createSandboxPolicyFromMode, getCollaborationModeValues, getExecutionPresets, isKnownModel, isReasoningEffortSupportedForModel, resolveCollaborationModeLabel, resolveDefaultCollaborationMode, resolveDefaultModel, resolveReasoningEffortForModel, resolveSandboxPolicy, resolveSessionModel, resolveTurnCollaborationMode, } from './session-config-resolver.js';
+import { buildConfigOptions, createSandboxPolicyFromMode, getCollaborationModeValues, getExecutionPresets, isKnownModel, isReasoningEffortSupportedForModel, resolveDefaultCollaborationMode, resolveDefaultModel, resolveReasoningEffortForModel, resolveSandboxPolicy, resolveSessionModel, resolveTurnCollaborationMode, } from './session-config-resolver.js';
 import { loadCollaborationModes, loadConfigRequirements, loadModelCatalog, negotiateNewSession, negotiateSessionResume, } from './session-negotiation.js';
 import { CodexAdapterSessionStateContainer } from './session-state-container.js';
 import { ShapeDriftReporter } from './shape-drift-reporter.js';
 import { CodexStreamEventHandler } from './stream-event-handler.js';
 const PENDING_TURN_ID = '__pending_turn__';
-function isPlanLikeMode(mode) {
-    return /plan/i.test(mode);
-}
-const PLAN_EXIT_MODE_PREFERENCE = ['default', 'code', 'acceptEdits', 'ask'];
-const PLAN_TEXT_MAX_DEPTH = 8;
-const PLAN_TEXT_PREFERRED_KEYS = [
-    'plan',
-    'text',
-    'content',
-    'markdown',
-    'value',
-    'message',
-];
-const REASONING_TEXT_MAX_DEPTH = 8;
-const REASONING_TEXT_PREFERRED_KEYS = [
-    'summary',
-    'summaryText',
-    'text',
-    'delta',
-    'message',
-    'content',
-    'reasoning',
-];
-function extractFirstPlanText(values, depth) {
-    for (const entry of values) {
-        const extracted = extractPlanTextLocal(entry, depth + 1);
-        if (extracted) {
-            return extracted;
-        }
-    }
-    return null;
-}
-function extractPlanTextFromRecord(value, depth) {
-    const preferred = extractFirstPlanText(PLAN_TEXT_PREFERRED_KEYS.map((key) => value[key]), depth);
-    if (preferred) {
-        return preferred;
-    }
-    return extractFirstPlanText(Object.values(value), depth);
-}
-function extractPlanTextLocal(value, depth = 0) {
-    if (depth > PLAN_TEXT_MAX_DEPTH) {
-        return null;
-    }
-    if (typeof value === 'string') {
-        const trimmed = value.trim();
-        return trimmed.length > 0 ? value : null;
-    }
-    if (Array.isArray(value)) {
-        return extractFirstPlanText(value, depth);
-    }
-    if (!isRecord(value)) {
-        return null;
-    }
-    return extractPlanTextFromRecord(value, depth);
-}
-function collectReasoningText(values, value, depth = 0) {
-    if (depth > REASONING_TEXT_MAX_DEPTH) {
-        return;
-    }
-    if (typeof value === 'string') {
-        if (value.trim().length > 0) {
-            values.push(value);
-        }
-        return;
-    }
-    if (Array.isArray(value)) {
-        for (const entry of value) {
-            collectReasoningText(values, entry, depth + 1);
-        }
-        return;
-    }
-    if (!isRecord(value)) {
-        return;
-    }
-    for (const key of REASONING_TEXT_PREFERRED_KEYS) {
-        collectReasoningText(values, value[key], depth + 1);
-    }
-}
-function extractReasoningTextLocal(value) {
-    const collected = [];
-    collectReasoningText(collected, value);
-    if (collected.length === 0) {
-        return null;
-    }
-    return dedupeStrings(collected).join('\n\n');
-}
-function toMcpEnvRecord(envVars) {
-    const env = {};
-    for (const entry of envVars) {
-        env[entry.name] = entry.value;
-    }
-    return env;
-}
-function toMcpHeadersRecord(headers) {
-    const result = {};
-    for (const header of headers) {
-        result[header.name] = header.value;
-    }
-    return result;
-}
-function sanitizeMcpServerName(name, index) {
-    const trimmed = name.trim();
-    return trimmed.length > 0 ? trimmed : `mcp_server_${index + 1}`;
-}
-function toCodexMcpServerConfig(server) {
-    if ('command' in server) {
-        const env = toMcpEnvRecord(server.env);
-        return {
-            enabled: true,
-            command: server.command,
-            args: [...server.args],
-            ...(Object.keys(env).length > 0 ? { env } : {}),
-        };
-    }
-    const httpHeaders = toMcpHeadersRecord(server.headers);
-    return {
-        enabled: true,
-        url: server.url,
-        ...(Object.keys(httpHeaders).length > 0 ? { http_headers: httpHeaders } : {}),
-        ...(server.type === 'sse' ? { transport: 'sse' } : {}),
-    };
-}
-function toCodexMcpConfigMap(mcpServers) {
-    const mcpServersByName = {};
-    const usedNames = new Set();
-    for (const [index, server] of mcpServers.entries()) {
-        const baseName = sanitizeMcpServerName(server.name, index);
-        let nextName = baseName;
-        let suffix = 2;
-        while (usedNames.has(nextName)) {
-            nextName = `${baseName}_${suffix}`;
-            suffix += 1;
-        }
-        usedNames.add(nextName);
-        mcpServersByName[nextName] = toCodexMcpServerConfig(server);
-    }
-    return mcpServersByName;
-}
-function parseTextFromPromptBlock(block) {
-    if (block.type === 'text') {
-        return block.text;
-    }
-    if (block.type === 'resource_link') {
-        return `[ACP_RESOURCE_LINK uri="${block.uri}" name="${block.name}"]\n[/ACP_RESOURCE_LINK]`;
-    }
-    if (block.type === 'resource') {
-        const resource = block.resource;
-        const mime = resource.mimeType ?? 'unknown';
-        const payload = 'text' in resource && typeof resource.text === 'string'
-            ? resource.text
-            : 'blob' in resource && typeof resource.blob === 'string'
-                ? resource.blob
-                : JSON.stringify(resource);
-        return `[ACP_RESOURCE uri="${resource.uri}" mime="${mime}"]\n${payload}\n[/ACP_RESOURCE]`;
-    }
-    if (block.type === 'image') {
-        const mime = block.mimeType ?? 'application/octet-stream';
-        return `[ACP_IMAGE mime="${mime}" bytes=${block.data.length}]`;
-    }
-    return JSON.stringify(block);
-}
 export class CodexAppServerAcpAdapter {
     connection;
     codex;
@@ -661,7 +502,7 @@ export class CodexAppServerAcpAdapter {
         await this.streamEventHandler.handleCodexNotification({ method, params });
     }
     async emitReasoningThoughtChunkFromItem(sessionId, item) {
-        const text = extractReasoningTextLocal(item);
+        const text = extractReasoningText(item);
         if (!text) {
             return;
         }
@@ -671,192 +512,34 @@ export class CodexAppServerAcpAdapter {
         });
     }
     shouldHoldTurnForPlanApproval(session, item, turnId) {
-        return (item.type === 'plan' &&
-            isPlanLikeMode(session.defaults.collaborationMode) &&
-            !session.planApprovalRequestedByTurnId.has(turnId) &&
-            this.extractPlanApprovalText(session, item) !== null);
-    }
-    buildPlanApprovalInput(planText, sourceItemId) {
-        return {
-            type: 'ExitPlanMode',
-            plan: { type: 'text', text: planText },
-            reason: 'Plan proposed. Approve to exit plan mode and continue implementation.',
-            source: 'codex_plan_completion',
-            sourceItemId,
-        };
-    }
-    extractPlanApprovalText(session, item) {
-        const bufferedText = session.planTextByItemId.get(item.id);
-        if (bufferedText && bufferedText.trim().length > 0) {
-            return bufferedText;
-        }
-        const fromPlanField = extractPlanTextLocal(item.plan);
-        if (fromPlanField && fromPlanField.trim().length > 0) {
-            return fromPlanField;
-        }
-        const fromTextField = extractPlanTextLocal(item.text);
-        if (fromTextField && fromTextField.trim().length > 0) {
-            return fromTextField;
-        }
-        return null;
-    }
-    getPlanExitModePriority(modeId) {
-        const normalized = modeId.toLowerCase();
-        const index = PLAN_EXIT_MODE_PREFERENCE.findIndex((preferred) => preferred.toLowerCase() === normalized);
-        return index >= 0 ? index : PLAN_EXIT_MODE_PREFERENCE.length;
-    }
-    comparePlanExitModePreference(left, right) {
-        const priorityDiff = this.getPlanExitModePriority(left) - this.getPlanExitModePriority(right);
-        if (priorityDiff !== 0) {
-            return priorityDiff;
-        }
-        return left.localeCompare(right);
-    }
-    resolveCollaborationModeLabel(modeId) {
-        return resolveCollaborationModeLabel(this.collaborationModes, modeId);
-    }
-    buildPlanApprovalOptions(session) {
-        const currentMode = session.defaults.collaborationMode;
-        const availableModes = this.getCollaborationModeValues(currentMode);
-        const nonPlanModes = availableModes
-            .filter((modeId) => !isPlanLikeMode(modeId))
-            .sort((left, right) => this.comparePlanExitModePreference(left, right));
-        const approvableModeIds = new Set(nonPlanModes);
-        const options = nonPlanModes.map((modeId) => ({
-            optionId: modeId,
-            name: `Approve and switch to ${this.resolveCollaborationModeLabel(modeId)}`,
-            kind: 'allow_once',
-        }));
-        options.push({
-            optionId: currentMode,
-            name: 'Keep planning',
-            kind: 'reject_once',
-        });
-        return { options, approvableModeIds };
+        return shouldHoldTurnForPlanApproval(session, item, turnId);
     }
     holdTurnUntilPlanApprovalResolves(session, turnId) {
-        if (this.hasPendingPlanApprovals(session, turnId)) {
-            return;
-        }
-        session.pendingPlanApprovalsByTurnId.set(turnId, 1);
+        holdTurnUntilPlanApprovalResolves(session, turnId);
     }
     hasPendingPlanApprovals(session, turnId) {
-        return (session.pendingPlanApprovalsByTurnId.get(turnId) ?? 0) > 0;
-    }
-    async releaseTurnHoldForPlanApproval(session, turnId) {
-        const pendingCount = session.pendingPlanApprovalsByTurnId.get(turnId) ?? 0;
-        if (pendingCount <= 1) {
-            session.pendingPlanApprovalsByTurnId.delete(turnId);
-        }
-        else {
-            session.pendingPlanApprovalsByTurnId.set(turnId, pendingCount - 1);
-        }
-        if (this.hasPendingPlanApprovals(session, turnId)) {
-            return;
-        }
-        if (!session.activeTurn || session.activeTurn.settled || session.activeTurn.turnId !== turnId) {
-            return;
-        }
-        const deferredCompletion = session.pendingTurnCompletionsByTurnId.get(turnId);
-        if (!deferredCompletion) {
-            return;
-        }
-        session.pendingTurnCompletionsByTurnId.delete(turnId);
-        if (deferredCompletion.errorMessage) {
-            await this.emitTurnFailureMessage(session.sessionId, deferredCompletion.errorMessage);
-        }
-        this.settleTurn(session, deferredCompletion.stopReason);
+        return hasPendingPlanApprovals(session, turnId);
     }
     async maybeRequestPlanApproval(session, item, turnId, completedPlanToolCall) {
-        if (item.type !== 'plan') {
-            return;
-        }
-        if (!isPlanLikeMode(session.defaults.collaborationMode)) {
-            return;
-        }
-        if (session.planApprovalRequestedByTurnId.has(turnId)) {
-            return;
-        }
-        const planText = this.extractPlanApprovalText(session, item);
-        if (!planText) {
-            return;
-        }
-        session.planApprovalRequestedByTurnId.add(turnId);
-        this.holdTurnUntilPlanApprovalResolves(session, turnId);
-        const approvalToolCallId = `${completedPlanToolCall.toolCallId}:exit-plan`;
-        const approvalInput = this.buildPlanApprovalInput(planText, item.id);
-        await this.emitSessionUpdate(session.sessionId, {
-            sessionUpdate: 'tool_call',
-            toolCallId: approvalToolCallId,
-            title: 'ExitPlanMode',
-            kind: 'switch_mode',
-            status: 'pending',
-            rawInput: approvalInput,
+        await maybeRequestPlanApproval({
+            session,
+            item,
+            turnId,
+            completedPlanToolCall,
+            connection: this.connection,
+            collaborationModes: this.collaborationModes,
+            buildConfigOptions: (targetSession) => this.buildConfigOptions(targetSession),
+            emitSessionUpdate: (sessionId, update) => this.emitSessionUpdate(sessionId, update),
+            emitTurnFailureMessage: (sessionId, errorMessage) => this.emitTurnFailureMessage(sessionId, errorMessage),
+            settleTurn: (targetSession, stopReason) => this.settleTurn(targetSession, stopReason),
         });
-        try {
-            const { options: planApprovalOptions, approvableModeIds } = this.buildPlanApprovalOptions(session);
-            if (approvableModeIds.size === 0) {
-                await this.emitSessionUpdate(session.sessionId, {
-                    sessionUpdate: 'tool_call_update',
-                    toolCallId: approvalToolCallId,
-                    kind: 'switch_mode',
-                    title: 'ExitPlanMode',
-                    status: 'failed',
-                    rawOutput: 'Plan proposed, but no non-plan collaboration mode is available.',
-                });
-                return;
-            }
-            const permissionResult = await this.connection.requestPermission({
-                sessionId: session.sessionId,
-                toolCall: {
-                    toolCallId: approvalToolCallId,
-                    title: 'ExitPlanMode',
-                    kind: 'switch_mode',
-                    status: 'pending',
-                    rawInput: approvalInput,
-                },
-                options: planApprovalOptions,
-            });
-            const selectedMode = permissionResult.outcome.outcome === 'selected' &&
-                approvableModeIds.has(permissionResult.outcome.optionId)
-                ? permissionResult.outcome.optionId
-                : null;
-            const approved = selectedMode !== null;
-            if (selectedMode && session.defaults.collaborationMode !== selectedMode) {
-                session.defaults.collaborationMode = selectedMode;
-                await this.emitSessionUpdate(session.sessionId, {
-                    sessionUpdate: 'config_option_update',
-                    configOptions: this.buildConfigOptions(session),
-                });
-            }
-            await this.emitSessionUpdate(session.sessionId, {
-                sessionUpdate: 'tool_call_update',
-                toolCallId: approvalToolCallId,
-                kind: 'switch_mode',
-                title: 'ExitPlanMode',
-                status: approved ? 'completed' : 'failed',
-                rawOutput: approved ? 'Plan approved' : 'Plan approval rejected',
-            });
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            await this.emitSessionUpdate(session.sessionId, {
-                sessionUpdate: 'tool_call_update',
-                toolCallId: approvalToolCallId,
-                kind: 'switch_mode',
-                title: 'ExitPlanMode',
-                status: 'failed',
-                rawOutput: `Plan approval failed: ${message}`,
-            });
-        }
-        finally {
-            await this.releaseTurnHoldForPlanApproval(session, turnId);
-        }
     }
     buildToolCallState(session, item, _turnId) {
         const kindByType = {
             commandExecution: 'execute',
+            custom_tool_call: 'execute',
             fileChange: 'edit',
+            function_call: 'execute',
             mcpToolCall: 'fetch',
             webSearch: 'search',
             plan: 'think',
@@ -865,40 +548,70 @@ export class CodexAppServerAcpAdapter {
         if (!kind) {
             return null;
         }
-        let title = item.type;
-        let kindToEmit = kind;
-        let locations = [];
-        if (item.type === 'commandExecution') {
-            const command = asString(item.command);
-            const cwd = asString(item.cwd) ?? session.cwd;
-            const parsed = resolveCommandDisplay({ command, cwd });
-            title = parsed.title;
-            kindToEmit = parsed.kind;
-            locations = parsed.locations;
-        }
-        else if (item.type === 'fileChange') {
-            title = 'fileChange';
-            locations = extractLocations(item);
-        }
-        else if (item.type === 'mcpToolCall') {
-            const server = asString(item.server) ?? 'mcp';
-            const tool = asString(item.tool) ?? 'tool';
-            title = `mcpToolCall:${server}/${tool}`;
-        }
-        else if (item.type === 'webSearch') {
-            const query = asString(item.query);
-            title = query ? `webSearch:${query}` : 'webSearch';
-        }
+        const display = this.resolveToolCallDisplay(session, item, kind);
         return {
             toolCallId: resolveToolCallId({
                 itemId: item.id,
                 source: item,
             }),
-            kind: kindToEmit,
-            title,
-            locations,
+            kind: display.kind,
+            title: display.title,
+            locations: display.locations,
         };
     }
+    resolveToolCallDisplay(session, item, defaultKind) {
+        if (item.type === 'commandExecution') {
+            return this.resolveCommandExecutionDisplay(session, item);
+        }
+        if (item.type === 'function_call' || item.type === 'custom_tool_call') {
+            return this.resolveCodexFunctionCallDisplay(session, item, defaultKind);
+        }
+        if (item.type === 'fileChange') {
+            return { title: 'fileChange', kind: defaultKind, locations: extractLocations(item) };
+        }
+        if (item.type === 'mcpToolCall') {
+            const server = asString(item.server) ?? 'mcp';
+            const tool = asString(item.tool) ?? 'tool';
+            return { title: `mcpToolCall:${server}/${tool}`, kind: defaultKind, locations: [] };
+        }
+        if (item.type === 'webSearch') {
+            const query = asString(item.query);
+            return {
+                title: query ? `webSearch:${query}` : 'webSearch',
+                kind: defaultKind,
+                locations: [],
+            };
+        }
+        return { title: item.type, kind: defaultKind, locations: [] };
+    }
+    resolveCommandExecutionDisplay(session, item) {
+        const command = asString(item.command);
+        const cwd = asString(item.cwd) ?? session.cwd;
+        return resolveCommandDisplay({ command, cwd });
+    }
+    resolveCodexFunctionCallDisplay(session, item, defaultKind) {
+        const title = asString(item.name) ?? asString(item.type) ?? 'function_call';
+        const rawArguments = item.arguments ?? item.input;
+        const parsedArguments = typeof rawArguments === 'string' ? this.parseToolCallArguments(rawArguments) : null;
+        const command = asString(parsedArguments?.cmd);
+        if (!command) {
+            return { title, kind: defaultKind, locations: [] };
+        }
+        const cwd = asString(parsedArguments?.workdir) ?? session.cwd;
+        return resolveCommandDisplay({ command, cwd });
+    }
+    parseToolCallArguments(rawArguments) {
+        try {
+            const parsed = JSON.parse(rawArguments);
+            if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+                return parsed;
+            }
+        }
+        catch {
+            return null;
+        }
+        return null;
+    }
     async handleCodexServerRequest(request) {
         await handleCodexServerPermissionRequest({
             request,