@xcanwin/manyoyo 8.6.12 → 8.7.0

package/lib/web/server.js

@@ -34,6 +34,7 @@ const { estimateContainerCapacity } = require('../capacity');
 const { extractAgentMessageFromCodexJsonl } = require('../codex-output');
 const { findValueRangeByPath, applyTextReplacements, upsertValueByPath } = require('../json5-text-edit');
 const { resolveRuntimeConfig } = require('../runtime-resolver');
+const { resolveQuickChatPath, expandTemplate } = require('../name-template');
 const { AGENT_ENV_SCHEMA } = require('../init-config');
 const { ensureImagePresent, pullImageProcess } = require('../image-pull');
 const { waitForImport } = require('../offline-import');
@@ -41,6 +42,7 @@ const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirro
 const { createImageAgentProbe } = require('../image-agents');
 const { createAuthStore } = require('./auth-store');
 const webUploads = require('./uploads');
+const webStorage = require('./storage');
 const webSnapshots = require('./snapshots');
 const webRewind = require('./rewind');
 const { listSetupAgents, getConfiguredAgents, buildAgentRunProfile, classifyConnectionResult, redactSecrets, validateSetupPassword, listMirrorPresets } = require('../setup');
@@ -2978,8 +2980,7 @@ function resolveNowTemplate(value, formatDate) {
     if (typeof value !== 'string') {
         return value;
     }
-    const nowText = typeof formatDate === 'function' ? formatDate() : '';
-    return value.replace(/\{now\}|\$\{now\}/g, nowText);
+    return expandTemplate(value, { now: typeof formatDate === 'function' ? formatDate() : '' }).value;
 }
 
 function validateContainerNameStrict(containerName) {
@@ -3236,7 +3237,7 @@ function buildConfigDefaults(ctx, config) {
     const parsed = toPlainObject(config);
     const defaults = {
         containerName: hasOwn(parsed, 'containerName') ? String(parsed.containerName || '') : '',
-        hostPath: sanitizeDefaultHostPath(pickFirstString(parsed.hostPath, ctx.hostPath)),
+        hostPath: sanitizeDefaultHostPath(pickFirstString(parsed.hostPath)),
         containerPath: pickFirstString(parsed.containerPath),
         imageName: pickFirstString(parsed.imageName, ctx.imageName),
         imageVersion: pickFirstString(parsed.imageVersion, ctx.imageVersion),
@@ -3284,7 +3285,8 @@ function buildConfigDefaults(ctx, config) {
 function buildStaticContainerRuntime(ctx, containerName) {
     return {
         containerName,
-        hostPath: ctx.hostPath,
+        // 只给已存在的容器用；不带 serve 的启动目录，万一容器在这之间被删也不会按它重建
+        hostPath: '',
         containerPath: ctx.containerPath,
         imageName: ctx.imageName,
         imageVersion: ctx.imageVersion,
@@ -3374,7 +3376,8 @@ function buildCreateRuntime(ctx, state, payload) {
         globalFirstConfig,
         runFirstConfig,
         defaults: {
-            hostPath: ctx.hostPath,
+            // 不用 ctx.hostPath（serve 的启动目录）：与前端新建容器对话框一致，按模板在真正创建时才建目录
+            hostPath: DEFAULT_NEW_CONTAINER_PATH_TEMPLATE,
             containerName: `my-${ctx.formatDate()}`,
             // 不用 ctx.containerPath：那是 serve 进程的启动目录（CLI 的 cwd 语义），与用户要挂载的目录无关；
             // 没配置也没传时落到下面的 `|| hostPath`，容器内路径与宿主机路径一致
@@ -3388,6 +3391,11 @@ function buildCreateRuntime(ctx, state, payload) {
         isServerStopMode: false,
         pickConfigValue: pickFirstString,
         resolveContainerNameTemplate: value => resolveNowTemplate(value, ctx.formatDate),
+        // {now} / {quickChatPath} 一次解析只取一个时间：容器名和目录用同一个时间戳
+        templateVars: {
+            now: typeof ctx.formatDate === 'function' ? ctx.formatDate() : undefined,
+            quickChatPath: resolveQuickChatPath(config, { homeDir: ctx.homeDir || os.homedir(), defaultDir: getSetupWorkpath(state) })
+        },
         normalizeCommandSuffix: value => {
             const text = String(value || '').trim();
             return text ? ` ${text}` : '';
@@ -3413,6 +3421,10 @@ function buildCreateRuntime(ctx, state, payload) {
     validateContainerNameStrict(containerName);
 
     const hostPath = resolvedBase.hostPath;
+    // 按模板（{now} / {quickChatPath}）生成的目录：此刻才建
+    if (resolvedBase.hostPathTemplated && !fs.existsSync(hostPath)) {
+        fs.mkdirSync(hostPath, { recursive: true });
+    }
     if (typeof ctx.validateHostPath === 'function') {
         ctx.validateHostPath(hostPath);
     } else {
@@ -4131,9 +4143,26 @@ function getWebNetworkManager(ctx, state) {
 
 // 进入容器前一律检查网络规则（宿主机侧的“本次启动已下发”状态）：文件浏览也会 exec /bin/bash -lc，
 // 里面的 .bashrc 等是 Agent 能改的代码，不能在规则缺失的窗口里跑
+// 只给名字时：容器还在就不需要运行配置；容器已被删掉，且历史里有创建参数，就按它重建（走 buildCreateRuntime 的路径校验）。
+// 不再无条件退回 serve 进程的启动目录：那会让重建的容器挂上 $HOME，并且没有原来的 env 和网络设置；
+// 没有历史也没有容器时直接报错，不再猜参数
+function resolveRuntimeForExistingName(ctx, state, containerName) {
+    if (ctx.containerExists(containerName)) {
+        return buildStaticContainerRuntime(ctx, containerName);
+    }
+    const history = loadWebSessionHistory(state.webHistoryDir, containerName);
+    const snapshot = history.runtimeSnapshot && typeof history.runtimeSnapshot === 'object' ? history.runtimeSnapshot : null;
+    if (!snapshot || !snapshot.hostPath) {
+        throw new Error('这个会话没有建容器的参数，请新建容器');
+    }
+    const createOptions = buildCloneCreateOptionsFromSnapshot(snapshot, history);
+    createOptions.containerName = containerName;
+    return buildCreateRuntime(ctx, state, { createOptions });
+}
+
 async function ensureWebContainer(ctx, state, containerInput, messageSessionRef = null) {
     const runtime = typeof containerInput === 'string'
-        ? buildStaticContainerRuntime(ctx, containerInput)
+        ? resolveRuntimeForExistingName(ctx, state, containerInput)
         : containerInput;
 
     if (!runtime || !runtime.containerName) {
@@ -4234,6 +4263,8 @@ async function ensureWebContainer(ctx, state, containerInput, messageSessionRef
     await getWebNetworkManager(ctx, state).ensureReady(runtime.containerName);
 }
 
+const DEFAULT_NEW_CONTAINER_NAME_TEMPLATE = 'my-easy-{now}';
+const DEFAULT_NEW_CONTAINER_PATH_TEMPLATE = '{quickChatPath}/{now}';
 const WEB_FIRST_COMMAND_TIMEOUT_MS = 10 * 60 * 1000;
 const WEB_FIRST_COMMAND_OUTPUT_CHARS = 500;
 
@@ -5868,6 +5899,38 @@ function getSetupWorkpath(state) {
     return path.join(path.dirname(path.resolve(state.webConfigPath)), 'work');
 }
 
+// 工作目录根：默认的 ~/.manyoyo/work；配置里的快捷对话目录（serve.quickChat.path）另算，storage 里会先校验再用
+function getStorageRootsConfig(ctx, state) {
+    const extraWorkRoots = [];
+    const configHostPaths = [];
+    try {
+        const parsed = readWebConfigSnapshot(state.webConfigPath).parsed;
+        // 配置里写死的挂载目录（全局与每个 runs.<名>）：删除时算在用；含 {模板} 的每次不同，不算
+        const fixedHostPaths = [parsed && parsed.hostPath, ...Object.values((parsed && parsed.runs) || {}).map(run => run && run.hostPath)];
+        for (const value of fixedHostPaths) {
+            if (typeof value === 'string' && value.trim() && !value.includes('{')) configHostPaths.push(expandHomeAliasPath(value.trim()));
+        }
+        const quickChatPath = parsed && parsed.serve && parsed.serve.quickChat && parsed.serve.quickChat.path;
+        if (typeof quickChatPath === 'string' && quickChatPath.trim()) extraWorkRoots.push(expandHomeAliasPath(quickChatPath.trim()));
+    } catch (e) { /* 配置读不出来就只认默认目录 */ }
+    return {
+        workRoots: [getSetupWorkpath(state)],
+        extraWorkRoots,
+        configHostPaths,
+        homeDir: ctx.homeDir || os.homedir(),
+        dockerExecAsync: ctx.dockerExecAsync || (async (args) => ctx.dockerExecArgs(args))
+    };
+}
+
+async function loadStorageListing(ctx, state) {
+    const listing = await webStorage.buildStorageListing({
+        ...getStorageRootsConfig(ctx, state),
+        historyDir: state.webHistoryDir
+    });
+    state.storageKnownPaths = new Set(listing.rows.map(row => row.path));
+    return listing;
+}
+
 async function inspectSetupImage(ctx, state) {
     const image = `${ctx.imageName}:${ctx.imageVersion}`;
     const pulling = state && state.imagePulls.get(image);
@@ -6175,7 +6238,7 @@ function buildSessionFallbackApplied(ctx, state, name, history, summary) {
 
     return {
         containerName: name,
-        hostPath: defaults.hostPath || ctx.hostPath || '',
+        hostPath: defaults.hostPath || '',
         containerPath: defaults.containerPath || ctx.containerPath || '',
         imageName: defaults.imageName || ctx.imageName || '',
         imageVersion: defaults.imageVersion || ctx.imageVersion || '',
@@ -6907,6 +6970,23 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            // 新建容器对话框的默认值：配置里写了就用配置的，没写就用默认模板
+            // （容器名 my-easy-{now}，宿主机目录与容器内目录 {quickChatPath}/{now}），由前端展开；目录在点“创建”时才建
+            method: 'GET',
+            match: currentPath => currentPath === '/api/system/new-container-defaults' ? [] : null,
+            handler: async () => {
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                const config = snapshot.parseError ? {} : toPlainObject(snapshot.parsed);
+                const hostPathConfigured = Boolean(pickFirstString(config.hostPath));
+                sendJson(res, 200, {
+                    containerName: pickFirstString(config.containerName) || DEFAULT_NEW_CONTAINER_NAME_TEMPLATE,
+                    hostPath: pickFirstString(config.hostPath) || DEFAULT_NEW_CONTAINER_PATH_TEMPLATE,
+                    containerPath: pickFirstString(config.containerPath) || (hostPathConfigured ? '' : DEFAULT_NEW_CONTAINER_PATH_TEMPLATE),
+                    quickChatPath: resolveQuickChatPath(config, { homeDir: ctx.homeDir || os.homedir(), defaultDir: getSetupWorkpath(state) })
+                });
+            }
+        },
         {
             // 系统设置“Agent 环境说明”：内置说明（只读）+ 全局配置里用户追加的说明
             method: 'GET',
@@ -7612,6 +7692,86 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, payload);
             }
         },
+        {
+            // 磁盘占用：宿主机工作目录与已删除容器的历史（体积另走 /size，大目录不拖慢列表）
+            method: 'GET',
+            match: currentPath => currentPath === '/api/storage' ? [] : null,
+            handler: async () => {
+                let listing;
+                try {
+                    listing = await loadStorageListing(ctx, state);
+                } catch (e) {
+                    sendJson(res, 503, { error: '容器运行时不可用，暂时无法判断目录是否还在使用' });
+                    return;
+                }
+                sendJson(res, 200, listing);
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/storage/size' ? [] : null,
+            handler: async () => {
+                const target = String(new URL(req.url || '/', 'http://localhost').searchParams.get('path') || '');
+                if (!state.storageKnownPaths || !state.storageKnownPaths.has(target)) {
+                    sendJson(res, 404, { error: '没有这个目录，请刷新列表' });
+                    return;
+                }
+                sendJson(res, 200, await webStorage.directorySize(target));
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath === '/api/storage/files' ? [] : null,
+            handler: async () => {
+                const params = new URL(req.url || '/', 'http://localhost').searchParams;
+                const target = String(params.get('path') || '');
+                if (!state.storageKnownPaths || !state.storageKnownPaths.has(target)) {
+                    sendJson(res, 404, { error: '没有这个目录，请刷新列表' });
+                    return;
+                }
+                const listed = await webStorage.listDirectory(target, params.get('sub') || '');
+                sendJson(res, listed.ok ? 200 : listed.status, listed.ok ? listed : { error: listed.error });
+            }
+        },
+        {
+            method: 'DELETE',
+            match: currentPath => currentPath === '/api/storage/dirs' ? [] : null,
+            handler: async () => {
+                const body = (await readJsonBody(req)) || {};
+                let listing;
+                try {
+                    listing = await loadStorageListing(ctx, state);
+                } catch (e) {
+                    sendJson(res, 503, { error: '容器运行时不可用，不能确认目录没人用，已拒绝删除' });
+                    return;
+                }
+                const removed = await webStorage.removeManagedDirectory(listing, String(body.path || ''), { emptyOnly: body.emptyOnly === true });
+                sendJson(res, removed.ok ? 200 : removed.status, removed.ok ? { removed: true } : { error: removed.error });
+            }
+        },
+        {
+            method: 'DELETE',
+            match: currentPath => currentPath === '/api/storage/histories' ? [] : null,
+            handler: async () => {
+                const body = (await readJsonBody(req)) || {};
+                const name = String(body.name || '');
+                if (!ctx.isValidContainerName(name)) {
+                    sendJson(res, 400, { error: '名称不合法' });
+                    return;
+                }
+                let listing;
+                try {
+                    listing = await loadStorageListing(ctx, state);
+                } catch (e) {
+                    sendJson(res, 503, { error: '容器运行时不可用，不能确认容器已删除，已拒绝清理' });
+                    return;
+                }
+                const removed = await webStorage.removeDeletedHistory(
+                    state.webHistoryDir, listing, name, historyName => removeWebSessionHistory(state.webHistoryDir, historyName)
+                );
+                sendJson(res, removed.ok ? 200 : removed.status, removed.ok ? { removed: true } : { error: removed.error });
+            }
+        },
         {
             // 聊天里的图片：原始请求体，类型只收 png/jpeg/gif/webp，单张 10MB
             method: 'POST',
@@ -8533,7 +8693,16 @@ async function handleWebApi(req, res, pathname, ctx, state) {
 
                 const payload = await readJsonBody(req);
                 const removeHistory = payload.removeHistory === true;
+                // 先记下工作目录：历史删掉后就查不到了
+                const removedHistoryInfo = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                const workDirHint = (removedHistoryInfo.applied && removedHistoryInfo.applied.hostPath) ||
+                    (removedHistoryInfo.runtimeSnapshot && removedHistoryInfo.runtimeSnapshot.hostPath) || '';
                 const { removedContainer } = removeContainerIdempotent(ctx, sessionRef.containerName);
+                let removedWorkDir = false;
+                if (removeHistory) {
+                    // 连同历史一起删时，顺手清掉空的工作目录（只 rmdir，非空删不动）
+                    removedWorkDir = await webStorage.removeEmptyWorkDir({ hostPath: workDirHint, ...getStorageRootsConfig(ctx, state) }).catch(() => false);
+                }
 
                 if (removeHistory) {
                     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
@@ -8546,6 +8715,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, {
                     removed: true,
                     removedHistory: removeHistory,
+                    removedWorkDir,
                     name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
                 });
             }