@xcanwin/manyoyo 8.6.9 → 8.6.11

package/lib/web/server.js

@@ -12,7 +12,7 @@ const JSON5 = require('json5');
 const { buildContainerRunArgs, hasNetworkArg } = require('../container-run');
 const { buildContainerIntegration, mergeIntegration } = require('../plugin');
 const { applyAptMirror } = require('../mirrors');
-const { BUILTIN_AGENT_INSTRUCTIONS, buildAgentInstructions, toTomlBasicString } = require('../agent-instructions');
+const { BUILTIN_AGENT_INSTRUCTIONS, buildAgentInstructions, composeSystemPrompt, SYSTEM_PROMPT_MAX_CHARS, toTomlBasicString } = require('../agent-instructions');
 const containerState = require('../container-state');
 const sessionMeta = require('./session-meta');
 const gitChanges = require('./git-changes');
@@ -37,7 +37,7 @@ const { resolveRuntimeConfig } = require('../runtime-resolver');
 const { AGENT_ENV_SCHEMA } = require('../init-config');
 const { ensureImagePresent, pullImageProcess } = require('../image-pull');
 const { waitForImport } = require('../offline-import');
-const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw } = require('../setup-config');
+const { baseRawOf, buildAgentConfigRaw, buildPasswordConfigRaw, shouldWriteMirrors, buildMirrorsConfigRaw, buildAgentInstructionsConfigRaw, buildBooleanConfigRaw } = require('../setup-config');
 const { listSetupAgents, getConfiguredAgents, buildAgentRunProfile, classifyConnectionResult, redactSecrets, validateSetupPassword, listMirrorPresets } = require('../setup');
 const { applyDoctorFixes } = require('../doctor');
 const { writeConfigFileSecure } = require('../secure-file');
@@ -2387,7 +2387,11 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
         sessionId: sessionIdForRun,
         model: agentSession.model || '',
         forwardSubagentText: agentMeta.agentProgram === 'claude' ? 'auto' : false,
-        instructions: buildAgentInstructions(configSnapshot.parseError ? {} : configSnapshot.parsed, runName)
+        instructions: buildAgentInstructions(
+            configSnapshot.parseError ? {} : configSnapshot.parsed,
+            runName,
+            readContainerSystemPrompt(ctx, sessionRef.containerName)
+        )
     });
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
@@ -2971,6 +2975,11 @@ function validateWebConfigShape(configObject) {
     if (hasOwn(config, 'agentInstructions') && typeof config.agentInstructions !== 'string') {
         throw new Error('agentInstructions 必须是字符串');
     }
+    ['agentInstructionsBuiltinEnabled', 'agentInstructionsCustomEnabled'].forEach(key => {
+        if (hasOwn(config, key) && typeof config[key] !== 'boolean') {
+            throw new Error(`${key} 必须是布尔值`);
+        }
+    });
     if (hasOwn(config, 'runs')) {
         const runs = config.runs;
         if (runs !== undefined && (typeof runs !== 'object' || runs === null || Array.isArray(runs))) {
@@ -3196,6 +3205,10 @@ function buildCreateRuntime(ctx, state, payload) {
         throw new Error('该网络设置会放开限制（自定义模式、很宽的允许规则或绑定非本机地址），需要确认（confirmRisk）');
     }
 
+    // 系统提示词：请求里填了就用它（创建时定下），否则按系统设置里的默认 + 补充（各自的开关生效）
+    const systemPrompt = normalizeSystemPromptInput(requestOptions.systemPrompt)
+        || { enabled: true, text: composeSystemPrompt(config, runName) };
+
     const containerName = resolvedBase.containerName;
     validateContainerNameStrict(containerName);
 
@@ -3313,6 +3326,7 @@ function buildCreateRuntime(ctx, state, payload) {
         containerPorts,
         autostart: manage.autostart,
         network: manage.network,
+        systemPrompt,
         agentPromptCommand,
         defaultCommand: buildDefaultCommand(shellPrefix, shell, shellSuffix) || '/bin/bash',
         // 仅供服务端内部复用（如"创建相同配置容器"/"复制容器"），绝不能透传给任何对外响应字段，
@@ -3334,6 +3348,7 @@ function buildCreateRuntime(ctx, state, payload) {
             volumes: resolvedBase.volumes || [],
             ports: resolvedBase.ports || [],
             autostart: manage.autostart,
+            systemPrompt,
             // 复制容器时端口暴露（宿主机端口会冲突）与 peers（按 id 引用别的容器）不带过去
             network: { ...manage.network, expose: [], peers: { inbound: [] } }
         },
@@ -3358,6 +3373,27 @@ function buildCreateRuntime(ctx, state, payload) {
     };
 }
 
+// 容器自己存的系统提示词；旧容器（没有 id 或没存过）返回 null，按系统设置现算
+function readContainerSystemPrompt(ctx, containerName) {
+    try {
+        const homeDir = ctx.homeDir || os.homedir();
+        const id = resolveContainerId(ctx.dockerExecArgs, containerName);
+        return id && containerState.stateExists(homeDir, id) ? containerState.readSystemPrompt(homeDir, id) : null;
+    } catch (e) {
+        return null;
+    }
+}
+
+// 请求里的系统提示词 {enabled, text}；没给返回 null，给了但格式不对抛错
+function normalizeSystemPromptInput(value) {
+    if (value === undefined || value === null) return null;
+    if (typeof value !== 'object' || Array.isArray(value) || typeof value.text !== 'string'
+        || (value.enabled !== undefined && typeof value.enabled !== 'boolean')) {
+        throw new Error('systemPrompt 必须是 {enabled, text}');
+    }
+    return { enabled: value.enabled !== false, text: value.text.slice(0, SYSTEM_PROMPT_MAX_CHARS) };
+}
+
 function resolveUniqueContainerName(ctx, state, baseName) {
     const containerMap = listWebManyoyoContainers(ctx);
     const historyNames = listWebHistorySessionNames(state.webHistoryDir, ctx.isValidContainerName);
@@ -3397,6 +3433,7 @@ function buildCloneCreateOptionsFromSnapshot(runtimeSnapshot, fallbackHistory) {
             volumes: runtimeSnapshot.volumes || [],
             ports: runtimeSnapshot.ports || [],
             autostart: runtimeSnapshot.autostart || '',
+            systemPrompt: runtimeSnapshot.systemPrompt || undefined,
             network: runtimeSnapshot.network || undefined,
             // 快照来自服务端、原容器创建时已确认过，复制不必再确认
             confirmRisk: runtimeSnapshot.network ? true : undefined
@@ -3877,6 +3914,7 @@ async function ensureWebContainer(ctx, state, containerInput, messageSessionRef
             envLines: userEnvLines,
             envFiles: runtime.envFiles,
             autostart: runtime.autostart,
+            systemPrompt: runtime.systemPrompt,
             network: networkPolicy,
             netRequired: !isUnrestrictedPolicy(networkPolicy),
             meta: { name: runtime.containerName }
@@ -6390,7 +6428,11 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 const config = snapshot.parseError ? {} : snapshot.parsed;
                 sendJson(res, 200, {
                     builtin: BUILTIN_AGENT_INSTRUCTIONS,
-                    custom: typeof config.agentInstructions === 'string' ? config.agentInstructions : ''
+                    custom: typeof config.agentInstructions === 'string' ? config.agentInstructions : '',
+                    builtinEnabled: config.agentInstructionsBuiltinEnabled !== false,
+                    customEnabled: config.agentInstructionsCustomEnabled !== false,
+                    // 新建容器时系统提示词的初始内容
+                    composed: composeSystemPrompt(config, '')
                 });
             }
         },
@@ -6399,31 +6441,41 @@ async function handleWebApi(req, res, pathname, ctx, state) {
             match: currentPath => currentPath === '/api/agent-instructions' ? [] : null,
             handler: async () => {
                 const payload = toPlainObject(await readJsonBody(req));
-                if (typeof payload.custom !== 'string') {
+                const toggles = [['builtinEnabled', 'agentInstructionsBuiltinEnabled'], ['customEnabled', 'agentInstructionsCustomEnabled']];
+                if (payload.custom !== undefined && typeof payload.custom !== 'string') {
                     sendJson(res, 400, { error: 'custom 必须是字符串' });
                     return;
                 }
-                const custom = payload.custom.slice(0, 4000);
+                if (toggles.some(([field]) => payload[field] !== undefined && typeof payload[field] !== 'boolean')) {
+                    sendJson(res, 400, { error: '开关必须是布尔值' });
+                    return;
+                }
                 const snapshot = readWebConfigSnapshot(state.webConfigPath);
                 if (snapshot.parseError) {
                     sendJson(res, 400, { error: '当前配置解析失败，无法继续', detail: snapshot.parseError });
                     return;
                 }
-                // 没写过、也没填内容时不动配置文件
-                if (!custom.trim() && !hasOwn(snapshot.parsed, 'agentInstructions')) {
-                    sendJson(res, 200, { saved: false, custom });
-                    return;
-                }
-                let nextRaw;
+                let nextRaw = baseRawOf(snapshot);
+                let changed = false;
                 try {
-                    nextRaw = buildAgentInstructionsConfigRaw(baseRawOf(snapshot), custom);
-                    parseAndValidateConfigRaw(nextRaw);
+                    // 没写过、也没填内容时不动配置文件；开关保持默认（开）且没写过时同理
+                    if (typeof payload.custom === 'string' && (payload.custom.trim() || hasOwn(snapshot.parsed, 'agentInstructions'))) {
+                        nextRaw = buildAgentInstructionsConfigRaw(nextRaw, payload.custom.slice(0, 4000));
+                        changed = true;
+                    }
+                    toggles.forEach(([field, key]) => {
+                        if (typeof payload[field] === 'boolean' && (payload[field] === false || hasOwn(snapshot.parsed, key))) {
+                            nextRaw = buildBooleanConfigRaw(nextRaw, key, payload[field]);
+                            changed = true;
+                        }
+                    });
+                    if (changed) parseAndValidateConfigRaw(nextRaw);
                 } catch (e) {
                     sendJson(res, 400, { error: '配置写入失败' });
                     return;
                 }
-                writeConfigFileSecure(path.resolve(state.webConfigPath), nextRaw);
-                sendJson(res, 200, { saved: true, custom });
+                if (changed) writeConfigFileSecure(path.resolve(state.webConfigPath), nextRaw);
+                sendJson(res, 200, { saved: changed });
             }
         },
         {
@@ -7724,6 +7776,39 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { ok: true, stopping: true });
             }
         },
+        {
+            // 容器菜单里的“启动容器”：与对话前的拉起同一条路径（含网络规则下发）
+            method: 'POST',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/container\/start$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) return;
+                if (!ctx.containerExists(sessionRef.containerName)) {
+                    sendJson(res, 404, { error: `容器不存在: ${sessionRef.containerName}` });
+                    return;
+                }
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                sendJson(res, 200, { ok: true });
+            }
+        },
+        {
+            method: 'POST',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/container\/stop$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) return;
+                if (!ctx.containerExists(sessionRef.containerName)) {
+                    sendJson(res, 404, { error: `容器不存在: ${sessionRef.containerName}` });
+                    return;
+                }
+                if (state.agentRuns && state.agentRuns.has(sessionRef.containerName)) {
+                    sendJson(res, 409, { error: '容器里有 AGENT 正在执行，请先停止任务' });
+                    return;
+                }
+                await ctx.dockerExecAsync(['stop', '-t', '10', sessionRef.containerName], { timeout: 60000 });
+                sendJson(res, 200, { ok: true });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/remove$/),
@@ -7803,7 +7888,11 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 state.containerNames.set(id, name);
             },
             ensureWebContainer,
-            execCommandInWebContainer
+            execCommandInWebContainer,
+            readConfig: () => {
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                return snapshot.parseError ? {} : snapshot.parsed;
+            }
         }
     }));
 

package/manyoyo.example.json

@@ -65,8 +65,11 @@
     "shell": "",
     "shellSuffix": "",
     "agentPromptCommand": "",
-    // 网页里执行 Agent 时追加的说明（接在内置环境说明后面），例如 "回答用中文"
+    // 网页里新建容器时的补充系统提示词（接在默认系统提示词后面），例如 "回答用中文"
     "agentInstructions": "",
+    // 默认 / 补充系统提示词的开关，默认都开
+    "agentInstructionsBuiltinEnabled": true,
+    "agentInstructionsCustomEnabled": true,
     "yolo": "",
     "quiet": ["tip", "cmd"],
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.6.9",
+    "version": "8.6.11",
     "imageVersion": "2.2.0-common",
     "playwrightCliVersion": "0.1.19",
     "patchrightCoreVersion": "1.63.0",