pi-lean-portal 0.3.2 → 0.4.0

package/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/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/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"
 	},