@blade-hq/agent-client 2610.0.0-beta.6 → 2610.0.0-beta.8

package/README.md

@@ -523,4 +523,4 @@ transformSlashCommand(skillId, prompt, { local: false, installed: false })
 - **消息与投影协议**：`MessageContent`、`MessageContentPart`、`TextContentPart`、`ImageUrlContentPart`、`FileContentPart`、`ToolCallInfo`、`ToolBridgeContent`、`CompactionInfo`、`MemoryRefInfo`、`ArchivedFileInfo`、`ArchivedToolCallInfo`、`TurnProjection`、`ContentBlock`、`PatchEnvelope`、`MemoryRef`、`PostChatFollowup`、`FinalArtifact`、`latestPostChatFollowup`、`buildMessageContent`、`normalizeMessageContent`、`isHiddenInternalMessage`、`transformSlashCommand`、`SkillMentionAvailability`、`extractTextAttachments`、`ParsedTextAttachment`、`ParsedTextContext`
 - **Solution / 任务协议**：`Solution`、`SolutionAppField`、`SolutionAppState`、`SolutionAppUiConfig`、`SolutionRef`、`PublishedSolutionRef`、`ExistingSolutionRef`、`PreparedSolution`、`PreparedSolutionAsset`、`LayoutType`、`BizRole`、`TaskStatus`、`BackgroundTask`、`BackgroundTaskStopResult`
 - **Headless**：`HeadlessResource`、`RunOptions`、`RunResult`、`RunTrace`
-- **低层通道（apps/web 等高级集成）**：`createSocket`、`CreateSocketOptions`、`TypedSocket`、`AsrAudioPayload`、`ClientProjectionBuilder`、`RawEvent`、`acceptedPostChatFollowupCompletesLatestRun`
+- **低层通道（apps/web 等高级集成）**：`createSocket`、`CreateSocketOptions`、`TypedSocket`、`AsrAudioPayload`、`ClientProjectionBuilder`、`RawEvent`、`acceptedPostChatFollowupCompletesLatestRun`、`reconcileOptimisticUserTurns`

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { SessionHub } from "./session/hub";
 export type { AgentSessionEvents, AgentSessionEventName } from "./session/events";
 export { SessionSetupError } from "./session/definition";
 export type { SessionConfig, SessionDefinition, SessionSetupStage, SkillDefinition, TextFile, SolutionDefinition, } from "./session/definition";
-export { createInitialSessionState, toReplaySnapshot } from "./session/state";
+export { createInitialSessionState, reconcileOptimisticUserTurns, toReplaySnapshot, } from "./session/state";
 export type { AskUserAnswerData, AgentLoopInfo, ActiveCompactionState, ConnectionStatus, ReplaySnapshot, SessionState, } from "./session/state";
 export { connectEmbedded } from "./commands/embedded";
 export type { EmbeddedChat, EmbeddedChatOptions } from "./commands/embedded";

package/dist/index.js

@@ -3140,6 +3140,25 @@ function orderTurns(turns) {
   }
   return turns;
 }
+function reconcileOptimisticUserTurns(currentTurns, incomingTurns) {
+  const currentById = new Map(currentTurns.map((turn) => [turn.turn_id, turn]));
+  const optimisticUserTurn = currentTurns.find(
+    (turn) => turn.role === "user" && turn.turn_id.startsWith("local-user-")
+  );
+  let optimisticUserMatched = false;
+  return incomingTurns.map((turn) => {
+    const current = currentById.get(turn.turn_id);
+    if (current) {
+      const currentRenderId = current.client_render_id;
+      return turn.client_render_id || !currentRenderId ? turn : { ...turn, client_render_id: currentRenderId };
+    }
+    if (!optimisticUserMatched && optimisticUserTurn && turn.role === "user" && !turn.turn_id.startsWith("local-user-")) {
+      optimisticUserMatched = true;
+      return { ...turn, client_render_id: optimisticUserTurn.turn_id };
+    }
+    return turn;
+  });
+}
 function areAgentLoopsEqual(left, right) {
   if (!left) return Object.keys(right).length === 0;
   const leftEntries = Object.entries(left);
@@ -3151,7 +3170,7 @@ function areAgentLoopsEqual(left, right) {
   });
 }
 function withTurns(state, turns) {
-  const orderedTurns = orderTurns(turns);
+  const orderedTurns = orderTurns(reconcileOptimisticUserTurns(state.turns, turns));
   const { messages, agentLoops, activeCompaction } = materialize(orderedTurns);
   const isWaitingForInput = orderedTurns.some(
     (turn) => turn.tool_calls.some((toolCall) => toolCall.status === "awaiting_answer")
@@ -3161,7 +3180,13 @@ function withTurns(state, turns) {
   const preservedErrors = lastTurnId ? state.messages.filter(
     (m) => m.role === "error" && typeof m.entry_id === "string" && m.entry_id.startsWith(`${ERROR_ANCHOR_PREFIX}${lastTurnId}:`)
   ) : [];
-  const mergedMessages = preservedErrors.length > 0 ? [...messages, ...preservedErrors] : messages;
+  const turnById = new Map(orderedTurns.map((turn) => [turn.turn_id, turn]));
+  const messagesWithRenderIds = messages.map((message) => {
+    if (!message.entry_id) return message;
+    const renderId = turnById.get(message.entry_id)?.client_render_id;
+    return renderId ? { ...message, render_id: renderId } : message;
+  });
+  const mergedMessages = preservedErrors.length > 0 ? [...messagesWithRenderIds, ...preservedErrors] : messagesWithRenderIds;
   const latestMode = [...orderedTurns].reverse().map((turn) => extractModeFromBlocks(turn.blocks)).find((mode) => mode !== null);
   return {
     ...state,
@@ -3196,14 +3221,17 @@ function addUserMessage(state, content) {
 }
 function upsertTurn(state, turn) {
   let existing = [...state.turns];
-  if (turn.role === "user" && !turn.turn_id.startsWith("local-user-")) {
-    existing = existing.filter((t) => !t.turn_id.startsWith("local-user-"));
+  const [nextTurn] = reconcileOptimisticUserTurns(existing, [turn]);
+  if (nextTurn.client_render_id && turn.role === "user") {
+    existing = existing.filter(
+      (item) => !(item.role === "user" && item.turn_id.startsWith("local-user-"))
+    );
   }
-  const index = existing.findIndex((item) => item.turn_id === turn.turn_id);
+  const index = existing.findIndex((item) => item.turn_id === nextTurn.turn_id);
   if (index >= 0) {
-    existing[index] = turn;
+    existing[index] = nextTurn;
   } else {
-    existing.push(turn);
+    existing.push(nextTurn);
   }
   return withTurns(state, existing);
 }
@@ -4471,7 +4499,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.6" : "1.1.1";
+var SDK_VERSION = true ? "2610.0.0-beta.8" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {
@@ -4994,6 +5022,7 @@ export {
   isInboundEnvelope,
   latestPostChatFollowup,
   normalizeMessageContent,
+  reconcileOptimisticUserTurns,
   toReplaySnapshot,
   transformSlashCommand
 };