allagents 0.33.1 → 0.34.0-next.1

package/dist/index.js

@@ -13440,7 +13440,7 @@ function gitInstanceFactory(baseDir, options) {
 }
 var import_file_exists, import_debug, import_promise_deferred, import_promise_deferred2, __defProp2, __getOwnPropDesc2, __getOwnPropNames2, __hasOwnProp2, __esm2 = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
-}, __commonJS2 = (cb, mod) => function __require() {
+}, __commonJS2 = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 }, __export2 = (target, all) => {
   for (var name in all)
@@ -22907,7 +22907,7 @@ var init_user_workspace = __esm(() => {
 // src/core/marketplace.ts
 import { existsSync as existsSync6 } from "node:fs";
 import { mkdir as mkdir5, readFile as readFile5, readdir as readdir3, rm as rm3, writeFile as writeFile3 } from "node:fs/promises";
-import { basename as basename3, join as join9, resolve as resolve7 } from "node:path";
+import { basename as basename3, dirname as dirname5, join as join9, resolve as resolve7 } from "node:path";
 function parseLocation(location) {
   const [owner = "", repo = "", ...rest] = location.split("/");
   const branch = rest.length > 0 ? rest.join("/") : undefined;
@@ -22922,8 +22922,10 @@ function getMarketplacesDir() {
 function getRegistryPath() {
   return join9(getAllagentsDir(), "marketplaces.json");
 }
-async function loadRegistry() {
-  const registryPath = getRegistryPath();
+function getProjectRegistryPath(workspacePath) {
+  return join9(workspacePath, ".allagents", "marketplaces.json");
+}
+async function loadRegistryFromPath(registryPath) {
   if (!existsSync6(registryPath)) {
     return { version: 1, marketplaces: {} };
   }
@@ -22934,15 +22936,20 @@ async function loadRegistry() {
     return { version: 1, marketplaces: {} };
   }
 }
-async function saveRegistry(registry) {
-  const registryPath = getRegistryPath();
-  const dir = getAllagentsDir();
+async function saveRegistryToPath(registry, registryPath) {
+  const dir = dirname5(registryPath);
   if (!existsSync6(dir)) {
     await mkdir5(dir, { recursive: true });
   }
   await writeFile3(registryPath, `${JSON.stringify(registry, null, 2)}
 `);
 }
+async function loadRegistry() {
+  return loadRegistryFromPath(getRegistryPath());
+}
+async function saveRegistry(registry) {
+  return saveRegistryToPath(registry, getRegistryPath());
+}
 function getSourceLocationKey(source) {
   return source.location;
 }
@@ -22993,7 +23000,7 @@ function parseMarketplaceSource(source) {
     name
   };
 }
-async function addMarketplace(source, customName, branch) {
+async function addMarketplace(source, customName, branch, scopeOptions) {
   const parsed = parseMarketplaceSource(source);
   if (!parsed) {
     return {
@@ -23020,7 +23027,8 @@ async function addMarketplace(source, customName, branch) {
     }
   }
   let name = customName || parsed.name;
-  const registry = await loadRegistry();
+  const registryPath = scopeOptions?.scope === "project" && scopeOptions?.workspacePath ? getProjectRegistryPath(scopeOptions.workspacePath) : getRegistryPath();
+  const registry = await loadRegistryFromPath(registryPath);
   if (registry.marketplaces[name]) {
     return {
       success: false,
@@ -23118,32 +23126,59 @@ async function addMarketplace(source, customName, branch) {
     lastUpdated: new Date().toISOString()
   };
   registry.marketplaces[name] = entry;
-  await saveRegistry(registry);
+  await saveRegistryToPath(registry, registryPath);
   return {
     success: true,
     marketplace: entry
   };
 }
 async function removeMarketplace(name, options = {}) {
-  const registry = await loadRegistry();
-  if (!registry.marketplaces[name]) {
+  const scope = options.scope ?? "all";
+  if ((scope === "project" || scope === "all") && !options.workspacePath && !options.userRegistryPath) {
+    if (scope === "project") {
+      return {
+        success: false,
+        error: 'workspacePath is required when scope is "project"'
+      };
+    }
+  }
+  const userRegPath = options.userRegistryPath ?? getRegistryPath();
+  let removedEntry;
+  if (scope === "user" || scope === "all") {
+    const userRegistry = await loadRegistryFromPath(userRegPath);
+    if (userRegistry.marketplaces[name]) {
+      removedEntry = userRegistry.marketplaces[name];
+      delete userRegistry.marketplaces[name];
+      await saveRegistryToPath(userRegistry, userRegPath);
+      if (removedEntry.source.type !== "local" && existsSync6(removedEntry.path)) {
+        await rm3(removedEntry.path, { recursive: true, force: true });
+      }
+    }
+  }
+  if ((scope === "project" || scope === "all") && options.workspacePath) {
+    const projectRegPath = getProjectRegistryPath(options.workspacePath);
+    const projectRegistry = await loadRegistryFromPath(projectRegPath);
+    if (projectRegistry.marketplaces[name]) {
+      removedEntry = projectRegistry.marketplaces[name];
+      delete projectRegistry.marketplaces[name];
+      await saveRegistryToPath(projectRegistry, projectRegPath);
+      if (removedEntry.source.type !== "local" && existsSync6(removedEntry.path)) {
+        await rm3(removedEntry.path, { recursive: true, force: true });
+      }
+    }
+  }
+  if (!removedEntry) {
     return {
       success: false,
       error: `Marketplace '${name}' not found in registry`
     };
   }
-  const entry = registry.marketplaces[name];
-  delete registry.marketplaces[name];
-  await saveRegistry(registry);
-  if (entry.source.type !== "local" && existsSync6(entry.path)) {
-    await rm3(entry.path, { recursive: true, force: true });
-  }
   if (options.cascade) {
     const { removeUserPluginsForMarketplace: removeUserPluginsForMarketplace2 } = await Promise.resolve().then(() => (init_user_workspace(), exports_user_workspace));
     const removedUserPlugins = await removeUserPluginsForMarketplace2(name);
     return {
       success: true,
-      marketplace: entry,
+      marketplace: removedEntry,
       removedUserPlugins
     };
   }
@@ -23151,7 +23186,7 @@ async function removeMarketplace(name, options = {}) {
   const retainedUserPlugins = await getUserPluginsForMarketplace2(name);
   return {
     success: true,
-    marketplace: entry,
+    marketplace: removedEntry,
     retainedUserPlugins
   };
 }
@@ -23159,12 +23194,16 @@ async function listMarketplaces() {
   const registry = await loadRegistry();
   return Object.values(registry.marketplaces).sort((a, b) => a.name.localeCompare(b.name));
 }
-async function getMarketplace(name) {
+async function getMarketplace(name, workspacePath) {
+  if (workspacePath) {
+    const { registry: registry2 } = await loadMergedRegistries(getRegistryPath(), getProjectRegistryPath(workspacePath));
+    return registry2.marketplaces[name] || null;
+  }
   const registry = await loadRegistry();
   return registry.marketplaces[name] || null;
 }
-async function findMarketplace(name, sourceLocation) {
-  const registry = await loadRegistry();
+async function findMarketplace(name, sourceLocation, workspacePath) {
+  const registry = workspacePath ? (await loadMergedRegistries(getRegistryPath(), getProjectRegistryPath(workspacePath))).registry : await loadRegistry();
   if (registry.marketplaces[name]) {
     return registry.marketplaces[name];
   }
@@ -23173,10 +23212,27 @@ async function findMarketplace(name, sourceLocation) {
   }
   return null;
 }
-async function updateMarketplace(name) {
-  const registry = await loadRegistry();
+async function updateMarketplace(name, workspacePath) {
+  const userRegistry = await loadRegistry();
+  let projectRegistry;
+  if (workspacePath) {
+    const projectPath = getProjectRegistryPath(workspacePath);
+    if (existsSync6(projectPath)) {
+      projectRegistry = await loadRegistryFromPath(projectPath);
+    }
+  }
+  const mergedEntries = new Map;
+  for (const entry of Object.values(userRegistry.marketplaces)) {
+    mergedEntries.set(entry.name, { entry, scope: "user" });
+  }
+  if (projectRegistry) {
+    for (const entry of Object.values(projectRegistry.marketplaces)) {
+      mergedEntries.set(entry.name, { entry, scope: "project" });
+    }
+  }
+  const toUpdateScoped = name ? mergedEntries.has(name) ? [mergedEntries.get(name)] : [] : Array.from(mergedEntries.values());
+  const toUpdate = toUpdateScoped.map((s) => s.entry);
   const results = [];
-  const toUpdate = name ? registry.marketplaces[name] ? [registry.marketplaces[name]] : [] : Object.values(registry.marketplaces);
   if (name && toUpdate.length === 0) {
     return [{ name, success: false, error: `Marketplace '${name}' not found` }];
   }
@@ -23225,7 +23281,6 @@ async function updateMarketplace(name) {
       await git.checkout(targetBranch);
       await pull(marketplace.path);
       marketplace.lastUpdated = new Date().toISOString();
-      registry.marketplaces[marketplace.name] = marketplace;
       results.push({
         name: marketplace.name,
         success: true
@@ -23238,7 +23293,23 @@ async function updateMarketplace(name) {
       });
     }
   }
-  await saveRegistry(registry);
+  let userDirty = false;
+  let projectDirty = false;
+  for (const { entry, scope } of toUpdateScoped) {
+    if (scope === "user") {
+      userRegistry.marketplaces[entry.name] = entry;
+      userDirty = true;
+    } else if (projectRegistry) {
+      projectRegistry.marketplaces[entry.name] = entry;
+      projectDirty = true;
+    }
+  }
+  if (userDirty) {
+    await saveRegistry(userRegistry);
+  }
+  if (projectDirty && projectRegistry && workspacePath) {
+    await saveRegistryToPath(projectRegistry, getProjectRegistryPath(workspacePath));
+  }
   return results;
 }
 async function getMarketplacePluginsFromManifest(marketplacePath) {
@@ -23262,8 +23333,8 @@ async function getMarketplacePluginsFromManifest(marketplacePath) {
   });
   return { plugins, warnings: result.warnings };
 }
-async function listMarketplacePlugins(name) {
-  const marketplace = await getMarketplace(name);
+async function listMarketplacePlugins(name, workspacePath) {
+  const marketplace = await getMarketplace(name, workspacePath);
   if (!marketplace) {
     return { plugins: [], warnings: [] };
   }
@@ -23324,7 +23395,7 @@ async function resolvePluginSpec(spec, options = {}) {
   const marketplaceName = options.marketplaceNameOverride ?? parsed.marketplaceName;
   let marketplacePath = options.marketplacePathOverride ?? null;
   if (!marketplacePath) {
-    const marketplace = await getMarketplace(marketplaceName);
+    const marketplace = await getMarketplace(marketplaceName, options.workspacePath);
     if (!marketplace) {
       return null;
     }
@@ -23408,7 +23479,7 @@ async function resolvePluginSpecWithAutoRegister(spec, options = {}) {
   }
   const { plugin: pluginName, marketplaceName, owner, repo, subpath } = parsed;
   const sourceLocation = owner && repo ? `${owner}/${repo}` : undefined;
-  let marketplace = await findMarketplace(marketplaceName, sourceLocation);
+  let marketplace = await findMarketplace(marketplaceName, sourceLocation, options.workspacePath);
   let didAutoRegister = false;
   if (!marketplace) {
     const sourceToRegister = owner && repo ? `${owner}/${repo}` : marketplaceName;
@@ -23419,7 +23490,7 @@ async function resolvePluginSpecWithAutoRegister(spec, options = {}) {
         error: autoRegResult.error || "Unknown error"
       };
     }
-    marketplace = await getMarketplace(autoRegResult.name ?? marketplaceName);
+    marketplace = await getMarketplace(autoRegResult.name ?? marketplaceName, options.workspacePath);
     didAutoRegister = true;
   }
   if (!marketplace) {
@@ -23429,7 +23500,7 @@ async function resolvePluginSpecWithAutoRegister(spec, options = {}) {
     };
   }
   if (!didAutoRegister && !options.offline && marketplace.source.type !== "local" && !updatedMarketplaceCache.has(marketplace.name)) {
-    const results = await updateMarketplace(marketplace.name);
+    const results = await updateMarketplace(marketplace.name, options.workspacePath);
     const result = results[0];
     if (result?.success) {
       updatedMarketplaceCache.add(marketplace.name);
@@ -23442,7 +23513,8 @@ async function resolvePluginSpecWithAutoRegister(spec, options = {}) {
   const resolveOpts = {
     ...subpath && { subpath },
     marketplaceNameOverride: marketplace.name,
-    ...options.offline != null && { offline: options.offline }
+    ...options.offline != null && { offline: options.offline },
+    ...options.workspacePath && { workspacePath: options.workspacePath }
   };
   let resolved = await resolvePluginSpec(spec, resolveOpts);
   if (!resolved && !options.offline && marketplace.source.type !== "local") {
@@ -23452,7 +23524,8 @@ async function resolvePluginSpecWithAutoRegister(spec, options = {}) {
       marketplace = refreshResult.marketplace;
       resolved = await resolvePluginSpec(spec, {
         ...subpath && { subpath },
-        marketplaceNameOverride: marketplace.name
+        marketplaceNameOverride: marketplace.name,
+        ...options.workspacePath && { workspacePath: options.workspacePath }
       });
     }
   }
@@ -23534,6 +23607,54 @@ async function ensureMarketplacesRegistered(plugins) {
   }
   return results;
 }
+async function loadMergedRegistries(userRegistryPath, projectRegistryPath) {
+  const [userRegistry, projectRegistry] = await Promise.all([
+    loadRegistryFromPath(userRegistryPath),
+    loadRegistryFromPath(projectRegistryPath)
+  ]);
+  const merged = {
+    version: 1,
+    marketplaces: { ...userRegistry.marketplaces }
+  };
+  const overrides = [];
+  for (const [name, entry] of Object.entries(projectRegistry.marketplaces)) {
+    if (merged.marketplaces[name]) {
+      overrides.push(name);
+    }
+    merged.marketplaces[name] = entry;
+  }
+  return { registry: merged, overrides };
+}
+async function getMarketplaceOverrides(userRegistryPath, projectRegistryPath) {
+  if (!existsSync6(projectRegistryPath)) {
+    return [];
+  }
+  const { overrides } = await loadMergedRegistries(userRegistryPath, projectRegistryPath);
+  return overrides;
+}
+async function listMarketplacesWithScope(userRegistryPath, projectRegistryPath) {
+  const [userRegistry, projectRegistry] = await Promise.all([
+    loadRegistryFromPath(userRegistryPath),
+    loadRegistryFromPath(projectRegistryPath)
+  ]);
+  const projectNames = new Set(Object.keys(projectRegistry.marketplaces));
+  const entries = [];
+  const overrides = [];
+  for (const entry of Object.values(userRegistry.marketplaces)) {
+    if (projectNames.has(entry.name)) {
+      overrides.push(entry.name);
+    } else {
+      entries.push({ ...entry, scope: "user" });
+    }
+  }
+  for (const entry of Object.values(projectRegistry.marketplaces)) {
+    entries.push({ ...entry, scope: "project" });
+  }
+  return {
+    entries: entries.sort((a, b) => a.name.localeCompare(b.name)),
+    overrides
+  };
+}
 async function getMarketplaceVersion(marketplacePath) {
   if (!existsSync6(marketplacePath)) {
     return null;
@@ -24262,7 +24383,7 @@ var init_sync_state = __esm(() => {
 // src/core/sync-state.ts
 import { readFile as readFile8, writeFile as writeFile6, mkdir as mkdir7 } from "node:fs/promises";
 import { existsSync as existsSync9 } from "node:fs";
-import { join as join12, dirname as dirname5 } from "node:path";
+import { join as join12, dirname as dirname6 } from "node:path";
 function getSyncStatePath(workspacePath) {
   return join12(workspacePath, CONFIG_DIR, SYNC_STATE_FILE);
 }
@@ -24295,7 +24416,7 @@ async function saveSyncState(workspacePath, data) {
     ...normalizedData.vscodeWorkspaceHash && { vscodeWorkspaceHash: normalizedData.vscodeWorkspaceHash },
     ...normalizedData.vscodeWorkspaceRepos && { vscodeWorkspaceRepos: normalizedData.vscodeWorkspaceRepos }
   };
-  await mkdir7(dirname5(statePath), { recursive: true });
+  await mkdir7(dirname6(statePath), { recursive: true });
   await writeFile6(statePath, JSON.stringify(state, null, 2), "utf-8");
 }
 function getPreviouslySyncedFiles(state, client) {
@@ -24456,7 +24577,7 @@ var init_vscode_workspace = __esm(() => {
 
 // src/core/vscode-mcp.ts
 import { existsSync as existsSync10, readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { join as join13, dirname as dirname6 } from "node:path";
+import { join as join13, dirname as dirname7 } from "node:path";
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -24599,7 +24720,7 @@ function syncVscodeMcpConfig(validatedPlugins, options) {
   const hasChanges = result.added > 0 || result.overwritten > 0 || result.removed > 0;
   if (hasChanges && !dryRun) {
     existingConfig.servers = existingServers;
-    const dir = dirname6(configPath);
+    const dir = dirname7(configPath);
     if (!existsSync10(dir)) {
       mkdirSync(dir, { recursive: true });
     }
@@ -24617,7 +24738,7 @@ function syncVscodeMcpConfig(validatedPlugins, options) {
     }
     if (result.removed > 0 && !dryRun) {
       existingConfig.servers = existingServers;
-      const dir = dirname6(configPath);
+      const dir = dirname7(configPath);
       if (!existsSync10(dir)) {
         mkdirSync(dir, { recursive: true });
       }
@@ -25013,7 +25134,7 @@ var init_native = __esm(() => {
 // src/core/sync.ts
 import { existsSync as existsSync11, readFileSync as readFileSync2, writeFileSync as writeFileSync2, lstatSync } from "node:fs";
 import { rm as rm4, unlink as unlink2, rmdir, copyFile } from "node:fs/promises";
-import { join as join14, resolve as resolve9, dirname as dirname7, relative as relative4 } from "node:path";
+import { join as join14, resolve as resolve9, dirname as dirname8, relative as relative4 } from "node:path";
 function deduplicateClientsByPath(clients, clientMappings = CLIENT_MAPPINGS) {
   const pathToClients = new Map;
   for (const client of clients) {
@@ -25139,16 +25260,16 @@ async function selectivePurgeWorkspace(workspacePath, state, clients, options) {
   return result;
 }
 async function cleanupEmptyParents(workspacePath, filePath) {
-  let parentPath = dirname7(filePath);
+  let parentPath = dirname8(filePath);
   while (parentPath && parentPath !== "." && parentPath !== "/") {
     const fullParentPath = join14(workspacePath, parentPath);
     if (!existsSync11(fullParentPath)) {
-      parentPath = dirname7(parentPath);
+      parentPath = dirname8(parentPath);
       continue;
     }
     try {
       await rmdir(fullParentPath);
-      parentPath = dirname7(parentPath);
+      parentPath = dirname8(parentPath);
     } catch {
       break;
     }
@@ -25308,7 +25429,8 @@ function collectSyncedPaths(copyResults, workspacePath, clients, clientMappings)
 async function validatePlugin(pluginSource, workspacePath, offline) {
   if (isPluginSpec(pluginSource)) {
     const resolved = await resolvePluginSpecWithAutoRegister(pluginSource, {
-      offline
+      offline,
+      workspacePath
     });
     if (!resolved.success) {
       return {
@@ -25753,6 +25875,10 @@ async function syncWorkspace(workspacePath = process.cwd(), options = {}) {
   } catch (error) {
     return failedSyncResult(error instanceof Error ? error.message : `Failed to parse ${CONFIG_DIR}/${WORKSPACE_CONFIG_FILE}`);
   }
+  const overrides = await getMarketplaceOverrides(getRegistryPath(), getProjectRegistryPath(workspacePath));
+  for (const name of overrides) {
+    console.warn(`Warning: Workspace marketplace '${name}' overrides user marketplace of the same name.`);
+  }
   const hasRepositories = (config.repositories?.length ?? 0) > 0;
   const configClientTypes = getClientTypes(config.clients);
   const workspaceClients = options.clients ? config.clients.filter((c) => {
@@ -26023,13 +26149,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 +26197,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);
@@ -26089,7 +26221,7 @@ var init_github_fetch = __esm(() => {
 // src/core/workspace.ts
 import { mkdir as mkdir8, readFile as readFile9, writeFile as writeFile7, copyFile as copyFile2, unlink as unlink3 } from "node:fs/promises";
 import { existsSync as existsSync13 } from "node:fs";
-import { join as join16, resolve as resolve10, dirname as dirname8, relative as relative5, sep as sep2, isAbsolute as isAbsolute4 } from "node:path";
+import { join as join16, resolve as resolve10, dirname as dirname9, relative as relative5, sep as sep2, isAbsolute as isAbsolute4 } from "node:path";
 import { fileURLToPath } from "node:url";
 async function initWorkspace(targetPath = ".", options = {}) {
   const absoluteTarget = resolve10(targetPath);
@@ -26104,10 +26236,13 @@ async function initWorkspace(targetPath = ".", options = {}) {
     }
   }
   const currentFilePath = fileURLToPath(import.meta.url);
-  const currentFileDir = dirname8(currentFilePath);
+  const currentFileDir = dirname9(currentFilePath);
   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 +26259,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 });
             }
           }
@@ -26164,9 +26298,9 @@ async function initWorkspace(targetPath = ".", options = {}) {
           }
         } else {
           sourceYamlPath = fromPath;
-          const parentDir = dirname8(fromPath);
+          const parentDir = dirname9(fromPath);
           if (parentDir.endsWith(CONFIG_DIR)) {
-            sourceDir = dirname8(parentDir);
+            sourceDir = dirname9(parentDir);
           } else {
             sourceDir = parentDir;
           }
@@ -26206,11 +26340,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 +26360,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 +29141,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "allagents",
-    version: "0.33.1",
+    version: "0.34.0-next.1",
     description: "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
     type: "module",
     bin: {
@@ -29123,8 +29252,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 +29297,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;
 });
@@ -31963,10 +32093,33 @@ native:`);
 var marketplaceListCmd = import_cmd_ts4.command({
   name: "list",
   description: buildDescription(marketplaceListMeta),
-  args: {},
-  handler: async () => {
+  args: {
+    scope: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "scope", short: "s", description: "Filter by scope: user or project" })
+  },
+  handler: async ({ scope }) => {
     try {
-      const marketplaces = await listMarketplaces();
+      if (scope && scope !== "user" && scope !== "project") {
+        const msg = `Invalid scope '${scope}'. Must be 'user' or 'project'.`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin marketplace list", error: msg });
+          process.exit(1);
+        }
+        console.error(`Error: ${msg}`);
+        process.exit(1);
+      }
+      let marketplaces;
+      let overrideNames = [];
+      if (!scope) {
+        const scopedResult = await listMarketplacesWithScope(getRegistryPath(), getProjectRegistryPath(process.cwd()));
+        marketplaces = scopedResult.entries;
+        overrideNames = scopedResult.overrides;
+      } else if (scope === "user") {
+        const registry = await loadRegistryFromPath(getRegistryPath());
+        marketplaces = Object.values(registry.marketplaces).map((mp) => ({ ...mp, scope: "user" }));
+      } else {
+        const registry = await loadRegistryFromPath(getProjectRegistryPath(process.cwd()));
+        marketplaces = Object.values(registry.marketplaces).map((mp) => ({ ...mp, scope: "project" }));
+      }
       if (isJsonMode()) {
         const enriched = await Promise.all(marketplaces.map(async (mp) => {
           const version = await getMarketplaceVersion(mp.path);
@@ -31985,6 +32138,9 @@ var marketplaceListCmd = import_cmd_ts4.command({
         });
         return;
       }
+      for (const overrideName of overrideNames) {
+        console.warn(`Warning: Workspace marketplace '${overrideName}' overrides user marketplace of the same name.`);
+      }
       if (marketplaces.length === 0) {
         console.log(`No marketplaces registered.
 `);
@@ -32010,7 +32166,7 @@ var marketplaceListCmd = import_cmd_ts4.command({
           default:
             sourceLabel = `Local: ${mp.source.location}`;
         }
-        console.log(`  ❯ ${mp.name}`);
+        console.log(`  ❯ ${mp.name} (${mp.scope})`);
         console.log(`    Source: ${sourceLabel}`);
         const version = await getMarketplaceVersion(mp.path);
         if (version) {
@@ -32039,14 +32195,39 @@ var marketplaceAddCmd = import_cmd_ts4.command({
   args: {
     source: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "source" }),
     name: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "name", short: "n", description: "Custom name for the marketplace" }),
-    branch: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "branch", short: "b", description: "Branch to checkout after cloning" })
+    branch: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "branch", short: "b", description: "Branch to checkout after cloning" }),
+    scope: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "scope", short: "s", description: "Scope: user (default) or project" })
   },
-  handler: async ({ source, name, branch }) => {
+  handler: async ({ source, name, branch, scope }) => {
     try {
+      const effectiveScope = scope ?? "user";
+      if (effectiveScope !== "user" && effectiveScope !== "project") {
+        const msg = `Invalid scope '${scope}'. Must be 'user' or 'project'.`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin marketplace add", error: msg });
+          process.exit(1);
+        }
+        console.error(`Error: ${msg}`);
+        process.exit(1);
+      }
+      if (effectiveScope === "project") {
+        if (!existsSync19(join22(process.cwd(), CONFIG_DIR, WORKSPACE_CONFIG_FILE))) {
+          const msg = 'No workspace found in current directory. Run "allagents workspace init" first.';
+          if (isJsonMode()) {
+            jsonOutput({ success: false, command: "plugin marketplace add", error: msg });
+            process.exit(1);
+          }
+          console.error(`Error: ${msg}`);
+          process.exit(1);
+        }
+      }
       if (!isJsonMode()) {
         console.log(`Adding marketplace: ${source}...`);
       }
-      const result = await addMarketplace(source, name, branch);
+      const result = await addMarketplace(source, name, branch, {
+        scope: effectiveScope,
+        workspacePath: process.cwd()
+      });
       if (!result.success) {
         if (isJsonMode()) {
           jsonOutput({ success: false, command: "plugin marketplace add", error: result.error ?? "Unknown error" });
@@ -32088,11 +32269,25 @@ var marketplaceRemoveCmd = import_cmd_ts4.command({
   name: "remove",
   description: buildDescription(marketplaceRemoveMeta),
   args: {
-    name: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "name" })
+    name: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "name" }),
+    scope: import_cmd_ts4.option({ type: import_cmd_ts4.optional(import_cmd_ts4.string), long: "scope", short: "s", description: "Filter by scope: user or project (default: removes from both)" })
   },
-  handler: async ({ name }) => {
+  handler: async ({ name, scope }) => {
     try {
-      const result = await removeMarketplace(name);
+      if (scope && scope !== "user" && scope !== "project") {
+        const msg = `Invalid scope '${scope}'. Must be 'user' or 'project'.`;
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin marketplace remove", error: msg });
+          process.exit(1);
+        }
+        console.error(`Error: ${msg}`);
+        process.exit(1);
+      }
+      const effectiveScope = scope ?? "all";
+      const result = await removeMarketplace(name, {
+        scope: effectiveScope,
+        workspacePath: process.cwd()
+      });
       if (!result.success) {
         if (isJsonMode()) {
           jsonOutput({ success: false, command: "plugin marketplace remove", error: result.error ?? "Unknown error" });
@@ -32148,7 +32343,7 @@ var marketplaceUpdateCmd = import_cmd_ts4.command({
         console.log(name ? `Updating marketplace: ${name}...` : "Updating all marketplaces...");
         console.log();
       }
-      const results = await updateMarketplace(name);
+      const results = await updateMarketplace(name, process.cwd());
       if (isJsonMode()) {
         const succeeded = results.filter((r) => r.success).length;
         const failed = results.filter((r) => !r.success).length;
@@ -32204,7 +32399,7 @@ var marketplaceBrowseCmd = import_cmd_ts4.command({
   },
   handler: async ({ name }) => {
     try {
-      if (!await findMarketplace(name)) {
+      if (!await findMarketplace(name, undefined, process.cwd())) {
         const error = `Marketplace '${name}' not found`;
         if (isJsonMode()) {
           jsonOutput({ success: false, command: "plugin marketplace browse", error });
@@ -32216,7 +32411,7 @@ To see registered marketplaces:`);
         console.log("  allagents plugin marketplace list");
         process.exit(1);
       }
-      const result = await listMarketplacePlugins(name);
+      const result = await listMarketplacePlugins(name, process.cwd());
       const userPlugins = await getInstalledUserPlugins();
       const projectPlugins = await getInstalledProjectPlugins(process.cwd());
       const installedMap = new Map;
@@ -32486,6 +32681,12 @@ var pluginInstallCmd = import_cmd_ts4.command({
           await ensureWorkspace(process.cwd(), clients);
         }
       }
+      if (!isUser) {
+        const overrideNames = await getMarketplaceOverrides(getRegistryPath(), getProjectRegistryPath(process.cwd()));
+        for (const name of overrideNames) {
+          console.warn(`Warning: Workspace marketplace '${name}' overrides user marketplace of the same name.`);
+        }
+      }
       const result = isUser ? await addUserPlugin(plugin) : await addPlugin(plugin);
       if (!result.success) {
         if (isJsonMode()) {
@@ -34668,17 +34869,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.34.0-next.1",
   "description": "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
   "type": "module",
   "bin": {