@ghl-ai/aw 0.1.36-beta.12 → 0.1.36-beta.13

package/commands/push.mjs

@@ -17,6 +17,7 @@ import {
   isValidClone,
   isWorktree,
   getLocalRegistryDir,
+  commitsAheadOfMain,
 } from '../git.mjs';
 
 const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
@@ -26,6 +27,9 @@ const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
 // Auto-generate a branch name from the files being pushed.
 function generateBranchName(files) {
   const shortId = Date.now().toString(36).slice(-5);
+
+  if (files.length === 0) return `sync/state-${shortId}`;
+
   const namespaces = [...new Set(files.map(f => f.namespace))];
   const hasDeletes = files.some(f => f.deleted);
   const allDeletes = files.every(f => f.deleted);
@@ -44,92 +48,96 @@ function generateBranchName(files) {
   return `${prefix}/batch-${shortId}`;
 }
 
+const TYPE_SINGULAR = { agents: 'agent', skills: 'skill', commands: 'command', evals: 'eval' };
+
+function singular(type, count) {
+  const s = TYPE_SINGULAR[type] ?? type;
+  return count === 1 ? s : `${s}s`;
+}
+
 function generatePrTitle(files) {
+  if (files.length === 0) return 'feat(registry): sync current state';
+
+  const namespaces = [...new Set(files.map(f => f.namespace))];
+
   if (files.length === 1) {
     const f = files[0];
-    const verb = f.deleted ? 'Remove' : 'Add';
-    const prep = f.deleted ? 'from' : 'to';
-    return `${verb} ${f.slug} (${f.type}) ${prep} ${f.namespace}`;
+    const verb = f.deleted ? 'remove' : 'update';
+    const scope = f.namespace;
+    return `feat(${scope}): ${verb} ${f.slug} ${TYPE_SINGULAR[f.type] ?? f.type}`;
   }
 
-  const addCounts = {};
-  const deleteCounts = {};
-  for (const f of files) {
-    const target = f.deleted ? deleteCounts : addCounts;
-    target[f.type] = (target[f.type] || 0) + 1;
-  }
-  const parts = [];
-  for (const [type, count] of Object.entries(addCounts)) {
-    parts.push(`+${count} ${type}`);
-  }
-  for (const [type, count] of Object.entries(deleteCounts)) {
-    parts.push(`-${count} ${type}`);
-  }
-  const namespaces = [...new Set(files.map(f => f.namespace))];
+  const added = files.filter(f => !f.deleted);
+  const deleted = files.filter(f => f.deleted);
+  const countsByType = groupBy(added.length ? added : deleted, 'type');
+  const summary = Object.entries(countsByType)
+    .map(([t, items]) => `${items.length} ${singular(t, items.length)}`)
+    .join(', ');
+  const verb = added.length === 0 ? 'remove' : deleted.length === 0 ? 'sync' : 'sync';
 
   if (namespaces.length === 1) {
-    return `sync: ${parts.join(', ')} in ${namespaces[0]}`;
+    return `feat(${namespaces[0]}): ${verb} ${summary}`;
   }
-  return `sync: ${parts.join(', ')} across ${namespaces.join(', ')}`;
+  return `feat(registry): ${verb} ${files.length} files across ${namespaces.length} namespaces`;
 }
 
-function generatePrBody(files, newNamespaces) {
-  if (files.length === 1) {
-    const f = files[0];
-    const action = f.deleted ? 'Registry Removal' : 'Registry Upload';
-    const bodyParts = [
-      `## ${action}`,
-      '',
-      `- **Type:** ${f.type}`,
-      `- **Slug:** ${f.slug}`,
-      `- **Namespace:** ${f.namespace}`,
-      `- **Path:** \`${f.registryTarget}\``,
-    ];
-    if (f.deleted) {
-      bodyParts.push('', '> File was deleted locally and removed from registry.');
-    }
-    if (newNamespaces.length > 0) {
-      bodyParts.push('', '> **New namespace** — CODEOWNERS entry auto-added.');
-    }
-    bodyParts.push('', `${f.deleted ? 'Removed' : 'Uploaded'} via \`aw push\``);
-    return bodyParts.join('\n');
-  }
+const AW_BRANDING = `---\nGenerated by [AW CLI](https://github.com/GoHighLevel/ghl-agentic-workspace)`;
 
+function generatePrBody(files, newNamespaces) {
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
+  const bodyParts = [];
 
-  const bodyParts = ['## Registry Sync', ''];
+  if (files.length === 0) {
+    bodyParts.push(
+      '## Registry Sync',
+      '',
+      'No new file changes — branching current state to capture all unpublished commits.',
+      '',
+      AW_BRANDING,
+    );
+    return bodyParts.join('\n');
+  }
 
-  if (added.length > 0) {
-    const grouped = groupBy(added, 'type');
-    bodyParts.push('### Added / Updated');
-    for (const [type, items] of Object.entries(grouped)) {
-      bodyParts.push(`**${type}**`);
-      for (const item of items.sort((a, b) => a.slug.localeCompare(b.slug))) {
-        bodyParts.push(`- \`${item.slug}\` (${item.namespace})`);
+  if (files.length === 1) {
+    const f = files[0];
+    const verb = f.deleted ? 'Removed' : 'Updated';
+    bodyParts.push(
+      `## ${verb} \`${f.slug}\` ${TYPE_SINGULAR[f.type] ?? f.type}`,
+      '',
+      `| Field | Value |`,
+      `|-------|-------|`,
+      `| Namespace | \`${f.namespace}\` |`,
+      `| Type | ${f.type} |`,
+      `| Path | \`${f.registryTarget}\` |`,
+    );
+  } else {
+    bodyParts.push('## Registry Sync', '');
+
+    if (added.length > 0) {
+      bodyParts.push('### Added / Updated', '');
+      bodyParts.push('| Type | Slug | Namespace |', '|------|------|-----------|');
+      for (const f of added.sort((a, b) => a.slug.localeCompare(b.slug))) {
+        bodyParts.push(`| ${f.type} | \`${f.slug}\` | \`${f.namespace}\` |`);
       }
+      bodyParts.push('');
     }
-    bodyParts.push('');
-  }
 
-  if (deleted.length > 0) {
-    const grouped = groupBy(deleted, 'type');
-    bodyParts.push('### Removed');
-    for (const [type, items] of Object.entries(grouped)) {
-      bodyParts.push(`**${type}**`);
-      for (const item of items.sort((a, b) => a.slug.localeCompare(b.slug))) {
-        bodyParts.push(`- ~~\`${item.slug}\`~~ (${item.namespace})`);
+    if (deleted.length > 0) {
+      bodyParts.push('### Removed', '');
+      bodyParts.push('| Type | Slug | Namespace |', '|------|------|-----------|');
+      for (const f of deleted.sort((a, b) => a.slug.localeCompare(b.slug))) {
+        bodyParts.push(`| ${f.type} | ~~\`${f.slug}\`~~ | \`${f.namespace}\` |`);
       }
+      bodyParts.push('');
     }
-    bodyParts.push('');
   }
 
   if (newNamespaces.length > 0) {
-    bodyParts.push(`> **New namespace${newNamespaces.length > 1 ? 's' : ''}:** ${newNamespaces.join(', ')} — CODEOWNERS entr${newNamespaces.length > 1 ? 'ies' : 'y'} auto-added.`);
-    bodyParts.push('');
+    bodyParts.push('', `> **New namespace${newNamespaces.length > 1 ? 's' : ''}:** \`${newNamespaces.join('`, `')}\` — CODEOWNERS entr${newNamespaces.length > 1 ? 'ies' : 'y'} auto-added.`);
   }
 
-  bodyParts.push(`---`, `Synced via \`aw push\` (${files.length} files: ${added.length} added/updated, ${deleted.length} removed)`);
+  bodyParts.push('', AW_BRANDING);
   return bodyParts.join('\n');
 }
 
@@ -277,7 +285,11 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${t} removed`);
   const countParts = [...addedParts, ...deletedParts];
 
-  fmt.logInfo(`${chalk.bold(files.length)} file${files.length > 1 ? 's' : ''} to push (${countParts.join(', ')})`);
+  if (files.length === 0) {
+    fmt.logInfo('Branching current state (no new changes)');
+  } else {
+    fmt.logInfo(`${chalk.bold(files.length)} file${files.length > 1 ? 's' : ''} to push (${countParts.join(', ')})`);
+  }
 
   if (dryRun) {
     for (const f of files) {
@@ -416,23 +428,42 @@ export function pushCommand(args) {
       ...changes.deleted.map(e => ({ ...e, deleted: true })),
     ];
 
+    if (allEntries.length === 0 && worktreeFlow && commitsAheadOfMain(awHome) > 0) {
+      fmt.logInfo(`${chalk.dim('mode:')} auto (no new changes — branching current state)`);
+      doPush([], awHome, dryRun, worktreeFlow, false);
+      return;
+    }
+
     if (allEntries.length === 0) {
       fmt.cancel('Nothing to push — no staged or modified files.\n\n  Stage files in your IDE or use `aw status` to see changes.');
       return;
     }
 
-    const files = allEntries.map(f => {
-      const meta = parseRegistryPath(f.registryPath);
-      const parts = f.registryPath.split('/');
-      return {
-        absPath: join(awHome, f.path),
-        registryTarget: f.path,
-        type: meta?.type ?? 'file',
-        namespace: meta?.namespace ?? parts.slice(0, -1).join('/'),
-        slug: meta?.slug ?? parts[parts.length - 1].replace(/\.md$/, ''),
-        deleted: f.deleted,
-      };
-    });
+    const files = allEntries
+      .filter(f => parseRegistryPath(f.registryPath) !== null)
+      .map(f => {
+        const meta = parseRegistryPath(f.registryPath);
+        const parts = f.registryPath.split('/');
+        return {
+          absPath: join(awHome, f.path),
+          registryTarget: f.path,
+          type: meta?.type ?? 'file',
+          namespace: meta?.namespace ?? parts.slice(0, -1).join('/'),
+          slug: meta?.slug ?? parts[parts.length - 1].replace(/\.md$/, ''),
+          deleted: f.deleted,
+        };
+      });
+
+    if (files.length === 0) {
+      // In worktree flow, still push if there are commits ahead of main not yet in a PR
+      if (worktreeFlow && commitsAheadOfMain(awHome) > 0) {
+        fmt.logInfo(`${chalk.dim('mode:')} auto (no new changes — branching current state)`);
+        doPush([], awHome, dryRun, worktreeFlow, false);
+        return;
+      }
+      fmt.cancel('Nothing to push — no staged or modified files.\n\n  Stage files in your IDE or use `aw status` to see changes.');
+      return;
+    }
 
     fmt.logInfo(`${chalk.dim('mode:')} auto (${files.length} file${files.length > 1 ? 's' : ''} — stage specific files to push a subset)`);
     doPush(files, awHome, dryRun, worktreeFlow, false);

package/git.mjs

@@ -345,6 +345,7 @@ export function updatePushBranch(awHome, pushBranchName) {
  *
  * preStaged=true  → files are already in the index; skip `git add`
  * preStaged=false → explicitly stage `files` before committing
+ * files=[]        → skip staging+commit entirely (branch current HEAD and push)
  *
  * Branch stays on disk for iteration. Returns the branch name.
  */
@@ -355,21 +356,23 @@ export function createPushBranch(awHome, branchName, files, commitMsg, preStaged
     throw new Error(`Failed to create branch ${branchName}: ${e.message}`);
   }
 
-  if (!preStaged) {
+  if (files.length > 0 || preStaged) {
+    if (!preStaged) {
+      try {
+        const quotedFiles = files.map(f => `"${f}"`).join(' ');
+        execSync(`git -C "${awHome}" add ${quotedFiles}`, { stdio: 'pipe' });
+      } catch (e) {
+        throw new Error(`Failed to stage files: ${e.message}`);
+      }
+    }
+
     try {
-      const quotedFiles = files.map(f => `"${f}"`).join(' ');
-      execSync(`git -C "${awHome}" add ${quotedFiles}`, { stdio: 'pipe' });
+      execSync(`git -C "${awHome}" commit -m "${commitMsg.replace(/"/g, '\\"')}"`, { stdio: 'pipe' });
     } catch (e) {
-      throw new Error(`Failed to stage files: ${e.message}`);
+      throw new Error(`Failed to commit: ${e.message}`);
     }
   }
 
-  try {
-    execSync(`git -C "${awHome}" commit -m "${commitMsg.replace(/"/g, '\\"')}"`, { stdio: 'pipe' });
-  } catch (e) {
-    throw new Error(`Failed to commit: ${e.message}`);
-  }
-
   try {
     execSync(`git -C "${awHome}" push -u origin "${branchName}"`, { stdio: 'pipe' });
   } catch (e) {
@@ -379,6 +382,21 @@ export function createPushBranch(awHome, branchName, files, commitMsg, preStaged
   return branchName;
 }
 
+/**
+ * Count commits on the current branch that are not yet in main.
+ */
+export function commitsAheadOfMain(awHome) {
+  try {
+    const out = execSync(
+      `git -C "${awHome}" rev-list --count ${REGISTRY_BASE_BRANCH}..HEAD`,
+      { stdio: 'pipe', encoding: 'utf8' },
+    );
+    return parseInt(out.trim(), 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+
 /**
  * Get the current branch name in awHome.
  */

package/package.json

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