@xcanwin/manyoyo 5.9.3 → 5.10.3

package/lib/web/frontend/app.js

@@ -60,6 +60,7 @@
         creatingAgent: false,
         agentTemplateSaving: false,
         configSnapshot: null,
+        configEditor: null,
         sessionDetail: null,
         sessionDetailError: '',
         sessionDetailRequestId: 0,
@@ -82,6 +83,8 @@
             title: '',
             tip: '',
             currentPath: '',
+            pathDraft: '',
+            parentPath: '',
             entries: [],
             error: ''
         },
@@ -167,11 +170,13 @@
     const directoryPickerModal = document.getElementById('directoryPickerModal');
     const directoryPickerTitle = document.getElementById('directoryPickerTitle');
     const directoryPickerTip = document.getElementById('directoryPickerTip');
-    const directoryPickerCurrent = document.getElementById('directoryPickerCurrent');
+    const directoryPickerPathInput = document.getElementById('directoryPickerPathInput');
+    const directoryPickerVisitBtn = document.getElementById('directoryPickerVisitBtn');
+    const directoryPickerStatus = document.getElementById('directoryPickerStatus');
+    const directoryPickerMkdirBtn = document.getElementById('directoryPickerMkdirBtn');
     const directoryPickerList = document.getElementById('directoryPickerList');
     const directoryPickerError = document.getElementById('directoryPickerError');
     const directoryPickerCancelBtn = document.getElementById('directoryPickerCancelBtn');
-    const directoryPickerUpBtn = document.getElementById('directoryPickerUpBtn');
     const directoryPickerSelectBtn = document.getElementById('directoryPickerSelectBtn');
     const activeTitle = document.getElementById('activeTitle');
     const activeMeta = document.getElementById('activeMeta');
@@ -810,6 +815,70 @@
         directoryPickerError.textContent = text;
     }
 
+    function ensureConfigCodeEditor() {
+        if (!configEditor || state.configEditor || !window.ManyoyoCodeEditor || typeof window.ManyoyoCodeEditor.create !== 'function') {
+            return state.configEditor;
+        }
+        state.configEditor = window.ManyoyoCodeEditor.create(configEditor, {
+            doc: '',
+            language: 'javascript',
+            readOnly: true,
+            onChange: function () {
+                if (!state.configSaveMessage) {
+                    return;
+                }
+                state.configSaveMessage = '';
+                showConfigStatus('');
+            }
+        });
+        return state.configEditor;
+    }
+
+    function setConfigEditorValue(value, readOnly) {
+        const text = String(value == null ? '' : value);
+        const editor = ensureConfigCodeEditor();
+        if (editor) {
+            editor.setValue(text);
+            editor.setLanguage('javascript');
+            editor.setReadOnly(readOnly !== false);
+            return;
+        }
+        if ('value' in configEditor) {
+            configEditor.value = text;
+            configEditor.readOnly = readOnly !== false;
+        } else {
+            configEditor.textContent = text;
+        }
+    }
+
+    function getConfigEditorValue() {
+        const editor = ensureConfigCodeEditor();
+        if (editor) {
+            return editor.getValue();
+        }
+        if ('value' in configEditor) {
+            return configEditor.value || '';
+        }
+        return configEditor && configEditor.textContent ? configEditor.textContent : '';
+    }
+
+    function setDirectoryPickerStatus(message) {
+        if (!directoryPickerStatus) return;
+        directoryPickerStatus.textContent = String(message || '').trim() || '未加载';
+    }
+
+    function joinDirectoryPath(basePath, childName) {
+        const base = String(basePath || '/').trim() || '/';
+        const child = String(childName || '').trim();
+        if (!child) {
+            return base;
+        }
+        if (base === '/') {
+            return '/' + child.replace(/^\/+/, '');
+        }
+        return base.replace(/\/+$/, '') + '/' + child.replace(/^\/+/, '');
+    }
+
     function envMapToText(envMap) {
         if (!envMap || typeof envMap !== 'object') {
             return '';
@@ -2448,8 +2517,7 @@
             configPath.textContent = lines.filter(Boolean).join('\n');
         }
         if (configEditor) {
-            configEditor.readOnly = config.editable === false;
-            configEditor.value = typeof config.raw === 'string' ? config.raw : '';
+            setConfigEditorValue(typeof config.raw === 'string' ? config.raw : '', config.editable === false);
         }
     }
 
@@ -2493,7 +2561,7 @@
         try {
             await api('/api/config', {
                 method: 'PUT',
-                body: JSON.stringify({ raw: configEditor.value || '' })
+                body: JSON.stringify({ raw: getConfigEditorValue() })
             });
             const config = await fetchConfigSnapshot();
             renderConfigModalSnapshot(config);
@@ -2553,39 +2621,73 @@
         if (directoryPickerTip) {
             directoryPickerTip.textContent = picker.tip || '';
         }
-        if (directoryPickerCurrent) {
-            directoryPickerCurrent.textContent = picker.currentPath || '未选择目录';
+        if (directoryPickerPathInput) {
+            directoryPickerPathInput.value = picker.pathDraft || picker.currentPath || '/';
         }
         showDirectoryPickerError(picker.error);
-        if (directoryPickerUpBtn) {
-            directoryPickerUpBtn.disabled = picker.loading || !picker.currentPath || !picker.parentPath;
+        if (directoryPickerVisitBtn) {
+            directoryPickerVisitBtn.disabled = picker.loading || !(picker.pathDraft || picker.currentPath);
+        }
+        if (directoryPickerMkdirBtn) {
+            directoryPickerMkdirBtn.disabled = picker.loading || !picker.currentPath;
         }
         if (directoryPickerSelectBtn) {
             directoryPickerSelectBtn.disabled = picker.loading || !picker.currentPath;
         }
+        if (picker.loading) {
+            setDirectoryPickerStatus('读取目录中');
+        } else if (picker.entries.length) {
+            setDirectoryPickerStatus('共 ' + picker.entries.length + ' 项');
+        } else if (picker.currentPath) {
+            setDirectoryPickerStatus('共 0 项');
+        } else {
+            setDirectoryPickerStatus('未加载');
+        }
         if (!directoryPickerList) {
             return;
         }
         directoryPickerList.innerHTML = '';
         if (picker.loading) {
             const loading = document.createElement('div');
-            loading.className = 'empty';
+            loading.className = 'files-empty';
             loading.textContent = '目录加载中...';
             directoryPickerList.appendChild(loading);
             return;
         }
+        if (picker.parentPath) {
+            const parentButton = document.createElement('button');
+            parentButton.type = 'button';
+            parentButton.className = 'files-entry files-entry-parent';
+            parentButton.title = picker.parentPath;
+            parentButton.innerHTML = `
+                <span class="files-entry-name">
+                    <span class="files-entry-title">..</span>
+                </span>
+                <span class="files-entry-meta">上一级</span>
+            `;
+            parentButton.addEventListener('click', function () {
+                loadDirectoryPicker(picker.parentPath);
+            });
+            directoryPickerList.appendChild(parentButton);
+        }
         if (!picker.entries.length) {
             const empty = document.createElement('div');
-            empty.className = 'empty';
-            empty.textContent = '当前目录下没有可选子目录';
+            empty.className = 'files-empty';
+            empty.innerHTML = '&nbsp;';
             directoryPickerList.appendChild(empty);
             return;
         }
         picker.entries.forEach(function (entry) {
             const btn = document.createElement('button');
             btn.type = 'button';
-            btn.className = 'dir-picker-item secondary';
-            btn.textContent = entry.name;
+            btn.className = 'files-entry';
+            btn.title = String(entry.path || entry.name || '');
+            btn.innerHTML = `
+                <span class="files-entry-name">
+                    <span class="files-entry-title">${escapeHtml(entry.name || entry.path || '未命名')}</span>
+                </span>
+                <span class="files-entry-meta">目录</span>
+            `;
             btn.addEventListener('click', function () {
                 loadDirectoryPicker(entry.path);
             });
@@ -2597,15 +2699,15 @@
         const picker = state.directoryPicker;
         picker.loading = true;
         picker.error = '';
-        if (targetPath) {
-            picker.currentPath = targetPath;
-        }
+        const nextPath = String(targetPath || picker.pathDraft || picker.currentPath || '/').trim() || '/';
+        picker.pathDraft = nextPath;
         renderDirectoryPicker();
         try {
             const params = new URLSearchParams();
-            params.set('path', picker.currentPath || '/');
+            params.set('path', nextPath);
             const data = await api('/api/fs/directories?' + params.toString());
-            picker.currentPath = data.currentPath || picker.currentPath;
+            picker.currentPath = data.currentPath || nextPath;
+            picker.pathDraft = picker.currentPath;
             picker.parentPath = data.parentPath || '';
             picker.entries = Array.isArray(data.entries) ? data.entries : [];
         } catch (e) {
@@ -2617,6 +2719,32 @@
         }
     }
 
+    async function createDirectoryInPicker() {
+        const picker = state.directoryPicker;
+        if (picker.loading || !picker.currentPath) {
+            return;
+        }
+        const input = window.prompt('请输入新目录名称');
+        const name = String(input || '').trim();
+        if (!name) {
+            return;
+        }
+        picker.loading = true;
+        picker.error = '';
+        renderDirectoryPicker();
+        try {
+            await api('/api/fs/directories/mkdir', {
+                method: 'POST',
+                body: JSON.stringify({ path: joinDirectoryPath(picker.currentPath, name) })
+            });
+            await loadDirectoryPicker(picker.currentPath);
+        } catch (e) {
+            picker.loading = false;
+            picker.error = e && e.message ? e.message : '创建目录失败';
+            renderDirectoryPicker();
+        }
+    }
+
     function closeDirectoryPicker() {
         state.directoryPicker.open = false;
         state.directoryPicker.loading = false;
@@ -2624,6 +2752,7 @@
         state.directoryPicker.title = '';
         state.directoryPicker.tip = '';
         state.directoryPicker.currentPath = '';
+        state.directoryPicker.pathDraft = '';
         state.directoryPicker.parentPath = '';
         state.directoryPicker.entries = [];
         state.directoryPicker.error = '';
@@ -2651,6 +2780,7 @@
         picker.title = '选择 hostPath';
         picker.tip = '浏览宿主机目录，选中后会回填 create 表单。';
         picker.currentPath = (createHostPath.value || '').trim() || '/';
+        picker.pathDraft = picker.currentPath;
         renderDirectoryPicker();
         loadDirectoryPicker(picker.currentPath);
     }
@@ -2855,6 +2985,42 @@
         return sorted.length && sorted[0] && sorted[0].name ? sorted[0].name : '';
     }
 
+    function findPreferredSessionNameAfterRemoval(sessions, removedName) {
+        const removedSessionName = String(removedName || '').trim();
+        if (!removedSessionName) {
+            return '';
+        }
+        const removedRef = parseSessionKey(removedSessionName);
+        const remaining = (Array.isArray(sessions) ? sessions : []).filter(function (session) {
+            return session
+                && session.name
+                && session.name !== removedSessionName
+                && session.containerName === removedRef.containerName;
+        });
+        if (!remaining.length) {
+            return '';
+        }
+
+        const removedRank = getSessionAgentCreationRank({ agentId: removedRef.agentId });
+        if (removedRef.agentId && removedRef.agentId !== WEB_DEFAULT_AGENT_ID && removedRank > 0) {
+            const lowerRanked = remaining
+                .filter(function (session) { return getSessionAgentCreationRank(session) < removedRank; })
+                .sort(function (a, b) { return getSessionAgentCreationRank(b) - getSessionAgentCreationRank(a); });
+            if (lowerRanked.length && lowerRanked[0] && lowerRanked[0].name) {
+                return lowerRanked[0].name;
+            }
+
+            const higherRanked = remaining
+                .filter(function (session) { return getSessionAgentCreationRank(session) > removedRank; })
+                .sort(function (a, b) { return getSessionAgentCreationRank(a) - getSessionAgentCreationRank(b); });
+            if (higherRanked.length && higherRanked[0] && higherRanked[0].name) {
+                return higherRanked[0].name;
+            }
+        }
+
+        return findLatestCreatedSessionName(remaining, removedRef.containerName);
+    }
+
     function createDisclosureButton(expanded, label) {
         const button = document.createElement('button');
         button.type = 'button';
@@ -3140,12 +3306,15 @@
     }
 
     function renderSessions() {
+        const directoryCount = new Set(state.sessions.map(function (session) {
+            return String(session && session.hostPath ? session.hostPath : '').trim() || '未配置目录';
+        }).filter(Boolean)).size;
         const containerCount = new Set(state.sessions.map(function (session) {
             return session && session.containerName ? session.containerName : '';
         }).filter(Boolean)).size;
         sessionCount.textContent = state.loadingSessions
             ? '加载中...'
-            : `${state.sessions.length} 个 AGENT / ${containerCount} 个容器`;
+            : `${directoryCount} 个 目录 / ${containerCount} 个容器 / ${state.sessions.length} 个 AGENT`;
 
         if (state.loadingSessions) {
             renderSessionsLoading();
@@ -3884,16 +4053,6 @@
         });
     }
 
-    if (configEditor) {
-        configEditor.addEventListener('input', function () {
-            if (!state.configSaveMessage) {
-                return;
-            }
-            state.configSaveMessage = '';
-            showConfigStatus('');
-        });
-    }
-
     if (createCancelBtn) {
         createCancelBtn.addEventListener('click', function () {
             closeCreateModal();
@@ -3919,14 +4078,32 @@
         });
     }
 
-    if (directoryPickerUpBtn) {
-        directoryPickerUpBtn.addEventListener('click', function () {
-            if (state.directoryPicker.parentPath) {
-                loadDirectoryPicker(state.directoryPicker.parentPath);
+    if (directoryPickerPathInput) {
+        directoryPickerPathInput.addEventListener('input', function () {
+            state.directoryPicker.pathDraft = directoryPickerPathInput.value;
+        });
+        directoryPickerPathInput.addEventListener('keydown', function (event) {
+            if (event.key === 'Enter') {
+                event.preventDefault();
+                loadDirectoryPicker();
             }
         });
     }
 
+    if (directoryPickerVisitBtn) {
+        directoryPickerVisitBtn.addEventListener('click', function () {
+            loadDirectoryPicker();
+        });
+    }
+
+    if (directoryPickerMkdirBtn) {
+        directoryPickerMkdirBtn.addEventListener('click', function () {
+            createDirectoryInPicker().catch(function (e) {
+                showDirectoryPickerError(e && e.message ? e.message : '创建目录失败');
+            });
+        });
+    }
+
     if (directoryPickerSelectBtn) {
         directoryPickerSelectBtn.addEventListener('click', function () {
             applyPickedDirectory();
@@ -4440,11 +4617,14 @@
         const yes = confirm('确认删除 AGENT ' + targetAgent + ' ?');
         if (!yes) return;
         try {
+            const current = state.active;
             const targetContainerName = activeSession && activeSession.containerName ? activeSession.containerName : '';
+            const fallbackSessionName = findPreferredSessionNameAfterRemoval(state.sessions, current);
             await api('/api/sessions/' + encodeURIComponent(state.active) + '/remove-with-history', {
                 method: 'POST'
             });
             await refreshSessions({
+                preferredName: fallbackSessionName || '',
                 preferredContainerName: targetContainerName,
                 withLoading: true,
                 reloadMessages: true

package/lib/web/frontend/codemirror-entry.js

@@ -35,8 +35,10 @@ function createEditor(parent, options = {}) {
     const initialDoc = String(options.doc || '');
     const initialLanguage = String(options.language || 'text').trim();
     const initialReadOnly = options.readOnly !== false;
+    const onChange = typeof options.onChange === 'function' ? options.onChange : null;
     const languageCompartment = new Compartment();
     const readOnlyCompartment = new Compartment();
+    let suppressChange = false;
     const view = new EditorView({
         parent: target,
         state: EditorState.create({
@@ -44,6 +46,12 @@ function createEditor(parent, options = {}) {
             extensions: [
                 basicSetup,
                 EditorView.lineWrapping,
+                EditorView.updateListener.of(function (update) {
+                    if (!update.docChanged || suppressChange || !onChange) {
+                        return;
+                    }
+                    onChange(update.state.doc.toString());
+                }),
                 readOnlyCompartment.of([
                     EditorState.readOnly.of(initialReadOnly),
                     EditorView.editable.of(!initialReadOnly)
@@ -65,6 +73,7 @@ function createEditor(parent, options = {}) {
     return {
         setValue(nextValue) {
             const text = String(nextValue == null ? '' : nextValue);
+            suppressChange = true;
             view.dispatch({
                 changes: {
                     from: 0,
@@ -72,6 +81,10 @@ function createEditor(parent, options = {}) {
                     insert: text
                 }
             });
+            suppressChange = false;
+        },
+        getValue() {
+            return view.state.doc.toString();
         },
         setLanguage(nextLanguage) {
             view.dispatch({

package/lib/web/frontend/codemirror.bundle.js

@@ -31583,8 +31583,10 @@
         const initialDoc = String(options.doc || "");
         const initialLanguage = String(options.language || "text").trim();
         const initialReadOnly = options.readOnly !== false;
+        const onChange = typeof options.onChange === "function" ? options.onChange : null;
         const languageCompartment = new Compartment();
         const readOnlyCompartment = new Compartment();
+        let suppressChange = false;
         const view = new EditorView({
           parent: target,
           state: EditorState.create({
@@ -31592,6 +31594,12 @@
             extensions: [
               basicSetup,
               EditorView.lineWrapping,
+              EditorView.updateListener.of(function(update) {
+                if (!update.docChanged || suppressChange || !onChange) {
+                  return;
+                }
+                onChange(update.state.doc.toString());
+              }),
               readOnlyCompartment.of([
                 EditorState.readOnly.of(initialReadOnly),
                 EditorView.editable.of(!initialReadOnly)
@@ -31612,6 +31620,7 @@
         return {
           setValue(nextValue) {
             const text = String(nextValue == null ? "" : nextValue);
+            suppressChange = true;
             view.dispatch({
               changes: {
                 from: 0,
@@ -31619,6 +31628,10 @@
                 insert: text
               }
             });
+            suppressChange = false;
+          },
+          getValue() {
+            return view.state.doc.toString();
           },
           setLanguage(nextLanguage) {
             view.dispatch({