jaitus 0.3.19 → 0.3.21

package/src/planView.js

@@ -1,9 +1,8 @@
 // ─── How a plan reads to the person using it: percentages, never credits ───────
 //
-// The gateway counts usage in credits (a fixed slice of real model cost) — that is its
-// internal unit and an admin's, not a customer's. Everything the CLI shows about a plan
-// is a percentage of the 5-hour session or of the week, with when each resets, the way
-// Claude's /usage reads. /usage, /cost, /status, `jaitus whoami`, `jaitus usage`, the
+// The server counts usage in its own internal unit, which is never shown to a customer.
+// Everything the CLI shows about a plan is a percentage of the 5-hour window, the week
+// or the month, with when each resets, in the usual /usage layout. /usage, /cost, /status, `jaitus whoami`, `jaitus usage`, the
 // status bar and the work bar all come from here, so no screen can say it differently.
 
 const pctOf = (used, total) => (Number(total) > 0
@@ -52,15 +51,16 @@ export function planPercents(st) {
 }
 
 /**
- * A spend in credits (one turn, one session) as a share of the 5-hour session and of
- * the week — null for either the plan does not have.
+ * A spend in credits (one turn, one session) as a share of the 5-hour window, the week
+ * and the month (while that limit is on) — null for any the plan does not have.
  */
 export function spendShare(credits, st) {
   const c = Number(credits) || 0;
-  if (!st || c <= 0) return { window: null, week: null };
+  if (!st || c <= 0) return { window: null, week: null, month: null };
   return {
     window: Number(st.windowCredits) > 0 ? (100 * c) / st.windowCredits : null,
     week: Number(st.weeklyCredits) > 0 ? (100 * c) / st.weeklyCredits : null,
+    month: monthShown(st) && Number(st.monthlyCredits) > 0 ? (100 * c) / st.monthlyCredits : null,
   };
 }
 
@@ -71,32 +71,40 @@ export const rememberPlan = (st) => { if (st && typeof st === 'object') lastPlan
 export const knownPlan = () => lastPlan;
 
 /**
- * What the status bar and the work bar need: the two percentages, and the two budgets
- * a turn's spend is measured against. null for an account with no plan limits.
+ * What the status bar and the work bar need: the percentages (5-hour window, week, and
+ * the month when that limit is on), and the two budgets a turn's spend is measured
+ * against. null for an account with no plan limits.
  */
 export function planBadge(st) {
   const p = planPercents(st);
-  if (!p || (p.window == null && p.week == null)) return null;
+  if (!p || (p.window == null && p.week == null && p.month == null)) return null;
   return {
-    window: p.window, week: p.week, windowHours: p.windowHours,
+    window: p.window, week: p.week, month: p.month, windowHours: p.windowHours,
     windowCredits: Number(st.windowCredits) || 0, weeklyCredits: Number(st.weeklyCredits) || 0,
   };
 }
 
-/** "5h 12% · week 3%" for the status bar. */
+/** "5h 12% · week 3% · month 18%" for the status bar (month only while that limit is on). */
 export function badgeText(b) {
   if (!b) return '';
   const parts = [];
   if (b.window != null) parts.push(`${b.windowHours || 5}h ${b.window}%`);
   if (b.week != null) parts.push(`week ${b.week}%`);
+  if (b.month != null) parts.push(`month ${b.month}%`);
   return parts.join(' · ');
 }
 
-/** What one turn has used so far, for the work bar: "0.6% of session". '' when unknown. */
+/** The highest of the badge's percentages — what its colour follows. */
+export function badgeTop(b) {
+  if (!b) return 0;
+  return Math.max(b.window ?? 0, b.week ?? 0, b.month ?? 0);
+}
+
+/** What one turn has used so far, for the work bar: "0.6% of 5h window". '' when unknown. */
 export function turnShareText(credits, b) {
   const c = Number(credits) || 0;
   if (!b || c <= 0) return '';
-  if (b.windowCredits > 0) return `${fmtShare((100 * c) / b.windowCredits)} of session`;
+  if (b.windowCredits > 0) return `${fmtShare((100 * c) / b.windowCredits)} of ${b.windowHours || 5}h window`;
   if (b.weeklyCredits > 0) return `${fmtShare((100 * c) / b.weeklyCredits)} of week`;
   return '';
 }
@@ -114,10 +122,48 @@ function extraLine(p) {
     : `available — used once your free prompts run out${until}`;
 }
 
+/** 600000 → "600k", 1500000 → "1.5M", for the free allowance. */
+function shortTokens(n) {
+  const v = Math.max(0, Number(n) || 0);
+  if (v >= 1e6) return `${+(v / 1e6).toFixed(1)}M`;
+  if (v >= 1e3) return `${Math.round(v / 1e3)}k`;
+  return String(Math.round(v));
+}
+
 /**
- * The plan as meters for /usage (popup) and `jaitus usage` (text): the 5-hour session
- * and the week fill at their own rates from the same requests, so each gets its own bar
- * and its own reset time. Extra usage and the free tier follow.
+ * The free allowance as the server counts it: prompts AND tokens, whichever runs out
+ * first. `percent` is the larger of the two shares. The token half is left out when the
+ * server does not send a token cap (an older server).
+ */
+export function freeAllowance(u) {
+  const usedPrompts = Number(u?.freeRequestsUsed) || 0;
+  const limitPrompts = Number(u?.freeRequestLimit) || 0;
+  const limitTokens = Number(u?.freeTokenLimit) || 0;
+  const usedTokens = Number(u?.totalTokensConsumed) || 0;
+  const promptPart = `${usedPrompts} of ${limitPrompts || '?'} prompts`;
+  const tokenPart = limitTokens > 0 ? `${shortTokens(Math.min(usedTokens, limitTokens))} of ${shortTokens(limitTokens)} tokens` : '';
+  const shares = [limitPrompts > 0 ? usedPrompts / limitPrompts : 0, limitTokens > 0 ? usedTokens / limitTokens : 0];
+  return {
+    text: tokenPart ? `${promptPart} · ${tokenPart}` : promptPart,
+    percent: Math.min(100, Math.floor(100 * Math.max(...shares))),
+    both: Boolean(tokenPart),
+  };
+}
+
+/** The GitHub bonus offer, or null once GitHub is linked (or the server sends no bonus). */
+function githubOffer(u) {
+  if (u?.github !== null) return null;  // undefined = an older server that does not say
+  const prompts = Number(u?.githubBonusPrompts) || 0;
+  const tokens = Number(u?.githubBonusTokens) || 0;
+  if (!prompts && !tokens) return null;
+  const gets = [prompts ? `+${prompts} prompts` : '', tokens ? `+${shortTokens(tokens)} tokens` : ''].filter(Boolean).join(' and ');
+  return `Link GitHub at jaitus.com for ${gets}.`;
+}
+
+/**
+ * The plan as meters for /usage (popup) and `jaitus usage` (text): the 5-hour window,
+ * the week and the month fill at their own rates from the same requests, so each gets
+ * its own bar and its own reset time. Extra usage and the free tier follow.
  */
 export function planSections(u) {
   const st = u?.planStatus || null;
@@ -125,15 +171,18 @@ export function planSections(u) {
   if (!u?.isPaid) {
     out.push({ heading: 'Free plan' });
     if (st?.freeTierStatus === 'locked') {
-      out.push({ label: 'Free prompts', value: 'not available — this computer already has its free accounts', tone: 'bad' });
+      out.push({ label: 'Free prompts', value: 'not available — another account on this computer already has them. Subscribe at jaitus.com/billing.', tone: 'bad' });
     } else {
-      out.push({ meter: 'Free prompts', used: u?.freeRequestsUsed ?? 0, total: u?.freeRequestLimit || 0, detail: `${u?.freeRequestsUsed ?? 0} of ${u?.freeRequestLimit ?? '?'} prompts used` });
+      const free = freeAllowance(u);
+      out.push({ meter: 'Free allowance', used: free.percent, total: 100, detail: free.both ? `${free.text} — whichever runs out first` : `${free.text} used` });
+      const offer = githubOffer(u);
+      if (offer) out.push({ label: 'More free use', value: offer });
     }
   } else {
     out.push({ heading: st?.name || 'Your plan' });
     const p = planPercents(st);
     if (p?.window != null) {
-      out.push({ meter: `${p.windowHours}-hour session`, used: p.window, total: 100, note: p.windowResetsAt ? `resets at ${clock(p.windowResetsAt)}` : 'starts with your next request' });
+      out.push({ meter: `${p.windowHours}-hour window`, used: p.window, total: 100, note: p.windowResetsAt ? `resets at ${clock(p.windowResetsAt)}` : 'starts with your next request' });
     }
     if (p?.week != null) {
       out.push({ meter: 'Week', used: p.week, total: 100, note: p.weekResetsAt ? `resets ${dayAndClock(p.weekResetsAt)}` : 'starts with your next request' });
@@ -141,19 +190,20 @@ export function planSections(u) {
     if (p?.month != null) {
       out.push({ meter: 'Month', used: p.month, total: 100, note: p.monthResetsAt ? `resets ${shortDate(p.monthResetsAt)}` : '' });
     }
-    if (u.planExpiresAt) out.push({ label: 'Renews by', value: longDate(u.planExpiresAt) });
+    if (u.planExpiresAt) out.push({ label: 'Plan ends', value: longDate(u.planExpiresAt) });
   }
   const extra = extraLine(planPercents(st));
   if (extra) out.push({ label: 'Extra usage', value: extra, tone: 'good' });
   return out;
 }
 
-/** A session's spend as plan shares: "2.1% of a 5-hour session · 0.5% of your week". */
+/** A session's spend as plan shares: "2.1% of a 5-hour window · 0.5% of your week". */
 export function spendText(credits, st = lastPlan) {
   const s = spendShare(credits, st);
   const parts = [];
-  if (s.window != null) parts.push(`${fmtShare(s.window)} of a 5-hour session`);
+  if (s.window != null) parts.push(`${fmtShare(s.window)} of a ${st?.windowHours || 5}-hour window`);
   if (s.week != null) parts.push(`${fmtShare(s.week)} of your week`);
+  if (s.month != null) parts.push(`${fmtShare(s.month)} of your month`);
   return parts.join(' · ');
 }
 
@@ -166,7 +216,7 @@ export function costSections(spent, st = lastPlan) {
     { label: 'Tool calls', value: String(spent?.tools || 0) },
     { gap: true },
     { label: 'Fresh input', value: `${(spent?.input || 0).toLocaleString()} tokens` },
-    { label: 'Cached input', value: `${(spent?.cached || 0).toLocaleString()} tokens (counted at the lower cached price)` },
+    { label: 'Cached input', value: `${(spent?.cached || 0).toLocaleString()} tokens (uses less of your plan than fresh input)` },
     { label: 'Output', value: `${(spent?.output || 0).toLocaleString()} tokens` },
     { gap: true },
     { label: '', value: '/usage for your plan' },
@@ -176,15 +226,20 @@ export function costSections(spent, st = lastPlan) {
 /** The plan as rows for `jaitus whoami`. */
 export function planRows(u) {
   const st = u?.planStatus || null;
-  if (!u?.isPaid) return [['Plan', 'Free'], ['Free prompts', `${u?.freeRequestsUsed ?? 0} of ${u?.freeRequestLimit ?? '?'} used`]];
+  if (!u?.isPaid) {
+    if (st?.freeTierStatus === 'locked') return [['Plan', 'Free'], ['Free prompts', 'not available — another account on this computer already has them']];
+    const free = freeAllowance(u);
+    const offer = githubOffer(u);
+    return [['Plan', 'Free'], ['Free allowance', `${free.text} used${free.both ? ' (whichever runs out first)' : ''}`], ...(offer ? [['More free use', offer]] : [])];
+  }
   const rows = [['Plan', st?.name || 'Paid']];
   const p = planPercents(st);
-  if (p?.window != null) rows.push([`${p.windowHours}-hour session`, `${p.window}% used · ${p.windowResetsAt ? `resets at ${clock(p.windowResetsAt)}` : 'starts with your next request'}`]);
+  if (p?.window != null) rows.push([`${p.windowHours}-hour window`, `${p.window}% used · ${p.windowResetsAt ? `resets at ${clock(p.windowResetsAt)}` : 'starts with your next request'}`]);
   if (p?.week != null) rows.push(['Week', `${p.week}% used · ${p.weekResetsAt ? `resets ${dayAndClock(p.weekResetsAt)}` : 'starts with your next request'}`]);
   if (p?.month != null) rows.push(['Month', `${p.month}% used${p.monthResetsAt ? ` · resets ${shortDate(p.monthResetsAt)}` : ''}`]);
   const extra = extraLine(p);
   if (extra) rows.push(['Extra usage', extra]);
-  if (u.planExpiresAt) rows.push(['Renews by', new Date(u.planExpiresAt).toLocaleDateString()]);
+  if (u.planExpiresAt) rows.push(['Plan ends', new Date(u.planExpiresAt).toLocaleDateString()]);
   return rows;
 }
 
@@ -202,13 +257,18 @@ export function publicPlan(st) {
   };
 }
 
-/** A copy of a response for --json with every credit field taken out, at any depth. */
+// Fields that are the server's internal accounting, not something a customer pays or
+// reads: `cost` and `estimatedCost` are in that internal unit, and the per-model
+// breakdown names what served each request.
+const INTERNAL_KEYS = new Set(['cost', 'estimatedcost', 'modelbreakdown']);
+
+/** A copy of a response for --json with every credit (and internal cost) field taken out, at any depth. */
 export function withoutCredits(value) {
   if (Array.isArray(value)) return value.map(withoutCredits);
   if (!value || typeof value !== 'object' || value instanceof Date) return value;
   const out = {};
   for (const [k, v] of Object.entries(value)) {
-    if (/credit/i.test(k)) continue;
+    if (/credit/i.test(k) || INTERNAL_KEYS.has(k.toLowerCase())) continue;
     out[k] = k === 'planStatus' ? publicPlan(v) : withoutCredits(v);
   }
   return out;

package/src/skills.js

@@ -2,7 +2,7 @@
 //
 // A skill is a small, discoverable workflow stored as SKILL.md — the open Agent Skills
 // format: a short YAML frontmatter description plus markdown instructions. Skills
-// already written for other agents (in .claude/skills) are picked up too; they are
+// already written for other coding agents in the same format are picked up too; they are
 // instructions only and never run anything by themselves.
 
 import fs from 'node:fs';

package/src/tui/entries.js

@@ -89,7 +89,7 @@ const BUILDERS = {
     const p = palette();
     const version = data.version ? `v${data.version}` : '';
     const tagline = `a coding agent in your terminal${version ? `  ${pick(['·', '-'])}  ${version}` : ''}`;
-    const chip = { t: ' J ', color: '#ffffff', backgroundColor: p.brand, bold: true };
+    const chip = { t: ' J ', color: '#03140d', backgroundColor: p.brand, bold: true };
     // One row: the chip, the name, and the tagline only if it fits whole. A tagline
     // truncated mid-word reads as a rendering bug, not as a small terminal.
     const oneLine = () => {
@@ -98,7 +98,7 @@ const BUILDERS = {
       return [row];
     };
 
-    // A raster console draws block elements as tofu, so there the brand is the coral
+    // A raster console draws block elements as tofu, so there the brand is the mint
     // chip and the name in caps — still the identity, just not drawn.
     if (useAscii()) return oneLine();
 

package/src/tui/theme.js

@@ -5,7 +5,7 @@
 // ROLE rather than by hue is what makes a second theme a data change instead of a
 // rewrite: nothing downstream asks for "orange", it asks for `brand`.
 //
-// The two-tone identity is the site's: coral leads, teal answers. Red and amber are
+// The identity is the site's: mint leads, a sibling teal answers. Red and amber are
 // kept strictly semantic — a failure and a warning — so a screen with no red on it is
 // a screen with nothing wrong, which is a property worth having.
 
@@ -13,22 +13,22 @@ import { themeName } from '../ui.js';
 
 const DARK = {
   name: 'dark',
-  bg: '#0b0f14',
-  surface: '#11161e',
-  raised: '#18202b',
-  sunken: '#080c11',
-  line: '#212c3a',
-  lineSoft: '#161f2a',
-  text: '#e6edf3',
-  muted: '#93a4b8',
-  dim: '#5d6e82',
-  faint: '#3a4757',
-  brand: '#ff6b4a',
-  brandSoft: '#ffa285',
-  brandDeep: '#c94a2e',
-  teal: '#20a898',
-  tealSoft: '#63dccc',
-  tealDeep: '#0f7a6e',
+  bg: '#05070a',
+  surface: '#0e1312',
+  raised: '#151c1a',
+  sunken: '#030405',
+  line: '#1f2a27',
+  lineSoft: '#141b19',
+  text: '#eef3f1',
+  muted: '#9aa6a0',
+  dim: '#66726c',
+  faint: '#36413d',
+  brand: '#3df2b0',
+  brandSoft: '#7af7ca',
+  brandDeep: '#1fc48a',
+  teal: '#2dd4bf',
+  tealSoft: '#7eeadb',
+  tealDeep: '#14a58f',
   green: '#3fb950',
   yellow: '#d9a441',
   red: '#ff6b6b',
@@ -65,9 +65,9 @@ const LIGHT = {
   muted: '#5a6673',
   dim: '#83909e',
   faint: '#aab4bf',
-  brand: '#c8431f',
-  brandSoft: '#e4724f',
-  brandDeep: '#8f2c11',
+  brand: '#0f8a5f',
+  brandSoft: '#1fb37c',
+  brandDeep: '#0a5f42',
   teal: '#0f7a6e',
   tealSoft: '#2ba394',
   tealDeep: '#0a574e',
@@ -110,7 +110,7 @@ const OCEAN = {
   tealSoft: '#7df0e0',
 };
 
-// Blue leads instead of coral: deuteranopia and protanopia both keep red/orange and
+// Blue leads instead of mint: deuteranopia and protanopia both keep red/orange and
 // green apart poorly, and a UI whose primary accent is orange loses its whole voice.
 const DALTONIZED = {
   ...DARK,

package/src/tui/wordmark.js

@@ -106,7 +106,7 @@ export function wordSize(word = 'JAITUS') {
  * The word as rows of spans, using half-blocks.
  *
  * `ink(column, total)` returns the colour for a column, so the caller owns the gradient
- * — the app runs coral to teal across the word and dims the whole thing during the
+ * — the app runs mint to teal across the word and dims the whole thing during the
  * intro, and neither of those belongs in the letterforms.
  */
 export function wordRows(word = 'JAITUS', ink = () => undefined) {