allagents 0.33.1 → 0.33.2

package/dist/index.js

@@ -26023,13 +26023,18 @@ async function fetchWorkspaceFromGitHub(url) {
   const repoUrl = gitHubUrl(owner, repo);
   let effectiveBranch = branch;
   let effectiveSubpath = subpath;
-  if (branch && subpath && !branch.includes("/")) {
+  if (branch && subpath) {
     const resolved = await resolveBranchAndSubpath(repoUrl, `${branch}/${subpath}`);
     if (resolved && resolved.branch !== branch) {
       effectiveBranch = resolved.branch;
       effectiveSubpath = resolved.subpath;
     }
   }
+  if (effectiveSubpath === CONFIG_DIR) {
+    effectiveSubpath = undefined;
+  } else if (effectiveSubpath?.endsWith(`/${CONFIG_DIR}`)) {
+    effectiveSubpath = effectiveSubpath.slice(0, -(CONFIG_DIR.length + 1));
+  }
   let tempDir;
   try {
     tempDir = await cloneToTemp(repoUrl, effectiveBranch);
@@ -26066,11 +26071,12 @@ async function fetchWorkspaceFromGitHub(url) {
   for (const filePath of pathsToTry) {
     const content = readFileFromClone(tempDir, filePath);
     if (content) {
-      return {
-        success: true,
-        content,
-        tempDir
-      };
+      const result = { success: true, content, tempDir };
+      if (basePath)
+        result.resolvedSubpath = basePath;
+      if (effectiveBranch)
+        result.resolvedBranch = effectiveBranch;
+      return result;
     }
   }
   await cleanupTempDir(tempDir);
@@ -26108,6 +26114,9 @@ async function initWorkspace(targetPath = ".", options = {}) {
   const isProduction = currentFilePath.includes(`${sep2}dist${sep2}`);
   const defaultTemplatePath = isProduction ? join16(currentFileDir, "templates", "default") : join16(currentFileDir, "..", "templates", "default");
   let githubTempDir;
+  let parsedFromUrl;
+  let githubBasePath = "";
+  let githubBranch = "main";
   try {
     await mkdir8(absoluteTarget, { recursive: true });
     await mkdir8(configDir, { recursive: true });
@@ -26124,18 +26133,17 @@ async function initWorkspace(targetPath = ".", options = {}) {
         }
         githubTempDir = fetchResult.tempDir;
         workspaceYamlContent = fetchResult.content;
+        parsedFromUrl = parseGitHubUrl(options.from);
+        githubBasePath = fetchResult.resolvedSubpath || "";
+        githubBranch = fetchResult.resolvedBranch || parsedFromUrl?.branch || "main";
         const parsed2 = load(workspaceYamlContent);
         const workspace = parsed2?.workspace;
         if (workspace?.source) {
           const source = workspace.source;
           if (!isGitHubUrl(source) && !isAbsolute4(source)) {
-            const parsedUrl = parseGitHubUrl(options.from);
-            if (parsedUrl) {
-              const basePath = parsedUrl.subpath || "";
-              const baseDir = basePath.replace(/\/?\.allagents\/workspace\.yaml$/, "").replace(/\/?workspace\.yaml$/, "");
-              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}`;
+            if (parsedFromUrl) {
+              const sourcePath = source === "." ? githubBasePath : githubBasePath ? `${githubBasePath}/${source}` : source;
+              workspace.source = `https://github.com/${parsedFromUrl.owner}/${parsedFromUrl.repo}/tree/${githubBranch}/${sourcePath}`;
               workspaceYamlContent = dump(parsed2, { lineWidth: -1 });
             }
           }
@@ -26206,11 +26214,8 @@ async function initWorkspace(targetPath = ".", options = {}) {
       const targetTemplatePath = join16(configDir, VSCODE_TEMPLATE_FILE2);
       if (!existsSync13(targetTemplatePath)) {
         if (isGitHubUrl(options.from) && githubTempDir) {
-          const parsedUrl = parseGitHubUrl(options.from);
-          if (parsedUrl) {
-            const basePath = parsedUrl.subpath || "";
-            const baseDir = basePath.replace(/\/?\.allagents\/workspace\.yaml$/, "").replace(/\/?workspace\.yaml$/, "");
-            const templatePath = baseDir ? `${baseDir}/${CONFIG_DIR}/${VSCODE_TEMPLATE_FILE2}` : `${CONFIG_DIR}/${VSCODE_TEMPLATE_FILE2}`;
+          if (parsedFromUrl) {
+            const templatePath = githubBasePath ? `${githubBasePath}/${CONFIG_DIR}/${VSCODE_TEMPLATE_FILE2}` : `${CONFIG_DIR}/${VSCODE_TEMPLATE_FILE2}`;
             const templateContent = readFileFromClone(githubTempDir, templatePath);
             if (templateContent) {
               await writeFile7(targetTemplatePath, templateContent, "utf-8");
@@ -26229,16 +26234,14 @@ async function initWorkspace(targetPath = ".", options = {}) {
     if (hasRepositories) {
       const copiedAgentFiles = [];
       if (options.from && isGitHubUrl(options.from) && githubTempDir) {
-        const parsedUrl = parseGitHubUrl(options.from);
-        if (parsedUrl) {
-          const basePath = parsedUrl.subpath || "";
+        if (parsedFromUrl) {
           for (const agentFile of AGENT_FILES) {
             const targetFilePath = join16(absoluteTarget, agentFile);
             if (existsSync13(targetFilePath)) {
               copiedAgentFiles.push(agentFile);
               continue;
             }
-            const filePath = basePath ? `${basePath}/${agentFile}` : agentFile;
+            const filePath = githubBasePath ? `${githubBasePath}/${agentFile}` : agentFile;
             const content = readFileFromClone(githubTempDir, filePath);
             if (content) {
               await writeFile7(targetFilePath, content, "utf-8");
@@ -29012,7 +29015,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "allagents",
-    version: "0.33.1",
+    version: "0.33.2",
     description: "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
     type: "module",
     bin: {
@@ -29123,8 +29126,8 @@ function buildNotice(currentVersion, latestVersion) {
     return null;
   if (!isNewer(latestVersion, currentVersion))
     return null;
-  return `  Update available: ${currentVersion} → ${latestVersion}
-  Run \`allagents self update\` to upgrade.`;
+  return source_default.yellow(`Update available: ${currentVersion} → ${latestVersion}
+Run \`allagents self update\` to upgrade.`);
 }
 function backgroundUpdateCheck() {
   const dir = join23(getHomeDir(), CONFIG_DIR);
@@ -29168,6 +29171,7 @@ async function getUpdateNotice(currentVersion) {
 }
 var CHECK_INTERVAL_MS, CACHE_FILE = "version-check.json", NPM_REGISTRY_URL = "https://registry.npmjs.org/allagents/latest";
 var init_update_check = __esm(() => {
+  init_source();
   init_constants();
   CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 });
@@ -34668,17 +34672,12 @@ var { args: argsNoJson, json: json2 } = extractJsonFlag(rawArgs);
 var { args: finalArgs, agentHelp } = extractAgentHelpFlag(argsNoJson);
 setJsonMode(json2);
 var isWizard = finalArgs.length === 0 && process.stdout.isTTY && !json2;
-var updateNotice = null;
 if (!agentHelp && !json2 && !isWizard) {
-  process.on("exit", () => {
-    if (updateNotice)
-      process.stderr.write(`
-${updateNotice}
+  const notice = await getUpdateNotice(package_default.version);
+  if (notice)
+    process.stderr.write(`${notice}
+
 `);
-  });
-  getUpdateNotice(package_default.version).then((n) => {
-    updateNotice = n;
-  });
 }
 if (agentHelp) {
   printAgentHelp(finalArgs, package_default.version);

package/package.json

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