pi-umbra 0.3.0 → 0.4.0

package/node_modules/pi-umbra-inputbar/extensions/umbra-inputbar.ts

@@ -1,7 +1,7 @@
 // The input bar: the session name on its top border (right side) and /umb-color for its border
 // colour. Both ride on pi's own extension point - ctx.ui.setEditorComponent with a subclass of
 // CustomEditor - so no bundle patch is involved. The name is read from pi.getSessionName() at
-// every render, so /umb-rename shows on the next repaint; /umb-color persists in
+// every render, so /name shows on the next repaint; /umb-color persists in
 // ~/.pi/agent/input-color.
 import { CustomEditor, type ExtensionAPI, type ExtensionContext, type KeybindingsManager } from "@earendil-works/pi-coding-agent";
 import { isKeyRepeat, visibleWidth, type TuiMouseEvent, type TuiMouseEventResult } from "@earendil-works/pi-tui";

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

@@ -1,7 +1,7 @@
 {
   "name": "pi-umbra-inputbar",
-  "version": "0.1.4",
-  "description": "pi's input bar, rebuilt: a chevron prompt, the session name on the border, a colour you pick, and a command to rename the session.",
+  "version": "0.1.5",
+  "description": "pi's input bar, rebuilt: a chevron prompt, the session name on the border, a colour you pick.",
   "keywords": [
     "pi-package",
     "pi",

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

@@ -1,6 +1,6 @@
 {
   "name": "pi-umbra-shimmer",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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",

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

@@ -60,8 +60,11 @@ const PATCHES = [
 		// 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)`,
+		// pi 1.0 bundles the same line with the local named `frame` rather than `frame2`.
+		variants: ["frame2", "frame"].map((name) => ({
+			from: `return this.renderIndicatorVerbatim?${name}:this.spinnerColorFn(${name})`,
+			to: `return this.renderIndicatorVerbatim&&!globalThis.__umbraShimmer?${name}:this.spinnerColorFn(${name})`,
+		})),
 	},
 	{
 		// The working indicator paints its spinner with `accent` and its message with `muted`, both
@@ -79,33 +82,32 @@ const CHECK = process.argv.includes("--check");
 const unapplied = [];
 const gone = [];
 
-for (const patch of PATCHES) {
-	let done = false;
+// One patch, every file read once: "applied", "unapplied" (--check), or undefined when gone.
+const apply = (patch) => {
 	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;
+		for (const variant of patch.variants ?? [patch]) {
+			const from = variant.from.split("\n").join(eol);
+			const to = variant.to.split("\n").join(eol);
+			if (source.includes(to)) return "applied";
+			if (!source.includes(from)) continue;
+			if (CHECK) return "unapplied";
+			writeFileSync(path, source.replace(from, to));
+			console.log(`patched: ${patch.reason}`);
+			return "applied";
 		}
-		writeFileSync(path, source.replace(from, to));
-		console.log(`patched: ${patch.reason}`);
-		done = true;
-		break;
 	}
+	return undefined;
+};
+
+for (const patch of PATCHES) {
+	const result = apply(patch);
+	if (result === "unapplied") unapplied.push(patch.reason);
 	// 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);
+	else if (!result) gone.push(patch.reason);
 }
 
 for (const reason of unapplied) console.log(`NOT APPLIED: ${reason}`);

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

@@ -1,6 +1,6 @@
 {
   "name": "pi-umbra-skill-matcher",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "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",

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

@@ -58,6 +58,7 @@ const PATCHES = [
 	},
 	{
 		reason: "the command list names skills without the prefix too",
+		needs: "/huh instead of /skill:huh",
 		from: "skills=this._resourceLoader.getSkills().skills.map(skill=>({name:`skill:${skill.name}`,",
 		to: "skills=this._resourceLoader.getSkills().skills.map(skill=>({name:skill.name,",
 	},
@@ -83,6 +84,7 @@ const PATCHES = [
 		// `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",
+		needs: "a mid-sentence /name opens the slash menu",
 		from: `char==="/"&&this.isAtStartOfMessage()`,
 		to: `char==="/"&&(this.isAtStartOfMessage()||this.umbraMidSlash((this.state.lines[this.state.cursorLine]||"").slice(0,this.state.cursorCol)))`,
 	},
@@ -94,6 +96,11 @@ const unapplied = [];
 const gone = [];
 
 for (const patch of PATCHES) {
+	// It would call a method, or offer a name, that only the patch it needs provides.
+	if (gone.includes(patch.needs)) {
+		gone.push(`${patch.reason} (held back: needs "${patch.needs}")`);
+		continue;
+	}
 	let done = false;
 	for (const path of files) {
 		const source = readFileSync(path, "utf8");

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

@@ -1,8 +1,10 @@
 # pi-umbra-subagents
 
-Parallel, read-only pi branches you can watch while they work. A branch is a separate `pi -p`
-process with an empty context; a live list above the input box shows what each one is doing,
-and their answers come back to the session when the last one ends. Also `/umb-loop`, which
+Parallel pi branches you can watch while they work. A branch is a separate `pi -p` process with
+an empty context; a live tree under the input box shows what each one is doing, and their answers
+come back to the session when the last one ends. Branches are read-only, unless one is marked
+`[write]`: that one works in its own git worktree, and its changes wait on a git branch until you
+say whether to merge them. Also `/umb-loop`, which
 sends a prompt again after every reply, on a count or a timer.
 
 ![Three branches running under the input box](https://raw.githubusercontent.com/grknbyk/pi-umbra/main/assets/subagents.webp)
@@ -33,14 +35,30 @@ design: Given the Map results, propose the change.
 `label@provider/model: task` picks a model for one branch, otherwise it runs on the session's
 model. The results arrive as a follow-up message at the start of the next turn.
 
+`label [write]: task` gives one branch `edit`, `write` and `bash`, in its own git worktree on a
+new `fan/<run>/<branch>` branch that starts from your working tree, uncommitted work included.
+Its changes are committed to that branch when it ends and its row reads `Changed +12 −3 · 2 files
+on fan/...`; nothing is merged until the session asks you and you say yes. It needs a git
+repository, and pi has no sandbox: bash can still reach outside the worktree, and only the
+branch's instructions forbid it.
+
+The worktree lives under `.git/fan-worktrees/`, where test runners, linters and `git clean` do not
+look. A write branch cannot stop on a question, because its worktree closes when it ends, so its
+task has to carry every decision. Every write branch starts from the tree as it was when the run started, so a later
+phase does not see an earlier phase's changes. A run you start with `/umb-fan` tells you when a write branch
+left changes; ask the session to merge or discard them.
+
 ## Commands and keys
 
 | Command or key | Effect |
 |---|---|
 | `/umb-fan [spec]` | start a run yourself; with no argument an editor opens with a template |
 | `/umb-agents`, `alt+a` | open the agent panel |
-| `↓` from the last input line | move the `❯` from `main` into the agent list under the input box |
-| `↑` `↓`, then `enter` in that list | pick an agent and open the panel on it; `↑` past the first agent or `esc` goes back |
+| `↓` from the last input line | move the `❯` into the agent tree under the input box |
+| `↑` `↓` in the tree | move between rows; `↑` past `main` or `esc` goes back to the input box |
+| `enter` in the tree | open the row's agents, closing every other row; on `main` it folds the tree back to the top |
+| `x` in the tree | stop the row and every agent under it |
+| `alt+a` in the tree | open the agent panel on that row |
 | `↑` `↓` in the panel | move between phases, or between the agents of one phase |
 | `→` `←` in the panel | go into a phase's agents, and back out to the phases |
 | `x` in the panel | stop the selected phase, or the selected agent |
@@ -67,7 +85,7 @@ wrote stays on disk.
 | Variable | Default | Effect |
 |---|---|---|
 | `FAN_MODEL` | the session's model | model for `fan` branches that do not name one |
-| `FAN_TOOLS` | `read,grep,find,ls` | tools a branch may use |
+| `FAN_TOOLS` | `read,grep,find,ls` | tools a read-only branch may use (`[write]` branches get `edit,write,bash` too) |
 | `FAN_LOAD` | `$LOAD` from `delegate.env` | extra `-e <path>` flags; branches start with `--no-extensions`, so a provider that comes from an extension has to be listed here |
 | `FAN_TIMEOUT_MS` | `$DELEGATE_TIMEOUT` × 1000, else `300000` | a branch still running after this long is cut off |