@hachej/boring-agent 0.1.75 → 0.1.77

package/dist/server/index.js

@@ -7,16 +7,18 @@ import {
   createAgent,
   createAgentRuntimeBridge,
   normalizeMeteringUsage
-} from "../chunk-AQVEZYLH.js";
-import "../chunk-WSQ5QNIY.js";
+} from "../chunk-3WWLQAJB.js";
+import "../chunk-ZUEITFIJ.js";
 import {
+  CommandReceiptSchema,
   FollowUpPayloadSchema,
   InterruptPayloadSchema,
   PiChatSnapshotSchema,
   PromptPayloadSchema,
   QueueClearPayloadSchema,
-  StopPayloadSchema
-} from "../chunk-4LXA7OOV.js";
+  StopPayloadSchema,
+  StopReceiptSchema
+} from "../chunk-ORURYKNY.js";
 import {
   PI_PACKAGE_RESOURCE_FILTERS,
   PiSessionStore,
@@ -31,7 +33,7 @@ import {
   registerConfiguredModelProviders,
   setEnvDefault,
   withPiHarnessDefaults
-} from "../chunk-FDGWCMJD.js";
+} from "../chunk-TS3QGFKK.js";
 import {
   safeCapture
 } from "../chunk-AQBXNPMD.js";
@@ -40,7 +42,7 @@ import {
 } from "../chunk-AJZHR626.js";
 import {
   ErrorCode
-} from "../chunk-XZKU7FBV.js";
+} from "../chunk-6AEK34XU.js";
 
 // src/server/sandbox/direct/createDirectSandbox.ts
 import { spawn } from "child_process";
@@ -180,7 +182,7 @@ function createDirectSandbox(opts = {}) {
       const maxOutputBytes = opts2?.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
       const workspaceRoot = runtimeContext.runtimeCwd;
       const cwd = opts2?.cwd ?? workspaceRoot;
-      return await new Promise((resolve10, reject) => {
+      return await new Promise((resolve11, reject) => {
         const child = spawn(cmd, {
           cwd,
           env: withWorkspacePythonEnv({ workspaceRoot, env: opts2?.env, preserveHostHome: true }),
@@ -209,7 +211,7 @@ function createDirectSandbox(opts = {}) {
           if (settled) return;
           settled = true;
           cleanup();
-          resolve10({
+          resolve11({
             stdout: new Uint8Array(Buffer.concat(stdoutChunks)),
             stderr: new Uint8Array(Buffer.concat(stderrChunks)),
             exitCode: typeof exitCode === "number" ? exitCode : timedOut ? 124 : 1,
@@ -558,9 +560,9 @@ function createNodeWatcher(root) {
       }
       startFsw();
       if (fsw) {
-        await new Promise((resolve10) => {
-          fsw.once("ready", resolve10);
-          fsw.once("error", () => resolve10());
+        await new Promise((resolve11) => {
+          fsw.once("ready", resolve11);
+          fsw.once("error", () => resolve11());
         });
       }
       if (closed) return { ok: false, reason: "closed" };
@@ -969,7 +971,7 @@ function createBwrapSandbox(opts = {}) {
         ...withSandboxCwd(baseArgs, sandboxCwd),
         ...buildCommandArgs(cmd, sandboxOptions.resourceLimits)
       ];
-      return await new Promise((resolve10, reject) => {
+      return await new Promise((resolve11, reject) => {
         const child = spawn2("bwrap", args, {
           env: {
             ...withWorkspacePythonEnv({ workspaceRoot, env: opts2?.env, sandboxRoot: SANDBOX_HOME2 }),
@@ -999,7 +1001,7 @@ function createBwrapSandbox(opts = {}) {
           if (settled) return;
           settled = true;
           cleanup();
-          resolve10({
+          resolve11({
             stdout: new Uint8Array(Buffer.concat(stdoutChunks)),
             stderr: new Uint8Array(Buffer.concat(stderrChunks)),
             exitCode: typeof exitCode === "number" ? exitCode : timedOut ? 124 : 1,
@@ -5242,11 +5244,11 @@ async function buildTarGz(files) {
   }
   chunks.push(Buffer.alloc(1024));
   const tarBuffer = Buffer.concat(chunks);
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     const gzip = createGzip({ level: 6 });
     const gzChunks = [];
     gzip.on("data", (chunk) => gzChunks.push(chunk));
-    gzip.on("end", () => resolve10(Buffer.concat(gzChunks)));
+    gzip.on("end", () => resolve11(Buffer.concat(gzChunks)));
     gzip.on("error", reject);
     Readable.from(tarBuffer).pipe(gzip);
   });
@@ -6466,13 +6468,13 @@ function resultTool(result) {
   };
 }
 function deferred() {
-  let resolve10;
+  let resolve11;
   let reject;
   const promise = new Promise((res, rej) => {
-    resolve10 = res;
+    resolve11 = res;
     reject = rej;
   });
-  return { promise, resolve: resolve10, reject };
+  return { promise, resolve: resolve11, reject };
 }
 function errorTool(error) {
   const safe = safeError(error);
@@ -7983,33 +7985,182 @@ function buildHarnessAgentTools(bundle, runtime) {
   return tools;
 }
 
-// src/server/http/routes/health.ts
-function healthRoutes(app, opts, done) {
-  const startTime = Date.now();
-  app.get("/health", async () => {
+// src/server/http/sessionChangesTracker.ts
+var InMemorySessionChangesTracker = class _InMemorySessionChangesTracker {
+  static MAX_CHANGES_PER_SESSION = 1e3;
+  bySession = /* @__PURE__ */ new Map();
+  record(sessionId, change) {
+    const existing = this.bySession.get(sessionId);
+    if (existing) {
+      existing.push(change);
+      if (existing.length > _InMemorySessionChangesTracker.MAX_CHANGES_PER_SESSION) {
+        existing.splice(
+          0,
+          existing.length - _InMemorySessionChangesTracker.MAX_CHANGES_PER_SESSION
+        );
+      }
+      return;
+    }
+    this.bySession.set(sessionId, [change]);
+  }
+  list(sessionId) {
+    return [...this.bySession.get(sessionId) ?? []];
+  }
+  clear(sessionId) {
+    this.bySession.delete(sessionId);
+  }
+};
+
+// src/server/runtime/readyStatus.ts
+function defaultCapabilities(sandboxReady, harnessReady) {
+  return {
+    chat: { state: harnessReady ? "ready" : "preparing" },
+    workspace: { state: sandboxReady ? "ready" : "preparing" },
+    runtimeDependencies: { state: "ready" }
+  };
+}
+var ReadyStatusTracker = class {
+  _sandboxReady;
+  _harnessReady;
+  _degradedReason;
+  _capabilities;
+  subscribers = /* @__PURE__ */ new Set();
+  constructor(opts) {
+    this._sandboxReady = opts?.sandboxReady ?? false;
+    this._harnessReady = opts?.harnessReady ?? false;
+    this._capabilities = {
+      ...defaultCapabilities(this._sandboxReady, this._harnessReady),
+      ...opts?.capabilities ?? {}
+    };
+  }
+  get state() {
+    if (this._degradedReason) return "degraded";
+    return this._sandboxReady && this._harnessReady ? "ready" : "provisioning";
+  }
+  isReady() {
+    return this.state === "ready";
+  }
+  getReadiness() {
     return {
-      status: "ok",
-      version: opts.version,
-      uptime: Math.floor((Date.now() - startTime) / 1e3)
+      sandboxReady: this._sandboxReady,
+      harnessReady: this._harnessReady,
+      capabilities: this.getCapabilities(),
+      degradedReason: this._degradedReason
     };
-  });
-  app.get("/ready", async (_request, reply) => {
-    const state = opts.getReadiness();
-    if (state.degradedReason) {
-      return reply.code(503).send({
-        status: "degraded",
-        reason: state.degradedReason
-      });
+  }
+  getCapabilities() {
+    return {
+      chat: { ...this._capabilities.chat },
+      workspace: { ...this._capabilities.workspace },
+      runtimeDependencies: { ...this._capabilities.runtimeDependencies }
+    };
+  }
+  updateCapability(name, detail) {
+    this._capabilities = {
+      ...this._capabilities,
+      [name]: { ...detail }
+    };
+    this.emit();
+  }
+  updateRuntimeDependencies(detail) {
+    this.updateCapability("runtimeDependencies", detail);
+  }
+  markSandboxReady() {
+    if (this._sandboxReady) return;
+    this._sandboxReady = true;
+    if (this._capabilities.workspace.state === "preparing") {
+      this._capabilities.workspace = { state: "ready" };
     }
-    if (!state.sandboxReady || !state.harnessReady) {
-      return reply.code(503).send({
-        status: "provisioning",
-        retryAfter: 2
-      });
+    this.emit();
+  }
+  markHarnessReady() {
+    if (this._harnessReady) return;
+    this._harnessReady = true;
+    if (this._capabilities.chat.state === "preparing") {
+      this._capabilities.chat = { state: "ready" };
+    }
+    this.emit();
+  }
+  markDegraded(reason) {
+    this._degradedReason = reason;
+    this.emit();
+  }
+  clearDegraded() {
+    if (!this._degradedReason) return;
+    this._degradedReason = void 0;
+    this.emit();
+  }
+  subscribe(handler) {
+    this.subscribers.add(handler);
+    handler(this.snapshot());
+    return () => {
+      this.subscribers.delete(handler);
+    };
+  }
+  emit() {
+    const event = this.snapshot();
+    for (const h of this.subscribers) h(event);
+  }
+  snapshot() {
+    return {
+      state: this.state,
+      sandboxReady: this._sandboxReady,
+      harnessReady: this._harnessReady,
+      capabilities: this.getCapabilities(),
+      message: this._degradedReason,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
+};
+
+// src/server/runtime/modeReadiness.ts
+function createRuntimeReadyStatusTracker(modeAdapter, opts) {
+  const readiness = modeAdapter.readiness;
+  const tracker = new ReadyStatusTracker({
+    sandboxReady: readiness?.initialSandboxReady ?? true,
+    harnessReady: opts.harnessReady,
+    capabilities: {
+      ...readiness?.initialWorkspaceReadiness ? { workspace: readiness.initialWorkspaceReadiness } : {},
+      ...opts.capabilities ?? {}
     }
-    return { status: "ready" };
   });
-  done();
+  readiness?.onTrackerCreated?.(tracker);
+  return tracker;
+}
+
+// src/server/tools/pluginDiagnostics.ts
+function createPluginDiagnosticsTool(deps) {
+  return {
+    name: "plugin_diagnostics",
+    description: [
+      "Return current plugin/skill loading errors plus the diagnostics from the",
+      "last /reload. Call this after asking the user to run /reload \u2014 or whenever a",
+      "plugin or skill you expected does not appear to be loaded \u2014 then fix the",
+      "reported error and ask the user to /reload again. Returns a JSON object with",
+      "lastReloadDiagnostics, resourceDiagnostics, and pluginErrors arrays; an empty",
+      "result means no load errors were detected."
+    ].join(" "),
+    parameters: {
+      type: "object",
+      properties: {},
+      additionalProperties: false
+    },
+    async execute(_params, ctx) {
+      const harness = deps.getHarness();
+      const resourceDiagnostics = harness?.getResourceDiagnostics?.(ctx.sessionId ?? "") ?? [];
+      const pluginErrors = deps.getPluginErrors ? await deps.getPluginErrors() : [];
+      const payload = {
+        lastReloadDiagnostics: deps.getLastReloadDiagnostics(),
+        resourceDiagnostics,
+        pluginErrors
+      };
+      return {
+        content: [{ type: "text", text: JSON.stringify(payload) }],
+        details: payload,
+        isError: false
+      };
+    }
+  };
 }
 
 // src/server/http/fsEventBroadcaster.ts
@@ -8404,12 +8555,20 @@ function modelsRoutes(app, opts, done) {
 }
 
 // src/server/http/routes/skills.ts
+import { isAbsolute as isAbsolute9, relative as relative13, resolve as resolve10, sep as sep7 } from "path";
 import {
   DefaultPackageManager,
   getAgentDir,
   loadSkills
 } from "@mariozechner/pi-coding-agent";
 var CACHE_TTL_MS2 = 3e4;
+function pathForWorkspaceEditor(workspaceRoot, filePath) {
+  const pathWithinWorkspace = relative13(resolve10(workspaceRoot), resolve10(filePath));
+  if (pathWithinWorkspace === "" || pathWithinWorkspace === ".." || pathWithinWorkspace.startsWith(`..${sep7}`) || isAbsolute9(pathWithinWorkspace)) {
+    return filePath;
+  }
+  return pathWithinWorkspace.split(sep7).join("/");
+}
 function skillsRoutes(app, opts, done) {
   const cached = /* @__PURE__ */ new Map();
   async function resolveSkillsForRequest(request, refresh = false) {
@@ -8448,7 +8607,7 @@ function skillsRoutes(app, opts, done) {
     const skills = result.skills.map((s) => ({
       name: String(s.name),
       description: String(s.description ?? ""),
-      ...typeof s.filePath === "string" ? { filePath: s.filePath } : {},
+      ...typeof s.filePath === "string" ? { filePath: pathForWorkspaceEditor(workspaceRoot, s.filePath) } : {},
       ...typeof s.sourceInfo?.scope === "string" ? { source: s.sourceInfo.scope } : {}
     }));
     const entry = { skills, expiresAt: now + CACHE_TTL_MS2 };
@@ -8510,7 +8669,7 @@ function piChatRoutes(app, opts, done) {
     try {
       const service = await resolveService(opts, request);
       if (!service.listSessions) throw unsupportedServiceMethod("list Pi chat sessions");
-      return reply.send(await service.listSessions(getRequestContext(request), sessionListOptions(request)));
+      return reply.send(await service.listSessions(getRequestContext(request, opts), sessionListOptions(request)));
     } catch (err) {
       return sendRouteError(reply, err, "list pi chat sessions failed");
     }
@@ -8521,7 +8680,7 @@ function piChatRoutes(app, opts, done) {
     try {
       const service = await resolveService(opts, request);
       if (!service.createSession) throw unsupportedServiceMethod("create Pi chat session");
-      return reply.code(201).send(await service.createSession(getRequestContext(request), body));
+      return reply.code(201).send(await service.createSession(getRequestContext(request, opts), body));
     } catch (err) {
       return sendRouteError(reply, err, "create pi chat session failed");
     }
@@ -8532,7 +8691,7 @@ function piChatRoutes(app, opts, done) {
     try {
       const service = await resolveService(opts, request);
       if (!service.deleteSession) throw unsupportedServiceMethod("delete Pi chat session");
-      await service.deleteSession(getRequestContext(request), params.sessionId);
+      await service.deleteSession(getRequestContext(request, opts), params.sessionId);
       return reply.code(204).send();
     } catch (err) {
       return sendRouteError(reply, err, "delete pi chat session failed");
@@ -8543,7 +8702,7 @@ function piChatRoutes(app, opts, done) {
     if (!params) return;
     try {
       const service = await resolveService(opts, request);
-      const snapshot = await service.readState(getRequestContext(request), params.sessionId);
+      const snapshot = await service.readState(getRequestContext(request, opts), params.sessionId);
       return reply.send(PiChatSnapshotSchema.parse(snapshot));
     } catch (err) {
       return sendRouteError(reply, err, "read pi chat state failed");
@@ -8564,7 +8723,7 @@ function piChatRoutes(app, opts, done) {
     };
     try {
       const service = await resolveService(opts, request);
-      const result = await service.subscribe(getRequestContext(request), params.sessionId, query.cursor, writeFrame);
+      const result = await service.subscribe(getRequestContext(request, opts), params.sessionId, query.cursor, writeFrame);
       if (result.type !== "ok") {
         return sendReplayRangeError(reply, result);
       }
@@ -8598,7 +8757,7 @@ function piChatRoutes(app, opts, done) {
     if (!body) return;
     try {
       const service = await resolveService(opts, request);
-      const receipt = await service.prompt(getRequestContext(request), params.sessionId, body);
+      const receipt = await service.prompt(getRequestContext(request, opts), params.sessionId, body);
       return reply.code(202).send(receipt);
     } catch (err) {
       return sendRouteError(reply, err, "prompt rejected");
@@ -8611,7 +8770,7 @@ function piChatRoutes(app, opts, done) {
     if (!body) return;
     try {
       const service = await resolveService(opts, request);
-      const receipt = await service.followUp(getRequestContext(request), params.sessionId, body);
+      const receipt = await service.followUp(getRequestContext(request, opts), params.sessionId, body);
       return reply.code(202).send(receipt);
     } catch (err) {
       return sendRouteError(reply, err, "follow-up rejected");
@@ -8624,7 +8783,7 @@ function piChatRoutes(app, opts, done) {
     if (!body) return;
     try {
       const service = await resolveService(opts, request);
-      const receipt = await service.clearQueue(getRequestContext(request), params.sessionId, body);
+      const receipt = await service.clearQueue(getRequestContext(request, opts), params.sessionId, body);
       return reply.code(202).send(receipt);
     } catch (err) {
       return sendRouteError(reply, err, "queue clear rejected");
@@ -8637,7 +8796,7 @@ function piChatRoutes(app, opts, done) {
     if (!body) return;
     try {
       const service = await resolveService(opts, request);
-      const receipt = await service.interrupt(getRequestContext(request), params.sessionId, body);
+      const receipt = await service.interrupt(getRequestContext(request, opts), params.sessionId, body);
       return reply.code(202).send(receipt);
     } catch (err) {
       return sendRouteError(reply, err, "interrupt rejected");
@@ -8650,7 +8809,7 @@ function piChatRoutes(app, opts, done) {
     if (!body) return;
     try {
       const service = await resolveService(opts, request);
-      const receipt = await service.stop(getRequestContext(request), params.sessionId, body);
+      const receipt = await service.stop(getRequestContext(request, opts), params.sessionId, body);
       return reply.code(202).send(receipt);
     } catch (err) {
       return sendRouteError(reply, err, "stop rejected");
@@ -8710,13 +8869,14 @@ async function resolveService(opts, request) {
   }
   return service;
 }
-function getRequestContext(request) {
+function getRequestContext(request, opts) {
   const storageScopeHeader = request.headers["x-boring-storage-scope"];
   const user = request.user;
   const authSubject = user?.id;
   const authEmail = user?.email;
+  const workspaceId = opts.defaultWorkspaceId === false ? void 0 : request.workspaceContext?.workspaceId ?? opts.defaultWorkspaceId ?? DEFAULT_WORKSPACE_ID2;
   return {
-    workspaceId: request.workspaceContext?.workspaceId ?? DEFAULT_WORKSPACE_ID2,
+    workspaceId,
     storageScope: typeof storageScopeHeader === "string" && storageScopeHeader.length > 0 ? storageScopeHeader : void 0,
     authSubject: typeof authSubject === "string" && authSubject.length > 0 ? authSubject : void 0,
     authEmail: typeof authEmail === "string" && authEmail.length > 0 ? authEmail : void 0,
@@ -8809,32 +8969,6 @@ function systemPromptRoutes(app, opts, done) {
   done();
 }
 
-// src/server/http/sessionChangesTracker.ts
-var InMemorySessionChangesTracker = class _InMemorySessionChangesTracker {
-  static MAX_CHANGES_PER_SESSION = 1e3;
-  bySession = /* @__PURE__ */ new Map();
-  record(sessionId, change) {
-    const existing = this.bySession.get(sessionId);
-    if (existing) {
-      existing.push(change);
-      if (existing.length > _InMemorySessionChangesTracker.MAX_CHANGES_PER_SESSION) {
-        existing.splice(
-          0,
-          existing.length - _InMemorySessionChangesTracker.MAX_CHANGES_PER_SESSION
-        );
-      }
-      return;
-    }
-    this.bySession.set(sessionId, [change]);
-  }
-  list(sessionId) {
-    return [...this.bySession.get(sessionId) ?? []];
-  }
-  clear(sessionId) {
-    this.bySession.delete(sessionId);
-  }
-};
-
 // src/server/http/routes/sessionChanges.ts
 function requireSessionId(value, reply) {
   if (typeof value !== "string" || value.length === 0) {
@@ -9163,7 +9297,7 @@ function searchRoutes(app, opts, done) {
 }
 
 // src/server/git/gitFileUrl.ts
-import { dirname as dirname12, relative as relative13 } from "path";
+import { dirname as dirname12, relative as relative14 } from "path";
 import { execFile as execFile3 } from "child_process";
 import { promisify as promisify3 } from "util";
 
@@ -9246,7 +9380,7 @@ async function resolveGitFileUrl(workspaceRoot, path4) {
       commitSha = null;
     }
   }
-  const repoRelativePath = relative13(repoRoot, absolutePath).replace(/\\/g, "/");
+  const repoRelativePath = relative14(repoRoot, absolutePath).replace(/\\/g, "/");
   const url = buildGitFileUrl({ remoteUrl, repoRelativePath, branch, commitSha });
   if (!url) {
     return disabled("Only GitHub SSH/HTTPS remotes are supported right now.");
@@ -9298,167 +9432,225 @@ function gitRoutes(app, opts, done) {
   done();
 }
 
-// src/server/runtime/readyStatus.ts
-function defaultCapabilities(sandboxReady, harnessReady) {
-  return {
-    chat: { state: harnessReady ? "ready" : "preparing" },
-    workspace: { state: sandboxReady ? "ready" : "preparing" },
-    runtimeDependencies: { state: "ready" }
-  };
-}
-var ReadyStatusTracker = class {
-  _sandboxReady;
-  _harnessReady;
-  _degradedReason;
-  _capabilities;
-  subscribers = /* @__PURE__ */ new Set();
-  constructor(opts) {
-    this._sandboxReady = opts?.sandboxReady ?? false;
-    this._harnessReady = opts?.harnessReady ?? false;
-    this._capabilities = {
-      ...defaultCapabilities(this._sandboxReady, this._harnessReady),
-      ...opts?.capabilities ?? {}
-    };
-  }
-  get state() {
-    if (this._degradedReason) return "degraded";
-    return this._sandboxReady && this._harnessReady ? "ready" : "provisioning";
-  }
-  isReady() {
-    return this.state === "ready";
-  }
-  getReadiness() {
+// src/server/http/routes/health.ts
+function healthRoutes(app, opts, done) {
+  const startTime = Date.now();
+  app.get("/health", async () => {
     return {
-      sandboxReady: this._sandboxReady,
-      harnessReady: this._harnessReady,
-      capabilities: this.getCapabilities(),
-      degradedReason: this._degradedReason
-    };
-  }
-  getCapabilities() {
-    return {
-      chat: { ...this._capabilities.chat },
-      workspace: { ...this._capabilities.workspace },
-      runtimeDependencies: { ...this._capabilities.runtimeDependencies }
-    };
-  }
-  updateCapability(name, detail) {
-    this._capabilities = {
-      ...this._capabilities,
-      [name]: { ...detail }
+      status: "ok",
+      version: opts.version,
+      uptime: Math.floor((Date.now() - startTime) / 1e3)
     };
-    this.emit();
-  }
-  updateRuntimeDependencies(detail) {
-    this.updateCapability("runtimeDependencies", detail);
-  }
-  markSandboxReady() {
-    if (this._sandboxReady) return;
-    this._sandboxReady = true;
-    if (this._capabilities.workspace.state === "preparing") {
-      this._capabilities.workspace = { state: "ready" };
+  });
+  app.get("/ready", async (_request, reply) => {
+    const state = opts.getReadiness();
+    if (state.degradedReason) {
+      return reply.code(503).send({
+        status: "degraded",
+        reason: state.degradedReason
+      });
     }
-    this.emit();
-  }
-  markHarnessReady() {
-    if (this._harnessReady) return;
-    this._harnessReady = true;
-    if (this._capabilities.chat.state === "preparing") {
-      this._capabilities.chat = { state: "ready" };
+    if (!state.sandboxReady || !state.harnessReady) {
+      return reply.code(503).send({
+        status: "provisioning",
+        retryAfter: 2
+      });
     }
-    this.emit();
-  }
-  markDegraded(reason) {
-    this._degradedReason = reason;
-    this.emit();
-  }
-  clearDegraded() {
-    if (!this._degradedReason) return;
-    this._degradedReason = void 0;
-    this.emit();
-  }
-  subscribe(handler) {
-    this.subscribers.add(handler);
-    handler(this.snapshot());
-    return () => {
-      this.subscribers.delete(handler);
-    };
-  }
-  emit() {
-    const event = this.snapshot();
-    for (const h of this.subscribers) h(event);
-  }
-  snapshot() {
-    return {
-      state: this.state,
-      sandboxReady: this._sandboxReady,
-      harnessReady: this._harnessReady,
-      capabilities: this.getCapabilities(),
-      message: this._degradedReason,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    };
-  }
-};
+    return { status: "ready" };
+  });
+  done();
+}
 
-// src/server/runtime/modeReadiness.ts
-function createRuntimeReadyStatusTracker(modeAdapter, opts) {
-  const readiness = modeAdapter.readiness;
-  const tracker = new ReadyStatusTracker({
-    sandboxReady: readiness?.initialSandboxReady ?? true,
-    harnessReady: opts.harnessReady,
-    capabilities: {
-      ...readiness?.initialWorkspaceReadiness ? { workspace: readiness.initialWorkspaceReadiness } : {},
-      ...opts.capabilities ?? {}
+// src/server/agentRouteBindingProfile.ts
+function toolNames(tools) {
+  return tools.map((tool) => tool.name);
+}
+async function registerAgentRouteBindingProfile(app, profile) {
+  if (profile.dispose) {
+    app.addHook("onClose", async () => {
+      await profile.dispose?.();
+    });
+  }
+  await profile.beforeRegister?.(app);
+  const { register = true, ...health } = profile.health;
+  if (register) await app.register(healthRoutes, health);
+  if (profile.filesystem) {
+    await app.register(fileRoutes, profile.filesystem.file);
+    await app.register(fsEventsRoutes, profile.filesystem.fsEvents);
+    await app.register(treeRoutes, profile.filesystem.tree);
+    await app.register(searchRoutes, profile.filesystem.search);
+    await app.register(gitRoutes, profile.filesystem.git);
+  }
+  await app.register(piChatRoutes, profile.chat);
+  if (profile.systemPrompt) await app.register(systemPromptRoutes, profile.systemPrompt);
+  await app.register(modelsRoutes, profile.models ?? {});
+  if (profile.skills) await app.register(skillsRoutes, profile.skills);
+  await app.register(sessionChangesRoutes, { tracker: profile.sessionChangesTracker });
+  if (profile.reload) {
+    if (typeof profile.reload === "function") {
+      await profile.reload(app);
+    } else {
+      await app.register(reloadRoutes, profile.reload);
     }
-  });
-  readiness?.onTrackerCreated?.(tracker);
-  return tracker;
+  }
+  await app.register(catalogRoutes, profile.catalog);
+  if (profile.commands) await app.register(commandsRoutes, profile.commands);
+  await app.register(readyStatusRoutes, profile.readyStatus);
 }
 
-// src/server/tools/pluginDiagnostics.ts
-function createPluginDiagnosticsTool(deps) {
+// src/server/workspaceAgentDispatcher.ts
+function createBoundWorkspaceAgentDispatcher(agent, ctx) {
+  const boundCtx = normalizeWorkspaceAgentDispatcherContext(ctx);
   return {
-    name: "plugin_diagnostics",
-    description: [
-      "Return current plugin/skill loading errors plus the diagnostics from the",
-      "last /reload. Call this after asking the user to run /reload \u2014 or whenever a",
-      "plugin or skill you expected does not appear to be loaded \u2014 then fix the",
-      "reported error and ask the user to /reload again. Returns a JSON object with",
-      "lastReloadDiagnostics, resourceDiagnostics, and pluginErrors arrays; an empty",
-      "result means no load errors were detected."
-    ].join(" "),
-    parameters: {
-      type: "object",
-      properties: {},
-      additionalProperties: false
+    send(input) {
+      return agent.send({ ...input, ctx: boundCtx });
     },
-    async execute(_params, ctx) {
-      const harness = deps.getHarness();
-      const resourceDiagnostics = harness?.getResourceDiagnostics?.(ctx.sessionId ?? "") ?? [];
-      const pluginErrors = deps.getPluginErrors ? await deps.getPluginErrors() : [];
-      const payload = {
-        lastReloadDiagnostics: deps.getLastReloadDiagnostics(),
-        resourceDiagnostics,
-        pluginErrors
-      };
-      return {
-        content: [{ type: "text", text: JSON.stringify(payload) }],
-        details: payload,
-        isError: false
-      };
+    async interrupt(sessionId) {
+      return parseControlReceipt(await agent.interrupt(sessionId, boundCtx), "interrupt");
+    },
+    async stop(sessionId) {
+      return parseStopReceipt(await agent.stop(sessionId, boundCtx));
     }
   };
 }
+function assertWorkspaceAgentDispatcherRequestContext(ctx, request) {
+  normalizeWorkspaceAgentDispatcherContext(ctx);
+  if (!request) return;
+  const requestWorkspaceId = request.workspaceContext?.workspaceId?.trim();
+  if (!requestWorkspaceId) return;
+  if (requestWorkspaceId !== ctx.workspaceId.trim()) {
+    throw createWorkspaceAgentDispatcherError(
+      ErrorCode.enum.UNAUTHORIZED,
+      "workspace agent dispatcher context does not match request workspace",
+      401
+    );
+  }
+}
+function normalizeWorkspaceAgentDispatcherContext(ctx) {
+  const workspaceId = ctx.workspaceId?.trim();
+  const userId = ctx.userId?.trim();
+  if (!workspaceId) {
+    throw createWorkspaceAgentDispatcherError(
+      ErrorCode.enum.WORKSPACE_UNINITIALIZED,
+      "workspace id is required",
+      400
+    );
+  }
+  if (!userId) {
+    throw createWorkspaceAgentDispatcherError(
+      ErrorCode.enum.UNAUTHORIZED,
+      "user id is required",
+      401
+    );
+  }
+  return { workspaceId, userId };
+}
+function parseControlReceipt(receipt, action) {
+  const parsed = CommandReceiptSchema.safeParse(receipt);
+  if (parsed.success) return parsed.data;
+  throw createWorkspaceAgentDispatcherError(
+    ErrorCode.enum.AGENT_CONTROL_RECEIPT_INVALID,
+    `agent ${action} returned a malformed receipt`,
+    500
+  );
+}
+function parseStopReceipt(receipt) {
+  const parsed = StopReceiptSchema.safeParse(receipt);
+  if (parsed.success) return parsed.data;
+  throw createWorkspaceAgentDispatcherError(
+    ErrorCode.enum.AGENT_CONTROL_RECEIPT_INVALID,
+    "agent stop returned a malformed receipt",
+    500
+  );
+}
+function createWorkspaceAgentDispatcherError(code, message, statusCode) {
+  const error = new Error(message);
+  error.code = code;
+  error.statusCode = statusCode;
+  return error;
+}
 
 // src/server/createAgentApp.ts
 var DEFAULT_VERSION = "0.1.0-dev";
 var DEFAULT_SESSION_ID = "default";
+var PURE_RUNTIME_MODE = "none";
+function createStaticWorkspaceAgentDispatcherResolver(agent, workspaceId) {
+  return {
+    async resolve(ctx, options) {
+      const boundCtx = normalizeWorkspaceAgentDispatcherContext(ctx);
+      assertWorkspaceAgentDispatcherRequestContext(boundCtx, options?.request);
+      if (boundCtx.workspaceId !== workspaceId) {
+        throw createWorkspaceAgentDispatcherError(
+          ErrorCode.enum.UNAUTHORIZED,
+          "workspace agent dispatcher context does not match bound workspace",
+          401
+        );
+      }
+      return createBoundWorkspaceAgentDispatcher(agent, boundCtx);
+    }
+  };
+}
 async function createAgentApp(opts = {}) {
-  const workspaceRoot = opts.workspaceRoot ?? process.cwd();
   const sessionId = opts.sessionId ?? DEFAULT_SESSION_ID;
-  const templatePath = opts.templatePath ?? getEnv("BORING_AGENT_TEMPLATE_PATH");
   const app = Fastify({ logger: opts.logger ?? true, bodyLimit: 16 * 1024 * 1024 });
   const resolvedMode = opts.runtimeModeAdapter?.id ?? opts.mode ?? autoDetectMode();
+  const profile = !opts.runtimeModeAdapter && resolvedMode === PURE_RUNTIME_MODE ? await createPureAgentAppProfile(opts, sessionId, resolvedMode) : await createWorkspaceAgentAppProfile(opts, sessionId, resolvedMode, app);
+  app.addHook(
+    "onRequest",
+    createAuthMiddleware({
+      authToken: opts.authToken,
+      publicPaths: ["/health", "/ready", "/api/v1/ready-status"]
+    })
+  );
+  await registerAgentRouteBindingProfile(app, profile);
+  return app;
+}
+async function createPureAgentAppProfile(opts, sessionId, resolvedMode) {
+  const runtimePi = withPiHarnessDefaults(opts.pi);
+  const baseHarnessFactory = opts.harnessFactory ?? ((input) => createPiCodingAgentHarness({
+    ...input,
+    pi: runtimePi
+  }));
+  const harnessFactory = ((input) => baseHarnessFactory({
+    ...input,
+    sessionNamespace: opts.sessionNamespace,
+    sessionRoot: opts.sessionRoot,
+    sessionDir: opts.sessionDir ?? input.sessionDir
+  }));
+  const tools = opts.extraTools ?? [];
+  const coreAgent = createAgentRuntimeBridge({
+    runtime: "none",
+    tools,
+    harnessFactory,
+    systemPromptAppend: opts.systemPromptAppend,
+    systemPromptDynamic: opts.systemPromptDynamic,
+    telemetry: opts.telemetry,
+    metering: opts.metering,
+    sessionStorageRoot: opts.sessionRoot
+  });
+  const agentRuntime = await coreAgent.getRuntime();
+  opts.onWorkspaceAgentDispatcher?.(createStaticWorkspaceAgentDispatcherResolver(coreAgent.agent, sessionId));
+  const readyTracker = new ReadyStatusTracker({ sandboxReady: true, harnessReady: true });
+  return {
+    runtimeMode: resolvedMode,
+    capabilities: { tools: toolNames(tools) },
+    sessionChangesTracker: new InMemorySessionChangesTracker(),
+    health: {
+      version: opts.version ?? DEFAULT_VERSION,
+      getReadiness: () => ({ sandboxReady: true, harnessReady: true })
+    },
+    chat: {
+      service: agentRuntime.service,
+      defaultWorkspaceId: false
+    },
+    catalog: { tools },
+    readyStatus: { tracker: readyTracker },
+    dispose: () => coreAgent.agent.dispose()
+  };
+}
+async function createWorkspaceAgentAppProfile(opts, sessionId, resolvedMode, app) {
+  const workspaceRoot = opts.workspaceRoot ?? process.cwd();
+  const templatePath = opts.templatePath ?? getEnv("BORING_AGENT_TEMPLATE_PATH");
   const modeAdapter = opts.runtimeModeAdapter ?? resolveMode(resolvedMode);
   let runtimeBundle = await modeAdapter.create({
     workspaceRoot,
@@ -9536,7 +9728,8 @@ async function createAgentApp(opts = {}) {
   const harnessFactory = ((input) => baseHarnessFactory({
     ...input,
     sessionNamespace: opts.sessionNamespace,
-    sessionDir: opts.sessionDir
+    sessionRoot: opts.sessionRoot,
+    sessionDir: opts.sessionDir ?? input.sessionDir
   }));
   const coreAgent = createAgentRuntimeBridge({
     runtime: modeAdapter,
@@ -9546,6 +9739,7 @@ async function createAgentApp(opts = {}) {
     systemPromptDynamic: opts.systemPromptDynamic,
     telemetry: opts.telemetry,
     metering: opts.metering,
+    sessionStorageRoot: opts.sessionRoot,
     workdir: workspaceRoot
   }, {
     service: {
@@ -9554,23 +9748,12 @@ async function createAgentApp(opts = {}) {
     }
   });
   const agentRuntime = await coreAgent.getRuntime();
+  opts.onWorkspaceAgentDispatcher?.(createStaticWorkspaceAgentDispatcherResolver(coreAgent.agent, sessionId));
   const harness = agentRuntime.harness;
   harnessRef = harness;
-  const sessionChangesTracker = new InMemorySessionChangesTracker();
   const readyTracker = createRuntimeReadyStatusTracker(modeAdapter, {
     harnessReady: true
   });
-  app.addHook(
-    "onRequest",
-    createAuthMiddleware({
-      authToken: opts.authToken,
-      publicPaths: ["/health", "/ready", "/api/v1/ready-status"]
-    })
-  );
-  await app.register(healthRoutes, {
-    version: opts.version ?? DEFAULT_VERSION,
-    getReadiness: () => readyTracker.getReadiness()
-  });
   const filesystemBindingsForRequest = opts.getFilesystemBindings ? (request) => {
     const user = request.user;
     return opts.getFilesystemBindings?.({
@@ -9583,46 +9766,65 @@ async function createAgentApp(opts = {}) {
       requestId: request.id
     });
   } : void 0;
-  await app.register(fileRoutes, { workspace: runtimeBundle.workspace, getFilesystemBindings: filesystemBindingsForRequest, filesystemBindings: runtimeBundle.filesystemBindings });
-  await app.register(fsEventsRoutes, { workspace: runtimeBundle.workspace });
-  await app.register(treeRoutes, { workspace: runtimeBundle.workspace, getFilesystemBindings: filesystemBindingsForRequest, filesystemBindings: runtimeBundle.filesystemBindings });
-  await app.register(searchRoutes, { fileSearch: runtimeBundle.fileSearch });
-  await app.register(gitRoutes, {
-    getWorkspaceRoot: () => getOptionalRuntimeBundleStorageRoot(runtimeBundle)
-  });
-  await app.register(piChatRoutes, {
-    service: agentRuntime.service
-  });
-  await app.register(systemPromptRoutes, { harness });
-  await app.register(modelsRoutes);
-  await app.register(skillsRoutes, {
-    workspaceRoot,
-    additionalSkillPaths: runtimePi.additionalSkillPaths,
-    piPackages: runtimePi.packages,
-    noSkills: runtimePi.noSkills,
-    getAdditionalSkillPaths: () => [
-      ...getRuntimeProvisioning()?.skillPaths ?? [],
-      ...opts.pi?.additionalSkillPaths ?? [],
-      ...opts.pi?.getHotReloadableResources?.().additionalSkillPaths ?? []
-    ],
-    getPiPackages: () => [
-      ...opts.pi?.packages ?? [],
-      ...opts.pi?.getHotReloadableResources?.().packages ?? []
-    ]
-  });
-  await app.register(sessionChangesRoutes, { tracker: sessionChangesTracker });
-  await app.register(catalogRoutes, { tools });
-  await app.register(commandsRoutes, { harness, defaultSessionId: sessionId, workdir: runtimeBundle.workspace.root, metering: opts.metering });
-  await app.register(reloadRoutes, {
-    harness,
-    defaultSessionId: sessionId,
-    beforeReload: opts.beforeReload,
-    onDiagnostics: (diagnostics) => {
-      lastReloadDiagnostics = diagnostics;
-    }
-  });
-  await app.register(readyStatusRoutes, { tracker: readyTracker });
-  return app;
+  return {
+    runtimeMode: resolvedMode,
+    capabilities: { tools: toolNames(tools) },
+    sessionChangesTracker: new InMemorySessionChangesTracker(),
+    health: {
+      version: opts.version ?? DEFAULT_VERSION,
+      getReadiness: () => readyTracker.getReadiness()
+    },
+    filesystem: {
+      file: {
+        workspace: runtimeBundle.workspace,
+        getFilesystemBindings: filesystemBindingsForRequest,
+        filesystemBindings: runtimeBundle.filesystemBindings
+      },
+      fsEvents: { workspace: runtimeBundle.workspace },
+      tree: {
+        workspace: runtimeBundle.workspace,
+        getFilesystemBindings: filesystemBindingsForRequest,
+        filesystemBindings: runtimeBundle.filesystemBindings
+      },
+      // File search shares the same bound implementation as the model tool.
+      search: { fileSearch: runtimeBundle.fileSearch },
+      // Git metadata resolves against host storage, not a sandbox-internal cwd.
+      git: { getWorkspaceRoot: () => getOptionalRuntimeBundleStorageRoot(runtimeBundle) }
+    },
+    chat: { service: agentRuntime.service },
+    systemPrompt: { harness },
+    skills: {
+      workspaceRoot,
+      additionalSkillPaths: runtimePi.additionalSkillPaths,
+      piPackages: runtimePi.packages,
+      noSkills: runtimePi.noSkills,
+      getAdditionalSkillPaths: () => [
+        ...getRuntimeProvisioning()?.skillPaths ?? [],
+        ...opts.pi?.additionalSkillPaths ?? [],
+        ...opts.pi?.getHotReloadableResources?.().additionalSkillPaths ?? []
+      ],
+      getPiPackages: () => [
+        ...opts.pi?.packages ?? [],
+        ...opts.pi?.getHotReloadableResources?.().packages ?? []
+      ]
+    },
+    catalog: { tools },
+    commands: {
+      harness,
+      defaultSessionId: sessionId,
+      workdir: runtimeBundle.workspace.root,
+      metering: opts.metering
+    },
+    reload: {
+      harness,
+      defaultSessionId: sessionId,
+      beforeReload: opts.beforeReload,
+      onDiagnostics: (diagnostics) => {
+        lastReloadDiagnostics = diagnostics;
+      }
+    },
+    readyStatus: { tracker: readyTracker }
+  };
 }
 
 // src/server/http/csp.ts
@@ -9650,6 +9852,7 @@ function applyCspHeaders(response, opts = {}) {
 }
 
 // src/server/registerAgentRoutes.ts
+import { createHash as createHash6 } from "crypto";
 import { basename as basename2 } from "path";
 import { AuthStorage as AuthStorage2, ModelRegistry as ModelRegistry2 } from "@mariozechner/pi-coding-agent";
 
@@ -9795,6 +9998,8 @@ function buildUploadAgentTools(bundle) {
 // src/server/registerAgentRoutes.ts
 var DEFAULT_VERSION2 = "0.1.0-dev";
 var DEFAULT_WORKSPACE_ID4 = "default";
+var PURE_RUNTIME_MODE2 = "none";
+var MAX_PURE_BINDINGS = 256;
 var STANDARD_AGENT_TOOL_NAMES = ["bash", "read", "write", "edit", "find", "grep", "ls"];
 function pluginNameFromPath(path4) {
   const fileName = basename2(path4);
@@ -9814,6 +10019,20 @@ function getAvailableModelProviders() {
     new Set(availableModels.map((model) => model.provider))
   ).sort((a, b) => a.localeCompare(b));
 }
+function registerAgentCapabilitiesContributor(app, profile) {
+  const host = app;
+  if (typeof host.registerCapabilitiesContributor !== "function") return;
+  host.registerCapabilitiesContributor(
+    "agent",
+    () => ({
+      agent: {
+        runtimeMode: profile.runtimeMode,
+        tools: profile.capabilities.tools,
+        modelProviders: getAvailableModelProviders()
+      }
+    })
+  );
+}
 function getRequestWorkspaceId2(request) {
   return request.workspaceContext?.workspaceId ?? DEFAULT_WORKSPACE_ID4;
 }
@@ -9839,6 +10058,14 @@ function normalizeSessionNamespace(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : void 0;
 }
+function pureSessionNamespaceFromWorkspaceId(workspaceId) {
+  const digest = createHash6("sha256").update(workspaceId).digest("hex").slice(0, 16);
+  return `workspace-${digest}`;
+}
+function pureSessionNamespaceFromScope(parts) {
+  const digest = createHash6("sha256").update(JSON.stringify(parts)).digest("hex").slice(0, 16);
+  return `scope-${digest}`;
+}
 function getRequestAuthSubject2(request) {
   const userId = request?.user?.id;
   if (typeof userId === "string" && userId.trim()) return userId.trim();
@@ -9895,16 +10122,20 @@ function createRuntimeReadinessCheck(workspaceId, getRuntimeDependencies) {
   };
 }
 var registerAgentRoutes = async (app, opts) => {
-  const workspaceRoot = opts.workspaceRoot ?? process.cwd();
   const sessionId = opts.sessionId ?? DEFAULT_WORKSPACE_ID4;
-  const templatePath = opts.templatePath ?? getEnv("BORING_AGENT_TEMPLATE_PATH");
   const resolvedMode = opts.runtimeModeAdapter?.id ?? opts.mode ?? autoDetectMode();
+  if (!opts.runtimeModeAdapter && resolvedMode === PURE_RUNTIME_MODE2) {
+    await registerPureAgentRoutes(app, opts, sessionId, resolvedMode);
+    return;
+  }
+  const workspaceRoot = opts.workspaceRoot ?? process.cwd();
+  const templatePath = opts.templatePath ?? getEnv("BORING_AGENT_TEMPLATE_PATH");
   const modeAdapter = opts.runtimeModeAdapter ?? resolveMode(resolvedMode, { sandboxHandleStore: opts.sandboxHandleStore });
   app.addHook("onClose", async () => {
     await modeAdapter.dispose?.();
   });
   const modelsWorkspaceScoped = Boolean(opts.filterModels);
-  const requestScopedRuntime = typeof opts.getWorkspaceId === "function" || typeof opts.getWorkspaceRoot === "function" || typeof opts.getTemplatePath === "function" || typeof opts.getPi === "function" || typeof opts.getExtraTools === "function" || typeof opts.getSessionNamespace === "function" || typeof opts.getSystemPromptDynamic === "function";
+  const requestScopedRuntime = typeof opts.getWorkspaceId === "function" || typeof opts.getWorkspaceRoot === "function" || typeof opts.getTemplatePath === "function" || typeof opts.getPi === "function" || typeof opts.getExtraTools === "function" || typeof opts.getSessionNamespace === "function" || typeof opts.getSystemPromptDynamic === "function" || typeof opts.getTrustedWorkspaceRoot === "function";
   const sessionChangesTracker = new InMemorySessionChangesTracker();
   const externalPluginsEnabled = opts.externalPlugins !== false;
   const runtimeBindings = /* @__PURE__ */ new Map();
@@ -9919,12 +10150,23 @@ var registerAgentRoutes = async (app, opts) => {
   async function resolveScopePi(workspaceId, root, request) {
     return withPiHarnessDefaults(opts.getPi ? await opts.getPi({ workspaceId, workspaceRoot: root, request }) : opts.pi);
   }
-  async function resolveRuntimeScope(workspaceId, request) {
-    const root = request && opts.getWorkspaceRoot ? await opts.getWorkspaceRoot(workspaceId, request) : workspaceRoot;
+  async function resolveRuntimeScope(workspaceId, request, trustedCtx) {
+    let root = workspaceRoot;
+    if (request && opts.getWorkspaceRoot) {
+      root = await opts.getWorkspaceRoot(workspaceId, request);
+    } else if (trustedCtx && opts.getTrustedWorkspaceRoot) {
+      root = await opts.getTrustedWorkspaceRoot(trustedCtx);
+    } else if (!request && opts.getWorkspaceRoot) {
+      throw createWorkspaceAgentDispatcherError(
+        ErrorCode.enum.WORKSPACE_UNINITIALIZED,
+        "workspace root resolution requires trusted workspace context",
+        400
+      );
+    }
     const scopedTemplatePath = opts.getTemplatePath ? await opts.getTemplatePath({ workspaceId, workspaceRoot: root, request }) : templatePath;
     const pi = await resolveScopePi(workspaceId, root, request);
-    const sessionNamespace = normalizeSessionNamespace(opts.getSessionNamespace ? await opts.getSessionNamespace({ workspaceId, workspaceRoot: root, request }) : opts.sessionNamespace);
-    const extraToolsAuthSubject = opts.getExtraTools ? getRequestAuthSubject2(request) : void 0;
+    const sessionNamespace = normalizeSessionNamespace(opts.getSessionNamespace ? await opts.getSessionNamespace({ workspaceId, workspaceRoot: root, request, userId: trustedCtx?.userId }) : opts.sessionNamespace);
+    const extraToolsAuthSubject = opts.getExtraTools ? trustedCtx?.userId ?? getRequestAuthSubject2(request) : void 0;
     return {
       root,
       templatePath: scopedTemplatePath,
@@ -9984,7 +10226,7 @@ var registerAgentRoutes = async (app, opts) => {
       request
     });
   }
-  async function createRuntimeBinding(workspaceId, scope, request) {
+  async function createRuntimeBinding(workspaceId, scope, request, trustedCtx) {
     const root = scope.root;
     const modeCtx = {
       workspaceRoot: root,
@@ -10132,7 +10374,7 @@ var registerAgentRoutes = async (app, opts) => {
       workspaceRoot: root,
       runtimeMode: resolvedMode,
       workspaceFsCapability: runtimeBundle.workspace.fsCapability,
-      authSubject: getRequestAuthSubject2(request)
+      authSubject: trustedCtx?.userId ?? getRequestAuthSubject2(request)
     }) : [];
     const tools = mergeTools({
       standardTools,
@@ -10208,12 +10450,12 @@ var registerAgentRoutes = async (app, opts) => {
     startRuntimeProvisioning(request);
     return binding;
   }
-  function createRuntimeBindingEntry(workspaceId, scope, request) {
+  function createRuntimeBindingEntry(workspaceId, scope, request, trustedCtx) {
     const entry = {
       state: "pending",
       promise: Promise.resolve(null)
     };
-    entry.promise = createRuntimeBinding(workspaceId, scope, request).then(
+    entry.promise = createRuntimeBinding(workspaceId, scope, request, trustedCtx).then(
       (binding) => {
         entry.state = "ready";
         return binding;
@@ -10229,7 +10471,7 @@ var registerAgentRoutes = async (app, opts) => {
     return entry;
   }
   async function getOrCreateRuntimeBinding(workspaceId, request, options = {}) {
-    const scope = await resolveRuntimeScope(workspaceId, request);
+    const scope = await resolveRuntimeScope(workspaceId, request, options.trustedCtx);
     const existing = runtimeBindings.get(scope.key);
     if (existing) {
       if (options.failIfPending && existing.state === "pending") {
@@ -10247,7 +10489,7 @@ var registerAgentRoutes = async (app, opts) => {
         );
       }
     }
-    const created = createRuntimeBindingEntry(workspaceId, scope, request);
+    const created = createRuntimeBindingEntry(workspaceId, scope, request, options.trustedCtx);
     runtimeBindings.set(scope.key, created);
     evictRuntimeBindings();
     if (options.failIfPending) {
@@ -10303,6 +10545,24 @@ var registerAgentRoutes = async (app, opts) => {
   const staticBinding = requestScopedRuntime ? null : await getOrCreateRuntimeBinding(sessionId);
   const skillsScopeByRequest = /* @__PURE__ */ new WeakMap();
   const earlySessionStores = /* @__PURE__ */ new Map();
+  opts.onWorkspaceAgentDispatcher?.({
+    async resolve(ctx, options) {
+      const boundCtx = normalizeWorkspaceAgentDispatcherContext(ctx);
+      assertWorkspaceAgentDispatcherRequestContext(boundCtx, options?.request);
+      if (staticBinding) {
+        if (boundCtx.workspaceId !== sessionId) {
+          throw createWorkspaceAgentDispatcherError(
+            ErrorCode.enum.UNAUTHORIZED,
+            "workspace agent dispatcher context does not match bound workspace",
+            401
+          );
+        }
+        return createBoundWorkspaceAgentDispatcher(staticBinding.agent, boundCtx);
+      }
+      const binding = await getOrCreateRuntimeBinding(boundCtx.workspaceId, options?.request, { trustedCtx: boundCtx });
+      return createBoundWorkspaceAgentDispatcher(binding.agent, boundCtx);
+    }
+  });
   function getSkillsScopeForRequest(request) {
     let promise = skillsScopeByRequest.get(request);
     if (!promise) {
@@ -10517,6 +10777,173 @@ var registerAgentRoutes = async (app, opts) => {
     staticBinding ? { tracker: staticBinding.readyTracker } : { getTracker: async (request) => (await getBindingForRequest(request)).readyTracker }
   );
 };
+async function registerPureAgentRoutes(app, opts, sessionId, resolvedMode) {
+  const pureBindings = /* @__PURE__ */ new Map();
+  const requestScopedPure = typeof opts.getWorkspaceId === "function" || typeof opts.getWorkspaceRoot === "function" || typeof opts.getExtraTools === "function" || typeof opts.getPi === "function" || typeof opts.getSessionNamespace === "function" || typeof opts.getSystemPromptDynamic === "function" || typeof opts.getTrustedWorkspaceRoot === "function";
+  function evictPureBindings() {
+    if (pureBindings.size <= MAX_PURE_BINDINGS) return;
+    const keys = Array.from(pureBindings.keys());
+    for (let i = 0; i < keys.length - MAX_PURE_BINDINGS; i += 1) {
+      const key = keys[i];
+      if (!key) continue;
+      const binding = pureBindings.get(key);
+      pureBindings.delete(key);
+      binding?.then((resolved) => resolved.agent.dispose()).catch(() => {
+      });
+    }
+  }
+  async function createPureBinding(request, trustedCtx) {
+    const workspaceId = trustedCtx?.workspaceId ?? (request ? getRequestWorkspaceId2(request) : sessionId);
+    let workspaceRoot = opts.workspaceRoot ?? "";
+    if (request && opts.getWorkspaceRoot) {
+      workspaceRoot = await opts.getWorkspaceRoot(workspaceId, request);
+    } else if (trustedCtx && opts.getTrustedWorkspaceRoot) {
+      workspaceRoot = await opts.getTrustedWorkspaceRoot(trustedCtx);
+    } else if (!request && opts.getWorkspaceRoot) {
+      throw createWorkspaceAgentDispatcherError(
+        ErrorCode.enum.WORKSPACE_UNINITIALIZED,
+        "workspace root resolution requires trusted workspace context",
+        400
+      );
+    }
+    const pi = withPiHarnessDefaults(opts.getPi ? await opts.getPi({ workspaceId, workspaceRoot, request }) : opts.pi);
+    const configuredSessionNamespace = normalizeSessionNamespace(opts.getSessionNamespace ? await opts.getSessionNamespace({ workspaceId, workspaceRoot, request, userId: trustedCtx?.userId }) : opts.sessionNamespace);
+    const authSubject = opts.getExtraTools ? trustedCtx?.userId ?? getRequestAuthSubject2(request) : void 0;
+    const pureScopeNamespace = opts.getWorkspaceId ? pureSessionNamespaceFromWorkspaceId(workspaceId) : requestScopedPure ? pureSessionNamespaceFromScope([resolvedMode, workspaceId, workspaceRoot, pi, authSubject ?? null]) : void 0;
+    const sessionNamespace = configuredSessionNamespace && pureScopeNamespace ? `${configuredSessionNamespace}-${pureScopeNamespace}` : configuredSessionNamespace ?? pureScopeNamespace;
+    const key = JSON.stringify([
+      resolvedMode,
+      workspaceId,
+      workspaceRoot,
+      pi,
+      sessionNamespace ?? null,
+      authSubject ?? null
+    ]);
+    const existing = pureBindings.get(key);
+    if (existing) return existing;
+    const bindingPromise = (async () => {
+      const scopedExtraTools = opts.getExtraTools ? await opts.getExtraTools({
+        workspaceId,
+        workspaceRoot,
+        runtimeMode: resolvedMode,
+        workspaceFsCapability: "none",
+        authSubject
+      }) : [];
+      const tools = mergeTools({
+        standardTools: [],
+        extraTools: [...opts.extraTools ?? [], ...scopedExtraTools],
+        logger: app.log
+      });
+      const baseHarnessFactory = opts.harnessFactory ?? ((input) => createPiCodingAgentHarness({
+        ...input,
+        pi
+      }));
+      const systemPromptDynamic = opts.getSystemPromptDynamic ? () => opts.getSystemPromptDynamic?.({ workspaceId, workspaceRoot }) : opts.systemPromptDynamic;
+      const harnessFactory = ((input) => baseHarnessFactory({
+        ...input,
+        sessionNamespace,
+        sessionRoot: opts.sessionRoot,
+        sessionDir: input.sessionDir
+      }));
+      const coreAgent = createAgentRuntimeBridge({
+        runtime: "none",
+        tools,
+        harnessFactory,
+        systemPromptAppend: opts.systemPromptAppend,
+        systemPromptDynamic,
+        telemetry: opts.telemetry,
+        metering: opts.metering,
+        sessionStorageRoot: opts.sessionRoot
+      });
+      const agentRuntime = await coreAgent.getRuntime();
+      return {
+        agent: coreAgent.agent,
+        tools,
+        readyTracker: new ReadyStatusTracker({ sandboxReady: true, harnessReady: true }),
+        piChatService: agentRuntime.service
+      };
+    })();
+    pureBindings.set(key, bindingPromise);
+    bindingPromise.catch(() => {
+      if (pureBindings.get(key) === bindingPromise) pureBindings.delete(key);
+    });
+    evictPureBindings();
+    return bindingPromise;
+  }
+  const staticBinding = requestScopedPure ? void 0 : await createPureBinding();
+  opts.onWorkspaceAgentDispatcher?.({
+    async resolve(ctx, options) {
+      const boundCtx = normalizeWorkspaceAgentDispatcherContext(ctx);
+      assertWorkspaceAgentDispatcherRequestContext(boundCtx, options?.request);
+      if (staticBinding) {
+        if (boundCtx.workspaceId !== sessionId) {
+          throw createWorkspaceAgentDispatcherError(
+            ErrorCode.enum.UNAUTHORIZED,
+            "workspace agent dispatcher context does not match bound workspace",
+            401
+          );
+        }
+        return createBoundWorkspaceAgentDispatcher(staticBinding.agent, boundCtx);
+      }
+      const binding = await createPureBinding(options?.request, boundCtx);
+      return createBoundWorkspaceAgentDispatcher(binding.agent, boundCtx);
+    }
+  });
+  const profile = {
+    runtimeMode: resolvedMode,
+    capabilities: {
+      tools: staticBinding ? toolNames(staticBinding.tools) : toolNames(opts.extraTools ?? [])
+    },
+    sessionChangesTracker: new InMemorySessionChangesTracker(),
+    health: {
+      register: opts.registerHealthRoute ?? true,
+      version: opts.version ?? DEFAULT_VERSION2,
+      getReadiness: () => ({ sandboxReady: true, harnessReady: true })
+    },
+    chat: {
+      ...staticBinding ? { service: staticBinding.piChatService } : { getService: async (request) => (await createPureBinding(request)).piChatService },
+      defaultWorkspaceId: false
+    },
+    models: { filterModels: opts.filterModels },
+    catalog: staticBinding ? { tools: staticBinding.tools } : { getTools: async (request) => (await createPureBinding(request)).tools },
+    readyStatus: staticBinding ? { tracker: staticBinding.readyTracker } : { getTracker: async (request) => (await createPureBinding(request)).readyTracker },
+    dispose: async () => {
+      const bindings = await Promise.allSettled(pureBindings.values());
+      await Promise.all(bindings.filter((result) => result.status === "fulfilled").map((result) => result.value.agent.dispose()));
+    },
+    beforeRegister: (profileApp) => {
+      profileApp.addHook("onRequest", async (request, reply) => {
+        const user = request.user;
+        let workspaceId = DEFAULT_WORKSPACE_ID4;
+        if (opts.getWorkspaceId && !isWorkspaceAgnosticAgentRequest(request, {
+          readyStatusWorkspaceScoped: requestScopedPure,
+          modelsWorkspaceScoped: Boolean(opts.filterModels)
+        })) {
+          try {
+            workspaceId = (await opts.getWorkspaceId(request)).trim();
+          } catch (error) {
+            const statusCode = typeof error?.statusCode === "number" ? error.statusCode : 400;
+            const message = statusCode >= 500 ? "workspace scope failed" : error instanceof Error ? error.message : "workspace id is required";
+            return reply.code(statusCode).send({
+              error: { code: ErrorCode.enum.WORKSPACE_UNINITIALIZED, message }
+            });
+          }
+          if (workspaceId.length === 0) {
+            return reply.code(400).send({
+              error: {
+                code: ErrorCode.enum.WORKSPACE_UNINITIALIZED,
+                message: "workspace id is required"
+              }
+            });
+          }
+        }
+        request.workspaceContext = { workspaceId, authenticated: !!user };
+      });
+    }
+  };
+  registerAgentCapabilitiesContributor(app, profile);
+  await registerAgentRouteBindingProfile(app, profile);
+}
 export {
   FileHandleStore,
   MANAGED_AGENT_MCP_DELIVERY_RULE,