jeo-code 0.6.22 → 0.6.24

package/src/tui/components/provider-picker.ts

@@ -7,6 +7,12 @@ import { SelectList, renderSelectList, type SelectItem, type RenderSelectOptions
 import type { ProviderStatus } from "../../ai/provider-status";
 import type { ProviderName } from "../../ai/types";
 import { companyLabel } from "../../ai/model-catalog";
+import { SUBSCRIPTION_PROVIDER_NAMES } from "../../ai/providers/openai-compatible-catalog";
+
+/** True for subscription/plan-tier providers (coding-plan, portal, token-plan, code). */
+export function isSubscriptionProvider(name: ProviderName): boolean {
+  return (SUBSCRIPTION_PROVIDER_NAMES as readonly string[]).includes(name);
+}
 
 /** Right-aligned hint for a provider row: credential kind + base URL + readiness. */
 export function providerHint(s: ProviderStatus, unicode = true): string {
@@ -43,3 +49,159 @@ export function providerPicker(statuses: ProviderStatus[], unicode = true): Sele
 export function renderProviderPicker(list: SelectList<ProviderName>, opts: RenderSelectOptions = {}): string[] {
   return renderSelectList(list, { title: "Select a provider", rows: 8, ...opts });
 }
+/** Relative expiry label for a stored OAuth token, e.g. "expires in 42m" / "expired". */
+export function loginExpiryLabel(expires: number | undefined, now: number = Date.now()): string | undefined {
+  if (!expires) return undefined;
+  const ms = expires - now;
+  if (ms <= 0) return "expired";
+  const mins = Math.round(ms / 60000);
+  if (mins < 60) return `expires in ${mins}m`;
+  return `expires in ${Math.round(mins / 60)}h`;
+}
+
+/** Right-aligned hint for a `/login` row: live OAuth login status (account + expiry)
+ *  rather than generic readiness. Logged-in providers show a check + account/expiry;
+ *  others show a muted "not logged in". gjc-parity for the login selector. */
+export function loginHint(s: ProviderStatus, unicode = true): string {
+  if (!s.loggedIn) return unicode ? "\u00b7 not logged in" : "not logged in";
+  const parts: string[] = [unicode ? "\u2713 logged in" : "logged in"];
+  if (s.oauthEmail) parts.push(s.oauthEmail);
+  const expiry = loginExpiryLabel(s.oauthExpires);
+  if (expiry) parts.push(expiry);
+  return parts.join(" \u00b7 ");
+}
+
+/** Build `/login` choices: logged-in providers first, each row badged with its live
+ *  OAuth login status (account/expiry). Pure builder mirroring gjc's OAuth selector. */
+export function buildLoginChoices(statuses: ProviderStatus[], unicode = true): SelectItem<ProviderName>[] {
+  const sorted = [...statuses].sort((a, b) => (!!a.loggedIn === !!b.loggedIn ? 0 : a.loggedIn ? -1 : 1));
+  return sorted.map(s => ({
+    value: s.name,
+    label: `${s.name} (${companyLabel(s.name)})`,
+    group: s.loggedIn ? "logged in" : "not logged in",
+    hint: loginHint(s, unicode),
+  }));
+}
+
+/** Construct a ready-to-drive `SelectList` for the `/login` flow. */
+export function loginPicker(statuses: ProviderStatus[], unicode = true): SelectList<ProviderName> {
+  return new SelectList(buildLoginChoices(statuses, unicode));
+}
+
+/** Right-aligned hint for a subscription-provider row: whether its key/token is stored,
+ *  plus the env var that seeds it. Subscriptions authenticate by token, not OAuth. */
+export function subscriptionHint(s: ProviderStatus, unicode = true): string {
+  const set = s.kind === "api_key";
+  const badge = set ? (unicode ? "\u2713 active" : "active") : (unicode ? "\u00b7 no token" : "no token");
+  return s.envVar ? `${badge} \u00b7 ${s.envVar}` : badge;
+}
+
+/** Build the combined "OAuth / subscription" login choices: OAuth providers (logged-in
+ *  first, badged with account/expiry) followed by subscription-tier providers (active
+ *  first, badged with token status). Pure builder mirroring gjc's onboarding selector. */
+export function buildSubscriptionLoginChoices(
+  oauthStatuses: ProviderStatus[],
+  subscriptionStatuses: ProviderStatus[],
+  unicode = true,
+): SelectItem<ProviderName>[] {
+  const oauth = [...oauthStatuses]
+    .sort((a, b) => (!!a.loggedIn === !!b.loggedIn ? 0 : a.loggedIn ? -1 : 1))
+    .map(s => ({
+      value: s.name,
+      label: `${s.name} (${companyLabel(s.name)})`,
+      group: "OAuth login",
+      hint: loginHint(s, unicode),
+    }));
+  const subs = [...subscriptionStatuses]
+    .sort((a, b) => ((a.kind === "api_key") === (b.kind === "api_key") ? 0 : a.kind === "api_key" ? -1 : 1))
+    .map(s => ({
+      value: s.name,
+      label: `${s.name} (${companyLabel(s.name)})`,
+      group: "subscription / plan",
+      hint: subscriptionHint(s, unicode),
+    }));
+  return [...oauth, ...subs];
+}
+
+/** Construct a ready-to-drive `SelectList` for the combined OAuth / subscription login flow. */
+export function subscriptionLoginPicker(
+  oauthStatuses: ProviderStatus[],
+  subscriptionStatuses: ProviderStatus[],
+  unicode = true,
+): SelectList<ProviderName> {
+  return new SelectList(buildSubscriptionLoginChoices(oauthStatuses, subscriptionStatuses, unicode));
+}
+
+/** Render a login picker `SelectList` with a sensible default title. */
+export function renderLoginPicker(list: SelectList<ProviderName>, opts: RenderSelectOptions = {}): string[] {
+  return renderSelectList(list, { title: "Select provider to login", rows: 8, ...opts });
+}
+
+/** The ways to onboard a provider, mirroring gjc's `/provider` onboarding selector:
+ *  log in to an OAuth/subscription provider, register an API-compatible endpoint, or
+ *  store an API key for one of the bundled API-key-only providers (groq, deepseek, …). */
+export type OnboardingAction = "oauth-login" | "api-key" | "api-add";
+
+/** Build the bare-`/provider` onboarding choices (gjc-parity interactive selector).
+ *  Pure builder: OAuth-login first (the common path), then API-key providers, then a
+ *  custom API-compatible endpoint. */
+export function buildOnboardingChoices(unicode = true): SelectItem<OnboardingAction>[] {
+  const arrow = unicode ? "\u2192 " : "";
+  return [
+    {
+      value: "oauth-login",
+      label: "Login with OAuth / subscription",
+      hint: `${arrow}OAuth providers + subscription / plan tokens`,
+    },
+    {
+      value: "api-key",
+      label: "Set an API key for a provider",
+      hint: `${arrow}groq, deepseek, mistral, openrouter, …`,
+    },
+    {
+      value: "api-add",
+      label: "Add an API-compatible endpoint",
+      hint: `${arrow}/provider add --base-url <url>`,
+    },
+  ];
+}
+
+/** Construct a ready-to-drive `SelectList` for the bare-`/provider` onboarding flow. */
+export function onboardingPicker(unicode = true): SelectList<OnboardingAction> {
+  return new SelectList(buildOnboardingChoices(unicode));
+}
+
+/** Render the onboarding picker `SelectList` with a sensible default title. */
+export function renderOnboardingPicker(list: SelectList<OnboardingAction>, opts: RenderSelectOptions = {}): string[] {
+  return renderSelectList(list, { title: "Provider onboarding  \u2191\u2193 move \u00b7 Enter select \u00b7 Esc cancel", rows: 4, ...opts });
+}
+
+/** Right-aligned hint for an API-key provider row: whether a key is stored, plus the
+ *  env var that seeds it. Mirrors `loginHint` but for keyed (no-OAuth) providers. */
+export function apiKeyHint(s: ProviderStatus, unicode = true): string {
+  const set = s.kind === "api_key";
+  const badge = set ? (unicode ? "\u2713 key set" : "key set") : (unicode ? "\u00b7 no key" : "no key");
+  return s.envVar ? `${badge} \u00b7 ${s.envVar}` : badge;
+}
+
+/** Build `/provider` API-key choices: providers with a stored key first, each badged with
+ *  its key status + env var. Pure builder mirroring the OAuth login selector. */
+export function buildApiKeyChoices(statuses: ProviderStatus[], unicode = true): SelectItem<ProviderName>[] {
+  const sorted = [...statuses].sort((a, b) => (a.kind === "api_key") === (b.kind === "api_key") ? 0 : a.kind === "api_key" ? -1 : 1);
+  return sorted.map(s => ({
+    value: s.name,
+    label: `${s.name} (${companyLabel(s.name)})`,
+    group: s.kind === "api_key" ? "key set" : "needs key",
+    hint: apiKeyHint(s, unicode),
+  }));
+}
+
+/** Construct a ready-to-drive `SelectList` for the API-key onboarding flow. */
+export function apiKeyPicker(statuses: ProviderStatus[], unicode = true): SelectList<ProviderName> {
+  return new SelectList(buildApiKeyChoices(statuses, unicode));
+}
+
+/** Render the API-key provider picker `SelectList` with a sensible default title. */
+export function renderApiKeyPicker(list: SelectList<ProviderName>, opts: RenderSelectOptions = {}): string[] {
+  return renderSelectList(list, { title: "Select a provider to key", rows: 8, ...opts });
+}

package/src/tui/components/slash.ts

@@ -37,8 +37,8 @@ export const SLASH_COMMAND_DETAILS: readonly SlashCommandInfo[] = [
   { command: "/goal", usage: "/goal <condition>", description: "Set a natural language stop condition for the session", group: "session" },
   { command: "/model", usage: "/model [id|#N|save|thinking <level>|subagent <role> <model|#N|thinking L>]", description: "Show/switch model; picker can apply to default or any subagent role and set thinking", group: "models" },
   { command: "/fast", usage: "/fast [on|off|status]", description: "Toggle fast thinking mode when the active model supports it", group: "models" },
-  { command: "/provider", usage: "/provider [login [name] | add --base-url <url> [--model <m>]]", description: "Provider onboarding: `login [name]` starts OAuth; `add --base-url <url>` registers an OpenAI-compatible endpoint. Switch the active model/provider with /model", group: "models" },
-  { command: "/login", usage: "/login [provider]", description: "OAuth login (alias of /provider login)", group: "models" },
+  { command: "/provider", usage: "/provider [login [name] | key [name] [key] | add --base-url <url> [--model <m>]]", description: "Provider onboarding: `login [name]` starts OAuth; `key [name]` stores an API key (groq, deepseek, …); `add --base-url <url>` registers an OpenAI-compatible endpoint. Switch the active model/provider with /model", group: "models" },
+  { command: "/login", usage: "/login [provider]", description: "OAuth login — opens a provider picker showing live login status (account · expiry) for each provider (alias of /provider login)", group: "models" },
   { command: "/logout", usage: "/logout <anthropic|openai|gemini|antigravity>", description: "Remove the stored OAuth token for a provider", group: "models" },
   { command: "/roles", usage: "/roles [tier model]", description: "Show or set model role tiers (smol/slow/plan)", group: "models" },
   { command: "/thinking", usage: "/thinking [level]", description: "Show or set thinking budget (minimal/low/medium/high/xhigh)", group: "models" },

package/src/tui/components/transcript.ts

@@ -156,6 +156,13 @@ export function formatTranscript(messages: readonly Message[], opts: TranscriptO
           ? ""
           : m.content;
     if (!reason.trim()) continue;
+    // Persisted thinking (gjc "think → answer" order): show the turn's reasoning,
+    // dimmed, above the reply so the durable record carries it across /resume + export.
+    if (m.reasoning?.trim()) {
+      if (lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
+      lines.push(dim(`${unicode ? "◇" : "*"} thinking`));
+      for (const l of clipBody(m.reasoning.trim(), bodyCap)) lines.push(dim(l));
+    }
     if (lines.length > 0 && lines[lines.length - 1] !== "") {
       lines.push("");
     }

package/src/tui/components/welcome.ts

@@ -1,5 +1,5 @@
 import chalk from "chalk";
-import { renderDnaClaw, DNA_CLAW_ART_GRAND } from "./ascii-art";
+import { renderForgeMark, FORGE_MARK_ART_GRAND } from "./ascii-art";
 import { truncate, isTTY } from "../terminal";
 import { detectColorLevel, ColorLevel } from "./color";
 
@@ -13,7 +13,7 @@ export interface WelcomeData {
   contextFiles?: string[]; // project context file paths (render basenames)
   recentSessions?: { name: string; timeAgo: string }[];
   cols?: number;           // default 80
-  /** Gradient phase [0..1) for the DNA Claw symbol — drives the launch sweep animation. */
+  /** Gradient phase [0..1) for the forge mark — drives the launch sweep animation. */
   phase?: number;
   /** Lit-edge painter (top border + left edge); theme accent. Default gray. */
   accent?: (s: string) => string;
@@ -42,7 +42,7 @@ function padLine(line: string, width: number, align: "left" | "center" | "right"
 /**
  * The gjc-style hero welcome box ("JEO forge"): one outer box with the version
  * embedded in the top border and a SINGLE CENTERED column inside — brand line,
- * tagline, the grand DNA Claw symbol (flowing gradient on capable terminals),
+ * tagline, the grand jeo forge mark (flowing gradient on capable terminals),
  * and the model/provider pills. Workspace details and key hints intentionally
  * live elsewhere (footer/status bar), matching the gjc forge banner.
  */
@@ -57,8 +57,8 @@ export function renderWelcome(d: WelcomeData): string[] {
 
   // The banner fills the full terminal width (gjc forge: flush with the input box and
   // status bar below it). `cols - 1` leaves the last column free so a full-width row
-  // never wraps; the DNA-claw + pills stay centered inside the box.
-  const grandWidth = Math.max(...DNA_CLAW_ART_GRAND.map(l => l.length));
+  // never wraps; the forge mark + pills stay centered inside the box.
+  const grandWidth = Math.max(...FORGE_MARK_ART_GRAND.map(l => l.length));
   // Title rides ON the top border: `─── jeo v{version} · JEO forge ───`. Defined
   // once here so the width calc and the border render below can't drift.
   const titleDashes = 3;
@@ -93,10 +93,10 @@ export function renderWelcome(d: WelcomeData): string[] {
   const bottomBorderPlain = g.bl + g.h.repeat(inner) + g.br;
   const bottomBorderLine = shadow(bottomBorderPlain);
 
-  // Grand symbol when the box is wide enough; compact DNA Claw otherwise.
+  // Grand symbol when the box is wide enough; compact forge mark otherwise.
   const colorLevel = useColor ? detectColorLevel(process.env, isTTY()) : ColorLevel.None;
   const grand = inner >= grandWidth;
-  const artLines = renderDnaClaw({
+  const artLines = renderForgeMark({
     color: useColor,
     phase: d.phase ?? 0,
     unicode,
@@ -136,7 +136,7 @@ export function renderWelcome(d: WelcomeData): string[] {
 }
 
 /**
- * Launch animation: sweep the DNA Claw's gradient through `cycles` FULL palette
+ * Launch animation: sweep the forge mark's gradient through `cycles` FULL palette
  * cycles by re-printing the welcome box in place (cursor-up rewrites, same row
  * count every frame). The loop is SEAMLESS — the phase wraps exactly at each
  * cycle boundary with a constant frame delay, so consecutive cycles join with

package/src/tui/components/width.ts

@@ -246,3 +246,24 @@ export function wrapTextWithAnsi(text: string, cols: number): string[] {
   }
   return out;
 }
+
+/**
+ * Single-slot memo for the live-frame wrap. The TUI's 120ms spinner tick re-renders
+ * the whole frame ~8×/s, but the reasoning / tool-output stream text only changes when
+ * a new delta arrives — so re-wrapping (grapheme-segmenting the up-to-16KB tail through
+ * `wrapTextWithAnsi`) on every idle tick is the hottest avoidable per-tick cost. This
+ * caches the most recent `key → value`: an unchanged frame reuses the prior wrap instead
+ * of recomputing it. One slot suffices — between two consecutive ticks the key (wrap
+ * width + text) is identical on the common path; a real change recomputes once.
+ */
+export function lastValueCache<T>(): (key: string, compute: () => T) => T {
+  let lastKey: string | undefined;
+  let lastValue: T;
+  return (key, compute) => {
+    if (key !== lastKey) {
+      lastKey = key;
+      lastValue = compute();
+    }
+    return lastValue;
+  };
+}