@ghl-ai/aw 0.1.40-beta.0 → 0.1.41-beta.0

package/commands/init.mjs

@@ -371,7 +371,7 @@ export async function initCommand(args) {
   }
 
   // Determine sparse paths
-  const sparsePaths = [`.aw_registry/platform`, `content`, RULES_SOURCE_DIR, `.aw_registry/AW-PROTOCOL.md`, `CODEOWNERS`];
+  const sparsePaths = [`.aw_registry/platform`, `content`, RULES_SOURCE_DIR, `.aw_registry/AW-PROTOCOL.md`, `CODEOWNERS`, `.github/CODEOWNERS`];
   if (folderName) {
     sparsePaths.push(`.aw_registry/${folderName}`);
   }

package/commands/push.mjs

@@ -1,7 +1,7 @@
 // commands/push.mjs — Push local agents/skills to registry via PR using persistent git clone
 
 import { existsSync, statSync, readFileSync, appendFileSync } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { join, dirname, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { exec as execCb, execFile as execFileCb } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -361,7 +361,11 @@ async function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = f
 
   // CODEOWNERS for new namespaces (runs inside spinner so no silent gap)
   const topNamespaces = [...new Set(files.map(f => f.namespace.split('/')[0]))];
-  const codeownersPath = join(awHome, 'CODEOWNERS');
+  // GitHub looks for CODEOWNERS in .github/ first (takes precedence over root).
+  // platform-docs has .github/CODEOWNERS as the authoritative file.
+  const codeownersPath = existsSync(join(awHome, '.github', 'CODEOWNERS'))
+    ? join(awHome, '.github', 'CODEOWNERS')
+    : join(awHome, 'CODEOWNERS');
   const newNamespaces = [];
   const ghUser = await getGitHubUser();
   for (const ns of topNamespaces) {
@@ -374,7 +378,8 @@ async function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = f
 
   const pathsToStage = files.map(f => f.registryTarget);
   if (newNamespaces.length > 0 && existsSync(codeownersPath)) {
-    pathsToStage.push('CODEOWNERS');
+    // Stage the correct relative path (could be .github/CODEOWNERS or root CODEOWNERS)
+    pathsToStage.push(relative(awHome, codeownersPath));
   }
   // Also stage any extra paths (content/, CODEOWNERS manual edits) passed from the caller
   for (const p of extraPaths) {
@@ -473,17 +478,17 @@ export async function pushCommand(args) {
   if (!input) {
     const rulesChanged = hasRulesChanges(cwd);
 
-    // Extra paths outside .aw_registry/ that aw also manages: content/ and CODEOWNERS.
+    // Extra paths outside .aw_registry/ that aw also manages: content/, CODEOWNERS, .github/CODEOWNERS.
     // Detect staged variants for staged-mode and unstaged variants for auto-mode.
     const getExtraStagedPaths = async () => {
       try {
-        const { stdout } = await exec(`git -C "${awHome}" diff --cached --name-only -- content/ CODEOWNERS`);
+        const { stdout } = await exec(`git -C "${awHome}" diff --cached --name-only -- content/ CODEOWNERS .github/CODEOWNERS`);
         return stdout.trim().split('\n').filter(Boolean);
       } catch { return []; }
     };
     const getExtraChangedPaths = async () => {
       try {
-        const { stdout } = await exec(`git -C "${awHome}" status --porcelain -- content/ CODEOWNERS`);
+        const { stdout } = await exec(`git -C "${awHome}" status --porcelain -- content/ CODEOWNERS .github/CODEOWNERS`);
         // git status --porcelain prefix is XY (2 chars) + optional space + path.
         // Staged-only files: `M path` (2-char prefix); unstaged files: ` M path` (3-char prefix).
         // slice(2).trimStart() handles both cases correctly.

package/git.mjs

@@ -9,49 +9,6 @@ import { REGISTRY_BASE_BRANCH, REGISTRY_DIR, DOCS_SOURCE_DIR, RULES_SOURCE_DIR }
 
 const exec = promisify(execCb);
 
-/**
- * Env vars applied to every git command that touches the network.
- * GIT_TERMINAL_PROMPT=0 prevents git from hanging when it would otherwise
- * prompt for credentials (e.g. HTTPS URL with SSH-only auth configured).
- * Instead, git exits immediately with a non-zero code that we can catch.
- */
-const GIT_NET_ENV = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
-
-/**
- * Convert an HTTPS GitHub URL to its SSH equivalent.
- * e.g. https://github.com/Org/Repo.git → git@github.com:Org/Repo.git
- */
-function toSshUrl(httpsUrl) {
-  const m = httpsUrl.match(/^https:\/\/github\.com\/(.+)$/);
-  return m ? `git@github.com:${m[1]}` : httpsUrl;
-}
-
-/**
- * Detect whether the user's git is configured to prefer SSH for github.com.
- * Checks: 1) git insteadOf config  2) gh CLI auth status
- * Returns true if SSH is preferred.
- */
-function prefersSsh() {
-  // Check git url."git@github.com:".insteadOf
-  try {
-    const out = execSync(
-      'git config --global --get-regexp "url\\.git@github\\.com.*\\.insteadOf"',
-      { stdio: 'pipe', encoding: 'utf8', env: GIT_NET_ENV },
-    ).trim();
-    if (out.includes('https://github.com')) return true;
-  } catch { /* not configured */ }
-
-  // Check gh auth — if protocol is ssh, prefer SSH
-  try {
-    const out = execSync('gh auth status 2>&1', {
-      stdio: 'pipe', encoding: 'utf8', env: GIT_NET_ENV, timeout: 5000,
-    });
-    if (/git protocol:\s*ssh/i.test(out)) return true;
-  } catch { /* gh not installed or not authed */ }
-
-  return false;
-}
-
 // ── Backward-compat: temp-dir sparse checkout (used by search.mjs) ────────────
 
 /**
@@ -61,23 +18,12 @@ function prefersSsh() {
 export function sparseCheckout(repo, paths) {
   const tempDir = mkdtempSync(join(tmpdir(), 'aw-'));
 
-  const httpsUrl = repo.startsWith('http') ? repo : `https://github.com/${repo}.git`;
-  const urls = prefersSsh() ? [toSshUrl(httpsUrl), httpsUrl] : [httpsUrl, toSshUrl(httpsUrl)];
-
-  let cloned = false;
-  for (const url of urls) {
-    try {
-      execSync(`git clone --filter=blob:none --no-checkout "${url}" "${tempDir}"`, {
-        stdio: 'pipe', env: GIT_NET_ENV,
-      });
-      cloned = true;
-      break;
-    } catch {
-      // Clean up partial clone so next attempt can use the same tempDir
-      try { rmSync(join(tempDir, '.git'), { recursive: true, force: true }); } catch {}
-    }
-  }
-  if (!cloned) {
+  const repoUrl = repo.startsWith('http') ? repo : `https://github.com/${repo}.git`;
+  try {
+    execSync(`git clone --filter=blob:none --no-checkout "${repoUrl}" "${tempDir}"`, {
+      stdio: 'pipe',
+    });
+  } catch (e) {
     throw new Error(`Failed to clone ${repo}. Check your git credentials and repo access.`);
   }
 
@@ -101,20 +47,10 @@ export function sparseCheckout(repo, paths) {
 export async function sparseCheckoutAsync(repo, paths) {
   const tempDir = mkdtempSync(join(tmpdir(), 'aw-'));
 
-  const httpsUrl = repo.startsWith('http') ? repo : `https://github.com/${repo}.git`;
-  const urls = prefersSsh() ? [toSshUrl(httpsUrl), httpsUrl] : [httpsUrl, toSshUrl(httpsUrl)];
-
-  let cloned = false;
-  for (const url of urls) {
-    try {
-      await exec(`git clone --filter=blob:none --no-checkout "${url}" "${tempDir}"`, { env: GIT_NET_ENV });
-      cloned = true;
-      break;
-    } catch {
-      try { rmSync(join(tempDir, '.git'), { recursive: true, force: true }); } catch {}
-    }
-  }
-  if (!cloned) {
+  const repoUrl = repo.startsWith('http') ? repo : `https://github.com/${repo}.git`;
+  try {
+    await exec(`git clone --filter=blob:none --no-checkout "${repoUrl}" "${tempDir}"`);
+  } catch (e) {
     throw new Error(`Failed to clone ${repo}. Check your git credentials and repo access.`);
   }
 
@@ -170,9 +106,7 @@ export function isValidClone(awHome, repoUrl) {
   if (!existsSync(join(awHome, '.git'))) return false;
   try {
     const remote = execSync('git remote get-url origin', { cwd: awHome, stdio: 'pipe', encoding: 'utf8' }).trim();
-    // Normalize both sides to bare repo path for comparison (handles HTTPS ↔ SSH)
-    const normalize = (u) => u.replace(/\.git$/, '').replace(/^git@github\.com:/, 'https://github.com/');
-    return normalize(remote) === normalize(repoUrl);
+    return remote === repoUrl || remote === repoUrl.replace(/\.git$/, '') + '.git' || remote.replace(/\.git$/, '') === repoUrl.replace(/\.git$/, '');
   } catch {
     return false;
   }
@@ -189,26 +123,10 @@ export async function initPersistentClone(repoUrl, awHome, sparsePaths) {
     try { execSync(`rm -rf "${awHome}"`, { stdio: 'pipe' }); } catch {}
   }
 
-  const urls = prefersSsh()
-    ? [toSshUrl(repoUrl), repoUrl]
-    : [repoUrl, toSshUrl(repoUrl)];
-
-  let cloned = false;
-  for (const url of urls) {
-    // Clean up any partial clone from a previous attempt
-    if (existsSync(awHome) && !isValidClone(awHome, url)) {
-      try { execSync(`rm -rf "${awHome}"`, { stdio: 'pipe' }); } catch {}
-    }
-    try {
-      await exec(`git clone --filter=blob:none --no-checkout "${url}" "${awHome}"`, { env: GIT_NET_ENV });
-      cloned = true;
-      break;
-    } catch {
-      // try next URL
-    }
-  }
-  if (!cloned) {
-    throw new Error(`Failed to clone ${repoUrl}. Check your git credentials and repo access (HTTPS and SSH both failed).`);
+  try {
+    await exec(`git clone --filter=blob:none --no-checkout "${repoUrl}" "${awHome}"`);
+  } catch (e) {
+    throw new Error(`Failed to clone ${repoUrl}: ${e.message}`);
   }
 
   try {
@@ -368,7 +286,7 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
 
   // ── 2. Fetch ──────────────────────────────────────────────────────────────
   try {
-    await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`, { env: GIT_NET_ENV });
+    await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`);
   } catch (e) {
     throw new Error(`Failed to fetch from origin: ${e.message}`);
   }
@@ -397,7 +315,7 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
     // someone else pushed to the remote tracking branch since our last fetch.
     if (isPushBranch) {
       try {
-        await exec(`git -C "${awHome}" push --force-with-lease origin "${currentBranch}"`, { env: GIT_NET_ENV });
+        await exec(`git -C "${awHome}" push --force-with-lease origin "${currentBranch}"`);
       } catch { /* non-blocking — divergence will be resolved on next aw push */ }
     }
   } catch {
@@ -524,7 +442,7 @@ export function updatePushBranch(awHome, pushBranchName) {
   }
 
   try {
-    execSync(`git -C "${awHome}" push origin "${pushBranchName}" --force`, { stdio: 'pipe', env: GIT_NET_ENV });
+    execSync(`git -C "${awHome}" push origin "${pushBranchName}" --force`, { stdio: 'pipe' });
   } catch (e) {
     throw new Error(`Failed to push branch: ${e.message}`);
   }
@@ -567,7 +485,7 @@ export async function createPushBranch(awHome, branchName, files, commitMsg, pre
   }
 
   try {
-    await exec(`git -C "${awHome}" push -u origin "${branchName}"`, { env: GIT_NET_ENV });
+    await exec(`git -C "${awHome}" push -u origin "${branchName}"`);
   } catch (e) {
     throw new Error(`Failed to push branch: ${e.message}`);
   }

package/package.json

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