@ghl-ai/aw 0.1.36-beta.93 → 0.1.36-beta.95

package/commands/init.mjs

@@ -205,7 +205,15 @@ export async function initCommand(args) {
   // ── Re-init path: already set up with native git clone ────────────────
 
   if (isGitNative) {
-    const cfg = config.load(GLOBAL_AW_DIR);
+    let cfg = config.load(GLOBAL_AW_DIR);
+
+    // Migration: create minimal config if it's missing (older installs may not have it)
+    if (!cfg) {
+      try {
+        config.create(GLOBAL_AW_DIR, { namespace: team || null, user: '' });
+        cfg = config.load(GLOBAL_AW_DIR);
+      } catch { /* GLOBAL_AW_DIR may not exist yet — full-init path will create it below */ }
+    }
 
     const isNewSubTeam = folderName && cfg && !cfg.include.includes(folderName);
     if (isNewSubTeam) {

package/commands/pull.mjs

@@ -3,7 +3,7 @@
 import { mkdirSync, existsSync, readdirSync, copyFileSync, unlinkSync, rmdirSync, lstatSync } from 'node:fs';
 import { join, relative, extname } from 'node:path';
 import { homedir } from 'node:os';
-import { exec as execCb } from 'node:child_process';
+import { exec as execCb, execSync } from 'node:child_process';
 import { promisify } from 'node:util';
 
 const exec = promisify(execCb);
@@ -11,7 +11,7 @@ import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { fetchAndMerge, addToSparseCheckout, removeFromSparseCheckout, syncWorktreeSparseCheckout, isValidClone, findNearestWorktree, rebaseOntoOriginMain } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, DOCS_SOURCE_DIR } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_URL, DOCS_SOURCE_DIR } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions } from '../integrate.mjs';
 
@@ -89,7 +89,7 @@ export async function pullCommand(args) {
   s.start('Fetching latest from registry...');
   let fetchResult = { updated: false, conflicts: [] };
   try {
-    fetchResult = await fetchAndMerge(AW_HOME);
+    fetchResult = await fetchAndMerge(AW_HOME, { silent });
     s.stop(fetchResult.updated ? 'Registry updated' : 'Already up to date');
   } catch (e) {
     s.stop(chalk.yellow('Fetch failed'));
@@ -113,14 +113,24 @@ export async function pullCommand(args) {
 
   if (fetchResult.conflicts.length > 0) {
     if (!silent) {
-      // Interactive mode: abort the merge so the working tree is clean again
-      try { await exec(`git -C "${AW_HOME}" merge --abort`); } catch { /* best effort */ }
-      log.logWarn(`Merge conflict in: ${fetchResult.conflicts.join(', ')}`);
-      log.logWarn('Merge aborted — your branch is unchanged. Resolve conflicts and run `aw pull` again.');
+      // Interactive: fetchAndMerge left the rebase in-progress with conflict markers.
+      // Do NOT touch git here — the user needs to resolve the markers in their IDE.
+      // Skipping syncDocs and IDE re-linking intentionally: working tree is partially
+      // applied (conflict markers in files) and must not be synced in this state.
+      log.logWarn('Conflicts detected. Open the files in your IDE and resolve the markers:');
+      for (const f of fetchResult.conflicts) {
+        log.logMessage(`  ${chalk.red('✗')} ${f}`);
+      }
+      log.logWarn('After resolving, run:');
+      log.logMessage(`  git -C "${AW_HOME}" rebase --continue`);
+      log.logWarn('Then run `aw pull` again to complete the sync.');
+      log.logWarn('(On a push branch: also run `aw push` after to update your PR.)');
+      log.outro(chalk.yellow('Pull paused — resolve conflicts to continue'));
       return;
     }
-    // Silent mode: leave conflict markers in place for IDE to show
-    log.logWarn(`Conflicts in: ${fetchResult.conflicts.join(', ')}`);
+    // Silent: fetchAndMerge already ran rebase --abort. Repo is clean. Warn and continue
+    // so syncDocs and IDE re-linking still run against the clean (pre-conflict) state.
+    log.logWarn(`Conflicts detected and aborted: ${fetchResult.conflicts.join(', ')}`);
   }
 
   // Rebase project worktree branch onto origin/main — only for legacy git worktrees.

package/git.mjs

@@ -255,11 +255,15 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   const isDrift = !isBaseBranch && !isPushBranch && currentBranch !== 'HEAD';
 
   if (isDrift) {
-    // Re-enable sparse checkout (may have been disabled by an old --no-edit merge)
+    // Re-enable sparse checkout (may have been disabled by an old --no-edit merge).
+    // After `git sparse-checkout init --no-cone`, git resets paths to `/*` + `!/*/`
+    // (root files only, no subdirectories) — which excludes .aw_registry/.
+    // We must explicitly set the registry path so files materialise on checkout.
     try {
       await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
       const { stdout: listOut } = await exec(`git -C "${awHome}" sparse-checkout list`);
-      if (!listOut.trim()) {
+      const hasPaths = listOut.trim().split('\n').filter(Boolean).some(p => p.includes(REGISTRY_DIR));
+      if (!hasPaths) {
         await exec(`git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`);
       }
     } catch {

package/package.json

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