@xcanwin/manyoyo 5.7.11 → 5.7.13

package/lib/web/frontend/app.html

@@ -226,6 +226,7 @@
     <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

@@ -59,6 +59,7 @@
         sessionDetailError: '',
         sessionDetailRequestId: 0,
         createAgentPromptAuto: false,
+        createContainerPathBase: '',
         createDefaults: null,
         createRuns: {},
         sessionNodeMap: new Map(),
@@ -77,6 +78,7 @@
             tip: '',
             currentPath: '',
             basePath: '',
+            baseContainerPath: '',
             entries: [],
             error: ''
         },
@@ -218,6 +220,9 @@
         && typeof window.ManyoyoMarkdown.render === 'function'
         ? window.ManyoyoMarkdown
         : null;
+    const pathPickerUtils = window.ManyoyoPathPickerUtils && typeof window.ManyoyoPathPickerUtils === 'object'
+        ? window.ManyoyoPathPickerUtils
+        : {};
 
     function normalizeBooleanMap(source) {
         const result = {};
@@ -647,10 +652,16 @@
     }
 
     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) {
@@ -660,6 +671,9 @@
     }
 
     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(/\/+$/, '');
@@ -860,6 +874,7 @@
         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 || '';
@@ -2074,6 +2089,7 @@
         state.directoryPicker.tip = '';
         state.directoryPicker.currentPath = '';
         state.directoryPicker.basePath = '';
+        state.directoryPicker.baseContainerPath = '';
         state.directoryPicker.parentPath = '';
         state.directoryPicker.entries = [];
         state.directoryPicker.error = '';
@@ -2089,11 +2105,12 @@
             createHostPath.value = picker.currentPath;
             if (!(createContainerPath.value || '').trim()) {
                 createContainerPath.value = '/workspace';
+                state.createContainerPathBase = '/workspace';
             }
         } else if (picker.mode === 'container') {
             const mapped = buildContainerPathFromHostSelection(
                 picker.basePath,
-                (createContainerPath.value || '').trim() || '/workspace',
+                picker.baseContainerPath || '/workspace',
                 picker.currentPath
             );
             createContainerPath.value = mapped;
@@ -2120,12 +2137,16 @@
             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() || '/';
         }
         renderDirectoryPicker();
@@ -3313,6 +3334,12 @@
         });
     }
 
+    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/frontend/path-picker-utils.js

@@ -0,0 +1,57 @@
+(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
+    };
+}));

package/lib/web/server.js

@@ -158,17 +158,57 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
     };
 }
 
+function resolveEffectiveAgentPromptCommand(template, applied) {
+    const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    if (!normalizedTemplate) {
+        return '';
+    }
+
+    const program = resolveAgentProgram(normalizedTemplate);
+    const defaultCommand = applied && typeof applied === 'object'
+        ? String(applied.defaultCommand || '').trim()
+        : '';
+    if (!program || !defaultCommand) {
+        return normalizedTemplate;
+    }
+
+    const defaultProgram = resolveAgentProgram(defaultCommand);
+    if (!defaultProgram || defaultProgram !== program) {
+        return normalizedTemplate;
+    }
+
+    const genericTemplate = normalizeAgentPromptCommandTemplate(
+        resolveAgentPromptCommandTemplate(program),
+        'agentPromptCommand'
+    );
+    if (normalizedTemplate !== genericTemplate) {
+        return normalizedTemplate;
+    }
+
+    const inferredTemplate = normalizeAgentPromptCommandTemplate(
+        resolveAgentPromptCommandTemplate(defaultCommand),
+        'agentPromptCommand'
+    );
+    if (!inferredTemplate || inferredTemplate === genericTemplate) {
+        return normalizedTemplate;
+    }
+
+    return inferredTemplate;
+}
+
 function normalizeWebHistoryRecord(containerName, rawData) {
     const data = rawData && typeof rawData === 'object' && !Array.isArray(rawData) ? rawData : {};
+    const applied = data.applied && typeof data.applied === 'object' && !Array.isArray(data.applied)
+        ? data.applied
+        : null;
     const history = {
         containerName,
         updatedAt: typeof data.updatedAt === 'string' ? data.updatedAt : null,
-        agentPromptCommand: typeof data.agentPromptCommand === 'string'
-            ? data.agentPromptCommand
-            : '',
-        applied: data.applied && typeof data.applied === 'object' && !Array.isArray(data.applied)
-            ? data.applied
-            : null,
+        agentPromptCommand: resolveEffectiveAgentPromptCommand(
+            typeof data.agentPromptCommand === 'string' ? data.agentPromptCommand : '',
+            applied
+        ),
+        applied,
         agents: {}
     };
 
@@ -3542,7 +3582,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')) {
+                if (!(assetName === 'app.css' || assetName === 'app.js' || assetName === 'markdown.css' || assetName === 'markdown-renderer.js' || assetName === 'path-picker-utils.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');
                     return;
                 }

package/package.json

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