rrce-workflow 0.2.16 → 0.2.17

package/dist/index.js

@@ -247,41 +247,6 @@ function parseWorkspaceConfig(configPath) {
     return null;
   }
 }
-function getProjectDisplayLabel(project) {
-  switch (project.source) {
-    case "global":
-      return `global: ~/.rrce-workflow/workspaces/${project.name}`;
-    case "sibling":
-      return `sibling: ${project.path}/.rrce-workflow`;
-    default:
-      return project.dataPath;
-  }
-}
-function getProjectFolders(project) {
-  const folders = [];
-  if (project.knowledgePath) {
-    folders.push({
-      path: project.knowledgePath,
-      type: "knowledge",
-      displayName: `\u{1F4DA} ${project.name} (knowledge)`
-    });
-  }
-  if (project.refsPath) {
-    folders.push({
-      path: project.refsPath,
-      type: "refs",
-      displayName: `\u{1F4CE} ${project.name} (refs)`
-    });
-  }
-  if (project.tasksPath) {
-    folders.push({
-      path: project.tasksPath,
-      type: "tasks",
-      displayName: `\u{1F4CB} ${project.name} (tasks)`
-    });
-  }
-  return folders;
-}
 
 // src/commands/wizard/setup-flow.ts
 import { group, select, multiselect, confirm, spinner, note, outro, cancel, isCancel as isCancel2 } from "@clack/prompts";
@@ -388,7 +353,6 @@ function copyDirRecursive(src, dest) {
 // src/commands/wizard/vscode.ts
 import * as fs5 from "fs";
 import * as path5 from "path";
-var REFERENCE_GROUP_PREFIX = "\u{1F4C1} References";
 function generateVSCodeWorkspace(workspacePath, workspaceName, linkedProjects, customGlobalPath) {
   const workspaceFilePath = path5.join(workspacePath, `${workspaceName}.code-workspace`);
   let workspace;
@@ -405,60 +369,47 @@ function generateVSCodeWorkspace(workspacePath, workspaceName, linkedProjects, c
   if (!workspace.settings) {
     workspace.settings = {};
   }
-  const existingNonReferencesFolders = workspace.folders.filter(
-    (f) => f.path === "." || !f.name?.includes(REFERENCE_GROUP_PREFIX) && !f.name?.startsWith("\u{1F4DA}") && !f.name?.startsWith("\u{1F4CE}") && !f.name?.startsWith("\u{1F4CB}")
+  workspace.folders = workspace.folders.filter(
+    (f) => f.path === "." || !f.name?.startsWith("\u{1F4C1}") && !f.name?.startsWith("\u{1F4DA}") && !f.name?.startsWith("\u{1F4CE}") && !f.name?.startsWith("\u{1F4CB}")
   );
-  workspace.folders = [];
-  const mainFolder = {
-    path: ".",
-    name: `\u{1F3E0} ${workspaceName} (workspace)`
-  };
-  workspace.folders.push(mainFolder);
-  for (const folder of existingNonReferencesFolders) {
-    if (folder.path !== ".") {
-      workspace.folders.push(folder);
-    }
+  const mainFolderIndex = workspace.folders.findIndex((f) => f.path === ".");
+  if (mainFolderIndex === -1) {
+    workspace.folders.unshift({
+      path: ".",
+      name: `\u{1F3E0} ${workspaceName} (workspace)`
+    });
+  } else {
+    workspace.folders[mainFolderIndex] = {
+      path: ".",
+      name: `\u{1F3E0} ${workspaceName} (workspace)`
+    };
   }
   const referenceFolderPaths = [];
   const isDetectedProjects = linkedProjects.length > 0 && typeof linkedProjects[0] === "object";
   if (isDetectedProjects) {
     const projects = linkedProjects;
     for (const project of projects) {
-      const folders = getProjectFolders(project);
       const sourceLabel = project.source === "global" ? "global" : "local";
-      for (const folder of folders) {
-        referenceFolderPaths.push(folder.path);
-        const existingIndex = workspace.folders.findIndex((f) => f.path === folder.path);
-        if (existingIndex === -1) {
-          workspace.folders.push({
-            path: folder.path,
-            name: `${folder.displayName} [${sourceLabel}]`
-          });
-        }
+      const folderPath = project.dataPath;
+      if (fs5.existsSync(folderPath)) {
+        referenceFolderPaths.push(folderPath);
+        workspace.folders.push({
+          path: folderPath,
+          name: `\u{1F4C1} ${project.name} [${sourceLabel}]`
+        });
       }
     }
   } else {
     const projectNames = linkedProjects;
     const rrceHome = customGlobalPath || getRRCEHome();
     for (const projectName of projectNames) {
-      const projectDataPath = path5.join(rrceHome, "workspaces", projectName);
-      const folderTypes = [
-        { subpath: "knowledge", icon: "\u{1F4DA}", type: "knowledge" },
-        { subpath: "refs", icon: "\u{1F4CE}", type: "refs" },
-        { subpath: "tasks", icon: "\u{1F4CB}", type: "tasks" }
-      ];
-      for (const { subpath, icon, type } of folderTypes) {
-        const folderPath = path5.join(projectDataPath, subpath);
-        if (fs5.existsSync(folderPath)) {
-          referenceFolderPaths.push(folderPath);
-          const existingIndex = workspace.folders.findIndex((f) => f.path === folderPath);
-          if (existingIndex === -1) {
-            workspace.folders.push({
-              path: folderPath,
-              name: `${icon} ${projectName} (${type}) [global]`
-            });
-          }
-        }
+      const folderPath = path5.join(rrceHome, "workspaces", projectName);
+      if (fs5.existsSync(folderPath)) {
+        referenceFolderPaths.push(folderPath);
+        workspace.folders.push({
+          path: folderPath,
+          name: `\u{1F4C1} ${projectName} [global]`
+        });
       }
     }
   }
@@ -468,12 +419,17 @@ function generateVSCodeWorkspace(workspacePath, workspaceName, linkedProjects, c
       readonlyPatterns[`${folderPath}/**`] = true;
     }
     const existingReadonly = workspace.settings["files.readonlyInclude"] || {};
+    const cleanedReadonly = {};
+    for (const [pattern, value] of Object.entries(existingReadonly)) {
+      if (!pattern.includes(".rrce-workflow") && !pattern.includes("rrce-workflow/workspaces")) {
+        cleanedReadonly[pattern] = value;
+      }
+    }
     workspace.settings["files.readonlyInclude"] = {
-      ...existingReadonly,
+      ...cleanedReadonly,
       ...readonlyPatterns
     };
   }
-  workspace.settings["explorer.sortOrder"] = workspace.settings["explorer.sortOrder"] || "default";
   fs5.writeFileSync(workspaceFilePath, JSON.stringify(workspace, null, 2));
 }
 
@@ -634,9 +590,12 @@ async function runSetupFlow(workspacePath, workspaceName, existingProjects) {
         return multiselect({
           message: "Link knowledge from other projects?",
           options: existingProjects.map((project) => ({
-            value: project.name,
-            label: project.name,
-            hint: pc2.dim(getProjectDisplayLabel(project))
+            value: `${project.name}:${project.source}`,
+            // Unique key
+            label: `${project.name} ${pc2.dim(`(${project.source})`)}`,
+            hint: pc2.dim(
+              project.source === "global" ? `~/.rrce-workflow/workspaces/${project.name}` : project.dataPath
+            )
           })),
           required: false
         });
@@ -822,7 +781,9 @@ linked_projects:
   }
   fs7.writeFileSync(workspaceConfigPath, configContent);
   if (config.tools.includes("copilot") || config.linkedProjects.length > 0) {
-    const selectedProjects = allProjects.filter((p) => config.linkedProjects.includes(p.name));
+    const selectedProjects = allProjects.filter(
+      (p) => config.linkedProjects.includes(`${p.name}:${p.source}`)
+    );
     generateVSCodeWorkspace(workspacePath, workspaceName, selectedProjects, config.globalPath);
   }
 }
@@ -859,9 +820,12 @@ async function runLinkProjectsFlow(workspacePath, workspaceName) {
   const linkedProjects = await multiselect2({
     message: "Select projects to link:",
     options: projects.map((project) => ({
-      value: project.name,
-      label: project.name,
-      hint: pc3.dim(getProjectDisplayLabel(project))
+      value: `${project.name}:${project.source}`,
+      // Unique key
+      label: `${project.name} ${pc3.dim(`(${project.source})`)}`,
+      hint: pc3.dim(
+        project.source === "global" ? `~/.rrce-workflow/workspaces/${project.name}` : project.dataPath
+      )
     })),
     required: true
   });
@@ -869,12 +833,14 @@ async function runLinkProjectsFlow(workspacePath, workspaceName) {
     cancel2("Cancelled.");
     process.exit(0);
   }
-  const selectedProjectNames = linkedProjects;
-  if (selectedProjectNames.length === 0) {
+  const selectedKeys = linkedProjects;
+  if (selectedKeys.length === 0) {
     outro2("No projects selected.");
     return;
   }
-  const selectedProjects = projects.filter((p) => selectedProjectNames.includes(p.name));
+  const selectedProjects = projects.filter(
+    (p) => selectedKeys.includes(`${p.name}:${p.source}`)
+  );
   const s = spinner2();
   s.start("Linking projects");
   const configFilePath = getConfigPath(workspacePath);
@@ -887,9 +853,10 @@ async function runLinkProjectsFlow(workspacePath, workspaceName) {
       while (insertIndex < lines.length && lines[insertIndex]?.startsWith("  - ")) {
         insertIndex++;
       }
-      for (const name of selectedProjectNames) {
-        if (!configContent.includes(`  - ${name}`)) {
-          lines.splice(insertIndex, 0, `  - ${name}`);
+      for (const project of selectedProjects) {
+        const entry = `  - ${project.name}:${project.source}`;
+        if (!configContent.includes(entry)) {
+          lines.splice(insertIndex, 0, entry);
           insertIndex++;
         }
       }
@@ -899,8 +866,8 @@ async function runLinkProjectsFlow(workspacePath, workspaceName) {
     configContent += `
 linked_projects:
 `;
-    selectedProjectNames.forEach((name) => {
-      configContent += `  - ${name}
+    selectedProjects.forEach((project) => {
+      configContent += `  - ${project.name}:${project.source}
 `;
     });
   }
@@ -912,12 +879,10 @@ linked_projects:
     `Linked projects:`,
     ...selectedProjects.map((p) => `  \u2713 ${p.name} ${pc3.dim(`(${p.source})`)}`),
     ``,
-    `Workspace file: ${pc3.cyan(workspaceFile)}`,
-    ``,
-    pc3.dim("Includes: knowledge, refs, tasks folders")
+    `Workspace file: ${pc3.cyan(workspaceFile)}`
   ];
   note2(summary.join("\n"), "Link Summary");
-  outro2(pc3.green(`\u2713 Projects linked! Open ${pc3.bold(workspaceFile)} in VSCode to access linked knowledge.`));
+  outro2(pc3.green(`\u2713 Projects linked! Open ${pc3.bold(workspaceFile)} in VSCode to access linked data.`));
 }
 
 // src/commands/wizard/sync-flow.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrce-workflow",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "RRCE-Workflow TUI - Agentic code workflow generator for AI-assisted development",
   "author": "RRCE Team",
   "license": "MIT",