pi-lens 4.2.1 → 4.4.0

package/scripts/download-grammars.js

@@ -38,6 +38,11 @@ export const SOURCE_OVERRIDES = {
         version: "0.7.1",
         url: "https://unpkg.com/@tree-sitter-grammars/tree-sitter-yaml@0.7.1/tree-sitter-yaml.wasm",
     },
+    "tree-sitter-bash.wasm": {
+        package: "tree-sitter-bash",
+        version: "0.25.1",
+        url: "https://unpkg.com/tree-sitter-bash@0.25.1/tree-sitter-bash.wasm",
+    },
 };
 /**
  * Grammars committed under `vendor/grammars/` rather than fetched.

package/scripts/grammars.lock.json

@@ -2,7 +2,7 @@
   "package": "tree-sitter-wasms",
   "version": "0.1.13",
   "grammars": {
-    "tree-sitter-bash.wasm": "sha256:807dcdb1380a59befb112ed8fbd3d3872c7fadaf5903a769282b50973b30696d",
+    "tree-sitter-bash.wasm": "sha256:8292919c88a0f7d3fb31d0cd0253ca5a9531bc1ede82b0537f2c63dd8abe6a7a",
     "tree-sitter-c.wasm": "sha256:056b25072382f72deee2c64ec238ffc4bb8cf42844ef21502c0e70f03a8a0d66",
     "tree-sitter-c_sharp.wasm": "sha256:6266a7e32d68a3459104d994dc848df15d5672b0ea8e86d327274b694f8e6991",
     "tree-sitter-cpp.wasm": "sha256:f6afdf53bfd6de76557bb7edb624a3a3869e14d9a83b78433f93617ecee42527",
@@ -39,6 +39,11 @@
       "package": "@tree-sitter-grammars/tree-sitter-yaml",
       "version": "0.7.1",
       "url": "https://unpkg.com/@tree-sitter-grammars/tree-sitter-yaml@0.7.1/tree-sitter-yaml.wasm"
+    },
+    "tree-sitter-bash.wasm": {
+      "package": "tree-sitter-bash",
+      "version": "0.25.1",
+      "url": "https://unpkg.com/tree-sitter-bash@0.25.1/tree-sitter-bash.wasm"
     }
   },
   "vendored": {

package/scripts/install-selftest.mjs

@@ -50,6 +50,10 @@ import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { HOST_PROVIDED_PACKAGES } from "./lib/host-provided-deps.mjs";
 import { collectSkillEntryPaths } from "./lib/skills-predicate.mjs";
+import {
+	findCoreGrammarDir,
+	resolveWebTreeSitterPackageDir,
+} from "./lib/web-tree-sitter-dir.mjs";
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const pkgRoot = path.resolve(here, "..");
@@ -126,18 +130,14 @@ function probeResolve(spec) {
 }
 
 // --- 1. The documented failure-point modules (eager bare imports) ----------
+// #3219: the package ships only bundled entries. file-utils (→ minimatch),
+// complexity-client (→ tree-sitter) and bootstrap (→ all analyzers) are inlined
+// in dist/index.js, so its import probes them; the installer registry is the
+// bundled dist/probes/installer.js the bins share chunks with.
 await probeImport("dist/index.js (entry)", "dist/index.js");
 await probeImport(
-	"clients/file-utils.js (→ minimatch)",
-	"dist/clients/file-utils.js",
-);
-await probeImport(
-	"clients/complexity-client.js (→ tree-sitter)",
-	"dist/clients/complexity-client.js",
-);
-await probeImport(
-	"clients/bootstrap.js (→ all analyzers)",
-	"dist/clients/bootstrap.js",
+	"probes/installer.js (bundled installer registry)",
+	"dist/probes/installer.js",
 );
 
 // --- 2. Direct bare-specifier resolution -----------------------------------
@@ -173,7 +173,7 @@ record(
 // symlink store) — the binary exists but the launcher can't reach it.
 try {
 	const installerUrl = `file://${path
-		.resolve(pkgRoot, "dist/clients/installer/index.js")
+		.resolve(pkgRoot, "dist/probes/installer.js")
 		.replace(/\\/g, "/")}`;
 	const { TOOLS, resolvePlatformPackageBinary } = await import(installerUrl);
 	for (const tool of TOOLS.filter((t) => t.platformPackage)) {
@@ -219,30 +219,33 @@ try {
 	);
 }
 
-// tree-sitter grammars — download-grammars.js postinstall writes them into
-// node_modules/web-tree-sitter/grammars/. Locate that dir via the resolved
-// web-tree-sitter package (matches tree-sitter-client's runtime strategy).
-let grammarDetail = "tree-sitter-*.wasm missing (postinstall skipped?)";
-let hasCoreGrammar = false;
-try {
-	// web-tree-sitter restricts `exports`, so resolve its main entry and walk
-	// up to the package root (the dir literally named web-tree-sitter), where
-	// download-grammars.js writes grammars/.
-	let dir = path.dirname(require.resolve("web-tree-sitter"));
-	while (
-		path.basename(dir) !== "web-tree-sitter" &&
-		dir !== path.dirname(dir)
-	) {
-		dir = path.dirname(dir);
-	}
-	const grammarDir = path.join(dir, "grammars");
-	hasCoreGrammar = fs.existsSync(
-		path.join(grammarDir, "tree-sitter-typescript.wasm"),
-	);
-	if (hasCoreGrammar) grammarDetail = grammarDir;
-} catch (err) {
-	grammarDetail = `web-tree-sitter unresolved: ${err?.message || err}`;
-}
+// tree-sitter grammars — the core set ships INSIDE the tarball, in
+// `<pkgRoot>/grammars`, and the runtime reads that dir first
+// (`bundledGrammarsDir` in clients/tree-sitter-client.ts). `web-tree-sitter/
+// grammars` is only the lazy-fetch write target, nothing at install time fills
+// it, so probing it alone warned in every layout and the strict npm gate (#1185)
+// could never drop `--allow-soft`. Check the bundled dir, then fall back to the
+// web-tree-sitter dir, which the extension runtime locates through the SAME
+// shared ladder (#3409 round 1, R3418-2): a bare `web-tree-sitter` resolve
+// throws MODULE_NOT_FOUND inside a `bun build --compile` host.
+const bundledGrammarDir = path.join(pkgRoot, "grammars");
+const webTreeSitterDir = resolveWebTreeSitterPackageDir({
+	resolve: (specifier) => require.resolve(specifier),
+	packageRoot: () => pkgRoot,
+	cwd: () => process.cwd(),
+});
+const grammarDir = findCoreGrammarDir({
+	packageRoot: pkgRoot,
+	webTreeSitterDir,
+});
+const hasCoreGrammar = grammarDir !== undefined;
+const grammarDetail = hasCoreGrammar
+	? grammarDir
+	: `tree-sitter-typescript.wasm missing in ${bundledGrammarDir}${
+			webTreeSitterDir
+				? ` and ${path.join(webTreeSitterDir, "grammars")}`
+				: " (web-tree-sitter dir unresolvable)"
+		}`;
 record("tree-sitter grammars", "asset", hasCoreGrammar, grammarDetail);
 
 // --- 4. pi.skills manifest resolution, AS INSTALLED (#2587) ----------------

package/scripts/lib/host-provided-deps.mjs

@@ -18,11 +18,20 @@
  *   VALUE imports of those work with no copy on disk — verified by hiding both
  *   from the dogfood install and re-running under PI_TIMING (#1926), and by
  *   `@tintinweb/pi-subagents`, which declares pi-tui as a peer and ships no
- *   copy. `@earendil-works/pi-coding-agent` is different: it is not resolvable
- *   from an extension at all, so pi-lens imports it TYPE-ONLY and inlines the
- *   runtime helpers it needs. `tests/host-sdk-type-only.test.ts` enforces that
+ *   copy. That resolution is jiti's: pi's loader hands `dist/index.js` to
+ *   jiti, whose native import fails on those unresolvable static imports, and
+ *   the transpiled fallback serves them from pi's running instance
+ *   (`virtualModules` in the bundled CLI). `@earendil-works/pi-coding-agent` is
+ *   served the same way, but a static import of it would fail the extension
+ *   LOAD on any host that does not serve it, and where pi-lens' static imports
+ *   resolve natively a runtime import of it goes through Node and can load a
+ *   second copy. So pi-lens imports it TYPE-ONLY and inlines the runtime
+ *   helpers it needs. `tests/host-sdk-type-only.test.ts` enforces that
  *   separate rule (#1334 S6); do not read this list as permission to
- *   value-import the host SDK.
+ *   value-import the host SDK. Its one admitted exception is lazy and caught:
+ *   `index.ts` looks up pi's `withFileMutationQueue` on the first write, and
+ *   `clients/file-mutation-queue.ts` records whether it reached the host's
+ *   own copy (#3506).
  *
  * LAZY_NATIVE_PACKAGES
  *   Native addon / wasm, dynamic-imported by absolute file:// URL at call time.

package/scripts/lib/web-tree-sitter-dir.mjs

@@ -0,0 +1,141 @@
+/**
+ * Where web-tree-sitter is installed — ONE ladder, for every caller that needs
+ * the answer (#3409).
+ *
+ * Callers: `clients/tree-sitter-client.ts` (the grammar read path and the
+ * lazy-fetch write target), `clients/install-diagnostics.ts` (the pasted
+ * environment fingerprint) and `scripts/install-selftest.mjs` (the installed
+ * host's own diagnostic). Each used to spell its own rungs, and the two that led
+ * with a BARE specifier were unconditionally broken on the host pi ships: inside
+ * a `bun build --compile` binary `require.resolve("web-tree-sitter")` throws
+ * MODULE_NOT_FOUND while `require.resolve("web-tree-sitter/tree-sitter.wasm")` —
+ * an explicit file subpath — still resolves.
+ *
+ * It lives in `scripts/lib/` rather than `clients/` because the installed
+ * selftest is packaged (`files[]`) without `clients/`, and this is the house
+ * pattern for logic a packaged .mjs script and the TypeScript runtime share
+ * (`scripts/lib/skills-predicate.mjs`, `scripts/lib/process-scan.mjs`). It
+ * imports nothing but `node:fs` and `node:path`, so it loads even on the hosts
+ * whose broken dependency graph the selftest exists to report.
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+/** The package this module is about. Also the name its manifest must carry. */
+const WEB_TREE_SITTER = "web-tree-sitter";
+
+/**
+ * The wasm the runtime loads, at the package root — where 0.25.10's `exports`
+ * map puts it (`"./tree-sitter.wasm": "./tree-sitter.wasm"`). If a later release
+ * moves it (#381's 0.26 migration), the two FALLBACK rungs below stop matching
+ * and the resolver rungs, which ask Node for that same subpath, keep working;
+ * this constant is then the one line to update.
+ */
+const RUNTIME_WASM = "tree-sitter.wasm";
+
+/**
+ * True when `dir` IS an installed web-tree-sitter package: its own manifest
+ * names it, and the wasm the runtime loads is in it.
+ *
+ * Round 1 review of #3409 (R3418-1): the constructed rungs used to accept any
+ * directory that merely EXISTED at `<base>/node_modules/web-tree-sitter`, so an
+ * empty or foreign directory of that name became the runtime fetch's write
+ * target and a downloaded grammar would land in an unrelated tree. Existence is
+ * not identity. The manifest name is the identity; the wasm is what makes the
+ * directory the right place to put grammars, since a grammar is only loadable by
+ * the web-tree-sitter runtime sitting next to it (the ABI drift #1564 is about).
+ */
+export function isWebTreeSitterPackageDir(dir) {
+	try {
+		if (!fs.existsSync(path.join(dir, RUNTIME_WASM))) return false;
+		const manifest = JSON.parse(
+			fs.readFileSync(path.join(dir, "package.json"), "utf8"),
+		);
+		return manifest?.name === WEB_TREE_SITTER;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * The package directory owning `resolvedFile`: walk up until a directory passes
+ * the identity check, or the filesystem root is reached. The walk exists because
+ * an `exports` map may point into a subdirectory, so the file's own parent is
+ * not necessarily the package; the identity check is what stops the walk, so a
+ * resolver that answers outside any web-tree-sitter package yields nothing
+ * rather than an unrelated ancestor.
+ */
+function packageDirOf(resolvedFile) {
+	let dir = path.dirname(resolvedFile);
+	for (;;) {
+		if (isWebTreeSitterPackageDir(dir)) return dir;
+		const parent = path.dirname(dir);
+		if (parent === dir) return undefined;
+		dir = parent;
+	}
+}
+
+/**
+ * web-tree-sitter's installed package directory, or undefined.
+ *
+ * Rung order, most authoritative first:
+ *  1. the `tree-sitter.wasm` SUBPATH, which resolves on a compiled host as well
+ *     as a plain one. This is the rung that makes the non-core grammars
+ *     fetchable there at all.
+ *  2. the BARE specifier, for a future web-tree-sitter whose exports map no
+ *     longer carries `./tree-sitter.wasm`.
+ *  3. pi-lens's own package root, for the temp-dir compile layout (#20) where
+ *     the resolver's context is a temp directory but the package root still has
+ *     the right `node_modules`.
+ *  4. the working directory, the pre-#3409 last resort.
+ *
+ * Rungs 1-2 are the resolver's answer and outrank the constructed guesses: the
+ * grammars must come from the SAME package whose wasm the runtime loaded. Every
+ * rung's candidate passes `isWebTreeSitterPackageDir` before it is returned.
+ *
+ * `resolve`, `packageRoot` and `cwd` are injected, never defaulted: the caller's
+ * resolver context and package root are what differ on a compiled host, so they
+ * must not be silently replaced by this module's — and a rung nothing can vary
+ * is a rung no test can drive.
+ */
+export function resolveWebTreeSitterPackageDir(deps) {
+	for (const specifier of [
+		`${WEB_TREE_SITTER}/${RUNTIME_WASM}`,
+		WEB_TREE_SITTER,
+	]) {
+		try {
+			const dir = packageDirOf(deps.resolve(specifier));
+			if (dir) return dir;
+		} catch {
+			/* next rung */
+		}
+	}
+	for (const base of [deps.packageRoot, deps.cwd]) {
+		try {
+			const candidate = path.join(base(), "node_modules", WEB_TREE_SITTER);
+			if (isWebTreeSitterPackageDir(candidate)) return candidate;
+		} catch {
+			/* next rung */
+		}
+	}
+	return undefined;
+}
+
+/**
+ * The directory holding the core grammars an INSTALLED pi-lens can load, or
+ * undefined (#1185). The tarball ships them in `<packageRoot>/grammars` and the
+ * runtime reads that dir first (`bundledGrammarsDir` in
+ * clients/tree-sitter-client.ts); `<web-tree-sitter>/grammars` is only the
+ * lazy-fetch write target and nothing at install time fills it. The selftest
+ * used to probe only the latter, so it warned in every layout.
+ */
+export function findCoreGrammarDir({ packageRoot, webTreeSitterDir }) {
+	return [
+		path.join(packageRoot, "grammars"),
+		webTreeSitterDir && path.join(webTreeSitterDir, "grammars"),
+	].find(
+		(dir) =>
+			dir && fs.existsSync(path.join(dir, "tree-sitter-typescript.wasm")),
+	);
+}

package/dist/clients/actionable-warnings-logger.js

@@ -1,35 +0,0 @@
-import * as path from "node:path";
-import { isTestMode } from "./env-utils.js";
-import { getGlobalPiLensLogDir } from "./probe-home-state.js";
-import { createNdjsonLogger } from "./ndjson-logger.js";
-import { normalizeFilePath } from "./path-utils.js";
-const AW_LOG_DIR = getGlobalPiLensLogDir();
-const AW_LOG_FILE = path.join(AW_LOG_DIR, "actionable-warnings.log");
-const AW_LOG_BACKUP_FILE = path.join(AW_LOG_DIR, "actionable-warnings.log.1");
-const MAX_LOG_BYTES = Math.max(128 * 1024, Number.parseInt(process.env.PI_LENS_AW_LOG_MAX_BYTES ?? "1048576", 10) ||
-    1048576);
-const writer = createNdjsonLogger({
-    filePath: AW_LOG_FILE,
-    maxBytes: MAX_LOG_BYTES,
-    backupPath: AW_LOG_BACKUP_FILE,
-});
-/**
- * #2219 (the #2141 class): `filePath` reaches here from
- * `actionable-warnings.ts`'s raw `path.resolve(cwd, file)` — the file
- * imports `normalizeMapKey` and uses it for map lookups on this same value,
- * but never normalizes what gets logged. `filePath` is optional (several
- * events, e.g. `report_started`/`report_complete`, carry none), so only
- * normalize when present.
- */
-export function logActionableWarningsEvent(entry) {
-    if (isTestMode()) {
-        return;
-    }
-    writer.log({
-        ts: new Date().toISOString(),
-        ...entry,
-        ...(entry.filePath !== undefined
-            ? { filePath: normalizeFilePath(entry.filePath) }
-            : {}),
-    });
-}