@springbrand/agent-runtime 0.2.0-alpha.42 → 0.2.0-alpha.44

package/src/pi/tool/web-fetch.ts

@@ -51,7 +51,7 @@ export const webFetchParameters = Type.Object({
         "默认 false（保留位，当前实现总是返回原始内容）。",
     }),
   ),
-});
+}, { additionalProperties: false });
 
 /** webFetch 工具调用的结构化 details，随 AgentToolResult 一起持久化。 */
 export interface WebFetchDetails {

package/src/pi/tool/web-search/web-search.ts

@@ -18,7 +18,7 @@ export const webSearchParameters = Type.Object({
     description: "Additional URLs to analyze along with search (up to 20)",
     maxItems: 20,
   })),
-});
+}, { additionalProperties: false });
 
 export interface WebSearchDetails extends Omit<WebSearchResult, "text"> {
   resultCount: number;
@@ -119,6 +119,7 @@ export function webSearchPiToolCandidate(
   };
   return {
     owner: "runtime-base",
+    exposureMode: "direct",
     requiredExecutionLevel: "safe",
     source: "action",
     tool,

package/src/pi/tool/workspace-revision.ts

@@ -14,7 +14,7 @@ const parameters = Type.Object({
   ], {
     description: "Use previous for the revision immediately before the current one.",
   }),
-});
+}, { additionalProperties: false });
 
 function result<T>(details: T): AgentToolResult<T> {
   return {
@@ -43,6 +43,7 @@ export function workspaceRevisionPiToolCandidate(
   };
   return {
     owner: "workspace",
+    exposureMode: "direct",
     tool,
     requiredExecutionLevel: "safe",
     alwaysRequiresApproval: true,

package/src/pi/tool/workspace-sandbox.ts

@@ -1,5 +1,4 @@
 import {
-  createBashTool,
   createDeleteTool,
   createEditTool,
   createFindTool,
@@ -68,7 +67,7 @@ const workspaceReadParameters = Type.Object({
     minimum: 1,
     description: "Maximum lines to return; a page is capped by size regardless",
   })),
-});
+}, { additionalProperties: false });
 const workspaceEditParameters = Type.Object({
   path: Type.String({
     minLength: 1,
@@ -80,7 +79,7 @@ const workspaceEditParameters = Type.Object({
       "Exact existing text to replace. Include enough surrounding context to match one location.",
   }),
   new_string: Type.String({ description: "Replacement text." }),
-});
+}, { additionalProperties: false });
 
 /**
  * 单页 read 返回的字符上限。
@@ -176,7 +175,7 @@ function pageReadResult(
   const span = `lines ${fromLine}-${toLine} of ${totalLines ?? toLine}`;
   const lossyNote = lossy
     ? " Some lines were longer than 2000 chars and are cut short; " +
-      "paging cannot recover them — use grep or bash on this path instead."
+      "paging cannot recover them — use grep on this path instead."
     : "";
   const marker = fromLine === 1 && eof && !lossy
     ? ""
@@ -399,12 +398,6 @@ export function workspacePiToolCandidates(
     },
   };
 
-  const bash = aiToolToPi(
-    "bash",
-    createBashTool({ ops: workspace }),
-    { label: "Workspace Bash" },
-  );
-
   return [
     {
       owner: "workspace",
@@ -420,13 +413,6 @@ export function workspacePiToolCandidates(
       requiredExecutionLevel: "safe" as const,
       tool,
     })),
-    {
-      owner: "workspace",
-      requiredExecutionLevel: "high" as const,
-      summary: "Run a Bash script over Workspace files",
-      source: "action" as const,
-      tool: bash,
-    },
   ];
 }
 
@@ -460,15 +446,18 @@ const sandboxExecParameters = Type.Object({
       description: "Maximum command runtime in milliseconds, from 1 to 60000.",
     }),
   ),
-});
-const sandboxStartParameters = Type.Object(sandboxCommandParameters);
+}, { additionalProperties: false });
+const sandboxStartParameters = Type.Object(
+  sandboxCommandParameters,
+  { additionalProperties: false },
+);
 const sandboxProcessParameters = Type.Object({
   id: Type.String({
     minLength: 1,
     maxLength: 128,
     description: "Process ID returned by sandbox_start_process.",
   }),
-});
+}, { additionalProperties: false });
 const sandboxPublishParameters = Type.Object({
   paths: Type.Array(Type.String({
     minLength: 1,
@@ -479,7 +468,7 @@ const sandboxPublishParameters = Type.Object({
     maxItems: 100,
     description: "Files to copy from the temporary Sandbox into the persistent Workspace.",
   }),
-});
+}, { additionalProperties: false });
 
 /**
  * 为现有 RuntimeSandboxPort 创建 Pi 命令、进程和文件发布工具。

package/src/runtime-assembler.ts

@@ -35,7 +35,10 @@ import {
   type PiRuntimeAssembly,
 } from "./pi/assembly/snapshot";
 import type { AgentTool } from "@earendil-works/pi-agent-core";
-import type { PiToolCandidate } from "./pi/tool/compiler";
+import type {
+  PiToolCandidate,
+  ToolExposureMode,
+} from "./pi/tool/compiler";
 import type {
   AssembleRuntimeSnapshotInput,
   RuntimeSettings,
@@ -178,6 +181,10 @@ interface ToolSurface {
   readonly degradations: readonly RuntimeDegradation[];
 }
 
+function exposureOf(candidate: PiToolCandidate): ToolExposureMode {
+  return candidate.exposureMode ?? "both";
+}
+
 // 唯一 Tool Surface seam：只读取已配置 Port、Resource 和 Agent policy，
 // 统一生成可见 Tool，并在一处做名称、执行档位与冲突校验。
 async function createToolSurface(
@@ -203,14 +210,14 @@ async function createToolSurface(
     });
   // 平台没有浏览器能力时注册空集：宁可没有这个 Tool，也不注册一个必然失败的 Tool 误导模型。
   // `create()` 推迟到确认这个名字真的可见之后，被 deny 的装配不白建一个浏览器连接器。
-  // `direct` 使它只走 Direct 调用，不再被并进 `execute` 的工具集——两个 Code Mode 类工具互相嵌套
+  // `direct` exposure 使它只走 Direct 调用，不再被并进 `execute` 的工具集——两个 Code Mode 类工具互相嵌套
   // 会让「哪次执行被记录、被重放」变得无法解释，而它们的分工本就由 System Prompt 划清。
   const browserVisible = !deny.has(BROWSER_EXECUTE_TOOL_NAME) &&
     allowsTool?.(BROWSER_EXECUTE_TOOL_NAME) !== false;
   const browserCandidates = input.platform.browser && browserVisible
     ? [{
         ...browserExecutionPiToolCandidate(input.platform.browser.create()),
-        direct: true as const,
+        exposureMode: "direct" as const,
       }]
     : [];
   const baseCandidates = basePiToolCandidates(input.webSearch);
@@ -256,7 +263,7 @@ async function createToolSurface(
 
         const finalized = [...tools.values()];
         const directVisible = finalized.filter(
-          (candidate) => !candidate.codeExecutionOnly,
+          (candidate) => exposureOf(candidate) !== "codemode",
         );
         if (tools.has("execute")) {
           throw new Error("SpringBrand reserved Runtime Tool name: execute");
@@ -273,7 +280,7 @@ async function createToolSurface(
         }
         const mergeable = finalized.filter(
           (candidate) =>
-            !candidate.direct &&
+            exposureOf(candidate) !== "direct" &&
             !candidate.interaction &&
             typeof candidate.tool.execute === "function",
         );
@@ -316,7 +323,7 @@ async function createToolSurface(
           ? "Skill resource copying is available only inside execute through " +
             "`tools.materialize_skill_resource({ name, path, destination })`; " +
             "no Direct Tool is registered for it. " +
-            "Use a loop or Promise.all when copying multiple resources.\n\n"
+            "Copy multiple resources sequentially in one execute so durable replay preserves call order.\n\n"
           : "";
         return Object.freeze({
           candidates: Object.freeze([

package/src/runtime.ts

@@ -48,6 +48,7 @@ import type {
 } from "./kernel/extensions";
 import type {
   RuntimeActivity,
+  RuntimeActivityProjection,
   RuntimeState,
   RuntimeTurnState,
 } from "./kernel/state";
@@ -153,6 +154,7 @@ const CHAT_RECOVERY_TERMINAL_MESSAGE =
 
 type RuntimeEventOutboxPayload =
   | { readonly type: "model-usage"; readonly event: RuntimeModelUsageEvent }
+  | { readonly type: "activity"; readonly projection: RuntimeActivityProjection }
   | {
       readonly type: "tool-settlement";
       readonly event: RuntimeToolSettlementEvent;
@@ -899,6 +901,7 @@ export abstract class AgentRuntimeKernel<
     return this.pi.createTurn({
       prepared: this.preparedPi(),
       pinnedDescriptor: submission.assemblyDescriptor,
+      modelSessionId: this.name,
       submission: {
         id: submission.submissionId,
         requestId: submission.requestId,
@@ -996,6 +999,7 @@ export abstract class AgentRuntimeKernel<
           ...(event.error ? { error: errorText(event.error) } : {}),
           occurredAt: event.occurredAt,
         });
+        this.projectNestedToolSettlement(submission.submissionId, event);
       },
       ...(toolExecutors && Object.keys(toolExecutors).length > 0
         ? { toolExecutors }
@@ -1103,12 +1107,12 @@ export abstract class AgentRuntimeKernel<
   async onStart(): Promise<void> {
     this.runtimeLoad.reset();
     this.telemetry.recover(() => this.ensureRuntimeReady());
+    await this.broadcastApprovals();
     if (this.db.runtimeEvents.hasPending()) {
       this.ctx.waitUntil(
         this.ensureRuntimeReady().then(() => this.drainRuntimeEvents()),
       );
     }
-    await this.broadcastApprovals();
     await this.approvals.dispatchPendingContinuations();
     const running = this.db.submissions.findRunning() as StoredSubmission | null;
     if (running) {
@@ -1132,6 +1136,13 @@ export abstract class AgentRuntimeKernel<
         const payload = JSON.parse(row.body) as RuntimeEventOutboxPayload;
         if (payload.type === "model-usage") {
           await turnEvents.onModelUsage?.(payload.event);
+        } else if (payload.type === "activity") {
+          if (
+            !this.state.activity ||
+            payload.projection.revision >= this.state.activity.revision
+          ) {
+            await turnEvents.onActivityChanged?.(payload.projection);
+          }
         } else if (payload.type === "tool-settlement") {
           await turnEvents.onToolSettled?.(payload.event);
         } else if (payload.type === "subagent-usage") {
@@ -2200,6 +2211,32 @@ export abstract class AgentRuntimeKernel<
     return this.drainRuntimeEvents();
   }
 
+  private projectNestedToolSettlement(
+    submissionId: string,
+    event: Readonly<{
+      toolCallId: string;
+      toolName: string;
+      outcome: "completed" | "failed" | "cancelled";
+      occurredAt: number;
+    }>,
+  ): void {
+    const settlement: RuntimeToolSettlementEvent = {
+      eventId: `${submissionId}:tool:${event.toolCallId}`,
+      submissionId,
+      toolCallId: event.toolCallId,
+      toolName: event.toolName,
+      status: event.outcome === "completed" ? "success" : "error",
+    };
+    this.db.transaction(() => {
+      this.db.runtimeEvents.insert({
+        eventId: settlement.eventId,
+        body: json({ type: "tool-settlement", event: settlement }),
+        createdAt: event.occurredAt,
+      });
+    });
+    this.ctx.waitUntil(this.drainRuntimeEvents());
+  }
+
   // 终态事务用这个同步内核先补齐 ToolResult，再在同一事务末尾写 marker。
   private settleToolSync(
     submissionId: string,
@@ -4570,6 +4607,13 @@ export abstract class AgentRuntimeKernel<
             backgroundWork,
             revision: (currentActivity?.revision ?? 0) + 1,
           };
+      this.db.transaction(() => {
+        this.db.runtimeEvents.insert({
+          eventId: `session-activity:${nextActivity.revision}`,
+          body: json({ type: "activity", projection: nextActivity }),
+          createdAt: Date.now(),
+        });
+      });
       if (
         this.state?.approvals === undefined ||
         json(this.state.approvals) !== json(approvals) ||
@@ -4583,14 +4627,9 @@ export abstract class AgentRuntimeKernel<
           turn,
         });
       }
-      const projection = this.turnEventsPort()?.onActivityChanged?.(nextActivity);
-      if (projection) {
-        this.ctx.waitUntil(
-          projection.catch(() => undefined),
-        );
-      }
+      this.ctx.waitUntil(this.drainRuntimeEvents());
     } catch {
-      // Approval projection is best effort and must not block execution.
+      // Rebuilding UI state is best effort; queued activity delivery retries independently.
     }
   }