@nalvietnam/avatar-cli 1.12.0 → 1.12.2

package/dist/index.js

@@ -223,21 +223,27 @@ function spinnerWithElapsed(prefix) {
 }
 
 // src/lib/check-claude-code-subscription-and-quota.ts
-var QUOTA_VERIFY_TIMEOUT_MS = 3e4;
+var QUOTA_VERIFY_TIMEOUT_MS = 6e4;
 var QUOTA_VERIFY_PROMPT = "ok";
-function checkClaudeCodeSubscriptionAuth() {
+function readClaudeCodeAuthInfo() {
   const result = spawnSync("claude", ["auth", "status"], { encoding: "utf8" });
-  if (result.error || result.status !== 0) return "not-authenticated";
+  if (result.error || result.status !== 0) return { state: "not-authenticated" };
   const stdout = (result.stdout || "").trim();
-  if (stdout.startsWith("{")) {
-    try {
-      const parsed = JSON.parse(stdout);
-      return parsed.loggedIn === true ? "authenticated" : "not-authenticated";
-    } catch {
-      return "authenticated";
-    }
+  if (!stdout.startsWith("{")) {
+    return { state: "authenticated" };
+  }
+  try {
+    const parsed = JSON.parse(stdout);
+    if (parsed.loggedIn !== true) return { state: "not-authenticated" };
+    return {
+      state: "authenticated",
+      email: parsed.email,
+      subscriptionType: parsed.subscriptionType,
+      apiProvider: parsed.apiProvider
+    };
+  } catch {
+    return { state: "authenticated" };
   }
-  return "authenticated";
 }
 function triggerClaudeCodeAuthLogin() {
   log.info("Kh\u1EDFi \u0111\u1ED9ng \u0111\u0103ng nh\u1EADp Claude Code (browser s\u1EBD m\u1EDF)...");
@@ -283,7 +289,7 @@ function getQuotaErrorHint(reason) {
     case "rate_limit":
       return "B\u1ECB rate limit t\u1EA1m th\u1EDDi. Ch\u1EDD v\xE0i ph\xFAt r\u1ED3i ch\u1EA1y `avatar ai setup`.";
     case "timeout":
-      return "Network ch\u1EADm ho\u1EB7c Anthropic API down. Check m\u1EA1ng r\u1ED3i ch\u1EA1y l\u1EA1i.";
+      return "Timeout 60s: (1) m\u1EA1ng VN ch\u1EADm \u2014 th\u1EED VPN, (2) Anthropic API spike \u2014 retry v\xE0i ph\xFAt, (3) token v\u1EABn auth nh\u01B0ng quota h\u1EBFt \xE2m th\u1EA7m \u2014 check t\u1EA1i claude.ai/settings/usage.";
     default:
       return "L\u1ED7i ch\u01B0a bi\u1EBFt. Xem stderr \u1EDF tr\xEAn + ch\u1EA1y `claude --print ok` tay \u0111\u1EC3 debug.";
   }
@@ -294,8 +300,13 @@ function verifyClaudeCodeQuota() {
     timeout: QUOTA_VERIFY_TIMEOUT_MS,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  if (result.signal === "SIGTERM") {
-    return { ok: false, reason: "timeout", detail: "claude --print > 30s" };
+  const isTimeout = result.signal === "SIGTERM" || result.status === 143 || result.error?.code === "ETIMEDOUT";
+  if (isTimeout) {
+    return {
+      ok: false,
+      reason: "timeout",
+      detail: `claude --print > ${QUOTA_VERIFY_TIMEOUT_MS / 1e3}s (m\u1EA1ng ch\u1EADm / API rate limit / token revoked kh\xF4ng return error)`
+    };
   }
   const stderr = result.stderr || "";
   const stdout = result.stdout || "";
@@ -802,15 +813,48 @@ async function runAiSetupPhase(args) {
     const choice = await promptAiProviderChoice(globalInfo);
     switch (choice) {
       case "subscription": {
-        if (checkClaudeCodeSubscriptionAuth() !== "authenticated") {
+        let authInfo = readClaudeCodeAuthInfo();
+        if (authInfo.state !== "authenticated") {
           triggerClaudeCodeAuthLogin();
+          authInfo = readClaudeCodeAuthInfo();
         }
+        if (authInfo.state === "authenticated" && authInfo.subscriptionType) {
+          await writeClaudeSettings(args.workspacePath, {
+            provider: "subscription",
+            model: SUBSCRIPTION_DEFAULT_MODEL
+          });
+          await appendAuditEntry(
+            "ai_setup",
+            `provider=subscription,result=ok,plan=${authInfo.subscriptionType},probe=skipped`
+          );
+          log.success(
+            `AI ready \xB7 Subscription (${authInfo.subscriptionType}) \xB7 model=${SUBSCRIPTION_DEFAULT_MODEL}`
+          );
+          return { ok: true, provider: "subscription", model: SUBSCRIPTION_DEFAULT_MODEL };
+        }
+        log.dim("Auth status kh\xF4ng tr\u1EA3 subscriptionType \u2014 verify quota (30-60s)...");
         let quota = verifyClaudeCodeQuota();
         if (!quota.ok && quota.reason === "auth-expired") {
           log.warn("Token Claude Code \u0111\xE3 h\u1EBFt h\u1EA1n. T\u1EF1 \u0111\u1ED9ng re-login...");
           triggerClaudeCodeAuthLogin();
           quota = verifyClaudeCodeQuota();
         }
+        if (!quota.ok && (quota.reason === "timeout" || quota.reason === "unknown")) {
+          log.warn(`Probe verify ${quota.reason} \u2014 accept trust auth status. Ti\u1EBFp t\u1EE5c.`);
+          if (quota.detail?.trim()) log.warn(`  Chi ti\u1EBFt: ${quota.detail.slice(0, 200)}`);
+          await writeClaudeSettings(args.workspacePath, {
+            provider: "subscription",
+            model: SUBSCRIPTION_DEFAULT_MODEL
+          });
+          await appendAuditEntry(
+            "ai_setup",
+            `provider=subscription,result=ok,probe=${quota.reason}-soft-pass`
+          );
+          log.success(
+            `AI ready \xB7 Subscription (probe ${quota.reason}, soft-pass) \xB7 model=${SUBSCRIPTION_DEFAULT_MODEL}`
+          );
+          return { ok: true, provider: "subscription", model: SUBSCRIPTION_DEFAULT_MODEL };
+        }
         if (!quota.ok) {
           const reason = quota.reason ?? "unknown";
           await appendAuditEntry(
@@ -818,9 +862,7 @@ async function runAiSetupPhase(args) {
             `provider=subscription,result=no-quota,reason=${reason}`
           );
           log.warn(`Subscription verify th\u1EA5t b\u1EA1i (${reason}).`);
-          if (quota.detail?.trim()) {
-            log.warn(`  Chi ti\u1EBFt: ${quota.detail.slice(0, 200)}`);
-          }
+          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" };
         }