pi-lean-dimension 0.3.2 → 0.4.0

package/README.md

@@ -21,13 +21,28 @@ npx playwright install chromium firefox
 That's it — the tools are registered and start enabled by default. Control
 them with `/web on|off|learn` (`on` = browser tools, `learn` = browser tools
 plus guide-saving via `web-learn`, `off` = everything off). The state persists
-per session. To set a different default for **new** sessions, add this to your
-Pi settings (`~/.pi/agent/settings.json` or `.pi/settings.json`):
+per session. To set a different default for **new** sessions, add a
+`toolsetDefaults` block to your Pi settings (`~/.pi/agent/settings.json` or
+`.pi/settings.json`):
 
 ```json
-{ "browserToggle": { "defaultEnabled": false } }
+{
+  "toolsetDefaults": {
+    "toolset-state:pi-lean-dimension.web": { "enabled": false },
+    "toolset-state:pi-lean-dimension.web-learn": { "enabled": false },
+    "toolset-state:pi-lean-dimension.search": { "enabled": false }
+  }
+}
 ```
 
+`toolsetDefaults` is read by the [`pi-tool-masking`](https://github.com/coreyryanhanson/pi-tool-masking/) library on restore, before
+the toolset's packaged default. Omit a key to use the packaged default; the
+`search` key only applies when `pi-lean-search` is installed.
+
+> The legacy `browserToggle.defaultEnabled` key is **removed in 0.4.0** and
+> no longer read. If you pinned it, move the value into the matching
+> `toolsetDefaults` entry above.
+
 ---
 
 ## Install options

package/node_modules/pi-lean-portal/README.md

@@ -115,8 +115,10 @@ toggles guide-saving mode, and manages browser profiles.
 ### Persistence
 
 The toggle state is stored in the conversation's branch history. A fresh
-conversation starts with the default from `settings.json` (`browserToggle.defaultEnabled`,
-which defaults to `true`).
+conversation starts with the default from `settings.json` — the
+`pi-tool-masking` library's `toolsetDefaults` block (see
+[Configuration (`settings.json`)](#configuration-settingsjson)), falling back
+to the toolset's packaged default (`true` for `web`).
 
 ---
 
@@ -606,18 +608,31 @@ a `profile` parameter:
 }
 ```
 
-### `browserToggle.defaultEnabled`
+### `toolsetDefaults` *(settings-based toolset defaults)*
 
-Whether browser tools are enabled on fresh conversations:
+Whether browser tools are enabled on fresh conversations. Read by the
+`pi-tool-masking` library at restore time, between the chat-branch tier and
+the toolset's packaged default:
 
 ```jsonc
 {
-  "browserToggle": {
-    "defaultEnabled": true
+  "toolsetDefaults": {
+    "toolset-state:pi-lean-dimension.web": { "enabled": true },
+    "toolset-state:pi-lean-dimension.web-learn": { "enabled": false },
+    "toolset-state:pi-lean-dimension.search": { "enabled": true }
   }
 }
 ```
 
+- Keys are the toolsets' `persistKey` values (`toolset-state:<id>`).
+- Omit a `toolsetDefaults` key to use the toolset's packaged default (`web`
+  and `search` default `true`; `web-learn` defaults `false`).
+- The `search` key only applies when `pi-lean-search` is installed.
+
+> The legacy `browserToggle.defaultEnabled` key is **removed in 0.4.0** — it
+> is no longer read. If you pinned it, move the value into the matching
+> `toolsetDefaults` entry above.
+
 ### `browser.maxStorageStateSize`
 
 Size threshold for profile state warnings (default: 10 MB):

package/node_modules/pi-lean-portal/__tests__/browser-toggle.test.ts

@@ -371,6 +371,30 @@ describe("/web focus-mode guard", () => {
 			expect(finalActive).toContain(name);
 		}
 	});
+
+	// Allowlist focus (an upstream pi-tool-masking consumer) holds the line
+	// the same way inclusion does. The published library type doesn't name
+	// "allowlist", so we set the shared module state directly — mirroring what
+	// an allowlist-capable consumer's restore writes into globalThis.
+	it("refuses /web on/off/learn while allowlist focus is active", async () => {
+		const { pi } = mockPi([]);
+		browserToggle(pi);
+		(globalThis as any)[MODULE_STATE_KEY] = {
+			defaultResolutionMode: "allowlist",
+		};
+
+		for (const sub of ["on", "off", "learn"]) {
+			(pi.setActiveTools as any).mockClear();
+			const ctx = mockCtx();
+			await captureWebHandler(pi)(sub, ctx);
+
+			expect(ctx.ui.notify).toHaveBeenCalledWith(
+				expect.stringContaining("Focus mode (allowlist) is active"),
+				"warning",
+			);
+			expect(pi.setActiveTools).not.toHaveBeenCalled();
+		}
+	});
 });
 
 // ==================================================================

package/node_modules/pi-lean-portal/browser-toggle.ts

@@ -1,6 +1,5 @@
 import type {
 	ExtensionAPI,
-	ExtensionCommandContext,
 	ExtensionContext,
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
@@ -10,7 +9,14 @@ import {
 	getDefaultResolutionMode,
 } from "pi-tool-masking";
 import type { ToolsetSpec } from "pi-tool-masking";
-import { readMergedSettings } from "./core/shared/settings-reader.js";
+
+// Focus-mode guard: refuse actuating subcommands while the library holds the
+// line — inclusion mode or allowlist focus (an upstream pi-tool-masking
+// consumer).
+function isFocusHolding(): boolean {
+	const mode = getDefaultResolutionMode();
+	return mode === "inclusion" || mode === "allowlist";
+}
 
 // ---- Toolset specs -----------------------------------------------
 
@@ -139,21 +145,10 @@ function renderBrowserGlyph(
 // ---- Toggle initializer ------------------------------------------
 
 export default function initBrowserToggle(pi: ExtensionAPI) {
-	const merged = readMergedSettings();
-	const browserToggleSegment = (merged as Record<string, unknown>)[
-		"browserToggle"
-	] as Record<string, unknown> | undefined;
-	const webDefault =
-		browserToggleSegment &&
-		typeof browserToggleSegment["defaultEnabled"] === "boolean"
-			? (browserToggleSegment["defaultEnabled"] as boolean)
-			: true;
-
-	const webSpec: ToolsetSpec = {
-		...PORTAL_WEB_SPEC,
-		defaultEnabled: webDefault,
-	};
-	const webToolset = defineToolset(pi, webSpec);
+	// Settings-based toolset defaults (`toolsetDefaults` tier) are read by
+	// pi-tool-masking itself inside defineToolset/restore — pass the packaged
+	// spec straight through.
+	const webToolset = defineToolset(pi, PORTAL_WEB_SPEC);
 	const learnToolset = defineToolset(pi, PORTAL_LEARN_SPEC);
 
 	// ── Keep cached state in sync with library events ─────────
@@ -180,16 +175,18 @@ export default function initBrowserToggle(pi: ExtensionAPI) {
 			const cmd = args.trim().toLowerCase();
 
 			// Focus-mode guard (§13.2): refuse actuating subcommands while the
-			// library holds the line in inclusion mode, so a sibling toggle
-			// can't write a focus-indistinguishable {enabled} entry. Read-only
-			// subcommands (status/profile/cookies/bare /web) stay unguarded,
-			// matching tbox's treatment of its own read-only commands.
-			if (
-				["on", "off", "learn"].includes(cmd) &&
-				getDefaultResolutionMode() === "inclusion"
-			) {
+			// library holds the line — either inclusion mode or allowlist focus
+			// (an upstream pi-tool-masking consumer). Either way a sibling
+			// toggle must not write a focus-indistinguishable {enabled} entry.
+			// Read-only subcommands (status/profile/cookies/bare /web) stay
+			// unguarded, matching the focus controller's treatment of its own
+			// read-only commands.
+			if (["on", "off", "learn"].includes(cmd) && isFocusHolding()) {
+				const inInclusion = getDefaultResolutionMode() === "inclusion";
 				ctx.ui.notify(
-					"Another plugin has active inclusion mode — this toolset can't be toggled while inclusion is holding the line. Deactivate it there first.",
+					inInclusion
+						? "Another plugin has active inclusion mode — this toolset can't be toggled while inclusion is holding the line. Deactivate it there first."
+						: "Focus mode (allowlist) is active — this toolset can't be toggled while focus is holding the line. Exit focus there first.",
 					"warning",
 				);
 				return;

package/node_modules/pi-lean-portal/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-lean-portal",
-	"version": "0.3.2",
+	"version": "0.4.0",
 	"description": "Pi extension. Interactive web browsing for Pi — a /web toggle removes the tools from context when switched off, Playwright Chromium/Firefox deliver accessibility-tree snapshots, persistent profiles, cookies, and domain-matched guides; custom/stealth backends (Camoufox) plug in when a site blocks the shipped browsers.",
 	"keywords": [
 		"pi-package",
@@ -56,7 +56,7 @@
 	},
 	"dependencies": {
 		"node-html-parser": "^6.1.0",
-		"pi-tool-masking": "^1.0.0",
+		"pi-tool-masking": "^1.2.0",
 		"playwright": "^1.60.0",
 		"turndown": "^7.2.0"
 	},

package/node_modules/pi-lean-search/__tests__/web-search.test.ts

@@ -80,9 +80,7 @@ describe("readSearxngUrl", () => {
 		vi.mocked(existsSync).mockImplementation(
 			(path) => typeof path === "string" && path.includes(".pi"),
 		);
-		vi.mocked(readFileSync).mockReturnValue(
-			JSON.stringify({ theme: "dark", browserToggle: {} }),
-		);
+		vi.mocked(readFileSync).mockReturnValue(JSON.stringify({ theme: "dark" }));
 		expect(readSearxngUrl()).toBeUndefined();
 	});
 
@@ -444,6 +442,7 @@ describe("execute answer rendering", () => {
 beforeEach(() => {
 	_resetStateForTest();
 	delete (globalThis as any)[REGISTRY_KEY];
+	delete (globalThis as any)["__piToolMaskingModuleState"];
 });
 
 // ==================================================================
@@ -477,4 +476,24 @@ describe("pi-lean-dimension.web co-activation mirror", () => {
 			expect.arrayContaining(["web-search"]),
 		);
 	});
+
+	// Allowlist focus (an upstream pi-tool-masking consumer) holds the line —
+	// the mirror must not co-activate, so a stale library `doRestore` emitting
+	// a web `changed` during resume can't disable search or write a {enabled}
+	// entry. Set the shared module state directly.
+	it("skips co-activation while allowlist focus is active", async () => {
+		const { pi, events } = mockSearchPi(["web-search"]);
+		searchExtension(pi);
+		(globalThis as any)["__piToolMaskingModuleState"] = {
+			defaultResolutionMode: "allowlist",
+		};
+
+		(pi.setActiveTools as any).mockClear();
+		events.emit(TOOLSET_EVENTS.changed, {
+			id: "pi-lean-dimension.web",
+			enabled: false,
+		});
+
+		expect(pi.setActiveTools).not.toHaveBeenCalled();
+	});
 });

package/node_modules/pi-lean-search/index.ts

@@ -16,7 +16,11 @@ import type {
 	ExtensionContext,
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
-import { defineToolset, TOOLSET_EVENTS } from "pi-tool-masking";
+import {
+	defineToolset,
+	TOOLSET_EVENTS,
+	getDefaultResolutionMode,
+} from "pi-tool-masking";
 import type { ToolsetSpec, ToolsetChangedEvent } from "pi-tool-masking";
 import { readSearxngUrl } from "./search-config.js";
 import { webSearchTool } from "./web-search-tool.js";
@@ -199,9 +203,15 @@ export default function (pi: ExtensionAPI) {
 
 	// ── Co-activation: mirror pi-lean-dimension.web changed events ─
 	// Listen on changed ONLY, not restored (§10.1).
+	//
+	// Focus-mode guard: while allowlist focus holds the line, skip
+	// co-activation. The focus set is authoritative, so a web `changed` event
+	// — including one a stale library `doRestore` emits during resume — must
+	// not disable search or write a focus-indistinguishable {enabled} entry.
 	pi.events.on(TOOLSET_EVENTS.changed, (data: unknown) => {
 		const event = data as ToolsetChangedEvent;
 		if (event.id === "pi-lean-dimension.web") {
+			if (getDefaultResolutionMode() === "allowlist") return;
 			if (event.enabled) {
 				searchToolset.enable(pi);
 			} else {

package/node_modules/pi-lean-search/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-lean-search",
-	"version": "0.3.2",
+	"version": "0.4.0",
 	"description": "Pi extension. SearXNG search tool for Pi — pairs with pi-lean-portal's /web toggle; search-only installs are valid, or add it to a portal install for the full web-tools suite.",
 	"keywords": [
 		"pi-package",
@@ -38,7 +38,7 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"pi-tool-masking": "^1.0.0"
+		"pi-tool-masking": "^1.2.0"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",