pi-spark 0.14.6 → 0.14.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-spark",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "Pi package that polishes your daily experience and keeps you at the frontier of agentic workflows.",
   "keywords": [
     "pi-coding-agent",

package/src/config/index.ts

@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
-import { sparkConfigSchema } from "./schema";
+import { featureSchemas } from "./schema";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SparkConfig } from "./schema";
@@ -10,18 +10,6 @@ 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,23 +18,44 @@ 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);
+  const rawValue = loadMergedJson(getConfigPaths(ctx.cwd, fileName)) ?? {};
+  const raw = isPlainObject(rawValue) ? rawValue : {};
+
+  // 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[] = [];
+
+  for (const field of Object.keys(featureSchemas) as (keyof SparkConfig)[]) {
+    const value = raw[field];
+
+    if (value === undefined) {
+      config[field] = {};
+      continue;
+    }
 
-  if (!result.success) {
-    const message = result.error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`).join("; ");
-    ctx.ui.notify(`Invalid spark config: ${message}`, "error");
+    if (value === false) {
+      config[field] = false;
+      continue;
+    }
 
-    const config = DISABLED_CONFIG;
-    cache.set(key, config);
+    const result = featureSchemas[field].safeParse(value);
+    if (result.success) {
+      config[field] = result.data;
+      continue;
+    }
 
-    return config;
+    config[field] = {};
+    const detail = result.error.issues.map((issue) => `${[field, ...issue.path].join(".")}: ${issue.message}`).join("; ");
+    errors.push(detail);
   }
 
-  const config = result.data;
-  cache.set(key, config);
+  if (errors.length > 0) {
+    ctx.ui.notify(`Invalid spark config, using defaults for: ${errors.join("; ")}`, "error");
+  }
 
-  return config;
+  cache.set(key, config as SparkConfig);
+  return config as SparkConfig;
 }
 
 function getConfigPaths(cwd: string, fileName: string): [globalPath: string, projectPath: string] {

package/src/config/schema.ts

@@ -9,22 +9,23 @@ 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,
+  pi: piConfigSchema,
+  presets: presetsConfigSchema,
+  recap: recapConfigSchema,
+  web: webConfigSchema,
+} 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/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

@@ -39,7 +39,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 +47,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,7 +58,7 @@ 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 {

package/src/features/pi/actions/models.ts

@@ -1,4 +1,4 @@
-import { keyText, truncateHead } from "@earendil-works/pi-coding-agent";
+import { keyHint, truncateHead } from "@earendil-works/pi-coding-agent";
 import { Container, Spacer, Text } from "@earendil-works/pi-tui";
 import { filter, parse } from "liqe";
 import { Type } from "typebox";
@@ -92,7 +92,7 @@ export const modelsAction = defineAction({
       addRows(models.slice(0, maxRows).map((model) => toModelRow(model)));
 
       const hiddenRows = models.length - maxRows;
-      if (hiddenRows > 0) container.addChild(new Text(theme.fg("dim", `... (${hiddenRows} more, ${keyText("app.tools.expand")} to expand)`), 0, 0));
+      if (hiddenRows > 0) container.addChild(new Text(theme.fg("dim", `... (${hiddenRows} more, `) + keyHint("app.tools.expand", "to expand") + theme.fg("dim", ")"), 0, 0));
       container.addChild(new Spacer(1));
     }
 

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/features/web/render.ts

@@ -1,4 +1,4 @@
-import { keyText } from "@earendil-works/pi-coding-agent";
+import { keyHint } from "@earendil-works/pi-coding-agent";
 import { Container, Spacer, Text } from "@earendil-works/pi-tui";
 
 import { joinTextContent } from "../../utils/format";
@@ -28,7 +28,7 @@ export function renderWebResult(result: AgentToolResult<unknown>, expanded: bool
   container.addChild(new Text(theme.fg("muted", lines.slice(0, maxLines).join("\n")), 0, 0));
 
   const hidden = lines.length - maxLines;
-  if (hidden > 0) container.addChild(new Text(theme.fg("dim", `... (${hidden} more lines, ${keyText("app.tools.expand")} to expand)`), 0, 0));
+  if (hidden > 0) container.addChild(new Text(theme.fg("dim", `... (${hidden} more lines, `) + keyHint("app.tools.expand", "to expand") + theme.fg("dim", ")"), 0, 0));
 
   return container;
 }