@narumitw/pi-sync 0.54.2 → 0.56.0

package/src/sync-extension.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { completeSyncArguments, splitArgs } from "./commands/command.js";
 import { handleCommand } from "./commands/command-handler.js";
 import type { AnySyncConfig } from "./settings/settings-types.js";
@@ -19,6 +19,31 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
   let sessionAbort = new AbortController();
   let shutdownAbort: AbortController | undefined;
   let initialization = Promise.resolve<AnySyncConfig | false | undefined>(undefined);
+  let continuous: ReturnType<typeof import("./sync/continuous-sync.js")["createContinuousSync"]> | undefined;
+  let owner: ExtensionContext["sessionManager"] | undefined;
+  let continuousPossible = false;
+  const foreground = new Map<ExtensionContext["sessionManager"], number>();
+  async function resumeContinuous(ctx: ExtensionContext, signal: AbortSignal, retry?: { setup?: string }) {
+    const isCurrent = () => !signal.aborted && !foreground.has(ctx.sessionManager) && owner === ctx.sessionManager;
+    if (!isCurrent() || !ctx.hasUI) return;
+    try {
+      const { loadConfigForCheck } = await import("./settings/config.js");
+      if (!isCurrent()) return;
+      const config = await loadConfigForCheck();
+      if (!isCurrent()) return;
+      continuousPossible = Boolean(config.continuous && config.agentMode);
+      if (!continuousPossible) {
+        await continuous?.stop(ctx.sessionManager);
+        return;
+      }
+      const { createContinuousSync } = await import("./sync/continuous-sync.js");
+      if (!isCurrent()) return;
+      continuous ??= createContinuousSync(loaders);
+      continuous.start(ctx, signal, Boolean(retry && (retry.setup === undefined || retry.setup === config.setupName)));
+    } catch {
+      /* Existing initialization/command paths report settings errors. */
+    }
+  }
 
   pi.registerCommand("sync", {
     description: "Sync Pi settings through Git, WebDAV, R2, or S3-compatible storage",
@@ -28,23 +53,39 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
         throw new Error("/sync requires TUI or RPC mode so results and safety prompts are observable.");
       }
       const signal = sessionAbort.signal;
-      const ready = await initialization;
-      if (signal.aborted) return;
-      await check.stop();
-      if (signal.aborted) return;
+      const manager = ctx.sessionManager;
       const command = splitArgs(args)[0];
-      if (ready === false && command !== "help" && command !== "unlock" && command !== "migrate-state") {
-        ctx.ui.notify(
-          "pi-sync recovery required. Repair the startup error, then /reload before syncing. Use /sync help for recovery guidance.",
-          "error",
-        );
-        return;
+      let retry: { setup?: string } | undefined;
+      let mayResume = false;
+      foreground.set(manager, (foreground.get(manager) ?? 0) + 1);
+      try {
+        const ready = await initialization;
+        mayResume = ready !== false;
+        if (signal.aborted) return;
+        await continuous?.stop(manager);
+        if (signal.aborted) return;
+        await check.stop();
+        if (signal.aborted) return;
+        if (ready === false && command !== "help" && command !== "unlock" && command !== "migrate-state") {
+          ctx.ui.notify(
+            "pi-sync recovery required. Repair the startup error, then /reload before syncing. Use /sync help for recovery guidance.",
+            "error",
+          );
+          return;
+        }
+        const run = () =>
+          handleCommand(args, ctx, signal, loaders, attention, (setup) => {
+            retry = { setup };
+          });
+        // Drain background children before foreground guards. Help remains reachable during repair.
+        if (command === "migrate-state" || command === "help") await run();
+        else await withStateDirectoryAccess(run);
+      } finally {
+        const count = (foreground.get(manager) ?? 1) - 1;
+        if (count) foreground.set(manager, count);
+        else foreground.delete(manager);
+        if (mayResume) await resumeContinuous(ctx, signal, retry);
       }
-      const run = () => handleCommand(args, ctx, signal, loaders, attention);
-      // Drain background cache/child cleanup before entering any foreground guard.
-      // Help must remain reachable when the state roots themselves need repair.
-      if (command === "migrate-state" || command === "help") await run();
-      else await withStateDirectoryAccess(run);
     },
   });
 
@@ -54,11 +95,15 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
     sessionAbort.abort(new DOMException("Session replaced", "AbortError"));
     sessionAbort = new AbortController();
     const signal = sessionAbort.signal;
+    owner = ctx.sessionManager;
+    continuousPossible = false;
     attention.reset(ctx);
     const previous = initialization;
     initialization = (async () => {
       await previous;
       if (signal.aborted) return false;
+      await continuous?.stop();
+      if (signal.aborted) return false;
       await check.stop();
       if (signal.aborted) return false;
       try {
@@ -72,18 +117,27 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
       }
     })();
     const ready = await initialization;
-    if (ready && !signal.aborted) check.start(ctx, signal, ready);
+    if (ready && !signal.aborted) {
+      if (ready.continuous && ready.agentMode) await resumeContinuous(ctx, signal);
+      else check.start(ctx, signal, ready);
+    }
   });
 
   pi.on("agent_start", async (_event, ctx) => {
+    await continuous?.stop(ctx.sessionManager);
     await check.interrupt(ctx);
   });
 
-  pi.on("agent_settled", (_event, ctx) => {
-    if (!sessionAbort.signal.aborted) check.settled(ctx);
+  pi.on("agent_settled", async (_event, ctx) => {
+    const signal = sessionAbort.signal;
+    if (!signal.aborted) {
+      check.settled(ctx);
+      if (continuousPossible) await resumeContinuous(ctx, signal);
+    }
   });
 
   pi.on("session_shutdown", async (event, ctx) => {
+    if (continuous && owner && owner !== ctx.sessionManager) return;
     sessionAbort.abort(new DOMException("Session shut down", "AbortError"));
     attention.reset(ctx);
     shutdownAbort?.abort(new DOMException("Session shut down again", "AbortError"));
@@ -94,6 +148,8 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
     try {
       const ready = await initialization;
       if (signal.aborted) return;
+      await continuous?.stop(ctx.sessionManager);
+      if (signal.aborted) return;
       await check.stop();
       if (signal.aborted) return;
       if (ready !== false && reason !== "reload") {

package/src/ui/agent-mode-setting.ts

@@ -0,0 +1,91 @@
+import { isDeepStrictEqual } from "node:util";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { requireSettings, updateLocalConfig } from "../settings/settings-store.js";
+import { captureMutationOwner } from "../sync/sync-local.js";
+import { confirmMergeReview } from "./merge-review.js";
+import { safeTerminalText } from "./terminal-text.js";
+
+export const AGENT_MODE_DESCRIPTION =
+  "This setup, experimental: one autonomous merged sync next startup and on Sync now. Sends eligible conflict text to the selected Pi model; may incur costs and replace/delete selected local and remote content without transfer prompts. No automatic reload. Unsupported conflicts pause.";
+
+export const CONTINUOUS_DESCRIPTION =
+  "This setup, experimental: recurring sync while Pi is open. Requires Agent mode. Watches selected files, checks the remote every 60–66 seconds, and retries temporary failures. Local changes and retries can cause extra requests between polls. May disclose conflict text and incur model/storage costs. No automatic reload.";
+
+export function saveContinuousMode(
+  ctx: ExtensionCommandContext,
+  setupName: string,
+  enabled: boolean,
+  signal?: AbortSignal,
+) {
+  return saveAgentMode(ctx, setupName, enabled, signal, "continuous");
+}
+
+export async function saveAgentMode(
+  ctx: ExtensionCommandContext,
+  setupName: string,
+  enabled: boolean,
+  signal?: AbortSignal,
+  preference: "agentMode" | "continuous" = "agentMode",
+) {
+  const validate = captureMutationOwner(ctx, signal);
+  const settings = await requireSettings();
+  validate();
+  const setup = settings.syncSetups[setupName];
+  if (!setup || settings.activeSyncSetup !== setupName) throw new Error("Current sync setup changed; reopen Settings.");
+  const continuous = preference === "continuous";
+  const label = continuous ? "Continuous sync" : "Agent mode";
+  if (enabled && continuous && !setup.sync.agentMode) throw new Error("Enable Agent mode before Continuous sync.");
+  if (Boolean(setup.sync[preference]) === enabled) return true;
+  if (enabled) {
+    const summary = [
+      `Setup: ${safeTerminalText(setupName)}`,
+      `Storage connection: ${safeTerminalText(setup.storage.connection)}`,
+      `Storage path: ${safeTerminalText(setup.storage.path)}`,
+      ...(setup.storage.bucket ? [`Bucket: ${safeTerminalText(String(setup.storage.bucket))}`] : []),
+      ...(setup.storage.branch ? [`Branch: ${safeTerminalText(String(setup.storage.branch))}`] : []),
+      `Included paths: ${setup.sync.include.map(safeTerminalText).join(", ")}`,
+      continuous ? CONTINUOUS_DESCRIPTION : AGENT_MODE_DESCRIPTION,
+      ...(continuous
+        ? [
+            "Upgrade all Pi processes sharing this agent directory before enabling Continuous sync. Monitoring starts after the /sync command or manager closes. An elected idle local session uses its selected Pi model; another session can use a different provider/model. Each computer is a separate replica.",
+            "Automatic requests are limited to two per candidate and two per replica binding in a rolling 15-minute window, across restarts. Network/storage checks and requests may incur costs. Retries start at five seconds and grow to five minutes. These are request bounds, not a currency cap.",
+          ]
+        : setup.sync.continuous
+          ? ["The saved Continuous sync preference will resume monitoring after the /sync command or manager closes."]
+          : []),
+      "Only bounded Markdown/plain-text conflicts and atomic global settings choices are eligible. Model errors can change intended behavior. Session histories, code, deletion conflicts and path collisions are not model-resolved.",
+      "The existing baseline, selection, secret-scan and publication checks remain. Pi Sync cannot exclude arbitrary concurrent local writers. Disabling does not undo completed transfers or provider charges. No transfer starts from Settings.",
+    ].join("\n\n");
+    if (
+      !(await confirmMergeReview(
+        ctx,
+        `Enable experimental ${label}?`,
+        summary,
+        signal,
+        () => !signal?.aborted,
+        `Enable ${label}`,
+        summary.split("\n"),
+      ))
+    )
+      return false;
+    validate();
+  }
+  await updateLocalConfig((current) => {
+    validate();
+    if (
+      current.activeSyncSetup !== setupName ||
+      !isDeepStrictEqual(current.syncSetups[setupName], setup) ||
+      !isDeepStrictEqual(
+        current.storageConnections[setup.storage.connection],
+        settings.storageConnections[setup.storage.connection],
+      )
+    )
+      throw new Error("Sync setup or connection changed during Agent mode review; reopen Settings.");
+    return {
+      ...current,
+      syncSetups: { ...current.syncSetups, [setupName]: { ...setup, sync: { ...setup.sync, [preference]: enabled } } },
+    };
+  }, signal);
+  // The atomic writer has committed. Later cancellation cannot undo this save.
+  return true;
+}

package/src/ui/manager-state.ts

@@ -21,6 +21,7 @@ import {
   type SyncAttentionState,
   syncAttentionMatchesConfig,
 } from "./sync-attention.js";
+import { startupTransferSummary } from "./sync-behavior.js";
 import { countValidSyncSetups } from "./sync-setups-ui.js";
 import { safeTerminalText } from "./terminal-text.js";
 
@@ -28,6 +29,8 @@ export const MAIN_MENU_ACTIONS = [
   "Sync now",
   "Pull from remote…",
   "Push to remote…",
+  "View differences",
+  "Check remote status",
   "Settings",
   "History",
   "Diagnostics",
@@ -121,7 +124,7 @@ export async function describeManagerState(
     const lastAppliedSnapshot = changesBlocked
       ? "Unavailable while operations are locked"
       : syncState?.lastAppliedSnapshot
-        ? safeTerminalText(syncState.lastAppliedSnapshot)
+        ? `${truncateToWidth(safeTerminalText(syncState.lastAppliedSnapshot), 20, "…")} (application time unavailable; full ID in History)`
         : syncState
           ? "Never synced"
           : "Unavailable";
@@ -134,10 +137,7 @@ export async function describeManagerState(
       "",
       `Current sync setup: ${safeTerminalText(config.setupName)}`,
       `Storage: ${backendStorageDescription(config)}`,
-      `Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} · ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} · Sessions ${selection.sessions ? "on" : "off"}`,
-      `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
-      `Automatic transfer at startup: ${config.automaticTransfer ? "On — upload/replace/delete at idle; no reload" : "Off"}`,
-      `Last applied: ${lastAppliedSnapshot}`,
+      "CURRENT STATE",
       ...(syncState?.unresolved?.length
         ? [
             `Unresolved: ${syncState.unresolved.length} dependency groups · choose Review unresolved conflicts`,
@@ -160,11 +160,17 @@ export async function describeManagerState(
               "Check-time observation only; synchronization rechecks current content.",
             ]
           : ["Remote status: Not checked"]),
+      `Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} · ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} · Sessions ${selection.sessions ? "on" : "off"}`,
+      `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
+      `Startup transfer: ${startupTransferSummary(config)}`,
+      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
+      ...(config.continuous ? await (await import("../sync/continuous-record.js")).continuousStatusLines(config) : []),
+      `Last applied: ${lastAppliedSnapshot}`,
       ...(noSyncedContent
         ? ["", "No included content is selected. Choose included content in Settings before syncing."]
         : []),
       "",
-      "What do you want to do?",
+      "ACTIONS · transfer, inspect, or manage",
     ];
     return {
       title: (changesBlocked ? ["Manage sync", ...operationStatusLines(operation)] : ordinaryTitle).join("\n"),

package/src/ui/manager-ui.ts

@@ -1,7 +1,8 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { type ActionMenuItem, defineMenu, runMenu } from "@narumitw/pi-tui-kit";
-import { loadConfig } from "../settings/config.js";
+import { loadConfig, syncCheckConfigFingerprint } from "../settings/config.js";
 import { operationBlocksChanges } from "../state/operation-availability.js";
+import { captureMutationOwner } from "../sync/sync-local.js";
 import { type RunRoute, runCancellableOperation } from "./cancellable-operation.js";
 import {
   attentionMainMenuItems,
@@ -11,12 +12,13 @@ import {
 } from "./manager-attention.js";
 import { recoverSyncAccess } from "./manager-recovery.js";
 import { dispatchManagerResult } from "./manager-result-dispatcher.js";
-import { describeManagerState } from "./manager-state.js";
+import { backendStorageDescription, describeManagerState } from "./manager-state.js";
 import { showSyncSettings } from "./settings-ui.js";
 import { showSyncSetupManager } from "./setup/setup-actions.js";
 import { showSetupSwitcher } from "./setup/setup-switcher.js";
 import { showStorageConnections } from "./storage-connections-ui.js";
 import { observationMatchesConfig } from "./sync-attention.js";
+import { safeTerminalText } from "./terminal-text.js";
 
 export async function showSyncManager(
   ctx: ExtensionCommandContext,
@@ -36,6 +38,8 @@ export async function showSyncManager(
     | "settings"
     | "pull"
     | "push"
+    | "diff"
+    | "status"
     | "setups"
     | "connections"
     | "history"
@@ -167,12 +171,43 @@ export async function showSyncManager(
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      doctor: async () => {
-        const result = await runCancellableOperation(ctx, "Checking setup access…", "doctor", runRoute, {
+      diff: async () => {
+        const result = await runCancellableOperation(ctx, "Comparing local and remote…", "diff", runRoute, {
+          signal: sessionSignal,
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
+      },
+      status: async () => {
+        const result = await runCancellableOperation(ctx, "Checking remote status…", "status", runRoute, {
           signal: sessionSignal,
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
+      doctor: async ({ signal: actionSignal }) => {
+        const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, signal);
+        const config = await loadConfig();
+        validate();
+        const confirmed = await ctx.ui.confirm(
+          "Run diagnostics?",
+          `Setup: ${safeTerminalText(config.setupName)}\nStorage: ${backendStorageDescription(config)}\nS3/R2 reads the latest pointer without writing. Git reads remote snapshots and checks its cache. WebDAV probes conditional writes and cleanup, and can repair a missing history entry. Possible-secret checks still run. This is not the read-only Check remote status action.`,
+          { signal },
+        );
+        if (signal.aborted) return { kind: "close" };
+        validate();
+        if (!confirmed) return { kind: "stay" };
+        const latest = await loadConfig();
+        validate();
+        if (syncCheckConfigFingerprint(config) !== syncCheckConfigFingerprint(latest)) {
+          ctx.ui.notify("Setup changed during diagnostics review; reopen Diagnostics.", "warning");
+          return { kind: "stay" };
+        }
+        const result = await runCancellableOperation(ctx, "Checking setup access…", "doctor", runRoute, {
+          signal,
+          target: config.setupName,
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
+      },
       recover: async ({ state, signal: actionSignal }) => {
         const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
         return { kind: result === "close" ? "close" : "stay" };
@@ -228,6 +263,8 @@ function syncMainMenuItem(
   | "sync"
   | "pull"
   | "push"
+  | "diff"
+  | "status"
   | "switch"
   | "settings"
   | "setups"
@@ -244,6 +281,8 @@ function syncMainMenuItem(
     "Sync now": "sync",
     "Pull from remote…": "pull",
     "Push to remote…": "push",
+    "View differences": "diff",
+    "Check remote status": "status",
     "Switch sync setup": "switch",
     Settings: "settings",
     History: "history",
@@ -263,8 +302,19 @@ function syncMainMenuItem(
     id: action,
     label,
     action,
-    ...(action === "doctor"
-      ? { description: "Check setup access; WebDAV also probes writes and repairs history." }
-      : {}),
+    description:
+      action === "doctor"
+        ? "Manage: review backend checks before running."
+        : action === "settings" || action === "history" || action === "switch"
+          ? "Manage"
+          : action === "sync"
+            ? "Transfer: choose a safe direction or review conflicts."
+            : action === "pull"
+              ? "Transfer: remote → local; review writes and removals."
+              : action === "push"
+                ? "Transfer: local → remote active snapshot; review publication."
+                : action === "status" || action === "diff"
+                  ? "Inspect: read current local and remote state without transferring files."
+                  : undefined,
   };
 }

package/src/ui/merge-review.ts

@@ -60,9 +60,9 @@ export async function confirmMergeReview(
           })
         : await runMenu(ctx, menu, { getState: () => undefined, signal, isCurrent, onError: () => {} });
     if (!isCurrent() || signal?.aborted) return false;
-    if (result.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
+    if (result.kind === "error") throw new Error("Sync review failed; no transfer was performed.");
     if (result.kind === "unsupported")
-      throw new Error("Merge review requires observable TUI or RPC; review the plan before using --yes.");
+      throw new Error("Sync review requires observable TUI or RPC; review the plan before using --yes.");
     if (result.kind === "completed") choice.value = result.value;
     else if (result.kind !== "closed") return false;
     // Keep authorization separate from UI termination in both adapters.
@@ -79,7 +79,7 @@ export async function confirmMergeReview(
       onError: () => {},
     });
     if (!isCurrent() || signal?.aborted) return false;
-    if (detail.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
+    if (detail.kind === "error") throw new Error("Sync review failed; no transfer was performed.");
     if (detail.kind !== "cancelled" || detail.reason !== "back") return false;
     // A fresh menu discards remembered selection: returning from details always selects No.
     // Unlike Pi's native Yes-first dialog, approval requires moving off the safe default.

package/src/ui/merged-sync-summary.ts

@@ -2,13 +2,8 @@ import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { PublicationCapability } from "../backends/sync-backend.js";
 import type { Snapshot } from "../snapshot/snapshot-types.js";
 import type { FileMergeDecision } from "../sync/file-merge-planner.js";
-import { fileHashMap } from "../sync/sync-state.js";
 import { safeTerminalText, snapshotPathLabel } from "./terminal-text.js";
-
-interface FileChange {
-  path: string;
-  action: "Add" | "Update" | "Delete";
-}
+import { transferChanges as changes, type TransferChange as FileChange } from "./transfer-changes.js";
 
 export interface MergedSyncSummaryInput {
   setupName: string;
@@ -78,6 +73,7 @@ export function mergedSyncSummary(input: MergedSyncSummaryInput) {
   const context = [`Setup: ${safeTerminalText(input.setupName)}`, `Remote: ${safeTerminalText(input.destination)}`];
   const safety = [
     `Remote snapshot publication: ${input.publish ? "yes" : "no"}`,
+    "Remote removals affect the active snapshot; retained history is not erased.",
     `Sessions: ${input.sessions ? "included — may contain private conversations" : "not included"}`,
     input.groups.length
       ? `Unresolved groups: ${input.groups.length} — these paths stay unchanged on each side`
@@ -114,15 +110,3 @@ export function mergedSyncSummary(input: MergedSyncSummaryInput) {
     ].join("\n"),
   };
 }
-
-function changes(before: Snapshot, after: Snapshot): FileChange[] {
-  const beforeMap = fileHashMap(before);
-  const afterMap = fileHashMap(after);
-  return [...new Set([...Object.keys(beforeMap), ...Object.keys(afterMap)])]
-    .sort()
-    .flatMap((filePath): FileChange[] => {
-      if (!Object.hasOwn(beforeMap, filePath)) return [{ path: filePath, action: "Add" }];
-      if (!Object.hasOwn(afterMap, filePath)) return [{ path: filePath, action: "Delete" }];
-      return beforeMap[filePath] !== afterMap[filePath] ? [{ path: filePath, action: "Update" }] : [];
-    });
-}

package/src/ui/remote-selection-ui.ts

@@ -11,6 +11,7 @@ import {
 import { SyncSetupReviewChangedError, updateSyncSetup } from "../settings/settings-management.js";
 import type { AnySyncConfig, PartialConfig } from "../settings/settings-types.js";
 import { readSnapshotForHead } from "../sync/remote-snapshot.js";
+import { throwIfAborted } from "../sync/signals.js";
 import { errorMessage } from "../sync/sync-errors.js";
 import {
   compareSyncInclude,
@@ -240,6 +241,8 @@ async function showSelectionDifference(
             include: [...state.decision.remoteInclude],
             automatic: review.config.automatic,
             automaticTransfer: review.config.automaticTransfer,
+            agentMode: review.config.agentMode,
+            continuous: review.config.continuous,
             onSwitch: review.config.onSwitch,
             showStatus: review.config.showStatus,
           };
@@ -592,6 +595,8 @@ function sameContinuationReview(left: PartialConfig, right: PartialConfig) {
     left.storagePath === right.storagePath &&
     left.bucket === right.bucket &&
     left.branch === right.branch &&
+    Boolean(left.agentMode) === Boolean(right.agentMode) &&
+    Boolean(left.continuous) === Boolean(right.continuous) &&
     sameSyncInclude(left.include, right.include)
   );
 }
@@ -639,8 +644,3 @@ function runWithOptionalStateAccess<T>(
 function combineSignals(sessionSignal: AbortSignal | undefined, actionSignal: AbortSignal) {
   return sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
 }
-
-function throwIfAborted(signal: AbortSignal) {
-  if (!signal.aborted) return;
-  throw signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted", "AbortError");
-}

package/src/ui/settings-frame.ts

@@ -0,0 +1,55 @@
+import { stripVTControlCharacters } from "node:util";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+
+/** Adapt only public rendering/input boundaries; Kit still owns search, saves and focus. */
+export function boundedSettingsUI(ctx: ExtensionCommandContext): ExtensionCommandContext["ui"] {
+  return {
+    ...ctx.ui,
+    custom: (factory, options) =>
+      ctx.ui.custom((tui, ...args) => {
+        // Kit pins search before the selected setting at a one-row budget. Render its
+        // smallest complete frame, then retain the active row when the real budget is smaller.
+        const terminal = new Proxy(tui.terminal, {
+          get: (target, key) => (key === "rows" ? Math.max(8, target.rows) : Reflect.get(target, key)),
+        });
+        const screenTui = new Proxy(tui, {
+          get(target, key) {
+            if (key === "terminal") return terminal;
+            const value = Reflect.get(target, key);
+            return typeof value === "function" ? value.bind(target) : value;
+          },
+        });
+        const guard = <
+          T extends {
+            render(width: number): string[];
+            handleMouse?: import("@earendil-works/pi-tui").Component["handleMouse"];
+          },
+        >(
+          component: T,
+        ): T => {
+          const render = component.render.bind(component);
+          const handleMouse = component.handleMouse?.bind(component);
+          let sourceRow = 0;
+          const compact = () => tui.terminal.rows < 8;
+          component.render = (width) => {
+            if (width <= 0) return [];
+            const lines = render(width);
+            if (!compact()) return lines;
+            const active = lines.findIndex((line) => stripVTControlCharacters(line).startsWith("→"));
+            const search = lines.findIndex((line) => stripVTControlCharacters(line).startsWith(">"));
+            sourceRow = active < 0 ? Math.max(0, search) : active;
+            return lines.slice(sourceRow, sourceRow + 1);
+          };
+          if (handleMouse)
+            component.handleMouse = (event) => {
+              if (event.width <= 0 || (compact() && event.y !== 0)) return undefined;
+              component.render(event.width);
+              return handleMouse(compact() ? { ...event, y: event.y + sourceRow } : event);
+            };
+          return component;
+        };
+        const component = factory(screenTui, ...args);
+        return component instanceof Promise ? component.then(guard) : guard(component);
+      }, options),
+  };
+}