jeo-code 0.7.56 → 0.7.58

package/src/ai/model-manager.ts

@@ -146,10 +146,23 @@ export async function describeModel(
   return { input, resolved, provider: resolveProvider(resolved) };
 }
 
-export type ModelRole = "smol" | "slow" | "plan";
-
-/** Resolve a model role tier (smol/slow/plan) → configured tier model, else defaultModel. */
-export function resolveRoleModel(role: ModelRole, config: { defaultModel: string; roles?: { smol?: string; slow?: string; plan?: string } }): string {
+export type ModelRole = "smol" | "medium" | "high" | "xhigh" | "slow" | "plan";
+
+/** Resolve a model role tier (smol/medium/high/xhigh/slow/plan) → configured tier model, else defaultModel. */
+export function resolveRoleModel(
+  role: ModelRole,
+  config: {
+    defaultModel: string;
+    roles?: {
+      smol?: string;
+      medium?: string;
+      high?: string;
+      xhigh?: string;
+      slow?: string;
+      plan?: string;
+    };
+  },
+): string {
   return config.roles?.[role] || config.defaultModel;
 }
 

package/src/auth/callback-server.ts

@@ -58,13 +58,15 @@ h1.ok{color:#22d3ee}h1.fail{color:#f472b6}
 p{margin:.25rem 0;color:#8b8b96;font-size:.92rem}
 button{margin-top:1.5rem;padding:.55rem 1.6rem;border-radius:999px;border:1px solid #2a2a35;background:transparent;color:#e7e7ec;font:inherit;font-size:.88rem;cursor:pointer}
 button:hover{background:#1b1c27}
-.hint{margin-top:.9rem;font-size:.78rem;color:#5f5f6b}</style></head>
+.hint{margin-top:.9rem;font-size:.78rem;color:#5f5f6b}
+.closed{display:none}</style></head>
 <body><div class="card">
 <img class="wordmark" alt="jeo" src="${JEO_WORDMARK_DATA_URI}">
 <h1 class="__STATUS__">__TITLE__</h1>
 <p>__MSG__</p>
 <button id="jeo-close" type="button">Close</button>
 <p class="hint">Closing automatically in <span id="jeo-countdown">__SECONDS__</span>s…</p>
+<p class="hint closed" id="jeo-closed-msg">Window closed. You can close this tab.</p>
 </div>
 <script>__SCRIPT__</script>
 </body></html>`;
@@ -78,8 +80,16 @@ const AUTO_CLOSE_SECONDS = 5;
 
 function renderHtml(ok: boolean, msg: string): string {
   const script = `(function(){
-    var n=${AUTO_CLOSE_SECONDS},el=document.getElementById("jeo-countdown"),btn=document.getElementById("jeo-close"),t;
-    function closeNow(){clearInterval(t);window.close();}
+    var n=${AUTO_CLOSE_SECONDS},el=document.getElementById("jeo-countdown"),btn=document.getElementById("jeo-close"),closedMsg=document.getElementById("jeo-closed-msg"),t;
+    function closeNow(){
+      clearInterval(t);
+      var closed=window.close();
+      if(!closed){
+        btn.style.display="none";
+        el.parentElement.style.display="none";
+        closedMsg.classList.remove("closed");
+      }
+    }
     t=setInterval(function(){n-=1;if(el)el.textContent=String(Math.max(n,0));if(n<=0)closeNow();},1000);
     if(btn)btn.addEventListener("click",closeNow);
   })();`;

package/src/commands/doctor.ts

@@ -8,7 +8,7 @@ import { meter } from "../tui/components/meter";
 import { size } from "../tui/terminal";
 import chalk from "chalk";
 import { extractChatgptAccountId, CODEX_RESPONSES_URL } from "../ai/providers/openai-responses";
-import { resolveTierModel } from "../agent/prompt-router";
+import { resolveTierModel, tierModelPool } from "../agent/prompt-router";
 
 interface ProbeResult {
   status: "ok" | "fail" | "skipped";
@@ -197,8 +197,9 @@ export async function runDoctorCommand(args: string[] = []): Promise<void> {
   if (routingEnabled) {
     const tierCandidates: { tier: string; model: string | undefined }[] = [
       { tier: "trivial", model: config.routing?.tiers?.trivial?.model || config.roles?.smol },
-      { tier: "standard", model: config.routing?.tiers?.standard?.model },
-      { tier: "complex", model: config.routing?.tiers?.complex?.model || config.roles?.slow },
+      { tier: "standard", model: config.routing?.tiers?.standard?.model || config.roles?.medium || config.roles?.high },
+      { tier: "high", model: config.routing?.tiers?.high?.model || config.roles?.high || config.roles?.medium },
+      { tier: "complex", model: config.routing?.tiers?.complex?.model || config.roles?.xhigh || config.roles?.slow },
     ];
     for (const { tier, model } of tierCandidates) {
       if (!model) continue;
@@ -220,11 +221,36 @@ export async function runDoctorCommand(args: string[] = []): Promise<void> {
   // informational — never affects ready/--strict, same contract as routingNotes.
   const routingPreview: { tier: string; model: string; provider: string; source: string }[] = [];
   if (routingEnabled) {
-    for (const tier of ["trivial", "standard", "complex"] as const) {
-      const explicit = config.routing?.tiers?.[tier]?.model || (tier === "trivial" ? config.roles?.smol : tier === "complex" ? config.roles?.slow : undefined);
+    // Legacy role-tier fallback per tier, mirroring resolveTierModel's OWN precedence
+    // (not just the id it happens to already show up under `routing.tiers.*.model`) —
+    // so e.g. a `roles.medium`-only config correctly shows "configured", not
+    // "auto-selected", for `standard`.
+
+    for (const tier of ["trivial", "standard", "high", "complex"] as const) {
+      const legacyRole =
+        tier === "trivial" ? config.roles?.smol
+        : tier === "standard" ? config.roles?.medium || config.roles?.high
+        : tier === "high" ? config.roles?.high || config.roles?.medium
+        : config.roles?.xhigh || config.roles?.slow;
+      const explicit = config.routing?.tiers?.[tier]?.model || legacyRole;
       const model = resolveTierModel(tier, config);
       const provider = resolveProvider(model);
-      const source = explicit ? "configured" : model === config.defaultModel ? "defaultModel" : tier === "trivial" ? "auto-selected: cheapest credentialed" : "auto-selected: strongest credentialed";
+      // crossProviderPoolPick (prompt-router.ts) is tried BEFORE every tier's own
+      // cheapest/strongest/mid-tier fallback, so a non-empty pool always wins over
+      // those once the flag is on — `.length > 0` alone is enough to know the pool,
+      // not the tier-specific fallback, produced `model`.
+      const pooled = !explicit && model !== config.defaultModel && !!config.routing?.crossProviderPool && tierModelPool(tier, config).length > 0;
+      const source = explicit
+        ? "configured"
+        : model === config.defaultModel
+          ? "defaultModel"
+          : pooled
+            ? "auto-selected: cross-provider pool"
+            : tier === "trivial"
+              ? "auto-selected: cheapest credentialed"
+              : tier === "high"
+                ? "auto-selected: strongest mid-tier credentialed"
+                : "auto-selected: strongest credentialed";
       routingPreview.push({ tier, model, provider, source });
     }
   }

package/src/commands/launch.ts

@@ -885,7 +885,7 @@ export async function runLaunchCommand(args: string[]): Promise<void> {
     // selection must stay session-local: running sessions never influence each other.
     const routingEnabled = sessionRouteOverride ?? !!turnConfig.routing?.enabled;
     let routed = routingEnabled && !sessionModel
-      ? await routePrompt(userInput, turnConfig, { hasImages: !!images?.length }).catch(() => null)
+      ? await routePrompt(userInput, turnConfig, { hasImages: !!images?.length, sessionId }).catch(() => null)
       : null;
     // Fail-open credential gate: `routePrompt` only resolves a tier's model from
     // config (routing.tiers/roles.smol/roles.slow/defaultModel) — it deliberately

package/src/tui/app.ts

@@ -73,7 +73,7 @@ export interface LaunchTuiOptions {
    *  gate fell back). Renders a persistent `⚡tier` marker in the status bar so the
    *  routed model stays visible without depending on the transient `[route]`
    *  console notice. See `StatusBarData.routedTier` in components/status.ts. */
-  routedTier?: "trivial" | "standard" | "complex";
+  routedTier?: "trivial" | "standard" | "high" | "complex";
 }
 
 export interface AgentEventsLike {
@@ -375,7 +375,7 @@ export class LaunchTui {
   private readonly thinkingLevel?: string;
   // PromptRouter's resolved tier when routing chose this turn's model; undefined when
   // routing didn't engage. Renders the persistent `⚡tier` marker in the status bar.
-  private readonly routedTier?: "trivial" | "standard" | "complex";
+  private readonly routedTier?: "trivial" | "standard" | "high" | "complex";
 
   constructor(opts: LaunchTuiOptions) {
     // Backpressure-aware wrapper around the underlying writer (real stdout, or the

package/src/tui/components/status.ts

@@ -24,7 +24,7 @@ export interface StatusBarData {
    *  marker so the routed model stays visible without depending on the transient
    *  `[route] …` console notice, which intentionally stays silent for routine
    *  unescalated `standard`-tier turns. */
-  routedTier?: "trivial" | "standard" | "complex";
+  routedTier?: "trivial" | "standard" | "high" | "complex";
   branch?: string;
   /** Uncommitted-change count for the `?N` dirty flag; omit/0 = clean. */
   dirtyCount?: number;