pi-vim 0.8.0 → 0.10.0

package/README.md

@@ -30,26 +30,22 @@ Clipboard write mirroring is controlled by `piVim.clipboardMirror`:
 | `yank` | Mirror yanks only; deletes/changes update only pi-vim's internal register |
 | `never` | Never mirror register writes to the OS clipboard |
 
-The setting controls write mirroring only. `p` / `P` keep the paste policy documented below.
+The setting controls which local register writes cross the OS clipboard boundary. `p` / `P` keep non-mirrored writes local.
 
-## wrapping pi-vim
-
-Supported: `pi-vim` first, `@jordyvd/pi-image-attachments` second. pi-vim does not call `ctx.ui.getEditorComponent()`; the wrapper does. Inverse order unsupported.
+Mode colors: `piVim.modeColors` accepts pi theme tokens (`insert`: `borderMuted`, `normal`: `borderAccent`, `ex`: `warning`); missing keys and unknown tokens use defaults. `piVim.syncBorderColorWithMode` defaults `false`; `true` syncs border to mode, overriding Pi's normal thinking-level border signal.
 
-Wrappers must decorate in place or forward unintercepted surface: lifecycle (`handleInput`, `render`, `invalidate`), text (`getText`, `setText`, `insertTextAtCursor`, `getExpandedText`), callbacks (`onSubmit`, `onChange`, `onEscape`, `onCtrlD`, `onPasteImage`, `onExtensionShortcut`), `actionHandlers`, flags (`focused`, `disableSubmit`), reads (`getLines`, `getCursor`, `getMode()`).
+## wrapping pi-vim
 
-#18/#21 delegation is not adopted: no previous-extension wrapping, insert delegate, or generic composition layer.
+Supported: `pi-vim` first, `@jordyvd/pi-image-attachments` second. pi-vim does not wrap previous editors; wrappers decorate in place or forward the CustomEditor surface: lifecycle (`handleInput`, `render`, `invalidate`), text (`getText`, `setText`, `insertTextAtCursor`, `getExpandedText`), callbacks, `actionHandlers`, flags, reads (`getLines`, `getCursor`, `getMode()`). Inverse order, insert delegates, and generic composition are unsupported.
 
-Manual smoke. If raw `-e` cannot resolve Pi peer packages, run `npm install --ignore-scripts --package-lock=false` in the image checkout.
+Smoke:
 
 ```bash
-# repo root
 pi -e ./index.ts -e ../pi-image-attachments/index.ts
-# this worktree
 pi -e ./index.ts -e ../../../pi-image-attachments/index.ts
 ```
 
-Check: insert text; add/paste image path; see `[Image #1]` widget; submit text+image stripped; switch INSERT/NORMAL modes.
+Check: insert text; add/paste image path; see `[Image #1]`; submit text+image stripped; switch INSERT/NORMAL.
 
 ## contributor setup
 
@@ -78,7 +74,7 @@ u          # undo
 2}         # jump two paragraphs forward
 ```
 
-Mode indicator (`INSERT` / `NORMAL` / `EX`) appears bottom-right, theme-colored.
+Mode indicator (`INSERT` / `NORMAL` / `EX`) appears bottom-right, theme-colored and configurable.
 
 Requires `@mariozechner/pi-tui >= 0.47.0`. With `pi-tui >= 0.49.3` and DECSCUSR support, cursor shape follows mode; otherwise software cursor remains.
 
@@ -297,8 +293,7 @@ implemented and cancel the pending operator. Linewise counted yank (`{count}yy`,
 | `{count}p`   | Put `{count}` times after cursor                            |
 | `{count}P`   | Put `{count}` times before cursor                           |
 
-Put reads the OS clipboard first, falling back to the internal unnamed-register shadow on slow read.
-Paste text ending in `\n` is treated as line-wise.
+Put reads the OS clipboard first unless the last local register write was not mirrored. Paste text ending in `\n` is line-wise.
 
 ---
 
@@ -320,7 +315,8 @@ Paste text ending in `\n` is treated as line-wise.
 - `piVim.clipboardMirror = "yank"` mirrors yanks only; deletes and changes update only pi-vim's internal shadow.
 - `piVim.clipboardMirror = "never"` disables write mirroring while keeping internal register writes synchronous.
 - Rapid mirrored writes coalesce: only the latest pending value is guaranteed to be mirrored.
-- `p` / `P` read the OS clipboard first, falling back to the shadow on read failure/timeout.
+- `p` / `P` read the OS clipboard first when no local write was skipped by policy, falling back to the shadow on read failure/timeout.
+- If policy skipped the last local write, `p` / `P` use the shadow so delete/yank → put works without touching the OS clipboard.
 - While a mirror is in flight, `p` / `P` use the shadow so immediate yank/delete → put stays ordered.
 - Pi owns the terminal clipboard backends; on Wayland external state may lag while the shadow stays authoritative for immediate puts.
 

package/clipboard-policy.ts

@@ -1,73 +1,23 @@
-import { SettingsManager } from "@mariozechner/pi-coding-agent";
-
 export type ClipboardMirrorPolicy = "all" | "yank" | "never";
 export type RegisterWriteSource = "mutation" | "yank";
-
 export const DEFAULT_CLIPBOARD_MIRROR_POLICY: ClipboardMirrorPolicy = "all";
 
-export type PiVimSettings = { clipboardMirror?: unknown };
-
-type UnknownRecord = Record<string, unknown>;
-
-const missing = Symbol();
-
-function formatInvalid(value: unknown) {
-  const type = value === null ? "null" : Array.isArray(value) ? "array" : typeof value;
+function fmt(v: unknown) {
+  const type = v === null ? "null" : Array.isArray(v) ? "array" : typeof v;
   try {
-    return `${JSON.stringify(value) ?? type} (type ${type})`;
+    return `${JSON.stringify(v) ?? type} (type ${type})`;
   } catch {
     return `(type ${type})`;
   }
 }
 
-function readSetting(settings: unknown): unknown {
-  if (typeof settings !== "object" || settings === null || !Object.hasOwn(settings, "piVim")) return missing;
-  const piVim = (settings as UnknownRecord).piVim;
-  if (typeof piVim !== "object" || piVim === null || Array.isArray(piVim)) return piVim;
-  return Object.hasOwn(piVim, "clipboardMirror") ? (piVim as UnknownRecord).clipboardMirror : missing;
-}
-
 export function resolveClipboardMirrorPolicy(value: unknown) {
   if (value === undefined) return { policy: DEFAULT_CLIPBOARD_MIRROR_POLICY };
-
-  if (typeof value === "string") {
-    const policy = value.trim().toLowerCase();
-    if (policy === "all" || policy === "yank" || policy === "never") {
-      return { policy: policy as ClipboardMirrorPolicy };
-    }
-  }
-
+  const p = typeof value === "string" ? value.trim().toLowerCase() : "";
+  if (p === "all" || p === "yank" || p === "never")
+    return { policy: p as ClipboardMirrorPolicy };
   return {
     policy: DEFAULT_CLIPBOARD_MIRROR_POLICY,
-    warning: `Invalid piVim.clipboardMirror ${formatInvalid(value)}; expected all, yank, never. Using all.`,
-  };
-}
-
-export function readPiVimClipboardMirrorSetting(globalSettings: unknown, projectSettings: unknown): unknown | undefined {
-  const project = readSetting(projectSettings);
-  if (project !== missing) return project;
-  const global = readSetting(globalSettings);
-  return global === missing ? undefined : global;
-}
-
-function readPiVimSettingsFromDisk(cwd: string): PiVimSettings {
-  const settings = SettingsManager.create(cwd);
-  return {
-    clipboardMirror: readPiVimClipboardMirrorSetting(settings.getGlobalSettings(), settings.getProjectSettings()),
-  };
-}
-
-let piVimSettingsReader = readPiVimSettingsFromDisk;
-
-export function readPiVimSettings(cwd: string) {
-  return piVimSettingsReader(cwd);
-}
-
-export function setPiVimSettingsReaderForTests(reader: typeof readPiVimSettingsFromDisk) {
-  const prev = piVimSettingsReader;
-  piVimSettingsReader = reader;
-
-  return () => {
-    piVimSettingsReader = prev;
+    warning: `Invalid piVim.clipboardMirror ${fmt(value)}; expected all, yank, never.`,
   };
 }