@ghl-ai/aw 0.1.34-beta.1 → 0.1.34-beta.2

package/commands/pull.mjs

@@ -178,7 +178,7 @@ export async function pullCommand(args) {
     const s2 = log.spinner();
     s2.start('Applying changes...');
     const conflictCount = applyActions(actions, { teamNS: teamNSOverride || renameNamespace || undefined });
-    updateManifest(workspaceDir, actions, cfg.namespace);
+    updateManifest(workspaceDir, actions, cfg.namespace, { fromTemplate: !!renameNamespace });
     s2.stop('Changes applied');
 
     // Copy root-level registry files (e.g. AW-PROTOCOL.md) that are fetched via
@@ -282,7 +282,7 @@ export async function pullAsync(args) {
     const { actions: rawActions } = computePlan(registryDirs, workspaceDir, [pattern], { skipOrphans: true });
     const actions = filterActions(rawActions, pattern);
     const conflictCount = applyActions(actions, { teamNS: teamNSOverride || renameNamespace || undefined });
-    updateManifest(workspaceDir, actions, cfg.namespace);
+    updateManifest(workspaceDir, actions, cfg.namespace, { fromTemplate: !!renameNamespace });
 
     const ROOT_REGISTRY_FILES = ['AW-PROTOCOL.md'];
     for (const fname of ROOT_REGISTRY_FILES) {

package/commands/push.mjs

@@ -8,7 +8,7 @@ import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { REGISTRY_REPO, REGISTRY_BASE_BRANCH, REGISTRY_DIR } from '../constants.mjs';
 import { resolveInput } from '../paths.mjs';
-import { load as loadManifest } from '../manifest.mjs';
+import { load as loadManifest, save as saveManifest } from '../manifest.mjs';
 import { hashFile, walkRegistryTree } from '../registry.mjs';
 
 const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
@@ -53,7 +53,9 @@ function collectModifiedFiles(workspaceDir) {
     const filePath = join(workspaceDir, key);
     if (!existsSync(filePath)) continue;
     const currentHash = hashFile(filePath);
-    if (currentHash !== entry.sha256) {
+    const isModified = currentHash !== entry.sha256;
+    const isNew = !entry.registry_sha256;  // Template-derived, never pushed to remote
+    if (isModified || isNew) {
       const meta = parseManifestKey(key);
       if (meta) {
         files.push({
@@ -170,7 +172,7 @@ function generatePrBody(files, newNamespaces) {
 
 // ── Git pipeline (works for single file or batch) ────────────────────
 
-function pushFiles(files, { repo, dryRun }) {
+function pushFiles(files, { repo, dryRun, workspaceDir }) {
   // Summary
   const counts = {};
   for (const f of files) {
@@ -289,6 +291,19 @@ function pushFiles(files, { repo, dryRun }) {
         fmt.logSuccess(`${items.length} ${type} pushed`);
       }
     }
+    // Update manifest — mark pushed files as synced (set registry_sha256 = sha256)
+    if (workspaceDir) {
+      const manifest = loadManifest(workspaceDir);
+      for (const file of files) {
+        // Convert registryTarget back to manifest key (strip REGISTRY_DIR/ prefix)
+        const manifestKey = file.registryTarget.replace(`${REGISTRY_DIR}/`, '');
+        if (manifest.files[manifestKey]) {
+          manifest.files[manifestKey].registry_sha256 = manifest.files[manifestKey].sha256;
+        }
+      }
+      saveManifest(workspaceDir, manifest);
+    }
+
     fmt.logSuccess(`PR: ${chalk.cyan(prUrl)}`);
     fmt.outro('Push complete');
   } catch (e) {
@@ -319,13 +334,13 @@ export function pushCommand(args) {
 
   fmt.intro('aw push');
 
-  // No args = push all modified files
+  // No args = push all modified + new (unpushed) files
   if (!input) {
     const files = collectModifiedFiles(workspaceDir);
     if (files.length === 0) {
-      fmt.cancel('Nothing to push — no modified files.\n\n  Use `aw status` to see synced files.');
+      fmt.cancel('Nothing to push — no modified or new files.\n\n  Use `aw status` to see synced files.');
     }
-    pushFiles(files, { repo, dryRun });
+    pushFiles(files, { repo, dryRun, workspaceDir });
     return;
   }
 
@@ -354,7 +369,7 @@ export function pushCommand(args) {
     if (files.length === 0) {
       fmt.cancel(`Nothing to push in ${chalk.cyan(input)} — no agents, skills, commands, or evals found.`);
     }
-    pushFiles(files, { repo, dryRun });
+    pushFiles(files, { repo, dryRun, workspaceDir });
     return;
   }
 
@@ -394,7 +409,7 @@ export function pushCommand(args) {
     namespace: namespacePath,
     slug,
     isDir,
-  }], { repo, dryRun });
+  }], { repo, dryRun, workspaceDir });
 }
 
 // ── Helpers ──────────────────────────────────────────────────────────

package/commands/status.mjs

@@ -39,6 +39,7 @@ export function statusCommand(args) {
 
   const files = Object.entries(manifest.files || {});
   const modified = [];
+  const unpushed = [];
   const missing = [];
   const conflicts = [];
 
@@ -51,6 +52,12 @@ export function statusCommand(args) {
 
     const currentHash = hashFile(filePath);
 
+    // Template-derived files that were never pushed to the remote registry
+    if (!entry.registry_sha256) {
+      unpushed.push(key);
+      continue;
+    }
+
     if (currentHash !== entry.sha256) {
       const content = readFileSync(filePath, 'utf8');
       if (content.includes('<<<<<<<')) {
@@ -64,6 +71,7 @@ export function statusCommand(args) {
   // Summary line
   const summaryParts = [
     `${files.length} synced`,
+    unpushed.length > 0 ? chalk.green(`${unpushed.length} new (unpushed)`) : null,
     modified.length > 0 ? chalk.yellow(`${modified.length} modified`) : null,
     conflicts.length > 0 ? chalk.red(`${conflicts.length} conflicts`) : null,
     missing.length > 0 ? chalk.dim(`${missing.length} missing`) : null,
@@ -78,6 +86,17 @@ export function statusCommand(args) {
     );
   }
 
+  if (unpushed.length > 0) {
+    // Group by namespace for cleaner display
+    const nsCounts = {};
+    for (const key of unpushed) {
+      const ns = key.split('/').slice(0, 2).join('/');
+      nsCounts[ns] = (nsCounts[ns] || 0) + 1;
+    }
+    const nsLines = Object.entries(nsCounts).map(([ns, count]) => chalk.green(`  ${ns}: ${count} files`)).join('\n');
+    fmt.note(nsLines, chalk.green('New (unpushed)'));
+  }
+
   if (modified.length > 0) {
     fmt.note(
       modified.map(m => chalk.yellow(m)).join('\n'),
@@ -92,7 +111,7 @@ export function statusCommand(args) {
     );
   }
 
-  if (modified.length === 0 && conflicts.length === 0 && missing.length === 0) {
+  if (modified.length === 0 && conflicts.length === 0 && missing.length === 0 && unpushed.length === 0) {
     fmt.logSuccess('Workspace is clean');
   }
 
@@ -100,6 +119,9 @@ export function statusCommand(args) {
   if (conflicts.length > 0) {
     fmt.logWarn(`Fix conflicts: ${chalk.dim('grep -r "<<<<<<< " .aw_registry/')}`);
   }
+  if (unpushed.length > 0) {
+    fmt.logInfo(`Push new files: ${chalk.dim('aw push')} or ${chalk.dim('aw push <namespace>')}`);
+  }
   if (modified.length > 0) {
     fmt.logInfo(`Push changes: ${chalk.dim('aw push <path>')}`);
   }

package/constants.mjs

@@ -1,7 +1,7 @@
 // constants.mjs — Single source of truth for registry settings.
 
 /** Base branch for PRs and sync checkout */
-export const REGISTRY_BASE_BRANCH = 'main';
+export const REGISTRY_BASE_BRANCH = 'feat/aw-push-batch';
 
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/platform-docs';

package/manifest.mjs

@@ -24,7 +24,7 @@ export function save(workspaceDir, manifest) {
   writeFileSync(manifestPath(workspaceDir), JSON.stringify(manifest, null, 2) + '\n');
 }
 
-export function update(workspaceDir, actions, namespaceName) {
+export function update(workspaceDir, actions, namespaceName, opts = {}) {
   const manifest = load(workspaceDir);
   manifest.synced_at = new Date().toISOString();
   manifest.namespace = namespaceName || manifest.namespace;
@@ -38,7 +38,9 @@ export function update(workspaceDir, actions, namespaceName) {
         manifest.files[manifestKey] = {
           sha256: hashFile(act.targetPath),
           source: act.source,
-          registry_sha256: act.registryHash,
+          // When pulled from template (renamed namespace), these files don't exist
+          // in the remote registry yet — mark as null so push detects them as new.
+          registry_sha256: opts.fromTemplate ? null : act.registryHash,
         };
       }
     } else if (act.action === 'CONFLICT') {

package/package.json

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

package/plan.mjs

@@ -68,7 +68,10 @@ export function computePlan(registryDirs, workspaceDir, includePatterns = [], {
           action = 'UPDATE';
         } else {
           const localChanged = localHash !== manifestEntry.sha256;
-          const registryChanged = registryHash !== manifestEntry.registry_sha256;
+          // registry_sha256 is null for template-derived files (never pushed).
+          // Treat null as "no known registry version" — can't conflict with unknown.
+          const registryChanged = manifestEntry.registry_sha256 != null
+            && registryHash !== manifestEntry.registry_sha256;
           if (localChanged && registryChanged) {
             action = 'CONFLICT';
           } else if (localChanged) {