@nalvietnam/avatar-cli 1.2.5 → 1.2.6

package/dist/index.js

@@ -1195,7 +1195,7 @@ 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 input3, select as select7 } from "@inquirer/prompts";
-import boxen3 from "boxen";
+import boxen4 from "boxen";
 
 // src/lib/prompt-recovery-action-on-failure.ts
 import { input as input2, select as select3 } from "@inquirer/prompts";
@@ -1227,6 +1227,7 @@ import { join as join10 } from "path";
 // src/lib/check-team-pack-access-with-retry-loop.ts
 import { spawnSync as spawnSync6 } from "child_process";
 import { confirm as confirm2, select as select4 } from "@inquirer/prompts";
+import boxen2 from "boxen";
 function parseRepoSlugFromGitUrl(url) {
   const httpsMatch = url.match(/github\.com[/:]([^/]+\/[^/]+?)(?:\.git)?$/);
   if (httpsMatch) return httpsMatch[1];
@@ -1244,6 +1245,13 @@ function getCurrentGhUser() {
   if (r.status !== 0) return null;
   return r.stdout.trim() || null;
 }
+function triggerGhAuthLoginInteractive() {
+  log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
+  const r = spawnSync6("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.`);
+  }
+}
 async function copyInfoToClipboardWithConsent(info) {
   const ok = await confirm2({
     message: "Copy th\xF4ng tin (GitHub username + email) v\xE0o clipboard \u0111\u1EC3 d\xE1n v\xE0o Slack/email?",
@@ -1258,44 +1266,78 @@ async function copyInfoToClipboardWithConsent(info) {
     log.dim(`Copy clipboard fail: ${err.message}`);
   }
 }
-function buildAccessRequestInfo(ghUser, ssoEmail) {
+function printAccessWarningBox(repoSlug, ghUser, ssoEmail) {
   const lines = [
-    "Request access team-ai-pack (NAL)",
+    `${chalk.red("\u26D4 KH\xD4NG C\xD3 QUY\u1EC0N ACCESS")}`,
+    "",
+    `Repo: ${chalk.bold(repoSlug)}`,
+    "",
+    "B\u1EA1n c\u1EA7n \u0111\u01B0\u1EE3c admin add v\xE0o org \u0111\u1EC3 pull team-ai-pack.",
+    "",
+    `${chalk.dim("Th\xF4ng tin g\u1EEDi admin:")}`,
+    `  GitHub username: ${chalk.cyan(ghUser ?? "(ch\u01B0a gh auth \u2014 ch\u1EA1y: gh auth login)")}`,
+    `  NAL email:       ${chalk.cyan(ssoEmail ?? "(ch\u01B0a avatar login \u2014 ch\u1EA1y: avatar login)")}`,
+    `  Date:            ${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}`,
+    "",
+    `${chalk.dim("Li\xEAn h\u1EC7:")} luke@nal.vn (Slack #avatar-setup)`
+  ];
+  process.stdout.write(
+    `${boxen2(lines.join("\n"), { padding: 1, borderColor: "red", borderStyle: "round" })}
+`
+  );
+}
+function buildAccessRequestInfo(repoSlug, ghUser, ssoEmail) {
+  return [
+    `Request access ${repoSlug} (NAL)`,
     "",
     `GitHub username: ${ghUser ?? "(ch\u01B0a gh auth \u2014 ch\u1EA1y: gh auth login)"}`,
     `NAL email:       ${ssoEmail ?? "(ch\u01B0a avatar login \u2014 ch\u1EA1y: avatar login)"}`,
     `Date:            ${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}`
-  ];
-  return lines.join("\n");
+  ].join("\n");
 }
 async function ensureTeamPackAccessWithRetry(args) {
   if (checkRepoAccess(args.repoSlug)) return true;
-  const ghUser = getCurrentGhUser();
-  const info = buildAccessRequestInfo(ghUser, args.ssoEmail ?? null);
-  log.warn(`B\u1EA1n ch\u01B0a c\xF3 quy\u1EC1n access v\xE0o b\u1ED9 package ${args.repoSlug}.`);
-  log.info("Li\xEAn h\u1EC7 admin (Luke @nal.vn) \u0111\u1EC3 \u0111\u01B0\u1EE3c add v\xE0o org nalvn.");
-  log.plain("");
-  log.plain(info);
-  log.plain("");
-  await copyInfoToClipboardWithConsent(info);
+  const initialGhUser = getCurrentGhUser();
+  printAccessWarningBox(args.repoSlug, initialGhUser, args.ssoEmail ?? null);
+  await copyInfoToClipboardWithConsent(
+    buildAccessRequestInfo(args.repoSlug, initialGhUser, args.ssoEmail ?? null)
+  );
   while (true) {
+    const ghUser = getCurrentGhUser();
+    const ghUserDisplay = ghUser ?? "(ch\u01B0a gh auth)";
     const action = await select4({
-      message: "Ti\u1EBFp t\u1EE5c?",
+      message: "C\xE1ch x\u1EED l\xFD?",
       choices: [
-        { name: "\u0110\xE3 \u0111\u01B0\u1EE3c add \u2014 ki\u1EC3m tra l\u1EA1i v\xE0 ti\u1EBFp t\u1EE5c", value: "retry" },
-        { name: "T\u1EA1m ng\u01B0ng \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau", value: "abort" }
+        {
+          name: `\u0110\xE3 \u0111\u01B0\u1EE3c grant access v\u1EDBi GitHub username '${ghUserDisplay}' \u2014 ki\u1EC3m tra l\u1EA1i`,
+          value: "retry-same"
+        },
+        {
+          name: "\u0110\xE3 grant v\u1EDBi GitHub account kh\xE1c \u2014 switch gh (m\u1EDF browser)",
+          value: "switch-account"
+        },
+        {
+          name: "T\u1EA1m ng\u01B0ng \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau",
+          value: "abort"
+        }
       ]
     });
     if (action === "abort") {
       log.dim("T\u1EA1m ng\u01B0ng. Ch\u1EA1y l\u1EA1i 'avatar init' sau khi \u0111\xE3 accept invite t\u1EEB GitHub.");
       return false;
     }
+    if (action === "switch-account") {
+      triggerGhAuthLoginInteractive();
+    }
     log.info("Ki\u1EC3m tra access...");
     if (checkRepoAccess(args.repoSlug)) {
-      log.success("\u0110\xE3 c\xF3 access \u2014 ti\u1EBFp t\u1EE5c.");
+      const finalUser = getCurrentGhUser();
+      log.success(`\u0110\xE3 c\xF3 access v\u1EDBi '${finalUser ?? "(unknown)"}' \u2014 ti\u1EBFp t\u1EE5c.`);
       return true;
     }
-    log.warn("V\u1EABn ch\u01B0a c\xF3 access. \u0110\u1EA3m b\u1EA3o b\u1EA1n \u0111\xE3 accept email invite t\u1EEB GitHub (Inbox + Spam).");
+    log.warn(
+      `V\u1EABn ch\u01B0a c\xF3 access v\u1EDBi account '${ghUser ?? "(unknown)"}'. \u0110\u1EA3m b\u1EA3o \u0111\xE3 accept email invite ho\u1EB7c switch \u0111\xFAng account.`
+    );
   }
 }
 
@@ -1361,10 +1403,10 @@ async function readPinnedPackVersion(projectRoot) {
 }
 
 // src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
-async function addTeamPackSubmoduleWithRetryOnNetworkFail(projectRoot, tag) {
+async function addTeamPackSubmoduleWithRetryOnNetworkFail(projectRoot, tag, ssoEmail) {
   while (true) {
     try {
-      const result = await addTeamPackSubmodule(projectRoot, tag);
+      const result = await addTeamPackSubmodule(projectRoot, tag, ssoEmail);
       return { pinnedTag: result.pinnedTag, skipped: false };
     } catch (err) {
       if (err instanceof TeamPackAccessAbortedError) throw err;
@@ -1616,7 +1658,7 @@ function getCurrentGhUser2() {
   if (r.status !== 0) return null;
   return r.stdout.trim() || null;
 }
-function triggerGhAuthLoginInteractive() {
+function triggerGhAuthLoginInteractive2() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
   const r = spawnSync12("gh", ["auth", "login", "--web"], { stdio: "inherit" });
   if (r.status !== 0) {
@@ -1669,7 +1711,7 @@ async function handleRemoteAccessFailureWithAccountSwitch(args) {
       );
     }
     if (action === "switch") {
-      triggerGhAuthLoginInteractive();
+      triggerGhAuthLoginInteractive2();
     }
     log.info("Verify remote l\u1EA1i...");
     const result = tryVerifyGitRemoteAccessible(args.url);
@@ -2176,7 +2218,7 @@ function buildScaffoldVariables(args) {
 }
 
 // src/commands/login.ts
-import boxen2 from "boxen";
+import boxen3 from "boxen";
 import open from "open";
 
 // src/lib/google-oauth-device-flow.ts
@@ -2323,7 +2365,7 @@ async function runLogin(opts) {
     "",
     `Ho\u1EB7c Avatar t\u1EF1 m\u1EDF browser, click ${chalk.green("Allow")}...`
   ].join("\n");
-  process.stdout.write(`${boxen2(instructions, { padding: 1, borderStyle: "round" })}
+  process.stdout.write(`${boxen3(instructions, { padding: 1, borderStyle: "round" })}
 `);
   void open(verificationUrl).catch(() => {
     log.dim("(Kh\xF4ng m\u1EDF \u0111\u01B0\u1EE3c browser t\u1EF1 \u0111\u1ED9ng \u2014 copy URL \u1EDF tr\xEAn)");
@@ -2482,7 +2524,8 @@ async function runInitFromExistingRemote(opts, ownerEmail) {
     repoVisibility: opts.repoVisibility,
     repoOrg: opts.repoOrg,
     flow: "existing-remote",
-    aiSkip: opts.aiSkip
+    aiSkip: opts.aiSkip,
+    ssoEmail: ownerEmail
   });
 }
 async function runInitFromExistingFolder(opts, ownerEmail) {
@@ -2517,7 +2560,8 @@ async function runInitFromExistingFolder(opts, ownerEmail) {
     repoVisibility: opts.repoVisibility,
     repoOrg: opts.repoOrg,
     flow: "existing-folder",
-    aiSkip: opts.aiSkip
+    aiSkip: opts.aiSkip,
+    ssoEmail: ownerEmail
   });
 }
 async function runInitFromScratch(opts, ownerEmail) {
@@ -2554,9 +2598,11 @@ async function runInitFromScratch(opts, ownerEmail) {
     await git(workspacePath).subModule(["add", urls.sshUrl, "src"]);
     let pinnedTag = "HEAD";
     if (!opts.skipTeamPack) {
+      sp.stop();
       const result = await addTeamPackSubmoduleWithRetryOnNetworkFail(
         workspacePath,
-        opts.packVersion
+        opts.packVersion,
+        ownerEmail
       );
       pinnedTag = result.pinnedTag ?? "HEAD";
       sp.succeed(`Pin team-ai-pack v\xE0o ${pinnedTag}`);
@@ -2627,9 +2673,11 @@ async function scaffoldWorkspaceWithSrcSubmodule(args) {
     await git(args.workspacePath).subModule(["add", args.srcRemoteUrl, "src"]);
     let pinnedTag = "HEAD";
     if (!args.skipTeamPack) {
+      sp.stop();
       const result = await addTeamPackSubmoduleWithRetryOnNetworkFail(
         args.workspacePath,
-        args.packVersion
+        args.packVersion,
+        args.ssoEmail
       );
       pinnedTag = result.pinnedTag ?? "HEAD";
       sp.succeed(`Pin team-ai-pack v\xE0o ${pinnedTag}`);
@@ -2806,7 +2854,7 @@ function printInitSuccessBox(rootPath, flow, aiResult = null) {
     `  ${chalk.cyan("avatar sync")}               Pull team-ai-pack m\u1EDBi`,
     `  ${chalk.cyan("avatar uninstall")}          G\u1EE1 Avatar (gi\u1EEF code)`
   ];
-  process.stdout.write(`${boxen3(lines.join("\n"), { padding: 1, borderStyle: "round" })}
+  process.stdout.write(`${boxen4(lines.join("\n"), { padding: 1, borderStyle: "round" })}
 `);
 }
 
@@ -2843,7 +2891,7 @@ function registerSecretsCommand(program2) {
 // src/commands/status.ts
 import { promises as fs8 } from "fs";
 import { join as join18 } from "path";
-import boxen4 from "boxen";
+import boxen5 from "boxen";
 
 // src/lib/pack-backup-manager.ts
 import { promises as fs7 } from "fs";
@@ -2921,7 +2969,7 @@ function renderStatusBox(s) {
     `${chalk.dim("Backups:")}            ${s.backupCount}`,
     `${chalk.dim("Tech stack:")}         ${s.techStackSummary}`
   ];
-  process.stdout.write(`${boxen4(lines.join("\n"), { padding: 1, borderStyle: "round" })}
+  process.stdout.write(`${boxen5(lines.join("\n"), { padding: 1, borderStyle: "round" })}
 `);
 }
 
@@ -2941,7 +2989,7 @@ function registerToolsCommand(program2) {
 // src/commands/uninstall.ts
 import { relative as relative3 } from "path";
 import { confirm as confirm4 } from "@inquirer/prompts";
-import boxen5 from "boxen";
+import boxen6 from "boxen";
 
 // src/lib/create-uninstall-backup-snapshot.ts
 import { cp, mkdir, writeFile } from "fs/promises";
@@ -3095,7 +3143,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.2.5";
+var CLI_VERSION = "1.2.6";
 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 {
@@ -3172,12 +3220,12 @@ function printUninstallSuccessBox(backupPath) {
     lines.push(`  ${chalk.dim("Backup:")} ${backupPath}`);
     lines.push(`  ${chalk.dim("Restore:")} ${chalk.cyan(`cp -r "${backupPath}"/* .`)}`);
   }
-  process.stdout.write(`${boxen5(lines.join("\n"), { padding: 1, borderStyle: "round" })}
+  process.stdout.write(`${boxen6(lines.join("\n"), { padding: 1, borderStyle: "round" })}
 `);
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.2.5";
+var CLI_VERSION2 = "1.2.6";
 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",