pi-agent-browser-native 0.9.3 → 0.9.5

package/scripts/convert-browser-session.mjs

@@ -2,19 +2,40 @@
 import { writeFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 
-const { values } = parseArgs({ options: {
-	source: { type: "string" }, output: { type: "string" }, receipt: { type: "string" },
-	"confirm-stopped": { type: "boolean" }, help: { type: "boolean", short: "h" },
-} });
+const { values } = parseArgs({
+	options: {
+		source: { type: "string" },
+		output: { type: "string" },
+		receipt: { type: "string" },
+		"confirm-stopped": { type: "boolean" },
+		help: { type: "boolean", short: "h" },
+	},
+});
 if (values.help) {
-	console.log("Usage: pi-agent-browser-convert --source <retained.jsonl> --output <private-archive/copy.jsonl> --confirm-stopped [--receipt <new.json>]\nStop/quiesce the exact writer first. This offline command never starts Pi, a provider or a browser, never edits the source, and publishes only a separate private copy. Keep the destination outside automatic session discovery until explicitly selected. The receipt and each converted record identify the retained source checksum/byte range.");
+	console.log(
+		"Usage: pi-agent-browser-convert --source <retained.jsonl> --output <private-archive/copy.jsonl> --confirm-stopped [--receipt <new.json>]\nStop/quiesce the exact writer first. This offline command never starts Pi, a provider or a browser, never edits the source, and publishes only a separate private copy. Keep the destination outside automatic session discovery until explicitly selected. The receipt and each converted record identify the retained source checksum/byte range.",
+	);
 } else {
 	try {
-		if (!values.source || !values.output) throw new Error("--source and --output are required; use --help for the stopped-writer workflow.");
-		const { convertBrowserSession } = await import("../dist/extensions/agent-browser/lib/browser-session-conversion.js");
-		const receipt = await convertBrowserSession({ source: values.source, destination: values.output, confirmedStopped: values["confirm-stopped"] === true });
+		if (!values.source || !values.output) {
+			throw new Error(
+				"--source and --output are required; use --help for the stopped-writer workflow.",
+			);
+		}
+		const { convertBrowserSession } =
+			await import("../dist/extensions/agent-browser/lib/browser-session-conversion.js");
+		const receipt = await convertBrowserSession({
+			source: values.source,
+			destination: values.output,
+			confirmedStopped: values["confirm-stopped"] === true,
+		});
 		console.log(JSON.stringify(receipt, null, 2));
-		if (values.receipt) await writeFile(values.receipt, `${JSON.stringify(receipt, null, 2)}\n`, { flag: "wx", mode: 0o600 });
+		if (values.receipt) {
+			await writeFile(values.receipt, `${JSON.stringify(receipt, null, 2)}\n`, {
+				flag: "wx",
+				mode: 0o600,
+			});
+		}
 	} catch (error) {
 		console.error(error instanceof Error ? error.message : String(error));
 		process.exitCode = 1;

package/scripts/doctor-sources.mjs

@@ -0,0 +1,195 @@
+/** Read-only Pi settings and autoload source discovery for the package doctor. */
+import { homedir } from "node:os";
+import { dirname, isAbsolute, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
+import stripJsonComments from "strip-json-comments";
+
+const PACKAGE_NAME = "pi-agent-browser-native";
+const REPO_URL_FRAGMENT = "github.com/fitchmultz/pi-agent-browser-native";
+const EXTENSION_ENTRYPOINTS = [
+	"extensions/agent-browser/index.ts",
+	"dist/extensions/agent-browser/index.js",
+];
+const THIS_PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+
+function isInsidePath(childPath, parentPath) {
+	const child = resolve(childPath);
+	const parent = resolve(parentPath);
+	return child === parent || child.startsWith(`${parent}${sep}`);
+}
+
+function expandUserPath(path) {
+	if (path === "~") {
+		return homedir();
+	}
+	if (path.startsWith("~/")) {
+		return resolve(homedir(), path.slice(2));
+	}
+	return path;
+}
+
+function isPathLikeSource(source) {
+	return (
+		isAbsolute(source) ||
+		source.startsWith("./") ||
+		source.startsWith("../") ||
+		source.startsWith("~")
+	);
+}
+
+function sourceLooksLikeThisPackage(source, cwd, sourceBaseDir = cwd) {
+	const text = String(source ?? "").trim();
+	if (text.length === 0) {
+		return false;
+	}
+	if (
+		/^npm:pi-agent-browser-native(?:@|$)/.test(text) ||
+		text === PACKAGE_NAME ||
+		text.includes(REPO_URL_FRAGMENT)
+	) {
+		return true;
+	}
+	if (!isPathLikeSource(text)) {
+		return false;
+	}
+	const resolvedSource = resolve(sourceBaseDir, expandUserPath(text));
+	return [cwd, THIS_PACKAGE_ROOT].some(
+		(root) =>
+			resolvedSource === root ||
+			EXTENSION_ENTRYPOINTS.some((entrypoint) =>
+				isInsidePath(resolve(root, entrypoint), resolvedSource),
+			),
+	);
+}
+
+function arrayEntries(value) {
+	return Array.isArray(value) ? value.entries() : [];
+}
+
+function entrySource(entry) {
+	if (typeof entry === "string") {
+		return entry;
+	}
+	if (entry && typeof entry === "object") {
+		return entry.source ?? entry.path ?? entry.package;
+	}
+}
+
+function collectSettingsSources(settings, settingsPath, cwd) {
+	const sources = [];
+	const sourceBaseDir = dirname(settingsPath);
+	for (const [field, kind] of [
+		["packages", "package"],
+		["extensions", "extension"],
+	]) {
+		for (const [index, entry] of arrayEntries(settings?.[field])) {
+			const source = entrySource(entry);
+			if (sourceLooksLikeThisPackage(source, cwd, sourceBaseDir)) {
+				sources.push({
+					kind,
+					source: String(source),
+					location: `${settingsPath} ${field}[${index}]`,
+				});
+			}
+		}
+	}
+	return sources;
+}
+
+async function inspectSettingsPath({ path, cwd, readText }) {
+	try {
+		const text = await readText(path);
+		if (text === undefined) {
+			return { sources: [], warnings: [] };
+		}
+		const settings = JSON.parse(stripJsonComments(text));
+		return { sources: collectSettingsSources(settings, path, cwd), warnings: [] };
+	} catch (error) {
+		return {
+			sources: [],
+			warnings: [
+				`Could not inspect Pi settings ${path}: ${error instanceof Error ? error.message : String(error)}`,
+			],
+		};
+	}
+}
+
+async function collectRepoLocalSources({ cwd, pathExists }) {
+	const candidates = [
+		resolve(cwd, ".pi/extensions/agent-browser.ts"),
+		resolve(cwd, ".pi/extensions/agent-browser/index.ts"),
+	];
+	const sources = [];
+	for (const candidate of candidates) {
+		// Inspect one autoload location at a time to preserve the injected read-only I/O order.
+		// oxlint-disable-next-line no-await-in-loop
+		if (await pathExists(candidate)) {
+			sources.push({
+				kind: "repo-local",
+				source: candidate,
+				location: `${candidate} repo-local autoload`,
+			});
+		}
+	}
+	return sources;
+}
+
+/**
+ * @param {{cwd: string, agentDir: string, settingsPaths: readonly string[], readText: (path: string) => Promise<string | undefined>, pathExists: (path: string) => Promise<boolean>}} options
+ * @returns {Promise<{status: "fail" | "pass" | "warn", title: string, lines: string[], warnings: string[]}>}
+ */
+export async function checkPiSources({ cwd, agentDir, settingsPaths, readText, pathExists }) {
+	const defaultSettingsPaths = [
+		resolve(agentDir, "settings.json"),
+		resolve(cwd, ".pi/settings.json"),
+	];
+	const allSettingsPaths = [
+		...new Set([...defaultSettingsPaths, ...settingsPaths].map((path) => resolve(path))),
+	];
+	const sources = [];
+	const warnings = [];
+	for (const path of allSettingsPaths) {
+		// Settings are inspected in configured precedence order; injected I/O preserves that order.
+		// oxlint-disable-next-line no-await-in-loop
+		if (await pathExists(path)) {
+			// Finish reading this settings file before reporting and inspecting the next source.
+			// oxlint-disable-next-line no-await-in-loop
+			const result = await inspectSettingsPath({ path, cwd, readText });
+			sources.push(...result.sources);
+			warnings.push(...result.warnings);
+		}
+	}
+	sources.push(...(await collectRepoLocalSources({ cwd, pathExists })));
+	if (sources.length > 1) {
+		return {
+			status: "fail",
+			title: "Duplicate pi-agent-browser-native sources detected.",
+			lines: [
+				"Pi may register multiple `agent_browser` tools when a checkout source and a package source are both active.",
+				"Detected sources:",
+				...sources.map((source) => `- ${source.source} from ${source.location}`),
+				"Keep exactly one active source:",
+				"- for normal use: keep `pi install npm:pi-agent-browser-native` and remove/disable checkout paths from Pi settings",
+				"- for temporary package or checkout trials: use `pi --approve --no-extensions -e <source>` when you intentionally trust the current project, or omit `--approve` to let Pi prompt in interactive mode",
+				"- for configured-source lifecycle validation: keep exactly one checkout or package source, then launch plain `pi`",
+			],
+			warnings,
+		};
+	}
+	if (sources.length === 1) {
+		return {
+			status: "pass",
+			title: "No duplicate pi-agent-browser-native sources detected.",
+			lines: [`Detected source: ${sources[0].source} from ${sources[0].location}`],
+			warnings,
+		};
+	}
+	return {
+		status: "warn",
+		title: "No configured pi-agent-browser-native source was found in inspected Pi settings.",
+		lines: [
+			"This is OK for isolated runs such as `pi --no-extensions -e npm:pi-agent-browser-native`, but normal package use should install exactly one source with `pi install npm:pi-agent-browser-native`.",
+		],
+		warnings,
+	};
+}