@pi-unipi/fusion 2.17.0 → 2.17.1

package/README.md

@@ -117,11 +117,14 @@ savings above `$0.005`.
   "default": {"lead": "provider/lead", "sidekick": "provider/sidekick"},
   "effort": {"provider/sidekick": "high"},
   "badges": {"provider/sidekick": "new"},
+  "prices": {"provider/sidekick": {"input": 0.2, "cachedInput": 0.02, "output": 1.2}},
   "recent": ["provider/lead"],
   "active": {"kind": "fusion", "lead": "provider/lead", "sidekick": "provider/sidekick"}
 }
 ```
 
+`prices` is an optional manual override for models whose provider reports no pricing.
+
 ## Status
 
 - [x] Preset store, project layering, curation UI, autocomplete boost

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/fusion",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "description": "Devin-style model picker, fusion presets (lead + sidekick), and Local Fusion runtime for UniPi",
   "type": "module",
   "main": "src/index.ts",

package/src/index.ts

@@ -21,6 +21,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import {
   effortLabel,
+  globalPresetPath,
   isEffortLevel,
   loadPreset,
   modelKey,
@@ -60,20 +61,18 @@ function findModel(reg: Registry | undefined, key: string): Model<Api> | undefin
   return modelBykey.get(key);
 }
 
-function costOf(m: Model<Api> | undefined): PickerModel["cost"] {
-  const cost = m?.cost;
-  return cost && typeof cost.input === "number"
-    ? { input: cost.input, cachedInput: cost.cacheRead ?? 0, output: cost.output }
-    : undefined;
+function costOf(m: Model<Api> | undefined, override?: PickerModel["cost"]): PickerModel["cost"] {
+  const cost = override ?? (m?.cost && typeof m.cost.input === "number" ? { input: m.cost.input, cachedInput: m.cost.cacheRead ?? 0, output: m.cost.output } : undefined);
+  return cost && (cost.input > 0 || cost.cachedInput > 0 || cost.output > 0) ? cost : undefined;
 }
 
-function toPickerModel(m: Model<Api>, badge?: FusionPreset["badges"][string]): PickerModel {
+function toPickerModel(m: Model<Api>, badge?: FusionPreset["badges"][string], override?: PickerModel["cost"]): PickerModel {
   return {
     key: modelKey(m),
     name: m.name || m.id,
     provider: m.provider,
     badge,
-    cost: costOf(m),
+    cost: costOf(m, override),
     reasoning: Boolean(m.reasoning),
   };
 }
@@ -130,9 +129,10 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   function statusSavings(ctx: ExtensionContext): number | undefined {
     if (active?.kind !== "fusion" || runtime === undefined) return undefined;
     const reg = registryOf(ctx);
+    const preset = loadPreset(ctx.cwd ?? process.cwd()).preset;
     const lead = findModel(reg, active.lead);
     const side = findModel(reg, active.sidekick);
-    return estimateSavings(runtime.usage, costOf(lead), costOf(side)).savedUsd;
+    return estimateSavings(runtime.usage, costOf(lead, preset.prices[active.lead]), costOf(side, preset.prices[active.sidekick])).savedUsd;
   }
 
   function publishStatus(ctx: ExtensionContext): void {
@@ -180,8 +180,14 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   function savingsStats(ctx: ExtensionContext): string {
     if (active?.kind !== "fusion" || runtime === undefined) return "Fusion is not active — pick a Fusion pair with /unipi:model.";
     const reg = registryOf(ctx);
-    const savings = estimateSavings(runtime.usage, costOf(findModel(reg, active.lead)), costOf(findModel(reg, active.sidekick)));
-    return `Sidekick tokens: in ${String(runtime.usage.input)} · out ${String(runtime.usage.output)} · cached ${String(runtime.usage.cacheRead)} · cache write ${String(runtime.usage.cacheWrite)}\nSidekick cost: $${savings.sidekickUsd.toFixed(2)} · at lead prices: $${savings.atLeadUsd.toFixed(2)} · saved: $${savings.savedUsd.toFixed(2)}\nHandoffs: ${String(runtime.reports.size)} · runtime alive: ${String(runtime.isAlive())} · busy: ${String(runtime.isBusy())}`;
+    const preset = loadPreset(ctx.cwd ?? process.cwd()).preset;
+    const leadCost = costOf(findModel(reg, active.lead), preset.prices[active.lead]);
+    const sidekickCost = costOf(findModel(reg, active.sidekick), preset.prices[active.sidekick]);
+    const savings = estimateSavings(runtime.usage, leadCost, sidekickCost);
+    const pricing = leadCost === undefined && sidekickCost === undefined
+      ? '\nPricing unavailable from provider — set "prices" in ~/.unipi/config/fusion/preset.json to estimate savings.'
+      : "";
+    return `Sidekick tokens: in ${String(runtime.usage.input)} · out ${String(runtime.usage.output)} · cached ${String(runtime.usage.cacheRead)} · cache write ${String(runtime.usage.cacheWrite)}\nSidekick cost: $${savings.sidekickUsd.toFixed(2)} · at lead prices: $${savings.atLeadUsd.toFixed(2)} · saved: $${savings.savedUsd.toFixed(2)}\nHandoffs: ${String(runtime.reports.size)} · runtime alive: ${String(runtime.isAlive())} · busy: ${String(runtime.isBusy())}${pricing}`;
   }
 
   registerFusionTools(pi, {
@@ -267,7 +273,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
       const cwd = ctx.cwd ?? process.cwd();
       const loaded = loadPreset(cwd);
       const preset = loaded.preset;
-      const models = reg.getAvailable().map((m) => toPickerModel(m, preset.badges[modelKey(m)]));
+      const models = reg.getAvailable().map((m) => toPickerModel(m, preset.badges[modelKey(m)], preset.prices[modelKey(m)]));
       if (models.length === 0) {
         ctx.ui.notify("No models available. Use /login to add a provider.", "warning");
         return;
@@ -347,13 +353,26 @@ export default function fusionExtension(pi: ExtensionAPI): void {
     },
   });
 
-  pi.on("session_start", (_e, ctx) => {
+  pi.on("session_start", async (_e, ctx) => {
     stopRuntime();
     nudged = false;
     modelBykey.clear();
     active = loadPreset(ctx.cwd ?? process.cwd()).preset.active;
-    // Only keep a Fusion status if the session actually runs on that lead.
-    if (active?.kind === "fusion" && ctx.model && modelKey(ctx.model) !== active.lead) active = undefined;
+    if (active?.kind === "fusion" && (!ctx.model || modelKey(ctx.model) !== active.lead)) {
+      const leadKey = active.lead;
+      const lead = findModel(registryOf(ctx), leadKey);
+      const restored = lead !== undefined && await pi.setModel(lead);
+      if (restored) {
+        try {
+          pi.setThinkingLevel(active.leadEffort ?? "medium");
+        } catch {
+          /* provider may not support thinking */
+        }
+      } else {
+        active = undefined;
+        if (ctx.hasUI) ctx.ui.notify(`Fusion lead ${leadKey} unavailable — Fusion off`, "warning");
+      }
+    }
     publishStatus(ctx);
     if (ctx.hasUI) ctx.ui.addAutocompleteProvider(createModelBoostProvider);
   });
@@ -369,6 +388,8 @@ export default function fusionExtension(pi: ExtensionAPI): void {
     if (active?.kind === "fusion" && modelKey(event.model) !== active.lead) {
       stopRuntime();
       active = { kind: "single", model: modelKey(event.model) };
+      const loaded = loadPreset(ctx.cwd ?? process.cwd());
+      saveRuntimeState(globalPresetPath(), { effort: loaded.preset.effort, recent: loaded.preset.recent, active });
       publishStatus(ctx);
     }
   });

package/src/picker.ts

@@ -128,6 +128,10 @@ function money(perMillion: number): string {
   return `$${rounded.replace(/\.0+$/u, "").replace(/(\.\d)0$/u, "$1")} / 1M`;
 }
 
+function hasPricing(cost: PickerModel["cost"]): cost is NonNullable<PickerModel["cost"]> {
+  return cost !== undefined && (cost.input > 0 || cost.cachedInput > 0 || cost.output > 0);
+}
+
 function pad(text: string, width: number): string {
   const w = visibleWidth(text);
   return w >= width ? text : text + " ".repeat(width - w);
@@ -161,7 +165,7 @@ export class ModelPicker {
     this.onRenderRequest = options.onRenderRequest;
     this.visibleRows = options.visibleRows ?? DEFAULT_VISIBLE_ROWS;
     this.modelsByKey = new Map(options.state.models.map((m) => [m.key, m]));
-    const prices = options.state.models.map((m) => (m.cost ? blendedPrice(m.cost) : undefined)).filter((p): p is number => p !== undefined);
+    const prices = options.state.models.map((m) => (hasPricing(m.cost) ? blendedPrice(m.cost) : undefined)).filter((p): p is number => p !== undefined && p > 0);
     this.priceRange = { min: prices.length > 0 ? Math.min(...prices) : 0, max: prices.length > 0 ? Math.max(...prices) : 0 };
     this.effort = { ...options.state.effort };
     const active = options.state.active;
@@ -477,24 +481,27 @@ export class ModelPicker {
     const primaryKey = row.kind === "fusion" ? this.lead : row.key;
     const primary = primaryKey === undefined ? undefined : this.modelsByKey.get(primaryKey);
     const side = row.kind === "fusion" && this.sidekick !== undefined ? this.modelsByKey.get(this.sidekick) : undefined;
+    const primaryCost = primary?.cost;
+    const sideCost = side?.cost;
     const cols: Array<[string, string]> = [];
-    if (primary?.cost) {
-      cols.push(["Input", money(primary.cost.input)]);
-      cols.push(["Cached input", money(primary.cost.cachedInput)]);
-      cols.push(["Output", money(primary.cost.output)]);
+    if (hasPricing(primaryCost)) {
+      cols.push(["Input", money(primaryCost.input)]);
+      cols.push(["Cached input", money(primaryCost.cachedInput)]);
+      cols.push(["Output", money(primaryCost.output)]);
     } else {
       cols.push(["Input", "—"], ["Cached input", "—"], ["Output", "—"]);
     }
     if (row.kind === "fusion") {
-      if (side?.cost) {
-        cols.push(["Sidekick input", money(side.cost.input)]);
-        cols.push(["Sidekick cached input", money(side.cost.cachedInput)]);
-        cols.push(["Sidekick output", money(side.cost.output)]);
+      if (hasPricing(sideCost)) {
+        cols.push(["Sidekick input", money(sideCost.input)]);
+        cols.push(["Sidekick cached input", money(sideCost.cachedInput)]);
+        cols.push(["Sidekick output", money(sideCost.output)]);
       } else {
         cols.push(["Sidekick input", "—"], ["Sidekick cached input", "—"], ["Sidekick output", "—"]);
       }
     }
-    const colWidth = Math.max(10, Math.min(18, Math.floor((width - 4) / cols.length)));
+    const need = Math.max(...cols.map(([h, v]) => Math.max(visibleWidth(h), visibleWidth(v)))) + 3;
+    const colWidth = Math.max(10, Math.min(need, Math.floor((width - 4) / cols.length)));
     const head = cols.map(([h]) => pad(t.fg("dim", h), colWidth)).join("");
     const vals = cols.map(([, v]) => pad(t.fg("text", v), colWidth)).join("");
     const desc =
@@ -506,7 +513,11 @@ export class ModelPicker {
     const badges = this.state.models.some((m) => m.badge !== undefined)
       ? `${t.fg("success", "✱")} ${t.fg("dim", "New")}  ${t.fg("accent", "✱")} ${t.fg("dim", "Promotion")}  ${t.fg("warning", "✱")} ${t.fg("dim", "Beta")} ${t.fg("dim", "·")}`
       : "";
-    const description = `${badges}${badges.length > 0 ? " " : ""}${desc}`;
+    const noPricing = row.kind === "fusion"
+      ? !hasPricing(primaryCost) || !hasPricing(sideCost)
+      : !hasPricing(primaryCost);
+    const pricing = noPricing ? t.fg("dim", " · no pricing data from provider") : "";
+    const description = `${badges}${badges.length > 0 ? " " : ""}${desc}${pricing}`;
     return [truncateToWidth(`  ${head}`, width - 1), truncateToWidth(`  ${vals}`, width - 1), truncateToWidth(`  ${description}`, width - 1)];
   }
 
@@ -561,8 +572,9 @@ export class ModelPicker {
     const sliderCells = Math.min(48, Math.max(1, width - 6));
     const sliderKey = row?.kind === "fusion" ? this.lead : row?.key;
     const sliderModel = sliderKey === undefined ? undefined : this.modelsByKey.get(sliderKey);
-    const sliderPrice = sliderModel?.cost === undefined ? undefined : blendedPrice(sliderModel.cost);
-    const marker = sliderPrice === undefined ? undefined : sliderPosition(sliderPrice, this.priceRange.min, this.priceRange.max, sliderCells);
+    const sliderCost = sliderModel?.cost;
+    const sliderPrice = hasPricing(sliderCost) ? blendedPrice(sliderCost) : undefined;
+    const marker = this.priceRange.max <= 0 || sliderPrice === undefined ? undefined : sliderPosition(sliderPrice, this.priceRange.min, this.priceRange.max, sliderCells);
     lines.push(truncateToWidth(`  ${renderSlider(sliderCells, marker)}`, width - 1));
     lines.push(...this.renderPricePanel(row, width));
     lines.push("");

package/src/preset.ts

@@ -61,6 +61,8 @@ export interface FusionPreset {
   recent: ModelKey[];
   /** Optional hand-curated model badge metadata. */
   badges: Record<ModelKey, FusionBadge>;
+  /** Manual pricing overrides for providers that report no pricing. */
+  prices: Record<ModelKey, { input: number; cachedInput: number; output: number }>;
   /** What the user last confirmed in the picker. */
   active?: ActiveSelection | undefined;
 }
@@ -74,6 +76,7 @@ export function emptyPreset(): FusionPreset {
     effort: {},
     recent: [],
     badges: {},
+    prices: {},
   };
 }
 
@@ -136,6 +139,20 @@ export function parsePreset(raw: unknown): Partial<FusionPreset> {
     }
     out.badges = badges;
   }
+  if (typeof r["prices"] === "object" && r["prices"] !== null) {
+    const prices: FusionPreset["prices"] = {};
+    for (const [k, v] of Object.entries(r["prices"] as Record<string, unknown>)) {
+      if (typeof v !== "object" || v === null) continue;
+      const price = v as Record<string, unknown>;
+      const input = price["input"];
+      const cachedInput = price["cachedInput"];
+      const output = price["output"];
+      if ([input, cachedInput, output].every((n) => typeof n === "number" && Number.isFinite(n) && n >= 0)) {
+        prices[k] = { input: input as number, cachedInput: cachedInput as number, output: output as number };
+      }
+    }
+    out.prices = prices;
+  }
   const active = r["active"];
   if (typeof active === "object" && active !== null) {
     const a = active as Record<string, unknown>;
@@ -167,6 +184,7 @@ export function mergePresets(base: FusionPreset, over: Partial<FusionPreset>): F
     effort: { ...base.effort, ...(over.effort ?? {}) },
     recent: over.recent ?? base.recent,
     badges: { ...base.badges, ...(over.badges ?? {}) },
+    prices: { ...base.prices, ...(over.prices ?? {}) },
     active: over.active ?? base.active,
   };
 }