@xcanwin/manyoyo 5.7.14 → 5.8.0

package/lib/web/server.js

@@ -137,6 +137,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
     return {
         agentId,
         agentName: normalizeWebAgentName(agentId, agentName),
+        agentPromptCommand: '',
         updatedAt: null,
         messages: [],
         lastResumeAt: null,
@@ -150,6 +151,9 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
     return {
         agentId,
         agentName: normalizeWebAgentName(agentId, source.agentName),
+        agentPromptCommand: typeof source.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(source.agentPromptCommand, `agents.${agentId}.agentPromptCommand`)
+            : '',
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
@@ -253,7 +257,7 @@ function saveWebSessionHistory(webHistoryDir, containerName, history) {
     ensureWebHistoryDir(webHistoryDir);
     const filePath = getWebHistoryFile(webHistoryDir, containerName);
     const normalized = normalizeWebHistoryRecord(containerName, history);
-    const runtimeMeta = getAgentRuntimeMeta(normalized);
+    const runtimeMeta = getAgentRuntimeMeta(normalized.agentPromptCommand || '');
     const defaultAgent = getWebAgentSession(normalized, WEB_DEFAULT_AGENT_ID) || createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID);
     const legacyCompatible = {
         ...normalized,
@@ -383,6 +387,81 @@ function setWebSessionAgentPromptCommand(webHistoryDir, containerName, agentProm
     saveWebSessionHistory(webHistoryDir, containerName, history);
 }
 
+function setWebAgentSessionPromptCommand(webHistoryDir, sessionRefOrContainerName, agentPromptCommand) {
+    const sessionRef = typeof sessionRefOrContainerName === 'string'
+        ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
+        : sessionRefOrContainerName;
+    if (sessionRef.agentId === WEB_DEFAULT_AGENT_ID) {
+        throw new Error('默认 AGENT 请直接修改容器级 agentPromptCommand');
+    }
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
+    agentSession.agentPromptCommand = normalizeAgentPromptCommandTemplate(
+        agentPromptCommand,
+        `agents.${sessionRef.agentId}.agentPromptCommand`
+    );
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+}
+
+function deriveAgentPromptCommandFromDefaultCommand(defaultCommand) {
+    const normalizedCommand = String(defaultCommand || '').trim();
+    if (!normalizedCommand) {
+        return '';
+    }
+    try {
+        return normalizeAgentPromptCommandTemplate(
+            resolveAgentPromptCommandTemplate(normalizedCommand),
+            'agentPromptCommand'
+        );
+    } catch (e) {
+        return '';
+    }
+}
+
+function resolveEffectiveSessionAgentPromptCommand(history, defaultCommand) {
+    return resolveEffectiveAgentPromptCommandForSession(history, WEB_DEFAULT_AGENT_ID, defaultCommand);
+}
+
+function resolveEffectiveAgentPromptCommandForSession(history, agentId, defaultCommand) {
+    const sessionHistory = history && typeof history === 'object' ? history : {};
+    const requestedAgentId = String(agentId || WEB_DEFAULT_AGENT_ID).trim() || WEB_DEFAULT_AGENT_ID;
+    const agentSession = getWebAgentSession(sessionHistory, requestedAgentId);
+    const agentTemplate = agentSession && typeof agentSession.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${requestedAgentId}.agentPromptCommand`)
+        : '';
+    if (isAgentPromptCommandEnabled(agentTemplate)) {
+        return agentTemplate;
+    }
+    const historyTemplate = typeof sessionHistory.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand')
+        : '';
+    if (isAgentPromptCommandEnabled(historyTemplate)) {
+        return historyTemplate;
+    }
+    return deriveAgentPromptCommandFromDefaultCommand(defaultCommand);
+}
+
+function getEffectiveAgentPromptCommandSource(history, agentId, defaultCommand) {
+    const sessionHistory = history && typeof history === 'object' ? history : {};
+    const requestedAgentId = String(agentId || WEB_DEFAULT_AGENT_ID).trim() || WEB_DEFAULT_AGENT_ID;
+    const agentSession = getWebAgentSession(sessionHistory, requestedAgentId);
+    const agentTemplate = agentSession && typeof agentSession.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${requestedAgentId}.agentPromptCommand`)
+        : '';
+    if (isAgentPromptCommandEnabled(agentTemplate)) {
+        return 'agent';
+    }
+    const historyTemplate = typeof sessionHistory.agentPromptCommand === 'string'
+        ? normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand')
+        : '';
+    if (isAgentPromptCommandEnabled(historyTemplate)) {
+        return 'container';
+    }
+    return isAgentPromptCommandEnabled(deriveAgentPromptCommandFromDefaultCommand(defaultCommand))
+        ? 'inferred'
+        : 'none';
+}
+
 function patchWebSessionHistory(webHistoryDir, containerName, patch) {
     const history = loadWebSessionHistory(webHistoryDir, containerName);
     if (!patch || typeof patch !== 'object') {
@@ -694,10 +773,9 @@ function extractAgentMessageFromStructuredOutput(agentProgram, text) {
     return '';
 }
 
-function getAgentRuntimeMeta(history) {
-    const sessionHistory = history && typeof history === 'object' ? history : {};
-    const template = normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand');
-    const agentProgram = resolveAgentProgram(template);
+function getAgentRuntimeMeta(template) {
+    const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const agentProgram = resolveAgentProgram(normalizedTemplate);
     const resumeCommand = buildAgentResumeCommand(agentProgram);
     return {
         agentProgram: agentProgram || '',
@@ -1362,17 +1440,34 @@ function prepareCodexTraceEvent(payload) {
 async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
-    const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
-    if (normalizedTemplate !== history.agentPromptCommand) {
-        history.agentPromptCommand = normalizedTemplate;
+    const containerMap = listWebManyoyoContainers(ctx);
+    const containerInfo = containerMap[sessionRef.containerName] || {};
+    const normalizedContainerTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+    if (normalizedContainerTemplate !== history.agentPromptCommand) {
+        history.agentPromptCommand = normalizedContainerTemplate;
         saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
     }
-    if (!isAgentPromptCommandEnabled(history.agentPromptCommand)) {
+    if (agentSession && typeof agentSession.agentPromptCommand === 'string') {
+        const normalizedAgentTemplate = normalizeAgentPromptCommandTemplate(
+            agentSession.agentPromptCommand,
+            `agents.${sessionRef.agentId}.agentPromptCommand`
+        );
+        if (normalizedAgentTemplate !== agentSession.agentPromptCommand) {
+            agentSession.agentPromptCommand = normalizedAgentTemplate;
+            saveWebSessionHistory(state.webHistoryDir, sessionRef.containerName, history);
+        }
+    }
+    const effectiveTemplate = resolveEffectiveAgentPromptCommandForSession(
+        history,
+        sessionRef.agentId,
+        containerInfo.defaultCommand
+    );
+    if (!isAgentPromptCommandEnabled(effectiveTemplate)) {
         throw new Error('当前会话未配置 agentPromptCommand');
     }
 
     await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
-    const agentMeta = getAgentRuntimeMeta(history);
+    const agentMeta = getAgentRuntimeMeta(effectiveTemplate);
     const hasPriorConversation = hasAgentConversationHistory(agentSession);
     let resumeAttempted = false;
     let resumeSucceeded = false;
@@ -1391,7 +1486,7 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const effectivePrompt = resumeSucceeded
         ? prompt
         : buildAgentPromptWithHistory(agentSession, prompt);
-    const command = buildWebAgentExecCommand(history.agentPromptCommand, effectivePrompt, agentMeta.agentProgram);
+    const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram);
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
     return {
@@ -2204,11 +2299,23 @@ function listWebManyoyoContainers(ctx) {
         if (!imageName.includes('manyoyo') && !name.startsWith('manyoyo-') && !name.startsWith('my-')) {
             return;
         }
+        let defaultCommand = '';
+        try {
+            defaultCommand = String(
+                ctx.dockerExecArgs(
+                    ['inspect', '-f', '{{index .Config.Labels "manyoyo.default_cmd"}}', name],
+                    { ignoreError: true }
+                ) || ''
+            ).trim();
+        } catch (e) {
+            defaultCommand = '';
+        }
         map[name] = {
             name,
             status: status || 'unknown',
             image: imageName,
-            createdAt: estimateStartTimeFromStatus(status)
+            createdAt: estimateStartTimeFromStatus(status),
+            defaultCommand
         };
     });
 
@@ -2588,7 +2695,6 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
     const containerName = sessionRef && sessionRef.containerName ? sessionRef.containerName : '';
     const agentId = sessionRef && sessionRef.agentId ? sessionRef.agentId : WEB_DEFAULT_AGENT_ID;
     const history = loadWebSessionHistory(state.webHistoryDir, containerName);
-    const agentMeta = getAgentRuntimeMeta(history);
     const agentSession = getWebAgentSession(history, agentId)
         || (agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
     if (!agentSession) {
@@ -2596,10 +2702,15 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
     }
     const latestMessage = agentSession.messages.length ? agentSession.messages[agentSession.messages.length - 1] : null;
     const containerInfo = containerMap[containerName] || {};
+    const effectiveAgentPromptCommand = resolveEffectiveAgentPromptCommandForSession(history, agentId, containerInfo.defaultCommand);
+    const agentMeta = getAgentRuntimeMeta(effectiveAgentPromptCommand);
+    const effectiveAgentProgram = agentMeta.agentProgram || resolveAgentProgram(effectiveAgentPromptCommand);
+    const effectiveResumeSupported = agentMeta.resumeSupported || Boolean(buildAgentResumeCommand(effectiveAgentProgram));
     const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
         ? history.applied
         : buildSessionFallbackApplied(ctx, state, containerName, history, {
-            status: containerInfo.status || 'history'
+            status: containerInfo.status || 'history',
+            defaultCommand: containerInfo.defaultCommand || ''
         });
     const updatedAt = agentSession.updatedAt || history.updatedAt || (latestMessage && latestMessage.timestamp) || containerInfo.createdAt || null;
     return {
@@ -2611,9 +2722,9 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         image: containerInfo.image || '',
         updatedAt,
         messageCount: agentSession.messages.length,
-        agentEnabled: isAgentPromptCommandEnabled(history.agentPromptCommand),
-        agentProgram: agentMeta.agentProgram,
-        resumeSupported: agentMeta.resumeSupported,
+        agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
+        agentProgram: effectiveAgentProgram || '',
+        resumeSupported: effectiveResumeSupported,
         hostPath: applied.hostPath || '',
         containerPath: applied.containerPath || ''
     };
@@ -2622,14 +2733,18 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
 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 = resolveAgentProgram(effectiveAgentPromptCommand) || '';
-    const effectiveResumeSupported = Boolean(buildAgentResumeCommand(effectiveAgentProgram));
-    const defaultCommand = buildDefaultCommand(
+    const configuredDefaultCommand = buildDefaultCommand(
         defaults.shellPrefix,
         defaults.shell,
         defaults.shellSuffix
     ) || buildStaticContainerRuntime(ctx, name).defaultCommand;
+    const defaultCommand = pickFirstString(
+        summary && summary.defaultCommand,
+        configuredDefaultCommand
+    );
+    const effectiveAgentPromptCommand = resolveEffectiveSessionAgentPromptCommand(history, defaultCommand);
+    const effectiveAgentProgram = resolveAgentProgram(effectiveAgentPromptCommand) || '';
+    const effectiveResumeSupported = Boolean(buildAgentResumeCommand(effectiveAgentProgram));
 
     return {
         containerName: name,
@@ -2656,7 +2771,12 @@ function buildSessionFallbackApplied(ctx, state, name, history, summary) {
 function buildSessionDetail(ctx, state, containerMap, name) {
     const sessionRef = typeof name === 'string' ? parseWebSessionKey(name) : name;
     const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
-    const normalizedTemplate = normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand');
+    const containerInfo = containerMap[sessionRef.containerName] || {};
+    const normalizedTemplate = resolveEffectiveAgentPromptCommandForSession(
+        history,
+        sessionRef.agentId,
+        containerInfo.defaultCommand
+    );
     const summary = buildSessionSummary(ctx, state, containerMap, sessionRef);
     const agentSession = getWebAgentSession(history, sessionRef.agentId)
         || (sessionRef.agentId === WEB_DEFAULT_AGENT_ID ? createEmptyWebAgentSession(WEB_DEFAULT_AGENT_ID) : null);
@@ -2677,6 +2797,14 @@ function buildSessionDetail(ctx, state, containerMap, name) {
         latestRole: latestMessage && latestMessage.role ? String(latestMessage.role) : '',
         latestTimestamp: latestMessage && latestMessage.timestamp ? latestMessage.timestamp : summary.updatedAt,
         agentPromptCommand: normalizedTemplate || '',
+        containerAgentPromptCommand: typeof history.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(history.agentPromptCommand, 'agentPromptCommand')
+            : '',
+        agentPromptCommandOverride: agentSession && typeof agentSession.agentPromptCommand === 'string'
+            ? normalizeAgentPromptCommandTemplate(agentSession.agentPromptCommand, `agents.${sessionRef.agentId}.agentPromptCommand`)
+            : '',
+        inferredAgentPromptCommand: deriveAgentPromptCommandFromDefaultCommand(containerInfo.defaultCommand),
+        agentPromptSource: getEffectiveAgentPromptCommandSource(history, sessionRef.agentId, containerInfo.defaultCommand),
         agentProgram: summary.agentProgram || '',
         resumeSupported: summary.resumeSupported === true,
         lastResumeAt: agentSession.lastResumeAt || null,
@@ -3216,6 +3344,63 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
         },
+        {
+            method: 'PUT',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/agent-template$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+
+                let payload = null;
+                try {
+                    payload = await readJsonBody(req);
+                } catch (e) {
+                    sendJson(res, 400, { error: e.message || '请求参数错误' });
+                    return;
+                }
+                const normalizedPayload = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
+                const hasContainerTemplate = hasOwn(normalizedPayload, 'containerAgentPromptCommand');
+                const hasAgentOverride = hasOwn(normalizedPayload, 'agentPromptCommandOverride');
+                if (!hasContainerTemplate && !hasAgentOverride) {
+                    sendJson(res, 400, { error: '至少提供一个模板字段' });
+                    return;
+                }
+                if (hasAgentOverride && sessionRef.agentId === WEB_DEFAULT_AGENT_ID) {
+                    sendJson(res, 400, { error: '默认 AGENT 不支持单独覆盖模板，请直接修改容器模板' });
+                    return;
+                }
+
+                try {
+                    if (hasContainerTemplate) {
+                        setWebSessionAgentPromptCommand(
+                            state.webHistoryDir,
+                            sessionRef.containerName,
+                            normalizedPayload.containerAgentPromptCommand
+                        );
+                    }
+                    if (hasAgentOverride) {
+                        setWebAgentSessionPromptCommand(
+                            state.webHistoryDir,
+                            sessionRef,
+                            normalizedPayload.agentPromptCommandOverride
+                        );
+                    }
+                } catch (e) {
+                    sendJson(res, 400, { error: e.message || '保存 Agent 模板失败' });
+                    return;
+                }
+
+                const containerMap = listWebManyoyoContainers(ctx);
+                const detail = buildSessionDetail(ctx, state, containerMap, sessionRef);
+                sendJson(res, 200, {
+                    saved: true,
+                    name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    detail
+                });
+            }
+        },
         {
             method: 'POST',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/run$/),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.7.14",
+    "version": "5.8.0",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",