@fieldwangai/agentflow 0.1.89 → 0.1.90

package/bin/lib/ui-server.mjs

@@ -1617,10 +1617,48 @@ const DISPLAY_SHARE_ALLOWED_EXPIRY_DAYS = new Set([1, 7, 30, 90, 365]);
 const NODE_STUDIO_DRAFTS_DIRNAME = "node-studio/drafts";
 const USER_WORKSPACES_FILENAME = "workspaces.json";
 
-function userWorkspacesPath(userCtx = {}) {
+function workspacesPath() {
+  return path.join(getAgentflowDataRoot(), USER_WORKSPACES_FILENAME);
+}
+
+function legacyUserWorkspacesPath(userCtx = {}) {
   return path.join(getAgentflowUserDataRoot(userCtx.userId || ""), USER_WORKSPACES_FILENAME);
 }
 
+function defaultWorkspaceGitPath(id) {
+  return path.join(getAgentflowDataRoot(), "workspaces", "repos", id);
+}
+
+function legacyDefaultWorkspaceGitPath(userCtx = {}, id = "") {
+  return path.join(getAgentflowUserDataRoot(userCtx.userId || ""), "workspaces", "repos", id);
+}
+
+function isLegacyDefaultWorkspaceGitPath(rawPath = "", id = "", userCtx = {}) {
+  const raw = String(rawPath || "").trim();
+  if (!raw || !id) return false;
+  try {
+    return path.resolve(raw.replace(/^~(?=$|\/|\\)/, os.homedir())) === path.resolve(legacyDefaultWorkspaceGitPath(userCtx, id));
+  } catch {
+    return false;
+  }
+}
+
+function workspaceRepoNameFromUrl(repoUrl = "") {
+  const raw = String(repoUrl || "").trim();
+  if (!raw) return "";
+  let pathname = raw;
+  try {
+    pathname = new URL(raw).pathname;
+  } catch {
+    pathname = raw.split("?")[0].split("#")[0];
+  }
+  const name = pathname.replace(/\/+$/, "").split("/").filter(Boolean).pop() || "";
+  return name
+    .replace(/\.git$/i, "")
+    .replace(/[^A-Za-z0-9._-]+/g, "_")
+    .replace(/^_+|_+$/g, "");
+}
+
 function normalizeWorkspaceEntry(entry = {}, index = 0, userCtx = {}) {
   const label = String(entry?.label || entry?.name || "").trim();
   const kindRaw = String(entry?.kind || entry?.source || "").trim().toLowerCase();
@@ -1632,9 +1670,11 @@ function normalizeWorkspaceEntry(entry = {}, index = 0, userCtx = {}) {
   if (!rawPath && kind !== "git") return null;
   const idRaw = String(entry?.id || label || mountPathRaw || repoUrl || rawPath || `workspace_${index + 1}`).trim().toLowerCase();
   const id = idRaw.replace(/[^a-z0-9_-]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 64) || `workspace_${index + 1}`;
-  const mountPath = (mountPathRaw || id).replace(/^\/+/, "").replace(/\.\.(\/|\\|$)/g, "").trim() || id;
-  const defaultGitPath = path.join(getAgentflowUserDataRoot(userCtx.userId || ""), "workspaces", "repos", id);
-  const absPath = path.resolve((rawPath || defaultGitPath).replace(/^~(?=$|\/|\\)/, os.homedir()));
+  const suggestedMountPath = kind === "git" ? workspaceRepoNameFromUrl(repoUrl) : "";
+  const mountPath = (mountPathRaw || suggestedMountPath || id).replace(/^\/+/, "").replace(/\.\.(\/|\\|$)/g, "").trim() || id;
+  const defaultGitPath = defaultWorkspaceGitPath(id);
+  const explicitPath = kind === "git" && isLegacyDefaultWorkspaceGitPath(rawPath, id, userCtx) ? "" : rawPath;
+  const absPath = path.resolve((explicitPath || defaultGitPath).replace(/^~(?=$|\/|\\)/, os.homedir()));
   const exists = fs.existsSync(absPath) && fs.statSync(absPath).isDirectory();
   return {
     id,
@@ -1653,8 +1693,7 @@ function normalizeWorkspaceEntry(entry = {}, index = 0, userCtx = {}) {
   };
 }
 
-function readUserWorkspaces(userCtx = {}) {
-  const p = userWorkspacesPath(userCtx);
+function readWorkspacesFromPath(p, userCtx = {}) {
   if (!fs.existsSync(p)) return [];
   try {
     const data = JSON.parse(fs.readFileSync(p, "utf-8"));
@@ -1665,6 +1704,49 @@ function readUserWorkspaces(userCtx = {}) {
   }
 }
 
+function readLegacyAdminWorkspaces(userCtx = {}) {
+  const users = readAuthUsers();
+  const candidates = [];
+  for (const [userId, user] of Object.entries(users || {})) {
+    if (user?.isAdmin) candidates.push(String(userId || ""));
+  }
+  if (userCtx?.isAdmin && userCtx.userId) candidates.unshift(String(userCtx.userId));
+  const seenPaths = new Set();
+  const seenEntries = new Set();
+  const out = [];
+  for (const userId of candidates) {
+    const p = legacyUserWorkspacesPath({ userId });
+    const resolved = path.resolve(p);
+    if (seenPaths.has(resolved) || resolved === path.resolve(workspacesPath())) continue;
+    seenPaths.add(resolved);
+    for (const entry of readWorkspacesFromPath(p, { userId })) {
+      const key = entry.id || entry.path || entry.repoUrl;
+      if (seenEntries.has(key)) continue;
+      seenEntries.add(key);
+      out.push(entry);
+    }
+  }
+  return out;
+}
+
+function readUserWorkspaces(userCtx = {}) {
+  const globalPath = workspacesPath();
+  const globalWorkspaces = fs.existsSync(globalPath) ? readWorkspacesFromPath(globalPath, userCtx) : [];
+  const adminLegacy = readLegacyAdminWorkspaces(userCtx);
+  if (globalWorkspaces.length || adminLegacy.length) {
+    const seen = new Set();
+    const out = [];
+    for (const entry of [...globalWorkspaces, ...adminLegacy]) {
+      const key = entry.id || entry.path || entry.repoUrl;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      out.push(entry);
+    }
+    return out;
+  }
+  return readWorkspacesFromPath(legacyUserWorkspacesPath(userCtx), userCtx);
+}
+
 function writeUserWorkspaces(userCtx = {}, entries = []) {
   const seen = new Set();
   const workspaces = (Array.isArray(entries) ? entries : [])
@@ -1676,7 +1758,7 @@ function writeUserWorkspaces(userCtx = {}, entries = []) {
       seen.add(key);
       return true;
     });
-  const p = userWorkspacesPath(userCtx);
+  const p = workspacesPath();
   fs.mkdirSync(path.dirname(p), { recursive: true });
   fs.writeFileSync(p, JSON.stringify({ version: 1, workspaces }, null, 2) + "\n", "utf-8");
   return workspaces;
@@ -7752,7 +7834,7 @@ export function startUiServer({
         }, userCtx);
         const scopedRoot = scoped.error ? root : scoped.root;
         json(res, 200, {
-          path: userWorkspacesPath(userCtx),
+          path: workspacesPath(),
           workspaces: listConfiguredWorkspaces(root, scopedRoot, userCtx),
           customWorkspaces: readUserWorkspaces(userCtx),
         });
@@ -7767,7 +7849,7 @@ export function startUiServer({
         const payload = JSON.parse(await readBody(req));
         const customWorkspaces = writeUserWorkspaces(userCtx, payload?.workspaces || payload?.customWorkspaces || []);
         json(res, 200, {
-          path: userWorkspacesPath(userCtx),
+          path: workspacesPath(),
           workspaces: listConfiguredWorkspaces(root, root, userCtx),
           customWorkspaces,
         });