neoagent 3.0.1-beta.2 → 3.0.1-beta.21

package/server/services/workspace/manager.js

@@ -71,11 +71,45 @@ class WorkspaceManager {
     return toolRoot;
   }
 
+  _normalizeWorkspacePath(root, candidatePath) {
+    const rawPath = String(candidatePath || '').trim();
+    if (!rawPath) return '.';
+    if (rawPath === '/workspace') return root;
+    if (rawPath.startsWith('/workspace/')) {
+      return path.join(root, rawPath.slice('/workspace/'.length));
+    }
+    if (path.isAbsolute(rawPath)) {
+      const legacyRelativePath = this._mapLegacyAbsolutePath(rawPath);
+      if (legacyRelativePath) {
+        return path.join(root, legacyRelativePath);
+      }
+    }
+    return rawPath;
+  }
+
+  _mapLegacyAbsolutePath(rawPath) {
+    const legacyMarkers = [
+      '/.neoagent/agent-data/workspaces/',
+      '/.neoagent/',
+      '/workspace/',
+    ];
+    for (const marker of legacyMarkers) {
+      const index = rawPath.indexOf(marker);
+      if (index === -1) continue;
+      const relativePath = rawPath.slice(index + marker.length).replace(/^\/+/, '');
+      if (relativePath) {
+        return relativePath;
+      }
+    }
+    return null;
+  }
+
   resolvePath(userId, candidatePath, label = 'path') {
     const root = this._ensureWorkspaceRootSync(userId);
-    const absolute = path.isAbsolute(candidatePath)
-      ? path.resolve(candidatePath)
-      : path.resolve(root, candidatePath || '.');
+    const normalizedPath = this._normalizeWorkspacePath(root, candidatePath);
+    const absolute = path.isAbsolute(normalizedPath)
+      ? path.resolve(normalizedPath)
+      : path.resolve(root, normalizedPath || '.');
     const relative = path.relative(root, absolute);
     if (relative.startsWith('..') || path.isAbsolute(relative)) {
       throw new Error(`${label} is outside the per-user workspace.`);