@springbrand/agent-runtime 0.2.0-alpha.67 → 0.2.0-alpha.69

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,10 @@ export abstract class AgentRuntimeKernel<
   };
 
   protected abstract ensureRuntimeReady(): Promise<void>;
+  /** Runs only before the first pin of a newly activated Submission. */
+  protected prepareRuntimeForSubmission(): Promise<void> {
+    return this.ensureRuntimeReady();
+  }
 
   /** Let the Host prepare a validated client response before Tool settlement. */
   protected prepareToolInteractionResponse(
@@ -579,7 +563,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 +747,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 +796,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 +887,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 +1055,7 @@ export abstract class AgentRuntimeKernel<
                 persisted.id,
                 submission.submissionId,
                 commit.message,
-                submission,
+                snapshot.pi.model,
               );
               this.db.runtimeEvents.insert({
                 eventId: event.eventId,
@@ -1107,7 +1085,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 +1535,12 @@ export abstract class AgentRuntimeKernel<
   // 作用：为新 Submission 生成包含当前 Context 的不可变装配描述。
   // 调用：Submission 通过去重和忙碌检查后，在真正写入前调用。
   // 原因：把动态 Context 和执行档位固定在准入时，恢复时才能按原配置继续。
-  private async admissionPin(): Promise<{
+  private async admissionPin(fresh: boolean): Promise<{
     revision: string;
     descriptor: string;
   }> {
-    await this.ensureRuntimeReady();
+    if (fresh) await this.prepareRuntimeForSubmission();
+    else await this.ensureRuntimeReady();
     return this.currentAssemblyPin();
   }
 
@@ -1606,6 +1584,7 @@ export abstract class AgentRuntimeKernel<
 
   private async pinSubmissionAssembly(
     submission: StoredSubmission,
+    mode: SubmissionExecutionMode,
   ): Promise<StoredSubmission> {
     if (submission.assemblyRevision && submission.assemblyDescriptor) {
       return submission;
@@ -1613,7 +1592,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');
     this.db.submissions.pinAssembly(
       submission.submissionId,
       revision,
@@ -1744,7 +1723,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 +1731,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 +1876,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 +1917,6 @@ export abstract class AgentRuntimeKernel<
             this.db.submissionAdmissions.saveAccepted(
               admissionRequestId,
               runId,
-              admission.accountId,
-              admission.rateVersion,
-              admission.slotIdentity,
             );
           }
           this.db.submissions.insert({
@@ -1973,9 +1936,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 +1943,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 +2043,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 +2809,6 @@ export abstract class AgentRuntimeKernel<
           userMessage,
           {
             submissionId: submission.submissionId,
-            createdAt: userMessage.timestamp,
             ...(uiMessage ? { userMessage: uiMessage } : {}),
           },
         );
@@ -2991,7 +2940,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 +3616,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 +3755,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 +4209,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 +4561,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,