@hachej/boring-workspace 0.1.23 → 0.1.26

package/dist/app-server.js

@@ -54,7 +54,7 @@ function buildBoringSystemPrompt(opts) {
   if (opts.scaffoldCommand) {
     n += 1;
     steps.push(
-      `**${n}. Scaffold.** Bash \`${opts.scaffoldCommand} <kebab-name> "$BORING_AGENT_WORKSPACE_ROOT"\` \u2014 writes canonical files under \`$BORING_AGENT_WORKSPACE_ROOT/.pi/extensions/<kebab-name>/\`. Read the generated \`package.json\` + \`front/index.tsx\`. Do NOT skip this or write from memory. Never \`cd\` to a parent repo or write plugins outside \`$BORING_AGENT_WORKSPACE_ROOT/.pi/extensions/\`.`
+      `**${n}. Check plugin-root support, then scaffold.** Bash \`boring-ui plugin-status --json\`; continue only if \`workspaceLocalPluginRoots\` is \`true\`. Then bash \`${opts.scaffoldCommand} <kebab-name> "$BORING_AGENT_WORKSPACE_ROOT"\`. Read generated \`package.json\` + \`front/index.tsx\`; do NOT write from memory.`
     );
   } else {
     n += 1;
@@ -80,7 +80,7 @@ function buildBoringSystemPrompt(opts) {
   steps.push(`**${n}. Ask the user to run \`/reload\`** to publish the change.`);
   const docsBlock = boringPiRoot ? [
     "## boring-ui plugin authoring documentation",
-    "Read these only when the user asks to build, modify, or debug a workspace plugin. Use your `read` tool with the absolute path; the agent runtime guarantees these files exist on the host:",
+    "Read these only when the user asks to build, modify, or debug a workspace plugin. Use your `read` tool with these workspace-relative paths; the agent runtime guarantees they exist inside `$BORING_AGENT_WORKSPACE_ROOT`:",
     ...buildDocsRefs(boringPiRoot).map((r) => `- ${r.topic}: ${r.path}`),
     "Follow .md cross-references when present (e.g. SKILL.md may link to a reference doc \u2014 read both)."
   ].join("\n") : [
@@ -88,7 +88,7 @@ function buildBoringSystemPrompt(opts) {
     "The `boring-plugin-authoring` skill listed under `<available_skills>` is the authoritative reference (read its `<location>`). Additional reference docs (`panels.md`, `bridge.md`, `plugins.md`) are unavailable on this host \u2014 `@hachej/boring-pi` is not installed."
   ].join("\n");
   return [
-    "You are operating inside boring-ui. Workspace root: `$BORING_AGENT_WORKSPACE_ROOT`; plugin files go under `$BORING_AGENT_WORKSPACE_ROOT/.pi/extensions/<name>/`.",
+    "You are operating inside boring-ui. Before `.pi/extensions/<name>/`, run `boring-ui plugin-status --json`; continue only when `workspaceLocalPluginRoots` is `true`. Default to `.pi/extensions/<name>/`. Global `~/.pi/agent/extensions/` only for explicit requests.",
     [
       "## Plugin authoring \u2014 required workflow",
       "",
@@ -98,7 +98,7 @@ function buildBoringSystemPrompt(opts) {
       "- API factories: `createPlugin`, `defineFrontPlugin`, `defineComponent` \u2014 use `definePlugin({id, panels, commands, ...})` from `@hachej/boring-workspace/plugin`.",
       "- Imperative method names: `registerComponent`, `addPanel`, `registerCommand` (no `Panel`), `registerTab` \u2014 the actual names are `registerPanel`, `registerPanelCommand`, `registerLeftTab`, `registerSurfaceResolver` (and you usually express these declaratively, not as method calls).",
       "- Import paths: `@hachej/boring-pi` (it's a skills package, not for code), `@boring-ui/*`, `@hachej/pi-sdk` \u2014 use `@hachej/boring-workspace/plugin` for front and `@hachej/boring-workspace/server` for server.",
-      '- File visualizers: for `.csv`/file-tree opens, import `WORKSPACE_OPEN_PATH_SURFACE_KIND` (and `PaneProps`) from `@hachej/boring-workspace/plugin`, read `request.target`, and fetch `/api/v1/files/raw?path=${encodeURIComponent(request.target)}`. Never import these from the root package, use `/workspace/read`, or string kind `"WORKSPACE_OPEN_PATH_SURFACE_KIND"`.',
+      '- File visualizers: import `WORKSPACE_OPEN_PATH_SURFACE_KIND`/`PaneProps` from `@hachej/boring-workspace/plugin`; import `useApiBaseUrl`/`useWorkspaceRequestId` from `@hachej/boring-workspace`; read `request.target`; fetch `${apiBaseUrl}/api/v1/files/raw?...` with `credentials: "include"` and `x-boring-workspace-id` when present. Never use `/workspace/read` or string kind `"WORKSPACE_OPEN_PATH_SURFACE_KIND"`.',
       "- Pi extension tools: `defineTool` and `export const tools` do NOT exist. Export `default function (pi) { pi.registerTool({ name, description, execute }) }`.",
       '- Server/Pi tool method: `handler` \u2014 use `execute`. Return shape: `{ content: [{ type: "text", text }] }` (NEVER a bare string).',
       "- Manifest values: `boring.server: true` \u2014 use `false`/omit for hot-reload user plugins, or a relative path string only for advanced boot-time/static server integration.",
@@ -112,7 +112,7 @@ function buildBoringSystemPrompt(opts) {
 // src/server/agentPlugins/manager.ts
 import { createHash } from "crypto";
 import { existsSync as existsSync4, lstatSync, mkdirSync as mkdirSync2, readFileSync as readFileSync3, readdirSync as readdirSync2, realpathSync as realpathSync2, rmSync as rmSync2, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname5, isAbsolute as isAbsolute2, join as join4, relative as relative2, resolve as resolve3 } from "path";
+import { dirname as dirname5, isAbsolute as isAbsolute2, join as join4, relative as relative2, resolve as resolve4 } from "path";
 
 // src/shared/plugins/manifest.ts
 var SEMVER_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
@@ -162,8 +162,8 @@ function validateBoringField(issues, boring) {
       ));
     }
   }
-  if (boring.id !== void 0) {
-    issues.push(issue("INVALID_FIELD", "boring.id", "boring.id is not supported; package discovery identity comes from package.json#name"));
+  if (boring.id !== void 0 && (typeof boring.id !== "string" || !isValidBoringPluginId(boring.id))) {
+    issues.push(issue("INVALID_ID", "boring.id", "boring.id must start with a letter or number and use only letters, numbers, dot, underscore, colon, or dash"));
   }
   const front = boring.front;
   if (front !== void 0 && (typeof front !== "string" || !isSafePluginRelativePath(front))) {
@@ -177,6 +177,7 @@ function validateBoringField(issues, boring) {
     issues.push(issue("INVALID_FIELD", "boring.label", "boring.label must be a string when provided"));
   }
   return {
+    ...typeof boring.id === "string" ? { id: boring.id } : {},
     ...typeof boring.front === "string" ? { front: boring.front } : {},
     ...typeof boring.server === "string" || boring.server === false ? { server: boring.server } : {},
     ...typeof boring.label === "string" ? { label: boring.label } : {}
@@ -343,6 +344,8 @@ function resolveSafePluginEntryPath({
 
 // src/server/agentPlugins/scan.ts
 function pluginIdFromPackageJson(pkg, rootDir) {
+  const explicitId = typeof pkg.boring?.id === "string" && pkg.boring.id.trim() ? pkg.boring.id.trim() : void 0;
+  if (explicitId) return explicitId;
   const name = typeof pkg.name === "string" && pkg.name.trim() ? pkg.name.trim() : void 0;
   return (name ?? rootDir.split(/[\\/]/).at(-1) ?? "plugin").replace(/^@/, "").replaceAll("/", "-");
 }
@@ -526,8 +529,8 @@ import { dirname as dirname4, join as join3 } from "path";
 var PLUGIN_SIGNATURE_CACHE_FILE = ".boring-signature.json";
 function pluginFileSignature(path) {
   if (!path || !existsSync3(path)) return "missing";
-  const stat = statSync2(path);
-  return `${stat.mtimeMs}:${stat.size}`;
+  const stat2 = statSync2(path);
+  return `${stat2.mtimeMs}:${stat2.size}`;
 }
 function cachePath(pluginRootDir) {
   return join3(pluginRootDir, PLUGIN_SIGNATURE_CACHE_FILE);
@@ -548,632 +551,721 @@ function clearPluginSignatureCache(pluginRootDir) {
   if (existsSync3(path)) rmSync(path, { force: true });
 }
 
-// src/server/agentPlugins/manager.ts
-function preflightErrorId(pluginDir) {
-  return `preflight-${createHash("sha256").update(pluginDir).digest("hex").slice(0, 12)}`;
+// src/server/agentPlugins/piPackages.ts
+import { resolve as resolve3 } from "path";
+var REMOTE_PI_PACKAGE_PREFIXES2 = ["npm:", "git:", "github:", "http:", "https:", "ssh:"];
+function isRemotePiPackageSource2(source) {
+  return REMOTE_PI_PACKAGE_PREFIXES2.some((prefix) => source.startsWith(prefix));
 }
-function directorySignature(root) {
-  if (!root || !existsSync4(root)) return "missing";
-  const hash = createHash("sha256");
-  const visited = /* @__PURE__ */ new Set();
-  let rootReal;
-  try {
-    rootReal = realpathSync2(root);
-  } catch {
-    return "missing";
+function packageLocalPathFromSource(source) {
+  if (isRemotePiPackageSource2(source)) return null;
+  return source.startsWith("file:") ? source.slice("file:".length) : source;
+}
+function normalizeLocalPiPackageSource(pluginRoot, source) {
+  const localPath = packageLocalPathFromSource(source);
+  if (localPath == null) return source;
+  if (localPath === "." || localPath === "./") return resolve3(pluginRoot);
+  const normalized = localPath.startsWith("./") ? localPath.slice(2) : localPath;
+  if (!isSafePluginRelativePath(normalized)) {
+    throw new Error(`unsafe Pi package source: ${source}`);
   }
-  visited.add(rootReal);
-  let count = 0;
-  const visit = (dir, depth) => {
-    if (depth > 8 || count > 5e4) return;
-    const entries = readdirSync2(dir, { withFileTypes: true }).filter((entry) => !entry.name.startsWith(".") && entry.name !== "node_modules").sort((a, b) => a.name.localeCompare(b.name));
-    for (const entry of entries) {
-      count++;
-      const path = join4(dir, entry.name);
-      const rel = relative2(root, path);
-      const stat = lstatSync(path);
-      if (stat.isSymbolicLink()) {
-        let target;
-        try {
-          target = realpathSync2(path);
-        } catch {
-          continue;
-        }
-        if (visited.has(target)) {
-          hash.update(rel);
-          hash.update("symlink-cycle");
-          continue;
-        }
-        visited.add(target);
-        const targetStat = statSync3(target);
-        hash.update(rel);
-        hash.update("symlink:");
-        hash.update(target);
-        if (targetStat.isDirectory()) visit(target, depth + 1);
-        else if (targetStat.isFile()) {
-          hash.update(String(targetStat.mtimeMs));
-          hash.update(String(targetStat.size));
-        }
-        continue;
-      }
-      hash.update(rel);
-      hash.update(String(stat.mtimeMs));
-      hash.update(String(stat.size));
-      if (stat.isDirectory()) {
-        visit(path, depth + 1);
-      }
-    }
+  return resolve3(pluginRoot, normalized);
+}
+function normalizeBoringPluginPiPackageSource(pluginRoot, source) {
+  if (typeof source === "string") return normalizeLocalPiPackageSource(pluginRoot, source);
+  return {
+    source: normalizeLocalPiPackageSource(pluginRoot, source.source),
+    ...source.extensions ? { extensions: source.extensions } : {},
+    ...source.skills ? { skills: source.skills } : {},
+    ...source.prompts ? { prompts: source.prompts } : {},
+    ...source.themes ? { themes: source.themes } : {}
   };
-  visit(root, 0);
-  return hash.digest("hex");
 }
-function pluginSignature(plugin) {
-  return createHash("sha256").update(JSON.stringify(plugin.boring)).update(JSON.stringify(plugin.pi ?? {})).update(plugin.version).update(plugin.frontPath ?? "").update(pluginFileSignature(plugin.frontPath)).update(directorySignature(plugin.frontPath ? dirname5(plugin.frontPath) : void 0)).update(directorySignature(join4(plugin.rootDir, "shared"))).update(plugin.serverPath ?? "").update(pluginFileSignature(plugin.serverPath)).update(directorySignature(plugin.serverPath ? dirname5(plugin.serverPath) : void 0)).update((plugin.extensionPaths ?? []).join("\0")).update((plugin.skillPaths ?? []).join("\0")).digest("hex");
+function normalizeBoringPluginPiPackages(plugins) {
+  return plugins.flatMap(
+    (plugin) => (plugin.pi?.packages ?? []).map(
+      (source) => normalizeBoringPluginPiPackageSource(plugin.rootDir, source)
+    )
+  );
 }
-function computeRequiresRestart(previous, next) {
-  if (!previous) return [];
-  const prevHasServer = !!previous.serverPath;
-  const nextHasServer = !!next.serverPath;
-  if (!prevHasServer && !nextHasServer) return [];
-  if (prevHasServer !== nextHasServer) return ["routes", "agentTools"];
-  const nextSig = pluginFileSignature(next.serverPath);
-  if (previous.serverSignature === nextSig) return [];
-  return ["routes", "agentTools"];
+
+// src/server/plugins/piPackages.ts
+import {
+  compactPiPackages,
+  PI_PACKAGE_RESOURCE_FILTERS
+} from "@hachej/boring-agent/server";
+
+// src/server/plugins/defineServerPlugin.ts
+function fail(pluginId, message) {
+  throw new Error(`server plugin "${pluginId}": ${message}`);
 }
-var BoringPluginAssetManager = class {
-  pluginDirs;
-  errorRoot;
-  loaded = /* @__PURE__ */ new Map();
-  revisions = /* @__PURE__ */ new Map();
-  listeners = /* @__PURE__ */ new Set();
-  loading = null;
-  reloadQueued = false;
-  constructor(options) {
-    this.pluginDirs = options.pluginDirs;
-    this.errorRoot = options.errorRoot ?? join4(process.cwd(), ".pi", "extensions");
+function isUrl(value) {
+  return value instanceof URL;
+}
+function isPathLike(value) {
+  return typeof value === "string" && value.length > 0 || isUrl(value);
+}
+function validateAgentTool(pluginId, tool, index) {
+  if (!tool || typeof tool !== "object") {
+    fail(pluginId, `agentTools[${index}] must be an object`);
   }
-  preflight() {
-    return preflightBoringPlugins(this.pluginDirs);
+  const candidate = tool;
+  if (!candidate.name || typeof candidate.name !== "string") {
+    fail(pluginId, `agentTools[${index}].name must be a non-empty string`);
   }
-  list() {
-    return [...this.loaded.values()].map((plugin) => ({
-      id: plugin.id,
-      boring: plugin.boring,
-      ...plugin.pi ? { pi: plugin.pi } : {},
-      version: plugin.version,
-      revision: plugin.revision,
-      ...plugin.frontUrl ? { frontUrl: plugin.frontUrl } : {}
-    }));
+  if (typeof candidate.description !== "string") {
+    fail(pluginId, `agentTools[${index}].description must be a string`);
   }
-  getError(pluginId) {
-    const path = this.errorPath(pluginId);
-    if (!path || !existsSync4(path)) return null;
-    return readFileSync3(path, "utf8");
+  if (!candidate.parameters || typeof candidate.parameters !== "object") {
+    fail(pluginId, `agentTools[${index}].parameters must be an object`);
   }
-  subscribe(listener) {
-    this.listeners.add(listener);
-    return () => this.listeners.delete(listener);
+  if (typeof candidate.execute !== "function") {
+    fail(pluginId, `agentTools[${index}].execute must be a function`);
   }
-  async load() {
-    if (this.loading) {
-      this.reloadQueued = true;
-      return this.loading;
+}
+function validatePiPackages2(pluginId, piPackages) {
+  for (let i = 0; i < piPackages.length; i++) {
+    const source = piPackages[i];
+    if (typeof source === "string") {
+      if (source.length === 0) {
+        fail(pluginId, `piPackages[${i}] must be a non-empty string`);
+      }
+      continue;
+    }
+    if (!source || typeof source !== "object" || Array.isArray(source)) {
+      fail(pluginId, `piPackages[${i}] must be a string or package source object`);
+    }
+    const candidate = source;
+    if (typeof candidate.source !== "string" || candidate.source.length === 0) {
+      fail(pluginId, `piPackages[${i}].source must be a non-empty string`);
+    }
+    for (const key of PI_PACKAGE_RESOURCE_FILTERS) {
+      const value = candidate[key];
+      if (value === void 0) continue;
+      if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string" || entry.length === 0)) {
+        fail(pluginId, `piPackages[${i}].${key} must be a string array when provided`);
+      }
     }
-    this.loading = this.drainLoads().finally(() => {
-      this.loading = null;
-    });
-    return this.loading;
   }
-  async drainLoads() {
-    let result;
-    do {
-      this.reloadQueued = false;
-      result = await this.doLoadOnce();
-    } while (this.reloadQueued);
-    return result;
+}
+function validateSkills(pluginId, skills) {
+  for (let i = 0; i < skills.length; i++) {
+    const skill = skills[i];
+    if (!skill || typeof skill !== "object") {
+      fail(pluginId, `skills[${i}] must be an object`);
+    }
+    if (!skill.name || typeof skill.name !== "string") {
+      fail(pluginId, `skills[${i}].name must be a non-empty string`);
+    }
+    if (!isPathLike(skill.source)) {
+      fail(pluginId, `skills[${i}].source must be a string or URL`);
+    }
   }
-  async doLoadOnce() {
-    const scan = scanBoringPlugins(this.pluginDirs);
-    const nextPlugins = scan.plugins;
-    const nextIds = new Set(nextPlugins.map((plugin) => plugin.id));
-    const invalidPluginDirs = new Set(scan.preflight.errors.map((error) => resolve3(error.pluginDir)));
-    const events = [];
-    const errors = [];
-    this.collectPreflightErrors(scan.preflight, events, errors);
-    for (const id of [...this.loaded.keys()]) {
-      if (nextIds.has(id)) continue;
-      const previous = this.loaded.get(id);
-      if (previous && invalidPluginDirs.has(resolve3(previous.rootDir))) continue;
-      const revision = this.bumpRevision(id);
-      this.loaded.delete(id);
-      if (previous) {
-        try {
-          clearPluginSignatureCache(previous.rootDir);
-        } catch {
-        }
+}
+function validateProvisioning(pluginId, provisioning) {
+  if (!provisioning || typeof provisioning !== "object") {
+    fail(pluginId, "provisioning must be an object");
+  }
+  if (provisioning.templateDirs !== void 0) {
+    if (!Array.isArray(provisioning.templateDirs)) {
+      fail(pluginId, "provisioning.templateDirs must be an array when provided");
+    }
+    for (let i = 0; i < provisioning.templateDirs.length; i++) {
+      const contribution = provisioning.templateDirs[i];
+      if (!contribution || typeof contribution !== "object") {
+        fail(pluginId, `provisioning.templateDirs[${i}] must be an object`);
+      }
+      if (!contribution.id || typeof contribution.id !== "string") {
+        fail(pluginId, `provisioning.templateDirs[${i}].id must be a non-empty string`);
+      }
+      if (!isPathLike(contribution.path)) {
+        fail(pluginId, `provisioning.templateDirs[${i}].path must be a string or URL`);
+      }
+      if (contribution.target !== void 0 && typeof contribution.target !== "string") {
+        fail(pluginId, `provisioning.templateDirs[${i}].target must be a string when provided`);
       }
-      const event = { type: "boring.plugin.unload", id, revision };
-      events.push(event);
-      this.emit(event);
     }
-    for (const plugin of nextPlugins) {
-      try {
-        const signature = pluginSignature(plugin);
-        const previous = this.loaded.get(plugin.id);
-        if (previous?.signature === signature) continue;
-        const revision = this.bumpRevision(plugin.id);
-        const serverSignature = plugin.serverPath ? pluginFileSignature(plugin.serverPath) : null;
-        const record = { ...plugin, revision, signature, serverSignature };
-        this.loaded.set(plugin.id, record);
-        this.clearError(plugin.id);
-        try {
-          writePluginSignatureCache(plugin.rootDir, { serverSignature });
-        } catch {
+  }
+  if (provisioning.nodePackages !== void 0) {
+    if (!Array.isArray(provisioning.nodePackages)) {
+      fail(pluginId, "provisioning.nodePackages must be an array when provided");
+    }
+    for (let i = 0; i < provisioning.nodePackages.length; i++) {
+      const spec = provisioning.nodePackages[i];
+      if (!spec || typeof spec !== "object") {
+        fail(pluginId, `provisioning.nodePackages[${i}] must be an object`);
+      }
+      if (!spec.id || typeof spec.id !== "string") {
+        fail(pluginId, `provisioning.nodePackages[${i}].id must be a non-empty string`);
+      }
+      if (!spec.packageName || typeof spec.packageName !== "string") {
+        fail(pluginId, `provisioning.nodePackages[${i}].packageName must be a non-empty string`);
+      }
+      if (spec.packageRoot !== void 0 && !isPathLike(spec.packageRoot)) {
+        fail(pluginId, `provisioning.nodePackages[${i}].packageRoot must be a string or URL`);
+      }
+    }
+  }
+  if (provisioning.python !== void 0) {
+    if (!Array.isArray(provisioning.python)) {
+      fail(pluginId, "provisioning.python must be an array when provided");
+    }
+    for (let i = 0; i < provisioning.python.length; i++) {
+      const spec = provisioning.python[i];
+      if (!spec || typeof spec !== "object") {
+        fail(pluginId, `provisioning.python[${i}] must be an object`);
+      }
+      if (!spec.id || typeof spec.id !== "string") {
+        fail(pluginId, `provisioning.python[${i}].id must be a non-empty string`);
+      }
+      if (!isPathLike(spec.projectFile)) {
+        fail(pluginId, `provisioning.python[${i}].projectFile must be a string or URL`);
+      }
+      if (spec.extraLibs !== void 0 && (!Array.isArray(spec.extraLibs) || spec.extraLibs.some((item) => typeof item !== "string"))) {
+        fail(pluginId, `provisioning.python[${i}].extraLibs must be a string array when provided`);
+      }
+      if (spec.env !== void 0) {
+        if (!spec.env || typeof spec.env !== "object" || Array.isArray(spec.env)) {
+          fail(pluginId, `provisioning.python[${i}].env must be an object when provided`);
+        }
+        for (const [key, value] of Object.entries(spec.env)) {
+          if (!key || !isPathLike(value)) {
+            fail(pluginId, `provisioning.python[${i}].env values must be strings or URLs`);
+          }
         }
-        const requiresRestart = computeRequiresRestart(previous, plugin);
-        const event = {
-          type: "boring.plugin.load",
-          id: plugin.id,
-          boring: plugin.boring,
-          version: plugin.version,
-          revision,
-          ...plugin.frontUrl ? { frontUrl: plugin.frontUrl } : {},
-          ...requiresRestart.length > 0 ? { requiresRestart } : {}
-        };
-        events.push(event);
-        this.emit(event);
-      } catch (error) {
-        const revision = this.bumpRevision(plugin.id);
-        const message = error instanceof Error ? error.stack ?? error.message : String(error);
-        this.writeError(plugin.id, message);
-        const event = { type: "boring.plugin.error", id: plugin.id, revision, message };
-        errors.push({ id: plugin.id, revision, message });
-        events.push(event);
-        this.emit(event);
       }
     }
-    return { loaded: this.list(), events, errors };
   }
-  collectPreflightErrors(preflight, events, errors) {
-    for (const error of preflight.errors) {
-      const id = error.pluginId ?? preflightErrorId(error.pluginDir);
-      const revision = this.bumpRevision(id);
-      const message = `${error.code}: ${error.message}
-
-Plugin dir: ${error.pluginDir}`;
-      const loadError = { id, revision, message };
-      errors.push(loadError);
-      this.writeError(id, message);
-      const event = { type: "boring.plugin.error", id, revision, message };
-      events.push(event);
-      this.emit(event);
+}
+function validateServerPlugin(plugin) {
+  if (!plugin.id || typeof plugin.id !== "string") {
+    fail(plugin.id ?? "<unknown>", "id must be a non-empty string");
+  }
+  if (plugin.label !== void 0 && typeof plugin.label !== "string") {
+    fail(plugin.id, "label must be a string when provided");
+  }
+  if (plugin.systemPrompt !== void 0 && typeof plugin.systemPrompt !== "string") {
+    fail(plugin.id, "systemPrompt must be a string when provided");
+  }
+  if (plugin.piPackages !== void 0) {
+    if (!Array.isArray(plugin.piPackages)) {
+      fail(plugin.id, "piPackages must be an array when provided");
+    }
+    validatePiPackages2(plugin.id, plugin.piPackages);
+  }
+  if (plugin.extensionPaths !== void 0) {
+    if (!Array.isArray(plugin.extensionPaths)) {
+      fail(plugin.id, "extensionPaths must be an array when provided");
     }
+    plugin.extensionPaths.forEach((path, index) => {
+      if (typeof path !== "string" || path.length === 0) {
+        fail(plugin.id, `extensionPaths[${index}] must be a non-empty string`);
+      }
+    });
   }
-  bumpRevision(id) {
-    const next = (this.revisions.get(id) ?? 0) + 1;
-    this.revisions.set(id, next);
-    return next;
+  if (plugin.skills !== void 0) {
+    if (!Array.isArray(plugin.skills)) {
+      fail(plugin.id, "skills must be an array when provided");
+    }
+    validateSkills(plugin.id, plugin.skills);
   }
-  emit(event) {
-    for (const listener of [...this.listeners]) {
-      try {
-        listener(event);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`[BoringPluginAssetManager] listener threw on ${event.type} for ${event.id}: ${message}`);
-      }
+  if (plugin.agentTools !== void 0) {
+    if (!Array.isArray(plugin.agentTools)) {
+      fail(plugin.id, "agentTools must be an array when provided");
     }
+    plugin.agentTools.forEach((tool, index) => validateAgentTool(plugin.id, tool, index));
   }
-  errorPath(pluginId) {
-    if (!isValidBoringPluginId(pluginId)) return null;
-    const root = resolve3(this.errorRoot);
-    const path = resolve3(root, pluginId, ".error");
-    const rel = relative2(root, path);
-    if (rel.startsWith("..") || isAbsolute2(rel)) return null;
-    return path;
+  if (plugin.routes !== void 0 && typeof plugin.routes !== "function") {
+    fail(plugin.id, "routes must be a Fastify plugin function when provided");
   }
-  writeError(pluginId, message) {
-    const path = this.errorPath(pluginId);
-    if (!path) return;
-    mkdirSync2(dirname5(path), { recursive: true });
-    writeFileSync2(path, message, "utf8");
+  if (plugin.preservedUiStateKeys !== void 0) {
+    if (!Array.isArray(plugin.preservedUiStateKeys) || plugin.preservedUiStateKeys.some((key) => typeof key !== "string" || key.length === 0)) {
+      fail(plugin.id, "preservedUiStateKeys must be a non-empty string array when provided");
+    }
   }
-  clearError(pluginId) {
-    const path = this.errorPath(pluginId);
-    if (path && existsSync4(path)) rmSync2(path, { force: true });
+  if (plugin.provisioning !== void 0) {
+    validateProvisioning(plugin.id, plugin.provisioning);
   }
-};
+}
 
-// src/server/agentPlugins/routes.ts
-function collectRestartWarnings(events) {
-  const warnings = [];
-  for (const event of events) {
-    if (event.type !== "boring.plugin.load") continue;
-    const surfaces = event.requiresRestart;
-    if (!surfaces || surfaces.length === 0) continue;
-    warnings.push({
-      id: event.id,
-      surfaces: [...surfaces],
-      message: `${event.id} reloaded \u2014 front bundle is live, but server-side ${surfaces.join(" + ")} were wired at boot and still run the old code. Stop and restart the workspace process (Ctrl-C, then re-run your dev command) to pick up changes.`
-    });
+// src/server/plugins/bootstrapServer.ts
+function bootstrapServer(options) {
+  const excludedDefaults = new Set(options.excludeDefaults ?? []);
+  const finalPlugins = [
+    ...(options.defaults ?? []).filter((p) => !excludedDefaults.has(p.id)),
+    ...options.plugins ?? []
+  ];
+  const seenIds = /* @__PURE__ */ new Set();
+  for (const plugin of finalPlugins) {
+    validateServerPlugin(plugin);
+    if (seenIds.has(plugin.id)) {
+      throw new Error(`plugin "${plugin.id}" registered twice`);
+    }
+    seenIds.add(plugin.id);
   }
-  return warnings;
-}
-async function boringPluginRoutes(app, opts) {
-  const { manager, rebuildPlugins, enableReloadRoute = true } = opts;
-  if (enableReloadRoute) {
-    app.post("/api/boring.reload", async (_request, reply) => {
-      const scan = await manager.load();
-      const rebuild = rebuildPlugins ? await rebuildPlugins() : { ok: true, diagnostics: [] };
-      const restart_warnings = collectRestartWarnings(scan.events);
-      const hasFailures = scan.errors.length > 0 || rebuild.diagnostics.length > 0;
-      if (hasFailures) {
-        return reply.status(422).send({
-          ok: false,
-          errors: scan.errors,
-          diagnostics: rebuild.diagnostics,
-          plugins: scan.loaded,
-          // Even on failure, emit warnings for plugins that DID reload
-          // — partial-failure tolerance means some loaded successfully.
-          ...restart_warnings.length > 0 ? { restart_warnings } : {}
-        });
-      }
-      return reply.send({
-        ok: true,
-        plugins: scan.loaded,
-        ...restart_warnings.length > 0 ? { restart_warnings } : {}
-      });
-    });
+  const agentTools = [];
+  for (const plugin of finalPlugins) {
+    for (const tool of plugin.agentTools ?? []) {
+      agentTools.push(tool);
+    }
   }
-  const listPlugins = async () => manager.list();
-  app.get("/api/v1/agent-plugins", listPlugins);
-  const getPluginError = async (request, reply) => {
-    const error = manager.getError(request.params.id);
-    if (error == null) return reply.status(404).send({ error: "not_found" });
-    return reply.type("text/plain").send(error);
+  const systemPromptAppend = finalPlugins.filter((p) => p.systemPrompt && p.systemPrompt.trim()).map((p) => p.systemPrompt.trim()).join("\n\n");
+  const piPackages = compactPiPackages(finalPlugins.flatMap((plugin) => plugin.piPackages ?? []));
+  const extensionPaths = finalPlugins.flatMap((p) => p.extensionPaths ?? []);
+  const provisioningContributions = finalPlugins.filter((p) => p.provisioning).map((p) => ({ id: p.id, provisioning: p.provisioning }));
+  const runtimePlugins = finalPlugins.map((plugin) => ({
+    id: plugin.id,
+    ...plugin.skills ? { skills: plugin.skills } : {},
+    ...plugin.provisioning ? { provisioning: plugin.provisioning } : {}
+  }));
+  const routeContributions = finalPlugins.filter((p) => p.routes).map((p) => ({ id: p.id, routes: p.routes }));
+  const preservedUiStateKeys = [...new Set(finalPlugins.flatMap((p) => p.preservedUiStateKeys ?? []))];
+  return {
+    registered: finalPlugins.map((p) => p.id),
+    systemPromptAppend,
+    piPackages,
+    extensionPaths,
+    agentTools,
+    runtimePlugins,
+    provisioningContributions,
+    routeContributions,
+    preservedUiStateKeys
   };
-  app.get("/api/v1/agent-plugins/:id/error", getPluginError);
-  app.get("/api/v1/agent-plugins/events", async (request, reply) => {
-    reply.hijack();
-    const res = reply.raw;
-    res.statusCode = 200;
-    res.setHeader("Content-Type", "text/event-stream");
-    res.setHeader("Cache-Control", "no-cache, no-transform");
-    res.setHeader("Connection", "keep-alive");
-    res.setHeader("X-Accel-Buffering", "no");
-    res.flushHeaders?.();
-    const write = (event) => {
-      try {
-        res.write(`event: ${event.type}
-`);
-        res.write(`data: ${JSON.stringify(event)}
-
-`);
-      } catch {
-      }
-    };
-    for (const plugin of manager.list()) {
-      write({
-        type: "boring.plugin.load",
-        id: plugin.id,
-        boring: plugin.boring,
-        version: plugin.version,
-        revision: plugin.revision,
-        ...plugin.frontUrl ? { frontUrl: plugin.frontUrl } : {}
-      });
-    }
-    const unsubscribe = manager.subscribe(write);
-    const heartbeat = setInterval(() => {
-      try {
-        res.write(": heartbeat\n\n");
-      } catch {
-      }
-    }, 25e3);
-    request.raw.on("close", () => {
-      clearInterval(heartbeat);
-      unsubscribe();
-    });
-  });
-}
-
-// src/server/agentPlugins/aggregatePluginPrompts.ts
-function aggregatePluginPrompts(manager) {
-  const prompts = manager.list().map((plugin) => plugin.pi?.systemPrompt?.trim()).filter((prompt) => Boolean(prompt));
-  if (prompts.length === 0) return void 0;
-  return `# Loaded boring-ui plugin context
-
-${prompts.join("\n\n")}`;
 }
 
-// src/server/agentPlugins/piPackages.ts
-import { resolve as resolve4 } from "path";
-var REMOTE_PI_PACKAGE_PREFIXES2 = ["npm:", "git:", "github:", "http:", "https:", "ssh:"];
-function isRemotePiPackageSource2(source) {
-  return REMOTE_PI_PACKAGE_PREFIXES2.some((prefix) => source.startsWith(prefix));
+// src/server/agentPlugins/manager.ts
+function skillPathForPiLoader(path) {
+  return existsSync4(join4(path, "SKILL.md")) ? dirname5(path) : path;
 }
-function packageLocalPathFromSource(source) {
-  if (isRemotePiPackageSource2(source)) return null;
-  return source.startsWith("file:") ? source.slice("file:".length) : source;
+function preflightErrorId(pluginDir) {
+  return `preflight-${createHash("sha256").update(pluginDir).digest("hex").slice(0, 12)}`;
 }
-function normalizeLocalPiPackageSource(pluginRoot, source) {
-  const localPath = packageLocalPathFromSource(source);
-  if (localPath == null) return source;
-  if (localPath === "." || localPath === "./") return resolve4(pluginRoot);
-  const normalized = localPath.startsWith("./") ? localPath.slice(2) : localPath;
-  if (!isSafePluginRelativePath(normalized)) {
-    throw new Error(`unsafe Pi package source: ${source}`);
+function directorySignature(root) {
+  if (!root || !existsSync4(root)) return "missing";
+  const hash = createHash("sha256");
+  const visited = /* @__PURE__ */ new Set();
+  let rootReal;
+  try {
+    rootReal = realpathSync2(root);
+  } catch {
+    return "missing";
   }
-  return resolve4(pluginRoot, normalized);
-}
-function normalizeBoringPluginPiPackageSource(pluginRoot, source) {
-  if (typeof source === "string") return normalizeLocalPiPackageSource(pluginRoot, source);
-  return {
-    source: normalizeLocalPiPackageSource(pluginRoot, source.source),
-    ...source.extensions ? { extensions: source.extensions } : {},
-    ...source.skills ? { skills: source.skills } : {},
-    ...source.prompts ? { prompts: source.prompts } : {},
-    ...source.themes ? { themes: source.themes } : {}
+  visited.add(rootReal);
+  let count = 0;
+  const visit = (dir, depth) => {
+    if (depth > 8 || count > 5e4) return;
+    const entries = readdirSync2(dir, { withFileTypes: true }).filter((entry) => !entry.name.startsWith(".") && entry.name !== "node_modules").sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      count++;
+      const path = join4(dir, entry.name);
+      const rel = relative2(root, path);
+      const stat2 = lstatSync(path);
+      if (stat2.isSymbolicLink()) {
+        let target;
+        try {
+          target = realpathSync2(path);
+        } catch {
+          continue;
+        }
+        if (visited.has(target)) {
+          hash.update(rel);
+          hash.update("symlink-cycle");
+          continue;
+        }
+        visited.add(target);
+        const targetStat = statSync3(target);
+        hash.update(rel);
+        hash.update("symlink:");
+        hash.update(target);
+        if (targetStat.isDirectory()) visit(target, depth + 1);
+        else if (targetStat.isFile()) {
+          hash.update(String(targetStat.mtimeMs));
+          hash.update(String(targetStat.size));
+        }
+        continue;
+      }
+      hash.update(rel);
+      hash.update(String(stat2.mtimeMs));
+      hash.update(String(stat2.size));
+      if (stat2.isDirectory()) {
+        visit(path, depth + 1);
+      }
+    }
   };
+  visit(root, 0);
+  return hash.digest("hex");
 }
-function normalizeBoringPluginPiPackages(plugins) {
-  return plugins.flatMap(
-    (plugin) => (plugin.pi?.packages ?? []).map(
-      (source) => normalizeBoringPluginPiPackageSource(plugin.rootDir, source)
-    )
-  );
+function normalizePluginSubpath(rootDir, path) {
+  return relative2(rootDir, path).replaceAll("\\", "/");
 }
-
-// src/app/server/pluginEntryResolver.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
-import { join as join5, resolve as resolve5 } from "path";
-import { createRequire as createRequire2 } from "module";
-import { pathToFileURL } from "url";
-
-// src/server/plugins/piPackages.ts
-import {
-  compactPiPackages,
-  PI_PACKAGE_RESOURCE_FILTERS
-} from "@hachej/boring-agent/server";
-
-// src/server/plugins/defineServerPlugin.ts
-function fail(pluginId, message) {
-  throw new Error(`server plugin "${pluginId}": ${message}`);
+function frontSignatureRoot(plugin) {
+  if (!plugin.frontPath) return void 0;
+  const frontRoot = join4(plugin.rootDir, "front");
+  const rel = relative2(frontRoot, plugin.frontPath);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute2(rel) ? frontRoot : dirname5(plugin.frontPath);
 }
-function isUrl(value) {
-  return value instanceof URL;
+function pluginSignature(plugin) {
+  return createHash("sha256").update(JSON.stringify(plugin.boring)).update(JSON.stringify(plugin.pi ?? {})).update(plugin.version).update(plugin.frontPath ?? "").update(pluginFileSignature(plugin.frontPath)).update(directorySignature(frontSignatureRoot(plugin))).update(directorySignature(join4(plugin.rootDir, "shared"))).update(plugin.serverPath ?? "").update(pluginFileSignature(plugin.serverPath)).update(directorySignature(plugin.serverPath ? dirname5(plugin.serverPath) : void 0)).update((plugin.extensionPaths ?? []).join("\0")).update((plugin.skillPaths ?? []).join("\0")).digest("hex");
 }
-function isPathLike(value) {
-  return typeof value === "string" && value.length > 0 || isUrl(value);
+function computeRequiresRestart(previous, next) {
+  if (!previous) return [];
+  const prevHasServer = !!previous.serverPath;
+  const nextHasServer = !!next.serverPath;
+  if (!prevHasServer && !nextHasServer) return [];
+  if (prevHasServer !== nextHasServer) return ["routes", "agentTools"];
+  const nextSig = pluginFileSignature(next.serverPath);
+  if (previous.serverSignature === nextSig) return [];
+  return ["routes", "agentTools"];
 }
-function validateAgentTool(pluginId, tool, index) {
-  if (!tool || typeof tool !== "object") {
-    fail(pluginId, `agentTools[${index}] must be an object`);
+var BoringPluginAssetManager = class {
+  pluginDirs;
+  errorRoot;
+  frontTargetResolver;
+  includeLegacyFrontUrl;
+  loaded = /* @__PURE__ */ new Map();
+  revisions = /* @__PURE__ */ new Map();
+  listeners = /* @__PURE__ */ new Set();
+  lastErrors = /* @__PURE__ */ new Map();
+  loading = null;
+  reloadQueued = false;
+  constructor(options) {
+    this.pluginDirs = options.pluginDirs;
+    this.errorRoot = options.errorRoot ?? join4(process.cwd(), ".pi", "extensions");
+    this.frontTargetResolver = options.frontTargetResolver;
+    this.includeLegacyFrontUrl = options.includeLegacyFrontUrl ?? true;
   }
-  const candidate = tool;
-  if (!candidate.name || typeof candidate.name !== "string") {
-    fail(pluginId, `agentTools[${index}].name must be a non-empty string`);
+  preflight() {
+    return preflightBoringPlugins(this.pluginDirs);
   }
-  if (typeof candidate.description !== "string") {
-    fail(pluginId, `agentTools[${index}].description must be a string`);
+  list() {
+    return [...this.loaded.values()].map((plugin) => this.toListEntry(plugin));
   }
-  if (!candidate.parameters || typeof candidate.parameters !== "object") {
-    fail(pluginId, `agentTools[${index}].parameters must be an object`);
+  getError(pluginId) {
+    const path = this.errorPath(pluginId);
+    if (!path || !existsSync4(path)) return null;
+    return readFileSync3(path, "utf8");
   }
-  if (typeof candidate.execute !== "function") {
-    fail(pluginId, `agentTools[${index}].execute must be a function`);
+  getErrors() {
+    return [...this.lastErrors.values()];
   }
-}
-function validatePiPackages2(pluginId, piPackages) {
-  for (let i = 0; i < piPackages.length; i++) {
-    const source = piPackages[i];
-    if (typeof source === "string") {
-      if (source.length === 0) {
-        fail(pluginId, `piPackages[${i}] must be a non-empty string`);
-      }
-      continue;
-    }
-    if (!source || typeof source !== "object" || Array.isArray(source)) {
-      fail(pluginId, `piPackages[${i}] must be a string or package source object`);
-    }
-    const candidate = source;
-    if (typeof candidate.source !== "string" || candidate.source.length === 0) {
-      fail(pluginId, `piPackages[${i}].source must be a non-empty string`);
-    }
-    for (const key of PI_PACKAGE_RESOURCE_FILTERS) {
-      const value = candidate[key];
-      if (value === void 0) continue;
-      if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string" || entry.length === 0)) {
-        fail(pluginId, `piPackages[${i}].${key} must be a string array when provided`);
-      }
-    }
+  inspectLoaded() {
+    return [...this.loaded.values()].map((plugin) => ({
+      id: plugin.id,
+      version: plugin.version,
+      revision: plugin.revision,
+      rootDir: plugin.rootDir,
+      ...plugin.frontPath ? { frontPath: plugin.frontPath } : {},
+      ...plugin.frontTarget ? { frontTarget: plugin.frontTarget } : {}
+    }));
   }
-}
-function validateSkills(pluginId, skills) {
-  for (let i = 0; i < skills.length; i++) {
-    const skill = skills[i];
-    if (!skill || typeof skill !== "object") {
-      fail(pluginId, `skills[${i}] must be an object`);
-    }
-    if (!skill.name || typeof skill.name !== "string") {
-      fail(pluginId, `skills[${i}].name must be a non-empty string`);
-    }
-    if (!isPathLike(skill.source)) {
-      fail(pluginId, `skills[${i}].source must be a string or URL`);
-    }
+  inspectLoadedPiSnapshot() {
+    const plugins = [...this.loaded.values()];
+    const prompts = plugins.map((plugin) => plugin.pi?.systemPrompt?.trim()).filter((prompt) => Boolean(prompt));
+    return {
+      additionalSkillPaths: [...new Set(plugins.flatMap((plugin) => plugin.skillPaths ?? []).map(skillPathForPiLoader))],
+      packages: compactPiPackages(normalizeBoringPluginPiPackages(plugins)),
+      extensionPaths: plugins.flatMap((plugin) => plugin.extensionPaths ?? []),
+      ...prompts.length > 0 ? { systemPromptAppend: `# Loaded boring-ui plugin context
+
+${prompts.join("\n\n")}` } : {}
+    };
   }
-}
-function validateProvisioning(pluginId, provisioning) {
-  if (!provisioning || typeof provisioning !== "object") {
-    fail(pluginId, "provisioning must be an object");
+  subscribe(listener) {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
   }
-  if (provisioning.templateDirs !== void 0) {
-    if (!Array.isArray(provisioning.templateDirs)) {
-      fail(pluginId, "provisioning.templateDirs must be an array when provided");
-    }
-    for (let i = 0; i < provisioning.templateDirs.length; i++) {
-      const contribution = provisioning.templateDirs[i];
-      if (!contribution || typeof contribution !== "object") {
-        fail(pluginId, `provisioning.templateDirs[${i}] must be an object`);
-      }
-      if (!contribution.id || typeof contribution.id !== "string") {
-        fail(pluginId, `provisioning.templateDirs[${i}].id must be a non-empty string`);
-      }
-      if (!isPathLike(contribution.path)) {
-        fail(pluginId, `provisioning.templateDirs[${i}].path must be a string or URL`);
-      }
-      if (contribution.target !== void 0 && typeof contribution.target !== "string") {
-        fail(pluginId, `provisioning.templateDirs[${i}].target must be a string when provided`);
-      }
+  async load() {
+    if (this.loading) {
+      this.reloadQueued = true;
+      return this.loading;
     }
+    this.loading = this.drainLoads().finally(() => {
+      this.loading = null;
+    });
+    return this.loading;
   }
-  if (provisioning.nodePackages !== void 0) {
-    if (!Array.isArray(provisioning.nodePackages)) {
-      fail(pluginId, "provisioning.nodePackages must be an array when provided");
-    }
-    for (let i = 0; i < provisioning.nodePackages.length; i++) {
-      const spec = provisioning.nodePackages[i];
-      if (!spec || typeof spec !== "object") {
-        fail(pluginId, `provisioning.nodePackages[${i}] must be an object`);
-      }
-      if (!spec.id || typeof spec.id !== "string") {
-        fail(pluginId, `provisioning.nodePackages[${i}].id must be a non-empty string`);
-      }
-      if (!spec.packageName || typeof spec.packageName !== "string") {
-        fail(pluginId, `provisioning.nodePackages[${i}].packageName must be a non-empty string`);
-      }
-      if (spec.packageRoot !== void 0 && !isPathLike(spec.packageRoot)) {
-        fail(pluginId, `provisioning.nodePackages[${i}].packageRoot must be a string or URL`);
-      }
-    }
+  async drainLoads() {
+    let result;
+    do {
+      this.reloadQueued = false;
+      result = await this.doLoadOnce();
+    } while (this.reloadQueued);
+    return result;
   }
-  if (provisioning.python !== void 0) {
-    if (!Array.isArray(provisioning.python)) {
-      fail(pluginId, "provisioning.python must be an array when provided");
-    }
-    for (let i = 0; i < provisioning.python.length; i++) {
-      const spec = provisioning.python[i];
-      if (!spec || typeof spec !== "object") {
-        fail(pluginId, `provisioning.python[${i}] must be an object`);
-      }
-      if (!spec.id || typeof spec.id !== "string") {
-        fail(pluginId, `provisioning.python[${i}].id must be a non-empty string`);
-      }
-      if (!isPathLike(spec.projectFile)) {
-        fail(pluginId, `provisioning.python[${i}].projectFile must be a string or URL`);
-      }
-      if (spec.extraLibs !== void 0 && (!Array.isArray(spec.extraLibs) || spec.extraLibs.some((item) => typeof item !== "string"))) {
-        fail(pluginId, `provisioning.python[${i}].extraLibs must be a string array when provided`);
-      }
-      if (spec.env !== void 0) {
-        if (!spec.env || typeof spec.env !== "object" || Array.isArray(spec.env)) {
-          fail(pluginId, `provisioning.python[${i}].env must be an object when provided`);
+  async doLoadOnce() {
+    this.lastErrors.clear();
+    const scan = scanBoringPlugins(this.pluginDirs);
+    const nextPlugins = scan.plugins;
+    const nextIds = new Set(nextPlugins.map((plugin) => plugin.id));
+    const invalidPluginDirs = new Set(scan.preflight.errors.map((error) => resolve4(error.pluginDir)));
+    const events = [];
+    const errors = [];
+    this.collectPreflightErrors(scan.preflight, events, errors);
+    for (const id of [...this.loaded.keys()]) {
+      if (nextIds.has(id)) continue;
+      const previous = this.loaded.get(id);
+      if (previous && invalidPluginDirs.has(resolve4(previous.rootDir))) continue;
+      const revision = this.bumpRevision(id);
+      this.loaded.delete(id);
+      this.lastErrors.delete(id);
+      if (previous) {
+        try {
+          clearPluginSignatureCache(previous.rootDir);
+        } catch {
         }
-        for (const [key, value] of Object.entries(spec.env)) {
-          if (!key || !isPathLike(value)) {
-            fail(pluginId, `provisioning.python[${i}].env values must be strings or URLs`);
-          }
+      }
+      const event = { type: "boring.plugin.unload", id, revision };
+      events.push(event);
+      this.emit(event);
+    }
+    for (const plugin of nextPlugins) {
+      try {
+        const signature = pluginSignature(plugin);
+        const previous = this.loaded.get(plugin.id);
+        if (previous?.signature === signature) continue;
+        const revision = this.bumpRevision(plugin.id);
+        const frontTarget = this.resolveFrontTarget(plugin, revision);
+        const serverSignature = plugin.serverPath ? pluginFileSignature(plugin.serverPath) : null;
+        const record = {
+          ...plugin,
+          revision,
+          signature,
+          ...frontTarget ? { frontTarget } : {},
+          serverSignature
+        };
+        this.loaded.set(plugin.id, record);
+        this.lastErrors.delete(plugin.id);
+        this.clearError(plugin.id);
+        try {
+          writePluginSignatureCache(plugin.rootDir, { serverSignature });
+        } catch {
         }
+        const requiresRestart = computeRequiresRestart(previous, plugin);
+        const event = {
+          type: "boring.plugin.load",
+          id: plugin.id,
+          boring: plugin.boring,
+          version: plugin.version,
+          revision,
+          ...this.frontUrlPayload(plugin.frontUrl),
+          ...frontTarget ? { frontTarget } : {},
+          ...requiresRestart.length > 0 ? { requiresRestart } : {}
+        };
+        events.push(event);
+        this.emit(event);
+      } catch (error) {
+        const revision = this.bumpRevision(plugin.id);
+        const message = error instanceof Error ? error.stack ?? error.message : String(error);
+        this.writeError(plugin.id, message);
+        const event = { type: "boring.plugin.error", id: plugin.id, revision, message };
+        const loadError = { id: plugin.id, revision, message };
+        this.lastErrors.set(plugin.id, loadError);
+        errors.push(loadError);
+        events.push(event);
+        this.emit(event);
       }
     }
+    return { loaded: this.list(), events, errors };
   }
-}
-function validateServerPlugin(plugin) {
-  if (!plugin.id || typeof plugin.id !== "string") {
-    fail(plugin.id ?? "<unknown>", "id must be a non-empty string");
+  collectPreflightErrors(preflight, events, errors) {
+    for (const error of preflight.errors) {
+      const id = error.pluginId ?? preflightErrorId(error.pluginDir);
+      const revision = this.bumpRevision(id);
+      const message = `${error.code}: ${error.message}
+
+Plugin dir: ${error.pluginDir}`;
+      const loadError = { id, revision, message };
+      this.lastErrors.set(id, loadError);
+      errors.push(loadError);
+      this.writeError(id, message);
+      const event = { type: "boring.plugin.error", id, revision, message };
+      events.push(event);
+      this.emit(event);
+    }
   }
-  if (plugin.label !== void 0 && typeof plugin.label !== "string") {
-    fail(plugin.id, "label must be a string when provided");
+  bumpRevision(id) {
+    const next = (this.revisions.get(id) ?? 0) + 1;
+    this.revisions.set(id, next);
+    return next;
   }
-  if (plugin.systemPrompt !== void 0 && typeof plugin.systemPrompt !== "string") {
-    fail(plugin.id, "systemPrompt must be a string when provided");
+  toListEntry(plugin) {
+    return {
+      id: plugin.id,
+      boring: plugin.boring,
+      ...plugin.pi ? { pi: plugin.pi } : {},
+      version: plugin.version,
+      revision: plugin.revision,
+      ...this.frontUrlPayload(plugin.frontUrl),
+      ...plugin.frontTarget ? { frontTarget: plugin.frontTarget } : {}
+    };
   }
-  if (plugin.piPackages !== void 0) {
-    if (!Array.isArray(plugin.piPackages)) {
-      fail(plugin.id, "piPackages must be an array when provided");
-    }
-    validatePiPackages2(plugin.id, plugin.piPackages);
+  frontUrlPayload(frontUrl) {
+    if (!this.includeLegacyFrontUrl || !frontUrl) return {};
+    return { frontUrl };
   }
-  if (plugin.extensionPaths !== void 0) {
-    if (!Array.isArray(plugin.extensionPaths)) {
-      fail(plugin.id, "extensionPaths must be an array when provided");
-    }
-    plugin.extensionPaths.forEach((path, index) => {
-      if (typeof path !== "string" || path.length === 0) {
-        fail(plugin.id, `extensionPaths[${index}] must be a non-empty string`);
-      }
+  resolveFrontTarget(plugin, revision) {
+    if (!plugin.frontPath || !this.frontTargetResolver) return void 0;
+    const frontEntrySubpath = typeof plugin.boring.front === "string" ? plugin.boring.front.replace(/^\.\//, "") : normalizePluginSubpath(plugin.rootDir, plugin.frontPath);
+    const frontTarget = this.frontTargetResolver(plugin, {
+      revision,
+      frontEntrySubpath
     });
+    if (!frontTarget) return void 0;
+    return { ...frontTarget, revision };
   }
-  if (plugin.skills !== void 0) {
-    if (!Array.isArray(plugin.skills)) {
-      fail(plugin.id, "skills must be an array when provided");
-    }
-    validateSkills(plugin.id, plugin.skills);
-  }
-  if (plugin.agentTools !== void 0) {
-    if (!Array.isArray(plugin.agentTools)) {
-      fail(plugin.id, "agentTools must be an array when provided");
+  emit(event) {
+    for (const listener of [...this.listeners]) {
+      try {
+        listener(event);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`[BoringPluginAssetManager] listener threw on ${event.type} for ${event.id}: ${message}`);
+      }
     }
-    plugin.agentTools.forEach((tool, index) => validateAgentTool(plugin.id, tool, index));
   }
-  if (plugin.routes !== void 0 && typeof plugin.routes !== "function") {
-    fail(plugin.id, "routes must be a Fastify plugin function when provided");
+  errorPath(pluginId) {
+    if (!isValidBoringPluginId(pluginId)) return null;
+    const root = resolve4(this.errorRoot);
+    const path = resolve4(root, pluginId, ".error");
+    const rel = relative2(root, path);
+    if (rel.startsWith("..") || isAbsolute2(rel)) return null;
+    return path;
   }
-  if (plugin.preservedUiStateKeys !== void 0) {
-    if (!Array.isArray(plugin.preservedUiStateKeys) || plugin.preservedUiStateKeys.some((key) => typeof key !== "string" || key.length === 0)) {
-      fail(plugin.id, "preservedUiStateKeys must be a non-empty string array when provided");
-    }
+  writeError(pluginId, message) {
+    const path = this.errorPath(pluginId);
+    if (!path) return;
+    mkdirSync2(dirname5(path), { recursive: true });
+    writeFileSync2(path, message, "utf8");
   }
-  if (plugin.provisioning !== void 0) {
-    validateProvisioning(plugin.id, plugin.provisioning);
+  clearError(pluginId) {
+    const path = this.errorPath(pluginId);
+    if (path && existsSync4(path)) rmSync2(path, { force: true });
   }
-}
+};
 
-// src/server/plugins/bootstrapServer.ts
-function bootstrapServer(options) {
-  const excludedDefaults = new Set(options.excludeDefaults ?? []);
-  const finalPlugins = [
-    ...(options.defaults ?? []).filter((p) => !excludedDefaults.has(p.id)),
-    ...options.plugins ?? []
-  ];
-  const seenIds = /* @__PURE__ */ new Set();
-  for (const plugin of finalPlugins) {
-    validateServerPlugin(plugin);
-    if (seenIds.has(plugin.id)) {
-      throw new Error(`plugin "${plugin.id}" registered twice`);
-    }
-    seenIds.add(plugin.id);
+// src/server/agentPlugins/routes.ts
+function collectRestartWarnings(events) {
+  const warnings = [];
+  for (const event of events) {
+    if (event.type !== "boring.plugin.load") continue;
+    const surfaces = event.requiresRestart;
+    if (!surfaces || surfaces.length === 0) continue;
+    warnings.push({
+      id: event.id,
+      surfaces: [...surfaces],
+      message: `${event.id} reloaded \u2014 front bundle is live, but server-side ${surfaces.join(" + ")} were wired at boot and still run the old code. Stop and restart the workspace process (Ctrl-C, then re-run your dev command) to pick up changes.`
+    });
   }
-  const agentTools = [];
-  for (const plugin of finalPlugins) {
-    for (const tool of plugin.agentTools ?? []) {
-      agentTools.push(tool);
-    }
+  return warnings;
+}
+async function boringPluginRoutes(app, opts) {
+  const { manager, rebuildPlugins, enableReloadRoute = true } = opts;
+  if (enableReloadRoute) {
+    app.post("/api/boring.reload", async (_request, reply) => {
+      const scan = await manager.load();
+      const rebuild = rebuildPlugins ? await rebuildPlugins() : { ok: true, diagnostics: [] };
+      const restart_warnings = collectRestartWarnings(scan.events);
+      const hasFailures = scan.errors.length > 0 || rebuild.diagnostics.length > 0;
+      if (hasFailures) {
+        return reply.status(422).send({
+          ok: false,
+          errors: scan.errors,
+          diagnostics: rebuild.diagnostics,
+          plugins: scan.loaded,
+          // Even on failure, emit warnings for plugins that DID reload
+          // — partial-failure tolerance means some loaded successfully.
+          ...restart_warnings.length > 0 ? { restart_warnings } : {}
+        });
+      }
+      return reply.send({
+        ok: true,
+        plugins: scan.loaded,
+        ...restart_warnings.length > 0 ? { restart_warnings } : {}
+      });
+    });
   }
-  const systemPromptAppend = finalPlugins.filter((p) => p.systemPrompt && p.systemPrompt.trim()).map((p) => p.systemPrompt.trim()).join("\n\n");
-  const piPackages = compactPiPackages(finalPlugins.flatMap((plugin) => plugin.piPackages ?? []));
-  const extensionPaths = finalPlugins.flatMap((p) => p.extensionPaths ?? []);
-  const provisioningContributions = finalPlugins.filter((p) => p.provisioning).map((p) => ({ id: p.id, provisioning: p.provisioning }));
-  const runtimePlugins = finalPlugins.map((plugin) => ({
-    id: plugin.id,
-    ...plugin.skills ? { skills: plugin.skills } : {},
-    ...plugin.provisioning ? { provisioning: plugin.provisioning } : {}
-  }));
-  const routeContributions = finalPlugins.filter((p) => p.routes).map((p) => ({ id: p.id, routes: p.routes }));
-  const preservedUiStateKeys = [...new Set(finalPlugins.flatMap((p) => p.preservedUiStateKeys ?? []))];
-  return {
-    registered: finalPlugins.map((p) => p.id),
-    systemPromptAppend,
-    piPackages,
-    extensionPaths,
-    agentTools,
-    runtimePlugins,
-    provisioningContributions,
-    routeContributions,
-    preservedUiStateKeys
+  const listPlugins = async () => manager.list();
+  app.get("/api/v1/agent-plugins", listPlugins);
+  const getPluginError = async (request, reply) => {
+    const error = manager.getError(request.params.id);
+    if (error == null) return reply.status(404).send({ error: "not_found" });
+    return reply.type("text/plain").send(error);
   };
+  app.get("/api/v1/agent-plugins/:id/error", getPluginError);
+  app.get("/api/v1/agent-plugins/events", async (request, reply) => {
+    reply.hijack();
+    const res = reply.raw;
+    res.statusCode = 200;
+    res.setHeader("Content-Type", "text/event-stream");
+    res.setHeader("Cache-Control", "no-cache, no-transform");
+    res.setHeader("Connection", "keep-alive");
+    res.setHeader("X-Accel-Buffering", "no");
+    res.flushHeaders?.();
+    const write = (eventName, payload) => {
+      try {
+        res.write(`event: ${eventName}
+`);
+        res.write(`data: ${JSON.stringify(payload)}
+
+`);
+      } catch {
+      }
+    };
+    const liveQueue = [];
+    let replaying = true;
+    const unsubscribe = manager.subscribe((event) => {
+      const payload = { ...event, replay: false };
+      if (replaying) {
+        liveQueue.push({ eventName: event.type, payload });
+        return;
+      }
+      write(event.type, payload);
+    });
+    for (const plugin of manager.list()) {
+      write("boring.plugin.load", {
+        type: "boring.plugin.load",
+        id: plugin.id,
+        boring: plugin.boring,
+        version: plugin.version,
+        revision: plugin.revision,
+        ...plugin.frontUrl ? { frontUrl: plugin.frontUrl } : {},
+        ...plugin.frontTarget ? { frontTarget: plugin.frontTarget } : {},
+        replay: true
+      });
+    }
+    write("boring.plugin.replay-complete", {
+      type: "boring.plugin.replay-complete",
+      replay: true
+    });
+    replaying = false;
+    for (const event of liveQueue) write(event.eventName, event.payload);
+    const heartbeat = setInterval(() => {
+      try {
+        res.write(": heartbeat\n\n");
+      } catch {
+      }
+    }, 25e3);
+    request.raw.on("close", () => {
+      clearInterval(heartbeat);
+      unsubscribe();
+    });
+  });
+}
+
+// src/server/agentPlugins/aggregatePluginPrompts.ts
+function aggregatePluginPrompts(manager) {
+  const prompts = manager.list().map((plugin) => plugin.pi?.systemPrompt?.trim()).filter((prompt) => Boolean(prompt));
+  if (prompts.length === 0) return void 0;
+  return `# Loaded boring-ui plugin context
+
+${prompts.join("\n\n")}`;
 }
 
 // src/app/server/pluginEntryResolver.ts
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
+import { join as join5, resolve as resolve5 } from "path";
+import { createRequire as createRequire2 } from "module";
+import { pathToFileURL } from "url";
 function readPluginPackageJson(dir) {
   const pkgPath = resolve5(dir, "package.json");
   if (!existsSync5(pkgPath)) return null;
@@ -1393,7 +1485,7 @@ function createInMemoryBridge() {
 }
 
 // src/server/ui-control/tools/uiTools.ts
-import { access } from "fs/promises";
+import { stat } from "fs/promises";
 import { resolve as resolve6, isAbsolute as isAbsolute4, relative as relative3, win32 } from "path";
 function makeError(message) {
   return {
@@ -1431,7 +1523,7 @@ function validatePathSyntax(relPath, workspaceRoot) {
   }
   return { ok: true };
 }
-async function validatePath(workspaceRoot, relPath) {
+async function validateExistingPath(workspaceRoot, relPath) {
   const syntax = validatePathSyntax(relPath, workspaceRoot);
   if (!syntax.ok) return syntax;
   const resolved = resolve6(workspaceRoot, relPath);
@@ -1443,8 +1535,8 @@ async function validatePath(workspaceRoot, relPath) {
     };
   }
   try {
-    await access(resolved);
-    return { ok: true };
+    const fileStat = await stat(resolved);
+    return { ok: true, kind: fileStat.isDirectory() ? "dir" : "file" };
   } catch {
     return {
       ok: false,
@@ -1455,6 +1547,7 @@ async function validatePath(workspaceRoot, relPath) {
 function createGetUiStateTool(uiBridge) {
   return {
     name: "get_ui_state",
+    readinessRequirements: ["ui-bridge"],
     description: [
       "Read the current workspace UI state. Returns a JSON object with:",
       "- workbenchOpen (boolean): is the right-side workbench pane visible?",
@@ -1508,12 +1601,13 @@ function isVerified(kind, params, state) {
   return true;
 }
 function createExecUiTool(uiBridge, opts = {}) {
-  const { workspaceRoot } = opts;
+  const { workspaceRoot, resolvePathKind } = opts;
   const verifyDelayMs = opts.verifyDelayMs ?? 200;
   const verifyRetries = opts.verifyRetries ?? 2;
   const verifyIntervalMs = opts.verifyIntervalMs ?? 200;
   return {
     name: "exec_ui",
+    readinessRequirements: ["ui-bridge"],
     description: [
       "Execute a UI command in the workspace. Use this to open files, panels,",
       "navigate to lines, or show notifications.",
@@ -1547,6 +1641,8 @@ function createExecUiTool(uiBridge, opts = {}) {
       "                 returned \u2014 don't give up and don't switch to the read",
       "                 tool. Repeat until openFile succeeds or no candidate",
       "                 is found.",
+      "                 If the path is a folder, openFile reveals/selects it in",
+      "                 the file tree instead of opening an editor tab.",
       "                 Example: {kind:'openFile', params:{path:'README.md'}}",
       "",
       "  openPanel    params: { id: string, component: string,",
@@ -1630,6 +1726,7 @@ function createExecUiTool(uiBridge, opts = {}) {
           return makeError("openSurface: meta must be an object when provided");
         }
       }
+      let effectiveKind = kind;
       if (PATH_BEARING_KINDS.has(kind)) {
         const relPath = getPathParam(kind, cmdParams);
         if (!relPath) {
@@ -1640,14 +1737,25 @@ function createExecUiTool(uiBridge, opts = {}) {
         const syntax = validatePathSyntax(relPath, workspaceRoot);
         if (!syntax.ok) return makeError(syntax.reason);
         if (workspaceRoot) {
-          const check = await validatePath(workspaceRoot, relPath);
+          const check = await validateExistingPath(workspaceRoot, relPath);
           if (!check.ok) {
             return makeError(check.reason);
           }
+          if (kind === "openFile" && check.kind === "dir") {
+            effectiveKind = "expandToFile";
+          }
+        } else if (resolvePathKind) {
+          const pathKind = await resolvePathKind(relPath);
+          if (!pathKind) {
+            return makeError(`file not found at "${relPath}". Try find or grep to locate the file before retrying openFile.`);
+          }
+          if (kind === "openFile" && pathKind === "dir") {
+            effectiveKind = "expandToFile";
+          }
         }
       }
       try {
-        const command = { kind, params: cmdParams };
+        const command = { kind: effectiveKind, params: cmdParams };
         const result = await uiBridge.postCommand(command);
         if (result.status === "error") {
           return {
@@ -1656,11 +1764,11 @@ function createExecUiTool(uiBridge, opts = {}) {
             details: result
           };
         }
-        if (verifyDelayMs > 0 && VERIFIABLE_KINDS.has(kind)) {
+        if (verifyDelayMs > 0 && VERIFIABLE_KINDS.has(effectiveKind)) {
           await new Promise((r) => setTimeout(r, verifyDelayMs));
           let uiState = await uiBridge.getState();
           for (let i = 0; i < verifyRetries; i++) {
-            if (isVerified(kind, cmdParams, uiState)) break;
+            if (isVerified(effectiveKind, cmdParams, uiState)) break;
             await new Promise((r) => setTimeout(r, verifyIntervalMs));
             uiState = await uiBridge.getState();
           }
@@ -1813,9 +1921,10 @@ data: ${JSON.stringify({ v: UI_BRIDGE_PROTOCOL_VERSION })}
 var __dirname = dirname7(fileURLToPath(import.meta.url));
 var require4 = createRequire4(import.meta.url);
 function boringPiRootVisibleToAgentTools(workspaceRoot, resolvedMode, provisioned) {
+  void workspaceRoot;
+  void resolvedMode;
   if (!provisioned) return void 0;
-  if (resolvedMode === "local") return "/workspace/node_modules/@hachej/boring-pi";
-  return join7(workspaceRoot, "node_modules", "@hachej", "boring-pi");
+  return "/workspace/.boring-agent/node/node_modules/@hachej/boring-pi";
 }
 function resolveWorkspacePackageRoot() {
   const candidates = [
@@ -1831,6 +1940,15 @@ function resolveWorkspacePackageRoot() {
   }
   return join7(__dirname, "../../..");
 }
+function readPackageVersion(packageRoot) {
+  if (!packageRoot) return void 0;
+  try {
+    const pkg = JSON.parse(readFileSync6(join7(packageRoot, "package.json"), "utf8"));
+    return typeof pkg.version === "string" && pkg.version.length > 0 ? pkg.version : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function nodePackageContribution(contributionId, nodePackageId, packageName, packageRoot) {
   if (!packageRoot || !existsSync7(join7(packageRoot, "package.json"))) return null;
   return {
@@ -1840,6 +1958,24 @@ function nodePackageContribution(contributionId, nodePackageId, packageName, pac
     }
   };
 }
+function publishedNodePackageContribution(contributionId, nodePackageId, packageName, version, expectedBins) {
+  return {
+    id: contributionId,
+    provisioning: {
+      nodePackages: [
+        {
+          id: nodePackageId,
+          packageName,
+          ...version ? { version } : {},
+          ...expectedBins ? { expectedBins } : {}
+        }
+      ]
+    }
+  };
+}
+function useLocalPackageProvisioning() {
+  return process.env.BORING_USE_LOCAL_PACKAGES === "1";
+}
 function createWorkspacePackageProvisioningContribution() {
   return nodePackageContribution(
     "boring-workspace-package",
@@ -1890,11 +2026,21 @@ function resolveBoringUiCliPackageRoot() {
   }
 }
 function createBoringUiCliPackageProvisioningContribution() {
-  return nodePackageContribution(
+  const packageRoot = resolveBoringUiCliPackageRoot();
+  if (useLocalPackageProvisioning()) {
+    return nodePackageContribution(
+      "boring-ui-cli-package",
+      "boring-ui-cli",
+      "@hachej/boring-ui-cli",
+      packageRoot
+    );
+  }
+  return publishedNodePackageContribution(
     "boring-ui-cli-package",
     "boring-ui-cli",
     "@hachej/boring-ui-cli",
-    resolveBoringUiCliPackageRoot()
+    packageRoot === join7(resolveWorkspacePackageRoot(), "..", "cli") ? void 0 : readPackageVersion(packageRoot) ?? readPackageVersion(resolveWorkspacePackageRoot()),
+    ["boring-ui"]
   );
 }
 function createBoringPiPackageSource(workspaceRoot) {
@@ -1970,7 +2116,7 @@ async function provisionWorkspaceAgentServer(opts) {
     force: opts.force
   });
 }
-function collectBoringPluginDirs(workspaceRoot, pluginCollection) {
+function collectBoringPluginDirs(workspaceRoot, pluginCollection, additionalPluginDirs = []) {
   const extensionPaths = pluginCollection.agentOptions.pi?.extensionPaths ?? [];
   const pluginRoots = extensionPaths.flatMap((path) => {
     try {
@@ -1979,10 +2125,11 @@ function collectBoringPluginDirs(workspaceRoot, pluginCollection) {
       return [];
     }
   });
-  return [
+  return [.../* @__PURE__ */ new Set([
     join7(workspaceRoot, ".pi", "extensions"),
-    ...pluginRoots
-  ];
+    ...pluginRoots,
+    ...additionalPluginDirs
+  ])];
 }
 function mergeRuntimeProvisioningInputs(plugins) {
   const byId = /* @__PURE__ */ new Map();
@@ -2008,6 +2155,12 @@ function skillNameFromResolvedPath(path) {
   if (leaf.toLowerCase() !== "skill.md") return leaf;
   return path.split(/[\\/]/).filter(Boolean).at(-2) ?? "skill";
 }
+function skillPathForPiLoader2(path) {
+  return existsSync7(join7(path, "SKILL.md")) ? dirname7(path) : path;
+}
+function uniqueStrings(values) {
+  return [...new Set(values)];
+}
 function readWorkspacePluginPackageRuntimePlugins(pluginDirs) {
   const scan = scanBoringPlugins(pluginDirs);
   return scan.plugins.map((plugin) => ({
@@ -2032,7 +2185,9 @@ function readWorkspacePluginPackagePiSnapshot(pluginDirs) {
     const scan = scanBoringPlugins(pluginDirs);
     const systemPromptAppend = aggregatePluginSystemPromptsFromScan(scan);
     return {
-      additionalSkillPaths: scan.plugins.flatMap((plugin) => plugin.skillPaths ?? []),
+      additionalSkillPaths: uniqueStrings(
+        scan.plugins.flatMap((plugin) => plugin.skillPaths ?? []).map(skillPathForPiLoader2)
+      ),
       packages: compactPiPackages(normalizeBoringPluginPiPackages(scan.plugins)),
       extensionPaths: scan.plugins.flatMap((plugin) => plugin.extensionPaths ?? []),
       ...systemPromptAppend ? { systemPromptAppend } : {}
@@ -2086,7 +2241,7 @@ async function createWorkspaceAgentServer(opts = {}) {
   ];
   const baseStaticPiExtensionPaths = pluginCollection.agentOptions.pi?.extensionPaths ?? [];
   const boringPluginDirs = [
-    ...collectBoringPluginDirs(workspaceRoot, pluginCollection),
+    ...collectBoringPluginDirs(workspaceRoot, pluginCollection, opts.additionalBoringPluginDirs),
     ...defaultPluginPackagePaths
   ];
   const staticPluginPackagePiSnapshot = pluginHotReload ? emptyPackageJsonPiSnapshot() : readWorkspacePluginPackagePiSnapshot(boringPluginDirs);
@@ -2105,7 +2260,9 @@ async function createWorkspaceAgentServer(opts = {}) {
   const getHotReloadablePiResources = pluginHotReload ? () => readWorkspacePluginPackagePiSnapshot(boringPluginDirs) : void 0;
   const boringAssetManager = new BoringPluginAssetManager({
     pluginDirs: boringPluginDirs,
-    errorRoot: join7(workspaceRoot, ".pi", "extensions")
+    errorRoot: join7(workspaceRoot, ".pi", "extensions"),
+    frontTargetResolver: opts.boringPluginFrontTargetResolver,
+    includeLegacyFrontUrl: opts.boringPluginIncludeLegacyFrontUrl
   });
   const buildRuntimeProvisioningInputs = () => mergeRuntimeProvisioningInputs([
     ...pluginCollection.runtimePlugins,
@@ -2121,11 +2278,18 @@ async function createWorkspaceAgentServer(opts = {}) {
       sessionId: opts.sessionId ?? "default"
     });
     if (!adapter) return currentRuntimeProvisioning;
-    currentRuntimeProvisioning = await provisionWorkspaceRuntime({
+    const provisioned = await provisionWorkspaceRuntime({
       plugins: buildRuntimeProvisioningInputs(),
       adapter,
       runtimeLayout
     });
+    currentRuntimeProvisioning = provisioned ? {
+      ...provisioned,
+      env: {
+        ...provisioned.env,
+        BORING_AGENT_WORKSPACE_LOCAL_PLUGIN_ROOTS: workspaceFsCapability === "strong" ? "1" : "0"
+      }
+    } : currentRuntimeProvisioning;
     return currentRuntimeProvisioning;
   };
   await runRuntimeProvisioning();
@@ -2210,6 +2374,7 @@ async function createWorkspaceAgentServer(opts = {}) {
   }
   ;
   app.__boringRebuildPlugins = rebuildPlugins;
+  app.__boringAssetManager = boringAssetManager;
   return app;
 }
 export {