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

package/src/pi/runtime-adapter/transcript.ts

@@ -1,4 +1,4 @@
-import type { SnapshotMessage, SqlTaggedTemplate } from "agents/chat";
+import type { SnapshotMessage } from "agents/chat";
 import type {
   AgentMessage,
   CustomMessage,
@@ -21,12 +21,7 @@ import {
   type PiToolApprovalView,
   type UIUserSidecar,
 } from "../message";
-import {
-  appendSessionMessageSync,
-  clearSessionSync,
-  PiTranscriptStore,
-  moveSessionLeafSync,
-} from "../session";
+import { openPiSessionStorage, type CloudflareSessionStorage } from "../session";
 import type { PiCanonicalMessageCommit } from "./execution";
 import type { PiRecoveredToolSettlement } from "./recovery";
 import type { RuntimeModelUsageEvent } from "../../kernel/bindings";
@@ -199,7 +194,7 @@ function hostText(message: UserMessage | AssistantMessage): string {
  * Pi Session 保存规范分支，Runtime 数据库保存 Submission、审批和用户 sidecar；分开保存可避免把 UI 字段写进模型上下文。
  */
 export class PiRuntimeTranscript {
-  private readonly store: PiTranscriptStore;
+  private readonly store: CloudflareSessionStorage;
 
   private modelBranch() {
     return this.store.branch().filter((entry) =>
@@ -215,15 +210,15 @@ export class PiRuntimeTranscript {
    *
    * `PiRuntimeAdapter.createTranscript` 每个 Runtime Kernel 构造时调用一次；`hasActiveTurn` 必须反映当前 Submission 生命周期。
    *
-   * Session 统一包住 `DoSqliteSessionStorage`，模型表只用于压缩，活动 Turn 检查只用于阻止并发导入。
+   * 官方 Storage 契约由同一 DO SQLite 实现；模型目录用于压缩，活动 Turn 检查阻止并发导入。
    */
   constructor(
-    private readonly sql: SqlTaggedTemplate,
+    storage: DurableObjectStorage,
     private readonly durability: PiTranscriptDurability,
     private readonly models: Models,
     private readonly hasActiveTurn: () => boolean,
   ) {
-    this.store = new PiTranscriptStore(sql);
+    this.store = openPiSessionStorage(storage);
   }
 
   // #region 规范消息写入
@@ -240,19 +235,15 @@ export class PiRuntimeTranscript {
     message: AgentMessage,
     options: {
       submissionId?: string;
-      createdAt?: number;
       userMessage?: UIMessage & { role: "user" };
     } = {},
   ): boolean {
-    const inserted = appendSessionMessageSync(this.sql, {
+    const inserted = this.store.appendMessage({
       id,
       message,
       ...(options.submissionId
         ? { submissionId: options.submissionId }
         : {}),
-      ...(options.createdAt === undefined
-        ? {}
-        : { createdAt: options.createdAt }),
     });
     if (inserted && options.userMessage) {
       const sidecar = captureUIUserSidecar(options.userMessage);
@@ -280,7 +271,6 @@ export class PiRuntimeTranscript {
       id,
       inserted: this.append(id, message, {
         submissionId,
-        createdAt: message.timestamp,
       }),
     };
   }
@@ -301,7 +291,6 @@ export class PiRuntimeTranscript {
           id: commit.id,
           inserted: this.append(commit.id, commit.message, {
             submissionId,
-            createdAt: commit.message.timestamp,
           }),
         }
       : this.commitTurnMessage(
@@ -329,7 +318,7 @@ export class PiRuntimeTranscript {
       }],
       display: true,
       timestamp,
-    } satisfies CustomMessage, { submissionId, createdAt: timestamp });
+    } satisfies CustomMessage, { submissionId });
   }
 
   /**
@@ -348,7 +337,6 @@ export class PiRuntimeTranscript {
       settlement.message,
       {
         submissionId,
-        createdAt: settlement.message.timestamp,
       },
     );
   }
@@ -434,7 +422,7 @@ export class PiRuntimeTranscript {
    * 这里委托同步 Session 存储辅助函数写入叶子标记，不删除原分支，保留 Pi 的分支结构。
    */
   moveLeaf(id: string): void {
-    moveSessionLeafSync(this.sql, id);
+    this.store.moveBranchTip(id);
   }
 
   /**
@@ -452,7 +440,7 @@ export class PiRuntimeTranscript {
       model: Model<Api>;
       signal?: AbortSignal;
       submissionId?: string;
-      onCompactionPersisted?: (event: RuntimeModelUsageEvent) => void;
+      onCompactionUsage?: (event: RuntimeModelUsageEvent, didCompact: boolean) => void;
     },
   ): Promise<AgentMessage[]> {
     const branch = this.modelBranch();
@@ -465,6 +453,9 @@ export class PiRuntimeTranscript {
         JSON.stringify(message) !== JSON.stringify(messages[index])
       )
     ) {
+      if (options.force) {
+        throw new Error("Forced context compaction requires canonical messages");
+      }
       console.warn(
         "[runtime-compaction:degraded]",
         JSON.stringify({ reason: "canonical-message-mismatch" }),
@@ -479,29 +470,22 @@ export class PiRuntimeTranscript {
       model: options.model,
       signal: options.signal,
     });
-    if (options.force && !result.didCompact) {
-      throw new Error("Forced context compaction did not reduce the model input");
-    }
-    if (result.compactionEntry) {
-      // 整对象写入:assembly 侧已经造好了完整的 compaction 条目,这里不再拆成位置
-      // 参数。旧写法拆 5 个参数喂 pi 的 Session.appendCompaction,pi 0.81 把它加到
-      // 7 个参数(usage / retainedTail)之后,多出来的会被静默丢掉且编译器不报。
+    if (result.compactionEntry || result.modelUsage) {
       this.durability.transaction(() => {
-        const eventId = this.store.appendCompaction(result.compactionEntry!);
-        if (
-          options.submissionId &&
-          options.onCompactionPersisted &&
-          result.modelUsage
-        ) {
-          options.onCompactionPersisted({
+        const eventId = this.store.recordCompaction(result.compactionEntry, result.modelUsage?.usage);
+        if (options.submissionId && options.onCompactionUsage && result.modelUsage) {
+          options.onCompactionUsage({
             eventId,
             submissionId: options.submissionId,
             kind: "compaction",
             ...result.modelUsage,
-          });
+          }, result.didCompact);
         }
       });
     }
+    if (options.force && !result.didCompact) {
+      throw new Error("Forced context compaction did not reduce the model input");
+    }
     if (result.degraded) {
       console.warn(
         "[runtime-compaction:degraded]",
@@ -532,7 +516,6 @@ export class PiRuntimeTranscript {
         }
         const appended = this.append(entry.id, entry.message, {
           submissionId: currentSubmissionId,
-          createdAt: entry.createdAt,
           ...(entry.message.role === "user" && entry.userSidecar
             ? {
                 userMessage: {
@@ -607,7 +590,7 @@ export class PiRuntimeTranscript {
    * 两类 Transcript 数据必须一起删除，否则复用消息 ID 时可能重新读到旧附件或 UI 元数据。
    */
   clear(): void {
-    clearSessionSync(this.sql);
+    this.store.clear();
     this.durability.clearUserSidecars();
   }
 
@@ -720,6 +703,7 @@ export class PiRuntimeTranscript {
             parts: [],
             metadata,
           });
+          activeAssistant = { submissionId: entry.submissionId, index: result.length - 1 };
         } else {
           const previous = result[index]!;
           result[index] = {
@@ -730,7 +714,8 @@ export class PiRuntimeTranscript {
             },
           };
         }
-        activeAssistant = undefined;
+        // A stream may settle after the stop marker. Keep its existing UI identity
+        // until the next user message rather than creating a second assistant.
         continue;
       }
       if (entry.message.role === "assistant") {
@@ -787,7 +772,10 @@ export class PiRuntimeTranscript {
               { type: "step-start" },
               ...projected.parts,
             ],
-            metadata: projected.metadata,
+            metadata: {
+              ...(previous.metadata as Record<string, unknown> | undefined),
+              ...(projected.metadata as Record<string, unknown> | undefined),
+            },
           };
         }
         continue;
@@ -861,21 +849,18 @@ export class PiRuntimeTranscript {
    *
    * 浏览器投影、Host 历史、Snapshot 以及 Turn 启动时的助手序号计算都从这里读取，调用方无需再查关联表。
    *
-   * Session entry 的 ISO 时间优先，解析失败才回退到消息时间；非消息 entry 在这一层统一排除。
+   * UI uses the message event time; Pi entry timestamps describe storage commits.
    */
   async storedMessages(): Promise<StoredTranscriptMessage[]> {
     const submissionByMessage =
       this.durability.listMessageSubmissionLinks();
     return this.store.branch().flatMap((entry) => {
       if (entry.type !== "message") return [];
-      const parsedTimestamp = Date.parse(entry.timestamp);
       return [{
         id: entry.id,
         submissionId: submissionByMessage.get(entry.id) ?? null,
         message: entry.message,
-        createdAt: Number.isFinite(parsedTimestamp)
-          ? parsedTimestamp
-          : entry.message.timestamp,
+        createdAt: entry.message.timestamp,
       }];
     });
   }

package/src/pi/session/index.ts

@@ -1,24 +1,24 @@
-import type { SqlTaggedTemplate } from "agents/chat";
-import {
-  PiTranscriptStore,
-  appendSessionMessageSync,
-  clearSessionSync,
-  moveSessionLeafSync,
-} from "./storage";
+import { migrateLegacyPiSession } from "./migration";
+import { CloudflareSessionStorage } from "./storage";
 
-export const piSession = Object.freeze({
-  appendMessage: appendSessionMessageSync,
-  clear: clearSessionSync,
-  /**
-   * 建库并返回回合事实源。
-   *
-   * 这里不再构造 pi 的 `Session` —— 会话所有权归这个 Durable Object,
-   * pi 只在需要压缩时被当作纯函数调用。理由见 `PiTranscriptStore` 的注释。
-   */
-  create(sql: SqlTaggedTemplate) {
-    return { store: new PiTranscriptStore(sql) };
-  },
-  moveLeaf: moveSessionLeafSync,
-});
+export { CloudflareSessionStorage } from "./storage";
 
-export * from "./storage";
+/** Open only after the startup transaction has installed the current database format. */
+export function openPiSessionStorage(
+  storage: DurableObjectStorage,
+): CloudflareSessionStorage {
+  return storage.transactionSync(() => {
+    const tables = new Set(
+      storage.sql
+        .exec<{ name: string }>(
+          "SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('pi_storage_state', 'pi_session_entries')",
+        )
+        .toArray()
+        .map((row) => row.name),
+    );
+    if (!tables.has("pi_storage_state") && tables.has("pi_session_entries")) {
+      migrateLegacyPiSession(storage, { dryRun: false });
+    }
+    return new CloudflareSessionStorage(storage);
+  });
+}