@xcanwin/manyoyo 5.8.0 → 5.8.1

package/lib/web/frontend/app.css

@@ -407,6 +407,75 @@ textarea:focus-visible {
     width: min(760px, calc(100vw - 24px));
 }
 
+.agent-template-primary .text-block {
+    margin-top: 0;
+}
+
+.agent-template-primary .text-block + .text-block,
+#agentTemplateOverrideGroup {
+    margin-top: 12px;
+}
+
+.agent-template-primary select,
+.agent-template-primary textarea {
+    border: 1px solid var(--line);
+    border-radius: 10px;
+    padding: 9px 11px;
+    background: var(--panel-strong);
+    color: var(--text);
+    font-size: 13px;
+    font-family: var(--font-ui);
+}
+
+.agent-template-primary textarea {
+    min-height: 92px;
+    font-family: var(--font-mono);
+    resize: vertical;
+}
+
+.agent-template-section {
+    padding: 12px;
+    border: 1px solid var(--line);
+    border-radius: 12px;
+    background: rgba(255, 253, 250, 0.92);
+}
+
+.agent-template-section + .agent-template-section {
+    margin-top: 12px;
+}
+
+.agent-template-section-title {
+    margin-bottom: 8px;
+    font-size: 12px;
+    font-weight: 700;
+    color: var(--text);
+}
+
+.agent-template-section .text-block {
+    margin-top: 0;
+}
+
+.agent-template-section .text-block + .text-block {
+    margin-top: 10px;
+}
+
+.agent-template-section select,
+.agent-template-section textarea {
+    border: 1px solid var(--line);
+    border-radius: 10px;
+    padding: 9px 11px;
+    background: var(--panel-strong);
+    color: var(--text);
+    font-size: 13px;
+    font-family: var(--font-ui);
+}
+
+.agent-template-section textarea {
+    min-height: 92px;
+    font-family: var(--font-mono);
+    resize: vertical;
+}
+
 .session-head {
     display: flex;
     justify-content: space-between;

package/lib/web/frontend/app.html

@@ -184,7 +184,15 @@
                         <label>shellPrefix<input id="createShellPrefix" placeholder="例如 IS_SANDBOX=1" /></label>
                         <label>shell<input id="createShell" placeholder="例如 claude / codex" /></label>
                         <label>shellSuffix<input id="createShellSuffix" placeholder="例如 --dangerously-skip-permissions" /></label>
-                        <label>yolo<input id="createYolo" placeholder="例如 c / cx / gm / oc" /></label>
+                        <label>CLI
+                            <select id="createYolo">
+                                <option value="">(不使用)</option>
+                                <option value="claude">claude</option>
+                                <option value="codex">codex</option>
+                                <option value="gemini">gemini</option>
+                                <option value="opencode">opencode</option>
+                            </select>
+                        </label>
                         <label>agentPromptCommand<input id="createAgentPromptCommand" placeholder="例如 codex exec --plain-text {prompt}" /></label>
                     </div>
                     <label class="text-block">env (KEY=VALUE，每行一项)
@@ -231,15 +239,38 @@
                     <button type="button" id="agentTemplateCancelBtn" class="secondary">关闭</button>
                 </header>
                 <div class="modal-body">
-                    <div id="agentTemplateTip" class="modal-tip"></div>
-                    <label class="text-block">容器默认 agentPromptCommand
-                        <textarea id="containerAgentPromptEditor" placeholder="例如 codex exec --skip-git-repo-check {prompt}"></textarea>
-                    </label>
-                    <div id="agentTemplateOverrideGroup">
-                        <label class="text-block">当前 AGENT 覆盖模板
-                            <textarea id="agentPromptOverrideEditor" placeholder="留空则继承容器默认模板"></textarea>
+                    <div id="agentTemplatePrimary" class="agent-template-primary">
+                        <label class="text-block">CLI
+                            <select id="containerCliSelect">
+                                <option value="custom">自定义</option>
+                                <option value="claude">claude</option>
+                                <option value="codex">codex</option>
+                                <option value="gemini">gemini</option>
+                                <option value="opencode">opencode</option>
+                            </select>
+                        </label>
+                        <label class="text-block">高级编辑 agentPromptCommand
+                            <textarea id="containerAgentPromptEditor" placeholder="例如 codex exec --skip-git-repo-check {prompt}"></textarea>
                         </label>
                     </div>
+                    <div id="agentTemplateOverrideGroup">
+                        <section class="agent-template-section">
+                            <div class="agent-template-section-title">当前 AGENT 覆盖</div>
+                            <label class="text-block">CLI
+                                <select id="agentCliSelect">
+                                    <option value="">继承容器默认</option>
+                                    <option value="custom">自定义</option>
+                                    <option value="claude">claude</option>
+                                    <option value="codex">codex</option>
+                                    <option value="gemini">gemini</option>
+                                    <option value="opencode">opencode</option>
+                                </select>
+                            </label>
+                            <label class="text-block">高级编辑 agentPromptCommand
+                                <textarea id="agentPromptOverrideEditor" placeholder="留空则继承容器默认模板"></textarea>
+                            </label>
+                        </section>
+                    </div>
                     <div id="agentTemplateError" class="modal-error" hidden></div>
                 </div>
                 <footer class="modal-footer">

package/lib/web/frontend/app.js

@@ -188,9 +188,11 @@
     const sendBtn = document.getElementById('sendBtn');
     const stopBtn = document.getElementById('stopBtn');
     const agentTemplateModal = document.getElementById('agentTemplateModal');
-    const agentTemplateTip = document.getElementById('agentTemplateTip');
+    const agentTemplatePrimary = document.getElementById('agentTemplatePrimary');
+    const containerCliSelect = document.getElementById('containerCliSelect');
     const containerAgentPromptEditor = document.getElementById('containerAgentPromptEditor');
     const agentTemplateOverrideGroup = document.getElementById('agentTemplateOverrideGroup');
+    const agentCliSelect = document.getElementById('agentCliSelect');
     const agentPromptOverrideEditor = document.getElementById('agentPromptOverrideEditor');
     const agentTemplateError = document.getElementById('agentTemplateError');
     const agentTemplateCancelBtn = document.getElementById('agentTemplateCancelBtn');
@@ -230,6 +232,12 @@
     const GEMINI_YOLO_FLAG = '--yolo';
     const CODEX_DANGEROUS_FLAG = '--dangerously-bypass-approvals-and-sandbox';
     const OPENCODE_PERMISSION_KEY = 'OPENCODE_PERMISSION=';
+    const AGENT_TEMPLATE_CLI_COMMAND_MAP = {
+        claude: YOLO_COMMAND_MAP.claude,
+        codex: YOLO_COMMAND_MAP.codex,
+        gemini: YOLO_COMMAND_MAP.gemini,
+        opencode: YOLO_COMMAND_MAP.opencode
+    };
     const SIDEBAR_TREE_STORAGE_KEY = 'manyoyo.web.sidebarTree.v1';
     const markdownRenderer = window.ManyoyoMarkdown
         && typeof window.ManyoyoMarkdown.shouldRenderMessage === 'function'
@@ -829,6 +837,26 @@
         return YOLO_COMMAND_MAP[key] || '';
     }
 
+    function normalizeCreateYoloValue(yolo) {
+        const key = String(yolo || '').trim().toLowerCase();
+        if (!key) {
+            return '';
+        }
+        if (key === 'claude' || key === 'cc' || key === 'c') {
+            return 'claude';
+        }
+        if (key === 'codex' || key === 'cx') {
+            return 'codex';
+        }
+        if (key === 'gemini' || key === 'gm' || key === 'g') {
+            return 'gemini';
+        }
+        if (key === 'opencode' || key === 'oc') {
+            return 'opencode';
+        }
+        return '';
+    }
+
     function stripLeadingAssignments(commandText) {
         let rest = String(commandText || '').trim();
         const assignmentPattern = /^(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)(?:\s+|$)/;
@@ -928,7 +956,7 @@
         createShellSuffix.value = value.shellSuffix || '';
         createAgentPromptCommand.value = value.agentPromptCommand || '';
         state.createAgentPromptAuto = false;
-        createYolo.value = value.yolo || '';
+        createYolo.value = normalizeCreateYoloValue(value.yolo);
         // 敏感 env 与继承数组由服务端在创建时合并，前端表单默认不回显，避免泄露或重复提交。
         createEnv.value = '';
         createEnvFile.value = '';
@@ -1106,28 +1134,101 @@
         agentTemplateError.textContent = state.agentTemplateError;
     }
 
+    function inferTemplateCliValue(templateText, options) {
+        const text = String(templateText || '').trim();
+        const opts = options && typeof options === 'object' ? options : {};
+        if (!text) {
+            return opts.allowEmpty ? '' : 'custom';
+        }
+        const program = resolveAgentProgram(text);
+        return AGENT_PROMPT_TEMPLATE_MAP[program] ? program : 'custom';
+    }
+
+    function buildTemplateFromCliValue(cliValue) {
+        const cli = String(cliValue || '').trim().toLowerCase();
+        if (!cli || cli === 'custom') {
+            return '';
+        }
+        const baseCommand = AGENT_TEMPLATE_CLI_COMMAND_MAP[cli] || '';
+        if (!baseCommand) {
+            return '';
+        }
+        return resolveAgentPromptTemplate(baseCommand);
+    }
+
+    function syncAgentTemplateSelectFromEditor(selectNode, editorNode, options) {
+        if (!selectNode || !editorNode) {
+            return;
+        }
+        const value = inferTemplateCliValue(editorNode.value, options);
+        selectNode.value = value;
+    }
+
+    function getInheritedContainerTemplateText() {
+        if (containerAgentPromptEditor) {
+            const editorText = String(containerAgentPromptEditor.value || '').trim();
+            if (editorText) {
+                return editorText;
+            }
+        }
+        if (state.sessionDetail && typeof state.sessionDetail.containerAgentPromptCommand === 'string') {
+            const containerText = String(state.sessionDetail.containerAgentPromptCommand || '').trim();
+            if (containerText) {
+                return containerText;
+            }
+        }
+        if (state.sessionDetail && typeof state.sessionDetail.agentPromptCommand === 'string') {
+            const effectiveText = String(state.sessionDetail.agentPromptCommand || '').trim();
+            if (effectiveText) {
+                return effectiveText;
+            }
+        }
+        return '';
+    }
+
+    function applyAgentTemplateCliSelection(selectNode, editorNode, options) {
+        if (!selectNode || !editorNode) {
+            return;
+        }
+        const opts = options && typeof options === 'object' ? options : {};
+        const cliValue = String(selectNode.value || '').trim();
+        if (!cliValue && opts.allowEmpty === true) {
+            editorNode.value = getInheritedContainerTemplateText();
+            showAgentTemplateError('');
+            return;
+        }
+        if (cliValue === 'custom') {
+            showAgentTemplateError('');
+            return;
+        }
+        const nextTemplate = buildTemplateFromCliValue(cliValue);
+        if (nextTemplate) {
+            editorNode.value = nextTemplate;
+        }
+        showAgentTemplateError('');
+    }
+
     function fillAgentTemplateForm(detail) {
         const currentDetail = detail && typeof detail === 'object' ? detail : {};
+        const overrideEditable = isActiveAgentOverrideEditable();
+        const containerTemplateText = String(
+            currentDetail.containerAgentPromptCommand || currentDetail.agentPromptCommand || ''
+        ).trim();
         if (containerAgentPromptEditor) {
-            containerAgentPromptEditor.value = currentDetail.containerAgentPromptCommand || '';
+            containerAgentPromptEditor.value = containerTemplateText;
         }
         if (agentPromptOverrideEditor) {
-            agentPromptOverrideEditor.value = currentDetail.agentPromptCommandOverride || '';
+            agentPromptOverrideEditor.value = currentDetail.agentPromptCommandOverride || containerTemplateText;
+        }
+        syncAgentTemplateSelectFromEditor(containerCliSelect, containerAgentPromptEditor);
+        if (agentCliSelect) {
+            agentCliSelect.value = currentDetail.agentPromptCommandOverride ? inferTemplateCliValue(currentDetail.agentPromptCommandOverride, { allowEmpty: true }) : '';
+        }
+        if (agentTemplatePrimary) {
+            agentTemplatePrimary.hidden = overrideEditable;
         }
         if (agentTemplateOverrideGroup) {
-            agentTemplateOverrideGroup.hidden = !isActiveAgentOverrideEditable();
-        }
-        if (agentTemplateTip) {
-            const sessionName = currentDetail.agentName || state.active || '当前会话';
-            const sourceMap = {
-                agent: '当前 AGENT 覆盖',
-                container: '容器默认模板',
-                inferred: '从容器启动命令推导',
-                none: '未配置'
-            };
-            const sourceLabel = sourceMap[currentDetail.agentPromptSource] || '未配置';
-            const effectiveTemplate = currentDetail.agentPromptCommand || '—';
-            agentTemplateTip.textContent = `${sessionName} · 当前生效来源：${sourceLabel} · 生效模板：${effectiveTemplate}`;
+            agentTemplateOverrideGroup.hidden = !overrideEditable;
         }
         showAgentTemplateError('');
     }
@@ -1155,7 +1256,11 @@
         state.agentTemplateModalOpen = true;
         fillAgentTemplateForm(detail);
         syncUi();
-        if (containerAgentPromptEditor) {
+        if (isActiveAgentOverrideEditable() && agentCliSelect) {
+            agentCliSelect.focus();
+        } else if (containerCliSelect) {
+            containerCliSelect.focus();
+        } else if (containerAgentPromptEditor) {
             containerAgentPromptEditor.focus();
         }
     }
@@ -1177,11 +1282,15 @@
         showAgentTemplateError('');
         syncUi();
         try {
-            const payload = {
-                containerAgentPromptCommand: containerAgentPromptEditor ? String(containerAgentPromptEditor.value || '').trim() : ''
-            };
-            if (isActiveAgentOverrideEditable() && agentPromptOverrideEditor) {
-                payload.agentPromptCommandOverride = String(agentPromptOverrideEditor.value || '').trim();
+            const payload = {};
+            if (isActiveAgentOverrideEditable()) {
+                if (agentCliSelect && String(agentCliSelect.value || '').trim() === '') {
+                    payload.agentPromptCommandOverride = '';
+                } else if (agentPromptOverrideEditor) {
+                    payload.agentPromptCommandOverride = String(agentPromptOverrideEditor.value || '').trim();
+                }
+            } else if (containerAgentPromptEditor) {
+                payload.containerAgentPromptCommand = String(containerAgentPromptEditor.value || '').trim();
             }
             const data = await api('/api/sessions/' + encodeURIComponent(state.active) + '/agent-template', {
                 method: 'PUT',
@@ -2020,6 +2129,18 @@
         if (agentTemplateCancelBtn) {
             agentTemplateCancelBtn.disabled = state.agentTemplateSaving;
         }
+        if (containerCliSelect) {
+            containerCliSelect.disabled = state.agentTemplateSaving || isActiveAgentOverrideEditable();
+        }
+        if (containerAgentPromptEditor) {
+            containerAgentPromptEditor.disabled = state.agentTemplateSaving || isActiveAgentOverrideEditable();
+        }
+        if (agentCliSelect) {
+            agentCliSelect.disabled = state.agentTemplateSaving || !isActiveAgentOverrideEditable();
+        }
+        if (agentPromptOverrideEditor) {
+            agentPromptOverrideEditor.disabled = state.agentTemplateSaving || !isActiveAgentOverrideEditable();
+        }
         document.body.classList.toggle(
             'modal-open',
             state.configModalOpen || state.createModalOpen || state.directoryPicker.open || state.agentTemplateModalOpen
@@ -3568,6 +3689,30 @@
         });
     }
 
+    if (containerCliSelect) {
+        containerCliSelect.addEventListener('change', function () {
+            applyAgentTemplateCliSelection(containerCliSelect, containerAgentPromptEditor);
+        });
+    }
+
+    if (agentCliSelect) {
+        agentCliSelect.addEventListener('change', function () {
+            applyAgentTemplateCliSelection(agentCliSelect, agentPromptOverrideEditor, { allowEmpty: true });
+        });
+    }
+
+    if (containerAgentPromptEditor) {
+        containerAgentPromptEditor.addEventListener('input', function () {
+            syncAgentTemplateSelectFromEditor(containerCliSelect, containerAgentPromptEditor);
+        });
+    }
+
+    if (agentPromptOverrideEditor) {
+        agentPromptOverrideEditor.addEventListener('input', function () {
+            syncAgentTemplateSelectFromEditor(agentCliSelect, agentPromptOverrideEditor, { allowEmpty: true });
+        });
+    }
+
     if (agentTemplateCancelBtn) {
         agentTemplateCancelBtn.addEventListener('click', function () {
             closeAgentTemplateModal();
@@ -3599,6 +3744,9 @@
         inputNode.addEventListener('input', function () {
             updateCreateAgentPromptCommandFromCommand();
         });
+        inputNode.addEventListener('change', function () {
+            updateCreateAgentPromptCommandFromCommand();
+        });
     });
 
     if (createAgentPromptCommand) {

package/package.json

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