@xcanwin/manyoyo 5.8.1 → 5.8.2

package/lib/web/frontend/app.html

@@ -165,12 +165,7 @@
                             </div>
                         </label>
                         <label>containerName<input id="createContainerName" placeholder="my-dev 或 my-{now}" /></label>
-                        <label>containerPath
-                            <div class="field-inline">
-                                <input id="createContainerPath" placeholder="/workspace" />
-                                <button type="button" id="pickContainerPathBtn" class="secondary field-picker-btn">选择</button>
-                            </div>
-                        </label>
+                        <label>containerPath<input id="createContainerPath" placeholder="/workspace" /></label>
                         <label>imageName<input id="createImageName" placeholder="localhost/xcanwin/manyoyo" /></label>
                         <label>imageVersion<input id="createImageVersion" placeholder="1.7.4-common" /></label>
                         <label>containerMode
@@ -285,7 +280,6 @@
     <script src="/app/vendor/xterm-addon-fit.js"></script>
     <script src="/app/vendor/marked.min.js"></script>
     <script src="/app/frontend/markdown-renderer.js"></script>
-    <script src="/app/frontend/path-picker-utils.js"></script>
     <script src="/app/frontend/app.js"></script>
 </body>
 </html>

package/lib/web/frontend/app.js

@@ -62,7 +62,6 @@
         sessionDetailRequestId: 0,
         agentTemplateError: '',
         createAgentPromptAuto: false,
-        createContainerPathBase: '',
         createDefaults: null,
         createRuns: {},
         sessionNodeMap: new Map(),
@@ -80,8 +79,6 @@
             title: '',
             tip: '',
             currentPath: '',
-            basePath: '',
-            baseContainerPath: '',
             entries: [],
             error: ''
         },
@@ -145,7 +142,6 @@
     const createHostPath = document.getElementById('createHostPath');
     const createContainerPath = document.getElementById('createContainerPath');
     const pickHostPathBtn = document.getElementById('pickHostPathBtn');
-    const pickContainerPathBtn = document.getElementById('pickContainerPathBtn');
     const createImageName = document.getElementById('createImageName');
     const createImageVersion = document.getElementById('createImageVersion');
     const createContainerMode = document.getElementById('createContainerMode');
@@ -244,10 +240,6 @@
         && typeof window.ManyoyoMarkdown.render === 'function'
         ? window.ManyoyoMarkdown
         : null;
-    const pathPickerUtils = window.ManyoyoPathPickerUtils && typeof window.ManyoyoPathPickerUtils === 'object'
-        ? window.ManyoyoPathPickerUtils
-        : {};
-
     function normalizeBooleanMap(source) {
         const result = {};
         if (!source || typeof source !== 'object' || Array.isArray(source)) {
@@ -704,41 +696,6 @@
         return false;
     }
 
-    function normalizeSlashPath(value) {
-        if (typeof pathPickerUtils.normalizeSlashPath === 'function') {
-            return pathPickerUtils.normalizeSlashPath(value);
-        }
-        return String(value || '').replace(/\\/g, '/');
-    }
-
-    function isChildPath(basePath, targetPath) {
-        if (typeof pathPickerUtils.isChildPath === 'function') {
-            return pathPickerUtils.isChildPath(basePath, targetPath);
-        }
-        const normalizedBase = normalizeSlashPath(basePath).replace(/\/+$/, '');
-        const normalizedTarget = normalizeSlashPath(targetPath).replace(/\/+$/, '');
-        if (!normalizedBase) {
-            return false;
-        }
-        return normalizedTarget === normalizedBase || normalizedTarget.startsWith(normalizedBase + '/');
-    }
-
-    function buildContainerPathFromHostSelection(baseHostPath, baseContainerPath, selectedHostPath) {
-        if (typeof pathPickerUtils.buildContainerPathFromHostSelection === 'function') {
-            return pathPickerUtils.buildContainerPathFromHostSelection(baseHostPath, baseContainerPath, selectedHostPath);
-        }
-        const normalizedBaseHost = normalizeSlashPath(baseHostPath).replace(/\/+$/, '');
-        const normalizedContainer = normalizeSlashPath(baseContainerPath).replace(/\/+$/, '') || '/workspace';
-        const normalizedSelected = normalizeSlashPath(selectedHostPath).replace(/\/+$/, '');
-        if (!normalizedBaseHost || !isChildPath(normalizedBaseHost, normalizedSelected)) {
-            return normalizedContainer;
-        }
-        const relative = normalizedSelected === normalizedBaseHost
-            ? ''
-            : normalizedSelected.slice(normalizedBaseHost.length + 1);
-        return relative ? `${normalizedContainer}/${relative}`.replace(/\/+/g, '/') : normalizedContainer;
-    }
-
     function setModalVisible(modalNode, visible) {
         if (!modalNode) return;
         modalNode.hidden = !visible;
@@ -947,7 +904,6 @@
         createContainerName.value = value.containerName || '';
         createHostPath.value = value.hostPath || '';
         createContainerPath.value = value.containerPath || '';
-        state.createContainerPathBase = String(value.containerPath || '').trim();
         createImageName.value = value.imageName || '';
         createImageVersion.value = value.imageVersion || '';
         createContainerMode.value = value.containerMode || '';
@@ -2411,12 +2367,8 @@
         try {
             const params = new URLSearchParams();
             params.set('path', picker.currentPath || '/');
-            if (picker.basePath) {
-                params.set('basePath', picker.basePath);
-            }
             const data = await api('/api/fs/directories?' + params.toString());
             picker.currentPath = data.currentPath || picker.currentPath;
-            picker.basePath = data.basePath || picker.basePath || '';
             picker.parentPath = data.parentPath || '';
             picker.entries = Array.isArray(data.entries) ? data.entries : [];
         } catch (e) {
@@ -2435,8 +2387,6 @@
         state.directoryPicker.title = '';
         state.directoryPicker.tip = '';
         state.directoryPicker.currentPath = '';
-        state.directoryPicker.basePath = '';
-        state.directoryPicker.baseContainerPath = '';
         state.directoryPicker.parentPath = '';
         state.directoryPicker.entries = [];
         state.directoryPicker.error = '';
@@ -2448,54 +2398,22 @@
         if (!picker.currentPath) {
             return;
         }
-        if (picker.mode === 'host') {
-            createHostPath.value = picker.currentPath;
-            if (!(createContainerPath.value || '').trim()) {
-                createContainerPath.value = '/workspace';
-                state.createContainerPathBase = '/workspace';
-            }
-        } else if (picker.mode === 'container') {
-            const mapped = buildContainerPathFromHostSelection(
-                picker.basePath,
-                picker.baseContainerPath || '/workspace',
-                picker.currentPath
-            );
-            createContainerPath.value = mapped;
-        }
+        createHostPath.value = picker.currentPath;
+        createContainerPath.value = picker.currentPath;
         closeDirectoryPicker();
     }
 
-    function openDirectoryPicker(mode) {
+    function openDirectoryPicker() {
         const picker = state.directoryPicker;
         picker.open = true;
         picker.loading = false;
         picker.error = '';
         picker.entries = [];
         picker.parentPath = '';
-        if (mode === 'container') {
-            const baseHostPath = (createHostPath.value || '').trim();
-            if (!baseHostPath) {
-                showCreateError('请先选择 hostPath，再选择 containerPath。');
-                picker.open = false;
-                renderDirectoryPicker();
-                return;
-            }
-            picker.mode = 'container';
-            picker.title = '选择 containerPath 对应目录';
-            picker.tip = '从 hostPath 下选择子目录，结果会映射到容器路径。';
-            picker.basePath = baseHostPath;
-            picker.baseContainerPath = typeof pathPickerUtils.resolveContainerPickerBase === 'function'
-                ? pathPickerUtils.resolveContainerPickerBase(state.createContainerPathBase, createContainerPath.value)
-                : (String(state.createContainerPathBase || '').trim() || String(createContainerPath.value || '').trim() || '/workspace');
-            picker.currentPath = baseHostPath;
-        } else {
-            picker.mode = 'host';
-            picker.title = '选择 hostPath';
-            picker.tip = '浏览宿主机目录，选中后会回填 create 表单。';
-            picker.basePath = '';
-            picker.baseContainerPath = '';
-            picker.currentPath = (createHostPath.value || '').trim() || '/';
-        }
+        picker.mode = 'host';
+        picker.title = '选择 hostPath';
+        picker.tip = '浏览宿主机目录，选中后会回填 create 表单。';
+        picker.currentPath = (createHostPath.value || '').trim() || '/';
         renderDirectoryPicker();
         loadDirectoryPicker(picker.currentPath);
     }
@@ -3659,13 +3577,7 @@
 
     if (pickHostPathBtn) {
         pickHostPathBtn.addEventListener('click', function () {
-            openDirectoryPicker('host');
-        });
-    }
-
-    if (pickContainerPathBtn) {
-        pickContainerPathBtn.addEventListener('click', function () {
-            openDirectoryPicker('container');
+            openDirectoryPicker();
         });
     }
 
@@ -3762,12 +3674,6 @@
         });
     }
 
-    if (createContainerPath) {
-        createContainerPath.addEventListener('input', function () {
-            state.createContainerPathBase = String(createContainerPath.value || '').trim();
-        });
-    }
-
     if (createForm) {
         createForm.addEventListener('submit', async function (event) {
             event.preventDefault();

package/lib/web/server.js

@@ -3767,7 +3767,7 @@ async function startWebServer(options) {
             const appFrontendMatch = pathname.match(/^\/app\/frontend\/([A-Za-z0-9._-]+)$/);
             if (req.method === 'GET' && appFrontendMatch) {
                 const assetName = appFrontendMatch[1];
-                if (!(assetName === 'app.css' || assetName === 'app.js' || assetName === 'markdown.css' || assetName === 'markdown-renderer.js' || assetName === 'path-picker-utils.js')) {
+                if (!(assetName === 'app.css' || assetName === 'app.js' || assetName === 'markdown.css' || assetName === 'markdown-renderer.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');
                     return;
                 }

package/package.json

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

package/lib/web/frontend/path-picker-utils.js

@@ -1,57 +0,0 @@
-(function (root, factory) {
-    const api = factory();
-    if (typeof module === 'object' && module.exports) {
-        module.exports = api;
-    }
-    if (root && typeof root === 'object') {
-        root.ManyoyoPathPickerUtils = api;
-    }
-}(typeof globalThis !== 'undefined' ? globalThis : this, function () {
-    function normalizeSlashPath(value) {
-        return String(value || '').replace(/\\/g, '/');
-    }
-
-    function isChildPath(basePath, targetPath) {
-        const normalizedBase = normalizeSlashPath(basePath).replace(/\/+$/, '');
-        const normalizedTarget = normalizeSlashPath(targetPath).replace(/\/+$/, '');
-        if (!normalizedBase) {
-            return false;
-        }
-        return normalizedTarget === normalizedBase || normalizedTarget.startsWith(normalizedBase + '/');
-    }
-
-    function resolveContainerPickerBase(baseContainerPath, currentContainerPath) {
-        return String(baseContainerPath || '').trim()
-            || String(currentContainerPath || '').trim()
-            || '/workspace';
-    }
-
-    function buildContainerPathFromHostSelection(baseHostPath, baseContainerPath, selectedHostPath) {
-        const normalizedBaseHost = normalizeSlashPath(baseHostPath).replace(/\/+$/, '');
-        const normalizedContainer = normalizeSlashPath(baseContainerPath).replace(/\/+$/, '') || '/workspace';
-        const normalizedSelected = normalizeSlashPath(selectedHostPath).replace(/\/+$/, '');
-        if (!normalizedBaseHost || !isChildPath(normalizedBaseHost, normalizedSelected)) {
-            return normalizedContainer;
-        }
-        const relative = normalizedSelected === normalizedBaseHost
-            ? ''
-            : normalizedSelected.slice(normalizedBaseHost.length + 1);
-        return relative ? `${normalizedContainer}/${relative}`.replace(/\/+/g, '/') : normalizedContainer;
-    }
-
-    function applyContainerPathSelection(baseHostPath, baseContainerPath, currentContainerPath, selectedHostPath) {
-        return buildContainerPathFromHostSelection(
-            baseHostPath,
-            resolveContainerPickerBase(baseContainerPath, currentContainerPath),
-            selectedHostPath
-        );
-    }
-
-    return {
-        normalizeSlashPath,
-        isChildPath,
-        resolveContainerPickerBase,
-        buildContainerPathFromHostSelection,
-        applyContainerPathSelection
-    };
-}));