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

package/commands/push.mjs

@@ -18,6 +18,7 @@ import {
   isWorktree,
   getLocalRegistryDir,
   commitsAheadOfMain,
+  logAheadOfMain,
 } from '../git.mjs';
 
 const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
@@ -55,8 +56,26 @@ function singular(type, count) {
   return count === 1 ? s : `${s}s`;
 }
 
-function generatePrTitle(files) {
-  if (files.length === 0) return 'feat(registry): sync current state';
+function extractNamespaceFromCommits(commits) {
+  // Try to extract a common namespace from commit messages like
+  // "registry: add agents/foo to revex/courses/backend"
+  const matches = commits
+    .map(c => c.message.match(/\bto\s+([\w/]+)$/))
+    .filter(Boolean)
+    .map(m => m[1]);
+  if (matches.length === 0) return null;
+  const unique = [...new Set(matches)];
+  return unique.length === 1 ? unique[0] : null;
+}
+
+function generatePrTitle(files, awHome = null) {
+  if (files.length === 0) {
+    const commits = awHome ? logAheadOfMain(awHome) : [];
+    const ns = extractNamespaceFromCommits(commits);
+    return ns
+      ? `feat(${ns}): push local changes`
+      : 'feat(registry): push local changes';
+  }
 
   const namespaces = [...new Set(files.map(f => f.namespace))];
 
@@ -81,21 +100,24 @@ function generatePrTitle(files) {
   return `feat(registry): ${verb} ${files.length} files across ${namespaces.length} namespaces`;
 }
 
-const AW_BRANDING = `---\nGenerated by [AW CLI](https://github.com/GoHighLevel/ghl-agentic-workspace)`;
+const AW_BRANDING = `---\n🤖 Generated by [AW CLI](https://github.com/GoHighLevel/ghl-agentic-workspace)`;
 
-function generatePrBody(files, newNamespaces) {
+function generatePrBody(files, newNamespaces, awHome = null) {
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
   const bodyParts = [];
 
   if (files.length === 0) {
-    bodyParts.push(
-      '## Registry Sync',
-      '',
-      'No new file changes — branching current state to capture all unpublished commits.',
-      '',
-      AW_BRANDING,
-    );
+    const commits = awHome ? logAheadOfMain(awHome) : [];
+    bodyParts.push('## What\'s included', '');
+    if (commits.length > 0) {
+      for (const c of commits) {
+        bodyParts.push(`- \`${c.hash}\` ${c.message}`);
+      }
+    } else {
+      bodyParts.push('Syncing current state to registry.');
+    }
+    bodyParts.push('', AW_BRANDING);
     return bodyParts.join('\n');
   }
 
@@ -321,8 +343,8 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   }
 
   const commitMsg = generateCommitMsg(files);
-  const prTitle = generatePrTitle(files);
-  const prBody = generatePrBody(files, newNamespaces);
+  const prTitle = generatePrTitle(files, awHome);
+  const prBody = generatePrBody(files, newNamespaces, awHome);
 
   const s = fmt.spinner();
   s.start('Committing and pushing...');

package/git.mjs

@@ -397,6 +397,25 @@ export function commitsAheadOfMain(awHome) {
   }
 }
 
+/**
+ * Get one-line log of commits ahead of main.
+ * Returns array of { hash, message } objects.
+ */
+export function logAheadOfMain(awHome) {
+  try {
+    const out = execSync(
+      `git -C "${awHome}" log ${REGISTRY_BASE_BRANCH}..HEAD --oneline`,
+      { stdio: 'pipe', encoding: 'utf8' },
+    );
+    return out.trim().split('\n').filter(Boolean).map(line => {
+      const spaceIdx = line.indexOf(' ');
+      return { hash: line.slice(0, spaceIdx), message: line.slice(spaceIdx + 1) };
+    });
+  } catch {
+    return [];
+  }
+}
+
 /**
  * Get the current branch name in awHome.
  */

package/package.json

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