pi-spark 0.14.6 → 0.15.0

package/README.md

@@ -2,7 +2,7 @@
 
 # pi-spark
 
-[Pi](https://pi.dev/) package that polishes your daily experience and keeps you at the frontier of agentic workflows.
+[Pi](https://pi.dev/) package that polishes your daily experience.
 
 ![Overview](./assets/screenshot-overview.png)
 
@@ -61,23 +61,6 @@ pi-spark generates a short recap of the current session after it goes idle, or o
 
 ![Recap](./assets/screenshot-recap.png)
 
-### Agent tools: `pi` and `web`
-
-pi-spark adds two agent tools:
-
-The `pi` tool lets the pi coding agent inspect and manipulate itself (~740 tokens).
-
-- `models` lists and searches the model catalog.
-- `name` sets or updates the current session's name.
-- `whoami` shows the current pi state, including session name, active model, and thinking level.
-
-The `web` tool gives the agent live web access, backed by the free [Exa MCP](https://exa.ai/mcp) (~350 tokens). No separate MCP setup or API key is needed.
-
-- `search` finds current information across the web and returns ready-to-use content.
-- `fetch` reads the full content of known URLs as clean markdown, and can batch several URLs in one call.
-
-![Agent tools](./assets/screenshot-tools.png)
-
 ## Configuration
 
 pi-spark reads config from `~/.pi/agent/spark.json` and from the current project's `.pi/spark.json`. Project config overrides matching global fields.
@@ -121,10 +104,8 @@ All fields are optional. Each top-level feature runs with the defaults below unl
 | `editor` | `EditorConfig` | Shows a working indicator and the current model on the editor's top border. |
 | `footer` | `{}` | Shows session info, extension statuses, cost, and context usage on one line. |
 | `fullscreen` | `{}` | Clears the screen and scrollback on start and exit, and pins the editor and footer to the bottom. |
-| `pi` | `{}` | Exposes the `pi` agent tool (`models`, `name`, `whoami` actions). |
 | `presets` | `{ [name]: Preset }` | Defines named model presets, keyed by name. |
 | `recap` | `RecapConfig` | Generates a session recap when idle or on demand. |
-| `web` | `{}` | Exposes the `web` agent tool (`search`, `fetch` actions) via Exa's hosted MCP server. |
 
 #### `EditorConfig`
 

package/index.ts

@@ -3,10 +3,8 @@ import { registerCredits } from "./src/features/credits";
 import { registerEditor } from "./src/features/editor";
 import { registerFooter } from "./src/features/footer";
 import { registerFullscreen } from "./src/features/fullscreen";
-import { registerPi } from "./src/features/pi";
 import { registerPresets } from "./src/features/presets";
 import { registerRecap } from "./src/features/recap";
-import { registerWeb } from "./src/features/web";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
@@ -24,8 +22,6 @@ export default function (pi: ExtensionAPI) {
   registerEditor(pi, events);
   registerFooter(pi);
   registerFullscreen(pi);
-  registerPi(pi);
   registerPresets(pi);
   registerRecap(pi);
-  registerWeb(pi);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-spark",
-  "version": "0.14.6",
-  "description": "Pi package that polishes your daily experience and keeps you at the frontier of agentic workflows.",
+  "version": "0.15.0",
+  "description": "Pi package that polishes your daily experience.",
   "keywords": [
     "pi-coding-agent",
     "pi-package"
@@ -31,8 +31,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.14.4",
     "@grpc/proto-loader": "^0.8.1",
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "liqe": "^3.8.7",
+    "defu": "^6.1.7",
     "ms": "4.0.0-nightly.202508271359",
     "zod": "^4.4.3"
   },

package/src/config/index.ts

@@ -1,27 +1,13 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
-import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME, getAgentDir } from "@earendil-works/pi-coding-agent";
+import { defu } from "defu";
 
-import { sparkConfigSchema } from "./schema";
+import { featureSchemas } from "./schema";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SparkConfig } from "./schema";
 
-type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };
-type JsonObject = { [key: string]: JsonValue };
-
-/** All features disabled; used as the fallback when `spark.json` fails validation. */
-const DISABLED_CONFIG: SparkConfig = Object.freeze({
-  credits: false,
-  editor: false,
-  footer: false,
-  fullscreen: false,
-  pi: false,
-  presets: false,
-  recap: false,
-  web: false,
-});
-
 const cache = new Map<string, SparkConfig>();
 
 /** Load and validate spark.json once per session lifecycle; later calls return the cached result. */
@@ -30,66 +16,55 @@ export function loadConfig(ctx: ExtensionContext, fileName: string = "spark.json
   const cached = cache.get(key);
   if (cached) return cached;
 
-  const rawConfig = loadMergedJson(getConfigPaths(ctx.cwd, fileName)) ?? {};
-  const result = sparkConfigSchema.safeParse(rawConfig);
+  // Deep-merge the global file under the project file, so project settings win at scalar
+  // leaves while deep objects (e.g., `recap.model`) combine across both.
+  const [globalPath, projectPath] = getConfigPaths(ctx.cwd, fileName);
+  const raw = defu(readRawConfig(projectPath) ?? {}, readRawConfig(globalPath) ?? {});
 
-  if (!result.success) {
-    const message = result.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`).join("; ");
-    ctx.ui.notify(`Invalid spark config: ${message}`, "error");
+  // Validate each feature independently so a single invalid field disables only that feature
+  // (falling back to its enabled defaults) instead of taking down the whole config.
+  const config = {} as Record<keyof SparkConfig, unknown>;
+  const errors: string[] = [];
 
-    const config = DISABLED_CONFIG;
-    cache.set(key, config);
+  for (const field of Object.keys(featureSchemas) as (keyof SparkConfig)[]) {
+    const value = raw[field];
 
-    return config;
-  }
+    if (value === undefined) {
+      config[field] = {};
+      continue;
+    }
 
-  const config = result.data;
-  cache.set(key, config);
+    if (value === false) {
+      config[field] = false;
+      continue;
+    }
 
-  return config;
-}
+    const result = featureSchemas[field].safeParse(value);
+    if (result.success) {
+      config[field] = result.data;
+      continue;
+    }
 
-function getConfigPaths(cwd: string, fileName: string): [globalPath: string, projectPath: string] {
-  return [join(getAgentDir(), fileName), join(cwd, ".pi", fileName)];
-}
+    config[field] = {};
+    errors.push(result.error.issues.map((issue) => `${[field, ...issue.path].join(".")}: ${issue.message}`).join("; "));
+  }
 
-function loadMergedJson(paths: string[]): JsonObject | undefined {
-  let merged: JsonObject | undefined;
-  paths.forEach((path) => {
-    const value = readJsonFile(path);
-    if (value === undefined) return;
+  if (errors.length > 0) {
+    ctx.ui.notify(`Invalid pi-spark config: ${errors.join("; ")}`, "error");
+  }
 
-    merged = mergeConfig(merged, value);
-  });
+  cache.set(key, config as SparkConfig);
+  return config as SparkConfig;
+}
 
-  return merged;
+function getConfigPaths(cwd: string, fileName: string): [globalPath: string, projectPath: string] {
+  return [join(getAgentDir(), fileName), join(cwd, CONFIG_DIR_NAME, fileName)];
 }
 
-function readJsonFile(path: string): JsonObject | undefined {
+function readRawConfig(path: string): Record<string, unknown> | undefined {
   try {
-    return JSON.parse(readFileSync(path, "utf8")) as JsonObject;
+    return JSON.parse(readFileSync(path, "utf8")) as Record<string, unknown>;
   } catch {
     return undefined;
   }
 }
-
-function mergeConfig(base: JsonObject | undefined, override: JsonObject): JsonObject {
-  if (base === undefined) return override;
-  if (!isPlainObject(base) || !isPlainObject(override)) return override;
-
-  const result: Record<string, JsonValue> = { ...base };
-  Object.entries(override).forEach(([key, overrideValue]) => {
-    const baseValue = base[key];
-    if (isPlainObject(baseValue) && isPlainObject(overrideValue)) {
-      result[key] = { ...baseValue, ...overrideValue };
-    } else {
-      result[key] = overrideValue;
-    }
-  });
-
-  return result;
-}
-
-function isPlainObject(value: unknown): value is Record<string, JsonValue> {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}

package/src/config/schema.ts

@@ -4,27 +4,24 @@ import { creditsConfigSchema } from "../features/credits/config";
 import { editorConfigSchema } from "../features/editor/config";
 import { footerConfigSchema } from "../features/footer/config";
 import { fullscreenConfigSchema } from "../features/fullscreen/config";
-import { piConfigSchema } from "../features/pi/config";
 import { presetsConfigSchema } from "../features/presets/config";
 import { recapConfigSchema } from "../features/recap/config";
-import { webConfigSchema } from "../features/web/config";
-
-const disabled = z.literal(false);
 
 /**
- * Each feature field is `{ ... } | false`: `false` disables the feature, an object configures
- * it, and an omitted field falls back to defaults (`{}`, enabled).
+ * Raw option shape for each feature. The enable/disable/default policy lives in `loadConfig`:
+ * an omitted field falls back to `{}` (enabled with defaults), `false` disables the feature, and
+ * any other value is validated against the feature schema.
  */
-export const sparkConfigSchema = z.object({
-  credits: creditsConfigSchema.or(disabled).default({}),
-  editor: editorConfigSchema.or(disabled).default({}),
-  footer: footerConfigSchema.or(disabled).default({}),
-  fullscreen: fullscreenConfigSchema.or(disabled).default({}),
-  pi: piConfigSchema.or(disabled).default({}),
-  presets: presetsConfigSchema.or(disabled).default({}),
-  recap: recapConfigSchema.or(disabled).default({}),
-  web: webConfigSchema.or(disabled).default({}),
-});
+export const featureSchemas = {
+  credits: creditsConfigSchema,
+  editor: editorConfigSchema,
+  footer: footerConfigSchema,
+  fullscreen: fullscreenConfigSchema,
+  presets: presetsConfigSchema,
+  recap: recapConfigSchema,
+} as const;
 
 /** Resolved config for every feature; `false` means the feature is disabled. */
-export type SparkConfig = z.infer<typeof sparkConfigSchema>;
+export type SparkConfig = {
+  [K in keyof typeof featureSchemas]: z.infer<(typeof featureSchemas)[K]> | false;
+};

package/src/features/credits/index.ts

@@ -2,8 +2,8 @@ import { CreditsManager } from "./manager";
 import { loadConfig } from "../../config";
 import { isUsage } from "../../utils/usage";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AgentMessage } from "@earendil-works/pi-agent-core";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 function hasCost(message: AgentMessage): boolean {
   const usage = (message as { usage?: unknown }).usage;
@@ -44,6 +44,7 @@ export function registerCredits(pi: ExtensionAPI): void {
   });
 
   pi.on("session_shutdown", () => {
+    creditsManager?.cancel();
     creditsManager = undefined;
   });
 }

package/src/features/credits/manager.ts

@@ -36,25 +36,29 @@ export class CreditsManager {
     });
   }
 
+  cancel(): void {
+    this.inflight?.abort();
+    this.inflight = undefined;
+  }
+
   private async fetch(ctx: ExtensionContext, provider: CreditsProvider, signal: AbortSignal): Promise<void> {
     try {
       const apiKey = await ctx.modelRegistry.getApiKeyForProvider(provider.id);
+      if (signal.aborted) return;
       if (!apiKey) {
         ctx.ui.setStatus(STATUS_KEY, undefined);
         return;
       }
 
-      const signals = [AbortSignal.timeout(REQUEST_TIMEOUT_MS), signal];
-      if (ctx.signal) signals.push(ctx.signal);
-
-      const credits = await provider.fetch(ctx, apiKey, AbortSignal.any(signals));
+      const signals = AbortSignal.any([AbortSignal.timeout(REQUEST_TIMEOUT_MS), signal]);
+      const credits = await provider.fetch(ctx, apiKey, signals);
 
       // The active model may have changed while the request was in flight.
       if (ctx.model?.provider !== provider.id) return;
 
       ctx.ui.setStatus(STATUS_KEY, renderCredits(ctx.ui.theme, provider.label, credits));
     } catch (error) {
-      if (signal.aborted || ctx.signal?.aborted) return;
+      if (signal.aborted) return;
       if (ctx.model?.provider !== provider.id) return;
 
       const message = error instanceof Error ? error.message : String(error);

package/src/features/credits/providers/moonshot.ts

@@ -10,7 +10,7 @@ interface MoonshotBalanceResponse {
 
 /**
  * For Moonshot, the international and China-mainland accounts live on separate hosts and bill in
- * different currencies (USD vs CNY), which the endpoint does not report, so each pi provider ID
+ * different currencies (USD vs CNY), which the endpoint does not report, so each Pi provider ID
  * fixes both host and currency.
  */
 function createMoonshotProvider(id: string, host: string, currency: string): CreditsProvider {

package/src/features/credits/status.ts

@@ -14,7 +14,7 @@ export function renderCredits(theme: Theme, label: string, credits: Credits): st
 }
 
 export function renderError(theme: Theme, label: string, message: string): string {
-  return theme.fg("error", `${label} credits unavailable: ${message}`);
+  return theme.fg("error", `${label} ${message}`);
 }
 
 function renderWindows(theme: Theme, credits: Extract<Credits, { type: "windows" }>): string {

package/src/features/credits/types.ts

@@ -16,7 +16,7 @@ export interface CreditsLane {
   percent: number | undefined;
 }
 
-/** A credits source for a pi provider, shown in the status line while that provider is active. */
+/** A credits source for a Pi provider, shown in the status line while that provider is active. */
 export interface CreditsProvider {
   readonly id: Provider;
   readonly label: string;

package/src/features/editor/index.ts

@@ -78,7 +78,7 @@ class Editor extends CustomEditor {
     const modelBeforeText = this.slots.modelBefore;
     const modelText = formatModel(this.ctx.model?.provider, this.ctx.model?.id, this.pi.getThinkingLevel());
 
-    return theme.fg("dim", [modelBeforeText, modelText].filter(Boolean).join(" • "));
+    return theme.fg("dim", [modelBeforeText, modelText].filter(Boolean).join(" · "));
   }
 }
 

package/src/features/footer/index.ts

@@ -5,6 +5,7 @@ import { pathToFileURL } from "node:url";
 import { SplitLine } from "../../components/split-line";
 import { loadConfig } from "../../config";
 import { formatContextUsage, formatCost, formatCwd, linkText, sanitizeText } from "../../utils/format";
+import { isFreeModel } from "../../utils/model";
 import { getEntryUsage } from "../../utils/usage";
 
 import type { ExtensionContext, ExtensionAPI, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
@@ -39,7 +40,7 @@ class FooterComponent implements Component {
     const branch = this.footerData.getGitBranch();
     const sessionName = this.ctx.sessionManager.getSessionName();
 
-    return this.theme.fg("dim", [cwdText, branch, sessionName].filter(Boolean).join(" • "));
+    return this.theme.fg("dim", [cwdText, branch, sessionName].filter(Boolean).join(" · "));
   }
 
   private getRight(): string {
@@ -47,7 +48,7 @@ class FooterComponent implements Component {
     const styledCostText = this.getStyledCostText();
     const styledContextUsageText = this.getStyledContextUsageText();
 
-    return [statusesText, styledCostText, styledContextUsageText].filter(Boolean).join(this.theme.fg("dim", " • "));
+    return [statusesText, styledCostText, styledContextUsageText].filter(Boolean).join(this.theme.fg("dim", " · "));
   }
 
   /** Get extension statuses, sorted by key alphabetically. */
@@ -58,11 +59,15 @@ class FooterComponent implements Component {
     return Array.from(extensionStatuses.entries())
       .sort(([a], [b]) => a.localeCompare(b))
       .map(([, text]) => sanitizeText(text))
-      .join(this.theme.fg("dim", " • "));
+      .join(this.theme.fg("dim", " · "));
   }
 
   private getStyledCostText(): string {
     const totalCost = this.ctx.sessionManager.getBranch().reduce((acc, entry) => acc + (getEntryUsage(entry)?.cost.total ?? 0), 0);
+
+    // Hide cost when it's zero and the current model is free.
+    if (totalCost === 0 && this.ctx.model && isFreeModel(this.ctx.model)) return "";
+
     const costText = formatCost(totalCost);
 
     if (totalCost > 20) return this.theme.fg("warning", costText);

package/src/features/fullscreen/filler.ts

@@ -22,7 +22,7 @@ export class BottomFiller implements Component {
     this.measuring = true;
 
     // Re-assert `clearOnShrink` every render pass; the TUI reads it after `render()` returns,
-    // so this wins deterministically over pi's reset to the settings value on startup/reload.
+    // so this wins deterministically over Pi's reset to the settings value on startup/reload.
     this.tui.setClearOnShrink(true);
 
     const rows = this.tui.terminal.rows;

package/src/features/presets/manager.ts

@@ -95,7 +95,7 @@ export class PresetManager {
     if (!preset) return;
 
     return this.keys.find((key) => {
-      const p = this.presets[key]!;
+      const p = this.presets[key];
 
       return p.provider === preset.provider && p.model === preset.model && p.thinkingLevel === preset.thinkingLevel;
     });

package/src/features/presets/selector.ts

@@ -1,4 +1,4 @@
-import { keyText, DynamicBorder } from "@earendil-works/pi-coding-agent";
+import { keyHint, rawKeyHint, DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { Box, Container, SelectList, Spacer, Text } from "@earendil-works/pi-tui";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
@@ -39,11 +39,11 @@ export async function showPresetSelector(ctx: ExtensionContext, presetManager: P
     box.addChild(new Spacer(1));
 
     const keyHints = [
-      ["↑↓", "navigate"],
-      [keyText("tui.select.confirm"), "select"],
-      [keyText("tui.select.cancel"), "cancel"],
-    ] as const;
-    box.addChild(new Text(keyHints.map((item) => `${theme.fg("dim", item[0])} ${theme.fg("muted", item[1])}`).join("  "), 0, 0));
+      rawKeyHint("↑↓", "navigate"),
+      keyHint("tui.select.confirm", "select"),
+      keyHint("tui.select.cancel", "cancel"),
+    ];
+    box.addChild(new Text(keyHints.join("  "), 0, 0));
 
     container.addChild(box);
     container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));

package/src/utils/format.ts

@@ -1,6 +1,6 @@
 import { isAbsolute, relative, resolve, sep } from "node:path";
 
-import type { ImageContent, Provider, TextContent } from "@earendil-works/pi-ai";
+import type { Provider } from "@earendil-works/pi-ai";
 import type { ContextUsage } from "@earendil-works/pi-coding-agent";
 
 export function formatModel(provider?: Provider, model?: string, thinkingLevel?: string): string {
@@ -28,11 +28,6 @@ export function formatCost(cost: number): string {
   return `$${cost.toFixed(2)}`;
 }
 
-/** Format a duration in ms as `1.2s`, like the built-in bash tool. */
-export function formatDuration(ms: number): string {
-  return `${(ms / 1000).toFixed(1)}s`;
-}
-
 export function formatCwd(cwd: string, home: string): string {
   const resolvedCwd = resolve(cwd);
   const resolvedHome = resolve(home);
@@ -67,14 +62,6 @@ export function sanitizeText(text: string): string {
     .trim();
 }
 
-/** Join the text blocks of tool result content into a single newline-separated string. */
-export function joinTextContent(content: (TextContent | ImageContent)[]): string {
-  return content
-    .filter((block) => block.type === "text")
-    .map((block) => block.text)
-    .join("\n");
-}
-
 /** Coerce a possibly-stringified numeric value to a finite number, or `undefined`. */
 export function toNumber(value?: string | number | null): number | undefined {
   if (value === undefined || value === null) return undefined;

package/src/utils/model.ts

@@ -0,0 +1,6 @@
+import type { Api, Model } from "@earendil-works/pi-ai";
+
+/** Check if a model has zero costs for all categories. */
+export function isFreeModel(model: Model<Api>): boolean {
+  return model.cost.input === 0 && model.cost.output === 0 && model.cost.cacheRead === 0 && model.cost.cacheWrite === 0;
+}

package/src/utils/usage.ts

@@ -1,7 +1,7 @@
 import type { Usage } from "@earendil-works/pi-ai";
 import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 
-/** Structural type guard for the pi `Usage` shape. */
+/** Structural type guard for the Pi `Usage` shape. */
 export function isUsage(value: unknown): value is Usage {
   if (typeof value !== "object" || value === null) return false;