@keyou007/agent-bot 0.1.24-alpha.4 → 0.1.24-alpha.6

package/src/presentation/TurnStateReducer.ts

@@ -1,4 +1,4 @@
-import type { AgentEvent, RemoteTurnDetails, ToolState } from "../runtime/types.js";
+import type { AgentEvent, ApprovalDecision, ApprovalRequest, RemoteTurnDetails, ToolState } from "../runtime/types.js";
 import { appendGeneratedImageMarkdown } from "../utils/generatedImageMarkdown.js";
 import type { MessageReplyTarget } from "../feishu/types.js";
 import { formatStorageSize } from "../utils/formatStorageSize.js";
@@ -113,6 +113,13 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent, complet
   if (event.type === "turn_completed") next.finalResponse = event.finalResponse;
   if (event.type === "agent_text_delta") next.assistantText = state.assistantText + event.text;
   if (event.type === "plan_updated") next.plan = event.steps;
+  if (event.type === "approval_requested" || event.type === "approval_resolved") {
+    const request = event.type === "approval_requested" ? event.request
+      : state.approval?.id === event.requestId ? state.approval : undefined;
+    if (request) next.activities = next.activities.map((a) => a.id === approvalActivityId(event.turnId, request.id) && a.kind === "assistant"
+      ? { ...a, text: approvalHistoryText(request, event.type === "approval_resolved" ? event.decision : undefined,
+        event.type === "approval_resolved" && event.automatic) } : a);
+  }
   if (event.type === "progress") {
     const id = event.activityId ?? "progress";
     const old = state.activities.find((a) => a.id === id);
@@ -162,6 +169,7 @@ function reduceEvent(state: TurnViewState, event: AgentEvent): TurnViewState {
       return {
         ...state,
         totalTokens: (state.totalTokens ?? 0) + delta,
+        ...countModelCall(state, event),
         tokenUsageCumulative: Math.max(previousCumulative ?? 0, cumulativeTokens),
         totalTokensIncludingCache: total.value,
         tokenUsageTotalCumulative: total.cumulative,
@@ -304,7 +312,7 @@ function reduceEvent(state: TurnViewState, event: AgentEvent): TurnViewState {
       return {
         ...state,
         ...tracking,
-        status: state.approval ? "waiting_for_approval" : "tool_running",
+        status: state.approval && !state.approval.automatic ? "waiting_for_approval" : "tool_running",
         activeTool: bounded,
         activities: activityUpdate.activities,
         activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -316,10 +324,21 @@ function reduceEvent(state: TurnViewState, event: AgentEvent): TurnViewState {
     case "tool_output_delta":
       return reduceToolOutputDelta(state, event.toolId, event.delta);
     case "approval_requested":
-      return { ...state, status: "waiting_for_approval", approval: event.request };
+      return { ...state, status: event.request.automatic ? state.activeTool ? "tool_running" : "running" : "waiting_for_approval", approval: event.request,
+        activities: [...state.activities.filter((a) => a.id !== approvalActivityId(event.turnId, event.request.id)), {
+          kind: "assistant", id: approvalActivityId(event.turnId, event.request.id), text: bound(approvalHistoryText(event.request)),
+        }],
+      };
     case "approval_resolved":
       if (state.approval?.id !== event.requestId) return state;
-      return { ...state, status: state.activeTool ? "tool_running" : "running", approval: undefined };
+      return {
+        ...state, status: state.activeTool ? "tool_running" : "running", approval: undefined,
+        activities: upsertActivity(state.activities,
+          state.activities.findIndex((a) => a.id === approvalActivityId(event.turnId, event.requestId)), {
+            kind: "assistant", id: approvalActivityId(event.turnId, event.requestId),
+            text: bound(approvalHistoryText(state.approval, event.decision, event.automatic)),
+          }).activities,
+      };
     case "turn_completed": {
       const durationMs = Math.max(0, event.durationMs ?? Date.now() - state.startedAt);
       return {
@@ -362,6 +381,27 @@ function reduceEvent(state: TurnViewState, event: AgentEvent): TurnViewState {
   }
 }
 
+export function approvalActivityId(turnId: string, requestId: string): string {
+  return "approval:" + turnId + ":" + requestId;
+}
+
+export function continueTurnView(state: TurnViewState, turnId: string, startedAt: number): TurnViewState {
+  return { ...state, turnId, previewTurnId: state.previewTurnId ?? state.turnId,
+    continuedFromTurnId: state.turnId, continuedToTurnId: undefined, segmentStartedAt: startedAt,
+    status: "running", completedAt: undefined, durationMs: undefined, finalResponse: undefined,
+    error: undefined, approval: undefined, activeTool: undefined, assistantText: "", progressText: undefined };
+}
+
+function approvalHistoryText(request: ApprovalRequest, decision?: ApprovalDecision, automatic = false): string {
+  const labels = { accept: "允许一次", acceptForSession: "本会话允许", decline: "拒绝", cancel: "取消请求" };
+  const choice = decision ? request.options.find((option) => option.id === decision)?.label ?? labels[decision] : undefined;
+  const heading = choice ? automatic ? "自动同意（auto）" : "用户选择：" + choice
+    : request.automatic ? "正在自动同意（auto）" : "等待选择";
+  return ["**审批请求 · " + heading + "**", request.title, request.reason,
+    request.command ? "~~~\n" + request.command + "\n~~~" : undefined,
+  ].filter(Boolean).join("\n\n");
+}
+
 export function appendSteerMessage(state: TurnViewState, id: string, text: string, localImagePaths?: string[]): TurnViewState {
   const normalized = text.trim();
   if (!normalized && !localImagePaths?.length) return state;
@@ -441,7 +481,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
       ...tracking,
       fullToolOutputs,
       fullToolErrors,
-      status: state.approval ? "waiting_for_approval" : "tool_running",
+      status: state.approval && !state.approval.automatic ? "waiting_for_approval" : "tool_running",
       activeTool: bounded,
       activities: activityUpdate.activities,
       activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -457,7 +497,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
       ...tracking,
       fullToolOutputs,
       fullToolErrors,
-      status: state.approval ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
+      status: state.approval && !state.approval.automatic ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
       activeTool,
       activities: activityUpdate.activities,
       activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -472,7 +512,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
     ...tracking,
     fullToolOutputs,
     fullToolErrors,
-    status: state.approval ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
+    status: state.approval && !state.approval.automatic ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
     activeTool,
     activities: activityUpdate.activities,
     activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -609,6 +649,46 @@ function bound(value: string): string {
   return `${value.slice(0, MAX_TEXT - 1)}…`;
 }
 
+function countModelCall(
+  state: TurnViewState,
+  event: Extract<AgentEvent, { type: "token_usage_updated" }>,
+): Pick<TurnViewState, "modelCallCount" | "modelCallTokenBaseline"> {
+  // A pre-existing snapshot without a counter cannot provide a complete turn count.
+  if (state.modelCallCount === undefined && state.modelCallTokenBaseline === undefined
+    && state.tokenUsageCumulative !== undefined) return {};
+  const nonCached = reportedUsage(event.lastTokens, event.cumulativeTokens);
+  const total = reportedUsage(event.lastTotalTokens, event.cumulativeTotalTokens);
+  if (!nonCached && !total) return { modelCallTokenBaseline: state.modelCallTokenBaseline ?? {} };
+  const previous = state.modelCallTokenBaseline;
+  const usage = total ?? nonCached!;
+  const staleNonCached = nonCached !== undefined && previous?.nonCached !== undefined
+    && nonCached.cumulative < previous.nonCached;
+  const nonCachedGrew = nonCached !== undefined && previous?.nonCached !== undefined
+    && nonCached.cumulative > previous.nonCached;
+  const grew = total && previous?.total !== undefined && !previous.totalNeedsRebase
+    ? total.cumulative > previous.total
+    : nonCached && previous?.nonCached !== undefined
+      ? nonCachedGrew
+      : previous?.total === undefined && previous?.nonCached === undefined
+        && usage.last > 0 && usage.cumulative > 0;
+  return {
+    modelCallCount: (state.modelCallCount ?? 0) + (grew ? 1 : 0),
+    modelCallTokenBaseline: {
+      nonCached: nonCached ? Math.max(previous?.nonCached ?? 0, nonCached.cumulative) : previous?.nonCached,
+      total: total ? Math.max(previous?.total ?? 0, total.cumulative) : previous?.total,
+      // After a legacy-only update, rebase totals before using them again; keep
+      // their high-water mark so stale reports cannot lower the baseline.
+      totalNeedsRebase: total && !staleNonCached ? false : nonCachedGrew || previous?.totalNeedsRebase,
+    },
+  };
+}
+
+function reportedUsage(last: number | undefined, cumulative: number | undefined): { last: number; cumulative: number } | undefined {
+  if (last === undefined || cumulative === undefined || !Number.isFinite(last) || !Number.isFinite(cumulative)
+    || last < 0 || cumulative < 0) return undefined;
+  return { last: normalizeTokenCount(last), cumulative: normalizeTokenCount(cumulative) };
+}
+
 function accumulateReportedTokens(
   last: number | undefined,
   cumulative: number | undefined,

package/src/presentation/turnViewTypes.ts

@@ -36,6 +36,11 @@ export interface TurnViewState {
   previewJournal?: boolean;
   /** Byte cursor for the on-demand preview, never needed for recovery. */
   previewCursor?: number;
+  /** Shared presentation journal across a plan/implementation handoff. */
+  previewTurnId?: string;
+  continuedFromTurnId?: string;
+  continuedToTurnId?: string;
+  segmentStartedAt?: number;
   sessionId: string;
   turnId: string;
   agentLabel?: string;
@@ -56,6 +61,10 @@ export interface TurnViewState {
   cachedInputTokens?: number;
   tokenUsageTotalCumulative?: number;
   tokenUsageCachedCumulative?: number;
+  /** Effective token-usage updates observed for this turn. */
+  modelCallCount?: number;
+  /** Independent high-water marks; token breakdowns may disappear in partial updates. */
+  modelCallTokenBaseline?: { nonCached?: number; total?: number; totalNeedsRebase?: boolean };
   contextCompactionStatus?: "running" | "completed";
   contextCompactionCount?: number;
   contextCompactionId?: string;