@keyou007/agent-bot 0.1.20 → 0.1.21

package/src/presentation/OutboundRouter.ts

@@ -16,7 +16,9 @@ export interface TurnPresenter {
     taskTitle?: string,
     projectCwd?: string,
     agentLabel?: string,
+    model?: string,
   ): void;
+  updateSessionModel(sessionId: string, model?: string): void;
   updateSessionTitle(sessionId: string, taskTitle: string): void;
   unregisterSession(sessionId: string): void;
   startPendingTurn(
@@ -67,11 +69,13 @@ export class OutboundRouter {
     taskTitle?: string,
     projectCwd?: string,
     agentLabel?: string,
+    model?: string,
   ): void {
     const route = this.route(contextKey);
     this.sessionRoutes.set(sessionId, route);
     this.sessionContextKeys.set(sessionId, contextKey);
     route.presenter.registerSession(sessionId, contextKey, taskTitle, projectCwd, agentLabel);
+    if (model) route.presenter.updateSessionModel(sessionId, model);
   }
 
   getSessionContextKey(sessionId: string): string | undefined {
@@ -90,6 +94,10 @@ export class OutboundRouter {
     this.sessionRoutes.get(sessionId)?.presenter.updateSessionTitle(sessionId, taskTitle);
   }
 
+  updateSessionModel(sessionId: string, model?: string): void {
+    this.sessionRoutes.get(sessionId)?.presenter.updateSessionModel(sessionId, model);
+  }
+
   unregisterSession(sessionId: string): void {
     const route = this.sessionRoutes.get(sessionId);
     route?.presenter.unregisterSession(sessionId);

package/src/presentation/TurnStateReducer.ts

@@ -1,6 +1,7 @@
 import type { AgentEvent, ToolState } from "../runtime/types.js";
 import { appendGeneratedImageMarkdown } from "../utils/generatedImageMarkdown.js";
 import type { MessageReplyTarget } from "../feishu/types.js";
+import { formatStorageSize } from "../utils/formatStorageSize.js";
 import type { FileSummary, TurnActivity, TurnViewState } from "./turnViewTypes.js";
 
 const MAX_TEXT = 6_000;
@@ -17,11 +18,13 @@ export function createTurnViewState(
   projectCwd?: string,
   prompt?: string,
   agentLabel?: string,
+  model?: string,
 ): TurnViewState {
   return {
     sessionId,
     turnId,
     agentLabel,
+    model,
     taskTitle,
     prompt,
     projectCwd,
@@ -31,6 +34,8 @@ export function createTurnViewState(
     assistantText: "",
     plan: [],
     activities: [],
+    fullToolOutputs: {},
+    fullToolErrors: {},
     totalToolCount: 0,
     completedToolCount: 0,
     failedToolCount: 0,
@@ -60,6 +65,93 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
         ...state,
         totalTokens: (state.totalTokens ?? 0) + delta,
         tokenUsageCumulative: Math.max(previousCumulative ?? 0, cumulativeTokens),
+        latestContextTokens: event.contextTokens === undefined
+          ? state.latestContextTokens
+          : normalizeTokenCount(event.contextTokens),
+      };
+    }
+    case "context_compaction": {
+      if (event.phase === "started") {
+        const compactionId = event.compactionId ?? `generated:${(state.contextCompactionCount ?? 0) + 1}`;
+        const beforeTokens = state.latestContextTokens;
+        const text = contextCompactionRunningText(beforeTokens, event.turnCount, event.storageBytes);
+        const activityId = `context-compaction:${compactionId}`;
+        const activityUpdate = upsertActivity(
+          state.activities ?? [],
+          (state.activities ?? []).findIndex((activity) => activity.id === activityId),
+          { kind: "assistant", id: activityId, text },
+        );
+        return {
+          ...state,
+          contextCompactionStatus: "running",
+          contextCompactionId: compactionId,
+          contextCompactionStartedAt: event.timestampMs ?? Date.now(),
+          contextCompactionDurationMs: undefined,
+          contextCompactionBeforeTokens: beforeTokens,
+          contextCompactionAfterTokens: undefined,
+          contextCompactionTurnCount: event.turnCount,
+          contextCompactionStorageBytes: event.storageBytes,
+          progressText: text,
+          activities: activityUpdate.activities,
+          activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
+        };
+      }
+      const currentId = state.contextCompactionId;
+      const repeatedItemCompletion = event.compactionId !== undefined
+        && event.compactionId === currentId
+        && state.contextCompactionStatus === "completed";
+      const repeatedLegacyCompletion = event.compactionId === undefined
+        && state.contextCompactionStatus === "completed";
+      const repeatedCompletion = repeatedItemCompletion || repeatedLegacyCompletion;
+      const contextCompactionCount = repeatedCompletion
+        ? state.contextCompactionCount ?? 1
+        : (state.contextCompactionCount ?? 0) + 1;
+      const compactionId = event.compactionId
+        ?? currentId
+        ?? `legacy:${contextCompactionCount}`;
+      const completedAt = event.timestampMs ?? Date.now();
+      const durationMs = repeatedCompletion
+        ? state.contextCompactionDurationMs
+        : state.contextCompactionStartedAt === undefined
+          ? undefined
+          : Math.max(0, completedAt - state.contextCompactionStartedAt);
+      const beforeTokens = state.contextCompactionBeforeTokens;
+      const afterTokens = repeatedCompletion
+        ? state.contextCompactionAfterTokens
+        : state.latestContextTokens;
+      const turnCount = repeatedCompletion
+        ? state.contextCompactionTurnCount
+        : event.turnCount ?? state.contextCompactionTurnCount;
+      const storageBytes = repeatedCompletion
+        ? state.contextCompactionStorageBytes
+        : event.storageBytes ?? state.contextCompactionStorageBytes;
+      const text = contextCompactionCompletedText(
+        contextCompactionCount,
+        durationMs,
+        beforeTokens,
+        afterTokens,
+        turnCount,
+        storageBytes,
+      );
+      const activityId = `context-compaction:${compactionId}`;
+      const activityUpdate = upsertActivity(
+        state.activities ?? [],
+        (state.activities ?? []).findIndex((activity) => activity.id === activityId),
+        { kind: "assistant", id: activityId, text },
+      );
+      return {
+        ...state,
+        contextCompactionStatus: "completed",
+        contextCompactionCount,
+        contextCompactionId: compactionId,
+        contextCompactionDurationMs: durationMs,
+        contextCompactionBeforeTokens: beforeTokens,
+        contextCompactionAfterTokens: afterTokens,
+        contextCompactionTurnCount: turnCount,
+        contextCompactionStorageBytes: storageBytes,
+        progressText: text,
+        activities: activityUpdate.activities,
+        activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
       };
     }
     case "progress": {
@@ -165,10 +257,11 @@ function reduceToolOutputDelta(state: TurnViewState, toolId: string, delta: stri
   if (!delta) return state;
   const tool = findTool(state, toolId);
   if (!tool || tool.status !== "running" || tool.kind !== "command") return state;
+  const fullOutput = `${state.fullToolOutputs?.[toolId] ?? tool.output ?? ""}${delta}`;
   return reduceToolUpdate(state, {
     ...tool,
     output: appendBoundedOutput(tool.output, delta),
-  });
+  }, fullOutput);
 }
 
 function findTool(state: TurnViewState, toolId: string): ToolState | undefined {
@@ -197,8 +290,15 @@ function appendBoundedOutput(previous: string | undefined, delta: string): strin
   return `…${combined.slice(-(MAX_TEXT - 1))}`;
 }
 
-function reduceToolUpdate(state: TurnViewState, tool: ToolState): TurnViewState {
+function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: string): TurnViewState {
   tool = withToolTiming(state, tool);
+  const nextFullOutput = fullOutput ?? tool.output;
+  const fullToolOutputs = nextFullOutput === undefined
+    ? state.fullToolOutputs
+    : { ...state.fullToolOutputs, [tool.id]: nextFullOutput };
+  const fullToolErrors = tool.error === undefined
+    ? state.fullToolErrors
+    : { ...state.fullToolErrors, [tool.id]: tool.error };
   const tracking = trackToolStatus(state, tool);
   const bounded = boundTool(tool);
   const activityUpdate = upsertToolActivity(state.activities ?? [], bounded);
@@ -210,6 +310,8 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState): TurnViewState
     return {
       ...state,
       ...tracking,
+      fullToolOutputs,
+      fullToolErrors,
       status: "tool_running",
       activeTool: bounded,
       activities: activityUpdate.activities,
@@ -224,6 +326,8 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState): TurnViewState
     return {
       ...state,
       ...tracking,
+      fullToolOutputs,
+      fullToolErrors,
       status: activeTool ? "tool_running" : "running",
       activeTool,
       activities: activityUpdate.activities,
@@ -237,6 +341,8 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState): TurnViewState
   return {
     ...state,
     ...tracking,
+    fullToolOutputs,
+    fullToolErrors,
     status: activeTool ? "tool_running" : "running",
     activeTool,
     activities: activityUpdate.activities,
@@ -360,3 +466,70 @@ function bound(value: string): string {
 function normalizeTokenCount(value: number): number {
   return Math.max(0, Math.round(value));
 }
+
+function contextCompactionCompletedText(
+  count: number,
+  durationMs: number | undefined,
+  beforeTokens: number | undefined,
+  afterTokens: number | undefined,
+  turnCount: number | undefined,
+  storageBytes: number | undefined,
+): string {
+  const subject = count > 1
+    ? `Codex 已完成本轮第 ${count} 次上下文压缩`
+    : "Codex 已完成上下文压缩";
+  const details = [
+    durationMs === undefined ? undefined : `耗时 ${formatCompactionDuration(durationMs)}`,
+    contextCompactionSizeText(beforeTokens, afterTokens),
+    contextCompactionTaskMetricsText(turnCount, storageBytes),
+  ].filter((detail): detail is string => detail !== undefined);
+  return `${subject}${details.length > 0 ? ` · ${details.join(" · ")}` : ""}，继续处理。`;
+}
+
+function contextCompactionRunningText(
+  beforeTokens: number | undefined,
+  turnCount: number | undefined,
+  storageBytes: number | undefined,
+): string {
+  const context = beforeTokens === undefined
+    ? "Codex 正在压缩上下文…"
+    : `Codex 正在压缩上下文（压缩前 ${formatInteger(beforeTokens)} tokens）…`;
+  const metrics = contextCompactionTaskMetricsText(turnCount, storageBytes);
+  return metrics ? `${context} · ${metrics}` : context;
+}
+
+function contextCompactionTaskMetricsText(
+  turnCount: number | undefined,
+  storageBytes: number | undefined,
+): string {
+  const turns = turnCount === undefined ? "已执行轮次未知" : `已执行 ${formatInteger(turnCount)} 轮`;
+  const storage = storageBytes === undefined ? "磁盘占用未知" : `磁盘占用 ${formatStorageSize(storageBytes)}`;
+  return `${turns} · ${storage}`;
+}
+
+function contextCompactionSizeText(
+  beforeTokens: number | undefined,
+  afterTokens: number | undefined,
+): string | undefined {
+  if (afterTokens === undefined) return undefined;
+  if (beforeTokens === undefined) return `压缩后 ${formatInteger(afterTokens)} tokens`;
+  if (afterTokens >= beforeTokens || beforeTokens === 0) return undefined;
+  const reduction = Math.round((1 - afterTokens / beforeTokens) * 100);
+  return `上下文 ${formatInteger(beforeTokens)} → ${formatInteger(afterTokens)} tokens（减少 ${reduction}%）`;
+}
+
+function formatCompactionDuration(durationMs: number): string {
+  const seconds = Math.max(0, durationMs) / 1_000;
+  if (seconds < 10) return `${Number(seconds.toFixed(1))}s`;
+  if (seconds < 60) return `${Math.round(seconds)}s`;
+  const totalSeconds = Math.round(seconds);
+  const hours = Math.floor(totalSeconds / 3_600);
+  const minutes = Math.floor((totalSeconds % 3_600) / 60);
+  const remainingSeconds = totalSeconds % 60;
+  const time = `${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`;
+  return hours > 0 ? `${String(hours).padStart(2, "0")}:${time}` : time;
+}
+
+function formatInteger(value: number): string {
+  return normalizeTokenCount(value).toLocaleString("en-US");
+}

package/src/presentation/turnViewTypes.ts

@@ -26,6 +26,7 @@ export interface TurnViewState {
   sessionId: string;
   turnId: string;
   agentLabel?: string;
+  model?: string;
   taskTitle?: string;
   prompt?: string;
   projectCwd?: string;
@@ -36,10 +37,22 @@ export interface TurnViewState {
   durationMs?: number;
   totalTokens?: number;
   tokenUsageCumulative?: number;
+  contextCompactionStatus?: "running" | "completed";
+  contextCompactionCount?: number;
+  contextCompactionId?: string;
+  latestContextTokens?: number;
+  contextCompactionStartedAt?: number;
+  contextCompactionDurationMs?: number;
+  contextCompactionBeforeTokens?: number;
+  contextCompactionAfterTokens?: number;
+  contextCompactionTurnCount?: number;
+  contextCompactionStorageBytes?: number;
   progressText?: string;
   assistantText: string;
   plan: PlanStep[];
   activities: TurnActivity[];
+  fullToolOutputs?: Record<string, string>;
+  fullToolErrors?: Record<string, string>;
   activitiesTruncated?: boolean;
   totalToolCount?: number;
   completedToolCount?: number;