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

package/src/local-files/LocalFileViewerServer.ts

@@ -3,6 +3,7 @@ import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
 import fs from "node:fs";
 import { createRequire } from "node:module";
 import http, { type IncomingMessage, type ServerResponse } from "node:http";
+import type { Duplex } from "node:stream";
 import path from "node:path";
 import hljs from "highlight.js/lib/common";
 import dos from "highlight.js/lib/languages/dos";
@@ -283,11 +284,18 @@ export interface LocalFileViewerAddress {
   publicConnectionKind?: NetworkConnectionKind;
 }
 
+export interface LocalFileViewerService {
+  handleRequest(request: IncomingMessage, response: ServerResponse): void;
+  handleUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer): void;
+  close(): Promise<void>;
+}
+
 export class LocalFileViewerServer {
   private server?: http.Server;
   private secret?: Buffer;
   private address?: LocalFileViewerAddress;
   private basePath = "";
+  private readonly services = new Map<string, LocalFileViewerService>();
 
   constructor(private readonly options: LocalFileViewerServerOptions) {}
 
@@ -315,6 +323,11 @@ export class LocalFileViewerServer {
       });
     });
     server.on("clientError", (_error, socket) => socket.end("HTTP/1.1 400 Bad Request\r\n\r\n"));
+    server.on("upgrade", (request, socket, head) => {
+      const service = this.serviceFor(request);
+      if (service) service.handleUpgrade(request, socket, head);
+      else socket.end("HTTP/1.1 404 Not Found\r\nConnection: close\r\n\r\n");
+    });
 
     let selectedPort = preferredPort;
     try {
@@ -361,12 +374,36 @@ export class LocalFileViewerServer {
   }
 
   async close(): Promise<void> {
+    await Promise.all([...this.services.values()].map((service) => service.close()));
+    this.services.clear();
     const server = this.server;
     this.server = undefined;
     this.address = undefined;
     if (server) await closeServer(server);
   }
 
+  mountService(name: string, service: LocalFileViewerService): { publicBaseUrl: string; unmount(): void } {
+    if (!this.address || !this.server) throw new Error("Preview server is not running.");
+    if (!/^[a-z][a-z0-9-]*$/u.test(name) || ["preview", "turn-preview", "assets", "view", "raw"].includes(name)) {
+      throw new Error("Invalid Preview service route.");
+    }
+    const basePath = `${this.basePath}/${name}`;
+    if (this.services.has(basePath)) throw new Error("Preview service route is already mounted.");
+    this.services.set(basePath, service);
+    const url = new URL(this.address.publicBaseUrl);
+    url.pathname = basePath;
+    return { publicBaseUrl: url.toString(), unmount: () => {
+      if (this.services.get(basePath) === service) this.services.delete(basePath);
+    } };
+  }
+
+  private serviceFor(request: IncomingMessage): LocalFileViewerService | undefined {
+    try {
+      const pathname = new URL(request.url ?? "/", "http://127.0.0.1").pathname;
+      return [...this.services].find(([base]) => pathname === base || pathname.startsWith(`${base}/`))?.[1];
+    } catch { return undefined; }
+  }
+
   createFileUrl(filePath: string, reference?: string): string | undefined {
     if (!this.address || !this.secret) return undefined;
     const absolutePath = normalizeAbsolutePath(filePath);
@@ -397,6 +434,8 @@ export class LocalFileViewerServer {
   }
 
   private async handleRequest(request: IncomingMessage, response: ServerResponse): Promise<void> {
+    const service = this.serviceFor(request);
+    if (service) { service.handleRequest(request, response); return; }
     if (request.method !== "GET" && request.method !== "HEAD") {
       response.setHeader("Allow", "GET, HEAD");
       this.sendHtml(response, 405, errorPage("不支持的请求", "该服务只接受只读请求。"), request.method === "HEAD");
@@ -433,14 +472,16 @@ export class LocalFileViewerServer {
         return;
       }
       const journal = this.options.previewJournal;
-      const recorded = journal?.has(turnId);
+      const stored = journal?.has(turnId) ? undefined : this.options.getTurnSnapshot?.(turnId);
+      const journalId = isTurnPreviewState(stored) ? stored.previewTurnId ?? turnId : turnId;
+      const recorded = journal?.has(journalId);
       if (recorded && requestUrl.searchParams.get("events") === "1") {
-        this.serveJournalEvents(request, response, turnId, journal!);
+        this.serveJournalEvents(request, response, journalId, journal!);
         return;
       }
       const detailKey = requestUrl.searchParams.get("detail");
       let snapshot = recorded
-        ? journal!.load(turnId, detailKey ?? false)
+        ? journal!.load(journalId, detailKey ?? false)
         : this.options.getTurnSnapshot?.(turnId);
       if (!recorded && this.options.loadTurnSnapshot && request.method !== "HEAD"
         && requestUrl.searchParams.get("events") !== "1" && !requestUrl.searchParams.has("detail")) {
@@ -467,7 +508,7 @@ export class LocalFileViewerServer {
         const after = requestUrl.searchParams.get("detailAfter");
         const outputAppend = recorded && after && tool?.kind === "tool" && tool.tool.kind === "command" && !tool.tool.error
           && !/repl/i.test(tool.tool.title) && snapshot.previewCursor !== undefined
-          ? journal!.outputAppend(turnId, tool.id, Number(after), snapshot.previewCursor) : undefined;
+          ? journal!.outputAppend(journalId, tool.id, Number(after), snapshot.previewCursor) : undefined;
         const detail = outputAppend !== undefined && tool?.kind === "tool"
           && (snapshot.fullToolOutputs?.[tool.id]?.length ?? 0) > outputAppend.length
           ? { key, revision: String(tool.tool.previewRevision), content: "", outputAppend,
@@ -965,6 +1006,9 @@ export class LocalFileViewerServer {
     if (renderHtml) {
       // A response-level sandbox also isolates this document when opened outside the viewer iframe.
       response.setHeader("Content-Security-Policy", "sandbox allow-scripts; default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; img-src data: blob:; media-src data: blob:; font-src data:; base-uri 'none'; form-action 'none'; frame-ancestors 'self'");
+    } else {
+      // Raw HTML/SVG/XML must not gain the shared origin's storage or execution privileges.
+      response.setHeader("Content-Security-Policy", "sandbox; default-src 'none'; style-src 'unsafe-inline'; img-src data: blob:; media-src data: blob:; base-uri 'none'; form-action 'none'; frame-ancestors 'self'");
     }
     response.setHeader("Accept-Ranges", "bytes");
     response.setHeader("Cache-Control", "no-store");

package/src/local-files/TurnPreviewPage.ts

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { approvalActivityId } from "../presentation/TurnStateReducer.js";
 import path from "node:path";
 import { enableDiagramFences, DIAGRAM_PREVIEW_CLIENT_SCRIPT, DIAGRAM_PREVIEW_CSS } from "./DiagramPreview.js";
 import MarkdownIt from "markdown-it";
@@ -693,7 +694,10 @@ function renderApprovalNotice(request: ApprovalRequest, renderText: (value: stri
     : `<div class="markdown">${renderText(reason)}</div>`;
   const details = commandApproval
     ? `<details class="approval-details" data-activity-id="approval:${escapeAttribute(request.id)}"><summary>${language === "zh" ? "查看完整命令" : "View full command"}</summary><pre data-scroll-id="approval:${escapeAttribute(request.id)}:command">${escapeHtml(request.command!)}</pre></details>` : "";
-  return `<section class="notice" data-preview-key="approval"><h2>${escapeHtml(title)}</h2>${description}${details}<p>${language === "zh" ? "请在飞书任务卡片中确认或拒绝。" : "Approve or reject using the task card in Feishu."}</p></section>`;
+  const instruction = request.automatic
+    ? language === "zh" ? "自动执行模式：正在自动同意。" : "Auto mode: approving automatically."
+    : language === "zh" ? "请在飞书任务卡片中确认或拒绝。" : "Approve or reject using the task card in Feishu.";
+  return `<section class="notice" data-preview-key="approval"><h2>${escapeHtml(title)}</h2>${description}${details}<p>${instruction}</p></section>`;
 }
 
 function renderFinalAnswer(markdown: string, turnId: string, renderText: (value: string) => string, language: TurnPreviewLanguage): string {
@@ -726,7 +730,8 @@ function renderTimeline(
   projectCwd?: string,
   deferDetails = false,
 ): string {
-  const activities = state.activities ?? [];
+  const activities = state.approval
+    ? state.activities.filter((a) => a.id !== approvalActivityId(state.turnId, state.approval!.id)) : state.activities ?? [];
   const positions = new Map(activities.map((activity, index) => [activity.id, index]));
   const reasoning = new Map<number, TurnReasoningItem[]>();
   for (const item of turnReasoningItems(state)) {

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);
@@ -305,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,
@@ -317,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 {
@@ -363,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;
@@ -442,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,
@@ -458,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,
@@ -473,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,

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;