@springbrand/agent-runtime 0.3.0-alpha.20 → 0.3.0-alpha.21

package/src/submission/admission.ts

@@ -1,5 +1,4 @@
 import type { UIMessage } from "ai";
-import { validateRuntimeAssemblyPin, type RuntimeAssemblyPin } from "../config/pinning";
 import type {
   RuntimeSubmissionAdmissionHook,
   RuntimeSubmissionAdmissionResult,
@@ -17,7 +16,7 @@ import type { RuntimeUnattendedExecutionGrant } from "./contracts";
 import type { ExecutionLevel } from "../lib/execution-level";
 
 // Pending records retain identity indefinitely; only recent attempts reserve capacity.
-const ADMISSION_ATTEMPT_WINDOW_MS = 60_000;
+export const ADMISSION_ATTEMPT_WINDOW_MS = 60_000;
 
 export interface SubmitMessageOptions {
   requestId: string;
@@ -177,8 +176,6 @@ export class SubmissionAdmission {
             requestId,
             idempotencyKey: idempotencyKey ?? null,
             createdAt: userMessage.timestamp,
-            assemblyRevision: "",
-            assemblyDescriptor: "",
             runtimeKey: runtime.runtimeKey,
             assistantMessageId: crypto.randomUUID(),
             queuedInputJson: JSON.stringify(userMessage),
@@ -210,38 +207,20 @@ export class SubmissionAdmission {
     };
   }
 
-  /** Validate before loading capabilities, then reuse or atomically persist the first-run pin. */
-  async pin(
+  /** Resolve the saved Agent identity against its current Config before every execution slice. */
+  async prepareCurrentRuntime(
     submission: StoredSubmission,
-    preparePin: () => Promise<RuntimeAssemblyPin>,
-    restoreRuntime?: (runtimeKey: string) => Promise<void>,
+    restoreRuntime: (runtimeKey: string) => Promise<void>,
   ): Promise<StoredSubmission> {
     const current = this.options.submissions.find(submission.submissionId);
     if (!current) throw new Error(`Unknown SpringBrand submission: ${submission.submissionId}`);
-    const hasPin = await validateRuntimeAssemblyPin(current.runtimeKey, {
-      revision: current.assemblyRevision,
-      descriptor: current.assemblyDescriptor,
-    });
-    await restoreRuntime?.(current.runtimeKey);
+    if (!current.runtimeKey) throw new Error("Cannot resume a Submission without its Agent Config ID");
+    await restoreRuntime(current.runtimeKey);
     const restored = this.options.submissions.find(current.submissionId);
     if (!restored || isTerminalSubmissionStatus(restored.status)) {
-      throw new Error("Submission ended before Runtime assembly was pinned");
-    }
-    if (hasPin) return restored;
-    const pin = await preparePin();
-    if (!await validateRuntimeAssemblyPin(current.runtimeKey, pin)) {
-      throw new Error("Submission assembly pin is incomplete");
+      throw new Error("Submission ended while loading current Agent Config");
     }
-    this.options.submissions.pinAssembly(current.submissionId, pin.revision, pin.descriptor);
-    const pinned = this.options.submissions.find(current.submissionId);
-    if (!pinned?.assemblyRevision || !pinned.assemblyDescriptor || isTerminalSubmissionStatus(pinned.status)) {
-      throw new Error("Submission ended before Runtime assembly was pinned");
-    }
-    await validateRuntimeAssemblyPin(pinned.runtimeKey, {
-      revision: pinned.assemblyRevision,
-      descriptor: pinned.assemblyDescriptor,
-    });
-    return pinned;
+    return restored;
   }
 
   /** The caller shares this synchronous write with its admission/timeout transaction. */

package/src/submission/lifecycle.ts

@@ -130,9 +130,9 @@ export type SubmissionOutcome = "succeeded" | "failed" | "aborted";
  * @remarks
  * `SubmissionLifecycle` 把它交给 `execute`，Runtime 据此选择执行前置动作。
  *
- * `recovery` 和 `continuation` 必须分开：前者的进程内配置已经丢失，需重新装配原 runtime key 再打开 Session；
- * 后者是本轮主动让出执行片，持久 operation 和已固定配置保持完好。
- * 区分两者可避免主动让出时重复加载原 runtime key。
+ * `recovery` 和 `continuation` 都以持久化的 Agent 身份重新读取当前配置，
+ * 然后继续同一个持久 operation；前者处理进程恢复，后者处理本轮主动让出执行片。
+ * 两者都不沿用旧执行片的固定配置。
  */
 export type SubmissionExecutionMode =
   /** 首次执行一条新接收的提交。 */
@@ -244,6 +244,7 @@ export class SubmissionLifecycle<
   private readonly executions = new Map<string, Promise<TSubmission>>();
   private readonly activeBySubmission = new Map<string, TActive>();
   private readonly terminalCommits = new Map<string, Promise<TSubmission>>();
+  private preparingAdmissions = 0;
 
   // #region 提交与恢复
 
@@ -262,6 +263,13 @@ export class SubmissionLifecycle<
     >,
   ) {}
 
+  /** Serialize an explicit Runtime change with this Chat's execution queue. */
+  async runConfigControl<T>(run: () => Promise<T>): Promise<T> {
+    const result = await this.queue.enqueue(`runtime-config:${crypto.randomUUID()}`, run);
+    if (result.status === "stale") throw new Error("Runtime configuration control was reset");
+    return result.value;
+  }
+
   /**
    * 接收新提交，或让重复请求加入已有提交。
    *
@@ -275,17 +283,22 @@ export class SubmissionLifecycle<
   ): Promise<SubmissionHandle<TSubmission>> {
     const duplicate = this.findDuplicate(input);
     if (duplicate) return this.join(duplicate);
-    const admitted = await this.admit(
-      input,
-      await input.prepareAdmission(),
-    );
-    if (admitted.admitted) this.pump();
-    return {
-      receipt: admitted.submission,
-      completion: admitted.rejected
-        ? Promise.resolve(admitted.submission)
-        : this.waitForTerminal(admitted.submission.submissionId),
-    };
+    this.preparingAdmissions += 1;
+    try {
+      const admitted = await this.admit(
+        input,
+        await input.prepareAdmission(),
+      );
+      if (admitted.admitted) this.pump();
+      return {
+        receipt: admitted.submission,
+        completion: admitted.rejected
+          ? Promise.resolve(admitted.submission)
+          : this.waitForTerminal(admitted.submission.submissionId),
+      };
+    } finally {
+      this.preparingAdmissions -= 1;
+    }
   }
 
   /**
@@ -551,7 +564,7 @@ export class SubmissionLifecycle<
    * 读取持久层而不是只看 `executions`，才能覆盖重启后尚未恢复的提交。
    */
   isBusy(): boolean {
-    return this.options.store.countUnfinished() > 0;
+    return this.preparingAdmissions > 0 || this.options.store.countUnfinished() > 0;
   }
 
   // 作用：在有限时间内轮询 Runtime 是否已无活动提交。

package/src/submission/repository.ts

@@ -46,8 +46,6 @@ export interface StoredSubmission {
   error: string | null;
   createdAt: number;
   completedAt: number | null;
-  assemblyRevision: string;
-  assemblyDescriptor: string;
   runtimeKey: string;
   assistantMessageId: string;
   abortReason: string | null;
@@ -63,6 +61,17 @@ export interface StoredSubmission {
   retryable?: boolean;
 }
 
+/** Saved key and whether its Submission can still execute. */
+export interface StoredRuntimeKey {
+  readonly runtimeKey: string;
+  readonly unfinished: boolean;
+}
+
+export interface RuntimeKeyRewrite {
+  readonly from: string;
+  readonly to: string;
+}
+
 /** Reuse durable stop intent when transferring work out of the source Submission. */
 export function submissionAbortReason(submission: StoredSubmission | null): string | undefined {
   return submission?.abortReason ||
@@ -74,8 +83,6 @@ export interface NewSubmission {
   requestId: string;
   idempotencyKey: string | null;
   createdAt: number;
-  assemblyRevision: string;
-  assemblyDescriptor: string;
   runtimeKey?: string;
   assistantMessageId: string;
   queuedInputJson?: string | null;
@@ -97,8 +104,6 @@ type SubmissionRow = {
   error: string | null;
   created_at: number;
   completed_at: number | null;
-  assembly_revision: string;
-  assembly_descriptor: string;
   runtime_key: string;
   assistant_message_id: string;
   abort_reason: string | null;
@@ -129,8 +134,6 @@ function mapRow(row: SubmissionRow): StoredSubmission {
     error: row.error,
     createdAt: row.created_at,
     completedAt: row.completed_at,
-    assemblyRevision: row.assembly_revision,
-    assemblyDescriptor: row.assembly_descriptor,
     runtimeKey: row.runtime_key,
     assistantMessageId: row.assistant_message_id,
     abortReason: row.abort_reason,
@@ -166,14 +169,36 @@ export class SubmissionRepository {
     return this.transact(run);
   }
 
+  /** Return saved identities for a one-time Host-owned key migration. */
+  listRuntimeKeys(): StoredRuntimeKey[] {
+    return this.sql<{ runtime_key: string; unfinished: number }>`
+      SELECT runtime_key,
+             MAX(CASE WHEN status IN ('pending', 'running') THEN 1 ELSE 0 END) AS unfinished
+      FROM pi_submissions
+      WHERE runtime_key <> ''
+      GROUP BY runtime_key
+      ORDER BY runtime_key
+    `.map((row) => ({ runtimeKey: row.runtime_key, unfinished: row.unfinished === 1 }));
+  }
+
+  /** Rewrite each saved identity atomically after the Host validates active work. */
+  rewriteRuntimeKeys(rewrites: readonly RuntimeKeyRewrite[]): void {
+    this.transact(() => {
+      for (const { from, to } of rewrites) {
+        if (from === to) continue;
+        this.sql`UPDATE pi_submissions SET runtime_key = ${to} WHERE runtime_key = ${from}`;
+      }
+    });
+  }
+
   // 按 submissionId 读取一条完整 Submission，不存在时返回 null。
   // Runtime 和 SubmissionLifecycle 在准入、执行、取消、结束与恢复时调用，调用方必须处理 null。
   // 所有列在这里一次投影并统一映射，不能让不同调用方各自拼出不完整的 Submission。
   find(id: string): StoredSubmission | null {
     const row = this.sql<SubmissionRow>`
       SELECT submission_id, request_id, idempotency_key, status, accepted,
-             error, created_at, completed_at, assembly_revision,
-             assembly_descriptor, runtime_key, assistant_message_id, abort_reason,
+             error, created_at, completed_at,
+             runtime_key, assistant_message_id, abort_reason,
              queued_input_json, queued_ui_message_json, user_message_id,
              regenerate_message_id,
              run_id,
@@ -279,7 +304,7 @@ export class SubmissionRepository {
     this.sql`
       INSERT INTO pi_submissions (
         submission_id, request_id, idempotency_key, status, accepted,
-        created_at, assembly_revision, assembly_descriptor, runtime_key,
+        created_at, runtime_key,
         assistant_message_id, queued_input_json, queued_ui_message_json,
         user_message_id, regenerate_message_id,
         run_id, origin, scheduled_max_execution_level, unattended_execution_grant_json
@@ -290,8 +315,6 @@ export class SubmissionRepository {
         'pending',
         1,
         ${s.createdAt},
-        ${s.assemblyRevision},
-        ${s.assemblyDescriptor},
         ${s.runtimeKey ?? ""},
         ${s.assistantMessageId},
         ${s.queuedInputJson ?? null},
@@ -336,31 +359,17 @@ export class SubmissionRepository {
     this.sql`
       INSERT INTO pi_submissions (
         submission_id, request_id, idempotency_key, status, accepted,
-        error, created_at, completed_at, assembly_revision,
-        assembly_descriptor, runtime_key, assistant_message_id, abort_reason,
+        error, created_at, completed_at,
+        runtime_key, assistant_message_id, abort_reason,
         run_id, admission_retryable, user_message_id
       ) VALUES (
         ${s.submissionId}, ${s.requestId}, ${s.idempotencyKey}, 'skipped', 0,
-        ${s.code}, ${s.createdAt}, ${s.createdAt}, '', '', '', ${s.assistantMessageId ?? s.submissionId}, NULL,
+        ${s.code}, ${s.createdAt}, ${s.createdAt}, '', ${s.assistantMessageId ?? s.submissionId}, NULL,
         ${s.submissionId}, ${s.retryable ? 1 : 0}, ${s.userMessageId ?? null}
       )
     `;
   }
 
-  pinAssembly(id: string, revision: string, descriptor: string): boolean {
-    const updated = this.sql<{ submission_id: string }>`
-      UPDATE pi_submissions
-      SET assembly_revision = ${revision},
-          assembly_descriptor = ${descriptor}
-      WHERE submission_id = ${id}
-        AND assembly_revision = ''
-        AND assembly_descriptor = ''
-        AND status IN ('pending', 'running')
-      RETURNING submission_id
-    `;
-    return updated.length === 1;
-  }
-
   recordUnattendedFailure(id: string, reason: string): void {
     this.sql`
       UPDATE pi_submissions

package/src/telemetry/contract.ts

@@ -56,7 +56,6 @@ export interface TelemetryPayloadByType {
     readonly idempotencyKey?: string;
   };
   readonly "turn.started": PayloadBase & {
-    readonly assemblyRevision?: string;
     readonly input?: TelemetryValue;
   };
   readonly "turn.steered": PayloadBase & {

package/src/telemetry/runtime-telemetry.ts

@@ -71,7 +71,6 @@ export class RuntimeTelemetry {
 
   turnStarted(input: Readonly<{
     submissionId: string;
-    assemblyRevision?: string;
     input?: unknown;
     occurredAt?: number;
   }>): TelemetryRecordResult {
@@ -80,9 +79,6 @@ export class RuntimeTelemetry {
       input.submissionId,
     );
     return this.record("turn.started", operationId, {
-      ...(input.assemblyRevision
-        ? { assemblyRevision: input.assemblyRevision }
-        : {}),
       ...(input.input === undefined ? {} : { input: input.input as never }),
     }, input);
   }

package/src/tools/assistant/ask-user.ts

@@ -3,6 +3,8 @@ import { modelAttachmentText } from "../../conversation/message/conversion";
 import type { PiToolCandidate } from "../runtime/contracts";
 import { candidate } from "./candidate";
 
+export const ASK_USER_TOOL_NAME = "ask_user";
+
 const askUserResponseTypes = [
   "text",
   "single_select",
@@ -240,7 +242,7 @@ function isAskUserResponse(input: unknown, value: unknown): boolean {
 export function askUserPiToolCandidate(): PiToolCandidate {
   return {
     ...candidate({
-      name: "ask_user",
+      name: ASK_USER_TOOL_NAME,
       label: "Ask user",
       description:
         "Ask all 1-10 user questions needed to continue in one call. Required input for every question: question and responseType; required defaults to false, so set it to true only when progress cannot continue without an answer. Use responseType text for free text, single_select or multi_select with 2-6 distinct options for choices, and attachment for files. At most one attachment question is allowed and it accepts multiple files. Do not add file-specific fields such as accept or tell the user to use the normal chat composer. The answers return as this tool's result, so continue the same turn after calling it.",

package/src/tools/extension/index.ts

@@ -12,7 +12,7 @@ const noParameters = Type.Object({}, { additionalProperties: false });
  *
  * Runtime 组装层在 Extension 装载完成后调用，模型需要发现当前可用扩展时使用该工具。
  *
- * 候选项捕获准备阶段的只读列表，这与 pinned Runtime 组装保持一致，不能在执行时重新扫描出另一份 Extension 集合。
+ * 候选项捕获当前配置准备阶段的只读列表，执行时不重新扫描 Extension 集合。
  */
 export function listExtensionsPiToolCandidate(
   extensions: readonly PiLoadedExtension[],
@@ -22,7 +22,7 @@ export function listExtensionsPiToolCandidate(
     label: "List extensions",
     description: "List all currently loaded extensions and their tools.",
     parameters: noParameters,
-    // 返回这个 pinned Runtime 已加载的 Extension 快照。
+    // 返回当前 Runtime 已加载的 Extension 快照。
     // Pi 工具循环在模型选择 `list_extensions` 时调用，调用前允许 Turn 取消。
     // 同时返回 count 和原列表，使模型既能快速判空又不丢失 Extension 细节。
     async execute(_toolCallId, _input, signal) {

package/src/tools/web/search/api.ts

@@ -1115,7 +1115,7 @@ export function applyCitations(text: string, groundingMetadata: any): { text: st
 const PROVIDER_ERROR_MAX_LENGTH = 2_048;
 const NATIVE_TIMEOUT_MS = 60_000;
 const OPENROUTER_MAX_OUTPUT_TOKENS = 4_096;
-export const WEB_SEARCH_MODEL = "deepseek/deepseek-v4-flash";
+export const WEB_SEARCH_MODEL = "deepseek/deepseek-v4.1-flash";
 
 export interface WebSearchOptions {
   endpoint: RuntimeModelEndpoint;