@fishawack/lab-env 5.4.0-beta.1 → 5.5.0-beta.1

package/commands/workspace.js

@@ -28,9 +28,135 @@ const generateWorkspaceName = (projects, customName) => {
     return `workspace-${baseName}`;
 };
 
+const linkInstructionFiles = (workspaceDir, projects, cwd) => {
+    const instructionsDir = path.join(workspaceDir, ".github", "instructions");
+    fs.mkdirSync(instructionsDir, { recursive: true });
+
+    const instructionFiles = projects.flatMap((project) =>
+        glob.sync(`${project}/.github/instructions/*.md`, { cwd }),
+    );
+
+    let linked = 0;
+    instructionFiles.forEach((filePath) => {
+        const fileName = path.basename(filePath);
+        const targetPath = path.join(instructionsDir, fileName);
+        if (fs.existsSync(targetPath)) return;
+        createSymlink(path.join(cwd, filePath), targetPath);
+        linked++;
+    });
+
+    return linked;
+};
+
+const createWorkspace = (workspaceDir, workspaceName, projects, cwd) => {
+    fs.mkdirSync(workspaceDir);
+    console.log(`Created workspace directory: ${workspaceName}`);
+
+    // Create project symlinks
+    projects.forEach((project) => {
+        createSymlink(
+            path.join(cwd, project),
+            path.join(workspaceDir, project),
+        );
+        console.log(`Linked project: ${project}`);
+    });
+
+    // Setup AI instructions
+    const linked = linkInstructionFiles(workspaceDir, projects, cwd);
+
+    console.log(
+        linked
+            ? `Linked ${linked} instruction file(s) to workspace`
+            : "No AI instruction files found in projects",
+    );
+
+    _.copyAIInstructionsFile("workspace-@", workspaceDir);
+    _.copyAIInstructionsFile("mcp-@", workspaceDir);
+
+    // Open in VS Code
+    try {
+        execSync("code .", { cwd: workspaceDir, stdio: "ignore" });
+        console.log(`\nOpened workspace in VS Code: ${workspaceName}`);
+    } catch {
+        // Silently ignore VS Code errors
+    }
+
+    console.log(`\nWorkspace setup complete: ${workspaceName}`);
+};
+
+const addToWorkspace = (workspaceDir, workspaceName, projects, cwd) => {
+    let added = 0;
+
+    projects.forEach((project) => {
+        const targetPath = path.join(workspaceDir, project);
+        if (fs.existsSync(targetPath)) {
+            console.log(`Already linked, skipping: ${project}`);
+            return;
+        }
+        createSymlink(path.join(cwd, project), targetPath);
+        console.log(`Linked project: ${project}`);
+        added++;
+    });
+
+    const linked = linkInstructionFiles(workspaceDir, projects, cwd);
+
+    if (linked)
+        console.log(`Linked ${linked} instruction file(s) to workspace`);
+    if (!added) console.log("\nNo new projects to add");
+    else
+        console.log(
+            `\nAdded ${added} project(s) to workspace: ${workspaceName}`,
+        );
+};
+
+const removeFromWorkspace = (workspaceDir, workspaceName, projects) => {
+    const instructionsDir = path.join(workspaceDir, ".github", "instructions");
+    let removed = 0;
+
+    projects.forEach((project) => {
+        const targetPath = path.join(workspaceDir, project);
+        if (!fs.existsSync(targetPath)) {
+            console.warn(`Not linked, skipping: ${project}`);
+            return;
+        }
+        fs.unlinkSync(targetPath);
+        console.log(`Unlinked project: ${project}`);
+        removed++;
+
+        // Remove instruction file symlinks that point into this project
+        if (fs.existsSync(instructionsDir)) {
+            const projectInstructionsDir = path.join(
+                project,
+                ".github",
+                "instructions",
+            );
+            fs.readdirSync(instructionsDir).forEach((file) => {
+                const filePath = path.join(instructionsDir, file);
+                const stat = fs.lstatSync(filePath);
+                if (!stat.isSymbolicLink()) return;
+
+                const linkTarget = path.resolve(
+                    instructionsDir,
+                    fs.readlinkSync(filePath),
+                );
+                if (linkTarget.includes(projectInstructionsDir)) {
+                    fs.unlinkSync(filePath);
+                    console.log(`Unlinked instruction file: ${file}`);
+                }
+            });
+        }
+    });
+
+    if (!removed) console.log("\nNo projects to remove");
+    else
+        console.log(
+            `\nRemoved ${removed} project(s) from workspace: ${workspaceName}`,
+        );
+};
+
 module.exports = [
     "workspace <projects..>",
-    "creates workspace directory with project symlinks and AI instruction files",
+    "creates or updates workspace directory with project symlinks and AI instruction files",
     (yargs) => {
         yargs
             .positional("projects", {
@@ -43,82 +169,53 @@ module.exports = [
                 describe:
                     "custom workspace name (will be prefixed with 'workspace-')",
                 type: "string",
+            })
+            .option("delete", {
+                alias: "d",
+                describe: "remove the specified projects from the workspace",
+                type: "boolean",
+                default: false,
+            })
+            .check((argv) => {
+                if (argv.delete && !argv.name)
+                    throw new Error(
+                        "--name (-n) is required when using --delete (-d)",
+                    );
+                return true;
             });
     },
     (argv) => {
-        const { projects, name } = argv;
+        const { projects, name, delete: isDelete } = argv;
         const cwd = process.cwd();
 
         // Validation
         if (!projects?.length)
             exitWithError("At least one project name is required");
 
-        const missingProjects = projects.filter(
-            (project) => !fs.existsSync(path.join(cwd, project)),
-        );
-        if (missingProjects.length)
-            exitWithError(
-                `Project directories not found: ${missingProjects.join(", ")}`,
-            );
-
-        // Setup workspace
         const workspaceName = generateWorkspaceName(projects, name);
         const workspaceDir = path.join(cwd, workspaceName);
 
-        if (fs.existsSync(workspaceDir))
-            exitWithError(
-                `Workspace directory '${workspaceName}' already exists`,
-            );
-
-        fs.mkdirSync(workspaceDir);
-        console.log(`Created workspace directory: ${workspaceName}`);
-
-        // Create project symlinks
-        projects.forEach((project) => {
-            createSymlink(
-                path.join(cwd, project),
-                path.join(workspaceDir, project),
-            );
-            console.log(`Linked project: ${project}`);
-        });
-
-        // Setup AI instructions
-        const instructionsDir = path.join(
-            workspaceDir,
-            ".github",
-            "instructions",
-        );
-        fs.mkdirSync(instructionsDir, { recursive: true });
-
-        const instructionFiles = projects.flatMap((project) =>
-            glob.sync(`${project}/.github/instructions/*.md`, { cwd }),
-        );
+        if (isDelete) {
+            if (!fs.existsSync(workspaceDir))
+                exitWithError(
+                    `Workspace directory '${workspaceName}' does not exist`,
+                );
 
-        instructionFiles.forEach((filePath) => {
-            const fileName = path.basename(filePath);
-            createSymlink(
-                path.join(cwd, filePath),
-                path.join(instructionsDir, fileName),
+            removeFromWorkspace(workspaceDir, workspaceName, projects);
+        } else {
+            const missingProjects = projects.filter(
+                (project) => !fs.existsSync(path.join(cwd, project)),
             );
-        });
-
-        console.log(
-            instructionFiles.length
-                ? `Linked ${instructionFiles.length} instruction file(s) to workspace`
-                : "No AI instruction files found in projects",
-        );
-
-        _.copyAIInstructionsFile("workspace-@", workspaceDir);
-        _.copyAIInstructionsFile("mcp-@", workspaceDir);
-
-        // Open in VS Code
-        try {
-            execSync("code .", { cwd: workspaceDir, stdio: "ignore" });
-            console.log(`\nOpened workspace in VS Code: ${workspaceName}`);
-        } catch {
-            // Silently ignore VS Code errors
+            if (missingProjects.length)
+                exitWithError(
+                    `Project directories not found: ${missingProjects.join(", ")}`,
+                );
+
+            if (fs.existsSync(workspaceDir)) {
+                addToWorkspace(workspaceDir, workspaceName, projects, cwd);
+            } else {
+                createWorkspace(workspaceDir, workspaceName, projects, cwd);
+            }
         }
-
-        console.log(`\nWorkspace setup complete: ${workspaceName}`);
     },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-env",
-    "version": "5.4.0-beta.1",
+    "version": "5.5.0-beta.1",
     "description": "Docker manager for FW",
     "main": "cli.js",
     "scripts": {
@@ -26,6 +26,7 @@
         "@aws-sdk/client-elastic-beanstalk": "^3.395.0",
         "@aws-sdk/client-iam": "^3.150.0",
         "@aws-sdk/client-s3": "^3.141.0",
+        "@aws-sdk/credential-providers": "^3.1011.0",
         "apache-md5": "^1.1.8",
         "axios": "^0.21.4",
         "chalk": "4.1.0",
@@ -40,6 +41,7 @@
         "lodash": "^4.17.21",
         "nodemailer": "^6.9.15",
         "ora": "5.4.1",
+        "p-limit": "^7.3.0",
         "semver": "7.3.4",
         "update-notifier": "^6.0.2",
         "yargs": "16.2.0"

package/python/0/docker-compose.yml

@@ -27,6 +27,19 @@ services:
       - $CWD/:/workspace
       - venv:/workspace/.venv
       - $FW_DIR/.ssh:/home/py/.ssh
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "wget",
+          "-q",
+          "--spider",
+          "http://localhost:${PORT_PY:-8000}/v1/health",
+        ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 15s
 networks:
   default:
     driver: "bridge"