@ghl-ai/aw 0.1.36-beta.83 → 0.1.36-beta.86

package/commands/init.mjs

@@ -220,8 +220,15 @@ export async function initCommand(args) {
     const s = fmt.spinner();
     if (!silent) s.start('Fetching latest from registry...');
     try {
-      await fetchAndMerge(AW_HOME);
-      if (!silent) s.stop('Registry up to date');
+      const { conflicts } = await fetchAndMerge(AW_HOME, { silent });
+      if (!silent) {
+        if (conflicts.length > 0) {
+          s.stop(chalk.yellow(`Conflicts in ${conflicts.length} file${conflicts.length > 1 ? 's' : ''} — resolve then run aw init again`));
+          fmt.logWarn(conflicts.map(f => `  • ${f}`).join('\n'));
+        } else {
+          s.stop('Registry up to date');
+        }
+      }
     } catch (e) {
       if (!silent) s.stop(chalk.yellow('Fetch failed — continuing with local cache'));
     }

package/commands/push.mjs

@@ -548,17 +548,26 @@ export async function pushCommand(args) {
       else if (existsSync(awBased + '.md')) absPath = awBased + '.md';
     }
   }
+  let isDeletedFile = false;
   if (!absPath || !existsSync(absPath)) {
     if (absPath && !absPath.endsWith('.md') && existsSync(absPath + '.md')) {
       absPath = absPath + '.md';
     } else {
-      fmt.cancel(`Path not found: ${absPath || input}\n\n  Only files inside .aw_registry/ can be pushed.\n  Use ${chalk.dim('aw status')} to see modified files.`);
-      return;
+      // File may have been deleted — check detectChanges before giving up
+      const preCheck = detectChanges(awHome, REGISTRY_DIR);
+      const deletedPaths = new Set(preCheck.deleted.map(e => e.path));
+      const candidate = `${REGISTRY_DIR}/${resolved.registryPath}`;
+      if (deletedPaths.has(candidate) || deletedPaths.has(candidate + '.md')) {
+        isDeletedFile = true;
+      } else {
+        fmt.cancel(`Path not found: ${absPath || input}\n\n  Only files inside .aw_registry/ can be pushed.\n  Use ${chalk.dim('aw status')} to see modified files.`);
+        return;
+      }
     }
   }
 
   // Folder/namespace input → batch push using registry content in awHome
-  if (statSync(absPath).isDirectory()) {
+  if (!isDeletedFile && statSync(absPath).isDirectory()) {
     const relFromRegistry = absPath.startsWith(registrySubDir + '/')
       ? absPath.slice(registrySubDir.length + 1)
       : absPath.startsWith(workspaceDir + '/')
@@ -578,7 +587,25 @@ export async function pushCommand(args) {
       ...folderChanges.deleted.map(e => e.path),
     ]);
     const files = allFiles.filter(f => changedPaths.has(f.registryTarget));
-    if (files.length === 0) {
+    // Also include deleted files within this folder (collectBatchFiles misses them — files don't exist on disk)
+    const folderPrefix = relFromRegistry ? relFromRegistry + '/' : '';
+    const deletedInFolder = folderChanges.deleted
+      .filter(e => !folderPrefix || e.registryPath.startsWith(folderPrefix))
+      .map(e => {
+        const meta = parseRegistryPath(e.registryPath);
+        const parts = e.registryPath.split('/');
+        return {
+          absPath: join(awHome, e.path),
+          registryTarget: e.path,
+          type: meta?.type ?? 'file',
+          namespace: meta?.namespace ?? parts.slice(0, -1).join('/'),
+          slug: meta?.slug ?? parts[parts.length - 1].replace(/\.md$/, ''),
+          isDir: false,
+          deleted: true,
+        };
+      });
+    const allChangedFiles = [...files, ...deletedInFolder];
+    if (allChangedFiles.length === 0) {
       if (commitsAheadOfMain(awHome) > 0) {
         fmt.logInfo(`${chalk.dim('mode:')} selected folder (no new changes — branching current state)`);
         await doPush([], awHome, dryRun, worktreeFlow);
@@ -587,7 +614,7 @@ export async function pushCommand(args) {
       fmt.cancel(`Nothing to push in ${chalk.cyan(input)} — no changes found.\n\n  Files in this folder are already up to date in the registry.\n  Edit a file first, then push.`);
       return;
     }
-    await doPush(files, awHome, dryRun, worktreeFlow);
+    await doPush(allChangedFiles, awHome, dryRun, worktreeFlow);
     return;
   }
 
@@ -616,7 +643,7 @@ export async function pushCommand(args) {
   const parentDir = regParts[typeIdx];
   const slug = regParts[typeIdx + 1];
   const namespacePath = namespaceParts.join('/');
-  const isDir = statSync(absPath).isDirectory();
+  const isDir = !isDeletedFile && statSync(absPath).isDirectory();
   const registryTarget = isDir
     ? `${REGISTRY_DIR}/${namespacePath}/${parentDir}/${slug}`
     : `${REGISTRY_DIR}/${namespacePath}/${parentDir}/${slug}.md`;
@@ -648,7 +675,7 @@ export async function pushCommand(args) {
     namespace: namespacePath,
     slug,
     isDir,
-    deleted: false,
+    deleted: isDeletedFile,
   }], awHome, dryRun, worktreeFlow);
 }
 

package/constants.mjs

@@ -4,7 +4,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 /** Base branch for PRs and sync checkout */
-export const REGISTRY_BASE_BRANCH = 'main';
+export const REGISTRY_BASE_BRANCH = 'chore/stream-registry';
 
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/platform-docs';

package/git.mjs

@@ -212,10 +212,51 @@ export function removeFromSparseCheckout(awHome, removePaths) {
 }
 
 /**
- * Fetch and merge latest from origin/main into the persistent clone.
+ * Fetch and sync the persistent clone with origin/REGISTRY_BASE_BRANCH.
  * Returns { updated: boolean, conflicts: string[] }
+ *
+ * Strategy:
+ *  1. Branch guard — if ~/.aw drifted off REGISTRY_BASE_BRANCH (e.g. partial
+ *     init left it on `main`), stash + checkout the right branch first.
+ *  2. Fetch from origin.
+ *  3. Fast-forward if possible (clean case, no local commits).
+ *  4. Rebase local commits on top of remote if ff-only fails.
+ *  5. On rebase conflict in silent mode: abort to keep repo usable.
+ *     In interactive mode: leave conflict markers for the user.
+ *  NEVER uses --no-edit merge — a merge commit on blob:none + sparse-checkout
+ *  disables sparse checkout, emptying the working tree.
+ *
+ * @param {string} awHome
+ * @param {{ silent?: boolean }} opts
  */
-export async function fetchAndMerge(awHome) {
+export async function fetchAndMerge(awHome, { silent = true } = {}) {
+  // ── 1. Branch guard ──────────────────────────────────────────────────────
+  // If ~/.aw is on the wrong branch (e.g. initPersistentClone cloned but the
+  // `git checkout chore/stream-registry` step failed, leaving HEAD on main),
+  // stash any local changes and switch back before doing anything.
+  try {
+    const { stdout: branchOut } = await exec(
+      `git -C "${awHome}" rev-parse --abbrev-ref HEAD`,
+    );
+    const currentBranch = branchOut.trim();
+    if (currentBranch !== REGISTRY_BASE_BRANCH && currentBranch !== 'HEAD') {
+      let stashed = false;
+      try {
+        const { stdout: stashOut } = await exec(
+          `git -C "${awHome}" stash push --include-untracked -m "aw: branch-guard stash"`,
+        );
+        stashed = !stashOut.includes('No local changes to save');
+      } catch { /* best effort */ }
+      try {
+        await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
+      } catch { /* if checkout fails, proceed — fetch will still work */ }
+      if (stashed) {
+        try { await exec(`git -C "${awHome}" stash pop`); } catch { /* best effort */ }
+      }
+    }
+  } catch { /* if branch detection fails, proceed */ }
+
+  // ── 2. Fetch ──────────────────────────────────────────────────────────────
   try {
     await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`);
   } catch (e) {
@@ -225,21 +266,36 @@ export async function fetchAndMerge(awHome) {
   let updated = false;
   const conflicts = [];
 
+  // ── 3. Fast-forward (clean case — no local commits ahead of remote) ──────
   try {
-    const { stdout } = await exec(`git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --ff-only`);
+    const { stdout } = await exec(
+      `git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --ff-only`,
+    );
     updated = !stdout.includes('Already up to date');
+    return { updated, conflicts };
+  } catch { /* ff-only failed — local commits exist, fall through to rebase */ }
+
+  // ── 4. Rebase local commits onto remote ───────────────────────────────────
+  // Rebase keeps history linear and never disables sparse checkout.
+  try {
+    await exec(`git -C "${awHome}" rebase origin/${REGISTRY_BASE_BRANCH}`);
+    updated = true;
   } catch {
-    // ff-only failed — try no-edit merge
+    // Rebase has conflicts — collect them
     try {
-      await exec(`git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --no-edit`);
-      updated = true;
-    } catch {
-      // Parse conflicts
-      try {
-        const { stdout } = await exec(`git -C "${awHome}" diff --name-only --diff-filter=U`);
-        conflicts.push(...stdout.trim().split('\n').filter(Boolean));
-      } catch { /* best effort */ }
+      const { stdout } = await exec(
+        `git -C "${awHome}" diff --name-only --diff-filter=U`,
+      );
+      conflicts.push(...stdout.trim().split('\n').filter(Boolean));
+    } catch { /* best effort */ }
+
+    if (silent) {
+      // In background (hook/IDE) mode: abort to leave the repo in a clean,
+      // usable state. The next explicit `aw init` will surface the conflict.
+      try { await exec(`git -C "${awHome}" rebase --abort`); } catch { /* best effort */ }
     }
+    // In interactive mode: leave conflict markers in place so the user can
+    // resolve them directly in their editor.
   }
 
   return { updated, conflicts };
@@ -253,7 +309,8 @@ export async function fetchAndMerge(awHome) {
 export function detectChanges(awHome, registryDir) {
   let statusOut = '';
   try {
-    statusOut = execSync(`git -C "${awHome}" status --porcelain "${registryDir}/"`, {
+    // -u expands untracked directories to individual files so we get exact paths
+    statusOut = execSync(`git -C "${awHome}" status --porcelain -u "${registryDir}/"`, {
       stdio: 'pipe',
       encoding: 'utf8',
     });

package/package.json

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