@hienlh/ppm 0.18.12 → 0.18.14

package/src/services/db.service.ts

@@ -3,7 +3,7 @@ import { resolve } from "node:path";
 import { mkdirSync, existsSync } from "node:fs";
 import { encrypt, decrypt } from "../lib/account-crypto.ts";
 import { getPpmDir } from "./ppm-dir.ts";
-export const CURRENT_SCHEMA_VERSION = 41;
+export const CURRENT_SCHEMA_VERSION = 42;
 
 let db: Database | null = null;
 let dbProfile: string | null = null;
@@ -899,6 +899,34 @@ function runMigrations(database: Database): void {
     try { database.exec("ALTER TABLE turn_usage ADD COLUMN account_label TEXT"); } catch { /* column exists */ }
     database.exec("PRAGMA user_version = 41;");
   }
+
+  if (current < 42) {
+    // Unread rows created before `incrementSessionUnread` learned the project name have
+    // `project_name IS NULL`. They could not heal on their own: the bell refuses to open a
+    // session it cannot place, so the connection that would have filled the name never
+    // happens, and the entry comes back on every reload. Fill them from the mapping that
+    // already knows, same shape as the v11 backfill above.
+    database.exec(`
+      UPDATE session_metadata SET
+        project_name = COALESCE(project_name, (
+          SELECT project_name FROM session_map
+          WHERE session_map.sdk_id = session_metadata.session_id
+             OR session_map.ppm_id = session_metadata.session_id
+        )),
+        project_path = COALESCE(project_path, (
+          SELECT project_path FROM session_map
+          WHERE session_map.sdk_id = session_metadata.session_id
+             OR session_map.ppm_id = session_metadata.session_id
+        ))
+      WHERE project_name IS NULL OR project_path IS NULL
+    `);
+    database.exec(`
+      UPDATE session_metadata SET project_path = (
+        SELECT path FROM projects WHERE projects.name = session_metadata.project_name
+      ) WHERE project_path IS NULL AND project_name IS NOT NULL
+    `);
+    database.exec("PRAGMA user_version = 42;");
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -1161,17 +1189,26 @@ export interface UnreadEntry {
   sessionTitle: string | null;
 }
 
-/** Increment unread count for a session and set the notification type + title snapshot */
-export function incrementSessionUnread(sessionId: string, type: string, title?: string | null): void {
-  if (title) {
-    getDb().query(
-      "UPDATE session_metadata SET unread_count = unread_count + 1, unread_type = ?, last_known_title = ? WHERE session_id = ?",
-    ).run(type, title, sessionId);
-  } else {
-    getDb().query(
-      "UPDATE session_metadata SET unread_count = unread_count + 1, unread_type = ? WHERE session_id = ?",
-    ).run(type, sessionId);
-  }
+/** Increment unread count for a session and set the notification type + title snapshot.
+ *
+ *  Row-creating, like {@link setSessionUnread}. A session PPM did not create — resumed
+ *  here, or started in the CLI — has no `session_metadata` row, and an UPDATE against a
+ *  missing row silently dropped the unread entry altogether.
+ *
+ *  `project_name` is filled in the same statement so the bell can group and open the
+ *  session, and the COALESCE keeps the *stored* name: a name arriving later is not
+ *  evidence the session moved, and letting it win would let a stale name in a persisted
+ *  tab's URL overwrite a good one. */
+export function incrementSessionUnread(sessionId: string, type: string, title?: string | null, projectName?: string | null): void {
+  getDb().query(
+    `INSERT INTO session_metadata (session_id, unread_count, unread_type, last_known_title, project_name)
+     VALUES (?, 1, ?, ?, ?)
+     ON CONFLICT(session_id) DO UPDATE SET
+       unread_count = session_metadata.unread_count + 1,
+       unread_type = excluded.unread_type,
+       last_known_title = COALESCE(excluded.last_known_title, session_metadata.last_known_title),
+       project_name = COALESCE(session_metadata.project_name, excluded.project_name)`,
+  ).run(sessionId, type, title ?? null, projectName ?? null);
 }
 
 /** Manually mark a session unread (idempotent: SETS count to 1, not increment; row-creating).
@@ -1188,6 +1225,19 @@ export function setSessionUnread(sessionId: string, type: string, title?: string
   ).run(sessionId, type, title ?? null, projectName ?? null);
 }
 
+/** Mark several sessions as read in one transaction.
+ *  Clearing is project-agnostic — the read route never looked at the project segment —
+ *  so this works for rows whose project is unknown or names a project that no longer
+ *  exists, which is exactly the set that could not be cleared before. */
+export function clearSessionUnreadMany(sessionIds: string[]): void {
+  if (sessionIds.length === 0) return;
+  const db = getDb();
+  const stmt = db.query("UPDATE session_metadata SET unread_count = 0, unread_type = NULL WHERE session_id = ?");
+  db.transaction(() => {
+    for (const id of sessionIds) stmt.run(id);
+  })();
+}
+
 /** Mark a session as read (reset unread count) */
 export function clearSessionUnread(sessionId: string): void {
   getDb().query(

package/src/services/edge-forwarder.ts

@@ -1,191 +1,191 @@
-/**
- * Edge forwarder — owns the public port and pipes raw TCP to the server's
- * current loopback port.
- *
- * ─── CRITICAL INVARIANT: THIS PROCESS MUST NEVER SPAWN A CHILD ───
- *
- * On Windows a child spawned with fd stdio inherits every inheritable handle,
- * including a listening socket. When such a descendant is orphaned it keeps the
- * socket open, so the port stays in LISTEN under a dead PID and can never be
- * rebound — a "zombie port". The server hits this constantly because it spawns
- * chat/tool/MCP subprocesses; those inherit its listener and wedge its port.
- *
- * The edge exists precisely because it spawns nothing, so its socket cannot be
- * inherited and its port cannot zombie. cloudflared can therefore stay pinned
- * to it forever and the public URL stops rotating. Adding any child-process
- * call to this file reintroduces the exact bug the edge was built to remove.
- *
- * Raw TCP, never HTTP: WebSocket upgrades and SSE streams pass through
- * untouched, and forwarded requests keep the headers cloudflared set.
- */
-import net from "node:net";
-import { resolveTargetPort, _resetTargetCache } from "./edge-target-resolver.ts";
-
-/** Delay between attempts while waiting for the server to come back. */
-const CONNECT_RETRY_MS = 250;
-/**
- * How long a client connection waits for a reachable server before giving up.
- * During an upgrade the server is briefly absent; refusing instantly would
- * surface as a broken page rather than a slow one.
- */
-const CONNECT_WINDOW_MS = 5000;
-
-const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
-
-/** Resolve once the socket is connected; reject on the first connect error. */
-function connectUpstream(port: number): Promise<net.Socket> {
-  return new Promise((resolvePromise, reject) => {
-    const upstream = net.connect({
-      port,
-      host: "127.0.0.1", // never taken from status.json — loopback only
-      allowHalfOpen: true,
-    });
-    const onError = (err: Error) => {
-      upstream.destroy();
-      reject(err);
-    };
-    upstream.once("error", onError);
-    upstream.once("connect", () => {
-      upstream.removeListener("error", onError);
-      resolvePromise(upstream);
-    });
-  });
-}
-
-/**
- * Largest amount of client data held while waiting for the server. Bounds the
- * memory a slow upload can pin during an upgrade window.
- */
-const MAX_PENDING_BYTES = 8 * 1024 * 1024;
-
-/**
- * Pipe one client connection to the server.
- *
- * Resolving the upstream is async, so the first bytes usually arrive before
- * there is anywhere to send them. They must be captured by a `data` listener
- * attached synchronously on this very tick and replayed once the upstream
- * exists.
- *
- * `socket.pause()` is NOT a substitute — verified against Bun 1.3.13: bytes
- * that arrive while paused are lost, and a later `pipe()`/`resume()` does not
- * bring them back. A socket with no `data` listener drops them outright too.
- * Both variants silently swallowed the first request in testing.
- */
-async function handleConnection(
-  client: net.Socket,
-  connectWindowMs: number,
-): Promise<void> {
-  const pending: Buffer[] = [];
-  let pendingBytes = 0;
-  let clientEnded = false;
-  const onEarlyData = (chunk: Buffer) => {
-    pendingBytes += chunk.length;
-    if (pendingBytes > MAX_PENDING_BYTES) {
-      client.destroy();
-      return;
-    }
-    pending.push(chunk);
-  };
-  client.on("data", onEarlyData);
-  client.once("end", () => { clientEnded = true; });
-
-  let upstream: net.Socket | null = null;
-  let clientGone = false;
-
-  // A socket error with no listener is an unhandled 'error' event, which would
-  // take the whole edge process — and the public port — down with it.
-  const teardown = () => {
-    upstream?.destroy();
-    client.destroy();
-  };
-  client.on("error", teardown);
-  client.once("close", () => { clientGone = true; });
-
-  const deadline = Date.now() + connectWindowMs;
-  while (!clientGone && Date.now() < deadline) {
-    const port = resolveTargetPort();
-    if (port !== null) {
-      try {
-        upstream = await connectUpstream(port);
-        break;
-      } catch {
-        // Server not up yet (or moved mid-restart) — re-resolve and retry.
-        _resetTargetCache();
-      }
-    }
-    await sleep(CONNECT_RETRY_MS);
-  }
-
-  if (clientGone) return;
-  if (!upstream) {
-    client.destroy();
-    return;
-  }
-
-  upstream.on("error", teardown);
-
-  // Replay what arrived during the connect, then hand both directions to the
-  // stream machinery. Removing the listener and piping happen in the same tick,
-  // so no chunk can slip through the gap.
-  client.off("data", onEarlyData);
-  for (const chunk of pending) upstream.write(chunk);
-  pending.length = 0;
-
-  client.pipe(upstream);
-  upstream.pipe(client);
-
-  // The client may have half-closed while we were still connecting.
-  if (clientEnded) upstream.end();
-}
-
-export interface EdgeForwarderOptions {
-  publicPort: number;
-  host?: string;
-  /** How long a client waits for a reachable server. Defaults to 5s. */
-  connectWindowMs?: number;
-}
-
-/**
- * Bind the public port and start forwarding. Resolves once listening so the
- * caller can fail fast when the port is unavailable.
- */
-export function startEdgeForwarder(
-  opts: EdgeForwarderOptions,
-): Promise<net.Server> {
-  const host = opts.host ?? "0.0.0.0";
-  const connectWindowMs = opts.connectWindowMs ?? CONNECT_WINDOW_MS;
-  return new Promise((resolvePromise, reject) => {
-    // allowHalfOpen keeps the other direction alive when one side sends FIN —
-    // long-lived chat WS and SSE streams depend on it.
-    const server = net.createServer({ allowHalfOpen: true }, (client) => {
-      void handleConnection(client, connectWindowMs);
-    });
-    server.once("error", reject);
-    server.listen(opts.publicPort, host, () => {
-      server.removeListener("error", reject);
-      resolvePromise(server);
-    });
-  });
-}
-
-// ─── Process entry ─────────────────────────────────────────────────────
-// Mirrors the `__serve__` guard in src/server/index.ts: the supervisor
-// re-invokes the binary as `<bin> __edge__ <publicPort> <host>`.
-if (process.argv.includes("__edge__")) {
-  const idx = process.argv.indexOf("__edge__");
-  const publicPort = parseInt(process.argv[idx + 1] ?? "", 10);
-  const host = process.argv[idx + 2] ?? "0.0.0.0";
-
-  if (!Number.isInteger(publicPort) || publicPort <= 0 || publicPort > 65535) {
-    process.stderr.write(`[edge] Invalid public port: ${process.argv[idx + 1]}\n`);
-    process.exit(2);
-  }
-
-  try {
-    await startEdgeForwarder({ publicPort, host });
-    process.stderr.write(`[edge] Listening on ${host}:${publicPort}\n`);
-  } catch (err) {
-    process.stderr.write(`[edge] Failed to bind ${host}:${publicPort}: ${err}\n`);
-    process.exit(1);
-  }
-}
+/**
+ * Edge forwarder — owns the public port and pipes raw TCP to the server's
+ * current loopback port.
+ *
+ * ─── CRITICAL INVARIANT: THIS PROCESS MUST NEVER SPAWN A CHILD ───
+ *
+ * On Windows a child spawned with fd stdio inherits every inheritable handle,
+ * including a listening socket. When such a descendant is orphaned it keeps the
+ * socket open, so the port stays in LISTEN under a dead PID and can never be
+ * rebound — a "zombie port". The server hits this constantly because it spawns
+ * chat/tool/MCP subprocesses; those inherit its listener and wedge its port.
+ *
+ * The edge exists precisely because it spawns nothing, so its socket cannot be
+ * inherited and its port cannot zombie. cloudflared can therefore stay pinned
+ * to it forever and the public URL stops rotating. Adding any child-process
+ * call to this file reintroduces the exact bug the edge was built to remove.
+ *
+ * Raw TCP, never HTTP: WebSocket upgrades and SSE streams pass through
+ * untouched, and forwarded requests keep the headers cloudflared set.
+ */
+import net from "node:net";
+import { resolveTargetPort, _resetTargetCache } from "./edge-target-resolver.ts";
+
+/** Delay between attempts while waiting for the server to come back. */
+const CONNECT_RETRY_MS = 250;
+/**
+ * How long a client connection waits for a reachable server before giving up.
+ * During an upgrade the server is briefly absent; refusing instantly would
+ * surface as a broken page rather than a slow one.
+ */
+const CONNECT_WINDOW_MS = 5000;
+
+const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
+
+/** Resolve once the socket is connected; reject on the first connect error. */
+function connectUpstream(port: number): Promise<net.Socket> {
+  return new Promise((resolvePromise, reject) => {
+    const upstream = net.connect({
+      port,
+      host: "127.0.0.1", // never taken from status.json — loopback only
+      allowHalfOpen: true,
+    });
+    const onError = (err: Error) => {
+      upstream.destroy();
+      reject(err);
+    };
+    upstream.once("error", onError);
+    upstream.once("connect", () => {
+      upstream.removeListener("error", onError);
+      resolvePromise(upstream);
+    });
+  });
+}
+
+/**
+ * Largest amount of client data held while waiting for the server. Bounds the
+ * memory a slow upload can pin during an upgrade window.
+ */
+const MAX_PENDING_BYTES = 8 * 1024 * 1024;
+
+/**
+ * Pipe one client connection to the server.
+ *
+ * Resolving the upstream is async, so the first bytes usually arrive before
+ * there is anywhere to send them. They must be captured by a `data` listener
+ * attached synchronously on this very tick and replayed once the upstream
+ * exists.
+ *
+ * `socket.pause()` is NOT a substitute — verified against Bun 1.3.13: bytes
+ * that arrive while paused are lost, and a later `pipe()`/`resume()` does not
+ * bring them back. A socket with no `data` listener drops them outright too.
+ * Both variants silently swallowed the first request in testing.
+ */
+async function handleConnection(
+  client: net.Socket,
+  connectWindowMs: number,
+): Promise<void> {
+  const pending: Buffer[] = [];
+  let pendingBytes = 0;
+  let clientEnded = false;
+  const onEarlyData = (chunk: Buffer) => {
+    pendingBytes += chunk.length;
+    if (pendingBytes > MAX_PENDING_BYTES) {
+      client.destroy();
+      return;
+    }
+    pending.push(chunk);
+  };
+  client.on("data", onEarlyData);
+  client.once("end", () => { clientEnded = true; });
+
+  let upstream: net.Socket | null = null;
+  let clientGone = false;
+
+  // A socket error with no listener is an unhandled 'error' event, which would
+  // take the whole edge process — and the public port — down with it.
+  const teardown = () => {
+    upstream?.destroy();
+    client.destroy();
+  };
+  client.on("error", teardown);
+  client.once("close", () => { clientGone = true; });
+
+  const deadline = Date.now() + connectWindowMs;
+  while (!clientGone && Date.now() < deadline) {
+    const port = resolveTargetPort();
+    if (port !== null) {
+      try {
+        upstream = await connectUpstream(port);
+        break;
+      } catch {
+        // Server not up yet (or moved mid-restart) — re-resolve and retry.
+        _resetTargetCache();
+      }
+    }
+    await sleep(CONNECT_RETRY_MS);
+  }
+
+  if (clientGone) return;
+  if (!upstream) {
+    client.destroy();
+    return;
+  }
+
+  upstream.on("error", teardown);
+
+  // Replay what arrived during the connect, then hand both directions to the
+  // stream machinery. Removing the listener and piping happen in the same tick,
+  // so no chunk can slip through the gap.
+  client.off("data", onEarlyData);
+  for (const chunk of pending) upstream.write(chunk);
+  pending.length = 0;
+
+  client.pipe(upstream);
+  upstream.pipe(client);
+
+  // The client may have half-closed while we were still connecting.
+  if (clientEnded) upstream.end();
+}
+
+export interface EdgeForwarderOptions {
+  publicPort: number;
+  host?: string;
+  /** How long a client waits for a reachable server. Defaults to 5s. */
+  connectWindowMs?: number;
+}
+
+/**
+ * Bind the public port and start forwarding. Resolves once listening so the
+ * caller can fail fast when the port is unavailable.
+ */
+export function startEdgeForwarder(
+  opts: EdgeForwarderOptions,
+): Promise<net.Server> {
+  const host = opts.host ?? "0.0.0.0";
+  const connectWindowMs = opts.connectWindowMs ?? CONNECT_WINDOW_MS;
+  return new Promise((resolvePromise, reject) => {
+    // allowHalfOpen keeps the other direction alive when one side sends FIN —
+    // long-lived chat WS and SSE streams depend on it.
+    const server = net.createServer({ allowHalfOpen: true }, (client) => {
+      void handleConnection(client, connectWindowMs);
+    });
+    server.once("error", reject);
+    server.listen(opts.publicPort, host, () => {
+      server.removeListener("error", reject);
+      resolvePromise(server);
+    });
+  });
+}
+
+// ─── Process entry ─────────────────────────────────────────────────────
+// Mirrors the `__serve__` guard in src/server/index.ts: the supervisor
+// re-invokes the binary as `<bin> __edge__ <publicPort> <host>`.
+if (process.argv.includes("__edge__")) {
+  const idx = process.argv.indexOf("__edge__");
+  const publicPort = parseInt(process.argv[idx + 1] ?? "", 10);
+  const host = process.argv[idx + 2] ?? "0.0.0.0";
+
+  if (!Number.isInteger(publicPort) || publicPort <= 0 || publicPort > 65535) {
+    process.stderr.write(`[edge] Invalid public port: ${process.argv[idx + 1]}\n`);
+    process.exit(2);
+  }
+
+  try {
+    await startEdgeForwarder({ publicPort, host });
+    process.stderr.write(`[edge] Listening on ${host}:${publicPort}\n`);
+  } catch (err) {
+    process.stderr.write(`[edge] Failed to bind ${host}:${publicPort}: ${err}\n`);
+    process.exit(1);
+  }
+}

package/src/services/extension-rpc-handlers.ts

@@ -8,6 +8,7 @@ import type { RpcChannel } from "./extension-rpc.ts";
 import { contributionRegistry } from "./contribution-registry.ts";
 import { broadcastExtMsg, requestFromBrowser } from "../server/ws/extensions.ts";
 import { getProjects } from "./db.service.ts";
+import { isSecretConfigKey, redactSecretConfigValue } from "./config-secret-keys.ts";
 
 let requestIdCounter = 0;
 function nextRequestId(): string {
@@ -153,11 +154,18 @@ export function registerVscodeCompatHandlers(rpc: RpcChannel): void {
   // --- workspace config ---
   rpc.onRequest("workspace:config:get", async (params) => {
     const [key] = params as [string];
+    // An extension gets no signal beyond "not present" for a secret key —
+    // same not-found shape as a key that genuinely does not exist.
+    if (isSecretConfigKey(key)) return null;
     // Read from PPM config service
     try {
       const { configService } = await import("./config.service.ts");
       const config = configService.getAll() as unknown as Record<string, unknown>;
-      return getNestedValue(config, key) ?? null;
+      const value = getNestedValue(config, key) ?? null;
+      // A request for an ANCESTOR of a secret key (e.g. "tunnel", "auth")
+      // is not caught by isSecretConfigKey above and still holds the raw
+      // object here, so deep-redact before it crosses the RPC boundary.
+      return value === null ? null : redactSecretConfigValue(key, value);
     } catch {
       return null;
     }

package/src/services/file-watcher/watch-tree.ts

@@ -8,23 +8,50 @@ import { RecreatedDirPoller } from "./recreated-dir-poller.ts";
  * near the number of *interesting* ones.
  *
  * `fs.watch(root, { recursive: true })` is a single call, but on Linux the runtime
- * expands it into one inotify watch per subdirectory — dependency trees included.
- * Filtering those events on arrival (what this service used to do) still pays the
- * full cost, which is how a handful of projects reached ~360k watches and pushed
- * the machine against `fs.inotify.max_user_watches`.
+ * expands it into one inotify watch per *entry* — every file as well as every
+ * directory, dependency trees included. Filtering those events on arrival (what this
+ * service used to do) still pays the full cost, which is how a handful of projects
+ * reached ~360k watches and pushed the machine against `fs.inotify.max_user_watches`.
  *
- * So coverage is chosen up front: a subtree with no ignored directory anywhere
- * inside it gets one native recursive watch (cheap, and the runtime tracks new
- * directories for us); any subtree that contains an ignored directory gets a
- * non-recursive watch plus per-child recursion, so the ignored branch is never
- * handed to the runtime. That keeps the watcher count small — which also keeps
- * `fs.inotify.max_user_instances` out of play — while pruning ~92% of the
- * directories in a typical repo.
+ * So coverage is chosen up front, and the shape depends on what the platform's
+ * recursive watch actually is.
+ *
+ * On Windows and macOS it is a kernel-side subtree watch (`ReadDirectoryChangesW`,
+ * FSEvents): one handle covers a whole subtree, it tracks directories created later,
+ * and it does not traverse reparse points. Measured on Windows 11 / Bun 1.3.10 over a
+ * 2,441-directory tree, one recursive handle attaches in 80ms for +7.0MB where one
+ * handle per directory takes 965ms for +25.2MB. So a subtree with no ignored directory
+ * inside it gets a single recursive watch there.
+ *
+ * On Linux there is no such call. Bun emulates it by walking the tree and opening a
+ * watch per entry, and that cost does not depend on the shape: measured over 4
+ * directories holding 600 files, one recursive handle and one non-recursive handle per
+ * directory both come to 604 descriptors on a single inotify instance. So this split
+ * buys nothing in inotify terms — the handle count was never what `max_user_instances`
+ * counts — and it is not why Linux takes a handle per directory.
+ *
+ * What it buys is coverage. The emulation differs from this scan in two ways: it does
+ * not pick up directories created after it attached, and it walks through symlinks this
+ * scan deliberately skips — a pnpm workspace with a symlinked `node_modules` had its
+ * whole store watched, one open descriptor per file, which exhausted the process at
+ * ~724k descriptors.
+ *
+ * Either way the walk below is what prunes ~92% of the directories in a typical repo,
+ * and an ignored branch is never handed to the runtime.
  */
 
 /** Coalesce a burst of directory churn into a single subtree rebuild. */
 const REBUILD_DEBOUNCE_MS = 500;
 
+/**
+ * Whether `{ recursive: true }` is a real subtree watch rather than a per-directory walk.
+ * Named platforms rather than `!== "linux"`, so a runtime nobody has measured here —
+ * freebsd, say — takes the conservative walk instead of inheriting a promise about
+ * `ReadDirectoryChangesW`. `RecreatedDirPoller` is derived from this for the same reason:
+ * the emulation is a different mechanism with different defects.
+ */
+const NATIVE_RECURSIVE = process.platform === "win32" || process.platform === "darwin";
+
 export interface WatchTreeOptions {
   /** Absolute path of the directory to watch. */
   root: string;
@@ -81,7 +108,10 @@ export class WatchTree {
   constructor(private readonly options: WatchTreeOptions) {
     // Only Bun on Linux has the stale-watch defect; elsewhere re-watching works
     // and paying for polling would be pure waste.
-    this.poller = process.platform === "linux"
+    // Tied to NATIVE_RECURSIVE rather than re-testing the platform: the poller stands in
+    // for a defect of the same emulation, and `attach()` relies on exactly one of the two
+    // being in play. Deriving it here keeps that from drifting apart.
+    this.poller = !NATIVE_RECURSIVE
       ? new RecreatedDirPoller({ onChange: (abs) => this.reportAbs(abs) })
       : null;
   }
@@ -135,13 +165,23 @@ export class WatchTree {
     }
 
     for (const entry of entries) {
-      // isDirectory() is false for symlinks, which keeps link cycles and
-      // duplicate coverage (pnpm stores, workspace links) out of the walk.
-      if (!entry.isDirectory()) continue;
-      if (isIgnoredDirName(entry.name)) {
+      // A symlink named like an ignored directory still has to mark the subtree, or an
+      // ancestor takes a recursive watch over a `node_modules` this walk never entered —
+      // which is how a pnpm store got watched through the link. Tested before
+      // isDirectory(), which is false for symlinks. Plain files are deliberately left out:
+      // IGNORED_DIRS holds names like `build`, `out` and `target`, and a compiled binary
+      // called `build` is no reason to cost everything around it its recursive coverage.
+      // A symlink to a *file* is caught here too, since telling it from a link to a
+      // directory needs a stat() the walk would otherwise never make. It holds no subtree,
+      // so marking it only forfeits recursive coverage — the safe direction, and it takes
+      // a file named exactly `node_modules` or `target` to happen at all.
+      if (isIgnoredDirName(entry.name) && (entry.isDirectory() || entry.isSymbolicLink())) {
         node.hasIgnored = true;
         continue;
       }
+      // isDirectory() is false for symlinks, which keeps link cycles and
+      // duplicate coverage (pnpm stores, workspace links) out of the walk.
+      if (!entry.isDirectory()) continue;
       if (budget.left <= 0) {
         // Unscanned directories remain: mark the node so no ancestor covers them
         // recursively, since we cannot know what they hold.
@@ -161,23 +201,17 @@ export class WatchTree {
   private attach(node: ScanNode): void {
     const fitsWholeSubtree = this.covered + node.size <= this.options.maxDirs;
 
-    // A path we have watched before is being re-attached, so this directory was
-    // deleted and recreated. On Bun + Linux its watcher will never fire again:
-    // poll its own entries, and cover the subtree non-recursively so each child
-    // gets a watcher on a path the runtime still honours.
-    if (this.poller && this.everAttached.has(node.path)) {
-      this.poller.add(node.path);
-      if (this.covered + 1 > this.options.maxDirs) {
-        this.truncated = true;
-        return;
-      }
-      this.addWatcher(node.path, false, 1);
-      for (const child of node.dirs) this.attach(child);
-      return;
-    }
-
-    // One recursive watch for a subtree the runtime can safely expand on its own.
-    if (!node.hasIgnored && fitsWholeSubtree && this.addWatcher(node.path, true, node.size)) return;
+    // A path we have watched before is being re-attached, so this directory was deleted
+    // and recreated, and on Bun + Linux its watcher will never fire again — poll its own
+    // entries instead. It needs no special coverage beyond that: the poller only exists
+    // where the recursive branch below is off, so the per-directory walk it falls through
+    // to is already the watch-on-a-path-the-runtime-still-honours this case wants.
+    if (this.poller && this.everAttached.has(node.path)) this.poller.add(node.path);
+
+    // One recursive watch for a subtree the runtime can safely expand on its own —
+    // only where that is a kernel-side subtree watch rather than a per-directory walk.
+    if (NATIVE_RECURSIVE && !node.hasIgnored && fitsWholeSubtree
+        && this.addWatcher(node.path, true, node.size)) return;
 
     // Otherwise cover this directory alone and recurse — a failed recursive attach
     // falls through to here too, so one unwatchable directory cannot silently drop