@aliou/pi-neuralwatt 0.16.3 → 0.18.0

package/schema.json

@@ -16,10 +16,6 @@
           "$ref": "#/definitions/NeuralwattQuotaWarningsConfig",
           "description": "Quota warning feature."
         },
-        "subBarIntegration": {
-          "$ref": "#/definitions/NeuralwattSubBarIntegrationConfig",
-          "description": "Sub-bar/status-bar integration feature."
-        },
         "provider": {
           "$ref": "#/definitions/NeuralwattProviderConfig",
           "description": "Provider behavior (API surface)."
@@ -35,7 +31,7 @@
               "pattern": "^\\d{1,15}(\\.\\d{1,15})?(\\.\\d{1,15})?$"
             }
           ],
-          "description": "Config schema version, stamped by migrations. Current version: 0.12.0."
+          "description": "Config schema version, stamped by migrations."
         }
       },
       "additionalProperties": false
@@ -60,22 +56,16 @@
       },
       "additionalProperties": false
     },
-    "NeuralwattSubBarIntegrationConfig": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "Show usage in the sub-bar / status bar."
-        }
-      },
-      "additionalProperties": false
-    },
     "NeuralwattProviderConfig": {
       "type": "object",
       "properties": {
         "api": {
           "$ref": "#/definitions/NeuralwattApi",
           "description": "Which API serves model requests."
+        },
+        "apiBaseUrl": {
+          "type": "string",
+          "description": "Fallback base URL for Neuralwatt API calls, used only by models that carry no baseUrl of their own (models.json, custom providers, and proxy routing all take precedence) and by the extension's own catalog and quota fetches. Defaults to the direct upstream."
         }
       },
       "additionalProperties": false

package/src/config/defaults.ts

@@ -1,5 +1,7 @@
 import type { ResolvedNeuralwattConfig } from "./types";
 
+export const NEURALWATT_API_BASE_URL = "https://api.neuralwatt.com/v1";
+
 export const DEFAULT_CONFIG: ResolvedNeuralwattConfig = {
   quotaCommand: {
     enabled: true,
@@ -7,10 +9,8 @@ export const DEFAULT_CONFIG: ResolvedNeuralwattConfig = {
   quotaWarnings: {
     enabled: true,
   },
-  subBarIntegration: {
-    enabled: true,
-  },
   provider: {
     api: "openai-completions",
+    apiBaseUrl: NEURALWATT_API_BASE_URL,
   },
 };

package/src/config/loader.ts

@@ -26,13 +26,9 @@ function normalizeResolvedConfig(
       enabled:
         config.quotaWarnings?.enabled ?? DEFAULT_CONFIG.quotaWarnings.enabled,
     },
-    subBarIntegration: {
-      enabled:
-        config.subBarIntegration?.enabled ??
-        DEFAULT_CONFIG.subBarIntegration.enabled,
-    },
     provider: {
       api: resolveApi(config.provider?.api),
+      apiBaseUrl: resolveApiBaseUrl(config.provider?.apiBaseUrl),
     },
   };
 }
@@ -44,6 +40,30 @@ export function resolveApi(value: string | undefined): NeuralwattApi {
   return DEFAULT_CONFIG.provider.api;
 }
 
+export function resolveApiBaseUrl(value: string | undefined): string {
+  const trimmed = value?.trim().replace(/\/+$/u, "");
+  if (!trimmed) {
+    return DEFAULT_CONFIG.provider.apiBaseUrl;
+  }
+  try {
+    const url = new URL(trimmed);
+    if (url.protocol !== "https:" && url.protocol !== "http:") {
+      return DEFAULT_CONFIG.provider.apiBaseUrl;
+    }
+  } catch {
+    return DEFAULT_CONFIG.provider.apiBaseUrl;
+  }
+  return trimmed;
+}
+
+export function configuredApiBaseUrl(): string {
+  try {
+    return configLoader.getConfig().provider.apiBaseUrl;
+  } catch {
+    return DEFAULT_CONFIG.provider.apiBaseUrl;
+  }
+}
+
 export const configLoader = new ConfigLoader<
   NeuralwattConfig,
   ResolvedNeuralwattConfig

package/src/config/migration/04-remove-sub-bar-integration.ts

@@ -0,0 +1,31 @@
+import type { Migration } from "@aliou/pi-utils-settings";
+
+export const SUB_BAR_GIST_URL =
+  "https://gist.github.com/aliou/9939544f3c5a4f917b0a8e5c0497cdb2";
+
+interface PreRemovalNeuralwattConfig {
+  $schema?: string;
+  quotaCommand?: { enabled?: boolean };
+  quotaWarnings?: { enabled?: boolean };
+  subBarIntegration?: { enabled?: boolean };
+  provider?: {
+    api?: string;
+    apiBaseUrl?: string;
+    includeLegacyModelIds?: boolean;
+    includeEarlyAccessModels?: boolean;
+  };
+}
+
+export const removeSubBarIntegrationMigration: Migration<PreRemovalNeuralwattConfig> =
+  {
+    name: "remove-sub-bar-integration",
+    version: "0.18.0",
+    shouldRun: (config) => config.subBarIntegration !== undefined,
+    message: `[neuralwatt] The built-in sub-bar integration was removed. Test with \`pi -e ${SUB_BAR_GIST_URL}\` and install with \`pi install ${SUB_BAR_GIST_URL}\`. The standalone extension won't be kept up to date.`,
+    run: (config) => {
+      if (config.subBarIntegration === undefined) return config;
+
+      const { subBarIntegration: _removed, ...rest } = config;
+      return rest;
+    },
+  };

package/src/config/migration/index.ts

@@ -1,19 +1,18 @@
 import type { Migration } from "@aliou/pi-utils-settings";
-import type { NeuralwattConfig } from "../types";
 
 export {
   backupConfig,
   flatToNestedConfigMigration,
 } from "./02-flat-to-nested-config";
 export { renameHiddenToEarlyAccessMigration } from "./03-rename-hidden-to-early-access";
+export { removeSubBarIntegrationMigration } from "./04-remove-sub-bar-integration";
 
 import { flatToNestedConfigMigration } from "./02-flat-to-nested-config";
 import { renameHiddenToEarlyAccessMigration } from "./03-rename-hidden-to-early-access";
+import { removeSubBarIntegrationMigration } from "./04-remove-sub-bar-integration";
 
-// Each migration is typed against its own historical input shape. The loader
-// applies them in sequence on the raw config record, so they are cast to the
-// current config type for the array.
 export const migrations = [
   flatToNestedConfigMigration,
   renameHiddenToEarlyAccessMigration,
-] as unknown as Migration<NeuralwattConfig>[];
+  removeSubBarIntegrationMigration,
+] as Migration<object>[];

package/src/config/types.ts

@@ -8,11 +8,6 @@ export interface NeuralwattQuotaWarningsConfig {
   enabled?: boolean;
 }
 
-export interface NeuralwattSubBarIntegrationConfig {
-  /** Show usage in the sub-bar / status bar. */
-  enabled?: boolean;
-}
-
 /**
  * Neuralwatt serves every chat model twice: on an OpenAI-compatible
  * `chat/completions` endpoint and on a vLLM-backed Anthropic-compatible
@@ -23,6 +18,14 @@ export type NeuralwattApi = "openai-completions" | "anthropic-messages";
 export interface NeuralwattProviderConfig {
   /** Which API serves model requests. */
   api?: NeuralwattApi;
+
+  /**
+   * Fallback base URL for Neuralwatt API calls, used only by models that
+   * carry no baseUrl of their own (models.json, custom providers, and proxy
+   * routing all take precedence) and by the extension's own catalog and
+   * quota fetches. Defaults to the direct upstream.
+   */
+  apiBaseUrl?: string;
 }
 
 export interface NeuralwattConfig {
@@ -35,9 +38,6 @@ export interface NeuralwattConfig {
   /** Quota warning feature. */
   quotaWarnings?: NeuralwattQuotaWarningsConfig;
 
-  /** Sub-bar/status-bar integration feature. */
-  subBarIntegration?: NeuralwattSubBarIntegrationConfig;
-
   /** Provider behavior (API surface). */
   provider?: NeuralwattProviderConfig;
 }
@@ -49,10 +49,8 @@ export interface ResolvedNeuralwattConfig {
   quotaWarnings: {
     enabled: boolean;
   };
-  subBarIntegration: {
-    enabled: boolean;
-  };
   provider: {
     api: NeuralwattApi;
+    apiBaseUrl: string;
   };
 }

package/src/events.ts

@@ -1,10 +1,7 @@
 import type { ResolvedNeuralwattConfig } from "./config";
 import type { NeuralwattQuotas } from "./types/quota-api";
 
-export type NeuralwattFeatureId =
-  | "quotaCommand"
-  | "quotaWarnings"
-  | "subBarIntegration";
+export type NeuralwattFeatureId = "quotaCommand" | "quotaWarnings";
 
 export const NEURALWATT_EXTENSIONS_REQUEST_EVENT =
   "neuralwatt:extensions:request" as const;

package/src/lib/neuralwatt-api.ts

@@ -1,3 +1,4 @@
+import { configuredApiBaseUrl } from "../config/loader";
 import type {
   NeuralwattApiModel,
   NeuralwattApiModelsResponse,
@@ -5,7 +6,6 @@ import type {
 import type { NeuralwattQuotas } from "../types/quota-api";
 import type { QuotasResult } from "../types/quota-result";
 
-const BASE_URL = "https://api.neuralwatt.com/v1";
 const FETCH_TIMEOUT_MS = 15_000;
 
 function authHeaders(apiKey: string | undefined): Record<string, string> {
@@ -31,7 +31,7 @@ async function neuralwattFetch(
   signal?: AbortSignal,
   headers?: Record<string, string>,
 ): Promise<Response> {
-  return fetch(`${BASE_URL}${path}`, {
+  return fetch(`${configuredApiBaseUrl()}${path}`, {
     headers: { ...authHeaders(apiKey), ...headers },
     signal: combineSignals(signal),
   });

package/extensions/sub-bar-integration/index.ts

@@ -1,131 +0,0 @@
-import type {
-  ExtensionAPI,
-  ExtensionContext,
-  Theme,
-} from "@earendil-works/pi-coding-agent";
-import { configLoader } from "../../src/config";
-import {
-  NEURALWATT_CONFIG_UPDATED_EVENT,
-  NEURALWATT_EXTENSIONS_REGISTER_EVENT,
-  NEURALWATT_EXTENSIONS_REQUEST_EVENT,
-  NEURALWATT_QUOTAS_REQUEST_EVENT,
-  NEURALWATT_QUOTAS_UPDATED_EVENT,
-  type NeuralwattConfigUpdatedPayload,
-  type NeuralwattQuotasUpdatedPayload,
-} from "../../src/events";
-import type { NeuralwattQuotas } from "../../src/types/quota-api";
-import {
-  percentCreditsRemaining,
-  percentEnergyRemaining,
-} from "../../src/utils/quota-bar";
-import { formatKwh, formatUsd } from "../../src/utils/quota-format";
-import { toUsageSnapshot } from "./snapshot";
-
-function formatStatus(quotas: NeuralwattQuotas, theme: Theme): string {
-  const parts: string[] = [];
-
-  const creditsRemaining = percentCreditsRemaining(quotas);
-  const creditsColor =
-    creditsRemaining > 50
-      ? "success"
-      : creditsRemaining > 20
-        ? "warning"
-        : "error";
-  parts.push(
-    `${theme.fg("dim", "credits:")} ${theme.fg(creditsColor, formatUsd(quotas.balance.credits_remaining_usd))}`,
-  );
-
-  if (quotas.subscription) {
-    const energyRemaining = percentEnergyRemaining(quotas.subscription);
-    const energyColor =
-      energyRemaining > 50
-        ? "success"
-        : energyRemaining > 20
-          ? "warning"
-          : "error";
-    parts.push(
-      `${theme.fg("dim", "energy:")} ${theme.fg(energyColor, formatKwh(quotas.subscription.kwh_remaining))}`,
-    );
-  }
-
-  return parts.join(" ");
-}
-
-export default async function (pi: ExtensionAPI) {
-  await configLoader.load();
-
-  let enabled = configLoader.getConfig().subBarIntegration.enabled;
-  let subCoreReady = false;
-  let currentProvider: string | undefined;
-  let unsubscribeQuotas: (() => void) | undefined;
-
-  // Listen for config changes at runtime
-  pi.events.on(NEURALWATT_CONFIG_UPDATED_EVENT, (data: unknown) => {
-    enabled = (data as NeuralwattConfigUpdatedPayload).config.subBarIntegration
-      .enabled;
-  });
-
-  function isActive(): boolean {
-    return currentProvider === "neuralwatt";
-  }
-
-  function emitUsage(quotas: NeuralwattQuotas): void {
-    pi.events.emit("sub-core:update-current", {
-      state: {
-        provider: "neuralwatt",
-        usage: toUsageSnapshot(quotas),
-      },
-    });
-  }
-
-  function requestQuotas(): void {
-    pi.events.emit(NEURALWATT_QUOTAS_REQUEST_EVENT, undefined);
-  }
-
-  // The quota handler runs on the shared event bus, so it must only touch a
-  // session ctx captured by a live session-scoped subscription: pi
-  // invalidates session-bound ctx after session replacement (newSession/
-  // fork/switchSession/reload), and dereferencing a stale ctx throws. We
-  // subscribe in session_start (capturing the fresh ctx in the closure) and
-  // unsubscribe in session_shutdown, before the ctx can go stale.
-  function handleQuotas(ctx: ExtensionContext, data: unknown): void {
-    if (!isActive() || !subCoreReady || !enabled) return;
-    if (!data || typeof data !== "object") return;
-    const { quotas } = data as NeuralwattQuotasUpdatedPayload;
-    emitUsage(quotas);
-
-    ctx.ui.setStatus("neuralwatt-usage", formatStatus(quotas, ctx.ui.theme));
-  }
-
-  pi.events.on("sub-core:ready", () => {
-    subCoreReady = true;
-  });
-
-  pi.on("session_start", async (_event, ctx) => {
-    unsubscribeQuotas?.();
-    currentProvider = ctx.model?.provider;
-    unsubscribeQuotas = pi.events.on(NEURALWATT_QUOTAS_UPDATED_EVENT, (data) =>
-      handleQuotas(ctx, data),
-    );
-  });
-
-  pi.on("model_select", async (_event, ctx) => {
-    currentProvider = ctx.model?.provider;
-
-    if (subCoreReady && isActive() && enabled) {
-      requestQuotas();
-    }
-  });
-
-  pi.on("session_shutdown", () => {
-    unsubscribeQuotas?.();
-    unsubscribeQuotas = undefined;
-    currentProvider = undefined;
-  });
-
-  pi.events.on(NEURALWATT_EXTENSIONS_REQUEST_EVENT, () => {
-    pi.events.emit(NEURALWATT_EXTENSIONS_REGISTER_EVENT, {
-      feature: "subBarIntegration",
-    });
-  });
-}

package/extensions/sub-bar-integration/snapshot.ts

@@ -1,47 +0,0 @@
-import type { NeuralwattQuotas } from "../../src/types/quota-api";
-import {
-  percentCreditsRemaining,
-  percentEnergyRemaining,
-} from "../../src/utils/quota-bar";
-import { formatKwh } from "../../src/utils/quota-format";
-
-interface RateWindow {
-  label: string;
-  usedPercent: number;
-  resetDescription?: string;
-}
-
-export interface UsageSnapshot {
-  provider: string;
-  displayName: string;
-  windows: RateWindow[];
-  lastSuccessAt?: number;
-}
-
-export function toUsageSnapshot(quotas: NeuralwattQuotas): UsageSnapshot {
-  const windows: RateWindow[] = [];
-
-  const creditsRemaining = percentCreditsRemaining(quotas);
-  const creditsUsed = 100 - creditsRemaining;
-  windows.push({
-    label: "Credits",
-    usedPercent: Math.max(0, Math.min(100, creditsUsed)),
-  });
-
-  if (quotas.subscription) {
-    const energyRemaining = percentEnergyRemaining(quotas.subscription);
-    const energyUsed = 100 - energyRemaining;
-    windows.push({
-      label: "Energy",
-      usedPercent: Math.max(0, Math.min(100, energyUsed)),
-      resetDescription: `${formatKwh(quotas.subscription.kwh_remaining)} left`,
-    });
-  }
-
-  return {
-    provider: "neuralwatt",
-    displayName: "Neuralwatt",
-    windows,
-    lastSuccessAt: Date.now(),
-  };
-}