@aspects-ai/workspace-cli 0.1.6 → 0.1.8

package/dist/index.js

@@ -436,6 +436,9 @@ import chalk5 from "chalk";
 import { Command as Command5 } from "commander";
 import fs5 from "fs-extra";
 import path5 from "path";
+function generateId() {
+  return Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString();
+}
 function parseManifestOption(manifestStr) {
   try {
     return JSON.parse(manifestStr);
@@ -446,7 +449,8 @@ function parseManifestOption(manifestStr) {
 function validateAndFixManifest(manifest, toolName, frameName) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const validatedManifest = {
-    id: manifest.id || frameName,
+    id: frameName,
+    // Always match the directory name
     projectId: manifest.projectId || "default-project",
     title: manifest.title || frameName.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" "),
     description: manifest.description || `Frame for ${toolName}`,
@@ -459,17 +463,20 @@ function validateAndFixManifest(manifest, toolName, frameName) {
   }
   return validatedManifest;
 }
-async function getNextFrameName(framesDir, baseName) {
-  if (!await fs5.pathExists(path5.join(framesDir, baseName))) {
-    return baseName;
+async function getNextFrameName(framesDir, customName) {
+  let frameName;
+  if (customName) {
+    const truncatedName = customName.slice(0, 20);
+    const uniqueId = generateId();
+    frameName = `${truncatedName}-${uniqueId}`;
+  } else {
+    frameName = generateId();
   }
-  let counter = 1;
-  let nextName = `${baseName}-${counter}`;
-  while (await fs5.pathExists(path5.join(framesDir, nextName))) {
-    counter++;
-    nextName = `${baseName}-${counter}`;
+  while (await fs5.pathExists(path5.join(framesDir, frameName))) {
+    const uniqueId = generateId();
+    frameName = customName ? `${customName.slice(0, 20)}-${uniqueId}` : uniqueId;
   }
-  return nextName;
+  return frameName;
 }
 async function fetchExampleFrame(toolName, targetPath) {
   const library = await getLibrary(toolName);
@@ -490,8 +497,8 @@ function createCreateFrameCommand() {
       const workspaceRoot = await ensureWorkspaceRoot();
       const framesDir = path5.join(workspaceRoot, "frames");
       await fs5.ensureDir(framesDir);
-      const baseName = options.name || "new-frame";
-      const frameName = await getNextFrameName(framesDir, baseName);
+      const customName = options.name && options.name !== "new-frame" ? options.name : void 0;
+      const frameName = await getNextFrameName(framesDir, customName);
       const frameDir = path5.join(framesDir, frameName);
       logger.info(`Creating frame: ${chalk5.cyan(frameName)} for ${chalk5.cyan(toolName)}`);
       await fetchExampleFrame(toolName, frameDir);
@@ -518,29 +525,30 @@ function createCreateFrameCommand() {
 import { Command as Command6 } from "commander";
 import path6 from "path";
 import fs6 from "fs-extra";
+import { execa as execa2 } from "execa";
+import os2 from "os";
 import chalk6 from "chalk";
-import { fileURLToPath as fileURLToPath2 } from "url";
-var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = path6.dirname(__filename2);
+var NOODLE_BASE_REPO = "https://github.com/aspects-ai/noodle-templates";
+var NOODLE_BASE_BRANCH = "main";
+var EDITING_FILE_PATH = "noodle-base/EDITING.md";
 function createUpdateTemplateCommand() {
   return new Command6("update-template").description("Update EDITING.md file from noodle-base template").action(async () => {
     try {
       const workspaceRoot = await ensureWorkspaceRoot();
-      const noodleBasePath = path6.resolve(__dirname2, "../../../noodle-base");
-      const sourceFile = path6.join(noodleBasePath, "EDITING.md");
       const targetFile = path6.join(workspaceRoot, "EDITING.md");
-      if (!await fs6.pathExists(sourceFile)) {
-        throw new Error(
-          `Template file not found at: ${sourceFile}
-Make sure noodle-base is available in the monorepo.`
-        );
-      }
+      const token = getToken();
       const targetExists = await fs6.pathExists(targetFile);
       if (targetExists) {
         logger.info("Existing EDITING.md found, it will be overwritten.");
       }
-      logger.info(`Copying EDITING.md from noodle-base...`);
-      await fs6.copy(sourceFile, targetFile, { overwrite: true });
+      logger.info("Fetching EDITING.md from noodle-base...");
+      const content = await fetchFileFromGit({
+        repository: NOODLE_BASE_REPO,
+        filePath: EDITING_FILE_PATH,
+        branch: NOODLE_BASE_BRANCH,
+        token
+      });
+      await fs6.writeFile(targetFile, content, "utf-8");
       logger.success(
         `Successfully ${targetExists ? "updated" : "copied"} EDITING.md to workspace`
       );
@@ -553,11 +561,44 @@ Make sure noodle-base is available in the monorepo.`
     }
   });
 }
+async function fetchFileFromGit(options) {
+  const tempDir = await fs6.mkdtemp(path6.join(os2.tmpdir(), "workspace-cli-"));
+  try {
+    const repoUrl = options.repository.replace(
+      "https://github.com/",
+      `https://${options.token}@github.com/`
+    );
+    await execa2("git", ["init"], { cwd: tempDir });
+    await execa2("git", ["remote", "add", "origin", repoUrl], { cwd: tempDir });
+    await execa2("git", ["config", "core.sparseCheckout", "true"], { cwd: tempDir });
+    const sparseFile = path6.join(tempDir, ".git", "info", "sparse-checkout");
+    await fs6.writeFile(sparseFile, `${options.filePath}
+`);
+    await execa2("git", ["pull", "origin", options.branch, "--depth=1"], {
+      cwd: tempDir,
+      stderr: "pipe"
+    });
+    const sourceFile = path6.join(tempDir, options.filePath);
+    if (!await fs6.pathExists(sourceFile)) {
+      throw new Error(`File '${options.filePath}' not found in repository`);
+    }
+    return await fs6.readFile(sourceFile, "utf-8");
+  } catch (error) {
+    if (error.stderr && error.stderr.includes("Authentication failed")) {
+      throw new Error(
+        "Git authentication failed. Please check your WORKSPACE_CLI_TOKEN.\nThe token must have access to the repository."
+      );
+    }
+    throw new Error(`Failed to fetch file from git: ${error.message}`);
+  } finally {
+    await fs6.remove(tempDir);
+  }
+}
 
 // package.json
 var package_default = {
   name: "@aspects-ai/workspace-cli",
-  version: "0.1.5",
+  version: "0.1.7",
   private: false,
   description: "Lightweight CLI for installing libraries into workspaces",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspects-ai/workspace-cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "private": false,
   "description": "Lightweight CLI for installing libraries into workspaces",
   "type": "module",