@nalvietnam/avatar-cli 1.11.2 → 1.12.1

package/dist/index.js

@@ -145,8 +145,8 @@ async function writeUserConfig(config) {
 }
 async function clearUserConfig() {
   if (await pathExists(USER_CONFIG_PATH)) {
-    const { promises: fs14 } = await import("fs");
-    await fs14.unlink(USER_CONFIG_PATH);
+    const { promises: fs15 } = await import("fs");
+    await fs15.unlink(USER_CONFIG_PATH);
   }
 }
 function isTokenExpired(config) {
@@ -223,7 +223,7 @@ function spinnerWithElapsed(prefix) {
 }
 
 // src/lib/check-claude-code-subscription-and-quota.ts
-var QUOTA_VERIFY_TIMEOUT_MS = 3e4;
+var QUOTA_VERIFY_TIMEOUT_MS = 6e4;
 var QUOTA_VERIFY_PROMPT = "ok";
 function checkClaudeCodeSubscriptionAuth() {
   const result = spawnSync("claude", ["auth", "status"], { encoding: "utf8" });
@@ -283,7 +283,7 @@ function getQuotaErrorHint(reason) {
     case "rate_limit":
       return "B\u1ECB rate limit t\u1EA1m th\u1EDDi. Ch\u1EDD v\xE0i ph\xFAt r\u1ED3i ch\u1EA1y `avatar ai setup`.";
     case "timeout":
-      return "Network ch\u1EADm ho\u1EB7c Anthropic API down. Check m\u1EA1ng r\u1ED3i ch\u1EA1y l\u1EA1i.";
+      return "Timeout 60s: (1) m\u1EA1ng VN ch\u1EADm \u2014 th\u1EED VPN, (2) Anthropic API spike \u2014 retry v\xE0i ph\xFAt, (3) token v\u1EABn auth nh\u01B0ng quota h\u1EBFt \xE2m th\u1EA7m \u2014 check t\u1EA1i claude.ai/settings/usage.";
     default:
       return "L\u1ED7i ch\u01B0a bi\u1EBFt. Xem stderr \u1EDF tr\xEAn + ch\u1EA1y `claude --print ok` tay \u0111\u1EC3 debug.";
   }
@@ -294,8 +294,13 @@ function verifyClaudeCodeQuota() {
     timeout: QUOTA_VERIFY_TIMEOUT_MS,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  if (result.signal === "SIGTERM") {
-    return { ok: false, reason: "timeout", detail: "claude --print > 30s" };
+  const isTimeout = result.signal === "SIGTERM" || result.status === 143 || result.error?.code === "ETIMEDOUT";
+  if (isTimeout) {
+    return {
+      ok: false,
+      reason: "timeout",
+      detail: `claude --print > ${QUOTA_VERIFY_TIMEOUT_MS / 1e3}s (m\u1EA1ng ch\u1EADm / API rate limit / token revoked kh\xF4ng return error)`
+    };
   }
   const stderr = result.stderr || "";
   const stdout = result.stdout || "";
@@ -2329,7 +2334,7 @@ function registerGitnexusCommand(program2) {
 }
 
 // src/commands/init.ts
-import { select as select12 } from "@inquirer/prompts";
+import { select as select13 } from "@inquirer/prompts";
 
 // src/lib/avatar-ascii-banner.ts
 import chalk2 from "chalk";
@@ -2393,11 +2398,178 @@ ${renderAvatarBanner(opts)}
 }
 
 // src/lib/handle-remote-access-failure-with-account-switch.ts
+import { spawnSync as spawnSync16 } from "child_process";
+import { input as input4, select as select6 } from "@inquirer/prompts";
+
+// src/lib/reset-folder-git-and-create-new-remote-under-current-user.ts
+import { spawnSync as spawnSync14 } from "child_process";
+import { promises as fs9 } from "fs";
+import { basename, join as join16 } from "path";
+import { confirm as confirm4, select as select5 } from "@inquirer/prompts";
+
+// src/lib/execute-gh-repo-create.ts
+import { spawnSync as spawnSync12 } 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.`);
+    this.name = "RepoAlreadyExistsError";
+  }
+};
+function executeGhRepoCreate(input8) {
+  const fullName = `${input8.org}/${input8.name}`;
+  const args = [
+    "repo",
+    "create",
+    fullName,
+    `--${input8.visibility}`,
+    "--source",
+    input8.folder,
+    "--remote",
+    "origin",
+    "--push"
+  ];
+  const r = spawnSync12("gh", args, { stdio: "inherit" });
+  if (r.status !== 0) {
+    if (r.status === 1) {
+      throw new RepoAlreadyExistsError(fullName);
+    }
+    throw new Error(`gh repo create th\u1EA5t b\u1EA1i (exit ${r.status})`);
+  }
+  return {
+    sshUrl: `git@github.com:${fullName}.git`,
+    httpsUrl: `https://github.com/${fullName}.git`
+  };
+}
+
+// src/lib/resolve-github-username-default.ts
 import { spawnSync as spawnSync13 } from "child_process";
-import { input as input4, select as select5 } from "@inquirer/prompts";
+function resolveGithubUsernameDefault() {
+  const r = spawnSync13("gh", ["api", "user", "--jq", ".login"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (r.status !== 0) {
+    throw new Error(`Kh\xF4ng l\u1EA5y \u0111\u01B0\u1EE3c GitHub username: ${r.stderr?.trim()}`);
+  }
+  return r.stdout.trim();
+}
+
+// src/lib/validate-repo-name-and-visibility.ts
+var REPO_NAME_REGEX = /^[a-zA-Z0-9._-]{1,100}$/;
+var InvalidRepoNameError = class extends Error {
+  constructor(name) {
+    super(
+      `T\xEAn repo "${name}" kh\xF4ng h\u1EE3p l\u1EC7. Ch\u1EC9 d\xF9ng ch\u1EEF/s\u1ED1/d\u1EA5u ch\u1EA5m/g\u1EA1ch/underscore, d\xE0i 1-100 k\xFD t\u1EF1.`
+    );
+    this.name = "InvalidRepoNameError";
+  }
+};
+function validateRepoName(name) {
+  if (!REPO_NAME_REGEX.test(name)) {
+    throw new InvalidRepoNameError(name);
+  }
+}
+function validateRepoVisibility(v) {
+  if (v !== "private" && v !== "public") {
+    throw new Error(`Visibility ph\u1EA3i l\xE0 "private" ho\u1EB7c "public", nh\u1EADn: "${v}"`);
+  }
+}
+
+// src/lib/create-github-remote-from-folder.ts
+function createGithubRemoteFromFolder(input8) {
+  validateRepoName(input8.name);
+  validateRepoVisibility(input8.visibility);
+  const org = input8.org ?? resolveGithubUsernameDefault();
+  log.info(`T\u1EA1o GitHub repo ${org}/${input8.name} (${input8.visibility})...`);
+  const urls = executeGhRepoCreate({
+    folder: input8.folder,
+    org,
+    name: input8.name,
+    visibility: input8.visibility
+  });
+  log.success(`\u0110\xE3 t\u1EA1o: ${urls.sshUrl}`);
+  return urls;
+}
+
+// src/lib/reset-folder-git-and-create-new-remote-under-current-user.ts
+function backupTimestamp() {
+  const d = /* @__PURE__ */ new Date();
+  return `${d.getFullYear().toString().slice(-2)}${String(d.getMonth() + 1).padStart(2, "0")}${String(d.getDate()).padStart(2, "0")}-${String(d.getHours()).padStart(2, "0")}${String(d.getMinutes()).padStart(2, "0")}`;
+}
+async function backupExistingDotGit(folderPath) {
+  const gitDir = join16(folderPath, ".git");
+  if (!await pathExists(gitDir)) {
+    throw new Error(`.git kh\xF4ng t\u1ED3n t\u1EA1i \u1EDF ${folderPath} \u2014 kh\xF4ng c\u1EA7n reset.`);
+  }
+  const backupName = `.git.backup-${backupTimestamp()}`;
+  const backupPath = join16(folderPath, backupName);
+  await fs9.rename(gitDir, backupPath);
+  log.success(`Backup .git \u2192 ${backupName}`);
+  return backupPath;
+}
+function reinitGitInFolder(folderPath) {
+  const r1 = spawnSync14("git", ["-C", folderPath, "init", "-b", "main"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (r1.status !== 0) {
+    throw new Error(`git init th\u1EA5t b\u1EA1i: ${r1.stderr || r1.stdout}`);
+  }
+  log.success("Git init m\u1EDBi (branch main)");
+  spawnSync14("git", ["-C", folderPath, "add", "-A"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  const r3 = spawnSync14(
+    "git",
+    ["-C", folderPath, "commit", "-m", "chore: initial commit from existing folder"],
+    { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  if (r3.status !== 0) {
+    log.warn(`git commit th\u1EA5t b\u1EA1i (folder c\xF3 th\u1EC3 r\u1ED7ng): ${(r3.stderr || "").slice(0, 200)}`);
+  } else {
+    log.success("Initial commit");
+  }
+}
+async function resetFolderGitAndCreateNewRemoteUnderCurrentUser(opts) {
+  const folderName = basename(opts.folderPath);
+  const repoName = opts.repoName ?? folderName;
+  if (!opts.autoYes) {
+    const confirmed = await confirm4({
+      message: `Folder '${folderName}' s\u1EBD \u0111\u01B0\u1EE3c reset:
+  1. Backup .git \u2192 .git.backup-{timestamp}
+  2. Git init m\u1EDBi (branch main, initial commit)
+  3. T\u1EA1o GitHub repo m\u1EDBi '${repoName}' d\u01B0\u1EDBi account c\u1EE7a b\u1EA1n
+Ti\u1EBFp t\u1EE5c?`,
+      default: true
+    });
+    if (!confirmed) {
+      throw new Error("User abort reset folder.");
+    }
+  }
+  const visibility = opts.visibility ?? (opts.autoYes ? "private" : await select5({
+    message: "Visibility cho repo m\u1EDBi?",
+    choices: [
+      { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
+      { name: "public", value: "public" }
+    ]
+  }));
+  const backupPath = await backupExistingDotGit(opts.folderPath);
+  reinitGitInFolder(opts.folderPath);
+  const urls = createGithubRemoteFromFolder({
+    folder: opts.folderPath,
+    name: repoName,
+    visibility,
+    org: opts.org
+  });
+  return {
+    newRemoteUrl: urls.httpsUrl,
+    backupPath
+  };
+}
 
 // src/lib/verify-git-remote-accessible.ts
-import { spawnSync as spawnSync12 } from "child_process";
+import { spawnSync as spawnSync15 } from "child_process";
 var TIMEOUT_MS = 5e3;
 function classifyRemoteError(stderr) {
   const text = stderr.toLowerCase();
@@ -2413,7 +2585,7 @@ function classifyRemoteError(stderr) {
   return "unknown";
 }
 function tryVerifyGitRemoteAccessible(url) {
-  const r = spawnSync12("git", ["ls-remote", "--exit-code", url, "HEAD"], {
+  const r = spawnSync15("git", ["ls-remote", "--exit-code", url, "HEAD"], {
     encoding: "utf8",
     timeout: TIMEOUT_MS,
     stdio: ["ignore", "pipe", "pipe"]
@@ -2435,7 +2607,7 @@ var RemoteAccessAbortedError = class extends Error {
   }
 };
 function getCurrentGhUser() {
-  const r = spawnSync13("gh", ["api", "user", "--jq", ".login"], {
+  const r = spawnSync16("gh", ["api", "user", "--jq", ".login"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -2444,7 +2616,7 @@ function getCurrentGhUser() {
 }
 function triggerGhAuthLoginInteractive() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync13("gh", ["auth", "login", "--web"], { stdio: "inherit" });
+  const r = spawnSync16("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.`);
   }
@@ -2478,32 +2650,54 @@ 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({
-      message: "C\xE1ch x\u1EED l\xFD?",
-      choices: [
-        {
-          name: "Nh\u1EADp l\u1EA1i URL \u0111\xFAng (recommended khi URL sai ch\xEDnh t\u1EA3)",
-          value: "re-input-url"
-        },
-        {
-          name: "Switch GitHub account (gh auth login \u2014 m\u1EDF browser)",
-          value: "switch"
-        },
-        {
-          name: "T\xF4i v\u1EEBa fix (accept invite / s\u1EEDa permission) \u2014 retry verify",
-          value: "retry"
-        },
-        {
-          name: "T\u1EA1m ng\u01B0ng init \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau",
-          value: "abort"
-        }
-      ]
+    const choices = [
+      {
+        name: "Nh\u1EADp l\u1EA1i URL \u0111\xFAng (recommended khi URL sai ch\xEDnh t\u1EA3)",
+        value: "re-input-url"
+      },
+      {
+        name: "Switch GitHub account (gh auth login \u2014 m\u1EDF browser)",
+        value: "switch"
+      },
+      {
+        name: "T\xF4i v\u1EEBa fix (accept invite / s\u1EEDa permission) \u2014 retry verify",
+        value: "retry"
+      }
+    ];
+    if (args.folderPath) {
+      choices.push({
+        name: "Reset folder & t\u1EA1o repo M\u1EDAI d\u01B0\u1EDBi account c\u1EE7a t\xF4i (backup .git c\u0169)",
+        value: "reset-folder"
+      });
+    }
+    choices.push({
+      name: "T\u1EA1m ng\u01B0ng init \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau",
+      value: "abort"
     });
+    const action = await select6({ message: "C\xE1ch x\u1EED l\xFD?", choices });
     if (action === "abort") {
       throw new RemoteAccessAbortedError(
         `User ch\u1ECDn t\u1EA1m ng\u01B0ng. Fix access ${currentUrl} r\u1ED3i ch\u1EA1y l\u1EA1i 'avatar init'.`
       );
     }
+    if (action === "reset-folder") {
+      if (!args.folderPath) {
+        log.warn("Reset folder c\u1EA7n folderPath \u2014 internal error.");
+        continue;
+      }
+      try {
+        const reset = await resetFolderGitAndCreateNewRemoteUnderCurrentUser({
+          folderPath: args.folderPath,
+          visibility: args.defaultVisibility
+        });
+        log.success(`Folder \u0111\xE3 reset. Backup t\u1EA1i: ${reset.backupPath}`);
+        log.success(`Remote m\u1EDBi: ${reset.newRemoteUrl}`);
+        return { resolvedUrl: reset.newRemoteUrl };
+      } catch (err) {
+        log.warn(`Reset folder th\u1EA5t b\u1EA1i: ${err.message}`);
+        continue;
+      }
+    }
     if (action === "re-input-url") {
       const newUrl = await input4({
         message: "URL git remote (https://github.com/owner/repo.git ho\u1EB7c git@github.com:owner/repo.git):",
@@ -2528,14 +2722,14 @@ async function handleRemoteAccessFailureWithAccountSwitch(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
 import { existsSync as existsSync6, statSync } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function checkFolderHasGit(folderPath) {
-  const gitPath = join16(folderPath, ".git");
+  const gitPath = join17(folderPath, ".git");
   if (!existsSync6(gitPath)) return false;
   const stat = statSync(gitPath);
   return stat.isDirectory() || stat.isFile();
@@ -2567,7 +2761,7 @@ async function createInitialGitCommit(folderPath) {
 
 // src/lib/detect-folder-tech-stack.ts
 import { existsSync as existsSync7 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 var SIGNATURES = {
   node: ["package.json"],
   python: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"],
@@ -2579,7 +2773,7 @@ var SIGNATURES = {
 function detectFolderTechStack(folderPath) {
   const matched = [];
   for (const [stack, files] of Object.entries(SIGNATURES)) {
-    if (files.some((f) => existsSync7(join17(folderPath, f)))) {
+    if (files.some((f) => existsSync7(join18(folderPath, f)))) {
       matched.push(stack);
     }
   }
@@ -2588,25 +2782,25 @@ function detectFolderTechStack(folderPath) {
 
 // src/lib/gitignore-template-loader.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname4, join as join18 } from "path";
+import { dirname as dirname4, join as join19 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __dirname = dirname4(fileURLToPath2(import.meta.url));
 var CANDIDATE_DIRS = [
   // Bundled production: dist/index.js → __dirname = .../dist/, sibling dist/templates
-  join18(__dirname, "templates", "gitignore"),
+  join19(__dirname, "templates", "gitignore"),
   // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
-  join18(__dirname, "..", "templates", "gitignore"),
+  join19(__dirname, "..", "templates", "gitignore"),
   // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
-  join18(__dirname, "..", "..", "src", "templates", "gitignore"),
+  join19(__dirname, "..", "..", "src", "templates", "gitignore"),
   // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
-  join18(__dirname, "..", "src", "templates", "gitignore")
+  join19(__dirname, "..", "src", "templates", "gitignore")
 ];
 var AVATAR_MARKER_START = "# === avatar ===";
 var AVATAR_MARKER_END = "# === /avatar ===";
 function readTemplate(stack) {
   for (const dir of CANDIDATE_DIRS) {
     try {
-      return readFileSync3(join18(dir, `${stack}.txt`), "utf8");
+      return readFileSync3(join19(dir, `${stack}.txt`), "utf8");
     } catch {
     }
   }
@@ -2621,9 +2815,9 @@ ${readTemplate(s).trim()}`);
 
 // src/lib/write-or-merge-gitignore.ts
 import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function writeOrMergeGitignore(folderPath, avatarBlock) {
-  const path = join19(folderPath, ".gitignore");
+  const path = join20(folderPath, ".gitignore");
   if (!existsSync8(path)) {
     writeFileSync(path, avatarBlock, "utf8");
     return;
@@ -2665,7 +2859,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: [
       {
@@ -2799,22 +2993,22 @@ async function safeBootstrapGitInFolder(folderPath, opts = {}) {
 }
 
 // src/lib/team-pack-submodule-manager.ts
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 
 // src/lib/check-team-pack-access-with-retry-loop.ts
-import { spawnSync as spawnSync14 } from "child_process";
-import { confirm as confirm4, select as select7 } from "@inquirer/prompts";
+import { spawnSync as spawnSync17 } from "child_process";
+import { confirm as confirm5, select as select8 } from "@inquirer/prompts";
 import boxen3 from "boxen";
 function parseRepoSlugFromGitUrl(url) {
   const httpsMatch = url.match(/github\.com[/:]([^/]+\/[^/]+?)(?:\.git)?$/);
   return httpsMatch?.[1] ?? null;
 }
 function checkRepoAccess(repoSlug) {
-  const r = spawnSync14("gh", ["api", `repos/${repoSlug}`], { stdio: "ignore" });
+  const r = spawnSync17("gh", ["api", `repos/${repoSlug}`], { stdio: "ignore" });
   return r.status === 0;
 }
 function getCurrentGhUser2() {
-  const r = spawnSync14("gh", ["api", "user", "--jq", ".login"], {
+  const r = spawnSync17("gh", ["api", "user", "--jq", ".login"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -2823,13 +3017,13 @@ function getCurrentGhUser2() {
 }
 function triggerGhAuthLoginInteractive2() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync14("gh", ["auth", "login", "--web"], { stdio: "inherit" });
+  const r = spawnSync17("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 confirm4({
+  const ok = await confirm5({
     message: "Copy th\xF4ng tin (GitHub username + email) v\xE0o clipboard \u0111\u1EC3 d\xE1n v\xE0o Slack/email?",
     default: true
   });
@@ -2881,7 +3075,7 @@ async function ensureTeamPackAccessWithRetry(args) {
   while (true) {
     const ghUser = getCurrentGhUser2();
     const ghUserDisplay = ghUser ?? "(ch\u01B0a gh auth)";
-    const action = await select7({
+    const action = await select8({
       message: "C\xE1ch x\u1EED l\xFD?",
       choices: [
         {
@@ -2995,7 +3189,7 @@ async function addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest = false)
     await checkoutBranchHeadInSubmodule(TEAM_PACK_RELATIVE_PATH, DEFAULT_PACK_BRANCH, projectRoot);
     return { pinnedTag: `${DEFAULT_PACK_BRANCH} (HEAD)` };
   }
-  const submoduleDir = join20(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const submoduleDir = join21(projectRoot, TEAM_PACK_RELATIVE_PATH);
   const allTags = await listTags(submoduleDir);
   const target = pickLatestStableSemVerTag(allTags);
   if (target) {
@@ -3004,7 +3198,7 @@ async function addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest = false)
   return { pinnedTag: target };
 }
 async function readPinnedPackVersion(projectRoot) {
-  const submoduleRoot = join20(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const submoduleRoot = join21(projectRoot, TEAM_PACK_RELATIVE_PATH);
   const tag = await tagAtHead(submoduleRoot);
   if (tag) return tag;
   const sha = await currentCommitSha(submoduleRoot);
@@ -3012,97 +3206,13 @@ async function readPinnedPackVersion(projectRoot) {
 }
 
 // src/commands/init-flow-handlers-for-each-project-status.ts
-import { basename as basename2, join as join26, resolve as resolve2 } from "path";
-import { input as input7, select as select11 } from "@inquirer/prompts";
-
-// src/lib/execute-gh-repo-create.ts
-import { spawnSync as spawnSync15 } 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.`);
-    this.name = "RepoAlreadyExistsError";
-  }
-};
-function executeGhRepoCreate(input8) {
-  const fullName = `${input8.org}/${input8.name}`;
-  const args = [
-    "repo",
-    "create",
-    fullName,
-    `--${input8.visibility}`,
-    "--source",
-    input8.folder,
-    "--remote",
-    "origin",
-    "--push"
-  ];
-  const r = spawnSync15("gh", args, { stdio: "inherit" });
-  if (r.status !== 0) {
-    if (r.status === 1) {
-      throw new RepoAlreadyExistsError(fullName);
-    }
-    throw new Error(`gh repo create th\u1EA5t b\u1EA1i (exit ${r.status})`);
-  }
-  return {
-    sshUrl: `git@github.com:${fullName}.git`,
-    httpsUrl: `https://github.com/${fullName}.git`
-  };
-}
-
-// src/lib/resolve-github-username-default.ts
-import { spawnSync as spawnSync16 } from "child_process";
-function resolveGithubUsernameDefault() {
-  const r = spawnSync16("gh", ["api", "user", "--jq", ".login"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  if (r.status !== 0) {
-    throw new Error(`Kh\xF4ng l\u1EA5y \u0111\u01B0\u1EE3c GitHub username: ${r.stderr?.trim()}`);
-  }
-  return r.stdout.trim();
-}
-
-// src/lib/validate-repo-name-and-visibility.ts
-var REPO_NAME_REGEX = /^[a-zA-Z0-9._-]{1,100}$/;
-var InvalidRepoNameError = class extends Error {
-  constructor(name) {
-    super(
-      `T\xEAn repo "${name}" kh\xF4ng h\u1EE3p l\u1EC7. Ch\u1EC9 d\xF9ng ch\u1EEF/s\u1ED1/d\u1EA5u ch\u1EA5m/g\u1EA1ch/underscore, d\xE0i 1-100 k\xFD t\u1EF1.`
-    );
-    this.name = "InvalidRepoNameError";
-  }
-};
-function validateRepoName(name) {
-  if (!REPO_NAME_REGEX.test(name)) {
-    throw new InvalidRepoNameError(name);
-  }
-}
-function validateRepoVisibility(v) {
-  if (v !== "private" && v !== "public") {
-    throw new Error(`Visibility ph\u1EA3i l\xE0 "private" ho\u1EB7c "public", nh\u1EADn: "${v}"`);
-  }
-}
-
-// src/lib/create-github-remote-from-folder.ts
-function createGithubRemoteFromFolder(input8) {
-  validateRepoName(input8.name);
-  validateRepoVisibility(input8.visibility);
-  const org = input8.org ?? resolveGithubUsernameDefault();
-  log.info(`T\u1EA1o GitHub repo ${org}/${input8.name} (${input8.visibility})...`);
-  const urls = executeGhRepoCreate({
-    folder: input8.folder,
-    org,
-    name: input8.name,
-    visibility: input8.visibility
-  });
-  log.success(`\u0110\xE3 t\u1EA1o: ${urls.sshUrl}`);
-  return urls;
-}
+import { basename as basename3, join as join27, resolve as resolve2 } from "path";
+import { input as input7, select as select12 } from "@inquirer/prompts";
 
 // src/lib/check-gh-cli-auth-status.ts
-import { spawnSync as spawnSync17 } from "child_process";
+import { spawnSync as spawnSync18 } from "child_process";
 function checkGhCliAuthStatus() {
-  const r = spawnSync17("gh", ["auth", "status"], { stdio: "ignore" });
+  const r = spawnSync18("gh", ["auth", "status"], { stdio: "ignore" });
   if (r.error && r.error.code === "ENOENT") {
     return "not-installed";
   }
@@ -3110,12 +3220,12 @@ function checkGhCliAuthStatus() {
 }
 
 // src/lib/detect-package-manager.ts
-import { spawnSync as spawnSync18 } from "child_process";
+import { spawnSync as spawnSync19 } from "child_process";
 function hasBinary(name) {
   const platform2 = detectHostPlatform();
   const probe = platform2 === "win32" ? "where" : "command";
   const args = platform2 === "win32" ? [name] : ["-v", name];
-  const r = spawnSync18(probe, args, {
+  const r = spawnSync19(probe, args, {
     shell: platform2 !== "win32",
     stdio: "ignore"
   });
@@ -3131,7 +3241,7 @@ function detectPackageManager() {
 }
 
 // src/lib/install-gh-cli-via-package-manager.ts
-import { spawnSync as spawnSync19 } from "child_process";
+import { spawnSync as spawnSync20 } from "child_process";
 var INSTALL_COMMANDS = {
   brew: { cmd: "brew", args: ["install", "gh"] },
   apt: { cmd: "sudo", args: ["apt-get", "install", "-y", "gh"] },
@@ -3142,7 +3252,7 @@ var INSTALL_COMMANDS = {
 function installGhCliViaPackageManager(pm) {
   const spec = INSTALL_COMMANDS[pm];
   log.info(`\u0110ang c\xE0i gh CLI qua ${pm}...`);
-  const r = spawnSync19(spec.cmd, spec.args, { stdio: "inherit" });
+  const r = spawnSync20(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.`);
   }
@@ -3150,9 +3260,9 @@ function installGhCliViaPackageManager(pm) {
 }
 
 // src/lib/setup-git-credential-via-gh.ts
-import { spawnSync as spawnSync20 } from "child_process";
+import { spawnSync as spawnSync21 } from "child_process";
 function setupGitCredentialViaGh() {
-  const r = spawnSync20("gh", ["auth", "setup-git"], { stdio: "ignore" });
+  const r = spawnSync21("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;
@@ -3161,10 +3271,10 @@ function setupGitCredentialViaGh() {
 }
 
 // src/lib/trigger-gh-cli-auth-login.ts
-import { spawnSync as spawnSync21 } from "child_process";
+import { spawnSync as spawnSync22 } 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 = spawnSync21(
+  const r = spawnSync22(
     "gh",
     ["auth", "login", "--hostname", "github.com", "--web", "--git-protocol", "ssh"],
     { stdio: "inherit" }
@@ -3253,28 +3363,28 @@ async function ensureGitHubReady(remoteUrl) {
 }
 
 // src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
-import { spawnSync as spawnSync22 } from "child_process";
-import { select as select8 } from "@inquirer/prompts";
+import { spawnSync as spawnSync23 } from "child_process";
+import { select as select9 } from "@inquirer/prompts";
 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 triggerGhAuthLoginInteractive3() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync22("gh", ["auth", "login", "--web"], { stdio: "inherit" });
+  const r = spawnSync23("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 = spawnSync22("open", ["https://github.com/settings/keys"], { stdio: "ignore" });
+  const r = spawnSync23("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 select8({
+  return await select9({
     message: "SSH permission denied. C\xE1ch x\u1EED l\xFD?",
     choices: [
       {
@@ -3448,12 +3558,12 @@ function parseBootstrapStrategyOpts(opts) {
 }
 
 // src/commands/workspace-scaffold-and-finalize-orchestrator.ts
-import { join as join25 } from "path";
-import { basename } from "path";
-import { confirm as confirm5, input as input6, select as select10 } from "@inquirer/prompts";
+import { join as join26 } from "path";
+import { basename as basename2 } from "path";
+import { confirm as confirm6, input as input6, select as select11 } from "@inquirer/prompts";
 
 // src/lib/create-workspace-remote-via-gh.ts
-import { spawnSync as spawnSync23 } from "child_process";
+import { spawnSync as spawnSync24 } from "child_process";
 var CreateWorkspaceRemoteError = class extends Error {
   reason;
   fullName;
@@ -3483,20 +3593,20 @@ function classifyGhCreateError(stderr) {
   return "unknown";
 }
 function repoExistsOnGitHub(fullName) {
-  const r = spawnSync23("gh", ["repo", "view", fullName, "--json", "name"], {
+  const r = spawnSync24("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 = spawnSync23("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
+  const r = spawnSync24("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
     stdio: "ignore"
   });
   if (r.status === 0) return { ok: true };
-  const orgCheck = spawnSync23("gh", ["api", `orgs/${org}`, "--silent"], { stdio: "ignore" });
+  const orgCheck = spawnSync24("gh", ["api", `orgs/${org}`, "--silent"], { stdio: "ignore" });
   if (orgCheck.status !== 0) {
-    const userCheck = spawnSync23("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
+    const userCheck = spawnSync24("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
     if (userCheck.status === 0) {
       return {
         ok: false,
@@ -3532,7 +3642,7 @@ async function createWorkspaceRemoteViaGh(input8) {
     );
   }
   log.info(`T\u1EA1o GitHub repo cho workspace: ${fullName} (${input8.visibility})...`);
-  const r = spawnSync23(
+  const r = spawnSync24(
     "gh",
     [
       "repo",
@@ -3573,7 +3683,7 @@ ${combined}
 function linkExistingRemoteToWorkspace(args) {
   const sshUrl = `git@github.com:${args.fullName}.git`;
   const httpsUrl = `https://github.com/${args.fullName}.git`;
-  const addResult = spawnSync23(
+  const addResult = spawnSync24(
     "git",
     ["-C", args.workspacePath, "remote", "add", "origin", sshUrl],
     {
@@ -3582,7 +3692,7 @@ function linkExistingRemoteToWorkspace(args) {
     }
   );
   if (addResult.status !== 0) {
-    spawnSync23("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
+    spawnSync24("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
       stdio: "ignore"
     });
   }
@@ -3591,8 +3701,8 @@ function linkExistingRemoteToWorkspace(args) {
 }
 
 // src/lib/merge-pack-settings-into-project-settings.ts
-import { promises as fs9 } from "fs";
-import { join as join21 } from "path";
+import { promises as fs10 } from "fs";
+import { join as join22 } from "path";
 async function isStatusLineCommandResolvable(workspacePath, command) {
   const trimmed = command.trim();
   const match = trimmed.match(/^(node|python|python3|bash|sh)\s+([^\s]+)/);
@@ -3600,7 +3710,7 @@ async function isStatusLineCommandResolvable(workspacePath, command) {
     return true;
   }
   const filePath = match[2];
-  const fullPath = filePath.startsWith("/") ? filePath : join21(workspacePath, filePath);
+  const fullPath = filePath.startsWith("/") ? filePath : join22(workspacePath, filePath);
   return await pathExists(fullPath);
 }
 function backupFilename(originalPath) {
@@ -3634,8 +3744,8 @@ function mergeHooksPerEvent(packHooks, userHooks) {
   return { merged, touchedEvents: touched };
 }
 async function mergePackSettingsIntoProjectSettings(workspacePath) {
-  const packTemplatePath = join21(workspacePath, ".claude", "pack", "templates", "settings.json.tpl");
-  const projectSettingsPath = join21(workspacePath, ".claude", "settings.json");
+  const packTemplatePath = join22(workspacePath, ".claude", "pack", "templates", "settings.json.tpl");
+  const projectSettingsPath = join22(workspacePath, ".claude", "settings.json");
   if (!await pathExists(packTemplatePath)) {
     return { action: "no-pack-template", changes: [] };
   }
@@ -3729,18 +3839,18 @@ async function mergePackSettingsIntoProjectSettings(workspacePath) {
   let backupPath;
   if (projectHasSettings) {
     backupPath = backupFilename(projectSettingsPath);
-    await fs9.copyFile(projectSettingsPath, backupPath);
+    await fs10.copyFile(projectSettingsPath, backupPath);
   }
   await writeJsonAtomic(projectSettingsPath, merged);
   return { action: "merged", backupPath, changes };
 }
 
 // src/lib/symlink-farm-for-team-pack-mount-dirs.ts
-import { promises as fs11 } from "fs";
-import { dirname as dirname6, join as join22, relative as relative2 } from "path";
+import { promises as fs12 } from "fs";
+import { dirname as dirname6, join as join23, relative as relative2 } from "path";
 
 // src/lib/backup-existing-dir-before-symlink-override.ts
-import { promises as fs10 } from "fs";
+import { promises as fs11 } from "fs";
 function timestamp() {
   const d = /* @__PURE__ */ new Date();
   const pad = (n) => n.toString().padStart(2, "0");
@@ -3748,7 +3858,7 @@ function timestamp() {
 }
 async function backupDirBeforeReplace(targetPath) {
   const backupPath = `${targetPath}.backup-${timestamp()}`;
-  await fs10.rename(targetPath, backupPath);
+  await fs11.rename(targetPath, backupPath);
   return backupPath;
 }
 
@@ -3764,7 +3874,7 @@ var TEAM_PACK_MOUNT_DIRS = [
 ];
 async function isSymbolicLink(path) {
   try {
-    const st = await fs11.lstat(path);
+    const st = await fs12.lstat(path);
     return st.isSymbolicLink();
   } catch {
     return false;
@@ -3777,33 +3887,33 @@ async function syncMountedDir(source, dest, force) {
   }
   if (await pathExists(dest)) {
     if (await isSymbolicLink(dest)) {
-      await fs11.unlink(dest);
+      await fs12.unlink(dest);
     } else if (force) {
       const backupPath = await backupDirBeforeReplace(dest);
       const relativeSource2 = relative2(dirname6(dest), source);
-      await fs11.symlink(relativeSource2, dest);
+      await fs12.symlink(relativeSource2, dest);
       return { dir, action: "backed-up-and-linked", backupPath };
     } else {
       return { dir, action: "skipped-conflict" };
     }
   }
   const relativeSource = relative2(dirname6(dest), source);
-  await fs11.symlink(relativeSource, dest);
+  await fs12.symlink(relativeSource, dest);
   return { dir, action: "created" };
 }
 async function syncAllMountDirs(packDir, claudeDir, force) {
   const results = [];
   for (const dir of TEAM_PACK_MOUNT_DIRS) {
-    const source = join22(packDir, dir);
-    const dest = join22(claudeDir, dir);
+    const source = join23(packDir, dir);
+    const dest = join23(claudeDir, dir);
     results.push(await syncMountedDir(source, dest, force));
   }
   return results;
 }
 
 // src/commands/init-success-rendering-and-helpers.ts
-import { join as join24, relative as relative3 } from "path";
-import { input as input5, select as select9 } from "@inquirer/prompts";
+import { join as join25, relative as relative3 } from "path";
+import { input as input5, select as select10 } from "@inquirer/prompts";
 import boxen5 from "boxen";
 
 // src/lib/format-pack-commands-cheatsheet-box.ts
@@ -3844,7 +3954,7 @@ function formatPackCommandsCheatsheetBox() {
 
 // src/commands/init-conflict-detection-helpers.ts
 import { readdir } from "fs/promises";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 async function isEmptyOrMissing(path) {
   if (!await pathExists(path)) return true;
   try {
@@ -3857,7 +3967,7 @@ async function isEmptyOrMissing(path) {
 }
 async function findAlternativeWorkspaceName(parent, desiredName, maxAttempts = 10) {
   for (let i = 2; i < maxAttempts; i++) {
-    const candidate = join23(parent, `${desiredName}-${i}`);
+    const candidate = join24(parent, `${desiredName}-${i}`);
     if (await isEmptyOrMissing(candidate)) return candidate;
   }
   return null;
@@ -3865,7 +3975,7 @@ async function findAlternativeWorkspaceName(parent, desiredName, maxAttempts = 1
 
 // src/commands/init-success-rendering-and-helpers.ts
 async function resolveWorkspacePath(parent, desiredName, force) {
-  const desired = join24(parent, desiredName);
+  const desired = join25(parent, desiredName);
   if (await isEmptyOrMissing(desired)) return desired;
   log.warn(`Workspace path "${desired}" \u0111\xE3 c\xF3 n\u1ED9i dung.`);
   while (true) {
@@ -3880,7 +3990,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 select9({
+    const action = await select10({
       message: "C\xE1ch x\u1EED l\xFD workspace path conflict?",
       choices
     });
@@ -3896,7 +4006,7 @@ async function resolveWorkspacePath(parent, desiredName, force) {
       message: "T\xEAn workspace m\u1EDBi:",
       validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
     });
-    const newPath = join24(parent, newName.trim());
+    const newPath = join25(parent, newName.trim());
     if (await isEmptyOrMissing(newPath)) return newPath;
     log.warn(`"${newPath}" c\u0169ng \u0111\xE3 c\xF3 n\u1ED9i dung. Th\u1EED t\xEAn kh\xE1c.`);
   }
@@ -3953,7 +4063,7 @@ async function printInitSuccessBox(rootPath, flow, aiResult = null, gitnexusResu
   ];
   process.stdout.write(`${boxen5(lines.join("\n"), { padding: 1, borderStyle: "round" })}
 `);
-  const packDir = join24(rootPath, TEAM_PACK_RELATIVE_PATH);
+  const packDir = join25(rootPath, TEAM_PACK_RELATIVE_PATH);
   if (await pathExists(packDir)) {
     process.stdout.write(`
 ${formatPackCommandsCheatsheetBox()}
@@ -3969,7 +4079,7 @@ async function getOrCreateOriginRemote(folderPath, opts) {
     log.success(`Folder \u0111\xE3 c\xF3 remote origin: ${origin.refs.push}`);
     return origin.refs.push;
   }
-  const shouldCreate = opts.createRemote ?? await confirm5({
+  const shouldCreate = opts.createRemote ?? await confirm6({
     message: "Folder ch\u01B0a c\xF3 remote. T\u1EA1o GitHub repo ngay \u0111\u1EC3 share team?",
     default: true
   });
@@ -3978,7 +4088,7 @@ async function getOrCreateOriginRemote(folderPath, opts) {
     return void 0;
   }
   await ensureGitHubReady();
-  const visibility = opts.repoVisibility ?? await select10({
+  const visibility = opts.repoVisibility ?? await select11({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -3987,7 +4097,7 @@ async function getOrCreateOriginRemote(folderPath, opts) {
   });
   const repoName = await input6({
     message: "T\xEAn repo:",
-    default: basename(folderPath)
+    default: basename2(folderPath)
   });
   const urls = createGithubRemoteFromFolder({
     folder: folderPath,
@@ -4053,10 +4163,10 @@ async function finalizeWorkspaceScaffold(args) {
   await writeRootClaudeMd(args.workspacePath, vars);
   await writeProjectSettings(args.workspacePath, vars);
   await appendGitignoreEntries(args.workspacePath);
-  await ensureDir(join25(args.workspacePath, "notes"));
-  await ensureDir(join25(args.workspacePath, "scripts"));
-  await installGitHook(join25(args.workspacePath, ".git"), "post-merge");
-  await installGitHook(join25(args.workspacePath, ".git", "modules", "src"), "pre-push");
+  await ensureDir(join26(args.workspacePath, "notes"));
+  await ensureDir(join26(args.workspacePath, "scripts"));
+  await installGitHook(join26(args.workspacePath, ".git"), "post-merge");
+  await installGitHook(join26(args.workspacePath, ".git", "modules", "src"), "pre-push");
   log.success("C\xE0i post-merge (workspace) + pre-push (src/)");
   await autoSyncPackOnInit(args.workspacePath);
   await appendAuditEntry("init", `flow=${args.flow},workspace=${args.workspaceName}`);
@@ -4094,12 +4204,12 @@ async function finalizeWorkspaceScaffold(args) {
   await printInitSuccessBox(args.workspacePath, args.flow, aiResult, gitnexusResult);
 }
 async function autoSyncPackOnInit(workspacePath) {
-  const packDir = join25(workspacePath, TEAM_PACK_RELATIVE_PATH);
+  const packDir = join26(workspacePath, TEAM_PACK_RELATIVE_PATH);
   if (!await pathExists(packDir)) {
     log.dim("Pack submodule kh\xF4ng t\u1ED3n t\u1EA1i (skip auto-sync). C\xF3 th\u1EC3 ch\u1EA1y `avatar sync` sau.");
     return;
   }
-  const claudeDir = join25(workspacePath, ".claude");
+  const claudeDir = join26(workspacePath, ".claude");
   log.info("Auto-sync pack content v\xE0o .claude/ (symlinks + settings merge)...");
   try {
     const results = await syncAllMountDirs(packDir, claudeDir, false);
@@ -4134,13 +4244,13 @@ async function maybeCreateWorkspaceRemote(args) {
   let shouldCreate = args.createWorkspaceRemote;
   if (shouldCreate === void 0) {
     if (args.autoYes) return;
-    shouldCreate = await confirm5({
+    shouldCreate = await confirm6({
       message: "T\u1EA1o remote GitHub cho workspace \u0111\u1EC3 share team? (Avatar state)",
       default: false
     });
   }
   if (!shouldCreate) return;
-  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select10({
+  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select11({
     message: "Workspace visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh, an to\xE0n)", value: "private" },
@@ -4159,7 +4269,7 @@ async function maybeCreateWorkspaceRemote(args) {
     } catch (err) {
       if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
         const fullName = err.fullName;
-        const reuseAction = await select10({
+        const reuseAction = await select11({
           message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
           choices: [
             {
@@ -4257,9 +4367,24 @@ async function runInitFromExistingFolder(opts, ownerEmail) {
     presetStrategy: parseBootstrapStrategyOpts(opts),
     autoYes: opts.yes
   });
-  const remoteUrl = await getOrCreateOriginRemote(folderPath, opts);
+  let remoteUrl = await getOrCreateOriginRemote(folderPath, opts);
+  if (remoteUrl) {
+    const verify = tryVerifyGitRemoteAccessible(remoteUrl);
+    if (!verify.ok) {
+      log.warn(`Remote ${remoteUrl} kh\xF4ng accessible (${verify.reason ?? "unknown"}).`);
+      const recovered = await handleRemoteAccessFailureWithAccountSwitch({
+        url: remoteUrl,
+        initialReason: verify.reason ?? "unknown",
+        initialDetail: verify.detail,
+        folderPath,
+        // enable option "Reset folder & tạo repo mới"
+        defaultVisibility: opts.repoVisibility
+      });
+      remoteUrl = recovered.resolvedUrl;
+    }
+  }
   const teamOwner = opts.teamOwner ?? await promptTeamOwner(ownerEmail);
-  const inferredName = opts.workspaceName ?? `${basename2(folderPath)}-avatar-workspace`;
+  const inferredName = opts.workspaceName ?? `${basename3(folderPath)}-avatar-workspace`;
   const workspaceName = opts.workspaceName ?? await input7({ message: "T\xEAn workspace:", default: inferredName });
   const workspaceParent = resolve2(opts.workspaceParent ?? ".");
   const workspacePath = await resolveWorkspacePath(workspaceParent, workspaceName, opts.force);
@@ -4290,7 +4415,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 select11({
+  const visibility = opts.repoVisibility ?? await select12({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -4300,7 +4425,7 @@ async function runInitFromScratch(opts, ownerEmail) {
   const teamOwner = opts.teamOwner ?? await promptTeamOwner(ownerEmail);
   const workspaceParent = resolve2(opts.workspaceParent ?? ".");
   const workspacePath = await resolveWorkspacePath(workspaceParent, projectName, opts.force);
-  const srcPath = join26(workspacePath, "src");
+  const srcPath = join27(workspacePath, "src");
   await ensureDir(workspacePath);
   await ensureDir(srcPath);
   await safeBootstrapGitInFolder(srcPath, { autoYes: true });
@@ -4617,7 +4742,7 @@ async function runInit(opts) {
   }
 }
 async function promptProjectStatus() {
-  return await select12({
+  return await select13({
     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" },
@@ -4649,7 +4774,7 @@ function registerMcpRunCommand(program2) {
 }
 
 // src/commands/pack-status-and-version-check.ts
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 import boxen7 from "boxen";
 var PACK_RELATIVE_PATH = ".claude/pack";
 function registerPackCommand(program2) {
@@ -4670,7 +4795,7 @@ function registerPackCommand(program2) {
   });
 }
 async function gatherPackStatus(cwd, doFetch) {
-  const packDir = join27(cwd, PACK_RELATIVE_PATH);
+  const packDir = join28(cwd, PACK_RELATIVE_PATH);
   if (!await pathExists(packDir) || !await isGitRepo(packDir)) {
     return {
       installed: false,
@@ -4759,18 +4884,18 @@ function registerSecretsCommand(program2) {
 }
 
 // src/commands/status.ts
-import { promises as fs13 } from "fs";
-import { join as join29 } from "path";
+import { promises as fs14 } from "fs";
+import { join as join30 } from "path";
 import boxen8 from "boxen";
 
 // src/lib/pack-backup-manager.ts
-import { promises as fs12 } from "fs";
-import { join as join28 } from "path";
+import { promises as fs13 } from "fs";
+import { join as join29 } from "path";
 var BACKUP_DIR_NAME = "_backup";
 async function listBackups(projectRoot) {
-  const dir = join28(projectRoot, ".claude", BACKUP_DIR_NAME);
+  const dir = join29(projectRoot, ".claude", BACKUP_DIR_NAME);
   if (!await pathExists(dir)) return [];
-  const entries = await fs12.readdir(dir, { withFileTypes: true });
+  const entries = await fs13.readdir(dir, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort().reverse();
 }
 
@@ -4793,7 +4918,7 @@ function registerStatusCommand(program2) {
 }
 async function gatherStatus(cwd) {
   const projectName = cwd.split("/").filter(Boolean).pop() ?? "unknown";
-  const claudeRoot = join29(cwd, ".claude");
+  const claudeRoot = join30(cwd, ".claude");
   const hasAvatar = await pathExists(claudeRoot);
   if (!hasAvatar) {
     return {
@@ -4806,9 +4931,9 @@ async function gatherStatus(cwd) {
       hasAvatar: false
     };
   }
-  const packVersion = await isGitRepo(join29(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
-  const pendingDir = join29(claudeRoot, "_pending");
-  const pendingCount = await pathExists(pendingDir) ? (await fs13.readdir(pendingDir)).filter((n) => n.endsWith(".diff.md")).length : 0;
+  const packVersion = await isGitRepo(join30(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
+  const pendingDir = join30(claudeRoot, "_pending");
+  const pendingCount = await pathExists(pendingDir) ? (await fs14.readdir(pendingDir)).filter((n) => n.endsWith(".diff.md")).length : 0;
   const backupCount = (await listBackups(cwd)).length;
   const techStackSummary = await readTechStackFirstLine(claudeRoot);
   return {
@@ -4822,7 +4947,7 @@ async function gatherStatus(cwd) {
   };
 }
 async function readTechStackFirstLine(claudeRoot) {
-  const techStackPath = join29(claudeRoot, "project", "tech-stack.md");
+  const techStackPath = join30(claudeRoot, "project", "tech-stack.md");
   if (!await pathExists(techStackPath)) return "(no tech-stack.md)";
   const content = await readText(techStackPath);
   const firstNonHeaderLine = content.split("\n").find((l) => l.trim() && !l.startsWith("#") && !l.startsWith(">"));
@@ -4843,17 +4968,17 @@ function renderStatusBox(s) {
 }
 
 // src/commands/sync.ts
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 
 // src/lib/preview-team-pack-sync-changes-for-dry-run.ts
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 async function inspectMountDir(packDir, claudeDir, dir) {
-  const source = join30(packDir, dir);
-  const dest = join30(claudeDir, dir);
+  const source = join31(packDir, dir);
+  const dest = join31(claudeDir, dir);
   if (!await pathExists(source)) return "source-missing";
   if (!await pathExists(dest)) return "needs-creation";
-  const { promises: fs14 } = await import("fs");
-  const st = await fs14.lstat(dest);
+  const { promises: fs15 } = await import("fs");
+  const st = await fs15.lstat(dest);
   if (st.isSymbolicLink()) return "already-linked";
   return "conflict-real-dir";
 }
@@ -4891,8 +5016,8 @@ async function buildSyncPreview(packDir, claudeDir, targetVersion) {
 var DEFAULT_PACK_BRANCH2 = "main";
 async function syncAction(opts) {
   const projectRoot = process.cwd();
-  const claudeDir = join31(projectRoot, ".claude");
-  const packDir = join31(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const claudeDir = join32(projectRoot, ".claude");
+  const packDir = join32(projectRoot, TEAM_PACK_RELATIVE_PATH);
   if (!await pathExists(packDir)) {
     log.error(
       `team-ai-pack submodule ch\u01B0a \u0111\u01B0\u1EE3c kh\u1EDFi t\u1EA1o \u1EDF ${TEAM_PACK_RELATIVE_PATH}/.
@@ -5027,33 +5152,33 @@ function registerToolsCommand(program2) {
 
 // src/commands/uninstall.ts
 import { relative as relative4 } from "path";
-import { confirm as confirm6 } from "@inquirer/prompts";
+import { confirm as confirm7 } from "@inquirer/prompts";
 import boxen9 from "boxen";
 
 // src/lib/create-uninstall-backup-snapshot.ts
 import { cp, mkdir, writeFile } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { basename as basename3, join as join32 } from "path";
-var UNINSTALL_BACKUPS_DIR = join32(homedir4(), ".avatar", "uninstall-backups");
+import { basename as basename4, join as join33 } from "path";
+var UNINSTALL_BACKUPS_DIR = join33(homedir4(), ".avatar", "uninstall-backups");
 async function createUninstallBackupSnapshot(projectRoot, artifacts, avatarVersion) {
-  const projectName = basename3(projectRoot);
+  const projectName = basename4(projectRoot);
   const timestamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const backupDir = join32(UNINSTALL_BACKUPS_DIR, `${projectName}-${timestamp2}`);
+  const backupDir = join33(UNINSTALL_BACKUPS_DIR, `${projectName}-${timestamp2}`);
   await mkdir(backupDir, { recursive: true, mode: 448 });
   if (artifacts.claudeDir) {
-    await cp(artifacts.claudeDir, join32(backupDir, ".claude"), { recursive: true });
+    await cp(artifacts.claudeDir, join33(backupDir, ".claude"), { recursive: true });
   }
   if (artifacts.claudeMd) {
-    await cp(artifacts.claudeMd, join32(backupDir, "CLAUDE.md"));
+    await cp(artifacts.claudeMd, join33(backupDir, "CLAUDE.md"));
   }
   if (artifacts.postMergeHook || artifacts.prePushHook) {
-    const hooksBackupDir = join32(backupDir, "hooks");
+    const hooksBackupDir = join33(backupDir, "hooks");
     await mkdir(hooksBackupDir, { recursive: true });
     if (artifacts.postMergeHook) {
-      await cp(artifacts.postMergeHook, join32(hooksBackupDir, "post-merge"));
+      await cp(artifacts.postMergeHook, join33(hooksBackupDir, "post-merge"));
     }
     if (artifacts.prePushHook) {
-      await cp(artifacts.prePushHook, join32(hooksBackupDir, "pre-push"));
+      await cp(artifacts.prePushHook, join33(hooksBackupDir, "pre-push"));
     }
   }
   const manifest = {
@@ -5068,27 +5193,27 @@ async function createUninstallBackupSnapshot(projectRoot, artifacts, avatarVersi
       prePushHook: !!artifacts.prePushHook
     }
   };
-  await writeFile(join32(backupDir, "manifest.json"), JSON.stringify(manifest, null, 2), "utf8");
+  await writeFile(join33(backupDir, "manifest.json"), JSON.stringify(manifest, null, 2), "utf8");
   return backupDir;
 }
 
 // src/lib/detect-avatar-project-artifacts.ts
 import { existsSync as existsSync9 } from "fs";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 function existsOrNull(path) {
   return existsSync9(path) ? path : null;
 }
 function detectAvatarProjectArtifacts(projectRoot) {
-  const claudeDir = existsOrNull(join33(projectRoot, ".claude"));
-  const claudeMd = existsOrNull(join33(projectRoot, "CLAUDE.md"));
-  const postMergeHook = existsOrNull(join33(projectRoot, ".git", "hooks", "post-merge"));
+  const claudeDir = existsOrNull(join34(projectRoot, ".claude"));
+  const claudeMd = existsOrNull(join34(projectRoot, "CLAUDE.md"));
+  const postMergeHook = existsOrNull(join34(projectRoot, ".git", "hooks", "post-merge"));
   const prePushHook = existsOrNull(
-    join33(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
+    join34(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
   );
-  const gitignorePath = existsOrNull(join33(projectRoot, ".gitignore"));
-  const gitmodulesPath = existsOrNull(join33(projectRoot, ".gitmodules"));
-  const notesDir = existsOrNull(join33(projectRoot, "notes"));
-  const scriptsDir = existsOrNull(join33(projectRoot, "scripts"));
+  const gitignorePath = existsOrNull(join34(projectRoot, ".gitignore"));
+  const gitmodulesPath = existsOrNull(join34(projectRoot, ".gitmodules"));
+  const notesDir = existsOrNull(join34(projectRoot, "notes"));
+  const scriptsDir = existsOrNull(join34(projectRoot, "scripts"));
   const hasAnyArtifact = !!(claudeDir || claudeMd || postMergeHook || prePushHook);
   return {
     hasAnyArtifact,
@@ -5109,11 +5234,11 @@ async function executeUninstallDeletion(artifacts, flags) {
   if (artifacts.claudeDir) {
     if (flags.keepSubmodule) {
       const { readdir: readdir2 } = await import("fs/promises");
-      const { join: join34 } = await import("path");
+      const { join: join35 } = await import("path");
       const entries = await readdir2(artifacts.claudeDir);
       for (const entry of entries) {
         if (entry === "pack") continue;
-        await rm(join34(artifacts.claudeDir, entry), { recursive: true, force: true });
+        await rm(join35(artifacts.claudeDir, entry), { recursive: true, force: true });
       }
     } else {
       await rm(artifacts.claudeDir, { recursive: true, force: true });
@@ -5206,7 +5331,7 @@ async function runUninstall(opts) {
     return;
   }
   if (!opts.yes) {
-    const ok = await confirm6({
+    const ok = await confirm7({
       message: "Ti\u1EBFp t\u1EE5c g\u1EE1 Avatar?",
       default: false
     });