@nalvietnam/avatar-cli 1.11.1 → 1.12.0

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) {
@@ -291,7 +291,8 @@ function getQuotaErrorHint(reason) {
 function verifyClaudeCodeQuota() {
   const result = spawnSync("claude", ["--print", QUOTA_VERIFY_PROMPT], {
     encoding: "utf8",
-    timeout: QUOTA_VERIFY_TIMEOUT_MS
+    timeout: QUOTA_VERIFY_TIMEOUT_MS,
+    stdio: ["ignore", "pipe", "pipe"]
   });
   if (result.signal === "SIGTERM") {
     return { ok: false, reason: "timeout", detail: "claude --print > 30s" };
@@ -301,12 +302,24 @@ function verifyClaudeCodeQuota() {
   if (result.status === 0) {
     return { ok: true };
   }
+  const stdoutTrimmed = stdout.trim();
+  const stderrLower = stderr.toLowerCase();
+  if (stdoutTrimmed.length > 20 && !stderrLower.includes("error") && !stderrLower.includes("limit") && !stderrLower.includes("quota") && !stderrLower.includes("401")) {
+    log.warn(
+      `claude --print exit=${result.status} nh\u01B0ng c\xF3 response (${stdoutTrimmed.length} chars). Accept v\u1EDBi caution.`
+    );
+    return { ok: true };
+  }
   const reason = classifyQuotaError(`${stderr}
 ${stdout}`);
-  if (reason === "unknown" && stderr.trim()) {
-    log.dim(`[debug] claude --print stderr: ${stderr.slice(0, 500)}`);
+  if (reason === "unknown") {
+    log.warn(
+      `[debug] claude --print exit=${result.status} signal=${result.signal ?? "none"}`
+    );
+    if (stderr.trim()) log.warn(`[debug] stderr: ${stderr.slice(0, 500)}`);
+    if (stdout.trim()) log.warn(`[debug] stdout: ${stdout.slice(0, 300)}`);
   }
-  return { ok: false, reason, detail: stderr.slice(0, 500) };
+  return { ok: false, reason, detail: stderr.slice(0, 500) || stdout.slice(0, 500) };
 }
 
 // src/lib/detect-claude-code-installation.ts
@@ -340,7 +353,7 @@ function probeClaudeVersion() {
   if (result.error || result.status !== 0) return null;
   const out = (result.stdout || "").trim();
   const match = SEMVER_REGEX.exec(out);
-  return match ? match[1] : null;
+  return match?.[1] ?? null;
 }
 function detectClaudeCodeInstallation() {
   const path = probeClaudeBinaryPath();
@@ -556,8 +569,9 @@ async function fetchAnthropicModels(apiKey) {
 }
 async function promptAnthropicModelChoice(models) {
   if (models.length === 1) {
-    log.info(`Auto-pick model: ${models[0]} (ch\u1EC9 1 model available)`);
-    return models[0];
+    const only = models[0];
+    log.info(`Auto-pick model: ${only} (ch\u1EC9 1 model available)`);
+    return only;
   }
   const sorted = [...models].sort((a, b) => {
     const score = (m) => {
@@ -645,8 +659,9 @@ async function fetchAvailableModels(baseUrl, apiKey) {
 async function promptModelChoice(models) {
   const claudeAliases = models.filter((m) => m.toLowerCase().includes("claude"));
   if (claudeAliases.length === 1) {
-    log.info(`Auto-pick model: ${claudeAliases[0]} (ch\u1EC9 1 claude alias tr\xEAn endpoint)`);
-    return claudeAliases[0];
+    const only = claudeAliases[0];
+    log.info(`Auto-pick model: ${only} (ch\u1EC9 1 claude alias tr\xEAn endpoint)`);
+    return only;
   }
   const choiceList = claudeAliases.length > 0 ? claudeAliases : models;
   return await select3({
@@ -733,22 +748,22 @@ function applyUseGlobal(existing, source) {
     ...sourceModel ? { model: sourceModel } : {}
   };
 }
-async function writeClaudeSettings(workspacePath, input6) {
+async function writeClaudeSettings(workspacePath, input8) {
   const path = getClaudeSettingsPath(workspacePath);
   const existing = await readExistingSettings(path);
   let merged;
-  switch (input6.provider) {
+  switch (input8.provider) {
     case "subscription":
-      merged = applySubscription(existing, input6.model);
+      merged = applySubscription(existing, input8.model);
       break;
     case "llmlite":
-      merged = applyLLMLite(existing, input6.apiKey, input6.baseUrl, input6.model);
+      merged = applyLLMLite(existing, input8.apiKey, input8.baseUrl, input8.model);
       break;
     case "anthropic":
-      merged = applyAnthropic(existing, input6.apiKey, input6.baseUrl, input6.model);
+      merged = applyAnthropic(existing, input8.apiKey, input8.baseUrl, input8.model);
       break;
     case "use-global":
-      merged = applyUseGlobal(existing, input6.sourceSettings);
+      merged = applyUseGlobal(existing, input8.sourceSettings);
       break;
   }
   await writeJsonAtomic(path, merged, SECRET_FILE_MODE2);
@@ -803,7 +818,10 @@ async function runAiSetupPhase(args) {
             `provider=subscription,result=no-quota,reason=${reason}`
           );
           log.warn(`Subscription verify th\u1EA5t b\u1EA1i (${reason}).`);
-          log.dim(`\u2192 ${getQuotaErrorHint(reason)}`);
+          if (quota.detail?.trim()) {
+            log.warn(`  Chi ti\u1EBFt: ${quota.detail.slice(0, 200)}`);
+          }
+          log.warn(`  \u2192 ${getQuotaErrorHint(reason)}`);
           return { ok: false, reason: `subscription-${reason}`, phase: "quota" };
         }
         await writeClaudeSettings(args.workspacePath, {
@@ -1765,7 +1783,7 @@ function probeGitnexusVersion() {
   if (result.error || result.status !== 0) return null;
   const out = (result.stdout || "").trim();
   const match = SEMVER_REGEX2.exec(out);
-  return match ? match[1] : null;
+  return match?.[1] ?? null;
 }
 function detectGitnexusInstallation() {
   const path = probeGitnexusBinaryPath();
@@ -2311,641 +2329,910 @@ function registerGitnexusCommand(program2) {
 }
 
 // src/commands/init.ts
-import { basename, join as join25, relative as relative3, resolve as resolve2 } from "path";
-import { confirm as confirm5, input as input5, select as select9 } from "@inquirer/prompts";
-import boxen6 from "boxen";
+import { select as select13 } from "@inquirer/prompts";
 
-// src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
-import { spawnSync as spawnSync13 } from "child_process";
-import { select as select6 } from "@inquirer/prompts";
+// src/lib/avatar-ascii-banner.ts
+import chalk2 from "chalk";
+var BANNER_LINES = [
+  " \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557   \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
+  "\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557",
+  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D",
+  "\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u255A\u2588\u2588\u2557 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557",
+  "\u2588\u2588\u2551  \u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2551  \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551",
+  "\u255A\u2550\u255D  \u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D  \u255A\u2550\u255D  \u255A\u2550\u255D   \u255A\u2550\u255D   \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D"
+];
+var GRADIENT_STOPS = [
+  [217, 79, 30],
+  // cam-cháy (#d94f1e)
+  [200, 70, 80],
+  // cam-hồng
+  [170, 70, 140],
+  // hồng-tím
+  [125, 88, 217]
+  // tím (#7d58d9)
+];
+function lerpChannel(a, b, t) {
+  return Math.round(a + (b - a) * t);
+}
+function gradientAt(t) {
+  const clamped = Math.max(0, Math.min(1, t));
+  const scaled = clamped * (GRADIENT_STOPS.length - 1);
+  const lo = Math.floor(scaled);
+  const hi = Math.min(GRADIENT_STOPS.length - 1, lo + 1);
+  const localT = scaled - lo;
+  const a = GRADIENT_STOPS[lo];
+  const b = GRADIENT_STOPS[hi];
+  return [
+    lerpChannel(a[0], b[0], localT),
+    lerpChannel(a[1], b[1], localT),
+    lerpChannel(a[2], b[2], localT)
+  ];
+}
+function renderAvatarBanner(opts) {
+  const isTty = process.stdout.isTTY ?? false;
+  const supportsColor = isTty && chalk2.level > 0;
+  if (!supportsColor) {
+    return [...BANNER_LINES, ...opts?.tagline ? ["", opts.tagline] : []].join("\n");
+  }
+  const colored = BANNER_LINES.map((line, idx) => {
+    const t = BANNER_LINES.length === 1 ? 0 : idx / (BANNER_LINES.length - 1);
+    const [r, g, b] = gradientAt(t);
+    return chalk2.rgb(r, g, b).bold(line);
+  });
+  if (opts?.tagline) {
+    colored.push("");
+    colored.push(chalk2.dim(opts.tagline));
+  }
+  return colored.join("\n");
+}
+function printAvatarBanner(opts) {
+  process.stdout.write(`
+${renderAvatarBanner(opts)}
 
-// src/lib/team-pack-submodule-manager.ts
-import { join as join16 } from "path";
+`);
+}
 
-// src/lib/check-team-pack-access-with-retry-loop.ts
-import { spawnSync as spawnSync12 } from "child_process";
+// 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";
-import boxen3 from "boxen";
-function parseRepoSlugFromGitUrl(url) {
-  const httpsMatch = url.match(/github\.com[/:]([^/]+\/[^/]+?)(?:\.git)?$/);
-  if (httpsMatch) return httpsMatch[1];
-  return null;
-}
-function checkRepoAccess(repoSlug) {
-  const r = spawnSync12("gh", ["api", `repos/${repoSlug}`], { stdio: "ignore" });
-  return r.status === 0;
+
+// 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`
+  };
 }
-function getCurrentGhUser() {
-  const r = spawnSync12("gh", ["api", "user", "--jq", ".login"], {
+
+// src/lib/resolve-github-username-default.ts
+import { spawnSync as spawnSync13 } from "child_process";
+function resolveGithubUsernameDefault() {
+  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 triggerGhAuthLoginInteractive() {
-  log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync12("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.`);
+    throw new Error(`Kh\xF4ng l\u1EA5y \u0111\u01B0\u1EE3c GitHub username: ${r.stderr?.trim()}`);
   }
+  return r.stdout.trim();
 }
-async function copyInfoToClipboardWithConsent(info) {
-  const ok = await confirm4({
-    message: "Copy th\xF4ng tin (GitHub username + email) v\xE0o clipboard \u0111\u1EC3 d\xE1n v\xE0o Slack/email?",
-    default: true
-  });
-  if (!ok) return;
-  try {
-    const { default: clipboardy } = await import("clipboardy");
-    await clipboardy.write(info);
-    log.success("\u0110\xE3 copy v\xE0o clipboard");
-  } catch (err) {
-    log.dim(`Copy clipboard fail: ${err.message}`);
+
+// 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 printAccessWarningBox(repoSlug, ghUser, ssoEmail) {
-  const lines = [
-    `${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(
-    `${boxen3(lines.join("\n"), { padding: 1, borderColor: "red", borderStyle: "round" })}
-`
-  );
+function validateRepoVisibility(v) {
+  if (v !== "private" && v !== "public") {
+    throw new Error(`Visibility ph\u1EA3i l\xE0 "private" ho\u1EB7c "public", nh\u1EADn: "${v}"`);
+  }
 }
-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]}`
-  ].join("\n");
+
+// 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;
 }
-async function ensureTeamPackAccessWithRetry(args) {
-  if (checkRepoAccess(args.repoSlug)) return true;
-  const initialGhUser = getCurrentGhUser();
-  printAccessWarningBox(args.repoSlug, initialGhUser, args.ssoEmail ?? null);
-  await copyInfoToClipboardWithConsent(
-    buildAccessRequestInfo(args.repoSlug, initialGhUser, args.ssoEmail ?? null)
+
+// 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"] }
   );
-  while (true) {
-    const ghUser = getCurrentGhUser();
-    const ghUserDisplay = ghUser ?? "(ch\u01B0a gh auth)";
-    const action = await select5({
-      message: "C\xE1ch x\u1EED l\xFD?",
-      choices: [
-        {
-          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 (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 (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();
+    if (!confirmed) {
+      throw new Error("User abort reset folder.");
     }
-    log.info("Ki\u1EC3m tra access...");
-    if (checkRepoAccess(args.repoSlug)) {
-      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 v\u1EDBi account '${ghUser ?? "(unknown)"}'. \u0110\u1EA3m b\u1EA3o \u0111\xE3 accept email invite ho\u1EB7c switch \u0111\xFAng account.`
-    );
   }
+  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/pick-latest-stable-semver-tag.ts
-var SEMVER_REGEX3 = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/;
-function parseSemVerTag(tag) {
-  const match = tag.match(SEMVER_REGEX3);
-  if (!match) return null;
-  const [, major, minor, patch, prerelease] = match;
-  return {
-    raw: tag,
-    major: Number.parseInt(major ?? "0", 10),
-    minor: Number.parseInt(minor ?? "0", 10),
-    patch: Number.parseInt(patch ?? "0", 10),
-    prerelease: prerelease ?? null
-  };
+// src/lib/verify-git-remote-accessible.ts
+import { spawnSync as spawnSync15 } from "child_process";
+var TIMEOUT_MS = 5e3;
+function classifyRemoteError(stderr) {
+  const text = stderr.toLowerCase();
+  if (text.includes("authentication") || text.includes("could not read username") || text.includes("permission denied") || text.includes("403") || text.includes("access denied") || text.includes("repository not found")) {
+    return "no-access";
+  }
+  if (text.includes("404") || text.includes("does not exist")) {
+    return "not-found";
+  }
+  if (text.includes("could not resolve host") || text.includes("network") || text.includes("connection refused") || text.includes("connection timed out")) {
+    return "network";
+  }
+  return "unknown";
 }
-function pickLatestStableSemVerTag(tags, includePrerelease = false) {
-  const parsed = tags.map(parseSemVerTag).filter((t) => t !== null).filter((t) => includePrerelease || t.prerelease === null);
-  if (parsed.length === 0) return null;
-  parsed.sort((a, b) => {
-    if (a.major !== b.major) return a.major - b.major;
-    if (a.minor !== b.minor) return a.minor - b.minor;
-    return a.patch - b.patch;
+function tryVerifyGitRemoteAccessible(url) {
+  const r = spawnSync15("git", ["ls-remote", "--exit-code", url, "HEAD"], {
+    encoding: "utf8",
+    timeout: TIMEOUT_MS,
+    stdio: ["ignore", "pipe", "pipe"]
   });
-  return parsed[parsed.length - 1]?.raw ?? null;
-}
-
-// src/lib/resolve-team-pack-repo-url.ts
-var ORG_DEFAULT = "git@github.com:nalvn/team-ai-pack.git";
-function resolveTeamPackRepoUrl() {
-  if (process.env.AVATAR_TEAM_PACK_REPO_URL) {
-    return process.env.AVATAR_TEAM_PACK_REPO_URL;
+  if (r.status === 0) return { ok: true };
+  if (r.signal === "SIGTERM") {
+    return { ok: false, reason: "timeout", detail: "git ls-remote > 5s" };
   }
-  return ORG_DEFAULT;
+  const stderr = (r.stderr || "").trim();
+  const reason = classifyRemoteError(stderr);
+  return { ok: false, reason, detail: stderr.slice(0, 300) };
 }
 
-// src/lib/team-pack-submodule-manager.ts
-var TEAM_PACK_REPO_URL = resolveTeamPackRepoUrl();
-var TEAM_PACK_RELATIVE_PATH = ".claude/pack";
-var TeamPackAccessAbortedError = class extends Error {
+// src/lib/handle-remote-access-failure-with-account-switch.ts
+var RemoteAccessAbortedError = class extends Error {
   constructor(message) {
     super(message);
-    this.name = "TeamPackAccessAbortedError";
+    this.name = "RemoteAccessAbortedError";
   }
 };
-var DEFAULT_PACK_BRANCH = "main";
-async function addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest = false) {
-  const url = resolveTeamPackRepoUrl();
-  const repoSlug = parseRepoSlugFromGitUrl(url);
-  if (repoSlug) {
-    const hasAccess = await ensureTeamPackAccessWithRetry({ repoSlug, ssoEmail });
-    if (!hasAccess) {
-      throw new TeamPackAccessAbortedError(
-        "User ch\u1ECDn t\u1EA1m ng\u01B0ng. Ch\u1EA1y l\u1EA1i 'avatar init' sau khi \u0111\u01B0\u1EE3c add v\xE0o org."
-      );
-    }
-  }
-  try {
-    await addSubmodule(url, TEAM_PACK_RELATIVE_PATH, projectRoot);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (msg.includes("Repository not found") || msg.includes("not found")) {
-      log.error(
-        `Repo team-ai-pack kh\xF4ng t\u1ED3n t\u1EA1i: ${url}
-  C\xE1ch fix:
-    1. T\u1EA1o repo: gh repo create <owner>/team-ai-pack --private --add-readme
-    2. Ho\u1EB7c override URL: export AVATAR_TEAM_PACK_REPO_URL=<url-repo-c\u1EE7a-b\u1EA1n>
-    3. Ho\u1EB7c d\xF9ng flag --skip-team-pack`
-      );
-    }
-    throw err;
-  }
-  if (tag) {
-    await checkoutTagInSubmodule(TEAM_PACK_RELATIVE_PATH, tag, projectRoot);
-    return { pinnedTag: tag };
-  }
-  if (latest) {
-    await checkoutBranchHeadInSubmodule(TEAM_PACK_RELATIVE_PATH, DEFAULT_PACK_BRANCH, projectRoot);
-    return { pinnedTag: `${DEFAULT_PACK_BRANCH} (HEAD)` };
-  }
-  const submoduleDir = join16(projectRoot, TEAM_PACK_RELATIVE_PATH);
-  const allTags = await listTags(submoduleDir);
-  const target = pickLatestStableSemVerTag(allTags);
-  if (target) {
-    await checkoutTagInSubmodule(TEAM_PACK_RELATIVE_PATH, target, projectRoot);
-  }
-  return { pinnedTag: target };
-}
-async function readPinnedPackVersion(projectRoot) {
-  const submoduleRoot = join16(projectRoot, TEAM_PACK_RELATIVE_PATH);
-  const tag = await tagAtHead(submoduleRoot);
-  if (tag) return tag;
-  const sha = await currentCommitSha(submoduleRoot);
-  return sha.slice(0, 7);
-}
-
-// 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 getCurrentGhUser() {
+  const r = spawnSync16("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 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}. C\xF3 th\u1EC3 ch\u1EA1y tay r\u1ED3i quay l\u1EA1i retry.`);
+    log.warn(`gh auth login exit ${r.status}. B\u1EA1n 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 = spawnSync13("open", ["https://github.com/settings/keys"], { stdio: "ignore" });
-  if (r.status !== 0) {
-    log.info("URL: https://github.com/settings/keys");
+function getReasonHint(reason, url, ghUser) {
+  switch (reason) {
+    case "no-access":
+      return ghUser ? `Repo c\xF3 th\u1EC3 private v\xE0 account '${ghUser}' kh\xF4ng c\xF3 quy\u1EC1n access. Switch sang account c\xF3 quy\u1EC1n, ho\u1EB7c xin invite t\u1EEB owner repo.` : "Repo c\xF3 th\u1EC3 private v\xE0 gh CLI ch\u01B0a login. Login tr\u01B0\u1EDBc r\u1ED3i retry.";
+    case "not-found":
+      return `URL c\xF3 th\u1EC3 sai ch\xEDnh t\u1EA3, ho\u1EB7c repo \u0111\xE3 b\u1ECB x\xF3a/rename. Nh\u1EADp l\u1EA1i URL \u0111\xFAng. Check: ${url}`;
+    case "network":
+      return "Kh\xF4ng k\u1EBFt n\u1ED1i \u0111\u01B0\u1EE3c GitHub. Check m\u1EA1ng / VPN / firewall.";
+    case "timeout":
+      return "Network ch\u1EADm > 5s. Check m\u1EA1ng r\u1ED3i retry.";
+    default:
+      return "L\u1ED7i kh\xF4ng x\xE1c \u0111\u1ECBnh. URL c\xF3 th\u1EC3 sai \u2014 nh\u1EADp l\u1EA1i, ho\u1EB7c check gh auth status.";
   }
 }
-async function handleSshPermissionError() {
-  return await select6({
-    message: "SSH permission denied. C\xE1ch x\u1EED l\xFD?",
-    choices: [
+function isValidGitUrl(url) {
+  const trimmed = url.trim();
+  if (!trimmed) return false;
+  return /^https?:\/\/[\w.@/-]+$/.test(trimmed) || /^git@[\w.-]+:[\w./-]+\.git$/.test(trimmed) || /^[\w.-]+\/[\w.-]+$/.test(trimmed);
+}
+async function handleRemoteAccessFailureWithAccountSwitch(args) {
+  let currentUrl = args.url;
+  let reason = args.initialReason;
+  let detail = args.initialDetail;
+  while (true) {
+    const ghUser = getCurrentGhUser();
+    log.warn(`Kh\xF4ng truy c\u1EADp \u0111\u01B0\u1EE3c ${currentUrl}`);
+    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 choices = [
       {
-        name: "Switch GitHub account (gh auth login \u2014 m\u1EDF browser)",
-        value: "switch"
+        name: "Nh\u1EADp l\u1EA1i URL \u0111\xFAng (recommended khi URL sai ch\xEDnh t\u1EA3)",
+        value: "re-input-url"
       },
       {
-        name: "D\xF9ng HTTPS thay SSH (override URL b\u1EB1ng env AVATAR_TEAM_PACK_REPO_URL)",
-        value: "https"
+        name: "Switch GitHub account (gh auth login \u2014 m\u1EDF browser)",
+        value: "switch"
       },
       {
-        name: "T\xF4i v\u1EEBa add SSH key l\xEAn GitHub \u2014 retry",
+        name: "T\xF4i v\u1EEBa fix (accept invite / s\u1EEDa permission) \u2014 retry verify",
         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, latest = false) {
-  while (true) {
-    try {
-      const result = await addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest);
-      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: message,
-        allowSkip: true,
-        hint: "Network glitch? Retry th\u01B0\u1EDDng work. N\u1EBFu skip, d\xF9ng `avatar sync` sau \u0111\u1EC3 pull pack."
+    ];
+    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"
       });
-      if (action === "abort") {
-        throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc pull team-ai-pack.");
+    }
+    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;
       }
-      if (action === "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 };
+      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):",
+        default: currentUrl,
+        validate: (v) => isValidGitUrl(v) || "URL kh\xF4ng \u0111\xFAng format git remote"
+      });
+      currentUrl = newUrl.trim();
+    }
+    if (action === "switch") {
+      triggerGhAuthLoginInteractive();
+    }
+    log.info(`Verify remote l\u1EA1i: ${currentUrl}...`);
+    const result = tryVerifyGitRemoteAccessible(currentUrl);
+    if (result.ok) {
+      log.success(`Remote accessible: ${currentUrl}`);
+      return { resolvedUrl: currentUrl };
+    }
+    reason = result.reason ?? "unknown";
+    detail = result.detail;
   }
 }
 
-// src/lib/avatar-ascii-banner.ts
-import chalk2 from "chalk";
-var BANNER_LINES = [
-  " \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557   \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
-  "\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557",
-  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D",
-  "\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u255A\u2588\u2588\u2557 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557",
-  "\u2588\u2588\u2551  \u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2551  \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551",
-  "\u255A\u2550\u255D  \u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D  \u255A\u2550\u255D  \u255A\u2550\u255D   \u255A\u2550\u255D   \u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D"
-];
-var GRADIENT_STOPS = [
-  [217, 79, 30],
-  // cam-cháy (#d94f1e)
-  [200, 70, 80],
-  // cam-hồng
-  [170, 70, 140],
-  // hồng-tím
-  [125, 88, 217]
-  // tím (#7d58d9)
-];
-function lerpChannel(a, b, t) {
-  return Math.round(a + (b - a) * t);
-}
-function gradientAt(t) {
-  const clamped = Math.max(0, Math.min(1, t));
-  const scaled = clamped * (GRADIENT_STOPS.length - 1);
-  const lo = Math.floor(scaled);
-  const hi = Math.min(GRADIENT_STOPS.length - 1, lo + 1);
-  const localT = scaled - lo;
-  const a = GRADIENT_STOPS[lo];
-  const b = GRADIENT_STOPS[hi];
-  return [
-    lerpChannel(a[0], b[0], localT),
-    lerpChannel(a[1], b[1], localT),
-    lerpChannel(a[2], b[2], localT)
-  ];
-}
-function renderAvatarBanner(opts) {
-  const isTty = process.stdout.isTTY ?? false;
-  const supportsColor = isTty && chalk2.level > 0;
-  if (!supportsColor) {
-    return [...BANNER_LINES, ...opts?.tagline ? ["", opts.tagline] : []].join("\n");
-  }
-  const colored = BANNER_LINES.map((line, idx) => {
-    const t = BANNER_LINES.length === 1 ? 0 : idx / (BANNER_LINES.length - 1);
-    const [r, g, b] = gradientAt(t);
-    return chalk2.rgb(r, g, b).bold(line);
-  });
-  if (opts?.tagline) {
-    colored.push("");
-    colored.push(chalk2.dim(opts.tagline));
-  }
-  return colored.join("\n");
-}
-function printAvatarBanner(opts) {
-  process.stdout.write(`
-${renderAvatarBanner(opts)}
+// src/lib/safe-bootstrap-for-dirty-folder.ts
+import { readdirSync } from "fs";
+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 join17 } from "path";
+function checkFolderHasGit(folderPath) {
+  const gitPath = join17(folderPath, ".git");
+  if (!existsSync6(gitPath)) return false;
+  const stat = statSync(gitPath);
+  return stat.isDirectory() || stat.isFile();
 }
 
-// src/lib/execute-gh-repo-create.ts
-import { spawnSync as spawnSync14 } 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";
+// src/lib/create-initial-git-commit.ts
+import { simpleGit as simpleGit2 } from "simple-git";
+var INITIAL_COMMIT_MESSAGE = "chore: initial commit";
+async function createInitialGitCommit(folderPath) {
+  const g = simpleGit2({ baseDir: folderPath });
+  const isRepo = await g.checkIsRepo().catch(() => false);
+  if (!isRepo) {
+    await g.init();
   }
-};
-function executeGhRepoCreate(input6) {
-  const fullName = `${input6.org}/${input6.name}`;
-  const args = [
-    "repo",
-    "create",
-    fullName,
-    `--${input6.visibility}`,
-    "--source",
-    input6.folder,
-    "--remote",
-    "origin",
-    "--push"
-  ];
-  const r = spawnSync14("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})`);
+  try {
+    await g.branch(["-M", "main"]);
+  } catch {
   }
-  return {
-    sshUrl: `git@github.com:${fullName}.git`,
-    httpsUrl: `https://github.com/${fullName}.git`
-  };
-}
-
-// src/lib/resolve-github-username-default.ts
-import { spawnSync as spawnSync15 } from "child_process";
-function resolveGithubUsernameDefault() {
-  const r = spawnSync15("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()}`);
+  await g.add(".");
+  const status = await g.status();
+  const hasCommits = (await g.raw(["rev-list", "-n", "1", "--all"]).catch(() => "")).trim();
+  if (hasCommits) return;
+  if (status.files.length === 0) {
+    await g.commit(INITIAL_COMMIT_MESSAGE, void 0, { "--allow-empty": null });
+  } else {
+    await g.commit(INITIAL_COMMIT_MESSAGE);
   }
-  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";
-  }
+// src/lib/detect-folder-tech-stack.ts
+import { existsSync as existsSync7 } from "fs";
+import { join as join18 } from "path";
+var SIGNATURES = {
+  node: ["package.json"],
+  python: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"],
+  go: ["go.mod"],
+  rust: ["Cargo.toml"],
+  java: ["pom.xml", "build.gradle", "build.gradle.kts"],
+  ruby: ["Gemfile"]
 };
-function validateRepoName(name) {
-  if (!REPO_NAME_REGEX.test(name)) {
-    throw new InvalidRepoNameError(name);
+function detectFolderTechStack(folderPath) {
+  const matched = [];
+  for (const [stack, files] of Object.entries(SIGNATURES)) {
+    if (files.some((f) => existsSync7(join18(folderPath, f)))) {
+      matched.push(stack);
+    }
   }
+  return matched.length > 0 ? matched : ["generic"];
 }
-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/gitignore-template-loader.ts
+import { readFileSync as readFileSync3 } from "fs";
+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
+  join19(__dirname, "templates", "gitignore"),
+  // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
+  join19(__dirname, "..", "templates", "gitignore"),
+  // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
+  join19(__dirname, "..", "..", "src", "templates", "gitignore"),
+  // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
+  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(join19(dir, `${stack}.txt`), "utf8");
+    } catch {
+    }
   }
+  throw new Error(`Kh\xF4ng t\xECm th\u1EA5y template gitignore cho stack "${stack}"`);
 }
-
-// src/lib/create-github-remote-from-folder.ts
-function createGithubRemoteFromFolder(input6) {
-  validateRepoName(input6.name);
-  validateRepoVisibility(input6.visibility);
-  const org = input6.org ?? resolveGithubUsernameDefault();
-  log.info(`T\u1EA1o GitHub repo ${org}/${input6.name} (${input6.visibility})...`);
-  const urls = executeGhRepoCreate({
-    folder: input6.folder,
-    org,
-    name: input6.name,
-    visibility: input6.visibility
-  });
-  log.success(`\u0110\xE3 t\u1EA1o: ${urls.sshUrl}`);
-  return urls;
+function composeGitignoreContent(stacks) {
+  const all = ["generic", ...stacks.filter((s) => s !== "generic")];
+  const sections = all.map((s) => `# --- ${s} ---
+${readTemplate(s).trim()}`);
+  return [AVATAR_MARKER_START, ...sections, AVATAR_MARKER_END, ""].join("\n");
 }
 
-// src/lib/create-workspace-remote-via-gh.ts
-import { spawnSync as spawnSync23 } from "child_process";
-
-// src/lib/check-gh-cli-auth-status.ts
-import { spawnSync as spawnSync16 } from "child_process";
-function checkGhCliAuthStatus() {
-  const r = spawnSync16("gh", ["auth", "status"], { stdio: "ignore" });
-  if (r.error && r.error.code === "ENOENT") {
-    return "not-installed";
+// src/lib/write-or-merge-gitignore.ts
+import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync } from "fs";
+import { join as join20 } from "path";
+function writeOrMergeGitignore(folderPath, avatarBlock) {
+  const path = join20(folderPath, ".gitignore");
+  if (!existsSync8(path)) {
+    writeFileSync(path, avatarBlock, "utf8");
+    return;
   }
-  return r.status === 0 ? "authenticated" : "not-authenticated";
-}
+  const existing = readFileSync4(path, "utf8");
+  const startIdx = existing.indexOf(AVATAR_MARKER_START);
+  const endIdx = existing.indexOf(AVATAR_MARKER_END);
+  if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
+    const before = existing.slice(0, startIdx);
+    const after = existing.slice(endIdx + AVATAR_MARKER_END.length);
+    writeFileSync(path, `${before.trimEnd()}
 
-// src/lib/detect-package-manager.ts
-import { spawnSync as spawnSync17 } from "child_process";
-function hasBinary(name) {
-  const platform2 = detectHostPlatform();
-  const probe = platform2 === "win32" ? "where" : "command";
-  const args = platform2 === "win32" ? [name] : ["-v", name];
-  const r = spawnSync17(probe, args, {
-    shell: platform2 !== "win32",
-    stdio: "ignore"
-  });
-  return r.status === 0;
-}
-function detectPackageManager() {
-  const platform2 = detectHostPlatform();
-  const candidates = platform2 === "darwin" ? ["brew"] : platform2 === "win32" ? ["winget"] : platform2 === "linux" ? ["apt", "dnf", "pacman"] : [];
-  for (const pm of candidates) {
-    if (hasBinary(pm)) return pm;
+${avatarBlock}${after.trimStart()}`, "utf8");
+    return;
   }
-  return null;
-}
+  writeFileSync(path, `${existing.trimEnd()}
 
-// src/lib/handle-remote-access-failure-with-account-switch.ts
-import { spawnSync as spawnSync19 } from "child_process";
-import { input as input4, select as select7 } from "@inquirer/prompts";
+${avatarBlock}`, "utf8");
+}
 
-// src/lib/verify-git-remote-accessible.ts
-import { spawnSync as spawnSync18 } from "child_process";
-var TIMEOUT_MS = 5e3;
-function classifyRemoteError(stderr) {
-  const text = stderr.toLowerCase();
-  if (text.includes("authentication") || text.includes("could not read username") || text.includes("permission denied") || text.includes("403") || text.includes("access denied") || text.includes("repository not found")) {
-    return "no-access";
-  }
-  if (text.includes("404") || text.includes("does not exist")) {
-    return "not-found";
+// src/lib/safe-bootstrap-for-dirty-folder.ts
+var InitAbortedByUserError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "InitAbortedByUserError";
   }
-  if (text.includes("could not resolve host") || text.includes("network") || text.includes("connection refused") || text.includes("connection timed out")) {
-    return "network";
+};
+async function detectFolderGitState(folderPath) {
+  const hasGit = checkFolderHasGit(folderPath);
+  if (!hasGit) {
+    const entries = readdirSync(folderPath).filter((e) => e !== ".git");
+    return entries.length === 0 ? "empty" : "untracked-only";
   }
-  return "unknown";
+  const g = simpleGit3({ baseDir: folderPath });
+  const status = await g.status();
+  return status.isClean() ? "clean" : "dirty";
 }
-function tryVerifyGitRemoteAccessible(url) {
-  const r = spawnSync18("git", ["ls-remote", "--exit-code", url, "HEAD"], {
-    encoding: "utf8",
-    timeout: TIMEOUT_MS,
-    stdio: ["ignore", "pipe", "pipe"]
+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 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: [
+      {
+        value: "stash",
+        name: "1. Stash changes \u2192 bootstrap \u2192 restore (KHUY\u1EBEN NGH\u1ECA)"
+      },
+      {
+        value: "commit-all",
+        name: "2. Commit to\xE0n b\u1ED9 v\xE0o initial commit (legacy v1.1.6)"
+      },
+      {
+        value: "skip",
+        name: "3. Skip \u2014 t\xF4i commit th\u1EE7 c\xF4ng r\u1ED3i ch\u1EA1y l\u1EA1i"
+      },
+      {
+        value: "branch",
+        name: "4. Commit v\xE0o branch ri\xEAng `avatar/init` (main gi\u1EEF s\u1EA1ch)"
+      }
+    ],
+    default: "stash"
   });
-  if (r.status === 0) return { ok: true };
-  if (r.signal === "SIGTERM") {
-    return { ok: false, reason: "timeout", detail: "git ls-remote > 5s" };
+}
+async function stashUserChanges(g, stashName) {
+  const status = await g.status();
+  if (status.isClean() && status.not_added.length === 0) return false;
+  await g.stash(["push", "--include-untracked", "-m", stashName]);
+  log.info(`Stashed changes: ${stashName}`);
+  return true;
+}
+async function restoreStash(g, stashName) {
+  try {
+    await g.stash(["pop"]);
+    log.success(`Restored stash: ${stashName}`);
+  } catch (err) {
+    log.warn(
+      "Restore stash conflict \u2014 files c\xF3 Avatar t\u1EA1o v\xE0 stash c\u1EE7a user xung \u0111\u1ED9t. Stash gi\u1EEF t\u1EA1i ref stash@{0}."
+    );
+    log.warn("Resolve: git stash show -p stash@{0} \u2192 fix conflict \u2192 git stash drop");
+    log.dim(`Detail: ${err.message}`);
   }
-  const stderr = (r.stderr || "").trim();
-  const reason = classifyRemoteError(stderr);
-  return { ok: false, reason, detail: stderr.slice(0, 300) };
 }
-
-// src/lib/handle-remote-access-failure-with-account-switch.ts
-var RemoteAccessAbortedError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "RemoteAccessAbortedError";
+async function getCurrentBranch(g) {
+  try {
+    const result = await g.revparse(["--abbrev-ref", "HEAD"]);
+    const branch = result.trim();
+    return branch === "HEAD" ? "main" : branch;
+  } catch {
+    return "main";
   }
-};
+}
+async function writeAvatarGitignore(folderPath) {
+  const stacks = detectFolderTechStack(folderPath);
+  log.info(`Tech stack: ${stacks.join(", ")}`);
+  writeOrMergeGitignore(folderPath, composeGitignoreContent(stacks));
+  log.success(".gitignore \u0111\xE3 ghi (Avatar block)");
+}
+async function executeBootstrapWithStrategy(folderPath, strategy) {
+  const g = simpleGit3({ baseDir: folderPath });
+  switch (strategy) {
+    case "skip":
+      throw new InitAbortedByUserError(
+        "Init aborted. Commit th\u1EE7 c\xF4ng changes hi\u1EC7n t\u1EA1i r\u1ED3i ch\u1EA1y l\u1EA1i `avatar init`."
+      );
+    case "stash": {
+      const stashName = `avatar-init-backup-${Date.now()}`;
+      const hadGit = checkFolderHasGit(folderPath);
+      if (!hadGit) {
+        await g.init();
+        await g.branch(["-M", "main"]).catch(() => void 0);
+      }
+      const hasCommit = (await g.raw(["rev-list", "-n", "1", "--all"]).catch(() => "")).trim();
+      if (!hasCommit) {
+        await g.commit("chore: avatar baseline (pre-stash)", void 0, { "--allow-empty": null });
+      }
+      const stashed = await stashUserChanges(g, stashName);
+      try {
+        await writeAvatarGitignore(folderPath);
+        await createInitialGitCommit(folderPath);
+      } finally {
+        if (stashed) await restoreStash(g, stashName);
+      }
+      break;
+    }
+    case "commit-all": {
+      await writeAvatarGitignore(folderPath);
+      await createInitialGitCommit(folderPath);
+      break;
+    }
+    case "branch": {
+      const hadGit = checkFolderHasGit(folderPath);
+      if (!hadGit) {
+        await g.init();
+        await g.branch(["-M", "main"]);
+      }
+      const originalBranch = await getCurrentBranch(g);
+      try {
+        await g.checkoutLocalBranch("avatar/init");
+      } catch {
+        await g.checkout("avatar/init");
+      }
+      await writeAvatarGitignore(folderPath);
+      await createInitialGitCommit(folderPath);
+      try {
+        await g.checkout(originalBranch);
+        log.info(
+          `Avatar init committed \u1EDF branch 'avatar/init'. Switch back v\u1EC1 '${originalBranch}'. Merge khi s\u1EB5n s\xE0ng: git merge avatar/init`
+        );
+      } catch {
+        log.warn(
+          `Kh\xF4ng switch v\u1EC1 '${originalBranch}' \u0111\u01B0\u1EE3c \u2014 \u1EDF l\u1EA1i branch 'avatar/init'. Switch tay sau.`
+        );
+      }
+      break;
+    }
+  }
+}
+async function safeBootstrapGitInFolder(folderPath, opts = {}) {
+  const state = await detectFolderGitState(folderPath);
+  log.info(`Folder state: ${state}`);
+  if (state === "empty" || state === "clean") {
+    await writeAvatarGitignore(folderPath);
+    if (state === "empty") {
+      await createInitialGitCommit(folderPath);
+    }
+    await appendAuditEntry("bootstrap", `state=${state},strategy=auto`);
+    return;
+  }
+  const strategy = await promptBootstrapStrategy(state, opts);
+  await executeBootstrapWithStrategy(folderPath, strategy);
+  await appendAuditEntry("bootstrap", `state=${state},strategy=${strategy}`);
+}
+
+// src/lib/team-pack-submodule-manager.ts
+import { join as join21 } from "path";
+
+// src/lib/check-team-pack-access-with-retry-loop.ts
+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 = spawnSync17("gh", ["api", `repos/${repoSlug}`], { stdio: "ignore" });
+  return r.status === 0;
+}
 function getCurrentGhUser2() {
-  const r = spawnSync19("gh", ["api", "user", "--jq", ".login"], {
+  const r = spawnSync17("gh", ["api", "user", "--jq", ".login"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"]
   });
   if (r.status !== 0) return null;
   return r.stdout.trim() || null;
 }
-function triggerGhAuthLoginInteractive3() {
+function triggerGhAuthLoginInteractive2() {
   log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
-  const r = spawnSync19("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}. B\u1EA1n c\xF3 th\u1EC3 ch\u1EA1y tay r\u1ED3i quay l\u1EA1i retry.`);
+    log.warn(`gh auth login exit ${r.status}. C\xF3 th\u1EC3 ch\u1EA1y tay r\u1ED3i quay l\u1EA1i retry.`);
   }
 }
-function getReasonHint(reason, url, ghUser) {
-  switch (reason) {
-    case "no-access":
-      return ghUser ? `Repo c\xF3 th\u1EC3 private v\xE0 account '${ghUser}' kh\xF4ng c\xF3 quy\u1EC1n access. Switch sang account c\xF3 quy\u1EC1n, ho\u1EB7c xin invite t\u1EEB owner repo.` : "Repo c\xF3 th\u1EC3 private v\xE0 gh CLI ch\u01B0a login. Login tr\u01B0\u1EDBc r\u1ED3i retry.";
-    case "not-found":
-      return `URL c\xF3 th\u1EC3 sai ch\xEDnh t\u1EA3, ho\u1EB7c repo \u0111\xE3 b\u1ECB x\xF3a/rename. Nh\u1EADp l\u1EA1i URL \u0111\xFAng. Check: ${url}`;
-    case "network":
-      return "Kh\xF4ng k\u1EBFt n\u1ED1i \u0111\u01B0\u1EE3c GitHub. Check m\u1EA1ng / VPN / firewall.";
-    case "timeout":
-      return "Network ch\u1EADm > 5s. Check m\u1EA1ng r\u1ED3i retry.";
-    default:
-      return "L\u1ED7i kh\xF4ng x\xE1c \u0111\u1ECBnh. URL c\xF3 th\u1EC3 sai \u2014 nh\u1EADp l\u1EA1i, ho\u1EB7c check gh auth status.";
+async function copyInfoToClipboardWithConsent(info) {
+  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
+  });
+  if (!ok) return;
+  try {
+    const { default: clipboardy } = await import("clipboardy");
+    await clipboardy.write(info);
+    log.success("\u0110\xE3 copy v\xE0o clipboard");
+  } catch (err) {
+    log.dim(`Copy clipboard fail: ${err.message}`);
   }
 }
-function isValidGitUrl(url) {
-  const trimmed = url.trim();
-  if (!trimmed) return false;
-  return /^https?:\/\/[\w.@/-]+$/.test(trimmed) || /^git@[\w.-]+:[\w./-]+\.git$/.test(trimmed) || /^[\w.-]+\/[\w.-]+$/.test(trimmed);
+function printAccessWarningBox(repoSlug, ghUser, ssoEmail) {
+  const lines = [
+    `${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(
+    `${boxen3(lines.join("\n"), { padding: 1, borderColor: "red", borderStyle: "round" })}
+`
+  );
 }
-async function handleRemoteAccessFailureWithAccountSwitch(args) {
-  let currentUrl = args.url;
-  let reason = args.initialReason;
-  let detail = args.initialDetail;
+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]}`
+  ].join("\n");
+}
+async function ensureTeamPackAccessWithRetry(args) {
+  if (checkRepoAccess(args.repoSlug)) return true;
+  const initialGhUser = getCurrentGhUser2();
+  printAccessWarningBox(args.repoSlug, initialGhUser, args.ssoEmail ?? null);
+  await copyInfoToClipboardWithConsent(
+    buildAccessRequestInfo(args.repoSlug, initialGhUser, args.ssoEmail ?? null)
+  );
   while (true) {
     const ghUser = getCurrentGhUser2();
-    log.warn(`Kh\xF4ng truy c\u1EADp \u0111\u01B0\u1EE3c ${currentUrl}`);
-    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 select7({
+    const ghUserDisplay = ghUser ?? "(ch\u01B0a gh auth)";
+    const action = await select8({
       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: `\u0110\xE3 \u0111\u01B0\u1EE3c grant access v\u1EDBi GitHub username '${ghUserDisplay}' \u2014 ki\u1EC3m tra l\u1EA1i`,
+          value: "retry-same"
         },
         {
-          name: "T\xF4i v\u1EEBa fix (accept invite / s\u1EEDa permission) \u2014 retry verify",
-          value: "retry"
+          name: "\u0110\xE3 grant v\u1EDBi GitHub account kh\xE1c \u2014 switch gh (m\u1EDF browser)",
+          value: "switch-account"
         },
         {
-          name: "T\u1EA1m ng\u01B0ng init \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau",
+          name: "T\u1EA1m ng\u01B0ng \u2014 ch\u1EA1y l\u1EA1i 'avatar init' sau",
           value: "abort"
         }
       ]
     });
     if (action === "abort") {
-      throw new RemoteAccessAbortedError(
-        `User ch\u1ECDn t\u1EA1m ng\u01B0ng. Fix access ${currentUrl} r\u1ED3i ch\u1EA1y l\u1EA1i 'avatar init'.`
-      );
+      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 === "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):",
-        default: currentUrl,
-        validate: (v) => isValidGitUrl(v) || "URL kh\xF4ng \u0111\xFAng format git remote"
-      });
-      currentUrl = newUrl.trim();
+    if (action === "switch-account") {
+      triggerGhAuthLoginInteractive2();
     }
-    if (action === "switch") {
-      triggerGhAuthLoginInteractive3();
+    log.info("Ki\u1EC3m tra access...");
+    if (checkRepoAccess(args.repoSlug)) {
+      const finalUser = getCurrentGhUser2();
+      log.success(`\u0110\xE3 c\xF3 access v\u1EDBi '${finalUser ?? "(unknown)"}' \u2014 ti\u1EBFp t\u1EE5c.`);
+      return true;
     }
-    log.info(`Verify remote l\u1EA1i: ${currentUrl}...`);
-    const result = tryVerifyGitRemoteAccessible(currentUrl);
-    if (result.ok) {
-      log.success(`Remote accessible: ${currentUrl}`);
-      return { resolvedUrl: currentUrl };
+    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.`
+    );
+  }
+}
+
+// src/lib/pick-latest-stable-semver-tag.ts
+var SEMVER_REGEX3 = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/;
+function parseSemVerTag(tag) {
+  const match = tag.match(SEMVER_REGEX3);
+  if (!match) return null;
+  const [, major, minor, patch, prerelease] = match;
+  return {
+    raw: tag,
+    major: Number.parseInt(major ?? "0", 10),
+    minor: Number.parseInt(minor ?? "0", 10),
+    patch: Number.parseInt(patch ?? "0", 10),
+    prerelease: prerelease ?? null
+  };
+}
+function pickLatestStableSemVerTag(tags, includePrerelease = false) {
+  const parsed = tags.map(parseSemVerTag).filter((t) => t !== null).filter((t) => includePrerelease || t.prerelease === null);
+  if (parsed.length === 0) return null;
+  parsed.sort((a, b) => {
+    if (a.major !== b.major) return a.major - b.major;
+    if (a.minor !== b.minor) return a.minor - b.minor;
+    return a.patch - b.patch;
+  });
+  return parsed[parsed.length - 1]?.raw ?? null;
+}
+
+// src/lib/resolve-team-pack-repo-url.ts
+var ORG_DEFAULT = "git@github.com:nalvn/team-ai-pack.git";
+function resolveTeamPackRepoUrl() {
+  if (process.env.AVATAR_TEAM_PACK_REPO_URL) {
+    return process.env.AVATAR_TEAM_PACK_REPO_URL;
+  }
+  return ORG_DEFAULT;
+}
+
+// src/lib/team-pack-submodule-manager.ts
+var TEAM_PACK_REPO_URL = resolveTeamPackRepoUrl();
+var TEAM_PACK_RELATIVE_PATH = ".claude/pack";
+var TeamPackAccessAbortedError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "TeamPackAccessAbortedError";
+  }
+};
+var DEFAULT_PACK_BRANCH = "main";
+async function addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest = false) {
+  const url = resolveTeamPackRepoUrl();
+  const repoSlug = parseRepoSlugFromGitUrl(url);
+  if (repoSlug) {
+    const hasAccess = await ensureTeamPackAccessWithRetry({ repoSlug, ssoEmail });
+    if (!hasAccess) {
+      throw new TeamPackAccessAbortedError(
+        "User ch\u1ECDn t\u1EA1m ng\u01B0ng. Ch\u1EA1y l\u1EA1i 'avatar init' sau khi \u0111\u01B0\u1EE3c add v\xE0o org."
+      );
     }
-    reason = result.reason ?? "unknown";
-    detail = result.detail;
   }
+  try {
+    await addSubmodule(url, TEAM_PACK_RELATIVE_PATH, projectRoot);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("Repository not found") || msg.includes("not found")) {
+      log.error(
+        `Repo team-ai-pack kh\xF4ng t\u1ED3n t\u1EA1i: ${url}
+  C\xE1ch fix:
+    1. T\u1EA1o repo: gh repo create <owner>/team-ai-pack --private --add-readme
+    2. Ho\u1EB7c override URL: export AVATAR_TEAM_PACK_REPO_URL=<url-repo-c\u1EE7a-b\u1EA1n>
+    3. Ho\u1EB7c d\xF9ng flag --skip-team-pack`
+      );
+    }
+    throw err;
+  }
+  if (tag) {
+    await checkoutTagInSubmodule(TEAM_PACK_RELATIVE_PATH, tag, projectRoot);
+    return { pinnedTag: tag };
+  }
+  if (latest) {
+    await checkoutBranchHeadInSubmodule(TEAM_PACK_RELATIVE_PATH, DEFAULT_PACK_BRANCH, projectRoot);
+    return { pinnedTag: `${DEFAULT_PACK_BRANCH} (HEAD)` };
+  }
+  const submoduleDir = join21(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const allTags = await listTags(submoduleDir);
+  const target = pickLatestStableSemVerTag(allTags);
+  if (target) {
+    await checkoutTagInSubmodule(TEAM_PACK_RELATIVE_PATH, target, projectRoot);
+  }
+  return { pinnedTag: target };
+}
+async function readPinnedPackVersion(projectRoot) {
+  const submoduleRoot = join21(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const tag = await tagAtHead(submoduleRoot);
+  if (tag) return tag;
+  const sha = await currentCommitSha(submoduleRoot);
+  return sha.slice(0, 7);
+}
+
+// src/commands/init-flow-handlers-for-each-project-status.ts
+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 spawnSync18 } from "child_process";
+function checkGhCliAuthStatus() {
+  const r = spawnSync18("gh", ["auth", "status"], { stdio: "ignore" });
+  if (r.error && r.error.code === "ENOENT") {
+    return "not-installed";
+  }
+  return r.status === 0 ? "authenticated" : "not-authenticated";
+}
+
+// src/lib/detect-package-manager.ts
+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 = spawnSync19(probe, args, {
+    shell: platform2 !== "win32",
+    stdio: "ignore"
+  });
+  return r.status === 0;
+}
+function detectPackageManager() {
+  const platform2 = detectHostPlatform();
+  const candidates = platform2 === "darwin" ? ["brew"] : platform2 === "win32" ? ["winget"] : platform2 === "linux" ? ["apt", "dnf", "pacman"] : [];
+  for (const pm of candidates) {
+    if (hasBinary(pm)) return pm;
+  }
+  return null;
 }
 
 // src/lib/install-gh-cli-via-package-manager.ts
@@ -3070,602 +3357,495 @@ async function ensureGitHubReady(remoteUrl) {
   return {};
 }
 
-// src/lib/create-workspace-remote-via-gh.ts
-var CreateWorkspaceRemoteError = class extends Error {
-  reason;
-  fullName;
-  stderr;
-  constructor(reason, fullName, message, stderr) {
-    super(message);
-    this.name = "CreateWorkspaceRemoteError";
-    this.reason = reason;
-    this.fullName = fullName;
-    this.stderr = stderr;
-  }
-};
-function classifyGhCreateError(stderr) {
-  const text = stderr.toLowerCase();
-  if (text.includes("name already exists") || text.includes("already exists on this account") || text.includes("repository already exists")) {
-    return "repo-exists";
-  }
-  if (text.includes("403") || text.includes("permission") || text.includes("not authorized") || text.includes("forbidden")) {
-    return "no-permission";
-  }
-  if (text.includes("invalid") && text.includes("name")) {
-    return "name-invalid";
-  }
-  if (text.includes("could not resolve") || text.includes("network") || text.includes("connection refused")) {
-    return "network";
-  }
-  return "unknown";
-}
-function repoExistsOnGitHub(fullName) {
-  const r = spawnSync23("gh", ["repo", "view", fullName, "--json", "name"], {
-    stdio: "ignore"
-  });
-  return r.status === 0;
+// src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
+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 canCreateInNamespace(org, ghUser) {
-  if (org.toLowerCase() === ghUser.toLowerCase()) return { ok: true };
-  const r = spawnSync23("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" });
-  if (orgCheck.status !== 0) {
-    const userCheck = spawnSync23("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
-    if (userCheck.status === 0) {
-      return {
-        ok: false,
-        reason: `'${org}' l\xE0 personal account kh\xE1c (kh\xF4ng ph\u1EA3i org). B\u1EA1n (${ghUser}) kh\xF4ng th\u1EC3 t\u1EA1o repo d\u01B0\u1EDBi account c\u1EE7a user kh\xE1c. Pass --repo-org=${ghUser} ho\u1EB7c switch gh: gh auth login`
-      };
-    }
-    return {
-      ok: false,
-      reason: `'${org}' kh\xF4ng t\u1ED3n t\u1EA1i tr\xEAn GitHub. Check ch\xEDnh t\u1EA3 ho\u1EB7c t\u1EA1o org tr\u01B0\u1EDBc.`
-    };
+function triggerGhAuthLoginInteractive3() {
+  log.info("M\u1EDF browser \u0111\u1EC3 switch GitHub account...");
+  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.`);
   }
-  return {
-    ok: false,
-    reason: `'${ghUser}' kh\xF4ng ph\u1EA3i member c\u1EE7a org '${org}'. Li\xEAn h\u1EC7 admin org \u0111\u1EC3 \u0111\u01B0\u1EE3c invite, ho\u1EB7c pass --repo-org=${ghUser} t\u1EA1o d\u01B0\u1EDBi personal account.`
-  };
 }
-async function createWorkspaceRemoteViaGh(input6) {
-  validateRepoName(input6.workspaceName);
-  validateRepoVisibility(input6.visibility);
-  await ensureGitHubReady();
-  const ghUser = resolveGithubUsernameDefault();
-  const org = input6.org ?? ghUser;
-  const namespaceCheck = canCreateInNamespace(org, ghUser);
-  if (!namespaceCheck.ok) {
-    throw new Error(`Kh\xF4ng th\u1EC3 t\u1EA1o repo d\u01B0\u1EDBi '${org}/': ${namespaceCheck.reason}`);
-  }
-  const fullName = `${org}/${input6.workspaceName}`;
-  if (repoExistsOnGitHub(fullName)) {
-    throw new CreateWorkspaceRemoteError(
-      "repo-exists",
-      fullName,
-      `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xF3 th\u1EC3 b\u1EA1n \u0111\xE3 init workspace n\xE0y tr\u01B0\u1EDBc \u0111\xF3.`
-    );
-  }
-  log.info(`T\u1EA1o GitHub repo cho workspace: ${fullName} (${input6.visibility})...`);
-  const r = spawnSync23(
-    "gh",
-    [
-      "repo",
-      "create",
-      fullName,
-      `--${input6.visibility}`,
-      "--source",
-      input6.workspacePath,
-      "--remote",
-      "origin",
-      "--push"
-    ],
-    { stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }
-  );
+function openGithubSshKeysPage() {
+  log.info("M\u1EDF trang GitHub Settings \u2192 SSH Keys...");
+  const r = spawnSync23("open", ["https://github.com/settings/keys"], { stdio: "ignore" });
   if (r.status !== 0) {
-    const stderr = (r.stderr || "").trim();
-    const stdout = (r.stdout || "").trim();
-    const combined = [stderr, stdout].filter(Boolean).join("\n");
-    const reason = classifyGhCreateError(combined);
-    if (combined) {
-      process.stderr.write(`
-${combined}
-
-`);
-    }
-    throw new CreateWorkspaceRemoteError(
-      reason,
-      fullName,
-      `T\u1EA1o workspace remote th\u1EA5t b\u1EA1i (exit ${r.status}): ${reason}.`,
-      combined
-    );
+    log.info("URL: https://github.com/settings/keys");
   }
-  const sshUrl = `git@github.com:${fullName}.git`;
-  const httpsUrl = `https://github.com/${fullName}.git`;
-  log.success(`Workspace remote: ${sshUrl}`);
-  return { sshUrl, httpsUrl };
 }
-function linkExistingRemoteToWorkspace(args) {
-  const sshUrl = `git@github.com:${args.fullName}.git`;
-  const httpsUrl = `https://github.com/${args.fullName}.git`;
-  const addResult = spawnSync23(
-    "git",
-    ["-C", args.workspacePath, "remote", "add", "origin", sshUrl],
-    {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "pipe"]
-    }
-  );
-  if (addResult.status !== 0) {
-    spawnSync23("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
-      stdio: "ignore"
-    });
-  }
-  log.success(`Linked existing remote: ${sshUrl}`);
-  return { sshUrl, httpsUrl };
-}
-
-// src/lib/format-pack-commands-cheatsheet-box.ts
-import boxen4 from "boxen";
-var PACK_COMMAND_CHEATSHEET = [
-  { cmd: "/avatar:help", desc: "H\u01B0\u1EDBng d\u1EABn s\u1EED d\u1EE5ng Avatar \u2014 ch\u1EC9 c\u1EA7n g\xF5 t\u1EF1 nhi\xEAn" },
-  { cmd: "/avatar:brainstorm", desc: "Brainstorm \xFD t\u01B0\u1EDFng cho m\u1ED9t feature" },
-  { cmd: "/avatar:plan", desc: "T\u1EA1o plan th\xF4ng minh v\u1EDBi prompt enhancement" },
-  { cmd: "/avatar:scout", desc: "T\xECm file li\xEAn quan trong codebase, ti\u1EBFt ki\u1EC7m token" },
-  { cmd: "/avatar:implement", desc: "B\u1EAFt \u0111\u1EA7u code & test theo plan c\xF3 s\u1EB5n" },
-  { cmd: "/avatar:build-full-flow", desc: "Implement m\u1ED9t feature t\u1EEBng b\u01B0\u1EDBc (end-to-end)" },
-  { cmd: "/avatar:fix", desc: "Ph\xE2n t\xEDch v\xE0 fix v\u1EA5n \u0111\u1EC1 t\u1EF1 \u0111i\u1EC1u h\u01B0\u1EDBng" },
-  { cmd: "/avatar:debug", desc: "Debug v\u1EA5n \u0111\u1EC1 k\u1EF9 thu\u1EADt + \u0111\u01B0a ra gi\u1EA3i ph\xE1p" },
-  { cmd: "/avatar:test", desc: "Ch\u1EA1y test tr\xEAn m\xE1y + ph\xE2n t\xEDch b\xE1o c\xE1o t\u1ED5ng h\u1EE3p" },
-  { cmd: "/avatar:design:good", desc: "T\u1EA1o thi\u1EBFt k\u1EBF ch\u1EC9n chu, s\u1ED1ng \u0111\u1ED9ng" },
-  { cmd: "/avatar:docs:init", desc: "Ph\xE2n t\xEDch codebase + t\u1EA1o t\xE0i li\u1EC7u kh\u1EDFi \u0111\u1EA7u" },
-  { cmd: "/avatar:status", desc: "Xem l\u1EA1i thay \u0111\u1ED5i g\u1EA7n \u0111\xE2y + t\u1ED5ng k\u1EBFt c\xF4ng vi\u1EC7c" },
-  { cmd: "/avatar:journal", desc: "Ghi nh\u1EADt k\xFD session" }
-];
-function formatPackCommandsCheatsheetBox() {
-  const maxCmdWidth = Math.max(...PACK_COMMAND_CHEATSHEET.map((e) => e.cmd.length));
-  const header = chalk.bold("\u{1F3AF} Slash commands t\u1EEB team-ai-pack");
-  const subheader = chalk.dim("G\xF5 trong Claude Code session \u0111\u1EC3 g\u1ECDi capability c\u1EE7a pack:");
-  const lines = PACK_COMMAND_CHEATSHEET.map((e) => {
-    const cmdPadded = chalk.cyan(e.cmd.padEnd(maxCmdWidth));
-    return `  ${cmdPadded}  ${chalk.dim(e.desc)}`;
-  });
-  const footer = chalk.dim(
-    "Catalog \u0111\u1EA7y \u0111\u1EE7 46 commands: cat .claude/pack/scripts/commands_data.yaml"
-  );
-  const content = [header, subheader, "", ...lines, "", footer].join("\n");
-  return boxen4(content, {
-    padding: 1,
-    borderStyle: "round",
-    borderColor: "cyan"
+async function handleSshPermissionError() {
+  return await select9({
+    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"
+      }
+    ]
   });
 }
-
-// src/lib/merge-pack-settings-into-project-settings.ts
-import { promises as fs9 } from "fs";
-import { join as join17 } from "path";
-async function isStatusLineCommandResolvable(workspacePath, command) {
-  const trimmed = command.trim();
-  const match = trimmed.match(/^(node|python|python3|bash|sh)\s+([^\s]+)/);
-  if (!match?.[2]) {
-    return true;
-  }
-  const filePath = match[2];
-  const fullPath = filePath.startsWith("/") ? filePath : join17(workspacePath, filePath);
-  return await pathExists(fullPath);
-}
-function backupFilename(originalPath) {
-  const d = /* @__PURE__ */ new Date();
-  const stamp = `${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")}`;
-  return `${originalPath}.backup-${stamp}`;
-}
-function unionDedupe(a, b) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const item of [...a, ...b]) {
-    const key = typeof item === "string" ? item : JSON.stringify(item);
-    if (!seen.has(key)) {
-      seen.add(key);
-      out.push(item);
-    }
-  }
-  return out;
-}
-function mergeHooksPerEvent(packHooks, userHooks) {
-  const touched = [];
-  const merged = { ...userHooks };
-  for (const [event, packEntries] of Object.entries(packHooks)) {
-    const userEntries = userHooks[event] || [];
-    const union = unionDedupe(userEntries, packEntries);
-    if (union.length !== userEntries.length) {
-      touched.push(event);
-    }
-    merged[event] = union;
-  }
-  return { merged, touchedEvents: touched };
-}
-async function mergePackSettingsIntoProjectSettings(workspacePath) {
-  const packTemplatePath = join17(workspacePath, ".claude", "pack", "templates", "settings.json.tpl");
-  const projectSettingsPath = join17(workspacePath, ".claude", "settings.json");
-  if (!await pathExists(packTemplatePath)) {
-    return { action: "no-pack-template", changes: [] };
-  }
-  let packTemplate;
-  try {
-    const raw = await readText(packTemplatePath);
-    packTemplate = JSON.parse(raw);
-  } catch (err) {
-    throw new Error(
-      `Pack settings template kh\xF4ng parse \u0111\u01B0\u1EE3c JSON: ${err.message}. Path: ${packTemplatePath}`
-    );
-  }
-  let userSettings = {};
-  let projectHasSettings = false;
-  if (await pathExists(projectSettingsPath)) {
-    projectHasSettings = true;
+async function addTeamPackSubmoduleWithRetryOnNetworkFail(projectRoot, tag, ssoEmail, latest = false) {
+  while (true) {
     try {
-      userSettings = await readJson(projectSettingsPath);
+      const result = await addTeamPackSubmodule(projectRoot, tag, ssoEmail, latest);
+      return { pinnedTag: result.pinnedTag, skipped: false };
     } catch (err) {
-      throw new Error(
-        `Project settings.json kh\xF4ng parse \u0111\u01B0\u1EE3c: ${err.message}. Manual fix tr\u01B0\u1EDBc khi sync.`
-      );
-    }
-  }
-  const changes = [];
-  const merged = { ...userSettings };
-  if (packTemplate.statusLine && !userSettings.statusLine) {
-    const statusLineOk = await isStatusLineCommandResolvable(
-      workspacePath,
-      packTemplate.statusLine.command
-    );
-    if (statusLineOk) {
-      merged.statusLine = packTemplate.statusLine;
-      changes.push("statusLine added");
-    } else {
-      changes.push(
-        `statusLine SKIPPED (file ref '${packTemplate.statusLine.command}' kh\xF4ng t\u1ED3n t\u1EA1i)`
-      );
-    }
-  }
-  if (typeof packTemplate.includeCoAuthoredBy === "boolean" && typeof userSettings.includeCoAuthoredBy !== "boolean") {
-    merged.includeCoAuthoredBy = packTemplate.includeCoAuthoredBy;
-    changes.push("includeCoAuthoredBy added");
-  }
-  if (packTemplate.model && !userSettings.model) {
-    merged.model = packTemplate.model;
-    changes.push("model added");
-  }
-  if (packTemplate.env) {
-    const mergedEnv = { ...userSettings.env || {} };
-    let envChanged = false;
-    for (const [k, v] of Object.entries(packTemplate.env)) {
-      if (!(k in mergedEnv)) {
-        mergedEnv[k] = v;
-        envChanged = true;
+      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") {
+          triggerGhAuthLoginInteractive3();
+          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: message,
+        allowSkip: true,
+        hint: "Network glitch? Retry th\u01B0\u1EDDng work. N\u1EBFu skip, d\xF9ng `avatar sync` sau \u0111\u1EC3 pull pack."
+      });
+      if (action === "abort") {
+        throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc pull team-ai-pack.");
+      }
+      if (action === "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 (envChanged) {
-      merged.env = mergedEnv;
-      changes.push("env vars added from pack");
-    }
-  }
-  if (packTemplate.permissions) {
-    const userAllow = userSettings.permissions?.allow || [];
-    const userDeny = userSettings.permissions?.deny || [];
-    const packAllow = packTemplate.permissions.allow || [];
-    const packDeny = packTemplate.permissions.deny || [];
-    const mergedAllow = unionDedupe(userAllow, packAllow);
-    const mergedDeny = unionDedupe(userDeny, packDeny);
-    if (mergedAllow.length !== userAllow.length || mergedDeny.length !== userDeny.length) {
-      merged.permissions = { allow: mergedAllow, deny: mergedDeny };
-      changes.push(
-        `permissions union (+${mergedAllow.length - userAllow.length} allow, +${mergedDeny.length - userDeny.length} deny)`
-      );
     }
   }
-  if (packTemplate.hooks) {
-    const userHooks = userSettings.hooks || {};
-    const { merged: mergedHooks, touchedEvents } = mergeHooksPerEvent(
-      packTemplate.hooks,
-      userHooks
-    );
-    if (touchedEvents.length > 0) {
-      merged.hooks = mergedHooks;
-      changes.push(`hooks added for events: ${touchedEvents.join(", ")}`);
+}
+
+// src/lib/read-cli-version-from-package-json.ts
+import { readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname5, resolve } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
+var cachedVersion = null;
+function readCliVersion() {
+  if (cachedVersion !== null) return cachedVersion;
+  const here = dirname5(fileURLToPath3(import.meta.url));
+  for (let i = 0; i < 5; i++) {
+    const candidate = resolve(here, ...Array(i).fill(".."), "package.json");
+    try {
+      const raw = readFileSync5(candidate, "utf8");
+      const pkg = JSON.parse(raw);
+      if (pkg.name === "@nalvietnam/avatar-cli" && typeof pkg.version === "string") {
+        cachedVersion = pkg.version;
+        return cachedVersion;
+      }
+    } catch {
     }
   }
-  if (changes.length === 0) {
-    return { action: "no-change", changes: [] };
-  }
-  let backupPath;
-  if (projectHasSettings) {
-    backupPath = backupFilename(projectSettingsPath);
-    await fs9.copyFile(projectSettingsPath, backupPath);
-  }
-  await writeJsonAtomic(projectSettingsPath, merged);
-  return { action: "merged", backupPath, changes };
+  cachedVersion = "unknown";
+  return cachedVersion;
 }
 
-// src/lib/safe-bootstrap-for-dirty-folder.ts
-import { readdirSync } from "fs";
-import { select as select8 } from "@inquirer/prompts";
-import { simpleGit as simpleGit3 } from "simple-git";
+// src/commands/init-scaffold-variable-builders.ts
+function inferWorkspaceName(repoUrl) {
+  const trimmed = repoUrl.trim().replace(/\/+$/, "");
+  const lastSegment = trimmed.split(/[/:]/).pop() ?? "";
+  const baseName = lastSegment.replace(/\.git$/, "");
+  if (!baseName) return "avatar-client-workspace";
+  const withoutPrefix = baseName.replace(/^avatar-/, "");
+  return `avatar-${withoutPrefix}-workspace`;
+}
+function buildGitnexusSection(gitnexusReady) {
+  if (!gitnexusReady) return "";
+  return `
+### \u{1F9E0} CODEBASE INTELLIGENCE \u2014 GitNexus
 
-// src/lib/check-folder-has-git.ts
-import { existsSync as existsSync6, statSync } from "fs";
-import { join as join18 } from "path";
-function checkFolderHasGit(folderPath) {
-  const gitPath = join18(folderPath, ".git");
-  if (!existsSync6(gitPath)) return false;
-  const stat = statSync(gitPath);
-  return stat.isDirectory() || stat.isFile();
+Workspace c\xF3 GitNexus index t\u1EA1i \`.gitnexus/\` cung c\u1EA5p architectural awareness
+cho Claude Code (impact analysis, call chains, blast radius).
+
+**H\u01B0\u1EDBng d\u1EABn cho Claude:**
+
+- Khi c\u1EA7n hi\u1EC3u codebase architecture (vd: tr\u01B0\u1EDBc refactor, debug call chain) \u2192
+  query GitNexus MCP resource \`gitnexus://repo/<name>/context\`
+- Khi resource tr\u1EA3 staleness hint "\u26A0\uFE0F Index is N commit(s) behind HEAD" \u2192
+  T\u1EF0 ch\u1EA1y \`gitnexus analyze .\` (trong workspace root) tr\u01B0\u1EDBc khi ti\u1EBFp t\u1EE5c task
+- Sau khi \`gitnexus analyze\` xong: **KH\xD4NG t\u1EF1 ch\u1EA1y \`gitnexus wiki\`**
+  (cost cao, c\xF3 th\u1EC3 block session 2-5 ph\xFAt) \u2014 user s\u1EBD ch\u1EA1y manual khi c\u1EA7n
+
+**Folders Claude scan auto cho skills:**
+
+- \`~/.claude/skills/gitnexus-*/\` \u2014 GitNexus global skills (exploring, debugging, ...)
+- \`.claude/pack/skills/\` \u2014 NAL team-shared skills (qua team-ai-pack submodule)
+- C\u1EA3 2 \u0111\u1EC1u \u0111\u01B0\u1EE3c scan, kh\xF4ng xung \u0111\u1ED9t (different naming prefix)
+
+**Manual wiki update:**
+
+Khi user c\u1EA7n regenerate wiki sau refactor l\u1EDBn \u2014 ch\u1EA1y:
+
+\`\`\`bash
+gitnexus wiki . --api-key <key> --base-url <url>
+\`\`\`
+`;
+}
+function buildScaffoldVariables(args) {
+  return {
+    projectName: args.projectName,
+    projectDescription: args.projectDescription,
+    teamOwner: args.teamOwner,
+    avatarVersion: readCliVersion(),
+    packVersion: args.packVersion,
+    lastScan: (/* @__PURE__ */ new Date()).toISOString(),
+    mode: args.mode,
+    gitnexusSection: buildGitnexusSection(args.gitnexusReady ?? false)
+  };
 }
 
-// src/lib/create-initial-git-commit.ts
-import { simpleGit as simpleGit2 } from "simple-git";
-var INITIAL_COMMIT_MESSAGE = "chore: initial commit";
-async function createInitialGitCommit(folderPath) {
-  const g = simpleGit2({ baseDir: folderPath });
-  const isRepo = await g.checkIsRepo().catch(() => false);
-  if (!isRepo) {
-    await g.init();
-  }
-  try {
-    await g.branch(["-M", "main"]);
-  } catch {
-  }
-  await g.add(".");
-  const status = await g.status();
-  const hasCommits = (await g.raw(["rev-list", "-n", "1", "--all"]).catch(() => "")).trim();
-  if (hasCommits) return;
-  if (status.files.length === 0) {
-    await g.commit(INITIAL_COMMIT_MESSAGE, void 0, { "--allow-empty": null });
-  } else {
-    await g.commit(INITIAL_COMMIT_MESSAGE);
+// src/commands/init-options-and-bootstrap-strategy-parser.ts
+function parseBootstrapStrategyOpts(opts) {
+  if (opts.preserveUncommitted) return "stash";
+  if (!opts.bootstrapStrategy) return void 0;
+  const valid = ["stash", "commit-all", "skip", "branch"];
+  if (valid.includes(opts.bootstrapStrategy)) {
+    return opts.bootstrapStrategy;
   }
+  throw new Error(
+    `--bootstrap-strategy kh\xF4ng h\u1EE3p l\u1EC7: ${opts.bootstrapStrategy}. Ch\u1ECDn: ${valid.join(" | ")}`
+  );
 }
 
-// src/lib/detect-folder-tech-stack.ts
-import { existsSync as existsSync7 } from "fs";
-import { join as join19 } from "path";
-var SIGNATURES = {
-  node: ["package.json"],
-  python: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"],
-  go: ["go.mod"],
-  rust: ["Cargo.toml"],
-  java: ["pom.xml", "build.gradle", "build.gradle.kts"],
-  ruby: ["Gemfile"]
+// src/commands/workspace-scaffold-and-finalize-orchestrator.ts
+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 spawnSync24 } from "child_process";
+var CreateWorkspaceRemoteError = class extends Error {
+  reason;
+  fullName;
+  stderr;
+  constructor(reason, fullName, message, stderr) {
+    super(message);
+    this.name = "CreateWorkspaceRemoteError";
+    this.reason = reason;
+    this.fullName = fullName;
+    this.stderr = stderr;
+  }
 };
-function detectFolderTechStack(folderPath) {
-  const matched = [];
-  for (const [stack, files] of Object.entries(SIGNATURES)) {
-    if (files.some((f) => existsSync7(join19(folderPath, f)))) {
-      matched.push(stack);
-    }
+function classifyGhCreateError(stderr) {
+  const text = stderr.toLowerCase();
+  if (text.includes("name already exists") || text.includes("already exists on this account") || text.includes("repository already exists")) {
+    return "repo-exists";
   }
-  return matched.length > 0 ? matched : ["generic"];
+  if (text.includes("403") || text.includes("permission") || text.includes("not authorized") || text.includes("forbidden")) {
+    return "no-permission";
+  }
+  if (text.includes("invalid") && text.includes("name")) {
+    return "name-invalid";
+  }
+  if (text.includes("could not resolve") || text.includes("network") || text.includes("connection refused")) {
+    return "network";
+  }
+  return "unknown";
 }
-
-// src/lib/gitignore-template-loader.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname4, join as join20 } 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
-  join20(__dirname, "templates", "gitignore"),
-  // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
-  join20(__dirname, "..", "templates", "gitignore"),
-  // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
-  join20(__dirname, "..", "..", "src", "templates", "gitignore"),
-  // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
-  join20(__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(join20(dir, `${stack}.txt`), "utf8");
-    } catch {
+function repoExistsOnGitHub(fullName) {
+  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 = spawnSync24("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
+    stdio: "ignore"
+  });
+  if (r.status === 0) return { ok: true };
+  const orgCheck = spawnSync24("gh", ["api", `orgs/${org}`, "--silent"], { stdio: "ignore" });
+  if (orgCheck.status !== 0) {
+    const userCheck = spawnSync24("gh", ["api", `users/${org}`, "--silent"], { stdio: "ignore" });
+    if (userCheck.status === 0) {
+      return {
+        ok: false,
+        reason: `'${org}' l\xE0 personal account kh\xE1c (kh\xF4ng ph\u1EA3i org). B\u1EA1n (${ghUser}) kh\xF4ng th\u1EC3 t\u1EA1o repo d\u01B0\u1EDBi account c\u1EE7a user kh\xE1c. Pass --repo-org=${ghUser} ho\u1EB7c switch gh: gh auth login`
+      };
     }
+    return {
+      ok: false,
+      reason: `'${org}' kh\xF4ng t\u1ED3n t\u1EA1i tr\xEAn GitHub. Check ch\xEDnh t\u1EA3 ho\u1EB7c t\u1EA1o org tr\u01B0\u1EDBc.`
+    };
   }
-  throw new Error(`Kh\xF4ng t\xECm th\u1EA5y template gitignore cho stack "${stack}"`);
-}
-function composeGitignoreContent(stacks) {
-  const all = ["generic", ...stacks.filter((s) => s !== "generic")];
-  const sections = all.map((s) => `# --- ${s} ---
-${readTemplate(s).trim()}`);
-  return [AVATAR_MARKER_START, ...sections, AVATAR_MARKER_END, ""].join("\n");
+  return {
+    ok: false,
+    reason: `'${ghUser}' kh\xF4ng ph\u1EA3i member c\u1EE7a org '${org}'. Li\xEAn h\u1EC7 admin org \u0111\u1EC3 \u0111\u01B0\u1EE3c invite, ho\u1EB7c pass --repo-org=${ghUser} t\u1EA1o d\u01B0\u1EDBi personal account.`
+  };
 }
-
-// src/lib/write-or-merge-gitignore.ts
-import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync } from "fs";
-import { join as join21 } from "path";
-function writeOrMergeGitignore(folderPath, avatarBlock) {
-  const path = join21(folderPath, ".gitignore");
-  if (!existsSync8(path)) {
-    writeFileSync(path, avatarBlock, "utf8");
-    return;
+async function createWorkspaceRemoteViaGh(input8) {
+  validateRepoName(input8.workspaceName);
+  validateRepoVisibility(input8.visibility);
+  await ensureGitHubReady();
+  const ghUser = resolveGithubUsernameDefault();
+  const org = input8.org ?? ghUser;
+  const namespaceCheck = canCreateInNamespace(org, ghUser);
+  if (!namespaceCheck.ok) {
+    throw new Error(`Kh\xF4ng th\u1EC3 t\u1EA1o repo d\u01B0\u1EDBi '${org}/': ${namespaceCheck.reason}`);
   }
-  const existing = readFileSync4(path, "utf8");
-  const startIdx = existing.indexOf(AVATAR_MARKER_START);
-  const endIdx = existing.indexOf(AVATAR_MARKER_END);
-  if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
-    const before = existing.slice(0, startIdx);
-    const after = existing.slice(endIdx + AVATAR_MARKER_END.length);
-    writeFileSync(path, `${before.trimEnd()}
+  const fullName = `${org}/${input8.workspaceName}`;
+  if (repoExistsOnGitHub(fullName)) {
+    throw new CreateWorkspaceRemoteError(
+      "repo-exists",
+      fullName,
+      `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xF3 th\u1EC3 b\u1EA1n \u0111\xE3 init workspace n\xE0y tr\u01B0\u1EDBc \u0111\xF3.`
+    );
+  }
+  log.info(`T\u1EA1o GitHub repo cho workspace: ${fullName} (${input8.visibility})...`);
+  const r = spawnSync24(
+    "gh",
+    [
+      "repo",
+      "create",
+      fullName,
+      `--${input8.visibility}`,
+      "--source",
+      input8.workspacePath,
+      "--remote",
+      "origin",
+      "--push"
+    ],
+    { stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }
+  );
+  if (r.status !== 0) {
+    const stderr = (r.stderr || "").trim();
+    const stdout = (r.stdout || "").trim();
+    const combined = [stderr, stdout].filter(Boolean).join("\n");
+    const reason = classifyGhCreateError(combined);
+    if (combined) {
+      process.stderr.write(`
+${combined}
 
-${avatarBlock}${after.trimStart()}`, "utf8");
-    return;
+`);
+    }
+    throw new CreateWorkspaceRemoteError(
+      reason,
+      fullName,
+      `T\u1EA1o workspace remote th\u1EA5t b\u1EA1i (exit ${r.status}): ${reason}.`,
+      combined
+    );
   }
-  writeFileSync(path, `${existing.trimEnd()}
-
-${avatarBlock}`, "utf8");
+  const sshUrl = `git@github.com:${fullName}.git`;
+  const httpsUrl = `https://github.com/${fullName}.git`;
+  log.success(`Workspace remote: ${sshUrl}`);
+  return { sshUrl, httpsUrl };
 }
-
-// src/lib/safe-bootstrap-for-dirty-folder.ts
-var InitAbortedByUserError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "InitAbortedByUserError";
+function linkExistingRemoteToWorkspace(args) {
+  const sshUrl = `git@github.com:${args.fullName}.git`;
+  const httpsUrl = `https://github.com/${args.fullName}.git`;
+  const addResult = spawnSync24(
+    "git",
+    ["-C", args.workspacePath, "remote", "add", "origin", sshUrl],
+    {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    }
+  );
+  if (addResult.status !== 0) {
+    spawnSync24("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
+      stdio: "ignore"
+    });
   }
-};
-async function detectFolderGitState(folderPath) {
-  const hasGit = checkFolderHasGit(folderPath);
-  if (!hasGit) {
-    const entries = readdirSync(folderPath).filter((e) => e !== ".git");
-    return entries.length === 0 ? "empty" : "untracked-only";
+  log.success(`Linked existing remote: ${sshUrl}`);
+  return { sshUrl, httpsUrl };
+}
+
+// src/lib/merge-pack-settings-into-project-settings.ts
+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]+)/);
+  if (!match?.[2]) {
+    return true;
   }
-  const g = simpleGit3({ baseDir: folderPath });
-  const status = await g.status();
-  return status.isClean() ? "clean" : "dirty";
+  const filePath = match[2];
+  const fullPath = filePath.startsWith("/") ? filePath : join22(workspacePath, filePath);
+  return await pathExists(fullPath);
 }
-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 select8({
-    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: [
-      {
-        value: "stash",
-        name: "1. Stash changes \u2192 bootstrap \u2192 restore (KHUY\u1EBEN NGH\u1ECA)"
-      },
-      {
-        value: "commit-all",
-        name: "2. Commit to\xE0n b\u1ED9 v\xE0o initial commit (legacy v1.1.6)"
-      },
-      {
-        value: "skip",
-        name: "3. Skip \u2014 t\xF4i commit th\u1EE7 c\xF4ng r\u1ED3i ch\u1EA1y l\u1EA1i"
-      },
-      {
-        value: "branch",
-        name: "4. Commit v\xE0o branch ri\xEAng `avatar/init` (main gi\u1EEF s\u1EA1ch)"
-      }
-    ],
-    default: "stash"
-  });
+function backupFilename(originalPath) {
+  const d = /* @__PURE__ */ new Date();
+  const stamp = `${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")}`;
+  return `${originalPath}.backup-${stamp}`;
 }
-async function stashUserChanges(g, stashName) {
-  const status = await g.status();
-  if (status.isClean() && status.not_added.length === 0) return false;
-  await g.stash(["push", "--include-untracked", "-m", stashName]);
-  log.info(`Stashed changes: ${stashName}`);
-  return true;
+function unionDedupe(a, b) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const item of [...a, ...b]) {
+    const key = typeof item === "string" ? item : JSON.stringify(item);
+    if (!seen.has(key)) {
+      seen.add(key);
+      out.push(item);
+    }
+  }
+  return out;
 }
-async function restoreStash(g, stashName) {
+function mergeHooksPerEvent(packHooks, userHooks) {
+  const touched = [];
+  const merged = { ...userHooks };
+  for (const [event, packEntries] of Object.entries(packHooks)) {
+    const userEntries = userHooks[event] || [];
+    const union = unionDedupe(userEntries, packEntries);
+    if (union.length !== userEntries.length) {
+      touched.push(event);
+    }
+    merged[event] = union;
+  }
+  return { merged, touchedEvents: touched };
+}
+async function mergePackSettingsIntoProjectSettings(workspacePath) {
+  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: [] };
+  }
+  let packTemplate;
   try {
-    await g.stash(["pop"]);
-    log.success(`Restored stash: ${stashName}`);
+    const raw = await readText(packTemplatePath);
+    packTemplate = JSON.parse(raw);
   } catch (err) {
-    log.warn(
-      "Restore stash conflict \u2014 files c\xF3 Avatar t\u1EA1o v\xE0 stash c\u1EE7a user xung \u0111\u1ED9t. Stash gi\u1EEF t\u1EA1i ref stash@{0}."
+    throw new Error(
+      `Pack settings template kh\xF4ng parse \u0111\u01B0\u1EE3c JSON: ${err.message}. Path: ${packTemplatePath}`
     );
-    log.warn("Resolve: git stash show -p stash@{0} \u2192 fix conflict \u2192 git stash drop");
-    log.dim(`Detail: ${err.message}`);
   }
-}
-async function getCurrentBranch(g) {
-  try {
-    const result = await g.revparse(["--abbrev-ref", "HEAD"]);
-    const branch = result.trim();
-    return branch === "HEAD" ? "main" : branch;
-  } catch {
-    return "main";
+  let userSettings = {};
+  let projectHasSettings = false;
+  if (await pathExists(projectSettingsPath)) {
+    projectHasSettings = true;
+    try {
+      userSettings = await readJson(projectSettingsPath);
+    } catch (err) {
+      throw new Error(
+        `Project settings.json kh\xF4ng parse \u0111\u01B0\u1EE3c: ${err.message}. Manual fix tr\u01B0\u1EDBc khi sync.`
+      );
+    }
   }
-}
-async function writeAvatarGitignore(folderPath) {
-  const stacks = detectFolderTechStack(folderPath);
-  log.info(`Tech stack: ${stacks.join(", ")}`);
-  writeOrMergeGitignore(folderPath, composeGitignoreContent(stacks));
-  log.success(".gitignore \u0111\xE3 ghi (Avatar block)");
-}
-async function executeBootstrapWithStrategy(folderPath, strategy) {
-  const g = simpleGit3({ baseDir: folderPath });
-  switch (strategy) {
-    case "skip":
-      throw new InitAbortedByUserError(
-        "Init aborted. Commit th\u1EE7 c\xF4ng changes hi\u1EC7n t\u1EA1i r\u1ED3i ch\u1EA1y l\u1EA1i `avatar init`."
+  const changes = [];
+  const merged = { ...userSettings };
+  if (packTemplate.statusLine && !userSettings.statusLine) {
+    const statusLineOk = await isStatusLineCommandResolvable(
+      workspacePath,
+      packTemplate.statusLine.command
+    );
+    if (statusLineOk) {
+      merged.statusLine = packTemplate.statusLine;
+      changes.push("statusLine added");
+    } else {
+      changes.push(
+        `statusLine SKIPPED (file ref '${packTemplate.statusLine.command}' kh\xF4ng t\u1ED3n t\u1EA1i)`
       );
-    case "stash": {
-      const stashName = `avatar-init-backup-${Date.now()}`;
-      const hadGit = checkFolderHasGit(folderPath);
-      if (!hadGit) {
-        await g.init();
-        await g.branch(["-M", "main"]).catch(() => void 0);
-      }
-      const hasCommit = (await g.raw(["rev-list", "-n", "1", "--all"]).catch(() => "")).trim();
-      if (!hasCommit) {
-        await g.commit("chore: avatar baseline (pre-stash)", void 0, { "--allow-empty": null });
-      }
-      const stashed = await stashUserChanges(g, stashName);
-      try {
-        await writeAvatarGitignore(folderPath);
-        await createInitialGitCommit(folderPath);
-      } finally {
-        if (stashed) await restoreStash(g, stashName);
+    }
+  }
+  if (typeof packTemplate.includeCoAuthoredBy === "boolean" && typeof userSettings.includeCoAuthoredBy !== "boolean") {
+    merged.includeCoAuthoredBy = packTemplate.includeCoAuthoredBy;
+    changes.push("includeCoAuthoredBy added");
+  }
+  if (packTemplate.model && !userSettings.model) {
+    merged.model = packTemplate.model;
+    changes.push("model added");
+  }
+  if (packTemplate.env) {
+    const mergedEnv = { ...userSettings.env || {} };
+    let envChanged = false;
+    for (const [k, v] of Object.entries(packTemplate.env)) {
+      if (!(k in mergedEnv)) {
+        mergedEnv[k] = v;
+        envChanged = true;
       }
-      break;
     }
-    case "commit-all": {
-      await writeAvatarGitignore(folderPath);
-      await createInitialGitCommit(folderPath);
-      break;
+    if (envChanged) {
+      merged.env = mergedEnv;
+      changes.push("env vars added from pack");
     }
-    case "branch": {
-      const hadGit = checkFolderHasGit(folderPath);
-      if (!hadGit) {
-        await g.init();
-        await g.branch(["-M", "main"]);
-      }
-      const originalBranch = await getCurrentBranch(g);
-      try {
-        await g.checkoutLocalBranch("avatar/init");
-      } catch {
-        await g.checkout("avatar/init");
-      }
-      await writeAvatarGitignore(folderPath);
-      await createInitialGitCommit(folderPath);
-      try {
-        await g.checkout(originalBranch);
-        log.info(
-          `Avatar init committed \u1EDF branch 'avatar/init'. Switch back v\u1EC1 '${originalBranch}'. Merge khi s\u1EB5n s\xE0ng: git merge avatar/init`
-        );
-      } catch {
-        log.warn(
-          `Kh\xF4ng switch v\u1EC1 '${originalBranch}' \u0111\u01B0\u1EE3c \u2014 \u1EDF l\u1EA1i branch 'avatar/init'. Switch tay sau.`
-        );
-      }
-      break;
+  }
+  if (packTemplate.permissions) {
+    const userAllow = userSettings.permissions?.allow || [];
+    const userDeny = userSettings.permissions?.deny || [];
+    const packAllow = packTemplate.permissions.allow || [];
+    const packDeny = packTemplate.permissions.deny || [];
+    const mergedAllow = unionDedupe(userAllow, packAllow);
+    const mergedDeny = unionDedupe(userDeny, packDeny);
+    if (mergedAllow.length !== userAllow.length || mergedDeny.length !== userDeny.length) {
+      merged.permissions = { allow: mergedAllow, deny: mergedDeny };
+      changes.push(
+        `permissions union (+${mergedAllow.length - userAllow.length} allow, +${mergedDeny.length - userDeny.length} deny)`
+      );
+    }
+  }
+  if (packTemplate.hooks) {
+    const userHooks = userSettings.hooks || {};
+    const { merged: mergedHooks, touchedEvents } = mergeHooksPerEvent(
+      packTemplate.hooks,
+      userHooks
+    );
+    if (touchedEvents.length > 0) {
+      merged.hooks = mergedHooks;
+      changes.push(`hooks added for events: ${touchedEvents.join(", ")}`);
     }
   }
-}
-async function safeBootstrapGitInFolder(folderPath, opts = {}) {
-  const state = await detectFolderGitState(folderPath);
-  log.info(`Folder state: ${state}`);
-  if (state === "empty" || state === "clean") {
-    await writeAvatarGitignore(folderPath);
-    if (state === "empty") {
-      await createInitialGitCommit(folderPath);
-    }
-    await appendAuditEntry("bootstrap", `state=${state},strategy=auto`);
-    return;
+  if (changes.length === 0) {
+    return { action: "no-change", changes: [] };
   }
-  const strategy = await promptBootstrapStrategy(state, opts);
-  await executeBootstrapWithStrategy(folderPath, strategy);
-  await appendAuditEntry("bootstrap", `state=${state},strategy=${strategy}`);
+  let backupPath;
+  if (projectHasSettings) {
+    backupPath = backupFilename(projectSettingsPath);
+    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 dirname5, 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");
@@ -3673,7 +3853,7 @@ function timestamp() {
 }
 async function backupDirBeforeReplace(targetPath) {
   const backupPath = `${targetPath}.backup-${timestamp()}`;
-  await fs10.rename(targetPath, backupPath);
+  await fs11.rename(targetPath, backupPath);
   return backupPath;
 }
 
@@ -3689,46 +3869,87 @@ 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;
   }
 }
 async function syncMountedDir(source, dest, force) {
-  const dir = relative2(dirname5(dest), dest) || dest;
+  const dir = relative2(dirname6(dest), dest) || dest;
   if (!await pathExists(source)) {
     return { dir, action: "source-missing" };
   }
   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(dirname5(dest), source);
-      await fs11.symlink(relativeSource2, dest);
+      const relativeSource2 = relative2(dirname6(dest), source);
+      await fs12.symlink(relativeSource2, dest);
       return { dir, action: "backed-up-and-linked", backupPath };
     } else {
       return { dir, action: "skipped-conflict" };
     }
   }
-  const relativeSource = relative2(dirname5(dest), source);
-  await fs11.symlink(relativeSource, dest);
+  const relativeSource = relative2(dirname6(dest), source);
+  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 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
+import boxen4 from "boxen";
+var PACK_COMMAND_CHEATSHEET = [
+  { cmd: "/avatar:help", desc: "H\u01B0\u1EDBng d\u1EABn s\u1EED d\u1EE5ng Avatar \u2014 ch\u1EC9 c\u1EA7n g\xF5 t\u1EF1 nhi\xEAn" },
+  { cmd: "/avatar:brainstorm", desc: "Brainstorm \xFD t\u01B0\u1EDFng cho m\u1ED9t feature" },
+  { cmd: "/avatar:plan", desc: "T\u1EA1o plan th\xF4ng minh v\u1EDBi prompt enhancement" },
+  { cmd: "/avatar:scout", desc: "T\xECm file li\xEAn quan trong codebase, ti\u1EBFt ki\u1EC7m token" },
+  { cmd: "/avatar:implement", desc: "B\u1EAFt \u0111\u1EA7u code & test theo plan c\xF3 s\u1EB5n" },
+  { cmd: "/avatar:build-full-flow", desc: "Implement m\u1ED9t feature t\u1EEBng b\u01B0\u1EDBc (end-to-end)" },
+  { cmd: "/avatar:fix", desc: "Ph\xE2n t\xEDch v\xE0 fix v\u1EA5n \u0111\u1EC1 t\u1EF1 \u0111i\u1EC1u h\u01B0\u1EDBng" },
+  { cmd: "/avatar:debug", desc: "Debug v\u1EA5n \u0111\u1EC1 k\u1EF9 thu\u1EADt + \u0111\u01B0a ra gi\u1EA3i ph\xE1p" },
+  { cmd: "/avatar:test", desc: "Ch\u1EA1y test tr\xEAn m\xE1y + ph\xE2n t\xEDch b\xE1o c\xE1o t\u1ED5ng h\u1EE3p" },
+  { cmd: "/avatar:design:good", desc: "T\u1EA1o thi\u1EBFt k\u1EBF ch\u1EC9n chu, s\u1ED1ng \u0111\u1ED9ng" },
+  { cmd: "/avatar:docs:init", desc: "Ph\xE2n t\xEDch codebase + t\u1EA1o t\xE0i li\u1EC7u kh\u1EDFi \u0111\u1EA7u" },
+  { cmd: "/avatar:status", desc: "Xem l\u1EA1i thay \u0111\u1ED5i g\u1EA7n \u0111\xE2y + t\u1ED5ng k\u1EBFt c\xF4ng vi\u1EC7c" },
+  { cmd: "/avatar:journal", desc: "Ghi nh\u1EADt k\xFD session" }
+];
+function formatPackCommandsCheatsheetBox() {
+  const maxCmdWidth = Math.max(...PACK_COMMAND_CHEATSHEET.map((e) => e.cmd.length));
+  const header = chalk.bold("\u{1F3AF} Slash commands t\u1EEB team-ai-pack");
+  const subheader = chalk.dim("G\xF5 trong Claude Code session \u0111\u1EC3 g\u1ECDi capability c\u1EE7a pack:");
+  const lines = PACK_COMMAND_CHEATSHEET.map((e) => {
+    const cmdPadded = chalk.cyan(e.cmd.padEnd(maxCmdWidth));
+    return `  ${cmdPadded}  ${chalk.dim(e.desc)}`;
+  });
+  const footer = chalk.dim(
+    "Catalog \u0111\u1EA7y \u0111\u1EE7 46 commands: cat .claude/pack/scripts/commands_data.yaml"
+  );
+  const content = [header, subheader, "", ...lines, "", footer].join("\n");
+  return boxen4(content, {
+    padding: 1,
+    borderStyle: "round",
+    borderColor: "cyan"
+  });
+}
+
 // 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 {
@@ -3741,389 +3962,365 @@ 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;
 }
 
-// src/lib/read-cli-version-from-package-json.ts
-import { readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname6, join as join24, resolve } from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
-var cachedVersion = null;
-function readCliVersion() {
-  if (cachedVersion !== null) return cachedVersion;
-  const here = dirname6(fileURLToPath3(import.meta.url));
-  for (let i = 0; i < 5; i++) {
-    const candidate = resolve(here, ...Array(i).fill(".."), "package.json");
-    try {
-      const raw = readFileSync5(candidate, "utf8");
-      const pkg = JSON.parse(raw);
-      if (pkg.name === "@nalvietnam/avatar-cli" && typeof pkg.version === "string") {
-        cachedVersion = pkg.version;
-        return cachedVersion;
-      }
-    } catch {
+// src/commands/init-success-rendering-and-helpers.ts
+async function resolveWorkspacePath(parent, desiredName, force) {
+  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) {
+    const alternative = await findAlternativeWorkspaceName(parent, desiredName);
+    if (force && alternative) {
+      log.info(`--force: d\xF9ng ${alternative}`);
+      return alternative;
     }
-    if (i === 0) {
-      const sibling = join24(here, "..", "package.json");
-      try {
-        const raw = readFileSync5(sibling, "utf8");
-        const pkg = JSON.parse(raw);
-        if (pkg.name === "@nalvietnam/avatar-cli" && typeof pkg.version === "string") {
-          cachedVersion = pkg.version;
-          return cachedVersion;
-        }
-      } catch {
-      }
+    const choices = [];
+    if (alternative) {
+      choices.push({ name: `D\xF9ng "${alternative}" (suggest)`, value: "use-alt" });
+    }
+    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 select10({
+      message: "C\xE1ch x\u1EED l\xFD workspace path conflict?",
+      choices
+    });
+    if (action === "abort") {
+      throw new UserAbortedRecoveryError(
+        "User abort t\u1EA1i b\u01B0\u1EDBc resolve workspace path. Ch\u1EA1y l\u1EA1i v\u1EDBi --workspace-name kh\xE1c."
+      );
+    }
+    if (action === "use-alt" && alternative) {
+      return alternative;
     }
+    const newName = await input5({
+      message: "T\xEAn workspace m\u1EDBi:",
+      validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
+    });
+    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.`);
   }
-  cachedVersion = "unknown";
-  return cachedVersion;
-}
-
-// src/commands/init-scaffold-variable-builders.ts
-function inferWorkspaceName(repoUrl) {
-  const trimmed = repoUrl.trim().replace(/\/+$/, "");
-  const lastSegment = trimmed.split(/[/:]/).pop() ?? "";
-  const baseName = lastSegment.replace(/\.git$/, "");
-  if (!baseName) return "avatar-client-workspace";
-  const withoutPrefix = baseName.replace(/^avatar-/, "");
-  return `avatar-${withoutPrefix}-workspace`;
-}
-function buildGitnexusSection(gitnexusReady) {
-  if (!gitnexusReady) return "";
-  return `
-### \u{1F9E0} CODEBASE INTELLIGENCE \u2014 GitNexus
-
-Workspace c\xF3 GitNexus index t\u1EA1i \`.gitnexus/\` cung c\u1EA5p architectural awareness
-cho Claude Code (impact analysis, call chains, blast radius).
-
-**H\u01B0\u1EDBng d\u1EABn cho Claude:**
-
-- Khi c\u1EA7n hi\u1EC3u codebase architecture (vd: tr\u01B0\u1EDBc refactor, debug call chain) \u2192
-  query GitNexus MCP resource \`gitnexus://repo/<name>/context\`
-- Khi resource tr\u1EA3 staleness hint "\u26A0\uFE0F Index is N commit(s) behind HEAD" \u2192
-  T\u1EF0 ch\u1EA1y \`gitnexus analyze .\` (trong workspace root) tr\u01B0\u1EDBc khi ti\u1EBFp t\u1EE5c task
-- Sau khi \`gitnexus analyze\` xong: **KH\xD4NG t\u1EF1 ch\u1EA1y \`gitnexus wiki\`**
-  (cost cao, c\xF3 th\u1EC3 block session 2-5 ph\xFAt) \u2014 user s\u1EBD ch\u1EA1y manual khi c\u1EA7n
-
-**Folders Claude scan auto cho skills:**
-
-- \`~/.claude/skills/gitnexus-*/\` \u2014 GitNexus global skills (exploring, debugging, ...)
-- \`.claude/pack/skills/\` \u2014 NAL team-shared skills (qua team-ai-pack submodule)
-- C\u1EA3 2 \u0111\u1EC1u \u0111\u01B0\u1EE3c scan, kh\xF4ng xung \u0111\u1ED9t (different naming prefix)
-
-**Manual wiki update:**
-
-Khi user c\u1EA7n regenerate wiki sau refactor l\u1EDBn \u2014 ch\u1EA1y:
-
-\`\`\`bash
-gitnexus wiki . --api-key <key> --base-url <url>
-\`\`\`
-`;
 }
-function buildScaffoldVariables(args) {
-  return {
-    projectName: args.projectName,
-    projectDescription: args.projectDescription,
-    teamOwner: args.teamOwner,
-    avatarVersion: readCliVersion(),
-    packVersion: args.packVersion,
-    lastScan: (/* @__PURE__ */ new Date()).toISOString(),
-    mode: args.mode,
-    gitnexusSection: buildGitnexusSection(args.gitnexusReady ?? false)
-  };
+async function promptTeamOwner(currentUserEmail) {
+  return await input5({ message: "Team owner email:", default: currentUserEmail });
 }
-
-// src/commands/login.ts
-import boxen5 from "boxen";
-import open from "open";
-
-// src/lib/google-oauth-device-flow.ts
-var GOOGLE_CLIENT_ID = "1014766441755-i4jimivh5rd7vt8phuhmepmt45sovtph.apps.googleusercontent.com";
-var GOOGLE_CLIENT_SECRET = "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";
-var HOSTED_DOMAIN = "nal.vn";
-var SCOPES = ["openid", "email", "profile"];
-var DEVICE_CODE_URL = "https://oauth2.googleapis.com/device/code";
-var TOKEN_URL = "https://oauth2.googleapis.com/token";
-var REVOKE_URL = "https://oauth2.googleapis.com/revoke";
-async function requestDeviceCode() {
-  const body = new URLSearchParams({
-    client_id: GOOGLE_CLIENT_ID,
-    scope: SCOPES.join(" ")
-  });
-  const res = await fetch(DEVICE_CODE_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body
-  });
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Device code request failed (${res.status}): ${text}`);
+async function maybeCommitWorkspace(workspacePath, skipCommit) {
+  if (skipCommit) {
+    log.warn("Skip commit (--no-commit). Ch\u1EA1y 'git status' + commit th\u1EE7 c\xF4ng sau.");
+    return;
   }
-  return await res.json();
+  const g = git(workspacePath);
+  await g.add(["CLAUDE.md", ".claude/", ".gitignore", ".gitmodules", "notes/", "scripts/"]);
+  await g.commit("chore: initialize Avatar workspace");
+  log.success("\u0110\xE3 commit workspace");
 }
-async function pollForToken(deviceCode) {
-  const body = new URLSearchParams({
-    client_id: GOOGLE_CLIENT_ID,
-    client_secret: GOOGLE_CLIENT_SECRET,
-    device_code: deviceCode,
-    grant_type: "urn:ietf:params:oauth:grant-type:device_code"
-  });
-  const res = await fetch(TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body
-  });
-  if (res.ok) {
-    return await res.json();
-  }
-  let errorCode = "";
-  try {
-    const data = await res.json();
-    errorCode = data.error ?? "";
-  } catch {
-    errorCode = "";
+function formatAiStatusLine(aiResult) {
+  if (aiResult === null) {
+    return `  ${chalk.yellow("AI:")} skipped \xB7 ${chalk.cyan("avatar ai setup")} \u0111\u1EC3 config sau`;
   }
-  if (errorCode === "authorization_pending" || errorCode === "slow_down") {
-    return null;
+  if (aiResult.ok) {
+    const modelPart = aiResult.model ? ` \xB7 model=${aiResult.model}` : "";
+    return `  ${chalk.green("AI:")} ready \xB7 ${aiResult.provider}${modelPart}`;
   }
-  if (errorCode === "access_denied") {
-    throw new Error("User t\u1EEB ch\u1ED1i quy\u1EC1n truy c\u1EADp");
+  return `  ${chalk.yellow("AI:")} failed (${aiResult.reason.slice(0, 60)}) \xB7 th\u1EED ${chalk.cyan("avatar ai setup")}`;
+}
+function formatGitnexusStatusLine(result) {
+  if (result === null) {
+    return `  ${chalk.yellow("GitNexus:")} skipped \xB7 ${chalk.cyan("avatar gitnexus install")} \u0111\u1EC3 setup sau`;
   }
-  if (errorCode === "expired_token") {
-    throw new Error("H\u1EBFt h\u1EA1n ch\u1EDD (5 ph\xFAt). Ch\u1EA1y l\u1EA1i 'avatar login'.");
+  if (result.ok) {
+    const parts = ["ready"];
+    if (result.analyzed) parts.push("indexed");
+    if (result.wikiGenerated) parts.push("wiki");
+    if (result.mcpRegistered) parts.push("mcp");
+    return `  ${chalk.green("GitNexus:")} ${parts.join(" \xB7 ")}`;
   }
-  throw new Error(`OAuth token endpoint tr\u1EA3 l\u1ED7i: ${errorCode || res.status}`);
+  return `  ${chalk.yellow("GitNexus:")} skipped (${(result.reason ?? "unknown").slice(0, 40)}) \xB7 th\u1EED ${chalk.cyan("avatar gitnexus install")}`;
 }
-function decodeIdToken(idToken) {
-  const parts = idToken.split(".");
-  if (parts.length !== 3) {
-    throw new Error("id_token format kh\xF4ng h\u1EE3p l\u1EC7");
+async function printInitSuccessBox(rootPath, flow, aiResult = null, gitnexusResult = null) {
+  const lines = [
+    `${chalk.green("\u2713")} Workspace s\u1EB5n s\xE0ng: ${relative3(process.cwd(), rootPath) || rootPath}`,
+    `  ${chalk.dim(`(flow: ${flow})`)}`,
+    formatAiStatusLine(aiResult),
+    formatGitnexusStatusLine(gitnexusResult),
+    "",
+    `  ${chalk.cyan(`cd ${rootPath}`)}`,
+    `  ${chalk.cyan("claude")}                    M\u1EDF Claude Code \u1EDF workspace root`,
+    "",
+    `  ${chalk.cyan("avatar commit src")}         Commit code l\xEAn client remote`,
+    `  ${chalk.cyan("avatar sync")}               Pull team-ai-pack m\u1EDBi`,
+    `  ${chalk.cyan("avatar uninstall")}          G\u1EE1 Avatar (gi\u1EEF code)`
+  ];
+  process.stdout.write(`${boxen5(lines.join("\n"), { padding: 1, borderStyle: "round" })}
+`);
+  const packDir = join25(rootPath, TEAM_PACK_RELATIVE_PATH);
+  if (await pathExists(packDir)) {
+    process.stdout.write(`
+${formatPackCommandsCheatsheetBox()}
+`);
   }
-  const payload = parts[1];
-  if (!payload) throw new Error("id_token thi\u1EBFu payload");
-  const base64 = payload.replace(/-/g, "+").replace(/_/g, "/");
-  const json = Buffer.from(base64, "base64").toString("utf8");
-  return JSON.parse(json);
 }
-function verifyHostedDomain(claims) {
-  if (claims.hd !== HOSTED_DOMAIN) {
-    throw new Error(
-      `Email kh\xF4ng thu\u1ED9c workspace NAL (y\xEAu c\u1EA7u @${HOSTED_DOMAIN}). Nh\u1EADn: ${claims.email}`
-    );
+
+// src/commands/workspace-scaffold-and-finalize-orchestrator.ts
+async function getOrCreateOriginRemote(folderPath, opts) {
+  const remotes = await git(folderPath).getRemotes(true);
+  const origin = remotes.find((r) => r.name === "origin");
+  if (origin?.refs.push) {
+    log.success(`Folder \u0111\xE3 c\xF3 remote origin: ${origin.refs.push}`);
+    return origin.refs.push;
   }
-  if (!claims.email_verified) {
-    throw new Error("Email ch\u01B0a \u0111\u01B0\u1EE3c Google verify");
+  const shouldCreate = opts.createRemote ?? await confirm6({
+    message: "Folder ch\u01B0a c\xF3 remote. T\u1EA1o GitHub repo ngay \u0111\u1EC3 share team?",
+    default: true
+  });
+  if (!shouldCreate) {
+    log.warn("Ti\u1EBFp t\u1EE5c v\u1EDBi local path. Workspace ch\u1EC9 ch\u1EA1y \u0111\u01B0\u1EE3c tr\xEAn m\xE1y b\u1EA1n.");
+    return void 0;
   }
-}
-function buildUserConfig(token, claims) {
-  const expiresAt = new Date(Date.now() + token.expires_in * 1e3).toISOString();
-  return {
-    email: claims.email,
-    name: claims.name ?? claims.email,
-    access_token: token.access_token,
-    refresh_token: token.refresh_token,
-    expires_at: expiresAt,
-    id_token: token.id_token
-  };
-}
-async function revokeToken(token) {
-  const body = new URLSearchParams({ token });
-  await fetch(REVOKE_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body
-  }).catch(() => {
+  await ensureGitHubReady();
+  const visibility = opts.repoVisibility ?? await select11({
+    message: "Visibility?",
+    choices: [
+      { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
+      { name: "public", value: "public" }
+    ]
   });
-}
-function buildVerificationUrl(response) {
-  const url = new URL(response.verification_url);
-  url.searchParams.set("user_code", response.user_code);
-  url.searchParams.set("hd", HOSTED_DOMAIN);
-  return url.toString();
-}
-
-// src/commands/login.ts
-function registerLoginCommand(program2) {
-  program2.command("login").description("\u0110\u0103ng nh\u1EADp Google SSO (workspace @nal.vn)").option("--reset", "X\xF3a credential c\u0169 v\xE0 \u0111\u0103ng nh\u1EADp l\u1EA1i").action(async (opts) => {
-    try {
-      await runLogin(opts);
-    } catch (err) {
-      log.error(err instanceof Error ? err.message : String(err));
-      process.exit(1);
-    }
+  const repoName = await input6({
+    message: "T\xEAn repo:",
+    default: basename2(folderPath)
+  });
+  const urls = createGithubRemoteFromFolder({
+    folder: folderPath,
+    name: repoName,
+    visibility,
+    org: opts.repoOrg
   });
+  return urls.sshUrl;
 }
-async function runLogin(opts) {
-  printAvatarBanner({ tagline: "\u0110\u0103ng nh\u1EADp Google SSO \xB7 workspace @nal.vn" });
-  if (opts.reset) {
-    await clearUserConfig();
-    await appendAuditEntry("login_reset");
-  } else {
-    const existing = await readUserConfig();
-    if (existing && !isTokenExpired(existing)) {
-      log.success(`\u0110\xE3 \u0111\u0103ng nh\u1EADp: ${existing.email}`);
-      return;
-    }
-  }
-  const deviceSpinner = spinner("\u0110ang y\xEAu c\u1EA7u device code t\u1EEB Google...");
-  let deviceCode;
+async function scaffoldWorkspaceWithSrcSubmodule(args) {
+  await ensureDir(args.workspacePath);
+  await git(args.workspacePath).init();
+  const sp = spinner(
+    args.skipTeamPack ? "Add submodule src/..." : "Add submodule src/ + team-ai-pack..."
+  );
   try {
-    deviceCode = await requestDeviceCode();
-    deviceSpinner.succeed("Nh\u1EADn device code");
+    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.ssoEmail,
+        args.packLatest === true && !args.packVersion
+        // v1.10.0
+      );
+      pinnedTag = result.pinnedTag ?? "HEAD";
+      sp.succeed(`Pin team-ai-pack v\xE0o ${pinnedTag}`);
+    } else {
+      sp.succeed("Skip team-ai-pack (--skip-team-pack)");
+    }
+    await finalizeWorkspaceScaffold({
+      workspacePath: args.workspacePath,
+      workspaceName: args.workspaceName,
+      teamOwner: args.teamOwner,
+      description: args.description,
+      packVersion: pinnedTag,
+      autoYes: args.autoYes,
+      skipCommit: args.skipCommit,
+      createWorkspaceRemote: args.createWorkspaceRemote,
+      repoVisibility: args.repoVisibility,
+      repoOrg: args.repoOrg,
+      flow: args.flow,
+      aiSkip: args.aiSkip,
+      gitnexusSkip: args.gitnexusSkip
+    });
   } catch (err) {
-    deviceSpinner.fail("Kh\xF4ng k\u1EBFt n\u1ED1i \u0111\u01B0\u1EE3c Google");
+    sp.fail("Init workspace th\u1EA5t b\u1EA1i");
     throw err;
   }
-  const verificationUrl = buildVerificationUrl(deviceCode);
-  const instructions = [
-    `1. Truy c\u1EADp:    ${chalk.cyan(deviceCode.verification_url)}`,
-    `2. Nh\u1EADp code:   ${chalk.bold.yellow(deviceCode.user_code)}`,
-    "",
-    `Ho\u1EB7c Avatar t\u1EF1 m\u1EDF browser, click ${chalk.green("Allow")}...`
-  ].join("\n");
-  process.stdout.write(`${boxen5(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)");
+}
+async function finalizeWorkspaceScaffold(args) {
+  const vars = buildScaffoldVariables({
+    projectName: args.workspaceName,
+    projectDescription: args.description,
+    teamOwner: args.teamOwner,
+    packVersion: args.packVersion,
+    mode: "client"
   });
-  const waitSpinner = spinner("\u0110ang ch\u1EDD x\xE1c nh\u1EADn trong browser...");
-  const intervalMs = deviceCode.interval * 1e3;
-  const deadline = Date.now() + deviceCode.expires_in * 1e3;
-  let token = null;
-  while (Date.now() < deadline) {
-    await sleep(intervalMs);
-    try {
-      token = await pollForToken(deviceCode.device_code);
-      if (token) break;
-    } catch (err) {
-      waitSpinner.fail("X\xE1c th\u1EF1c th\u1EA5t b\u1EA1i");
-      throw err;
+  await createClaudeDirTree(args.workspacePath);
+  await writeProjectKnowledgeFiles(args.workspacePath, vars);
+  await writeRootClaudeMd(args.workspacePath, vars);
+  await writeProjectSettings(args.workspacePath, vars);
+  await appendGitignoreEntries(args.workspacePath);
+  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}`);
+  await maybeCommitWorkspace(args.workspacePath, args.skipCommit);
+  await maybeCreateWorkspaceRemote(args);
+  let aiResult = null;
+  if (args.aiSkip) {
+    log.dim("B\u1ECF qua AI setup (--ai-skip). Setup sau qua: avatar ai setup");
+  } else {
+    aiResult = await runAiSetupPhase({ workspacePath: args.workspacePath });
+  }
+  let gitnexusResult = null;
+  const skipGitnexus = args.aiSkip || args.gitnexusSkip;
+  if (skipGitnexus) {
+    if (args.gitnexusSkip) {
+      log.dim("B\u1ECF qua GitNexus setup (--gitnexus-skip). Setup sau: avatar gitnexus install");
+    } else {
+      log.dim("B\u1ECF qua GitNexus setup (auto-skip do --ai-skip).");
     }
+  } else {
+    gitnexusResult = await runGitnexusSetupPhase({ workspacePath: args.workspacePath });
   }
-  if (!token) {
-    waitSpinner.fail("H\u1EBFt h\u1EA1n ch\u1EDD (5 ph\xFAt). Ch\u1EA1y l\u1EA1i 'avatar login'.");
-    process.exit(1);
+  if (gitnexusResult?.ok) {
+    const updatedVars = buildScaffoldVariables({
+      projectName: args.workspaceName,
+      projectDescription: args.description,
+      teamOwner: args.teamOwner,
+      packVersion: args.packVersion,
+      mode: "client",
+      gitnexusReady: true
+    });
+    await writeRootClaudeMd(args.workspacePath, updatedVars);
+    log.dim("Updated CLAUDE.md v\u1EDBi GitNexus section");
   }
-  waitSpinner.succeed("\u0110\xE3 nh\u1EADn token t\u1EEB Google");
-  const claims = decodeIdToken(token.id_token);
+  await printInitSuccessBox(args.workspacePath, args.flow, aiResult, gitnexusResult);
+}
+async function autoSyncPackOnInit(workspacePath) {
+  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 = join26(workspacePath, ".claude");
+  log.info("Auto-sync pack content v\xE0o .claude/ (symlinks + settings merge)...");
   try {
-    verifyHostedDomain(claims);
+    const results = await syncAllMountDirs(packDir, claudeDir, false);
+    const created = results.filter((r) => r.action === "created" || r.action === "updated").length;
+    const missing = results.filter((r) => r.action === "source-missing").length;
+    log.success(
+      `  \u2713 Symlinks: ${created} created${missing > 0 ? `, ${missing} source-missing (pack thi\u1EBFu dir)` : ""}`
+    );
+    const mergeResult = await mergePackSettingsIntoProjectSettings(workspacePath);
+    switch (mergeResult.action) {
+      case "merged":
+        log.success(`  \u2713 settings.json merged (${mergeResult.changes.join("; ")})`);
+        break;
+      case "no-change":
+        log.dim("  - settings.json \u0111\xE3 sync, kh\xF4ng c\u1EA7n thay \u0111\u1ED5i.");
+        break;
+      case "no-pack-template":
+        log.dim("  - Pack kh\xF4ng c\xF3 templates/settings.json.tpl, skip merge.");
+        break;
+    }
   } catch (err) {
-    await revokeToken(token.access_token);
-    throw err;
+    log.warn(
+      `Auto-sync pack fail: ${err instanceof Error ? err.message : err}. Ch\u1EA1y \`avatar sync\` th\u1EE7 c\xF4ng \u0111\u1EC3 retry.`
+    );
   }
-  const userConfig = buildUserConfig(token, claims);
-  await writeUserConfig(userConfig);
-  await appendAuditEntry("login", userConfig.email);
-  log.success(`X\xE1c th\u1EF1c th\xE0nh c\xF4ng: ${userConfig.email}`);
-  log.success(`Verify hosted domain: ${claims.hd} \u2713`);
-  log.success(`L\u01B0u credential v\xE0o ${USER_CONFIG_PATH} (chmod 600)`);
-}
-function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-
-// src/commands/init.ts
-function parseBootstrapStrategyOpts(opts) {
-  if (opts.preserveUncommitted) return "stash";
-  if (!opts.bootstrapStrategy) return void 0;
-  const valid = ["stash", "commit-all", "skip", "branch"];
-  if (valid.includes(opts.bootstrapStrategy)) {
-    return opts.bootstrapStrategy;
+async function maybeCreateWorkspaceRemote(args) {
+  if (args.skipCommit) {
+    log.dim("Skip workspace remote (ch\u01B0a commit). Setup sau qua: gh repo create ...");
+    return;
   }
-  throw new Error(
-    `--bootstrap-strategy kh\xF4ng h\u1EE3p l\u1EC7: ${opts.bootstrapStrategy}. Ch\u1ECDn: ${valid.join(" | ")}`
-  );
-}
-function registerInitCommand(program2) {
-  program2.command("init").description("Kh\u1EDFi t\u1EA1o Avatar \u2014 3 flow t\u1EF1 nh\u1EADn di\u1EC7n (repo / folder / new)").option("--project-status <val>", "existing-remote | existing-folder | new-project").option("--folder-path <path>", "\u0110\u01B0\u1EDDng d\u1EABn folder hi\u1EC7n c\xF3 (flow existing-folder)").option("--create-remote", "Force t\u1EA1o remote qua gh (flow existing-folder ho\u1EB7c new-project)").option("--repo-visibility <val>", "private (m\u1EB7c \u0111\u1ECBnh) | public").option("--repo-org <name>", "GitHub org/owner cho repo m\u1EDBi").option("--client-repo <url>", "URL git remote (flow existing-remote)").option("--workspace-name <name>", "T\xEAn workspace").option("--workspace-parent <path>", "Th\u01B0 m\u1EE5c cha t\u1EA1o workspace (m\u1EB7c \u0111\u1ECBnh . \u2014 CWD)").option("--pack-version <tag>", "Pin team-ai-pack v\xE0o tag c\u1EE5 th\u1EC3").option("--latest", "Pull HEAD c\u1EE7a team-ai-pack main branch (b\u1ECF qua tag SemVer, bleeding-edge)").option("--team-owner <email>", "Email team owner (b\u1ECF qua prompt)").option("--description <text>", "M\xF4 t\u1EA3 1 d\xF2ng c\u1EE7a d\u1EF1 \xE1n").option("--skip-scan", "B\u1ECF qua project-scanner sau scaffold").option("--skip-team-pack", "B\u1ECF qua submodule team-ai-pack (test mode)").option("--force", "B\u1ECF qua prompt khi workspace path \u0111\xE3 t\u1ED3n t\u1EA1i").option("--yes", "Auto-confirm t\u1EA5t c\u1EA3 prompt").option("--no-commit", "Skip commit workspace initial state (m\u1EB7c \u0111\u1ECBnh LU\xD4N commit)").option("--workspace-remote", "T\u1EA1o GitHub remote cho workspace root (default: prompt)").option("--ai-skip", "B\u1ECF qua phase AI setup (CI/test mode \u2014 ch\u1EA1y `avatar ai setup` sau)").option(
-    "--gitnexus-skip",
-    "B\u1ECF qua phase GitNexus setup (M10 \u2014 ch\u1EA1y `avatar gitnexus install` sau)"
-  ).option(
-    "--bootstrap-strategy <s>",
-    "X\u1EED l\xFD folder dirty: stash | commit-all | skip | branch (default: prompt)"
-  ).option("--preserve-uncommitted", "Alias cho --bootstrap-strategy=stash (gi\u1EEF changes user)").option("--mode <mode>", "[DEPRECATED] D\xF9ng --project-status thay th\u1EBF").action(async (opts) => {
+  let shouldCreate = args.createWorkspaceRemote;
+  if (shouldCreate === void 0) {
+    if (args.autoYes) return;
+    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 select11({
+    message: "Workspace visibility?",
+    choices: [
+      { name: "private (m\u1EB7c \u0111\u1ECBnh, an to\xE0n)", value: "private" },
+      { name: "public", value: "public" }
+    ]
+  }));
+  while (true) {
     try {
-      await runInit(opts);
+      await createWorkspaceRemoteViaGh({
+        workspacePath: args.workspacePath,
+        workspaceName: args.workspaceName,
+        visibility,
+        org: args.repoOrg
+      });
+      return;
     } catch (err) {
-      if (err instanceof InitAbortedByUserError) {
-        log.dim(err.message);
-        process.exit(0);
-      }
-      if (err instanceof TeamPackAccessAbortedError) {
-        log.dim(err.message);
-        process.exit(0);
+      if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
+        const fullName = err.fullName;
+        const reuseAction = await select11({
+          message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
+          choices: [
+            {
+              name: "D\xF9ng remote \u0111\xE3 c\xF3 (link workspace local v\xE0o repo n\xE0y)",
+              value: "reuse"
+            },
+            {
+              name: "Nh\u1EADp t\xEAn workspace kh\xE1c (t\u1EA1o repo m\u1EDBi)",
+              value: "rename"
+            },
+            { name: "B\u1ECF qua (workspace local-only)", value: "skip" },
+            { name: "T\u1EA1m ng\u01B0ng init", value: "abort" }
+          ]
+        });
+        if (reuseAction === "abort") {
+          throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc t\u1EA1o workspace remote.");
+        }
+        if (reuseAction === "skip") {
+          log.warn("Workspace v\u1EABn s\u1EB5n s\xE0ng local-only. Setup remote sau khi c\u1EA7n.");
+          return;
+        }
+        if (reuseAction === "reuse") {
+          linkExistingRemoteToWorkspace({
+            workspacePath: args.workspacePath,
+            fullName
+          });
+          return;
+        }
+        const newName = await input6({
+          message: "T\xEAn workspace m\u1EDBi (s\u1EBD t\u1EA1o repo new):",
+          validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
+        });
+        args.workspaceName = newName.trim();
+        continue;
       }
-      if (err instanceof RemoteAccessAbortedError) {
-        log.dim(err.message);
-        process.exit(0);
+      const action = await promptRetryOrSkip({
+        taskName: "T\u1EA1o workspace remote tr\xEAn GitHub",
+        reason: err instanceof Error ? err.message : String(err),
+        allowSkip: true,
+        // Workspace remote OPTIONAL — skip OK, workspace local vẫn dùng được.
+        hint: "Tip: sai org? Pass --repo-org=<your-gh-user>. Ho\u1EB7c switch gh: gh auth login."
+      });
+      if (action === "abort") {
+        throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc t\u1EA1o workspace remote.");
       }
-      if (err instanceof UserAbortedRecoveryError) {
-        log.dim(err.message);
-        process.exit(0);
+      if (action === "skip") {
+        log.warn("Workspace v\u1EABn s\u1EB5n s\xE0ng local-only. Setup remote sau khi c\u1EA7n.");
+        return;
       }
-      log.error(err instanceof Error ? err.message : String(err));
-      process.exit(1);
-    }
-  });
-}
-async function runInit(opts) {
-  if (!opts.yes) printAvatarBanner({ tagline: "Kh\u1EDFi t\u1EA1o Avatar trong d\u1EF1 \xE1n c\u1EE7a b\u1EA1n" });
-  if (opts.mode) {
-    log.warn("Flag --mode \u0111\xE3 deprecated t\u1EEB v1.1. D\xF9ng --project-status thay th\u1EBF.");
-  }
-  let userConfig = await readUserConfig();
-  while (!userConfig || isTokenExpired(userConfig)) {
-    log.info("Ch\u01B0a \u0111\u0103ng nh\u1EADp \u2014 ch\u1EA1y login flow tr\u01B0\u1EDBc khi init...");
-    try {
-      await runLogin({});
-    } catch (err) {
-      log.warn(`Login fail: ${err.message}`);
-    }
-    userConfig = await readUserConfig();
-    if (userConfig && !isTokenExpired(userConfig)) break;
-    const action = await promptRetryOrSkip({
-      taskName: "\u0110\u0103ng nh\u1EADp SSO Google",
-      reason: "Token ch\u01B0a \u0111\u01B0\u1EE3c t\u1EA1o ho\u1EB7c \u0111\xE3 h\u1EBFt h\u1EA1n.",
-      allowSkip: false,
-      // Login bắt buộc, không skip được.
-      hint: "\u0110\u1EA3m b\u1EA3o b\u1EA1n ch\u1ECDn 'Allow' tr\xEAn browser v\xE0 d\xF9ng email @nal.vn."
-    });
-    if (action === "abort") {
-      throw new UserAbortedRecoveryError(
-        "User abort t\u1EA1i b\u01B0\u1EDBc login. Ch\u1EA1y 'avatar login' tay r\u1ED3i 'avatar init' l\u1EA1i."
-      );
     }
   }
-  const status = opts.projectStatus ?? await promptProjectStatus();
-  switch (status) {
-    case "existing-remote":
-      await runInitFromExistingRemote(opts, userConfig.email);
-      break;
-    case "existing-folder":
-      await runInitFromExistingFolder(opts, userConfig.email);
-      break;
-    case "new-project":
-      await runInitFromScratch(opts, userConfig.email);
-      break;
-  }
-}
-async function promptProjectStatus() {
-  return await select9({
-    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" },
-      { name: "2. \u0110\xE3 c\xF3 folder code local", value: "existing-folder" },
-      { name: "3. D\u1EF1 \xE1n m\u1EDBi ho\xE0n to\xE0n", value: "new-project" }
-    ]
-  });
 }
+
+// src/commands/init-flow-handlers-for-each-project-status.ts
 async function runInitFromExistingRemote(opts, ownerEmail) {
-  const initialRemoteUrl = opts.clientRepo ?? await input5({
+  const initialRemoteUrl = opts.clientRepo ?? await input7({
     message: "URL git c\u1EE7a repo:",
     validate: (v) => v.length > 0 ? true : "URL b\u1EAFt bu\u1ED9c"
   });
@@ -4131,7 +4328,7 @@ async function runInitFromExistingRemote(opts, ownerEmail) {
   const remoteUrl = resolvedRemoteUrl ?? initialRemoteUrl;
   const teamOwner = opts.teamOwner ?? await promptTeamOwner(ownerEmail);
   const inferredName = inferWorkspaceName(remoteUrl);
-  const workspaceName = opts.workspaceName ?? await input5({ message: "T\xEAn workspace:", default: inferredName });
+  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);
   await scaffoldWorkspaceWithSrcSubmodule({
@@ -4156,7 +4353,7 @@ async function runInitFromExistingRemote(opts, ownerEmail) {
 }
 async function runInitFromExistingFolder(opts, ownerEmail) {
   const folderPath = resolve2(
-    opts.folderPath ?? await input5({
+    opts.folderPath ?? await input7({
       message: "\u0110\u01B0\u1EDDng d\u1EABn folder hi\u1EC7n c\xF3:",
       validate: (v) => v.length > 0 ? true : "Path b\u1EAFt bu\u1ED9c"
     })
@@ -4165,10 +4362,25 @@ 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 ?? `${basename(folderPath)}-avatar-workspace`;
-  const workspaceName = opts.workspaceName ?? await input5({ message: "T\xEAn workspace:", default: inferredName });
+  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);
   await scaffoldWorkspaceWithSrcSubmodule({
@@ -4194,11 +4406,11 @@ async function runInitFromExistingFolder(opts, ownerEmail) {
 }
 async function runInitFromScratch(opts, ownerEmail) {
   await ensureGitHubReady();
-  const projectName = opts.workspaceName ?? await input5({
+  const projectName = opts.workspaceName ?? await input7({
     message: "T\xEAn d\u1EF1 \xE1n:",
     validate: (v) => v.length > 0 ? true : "T\xEAn b\u1EAFt bu\u1ED9c"
   });
-  const visibility = opts.repoVisibility ?? await select9({
+  const visibility = opts.repoVisibility ?? await select12({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -4208,7 +4420,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 = join25(workspacePath, "src");
+  const srcPath = join27(workspacePath, "src");
   await ensureDir(workspacePath);
   await ensureDir(srcPath);
   await safeBootstrapGitInFolder(srcPath, { autoYes: true });
@@ -4232,85 +4444,7 @@ async function runInitFromScratch(opts, ownerEmail) {
         opts.packVersion,
         ownerEmail,
         opts.latest === true && !opts.packVersion
-        // v1.10.0: latest mode khi flag set + không có explicit tag
-      );
-      pinnedTag = result.pinnedTag ?? "HEAD";
-      sp.succeed(`Pin team-ai-pack v\xE0o ${pinnedTag}`);
-    } else {
-      sp.succeed("Skip team-ai-pack (--skip-team-pack)");
-    }
-    await finalizeWorkspaceScaffold({
-      workspacePath,
-      workspaceName: projectName,
-      teamOwner,
-      description: opts.description ?? `D\u1EF1 \xE1n m\u1EDBi: ${projectName}`,
-      packVersion: pinnedTag,
-      autoYes: opts.yes,
-      skipCommit: opts.commit === false,
-      createWorkspaceRemote: opts.workspaceRemote,
-      repoVisibility: opts.repoVisibility,
-      repoOrg: opts.repoOrg,
-      flow: "new-project",
-      aiSkip: opts.aiSkip,
-      gitnexusSkip: opts.gitnexusSkip
-    });
-  } catch (err) {
-    sp.fail("Init workspace th\u1EA5t b\u1EA1i");
-    throw err;
-  }
-}
-async function getOrCreateOriginRemote(folderPath, opts) {
-  const remotes = await git(folderPath).getRemotes(true);
-  const origin = remotes.find((r) => r.name === "origin");
-  if (origin?.refs.push) {
-    log.success(`Folder \u0111\xE3 c\xF3 remote origin: ${origin.refs.push}`);
-    return origin.refs.push;
-  }
-  const shouldCreate = opts.createRemote ?? await confirm5({
-    message: "Folder ch\u01B0a c\xF3 remote. T\u1EA1o GitHub repo ngay \u0111\u1EC3 share team?",
-    default: true
-  });
-  if (!shouldCreate) {
-    log.warn("Ti\u1EBFp t\u1EE5c v\u1EDBi local path. Workspace ch\u1EC9 ch\u1EA1y \u0111\u01B0\u1EE3c tr\xEAn m\xE1y b\u1EA1n.");
-    return void 0;
-  }
-  await ensureGitHubReady();
-  const visibility = opts.repoVisibility ?? await select9({
-    message: "Visibility?",
-    choices: [
-      { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
-      { name: "public", value: "public" }
-    ]
-  });
-  const repoName = await input5({
-    message: "T\xEAn repo:",
-    default: basename(folderPath)
-  });
-  const urls = createGithubRemoteFromFolder({
-    folder: folderPath,
-    name: repoName,
-    visibility,
-    org: opts.repoOrg
-  });
-  return urls.sshUrl;
-}
-async function scaffoldWorkspaceWithSrcSubmodule(args) {
-  await ensureDir(args.workspacePath);
-  await git(args.workspacePath).init();
-  const sp = spinner(
-    args.skipTeamPack ? "Add submodule src/..." : "Add submodule src/ + team-ai-pack..."
-  );
-  try {
-    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.ssoEmail,
-        args.packLatest === true && !args.packVersion
-        // v1.10.0
+        // v1.10.0: latest mode khi flag set + không có explicit tag
       );
       pinnedTag = result.pinnedTag ?? "HEAD";
       sp.succeed(`Pin team-ai-pack v\xE0o ${pinnedTag}`);
@@ -4318,292 +4452,299 @@ async function scaffoldWorkspaceWithSrcSubmodule(args) {
       sp.succeed("Skip team-ai-pack (--skip-team-pack)");
     }
     await finalizeWorkspaceScaffold({
-      workspacePath: args.workspacePath,
-      workspaceName: args.workspaceName,
-      teamOwner: args.teamOwner,
-      description: args.description,
+      workspacePath,
+      workspaceName: projectName,
+      teamOwner,
+      description: opts.description ?? `D\u1EF1 \xE1n m\u1EDBi: ${projectName}`,
       packVersion: pinnedTag,
-      autoYes: args.autoYes,
-      skipCommit: args.skipCommit,
-      createWorkspaceRemote: args.createWorkspaceRemote,
-      repoVisibility: args.repoVisibility,
-      repoOrg: args.repoOrg,
-      flow: args.flow,
-      aiSkip: args.aiSkip,
-      gitnexusSkip: args.gitnexusSkip
+      autoYes: opts.yes,
+      skipCommit: opts.commit === false,
+      createWorkspaceRemote: opts.workspaceRemote,
+      repoVisibility: opts.repoVisibility,
+      repoOrg: opts.repoOrg,
+      flow: "new-project",
+      aiSkip: opts.aiSkip,
+      gitnexusSkip: opts.gitnexusSkip
     });
   } catch (err) {
     sp.fail("Init workspace th\u1EA5t b\u1EA1i");
     throw err;
   }
 }
-async function finalizeWorkspaceScaffold(args) {
-  const vars = buildScaffoldVariables({
-    projectName: args.workspaceName,
-    projectDescription: args.description,
-    teamOwner: args.teamOwner,
-    packVersion: args.packVersion,
-    mode: "client"
+
+// src/commands/login.ts
+import boxen6 from "boxen";
+import open from "open";
+
+// src/lib/google-oauth-device-flow.ts
+var GOOGLE_CLIENT_ID = "1014766441755-i4jimivh5rd7vt8phuhmepmt45sovtph.apps.googleusercontent.com";
+var GOOGLE_CLIENT_SECRET = "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";
+var HOSTED_DOMAIN = "nal.vn";
+var SCOPES = ["openid", "email", "profile"];
+var DEVICE_CODE_URL = "https://oauth2.googleapis.com/device/code";
+var TOKEN_URL = "https://oauth2.googleapis.com/token";
+var REVOKE_URL = "https://oauth2.googleapis.com/revoke";
+async function requestDeviceCode() {
+  const body = new URLSearchParams({
+    client_id: GOOGLE_CLIENT_ID,
+    scope: SCOPES.join(" ")
   });
-  await createClaudeDirTree(args.workspacePath);
-  await writeProjectKnowledgeFiles(args.workspacePath, vars);
-  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");
-  log.success("C\xE0i post-merge (workspace) + pre-push (src/)");
-  await autoSyncPackOnInit(args.workspacePath);
-  await appendAuditEntry("init", `flow=${args.flow},workspace=${args.workspaceName}`);
-  await maybeCommitWorkspace(args.workspacePath, args.skipCommit);
-  await maybeCreateWorkspaceRemote(args);
-  let aiResult = null;
-  if (args.aiSkip) {
-    log.dim("B\u1ECF qua AI setup (--ai-skip). Setup sau qua: avatar ai setup");
-  } else {
-    aiResult = await runAiSetupPhase({ workspacePath: args.workspacePath });
+  const res = await fetch(DEVICE_CODE_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`Device code request failed (${res.status}): ${text}`);
   }
-  let gitnexusResult = null;
-  const skipGitnexus = args.aiSkip || args.gitnexusSkip;
-  if (skipGitnexus) {
-    if (args.gitnexusSkip) {
-      log.dim("B\u1ECF qua GitNexus setup (--gitnexus-skip). Setup sau: avatar gitnexus install");
-    } else {
-      log.dim("B\u1ECF qua GitNexus setup (auto-skip do --ai-skip).");
-    }
-  } else {
-    gitnexusResult = await runGitnexusSetupPhase({ workspacePath: args.workspacePath });
+  return await res.json();
+}
+async function pollForToken(deviceCode) {
+  const body = new URLSearchParams({
+    client_id: GOOGLE_CLIENT_ID,
+    client_secret: GOOGLE_CLIENT_SECRET,
+    device_code: deviceCode,
+    grant_type: "urn:ietf:params:oauth:grant-type:device_code"
+  });
+  const res = await fetch(TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body
+  });
+  if (res.ok) {
+    return await res.json();
   }
-  if (gitnexusResult?.ok) {
-    const updatedVars = buildScaffoldVariables({
-      projectName: args.workspaceName,
-      projectDescription: args.description,
-      teamOwner: args.teamOwner,
-      packVersion: args.packVersion,
-      mode: "client",
-      gitnexusReady: true
-    });
-    await writeRootClaudeMd(args.workspacePath, updatedVars);
-    log.dim("Updated CLAUDE.md v\u1EDBi GitNexus section");
+  let errorCode = "";
+  try {
+    const data = await res.json();
+    errorCode = data.error ?? "";
+  } catch {
+    errorCode = "";
   }
-  await printInitSuccessBox(args.workspacePath, args.flow, aiResult, gitnexusResult);
+  if (errorCode === "authorization_pending" || errorCode === "slow_down") {
+    return null;
+  }
+  if (errorCode === "access_denied") {
+    throw new Error("User t\u1EEB ch\u1ED1i quy\u1EC1n truy c\u1EADp");
+  }
+  if (errorCode === "expired_token") {
+    throw new Error("H\u1EBFt h\u1EA1n ch\u1EDD (5 ph\xFAt). Ch\u1EA1y l\u1EA1i 'avatar login'.");
+  }
+  throw new Error(`OAuth token endpoint tr\u1EA3 l\u1ED7i: ${errorCode || res.status}`);
 }
-async function autoSyncPackOnInit(workspacePath) {
-  const packDir = join25(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;
+function decodeIdToken(idToken) {
+  const parts = idToken.split(".");
+  if (parts.length !== 3) {
+    throw new Error("id_token format kh\xF4ng h\u1EE3p l\u1EC7");
   }
-  const claudeDir = join25(workspacePath, ".claude");
-  log.info("Auto-sync pack content v\xE0o .claude/ (symlinks + settings merge)...");
-  try {
-    const results = await syncAllMountDirs(packDir, claudeDir, false);
-    const created = results.filter((r) => r.action === "created" || r.action === "updated").length;
-    const missing = results.filter((r) => r.action === "source-missing").length;
-    log.success(
-      `  \u2713 Symlinks: ${created} created${missing > 0 ? `, ${missing} source-missing (pack thi\u1EBFu dir)` : ""}`
+  const payload = parts[1];
+  if (!payload) throw new Error("id_token thi\u1EBFu payload");
+  const base64 = payload.replace(/-/g, "+").replace(/_/g, "/");
+  const json = Buffer.from(base64, "base64").toString("utf8");
+  return JSON.parse(json);
+}
+function verifyHostedDomain(claims) {
+  if (claims.hd !== HOSTED_DOMAIN) {
+    throw new Error(
+      `Email kh\xF4ng thu\u1ED9c workspace NAL (y\xEAu c\u1EA7u @${HOSTED_DOMAIN}). Nh\u1EADn: ${claims.email}`
     );
-    const mergeResult = await mergePackSettingsIntoProjectSettings(workspacePath);
-    switch (mergeResult.action) {
-      case "merged":
-        log.success(`  \u2713 settings.json merged (${mergeResult.changes.join("; ")})`);
-        break;
-      case "no-change":
-        log.dim("  - settings.json \u0111\xE3 sync, kh\xF4ng c\u1EA7n thay \u0111\u1ED5i.");
-        break;
-      case "no-pack-template":
-        log.dim("  - Pack kh\xF4ng c\xF3 templates/settings.json.tpl, skip merge.");
-        break;
+  }
+  if (!claims.email_verified) {
+    throw new Error("Email ch\u01B0a \u0111\u01B0\u1EE3c Google verify");
+  }
+}
+function buildUserConfig(token, claims) {
+  const expiresAt = new Date(Date.now() + token.expires_in * 1e3).toISOString();
+  return {
+    email: claims.email,
+    name: claims.name ?? claims.email,
+    access_token: token.access_token,
+    refresh_token: token.refresh_token,
+    expires_at: expiresAt,
+    id_token: token.id_token
+  };
+}
+async function revokeToken(token) {
+  const body = new URLSearchParams({ token });
+  await fetch(REVOKE_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body
+  }).catch(() => {
+  });
+}
+function buildVerificationUrl(response) {
+  const url = new URL(response.verification_url);
+  url.searchParams.set("user_code", response.user_code);
+  url.searchParams.set("hd", HOSTED_DOMAIN);
+  return url.toString();
+}
+
+// src/commands/login.ts
+function registerLoginCommand(program2) {
+  program2.command("login").description("\u0110\u0103ng nh\u1EADp Google SSO (workspace @nal.vn)").option("--reset", "X\xF3a credential c\u0169 v\xE0 \u0111\u0103ng nh\u1EADp l\u1EA1i").action(async (opts) => {
+    try {
+      await runLogin(opts);
+    } catch (err) {
+      log.error(err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
+  });
+}
+async function runLogin(opts) {
+  printAvatarBanner({ tagline: "\u0110\u0103ng nh\u1EADp Google SSO \xB7 workspace @nal.vn" });
+  if (opts.reset) {
+    await clearUserConfig();
+    await appendAuditEntry("login_reset");
+  } else {
+    const existing = await readUserConfig();
+    if (existing && !isTokenExpired(existing)) {
+      log.success(`\u0110\xE3 \u0111\u0103ng nh\u1EADp: ${existing.email}`);
+      return;
+    }
+  }
+  const deviceSpinner = spinner("\u0110ang y\xEAu c\u1EA7u device code t\u1EEB Google...");
+  let deviceCode;
+  try {
+    deviceCode = await requestDeviceCode();
+    deviceSpinner.succeed("Nh\u1EADn device code");
+  } catch (err) {
+    deviceSpinner.fail("Kh\xF4ng k\u1EBFt n\u1ED1i \u0111\u01B0\u1EE3c Google");
+    throw err;
+  }
+  const verificationUrl = buildVerificationUrl(deviceCode);
+  const instructions = [
+    `1. Truy c\u1EADp:    ${chalk.cyan(deviceCode.verification_url)}`,
+    `2. Nh\u1EADp code:   ${chalk.bold.yellow(deviceCode.user_code)}`,
+    "",
+    `Ho\u1EB7c Avatar t\u1EF1 m\u1EDF browser, click ${chalk.green("Allow")}...`
+  ].join("\n");
+  process.stdout.write(`${boxen6(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)");
+  });
+  const waitSpinner = spinner("\u0110ang ch\u1EDD x\xE1c nh\u1EADn trong browser...");
+  const intervalMs = deviceCode.interval * 1e3;
+  const deadline = Date.now() + deviceCode.expires_in * 1e3;
+  let token = null;
+  while (Date.now() < deadline) {
+    await sleep(intervalMs);
+    try {
+      token = await pollForToken(deviceCode.device_code);
+      if (token) break;
+    } catch (err) {
+      waitSpinner.fail("X\xE1c th\u1EF1c th\u1EA5t b\u1EA1i");
+      throw err;
     }
+  }
+  if (!token) {
+    waitSpinner.fail("H\u1EBFt h\u1EA1n ch\u1EDD (5 ph\xFAt). Ch\u1EA1y l\u1EA1i 'avatar login'.");
+    process.exit(1);
+  }
+  waitSpinner.succeed("\u0110\xE3 nh\u1EADn token t\u1EEB Google");
+  const claims = decodeIdToken(token.id_token);
+  try {
+    verifyHostedDomain(claims);
   } catch (err) {
-    log.warn(
-      `Auto-sync pack fail: ${err instanceof Error ? err.message : err}. Ch\u1EA1y \`avatar sync\` th\u1EE7 c\xF4ng \u0111\u1EC3 retry.`
-    );
+    await revokeToken(token.access_token);
+    throw err;
   }
+  const userConfig = buildUserConfig(token, claims);
+  await writeUserConfig(userConfig);
+  await appendAuditEntry("login", userConfig.email);
+  log.success(`X\xE1c th\u1EF1c th\xE0nh c\xF4ng: ${userConfig.email}`);
+  log.success(`Verify hosted domain: ${claims.hd} \u2713`);
+  log.success(`L\u01B0u credential v\xE0o ${USER_CONFIG_PATH} (chmod 600)`);
 }
-async function maybeCreateWorkspaceRemote(args) {
-  if (args.skipCommit) {
-    log.dim("Skip workspace remote (ch\u01B0a commit). Setup sau qua: gh repo create ...");
-    return;
-  }
-  let shouldCreate = args.createWorkspaceRemote;
-  if (shouldCreate === void 0) {
-    if (args.autoYes) return;
-    shouldCreate = await confirm5({
-      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 select9({
-    message: "Workspace visibility?",
-    choices: [
-      { name: "private (m\u1EB7c \u0111\u1ECBnh, an to\xE0n)", value: "private" },
-      { name: "public", value: "public" }
-    ]
-  }));
-  while (true) {
+function sleep(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+
+// src/commands/init.ts
+function registerInitCommand(program2) {
+  program2.command("init").description("Kh\u1EDFi t\u1EA1o Avatar \u2014 3 flow t\u1EF1 nh\u1EADn di\u1EC7n (repo / folder / new)").option("--project-status <val>", "existing-remote | existing-folder | new-project").option("--folder-path <path>", "\u0110\u01B0\u1EDDng d\u1EABn folder hi\u1EC7n c\xF3 (flow existing-folder)").option("--create-remote", "Force t\u1EA1o remote qua gh (flow existing-folder ho\u1EB7c new-project)").option("--repo-visibility <val>", "private (m\u1EB7c \u0111\u1ECBnh) | public").option("--repo-org <name>", "GitHub org/owner cho repo m\u1EDBi").option("--client-repo <url>", "URL git remote (flow existing-remote)").option("--workspace-name <name>", "T\xEAn workspace").option("--workspace-parent <path>", "Th\u01B0 m\u1EE5c cha t\u1EA1o workspace (m\u1EB7c \u0111\u1ECBnh . \u2014 CWD)").option("--pack-version <tag>", "Pin team-ai-pack v\xE0o tag c\u1EE5 th\u1EC3").option("--latest", "Pull HEAD c\u1EE7a team-ai-pack main branch (b\u1ECF qua tag SemVer, bleeding-edge)").option("--team-owner <email>", "Email team owner (b\u1ECF qua prompt)").option("--description <text>", "M\xF4 t\u1EA3 1 d\xF2ng c\u1EE7a d\u1EF1 \xE1n").option("--skip-scan", "B\u1ECF qua project-scanner sau scaffold").option("--skip-team-pack", "B\u1ECF qua submodule team-ai-pack (test mode)").option("--force", "B\u1ECF qua prompt khi workspace path \u0111\xE3 t\u1ED3n t\u1EA1i").option("--yes", "Auto-confirm t\u1EA5t c\u1EA3 prompt").option("--no-commit", "Skip commit workspace initial state (m\u1EB7c \u0111\u1ECBnh LU\xD4N commit)").option("--workspace-remote", "T\u1EA1o GitHub remote cho workspace root (default: prompt)").option("--ai-skip", "B\u1ECF qua phase AI setup (CI/test mode \u2014 ch\u1EA1y `avatar ai setup` sau)").option(
+    "--gitnexus-skip",
+    "B\u1ECF qua phase GitNexus setup (M10 \u2014 ch\u1EA1y `avatar gitnexus install` sau)"
+  ).option(
+    "--bootstrap-strategy <s>",
+    "X\u1EED l\xFD folder dirty: stash | commit-all | skip | branch (default: prompt)"
+  ).option("--preserve-uncommitted", "Alias cho --bootstrap-strategy=stash (gi\u1EEF changes user)").option("--mode <mode>", "[DEPRECATED] D\xF9ng --project-status thay th\u1EBF").action(async (opts) => {
     try {
-      await createWorkspaceRemoteViaGh({
-        workspacePath: args.workspacePath,
-        workspaceName: args.workspaceName,
-        visibility,
-        org: args.repoOrg
-      });
-      return;
+      await runInit(opts);
     } catch (err) {
-      if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
-        const fullName = err.fullName;
-        const reuseAction = await select9({
-          message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
-          choices: [
-            {
-              name: "D\xF9ng remote \u0111\xE3 c\xF3 (link workspace local v\xE0o repo n\xE0y)",
-              value: "reuse"
-            },
-            {
-              name: "Nh\u1EADp t\xEAn workspace kh\xE1c (t\u1EA1o repo m\u1EDBi)",
-              value: "rename"
-            },
-            { name: "B\u1ECF qua (workspace local-only)", value: "skip" },
-            { name: "T\u1EA1m ng\u01B0ng init", value: "abort" }
-          ]
-        });
-        if (reuseAction === "abort") {
-          throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc t\u1EA1o workspace remote.");
-        }
-        if (reuseAction === "skip") {
-          log.warn("Workspace v\u1EABn s\u1EB5n s\xE0ng local-only. Setup remote sau khi c\u1EA7n.");
-          return;
-        }
-        if (reuseAction === "reuse") {
-          linkExistingRemoteToWorkspace({
-            workspacePath: args.workspacePath,
-            fullName
-          });
-          return;
-        }
-        const newName = await input5({
-          message: "T\xEAn workspace m\u1EDBi (s\u1EBD t\u1EA1o repo new):",
-          validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
-        });
-        args.workspaceName = newName.trim();
-        continue;
+      if (err instanceof InitAbortedByUserError) {
+        log.dim(err.message);
+        process.exit(0);
       }
-      const action = await promptRetryOrSkip({
-        taskName: "T\u1EA1o workspace remote tr\xEAn GitHub",
-        reason: err instanceof Error ? err.message : String(err),
-        allowSkip: true,
-        // Workspace remote OPTIONAL — skip OK, workspace local vẫn dùng được.
-        hint: "Tip: sai org? Pass --repo-org=<your-gh-user>. Ho\u1EB7c switch gh: gh auth login."
-      });
-      if (action === "abort") {
-        throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc t\u1EA1o workspace remote.");
+      if (err instanceof TeamPackAccessAbortedError) {
+        log.dim(err.message);
+        process.exit(0);
       }
-      if (action === "skip") {
-        log.warn("Workspace v\u1EABn s\u1EB5n s\xE0ng local-only. Setup remote sau khi c\u1EA7n.");
-        return;
+      if (err instanceof RemoteAccessAbortedError) {
+        log.dim(err.message);
+        process.exit(0);
+      }
+      if (err instanceof UserAbortedRecoveryError) {
+        log.dim(err.message);
+        process.exit(0);
       }
+      log.error(err instanceof Error ? err.message : String(err));
+      process.exit(1);
     }
-  }
+  });
 }
-async function resolveWorkspacePath(parent, desiredName, force) {
-  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) {
-    const alternative = await findAlternativeWorkspaceName(parent, desiredName);
-    if (force && alternative) {
-      log.info(`--force: d\xF9ng ${alternative}`);
-      return alternative;
-    }
-    const choices = [];
-    if (alternative) {
-      choices.push({ name: `D\xF9ng "${alternative}" (suggest)`, value: "use-alt" });
+async function runInit(opts) {
+  if (!opts.yes) printAvatarBanner({ tagline: "Kh\u1EDFi t\u1EA1o Avatar trong d\u1EF1 \xE1n c\u1EE7a b\u1EA1n" });
+  if (opts.mode) {
+    log.warn("Flag --mode \u0111\xE3 deprecated t\u1EEB v1.1. D\xF9ng --project-status thay th\u1EBF.");
+  }
+  let userConfig = await readUserConfig();
+  while (!userConfig || isTokenExpired(userConfig)) {
+    log.info("Ch\u01B0a \u0111\u0103ng nh\u1EADp \u2014 ch\u1EA1y login flow tr\u01B0\u1EDBc khi init...");
+    try {
+      await runLogin({});
+    } catch (err) {
+      log.warn(`Login fail: ${err.message}`);
     }
-    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({
-      message: "C\xE1ch x\u1EED l\xFD workspace path conflict?",
-      choices
+    userConfig = await readUserConfig();
+    if (userConfig && !isTokenExpired(userConfig)) break;
+    const action = await promptRetryOrSkip({
+      taskName: "\u0110\u0103ng nh\u1EADp SSO Google",
+      reason: "Token ch\u01B0a \u0111\u01B0\u1EE3c t\u1EA1o ho\u1EB7c \u0111\xE3 h\u1EBFt h\u1EA1n.",
+      allowSkip: false,
+      // Login bắt buộc, không skip được.
+      hint: "\u0110\u1EA3m b\u1EA3o b\u1EA1n ch\u1ECDn 'Allow' tr\xEAn browser v\xE0 d\xF9ng email @nal.vn."
     });
     if (action === "abort") {
       throw new UserAbortedRecoveryError(
-        "User abort t\u1EA1i b\u01B0\u1EDBc resolve workspace path. Ch\u1EA1y l\u1EA1i v\u1EDBi --workspace-name kh\xE1c."
+        "User abort t\u1EA1i b\u01B0\u1EDBc login. Ch\u1EA1y 'avatar login' tay r\u1ED3i 'avatar init' l\u1EA1i."
       );
     }
-    if (action === "use-alt" && alternative) {
-      return alternative;
-    }
-    const newName = await input5({
-      message: "T\xEAn workspace m\u1EDBi:",
-      validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
-    });
-    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.`);
-  }
-}
-async function promptTeamOwner(currentUserEmail) {
-  return await input5({ message: "Team owner email:", default: currentUserEmail });
-}
-async function maybeCommitWorkspace(workspacePath, skipCommit) {
-  if (skipCommit) {
-    log.warn("Skip commit (--no-commit). Ch\u1EA1y 'git status' + commit th\u1EE7 c\xF4ng sau.");
-    return;
-  }
-  const g = git(workspacePath);
-  await g.add(["CLAUDE.md", ".claude/", ".gitignore", ".gitmodules", "notes/", "scripts/"]);
-  await g.commit("chore: initialize Avatar workspace");
-  log.success("\u0110\xE3 commit workspace");
-}
-function formatAiStatusLine(aiResult) {
-  if (aiResult === null) {
-    return `  ${chalk.yellow("AI:")} skipped \xB7 ${chalk.cyan("avatar ai setup")} \u0111\u1EC3 config sau`;
-  }
-  if (aiResult.ok) {
-    const modelPart = aiResult.model ? ` \xB7 model=${aiResult.model}` : "";
-    return `  ${chalk.green("AI:")} ready \xB7 ${aiResult.provider}${modelPart}`;
-  }
-  return `  ${chalk.yellow("AI:")} failed (${aiResult.reason.slice(0, 60)}) \xB7 th\u1EED ${chalk.cyan("avatar ai setup")}`;
-}
-function formatGitnexusStatusLine(result) {
-  if (result === null) {
-    return `  ${chalk.yellow("GitNexus:")} skipped \xB7 ${chalk.cyan("avatar gitnexus install")} \u0111\u1EC3 setup sau`;
   }
-  if (result.ok) {
-    const parts = ["ready"];
-    if (result.analyzed) parts.push("indexed");
-    if (result.wikiGenerated) parts.push("wiki");
-    if (result.mcpRegistered) parts.push("mcp");
-    return `  ${chalk.green("GitNexus:")} ${parts.join(" \xB7 ")}`;
+  const status = opts.projectStatus ?? await promptProjectStatus();
+  switch (status) {
+    case "existing-remote":
+      await runInitFromExistingRemote(opts, userConfig.email);
+      break;
+    case "existing-folder":
+      await runInitFromExistingFolder(opts, userConfig.email);
+      break;
+    case "new-project":
+      await runInitFromScratch(opts, userConfig.email);
+      break;
   }
-  return `  ${chalk.yellow("GitNexus:")} skipped (${(result.reason ?? "unknown").slice(0, 40)}) \xB7 th\u1EED ${chalk.cyan("avatar gitnexus install")}`;
 }
-async function printInitSuccessBox(rootPath, flow, aiResult = null, gitnexusResult = null) {
-  const lines = [
-    `${chalk.green("\u2713")} Workspace s\u1EB5n s\xE0ng: ${relative3(process.cwd(), rootPath) || rootPath}`,
-    `  ${chalk.dim(`(flow: ${flow})`)}`,
-    formatAiStatusLine(aiResult),
-    formatGitnexusStatusLine(gitnexusResult),
-    "",
-    `  ${chalk.cyan(`cd ${rootPath}`)}`,
-    `  ${chalk.cyan("claude")}                    M\u1EDF Claude Code \u1EDF workspace root`,
-    "",
-    `  ${chalk.cyan("avatar commit src")}         Commit code l\xEAn client remote`,
-    `  ${chalk.cyan("avatar sync")}               Pull team-ai-pack m\u1EDBi`,
-    `  ${chalk.cyan("avatar uninstall")}          G\u1EE1 Avatar (gi\u1EEF code)`
-  ];
-  process.stdout.write(`${boxen6(lines.join("\n"), { padding: 1, borderStyle: "round" })}
-`);
-  const packDir = join25(rootPath, TEAM_PACK_RELATIVE_PATH);
-  if (await pathExists(packDir)) {
-    process.stdout.write(`
-${formatPackCommandsCheatsheetBox()}
-`);
-  }
+async function promptProjectStatus() {
+  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" },
+      { name: "2. \u0110\xE3 c\xF3 folder code local", value: "existing-folder" },
+      { name: "3. D\u1EF1 \xE1n m\u1EDBi ho\xE0n to\xE0n", value: "new-project" }
+    ]
+  });
 }
 
 // src/lib/not-implemented-stub.ts
@@ -4628,7 +4769,7 @@ function registerMcpRunCommand(program2) {
 }
 
 // src/commands/pack-status-and-version-check.ts
-import { join as join26 } from "path";
+import { join as join28 } from "path";
 import boxen7 from "boxen";
 var PACK_RELATIVE_PATH = ".claude/pack";
 function registerPackCommand(program2) {
@@ -4649,7 +4790,7 @@ function registerPackCommand(program2) {
   });
 }
 async function gatherPackStatus(cwd, doFetch) {
-  const packDir = join26(cwd, PACK_RELATIVE_PATH);
+  const packDir = join28(cwd, PACK_RELATIVE_PATH);
   if (!await pathExists(packDir) || !await isGitRepo(packDir)) {
     return {
       installed: false,
@@ -4738,18 +4879,18 @@ function registerSecretsCommand(program2) {
 }
 
 // src/commands/status.ts
-import { promises as fs13 } from "fs";
-import { join as join28 } 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 join27 } 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 = join27(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();
 }
 
@@ -4772,7 +4913,7 @@ function registerStatusCommand(program2) {
 }
 async function gatherStatus(cwd) {
   const projectName = cwd.split("/").filter(Boolean).pop() ?? "unknown";
-  const claudeRoot = join28(cwd, ".claude");
+  const claudeRoot = join30(cwd, ".claude");
   const hasAvatar = await pathExists(claudeRoot);
   if (!hasAvatar) {
     return {
@@ -4785,9 +4926,9 @@ async function gatherStatus(cwd) {
       hasAvatar: false
     };
   }
-  const packVersion = await isGitRepo(join28(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
-  const pendingDir = join28(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 {
@@ -4801,7 +4942,7 @@ async function gatherStatus(cwd) {
   };
 }
 async function readTechStackFirstLine(claudeRoot) {
-  const techStackPath = join28(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(">"));
@@ -4822,17 +4963,17 @@ function renderStatusBox(s) {
 }
 
 // src/commands/sync.ts
-import { join as join30 } from "path";
+import { join as join32 } from "path";
 
 // src/lib/preview-team-pack-sync-changes-for-dry-run.ts
-import { join as join29 } from "path";
+import { join as join31 } from "path";
 async function inspectMountDir(packDir, claudeDir, dir) {
-  const source = join29(packDir, dir);
-  const dest = join29(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";
 }
@@ -4870,15 +5011,14 @@ async function buildSyncPreview(packDir, claudeDir, targetVersion) {
 var DEFAULT_PACK_BRANCH2 = "main";
 async function syncAction(opts) {
   const projectRoot = process.cwd();
-  const claudeDir = join30(projectRoot, ".claude");
-  const packDir = join30(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}/.
   Ch\u1EA1y 'avatar init' \u0111\u1EC3 add submodule, ho\u1EB7c 'git submodule update --init' n\u1EBFu \u0111\xE3 clone repo.`
     );
     process.exit(1);
-    return;
   }
   try {
     await git(packDir).fetch(["--tags", "origin"]);
@@ -4901,7 +5041,6 @@ async function syncAction(opts) {
   Pass --version <tag> r\xF5 r\xE0ng, ho\u1EB7c d\xF9ng --latest \u0111\u1EC3 pull HEAD branch ${DEFAULT_PACK_BRANCH2}.`
       );
       process.exit(1);
-      return;
     }
     targetVersion = picked;
   }
@@ -5008,33 +5147,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 basename2, join as join31 } from "path";
-var UNINSTALL_BACKUPS_DIR = join31(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 = basename2(projectRoot);
+  const projectName = basename4(projectRoot);
   const timestamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const backupDir = join31(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, join31(backupDir, ".claude"), { recursive: true });
+    await cp(artifacts.claudeDir, join33(backupDir, ".claude"), { recursive: true });
   }
   if (artifacts.claudeMd) {
-    await cp(artifacts.claudeMd, join31(backupDir, "CLAUDE.md"));
+    await cp(artifacts.claudeMd, join33(backupDir, "CLAUDE.md"));
   }
   if (artifacts.postMergeHook || artifacts.prePushHook) {
-    const hooksBackupDir = join31(backupDir, "hooks");
+    const hooksBackupDir = join33(backupDir, "hooks");
     await mkdir(hooksBackupDir, { recursive: true });
     if (artifacts.postMergeHook) {
-      await cp(artifacts.postMergeHook, join31(hooksBackupDir, "post-merge"));
+      await cp(artifacts.postMergeHook, join33(hooksBackupDir, "post-merge"));
     }
     if (artifacts.prePushHook) {
-      await cp(artifacts.prePushHook, join31(hooksBackupDir, "pre-push"));
+      await cp(artifacts.prePushHook, join33(hooksBackupDir, "pre-push"));
     }
   }
   const manifest = {
@@ -5049,27 +5188,27 @@ async function createUninstallBackupSnapshot(projectRoot, artifacts, avatarVersi
       prePushHook: !!artifacts.prePushHook
     }
   };
-  await writeFile(join31(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 join32 } from "path";
+import { join as join34 } from "path";
 function existsOrNull(path) {
   return existsSync9(path) ? path : null;
 }
 function detectAvatarProjectArtifacts(projectRoot) {
-  const claudeDir = existsOrNull(join32(projectRoot, ".claude"));
-  const claudeMd = existsOrNull(join32(projectRoot, "CLAUDE.md"));
-  const postMergeHook = existsOrNull(join32(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(
-    join32(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
+    join34(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
   );
-  const gitignorePath = existsOrNull(join32(projectRoot, ".gitignore"));
-  const gitmodulesPath = existsOrNull(join32(projectRoot, ".gitmodules"));
-  const notesDir = existsOrNull(join32(projectRoot, "notes"));
-  const scriptsDir = existsOrNull(join32(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,
@@ -5090,11 +5229,11 @@ async function executeUninstallDeletion(artifacts, flags) {
   if (artifacts.claudeDir) {
     if (flags.keepSubmodule) {
       const { readdir: readdir2 } = await import("fs/promises");
-      const { join: join33 } = 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(join33(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 });
@@ -5187,7 +5326,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
     });