pi-advisor-flow 0.5.4 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-advisor-flow",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Advanced Executor/Advisor flow for Pi, fully configurable and extendable.",
   "keywords": [
     "pi-package",
@@ -18,9 +18,10 @@
   "license": "MIT",
   "author": "Philip Brembeck",
   "type": "module",
-  "main": "extensions/index.ts",
+  "main": "dist/index.js",
   "types": "extensions/index.ts",
   "files": [
+    "dist",
     "extensions",
     "src",
     "CHANGELOG.md",
@@ -32,15 +33,18 @@
     "bench:evaluate": "bun bench/src/cli.ts evaluate",
     "bench:replay": "bun bench/src/cli.ts replay",
     "bench:screen": "bun bench/src/cli.ts screen",
+    "build": "bun build ./extensions/index.ts --outfile dist/index.js --target node --format esm --external @earendil-works/pi-ai --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external typebox",
     "check:boundaries": "node scripts/check-module-boundaries.mjs",
     "format": "bunx ultracite fix --linter-enabled=false",
     "lint": "bunx ultracite check",
     "lint:fix": "bunx ultracite fix",
+    "prepack": "bun run build >/dev/null",
     "package:check": "node scripts/check-package.mjs",
     "prepare": "husky",
     "socket": "bunx socket optimize",
-    "test": "bun test",
+    "test": "bun test && bun run test:node-loader",
     "test:bench": "bun --config=./bunfig.bench.toml test ./bench/test/",
+    "test:node-loader": "node --test test/default-resource-loader.node.mjs",
     "typecheck": "tsc --noEmit"
   },
   "lint-staged": {
@@ -58,9 +62,9 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.12",
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
+    "@earendil-works/pi-ai": "^0.85.1",
+    "@earendil-works/pi-coding-agent": "^0.85.1",
+    "@earendil-works/pi-tui": "^0.85.1",
     "@types/node": "^26.4.1",
     "bun-types": "1.4.1",
     "husky": "^9.1.7",
@@ -70,9 +74,9 @@
     "ultracite": "7.10.8"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.84.1",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
-    "@earendil-works/pi-tui": "^0.84.1",
+    "@earendil-works/pi-ai": "^0.84.1 || ^0.85.1",
+    "@earendil-works/pi-coding-agent": "^0.84.1 || ^0.85.1",
+    "@earendil-works/pi-tui": "^0.84.1 || ^0.85.1",
     "typebox": "^1.1.38"
   },
   "peerDependenciesMeta": {
@@ -91,7 +95,7 @@
   },
   "pi": {
     "extensions": [
-      "./extensions/index.ts"
+      "./dist/index.js"
     ],
     "image": "https://raw.githubusercontent.com/philipbrembeck/pi-advisor/refs/heads/main/assets/hero.png"
   }

package/src/config/storage.ts

@@ -53,6 +53,125 @@ export const configPaths = (ctx: ExtensionContext) => [
 const configuredModelRef = (value: string | undefined): string | undefined =>
   value?.trim() || undefined;
 
+const SAVED_CONFIG_KEYS = [
+  "advisor",
+  "advisorAutoLoopGate",
+  "advisorBlockOnBlocked",
+  "advisorCollapseResponses",
+  "advisorCompletionGate",
+  "advisorCustomInvocation",
+  "advisorEffort",
+  "advisorFailureGate",
+  "advisorGitContext",
+  "advisorGitContextMaxChars",
+  "advisorHerdrIntegration",
+  "advisorLoopThreshold",
+  "advisorMaxCallsPerSession",
+  "advisorPlanGate",
+  "advisorRedactSecrets",
+  "advisorScoutEnabled",
+  "advisorSessionSummary",
+  "advisorToolPolicies",
+  "advisorToolResultMaxBytes",
+  "advisorToolResultMaxLines",
+  "advisorTrackedFileContent",
+  "advisorUntrackedContent",
+  "alwaysOn",
+  "contextMaxChars",
+  "executor",
+  "executorEffort",
+  "gateFailureMode",
+  "showUsageDetails",
+  "showUsageFooter",
+  "simpleMode",
+] as const satisfies readonly (keyof AdvisorConfig)[];
+type SavedConfigKey = (typeof SAVED_CONFIG_KEYS)[number];
+type ConfigState = {
+  [Key in SavedConfigKey]: AdvisorConfig[Key];
+};
+
+const currentConfigState = (): ConfigState => ({
+  advisor: configuredModelRef(advisorRef),
+  advisorAutoLoopGate: advisorAutoLoopGateRef,
+  advisorBlockOnBlocked: advisorBlockOnBlockedRef,
+  advisorCollapseResponses: advisorCollapseResponsesRef,
+  advisorCompletionGate: advisorCompletionGateRef,
+  advisorCustomInvocation: advisorCustomInvocationRef,
+  advisorEffort: advisorEffortRef,
+  advisorFailureGate: advisorFailureGateRef,
+  advisorGitContext: advisorGitContextRef,
+  advisorGitContextMaxChars: advisorGitContextMaxCharsRef,
+  advisorHerdrIntegration: advisorHerdrIntegrationRef,
+  advisorLoopThreshold: advisorLoopThresholdRef,
+  advisorMaxCallsPerSession: advisorMaxCallsPerSessionRef,
+  advisorPlanGate: advisorPlanGateRef,
+  advisorRedactSecrets: advisorRedactSecretsRef,
+  advisorScoutEnabled: advisorScoutEnabledRef,
+  advisorSessionSummary: advisorSessionSummaryRef,
+  advisorToolPolicies: { ...advisorToolPoliciesRef },
+  advisorToolResultMaxBytes: advisorToolResultMaxBytesRef,
+  advisorToolResultMaxLines: advisorToolResultMaxLinesRef,
+  advisorTrackedFileContent: advisorTrackedFileContentRef,
+  advisorUntrackedContent: advisorUntrackedContentRef,
+  alwaysOn: alwaysOnRef,
+  contextMaxChars: contextMaxCharsRef,
+  executor: configuredModelRef(executorRef),
+  executorEffort: executorEffortRef,
+  gateFailureMode: advisorFailureModeRef,
+  showUsageDetails: showUsageDetailsRef,
+  showUsageFooter: showUsageFooterRef,
+  simpleMode: simpleModeRef,
+});
+
+const sameConfigValue = <Value>(left: Value, right: Value) =>
+  JSON.stringify(left) === JSON.stringify(right);
+
+const readExistingConfig = (path: string): Record<string, unknown> => {
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+      ? (parsed as Record<string, unknown>)
+      : {};
+  } catch {
+    return {};
+  }
+};
+
+const shouldPersistConfigKey = (
+  key: SavedConfigKey,
+  persistAdvisor: boolean,
+  persistExecutor: boolean
+) =>
+  (key !== "advisor" || persistAdvisor) &&
+  (key !== "executor" || persistExecutor);
+
+const applyChangedConfigValues = (
+  data: Record<string, unknown>,
+  current: ConfigState,
+  changedKeys: readonly SavedConfigKey[],
+  persistAdvisor: boolean,
+  persistExecutor: boolean
+) => {
+  for (const key of changedKeys) {
+    if (!shouldPersistConfigKey(key, persistAdvisor, persistExecutor)) {
+      continue;
+    }
+    const value = current[key];
+    const isEmptyModelRef = (key === "advisor" || key === "executor") && !value;
+    if (value === undefined || isEmptyModelRef) {
+      delete data[key];
+    } else {
+      data[key] = value;
+    }
+  }
+};
+
+// Tracks the runtime state represented by the last successful load/save. A
+// save can then merge fresh disk contents without treating untouched in-memory
+// values as an instruction to overwrite an external edit.
+let loadedConfigState: ConfigState | undefined;
+let loadedConfigPath: string | undefined;
+
 const readConfig = (path: string): AdvisorConfig => {
   try {
     const config = JSON.parse(readFileSync(path, "utf8"));
@@ -135,10 +254,17 @@ export const loadConfig = (_ctx: ExtensionContext) => {
   // prompts, gates, budgets, disclosure, redaction, integrations, and consent
   // remain under the user's global Pi configuration.
   setAdvisorOutcomeLoggingRef(globalConfig?.advisorOutcomeLogging === true);
+  loadedConfigState = currentConfigState();
+  loadedConfigPath = global;
   return existsSync(global) ? global : null;
 };
 
-/** Saves user-controlled configuration globally without outcome consent. */
+/**
+ * Saves user-controlled configuration globally without outcome consent.
+ *
+ * Only values changed since the last load/save are written. This lets an
+ * external edit to advisor.json coexist with a later settings or model save.
+ */
 export interface SaveConfigOptions {
   persistAdvisor?: boolean;
   persistExecutor?: boolean;
@@ -151,70 +277,51 @@ export const saveConfig = (
   const path = join(getAgentDir(), "advisor.json");
   const persistAdvisor = options.persistAdvisor ?? true;
   const persistExecutor = options.persistExecutor ?? true;
-  let existing: Record<string, unknown> = {};
-  try {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      existing = parsed as Record<string, unknown>;
-    }
-  } catch {
-    /* replace a missing or malformed file */
-  }
-  if (advisorMaxCallsPerSessionRef === undefined) {
-    existing.advisorMaxCallsPerSession = undefined;
+  const existing = readExistingConfig(path);
+  const current = currentConfigState();
+  const baseline = loadedConfigPath === path ? loadedConfigState : undefined;
+  const changedKeys = baseline
+    ? SAVED_CONFIG_KEYS.filter(
+        (key) => !sameConfigValue(current[key], baseline[key])
+      )
+    : [...SAVED_CONFIG_KEYS];
+  if (changedKeys.length === 0) {
+    return path;
   }
-  const data = {
-    ...existing,
-    ...(persistAdvisor && advisorRef ? { advisor: advisorRef } : {}),
-    advisorAutoLoopGate: advisorAutoLoopGateRef,
-    advisorBlockOnBlocked: advisorBlockOnBlockedRef,
-    advisorCollapseResponses: advisorCollapseResponsesRef,
-    advisorCompletionGate: advisorCompletionGateRef,
-    advisorCustomInvocation: advisorCustomInvocationRef,
-    advisorEffort: advisorEffortRef,
-    advisorFailureGate: advisorFailureGateRef,
-    advisorLoopThreshold: advisorLoopThresholdRef,
-    advisorPlanGate: advisorPlanGateRef,
-    contextMaxChars: contextMaxCharsRef,
-    ...(persistExecutor && executorRef ? { executor: executorRef } : {}),
-    executorEffort: executorEffortRef,
-    ...(advisorMaxCallsPerSessionRef === undefined
-      ? {}
-      : { advisorMaxCallsPerSession: advisorMaxCallsPerSessionRef }),
-    advisorGitContext: advisorGitContextRef,
-    advisorGitContextMaxChars: advisorGitContextMaxCharsRef,
-    advisorHerdrIntegration: advisorHerdrIntegrationRef,
-    advisorRedactSecrets: advisorRedactSecretsRef,
-    advisorScoutEnabled: advisorScoutEnabledRef,
-    advisorSessionSummary: advisorSessionSummaryRef,
-    advisorToolPolicies: advisorToolPoliciesRef,
-    advisorToolResultMaxBytes: advisorToolResultMaxBytesRef,
-    advisorToolResultMaxLines: advisorToolResultMaxLinesRef,
-    advisorTrackedFileContent: advisorTrackedFileContentRef,
-    advisorUntrackedContent: advisorUntrackedContentRef,
-    alwaysOn: alwaysOnRef,
-    gateFailureMode: advisorFailureModeRef,
-    showUsageDetails: showUsageDetailsRef,
-    showUsageFooter: showUsageFooterRef,
-    simpleMode: simpleModeRef,
-  };
+  const data = { ...existing };
+  applyChangedConfigValues(
+    data,
+    current,
+    changedKeys,
+    persistAdvisor,
+    persistExecutor
+  );
   writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`);
   resetConfigCache();
+  const nextLoadedState = { ...current };
+  if (!persistAdvisor) {
+    nextLoadedState.advisor = baseline
+      ? baseline.advisor
+      : configuredModelRef(
+          typeof existing.advisor === "string" ? existing.advisor : undefined
+        );
+  }
+  if (!persistExecutor) {
+    nextLoadedState.executor = baseline
+      ? baseline.executor
+      : configuredModelRef(
+          typeof existing.executor === "string" ? existing.executor : undefined
+        );
+  }
+  loadedConfigState = nextLoadedState;
+  loadedConfigPath = path;
   return path;
 };
 
 /** Outcome logging is deliberately written only to the global Pi configuration. */
 export const saveGlobalOutcomeLogging = (enabled: boolean) => {
   const path = join(getAgentDir(), "advisor.json");
-  let existing: Record<string, unknown> = {};
-  try {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      existing = parsed as Record<string, unknown>;
-    }
-  } catch {
-    /* create it */
-  }
+  const existing = readExistingConfig(path);
   writeFileSync(
     path,
     `${JSON.stringify({ ...existing, advisorOutcomeLogging: enabled }, null, 2)}\n`

package/src/ui/manual-dialog-render.ts

@@ -135,8 +135,15 @@ export const renderManualAdvisorDialog = (
   const cancelLabel = cancel
     ? theme.fg("accent", "[Cancel]")
     : theme.fg("text", "[Cancel]");
+  const actionButtons = `${submitLabel}  ${cancelLabel}`;
+  // Center the buttons in the content area; the 2-column focus marker sits
+  // left of the computed offset.
+  const buttonOffset = Math.max(
+    0,
+    Math.floor((contentWidth - visibleWidth(actionButtons)) / 2) - 2
+  );
   addLine(
-    `${focusMarker("actions")}                 ${submitLabel}  ${cancelLabel}`
+    `${focusMarker("actions")}${" ".repeat(buttonOffset)}${actionButtons}`
   );
   addWrapped(interactionHint, "dim");
   addLine("");

package/src/ui/model-selector.ts

@@ -6,6 +6,7 @@ import {
   Input,
   type Keybindings,
   type KeybindingsManager,
+  truncateToWidth,
 } from "@earendil-works/pi-tui";
 import type { SearchableModelSelectorOptions } from "./types.js";
 
@@ -58,9 +59,9 @@ export class SearchableModelSelector implements Component, Focusable {
   }
 
   render(width: number): string[] {
-    const lines: string[] = ["═".repeat(width)];
+    const lines: string[] = [this.theme.fg("border", "─".repeat(width))];
     lines.push(`  ${this.theme.fg("accent", this.theme.bold(this.title))}`);
-    const inputLines = this.searchInput.render(width - 12);
+    const inputLines = this.searchInput.render(Math.max(1, width - 10));
     lines.push(
       `  ${this.theme.fg("accent", "Search: ")}${inputLines[0] || ""}`
     );
@@ -108,10 +109,10 @@ export class SearchableModelSelector implements Component, Focusable {
     }
     lines.push("");
     lines.push(
-      `  ${this.theme.fg("muted", "Type to search · ↑↓: navigate · Enter: select · Esc: cancel")}`
+      `  ${this.theme.fg("dim", "Type to search · ↑↓: navigate · Enter: select · Esc: cancel")}`
     );
-    lines.push("═".repeat(width));
-    return lines;
+    lines.push(this.theme.fg("border", "─".repeat(width)));
+    return lines.map((line) => truncateToWidth(line, width));
   }
 
   handleInput(keyData: string): void {

package/src/ui/text-setting-submenu.ts

@@ -61,6 +61,11 @@ export class TextSettingSubmenu implements Component, Focusable {
   }
 
   handleInput(keyData: string): void {
+    const before = this.input.getValue();
     this.input.handleInput(keyData);
+    // A failed submit leaves the error visible; the first value change clears it.
+    if (this.error && this.input.getValue() !== before) {
+      this.error = undefined;
+    }
   }
 }