@xcanwin/manyoyo 5.8.6 → 5.8.10

package/lib/web/server.js

@@ -10,6 +10,13 @@ const WebSocket = require('ws');
 const JSON5 = require('json5');
 const { buildContainerRunArgs } = require('../container-run');
 const { extractAgentMessageFromCodexJsonl } = require('../codex-output');
+const { findValueRangeByPath, applyTextReplacements } = require('../json5-text-edit');
+const { resolveRuntimeConfig } = require('../runtime-resolver');
+const {
+    parseEnvEntry,
+    expandHomeAliasPath,
+    normalizeVolume
+} = require('../runtime-normalizers');
 const {
     resolveAgentProgram,
     resolveAgentPromptCommandTemplate,
@@ -1636,226 +1643,6 @@ function isSensitiveConfigKey(key) {
     return Boolean(normalized) && SENSITIVE_CONFIG_KEY_PATTERN.test(normalized);
 }
 
-function readConfigQuotedString(text, startIndex) {
-    const quote = text[startIndex];
-    let value = '';
-
-    for (let i = startIndex + 1; i < text.length; i += 1) {
-        const ch = text[i];
-        if (ch === '\\') {
-            value += ch;
-            if (i + 1 < text.length) {
-                value += text[i + 1];
-                i += 1;
-            }
-            continue;
-        }
-        if (ch === quote) {
-            return {
-                value,
-                end: i + 1
-            };
-        }
-        value += ch;
-    }
-
-    return null;
-}
-
-function isConfigIdentifierStart(ch) {
-    return /[A-Za-z_$]/.test(ch);
-}
-
-function isConfigIdentifierPart(ch) {
-    return /[A-Za-z0-9_$]/.test(ch);
-}
-
-function skipConfigTrivia(text, index) {
-    let cursor = index;
-    while (cursor < text.length) {
-        const ch = text[cursor];
-        const next = text[cursor + 1];
-        if (/\s/.test(ch)) {
-            cursor += 1;
-            continue;
-        }
-        if (ch === '/' && next === '/') {
-            cursor += 2;
-            while (cursor < text.length && text[cursor] !== '\n') {
-                cursor += 1;
-            }
-            continue;
-        }
-        if (ch === '/' && next === '*') {
-            cursor += 2;
-            while (cursor + 1 < text.length && !(text[cursor] === '*' && text[cursor + 1] === '/')) {
-                cursor += 1;
-            }
-            cursor = cursor + 1 < text.length ? cursor + 2 : text.length;
-            continue;
-        }
-        break;
-    }
-    return cursor;
-}
-
-function scanConfigValueEnd(text, startIndex) {
-    let cursor = startIndex;
-    let stringQuote = '';
-    let lineComment = false;
-    let blockComment = false;
-    let depth = 0;
-
-    for (; cursor < text.length; cursor += 1) {
-        const ch = text[cursor];
-        const next = text[cursor + 1];
-
-        if (lineComment) {
-            if (ch === '\n') {
-                lineComment = false;
-            }
-            continue;
-        }
-        if (blockComment) {
-            if (ch === '*' && next === '/') {
-                blockComment = false;
-                cursor += 1;
-            }
-            continue;
-        }
-        if (stringQuote) {
-            if (ch === '\\') {
-                cursor += 1;
-                continue;
-            }
-            if (ch === stringQuote) {
-                stringQuote = '';
-            }
-            continue;
-        }
-
-        if (ch === '/' && next === '/') {
-            lineComment = true;
-            cursor += 1;
-            continue;
-        }
-        if (ch === '/' && next === '*') {
-            blockComment = true;
-            cursor += 1;
-            continue;
-        }
-        if (ch === '"' || ch === '\'') {
-            stringQuote = ch;
-            continue;
-        }
-        if (ch === '{' || ch === '[' || ch === '(') {
-            depth += 1;
-            continue;
-        }
-        if (ch === '}' || ch === ']' || ch === ')') {
-            if (depth === 0) {
-                break;
-            }
-            depth -= 1;
-            continue;
-        }
-        if (depth === 0 && ch === ',') {
-            break;
-        }
-    }
-
-    let end = cursor;
-    while (end > startIndex && /\s/.test(text[end - 1])) {
-        end -= 1;
-    }
-    return end;
-}
-
-function findConfigRootObjectStart(text) {
-    const start = skipConfigTrivia(String(text || ''), 0);
-    return text[start] === '{' ? start : -1;
-}
-
-function readConfigPropertyToken(text, startIndex) {
-    const ch = text[startIndex];
-    if (ch === '"' || ch === '\'') {
-        const token = readConfigQuotedString(text, startIndex);
-        if (!token) {
-            return null;
-        }
-        return token;
-    }
-    if (!isConfigIdentifierStart(ch)) {
-        return null;
-    }
-    let end = startIndex + 1;
-    while (end < text.length && isConfigIdentifierPart(text[end])) {
-        end += 1;
-    }
-    return {
-        value: text.slice(startIndex, end),
-        end
-    };
-}
-
-function findConfigObjectPropertyValueRange(text, objectStartIndex, propertyName) {
-    let cursor = skipConfigTrivia(text, objectStartIndex + 1);
-    while (cursor < text.length) {
-        cursor = skipConfigTrivia(text, cursor);
-        if (text[cursor] === '}') {
-            return null;
-        }
-        const token = readConfigPropertyToken(text, cursor);
-        if (!token) {
-            return null;
-        }
-        cursor = skipConfigTrivia(text, token.end);
-        if (text[cursor] !== ':') {
-            return null;
-        }
-        const valueStart = skipConfigTrivia(text, cursor + 1);
-        const valueEnd = scanConfigValueEnd(text, valueStart);
-        if (token.value === propertyName) {
-            return { start: valueStart, end: valueEnd };
-        }
-        cursor = skipConfigTrivia(text, valueEnd);
-        if (text[cursor] === ',') {
-            cursor += 1;
-            continue;
-        }
-        if (text[cursor] === '}') {
-            return null;
-        }
-    }
-    return null;
-}
-
-function findConfigValueRangeByPath(text, pathParts) {
-    if (!Array.isArray(pathParts) || pathParts.length === 0) {
-        return null;
-    }
-    let objectStart = findConfigRootObjectStart(text);
-    if (objectStart === -1) {
-        return null;
-    }
-    let range = null;
-    for (let i = 0; i < pathParts.length; i += 1) {
-        range = findConfigObjectPropertyValueRange(text, objectStart, pathParts[i]);
-        if (!range) {
-            return null;
-        }
-        if (i === pathParts.length - 1) {
-            return range;
-        }
-        const nextObjectStart = skipConfigTrivia(text, range.start);
-        if (text[nextObjectStart] !== '{') {
-            return null;
-        }
-        objectStart = nextObjectStart;
-    }
-    return range;
-}
-
 function collectSensitiveConfigPaths(value, pathParts = []) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return [];
@@ -1894,13 +1681,6 @@ function collectSensitivePlaceholderPaths(value, pathParts = []) {
     return result;
 }
 
-function applyConfigTextReplacements(text, replacements) {
-    return replacements
-        .slice()
-        .sort((a, b) => b.start - a.start)
-        .reduce((result, item) => `${result.slice(0, item.start)}${item.text}${result.slice(item.end)}`, text);
-}
-
 function buildConfigPathLabel(pathParts) {
     return (Array.isArray(pathParts) ? pathParts : []).join('.');
 }
@@ -1908,7 +1688,7 @@ function buildConfigPathLabel(pathParts) {
 function maskWebConfigRaw(raw, parsed) {
     const text = String(raw || '');
     const replacements = collectSensitiveConfigPaths(parsed).map(pathParts => {
-        const range = findConfigValueRangeByPath(text, pathParts);
+        const range = findValueRangeByPath(text, pathParts);
         if (!range) {
             throw new Error(`敏感字段定位失败: ${buildConfigPathLabel(pathParts)}`);
         }
@@ -1918,7 +1698,7 @@ function maskWebConfigRaw(raw, parsed) {
             text: JSON.stringify(WEB_CONFIG_KEEP_SECRET_PLACEHOLDER)
         };
     });
-    return applyConfigTextReplacements(text, replacements);
+    return applyTextReplacements(text, replacements);
 }
 
 function parseConfigRawObject(raw) {
@@ -1946,8 +1726,8 @@ function restoreWebConfigSecrets(raw, snapshot) {
 
     const currentRaw = String(snapshot.raw || '');
     const replacements = placeholderPaths.map(pathParts => {
-        const editedRange = findConfigValueRangeByPath(text, pathParts);
-        const currentRange = findConfigValueRangeByPath(currentRaw, pathParts);
+        const editedRange = findValueRangeByPath(text, pathParts);
+        const currentRange = findValueRangeByPath(currentRaw, pathParts);
         if (!editedRange) {
             throw new Error(`敏感字段定位失败: ${buildConfigPathLabel(pathParts)}`);
         }
@@ -1961,7 +1741,7 @@ function restoreWebConfigSecrets(raw, snapshot) {
         };
     });
 
-    return applyConfigTextReplacements(text, replacements);
+    return applyTextReplacements(text, replacements);
 }
 
 function redactConfigValue(value) {
@@ -2078,23 +1858,6 @@ function validateWebHostPath(hostPath) {
     }
 }
 
-function parseEnvEntry(entryText) {
-    const text = String(entryText || '');
-    const idx = text.indexOf('=');
-    if (idx <= 0) {
-        throw new Error(`env 格式应为 KEY=VALUE: ${text}`);
-    }
-    const key = text.slice(0, idx);
-    const value = text.slice(idx + 1);
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
-        throw new Error(`env key 非法: ${key}`);
-    }
-    if (/[\r\n\0]/.test(value) || /[;&|`$<>]/.test(value)) {
-        throw new Error(`env value 含非法字符: ${key}`);
-    }
-    return { key, value };
-}
-
 function normalizeEnvMap(envConfig, sourceLabel) {
     if (envConfig === undefined || envConfig === null) {
         return {};
@@ -2113,6 +1876,15 @@ function normalizeEnvMap(envConfig, sourceLabel) {
     return result;
 }
 
+function normalizeCliEnvMap(envList) {
+    const result = {};
+    for (const envText of (envList || [])) {
+        const parsed = parseEnvEntry(envText);
+        result[parsed.key] = parsed.value;
+    }
+    return result;
+}
+
 function normalizeStringArray(value, sourceLabel) {
     if (value === undefined || value === null) {
         return [];
@@ -2125,41 +1897,6 @@ function normalizeStringArray(value, sourceLabel) {
         .filter(Boolean);
 }
 
-function expandHomeAliasPath(filePath) {
-    const text = String(filePath || '').trim();
-    if (!text) {
-        return text;
-    }
-    const homeDir = os.homedir();
-    if (text === '~') {
-        return homeDir;
-    }
-    if (text.startsWith('~/')) {
-        return path.join(homeDir, text.slice(2));
-    }
-    if (text === '$HOME') {
-        return homeDir;
-    }
-    if (text.startsWith('$HOME/')) {
-        return path.join(homeDir, text.slice('$HOME/'.length));
-    }
-    return text;
-}
-
-function normalizeVolume(volume) {
-    const text = String(volume || '').trim();
-    if (!text.startsWith('~') && !text.startsWith('$HOME')) {
-        return text;
-    }
-    const separatorIndex = text.indexOf(':');
-    if (separatorIndex === -1) {
-        return expandHomeAliasPath(text);
-    }
-    const hostPath = text.slice(0, separatorIndex);
-    const rest = text.slice(separatorIndex);
-    return `${expandHomeAliasPath(hostPath)}${rest}`;
-}
-
 function parseEnvFileToArgs(filePath) {
     const resolvedPath = expandHomeAliasPath(filePath);
     if (!path.isAbsolute(resolvedPath)) {
@@ -2429,29 +2166,65 @@ function buildCreateRuntime(ctx, state, payload) {
     const hasConfigPorts = hasOwn(config, 'ports');
 
     const requestName = pickFirstString(requestOptions.containerName, body.name);
-    let containerName = pickFirstString(requestName, runConfig.containerName, config.containerName);
-    if (!containerName) {
-        containerName = `my-${ctx.formatDate()}`;
-    }
-    containerName = resolveNowTemplate(containerName, ctx.formatDate);
+    const requestEnvMap = hasRequestEnv ? normalizeEnvMap(requestOptions.env, 'createOptions.env') : {};
+    const requestEnvList = Object.entries(requestEnvMap).map(([key, value]) => `${key}=${value}`);
+    const requestEnvFileList = hasRequestEnvFile ? normalizeStringArray(requestOptions.envFile, 'createOptions.envFile') : [];
+    const requestVolumeList = hasRequestVolumes ? normalizeStringArray(requestOptions.volumes, 'createOptions.volumes') : [];
+    const requestPortList = hasRequestPorts ? normalizeStringArray(requestOptions.ports, 'createOptions.ports') : [];
+
+    const resolvedBase = resolveRuntimeConfig({
+        cliOptions: {
+            hostPath: requestOptions.hostPath,
+            contName: requestName,
+            contPath: requestOptions.containerPath,
+            imageName: requestOptions.imageName,
+            imageVer: requestOptions.imageVersion,
+            env: requestEnvList,
+            envFile: requestEnvFileList,
+            volume: requestVolumeList,
+            port: requestPortList
+        },
+        globalConfig: config,
+        runConfig,
+        globalFirstConfig: {},
+        runFirstConfig: {},
+        defaults: {
+            hostPath: ctx.hostPath,
+            containerName: `my-${ctx.formatDate()}`,
+            containerPath: ctx.containerPath,
+            imageName: ctx.imageName,
+            imageVersion: ctx.imageVersion
+        },
+        envVars: {},
+        argv: [],
+        isServerMode: false,
+        isServerStopMode: false,
+        pickConfigValue: pickFirstString,
+        resolveContainerNameTemplate: value => resolveNowTemplate(value, ctx.formatDate),
+        normalizeCommandSuffix: value => {
+            const text = String(value || '').trim();
+            return text ? ` ${text}` : '';
+        },
+        normalizeJsonEnvMap: normalizeEnvMap,
+        normalizeCliEnvMap,
+        mergeArrayConfig: (globalValue, runValue, cliValue) => [...(globalValue || []), ...(runValue || []), ...(cliValue || [])],
+        normalizeVolume,
+        parseServerListen: () => ({ host: '', port: 0 })
+    });
+
+    const containerName = resolvedBase.containerName;
     validateContainerNameStrict(containerName);
 
-    const hostPath = pickFirstString(requestOptions.hostPath, runConfig.hostPath, config.hostPath, ctx.hostPath);
+    const hostPath = resolvedBase.hostPath;
     if (typeof ctx.validateHostPath === 'function') {
         ctx.validateHostPath(hostPath);
     } else {
         validateWebHostPath(hostPath);
     }
 
-    const containerPath = pickFirstString(
-        requestOptions.containerPath,
-        runConfig.containerPath,
-        config.containerPath,
-        ctx.containerPath,
-        hostPath
-    ) || hostPath;
-    const imageName = pickFirstString(requestOptions.imageName, runConfig.imageName, config.imageName, ctx.imageName);
-    const imageVersion = pickFirstString(requestOptions.imageVersion, runConfig.imageVersion, config.imageVersion, ctx.imageVersion);
+    const containerPath = resolvedBase.containerPath || hostPath;
+    const imageName = resolvedBase.imageName;
+    const imageVersion = resolvedBase.imageVersion;
 
     if (!/^[A-Za-z0-9][A-Za-z0-9._/:-]*$/.test(imageName)) {
         throw new Error(`imageName 非法: ${imageName}`);
@@ -2510,20 +2283,14 @@ function buildCreateRuntime(ctx, state, payload) {
     const hasRunEnv = hasOwn(runConfig, 'env');
     const hasRunEnvFile = hasOwn(runConfig, 'envFile');
     if (hasRequestEnv || hasRequestEnvFile || hasRunEnv || hasRunEnvFile || hasConfigEnv || hasConfigEnvFile) {
-        const configEnv = normalizeEnvMap(config.env, 'config.env');
-        const runEnv = normalizeEnvMap(runConfig.env, runName ? `runs.${runName}.env` : 'run.env');
-        const requestEnv = hasRequestEnv ? normalizeEnvMap(requestOptions.env, 'createOptions.env') : {};
-        const mergedEnv = { ...configEnv, ...runEnv, ...requestEnv };
+        const mergedEnv = resolvedBase.env;
         const envArgs = [];
         Object.entries(mergedEnv).forEach(([key, value]) => {
             const parsed = parseEnvEntry(`${key}=${value}`);
             envArgs.push('--env', `${parsed.key}=${parsed.value}`);
         });
 
-        const envFileList = []
-            .concat(normalizeStringArray(config.envFile, 'config.envFile'))
-            .concat(normalizeStringArray(runConfig.envFile, runName ? `runs.${runName}.envFile` : 'run.envFile'))
-            .concat(hasRequestEnvFile ? normalizeStringArray(requestOptions.envFile, 'createOptions.envFile') : []);
+        const envFileList = resolvedBase.envFile;
         const envFileArgs = [];
         envFileList.forEach(filePath => {
             envFileArgs.push(...parseEnvFileToArgs(filePath));
@@ -2535,10 +2302,7 @@ function buildCreateRuntime(ctx, state, payload) {
     let containerVolumes = Array.isArray(ctx.containerVolumes) ? ctx.containerVolumes.slice() : [];
     const hasRunVolumes = hasOwn(runConfig, 'volumes');
     if (hasRequestVolumes || hasRunVolumes || hasConfigVolumes) {
-        const volumeList = []
-            .concat(normalizeStringArray(config.volumes, 'config.volumes'))
-            .concat(normalizeStringArray(runConfig.volumes, runName ? `runs.${runName}.volumes` : 'run.volumes'))
-            .concat(hasRequestVolumes ? normalizeStringArray(requestOptions.volumes, 'createOptions.volumes') : []);
+        const volumeList = resolvedBase.volumes;
         containerVolumes = [];
         volumeList.forEach(volume => {
             containerVolumes.push('--volume', normalizeVolume(volume));
@@ -2548,10 +2312,7 @@ function buildCreateRuntime(ctx, state, payload) {
     let containerPorts = Array.isArray(ctx.containerPorts) ? ctx.containerPorts.slice() : [];
     const hasRunPorts = hasOwn(runConfig, 'ports');
     if (hasRequestPorts || hasRunPorts || hasConfigPorts) {
-        const portList = []
-            .concat(normalizeStringArray(config.ports, 'config.ports'))
-            .concat(normalizeStringArray(runConfig.ports, runName ? `runs.${runName}.ports` : 'run.ports'))
-            .concat(hasRequestPorts ? normalizeStringArray(requestOptions.ports, 'createOptions.ports') : []);
+        const portList = resolvedBase.ports;
         containerPorts = [];
         portList.forEach(port => {
             containerPorts.push('--publish', port);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.8.6",
+    "version": "5.8.10",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",