@nalvietnam/avatar-cli 1.5.0 → 1.6.1

package/dist/index.js

@@ -473,27 +473,126 @@ async function promptAiProviderChoice(globalInfo = detectGlobalClaudeSettings())
     message: "Ch\u1ECDn provider cho AI features:",
     choices: [
       {
-        name: "1. Claude Code Subscription (d\xF9ng quota c\xE1 nh\xE2n Anthropic)",
+        name: "1. Claude Code Subscription (d\xF9ng quota c\xE1 nh\xE2n Anthropic, OAuth login)",
         value: "subscription"
       },
       {
-        name: "2. LLMLite API key (llm.nal.vn \u2014 NAL c\u1EA5p)",
+        name: "2. LLMLite API key (llm.nal.vn \u2014 NAL gateway, key sk-...)",
         value: "llmlite"
+      },
+      {
+        name: "3. Anthropic API key tr\u1EF1c ti\u1EBFp (console.anthropic.com, key sk-ant-...)",
+        value: "anthropic"
       }
     ]
   });
 }
 
+// src/lib/setup-anthropic-api-key-and-model.ts
+import { password, select as select2 } from "@inquirer/prompts";
+var ANTHROPIC_BASE_URL = "https://api.anthropic.com";
+var ANTHROPIC_API_VERSION = "2023-06-01";
+var FETCH_TIMEOUT_MS = 1e4;
+function maskAnthropicKey(key) {
+  if (key.length <= 12) return "sk-ant-***";
+  return `${key.slice(0, 7)}...${key.slice(-4)}`;
+}
+function validateAnthropicKeyFormat(key) {
+  const trimmed = key.trim();
+  if (trimmed.length === 0) return "API key b\u1EAFt bu\u1ED9c";
+  if (!trimmed.startsWith("sk-ant-")) {
+    return "Anthropic API key th\u01B0\u1EDDng b\u1EAFt \u0111\u1EA7u b\u1EB1ng 'sk-ant-' (l\u1EA5y t\u1EEB console.anthropic.com).";
+  }
+  return true;
+}
+async function promptAnthropicKeyHidden() {
+  return await password({
+    message: "Anthropic API key (sk-ant-..., \u1EA9n input):",
+    mask: "*",
+    validate: validateAnthropicKeyFormat
+  });
+}
+async function fetchAnthropicModels(apiKey) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+  try {
+    const res = await fetch(`${ANTHROPIC_BASE_URL}/v1/models`, {
+      method: "GET",
+      headers: {
+        "x-api-key": apiKey,
+        "anthropic-version": ANTHROPIC_API_VERSION,
+        Accept: "application/json"
+      },
+      signal: controller.signal
+    });
+    if (res.status === 401) {
+      throw new Error("API key invalid (HTTP 401). Check key tr\xEAn console.anthropic.com.");
+    }
+    if (res.status === 403) {
+      throw new Error(
+        "API key b\u1ECB reject (HTTP 403). Key c\xF3 th\u1EC3 \u0111\xE3 b\u1ECB revoke ho\u1EB7c thi\u1EBFu permission."
+      );
+    }
+    if (res.status === 429) {
+      throw new Error("Rate limit (HTTP 429). Ch\u1EDD v\xE0i gi\xE2y r\u1ED3i th\u1EED l\u1EA1i.");
+    }
+    if (!res.ok) {
+      throw new Error(`Fetch models th\u1EA5t b\u1EA1i (HTTP ${res.status}).`);
+    }
+    const json = await res.json();
+    const models = (json.data || []).map((m) => typeof m.id === "string" ? m.id : null).filter((id) => id !== null);
+    if (models.length === 0) {
+      throw new Error("Anthropic tr\u1EA3 v\u1EC1 list r\u1ED7ng. Li\xEAn h\u1EC7 support ho\u1EB7c check account.");
+    }
+    return models;
+  } catch (err) {
+    if (err.name === "AbortError") {
+      throw new Error(`Connect ${ANTHROPIC_BASE_URL} timeout sau ${FETCH_TIMEOUT_MS / 1e3}s.`);
+    }
+    throw err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function promptAnthropicModelChoice(models) {
+  if (models.length === 1) {
+    log.info(`Auto-pick model: ${models[0]} (ch\u1EC9 1 model available)`);
+    return models[0];
+  }
+  const sorted = [...models].sort((a, b) => {
+    const score = (m) => {
+      const lower = m.toLowerCase();
+      if (lower.includes("sonnet")) return 0;
+      if (lower.includes("opus")) return 1;
+      if (lower.includes("haiku")) return 2;
+      return 3;
+    };
+    return score(a) - score(b);
+  });
+  return await select2({
+    message: "Ch\u1ECDn model m\u1EB7c \u0111\u1ECBnh cho project:",
+    choices: sorted.map((m) => ({ name: m, value: m }))
+  });
+}
+async function setupAnthropicApiKeyAndModel() {
+  const apiKey = await promptAnthropicKeyHidden();
+  log.info(`Verify key (${maskAnthropicKey(apiKey)}) qua ${ANTHROPIC_BASE_URL}/v1/models...`);
+  const models = await fetchAnthropicModels(apiKey);
+  log.success(`Endpoint OK \u2014 ${models.length} models available`);
+  const model = await promptAnthropicModelChoice(models);
+  return { apiKey, baseUrl: ANTHROPIC_BASE_URL, model };
+}
+
 // src/lib/setup-llmlite-api-key-and-model.ts
-import { input, password, select as select2 } from "@inquirer/prompts";
+import { input, password as password2, select as select3 } from "@inquirer/prompts";
 var DEFAULT_BASE_URL = "https://llm.nal.vn";
-var FETCH_TIMEOUT_MS = 1e4;
+var FETCH_TIMEOUT_MS2 = 1e4;
 function maskApiKey(key) {
   if (key.length <= 8) return "sk-***";
   return `${key.slice(0, 3)}...${key.slice(-4)}`;
 }
 async function promptApiKeyHidden() {
-  return await password({
+  return await password2({
     message: "LLMLite API key (\u1EA9n input):",
     mask: "*",
     validate: (v) => v.trim().length > 0 ? true : "API key b\u1EAFt bu\u1ED9c"
@@ -509,7 +608,7 @@ async function promptBaseUrl(defaultUrl = DEFAULT_BASE_URL) {
 }
 async function fetchAvailableModels(baseUrl, apiKey) {
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS2);
   try {
     const res = await fetch(`${baseUrl}/v1/models`, {
       method: "GET",
@@ -536,7 +635,7 @@ async function fetchAvailableModels(baseUrl, apiKey) {
     return models;
   } catch (err) {
     if (err.name === "AbortError") {
-      throw new Error(`Connect ${baseUrl} timeout sau ${FETCH_TIMEOUT_MS / 1e3}s.`);
+      throw new Error(`Connect ${baseUrl} timeout sau ${FETCH_TIMEOUT_MS2 / 1e3}s.`);
     }
     throw err;
   } finally {
@@ -550,7 +649,7 @@ async function promptModelChoice(models) {
     return claudeAliases[0];
   }
   const choiceList = claudeAliases.length > 0 ? claudeAliases : models;
-  return await select2({
+  return await select3({
     message: "Ch\u1ECDn model m\u1EB7c \u0111\u1ECBnh cho project:",
     choices: choiceList.map((m) => ({ name: m, value: m }))
   });
@@ -586,7 +685,12 @@ function applySubscription(existing, model) {
   const { env: existingEnv, ...rest } = existing;
   const merged = { ...rest, model };
   if (existingEnv) {
-    const { ANTHROPIC_BASE_URL: _b, ANTHROPIC_AUTH_TOKEN: _t, ...envRest } = existingEnv;
+    const {
+      ANTHROPIC_BASE_URL: _b,
+      ANTHROPIC_AUTH_TOKEN: _t,
+      ANTHROPIC_API_KEY: _k,
+      ...envRest
+    } = existingEnv;
     if (Object.keys(envRest).length > 0) {
       merged.env = envRest;
     }
@@ -594,16 +698,29 @@ function applySubscription(existing, model) {
   return merged;
 }
 function applyLLMLite(existing, apiKey, baseUrl, model) {
+  const { ANTHROPIC_API_KEY: _k, ...envRest } = existing.env || {};
   return {
     ...existing,
     env: {
-      ...existing.env || {},
+      ...envRest,
       ANTHROPIC_BASE_URL: baseUrl,
       ANTHROPIC_AUTH_TOKEN: apiKey
     },
     model
   };
 }
+function applyAnthropic(existing, apiKey, baseUrl, model) {
+  const { ANTHROPIC_AUTH_TOKEN: _t, ...envRest } = existing.env || {};
+  return {
+    ...existing,
+    env: {
+      ...envRest,
+      ANTHROPIC_BASE_URL: baseUrl,
+      ANTHROPIC_API_KEY: apiKey
+    },
+    model
+  };
+}
 function applyUseGlobal(existing, source) {
   const sourceEnv = source.env || {};
   const sourceModel = typeof source.model === "string" ? source.model : void 0;
@@ -627,6 +744,9 @@ async function writeClaudeSettings(workspacePath, input6) {
     case "llmlite":
       merged = applyLLMLite(existing, input6.apiKey, input6.baseUrl, input6.model);
       break;
+    case "anthropic":
+      merged = applyAnthropic(existing, input6.apiKey, input6.baseUrl, input6.model);
+      break;
     case "use-global":
       merged = applyUseGlobal(existing, input6.sourceSettings);
       break;
@@ -701,6 +821,23 @@ async function runAiSetupPhase(args) {
         log.success(`AI ready \xB7 LLMLite \xB7 model=${llmConfig.model} \xB7 ${llmConfig.baseUrl}`);
         return { ok: true, provider: "llmlite", model: llmConfig.model };
       }
+      case "anthropic": {
+        const anthropicConfig = await setupAnthropicApiKeyAndModel();
+        await writeClaudeSettings(args.workspacePath, {
+          provider: "anthropic",
+          apiKey: anthropicConfig.apiKey,
+          baseUrl: anthropicConfig.baseUrl,
+          model: anthropicConfig.model
+        });
+        await appendAuditEntry(
+          "ai_setup",
+          `provider=anthropic,result=ok,model=${anthropicConfig.model}`
+        );
+        log.success(
+          `AI ready \xB7 Anthropic Direct \xB7 model=${anthropicConfig.model} \xB7 ${anthropicConfig.baseUrl}`
+        );
+        return { ok: true, provider: "anthropic", model: anthropicConfig.model };
+      }
       case "use-global": {
         if (!globalInfo.rawSettings) {
           throw new Error("use-global ch\u1ECDn nh\u01B0ng kh\xF4ng \u0111\u1ECDc \u0111\u01B0\u1EE3c global settings.");
@@ -725,14 +862,15 @@ async function runAiSetupPhase(args) {
 
 // src/lib/test-ai-provider-by-detected-mode.ts
 import { spawnSync as spawnSync4 } from "child_process";
-var FETCH_TIMEOUT_MS2 = 1e4;
+var FETCH_TIMEOUT_MS3 = 1e4;
 var CLAUDE_PRINT_TIMEOUT_MS = 3e4;
 var TEST_CHAT_MAX_TOKENS = 5;
 var TEST_CHAT_PROMPT = "say ok";
+var ANTHROPIC_API_VERSION2 = "2023-06-01";
 async function testLLMLiteProvider(baseUrl, token, model) {
   log.info(`Testing LLMLite provider: ${baseUrl} (key: ${maskApiKey(token)})`);
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS2);
+  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS3);
   try {
     const modelsRes = await fetch(`${baseUrl}/v1/models`, {
       headers: { Authorization: `Bearer ${token}` },
@@ -777,7 +915,7 @@ async function testLLMLiteProvider(baseUrl, token, model) {
     log.dim(`  Tokens used: ${tokens}`);
   } catch (err) {
     if (err.name === "AbortError") {
-      throw new Error(`Timeout ${FETCH_TIMEOUT_MS2 / 1e3}s. Check m\u1EA1ng / endpoint ${baseUrl}.`);
+      throw new Error(`Timeout ${FETCH_TIMEOUT_MS3 / 1e3}s. Check m\u1EA1ng / endpoint ${baseUrl}.`);
     }
     throw err;
   } finally {
@@ -806,11 +944,63 @@ function testSubscriptionProvider() {
   }
   log.success(`Response: "${(result.stdout || "").trim().slice(0, 100)}"`);
 }
+async function testAnthropicProvider(baseUrl, apiKey, model) {
+  log.info(`Testing Anthropic Direct provider: ${baseUrl} (key: ${maskApiKey(apiKey)})`);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS3);
+  try {
+    const modelsRes = await fetch(`${baseUrl}/v1/models`, {
+      headers: {
+        "x-api-key": apiKey,
+        "anthropic-version": ANTHROPIC_API_VERSION2
+      },
+      signal: controller.signal
+    });
+    if (modelsRes.status === 401 || modelsRes.status === 403) {
+      throw new Error(`API key invalid (HTTP ${modelsRes.status}). Re-run: avatar ai setup`);
+    }
+    if (!modelsRes.ok) {
+      throw new Error(`Endpoint /v1/models l\u1ED7i (HTTP ${modelsRes.status}).`);
+    }
+    const modelsJson = await modelsRes.json();
+    const models = (modelsJson.data || []).map((m) => typeof m.id === "string" ? m.id : null).filter((id) => id !== null);
+    log.success(`Connectivity OK \xB7 ${models.length} models available`);
+    log.info(`Testing message v\u1EDBi model "${model}"...`);
+    const msgRes = await fetch(`${baseUrl}/v1/messages`, {
+      method: "POST",
+      headers: {
+        "x-api-key": apiKey,
+        "anthropic-version": ANTHROPIC_API_VERSION2,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        model,
+        max_tokens: TEST_CHAT_MAX_TOKENS,
+        messages: [{ role: "user", content: TEST_CHAT_PROMPT }]
+      }),
+      signal: controller.signal
+    });
+    if (!msgRes.ok) {
+      const errText = (await msgRes.text()).slice(0, 200);
+      throw new Error(`Message endpoint fail (HTTP ${msgRes.status}): ${errText}`);
+    }
+    const msgJson = await msgRes.json();
+    const text = (msgJson.content || []).map((c) => typeof c.text === "string" ? c.text : "").join("").trim().slice(0, 100);
+    log.success(`Response: "${text}"`);
+  } finally {
+    clearTimeout(timer);
+  }
+}
 async function testAiProviderByDetectedMode(settings) {
   const env = settings.env || {};
   const baseUrl = typeof env.ANTHROPIC_BASE_URL === "string" ? env.ANTHROPIC_BASE_URL : void 0;
   const token = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : void 0;
+  const apiKey = typeof env.ANTHROPIC_API_KEY === "string" ? env.ANTHROPIC_API_KEY : void 0;
   const model = typeof settings.model === "string" ? settings.model : "default";
+  if (apiKey && baseUrl) {
+    await testAnthropicProvider(baseUrl, apiKey, model);
+    return { ok: true, provider: "anthropic", message: "Anthropic Direct provider working" };
+  }
   if (baseUrl && token) {
     await testLLMLiteProvider(baseUrl, token, model);
     return { ok: true, provider: "llmlite", message: "LLMLite provider working" };
@@ -856,12 +1046,27 @@ async function runAiStatus() {
   const env = settings.env || {};
   const baseUrl = typeof env.ANTHROPIC_BASE_URL === "string" ? env.ANTHROPIC_BASE_URL : void 0;
   const token = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : void 0;
+  const apiKey = typeof env.ANTHROPIC_API_KEY === "string" ? env.ANTHROPIC_API_KEY : void 0;
   const model = typeof settings.model === "string" ? settings.model : void 0;
-  const provider = baseUrl ? "LLMLite" : token ? "Custom" : "Subscription (default)";
+  let provider;
+  let credentialDisplay;
+  if (apiKey) {
+    provider = baseUrl?.includes("api.anthropic.com") || apiKey.startsWith("sk-ant-") ? "Anthropic Direct" : "Custom (API key)";
+    credentialDisplay = maskApiKey(apiKey);
+  } else if (baseUrl && token) {
+    provider = "LLMLite";
+    credentialDisplay = maskApiKey(token);
+  } else if (token) {
+    provider = "Custom";
+    credentialDisplay = maskApiKey(token);
+  } else {
+    provider = "Subscription (default)";
+    credentialDisplay = "(kh\xF4ng set \u2014 d\xF9ng subscription auth)";
+  }
   log.info(`Project:  ${workspacePath}`);
   log.info(`Provider: ${provider}${baseUrl ? ` (${baseUrl})` : ""}`);
   log.info(`Model:    ${model ?? "(default \u2014 Claude Code ch\u1ECDn)"}`);
-  log.info(`Token:    ${token ? maskApiKey(token) : "(kh\xF4ng set \u2014 d\xF9ng subscription auth)"}`);
+  log.info(`Token:    ${credentialDisplay}`);
 }
 async function runAiTest() {
   const workspacePath = await ensureWorkspaceCwd();
@@ -891,7 +1096,12 @@ async function runAiReset(opts) {
   const { env: existingEnv, ...rest } = settings;
   const reset = { ...rest };
   if (existingEnv) {
-    const { ANTHROPIC_BASE_URL: _b, ANTHROPIC_AUTH_TOKEN: _t, ...envRest } = existingEnv;
+    const {
+      ANTHROPIC_BASE_URL: _b,
+      ANTHROPIC_AUTH_TOKEN: _t,
+      ANTHROPIC_API_KEY: _k,
+      ...envRest
+    } = existingEnv;
     if (Object.keys(envRest).length > 0) {
       reset.env = envRest;
     }
@@ -1549,7 +1759,7 @@ function installGitnexusViaNpm() {
 }
 
 // src/lib/prompt-recovery-action-on-failure.ts
-import { input as input3, select as select3 } from "@inquirer/prompts";
+import { input as input3, select as select4 } from "@inquirer/prompts";
 var UserAbortedRecoveryError = class extends Error {
   constructor(message) {
     super(message);
@@ -1566,7 +1776,7 @@ async function promptRetryOrSkip(args) {
     choices.push({ name: "B\u1ECF qua b\u01B0\u1EDBc n\xE0y v\xE0 ti\u1EBFp t\u1EE5c (Skip)", value: "skip" });
   }
   choices.push({ name: "T\u1EA1m ng\u01B0ng init \u2014 ch\u1EA1y l\u1EA1i sau (Abort)", value: "abort" });
-  return await select3({
+  return await select4({
     message: "C\xE1ch x\u1EED l\xFD?",
     choices
   });
@@ -1642,17 +1852,41 @@ import { join as join14 } from "path";
 import { confirm as confirm2 } from "@inquirer/prompts";
 var WIKI_TIMEOUT_MS = 15 * 60 * 1e3;
 var DEFAULT_LLMLITE_MODEL = "nal-claude";
+var DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-4-5";
+function normalizeAnthropicBaseUrl(rawBaseUrl) {
+  const cleaned = rawBaseUrl.replace(/\/+$/, "");
+  if (cleaned.endsWith("/v1")) return `${cleaned}/`;
+  if (cleaned.endsWith("/v1/")) return cleaned;
+  return `${cleaned}/v1/`;
+}
 async function readSettingsForWikiCredentials(workspacePath) {
   const settingsPath = join14(workspacePath, ".claude", "settings.json");
   if (!await pathExists(settingsPath)) return null;
   try {
     const settings = await readJson(settingsPath);
     const env = settings.env || {};
-    const apiKey = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : null;
     const baseUrl = typeof env.ANTHROPIC_BASE_URL === "string" ? env.ANTHROPIC_BASE_URL : null;
-    if (!apiKey || !baseUrl) return null;
-    const model = typeof env.ANTHROPIC_MODEL === "string" && env.ANTHROPIC_MODEL.length > 0 ? env.ANTHROPIC_MODEL : DEFAULT_LLMLITE_MODEL;
-    return { apiKey, baseUrl, model };
+    if (!baseUrl) return null;
+    const userModel = typeof env.ANTHROPIC_MODEL === "string" ? env.ANTHROPIC_MODEL : "";
+    const anthropicKey = typeof env.ANTHROPIC_API_KEY === "string" ? env.ANTHROPIC_API_KEY : null;
+    if (anthropicKey) {
+      return {
+        provider: "anthropic",
+        apiKey: anthropicKey,
+        baseUrl: normalizeAnthropicBaseUrl(baseUrl),
+        model: userModel.length > 0 ? userModel : DEFAULT_ANTHROPIC_MODEL
+      };
+    }
+    const llmliteToken = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : null;
+    if (llmliteToken) {
+      return {
+        provider: "llmlite",
+        apiKey: llmliteToken,
+        baseUrl,
+        model: userModel.length > 0 ? userModel : DEFAULT_LLMLITE_MODEL
+      };
+    }
+    return null;
   } catch {
     return null;
   }
@@ -1670,8 +1904,10 @@ function tailLines2(text, n) {
 async function runGitnexusWikiConditional(workspacePath) {
   const creds = await readSettingsForWikiCredentials(workspacePath);
   if (!creds) {
-    log.warn("Subscription mode (ho\u1EB7c settings.json kh\xF4ng c\xF3 LLMLite key) \u2192 skip wiki gen.");
-    log.dim("\u0110\u1EC3 gen wiki sau, ch\u1EA1y manual: gitnexus wiki . --api-key <openai-key>");
+    log.warn("Subscription mode (OAuth, kh\xF4ng c\xF3 API key trong settings.json) \u2192 skip wiki gen.");
+    log.dim(
+      "\u0110\u1EC3 gen wiki sau, ch\u1EA1y manual:\n  gitnexus wiki . --api-key <key> --base-url <url> --model <model>"
+    );
     return { ran: false, skipped: true, reason: "subscription-mode" };
   }
   const proceed = await confirmWikiGeneration(creds.baseUrl, creds.model);
@@ -1681,7 +1917,9 @@ async function runGitnexusWikiConditional(workspacePath) {
     );
     return { ran: false, skipped: true, reason: "user-declined" };
   }
-  const sp = spinnerWithElapsed(`Generating wiki via ${creds.baseUrl} model=${creds.model}`);
+  const sp = spinnerWithElapsed(
+    `Generating wiki via ${creds.baseUrl} (${creds.provider}) model=${creds.model}`
+  );
   const result = spawnSync10(
     "gitnexus",
     ["wiki", ".", "--api-key", creds.apiKey, "--base-url", creds.baseUrl, "--model", creds.model],
@@ -1960,19 +2198,19 @@ function registerGitnexusCommand(program2) {
 
 // src/commands/init.ts
 import { basename, join as join22, relative as relative2, resolve } from "path";
-import { confirm as confirm5, input as input5, select as select8 } from "@inquirer/prompts";
+import { confirm as confirm5, input as input5, select as select9 } from "@inquirer/prompts";
 import boxen5 from "boxen";
 
 // src/lib/add-team-pack-submodule-with-retry-on-network-fail.ts
 import { spawnSync as spawnSync13 } from "child_process";
-import { select as select5 } from "@inquirer/prompts";
+import { select as select6 } from "@inquirer/prompts";
 
 // 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";
-import { confirm as confirm4, select as select4 } from "@inquirer/prompts";
+import { confirm as confirm4, select as select5 } from "@inquirer/prompts";
 import boxen3 from "boxen";
 function parseRepoSlugFromGitUrl(url) {
   const httpsMatch = url.match(/github\.com[/:]([^/]+\/[^/]+?)(?:\.git)?$/);
@@ -2051,7 +2289,7 @@ async function ensureTeamPackAccessWithRetry(args) {
   while (true) {
     const ghUser = getCurrentGhUser();
     const ghUserDisplay = ghUser ?? "(ch\u01B0a gh auth)";
-    const action = await select4({
+    const action = await select5({
       message: "C\xE1ch x\u1EED l\xFD?",
       choices: [
         {
@@ -2168,7 +2406,7 @@ function openGithubSshKeysPage() {
   }
 }
 async function handleSshPermissionError() {
-  return await select5({
+  return await select6({
     message: "SSH permission denied. C\xE1ch x\u1EED l\xFD?",
     choices: [
       {
@@ -2431,7 +2669,7 @@ function detectPackageManager() {
 
 // src/lib/handle-remote-access-failure-with-account-switch.ts
 import { spawnSync as spawnSync19 } from "child_process";
-import { input as input4, select as select6 } from "@inquirer/prompts";
+import { input as input4, select as select7 } from "@inquirer/prompts";
 
 // src/lib/verify-git-remote-accessible.ts
 import { spawnSync as spawnSync18 } from "child_process";
@@ -2515,7 +2753,7 @@ async function handleRemoteAccessFailureWithAccountSwitch(args) {
     log.dim(`  L\xFD do: ${reason}${detail ? ` \u2014 ${detail.slice(0, 150)}` : ""}`);
     log.info(getReasonHint(reason, currentUrl, ghUser));
     if (ghUser) log.dim(`  gh CLI hi\u1EC7n \u0111ang login: ${ghUser}`);
-    const action = await select6({
+    const action = await select7({
       message: "C\xE1ch x\u1EED l\xFD?",
       choices: [
         {
@@ -2824,7 +3062,7 @@ function linkExistingRemoteToWorkspace(args) {
 
 // src/lib/safe-bootstrap-for-dirty-folder.ts
 import { readdirSync } from "fs";
-import { select as select7 } from "@inquirer/prompts";
+import { select as select8 } from "@inquirer/prompts";
 import { simpleGit as simpleGit3 } from "simple-git";
 
 // src/lib/check-folder-has-git.ts
@@ -2961,7 +3199,7 @@ async function promptBootstrapStrategy(state, opts) {
   if (opts.presetStrategy) return opts.presetStrategy;
   if (opts.autoYes) return "stash";
   if (state === "empty" || state === "clean") return "commit-all";
-  return await select7({
+  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: [
       {
@@ -3446,7 +3684,7 @@ async function runInit(opts) {
   }
 }
 async function promptProjectStatus() {
-  return await select8({
+  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" },
@@ -3529,7 +3767,7 @@ async function runInitFromScratch(opts, ownerEmail) {
     message: "T\xEAn d\u1EF1 \xE1n:",
     validate: (v) => v.length > 0 ? true : "T\xEAn b\u1EAFt bu\u1ED9c"
   });
-  const visibility = opts.repoVisibility ?? await select8({
+  const visibility = opts.repoVisibility ?? await select9({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -3604,7 +3842,7 @@ async function getOrCreateOriginRemote(folderPath, opts) {
     return void 0;
   }
   await ensureGitHubReady();
-  const visibility = opts.repoVisibility ?? await select8({
+  const visibility = opts.repoVisibility ?? await select9({
     message: "Visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh)", value: "private" },
@@ -3730,7 +3968,7 @@ async function maybeCreateWorkspaceRemote(args) {
     });
   }
   if (!shouldCreate) return;
-  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select8({
+  const visibility = args.repoVisibility ?? (args.autoYes ? "private" : await select9({
     message: "Workspace visibility?",
     choices: [
       { name: "private (m\u1EB7c \u0111\u1ECBnh, an to\xE0n)", value: "private" },
@@ -3749,7 +3987,7 @@ async function maybeCreateWorkspaceRemote(args) {
     } catch (err) {
       if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
         const fullName = err.fullName;
-        const reuseAction = await select8({
+        const reuseAction = await select9({
           message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
           choices: [
             {
@@ -3818,7 +4056,7 @@ async function resolveWorkspacePath(parent, desiredName, force) {
     }
     choices.push({ name: "Nh\u1EADp t\xEAn workspace kh\xE1c (manual)", value: "manual" });
     choices.push({ name: "T\u1EA1m ng\u01B0ng init", value: "abort" });
-    const action = await select8({
+    const action = await select9({
       message: "C\xE1ch x\u1EED l\xFD workspace path conflict?",
       choices
     });
@@ -4536,7 +4774,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.5.0";
+var CLI_VERSION = "1.6.1";
 function registerUninstallCommand(program2) {
   program2.command("uninstall").description("G\u1EE1 Avatar kh\u1ECFi project \u2014 backup t\u1EF1 \u0111\u1ED9ng (M11)").option("--yes", "Skip confirm prompt").option("--no-backup", "Kh\xF4ng t\u1EA1o backup tr\u01B0\u1EDBc khi x\xF3a (nguy hi\u1EC3m)").option("--keep-submodule", "Gi\u1EEF submodule .claude/pack/").option("--keep-hooks", "Gi\u1EEF git hooks post-merge, pre-push").option("--dry-run", "Hi\u1EC3n th\u1ECB danh s\xE1ch s\u1EBD x\xF3a, kh\xF4ng th\u1EF1c thi").action(async (opts) => {
     try {
@@ -4618,7 +4856,7 @@ function printUninstallSuccessBox(backupPath) {
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.5.0";
+var CLI_VERSION2 = "1.6.1";
 var program = new Command();
 program.name("avatar").description("AI harness CLI for NAL Vietnam engineering").version(CLI_VERSION2, "-v, --version", "Hi\u1EC3n th\u1ECB phi\xEAn b\u1EA3n Avatar CLI").addHelpText(
   "beforeAll",