factory-factory 0.3.17 → 0.3.19

package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.js

@@ -0,0 +1,153 @@
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { createLogger } from '../../../../../backend/services/logger.service.js';
+import { normalizeUnknownError } from './acp-stream-normalizer.js';
+const logger = createLogger('acp-runtime-manager');
+const MAX_FACTORY_ROOT_SEARCH_DEPTH = 20;
+const requireFromCurrentModule = createRequire(import.meta.url);
+export function hasUsableWorkingDir(workingDir) {
+    return typeof workingDir === 'string' && workingDir.trim().length > 0;
+}
+export function createAcpSpawnError(commandLabel, error) {
+    const normalized = normalizeUnknownError(error);
+    return new Error(`Failed to spawn ACP adapter "${commandLabel}": ${normalized.message}`);
+}
+export function resolveAcpBinary(packageName, binaryName) {
+    try {
+        const packageJsonPath = requireFromCurrentModule.resolve(`${packageName}/package.json`);
+        const packageDir = dirname(packageJsonPath);
+        const pkg = requireFromCurrentModule(packageJsonPath);
+        const binPath = typeof pkg.bin === 'string'
+            ? pkg.bin
+            : typeof pkg.bin?.[binaryName] === 'string'
+                ? pkg.bin[binaryName]
+                : undefined;
+        if (binPath) {
+            return join(packageDir, binPath);
+        }
+    }
+    catch {
+        logger.debug('Could not resolve binary via package.json, falling back to PATH', {
+            packageName,
+            binaryName,
+        });
+    }
+    return binaryName;
+}
+export async function withTimeout(params) {
+    return await new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+            reject(new Error(`ACP ${params.description} timed out after ${params.timeoutMs}ms`));
+        }, params.timeoutMs);
+        timeout.unref?.();
+        const clearTimer = () => {
+            clearTimeout(timeout);
+        };
+        const cancelOn = params.cancelOn;
+        if (cancelOn !== undefined) {
+            void cancelOn.finally(clearTimer).catch(() => {
+            });
+        }
+        params.promise.then((value) => {
+            clearTimer();
+            resolve(value);
+        }, (error) => {
+            clearTimer();
+            reject(error);
+        });
+    });
+}
+function findFactoryRoot(startDir) {
+    let currentDir = startDir;
+    for (let depth = 0; depth < MAX_FACTORY_ROOT_SEARCH_DEPTH; depth += 1) {
+        const hasPackageJson = existsSync(join(currentDir, 'package.json'));
+        const hasCliDistEntrypoint = existsSync(join(currentDir, 'dist', 'src', 'cli', 'index.js'));
+        const hasCliSourceEntrypoint = existsSync(join(currentDir, 'src', 'cli', 'index.ts'));
+        if (hasPackageJson && (hasCliDistEntrypoint || hasCliSourceEntrypoint)) {
+            return currentDir;
+        }
+        const parentDir = dirname(currentDir);
+        if (parentDir === currentDir) {
+            return null;
+        }
+        currentDir = parentDir;
+    }
+    return null;
+}
+function resolveFactoryRootForInternalCodexAdapter() {
+    const moduleDir = dirname(fileURLToPath(import.meta.url));
+    const candidateStarts = [process.cwd(), moduleDir];
+    for (const candidate of candidateStarts) {
+        const root = findFactoryRoot(candidate);
+        if (root) {
+            return root;
+        }
+    }
+    throw new Error('Cannot resolve Factory Factory root for CODEX ACP adapter spawn');
+}
+export function resolveInternalCodexAcpSpawnCommand(preferSourceEntrypoint) {
+    const projectRoot = resolveFactoryRootForInternalCodexAdapter();
+    const cliSourceEntrypoint = join(projectRoot, 'src', 'cli', 'index.ts');
+    const cliDistEntrypoint = join(projectRoot, 'dist', 'src', 'cli', 'index.js');
+    const tsconfigPath = join(projectRoot, 'tsconfig.json');
+    const tsxBin = join(projectRoot, 'node_modules', '.bin', process.platform === 'win32' ? 'tsx.cmd' : 'tsx');
+    const hasTypeScriptRuntime = process.execArgv.some((arg) => arg.includes('tsx')) ||
+        process.execArgv.some((arg) => arg.includes('ts-node'));
+    const buildNodeSpawnCommand = (entrypoint) => {
+        const args = [entrypoint, 'internal', 'codex-app-server-acp'];
+        return {
+            command: process.execPath,
+            args,
+            commandLabel: `${process.execPath} ${args.join(' ')}`.trim(),
+        };
+    };
+    const resolveSourceSpawnCommand = () => {
+        if (!existsSync(cliSourceEntrypoint)) {
+            return null;
+        }
+        if (existsSync(tsxBin)) {
+            const args = [
+                ...(existsSync(tsconfigPath) ? ['--tsconfig', tsconfigPath] : []),
+                cliSourceEntrypoint,
+                'internal',
+                'codex-app-server-acp',
+            ];
+            return {
+                command: tsxBin,
+                args,
+                commandLabel: `${tsxBin} ${args.join(' ')}`.trim(),
+            };
+        }
+        if (hasTypeScriptRuntime) {
+            const args = [...process.execArgv, cliSourceEntrypoint, 'internal', 'codex-app-server-acp'];
+            return {
+                command: process.execPath,
+                args,
+                commandLabel: `${process.execPath} ${args.join(' ')}`.trim(),
+            };
+        }
+        return null;
+    };
+    if (preferSourceEntrypoint) {
+        const sourceCommand = resolveSourceSpawnCommand();
+        if (sourceCommand) {
+            return sourceCommand;
+        }
+        if (existsSync(cliDistEntrypoint)) {
+            return buildNodeSpawnCommand(cliDistEntrypoint);
+        }
+    }
+    else {
+        if (existsSync(cliDistEntrypoint)) {
+            return buildNodeSpawnCommand(cliDistEntrypoint);
+        }
+        const sourceCommand = resolveSourceSpawnCommand();
+        if (sourceCommand) {
+            return sourceCommand;
+        }
+    }
+    throw new Error('Cannot resolve CLI entrypoint for CODEX ACP adapter spawn');
+}
+//# sourceMappingURL=acp-runtime-spawn.js.map

package/dist/src/backend/services/session/service/acp/acp-runtime-spawn.js.map

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

package/dist/src/backend/services/session/service/acp/acp-session-config-options.d.ts

@@ -0,0 +1,9 @@
+import type { SessionConfigOption, SessionModelState, SessionModeState } from '@agentclientprotocol/sdk';
+type SessionResultWithFallbackState = {
+    configOptions?: SessionConfigOption[] | null;
+    models?: SessionModelState | null;
+    modes?: SessionModeState | null;
+};
+export declare function requireSessionConfigOptions(provider: string, sessionSource: 'newSession' | 'loadSession' | 'setSessionConfigOption', sessionResult: SessionResultWithFallbackState): SessionConfigOption[];
+export {};
+//# sourceMappingURL=acp-session-config-options.d.ts.map

package/dist/src/backend/services/session/service/acp/acp-session-config-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-session-config-options.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-session-config-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAGnB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAMlC,KAAK,8BAA8B,GAAG;IACpC,aAAa,CAAC,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IAC7C,MAAM,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACjC,CAAC;AA8KF,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,YAAY,GAAG,aAAa,GAAG,wBAAwB,EACtE,aAAa,EAAE,8BAA8B,GAC5C,mBAAmB,EAAE,CA+BvB"}

package/dist/src/backend/services/session/service/acp/acp-session-config-options.js

@@ -0,0 +1,162 @@
+import { createLogger } from '../../../../../backend/services/logger.service.js';
+const logger = createLogger('acp-session-config-options');
+const REQUIRED_CONFIG_CATEGORIES = ['model', 'mode'];
+function isNonEmptyString(value) {
+    return typeof value === 'string' && value.length > 0;
+}
+function resolveModelFamilyName(description) {
+    if (!isNonEmptyString(description)) {
+        return null;
+    }
+    const familyName = description.split('·')[0]?.trim();
+    return familyName && familyName.length > 0 ? familyName : null;
+}
+function normalizeClaudeModelOption(option) {
+    if (option.value !== 'default') {
+        return option;
+    }
+    const modelFamilyName = resolveModelFamilyName(option.description);
+    if (!modelFamilyName) {
+        return option;
+    }
+    return {
+        ...option,
+        name: modelFamilyName,
+    };
+}
+function isOptionGroup(option) {
+    return 'group' in option;
+}
+function isOptionGroupArray(options) {
+    const [firstOption] = options;
+    return firstOption ? isOptionGroup(firstOption) : false;
+}
+function normalizeClaudeConfigOptions(configOptions) {
+    return configOptions.map((configOption) => {
+        if (configOption.category !== 'model') {
+            return configOption;
+        }
+        if (isOptionGroupArray(configOption.options)) {
+            const normalizedGroups = configOption.options.map((group) => ({
+                ...group,
+                options: group.options.map(normalizeClaudeModelOption),
+            }));
+            return {
+                ...configOption,
+                options: normalizedGroups,
+            };
+        }
+        const normalizedOptions = configOption.options.map(normalizeClaudeModelOption);
+        return {
+            ...configOption,
+            options: normalizedOptions,
+        };
+    });
+}
+function normalizeSessionConfigOptions(provider, configOptions) {
+    const providerNormalized = provider === 'CLAUDE' ? normalizeClaudeConfigOptions(configOptions) : configOptions;
+    return providerNormalized.map((configOption) => {
+        if (configOption.category || (configOption.id !== 'model' && configOption.id !== 'mode')) {
+            return configOption;
+        }
+        return {
+            ...configOption,
+            category: configOption.id,
+        };
+    });
+}
+function resolveModelConfigOption(models) {
+    if (!(models && Array.isArray(models.availableModels))) {
+        return null;
+    }
+    const options = models.availableModels
+        .filter((entry) => isNonEmptyString(entry.modelId))
+        .map((entry) => ({
+        value: entry.modelId,
+        name: isNonEmptyString(entry.name) ? entry.name : entry.modelId,
+        ...(isNonEmptyString(entry.description) ? { description: entry.description } : {}),
+    }));
+    if (options.length === 0) {
+        return null;
+    }
+    const preferredValue = isNonEmptyString(models.currentModelId) ? models.currentModelId : null;
+    const currentValue = (preferredValue && options.some((option) => option.value === preferredValue)
+        ? preferredValue
+        : options[0]?.value) ?? null;
+    if (!currentValue) {
+        return null;
+    }
+    return {
+        id: 'model',
+        name: 'Model',
+        type: 'select',
+        category: 'model',
+        currentValue,
+        options,
+    };
+}
+function resolveModeConfigOption(modes) {
+    if (!(modes && Array.isArray(modes.availableModes))) {
+        return null;
+    }
+    const options = modes.availableModes
+        .filter((entry) => isNonEmptyString(entry.id))
+        .map((entry) => ({
+        value: entry.id,
+        name: isNonEmptyString(entry.name) ? entry.name : entry.id,
+        ...(isNonEmptyString(entry.description) ? { description: entry.description } : {}),
+    }));
+    if (options.length === 0) {
+        return null;
+    }
+    const preferredValue = isNonEmptyString(modes.currentModeId) ? modes.currentModeId : null;
+    const currentValue = (preferredValue && options.some((option) => option.value === preferredValue)
+        ? preferredValue
+        : options[0]?.value) ?? null;
+    if (!currentValue) {
+        return null;
+    }
+    return {
+        id: 'mode',
+        name: 'Mode',
+        type: 'select',
+        category: 'mode',
+        currentValue,
+        options,
+    };
+}
+function fallbackSessionConfigOptions(sessionResult) {
+    const fallbackOptions = [];
+    const modelOption = resolveModelConfigOption(sessionResult.models);
+    if (modelOption) {
+        fallbackOptions.push(modelOption);
+    }
+    const modeOption = resolveModeConfigOption(sessionResult.modes);
+    if (modeOption) {
+        fallbackOptions.push(modeOption);
+    }
+    return fallbackOptions;
+}
+export function requireSessionConfigOptions(provider, sessionSource, sessionResult) {
+    let configOptions = Array.isArray(sessionResult.configOptions) ? sessionResult.configOptions : [];
+    if (sessionSource !== 'setSessionConfigOption') {
+        const fallbackOptions = fallbackSessionConfigOptions(sessionResult);
+        if (configOptions.length === 0 && fallbackOptions.length > 0) {
+            logger.warn('ACP session response missing configOptions; deriving from models/modes', {
+                provider,
+                sessionSource,
+            });
+            configOptions = fallbackOptions;
+        }
+    }
+    if (configOptions.length === 0) {
+        throw new Error(`ACP ${provider} ${sessionSource} response did not include required configOptions`);
+    }
+    const normalizedConfigOptions = normalizeSessionConfigOptions(provider, configOptions);
+    const missingCategories = REQUIRED_CONFIG_CATEGORIES.filter((category) => !normalizedConfigOptions.some((option) => option.category === category));
+    if (missingCategories.length > 0) {
+        throw new Error(`ACP ${provider} ${sessionSource} response missing required config option categories: ${missingCategories.join(', ')}`);
+    }
+    return normalizedConfigOptions;
+}
+//# sourceMappingURL=acp-session-config-options.js.map

package/dist/src/backend/services/session/service/acp/acp-session-config-options.js.map

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

package/dist/src/backend/services/session/service/acp/acp-stream-normalizer.d.ts

@@ -0,0 +1,3 @@
+export declare function normalizeUnknownError(error: unknown): Error;
+export declare function createNormalizedAcpReadableStream<T>(readable: ReadableStream<T>): ReadableStream<T>;
+//# sourceMappingURL=acp-stream-normalizer.d.ts.map

package/dist/src/backend/services/session/service/acp/acp-stream-normalizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-stream-normalizer.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-stream-normalizer.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAE3D;AAgDD,wBAAgB,iCAAiC,CAAC,CAAC,EACjD,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,GAC1B,cAAc,CAAC,CAAC,CAAC,CAwCnB"}

package/dist/src/backend/services/session/service/acp/acp-stream-normalizer.js

@@ -0,0 +1,81 @@
+export function normalizeUnknownError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function normalizeSessionUpdateMessage(message) {
+    if (!isRecord(message) ||
+        message.method !== 'session/update' ||
+        !isRecord(message.params) ||
+        !isRecord(message.params.update) ||
+        !Array.isArray(message.params.update.locations)) {
+        return message;
+    }
+    const update = message.params.update;
+    const locations = update.locations;
+    const needsNormalization = locations.some((loc) => isRecord(loc) && loc.line !== undefined && loc.line !== null && typeof loc.line !== 'number');
+    if (!needsNormalization) {
+        return message;
+    }
+    return {
+        ...message,
+        params: {
+            ...message.params,
+            update: {
+                ...update,
+                locations: locations.map((loc) => {
+                    if (!isRecord(loc) || typeof loc.line === 'number' || loc.line == null) {
+                        return loc;
+                    }
+                    return {
+                        ...loc,
+                        line: Array.isArray(loc.line) && loc.line.length > 0 ? loc.line[0] : undefined,
+                    };
+                }),
+            },
+        },
+    };
+}
+export function createNormalizedAcpReadableStream(readable) {
+    if (typeof readable.getReader !== 'function') {
+        return readable;
+    }
+    let reader = null;
+    return new ReadableStream({
+        start() {
+            reader = readable.getReader();
+        },
+        async pull(controller) {
+            if (!reader) {
+                reader = readable.getReader();
+            }
+            const currentReader = reader;
+            try {
+                const { done, value } = await currentReader.read();
+                if (done) {
+                    controller.close();
+                    currentReader.releaseLock();
+                    reader = null;
+                    return;
+                }
+                controller.enqueue(normalizeSessionUpdateMessage(value));
+            }
+            catch (error) {
+                currentReader.releaseLock();
+                controller.error(error);
+                reader = null;
+            }
+        },
+        async cancel(reason) {
+            try {
+                await reader?.cancel(reason);
+            }
+            finally {
+                reader?.releaseLock();
+                reader = null;
+            }
+        },
+    });
+}
+//# sourceMappingURL=acp-stream-normalizer.js.map

package/dist/src/backend/services/session/service/acp/acp-stream-normalizer.js.map

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

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

@@ -0,0 +1,10 @@
+import type { McpServer, PromptRequest } from '@agentclientprotocol/sdk';
+import type { CodexMcpServerConfig } from './adapter-state.js';
+type PromptContentBlock = PromptRequest['prompt'][number];
+export declare function isPlanLikeMode(mode: string): boolean;
+export declare function extractPlanText(value: unknown, depth?: number): string | null;
+export declare function extractReasoningText(value: unknown): string | null;
+export declare function toCodexMcpConfigMap(mcpServers: McpServer[]): Record<string, CodexMcpServerConfig>;
+export declare function parseTextFromPromptBlock(block: PromptContentBlock): string;
+export {};
+//# sourceMappingURL=codex-adapter-parsing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"codex-adapter-parsing.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-adapter-parsing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,KAAK,kBAAkB,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AA2CD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,MAAM,GAAG,IAAI,CAmBxE;AA8BD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQlE;AA6CD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAiBjG;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,CA2B1E"}

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

@@ -0,0 +1,162 @@
+import { dedupeStrings, isRecord } from './acp-adapter-utils.js';
+export function isPlanLikeMode(mode) {
+    return /plan/i.test(mode);
+}
+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 = extractPlanText(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);
+}
+export function extractPlanText(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);
+    }
+}
+export function extractReasoningText(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' } : {}),
+    };
+}
+export 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;
+}
+export 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);
+}
+//# sourceMappingURL=codex-adapter-parsing.js.map

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,15 +52,8 @@ 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 handleCodexServerRequest;