@springbrand/agent-runtime 0.2.0-alpha.68 → 0.2.0-alpha.70

package/src/pi/tool/compiler.ts

@@ -1,5 +1,5 @@
 import type {
-  AgentOptions,
+  AgentLoopConfig,
   AgentTool,
   AgentToolResult,
 } from "@earendil-works/pi-agent-core";
@@ -88,7 +88,7 @@ const governanceState = Symbol("PiToolGovernanceState");
 
 /** 向 Pi Agent 提供工具后置钩子，并为编译器保留同一 Turn 的治理状态。 */
 export interface PiToolGovernance {
-  readonly afterToolCall: NonNullable<AgentOptions["afterToolCall"]>;
+  readonly afterToolCall: NonNullable<AgentLoopConfig["afterToolCall"]>;
   readonly wrapUpRequested: () => boolean;
   readonly [governanceState]: PiToolGovernanceState;
 }

package/src/pi/tool/core-host.ts

@@ -1,5 +1,6 @@
 import {
   createWorkspaceStateBackend,
+  STATE_TYPES,
   type StateBackend,
   type WorkspaceFsLike,
 } from "@cloudflare/shell";
@@ -24,6 +25,7 @@ import type {
 import {
   WorkspaceStateConnector,
   WORKSPACE_PAGING_INSTRUCTIONS,
+  WORKSPACE_STATE_TYPES,
 } from "./workspace-state-connector";
 import type { RuntimeCodeExecutionFactory } from "../../kernel/bindings";
 import { serializeOutput } from "../../lib/artifacts";
@@ -384,6 +386,10 @@ export function createWorkspaceCodeExecutionFactory(options: {
       return {
         description: [
           description,
+          ...(state ? [
+            "## Workspace type reference\nOnly methods exposed by connector discovery are callable.\n\n```ts\n" +
+              (workspaceState ? WORKSPACE_STATE_TYPES : STATE_TYPES) + "\n```",
+          ] : []),
           ...(workspaceState ? [WORKSPACE_PAGING_INSTRUCTIONS] : []),
           SPRINGBRAND_CODE_MODE_POLICY,
         ].join("\n\n"),

package/src/pi/tool/mcp.ts

@@ -1,4 +1,3 @@
-import type { MCPClientManager } from "agents/mcp/client";
 import type { RuntimeMcpServer } from "../../kernel/profile";
 import type { PiToolCandidate } from "./compiler";
 import { createPiDeclaredToolCandidate } from "./declared";
@@ -51,7 +50,8 @@ export interface PiMcpHost {
     }>;
   };
   /** 提供原始工具发现，以及对指定 MCP Server 的一次工具调用。 */
-  readonly mcp: Pick<MCPClientManager, "listTools"> & {
+  readonly mcp: {
+    listTools(filter?: { serverId: string[]; state: 'ready' }): PiDiscoveredMcpTool[];
     /**
      * 调用一个已发现的 MCP 工具。
      *
@@ -59,7 +59,7 @@ export interface PiMcpHost {
      * 参数和中止信号必须原样交给 Agents SDK，避免另造一套传输生命周期。
      */
     callTool(
-      params: Parameters<MCPClientManager["callTool"]>[0],
+      params: { serverId: string; name: string; arguments?: Record<string, unknown> },
       options?: { signal?: AbortSignal },
     ): Promise<unknown>;
   };
@@ -68,8 +68,12 @@ export interface PiMcpHost {
 // 作用：给一个远端 MCP 工具生成 Pi 模型可见的稳定名称。
 // 调用：候选工厂在映射每个已发现工具时调用。
 // 原因：服务器前缀隔离同名工具，去掉连字符则保持现有 Pi 工具名格式。
-function modelVisibleName(serverId: string, toolName: string): string {
-  return `tool_${serverId.replace(/-/g, "")}_${toolName}`;
+async function modelVisibleName(serverId: string, toolName: string): Promise<string> {
+  const name = `tool_${serverId.replace(/-/g, "")}_${toolName}`;
+  if (/^[A-Za-z0-9_-]{1,64}$/.test(name)) return name;
+  const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(JSON.stringify([serverId, toolName])));
+  const hash = Array.from(new Uint8Array(digest), byte => byte.toString(16).padStart(2, '0')).join('');
+  return `mcp_${toolName.replace(/[^A-Za-z0-9_]/g, '_').slice(0, 26)}_${hash.slice(0, 32)}`;
 }
 
 // 作用：把任意 MCP 返回值尽量转换成可展示文本。
@@ -245,6 +249,9 @@ export function createPiMcpToolCandidate(
       requiredExecutionLevel: policy.requiredExecutionLevel,
       requiredExecutionLevelForInput: policy.requiredExecutionLevelForInput,
       source: "action",
+      // Human approval must park a first-class Pi Tool, not a nested Code Mode
+      // RPC whose execution timer continues while the person is deciding.
+      exposureMode: 'direct',
       project: (reply) => {
         const result = normalizeCallResult(reply);
         if (result.isError) throw new Error(errorMessage(result));
@@ -279,16 +286,17 @@ export function createPiMcpToolCandidate(
  *
  * `Host`、`Pi`、`Runtime Snapshot` 与“候选工具”见 `../../index.ts`。
  */
-export function createPiMcpToolCandidates(
+export async function createPiMcpToolCandidates(
   host: PiMcpHost,
   configured: readonly RuntimeMcpServer[],
-): PiToolCandidate[] {
+): Promise<PiToolCandidate[]> {
   // TODO(待确认)：Runtime 配置目前只 trim URL，而 agents@0.19.0 会用
   // new URL(url).href 保存连接地址；`https://x` 与 `https://x/`
   // 可能因此精确匹配失败。
   const configuredUrls = new Set(
-    configured.map((server) => server.url),
+    configured.filter(server => !server.id).map((server) => server.url),
   );
+  const configuredIds = new Map(configured.filter(server => server.id).map(server => [server.id!, server.url]));
   const selectedUrls = new Set<string>();
   const selectedServerIds: string[] = [];
 
@@ -297,24 +305,24 @@ export function createPiMcpToolCandidates(
   )) {
     if (
       server.state !== "ready" ||
-      !configuredUrls.has(server.server_url) ||
-      selectedUrls.has(server.server_url)
+      !(configuredIds.get(serverId) === server.server_url || configuredUrls.has(server.server_url)) ||
+      (!configuredIds.has(serverId) && selectedUrls.has(server.server_url))
     ) {
       continue;
     }
-    selectedUrls.add(server.server_url);
+    if (!configuredIds.has(serverId)) selectedUrls.add(server.server_url);
     selectedServerIds.push(serverId);
   }
   if (selectedServerIds.length === 0) return [];
 
   const selectedIds = new Set(selectedServerIds);
-  return host.mcp
+  return Promise.all(host.mcp
     .listTools({
       serverId: selectedServerIds,
       state: "ready",
     })
     .filter((tool) => selectedIds.has(tool.serverId))
-    .map((mcpTool) => createPiMcpToolCandidate(
+    .map(async (mcpTool) => createPiMcpToolCandidate(
       mcpTool,
       (args, signal) => host.mcp.callTool(
         {
@@ -326,10 +334,10 @@ export function createPiMcpToolCandidates(
       ),
       {
         owner: `mcp:${mcpTool.serverId}`,
-        modelName: modelVisibleName(mcpTool.serverId, mcpTool.name),
+        modelName: await modelVisibleName(mcpTool.serverId, mcpTool.name),
         // Remote MCP annotations are untrusted; all user-configured methods
         // retain the existing high-risk approval policy.
         requiredExecutionLevel: "high",
       },
-    ));
+    )));
 }

package/src/pi/tool/subagent.ts

@@ -82,9 +82,6 @@ async function recordSubagentResult(
       runId: run.runId,
       subagentRunId: run.runId,
       parentRunId: lifecycle.parentRunId,
-      ...(lifecycle.accountId ? { accountId: lifecycle.accountId } : {}),
-      ...(lifecycle.rateVersion !== undefined ? { rateVersion: lifecycle.rateVersion } : {}),
-      ...(lifecycle.slotIdentity ? { slotIdentity: lifecycle.slotIdentity } : {}),
       kind: "subagent",
       status,
       usage: run.usage,
@@ -157,9 +154,6 @@ export function subagentPiToolCandidates(
               parentRunId: lifecycle.parentRunId,
               submissionId: lifecycle.submissionId,
               ...(reserved ? { subagentRunId: reserved.runId } : {}),
-              ...(lifecycle.accountId ? { accountId: lifecycle.accountId } : {}),
-              ...(lifecycle.rateVersion !== undefined ? { rateVersion: lifecycle.rateVersion } : {}),
-              ...(lifecycle.slotIdentity ? { slotIdentity: lifecycle.slotIdentity } : {}),
             }
           : undefined;
         const run = lifecycle && reserved
@@ -239,9 +233,6 @@ export function subagentPiToolCandidates(
               parentRunId: lifecycle.parentRunId,
               submissionId: lifecycle.submissionId,
               ...(reserved ? { subagentRunId: reserved.runId } : {}),
-              ...(lifecycle.accountId ? { accountId: lifecycle.accountId } : {}),
-              ...(lifecycle.rateVersion !== undefined ? { rateVersion: lifecycle.rateVersion } : {}),
-              ...(lifecycle.slotIdentity ? { slotIdentity: lifecycle.slotIdentity } : {}),
             }
           : {}),
       };

package/src/pi/tool/workspace-state-connector.ts

@@ -1,3 +1,4 @@
+import { STATE_TYPES } from "@cloudflare/shell";
 import type { StateBackend } from "@cloudflare/shell/workers";
 import { StateConnector } from "@cloudflare/shell/workers";
 import type { ConnectorTools } from "@cloudflare/codemode";
@@ -11,6 +12,11 @@ type WorkspaceFilePage =
   | { kind: "csv"; size: number; nextOffset: number | null; columns: string[] | null; rows: string[][] };
 `;
 
+export const WORKSPACE_STATE_TYPES = `${READ_FILE_PAGE_TYPES}\n${STATE_TYPES.replace(
+  /\n\};$/u,
+  '\n  /** CSV pages have columns and rows; never data. Omit offset first, then pass nextOffset until null. */\n  readFilePage(args: { path: string; offset?: number }): Promise<WorkspaceFilePage | null>;\n};',
+)}`;
+
 export const WORKSPACE_PAGING_INSTRUCTIONS = `For CSV files, do not make a separate probe read or return page contents. Inspect columns and aggregate rows in the same execution with this loop shape:
 
 let page = await state.readFilePage({ path });
@@ -97,12 +103,7 @@ ${WORKSPACE_PAGING_INSTRUCTIONS}`;
   }
 
   override async getTypeScriptTypes(): Promise<string> {
-    const types = await super.getTypeScriptTypes();
-    const addition = [
-      "  /** CSV pages have columns and rows; never data. Omit offset first, then pass nextOffset until null. */",
-      "  readFilePage(args: { path: string; offset?: number }): Promise<WorkspaceFilePage | null>;",
-    ].join("\n");
-    return `${READ_FILE_PAGE_TYPES}\n${types.replace(/\n\};$/u, `\n${addition}\n};`)}`;
+    return WORKSPACE_STATE_TYPES;
   }
 }
 

package/src/runtime-agent-context.ts

@@ -60,6 +60,8 @@ export interface RuntimeAgentConfigContext<
   readonly parentPath: readonly RuntimeAgentPathStep[];
   /** Runtime 根据 Agent facet 父子关系自动判定，不是外部配置项。 */
   readonly role: RuntimeAgentRole;
+  /** Current/preparing Submission and durable identities that may still resume. */
+  readonly submission?: { readonly id: string | undefined; readonly unfinishedIds: readonly string[] };
   /** 向当前 Agent facet 的已连接客户端发送实时消息。 */
   broadcast(message: string): void;
   /**

package/src/runtime-agent.ts

@@ -96,6 +96,11 @@ interface RuntimeAgentDefinitionBase<
   /** 必须等于 Worker 导出名（Wrangler `class_name`）。 */
   readonly name: string;
 
+  /** Refresh Host-owned inputs before a new Submission is pinned. Never runs on continuation/recovery. */
+  readonly beforeSubmission?: (
+    context: RuntimeAgentPlanningContext<Env, Command, Change>,
+  ) => Promise<boolean>;
+
   readonly load: (
     context: RuntimeAgentPlanningContext<Env, Command, Change>,
     requestedRuntimeKey?: string,
@@ -444,6 +449,17 @@ export function defineRuntimeAgent<
         return this.ensureConfig();
       }
 
+      protected async prepareRuntimeForSubmission(submissionId: string): Promise<void> {
+        const beforeSubmission = definition.beforeSubmission as RuntimeAgentDefinitionBase<Env, Config, Command, Change>["beforeSubmission"];
+        try {
+          const changed = await beforeSubmission?.(this.createDefinitionContext(undefined, submissionId));
+          await this.ensureConfig(undefined, changed === true);
+        } catch (error) {
+          this.hasLoadedRuntime = false;
+          throw error;
+        }
+      }
+
       // 作用：加载默认 Runtime，或切换到调用方指定的 key。
       // 调用：RPC 控制面在业务配置需要刷新时调用。
       // 原因：复用 `ensureConfig`，让手动重载遵守和首次启动相同的原子规则。
@@ -658,6 +674,9 @@ export function defineRuntimeAgent<
             // Host 的会话列表把装配后的第一次投影当作「facet 已就绪」的信号。
             await this.broadcastApprovals();
           })().catch((error) => {
+            // A failed replacement must be retried even when Host inputs have
+            // not changed again since that failed attempt.
+            this.hasLoadedRuntime = false;
             logRuntimeLoadFailure("runtime", error);
             this.runtimeLoad.fail();
             throw error;
@@ -820,6 +839,7 @@ export function defineRuntimeAgent<
 
       protected createDefinitionContext(
         runtimeConfig?: { value: Config },
+        submissionId?: string,
       ): RuntimeAgentPlanningContext<
         Env,
         Command,
@@ -838,6 +858,10 @@ export function defineRuntimeAgent<
           get role() {
             return agent.role;
           },
+          get submission() {
+            const current = agent.submissionContext;
+            return { ...current, id: submissionId ?? current.id };
+          },
           broadcast: (message) => agent.broadcast(message),
           ...(agent.role === "primary"
             ? {

package/src/runtime-assembler.ts

@@ -1,6 +1,7 @@
 import type { SkillSource } from "agents/skills";
 import type {
   RuntimeGatewayPort,
+  RuntimeMcpHost,
   RuntimeMemoryPort,
   RuntimePlatformPort,
   RuntimeProviderPort,
@@ -95,6 +96,7 @@ export interface RuntimeAssemblyInput {
   readonly skills: readonly RuntimeSkillContribution[];
   readonly connectors: readonly RuntimeMcpServer[];
   readonly gateway?: RuntimeGatewayPort;
+  readonly managedMcp?: RuntimeMcpHost;
   readonly extensions: readonly RuntimeExtensionContribution[];
   readonly subagents?: RuntimeSubagentPort;
   readonly schedule?: RuntimeSchedulePort;
@@ -368,6 +370,7 @@ class RuntimeBuilder {
   private provider?: RuntimeProviderPort;
   private platform?: RuntimePlatformPort;
   private gateway?: RuntimeGatewayPort;
+  private managedMcp?: RuntimeMcpHost;
   private workspace?: WorkspacePort;
   private codeExecution?: RuntimeCodeExecutionFactory;
   private sandbox?: RuntimeSandboxPort;
@@ -416,6 +419,10 @@ class RuntimeBuilder {
     for (const skill of input.skills) this.addSkill(skill);
     for (const connector of input.connectors) this.addConnector(connector);
     this.gateway = input.gateway;
+    this.managedMcp = input.managedMcp;
+    for (const server of input.managedMcp?.servers ?? []) {
+      this.addConnector({ ...server, hostManaged: true });
+    }
     for (const { name, extension } of input.extensions) {
       this.addExtension(name, extension);
     }
@@ -478,13 +485,15 @@ class RuntimeBuilder {
 
   private addConnector(server: RuntimeMcpServer): void {
     const name = requiredName(server.name, "Connector");
-    if (this.connectors.has(name)) {
+    const identity = server.id ?? name;
+    if (this.connectors.has(identity)) {
       throw new Error(`Duplicate Runtime Connector: ${name}`);
     }
     if (!server.url.trim()) {
       throw new Error(`Runtime Connector "${name}" URL must not be empty`);
     }
-    this.connectors.set(name, Object.freeze({
+    this.connectors.set(identity, Object.freeze({
+      ...server,
       name,
       url: server.url.trim(),
     }));
@@ -644,6 +653,7 @@ class RuntimeBuilder {
       platform: Object.freeze({ ...this.platform }),
       ...(this.codeExecution ? { codeExecution: this.codeExecution } : {}),
       ...(this.gateway ? { gateway: this.gateway } : {}),
+      ...(this.managedMcp ? { mcp: this.managedMcp } : {}),
       ...(this.workspace ? { workspace: this.workspace } : {}),
       ...(this.memoryProfile.enabled && this.memory
         ? { memory: this.memory }
@@ -805,6 +815,7 @@ export async function assembleRuntimeSnapshot<
         ? [...BUILT_IN_RUNTIME_SKILLS, ...resources.skills]
         : resources.skills,
     connectors: resources.connectors.servers,
+    managedMcp: resources.connectors.managed,
     ...(resources.connectors.gateway
       ? { gateway: resources.connectors.gateway }
       : {}),

package/src/runtime-definition.ts

@@ -2,6 +2,7 @@ import type { SkillSource } from "agents/skills";
 import type { ExecutionLevel } from "./lib/execution-level";
 import type {
   RuntimeGatewayPort,
+  RuntimeMcpHost,
   RuntimePlatformPort,
   RuntimeProviderPort,
   RuntimeSkillScriptPolicy,
@@ -79,6 +80,7 @@ export type { RuntimeAgentContext, RuntimeAssemblyContext } from "./runtime-agen
 export interface ResolvedConnectors {
   readonly servers: readonly RuntimeMcpServer[];
   readonly gateway?: RuntimeGatewayPort;
+  readonly managed?: RuntimeMcpHost;
   readonly degradations: readonly RuntimeDegradation[];
 }
 

package/src/runtime.ts

@@ -1,3 +1,4 @@
+import { summarizeModelUsage } from "./model-usage";
 import type {
   AgentToolLifecycleResult,
   AgentToolRunInfo,
@@ -181,9 +182,6 @@ interface StoredSubmission extends SubmissionReceipt {
   recoveryErrorCount: number;
   recoveryReason?: SubmissionRecoveryReason;
   runId: string | null;
-  accountId: string | null;
-  rateVersion: number | null;
-  slotIdentity: string | null;
   /** 跨执行片累计的模型回合数，全局回合预算据此判断。 */
   modelTurns: number;
   /** 当前让步执行片的标识；没有未完成让步时为 null。 */
@@ -281,14 +279,6 @@ function validateAdmissionResult(
     }
     return result;
   }
-  if (
-    typeof result.accountId !== "string" || !result.accountId.trim() ||
-    typeof result.slotIdentity !== "string" || !result.slotIdentity.trim() ||
-    !Number.isSafeInteger(result.rateVersion) ||
-    result.rateVersion <= 0
-  ) {
-    throw new Error("Runtime admission context is invalid");
-  }
   return result;
 }
 
@@ -306,24 +296,14 @@ function assistantUsageEvent(
   eventId: string,
   submissionId: string,
   message: AssistantMessage,
-  pinned?: Pick<StoredSubmission, "accountId" | "rateVersion" | "slotIdentity">,
+  requestedModel: RuntimeSnapshot["pi"]["model"],
 ): RuntimeModelUsageEvent {
   return {
     eventId,
     submissionId,
     runId: submissionId,
-    ...(pinned?.accountId ? { accountId: pinned.accountId } : {}),
-    ...(pinned?.rateVersion !== null && pinned?.rateVersion !== undefined
-      ? { rateVersion: pinned.rateVersion }
-      : {}),
-    ...(pinned?.slotIdentity ? { slotIdentity: pinned.slotIdentity } : {}),
     kind: "assistant",
-    api: message.api,
-    provider: message.provider,
-    model: message.model,
-    ...(message.responseModel ? { responseModel: message.responseModel } : {}),
-    stopReason: message.stopReason,
-    usage: message.usage,
+    ...summarizeModelUsage(requestedModel, [message]),
   };
 }
 
@@ -437,6 +417,16 @@ export abstract class AgentRuntimeKernel<
   };
 
   protected abstract ensureRuntimeReady(): Promise<void>;
+  /** Runs only before the first pin of a newly activated Submission. */
+  protected prepareRuntimeForSubmission(_submissionId: string): Promise<void> {
+    return this.ensureRuntimeReady();
+  }
+  protected get submissionContext() {
+    return {
+      id: this.submissions.currentActive()?.submissionId ?? this.db.submissions.findRunning()?.submissionId,
+      unfinishedIds: this.db.submissions.listUnfinishedIds(),
+    };
+  }
 
   /** Let the Host prepare a validated client response before Tool settlement. */
   protected prepareToolInteractionResponse(
@@ -579,7 +569,7 @@ export abstract class AgentRuntimeKernel<
       interruptActive: (turn) => turn.agent.interrupt(),
     });
     this.transcript = this.pi.createTranscript({
-      sql: this.sql.bind(this),
+      storage: this.ctx.storage,
       durability: {
         transaction: (run) => this.db.transaction(run),
         upsertUserSidecar: (id, body) =>
@@ -763,7 +753,7 @@ export abstract class AgentRuntimeKernel<
     this.runtimeLoad.advance("mcp");
     await connectConfiguredMcpServers(
       this,
-      candidateSnapshot.profile.mcpServers,
+      candidateSnapshot.profile.mcpServers.filter(server => !server.hostManaged),
     );
     const gatewayDegradations = [];
     let gatewaySession: RuntimeGatewaySession | undefined;
@@ -812,7 +802,8 @@ export abstract class AgentRuntimeKernel<
     // 新能力，同一轮接着跑」所依赖的那一步。真正在执行的 Turn 仍然被挡住。
     const contested = Boolean(previous) &&
       revision !== previous?.revision &&
-      this.submissions.isBusy();
+      this.submissions.isBusy() &&
+      this.db.submissions.listUnfinishedIds().some(id => Boolean(this.readSubmission(id)?.assemblyRevision));
     const parked = contested && this.db.everyUnfinishedSubmissionParked();
     if (contested && !parked) {
       await closeRuntimeGatewaySession(gatewaySession, "gateway.close.contested");
@@ -902,13 +893,6 @@ export abstract class AgentRuntimeKernel<
     const runMetadata: RuntimeSubagentRunMetadata = {
       submissionId: submission.submissionId,
       parentRunId: submission.runId ?? submission.submissionId,
-      ...(submission.accountId ? { accountId: submission.accountId } : {}),
-      ...(submission.rateVersion !== null
-        ? { rateVersion: submission.rateVersion }
-        : {}),
-      ...(submission.slotIdentity
-        ? { slotIdentity: submission.slotIdentity }
-        : {}),
     };
     const lifecycle = this.subagentLifecycle(runMetadata);
     const toolExecutors = snapshot.bindings.subagents
@@ -1077,7 +1061,7 @@ export abstract class AgentRuntimeKernel<
                 persisted.id,
                 submission.submissionId,
                 commit.message,
-                submission,
+                snapshot.pi.model,
               );
               this.db.runtimeEvents.insert({
                 eventId: event.eventId,
@@ -1107,7 +1091,6 @@ export abstract class AgentRuntimeKernel<
             : undefined;
           this.transcript.append(commit.id, commit.message, {
             submissionId: submission.submissionId,
-            createdAt: commit.message.timestamp,
             ...(uiMessage ? { userMessage: uiMessage } : {}),
           });
           this.db.steers.deleteByMessageId(commit.id);
@@ -1558,11 +1541,12 @@ export abstract class AgentRuntimeKernel<
   // 作用：为新 Submission 生成包含当前 Context 的不可变装配描述。
   // 调用：Submission 通过去重和忙碌检查后，在真正写入前调用。
   // 原因：把动态 Context 和执行档位固定在准入时，恢复时才能按原配置继续。
-  private async admissionPin(): Promise<{
+  private async admissionPin(fresh: boolean, submissionId: string): Promise<{
     revision: string;
     descriptor: string;
   }> {
-    await this.ensureRuntimeReady();
+    if (fresh) await this.prepareRuntimeForSubmission(submissionId);
+    else await this.ensureRuntimeReady();
     return this.currentAssemblyPin();
   }
 
@@ -1606,6 +1590,7 @@ export abstract class AgentRuntimeKernel<
 
   private async pinSubmissionAssembly(
     submission: StoredSubmission,
+    mode: SubmissionExecutionMode,
   ): Promise<StoredSubmission> {
     if (submission.assemblyRevision && submission.assemblyDescriptor) {
       return submission;
@@ -1613,7 +1598,7 @@ export abstract class AgentRuntimeKernel<
     if (submission.assemblyRevision || submission.assemblyDescriptor) {
       throw new Error("Submission assembly pin is incomplete");
     }
-    const { revision, descriptor } = await this.admissionPin();
+    const { revision, descriptor } = await this.admissionPin(mode === 'fresh', submission.submissionId);
     this.db.submissions.pinAssembly(
       submission.submissionId,
       revision,
@@ -1744,7 +1729,7 @@ export abstract class AgentRuntimeKernel<
       model: snapshot.pi.model,
       signal,
       submissionId,
-      onCompactionPersisted: (event) => {
+      onCompactionUsage: (event, didCompact) => {
         this.db.runtimeEvents.insert({
           eventId: event.eventId,
           body: json({
@@ -1752,21 +1737,11 @@ export abstract class AgentRuntimeKernel<
             event: {
               ...event,
               runId: submissionId,
-              ...(this.readSubmission(submissionId)?.accountId
-                ? { accountId: this.readSubmission(submissionId)!.accountId! }
-                : {}),
-              ...(this.readSubmission(submissionId)?.rateVersion !== null &&
-                this.readSubmission(submissionId)?.rateVersion !== undefined
-                ? { rateVersion: this.readSubmission(submissionId)!.rateVersion! }
-                : {}),
-              ...(this.readSubmission(submissionId)?.slotIdentity
-                ? { slotIdentity: this.readSubmission(submissionId)!.slotIdentity! }
-                : {}),
             },
           }),
           createdAt: Date.now(),
         });
-        this.telemetry.capture("contextCompacted", {
+        if (didCompact) this.telemetry.capture("contextCompacted", {
           submissionId,
           compactionId: event.eventId,
           inputTokens: event.usage.input,
@@ -1907,9 +1882,6 @@ export abstract class AgentRuntimeKernel<
         let admission = existing?.status === "accepted"
           ? {
               accepted: true as const,
-              accountId: existing.accountId!,
-              rateVersion: existing.rateVersion!,
-              slotIdentity: existing.slotIdentity!,
             }
           : existing?.status === "rejected"
             ? {
@@ -1951,9 +1923,6 @@ export abstract class AgentRuntimeKernel<
             this.db.submissionAdmissions.saveAccepted(
               admissionRequestId,
               runId,
-              admission.accountId,
-              admission.rateVersion,
-              admission.slotIdentity,
             );
           }
           this.db.submissions.insert({
@@ -1973,9 +1942,6 @@ export abstract class AgentRuntimeKernel<
               ? options.userMessageId ?? null
               : null,
             runId,
-            accountId: admission?.accepted ? admission.accountId : null,
-            rateVersion: admission?.accepted ? admission.rateVersion : null,
-            slotIdentity: admission?.accepted ? admission.slotIdentity : null,
           });
           if (admission?.accepted) {
             const fact: RuntimeLifecycleFact = {
@@ -1983,9 +1949,6 @@ export abstract class AgentRuntimeKernel<
               eventId: `${submissionId}:admitted`,
               submissionId,
               runId: submissionId,
-              accountId: admission.accountId,
-              rateVersion: admission.rateVersion,
-              slotIdentity: admission.slotIdentity,
             };
             this.db.runtimeEvents.insert({
               eventId: fact.eventId,
@@ -2086,13 +2049,6 @@ export abstract class AgentRuntimeKernel<
       zeroUsage: !this.db.runtimeEvents.hasNonZeroModelUsage(
         submission.submissionId,
       ),
-      ...(submission.accountId ? { accountId: submission.accountId } : {}),
-      ...(submission.rateVersion !== null
-        ? { rateVersion: submission.rateVersion }
-        : {}),
-      ...(submission.slotIdentity
-        ? { slotIdentity: submission.slotIdentity }
-        : {}),
     };
     this.db.runtimeEvents.insert({
       eventId: terminalFact.eventId,
@@ -2859,7 +2815,6 @@ export abstract class AgentRuntimeKernel<
           userMessage,
           {
             submissionId: submission.submissionId,
-            createdAt: userMessage.timestamp,
             ...(uiMessage ? { userMessage: uiMessage } : {}),
           },
         );
@@ -2991,7 +2946,7 @@ export abstract class AgentRuntimeKernel<
         submission.abortReason,
       );
     }
-    submission = await this.pinSubmissionAssembly(submission);
+    submission = await this.pinSubmissionAssembly(submission, mode);
     await this.assertPinnedSubmission(submission);
     if (submission.status === "pending" && mode === "fresh") {
       submission = await this.activateQueuedSubmission(submission);
@@ -3667,7 +3622,9 @@ export abstract class AgentRuntimeKernel<
   private async hydrationMessages(): Promise<UIMessage[]> {
     const messages = await this.getMessages();
     const running = this.db.submissions.findRunning();
-    return running?.assistantMessageId
+    // After a restart there is no in-memory replay stream. In particular, a
+    // parked approval cannot recreate one until the user can see and decide it.
+    return running?.assistantMessageId && this.streamBySubmission.has(running.submissionId)
       ? messages.filter((message) =>
           message.role !== "assistant" ||
           (message.id !== running.assistantMessageId &&
@@ -3804,9 +3761,7 @@ export abstract class AgentRuntimeKernel<
       await this.broadcastApprovals();
       return;
     }
-    this.transcript.append(crypto.randomUUID(), message, {
-      createdAt: message.timestamp,
-    });
+    this.transcript.append(crypto.randomUUID(), message);
   }
 
   // 作用：返回扩展可见的当前 Session 摘要。
@@ -4260,7 +4215,6 @@ export abstract class AgentRuntimeKernel<
             : undefined;
           this.transcript.append(steer.messageId, message, {
             submissionId: current.submissionId,
-            createdAt: steer.createdAt,
             ...(userMessage ? { userMessage } : {}),
           });
           this.db.steers.deleteByMessageId(steer.messageId);
@@ -4613,13 +4567,6 @@ export abstract class AgentRuntimeKernel<
             runId: run.runId,
             subagentRunId: run.runId,
             parentRunId: metadata.parentRunId,
-            ...(metadata.accountId ? { accountId: metadata.accountId } : {}),
-            ...(metadata.rateVersion !== undefined
-              ? { rateVersion: metadata.rateVersion }
-              : {}),
-            ...(metadata.slotIdentity
-              ? { slotIdentity: metadata.slotIdentity }
-              : {}),
             kind: "subagent",
             status,
             usage: completion.usage,