@xcanwin/manyoyo 5.4.14 → 5.6.0

package/lib/web/server.js

@@ -26,6 +26,8 @@ const WEB_TERMINAL_MIN_ROWS = 12;
 const WEB_AGENT_CONTEXT_MAX_MESSAGES = 24;
 const WEB_AGENT_CONTEXT_MAX_CHARS = 6000;
 const WEB_AGENT_CONTEXT_PER_MESSAGE_MAX_CHARS = 600;
+const WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER = '__MANYOYO_LAST_MESSAGE_BEGIN__';
+const WEB_AGENT_LAST_MESSAGE_END_MARKER = '__MANYOYO_LAST_MESSAGE_END__';
 const WEB_AUTH_COOKIE_NAME = 'manyoyo_web_auth';
 const WEB_AUTH_TTL_SECONDS = 12 * 60 * 60;
 const FRONTEND_DIR = path.join(__dirname, 'frontend');
@@ -124,7 +126,8 @@ function loadWebSessionHistory(webHistoryDir, containerName) {
             resumeSupported: false,
             lastResumeAt: null,
             lastResumeOk: null,
-            lastResumeError: ''
+            lastResumeError: '',
+            applied: null
         };
     }
 
@@ -141,7 +144,10 @@ function loadWebSessionHistory(webHistoryDir, containerName) {
             resumeSupported: data.resumeSupported === true,
             lastResumeAt: typeof data.lastResumeAt === 'string' ? data.lastResumeAt : null,
             lastResumeOk: typeof data.lastResumeOk === 'boolean' ? data.lastResumeOk : null,
-            lastResumeError: typeof data.lastResumeError === 'string' ? data.lastResumeError : ''
+            lastResumeError: typeof data.lastResumeError === 'string' ? data.lastResumeError : '',
+            applied: data.applied && typeof data.applied === 'object' && !Array.isArray(data.applied)
+                ? data.applied
+                : null
         };
     } catch (e) {
         return {
@@ -153,7 +159,8 @@ function loadWebSessionHistory(webHistoryDir, containerName) {
             resumeSupported: false,
             lastResumeAt: null,
             lastResumeOk: null,
-            lastResumeError: ''
+            lastResumeError: '',
+            applied: null
         };
     }
 }
@@ -251,6 +258,9 @@ function normalizeAgentPromptCommandTemplate(value, sourceLabel = 'agentPromptCo
     if (!text.includes('{prompt}')) {
         throw new Error(`${sourceLabel} 必须包含 {prompt} 占位符`);
     }
+    if (/^codex\s+exec(?:\s|$)/.test(text) && !text.includes('--skip-git-repo-check')) {
+        return text.replace(/^codex\s+exec\b/, 'codex exec --skip-git-repo-check');
+    }
     return text;
 }
 
@@ -269,6 +279,49 @@ function renderAgentPromptCommand(template, prompt) {
     return templateText.replace(/\{prompt\}/g, safePrompt);
 }
 
+function buildCodexAgentExecCommand(template, prompt) {
+    const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const outputFile = `/tmp/manyoyo-web-agent-last-${Date.now()}-${crypto.randomBytes(6).toString('hex')}.txt`;
+    const quotedOutputFile = quoteBashSingleValue(outputFile);
+    const codexTemplate = templateText.replace(
+        /^((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)codex\s+exec\b/,
+        `$1codex exec --output-last-message ${quotedOutputFile}`
+    );
+    const command = codexTemplate === templateText
+        ? renderAgentPromptCommand(templateText, prompt)
+        : renderAgentPromptCommand(codexTemplate, prompt);
+    return [
+        `rm -f ${quotedOutputFile}`,
+        command,
+        '__manyoyo_agent_exit=$?',
+        `if [ -f ${quotedOutputFile} ]; then printf '\\n${WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER}\\n'; cat ${quotedOutputFile}; printf '\\n${WEB_AGENT_LAST_MESSAGE_END_MARKER}\\n'; fi`,
+        `rm -f ${quotedOutputFile}`,
+        'exit $__manyoyo_agent_exit'
+    ].join('; ');
+}
+
+function buildWebAgentExecCommand(template, prompt, agentProgram) {
+    if (agentProgram === 'codex') {
+        return buildCodexAgentExecCommand(template, prompt);
+    }
+    return renderAgentPromptCommand(template, prompt);
+}
+
+function extractLastMessageOutput(text) {
+    const raw = String(text || '');
+    const pattern = new RegExp(
+        `(?:^|\\r?\\n)${WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER}\\r?\\n([\\s\\S]*?)(?:\\r?\\n)${WEB_AGENT_LAST_MESSAGE_END_MARKER}(?:\\r?\\n|$)`,
+        'g'
+    );
+    let lastMatch = null;
+    let matched = pattern.exec(raw);
+    while (matched) {
+        lastMatch = matched[1];
+        matched = pattern.exec(raw);
+    }
+    return String(lastMatch || '').trim();
+}
+
 function getAgentRuntimeMeta(history) {
     const sessionHistory = history && typeof history === 'object' ? history : {};
     const template = normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand');
@@ -533,15 +586,51 @@ 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) {
-    if (!path.isAbsolute(filePath)) {
+    const resolvedPath = expandHomeAliasPath(filePath);
+    if (!path.isAbsolute(resolvedPath)) {
         throw new Error(`envFile 仅支持绝对路径: ${filePath}`);
     }
-    if (!fs.existsSync(filePath)) {
-        throw new Error(`未找到环境文件: ${filePath}`);
+    if (!fs.existsSync(resolvedPath)) {
+        throw new Error(`未找到环境文件: ${resolvedPath}`);
     }
 
-    const content = fs.readFileSync(filePath, 'utf-8');
+    const content = fs.readFileSync(resolvedPath, 'utf-8');
     const args = [];
     const lines = content.split('\n');
 
@@ -897,7 +986,7 @@ function buildCreateRuntime(ctx, state, payload) {
             : normalizeStringArray(config.volumes, 'config.volumes');
         containerVolumes = [];
         volumeList.forEach(volume => {
-            containerVolumes.push('--volume', volume);
+            containerVolumes.push('--volume', normalizeVolume(volume));
         });
     }
 
@@ -935,6 +1024,7 @@ function buildCreateRuntime(ctx, state, payload) {
             shellPrefix: shellPrefix || '',
             shell: shell || '',
             shellSuffix: shellSuffix || '',
+            defaultCommand: buildDefaultCommand(shellPrefix, shell, shellSuffix) || '/bin/bash',
             agentEnabled: isAgentPromptCommandEnabled(agentPromptCommand),
             agentProgram: agentProgram || '',
             resumeSupported,
@@ -1083,7 +1173,9 @@ async function execCommandInWebContainer(ctx, containerName, command) {
         process.on('close', code => {
             const exitCode = typeof code === 'number' ? code : 1;
             const clippedRaw = outputTruncated ? `${rawOutput}\n...[raw-truncated]` : rawOutput;
-            const output = clipText(stripAnsi(clippedRaw).trim() || '(无输出)');
+            const extractedLastMessage = extractLastMessageOutput(clippedRaw);
+            const cleanOutputSource = extractedLastMessage || clippedRaw;
+            const output = clipText(stripAnsi(cleanOutputSource).trim() || '(无输出)');
             resolve({ exitCode, output });
         });
     });
@@ -1169,6 +1261,64 @@ function buildSessionSummary(ctx, state, containerMap, name) {
     };
 }
 
+function buildSessionFallbackApplied(ctx, state, name, history, summary) {
+    const snapshot = readWebConfigSnapshot(state.webConfigPath);
+    const defaults = buildConfigDefaults(ctx, snapshot.parseError ? {} : snapshot.parsed);
+    const effectiveAgentPromptCommand = history.agentPromptCommand || defaults.agentPromptCommand || '';
+    const effectiveAgentProgram = history.agentProgram || resolveAgentProgram(effectiveAgentPromptCommand) || '';
+    const effectiveResumeSupported = history.resumeSupported === true
+        || Boolean(buildAgentResumeCommand(effectiveAgentProgram));
+    const defaultCommand = buildDefaultCommand(
+        defaults.shellPrefix,
+        defaults.shell,
+        defaults.shellSuffix
+    ) || buildStaticContainerRuntime(ctx, name).defaultCommand;
+
+    return {
+        containerName: name,
+        hostPath: defaults.hostPath || ctx.hostPath || '',
+        containerPath: defaults.containerPath || ctx.containerPath || '',
+        imageName: defaults.imageName || ctx.imageName || '',
+        imageVersion: defaults.imageVersion || ctx.imageVersion || '',
+        containerMode: defaults.containerMode || '',
+        shellPrefix: defaults.shellPrefix || '',
+        shell: defaults.shell || '',
+        shellSuffix: defaults.shellSuffix || '',
+        defaultCommand,
+        agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
+        agentProgram: effectiveAgentProgram,
+        resumeSupported: effectiveResumeSupported,
+        yolo: defaults.yolo || '',
+        envCount: Object.keys(defaults.env || {}).length,
+        volumeCount: Array.isArray(defaults.volumes) ? defaults.volumes.length : 0,
+        portCount: Array.isArray(defaults.ports) ? defaults.ports.length : 0,
+        status: summary.status || 'history'
+    };
+}
+
+function buildSessionDetail(ctx, state, containerMap, name) {
+    const history = loadWebSessionHistory(state.webHistoryDir, name);
+    const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+    const summary = buildSessionSummary(ctx, state, containerMap, name);
+    const latestMessage = history.messages.length ? history.messages[history.messages.length - 1] : null;
+    const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
+        ? history.applied
+        : buildSessionFallbackApplied(ctx, state, name, history, summary);
+
+    return {
+        ...summary,
+        latestRole: latestMessage && latestMessage.role ? String(latestMessage.role) : '',
+        latestTimestamp: latestMessage && latestMessage.timestamp ? latestMessage.timestamp : summary.updatedAt,
+        agentPromptCommand: normalizedTemplate || '',
+        agentProgram: history.agentProgram || summary.agentProgram || '',
+        resumeSupported: history.resumeSupported === true || summary.resumeSupported === true,
+        lastResumeAt: history.lastResumeAt || null,
+        lastResumeOk: typeof history.lastResumeOk === 'boolean' ? history.lastResumeOk : null,
+        lastResumeError: history.lastResumeError || '',
+        applied
+    };
+}
+
 function isSafeStaticAssetName(name) {
     return /^[A-Za-z0-9._-]+$/.test(name);
 }
@@ -1584,6 +1734,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
 
                 await ensureWebContainer(ctx, state, runtime);
                 setWebSessionAgentPromptCommand(state.webHistoryDir, runtime.containerName, runtime.agentPromptCommand);
+                patchWebSessionAgentState(state.webHistoryDir, runtime.containerName, {
+                    applied: runtime.applied
+                });
                 sendJson(res, 200, { name: runtime.containerName, applied: runtime.applied });
             }
         },
@@ -1599,6 +1752,20 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: containerName, messages: history.messages });
             }
         },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/detail$/),
+            handler: async match => {
+                const containerName = getValidSessionName(ctx, res, match[1]);
+                if (!containerName) {
+                    return;
+                }
+
+                const containerMap = listWebManyoyoContainers(ctx);
+                const detail = buildSessionDetail(ctx, state, containerMap, containerName);
+                sendJson(res, 200, { name: containerName, detail });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/run$/),
@@ -1645,6 +1812,11 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
 
                 const history = loadWebSessionHistory(state.webHistoryDir, containerName);
+                const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+                if (normalizedTemplate !== history.agentPromptCommand) {
+                    history.agentPromptCommand = normalizedTemplate;
+                    saveWebSessionHistory(state.webHistoryDir, containerName, history);
+                }
                 if (!isAgentPromptCommandEnabled(history.agentPromptCommand)) {
                     sendJson(res, 400, { error: '当前会话未配置 agentPromptCommand' });
                     return;
@@ -1669,7 +1841,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 const effectivePrompt = resumeSucceeded
                     ? prompt
                     : buildAgentPromptWithHistory(history, prompt);
-                const command = renderAgentPromptCommand(history.agentPromptCommand, effectivePrompt);
+                const command = buildWebAgentExecCommand(history.agentPromptCommand, effectivePrompt, agentMeta.agentProgram);
                 const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
                 appendWebSessionMessage(state.webHistoryDir, containerName, 'user', prompt, {
                     mode: 'agent',
@@ -1995,7 +2167,7 @@ async function startWebServer(options) {
             const { GREEN, CYAN, YELLOW, NC } = ctx.colors;
             const listenHost = formatUrlHost(ctx.serverHost);
             console.log(`${GREEN}✅ MANYOYO Web 服务已启动: http://${listenHost}:${listenPort}${NC}`);
-            console.log(`${CYAN}提示: 左侧是 manyoyo 容器会话列表，右侧支持命令模式、AGENT 模式与交互式终端模式。${NC}`);
+            console.log(`${CYAN}提示: 左侧是 manyoyo 容器会话列表，中间是活动/终端/配置/检查工作台，右侧显示当前会话上下文。${NC}`);
             if (ctx.serverHost === '0.0.0.0') {
                 console.log(`${CYAN}提示: 当前监听全部网卡，请用本机局域网 IP 访问。${NC}`);
             }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.4.14",
-    "imageVersion": "1.8.12-common",
+    "version": "5.6.0",
+    "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
@@ -77,6 +77,15 @@
         "testMatch": [
             "**/test/**/*.test.js"
         ],
-        "testEnvironment": "node"
+        "testEnvironment": "node",
+        "modulePathIgnorePatterns": [
+            "<rootDir>/temp/"
+        ],
+        "testPathIgnorePatterns": [
+            "<rootDir>/temp/"
+        ],
+        "watchPathIgnorePatterns": [
+            "<rootDir>/temp/"
+        ]
     }
 }