@nalvietnam/avatar-cli 1.2.10 → 1.2.11

package/dist/index.js

@@ -1194,9 +1194,13 @@ async function applyFixes(checks) {
 
 // src/commands/init.ts
 import { basename, join as join16, relative as relative2, resolve } from "path";
-import { confirm as confirm3, input as input4, select as select7 } from "@inquirer/prompts";
+import { confirm as confirm3, input as input4, select as select8 } from "@inquirer/prompts";
 import boxen4 from "boxen";
 
+// src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
+import { spawnSync as spawnSync7 } from "child_process";
+import { select as select5 } from "@inquirer/prompts";
+
 // src/lib/prompt-recovery-action-on-failure.ts
 import { input as input2, select as select3 } from "@inquirer/prompts";
 var UserAbortedRecoveryError = class extends Error {
@@ -1403,6 +1407,51 @@ async function readPinnedPackVersion(projectRoot) {
 }
 
 // src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
+function isSshPermissionError(message) {
+  const text = message.toLowerCase();
+  return text.includes("permission denied (publickey)") || text.includes("publickey)") || text.includes("ssh: could not resolve") || text.includes("host key verification failed");
+}
+function triggerGhAuthLoginInteractive2() {
+  log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
+  const r = spawnSync7("gh", ["auth", "login", "--web"], { stdio: "inherit" });
+  if (r.status !== 0) {
+    log.warn(`gh auth login exit ${r.status}. C\xF3 th\u1EC3 ch\u1EA1y tay r\u1ED3i quay l\u1EA1i retry.`);
+  }
+}
+function openGithubSshKeysPage() {
+  log.info("M\u1EDF trang GitHub Settings \u2192 SSH Keys...");
+  const r = spawnSync7("open", ["https://github.com/settings/keys"], { stdio: "ignore" });
+  if (r.status !== 0) {
+    log.info("URL: https://github.com/settings/keys");
+  }
+}
+async function handleSshPermissionError() {
+  return await select5({
+    message: "SSH permission denied. C\xE1ch x\u1EED l\xFD?",
+    choices: [
+      {
+        name: "Switch GitHub account (gh auth login \u2014 m\u1EDF browser)",
+        value: "switch"
+      },
+      {
+        name: "D\xF9ng HTTPS thay SSH (override URL b\u1EB1ng env AVATAR_TEAM_PACK_REPO_URL)",
+        value: "https"
+      },
+      {
+        name: "T\xF4i v\u1EEBa add SSH key l\xEAn GitHub \u2014 retry",
+        value: "retry"
+      },
+      {
+        name: "B\u1ECF qua team-ai-pack (d\xF9ng avatar sync sau)",
+        value: "skip"
+      },
+      {
+        name: "T\u1EA1m ng\u01B0ng init \u2014 fix SSH key tay r\u1ED3i ch\u1EA1y l\u1EA1i",
+        value: "abort"
+      }
+    ]
+  });
+}
 async function addTeamPackSubmoduleWithRetryOnNetworkFail(projectRoot, tag, ssoEmail) {
   while (true) {
     try {
@@ -1410,9 +1459,39 @@ async function addTeamPackSubmoduleWithRetryOnNetworkFail(projectRoot, tag, ssoE
       return { pinnedTag: result.pinnedTag, skipped: false };
     } catch (err) {
       if (err instanceof TeamPackAccessAbortedError) throw err;
+      const message = err instanceof Error ? err.message : String(err);
+      if (isSshPermissionError(message)) {
+        log.warn("Pull team-ai-pack th\u1EA5t b\u1EA1i: SSH permission denied (publickey).");
+        log.dim(
+          "  \u2192 M\xE1y n\xE0y ch\u01B0a c\xF3 SSH key \u0111\u01B0\u1EE3c register tr\xEAn GitHub, ho\u1EB7c key thu\u1ED9c account kh\xE1c."
+        );
+        const action2 = await handleSshPermissionError();
+        if (action2 === "abort") {
+          throw new UserAbortedRecoveryError(
+            "User abort t\u1EA1i b\u01B0\u1EDBc pull team-ai-pack. Fix SSH key (https://github.com/settings/keys) r\u1ED3i ch\u1EA1y l\u1EA1i 'avatar init'."
+          );
+        }
+        if (action2 === "skip") {
+          log.warn(
+            "Skip team-ai-pack. Workspace d\xF9ng \u0111\u01B0\u1EE3c nh\u01B0ng kh\xF4ng c\xF3 shared knowledge. Pull sau qua `avatar sync`."
+          );
+          return { pinnedTag: null, skipped: true };
+        }
+        if (action2 === "switch") {
+          triggerGhAuthLoginInteractive2();
+          continue;
+        }
+        if (action2 === "https") {
+          process.env.AVATAR_TEAM_PACK_REPO_URL = "https://github.com/nalvn/team-ai-pack.git";
+          log.info("Override URL sang HTTPS. L\u01B0u \xFD: HTTPS c\xF3 th\u1EC3 fail 403 n\u1EBFu read-only role.");
+          openGithubSshKeysPage();
+          continue;
+        }
+        continue;
+      }
       const action = await promptRetryOrSkip({
         taskName: "Pull team-ai-pack submodule",
-        reason: err instanceof Error ? err.message : String(err),
+        reason: message,
         allowSkip: true,
         hint: "Network glitch? Retry th\u01B0\u1EDDng work. N\u1EBFu skip, d\xF9ng `avatar sync` sau \u0111\u1EC3 pull pack."
       });
@@ -1491,7 +1570,7 @@ ${renderAvatarBanner(opts)}
 }
 
 // src/lib/execute-gh-repo-create.ts
-import { spawnSync as spawnSync7 } from "child_process";
+import { spawnSync as spawnSync8 } from "child_process";
 var RepoAlreadyExistsError = class extends Error {
   constructor(fullName) {
     super(`Repo "${fullName}" \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. \u0110\u1ED5i t\xEAn ho\u1EB7c x\xF3a repo c\u0169.`);
@@ -1511,7 +1590,7 @@ function executeGhRepoCreate(input5) {
     "origin",
     "--push"
   ];
-  const r = spawnSync7("gh", args, { stdio: "inherit" });
+  const r = spawnSync8("gh", args, { stdio: "inherit" });
   if (r.status !== 0) {
     if (r.status === 1) {
       throw new RepoAlreadyExistsError(fullName);
@@ -1525,9 +1604,9 @@ function executeGhRepoCreate(input5) {
 }
 
 // src/lib/resolve-github-username-default.ts
-import { spawnSync as spawnSync8 } from "child_process";
+import { spawnSync as spawnSync9 } from "child_process";
 function resolveGithubUsernameDefault() {
-  const r = spawnSync8("gh", ["api", "user", "--jq", ".login"], {
+  const r = spawnSync9("gh", ["api", "user", "--jq", ".login"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -1575,12 +1654,12 @@ function createGithubRemoteFromFolder(input5) {
 }
 
 // src/lib/create-workspace-remote-via-gh.ts
-import { spawnSync as spawnSync16 } from "child_process";
+import { spawnSync as spawnSync17 } from "child_process";
 
 // src/lib/check-gh-cli-auth-status.ts
-import { spawnSync as spawnSync9 } from "child_process";
+import { spawnSync as spawnSync10 } from "child_process";
 function checkGhCliAuthStatus() {
-  const r = spawnSync9("gh", ["auth", "status"], { stdio: "ignore" });
+  const r = spawnSync10("gh", ["auth", "status"], { stdio: "ignore" });
   if (r.error && r.error.code === "ENOENT") {
     return "not-installed";
   }
@@ -1588,12 +1667,12 @@ function checkGhCliAuthStatus() {
 }
 
 // src/lib/detect-package-manager.ts
-import { spawnSync as spawnSync10 } from "child_process";
+import { spawnSync as spawnSync11 } from "child_process";
 function hasBinary(name) {
   const platform2 = detectHostPlatform();
   const probe = platform2 === "win32" ? "where" : "command";
   const args = platform2 === "win32" ? [name] : ["-v", name];
-  const r = spawnSync10(probe, args, {
+  const r = spawnSync11(probe, args, {
     shell: platform2 !== "win32",
     stdio: "ignore"
   });
@@ -1609,11 +1688,11 @@ function detectPackageManager() {
 }
 
 // src/lib/handle-remote-access-failure-with-account-switch.ts
-import { spawnSync as spawnSync12 } from "child_process";
-import { input as input3, select as select5 } from "@inquirer/prompts";
+import { spawnSync as spawnSync13 } from "child_process";
+import { input as input3, select as select6 } from "@inquirer/prompts";
 
 // src/lib/verify-git-remote-accessible.ts
-import { spawnSync as spawnSync11 } from "child_process";
+import { spawnSync as spawnSync12 } from "child_process";
 var TIMEOUT_MS = 5e3;
 function classifyRemoteError(stderr) {
   const text = stderr.toLowerCase();
@@ -1629,7 +1708,7 @@ function classifyRemoteError(stderr) {
   return "unknown";
 }
 function tryVerifyGitRemoteAccessible(url) {
-  const r = spawnSync11("git", ["ls-remote", "--exit-code", url, "HEAD"], {
+  const r = spawnSync12("git", ["ls-remote", "--exit-code", url, "HEAD"], {
     encoding: "utf8",
     timeout: TIMEOUT_MS,
     stdio: ["ignore", "pipe", "pipe"]
@@ -1651,16 +1730,16 @@ var RemoteAccessAbortedError = class extends Error {
   }
 };
 function getCurrentGhUser2() {
-  const r = spawnSync12("gh", ["api", "user", "--jq", ".login"], {
+  const r = spawnSync13("gh", ["api", "user", "--jq", ".login"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   });
   if (r.status !== 0) return null;
   return r.stdout.trim() || null;
 }
-function triggerGhAuthLoginInteractive2() {
+function triggerGhAuthLoginInteractive3() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync12("gh", ["auth", "login", "--web"], { stdio: "inherit" });
+  const r = spawnSync13("gh", ["auth", "login", "--web"], { stdio: "inherit" });
   if (r.status !== 0) {
     log.warn(`gh auth login exit ${r.status}. B\u1EA1n c\xF3 th\u1EC3 ch\u1EA1y tay r\u1ED3i quay l\u1EA1i retry.`);
   }
@@ -1694,7 +1773,7 @@ async function handleRemoteAccessFailureWithAccountSwitch(args) {
     log.dim(`  L\xFD do: ${reason}${detail ? ` \u2014 ${detail.slice(0, 150)}` : ""}`);
     log.info(getReasonHint(reason, currentUrl, ghUser));
     if (ghUser) log.dim(`  gh CLI hi\u1EC7n \u0111ang login: ${ghUser}`);
-    const action = await select5({
+    const action = await select6({
       message: "C\xE1ch x\u1EED l\xFD?",
       choices: [
         {
@@ -1729,7 +1808,7 @@ async function handleRemoteAccessFailureWithAccountSwitch(args) {
       currentUrl = newUrl.trim();
     }
     if (action === "switch") {
-      triggerGhAuthLoginInteractive2();
+      triggerGhAuthLoginInteractive3();
     }
     log.info(`Verify remote l\u1EA1i: ${currentUrl}...`);
     const result = tryVerifyGitRemoteAccessible(currentUrl);
@@ -1743,7 +1822,7 @@ async function handleRemoteAccessFailureWithAccountSwitch(args) {
 }
 
 // src/lib/install-gh-cli-via-package-manager.ts
-import { spawnSync as spawnSync13 } from "child_process";
+import { spawnSync as spawnSync14 } from "child_process";
 var INSTALL_COMMANDS = {
   brew: { cmd: "brew", args: ["install", "gh"] },
   apt: { cmd: "sudo", args: ["apt-get", "install", "-y", "gh"] },
@@ -1754,7 +1833,7 @@ var INSTALL_COMMANDS = {
 function installGhCliViaPackageManager(pm) {
   const spec = INSTALL_COMMANDS[pm];
   log.info(`\u0110ang c\xE0i gh CLI qua ${pm}...`);
-  const r = spawnSync13(spec.cmd, spec.args, { stdio: "inherit" });
+  const r = spawnSync14(spec.cmd, spec.args, { stdio: "inherit" });
   if (r.status !== 0) {
     throw new Error(`C\xE0i gh CLI th\u1EA5t b\u1EA1i qua ${pm} (exit ${r.status}). C\xE0i tay r\u1ED3i ch\u1EA1y l\u1EA1i.`);
   }
@@ -1762,9 +1841,9 @@ function installGhCliViaPackageManager(pm) {
 }
 
 // src/lib/setup-git-credential-via-gh.ts
-import { spawnSync as spawnSync14 } from "child_process";
+import { spawnSync as spawnSync15 } from "child_process";
 function setupGitCredentialViaGh() {
-  const r = spawnSync14("gh", ["auth", "setup-git"], { stdio: "ignore" });
+  const r = spawnSync15("gh", ["auth", "setup-git"], { stdio: "ignore" });
   if (r.status !== 0) {
     log.warn("gh auth setup-git fail (non-fatal). N\u1EBFu git clone l\u1ED7i 128 \u2192 ch\u1EA1y th\u1EE7 c\xF4ng.");
     return;
@@ -1773,10 +1852,10 @@ function setupGitCredentialViaGh() {
 }
 
 // src/lib/trigger-gh-cli-auth-login.ts
-import { spawnSync as spawnSync15 } from "child_process";
+import { spawnSync as spawnSync16 } from "child_process";
 function triggerGhCliAuthLogin() {
   log.info("Kh\u1EDFi \u0111\u1ED9ng \u0111\u0103ng nh\u1EADp GitHub qua gh CLI (browser s\u1EBD m\u1EDF)...");
-  const r = spawnSync15(
+  const r = spawnSync16(
     "gh",
     ["auth", "login", "--hostname", "github.com", "--web", "--git-protocol", "ssh"],
     { stdio: "inherit" }
@@ -1894,20 +1973,20 @@ function classifyGhCreateError(stderr) {
   return "unknown";
 }
 function repoExistsOnGitHub(fullName) {
-  const r = spawnSync16("gh", ["repo", "view", fullName, "--json", "name"], {
+  const r = spawnSync17("gh", ["repo", "view", fullName, "--json", "name"], {
     stdio: "ignore"
   });
   return r.status === 0;
 }
 function canCreateInNamespace(org, ghUser) {
   if (org.toLowerCase() === ghUser.toLowerCase()) return { ok: true };
-  const r = spawnSync16("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
+  const r = spawnSync17("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
     stdio: "ignore"
   });
   if (r.status === 0) return { ok: true };
-  const orgCheck = spawnSync16("gh", ["api", `orgs/${org}`, "--silent"], { stdio: "ignore" });
+  const orgCheck = spawnSync17("gh", ["api", `orgs/${org}`, "--silent"], { stdio: "ignore" });
   if (orgCheck.status !== 0) {
-    const userCheck = spawnSync16("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
+    const userCheck = spawnSync17("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
     if (userCheck.status === 0) {
       return {
         ok: false,
@@ -1943,7 +2022,7 @@ async function createWorkspaceRemoteViaGh(input5) {
     );
   }
   log.info(`T\u1EA1o GitHub repo cho workspace: ${fullName} (${input5.visibility})...`);
-  const r = spawnSync16(
+  const r = spawnSync17(
     "gh",
     [
       "repo",
@@ -1984,7 +2063,7 @@ ${combined}
 function linkExistingRemoteToWorkspace(args) {
   const sshUrl = `git@github.com:${args.fullName}.git`;
   const httpsUrl = `https://github.com/${args.fullName}.git`;
-  const addResult = spawnSync16(
+  const addResult = spawnSync17(
     "git",
     ["-C", args.workspacePath, "remote", "add", "origin", sshUrl],
     {
@@ -1993,7 +2072,7 @@ function linkExistingRemoteToWorkspace(args) {
     }
   );
   if (addResult.status !== 0) {
-    spawnSync16("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
+    spawnSync17("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
       stdio: "ignore"
     });
   }
@@ -2003,7 +2082,7 @@ function linkExistingRemoteToWorkspace(args) {
 
 // src/lib/safe-bootstrap-for-dirty-folder.ts
 import { readdirSync } from "fs";
-import { select as select6 } from "@inquirer/prompts";
+import { select as select7 } from "@inquirer/prompts";
 import { simpleGit as simpleGit3 } from "simple-git";
 
 // src/lib/check-folder-has-git.ts
@@ -2140,7 +2219,7 @@ async function promptBootstrapStrategy(state, opts) {
   if (opts.presetStrategy) return opts.presetStrategy;
   if (opts.autoYes) return "stash";
   if (state === "empty" || state === "clean") return "commit-all";
-  return await select6({
+  return await select7({
     message: state === "dirty" ? "Folder c\xF3 changes ch\u01B0a commit. C\xE1ch x\u1EED l\xFD:" : "Folder c\xF3 file ch\u01B0a version. C\xE1ch x\u1EED l\xFD:",
     choices: [
       {
@@ -2589,7 +2668,7 @@ async function runInit(opts) {
   }
 }
 async function promptProjectStatus() {
-  return await select7({
+  return await select8({
     message: "T\xECnh tr\u1EA1ng d\u1EF1 \xE1n c\u1EE7a b\u1EA1n?",
     choices: [
       { name: "1. \u0110\xE3 c\xF3 repo git remote (URL c\xF3 s\u1EB5n)", value: "existing-remote" },
@@ -2670,7 +2749,7 @@ async function runInitFromScratch(opts, ownerEmail) {
     message: "T\xEAn d\u1EF1 \xE1n:",
     validate: (v) => v.length > 0 ? true : "T\xEAn b\u1EAFt bu\u1ED9c"
   });
-  const visibility = opts.repoVisibility ?? await select7({
+  const visibility = opts.repoVisibility ?? await select8({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -2744,7 +2823,7 @@ async function getOrCreateOriginRemote(folderPath, opts) {
     return void 0;
   }
   await ensureGitHubReady();
-  const visibility = opts.repoVisibility ?? await select7({
+  const visibility = opts.repoVisibility ?? await select8({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -2846,7 +2925,7 @@ async function maybeCreateWorkspaceRemote(args) {
     });
   }
   if (!shouldCreate) return;
-  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select7({
+  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select8({
     message: "Workspace visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh, an to\xE0n)", value: "private" },
@@ -2865,7 +2944,7 @@ async function maybeCreateWorkspaceRemote(args) {
     } catch (err) {
       if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
         const fullName = err.fullName;
-        const reuseAction = await select7({
+        const reuseAction = await select8({
           message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
           choices: [
             {
@@ -2934,7 +3013,7 @@ async function resolveWorkspacePath(parent, desiredName, force) {
     }
     choices.push({ name: "Nh\u1EADp t\xEAn workspace kh\xE1c (manual)", value: "manual" });
     choices.push({ name: "T\u1EA1m ng\u01B0ng init", value: "abort" });
-    const action = await select7({
+    const action = await select8({
       message: "C\xE1ch x\u1EED l\xFD workspace path conflict?",
       choices
     });
@@ -3281,7 +3360,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.2.10";
+var CLI_VERSION = "1.2.11";
 function registerUninstallCommand(program2) {
   program2.command("uninstall").description("G\u1EE1 Avatar kh\u1ECFi project \u2014 backup t\u1EF1 \u0111\u1ED9ng (M11)").option("--yes", "Skip confirm prompt").option("--no-backup", "Kh\xF4ng t\u1EA1o backup tr\u01B0\u1EDBc khi x\xF3a (nguy hi\u1EC3m)").option("--keep-submodule", "Gi\u1EEF submodule .claude/pack/").option("--keep-hooks", "Gi\u1EEF git hooks post-merge, pre-push").option("--dry-run", "Hi\u1EC3n th\u1ECB danh s\xE1ch s\u1EBD x\xF3a, kh\xF4ng th\u1EF1c thi").action(async (opts) => {
     try {
@@ -3363,7 +3442,7 @@ function printUninstallSuccessBox(backupPath) {
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.2.10";
+var CLI_VERSION2 = "1.2.11";
 var program = new Command();
 program.name("avatar").description("AI harness CLI for NAL Vietnam engineering").version(CLI_VERSION2, "-v, --version", "Hi\u1EC3n th\u1ECB phi\xEAn b\u1EA3n Avatar CLI").addHelpText(
   "beforeAll",