@xcanwin/manyoyo 8.6.8 → 8.6.10

package/lib/web/server.js

@@ -12,7 +12,10 @@ const JSON5 = require('json5');
 const { buildContainerRunArgs, hasNetworkArg } = require('../container-run');
 const { buildContainerIntegration, mergeIntegration } = require('../plugin');
 const { applyAptMirror } = require('../mirrors');
+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');
 const { buildExecArgs, resolveContainerId, readMergedEnv } = require('../container-exec');
 const { createNetworkManager, NETWORK_NAME } = require('../container-network');
 const { normalizePolicy, isUnrestricted: isUnrestrictedPolicy } = require('../network-policy');
@@ -34,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 } = 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');
@@ -96,6 +99,7 @@ const NATIVE_SESSION_RESUME_PROGRAMS = new Set(['claude', 'codex', 'opencode']);
 const WEB_FILE_PREVIEW_MAX_BYTES = 512 * 1024;
 const WEB_FILE_EDIT_MAX_BYTES = 2 * 1024 * 1024;
 const WEB_FILE_RAW_MAX_CONCURRENT_PER_CONTAINER = 4;
+const WEB_FS_LIST_MAX_LIMIT = 200;
 const IMAGE_EXTENSION_CONTENT_TYPES = {
     '.png': 'image/png',
     '.jpg': 'image/jpeg',
@@ -221,7 +225,11 @@ function createEmptyWebAgentSession(agentId, agentName) {
         usageTotal: null,
         model: '',
         queue: [],
-        queuePaused: false
+        queuePaused: false,
+        title: '',
+        firstPrompt: '',
+        pinned: false,
+        slashCommands: null
     };
 }
 
@@ -275,7 +283,23 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         usageTotal: normalizeWebAgentUsageTotal(source.usageTotal),
         model: normalizeStoredAgentModelValue(source.model),
         queue: agentQueue.normalizeStoredQueue(source.queue),
-        queuePaused: source.queuePaused === true
+        queuePaused: source.queuePaused === true,
+        title: sessionMeta.normalizeTitle(source.title),
+        firstPrompt: sessionMeta.normalizeFirstPrompt(source.firstPrompt),
+        pinned: source.pinned === true,
+        slashCommands: normalizeStoredSlashCommands(source.slashCommands)
+    };
+}
+
+// claude 每次运行开头的 init 事件里带的命令列表：all 是全部，skills 是其中的 skill，terminal 是只在终端里可用的
+function normalizeStoredSlashCommands(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    return {
+        all: sessionMeta.normalizeSlashCommands(value.all),
+        skills: sessionMeta.normalizeSlashCommands(value.skills),
+        terminal: sessionMeta.normalizeSlashCommands(value.terminal)
     };
 }
 
@@ -570,6 +594,10 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     if (!agentSession.createdAt) {
         agentSession.createdAt = timestamp;
     }
+    // 首条 Agent 对话消息只记一次，作为没有标题时的会话名（消息会被裁剪，不能现算）
+    if (role === 'user' && extra.mode !== 'command' && !agentSession.firstPrompt) {
+        agentSession.firstPrompt = sessionMeta.normalizeFirstPrompt(content);
+    }
     agentSession.messages.push(message);
 
     if (agentSession.messages.length > WEB_HISTORY_MAX_MESSAGES) {
@@ -911,7 +939,8 @@ function quoteBashSingleValue(value) {
 function renderAgentPromptCommand(template, prompt) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const safePrompt = quoteBashSingleValue(prompt);
-    return templateText.replace(/\{prompt\}/g, safePrompt);
+    // 用函数返回替换值：字符串形式会把提示词里的 $' $` $& 当成替换模式
+    return templateText.replace(/\{prompt\}/g, () => safePrompt);
 }
 
 function buildCodexAgentExecCommand(template, prompt, options = {}) {
@@ -929,12 +958,17 @@ function buildCodexAgentExecCommand(template, prompt, options = {}) {
         const injectedFlags = hasJson ? '' : ' --json';
         const hasModel = /(?:^|\s)(?:-m|--model)(?:\s|$)/.test(suffix);
         const modelFlag = model && !hasModel ? ` --model ${quoteBashSingleValue(model)}` : '';
+        // 环境说明：模板里已经写了 developer_instructions 就以用户的为准
+        const instructions = options && typeof options.instructions === 'string' ? options.instructions : '';
+        const instructionsFlag = instructions && !/developer_instructions/.test(suffix)
+            ? ` -c ${quoteBashSingleValue(`developer_instructions=${toTomlBasicString(instructions)}`)}`
+            : '';
         if (sessionId) {
             const promptIndex = suffix.indexOf('{prompt}');
             const resumeSuffix = `${suffix.slice(0, promptIndex)}${quoteBashSingleValue(sessionId)} ${suffix.slice(promptIndex)}`;
-            codexTemplate = `${prefix}codex exec resume${injectedFlags}${modelFlag}${resumeSuffix}`;
+            codexTemplate = `${prefix}codex exec resume${injectedFlags}${modelFlag}${instructionsFlag}${resumeSuffix}`;
         } else {
-            codexTemplate = `${prefix}codex exec${injectedFlags}${modelFlag}${suffix}`;
+            codexTemplate = `${prefix}codex exec${injectedFlags}${modelFlag}${instructionsFlag}${suffix}`;
         }
     }
     return codexTemplate === templateText
@@ -948,10 +982,12 @@ function prependAgentFlags(commandText, matchPattern, flagSpecs) {
         return String(commandText || '');
     }
     const prefix = matched[1] || '';
-    let suffix = matched[matched.length - 1] || '';
+    // “模板里是否已经写了这个参数”只看原模板：插进去的参数值（比如环境说明正文里的 “-r”）不能让后面的参数被跳过
+    const original = matched[matched.length - 1] || '';
+    let suffix = original;
     for (let i = flagSpecs.length - 1; i >= 0; i -= 1) {
         const spec = flagSpecs[i];
-        if (!spec || !spec.flag || !(spec.pattern instanceof RegExp) || spec.pattern.test(suffix)) {
+        if (!spec || !spec.flag || !(spec.pattern instanceof RegExp) || spec.pattern.test(original)) {
             continue;
         }
         suffix = ` ${spec.flag}${suffix}`;
@@ -978,6 +1014,14 @@ function buildClaudeAgentExecCommand(template, prompt, options = {}) {
     if (model) {
         flagSpecs.push({ flag: `--model ${quoteBashSingleValue(model)}`, pattern: /(?:^|\s)--model(?:\s|$)/ });
     }
+    // 环境说明：追加在内置系统提示之后；模板里已经写了 --append-system-prompt(-file) 就以用户的为准
+    const instructions = options && typeof options.instructions === 'string' ? options.instructions : '';
+    if (instructions) {
+        flagSpecs.push({
+            flag: `--append-system-prompt ${quoteBashSingleValue(instructions)}`,
+            pattern: /(?:^|\s)--append-system-prompt(?:-file)?(?:\s|$)/
+        });
+    }
     // 子 Agent 说的话和思考默认不转发（v2.1.211+ 才有 --forward-subagent-text，旧版本不认这个参数会直接报错）。
     // 'auto'：在容器里随命令探测（claude --help 约 50ms），支持就展开成这个参数、不支持展开成空；true：直接加。
     // 'auto' 的参数放在整条命令末尾，不改变前面已有参数的相对顺序
@@ -1035,14 +1079,20 @@ function buildOpenCodeAgentExecCommand(template, prompt, options = {}) {
     if (model) {
         flagSpecs.push({ flag: `--model ${quoteBashSingleValue(model)}`, pattern: /(?:^|\s)(?:-m|--model)(?:\s|$)/ });
     }
-    const opencodeTemplate = prependAgentFlags(
-        templateText,
-        /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)opencode\b.*?\s+run\b)(.*)$/,
-        flagSpecs
-    );
-    return opencodeTemplate === templateText
+    const opencodePattern = /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)opencode\b.*?\s+run\b)(.*)$/;
+    const opencodeTemplate = prependAgentFlags(templateText, opencodePattern, flagSpecs);
+    const rendered = opencodeTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
         : renderAgentPromptCommand(opencodeTemplate, prompt);
+    // 环境说明：opencode 的 instructions 只认文件路径。OPENCODE_CONFIG_CONTENT 会与用户自己的配置合并
+    //（instructions 数组拼接，实测 1.19.3），用户已经设置了这个变量或在模板里写了它时不动
+    const instructions = options && typeof options.instructions === 'string' ? options.instructions : '';
+    if (!instructions || !opencodePattern.test(templateText) || /OPENCODE_CONFIG_CONTENT/.test(templateText)) {
+        return rendered;
+    }
+    const file = '/tmp/manyoyo-agent-instructions.md';
+    const content = quoteBashSingleValue(JSON.stringify({ instructions: [file] }));
+    return `if [ -z "\${OPENCODE_CONFIG_CONTENT:-}" ]; then printf '%s' ${quoteBashSingleValue(instructions)} > ${file} && export OPENCODE_CONFIG_CONTENT=${content}; fi; ${rendered}`;
 }
 
 function buildWebAgentExecCommand(template, prompt, agentProgram, options = {}) {
@@ -1214,6 +1264,23 @@ function extractClaudeSessionId(text) {
     return '';
 }
 
+function extractClaudeInitSlashCommands(text) {
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (payload && payload.type === 'system' && payload.subtype === 'init') {
+            if (!Array.isArray(payload.slash_commands)) {
+                return null;
+            }
+            return normalizeStoredSlashCommands({
+                all: payload.slash_commands,
+                skills: payload.skills,
+                terminal: payload.terminal_slash_commands
+            });
+        }
+    }
+    return null;
+}
+
 function extractOpenCodeSessionId(text) {
     for (const rawLine of String(text || '').split('\n')) {
         const payload = parseJsonObjectLine(rawLine);
@@ -2313,10 +2380,18 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const effectivePrompt = resumeSucceeded
         ? prompt
         : buildAgentPromptWithHistory(agentSession, prompt);
+    // 环境说明每次执行时现读配置：改了设置不用重建容器；运行配置名记在创建时的快照里（旧会话没有，用全局配置）
+    const configSnapshot = readWebConfigSnapshot(state.webConfigPath);
+    const runName = history.runtimeSnapshot && typeof history.runtimeSnapshot.run === 'string' ? history.runtimeSnapshot.run : '';
     const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram, {
         sessionId: sessionIdForRun,
         model: agentSession.model || '',
-        forwardSubagentText: agentMeta.agentProgram === 'claude' ? 'auto' : false
+        forwardSubagentText: agentMeta.agentProgram === 'claude' ? 'auto' : false,
+        instructions: buildAgentInstructions(
+            configSnapshot.parseError ? {} : configSnapshot.parsed,
+            runName,
+            readContainerSystemPrompt(ctx, sessionRef.containerName)
+        )
     });
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
@@ -2357,10 +2432,66 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
     if (turnUsage) {
         patch.usageTotal = accumulateUsageTotal(agentSession.usageTotal, turnUsage);
     }
+    if (agentMeta.agentProgram === 'claude') {
+        const slashCommands = extractClaudeInitSlashCommands(result.stdout);
+        if (slashCommands) {
+            patch.slashCommands = slashCommands;
+        }
+    }
     patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
     return replyMessage;
 }
 
+function resolveWebSessionWorkDir(state, sessionRef) {
+    const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+    const applied = history.applied && typeof history.applied === 'object' ? history.applied : {};
+    return typeof applied.containerPath === 'string' && applied.containerPath ? applied.containerPath : '/';
+}
+
+async function readWebGitChanges(ctx, state, sessionRef) {
+    const result = await execCommandInWebContainer(
+        ctx,
+        sessionRef.containerName,
+        gitChanges.buildGitChangesCommand(resolveWebSessionWorkDir(state, sessionRef)),
+        { withEnv: false }
+    );
+    return gitChanges.parseGitChangesOutput(result.stdout);
+}
+
+// 每轮结束后在后台读一次 Agent 自己生成的标题（目前只有 claude 会写 ai-title，交互模式实测；
+// 其他 Agent 只用首条消息）。不阻塞本轮结果；读不到或失败都静默——每轮都会触发，属于高频路径，不写日志
+async function refreshWebAgentTitle(ctx, state, sessionRef, agentProgram) {
+    if (agentProgram !== 'claude') {
+        return '';
+    }
+    try {
+        const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+        const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true });
+        const command = sessionMeta.buildClaudeTitleReadCommand(agentSession && agentSession.engineSessionId);
+        if (!command) {
+            return '';
+        }
+        const sessionId = agentSession.engineSessionId;
+        const result = await execCommandInWebContainer(ctx, sessionRef.containerName, command);
+        const title = sessionMeta.parseClaudeTitleOutput(result.stdout);
+        // 读标题期间 AGENT 可能被删除或换了引擎会话：写回前重新读一次，不在了就放弃（不能把它重新建出来）
+        const fresh = getWebAgentSession(
+            loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName),
+            sessionRef.agentId,
+            { includeArchived: true }
+        );
+        if (!fresh || fresh.engineSessionId !== sessionId) {
+            return '';
+        }
+        if (title && title !== fresh.title) {
+            patchWebAgentSessionState(state.webHistoryDir, sessionRef, { title });
+        }
+        return title;
+    } catch (e) {
+        return '';
+    }
+}
+
 function appendWebAgentTraceMessage(webHistoryDir, sessionRefOrContainerName, content, extra = {}) {
     const text = String(content || '').trim();
     if (!text) {
@@ -2841,6 +2972,14 @@ function validateWebConfigShape(configObject) {
     if (hasOwn(config, 'agentPromptCommand')) {
         normalizeAgentPromptCommandTemplate(config.agentPromptCommand, 'agentPromptCommand');
     }
+    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))) {
@@ -2851,6 +2990,9 @@ function validateWebConfigShape(configObject) {
             if (hasOwn(normalizedRun, 'agentPromptCommand')) {
                 normalizeAgentPromptCommandTemplate(normalizedRun.agentPromptCommand, `runs.${runName}.agentPromptCommand`);
             }
+            if (hasOwn(normalizedRun, 'agentInstructions') && typeof normalizedRun.agentInstructions !== 'string') {
+                throw new Error(`runs.${runName}.agentInstructions 必须是字符串`);
+            }
         });
     }
 }
@@ -3063,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);
 
@@ -3180,11 +3326,13 @@ function buildCreateRuntime(ctx, state, payload) {
         containerPorts,
         autostart: manage.autostart,
         network: manage.network,
+        systemPrompt,
         agentPromptCommand,
         defaultCommand: buildDefaultCommand(shellPrefix, shell, shellSuffix) || '/bin/bash',
         // 仅供服务端内部复用（如"创建相同配置容器"/"复制容器"），绝不能透传给任何对外响应字段，
         // 因为 env/volumes/ports 可能包含密钥原始值（对外响应不暴露它们）。
         runtimeSnapshot: {
+            run: runName || '',
             hostPath,
             containerPath,
             imageName,
@@ -3200,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: [] } }
         },
@@ -3224,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);
@@ -3263,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
@@ -3743,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 }
@@ -3936,13 +4108,19 @@ async function execJsonCommandInWebContainer(ctx, containerName, command) {
     }
 }
 
-function buildContainerFileListCommand(requestedPath) {
+// options.limit / options.prefix 供输入框 @ 补全用：先按名字前缀过滤、按“目录在前 + 名字”排序后只取前 limit 项，
+// 只对这些项做 lstat（大目录里全量 lstat 才是慢的部分）
+function buildContainerFileListCommand(requestedPath, options = {}) {
+    const limit = Number.isInteger(options.limit) && options.limit > 0 ? options.limit : 0;
+    const prefix = typeof options.prefix === 'string' ? options.prefix.toLowerCase() : '';
     return buildWebContainerNodeCommand(`
 // __MANYOYO_FS_LIST__
 const fs = require('fs');
 const path = require('path');
 
 const requestedPath = ${JSON.stringify(String(requestedPath || '/'))};
+const limit = ${JSON.stringify(limit)};
+const prefix = ${JSON.stringify(prefix)};
 
 try {
     const realPath = fs.realpathSync(requestedPath);
@@ -3953,7 +4131,20 @@ try {
 
     const root = path.parse(realPath).root;
     const parentPath = realPath === root ? '' : path.dirname(realPath);
-    const entries = fs.readdirSync(realPath, { withFileTypes: true })
+    let dirents = fs.readdirSync(realPath, { withFileTypes: true });
+    if (prefix) {
+        dirents = dirents.filter(entry => entry.name.toLowerCase().startsWith(prefix));
+    }
+    let truncated = false;
+    if (limit > 0 && dirents.length > limit) {
+        dirents.sort((a, b) => {
+            if (a.isDirectory() !== b.isDirectory()) return a.isDirectory() ? -1 : 1;
+            return a.name.localeCompare(b.name, 'zh-CN');
+        });
+        dirents = dirents.slice(0, limit);
+        truncated = true;
+    }
+    const entries = dirents
         .map(entry => {
             const fullPath = path.join(realPath, entry.name);
             let itemStat = null;
@@ -4002,7 +4193,8 @@ try {
     process.stdout.write(JSON.stringify({
         path: realPath,
         parentPath,
-        entries
+        entries,
+        ...(truncated ? { truncated: true } : {})
     }));
 } catch (e) {
     process.stdout.write(JSON.stringify({
@@ -5127,6 +5319,7 @@ async function runWebAgentStreamTurn(ctx, state, sessionRef, prompt, clientMessa
             resumeError,
             engineSessionId
         }, result);
+        void refreshWebAgentTitle(ctx, state, sessionRef, agentMeta.agentProgram);
         emitStreamEvent({
             type: 'result',
             exitCode: result.exitCode,
@@ -5451,6 +5644,9 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef, preloadedHist
         agentId,
         agentName: agentSession.agentName,
         agentRemark: agentSession.remark || '',
+        agentTitle: agentSession.title || '',
+        firstPrompt: agentSession.firstPrompt || '',
+        pinned: agentSession.pinned === true,
         containerRemark: history.remark || '',
         status: containerInfo.status || 'history',
         image: containerInfo.image || '',
@@ -6223,6 +6419,65 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            // 系统设置“Agent 环境说明”：内置说明（只读）+ 全局配置里用户追加的说明
+            method: 'GET',
+            match: currentPath => currentPath === '/api/agent-instructions' ? [] : null,
+            handler: async () => {
+                const snapshot = readWebConfigSnapshot(state.webConfigPath);
+                const config = snapshot.parseError ? {} : snapshot.parsed;
+                sendJson(res, 200, {
+                    builtin: BUILTIN_AGENT_INSTRUCTIONS,
+                    custom: typeof config.agentInstructions === 'string' ? config.agentInstructions : '',
+                    builtinEnabled: config.agentInstructionsBuiltinEnabled !== false,
+                    customEnabled: config.agentInstructionsCustomEnabled !== false,
+                    // 新建容器时系统提示词的初始内容
+                    composed: composeSystemPrompt(config, '')
+                });
+            }
+        },
+        {
+            method: 'POST',
+            match: currentPath => currentPath === '/api/agent-instructions' ? [] : null,
+            handler: async () => {
+                const payload = toPlainObject(await readJsonBody(req));
+                const toggles = [['builtinEnabled', 'agentInstructionsBuiltinEnabled'], ['customEnabled', 'agentInstructionsCustomEnabled']];
+                if (payload.custom !== undefined && typeof payload.custom !== 'string') {
+                    sendJson(res, 400, { error: 'custom 必须是字符串' });
+                    return;
+                }
+                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;
+                }
+                let nextRaw = baseRawOf(snapshot);
+                let changed = false;
+                try {
+                    // 没写过、也没填内容时不动配置文件；开关保持默认（开）且没写过时同理
+                    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;
+                }
+                if (changed) writeConfigFileSecure(path.resolve(state.webConfigPath), nextRaw);
+                sendJson(res, 200, { saved: changed });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath === '/api/config' ? [] : null,
@@ -6727,6 +6982,26 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), remark });
             }
         },
+        {
+            method: 'POST',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/agent-pin$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const payload = await readJsonBody(req);
+                const pinned = payload.pinned === true;
+                const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                // 默认 AGENT 在还没有任何消息时也会出现在列表里（历史里还没有它的记录），允许置顶
+                if (sessionRef.agentId !== WEB_DEFAULT_AGENT_ID && !getWebAgentSession(history, sessionRef.agentId, { includeArchived: true })) {
+                    sendJson(res, 404, { error: 'AGENT 不存在' });
+                    return;
+                }
+                patchWebAgentSessionState(state.webHistoryDir, sessionRef, { pinned });
+                sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), pinned });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/messages$/),
@@ -6806,12 +7081,17 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
                 const requestUrl = new URL(req.url || '/api/sessions/x/fs/list', 'http://localhost');
                 const targetPath = String(requestUrl.searchParams.get('path') || '/').trim() || '/';
+                const limitParam = Number.parseInt(requestUrl.searchParams.get('limit') || '', 10);
+                const listOptions = {
+                    limit: Number.isInteger(limitParam) && limitParam > 0 ? Math.min(limitParam, WEB_FS_LIST_MAX_LIMIT) : 0,
+                    prefix: String(requestUrl.searchParams.get('prefix') || '').slice(0, 255)
+                };
 
                 await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
                 const payload = await execJsonCommandInWebContainer(
                     ctx,
                     sessionRef.containerName,
-                    buildContainerFileListCommand(targetPath)
+                    buildContainerFileListCommand(targetPath, listOptions)
                 );
                 if (payload && payload.error) {
                     sendJson(res, 400, { error: payload.error });
@@ -7040,6 +7320,68 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail }, {}, { autoEtag: true });
             }
         },
+        {
+            // “改动”视图：工作目录所在 git 仓库的改动列表（按需请求，前端不轮询）
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/git\/changes$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                const changes = await readWebGitChanges(ctx, state, sessionRef);
+                sendJson(res, 200, changes);
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/git\/diff$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const requestUrl = new URL(req.url || '/', 'http://localhost');
+                const filePath = String(requestUrl.searchParams.get('path') || '');
+                if (!gitChanges.isAcceptableDiffPath(filePath)) {
+                    sendJson(res, 400, { error: '文件路径不合法' });
+                    return;
+                }
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                // 只给改动列表里出现过的文件看 diff：路径由服务端重新取一次核对，不信任请求
+                const changes = await readWebGitChanges(ctx, state, sessionRef);
+                const entry = changes.files.find(file => file.path === filePath);
+                if (!entry || entry.status === 'untracked') {
+                    sendJson(res, 404, { error: '该文件不在改动列表里' });
+                    return;
+                }
+                const result = await execCommandInWebContainer(
+                    ctx,
+                    sessionRef.containerName,
+                    gitChanges.buildGitDiffCommand(resolveWebSessionWorkDir(state, sessionRef), filePath),
+                    { withEnv: false }
+                );
+                sendJson(res, 200, { path: filePath, ...gitChanges.parseGitDiffOutput(result.stdout) });
+            }
+        },
+        {
+            // 输入框里打 / 时的候选：只列实测能在 Web 端执行的（见 lib/web/session-meta.js）
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/slash-commands$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+                const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true });
+                sendJson(res, 200, {
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    commands: sessionMeta.listUsableSlashCommands(agentSession && agentSession.slashCommands)
+                });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/models$/),
@@ -7279,6 +7621,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     resumeError,
                     engineSessionId
                 }, result);
+                void refreshWebAgentTitle(ctx, state, sessionRef, agentMeta.agentProgram);
                 sendJson(res, 200, {
                     exitCode: result.exitCode,
                     output: result.output,
@@ -7433,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$/),
@@ -7512,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;
+            }
         }
     }));
 
@@ -7883,6 +8263,8 @@ module.exports = {
     __testing: {
         prepareStructuredTraceEvents,
         buildClaudeAgentExecCommand,
+        buildWebAgentExecCommand,
+        buildContainerFileListCommand,
         extractContentDeltaFromPayload,
         extractAgentMessageFromStructuredOutput,
         appendWebSessionMessage,