@tea-agent/loop-agent 0.39.0-next.3 → 0.39.0-next.30

package/dist/worker/console/chat/session-store.js

@@ -17,6 +17,7 @@ import { dispatchOperatorAction } from "../operator-actions.js";
 import { authorizeOperatorChatTool } from "./tools.js";
 import { projectOperationForChat } from "./chat-event-store.js";
 import { scrubSecrets } from "./explore-tools.js";
+import { hashDeferredTurnPayload, parseDeferredTurn, } from "./deferred-turn.js";
 const CHAT_TITLE_MAX_CHARS = 80;
 /** Safe, one-line bounded title used for placeholders and model output. */
 export function cleanChatTitle(value) {
@@ -53,6 +54,7 @@ export class ChatSessionStore {
         const raw = await readJsonIfExists(recordPath(this.appData, sessionId));
         if (!raw || raw.sessionId !== sessionId)
             return undefined;
+        const deferredTurn = parseDeferredTurn(raw.deferredTurn);
         return {
             schemaVersion: 2,
             sessionId,
@@ -67,6 +69,7 @@ export class ChatSessionStore {
             ...(typeof raw.modelProvider === "string" ? { modelProvider: raw.modelProvider } : {}),
             ...(typeof raw.modelId === "string" ? { modelId: raw.modelId } : {}),
             ...(typeof raw.thinkingLevel === "string" ? { thinkingLevel: raw.thinkingLevel } : {}),
+            ...(deferredTurn ? { deferredTurn } : {}),
             messages: Array.isArray(raw.messages) ? raw.messages : [],
             toolInvocations: Array.isArray(raw.toolInvocations) ? raw.toolInvocations : [],
         };
@@ -147,6 +150,7 @@ export class ChatSessionStore {
                 ...(input.targetSessionFile ? { sessionFile: input.targetSessionFile } : { sessionFile: undefined }),
                 createdAt: now,
                 updatedAt: now,
+                deferredTurn: undefined,
                 messages: structuredClone(source.messages),
                 toolInvocations: structuredClone(source.toolInvocations),
             };
@@ -216,6 +220,146 @@ export class ChatSessionStore {
             return true;
         });
     }
+    async putDeferredTurn(sessionId, input) {
+        return this.serialize(sessionId, async () => {
+            const record = await this.get(sessionId);
+            if (!record)
+                return { ok: false, code: "NOT_FOUND" };
+            const clientRequestId = input.clientRequestId.trim();
+            const blockedByTurnId = input.blockedByTurnId.trim();
+            const text = input.text.trim() || (input.images.length > 0 ? "请查看附件图片。" : "");
+            if (!clientRequestId || !blockedByTurnId || !text) {
+                return { ok: false, code: "INVALID_INPUT" };
+            }
+            const payloadHash = hashDeferredTurnPayload({ text, images: input.images });
+            const existing = record.deferredTurn;
+            if (existing) {
+                if (existing.clientRequestId === clientRequestId) {
+                    if (existing.payloadHash !== payloadHash) {
+                        return {
+                            ok: false,
+                            code: "REQUEST_ID_REUSE_CONFLICT",
+                            deferredTurn: existing,
+                        };
+                    }
+                    return { ok: true, deferredTurn: existing, idempotent: true };
+                }
+                if (existing.state !== "queued") {
+                    return {
+                        ok: false,
+                        code: "NOT_REPLACEABLE",
+                        deferredTurn: existing,
+                    };
+                }
+                if (input.expectedRevision !== existing.revision) {
+                    return {
+                        ok: false,
+                        code: "REVISION_CONFLICT",
+                        deferredTurn: existing,
+                    };
+                }
+            }
+            else if (input.expectedRevision !== undefined &&
+                input.expectedRevision !== 0) {
+                return { ok: false, code: "REVISION_CONFLICT" };
+            }
+            const now = new Date().toISOString();
+            const deferredTurn = {
+                schemaVersion: 1,
+                revision: (existing?.revision ?? 0) + 1,
+                clientRequestId,
+                payloadHash,
+                blockedByTurnId,
+                text,
+                images: structuredClone(input.images),
+                state: "queued",
+                createdAt: existing?.createdAt ?? now,
+                updatedAt: now,
+            };
+            record.deferredTurn = deferredTurn;
+            record.updatedAt = now;
+            await writeSecureJson(recordPath(this.appData, sessionId), record);
+            return { ok: true, deferredTurn, idempotent: false };
+        });
+    }
+    async claimDeferredTurn(sessionId, expectedRevision) {
+        return this.serialize(sessionId, async () => {
+            const record = await this.get(sessionId);
+            const existing = record?.deferredTurn;
+            if (!record || !existing)
+                return { ok: false, code: "NOT_FOUND" };
+            if (existing.revision !== expectedRevision) {
+                return { ok: false, code: "REVISION_CONFLICT", deferredTurn: existing };
+            }
+            if (existing.state !== "queued") {
+                return { ok: false, code: "NOT_CLAIMABLE", deferredTurn: existing };
+            }
+            const next = {
+                ...existing,
+                revision: existing.revision + 1,
+                state: "dispatching",
+                updatedAt: new Date().toISOString(),
+            };
+            record.deferredTurn = next;
+            record.updatedAt = next.updatedAt;
+            await writeSecureJson(recordPath(this.appData, sessionId), record);
+            return { ok: true, deferredTurn: next };
+        });
+    }
+    async transitionDeferredTurn(sessionId, input) {
+        return this.serialize(sessionId, async () => {
+            const record = await this.get(sessionId);
+            const existing = record?.deferredTurn;
+            if (!record || !existing || existing.revision !== input.expectedRevision)
+                return undefined;
+            const next = {
+                ...existing,
+                revision: existing.revision + 1,
+                state: input.state,
+                updatedAt: new Date().toISOString(),
+                ...(input.acceptedTurnId ? { acceptedTurnId: input.acceptedTurnId } : {}),
+                ...(input.lastError ? { lastError: input.lastError } : {}),
+            };
+            if (!input.lastError)
+                delete next.lastError;
+            record.deferredTurn = next;
+            record.updatedAt = next.updatedAt;
+            await writeSecureJson(recordPath(this.appData, sessionId), record);
+            return next;
+        });
+    }
+    async deleteDeferredTurn(sessionId, input) {
+        return this.serialize(sessionId, async () => {
+            const record = await this.get(sessionId);
+            const existing = record?.deferredTurn;
+            if (!record || !existing || existing.clientRequestId !== input.clientRequestId) {
+                return { ok: false, code: "NOT_FOUND" };
+            }
+            if (existing.state !== "queued" && existing.state !== "failed") {
+                return { ok: false, code: "NOT_CANCELLABLE", deferredTurn: existing };
+            }
+            if (existing.revision !== input.expectedRevision) {
+                return { ok: false, code: "REVISION_CONFLICT", deferredTurn: existing };
+            }
+            delete record.deferredTurn;
+            record.updatedAt = new Date().toISOString();
+            await writeSecureJson(recordPath(this.appData, sessionId), record);
+            return { ok: true, deferredTurn: existing };
+        });
+    }
+    async clearDeferredTurnForRequest(sessionId, clientRequestId) {
+        return this.serialize(sessionId, async () => {
+            const record = await this.get(sessionId);
+            const existing = record?.deferredTurn;
+            if (!record || !existing || existing.clientRequestId !== clientRequestId) {
+                return undefined;
+            }
+            delete record.deferredTurn;
+            record.updatedAt = new Date().toISOString();
+            await writeSecureJson(recordPath(this.appData, sessionId), record);
+            return { deferredTurn: existing, clearedRevision: existing.revision + 1 };
+        });
+    }
     async appendMessage(sessionId, message) {
         return this.serialize(sessionId, async () => {
             const record = await this.get(sessionId);
@@ -340,10 +484,10 @@ export async function runChatTurn(options) {
             },
         };
     }
-    await store.appendMessage(sessionId, { role: "user", text });
+    const userMessage = await store.appendMessage(sessionId, { role: "user", text });
     const afterUserMessage = await store.get(sessionId);
     if (afterUserMessage)
-        await options.onUserMessagePersisted?.(afterUserMessage);
+        await options.onUserMessagePersisted?.(afterUserMessage, userMessage);
     let turnError;
     // Collect persistence promises so runChatTurn does not resolve before the
     // chat history / audit trail is durably written (also makes the outcome

package/dist/worker/console/chat/turn-process.js

@@ -92,36 +92,25 @@ function sortToolsStable(tools) {
     });
 }
 /**
- * Flush buffered consecutive tools into process items. Semantic operator
- * tools stay as individual activity events; plain tools group into a
- * `tool-group` ("并行调用 · N 项") when two or more land back to back.
+ * Flush buffered consecutive tools into process items (pi-web aligned:
+ * strict sequential flow, no synthetic grouping). Semantic operator tools
+ * stay as individual activity events; plain tools each render as their own
+ * card in stable server order (eventSeq first, createdAt fallback).
  * Thinking/text/activity boundaries break the buffer upstream.
  */
 function flushToolBuffer(processItems, buffer) {
     if (buffer.length === 0)
         return;
     const sorted = sortToolsStable(buffer);
-    let plainGroup = [];
-    const flushPlain = () => {
-        if (plainGroup.length === 1) {
-            processItems.push({ kind: "tool", tool: plainGroup[0] });
-        }
-        else if (plainGroup.length > 1) {
-            processItems.push({ kind: "tool-group", tools: plainGroup });
-        }
-        plainGroup = [];
-    };
     for (const tool of sorted) {
         const activity = semanticActivityForTool(tool);
         if (activity) {
-            flushPlain();
             processItems.push({ kind: "activity", activity });
         }
         else {
-            plainGroup.push(tool);
+            processItems.push({ kind: "tool", tool });
         }
     }
-    flushPlain();
 }
 function emitProcessBlocks(blocks, group, processItems, usedToolIds) {
     let buffer = [];
@@ -227,9 +216,6 @@ export function buildTurnProcessGroups(input) {
             current = startGroup(`assistant-${message.id}`);
         current.assistants.push(message);
     }
-    if (groups.length === 0 && input.toolCalls.length > 0) {
-        groups.push(emptyGroup("orphan-tools"));
-    }
     const assigned = new Set();
     const assistantToGroup = new Map();
     for (const group of groups) {
@@ -276,17 +262,12 @@ export function buildTurnProcessGroups(input) {
             const end = next?.user?.createdAt ?? Number.POSITIVE_INFINITY;
             return tool.createdAt >= start && tool.createdAt < end;
         });
+        // Time window only. Never dump unmatched tools onto the latest group:
+        // that is how a previous turn's bash cards jump under a new prompt.
         if (windowGroup) {
             windowGroup.tools.push(tool);
             assigned.add(tool.id);
         }
-        else {
-            const lastGroup = groups.at(-1);
-            if (lastGroup) {
-                lastGroup.tools.push(tool);
-                assigned.add(tool.id);
-            }
-        }
     }
     for (const group of groups) {
         group.tools.sort((a, b) => {
@@ -303,6 +284,14 @@ export function buildTurnProcessGroups(input) {
     }
     return groups;
 }
+/** Keep the most recent complete turns. Slice groups, never raw messages. */
+export function selectRecentTurnGroups(groups, limit) {
+    if (limit <= 0)
+        return [];
+    if (groups.length <= limit)
+        return [...groups];
+    return groups.slice(-limit);
+}
 export function processGroupSummary(tools, options) {
     const count = tools.length;
     const thinkingCount = options?.thinkingCount ?? 0;
@@ -324,7 +313,7 @@ export function processGroupSummary(tools, options) {
         parts.push("运行中");
     return { count, errorCount, runningCount, stepCount, label: parts.join(" · ") };
 }
-/** Summary over rendered process items (tool-group tools count individually). */
+/** Summary over rendered process items. */
 export function summarizeProcessItems(items) {
     const tools = [];
     let thinkingCount = 0;
@@ -344,10 +333,8 @@ export function summarizeProcessItems(items) {
             else if (item.activity.kind === "progress")
                 activityRunningCount += 1;
         }
-        else if (item.kind === "tool")
-            tools.push(item.tool);
         else
-            tools.push(...item.tools);
+            tools.push(item.tool);
     }
     return processGroupSummary(tools, {
         thinkingCount,

package/dist/worker/console/harness-pi-model-matrix.js

@@ -0,0 +1,137 @@
+/**
+ * harness.json executors.pi LOW/MED/HIGH 模型矩阵的读写与校验。
+ *
+ * 该模块只服务于 Console「模型与认证」页的模型矩阵编辑器：
+ *  - `validatePiModelMatrixTiers`：写入前拒绝空串 / default 哨兵 / 非字符串 /
+ *    畸形 provider/model（如 provider/、/model、a//b）。
+ *  - `readPiModelMatrixProjection`：读全文档并投影三档的 provider/model 或裸
+ *    model id（供 readiness 结构化投影 piModelMatrix 使用）。
+ *  - `writePiModelMatrix`：读全文档 → 校验 → 原子写 tmp + fsync + rename，
+ *    保留 $schema 与其余所有字段。
+ *
+ * 本模块在 worker/console（Node 侧），不得被浏览器静态资源直接 import
+ * （依赖 node:fs / node:crypto / node:path）。
+ */
+import { randomBytes } from "node:crypto";
+import { open, readFile, rename, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { normalizeExecutorTierValue } from "../../governance/manifest-types.js";
+export const PI_MODEL_TIERS = ["LOW", "MED", "HIGH"];
+/** 校验单档字符串值，返回错误文案；合法返回 undefined。 */
+export function piModelTierValueError(value) {
+    if (typeof value !== "string")
+        return "模型值必须是字符串";
+    if (value.length === 0)
+        return "模型值不能为空";
+    if (value.trim() !== value)
+        return "模型值不能包含首尾空白";
+    if (value === "default")
+        return "default 是保留哨兵，不能作为模型值";
+    // 比 normalizeExecutorTierValue 更严格：拒绝 provider/、/model、a//b。
+    if (value.startsWith("/") || value.endsWith("/") || value.includes("//")) {
+        return "provider/model 格式非法：不允许 /model、provider/ 或 a//b";
+    }
+    return undefined;
+}
+/**
+ * 写入前校验三档字符串值。任何一档非法即整体拒绝，保证不落盘。
+ */
+export function validatePiModelMatrixTiers(input) {
+    if (!input || typeof input !== "object" || Array.isArray(input)) {
+        return {
+            ok: false,
+            code: "INVALID_INPUT",
+            message: "模型矩阵必须是 { LOW, MED, HIGH } 对象",
+        };
+    }
+    const record = input;
+    const tiers = {};
+    for (const tier of PI_MODEL_TIERS) {
+        const raw = record[tier];
+        const error = piModelTierValueError(raw);
+        if (error) {
+            return {
+                ok: false,
+                code: "INVALID_INPUT",
+                message: `${tier}: ${error}`,
+                tier,
+            };
+        }
+        tiers[tier] = raw;
+    }
+    return { ok: true, tiers };
+}
+async function readHarnessJson(repoRoot) {
+    try {
+        const raw = await readFile(path.join(repoRoot, "harness.json"), "utf8");
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+            return undefined;
+        }
+        return parsed;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * 投影 harness.json executors.pi 三档（provider/model 或裸 model id）。
+ * 缺文件 / 非法 JSON / 未配置档位均优雅降级为缺省，绝不抛错。
+ */
+export async function readPiModelMatrixProjection(repoRoot) {
+    const manifest = await readHarnessJson(repoRoot);
+    const pi = manifest?.executors?.pi;
+    const projection = {};
+    if (!pi || typeof pi !== "object")
+        return projection;
+    for (const tier of PI_MODEL_TIERS) {
+        const selection = normalizeExecutorTierValue(pi[tier]);
+        if (!selection)
+            continue;
+        projection[tier] = {
+            model: selection.model,
+            ...(selection.provider ? { provider: selection.provider } : {}),
+            value: selection.provider
+                ? `${selection.provider}/${selection.model}`
+                : selection.model,
+        };
+    }
+    return projection;
+}
+/**
+ * 原子更新 harness.json executors.pi.LOW/MED/HIGH：
+ * 读全文档 → 校验 → 保留其余字段 → 写 tmp + fsync + rename。
+ */
+export async function writePiModelMatrix(repoRoot, tiers) {
+    const validation = validatePiModelMatrixTiers(tiers);
+    if (!validation.ok) {
+        throw Object.assign(new Error(validation.message), {
+            code: validation.code,
+        });
+    }
+    const file = path.join(repoRoot, "harness.json");
+    const manifest = await readHarnessJson(repoRoot);
+    if (!manifest) {
+        throw Object.assign(new Error("harness.json 不存在或不是合法 JSON"), {
+            code: "HARNESS_NOT_FOUND",
+        });
+    }
+    const executors = (manifest.executors ?? {});
+    const pi = (executors.pi ?? {});
+    const nextPi = { ...pi };
+    for (const tier of PI_MODEL_TIERS) {
+        nextPi[tier] = validation.tiers[tier];
+    }
+    const nextManifest = { ...manifest, executors: { ...executors, pi: nextPi } };
+    const body = `${JSON.stringify(nextManifest, null, 2)}\n`;
+    const tmp = path.join(repoRoot, `.harness.${process.pid}.${randomBytes(4).toString("hex")}.tmp`);
+    await writeFile(tmp, body, { encoding: "utf8" });
+    const handle = await open(tmp, "r+");
+    try {
+        await handle.sync();
+    }
+    finally {
+        await handle.close();
+    }
+    await rename(tmp, file);
+}