archondev 2.19.4 → 2.19.6

package/dist/{chunk-3UOMLERV.js → chunk-KDWIKBM2.js}

@@ -6,7 +6,7 @@ import {
 import {
   listLocalAtoms,
   loadAtom
-} from "./chunk-IKMCIWK3.js";
+} from "./chunk-OTODLPY4.js";
 import {
   loadConfig
 } from "./chunk-SVU7MLG6.js";

package/dist/{chunk-K3XN7PN6.js → chunk-MIT5Z5V7.js}

@@ -763,6 +763,7 @@ async function interactiveSettings() {
   }
   await displayCurrentSettings(profile, usage, providers);
   console.log(chalk.bold("\nOptions:\n"));
+  console.log(chalk.dim("Type naturally (recommended) or use a shortcut:\n"));
   console.log(`  ${chalk.cyan("1")}) Change billing mode (BYOK / Credits)`);
   console.log(`  ${chalk.cyan("2")}) Set default models`);
   console.log(`  ${chalk.cyan("x")}) Smart Routing (cost optimization)`);
@@ -771,7 +772,8 @@ async function interactiveSettings() {
   console.log(`  ${chalk.cyan("5")}) Reset to defaults`);
   console.log(`  ${chalk.cyan("b")}) Back to project`);
   console.log();
-  const choice = await prompt("Enter choice");
+  const rawChoice = await prompt("What would you like to do?");
+  const choice = resolveSettingsChoice(rawChoice);
   switch (choice.toLowerCase()) {
     case "1":
       await changeBillingMode(profile.tier);
@@ -790,7 +792,7 @@ async function interactiveSettings() {
       await interactiveSettings();
       break;
     case "4":
-      await showUsageDetails();
+      await showUsageDetails({ pauseForInput: true });
       await interactiveSettings();
       break;
     case "5":
@@ -801,7 +803,7 @@ async function interactiveSettings() {
       console.log(chalk.dim("\nReturning to project...\n"));
       return;
     default:
-      console.log(chalk.yellow("Invalid choice."));
+      console.log(chalk.yellow("I did not catch that. Try again or describe what you need."));
       await interactiveSettings();
   }
 }
@@ -843,7 +845,8 @@ async function changeBillingMode(currentTier) {
   console.log(chalk.dim("      10% service fee applied.\n"));
   console.log(`  ${chalk.cyan("b")}) Back`);
   console.log();
-  const choice = await prompt("Enter choice");
+  const rawChoice = await prompt("How do you want to pay?");
+  const choice = resolveBillingChoice(rawChoice);
   if (choice === "1" && !byokSelected) {
     const spinner = ora("Switching to BYOK...").start();
     const result = await updateUserTier("BYOK");
@@ -861,9 +864,11 @@ async function changeBillingMode(currentTier) {
     } else {
       spinner.fail(chalk.red(result.error ?? "Failed to update"));
     }
-  } else if (choice.toLowerCase() !== "b") {
+  } else if (choice !== "b") {
     if (choice === "1" && byokSelected || choice === "2" && creditsSelected) {
       console.log(chalk.dim("Already using this billing mode."));
+    } else {
+      console.log(chalk.yellow("I did not catch that."));
     }
   }
 }
@@ -877,7 +882,8 @@ async function setDefaultModelsMenu(profile, providers) {
   console.log();
   console.log(`  ${chalk.cyan("b")}) Back`);
   console.log();
-  const choice = await prompt("Which model to change?");
+  const rawChoice = await prompt("Which default model should change?");
+  const choice = resolveDefaultModelSlotChoice(rawChoice);
   const keyMap = {
     "1": "fast-model",
     "2": "thinking-model",
@@ -889,7 +895,7 @@ async function setDefaultModelsMenu(profile, providers) {
   }
   const prefKey = keyMap[choice];
   if (!prefKey) {
-    console.log(chalk.yellow("Invalid choice."));
+    console.log(chalk.yellow("I did not catch that."));
     return;
   }
   const models = getAllActiveModels();
@@ -906,8 +912,8 @@ async function setDefaultModelsMenu(profile, providers) {
     console.log(`  ${chalk.cyan(String(i + 1))}) ${m.modelName} ${categoryLabel}`);
   });
   console.log();
-  const modelChoice = await prompt("Select model number");
-  const modelIndex = parseInt(modelChoice, 10) - 1;
+  const modelChoice = await prompt("Which model do you want? (number or model name)");
+  const modelIndex = resolveModelChoice(modelChoice, availableModels);
   if (modelIndex >= 0 && modelIndex < availableModels.length) {
     const selectedModel = availableModels[modelIndex];
     if (selectedModel) {
@@ -940,7 +946,8 @@ async function setSmartRoutingMenu(profile, providers) {
   console.log(`  ${chalk.cyan("5")}) View operations by tier`);
   console.log(`  ${chalk.cyan("b")}) Back`);
   console.log();
-  const choice = await prompt("Select option");
+  const rawChoice = await prompt("What would you like to change?");
+  const choice = resolveSmartRoutingChoice(rawChoice);
   if (choice.toLowerCase() === "b") {
     return;
   }
@@ -963,7 +970,8 @@ async function setSmartRoutingMenu(profile, providers) {
     console.log(`  ${chalk.cyan("3")}) google`);
     console.log(`  ${chalk.cyan("0")}) Clear preference (auto)`);
     console.log();
-    const provChoice = await prompt("Select");
+    const provChoiceRaw = await prompt("Which provider should be preferred?");
+    const provChoice = resolveProviderChoice(provChoiceRaw);
     const providerMap = {
       "0": null,
       "1": "anthropic",
@@ -997,12 +1005,12 @@ Select model for ${selectedTier.tier} tier:
       console.log(`  ${chalk.cyan(String(i + 1))}) ${m.modelName} ${categoryLabel}`);
     });
     console.log();
-    const modelChoice = await prompt("Select model number");
+    const modelChoice = await prompt("Which model do you want for this tier? (number or model name)");
     if (modelChoice === "0") {
       await setTierPreference(selectedTier.key, null);
       return;
     }
-    const modelIndex = parseInt(modelChoice, 10) - 1;
+    const modelIndex = resolveModelChoice(modelChoice, availableModels);
     if (modelIndex >= 0 && modelIndex < availableModels.length) {
       const selectedModel = availableModels[modelIndex];
       if (selectedModel) {
@@ -1057,7 +1065,8 @@ async function manageApiKeys() {
   console.log(`  ${chalk.cyan("4")}) Remove a key`);
   console.log(`  ${chalk.cyan("b")}) Back`);
   console.log();
-  const choice = await prompt("Enter choice");
+  const rawChoice = await prompt("What do you want to do with API keys?");
+  const choice = resolveApiKeysChoice(rawChoice);
   const providerMap = {
     "1": "anthropic",
     "2": "openai",
@@ -1073,8 +1082,8 @@ async function manageApiKeys() {
     }
     console.log("\nWhich provider to remove?");
     providers.forEach((p, i) => console.log(`  ${chalk.cyan(String(i + 1))}) ${p}`));
-    const removeChoice = await prompt("Select");
-    const removeIndex = parseInt(removeChoice, 10) - 1;
+    const removeChoice = await prompt("Which provider key should be removed?");
+    const removeIndex = resolveProviderIndexChoice(removeChoice, providers);
     if (removeIndex >= 0 && removeIndex < providers.length) {
       const providerToRemove = providers[removeIndex];
       if (providerToRemove) {
@@ -1088,9 +1097,182 @@ async function manageApiKeys() {
   if (provider) {
     const { addKey } = await import("./keys-T2VPHE7Z.js");
     await addKey(provider);
+  } else if (choice !== "b") {
+    console.log(chalk.yellow("I did not catch that."));
+  }
+}
+function resolveSettingsChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "1" || normalized.includes("billing") || normalized.includes("tier") || normalized.includes("pay")) return "1";
+  if (normalized === "2" || normalized.includes("default model") || normalized.includes("model")) return "2";
+  if (normalized === "x" || normalized === "smart" || normalized.includes("routing") || normalized.includes("cost optimization")) return "x";
+  if (normalized === "3" || normalized.includes("key")) return "3";
+  if (normalized === "4" || normalized.includes("usage") || normalized.includes("spend") || normalized.includes("cost details")) return "4";
+  if (normalized === "5" || normalized.includes("reset") || normalized.includes("defaults")) return "5";
+  if (normalized === "b" || normalized.includes("back") || normalized.includes("return")) return "b";
+  return normalized;
+}
+function resolveBillingChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "1" || normalized.includes("byok") || normalized.includes("own key")) return "1";
+  if (normalized === "2" || normalized.includes("credit") || normalized.includes("managed")) return "2";
+  if (normalized === "b" || normalized.includes("back")) return "b";
+  return normalized;
+}
+function resolveDefaultModelSlotChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "1" || normalized.includes("fast")) return "1";
+  if (normalized === "2" || normalized.includes("thinking")) return "2";
+  if (normalized === "3" || normalized.includes("primary")) return "3";
+  if (normalized === "4" || normalized.includes("secondary")) return "4";
+  if (normalized === "b" || normalized.includes("back")) return "b";
+  return normalized;
+}
+function resolveModelChoice(choice, models) {
+  const normalized = choice.trim().toLowerCase();
+  const numeric = parseInt(normalized, 10);
+  if (!Number.isNaN(numeric)) {
+    return numeric - 1;
+  }
+  const idx = models.findIndex(
+    (m) => m.modelId.toLowerCase() === normalized || m.modelName.toLowerCase() === normalized || m.modelName.toLowerCase().includes(normalized) || normalized.includes(m.modelName.toLowerCase())
+  );
+  return idx;
+}
+function resolveSmartRoutingChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "1" || normalized.includes("planning")) return "1";
+  if (normalized === "2" || normalized.includes("reasoning")) return "2";
+  if (normalized === "3" || normalized.includes("execution")) return "3";
+  if (normalized === "4" || normalized.includes("provider")) return "4";
+  if (normalized === "5" || normalized.includes("operation")) return "5";
+  if (normalized === "b" || normalized.includes("back")) return "b";
+  return normalized;
+}
+function resolveProviderChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "0" || normalized.includes("auto") || normalized.includes("clear")) return "0";
+  if (normalized === "1" || normalized.includes("anthropic")) return "1";
+  if (normalized === "2" || normalized.includes("openai")) return "2";
+  if (normalized === "3" || normalized.includes("google") || normalized.includes("gemini")) return "3";
+  return normalized;
+}
+function resolveApiKeysChoice(input) {
+  const normalized = input.trim().toLowerCase();
+  if (!normalized) return "";
+  if (normalized === "1" || normalized.includes("add") && normalized.includes("anthropic")) return "1";
+  if (normalized === "2" || normalized.includes("add") && normalized.includes("openai")) return "2";
+  if (normalized === "3" || normalized.includes("add") && (normalized.includes("google") || normalized.includes("gemini"))) return "3";
+  if (normalized === "4" || normalized.includes("remove") || normalized.includes("delete")) return "4";
+  if (normalized === "b" || normalized.includes("back")) return "b";
+  return normalized;
+}
+function resolveProviderIndexChoice(choice, providers) {
+  const normalized = choice.trim().toLowerCase();
+  const numeric = parseInt(normalized, 10);
+  if (!Number.isNaN(numeric)) return numeric - 1;
+  return providers.findIndex((p) => normalized.includes(p));
+}
+var __preferencesChoiceHelpers = {
+  resolveSettingsChoice,
+  resolveBillingChoice,
+  resolveDefaultModelSlotChoice,
+  resolveSmartRoutingChoice,
+  resolveProviderChoice,
+  resolveApiKeysChoice,
+  resolveProviderIndexChoice,
+  resolveModelChoice
+};
+function formatLocalDateTime(value) {
+  const date = new Date(value);
+  if (isNaN(date.getTime())) {
+    return value;
   }
+  return date.toLocaleString();
+}
+function formatUsagePeriodLabel(periodSource) {
+  if (periodSource === "credit_purchase") return "Since last top-up";
+  if (periodSource === "month") return "Current month to date";
+  return "Current billing period";
 }
-async function showUsageDetails() {
+function sumModelCost(byModel) {
+  return (byModel ?? []).reduce((sum, row) => sum + row.cost, 0);
+}
+function renderModelBreakdown(rows, options = {}) {
+  const indent = options.indent ?? "  ";
+  if (rows.length === 0) {
+    console.log(chalk.dim(`${indent}No usage recorded.`));
+    return;
+  }
+  const total = rows.reduce((sum, row) => sum + row.cost, 0);
+  const sorted = [...rows].sort((a, b) => b.cost - a.cost);
+  for (const row of sorted) {
+    const modelInfo = findModel(row.model);
+    const name = modelInfo?.name ?? row.model;
+    const tokenTotal = row.inputTokens + row.outputTokens;
+    const share = total > 0 ? (row.cost / total * 100).toFixed(1) : "0.0";
+    const note = options.costNote ? ` ${chalk.dim(options.costNote)}` : "";
+    console.log(`${indent}${name}: ${formatTokens(tokenTotal)} tokens | ${formatCost(row.cost)} (${share}%)${note}`);
+  }
+}
+async function resolveAuthAndProfileIds(authToken, fallbackAuthId) {
+  const supabase = createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, authToken);
+  let authId = fallbackAuthId ?? null;
+  if (!authId) {
+    const { data, error } = await supabase.auth.getUser();
+    if (error || !data.user?.id) {
+      return { authId: null, profileId: null };
+    }
+    authId = data.user.id;
+  }
+  const { data: profileRow, error: profileError } = await supabase.from("user_profiles").select("id").eq("auth_id", authId).single();
+  if (profileError || !profileRow?.id) {
+    return { authId, profileId: null };
+  }
+  return { authId, profileId: profileRow.id };
+}
+async function fetchUsageRows(authToken, profileId, startIso, endIso) {
+  const supabase = createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, authToken);
+  const { data, error } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, created_at").eq("user_id", profileId).gte("created_at", startIso).lte("created_at", endIso);
+  if (error || !data) {
+    return null;
+  }
+  return data;
+}
+function aggregateUsageRows(rows, start, end) {
+  let totalInputTokens = 0;
+  let totalOutputTokens = 0;
+  let totalCost = 0;
+  const byModelMap = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const ts = new Date(row.created_at);
+    if (ts < start || ts > end) continue;
+    totalInputTokens += row.input_tokens;
+    totalOutputTokens += row.output_tokens;
+    totalCost += row.base_cost;
+    const existing = byModelMap.get(row.model);
+    if (existing) {
+      existing.inputTokens += row.input_tokens;
+      existing.outputTokens += row.output_tokens;
+      existing.cost += row.base_cost;
+    } else {
+      byModelMap.set(row.model, {
+        inputTokens: row.input_tokens,
+        outputTokens: row.output_tokens,
+        cost: row.base_cost
+      });
+    }
+  }
+  const byModel = Array.from(byModelMap.entries()).map(([model, stats]) => ({ model, ...stats })).sort((a, b) => b.cost - a.cost);
+  return { totalInputTokens, totalOutputTokens, totalCost, byModel };
+}
+async function showUsageDetails(options = {}) {
+  const { pauseForInput = false } = options;
   console.log(chalk.bold("\n-- Usage Details --\n"));
   const spinner = ora("Loading usage data...").start();
   const config = await loadConfig();
@@ -1112,84 +1294,49 @@ async function showUsageDetails() {
     }
     const data = await response.json();
     if (data.tier === "BYOK") {
-      if (!authId) {
+      const ids = await resolveAuthAndProfileIds(authToken, authId);
+      if (!ids.authId || !ids.profileId) {
         console.log(chalk.yellow("Unable to resolve user ID for usage details."));
         return;
       }
-      const supabase = createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, authToken);
-      const { data: profileRow, error: profileError } = await supabase.from("user_profiles").select("id").eq("auth_id", authId).single();
-      if (profileError || !profileRow?.id) {
-        console.log(chalk.yellow("Unable to resolve profile for usage details."));
-        return;
-      }
-      const profileId = profileRow.id;
       const now = /* @__PURE__ */ new Date();
       const yearStart = new Date(now.getFullYear(), 0, 1);
-      const { data: usageRows, error } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, created_at").eq("user_id", profileId).gte("created_at", yearStart.toISOString()).lte("created_at", now.toISOString());
-      if (error || !usageRows) {
+      const usageRows = await fetchUsageRows(authToken, ids.profileId, yearStart.toISOString(), now.toISOString());
+      if (!usageRows) {
         console.log(chalk.yellow("Unable to fetch BYOK usage data."));
         return;
       }
-      const rows = usageRows;
       const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-      const startOfWeek = new Date(now.getFullYear(), now.getMonth(), now.getDate() - now.getDay());
-      const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+      const startOf24h = new Date(now.getTime() - 24 * 60 * 60 * 1e3);
+      const startOf7d = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1e3);
+      const startOf30d = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1e3);
       const periods = [
         { label: "Today", start: startOfToday, end: now },
-        { label: "Week to Date (Sun\u2013Sat)", start: startOfWeek, end: now },
-        { label: "Month to Date", start: startOfMonth, end: now },
+        { label: "Last 24 Hours", start: startOf24h, end: now },
+        { label: "Last 7 Days", start: startOf7d, end: now },
+        { label: "Last 30 Days", start: startOf30d, end: now },
         { label: "Year to Date", start: yearStart, end: now }
       ];
-      const aggregate = (start, end) => {
-        let totalInputTokens = 0;
-        let totalOutputTokens = 0;
-        let totalCost = 0;
-        const byModelMap = /* @__PURE__ */ new Map();
-        for (const row of rows) {
-          const ts = new Date(row.created_at);
-          if (ts < start || ts > end) continue;
-          totalInputTokens += row.input_tokens;
-          totalOutputTokens += row.output_tokens;
-          totalCost += row.base_cost;
-          const existing = byModelMap.get(row.model);
-          if (existing) {
-            existing.inputTokens += row.input_tokens;
-            existing.outputTokens += row.output_tokens;
-            existing.cost += row.base_cost;
-          } else {
-            byModelMap.set(row.model, {
-              inputTokens: row.input_tokens,
-              outputTokens: row.output_tokens,
-              cost: row.base_cost
-            });
-          }
-        }
-        const byModel = Array.from(byModelMap.entries()).map(([model, stats]) => ({ model, ...stats })).sort((a, b) => b.cost - a.cost);
-        return { totalInputTokens, totalOutputTokens, totalCost, byModel };
-      };
       console.log(chalk.blue("BYOK Usage (local time):"));
+      console.log(chalk.dim("Estimated provider spend by model (you are billed directly by provider)."));
       for (const period of periods) {
-        const summary = aggregate(period.start, period.end);
+        const summary = aggregateUsageRows(usageRows, period.start, period.end);
         console.log();
         console.log(chalk.bold(`${period.label}:`));
         console.log(`  ${period.start.toLocaleDateString()} \u2192 ${period.end.toLocaleDateString()}`);
         console.log(`  Tokens: ${formatTokens(summary.totalInputTokens + summary.totalOutputTokens)} (in ${formatTokens(summary.totalInputTokens)} / out ${formatTokens(summary.totalOutputTokens)})`);
-        console.log(`  Cost:   ${formatCost(summary.totalCost)} ${chalk.dim("(paid directly to provider)")}`);
-        if (summary.byModel.length > 0) {
-          console.log(chalk.dim("  By Model:"));
-          for (const model of summary.byModel) {
-            const modelInfo = findModel(model.model);
-            const name = modelInfo?.name ?? model.model;
-            const tokenTotal = model.inputTokens + model.outputTokens;
-            console.log(`    ${name}: ${formatTokens(tokenTotal)} tokens (${formatCost(model.cost)})`);
-          }
-        } else {
-          console.log(chalk.dim("  No usage recorded."));
-        }
+        console.log(`  Estimated Spend: ${formatCost(summary.totalCost)} ${chalk.dim("(paid directly to provider)")}`);
+        console.log(chalk.dim("  By Model:"));
+        renderModelBreakdown(summary.byModel, { indent: "    " });
       }
     } else {
-      console.log(chalk.blue("Current Billing Period:"));
-      console.log(`  ${data.periodStart} to ${data.periodEnd}`);
+      const periodLabel = formatUsagePeriodLabel(data.periodSource);
+      const byModel = [...data.byModel ?? []].sort((a, b) => b.cost - a.cost);
+      const modelBilledTotal = sumModelCost(byModel);
+      const modelBaseTotal = data.totalBaseCost;
+      const modelFeeTotal = Math.max(0, modelBilledTotal - modelBaseTotal);
+      console.log(chalk.blue(`${periodLabel}:`));
+      console.log(`  ${formatLocalDateTime(data.periodStart)} \u2192 ${formatLocalDateTime(data.periodEnd)}`);
       console.log();
       console.log(chalk.blue("Token Usage:"));
       console.log(`  Input:  ${formatTokens(data.totalInputTokens)} tokens`);
@@ -1197,24 +1344,29 @@ async function showUsageDetails() {
       console.log(`  Total:  ${formatTokens(data.totalInputTokens + data.totalOutputTokens)} tokens`);
       console.log();
       console.log(chalk.blue("Cost:"));
-      console.log(`  Base Cost:      ${formatCost(data.totalBaseCost)}`);
       if (data.tier === "CREDITS") {
-        const withFee = data.totalBaseCost * 1.1;
-        console.log(`  With 10% Fee:   ${formatCost(withFee)}`);
+        console.log(`  Base Model Cost: ${formatCost(modelBaseTotal)}`);
+        console.log(`  Platform Fee:    ${formatCost(modelFeeTotal)}`);
+        console.log(`  Credits Deducted:${formatCost(modelBilledTotal)}`);
+      } else {
+        console.log(`  Estimated Cost:  ${formatCost(modelBaseTotal)}`);
       }
-      if (data.byModel && data.byModel.length > 0) {
+      if (byModel.length > 0) {
         console.log();
         console.log(chalk.blue("By Model:"));
-        for (const stats of data.byModel) {
-          const modelInfo = findModel(stats.model);
-          const name = modelInfo?.name ?? stats.model;
-          console.log(`  ${name}: ${formatTokens(stats.inputTokens + stats.outputTokens)} tokens (${formatCost(stats.cost)})`);
-        }
+        renderModelBreakdown(
+          byModel.map((row) => ({
+            model: row.model,
+            inputTokens: row.inputTokens,
+            outputTokens: row.outputTokens,
+            cost: row.cost
+          }))
+        );
       }
       if (data.byOperation && data.byOperation.length > 0) {
         console.log();
         console.log(chalk.blue("By Operation:"));
-        for (const stats of data.byOperation) {
+        for (const stats of [...data.byOperation].sort((a, b) => b.cost - a.cost)) {
           console.log(`  ${stats.operation}: ${formatTokens(stats.tokenCount)} tokens (${formatCost(stats.cost)})`);
         }
       }
@@ -1223,8 +1375,12 @@ async function showUsageDetails() {
     spinner.stop();
     console.log(chalk.yellow("Error fetching usage data."));
   }
-  console.log();
-  await prompt("Press Enter to continue");
+  if (pauseForInput) {
+    console.log();
+    await prompt("Press Enter to continue");
+  } else {
+    console.log();
+  }
 }
 
 export {
@@ -1236,5 +1392,6 @@ export {
   resetPreferences,
   listModels,
   interactiveSettings,
+  __preferencesChoiceHelpers,
   showUsageDetails
 };