archondev 2.19.5 → 2.19.6

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

@@ -792,7 +792,7 @@ async function interactiveSettings() {
       await interactiveSettings();
       break;
     case "4":
-      await showUsageDetails();
+      await showUsageDetails({ pauseForInput: true });
       await interactiveSettings();
       break;
     case "5":
@@ -1188,7 +1188,91 @@ var __preferencesChoiceHelpers = {
   resolveProviderIndexChoice,
   resolveModelChoice
 };
-async function showUsageDetails() {
+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";
+}
+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();
@@ -1210,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`);
@@ -1295,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)})`);
         }
       }
@@ -1321,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 {

package/dist/index.js

@@ -28,7 +28,7 @@ import {
   showExecutionPreferences,
   showPreferences,
   showUsageDetails
-} from "./chunk-KETUHDUE.js";
+} from "./chunk-MIT5Z5V7.js";
 import {
   a11yBadge,
   a11yCheck,
@@ -3187,7 +3187,7 @@ async function handleNewProject(cwd, _state) {
   }
   if (intent.mode === "explore" && intent.confidence >= 0.7) {
     console.log(chalk6.dim("\n> Got it! Analyzing the project...\n"));
-    await runExploreFlow(cwd);
+    await runExploreFlow(cwd, initialResponse);
     return;
   }
   if (intent.mode === "ad_hoc" && intent.confidence >= 0.7) {
@@ -3274,7 +3274,7 @@ async function showNewProjectMenu(cwd) {
       await showNewProjectMenu(cwd);
   }
 }
-async function runExploreFlow(cwd) {
+async function runExploreFlow(cwd, followUpInput) {
   console.log(chalk6.blue("-- Analyzing Project --\n"));
   const projectInfo = await gatherProjectInfo(cwd);
   console.log(chalk6.bold("\u{1F4C1} Project Overview\n"));
@@ -3315,6 +3315,13 @@ async function runExploreFlow(cwd) {
   }
   console.log();
   console.log(chalk6.green("\u2713 Analysis complete! I'm ready to work on this project.\n"));
+  const actionableFollowUp = extractActionableFollowUpFromExplore(followUpInput ?? "");
+  if (actionableFollowUp) {
+    console.log(chalk6.dim("I finished the project scan. Continuing with your requested task...\n"));
+    await handlePostExploreAction(cwd, actionableFollowUp);
+    await showMainMenu();
+    return;
+  }
   console.log(chalk6.bold("What would you like to do next?\n"));
   console.log(chalk6.dim("You can describe it naturally, or use shortcuts:\n"));
   console.log(`  ${chalk6.cyan("1")}) ${chalk6.bold("Plan a task")} \u2014 Tell me what to implement, fix, or change`);
@@ -3332,22 +3339,26 @@ async function runExploreFlow(cwd) {
         const { plan: plan2 } = await import("./plan-7SCZH7EA.js");
         await plan2(description, {});
       }
-      break;
+      await showMainMenu();
+      return;
     }
     case "2":
       await codeReviewFirst(cwd);
-      break;
+      await showMainMenu();
+      return;
     case "3":
       if (!projectInfo.hasArchitecture) {
         await analyzeAndAdapt(cwd);
       }
-      break;
+      await showMainMenu();
+      return;
     case "q":
       process.exit(0);
     default:
       if (choice.trim()) {
         const handled = await handleFreeformJourneyInput(cwd, choice);
         if (handled) {
+          await showMainMenu();
           return;
         }
       }
@@ -3649,7 +3660,7 @@ async function handleAdaptExisting(cwd, state) {
   const intent = detectUserIntent(response);
   if (intent.mode === "explore" && intent.confidence >= 0.7) {
     console.log(chalk6.dim("\n> Got it! Analyzing the project...\n"));
-    await runExploreFlow(cwd);
+    await runExploreFlow(cwd, response);
     return;
   }
   if (intent.mode === "ad_hoc" && intent.confidence >= 0.7) {
@@ -3874,7 +3885,7 @@ async function handleFreeformJourneyInput(cwd, input) {
   const intent = detectUserIntent(freeform);
   if (intent.mode === "explore" && intent.confidence >= 0.7) {
     console.log(chalk6.dim("\n> Got it! Analyzing the project...\n"));
-    await runExploreFlow(cwd);
+    await runExploreFlow(cwd, freeform);
     return true;
   }
   if (intent.mode === "app_builder" && intent.confidence >= 0.7) {
@@ -3887,6 +3898,42 @@ async function handleFreeformJourneyInput(cwd, input) {
   await plan2(freeform, {});
   return true;
 }
+function extractActionableFollowUpFromExplore(input) {
+  const trimmed = input.trim();
+  if (!trimmed) return null;
+  const normalized = trimmed.toLowerCase();
+  const hasExploreSignal = /(analyz|review|explore|scan|inspect|understand|get familiar)/.test(normalized);
+  const hasActionSignal = /(how (can|could|do i)|create|build|generate|make|produce|plan|implement|write)/.test(normalized);
+  if (!hasExploreSignal || !hasActionSignal) {
+    return null;
+  }
+  const transitions = [" and then ", " then ", " and "];
+  for (const token of transitions) {
+    const idx = normalized.indexOf(token);
+    if (idx !== -1) {
+      const candidate = trimmed.slice(idx + token.length).trim();
+      if (candidate.length > 10) {
+        return candidate;
+      }
+    }
+  }
+  return trimmed;
+}
+async function handlePostExploreAction(cwd, request) {
+  const intent = detectUserIntent(request);
+  if (intent.mode === "app_builder" && intent.confidence >= 0.7) {
+    console.log(chalk6.dim("> Let me understand your project better...\n"));
+    await runConversationalInterview(cwd, request);
+    return;
+  }
+  if (intent.mode === "explore" && intent.confidence >= 0.7) {
+    console.log(chalk6.dim("> I can go deeper. Creating a concrete task from your request...\n"));
+  } else {
+    console.log(chalk6.dim("> Got it! Creating a task for this...\n"));
+  }
+  const { plan: plan2 } = await import("./plan-7SCZH7EA.js");
+  await plan2(request, {});
+}
 async function showReviewProgress(cwd) {
   try {
     const { ReviewDatabase } = await import("./code-review-GJVBZPZA.js");
@@ -3919,7 +3966,7 @@ async function listAtoms() {
 async function executeNext() {
   const { listLocalAtoms: listLocalAtoms2 } = await import("./plan-7SCZH7EA.js");
   const { analyzeProject, getComplexityDescription, getModeDescription } = await import("./orchestration-HIF3KP25.js");
-  const { loadExecutionPreferences } = await import("./preferences-YOSAIHGM.js");
+  const { loadExecutionPreferences } = await import("./preferences-4V4C7MVD.js");
   const cwd = process.cwd();
   const atoms = await listLocalAtoms2();
   const pendingAtoms = atoms.filter((a) => a.status === "READY" || a.status === "IN_PROGRESS");
@@ -4018,7 +4065,7 @@ async function viewStatus() {
   await status2();
 }
 async function settingsMenu() {
-  const { interactiveSettings } = await import("./preferences-YOSAIHGM.js");
+  const { interactiveSettings } = await import("./preferences-4V4C7MVD.js");
   await interactiveSettings();
   await showMainMenu();
 }
@@ -4376,16 +4423,38 @@ import readline2 from "readline";
 function getSupabaseClient(accessToken) {
   return createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, accessToken);
 }
+async function resolveAuthAndProfileIds(accessToken, fallbackAuthId) {
+  const supabase = getSupabaseClient(accessToken);
+  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: profile } = await supabase.from("user_profiles").select("id").eq("auth_id", authId).single();
+  return {
+    authId,
+    profileId: profile?.id ?? null
+  };
+}
 async function showCredits() {
   const spinner = ora("Fetching credit balance...").start();
   try {
     const config = await loadConfig();
-    if (!config.accessToken || !config.userId) {
+    const authToken = getAuthToken(config);
+    if (!authToken) {
       spinner.fail("Not logged in. Run: archon login");
       return;
     }
-    const supabase = getSupabaseClient(config.accessToken);
-    const { data, error } = await supabase.from("user_profiles").select("tier, credit_balance_cents, atoms_used_this_month").eq("auth_id", config.userId).single();
+    const supabase = getSupabaseClient(authToken);
+    const ids = await resolveAuthAndProfileIds(authToken, config.userId);
+    if (!ids.authId) {
+      spinner.fail("Could not resolve account. Run: archon login");
+      return;
+    }
+    const { data, error } = await supabase.from("user_profiles").select("tier, credit_balance_cents, atoms_used_this_month").eq("auth_id", ids.authId).single();
     if (error || !data) {
       spinner.fail("Could not fetch profile");
       return;
@@ -4406,6 +4475,7 @@ async function showCredits() {
     } else if (profile.tier === "CREDITS") {
       console.log();
       console.log(chalk7.dim("  Add more credits: archon credits add"));
+      console.log(chalk7.dim("  Detailed usage by model: archon usage"));
       printCreditsNextAction("CREDITS");
       if (balance < 5) {
         const addNow = await promptYesNo2("Balance is low. Add credits now?", false);
@@ -4416,6 +4486,7 @@ async function showCredits() {
     } else if (profile.tier === "BYOK") {
       console.log();
       console.log(chalk7.dim("  Using your own API keys - no credit charges"));
+      console.log(chalk7.dim("  Estimated spend by model: archon usage"));
       printCreditsNextAction("BYOK");
     }
     console.log();
@@ -4514,13 +4585,19 @@ async function showHistory(options = {}) {
   const spinner = ora("Fetching usage history...").start();
   try {
     const config = await loadConfig();
-    if (!config.accessToken || !config.userId) {
+    const authToken = getAuthToken(config);
+    if (!authToken) {
       spinner.fail("Not logged in. Run: archon login");
       return;
     }
-    const supabase = getSupabaseClient(config.accessToken);
+    const supabase = getSupabaseClient(authToken);
+    const ids = await resolveAuthAndProfileIds(authToken, config.userId);
+    if (!ids.profileId) {
+      spinner.fail("Could not resolve profile for usage history");
+      return;
+    }
     const limit = options.limit ? parseInt(options.limit, 10) : 20;
-    const { data, error } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, created_at").eq("user_id", config.userId).order("created_at", { ascending: false }).limit(limit);
+    const { data, error } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, created_at").eq("user_id", ids.profileId).order("created_at", { ascending: false }).limit(limit);
     if (error) {
       spinner.fail("Could not fetch usage");
       return;

package/dist/{preferences-YOSAIHGM.js → preferences-4V4C7MVD.js}

@@ -9,7 +9,7 @@ import {
   showExecutionPreferences,
   showPreferences,
   showUsageDetails
-} from "./chunk-KETUHDUE.js";
+} from "./chunk-MIT5Z5V7.js";
 import "./chunk-Q3GIFHIQ.js";
 import "./chunk-UFR2LX6G.js";
 import "./chunk-TFSHS7EN.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archondev",
-  "version": "2.19.5",
+  "version": "2.19.6",
   "description": "Local-first AI-powered development governance system",
   "main": "dist/index.js",
   "bin": {