pi-umbra 0.1.4 → 0.1.5

package/README.md

@@ -1,31 +1,33 @@
-# pi-umbra
-
-Every small thing pi does not build in, in one install.
-
-```sh
-pi install npm:pi-umbra
-```
-
-One tarball. The nine packages below ship bundled inside it, so the install does not
-depend on npm hoisting nine separate trees into the layout pi expects.
-
-```
-pi-umbra
-├── pi-umbra-theme          seven themes and the chrome around them
-├── pi-umbra-ask            the model asks you a question mid-turn
-├── pi-umbra-copy-chat      /umb-copy-chat
-├── pi-umbra-help           /umb-help, /umb-doctor
-├── pi-umbra-inputbar       the input box
-├── pi-umbra-preview        /umb-preview
-├── pi-umbra-rename         /umb-rename
-├── pi-umbra-shimmer        a shimmer through the working indicator
-└── pi-umbra-skill-matcher  skill completion mid-prompt
-```
-
-Install any of them on its own if you want less. Each package has its own README saying
-what it solves.
-
-`pi-umbra-shimmer` and `pi-umbra-skill-matcher` also need a bundle patch, which is not
-published here. Without it they install and do nothing.
-
-MIT.
+# pi-umbra
+
+Every small thing pi does not build in, in one install.
+
+```sh
+pi install npm:pi-umbra
+```
+
+One tarball. The nine packages below ship bundled inside it, so the install does not
+depend on npm hoisting nine separate trees into the layout pi expects.
+
+```
+pi-umbra
+├── pi-umbra-theme          seven themes and the chrome around them
+├── pi-umbra-ask            the model asks you a question mid-turn
+├── pi-umbra-copy-chat      /umb-copy-chat
+├── pi-umbra-help           /umb-help, /umb-doctor
+├── pi-umbra-inputbar       the input box
+├── pi-umbra-preview        /umb-preview
+├── pi-umbra-rename         /umb-rename
+├── pi-umbra-shimmer        a shimmer through the working indicator
+└── pi-umbra-skill-matcher  skill completion mid-prompt
+```
+
+Install any of them on its own if you want less. Each package has its own README saying
+what it solves.
+
+`pi-umbra-shimmer` and `pi-umbra-skill-matcher` reach past what the extension API
+exposes, so each ships a `patch.mjs` that has to be run once after installing and again
+after every pi update. Their own READMEs carry the command. Until it is run, those two
+load and do nothing; the rest of the family is unaffected.
+
+MIT.

package/node_modules/pi-umbra-shimmer/README.md

@@ -7,26 +7,44 @@ The highlight is not one colour. It travels from white down to the theme's own m
 and back, blending the whole way rather than stepping, so the band changes tone while it
 moves.
 
+## Install
+
+```sh
+pi install npm:pi-umbra-shimmer
+node ~/.pi/agent/npm/node_modules/pi-umbra-shimmer/patch.mjs
+```
+
+Then restart pi.
+
+## The second line is not optional
+
 pi builds the working indicator with a colour function already in hand, and paints custom
-spinner frames verbatim without running them through that step at all. Both points are
-past what the extension API exposes, so reaching them needs a bundle patch, which is not
-published in this repo.
+spinner frames verbatim without running them through that step at all. Neither point is
+reachable from the extension API, so this package ships three patches against pi's built
+bundle. Without them the extension loads and does nothing.
 
-Installed alone this package does nothing. The patches are inert without it. With neither
-present pi keeps its own behaviour, so nothing here can half-apply.
+```sh
+node ~/.pi/agent/npm/node_modules/pi-umbra-shimmer/patch.mjs --check
+```
+
+`--check` writes nothing and exits 1 when a patch is missing. **Run it after every pi
+update.** An update replaces the bundle, so all three patches disappear silently and the
+shimmer stops without an error.
+
+Nothing here is destructive. Each patch is additive, a patch whose text no longer matches
+is reported rather than forced, and reinstalling pi returns the bundle to stock. The
+patched behaviour is gated on the extension being loaded, so the patches alone change
+nothing.
+
+Set `PI_UMBRA_PI` if pi lives somewhere this script cannot find it.
 
 ```
 pi-umbra-shimmer/
 ├── checks
 │   └── umbra-shimmer.check.ts
-└── extensions
-    └── umbra-shimmer.ts
-```
-
-## Install
-
-```sh
-pi install npm:pi-umbra-shimmer
+├── extensions
+│   └── umbra-shimmer.ts
+└── patch.mjs
 ```
 
 MIT.

package/node_modules/pi-umbra-shimmer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-umbra-shimmer",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A wave of colour running through pi's working indicator, over both the spinner and the text. Needs the umbra bundle patches; without them it does nothing.",
   "keywords": [
     "pi-package",
@@ -23,7 +23,8 @@
     "extensions",
     "checks",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "patch.mjs"
   ],
   "pi": {
     "extensions": [

package/node_modules/pi-umbra-shimmer/patch.mjs

@@ -0,0 +1,101 @@
+// pi-umbra-shimmer needs 3 seams that pi's extension API does not expose, so it edits
+// pi's built bundle. Run it after installing, and again after every pi update:
+//
+//   node <this file>           apply
+//   node <this file> --check   report only, write nothing, exit 1 if anything is missing
+//
+// pi runs dist/bundle/cli.js, a self-contained bundle, and the chunk names are content-hashed,
+// so every patch finds its own place by matching its own text rather than by line number.
+//
+// Nothing here is destructive. Each patch is additive, a patch whose text no longer matches is
+// reported instead of forced, and reinstalling pi returns the bundle to stock. A pi upgrade
+// replaces the bundle and drops every patch silently, which is what --check is for.
+import { createRequire } from "node:module";
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+// PI_UMBRA_PI points this at another pi tree. Otherwise pi is resolved from wherever this
+// package was installed, since it is a peer dependency, and the bun global path is the last resort.
+const resolvePi = () => {
+	if (process.env.PI_UMBRA_PI) return process.env.PI_UMBRA_PI;
+	try {
+		return dirname(createRequire(import.meta.url).resolve("@earendil-works/pi-coding-agent/package.json"));
+	} catch {
+		return join(homedir(), ".bun/install/global/node_modules/@earendil-works/pi-coding-agent");
+	}
+};
+
+const BUNDLE = join(resolvePi(), "dist/bundle");
+if (!existsSync(BUNDLE)) {
+	console.error(`no pi bundle at ${BUNDLE} - set PI_UMBRA_PI to your pi install`);
+	process.exit(1);
+}
+
+const PATCHES = [
+	{
+		// The indicator is built with a colour function already in hand - the editor embeds the
+		// working status, so pi hands it the editor border - and the fallback below never runs.
+		// Standing that function down when a shimmer is installed is what lets the fallback through.
+		reason: "a shimmer outranks the editor border",
+		from: `let colorFn=isWorkingStatusEditor(this.editor)?text=>(this.editor.borderColor??theme.getThinkingBorderColor(this.session.thinkingLevel||"off"))(text):void 0;`,
+		to: `let colorFn=globalThis.__umbraShimmer?void 0:isWorkingStatusEditor(this.editor)?text=>(this.editor.borderColor??theme.getThinkingBorderColor(this.session.thinkingLevel||"off"))(text):void 0;`,
+	},
+	{
+		// Custom frames are rendered verbatim, which is what kept the braille glyph out of the
+		// wave: the spinner colour function was skipped for them while the message kept being
+		// repainted every frame. Verbatim still holds when no shimmer is installed.
+		reason: "and paints the custom frames too",
+		from: `return this.renderIndicatorVerbatim?frame2:this.spinnerColorFn(frame2)`,
+		to: `return this.renderIndicatorVerbatim&&!globalThis.__umbraShimmer?frame2:this.spinnerColorFn(frame2)`,
+	},
+	{
+		// The working indicator paints its spinner with `accent` and its message with `muted`, both
+		// fixed at construction. A shimmer has to repaint every character on every frame, so the
+		// two colour functions become a lookup the shimmer extension can fill in. Nothing
+		// installed means pi's own two colours, unchanged.
+		reason: "the working indicator's colours can be taken over",
+		from: `super("working",ui,colorFn??(text=>theme.fg("accent",text)),colorFn??(text=>theme.fg("muted",text)),message,indicator)`,
+		to: `super("working",ui,colorFn??(text=>(globalThis.__umbraShimmer?.spinner??(t=>theme.fg("accent",t)))(text)),colorFn??(text=>(globalThis.__umbraShimmer?.message??(t=>theme.fg("muted",t)))(text)),message,indicator)`,
+	},
+];
+
+const files = [join(BUNDLE, "cli.js"), ...readdirSync(join(BUNDLE, "chunks")).map((name) => join(BUNDLE, "chunks", name))];
+const CHECK = process.argv.includes("--check");
+const unapplied = [];
+const gone = [];
+
+for (const patch of PATCHES) {
+	let done = false;
+	for (const path of files) {
+		const source = readFileSync(path, "utf8");
+		// A multi-line patch is written with newline escapes; match whatever line ending the file uses.
+		const eol = source.includes("\r\n") ? "\r\n" : "\n";
+		const from = patch.from.split("\n").join(eol);
+		const to = patch.to.split("\n").join(eol);
+		if (source.includes(to)) {
+			if (!CHECK) console.log(`already patched: ${patch.reason}`);
+			done = true;
+			break;
+		}
+		if (!source.includes(from)) continue;
+		if (CHECK) {
+			unapplied.push(patch.reason);
+			done = true;
+			break;
+		}
+		writeFileSync(path, source.replace(from, to));
+		console.log(`patched: ${patch.reason}`);
+		done = true;
+		break;
+	}
+	// Neither the original text nor the patched text is there, so pi changed the code this
+	// patch names. Report it rather than force anything.
+	if (!done) gone.push(patch.reason);
+}
+
+for (const reason of unapplied) console.log(`NOT APPLIED: ${reason}`);
+for (const reason of gone) console.log(`SEAM GONE:   ${reason}`);
+const bad = unapplied.length + gone.length;
+console.log(bad ? `${bad} of ${PATCHES.length} not in place` : `all ${PATCHES.length} patches applied`);
+process.exit(bad ? 1 : 0);

package/node_modules/pi-umbra-skill-matcher/README.md

@@ -3,34 +3,58 @@
 Type `/huh` and reach `skill:huh`. Complete a skill anywhere in the line, not only at the
 start of it.
 
-pi lists every skill in the completion dropdown under its bare name, but only `/skill:huh`
-runs one. So the dropdown offers `/huh`, you press enter, and pi answers "Unknown command".
-The fuzzy matching is not the problem; the name it matches against is. This wraps the
-built-in provider and rewrites every skill row to the form that dispatches, then re-runs
-the match against the prefixed name so `/skill:hu` still finds it after the built-in pass
-has given up.
+## Install
+
+```sh
+pi install npm:pi-umbra-skill-matcher
+node ~/.pi/agent/npm/node_modules/pi-umbra-skill-matcher/patch.mjs
+```
+
+Then restart pi.
+
+## What it fixes
+
+pi lists every skill in the completion dropdown under its bare name, but only
+`/skill:huh` runs one. So the dropdown offers `/huh`, you press enter, and pi answers
+"Unknown command". The fuzzy matching is not the problem; the name it matches against is.
+This wraps the built-in provider and rewrites every skill row to the form that dispatches,
+then re-runs the match against the prefixed name so `/skill:hu` still finds it after the
+built-in pass has given up.
 
 It also fills the mid-sentence slash menu. pi gates that menu on the line starting with
-`/`, so a `/name` written inside a sentence never reaches a provider at all. Lifting the
-gate needs a bundle patch, which is not published in this repo. What appears behind the
-gate is decided here.
+`/`, so a `/name` written inside a sentence never reaches a provider at all.
 
 The mid-sentence match stays deliberately narrow, so a path keeps behaving like a path:
 the token must be the last one on the line, hold no space, and follow real text ending in
 whitespace. `src/foo` and an indented `/foo` both fail those tests and are left to pi.
 
+## The second install line is not optional
+
+Two of the four seams are past what the extension API exposes: the dispatch map that only
+knows the prefixed name, and the gate that keeps the slash menu at the start of the line.
+So this package ships four patches against pi's built bundle. Without them the extension
+loads and does nothing.
+
+```sh
+node ~/.pi/agent/npm/node_modules/pi-umbra-skill-matcher/patch.mjs --check
+```
+
+`--check` writes nothing and exits 1 when a patch is missing. **Run it after every pi
+update.** An update replaces the bundle, so all four patches disappear silently and `/huh`
+goes back to "Unknown command".
+
+Nothing here is destructive. Each patch is additive, a patch whose text no longer matches
+is reported rather than forced, and reinstalling pi returns the bundle to stock.
+
+Set `PI_UMBRA_PI` if pi lives somewhere this script cannot find it.
+
 ```
 pi-umbra-skill-matcher/
 ├── checks
 │   └── umbra-skill-matcher.check.ts
-└── extensions
-    └── umbra-skill-matcher.ts
-```
-
-## Install
-
-```sh
-pi install npm:pi-umbra-skill-matcher
+├── extensions
+│   └── umbra-skill-matcher.ts
+└── patch.mjs
 ```
 
 MIT.

package/node_modules/pi-umbra-skill-matcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-umbra-skill-matcher",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Type /huh and reach skill:huh. pi lists every skill under its bare name, which is not the name that dispatches.",
   "keywords": [
     "pi-package",
@@ -21,7 +21,9 @@
   "files": [
     "extensions",
     "checks",
-    "README.md"
+    "README.md",
+    "patch.mjs",
+    "LICENSE"
   ],
   "pi": {
     "extensions": [

package/node_modules/pi-umbra-skill-matcher/patch.mjs

@@ -0,0 +1,115 @@
+// pi-umbra-skill-matcher needs 4 seams that pi's extension API does not expose, so it edits
+// pi's built bundle. Run it after installing, and again after every pi update:
+//
+//   node <this file>           apply
+//   node <this file> --check   report only, write nothing, exit 1 if anything is missing
+//
+// pi runs dist/bundle/cli.js, a self-contained bundle, and the chunk names are content-hashed,
+// so every patch finds its own place by matching its own text rather than by line number.
+//
+// Nothing here is destructive. Each patch is additive, a patch whose text no longer matches is
+// reported instead of forced, and reinstalling pi returns the bundle to stock. A pi upgrade
+// replaces the bundle and drops every patch silently, which is what --check is for.
+import { createRequire } from "node:module";
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+// PI_UMBRA_PI points this at another pi tree. Otherwise pi is resolved from wherever this
+// package was installed, since it is a peer dependency, and the bun global path is the last resort.
+const resolvePi = () => {
+	if (process.env.PI_UMBRA_PI) return process.env.PI_UMBRA_PI;
+	try {
+		return dirname(createRequire(import.meta.url).resolve("@earendil-works/pi-coding-agent/package.json"));
+	} catch {
+		return join(homedir(), ".bun/install/global/node_modules/@earendil-works/pi-coding-agent");
+	}
+};
+
+const BUNDLE = join(resolvePi(), "dist/bundle");
+if (!existsSync(BUNDLE)) {
+	console.error(`no pi bundle at ${BUNDLE} - set PI_UMBRA_PI to your pi install`);
+	process.exit(1);
+}
+
+const PATCHES = [
+	{
+		// A skill is reachable as /skill:huh only. The prefix is hardcoded at both sites below,
+		// with no setting for it. The dispatch map now holds each skill under both names, so
+		// /huh works and any /skill:huh already in muscle memory or in a doc keeps working.
+		// Only the bare name is offered in autocomplete, to keep the list one line per skill.
+		reason: "/huh instead of /skill:huh",
+		from: "let commandName=`skill:${skill.name}`;this.skillCommands.set(commandName,skill.filePath),skillCommandList.push({name:commandName,",
+		to: "let commandName=skill.name;this.skillCommands.set(`skill:${skill.name}`,skill.filePath),this.skillCommands.set(commandName,skill.filePath),skillCommandList.push({name:commandName,",
+	},
+	{
+		reason: "the command list names skills without the prefix too",
+		from: "skills=this._resourceLoader.getSkills().skills.map(skill=>({name:`skill:${skill.name}`,",
+		to: "skills=this._resourceLoader.getSkills().skills.map(skill=>({name:skill.name,",
+	},
+	{
+		// The slash menu only ever opens on a line that starts with "/": `isAtStartOfMessage`
+		// gates the keystroke and `isInSlashCommandContext` gates every letter after it. A
+		// "/name" written in the middle of a sentence therefore reaches no provider at all, and
+		// an extension cannot fix that - it is never asked. These two open the door;
+		// umbra-skill-matcher decides what stands behind it.
+		//
+		// `umbraMidSlash` is deliberately narrow, so a path keeps behaving like a path: the
+		// token must be the last one on the line, hold no space, and sit after real text that
+		// ends in whitespace. "src/foo" fails on the last clause, "  /foo" on the one before it.
+		// `head!==head.trimEnd()` is how "ends in a space or a tab" is written without putting an
+		// escape inside a patch string.
+		reason: "a mid-sentence /name opens the slash menu",
+		from: `isInSlashCommandContext(textBeforeCursor){return this.isSlashMenuAllowed()&&textBeforeCursor.trimStart().startsWith("/")}`,
+		to: `isInSlashCommandContext(textBeforeCursor){return this.isSlashMenuAllowed()&&textBeforeCursor.trimStart().startsWith("/")||this.umbraMidSlash(textBeforeCursor)}umbraMidSlash(t){let i=t.lastIndexOf("/");if(i<1)return!1;if(t.slice(i+1).indexOf(" ")>=0)return!1;let head=t.slice(0,i);return head.trim()!==""&&head!==head.trimEnd()}`,
+	},
+	{
+		// The companion to the patch above: without it the menu opens on the second character
+		// rather than on the slash, because typing "/" is handled by its own branch that ends at
+		// `isAtStartOfMessage`. At that moment the token after the slash is still empty, which is
+		// exactly the shape `umbraMidSlash` accepts.
+		reason: "typing a mid-sentence slash opens the menu on the slash",
+		from: `char==="/"&&this.isAtStartOfMessage()`,
+		to: `char==="/"&&(this.isAtStartOfMessage()||this.umbraMidSlash((this.state.lines[this.state.cursorLine]||"").slice(0,this.state.cursorCol)))`,
+	},
+];
+
+const files = [join(BUNDLE, "cli.js"), ...readdirSync(join(BUNDLE, "chunks")).map((name) => join(BUNDLE, "chunks", name))];
+const CHECK = process.argv.includes("--check");
+const unapplied = [];
+const gone = [];
+
+for (const patch of PATCHES) {
+	let done = false;
+	for (const path of files) {
+		const source = readFileSync(path, "utf8");
+		// A multi-line patch is written with newline escapes; match whatever line ending the file uses.
+		const eol = source.includes("\r\n") ? "\r\n" : "\n";
+		const from = patch.from.split("\n").join(eol);
+		const to = patch.to.split("\n").join(eol);
+		if (source.includes(to)) {
+			if (!CHECK) console.log(`already patched: ${patch.reason}`);
+			done = true;
+			break;
+		}
+		if (!source.includes(from)) continue;
+		if (CHECK) {
+			unapplied.push(patch.reason);
+			done = true;
+			break;
+		}
+		writeFileSync(path, source.replace(from, to));
+		console.log(`patched: ${patch.reason}`);
+		done = true;
+		break;
+	}
+	// Neither the original text nor the patched text is there, so pi changed the code this
+	// patch names. Report it rather than force anything.
+	if (!done) gone.push(patch.reason);
+}
+
+for (const reason of unapplied) console.log(`NOT APPLIED: ${reason}`);
+for (const reason of gone) console.log(`SEAM GONE:   ${reason}`);
+const bad = unapplied.length + gone.length;
+console.log(bad ? `${bad} of ${PATCHES.length} not in place` : `all ${PATCHES.length} patches applied`);
+process.exit(bad ? 1 : 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-umbra",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Every small thing pi does not build in, in one install: seven themes and the chrome around them, the input bar, session rename, a shimmer through the working indicator, mid-prompt skill completion, ask, copy-chat, preview and help.",
   "keywords": [
     "pi-package",
@@ -46,8 +46,8 @@
     "pi-umbra-inputbar": "0.1.2",
     "pi-umbra-preview": "0.1.2",
     "pi-umbra-rename": "0.1.2",
-    "pi-umbra-shimmer": "0.1.2",
-    "pi-umbra-skill-matcher": "0.1.1"
+    "pi-umbra-shimmer": "0.1.3",
+    "pi-umbra-skill-matcher": "0.1.2"
   },
   "bundledDependencies": [
     "pi-umbra-theme",