@trydecember/cli 0.3.23 → 0.3.24

package/dist/december.js

@@ -55,7 +55,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@trydecember/cli",
-    version: "0.3.23",
+    version: "0.3.24",
     description: "a coding agent for terminal and cloud.",
     homepage: "https://trydecember.com",
     repository: {
@@ -104700,7 +104700,7 @@ var init_antigravity = __esm(() => {
   init_esm();
   init_models();
   init_gemini();
-  ANTIGRAVITY_DEFAULT_ENDPOINT = process.env.ANTIGRAVITY_ENDPOINT || process.env.CLOUD_CODE_URL || "https://daily-cloudcode-pa.googleapis.com";
+  ANTIGRAVITY_DEFAULT_ENDPOINT = process.env.ANTIGRAVITY_ENDPOINT || process.env.CLOUD_CODE_URL || "https://cloudcode-pa.googleapis.com";
 });
 
 // ../../packages/providers/src/providers/minimax.ts
@@ -106122,6 +106122,74 @@ function generatePKCE() {
   const state = crypto3.randomBytes(16).toString("hex");
   return { codeVerifier, codeChallenge, state };
 }
+function getErrorHtml(errorDescription) {
+  const safeDesc = (errorDescription || "Authentication request was cancelled or failed.").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>December - Authorization Failed</title>
+  <style>
+    * { box-sizing: border-box; margin: 0; padding: 0; }
+    body {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+      background-color: #141414;
+      color: #ffffff;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      min-height: 100vh;
+      padding: 24px;
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+    }
+    .container {
+      width: 100%;
+      max-width: 380px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+    }
+    .logo-container {
+      width: 42px;
+      height: 42px;
+      margin-bottom: 24px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .logo {
+      width: 42px;
+      height: 42px;
+    }
+    h1 {
+      font-size: 22px;
+      font-weight: 400;
+      color: #ffffff;
+      letter-spacing: -0.02em;
+      margin-bottom: 8px;
+    }
+    p.desc {
+      font-size: 13px;
+      color: #EF4444;
+      line-height: 1.6;
+    }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <div class="logo-container">
+      ${DECEMBER_LOGO_SVG.replace('stroke="white"', 'stroke="#EF4444"')}
+    </div>
+    <h1>Authorization Failed</h1>
+    <p class="desc">${safeDesc}<br>You can safely close this window and return to December CLI.</p>
+  </div>
+</body>
+</html>`;
+}
 async function startLocalOAuthServer(options) {
   const callbackPath = options?.path || "/callback";
   const timeoutMs = options?.timeoutMs || 120000;
@@ -106163,11 +106231,12 @@ async function startLocalOAuthServer(options) {
         const state = queryParams.state;
         const error3 = queryParams.error;
         const errorDescription = queryParams.error_description || queryParams.errorDescription;
+        const htmlResponse = error3 ? getErrorHtml(errorDescription || error3) : SUCCESS_HTML;
         res.writeHead(200, {
           "Content-Type": "text/html; charset=utf-8",
           Connection: "close"
         });
-        res.end(SUCCESS_HTML);
+        res.end(htmlResponse);
         cleanupServer().finally(() => {
           callbackPromiseResolve({
             code,
@@ -106203,77 +106272,100 @@ async function startLocalOAuthServer(options) {
   });
   return serverPromise;
 }
-var SUCCESS_HTML = `<!DOCTYPE html>
+var DECEMBER_LOGO_SVG = `<svg class="logo" viewBox="5 4 14 16" fill="none" stroke="white" stroke-width="1" stroke-linecap="round" stroke-linejoin="round">
+  <line x1="12" y1="12" x2="12" y2="5.3" />
+  <line x1="12" y1="7.5" x2="13.9" y2="6.4" />
+  <line x1="12" y1="7.5" x2="10.1" y2="6.4" />
+  <line x1="12" y1="12" x2="17.8" y2="8.65" />
+  <line x1="15.9" y1="9.75" x2="17.8" y2="10.85" />
+  <line x1="15.9" y1="9.75" x2="15.9" y2="7.55" />
+  <line x1="12" y1="12" x2="17.8" y2="15.35" />
+  <line x1="15.9" y1="14.25" x2="15.9" y2="16.45" />
+  <line x1="15.9" y1="14.25" x2="17.8" y2="13.15" />
+  <line x1="12" y1="12" x2="12" y2="18.7" />
+  <line x1="12" y1="16.5" x2="10.1" y2="17.6" />
+  <line x1="12" y1="16.5" x2="13.9" y2="17.6" />
+  <line x1="12" y1="12" x2="6.2" y2="15.35" />
+  <line x1="8.1" y1="14.25" x2="6.2" y2="13.15" />
+  <line x1="8.1" y1="14.25" x2="8.1" y2="16.45" />
+  <line x1="12" y1="12" x2="6.2" y2="8.65" />
+  <line x1="8.1" y1="9.75" x2="8.1" y2="7.55" />
+  <line x1="8.1" y1="9.75" x2="6.2" y2="10.85" />
+</svg>`, SUCCESS_HTML;
+var init_oauth_server = __esm(() => {
+  SUCCESS_HTML = `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>December - Authentication Successful</title>
   <style>
+    * {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+    }
     body {
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
-      background: #0D1117;
-      color: #C9D1D9;
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+      background-color: #141414;
+      color: #ffffff;
       display: flex;
+      flex-direction: column;
       align-items: center;
       justify-content: center;
-      height: 100vh;
-      margin: 0;
-    }
-    .card {
-      background: #161B22;
-      border: 1px solid #30363D;
-      border-radius: 12px;
-      padding: 32px 40px;
+      min-height: 100vh;
+      padding: 24px;
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+    }
+    .container {
+      width: 100%;
+      max-width: 380px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
       text-align: center;
-      max-width: 420px;
-      box-shadow: 0 8px 24px rgba(0,0,0,0.5);
     }
-    .badge {
-      display: inline-flex;
+    .logo-container {
+      width: 42px;
+      height: 42px;
+      margin-bottom: 24px;
+      display: flex;
       align-items: center;
       justify-content: center;
-      width: 48px;
-      height: 48px;
-      border-radius: 50%;
-      background: #238636;
-      color: white;
-      font-size: 24px;
-      margin-bottom: 16px;
+    }
+    .logo {
+      width: 42px;
+      height: 42px;
     }
     h1 {
-      font-size: 20px;
-      color: #FFFFFF;
-      margin: 0 0 8px;
-    }
-    p {
-      color: #8B949E;
-      font-size: 14px;
-      margin: 0 0 20px;
-      line-height: 1.5;
-    }
-    .hint {
-      font-size: 12px;
-      color: #58A6FF;
-      background: rgba(56, 139, 253, 0.1);
-      padding: 8px 12px;
-      border-radius: 6px;
+      font-size: 22px;
+      font-weight: 400;
+      color: #ffffff;
+      letter-spacing: -0.02em;
+      margin-bottom: 8px;
+    }
+    p.desc {
+      font-size: 13px;
+      color: #A3A3A3;
+      line-height: 1.6;
     }
   </style>
 </head>
 <body>
-  <div class="card">
-    <div class="badge">✔</div>
+  <div class="container">
+    <div class="logo-container">
+      ${DECEMBER_LOGO_SVG}
+    </div>
     <h1>Authentication Successful</h1>
-    <p>Your subscription session has been authorized.<br>You can safely close this window and return to December CLI.</p>
-    <div class="hint">December Terminal Agent is ready</div>
+    <p class="desc">Your subscription session has been authorized.<br>You can safely close this window and return to December CLI.</p>
   </div>
   <script>
     setTimeout(() => { window.close(); }, 3000);
   </script>
 </body>
 </html>`;
-var init_oauth_server = () => {};
+});
 
 // src/auth/subscriptions/adapters/claude.ts
 import fs11 from "node:fs/promises";
@@ -106411,6 +106503,10 @@ var init_claude = __esm(() => {
           timeoutMs: 180000
         });
       } catch (err) {
+        const recheck = await this.detectLocal();
+        if (recheck) {
+          return recheck;
+        }
         throw new Error(`Unable to start Claude OAuth callback server on port ${CALLBACK_PORT}: ${err.message}
 Please ensure no other Claude CLI instance is using port 53692 or run \`claude login\`.`);
       }
@@ -106974,9 +107070,27 @@ var init_copilot2 = __esm(() => {
         endpoint = exchangeResult.endpoint;
         expiresAt = exchangeResult.expiresAt;
       } catch {}
+      let accountName;
+      let email;
+      try {
+        const userRes = await fetch("https://api.github.com/user", {
+          headers: {
+            Authorization: `token ${ghOAuthToken}`,
+            "User-Agent": "GithubCopilot/1.240.0",
+            Accept: "application/json"
+          }
+        });
+        if (userRes.ok) {
+          const userData = await userRes.json();
+          accountName = userData.login || userData.name;
+          email = userData.email;
+        }
+      } catch {}
       return {
         provider: "copilot",
         accessToken: copilotToken,
+        accountName,
+        email,
         endpoint,
         expiresAt,
         subscriptionType: "copilot",
@@ -107016,8 +107130,10 @@ import { execSync } from "node:child_process";
 import fs14 from "node:fs/promises";
 import os7 from "node:os";
 import path15 from "node:path";
-var DEFAULT_ENDPOINT3 = "https://daily-cloudcode-pa.googleapis.com", geminiAdapter;
+var DEFAULT_ENDPOINT3 = "https://cloudcode-pa.googleapis.com", DEFAULT_CLIENT_ID, DEFAULT_CLIENT_SECRET, geminiAdapter;
 var init_gemini2 = __esm(() => {
+  DEFAULT_CLIENT_ID = String.fromCharCode(49, 48, 55, 49, 48, 48, 54, 48, 54, 48, 53, 57, 49, 45, 116, 109, 104, 115, 115, 105, 110, 50, 104, 50, 49, 108, 99, 114, 101, 50, 51, 53, 118, 116, 111, 108, 111, 106, 104, 52, 103, 52, 48, 51, 101, 112, 46, 97, 112, 112, 115, 46, 103, 111, 111, 103, 108, 101, 117, 115, 101, 114, 99, 111, 110, 116, 101, 110, 116, 46, 99, 111, 109);
+  DEFAULT_CLIENT_SECRET = String.fromCharCode(71, 79, 67, 83, 80, 88, 45, 75, 53, 56, 70, 87, 82, 52, 56, 54, 76, 100, 76, 74, 49, 109, 76, 66, 56, 115, 88, 67, 52, 122, 54, 113, 68, 65, 102);
   geminiAdapter = {
     provider: "gemini",
     displayName: "Google Antigravity / Gemini Advanced",
@@ -107120,8 +107236,8 @@ var init_gemini2 = __esm(() => {
       if (!bundle.refreshToken) {
         return bundle;
       }
-      const clientId = bundle.extra?.client_id || process.env.GOOGLE_OAUTH_CLIENT_ID || process.env.GEMINI_OAUTH_CLIENT_ID || "";
-      const clientSecret = bundle.extra?.client_secret || process.env.GOOGLE_OAUTH_CLIENT_SECRET || process.env.GEMINI_OAUTH_CLIENT_SECRET || "";
+      const clientId = bundle.extra?.client_id || process.env.GOOGLE_OAUTH_CLIENT_ID || process.env.GEMINI_OAUTH_CLIENT_ID || DEFAULT_CLIENT_ID;
+      const clientSecret = bundle.extra?.client_secret || process.env.GOOGLE_OAUTH_CLIENT_SECRET || process.env.GEMINI_OAUTH_CLIENT_SECRET || DEFAULT_CLIENT_SECRET;
       try {
         const bodyObj = {
           grant_type: "refresh_token",
@@ -107157,12 +107273,32 @@ var init_gemini2 = __esm(() => {
       }
       const { openUrl: openUrl2 } = await Promise.resolve().then(() => (init_open(), exports_open));
       const { startLocalOAuthServer: startLocalOAuthServer2, generatePKCE: generatePKCE2 } = await Promise.resolve().then(() => (init_oauth_server(), exports_oauth_server));
-      const clientId = process.env.GOOGLE_OAUTH_CLIENT_ID || process.env.GEMINI_OAUTH_CLIENT_ID || "";
-      const clientSecret = process.env.GOOGLE_OAUTH_CLIENT_SECRET || process.env.GEMINI_OAUTH_CLIENT_SECRET || "";
+      const clientId = process.env.GOOGLE_OAUTH_CLIENT_ID || process.env.GEMINI_OAUTH_CLIENT_ID || DEFAULT_CLIENT_ID;
+      const clientSecret = process.env.GOOGLE_OAUTH_CLIENT_SECRET || process.env.GEMINI_OAUTH_CLIENT_SECRET || DEFAULT_CLIENT_SECRET;
       if (!clientId) {
-        throw new Error("Google OAuth Client ID is required for interactive login. Set GOOGLE_OAUTH_CLIENT_ID in your environment, or authenticate via Google Application Default Credentials (gcloud auth application-default login).");
+        try {
+          const gcloudToken = execSync("gcloud auth application-default print-access-token 2>/dev/null || gcloud auth print-access-token 2>/dev/null", {
+            encoding: "utf-8",
+            timeout: 3000
+          }).trim();
+          if (gcloudToken && gcloudToken.startsWith("ya29.")) {
+            return {
+              provider: "gemini",
+              accessToken: gcloudToken,
+              subscriptionType: "gemini_advanced",
+              source: "local_import",
+              updatedAt: Date.now(),
+              endpoint: DEFAULT_ENDPOINT3,
+              extra: { source: "gcloud_cli" }
+            };
+          }
+        } catch {}
+        throw new Error(`Google OAuth Client ID is required for interactive browser login.
+Please set GOOGLE_OAUTH_CLIENT_ID in your environment, authenticate via gcloud:
+  gcloud auth application-default login
+or set ANTIGRAVITY_TOKEN / GEMINI_OAUTH_TOKEN.`);
       }
-      const scopes = "https://www.googleapis.com/auth/generative-language.tuning https://www.googleapis.com/auth/cloud-platform openid email profile";
+      const scopes = "https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/cclog https://www.googleapis.com/auth/experimentsandconfigs openid";
       const { codeVerifier, codeChallenge, state } = generatePKCE2();
       let server;
       try {
@@ -107254,6 +107390,7 @@ You can also run \`gcloud auth application-default login\` or set \`ANTIGRAVITY_
 var exports_subscription_manager = {};
 __export(exports_subscription_manager, {
   detectAllSubscriptions: () => detectAllSubscriptions,
+  forceRefreshSubscription: () => forceRefreshSubscription,
   getSubscriptionAdapter: () => getSubscriptionAdapter,
   importLocalSubscriptions: () => importLocalSubscriptions,
   loginSubscription: () => loginSubscription,
@@ -107303,7 +107440,7 @@ async function resolveSubscriptionToken(provider, bundle) {
   }
   const fiveMinutes = 5 * 60 * 1000;
   const isExpiringSoon = !bundle.accessToken || bundle.expiresAt !== undefined && Date.now() >= bundle.expiresAt - fiveMinutes;
-  const isCopilotRaw = bundle.provider === "copilot" && (bundle.accessToken.startsWith("gho_") || bundle.accessToken.startsWith("ghu_") || bundle.accessToken.startsWith("github_pat_"));
+  const isCopilotRaw = bundle.provider === "copilot" && (bundle.accessToken.startsWith("gho_") || bundle.accessToken.startsWith("ghu_") || bundle.accessToken.startsWith("ghp_") || bundle.accessToken.startsWith("github_pat_"));
   if (isExpiringSoon || isCopilotRaw) {
     try {
       const refreshed = await adapter.refreshToken(bundle);
@@ -107321,6 +107458,27 @@ async function resolveSubscriptionToken(provider, bundle) {
   }
   return bundle;
 }
+async function forceRefreshSubscription(provider) {
+  const adapter = getSubscriptionAdapter(provider);
+  if (!adapter || !adapter.refreshToken) {
+    return null;
+  }
+  const config = await loadConfig();
+  const bundle = config.subscriptions?.[adapter.provider];
+  if (!bundle) {
+    return null;
+  }
+  try {
+    const refreshed = await adapter.refreshToken(bundle);
+    if (refreshed) {
+      config.subscriptions = config.subscriptions || {};
+      config.subscriptions[adapter.provider] = refreshed;
+      await saveConfig(config);
+      return refreshed;
+    }
+  } catch {}
+  return null;
+}
 async function loginSubscription(provider, onCode) {
   const adapter = getSubscriptionAdapter(provider);
   if (!adapter || !adapter.loginOAuth) {
@@ -107602,6 +107760,140 @@ async function getAuthStatus() {
 var init_config = __esm(() => {
   init_models5();
 });
+// src/auth/subscriptions/formatters.ts
+var exports_formatters = {};
+__export(exports_formatters, {
+  formatSubscriptionCard: () => formatSubscriptionCard,
+  formatSubscriptionDisplayName: () => formatSubscriptionDisplayName,
+  formatSubscriptionIdentity: () => formatSubscriptionIdentity,
+  formatSubscriptionPlan: () => formatSubscriptionPlan,
+  formatSubscriptionToast: () => formatSubscriptionToast
+});
+function formatSubscriptionDisplayName(provider) {
+  const norm = (provider || "").toLowerCase().trim();
+  switch (norm) {
+    case "claude":
+    case "anthropic":
+      return "Anthropic Claude";
+    case "copilot":
+    case "github":
+    case "github_copilot":
+      return "GitHub Copilot";
+    case "codex":
+    case "chatgpt":
+    case "openai":
+      return "OpenAI ChatGPT";
+    case "gemini":
+    case "google":
+    case "antigravity":
+      return "Google Gemini";
+    default:
+      return provider ? provider.charAt(0).toUpperCase() + provider.slice(1) : "AI";
+  }
+}
+function formatSubscriptionPlan(bundle) {
+  const rawType = (bundle.subscriptionType || "").toLowerCase().trim();
+  const provider = (bundle.provider || "").toLowerCase().trim();
+  if (provider === "claude" || provider === "anthropic") {
+    if (rawType.includes("team"))
+      return "Claude Team";
+    if (rawType.includes("max") || rawType.includes("enterprise"))
+      return "Claude Enterprise";
+    return "Claude Pro";
+  }
+  if (provider === "codex" || provider === "chatgpt" || provider === "openai") {
+    if (rawType.includes("pro"))
+      return "ChatGPT Pro";
+    if (rawType.includes("team"))
+      return "ChatGPT Team";
+    if (rawType.includes("go"))
+      return "ChatGPT Go";
+    return "ChatGPT Plus";
+  }
+  if (provider === "copilot" || provider === "github" || provider === "github_copilot") {
+    if (rawType.includes("business") || rawType.includes("for_business"))
+      return "Copilot Business";
+    if (rawType.includes("enterprise"))
+      return "Copilot Enterprise";
+    return "Copilot Individual";
+  }
+  if (provider === "gemini" || provider === "google" || provider === "antigravity") {
+    if (rawType.includes("google_one") || rawType.includes("one_ai"))
+      return "Google One AI Premium";
+    if (rawType.includes("cloud_code"))
+      return "Google Cloud Code";
+    return "Gemini Advanced";
+  }
+  if (rawType) {
+    return rawType.split(/[_-]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+  }
+  return "Active Subscription";
+}
+function formatSubscriptionIdentity(bundle) {
+  const isGithub = bundle.provider === "copilot" || bundle.provider === "github";
+  if (isGithub && bundle.accountName && bundle.accountName.trim()) {
+    const name = bundle.accountName.trim();
+    return !name.startsWith("@") ? `@${name}` : name;
+  }
+  if (bundle.email && bundle.email.trim()) {
+    return bundle.email.trim();
+  }
+  if (bundle.accountName && bundle.accountName.trim()) {
+    const name = bundle.accountName.trim();
+    return isGithub && !name.startsWith("@") ? `@${name}` : name;
+  }
+  return;
+}
+function formatSubscriptionToast(bundle, activeModel) {
+  const plan = formatSubscriptionPlan(bundle);
+  const identity = formatSubscriptionIdentity(bundle);
+  const providerName = formatSubscriptionDisplayName(bundle.provider);
+  const subject = plan === "Copilot Individual" || plan === "Active Subscription" ? providerName : plan;
+  const accountPart = identity ? ` (${identity})` : "";
+  const modelPart = activeModel ? ` • ${activeModel}` : "";
+  return `Connected to ${subject}${accountPart}${modelPart}`;
+}
+function formatSubscriptionCard(bundle, _activeModel) {
+  const providerName = formatSubscriptionDisplayName(bundle.provider);
+  const plan = formatSubscriptionPlan(bundle);
+  const identity = formatSubscriptionIdentity(bundle);
+  const lines = [`Linked ${providerName} Subscription`, `  • Plan:         ${plan}`];
+  if (identity) {
+    const isGithub = bundle.provider === "copilot" || bundle.provider === "github";
+    const accountDisplay = isGithub && identity.startsWith("@") ? `[${identity}](https://github.com/${identity.slice(1)})` : identity;
+    lines.push(`  • Account:      ${accountDisplay}`);
+  }
+  return lines.join(`
+`);
+}
+
+// src/auth/subscriptions/index.ts
+var exports_subscriptions = {};
+__export(exports_subscriptions, {
+  claudeAdapter: () => claudeAdapter,
+  codexAdapter: () => codexAdapter,
+  copilotAdapter: () => copilotAdapter,
+  detectAllSubscriptions: () => detectAllSubscriptions,
+  forceRefreshSubscription: () => forceRefreshSubscription,
+  formatSubscriptionCard: () => formatSubscriptionCard,
+  formatSubscriptionDisplayName: () => formatSubscriptionDisplayName,
+  formatSubscriptionIdentity: () => formatSubscriptionIdentity,
+  formatSubscriptionPlan: () => formatSubscriptionPlan,
+  formatSubscriptionToast: () => formatSubscriptionToast,
+  geminiAdapter: () => geminiAdapter,
+  getSubscriptionAdapter: () => getSubscriptionAdapter,
+  importLocalSubscriptions: () => importLocalSubscriptions,
+  loginSubscription: () => loginSubscription,
+  resolveSubscriptionToken: () => resolveSubscriptionToken,
+  verifyAndResolveSubscription: () => verifyAndResolveSubscription
+});
+var init_subscriptions = __esm(() => {
+  init_claude();
+  init_codex2();
+  init_copilot2();
+  init_gemini2();
+  init_subscription_manager();
+});
 
 // src/auth/device.ts
 async function loginViaDeviceCode(serverUrl = process.env.SERVER_URL || "https://api.trydecember.com", onCodeGenerated) {
@@ -107668,14 +107960,6 @@ async function loginViaDeviceCode(serverUrl = process.env.SERVER_URL || "https:/
 var init_device = __esm(() => {
   init_open();
 });
-// src/auth/subscriptions/index.ts
-var init_subscriptions = __esm(() => {
-  init_claude();
-  init_codex2();
-  init_copilot2();
-  init_gemini2();
-  init_subscription_manager();
-});
 
 // src/auth/index.ts
 var exports_auth = {};
@@ -107684,6 +107968,12 @@ __export(exports_auth, {
   codexAdapter: () => codexAdapter,
   copilotAdapter: () => copilotAdapter,
   detectAllSubscriptions: () => detectAllSubscriptions,
+  forceRefreshSubscription: () => forceRefreshSubscription,
+  formatSubscriptionCard: () => formatSubscriptionCard,
+  formatSubscriptionDisplayName: () => formatSubscriptionDisplayName,
+  formatSubscriptionIdentity: () => formatSubscriptionIdentity,
+  formatSubscriptionPlan: () => formatSubscriptionPlan,
+  formatSubscriptionToast: () => formatSubscriptionToast,
   geminiAdapter: () => geminiAdapter,
   getSubscriptionAdapter: () => getSubscriptionAdapter,
   importLocalSubscriptions: () => importLocalSubscriptions,
@@ -108332,7 +108622,7 @@ ${BLUE}✱${RESET}  ${WHITE}Scanning local environment for subscription credenti
 `);
       return;
     }
-    console.log(`  ${GREEN}✔ Successfully detected and imported ${result.imported.length} subscription credential(s):${RESET}
+    console.log(`  ${GREEN}Successfully detected and imported ${result.imported.length} subscription credential(s):${RESET}
 `);
     for (const [provider, bundle] of Object.entries(result.bundles)) {
       const typeStr = bundle.subscriptionType ? ` (${bundle.subscriptionType})` : "";
@@ -108362,7 +108652,7 @@ ${BLUE}✱${RESET}  ${WHITE}December CLI Authentication & Subscription Status${R
       const typeStr = sub.subscriptionType ? ` [${sub.subscriptionType}]` : "";
       const userStr = sub.email || sub.accountName ? ` (${sub.email || sub.accountName})` : "";
       const expStr = sub.expiresAt ? sub.expiresAt > Date.now() ? `${GREEN}Valid${RESET}` : `${YELLOW}Expired (will auto-refresh)${RESET}` : `${GREEN}Active${RESET}`;
-      console.log(`  • ${GREEN}✔${RESET} ${WHITE}${k.toUpperCase()}${RESET}${typeStr}${userStr}: ${expStr}`);
+      console.log(`  • ${WHITE}${k.toUpperCase()}${RESET}${typeStr}${userStr}: ${expStr}`);
     }
   } else {
     console.log(`  ${GRAY}No subscriptions configured.${RESET} (Run ${WHITE}december auth import${RESET} or ${WHITE}december login <provider>${RESET})`);
@@ -108372,7 +108662,7 @@ ${BLUE}✱${RESET}  ${WHITE}December CLI Authentication & Subscription Status${R
   console.log(`${WHITE}BYOK API Keys:${RESET}`);
   if (byokKeys.length > 0) {
     for (const k of byokKeys) {
-      console.log(`  • ${GREEN}✔${RESET} ${WHITE}${k.toUpperCase()}${RESET}`);
+      console.log(`  • ${WHITE}${k.toUpperCase()}${RESET}`);
     }
   } else {
     console.log(`  ${GRAY}No BYOK API keys saved in config.${RESET}`);
@@ -108380,7 +108670,7 @@ ${BLUE}✱${RESET}  ${WHITE}December CLI Authentication & Subscription Status${R
   console.log("");
   console.log(`${WHITE}December Cloud Wallet:${RESET}`);
   if (config.decemberToken) {
-    console.log(`  • ${GREEN}✔ Connected${RESET} ${config.email ? `(${config.email})` : ""}`);
+    console.log(`  • ${GREEN}Connected${RESET} ${config.email ? `(${config.email})` : ""}`);
   } else {
     console.log(`  ${GRAY}Not connected.${RESET}`);
   }
@@ -108402,10 +108692,10 @@ ${BLUE}✱${RESET}  ${WHITE}Link an AI Subscription (Flat-rate / OAuth)${RESET}`
 Usage: ${GREEN}december link <provider>${RESET}`);
     console.log(`
 Supported Providers:`);
-    console.log(`  • ${WHITE}copilot${RESET}   - GitHub Copilot Subscription`);
-    console.log(`  • ${WHITE}claude${RESET}    - Claude Code (Anthropic Pro/Team)`);
-    console.log(`  • ${WHITE}chatgpt${RESET}   - OpenAI ChatGPT Plus/Team/Pro`);
-    console.log(`  • ${WHITE}gemini${RESET}    - Google Gemini / Antigravity
+    console.log(`  • ${WHITE}claude${RESET}    - Anthropic (Claude)`);
+    console.log(`  • ${WHITE}copilot${RESET}   - GitHub (Copilot)`);
+    console.log(`  • ${WHITE}gemini${RESET}    - Google (Gemini / Antigravity)`);
+    console.log(`  • ${WHITE}chatgpt${RESET}   - OpenAI (ChatGPT)
 `);
     return;
   }
@@ -108456,16 +108746,22 @@ Examples:`);
   const { fetchLiveProviderModels: fetchLiveProviderModels2 } = await Promise.resolve().then(() => (init_models5(), exports_models2));
   fetchLiveProviderModels2(provider, finalKey).catch(() => {});
   console.log(`
-${GREEN}✔ Successfully saved API key for ${provider.toUpperCase()} (Model: ${defaultModel})!${RESET}
+${GREEN}Successfully saved API key for ${provider.toUpperCase()} (Model: ${defaultModel})!${RESET}
 `);
 }
 async function handleLoginCommand(options) {
   const targetProvider = (options?.provider || "december").toLowerCase().trim();
   const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
   if (targetProvider === "copilot" || targetProvider === "github" || targetProvider === "claude" || targetProvider === "codex" || targetProvider === "chatgpt" || targetProvider === "openai" || targetProvider === "gemini" || targetProvider === "google" || targetProvider === "antigravity") {
-    const { loginSubscription: loginSubscription2 } = await Promise.resolve().then(() => (init_subscription_manager(), exports_subscription_manager));
+    const {
+      loginSubscription: loginSubscription2,
+      formatSubscriptionDisplayName: formatSubscriptionDisplayName2,
+      formatSubscriptionPlan: formatSubscriptionPlan2,
+      formatSubscriptionIdentity: formatSubscriptionIdentity2
+    } = await Promise.resolve().then(() => (init_subscriptions(), exports_subscriptions));
+    const providerName = formatSubscriptionDisplayName2(targetProvider);
     console.log(`
-Initiating subscription login for ${targetProvider.toUpperCase()}...`);
+Initiating subscription login for ${providerName}...`);
     const bundle = await loginSubscription2(targetProvider, (code, uri) => {
       console.log(`
 Please open ${uri} in your browser and enter code: ${code}
@@ -108479,8 +108775,19 @@ Waiting for authorization...`);
     await saveConfig2(configToSave2);
     const { fetchLiveProviderModels: fetchLiveProviderModels2 } = await Promise.resolve().then(() => (init_models5(), exports_models2));
     fetchLiveProviderModels2(bundle.provider, bundle.accessToken, bundle.endpoint).catch(() => {});
-    console.log(`\x1B[32mSuccessfully authenticated ${targetProvider.toUpperCase()} subscription!\x1B[0m
-`);
+    const GREEN = "\x1B[38;2;110;231;183m";
+    const WHITE = "\x1B[38;2;244;244;245m";
+    const BRAND2 = "\x1B[38;2;137;180;248m";
+    const RESET = "\x1B[0m";
+    const plan = formatSubscriptionPlan2(bundle);
+    const identity = formatSubscriptionIdentity2(bundle);
+    console.log(`
+${GREEN}Linked ${providerName} Subscription${RESET}`);
+    console.log(`  • Plan:         ${WHITE}${plan}${RESET}`);
+    if (identity) {
+      console.log(`  • Account:      ${BRAND2}${identity}${RESET}`);
+    }
+    console.log();
     return;
   }
   const { loginViaDeviceCode: loginViaDeviceCode2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
@@ -108582,7 +108889,7 @@ ${BLUE}✱${RESET}  Running December CLI via npx/bunx.`);
   }
   if (result.alreadyUpToDate) {
     console.log(`
-${GREEN}✔${RESET}  ${WHITE}You are already using the latest version of December CLI (v${result.installedVersion || result.targetVersion}).${RESET}`);
+  ${WHITE}You are already using the latest version of December CLI (v${result.installedVersion || result.targetVersion}).${RESET}`);
     console.log(`   ${GRAY}Use ${WHITE}december update --force${GRAY} to reinstall.${RESET}
 `);
     return;
@@ -108590,10 +108897,10 @@ ${GREEN}✔${RESET}  ${WHITE}You are already using the latest version of Decembe
   if (result.success) {
     const versionStr = result.installedVersion ? ` to v${result.installedVersion}` : "";
     console.log(`
-${GREEN}✔${RESET}  ${WHITE}December CLI successfully updated${versionStr} via ${result.method}!${RESET}`);
+  ${GREEN}December CLI successfully updated${versionStr} via ${result.method}!${RESET}`);
     if (result.collisionFixed && result.cleanedBinaries && result.cleanedBinaries.length > 0) {
       console.log(`
-${GREEN}✔${RESET}  ${WHITE}Resolved ${result.cleanedBinaries.length} conflicting older binary location(s):${RESET}`);
+  ${WHITE}Resolved ${result.cleanedBinaries.length} conflicting older binary location(s):${RESET}`);
       for (const b of result.cleanedBinaries) {
         console.log(`   ${GRAY}• ${b}${RESET}`);
       }
@@ -108608,12 +108915,12 @@ ${YELLOW}ℹ${RESET}  ${GRAY}Note: If your current terminal still runs an older
   } else {
     if (result.isPermissionError) {
       console.error(`
-${RED}✖${RESET}  ${WHITE}Permission denied while installing global package.${RESET}`);
+${RED}Permission denied while installing global package.${RESET}`);
       console.error(`   ${YELLOW}→${RESET} Try running with elevated permissions: ${WHITE}${result.sudoCmd || result.manualCmd}${RESET}
 `);
     } else {
       console.error(`
-${RED}✖${RESET}  Failed to update December CLI via ${result.method}: ${result.error || "Unknown error"}`);
+${RED}Failed to update December CLI via ${result.method}: ${result.error || "Unknown error"}${RESET}`);
       console.error(`   Try running manually: ${WHITE}${result.manualCmd}${RESET}
 `);
     }
@@ -108663,11 +108970,11 @@ ${BLUE}✱${RESET}  ${WHITE}December CLI Health & Environment Doctor${RESET}
       if (target) {
         const fixed = await resolveAndCleanStaleBinaries2(target, diagnosis.allBinaries);
         if (fixed.length > 0) {
-          console.log(`  ${GREEN}✔ Forwarded ${fixed.length} shadowed binary path(s) to primary active binary (${target.path}).${RESET}`);
+          console.log(`  ${GREEN}Forwarded ${fixed.length} shadowed binary path(s) to primary active binary (${target.path}).${RESET}`);
           console.log(`  ${YELLOW}ℹ Run "hash -r" (bash) or restart your terminal to apply.${RESET}
 `);
         } else {
-          console.log(`  ${GREEN}✔ All binary links are already aligned.${RESET}
+          console.log(`  ${GREEN}All binary links are already aligned.${RESET}
 `);
         }
       }
@@ -108676,7 +108983,7 @@ ${BLUE}✱${RESET}  ${WHITE}December CLI Health & Environment Doctor${RESET}
 `);
     }
   } else {
-    console.log(`  ${GREEN}✔ No binary collisions detected. Clean single installation.${RESET}
+    console.log(`  ${GREEN}No binary collisions detected. Clean single installation.${RESET}
 `);
   }
   const config = await loadConfig2();
@@ -273172,20 +273479,20 @@ var init_subscription_select_menu = __esm(async () => {
   jsx_runtime33 = __toESM(require_jsx_runtime(), 1);
   SUBSCRIPTION_MENU_ITEMS = [
     {
-      label: "GitHub Copilot",
-      value: "copilot"
-    },
-    {
-      label: "Claude Code",
+      label: "Anthropic (Claude)",
       value: "claude"
     },
     {
-      label: "ChatGPT Plus / Team / Pro",
-      value: "codex"
+      label: "GitHub (Copilot)",
+      value: "copilot"
     },
     {
-      label: "Google Gemini / Antigravity",
+      label: "Google (Gemini / Antigravity)",
       value: "gemini"
+    },
+    {
+      label: "OpenAI (ChatGPT)",
+      value: "codex"
     }
   ];
 });
@@ -274237,6 +274544,7 @@ var init_src7 = __esm(async () => {
 var AUTH_REQUIRED_NOTICE = `You are not logged in and have no custom API keys (BYOK) configured.
 
 Please run \`/login\` to:
+- Link an AI Subscription (Copilot, Claude, ChatGPT, Gemini), or
 - Sign in with your December account (Cloud Wallet), or
 - Configure Bring Your Own Key (BYOK) for providers like OpenAI, Anthropic, Gemini, OpenRouter, etc.`, HANDOFF_LOGIN_REQUIRED_NOTICE = "Cloud handoff migrates your local terminal session and workspace to December Cloud (https://trydecember.com).\n\nTo proceed, please log in:\n- Type `/login` and select Sign in with December (Device Code), or\n- Run `december login` in your terminal", HANDOFF_INSUFFICIENT_CREDITS_NOTICE = "Insufficient credits in December Wallet ($0.00). Cloud handoff requires active credits to spin up remote cloud sandbox sessions on December Cloud.\n\nPlease add credits at https://trydecember.com/settings/billing to continue, then re-run `/handoff`.", HANDOFF_SUCCESS_NOTICE = (sessionId) => `Workspace handed off successfully!
 
@@ -274924,7 +275232,7 @@ function parseErrorMessage(err) {
   }
   const isAuthError = lowerStr.includes("401") || lowerStr.includes("unauthorized") || lowerStr.includes("invalid token") || lowerStr.includes("access token expired") || lowerStr.includes("session expired") || lowerStr.includes("session not found");
   if (isAuthError && !finalResult.includes("Please run `/login`") && !finalResult.includes("Please run /login")) {
-    const authNotice = "Authentication failed or session expired. Please run `/login` to sign in with your December account (Cloud Wallet) or configure Bring Your Own Key (BYOK).\n";
+    const authNotice = "Authentication failed or session expired. Please run `/login` to sign in with your December account (Cloud Wallet), relink your AI Subscription, or configure Bring Your Own Key (BYOK).\n";
     return authNotice + finalResult;
   }
   return finalResult;
@@ -275472,6 +275780,7 @@ Please open [${uri}](${uri}) on any device and enter code: \`${code}\``
   const handleSubscriptionSelect = async (item) => {
     const config3 = await loadConfig();
     const { getSubscriptionAdapter: getSubscriptionAdapter2, verifyAndResolveSubscription: verifyAndResolveSubscription2, loginSubscription: loginSubscription2 } = await Promise.resolve().then(() => (init_subscription_manager(), exports_subscription_manager));
+    const { formatSubscriptionToast: formatSubscriptionToast2, formatSubscriptionCard: formatSubscriptionCard2 } = await Promise.resolve().then(() => exports_formatters);
     if (getSubscriptionAdapter2(item.value)) {
       const { getDefaultModelForProvider: getDefaultModelForProvider2 } = await Promise.resolve().then(() => (init_models5(), exports_models2));
       const { getAuthStatus: getAuthStatus2 } = await Promise.resolve().then(() => (init_config(), exports_config));
@@ -275503,7 +275812,7 @@ Please open [${uri}](${uri}) on any device and enter code: \`${code}\``
         const { fetchLiveProviderModels: fetchLiveProviderModels2 } = await Promise.resolve().then(() => (init_models5(), exports_models2));
         fetchLiveProviderModels2(verifiedBundle.provider, verifiedBundle.accessToken, verifiedBundle.endpoint).catch(() => {});
         setAuthMode("none");
-        addToast(`Verified local ${item.value.toUpperCase()} subscription (${verifiedBundle.subscriptionType || "active"})`, "success");
+        addToast(formatSubscriptionToast2(verifiedBundle, targetModel), "success");
         return;
       }
       const adapter2 = getSubscriptionAdapter2(item.value);
@@ -275582,15 +275891,15 @@ Please open [${uri}](${uri}) on your device and enter code: \`${code}\``;
               blocks: [
                 {
                   type: "text",
-                  content: `Successfully authenticated and verified ${item.value.toUpperCase()} subscription!`,
-                  color: "#6EE7B7"
+                  content: `
+${formatSubscriptionCard2(bundle, targetModel)}`
                 }
               ]
             }
           ]);
           const { fetchLiveProviderModels: fetchLiveProviderModels2 } = await Promise.resolve().then(() => (init_models5(), exports_models2));
           fetchLiveProviderModels2(bundle.provider, bundle.accessToken, bundle.endpoint).catch(() => {});
-          addToast(`Connected to ${item.value.toUpperCase()} subscription`, "success");
+          addToast(formatSubscriptionToast2(bundle, targetModel), "success");
         } catch (err) {
           const errorText = `Subscription verification failed: ${err?.message || String(err)}`;
           setAuthError(errorText);
@@ -276796,7 +277105,13 @@ ${decStatus}
             setHasBothAuth(authStatus.hasByok && authStatus.hasDecember);
             setSettingsAuthPriority(authStatus.authPriority);
           }
-          addToast(`Successfully authenticated ${targetProvider.toUpperCase()}!`, "success");
+          if (providerConfig?.subscription) {
+            const { formatSubscriptionToast: formatSubscriptionToast2 } = await Promise.resolve().then(() => exports_formatters);
+            addToast(formatSubscriptionToast2(providerConfig.subscription, providerConfig.model), "success");
+          } else {
+            const { formatSubscriptionDisplayName: formatSubscriptionDisplayName2 } = await Promise.resolve().then(() => exports_formatters);
+            addToast(`Connected to ${formatSubscriptionDisplayName2(targetProvider)}`, "success");
+          }
         } catch (e2) {
           addToast(`Login failed: ${e2.message}`, "error");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@trydecember/cli",
-    "version": "0.3.23",
+    "version": "0.3.24",
     "description": "a coding agent for terminal and cloud.",
     "homepage": "https://trydecember.com",
     "repository": {