@ghl-ai/aw 0.1.34-beta.6 → 0.1.34-beta.7

package/commands/pull.mjs

@@ -34,7 +34,7 @@ export async function pullCommand(args) {
   const dryRun = args['--dry-run'] === true;
   const verbose = args['-v'] === true || args['--verbose'] === true;
   const silent = args['--silent'] === true || args._silent === true;
-  const renameNamespace = args._renameNamespace || null;
+  let renameNamespace = args._renameNamespace || null;
   const teamNSOverride = args._teamNS || null;
 
   // Silent mode: wrap fmt to suppress all output and exit cleanly on errors
@@ -101,7 +101,13 @@ export async function pullCommand(args) {
   const s = log.spinner();
   s.start('Fetching from registry...');
 
-  const sparsePaths = includeToSparsePaths([pattern]);
+  // When pulling from template with rename, also fetch the actual namespace —
+  // if it exists in the registry, use it directly instead of the template.
+  const pathsToFetch = [pattern];
+  if (renameNamespace && pattern === '[template]') {
+    pathsToFetch.push(renameNamespace);
+  }
+  const sparsePaths = includeToSparsePaths(pathsToFetch);
   let tempDir;
   try {
     tempDir = sparseCheckout(cfg.repo, sparsePaths);
@@ -111,9 +117,22 @@ export async function pullCommand(args) {
   }
 
   try {
-    const registryDirs = [];
     const regBase = join(tempDir, REGISTRY_DIR);
 
+    // Check if actual namespace exists in the registry
+    if (renameNamespace && pattern === '[template]') {
+      const actualNsTopDir = renameNamespace.split('/')[0];
+      const actualNsPath = join(regBase, actualNsTopDir);
+      if (existsSync(actualNsPath)) {
+        const fullNsPath = join(regBase, ...renameNamespace.split('/'));
+        if (existsSync(fullNsPath) && listDirs(fullNsPath).length > 0) {
+          pattern = renameNamespace;
+          renameNamespace = null;  // No rename needed — using actual content
+        }
+      }
+    }
+
+    const registryDirs = [];
     if (existsSync(regBase)) {
       for (const name of listDirs(regBase)) {
         registryDirs.push({ name, path: join(regBase, name) });
@@ -226,7 +245,7 @@ export async function pullCommand(args) {
 export async function pullAsync(args) {
   const input = args._positional?.[0] || '';
   const workspaceDir = args._workspaceDir;
-  const renameNamespace = args._renameNamespace || null;
+  let renameNamespace = args._renameNamespace || null;
   const teamNSOverride = args._teamNS || null;
 
   const resolved = resolveInput(input, workspaceDir);
@@ -238,13 +257,35 @@ export async function pullAsync(args) {
   const cfg = config.load(workspaceDir);
   if (!cfg) throw new Error('No .sync-config.json found');
 
-  const sparsePaths = includeToSparsePaths([pattern]);
+  // When pulling from template with rename, also fetch the actual namespace —
+  // if it exists in the registry, use it directly instead of the template.
+  const pathsToFetch = [pattern];
+  if (renameNamespace && pattern === '[template]') {
+    pathsToFetch.push(renameNamespace);
+  }
+  const sparsePaths = includeToSparsePaths(pathsToFetch);
   const tempDir = await sparseCheckoutAsync(cfg.repo, sparsePaths);
 
   try {
-    const registryDirs = [];
     const regBase = join(tempDir, REGISTRY_DIR);
 
+    // Check if actual namespace exists in the registry
+    let useActualNamespace = false;
+    if (renameNamespace && pattern === '[template]') {
+      const actualNsTopDir = renameNamespace.split('/')[0];
+      const actualNsPath = join(regBase, actualNsTopDir);
+      if (existsSync(actualNsPath)) {
+        // Verify the full namespace path has content (not just the top-level team dir)
+        const fullNsPath = join(regBase, ...renameNamespace.split('/'));
+        if (existsSync(fullNsPath) && listDirs(fullNsPath).length > 0) {
+          useActualNamespace = true;
+          pattern = renameNamespace;
+          renameNamespace = null;  // No rename needed — using actual content
+        }
+      }
+    }
+
+    const registryDirs = [];
     if (existsSync(regBase)) {
       for (const name of listDirs(regBase)) {
         registryDirs.push({ name, path: join(regBase, name) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.34-beta.6",
+  "version": "0.1.34-beta.7",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {