@hachej/boring-agent 0.1.10 → 0.1.13

package/dist/front/index.d.ts

@@ -4,7 +4,7 @@ import { ReactNode, ComponentType, HTMLAttributes, ComponentProps, FormEvent, El
 import * as ai from 'ai';
 import { UIMessage, FileUIPart, ChatStatus } from 'ai';
 import * as _ai_sdk_react from '@ai-sdk/react';
-import { S as SendMessageInput, d as SessionSummary } from '../harness-DpMCKbzh.js';
+import { S as SendMessageInput, d as SessionSummary } from '../harness-DT3ZzdAN.js';
 import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger, InputGroupButton, TooltipContent, InputGroupAddon, InputGroupTextarea } from '@hachej/boring-ui-kit';
 import { Streamdown } from 'streamdown';
 import { StickToBottom } from 'use-stick-to-bottom';

package/dist/front/index.js

@@ -344,32 +344,61 @@ function useAgentChat(opts) {
 
 // src/front/splitFollowUp.ts
 function splitFollowUp(msgs, consumed, genId) {
-  const targetIdx = msgs.findIndex(
+  let targetIdx = msgs.findIndex(
     (m) => m.role === "assistant" && m.parts?.some((p) => {
       const part = p;
       return part.type === "data-followup-consumed" || part.id?.startsWith("turn-");
     })
   );
+  if (targetIdx < 0) {
+    for (let i = msgs.length - 1; i >= 0; i--) {
+      if (msgs[i]?.role === "assistant") {
+        targetIdx = i;
+        break;
+      }
+    }
+  }
+  const displayTextFromMarker = msgs.flatMap((m) => m.parts ?? []).map((p) => p).find((p) => p.type === "data-followup-consumed" && typeof p.data?.text === "string")?.data?.text;
   const userMsg = {
     id: genId(),
     role: "user",
-    parts: [...consumed.files, { type: "text", text: consumed.text }]
+    parts: [...consumed.files, { type: "text", text: displayTextFromMarker ?? consumed.text }]
   };
   if (targetIdx < 0) {
     return [...msgs, userMsg];
   }
   const target = msgs[targetIdx];
-  const markerIdx = target.parts?.findIndex((p) => {
+  const parts = target.parts ?? [];
+  let markerIdx = parts.findIndex((p) => {
     const part = p;
     return part.type === "data-followup-consumed" || part.id?.startsWith("turn-");
-  }) ?? -1;
-  const markerIsPart = markerIdx >= 0 && (target.parts?.[markerIdx]).type === "data-followup-consumed";
-  const turn1Parts = markerIdx >= 0 ? target.parts?.slice(0, markerIdx) ?? [] : target.parts ?? [];
-  const turn2Parts = markerIdx >= 0 ? target.parts?.slice(markerIsPart ? markerIdx + 1 : markerIdx) ?? [] : [];
+  });
+  let markerIsPart = markerIdx >= 0 && parts[markerIdx].type === "data-followup-consumed";
+  if (markerIdx < 0) {
+    const textPartIndexes = parts.map((p, index) => p.type === "text" ? index : -1).filter((index) => index >= 0);
+    if (textPartIndexes.length > 1) {
+      markerIdx = textPartIndexes[textPartIndexes.length - 1];
+      markerIsPart = false;
+    } else {
+      return [...msgs.slice(0, targetIdx), userMsg, target, ...msgs.slice(targetIdx + 1)];
+    }
+  }
+  const turn1Parts = markerIdx >= 0 ? parts.slice(0, markerIdx) : parts;
+  const turn2Parts = markerIdx >= 0 ? parts.slice(markerIsPart ? markerIdx + 1 : markerIdx) : [];
   const asst1 = { ...target, parts: turn1Parts };
   const asst2 = { ...target, id: genId(), parts: turn2Parts };
   return [...msgs.slice(0, targetIdx), asst1, userMsg, asst2, ...msgs.slice(targetIdx + 1)];
 }
+function splitFollowUpForDisplay(msgs, consumed, pending, ids) {
+  const draft = consumed ?? pending;
+  if (!draft || !ids) return msgs;
+  const hasFollowUpBoundary = msgs.some(
+    (m) => m.role === "assistant" && (m.parts?.some((p) => p.id?.startsWith("turn-") || p.type === "data-followup-consumed") || (m.parts?.filter((p) => p.type === "text").length ?? 0) > 1)
+  );
+  if (!hasFollowUpBoundary) return msgs;
+  let n = 0;
+  return splitFollowUp(msgs, draft, () => n++ === 0 ? ids.userId : ids.assistantId);
+}
 
 // src/front/DebugDrawer.tsx
 import { useCallback as useCallback3, useEffect as useEffect5, useRef as useRef5, useState as useState4 } from "react";
@@ -3778,6 +3807,8 @@ function ChatPanel(props) {
   const [debugWidth, setDebugWidth] = useState13(440);
   const [pendingMessage, setPendingMessage] = useState13(null);
   const pendingMessageRef = useRef10(null);
+  const followUpPostedRef = useRef10(false);
+  const followUpPostTimerRef = useRef10(null);
   const consumedFollowUpRef = useRef10(null);
   const followUpSplitIdsRef = useRef10(null);
   const {
@@ -3793,7 +3824,8 @@ function ChatPanel(props) {
     onData: (part) => {
       if (part?.type === "data-followup-consumed") {
         const pending = pendingMessageRef.current;
-        consumedFollowUpRef.current = pending ? { text: pending.text, files: pending.files } : null;
+        const serverText = part?.data?.text;
+        consumedFollowUpRef.current = pending ? { text: pending.text, files: pending.files } : typeof serverText === "string" ? { text: serverText, files: [] } : null;
         followUpSplitIdsRef.current = {
           userId: globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-followup-user`,
           assistantId: globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-followup-assistant`
@@ -3923,17 +3955,35 @@ function ChatPanel(props) {
     return () => globalThis.removeEventListener?.("boring:model-change", onChange);
   }, []);
   const isStreaming = status === "submitted" || status === "streaming";
-  const displayMessages = useMemo10(() => {
-    const consumed = consumedFollowUpRef.current ?? pendingMessageRef.current;
-    const ids = followUpSplitIdsRef.current;
-    if (!consumed || !ids) return messages;
-    const hasFollowUpPart = messages.some(
-      (m) => m.role === "assistant" && m.parts?.some((p) => p.id?.startsWith("turn-"))
-    );
-    if (!hasFollowUpPart) return messages;
-    let n = 0;
-    return splitFollowUp(messages, consumed, () => n++ === 0 ? ids.userId : ids.assistantId);
-  }, [messages]);
+  const displayMessages = useMemo10(
+    () => splitFollowUpForDisplay(
+      messages,
+      consumedFollowUpRef.current,
+      pendingMessageRef.current,
+      followUpSplitIdsRef.current
+    ),
+    [messages]
+  );
+  const postPendingFollowUp = useCallback12((pending) => {
+    if (followUpPostedRef.current) return;
+    followUpPostedRef.current = true;
+    fetch(`/api/v1/agent/chat/${encodeURIComponent(sessionId)}/followup`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...requestHeaders
+      },
+      body: JSON.stringify({ message: pending.serverMessage, displayText: pending.text, attachments: pending.attachments })
+    }).catch(() => {
+      followUpPostedRef.current = false;
+    });
+  }, [sessionId, requestHeaders]);
+  useEffect11(() => {
+    if (status !== "streaming") return;
+    const pending = pendingMessageRef.current;
+    if (!pending) return;
+    postPendingFollowUp(pending);
+  }, [status, postPendingFollowUp]);
   const prevStatusForQueue = useRef10(status);
   useEffect11(() => {
     const prev = prevStatusForQueue.current;
@@ -3946,6 +3996,9 @@ function ChatPanel(props) {
     consumedFollowUpRef.current = null;
     followUpSplitIdsRef.current = null;
     pendingMessageRef.current = null;
+    followUpPostedRef.current = false;
+    if (followUpPostTimerRef.current) clearTimeout(followUpPostTimerRef.current);
+    followUpPostTimerRef.current = null;
     setPendingMessage(null);
     let n = 0;
     const genId = () => ids ? n++ === 0 ? ids.userId : ids.assistantId : globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-${Math.random()}`;
@@ -3966,6 +4019,9 @@ function ChatPanel(props) {
     consumedFollowUpRef.current = null;
     followUpSplitIdsRef.current = null;
     pendingMessageRef.current = null;
+    followUpPostedRef.current = false;
+    if (followUpPostTimerRef.current) clearTimeout(followUpPostTimerRef.current);
+    followUpPostTimerRef.current = null;
     setPendingMessage(null);
     fetch(`/api/v1/agent/chat/${encodeURIComponent(sessionId)}/followup`, {
       method: "DELETE",
@@ -4155,16 +4211,17 @@ ${content}
           attachments: resolvedAttachments
         };
         pendingMessageRef.current = nextPending;
+        followUpPostedRef.current = false;
         setPendingMessage(nextPending);
-        fetch(`/api/v1/agent/chat/${encodeURIComponent(sessionId)}/followup`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            ...requestHeaders
-          },
-          body: JSON.stringify({ message: serverMessage, attachments: resolvedAttachments })
-        }).catch(() => {
-        });
+        if (status === "streaming") {
+          postPendingFollowUp(nextPending);
+        } else {
+          if (followUpPostTimerRef.current) clearTimeout(followUpPostTimerRef.current);
+          followUpPostTimerRef.current = setTimeout(() => {
+            const pending = pendingMessageRef.current;
+            if (pending) postPendingFollowUp(pending);
+          }, 1e3);
+        }
       }
       return;
     }

package/dist/{harness-DpMCKbzh.d.ts → harness-DT3ZzdAN.d.ts}

@@ -51,7 +51,7 @@ interface AgentHarness {
      * A `data-followup-consumed` chunk is emitted before the follow-up turn so
      * the client can clear its pending-message bubble immediately.
      */
-    followUp?(sessionId: string, text: string, attachments?: MessageAttachment[]): void;
+    followUp?(sessionId: string, text: string, attachments?: MessageAttachment[], displayText?: string): void | Promise<void>;
     /**
      * Discard any queued follow-up for this session (called by the Stop button).
      */

package/dist/server/index.d.ts

@@ -215,9 +215,16 @@ interface VercelSandboxWorkspaceOptions {
 }
 declare function createVercelSandboxWorkspace(sandbox: Sandbox$1, workspaceOpts?: VercelSandboxWorkspaceOptions): VercelSandboxWorkspace;
 
-type RuntimeModeId = 'direct' | 'local' | 'vercel-sandbox';
+type BuiltinRuntimeModeId = 'direct' | 'local' | 'vercel-sandbox';
+type RuntimeModeId = BuiltinRuntimeModeId | (string & {});
 interface RuntimeModeAdapter {
     readonly id: RuntimeModeId;
+    /**
+     * Declares whether the workspace files are strongly available on the host
+     * path before create() runs. Composition layers use this to decide whether
+     * host-side fs checks/prompts are safe without hard-coding sandbox IDs.
+     */
+    readonly workspaceFsCapability?: Workspace['fsCapability'];
     create(ctx: ModeContext): Promise<RuntimeBundle>;
     dispose?(): Promise<void>;
 }
@@ -260,6 +267,8 @@ interface CreateAgentAppOptions {
     sessionId?: string;
     templatePath?: string;
     mode?: RuntimeModeId;
+    /** Supply a custom runtime adapter to plug in non-built-in sandbox/workspace modes. */
+    runtimeModeAdapter?: RuntimeModeAdapter;
     authToken?: string;
     version?: string;
     logger?: boolean;
@@ -295,12 +304,15 @@ interface RegisterAgentRoutesOptions {
         request?: FastifyRequest;
     }) => string | undefined | Promise<string | undefined>;
     mode?: RuntimeModeId;
+    /** Supply a custom runtime adapter to plug in non-built-in sandbox/workspace modes. */
+    runtimeModeAdapter?: RuntimeModeAdapter;
     version?: string;
     extraTools?: AgentTool[];
     getExtraTools?: (ctx: {
         workspaceId: string;
         workspaceRoot: string;
         runtimeMode: RuntimeModeId;
+        workspaceFsCapability?: Workspace['fsCapability'];
     }) => AgentTool[] | Promise<AgentTool[]>;
     systemPromptAppend?: string;
     resourceLoaderOptions?: PiResourceLoaderOptions;
@@ -329,4 +341,4 @@ interface Logger {
 }
 declare function createLogger(prefix: string): Logger;
 
-export { type CreateAgentAppOptions, type DeploymentSnapshotProvider, type DeploymentSnapshotRecipe, type DeploymentSnapshotResult, type DeploymentSnapshotStatus, FileHandleStore, type LogFields, type Logger, type ModeContext, PI_PACKAGE_RESOURCE_FILTERS, type PiPackageSource, type PiResourceLoaderOptions, type ProvisionRuntimeWorkspaceOptions, type RegisterAgentRoutesOptions, type RuntimeBundle, type RuntimeModeAdapter, type RuntimeModeId, type RuntimeProvisioningContribution, type RuntimePythonSpec, type RuntimeTemplateContribution, type RuntimeWorkspaceProvisioningResult, type SnapshotBakeOptions, type SnapshotBakeResult, UV_SETUP_COMMANDS, UV_SETUP_COMMANDS as VERCEL_UV_SETUP_COMMANDS, type VercelBakeClient, type VercelBakeSandbox, type VercelDeploymentSnapshotOptions, applyCspHeaders, autoDetectMode, bakeSnapshotIfNeeded, buildDeploymentSnapshotRecipe, buildPackageHash, buildSnapshotRecipeHash, compactPiPackages, createAgentApp, createBwrapSandbox, createDirectSandbox, createLogger, createNodeWorkspace, createVercelDeploymentSnapshotProvider, createVercelSandboxWorkspace, hasBwrap, mergePiPackageSources, piPackageSourceKey, prepareDeploymentSnapshot, prepareVercelDeploymentSnapshot, provisionRuntimeWorkspace, registerAgentRoutes, resolveMode, resolveSandboxHandle };
+export { type BuiltinRuntimeModeId, type CreateAgentAppOptions, type DeploymentSnapshotProvider, type DeploymentSnapshotRecipe, type DeploymentSnapshotResult, type DeploymentSnapshotStatus, FileHandleStore, type LogFields, type Logger, type ModeContext, PI_PACKAGE_RESOURCE_FILTERS, type PiPackageSource, type PiResourceLoaderOptions, type ProvisionRuntimeWorkspaceOptions, type RegisterAgentRoutesOptions, type RuntimeBundle, type RuntimeModeAdapter, type RuntimeModeId, type RuntimeProvisioningContribution, type RuntimePythonSpec, type RuntimeTemplateContribution, type RuntimeWorkspaceProvisioningResult, type SnapshotBakeOptions, type SnapshotBakeResult, UV_SETUP_COMMANDS, UV_SETUP_COMMANDS as VERCEL_UV_SETUP_COMMANDS, type VercelBakeClient, type VercelBakeSandbox, type VercelDeploymentSnapshotOptions, applyCspHeaders, autoDetectMode, bakeSnapshotIfNeeded, buildDeploymentSnapshotRecipe, buildPackageHash, buildSnapshotRecipeHash, compactPiPackages, createAgentApp, createBwrapSandbox, createDirectSandbox, createLogger, createNodeWorkspace, createVercelDeploymentSnapshotProvider, createVercelSandboxWorkspace, hasBwrap, mergePiPackageSources, piPackageSourceKey, prepareDeploymentSnapshot, prepareVercelDeploymentSnapshot, provisionRuntimeWorkspace, registerAgentRoutes, resolveMode, resolveSandboxHandle };

package/dist/server/index.js

@@ -2164,6 +2164,7 @@ async function copyTemplate(templatePath, workspaceRoot) {
 // src/server/runtime/modes/direct.ts
 var directModeAdapter = {
   id: "direct",
+  workspaceFsCapability: "strong",
   async create(ctx) {
     await mkdir6(ctx.workspaceRoot, { recursive: true });
     await copyTemplate(ctx.templatePath, ctx.workspaceRoot);
@@ -2182,6 +2183,7 @@ var directModeAdapter = {
 import { mkdir as mkdir7 } from "fs/promises";
 var localModeAdapter = {
   id: "local",
+  workspaceFsCapability: "strong",
   async create(ctx) {
     if (process.platform !== "linux") {
       throw new Error("local mode requires Linux with bubblewrap");
@@ -2242,13 +2244,40 @@ function timeoutResult(durationMs) {
     stderrEncoding: "utf-8"
   };
 }
+function toRemotePath(value) {
+  if (value === VERCEL_SANDBOX_WORKSPACE_ROOT) return VERCEL_SANDBOX_REMOTE_ROOT;
+  if (value.startsWith(`${VERCEL_SANDBOX_WORKSPACE_ROOT}/`)) {
+    return `${VERCEL_SANDBOX_REMOTE_ROOT}${value.slice(VERCEL_SANDBOX_WORKSPACE_ROOT.length)}`;
+  }
+  return value;
+}
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var WORKSPACE_ALIAS_PREFIX_BOUNDARY = String.raw`(^|[\s"'=:;,\[({<>&|])`;
+var WORKSPACE_ALIAS_SUFFIX_BOUNDARY = String.raw`(?=/|$|[\s"'=:;,)\]}> &|])`;
+var WORKSPACE_ALIAS_PATTERN = new RegExp(
+  `${WORKSPACE_ALIAS_PREFIX_BOUNDARY}${escapeRegExp(VERCEL_SANDBOX_WORKSPACE_ROOT)}${WORKSPACE_ALIAS_SUFFIX_BOUNDARY}`,
+  "g"
+);
+function replaceWorkspaceAliases(value) {
+  return value.replace(
+    WORKSPACE_ALIAS_PATTERN,
+    (_match, prefix) => `${prefix}${VERCEL_SANDBOX_REMOTE_ROOT}`
+  );
+}
 function toRemoteCwd(cwd) {
   if (!cwd) return cwd;
-  if (cwd === VERCEL_SANDBOX_WORKSPACE_ROOT) return VERCEL_SANDBOX_REMOTE_ROOT;
-  if (cwd.startsWith(`${VERCEL_SANDBOX_WORKSPACE_ROOT}/`)) {
-    return `${VERCEL_SANDBOX_REMOTE_ROOT}${cwd.slice(VERCEL_SANDBOX_WORKSPACE_ROOT.length)}`;
-  }
-  return cwd;
+  return toRemotePath(cwd);
+}
+function toRemoteCommand(command) {
+  return replaceWorkspaceAliases(command);
+}
+function toRemoteEnv(env) {
+  if (!env) return void 0;
+  return Object.fromEntries(
+    Object.entries(env).map(([key, value]) => [key, replaceWorkspaceAliases(toRemotePath(value))])
+  );
 }
 function createVercelSandboxExec(sandbox, execOpts = {}) {
   return {
@@ -2294,9 +2323,9 @@ function createVercelSandboxExec(sandbox, execOpts = {}) {
         }
         const result = await sandbox.runCommand({
           cmd: "sh",
-          args: ["-c", cmd],
+          args: ["-c", toRemoteCommand(cmd)],
           cwd: toRemoteCwd(opts?.cwd),
-          env: opts?.env,
+          env: toRemoteEnv(opts?.env),
           signal: controller.signal,
           stdout: createStreamWritable(stdoutCollector, captureState, opts?.onStdout),
           stderr: createStreamWritable(stderrCollector, captureState, opts?.onStderr)
@@ -2578,6 +2607,7 @@ function createVercelSandboxModeAdapter(opts = {}) {
   const snapshotScheduler = opts.snapshotScheduler ?? null;
   return {
     id: "vercel-sandbox",
+    workspaceFsCapability: "best-effort",
     async dispose() {
       await snapshotScheduler?.shutdown();
     },
@@ -2674,7 +2704,7 @@ var MODE_ADAPTERS = {
   local: localModeAdapter,
   "vercel-sandbox": vercelSandboxModeAdapter
 };
-function isRuntimeModeId(value) {
+function isBuiltinRuntimeModeId(value) {
   return value === "direct" || value === "local" || value === "vercel-sandbox";
 }
 function hasBwrap() {
@@ -2684,7 +2714,7 @@ function hasBwrap() {
 function autoDetectMode() {
   const explicitMode = getEnv("BORING_AGENT_MODE");
   if (explicitMode) {
-    if (!isRuntimeModeId(explicitMode)) {
+    if (!isBuiltinRuntimeModeId(explicitMode)) {
       throw new Error(
         `Invalid BORING_AGENT_MODE "${explicitMode}". Expected direct, local, or vercel-sandbox.`
       );
@@ -2697,7 +2727,8 @@ function autoDetectMode() {
   return "direct";
 }
 function resolveMode(mode = autoDetectMode()) {
-  return MODE_ADAPTERS[mode];
+  if (isBuiltinRuntimeModeId(mode)) return MODE_ADAPTERS[mode];
+  throw new Error(`Runtime mode "${mode}" has no built-in adapter. Pass runtimeModeAdapter to use a custom sandbox mode.`);
 }
 
 // src/server/createAgentApp.ts
@@ -3689,6 +3720,16 @@ function mergePiPackageSources(base = [], additional = []) {
 }
 
 // src/server/harness/pi-coding-agent/createHarness.ts
+function extractUserMessageText(message) {
+  const record = message;
+  if (record?.role !== "user") return "";
+  if (typeof record.content === "string") return record.content;
+  if (!Array.isArray(record.content)) return "";
+  return record.content.map((part) => {
+    const p = part;
+    return p.type === "text" && typeof p.text === "string" ? p.text : "";
+  }).join("");
+}
 function extractAssistantMessageText(message) {
   const record = message;
   const role = typeof record?.role === "string" ? record.role : void 0;
@@ -3874,16 +3915,18 @@ function createPiCodingAgentHarness(opts) {
     await originalDelete(ctx, sessionId);
     disposePiSession(sessionId);
   };
-  const harnessFollowUpQueues = /* @__PURE__ */ new Map();
+  const nativeFollowUpPending = /* @__PURE__ */ new Set();
   return {
     id: "pi-coding-agent",
     placement: "server",
     sessions: sessionStore,
-    followUp(sessionId, text, attachments) {
-      harnessFollowUpQueues.set(sessionId, { message: text, attachments });
+    async followUp(sessionId, text, _attachments, _displayText = text) {
+      const handle = piSessions.get(sessionId);
+      if (!handle) return;
+      nativeFollowUpPending.add(sessionId);
+      await handle.piSession.followUp(text);
     },
-    clearFollowUp(sessionId) {
-      harnessFollowUpQueues.delete(sessionId);
+    clearFollowUp(_sessionId) {
     },
     /**
      * Pi exposes the resolved system prompt as a getter on AgentSession.
@@ -3900,7 +3943,6 @@ function createPiCodingAgentHarness(opts) {
         input,
         ctx
       );
-      harnessFollowUpQueues.delete(input.sessionId);
       const chunks = [];
       let done = false;
       let streamError = null;
@@ -3960,7 +4002,6 @@ function createPiCodingAgentHarness(opts) {
           return chunk2;
         });
       }
-      let pendingFollowUp;
       let promptSettled = false;
       let promptPromise = Promise.resolve();
       const unsubscribe = piSession.subscribe((event) => {
@@ -3982,7 +4023,19 @@ function createPiCodingAgentHarness(opts) {
           activeTools.delete(event.toolCallId);
           if (activeTools.size === 0) stopHeartbeat();
         }
-        let converted = namespaceInlinePartIds(dedupStartChunks(piEventToChunks(event)));
+        let converted;
+        if (event.type === "message_start" && event.message?.role === "user") {
+          const text = extractUserMessageText(event.message);
+          converted = text && text !== input.message ? [{ type: "data-followup-consumed", data: { text } }] : [];
+          if (text && text !== input.message) {
+            inlineTurnIndex += 1;
+            nativeFollowUpPending.delete(input.sessionId);
+          }
+        } else if (event.type === "message_end" && event.message?.role === "user") {
+          converted = [];
+        } else {
+          converted = namespaceInlinePartIds(dedupStartChunks(piEventToChunks(event)));
+        }
         if (event.type === "message_update") {
           const ame = event.assistantMessageEvent;
           if (ame.type === "text_end" && typeof ame.content === "string" && ame.content.length > 0 && !textDeltaSeen.has(ame.contentIndex)) {
@@ -4042,16 +4095,7 @@ function createPiCodingAgentHarness(opts) {
               assistantText += text;
             }
           }
-          const followUp = harnessFollowUpQueues.get(input.sessionId);
-          if (followUp !== void 0 && !ctx.abortSignal.aborted) {
-            harnessFollowUpQueues.delete(input.sessionId);
-            chunks.push({ type: "data-followup-consumed" });
-            inlineTurnIndex += 1;
-            sawTextChunk = false;
-            textStartSeen.clear();
-            textDeltaSeen.clear();
-            assistantText = "";
-            pendingFollowUp = followUp;
+          if (nativeFollowUpPending.has(input.sessionId) && !ctx.abortSignal.aborted) {
           } else {
             done = true;
             stopHeartbeat();
@@ -4107,11 +4151,6 @@ ${attachmentNotes.join("\n")}` : message,
         const prepared = await prepareTurn(message, attachments);
         return piSession.prompt(prepared.message, prepared.promptOpts).then(() => {
           promptSettled = true;
-          if (pendingFollowUp !== void 0 && !ctx.abortSignal.aborted) {
-            const next = pendingFollowUp;
-            pendingFollowUp = void 0;
-            promptPromise = startTurn(next.message, next.attachments);
-          }
         }).catch((err) => {
           promptSettled = true;
           streamError = err;
@@ -4534,13 +4573,33 @@ function boundFs(workspaceRoot) {
 }
 
 // src/server/tools/operations/vercel.ts
-import { relative as relative5 } from "path";
+import { isAbsolute as isAbsolute5, relative as relative5 } from "path";
+function rootAliases(workspace) {
+  const aliases = [workspace.root];
+  if (workspace.root === VERCEL_SANDBOX_WORKSPACE_ROOT) aliases.push(VERCEL_SANDBOX_REMOTE_ROOT);
+  if (workspace.root === VERCEL_SANDBOX_REMOTE_ROOT) aliases.push(VERCEL_SANDBOX_WORKSPACE_ROOT);
+  return aliases;
+}
+function isOutsideWorkspaceRel(rel) {
+  return rel === ".." || rel.startsWith("../") || rel.startsWith("..\\") || isAbsolute5(rel);
+}
 function toRelPath(workspace, absolutePath) {
-  const rel = relative5(workspace.root, absolutePath);
-  if (rel.startsWith("..") || rel.startsWith("/")) {
-    throw new Error(`path "${absolutePath}" is outside workspace`);
+  for (const root of rootAliases(workspace)) {
+    const rel = relative5(root, absolutePath);
+    if (!isOutsideWorkspaceRel(rel)) return rel;
+  }
+  const skillMarker = "/.agents/skills/";
+  const skillIndex = absolutePath.indexOf(skillMarker);
+  if (skillIndex >= 0) {
+    const skillPath = absolutePath.slice(skillIndex + skillMarker.length);
+    if (skillPath.includes("\0") || skillPath.split(/[\\/]+/).includes("..")) {
+      throw new Error(`path "${absolutePath}" escapes the workspace skills directory`);
+    }
+    return `.agents/skills/${skillPath}`;
   }
-  return rel;
+  throw new Error(
+    `path "${absolutePath}" is outside workspace; use a path relative to the workspace root or under ${rootAliases(workspace).join(" / ")}`
+  );
 }
 function vercelBashOps(sandbox) {
   return {
@@ -4599,6 +4658,39 @@ function vercelEditOps(workspace) {
     }
   };
 }
+function toRemotePath2(value) {
+  if (value === VERCEL_SANDBOX_WORKSPACE_ROOT) return VERCEL_SANDBOX_REMOTE_ROOT;
+  if (value.startsWith(`${VERCEL_SANDBOX_WORKSPACE_ROOT}/`)) {
+    return `${VERCEL_SANDBOX_REMOTE_ROOT}${value.slice(VERCEL_SANDBOX_WORKSPACE_ROOT.length)}`;
+  }
+  return value;
+}
+function findPredicate(pattern) {
+  const isPathShaped = pattern.includes("/") || pattern.includes("**");
+  if (!isPathShaped) return `-name ${shellEscape(pattern)}`;
+  let translated = pattern.replaceAll("**", "*").replace(/^\/+/, "");
+  if (!translated.startsWith("*")) translated = `*${translated}`;
+  return `-path ${shellEscape(translated)}`;
+}
+function findIgnoreArgs(cwd, ignore) {
+  return ignore.map((pattern) => `! -path ${shellEscape(`${cwd}/${pattern.replace(/^\/+/, "")}/*`)}`).join(" ");
+}
+function fallbackFindCommand(pattern, cwd, options) {
+  return [
+    "find",
+    shellEscape(cwd),
+    "-maxdepth 20",
+    "-type f",
+    findIgnoreArgs(cwd, options.ignore),
+    findPredicate(pattern),
+    `| head -n ${Math.max(1, Math.trunc(options.limit))}`
+  ].filter(Boolean).join(" ");
+}
+function isFdMissing(result) {
+  if (result.exitCode !== 127) return false;
+  const stderr = Buffer.from(result.stderr).toString("utf-8");
+  return /\bfd: (?:not found|command not found)\b/i.test(stderr);
+}
 function vercelFindOps(sandbox, workspace) {
   return {
     async exists(absolutePath) {
@@ -4617,18 +4709,25 @@ function vercelFindOps(sandbox, workspace) {
       return result.exitCode === 0;
     },
     async glob(pattern, cwd, options) {
+      const remoteCwd = toRemotePath2(cwd);
       const args = ["fd", "--glob", "--no-require-git", "--max-results", String(options.limit)];
       for (const ig of options.ignore) {
         args.push("--exclude", ig);
       }
-      args.push(pattern, cwd);
-      const result = await sandbox.exec(args.map(shellEscape).join(" "), {
+      args.push(pattern, remoteCwd);
+      let result = await sandbox.exec(args.map(shellEscape).join(" "), {
         timeoutMs: 3e4,
         maxOutputBytes: 1048576
       });
+      if (isFdMissing(result)) {
+        result = await sandbox.exec(fallbackFindCommand(pattern, remoteCwd, options), {
+          timeoutMs: 3e4,
+          maxOutputBytes: 1048576
+        });
+      }
       if (result.exitCode !== 0 && result.exitCode !== 1) {
         const stderr = Buffer.from(result.stderr).toString("utf-8").trim();
-        throw new Error(`fd failed (exit ${result.exitCode}): ${stderr}`);
+        throw new Error(`file search failed (exit ${result.exitCode}): ${stderr}`);
       }
       const stdout = Buffer.from(result.stdout).toString("utf-8");
       return stdout.split("\n").filter(Boolean);
@@ -6158,7 +6257,12 @@ function chatRoutes(app, opts, done) {
         });
       }
       const runtime = await resolveRuntime(request);
-      runtime.harness.followUp?.(sessionId, body.message, parsedAttachments.data);
+      await runtime.harness.followUp?.(
+        sessionId,
+        body.message,
+        parsedAttachments.data,
+        typeof body.displayText === "string" && body.displayText.length > 0 ? body.displayText : body.message
+      );
       return reply.code(202).send({ queued: true });
     }
   );
@@ -6281,9 +6385,16 @@ import { randomUUID as randomUUID4 } from "crypto";
 import { z as z2 } from "zod";
 var DEFAULT_SESSION_TITLE2 = "New session";
 var DEFAULT_WORKSPACE_ID2 = "default";
+var MAX_ANALYSIS_TRANSCRIPT_CHARS = 12e4;
 var createSessionBodySchema = z2.object({
   title: z2.string().min(1).max(200).optional()
 }).optional();
+var analyzeSessionBodySchema = z2.object({
+  instructions: z2.string().max(4e3).optional(),
+  title: z2.string().min(1).max(200).optional(),
+  run: z2.boolean().optional(),
+  includeTranscript: z2.boolean().optional()
+}).optional();
 var SessionNotFoundError = class extends Error {
   constructor(sessionId) {
     super(`Session not found: ${sessionId}`);
@@ -6380,13 +6491,141 @@ function classifySessionError(err, reply) {
     }
   });
 }
+function stableStringify(value) {
+  if (typeof value === "string") return value;
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
+function partText(part) {
+  const value = part;
+  if (typeof value.text === "string") return value.text;
+  if (typeof value.delta === "string") return value.delta;
+  if (typeof value.content === "string") return value.content;
+  return "";
+}
+function toolName(part) {
+  if (typeof part.toolName === "string") return part.toolName;
+  if (typeof part.type === "string" && part.type.startsWith("tool-")) {
+    return part.type.slice("tool-".length);
+  }
+  return "tool";
+}
+function formatToolPart(part) {
+  const name = toolName(part);
+  const lines = [`[tool:${name}]`];
+  if ("input" in part) {
+    lines.push("input:", stableStringify(part.input));
+  }
+  if ("output" in part) {
+    lines.push("output:", stableStringify(part.output));
+  }
+  if (typeof part.errorText === "string" && part.errorText.length > 0) {
+    lines.push("error:", part.errorText);
+  }
+  return lines.join("\n");
+}
+function formatMessageForTranscript(message, index) {
+  const msg = message;
+  const role = String(msg.role ?? "unknown").toUpperCase();
+  const parts = Array.isArray(msg.parts) ? msg.parts : [];
+  const lines = [`## ${index + 1}. ${role}`];
+  if (typeof msg.content === "string" && msg.content.trim()) {
+    lines.push(msg.content.trim());
+  }
+  for (const part of parts) {
+    const record = part;
+    const type = typeof record.type === "string" ? record.type : "";
+    if (type === "text") {
+      const text2 = partText(record).trim();
+      if (text2) lines.push(text2);
+      continue;
+    }
+    if (type === "reasoning") {
+      const text2 = partText(record).trim();
+      if (text2) lines.push(`[reasoning]
+${text2}`);
+      continue;
+    }
+    if (type.startsWith("tool-")) {
+      lines.push(formatToolPart(record));
+      continue;
+    }
+    const text = partText(record).trim();
+    if (text) lines.push(`[${type || "part"}]
+${text}`);
+  }
+  if (lines.length === 1) lines.push("(no visible content)");
+  return lines.join("\n\n");
+}
+function formatSessionTranscript(session) {
+  const header = [
+    `# Agent session transcript: ${session.title}`,
+    "",
+    `- Session: ${session.id}`,
+    `- Created: ${session.createdAt}`,
+    `- Updated: ${session.updatedAt}`,
+    `- User turns: ${session.turnCount}`
+  ];
+  const body = session.messages.map(formatMessageForTranscript);
+  return [...header, "", ...body].join("\n");
+}
+function truncateMiddle(value, maxChars) {
+  if (value.length <= maxChars) return value;
+  const keep = Math.floor((maxChars - 200) / 2);
+  return `${value.slice(0, keep)}
+
+[... transcript truncated: ${value.length - keep * 2} chars omitted ...]
+
+${value.slice(-keep)}`;
+}
+function buildAnalysisPrompt(session, transcript, instructions) {
+  const boundedTranscript = truncateMiddle(transcript, MAX_ANALYSIS_TRANSCRIPT_CHARS);
+  return [
+    "You are an agent-session analyst. Analyze the transcript below and explain what is going on.",
+    "",
+    "Return a concise, evidence-backed report with these sections:",
+    "1. User goal",
+    "2. Current state",
+    "3. What the agent did",
+    "4. Failures, confusing behavior, or likely root causes",
+    "5. Files/tools/commands that matter",
+    "6. Risks and recommended next actions",
+    "",
+    "Rules:",
+    "- Cite concrete transcript evidence when possible.",
+    '- Say "unknown" when the transcript does not prove something.',
+    "- Do not modify files unless explicitly asked in follow-up.",
+    instructions ? `- Extra user instructions: ${instructions}` : "",
+    "",
+    `Source session: ${session.id} (${session.title})`,
+    "",
+    "<transcript>",
+    boundedTranscript,
+    "</transcript>"
+  ].filter(Boolean).join("\n");
+}
+function analysisTextFromChunks(chunks) {
+  return chunks.map((chunk2) => {
+    const record = chunk2;
+    return record.type === "text-delta" && typeof record.delta === "string" ? record.delta : "";
+  }).join("").trim();
+}
 function sessionRoutes(app, opts, done) {
   const sessionStore = opts.sessionStore ?? new InMemorySessionStore();
   const validateCreateBody = createBodyValidator(createSessionBodySchema);
+  const validateAnalyzeBody = createBodyValidator(analyzeSessionBodySchema);
   async function resolveSessionStore(request) {
     if (opts.getSessionStore) return await opts.getSessionStore(request);
     return sessionStore;
   }
+  async function resolveRuntime(request) {
+    if (opts.getRuntime) return await opts.getRuntime(request);
+    if (opts.harness && opts.workdir) return { harness: opts.harness, workdir: opts.workdir };
+    throw new Error("session analysis requires harness/workdir or getRuntime");
+  }
   app.get("/api/v1/agent/sessions", async (request, reply) => {
     try {
       const store = await resolveSessionStore(request);
@@ -6421,6 +6660,113 @@ function sessionRoutes(app, opts, done) {
       return classifySessionError(err, reply);
     }
   });
+  app.get("/api/v1/agent/sessions/:id/transcript", async (request, reply) => {
+    const params = request.params;
+    const sessionId = requireSessionId(params.id, reply);
+    if (sessionId === null) return;
+    const query = request.query;
+    const format = query.format === "json" ? "json" : "markdown";
+    try {
+      const store = await resolveSessionStore(request);
+      const session = await store.load(getSessionCtx(request), sessionId);
+      const transcript = formatSessionTranscript(session);
+      if (format === "json") {
+        return {
+          session: {
+            id: session.id,
+            title: session.title,
+            createdAt: session.createdAt,
+            updatedAt: session.updatedAt,
+            turnCount: session.turnCount
+          },
+          transcript,
+          messages: session.messages
+        };
+      }
+      return reply.header("Content-Type", "text/markdown; charset=utf-8").send(transcript);
+    } catch (err) {
+      return classifySessionError(err, reply);
+    }
+  });
+  app.post(
+    "/api/v1/agent/sessions/:id/analysis",
+    { preHandler: validateAnalyzeBody },
+    async (request, reply) => {
+      const params = request.params;
+      const sourceSessionId = requireSessionId(params.id, reply);
+      if (sourceSessionId === null) return;
+      const body = request.body;
+      const run2 = body?.run === true;
+      const sessionCtx = getSessionCtx(request);
+      try {
+        const store = await resolveSessionStore(request);
+        const sourceSession = await store.load(sessionCtx, sourceSessionId);
+        const transcript = formatSessionTranscript(sourceSession);
+        const prompt = buildAnalysisPrompt(sourceSession, transcript, body?.instructions);
+        let runtime = null;
+        if (run2) {
+          try {
+            runtime = await resolveRuntime(request);
+          } catch {
+            return reply.code(501).send({
+              error: {
+                code: ERROR_CODE_NOT_IMPLEMENTED,
+                message: "session analysis runtime is not configured"
+              }
+            });
+          }
+        }
+        const analysisSession = await store.create(sessionCtx, {
+          title: body?.title ?? `Analysis: ${sourceSession.title}`.slice(0, 200)
+        });
+        if (!run2) {
+          return {
+            sourceSession: {
+              id: sourceSession.id,
+              title: sourceSession.title,
+              createdAt: sourceSession.createdAt,
+              updatedAt: sourceSession.updatedAt,
+              turnCount: sourceSession.turnCount
+            },
+            analysisSession,
+            prompt,
+            transcriptUrl: `/api/v1/agent/sessions/${encodeURIComponent(sourceSession.id)}/transcript`,
+            ...body?.includeTranscript ? { transcript } : {}
+          };
+        }
+        if (!runtime) {
+          throw new Error("session analysis runtime is not configured");
+        }
+        const abortController = new AbortController();
+        const chunks = [];
+        for await (const chunk2 of runtime.harness.sendMessage(
+          { sessionId: analysisSession.id, message: prompt },
+          {
+            abortSignal: abortController.signal,
+            workdir: runtime.workdir
+          }
+        )) {
+          chunks.push(chunk2);
+        }
+        return {
+          sourceSession: {
+            id: sourceSession.id,
+            title: sourceSession.title,
+            createdAt: sourceSession.createdAt,
+            updatedAt: sourceSession.updatedAt,
+            turnCount: sourceSession.turnCount
+          },
+          analysisSession,
+          prompt,
+          transcriptUrl: `/api/v1/agent/sessions/${encodeURIComponent(sourceSession.id)}/transcript`,
+          analysisText: analysisTextFromChunks(chunks),
+          ...body?.includeTranscript ? { transcript } : {}
+        };
+      } catch (err) {
+        return classifySessionError(err, reply);
+      }
+    }
+  );
   app.delete("/api/v1/agent/sessions/:id", async (request, reply) => {
     const params = request.params;
     const sessionId = requireSessionId(params.id, reply);
@@ -6678,14 +7024,15 @@ async function createAgentApp(opts = {}) {
   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.mode ?? autoDetectMode();
-  const runtimeBundle = await resolveMode(resolvedMode).create({
+  const resolvedMode = opts.runtimeModeAdapter?.id ?? opts.mode ?? autoDetectMode();
+  const modeAdapter = opts.runtimeModeAdapter ?? resolveMode(resolvedMode);
+  const runtimeBundle = await modeAdapter.create({
     workspaceRoot,
     sessionId,
     templatePath
   });
   const pluginTools = [];
-  if (resolvedMode !== "vercel-sandbox") {
+  if (modeAdapter.workspaceFsCapability === "strong") {
     const pluginResult = await loadPlugins({ cwd: workspaceRoot });
     if (pluginResult.errors.length > 0) {
       for (const e of pluginResult.errors) {
@@ -6741,7 +7088,9 @@ async function createAgentApp(opts = {}) {
     sessionChangesTracker
   });
   await app.register(sessionRoutes, {
-    sessionStore: harness.sessions
+    sessionStore: harness.sessions,
+    harness,
+    workdir: runtimeBundle.workspace.root
   });
   await app.register(systemPromptRoutes, { harness });
   await app.register(modelsRoutes);
@@ -6971,8 +7320,8 @@ var registerAgentRoutes = async (app, opts) => {
   const workspaceRoot = opts.workspaceRoot ?? process.cwd();
   const sessionId = opts.sessionId ?? DEFAULT_WORKSPACE_ID3;
   const templatePath = opts.templatePath ?? getEnv("BORING_AGENT_TEMPLATE_PATH");
-  const resolvedMode = opts.mode ?? autoDetectMode();
-  const modeAdapter = selectRuntimeModeAdapter(resolvedMode, opts.sandboxHandleStore);
+  const resolvedMode = opts.runtimeModeAdapter?.id ?? opts.mode ?? autoDetectMode();
+  const modeAdapter = opts.runtimeModeAdapter ?? selectRuntimeModeAdapter(resolvedMode, opts.sandboxHandleStore);
   app.addHook("onClose", async () => {
     await modeAdapter.dispose?.();
   });
@@ -7000,7 +7349,7 @@ var registerAgentRoutes = async (app, opts) => {
       ...buildUploadAgentTools(runtimeBundle)
     ];
     const pluginTools = [];
-    if (resolvedMode !== "vercel-sandbox") {
+    if (modeAdapter.workspaceFsCapability === "strong") {
       const pluginResult = await loadPlugins({ cwd: root });
       if (pluginResult.errors.length > 0) {
         for (const e of pluginResult.errors) {
@@ -7017,7 +7366,8 @@ var registerAgentRoutes = async (app, opts) => {
     const scopedExtraTools = opts.getExtraTools ? await opts.getExtraTools({
       workspaceId,
       workspaceRoot: root,
-      runtimeMode: resolvedMode
+      runtimeMode: resolvedMode,
+      workspaceFsCapability: runtimeBundle.workspace.fsCapability
     }) : [];
     const tools = mergeTools({
       standardTools,
@@ -7193,6 +7543,13 @@ var registerAgentRoutes = async (app, opts) => {
     getSessionStore: async (request) => {
       const binding = await getBindingForRequest(request);
       return binding.harness.sessions;
+    },
+    getRuntime: async (request) => {
+      const binding = await getBindingForRequest(request);
+      return {
+        harness: binding.harness,
+        workdir: binding.runtimeBundle.workspace.root
+      };
     }
   });
   await app.register(systemPromptRoutes, {

package/dist/shared/index.d.ts

@@ -1,4 +1,4 @@
-export { A as AgentHarness, R as RunContext, S as SendMessageInput, a as SessionCtx, b as SessionDetail, c as SessionStore, d as SessionSummary } from '../harness-DpMCKbzh.js';
+export { A as AgentHarness, R as RunContext, S as SendMessageInput, a as SessionCtx, b as SessionDetail, c as SessionStore, d as SessionSummary } from '../harness-DT3ZzdAN.js';
 import { W as Workspace, S as Sandbox, F as FileSearch, A as AgentTool } from '../sandbox-handle-store-DCNEJJ6b.js';
 export { E as Entry, a as ExecOptions, b as ExecResult, I as IsolatedCodeInput, c as IsolatedCodeOutput, J as JSONSchema, d as SandboxCapability, e as SandboxHandleRecord, f as SandboxHandleStore, g as Stat, T as ToolExecContext, h as ToolResult } from '../sandbox-handle-store-DCNEJJ6b.js';
 export { UIMessage, UIMessageChunk } from 'ai';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hachej/boring-agent",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "type": "module",
   "license": "MIT",
   "description": "Pane-embeddable coding agent. Ships direct/local/vercel-sandbox execution modes behind one interface.",
@@ -74,7 +74,7 @@
     "use-stick-to-bottom": "^1.1.3",
     "yaml": "^2.8.3",
     "zod": "^3.25.76",
-    "@hachej/boring-ui-kit": "0.1.10"
+    "@hachej/boring-ui-kit": "0.1.13"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",