@xcanwin/manyoyo 7.0.6 → 7.0.8

package/lib/web/server.js

@@ -9,8 +9,9 @@ const http = require('http');
 const WebSocket = require('ws');
 const JSON5 = require('json5');
 const { buildContainerRunArgs } = require('../container-run');
+const { estimateContainerCapacity } = require('../capacity');
 const { extractAgentMessageFromCodexJsonl } = require('../codex-output');
-const { findValueRangeByPath, applyTextReplacements } = require('../json5-text-edit');
+const { findValueRangeByPath, applyTextReplacements, upsertValueByPath } = require('../json5-text-edit');
 const { resolveRuntimeConfig } = require('../runtime-resolver');
 const {
     parseEnvEntry,
@@ -4505,6 +4506,83 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/system/capacity' ? [] : null,
+            handler: async () => {
+                const containerMap = listWebManyoyoContainers(ctx);
+                const diskPath = path.dirname(path.resolve(state.webConfigPath));
+                const report = estimateContainerCapacity({
+                    runtimeCommand: ctx.dockerCmd || 'docker',
+                    imageName: ctx.imageName,
+                    imageVersion: ctx.imageVersion,
+                    containerNames: Object.keys(containerMap),
+                    diskPath,
+                    runCommand: (command, args) => ctx.dockerExecArgs(args, { ignoreError: false }),
+                    statfs: statPath => fs.statfsSync(statPath)
+                });
+                sendJson(res, 200, report);
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/system/quick-chat-config' ? [] : null,
+            handler: async () => {
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                const serve = snapshot.parsed && typeof snapshot.parsed.serve === 'object' && snapshot.parsed.serve !== null
+                    ? snapshot.parsed.serve
+                    : {};
+                const quickChat = serve.quickChat && typeof serve.quickChat === 'object' ? serve.quickChat : {};
+                sendJson(res, 200, {
+                    path: typeof quickChat.path === 'string' && quickChat.path.trim() ? quickChat.path : null,
+                    run: typeof quickChat.run === 'string' && quickChat.run.trim() ? quickChat.run : null
+                });
+            }
+        },
+        {
+            method: 'PUT',
+            match: currentPath => currentPath === '/api/system/quick-chat-config' ? [] : null,
+            handler: async () => {
+                const payload = await readJsonBody(req);
+                const quickChatPath = typeof payload.path === 'string' ? payload.path.trim() : '';
+                const quickChatRun = typeof payload.run === 'string' ? payload.run.trim() : '';
+                if (!quickChatPath) {
+                    sendJson(res, 400, { error: 'path 不能为空' });
+                    return;
+                }
+                if (!quickChatRun) {
+                    sendJson(res, 400, { error: 'run 不能为空' });
+                    return;
+                }
+                const resolvedPath = expandHomeAliasPath(quickChatPath);
+                const homeDir = process.env.HOME || os.homedir() || '/home';
+                if (resolvedPath === '/' || resolvedPath === homeDir) {
+                    sendJson(res, 400, { error: 'path 不能是根目录或 home 目录本身' });
+                    return;
+                }
+
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                if (snapshot.parseError) {
+                    sendJson(res, 400, { error: '当前配置解析失败，无法写入', detail: snapshot.parseError });
+                    return;
+                }
+
+                let nextRaw;
+                try {
+                    nextRaw = upsertValueByPath(snapshot.raw, ['serve', 'quickChat', 'path'], JSON.stringify(quickChatPath));
+                    nextRaw = upsertValueByPath(nextRaw, ['serve', 'quickChat', 'run'], JSON.stringify(quickChatRun));
+                } catch (e) {
+                    sendJson(res, 400, { error: '配置写入失败', detail: e.message || '' });
+                    return;
+                }
+
+                const savePath = path.resolve(state.webConfigPath);
+                fs.mkdirSync(path.dirname(savePath), { recursive: true });
+                fs.writeFileSync(savePath, nextRaw, 'utf-8');
+
+                sendJson(res, 200, { saved: true, path: quickChatPath, run: quickChatRun });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath === '/api/sessions' ? [] : null,
@@ -5044,14 +5122,17 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
 
                 await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
-                appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', command);
+                appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', command, { mode: 'command' });
                 const result = await execCommandInWebContainer(ctx, sessionRef.containerName, command);
+                // role 用 'system'、带 mode: 'command'，与前端实时发送时的约定对齐（workspace-panel.tsx
+                // handleSend 的 command 分支）——命令输出本来就不该走 assistant 的气泡样式和 markdown 渲染，
+                // 之前这里存的是 'assistant' 且没带 mode，历史记录重新加载后气泡样式和渲染方式会跟实时时不一致
                 appendWebSessionMessage(
                     state.webHistoryDir,
                     sessionRef,
-                    'assistant',
+                    'system',
                     result.output,
-                    { exitCode: result.exitCode }
+                    { exitCode: result.exitCode, mode: 'command' }
                 );
                 sendJson(res, 200, { exitCode: result.exitCode, output: result.output });
             }

package/manyoyo.example.json

@@ -47,8 +47,14 @@
     // serve 命令专属配置（覆盖型：runs.<name>.serve > 全局配置）
     // 不设置 serve 字段（或不设置 title 字段）时，网页 <title> 按当前会话 Agent 名动态显示
     // 一旦设置 title，则固定显示该值（不再随会话变化），留空字符串 "" 即固定显示为空
+    // quickChat 是网页端"快捷对话"按钮的配置：path 为工作根目录（每次点击按时间戳建子目录），
+    // run 为使用哪个 runs.<name> 配置；也可以在网页「系统设置 > 快捷对话」里填写，效果一样
     // "serve": {
-    //     "title": "My MANYOYO"
+    //     "title": "My MANYOYO",
+    //     "quickChat": {
+    //         "path": "~/.manyoyo/workpath/",
+    //         "run": "claude"
+    //     }
     // },
 
     // 可选插件（manyoyo playwright / manyoyo plugin playwright）

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "7.0.6",
+    "version": "7.0.8",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",