allagents 0.5.0 → 0.5.2

package/dist/index.js

@@ -19365,25 +19365,43 @@ function parseGitHubUrl(url) {
     }
     return null;
   }
-  const subpathPattern = /^https?:\/\/(?:www\.)?github\.com\/([^/]+)\/([^/]+?)\/tree\/([^/]+)\/(.+)$/;
-  const subpathMatch = normalized.match(subpathPattern);
-  if (subpathMatch) {
-    const owner = subpathMatch[1];
-    const repo = subpathMatch[2]?.replace(/\.git$/, "");
-    const branch = subpathMatch[3];
-    const subpath = subpathMatch[4];
-    if (owner && repo && branch && subpath) {
-      return { owner, repo, branch, subpath };
-    }
-  }
-  const branchPattern = /^https?:\/\/(?:www\.)?github\.com\/([^/]+)\/([^/]+?)\/tree\/([^/]+)$/;
-  const branchMatch = normalized.match(branchPattern);
-  if (branchMatch) {
-    const owner = branchMatch[1];
-    const repo = branchMatch[2]?.replace(/\.git$/, "");
-    const branch = branchMatch[3];
-    if (owner && repo && branch) {
-      return { owner, repo, branch };
+  const treeMatch = normalized.match(/^https?:\/\/(?:www\.)?github\.com\/([^/]+)\/([^/]+?)\/tree\/(.+)$/);
+  if (treeMatch) {
+    const owner = treeMatch[1];
+    const repo = treeMatch[2]?.replace(/\.git$/, "");
+    const afterTree = treeMatch[3];
+    if (owner && repo && afterTree) {
+      const parts = afterTree.split("/");
+      if (parts.length === 1) {
+        const branch2 = parts[0];
+        return branch2 ? { owner, repo, branch: branch2 } : { owner, repo };
+      }
+      const commonPathDirs = new Set([
+        "plugins",
+        "src",
+        "docs",
+        "examples",
+        "lib",
+        "test",
+        "tests",
+        "spec",
+        "scripts",
+        "config",
+        ".allagents",
+        "dist",
+        "build"
+      ]);
+      for (let i2 = 1;i2 < parts.length; i2++) {
+        const part = parts[i2];
+        if (part && commonPathDirs.has(part)) {
+          const branch2 = parts.slice(0, i2).join("/");
+          const subpath2 = parts.slice(i2).join("/");
+          return { owner, repo, branch: branch2, subpath: subpath2 };
+        }
+      }
+      const branch = parts[0];
+      const subpath = parts.slice(1).join("/");
+      return branch ? { owner, repo, branch, subpath } : { owner, repo };
     }
   }
   const basicPattern = /^https?:\/\/(?:www\.)?github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/.*)?$/;
@@ -19423,9 +19441,14 @@ function parsePluginSource(source, baseDir = process.cwd()) {
     normalized: normalizePluginPath(source, baseDir)
   };
 }
-function getPluginCachePath(owner, repo) {
+function sanitizeBranchForPath(branch) {
+  return branch.replace(/[/\\:*?"<>|]/g, "_");
+}
+function getPluginCachePath(owner, repo, branch) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || "~";
-  return resolve(homeDir, ".allagents", "plugins", "marketplaces", `${owner}-${repo}`);
+  const basePath = `${owner}-${repo}`;
+  const cacheName = branch ? `${basePath}@${sanitizeBranchForPath(branch)}` : basePath;
+  return resolve(homeDir, ".allagents", "plugins", "marketplaces", cacheName);
 }
 function validatePluginSource(source) {
   if (!source || source.trim() === "") {
@@ -19539,7 +19562,7 @@ import { mkdir, readdir, stat } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { dirname, join, resolve as resolve2 } from "node:path";
 async function fetchPlugin(url, options2 = {}) {
-  const { force = false } = options2;
+  const { force = false, branch } = options2;
   const validation = validatePluginSource(url);
   if (!validation.valid) {
     return {
@@ -19559,7 +19582,7 @@ async function fetchPlugin(url, options2 = {}) {
     };
   }
   const { owner, repo } = parsed;
-  const cachePath = getPluginCachePath(owner, repo);
+  const cachePath = getPluginCachePath(owner, repo, branch);
   try {
     await execa("gh", ["--version"]);
   } catch {
@@ -19590,7 +19613,11 @@ async function fetchPlugin(url, options2 = {}) {
     }
     const parentDir = dirname(cachePath);
     await mkdir(parentDir, { recursive: true });
-    await execa("gh", ["repo", "clone", `${owner}/${repo}`, cachePath]);
+    if (branch) {
+      await execa("gh", ["repo", "clone", `${owner}/${repo}`, cachePath, "--", "--branch", branch]);
+    } else {
+      await execa("gh", ["repo", "clone", `${owner}/${repo}`, cachePath]);
+    }
     return {
       success: true,
       action: "fetched",
@@ -20763,7 +20790,11 @@ async function validatePlugin(pluginSource, workspacePath, force) {
     };
   }
   if (isGitHubUrl(pluginSource)) {
-    const fetchResult = await fetchPlugin(pluginSource, { force });
+    const parsed = parseGitHubUrl(pluginSource);
+    const fetchResult = await fetchPlugin(pluginSource, {
+      force,
+      ...parsed?.branch && { branch: parsed.branch }
+    });
     if (!fetchResult.success) {
       return {
         plugin: pluginSource,
@@ -20772,7 +20803,6 @@ async function validatePlugin(pluginSource, workspacePath, force) {
         ...fetchResult.error && { error: fetchResult.error }
       };
     }
-    const parsed = parseGitHubUrl(pluginSource);
     const resolvedPath2 = parsed?.subpath ? join7(fetchResult.cachePath, parsed.subpath) : fetchResult.cachePath;
     return {
       plugin: pluginSource,
@@ -21230,8 +21260,9 @@ async function initWorkspace(targetPath = ".", options2 = {}) {
             if (parsedUrl) {
               const basePath = parsedUrl.subpath || "";
               const baseDir = basePath.replace(/\/?\.allagents\/workspace\.yaml$/, "").replace(/\/?workspace\.yaml$/, "");
-              const sourcePath = baseDir ? `${baseDir}/${source}` : source;
-              workspace.source = `https://github.com/${parsedUrl.owner}/${parsedUrl.repo}/tree/main/${sourcePath}`;
+              const sourcePath = source === "." ? baseDir : baseDir ? `${baseDir}/${source}` : source;
+              const branch = parsedUrl.branch || "main";
+              workspace.source = `https://github.com/${parsedUrl.owner}/${parsedUrl.repo}/tree/${branch}/${sourcePath}`;
               workspaceYamlContent = dump(parsed2, { lineWidth: -1 });
             }
           }
@@ -21290,13 +21321,28 @@ async function initWorkspace(targetPath = ".", options2 = {}) {
     }
     await writeFile4(configPath, workspaceYamlContent, "utf-8");
     const copiedAgentFiles = [];
-    const effectiveSourceDir = sourceDir ?? defaultTemplatePath;
-    for (const agentFile of AGENT_FILES) {
-      const sourcePath = join8(effectiveSourceDir, agentFile);
-      if (existsSync7(sourcePath)) {
-        const content = await readFile6(sourcePath, "utf-8");
-        await writeFile4(join8(absoluteTarget, agentFile), content, "utf-8");
-        copiedAgentFiles.push(agentFile);
+    if (options2.from && isGitHubUrl(options2.from)) {
+      const parsedUrl = parseGitHubUrl(options2.from);
+      if (parsedUrl) {
+        const basePath = parsedUrl.subpath || "";
+        for (const agentFile of AGENT_FILES) {
+          const filePath = basePath ? `${basePath}/${agentFile}` : agentFile;
+          const content = await fetchFileFromGitHub(parsedUrl.owner, parsedUrl.repo, filePath, parsedUrl.branch);
+          if (content) {
+            await writeFile4(join8(absoluteTarget, agentFile), content, "utf-8");
+            copiedAgentFiles.push(agentFile);
+          }
+        }
+      }
+    } else {
+      const effectiveSourceDir = sourceDir ?? defaultTemplatePath;
+      for (const agentFile of AGENT_FILES) {
+        const sourcePath = join8(effectiveSourceDir, agentFile);
+        if (existsSync7(sourcePath)) {
+          const content = await readFile6(sourcePath, "utf-8");
+          await writeFile4(join8(absoluteTarget, agentFile), content, "utf-8");
+          copiedAgentFiles.push(agentFile);
+        }
       }
     }
     if (copiedAgentFiles.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allagents",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
   "type": "module",
   "bin": {