aws-runtime-bridge 1.9.10 → 1.9.21

package/dist/services/instance-ai-config-service.js

@@ -0,0 +1,174 @@
+/**
+ * AI 配置服务
+ *
+ * 管理 ACode 实例的 AI provider 配置（model/baseURL/apiKey）。
+ * 支持三层来源（api > env > file）仲裁，deep-merge 后写入
+ * per-instance acode.json 供 ACode runtime 加载。
+ */
+import fs from "node:fs/promises";
+import path from "node:path";
+import { getAcodeConfigFile, getRuntimeHomeDir } from "../config.js";
+import { getInstanceAiConfigDebugLogger } from "../utils/instance-ai-config-debug-logger.js";
+// ── 敏感信息脱敏 ─────────────────────────────────────────
+const SENSITIVE_KEYS = new Set([
+    "apiKey", "api_key", "apikey",
+    "key", "secret", "token", "password",
+]);
+/**
+ * 脱敏日志中的敏感字段（apiKey / secret / token / password）。
+ * 返回新对象，不修改原对象。
+ */
+export function redactForLog(obj) {
+    const result = { ...obj };
+    for (const key of Object.keys(result)) {
+        if (SENSITIVE_KEYS.has(key)) {
+            const val = result[key];
+            if (typeof val === "string" && val.length > 0) {
+                result[key] = val.length > 8
+                    ? `${val.slice(0, 4)}...${val.slice(-4)}`
+                    : "***";
+            }
+        }
+        else if (typeof result[key] === "object" && result[key] !== null) {
+            result[key] = redactForLog(result[key]);
+        }
+    }
+    return result;
+}
+// ── 配置准备 ─────────────────────────────────────────────
+function loadEnvLayer() {
+    return {
+        ...(process.env.ACODE_MODEL ? { model: process.env.ACODE_MODEL } : {}),
+        ...(process.env.ACODE_BASE_URL ? { baseURL: process.env.ACODE_BASE_URL } : {}),
+        ...(process.env.ACODE_API_KEY ? { apiKey: process.env.ACODE_API_KEY } : {}),
+        ...(process.env.ACODE_EFFORT ? { effort: process.env.ACODE_EFFORT } : {}),
+    };
+}
+async function loadFileLayer(acodeConfigPath) {
+    try {
+        const raw = await fs.readFile(acodeConfigPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        const provider = parsed.provider;
+        const def = provider?.default;
+        const opts = def?.options;
+        return {
+            ...(def?.model ? { model: def.model } : {}),
+            ...(opts?.baseURL || opts?.baseUrl ? { baseURL: opts.baseURL || opts.baseUrl } : {}),
+            ...(opts?.apiKey ? { apiKey: opts.apiKey } : {}),
+        };
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * 仲裁来源标签。优先级：api > env > file > default
+ */
+function resolveSourceLabel(key, apiVal, envVal, fileVal) {
+    if (apiVal !== undefined)
+        return "api";
+    if (envVal !== undefined)
+        return "env";
+    if (fileVal !== undefined)
+        return "file";
+    return "default";
+}
+/**
+ * 准备 ACode 实例配置。
+ *
+ * 主流程：
+ * 1. 从 apiOverrides（请求体）、env（环境变量）、file（acode.json）三层收集配置
+ * 2. 按 api > env > file 优先级仲裁每个字段
+ * 3. 将仲裁结果 deep-merge 写入 per-instance acode.json
+ * 4. 返回合并后的 config 和 per-instance 文件路径
+ */
+export async function prepareAcodeInstanceConfig(options) {
+    const runtimeHome = getRuntimeHomeDir();
+    const globalConfigPath = getAcodeConfigFile(runtimeHome);
+    const perInstanceDir = path.join(runtimeHome, ".aws-bridge", "instances", options.agentId);
+    const perInstanceConfigPath = path.join(perInstanceDir, "acode.json");
+    // 收集三层配置
+    const apiLayer = options.apiOverrides ?? {};
+    const envLayer = loadEnvLayer();
+    const fileLayer = await loadFileLayer(globalConfigPath);
+    // 逐字段仲裁（api > env > file）
+    const model = apiLayer.model ?? envLayer.model ?? fileLayer.model;
+    const baseURL = apiLayer.baseURL ?? envLayer.baseURL ?? fileLayer.baseURL;
+    const apiKey = apiLayer.apiKey ?? envLayer.apiKey ?? fileLayer.apiKey;
+    const effort = apiLayer.effort ?? envLayer.effort;
+    const resolvedConfig = {};
+    if (model)
+        resolvedConfig.model = model;
+    if (baseURL)
+        resolvedConfig.baseURL = baseURL;
+    if (apiKey)
+        resolvedConfig.apiKey = apiKey;
+    if (effort)
+        resolvedConfig.effort = effort;
+    const source = {
+        model: resolveSourceLabel("model", apiLayer.model, envLayer.model, fileLayer.model),
+        baseURL: resolveSourceLabel("baseURL", apiLayer.baseURL, envLayer.baseURL, fileLayer.baseURL),
+        apiKey: resolveSourceLabel("apiKey", apiLayer.apiKey, envLayer.apiKey, fileLayer.apiKey),
+        effort: resolveSourceLabel("effort", apiLayer.effort, envLayer.effort, undefined),
+    };
+    // 写入 per-instance acode.json（deep-merge 全局配置 + 仲裁结果）
+    const dbg = getInstanceAiConfigDebugLogger();
+    try {
+        await fs.mkdir(perInstanceDir, { recursive: true });
+        // 读取全局 acode.json 作为 base
+        let baseConfig = {};
+        try {
+            const globalRaw = await fs.readFile(globalConfigPath, "utf-8");
+            baseConfig = JSON.parse(globalRaw);
+        }
+        catch {
+            // 全局文件不存在则用空对象
+        }
+        // deep-merge provider.default.options
+        const mergedConfig = JSON.parse(JSON.stringify(baseConfig));
+        const provider = (mergedConfig.provider ?? {});
+        const def = (provider.default ?? {});
+        const options_ = (def.options ?? {});
+        if (model)
+            options_.model = model;
+        if (baseURL)
+            options_.baseURL = baseURL;
+        if (apiKey)
+            options_.apiKey = apiKey;
+        if (effort)
+            options_.effort = effort;
+        def.options = options_;
+        provider.default = def;
+        mergedConfig.provider = provider;
+        await fs.writeFile(perInstanceConfigPath, JSON.stringify(mergedConfig, null, 2), "utf-8");
+        void dbg.log({
+            level: "info",
+            category: "apply",
+            message: "per-instance acode.json 已写入",
+            source: "bridge",
+            agentId: options.agentId,
+            sessionId: options.sessionId,
+            details: {
+                perInstanceConfigPath,
+                source,
+            },
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        void dbg.log({
+            level: "error",
+            category: "apply",
+            message: `per-instance acode.json 写入失败: ${message}`,
+            source: "bridge",
+            agentId: options.agentId,
+        });
+    }
+    return {
+        instanceConfig: {
+            config: resolvedConfig,
+            source,
+        },
+        perInstanceConfigPath,
+    };
+}

package/dist/services/panel-auth.d.ts

@@ -12,6 +12,14 @@ export declare function createSession(): string;
 export declare function validateSession(token: string | undefined | null): boolean;
 /** 销毁指定会话（登出） */
 export declare function destroySession(token: string): void;
+/** 列出所有活跃会话（用于管理面板） */
+export declare function getAllSessions(): Array<{
+    token: string;
+    createdAt: number;
+    lastUsedAt: number;
+}>;
+/** 获取当前活跃会话数 */
+export declare function getActiveSessionCount(): number;
 interface PanelCredentials {
     username: string;
     password: string;

package/dist/services/panel-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-auth.d.ts","sourceRoot":"","sources":["../../src/services/panel-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAwCH,yBAAyB;AACzB,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED,kCAAkC;AAClC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAWzE;AAED,iBAAiB;AACjB,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAElD;AAID,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA0BD,mCAAmC;AACnC,wBAAgB,mBAAmB,IAAI,gBAAgB,CAWtD;AAED,cAAc;AACd,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAGT;AAED,wBAAwB;AACxB,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAWlD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAG9C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI,CA8BN"}
+{"version":3,"file":"panel-auth.d.ts","sourceRoot":"","sources":["../../src/services/panel-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAwCH,yBAAyB;AACzB,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED,kCAAkC;AAClC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAWzE;AAED,iBAAiB;AACjB,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAElD;AAED,uBAAuB;AACvB,wBAAgB,cAAc,IAAI,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAEhG;AAED,gBAAgB;AAChB,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAID,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA0BD,mCAAmC;AACnC,wBAAgB,mBAAmB,IAAI,gBAAgB,CAWtD;AAED,cAAc;AACd,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAGT;AAED,wBAAwB;AACxB,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAWlD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAG9C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI,CA8BN"}

package/dist/services/panel-auth.js

@@ -60,6 +60,14 @@ export function validateSession(token) {
 export function destroySession(token) {
     sessions.delete(token);
 }
+/** 列出所有活跃会话（用于管理面板） */
+export function getAllSessions() {
+    return Array.from(sessions.values());
+}
+/** 获取当前活跃会话数 */
+export function getActiveSessionCount() {
+    return sessions.size;
+}
 let cachedCredentials = null;
 function getConfigFilePath() {
     return path.join(os.homedir(), ".aws-bridge", "config.json");

package/dist/services/ring-buffer.d.ts

@@ -0,0 +1,67 @@
+/**
+ * 环状缓冲区
+ *
+ * 提供固定容量的泛型环状缓冲区，支持追加和按条件合并。
+ * 当缓冲区满时自动覆盖最旧的元素。
+ */
+export interface RingBufferEntry<T> {
+    data: T;
+    readonly timestamp: number;
+    readonly index: number;
+}
+export type RingBufferSlice<T> = readonly RingBufferEntry<T>[];
+/**
+ * 泛型环状缓冲区。
+ * 容量固定，写入超过容量后自动覆盖最旧条目。
+ * 每个 entry 携带单调递增 index，支持增量查询。
+ */
+export declare class RingBuffer<T> {
+    private readonly entries;
+    private readonly capacity;
+    private nextIndex;
+    private totalAppended;
+    constructor(capacity: number);
+    /**
+     * 追加一条记录到缓冲区尾部。
+     * 缓冲区满时自动覆盖最旧的记录。
+     * @returns 新创建的条目
+     */
+    append(item: T): RingBufferEntry<T>;
+    /**
+     * 按条件追加或合并到最后一条记录。
+     * 如果缓冲区非空且 condition 返回 true，将 item 合并到最后一条记录中；
+     * 否则直接追加新记录。
+     *
+     * @param item 待追加的数据
+     * @param condition 判断是否与最后一条合并，接收最后一条条目
+     * @param merge 合并函数，接收已有数据和新增数据，返回合并结果
+     * @returns 被合并或新创建的条目
+     */
+    appendOrMerge(item: T, condition: (lastEntry: RingBufferEntry<T>) => boolean, merge: (last: T, next: T) => T): RingBufferEntry<T>;
+    /**
+     * 返回当前所有条目的快照。
+     */
+    slice(): RingBufferSlice<T>;
+    /**
+     * 返回当前条目数。
+     */
+    get size(): number;
+    /**
+     * 返回最近 N 条记录。
+     */
+    getLastN(n: number): RingBufferSlice<T>;
+    /**
+     * 返回自指定 index（不含）之后的记录。
+     * @returns 包含 entries、nextIndex（下一个待分配 index）、oldestIndex（最老条目的 index）
+     */
+    getSinceIndex(index: number): {
+        entries: RingBufferSlice<T>;
+        nextIndex: number;
+        oldestIndex: number;
+    };
+    /**
+     * 清空缓冲区。
+     */
+    clear(): void;
+}
+//# sourceMappingURL=ring-buffer.d.ts.map

package/dist/services/ring-buffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ring-buffer.d.ts","sourceRoot":"","sources":["../../src/services/ring-buffer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,SAAS,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,UAAU,CAAC,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,aAAa,CAAK;gBAEd,QAAQ,EAAE,MAAM;IAQ5B;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAanC;;;;;;;;;OASG;IACH,aAAa,CACX,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,OAAO,EACrD,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,GAC7B,eAAe,CAAC,CAAC,CAAC;IAWrB;;OAEG;IACH,KAAK,IAAI,eAAe,CAAC,CAAC,CAAC;IAI3B;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAQvC;;;OAGG;IACH,aAAa,CACX,KAAK,EAAE,MAAM,GACZ;QAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;IAQ1E;;OAEG;IACH,KAAK,IAAI,IAAI;CAKd"}

package/dist/services/ring-buffer.js

@@ -0,0 +1,103 @@
+/**
+ * 环状缓冲区
+ *
+ * 提供固定容量的泛型环状缓冲区，支持追加和按条件合并。
+ * 当缓冲区满时自动覆盖最旧的元素。
+ */
+/**
+ * 泛型环状缓冲区。
+ * 容量固定，写入超过容量后自动覆盖最旧条目。
+ * 每个 entry 携带单调递增 index，支持增量查询。
+ */
+export class RingBuffer {
+    constructor(capacity) {
+        this.nextIndex = 0;
+        this.totalAppended = 0;
+        if (capacity <= 0) {
+            throw new Error("RingBuffer capacity must be positive");
+        }
+        this.capacity = capacity;
+        this.entries = [];
+    }
+    /**
+     * 追加一条记录到缓冲区尾部。
+     * 缓冲区满时自动覆盖最旧的记录。
+     * @returns 新创建的条目
+     */
+    append(item) {
+        const index = this.totalAppended;
+        const entry = { data: item, timestamp: Date.now(), index };
+        if (this.entries.length < this.capacity) {
+            this.entries.push(entry);
+        }
+        else {
+            this.entries[this.nextIndex % this.capacity] = entry;
+        }
+        this.nextIndex++;
+        this.totalAppended++;
+        return entry;
+    }
+    /**
+     * 按条件追加或合并到最后一条记录。
+     * 如果缓冲区非空且 condition 返回 true，将 item 合并到最后一条记录中；
+     * 否则直接追加新记录。
+     *
+     * @param item 待追加的数据
+     * @param condition 判断是否与最后一条合并，接收最后一条条目
+     * @param merge 合并函数，接收已有数据和新增数据，返回合并结果
+     * @returns 被合并或新创建的条目
+     */
+    appendOrMerge(item, condition, merge) {
+        if (this.entries.length > 0) {
+            const lastEntry = this.entries[this.entries.length - 1];
+            if (condition(lastEntry)) {
+                lastEntry.data = merge(lastEntry.data, item);
+                return lastEntry;
+            }
+        }
+        return this.append(item);
+    }
+    /**
+     * 返回当前所有条目的快照。
+     */
+    slice() {
+        return [...this.entries];
+    }
+    /**
+     * 返回当前条目数。
+     */
+    get size() {
+        return this.entries.length;
+    }
+    /**
+     * 返回最近 N 条记录。
+     */
+    getLastN(n) {
+        if (n <= 0)
+            return [];
+        const total = this.entries.length;
+        if (total === 0)
+            return [];
+        const count = Math.min(n, total);
+        return this.entries.slice(total - count);
+    }
+    /**
+     * 返回自指定 index（不含）之后的记录。
+     * @returns 包含 entries、nextIndex（下一个待分配 index）、oldestIndex（最老条目的 index）
+     */
+    getSinceIndex(index) {
+        const oldestIndex = this.entries.length > 0
+            ? this.entries[0].index
+            : this.totalAppended;
+        const entries = this.entries.filter((e) => e.index > index);
+        return { entries, nextIndex: this.totalAppended, oldestIndex };
+    }
+    /**
+     * 清空缓冲区。
+     */
+    clear() {
+        this.entries.length = 0;
+        this.nextIndex = 0;
+        this.totalAppended = 0;
+    }
+}

package/dist/services/session-output.d.ts

@@ -3,12 +3,58 @@
  *
  * 管理终端会话的输出缓冲和刷新机制
  */
-import type { AxiosResponse } from "axios";
+import { type AxiosResponse } from "axios";
 import type { Session } from "../types.js";
+import { RingBuffer, type RingBufferEntry, type RingBufferSlice } from "./ring-buffer.js";
+/**
+ * 桥接侧本地事件的 category 分类。
+ * status — 状态变更事件；output — 输出增量事件；question — 询问事件；file_changed — 文件变更事件。
+ */
+export type BridgeEventCategory = "status" | "output" | "question" | "file_changed";
+/**
+ * 桥接侧 ring buffer 中存储的事件负载。
+ *
+ * 记录从 sendStatus / sendOutput / sendQuestionRequest / sendFileChanged
+ * 产生的非关键时间线数据，供本地增量查询和调试面板使用。
+ */
+export interface BridgeEventPayload {
+    readonly category: BridgeEventCategory;
+    readonly agentId: string;
+    readonly sessionId: string | null;
+    readonly status?: string;
+    readonly output?: string;
+    readonly seq?: number;
+    readonly questions?: unknown[];
+    readonly actionType?: string;
+    readonly actionLabel?: string;
+    readonly actionDetail?: string;
+    readonly actionInput?: string;
+    readonly actionResult?: string;
+    readonly actionId?: string;
+    readonly inputTokens?: number;
+    readonly outputTokens?: number;
+    readonly sourceEventType?: string;
+    readonly logLevel?: string;
+    readonly logCategory?: string;
+    readonly workspacePath?: string;
+    readonly filePath?: string;
+    readonly eventType?: string;
+    readonly size?: number;
+}
+/** RingBufferEntry 的便捷导出 */
+export type { RingBufferEntry, RingBufferSlice };
+/**
+ * 全局桥接侧事件环状缓冲区。
+ *
+ * 容量 2000 条，适用于记录非关键状态/输出事件。
+ * 通过 sendStatus/sendOutput 自动写入，同时保留原有的 server 回调路径。
+ */
+export declare const bridgeEventBuffer: RingBuffer<BridgeEventPayload>;
 interface RuntimeStatusActionInfo {
     actionType?: string;
     actionLabel?: string;
     actionDetail?: string;
+    actionInput?: string;
     actionResult?: string;
     actionId?: string;
 }
@@ -40,7 +86,8 @@ export declare const sessions: Map<string, Session>;
 export declare function sendStatus(agentId: string, sessionId: string | null, status: string, actionInfo?: RuntimeStatusActionInfo, usage?: {
     inputTokens: number;
     outputTokens: number;
-}, authOptions?: RuntimeCallbackAuthOptions): Promise<AxiosResponse<unknown> | undefined>;
+    contextLimit?: number;
+}, authOptions?: RuntimeCallbackAuthOptions, timestamp?: number, sourceEventType?: string): Promise<AxiosResponse<unknown> | undefined>;
 /**
  * 发送输出到调度器
  *
@@ -88,5 +135,4 @@ export declare function scheduleOutputFlush(sessionId: string): void;
  * @param sessionId - 会话 ID
  */
 export declare function flushSessionOutput(sessionId: string): Promise<void>;
-export {};
 //# sourceMappingURL=session-output.d.ts.map

package/dist/services/session-output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/services/session-output.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI3C,UAAU,uBAAuB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAgED,aAAa;AACb,eAAO,MAAM,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAa,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,uBAAuB,EACpC,KAAK,CAAC,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,EACrD,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAgE7C;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,qBAAqB,EAChC,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAgBzE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAa3D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCzE"}
+{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/services/session-output.ts"],"names":[],"mappings":"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"}

package/dist/services/session-output.js

@@ -4,10 +4,20 @@
  * 管理终端会话的输出缓冲和刷新机制
  */
 import axios from "axios";
-import { requestRuntimeAccessTokenRefreshForServer } from "../services/auto-register.js";
 import { resolveSchedulerBaseUrlFrom } from "../config.js";
+import { requestRuntimeAccessTokenRefreshForServer } from "../services/auto-register.js";
 import { logger } from "../utils/logger.js";
+import { agentEventStore } from "./agent-event-store.js";
+import { scheduleEventPush } from "./event-delta-pusher.js";
+import { RingBuffer } from "./ring-buffer.js";
 import { getRuntimeAccessToken } from "./runtime-binding.js";
+/**
+ * 全局桥接侧事件环状缓冲区。
+ *
+ * 容量 2000 条，适用于记录非关键状态/输出事件。
+ * 通过 sendStatus/sendOutput 自动写入，同时保留原有的 server 回调路径。
+ */
+export const bridgeEventBuffer = new RingBuffer(2000);
 function runtimeAuthHeaders(options, callbackBaseUrl = resolveRuntimeCallbackBaseUrl(options)) {
     const token = options?.runtimeAccessToken ||
         getRuntimeAccessToken(undefined, callbackBaseUrl) ||
@@ -59,6 +69,8 @@ async function tryRefreshRuntimeToken(serverBaseUrl) {
         tokenRefreshPromise = null;
     }
 }
+/** 单条 output 事件的文本长度上限（需求 4.1.3 #1），超过则截断。 */
+const MAX_SINGLE_OUTPUT_CHARS = 8000;
 /** 单个会话待发送输出上限，避免调度器不可达时内存无限增长。 */
 const MAX_PENDING_OUTPUT_CHARS = 64 * 1024;
 /** 单次回调最大发送量，避免一次 POST 携带过大的终端噪声。 */
@@ -73,8 +85,12 @@ export const sessions = new Map();
  * @param status - 状态
  * @param actionInfo - 可选的动作详情
  */
-export async function sendStatus(agentId, sessionId, status, actionInfo, usage, authOptions) {
+export async function sendStatus(agentId, sessionId, status, actionInfo, usage, authOptions, timestamp, sourceEventType) {
     const payload = { agentId, sessionId, status };
+    // 添加时间戳（仅当提供了有效时间戳时才传递，保持原始事件时间顺序）
+    if (timestamp !== undefined) {
+        payload.timestamp = timestamp;
+    }
     // 添加细粒度动作信息
     if (actionInfo) {
         if (actionInfo.actionType)
@@ -83,6 +99,8 @@ export async function sendStatus(agentId, sessionId, status, actionInfo, usage,
             payload.actionLabel = actionInfo.actionLabel;
         if (actionInfo.actionDetail)
             payload.actionDetail = actionInfo.actionDetail;
+        if (actionInfo.actionInput)
+            payload.actionInput = actionInfo.actionInput;
         if (actionInfo.actionResult)
             payload.actionResult = actionInfo.actionResult;
         if (actionInfo.actionId)
@@ -92,6 +110,13 @@ export async function sendStatus(agentId, sessionId, status, actionInfo, usage,
     if (usage) {
         payload.inputTokens = usage.inputTokens;
         payload.outputTokens = usage.outputTokens;
+        if (usage.contextLimit) {
+            payload.contextLimit = usage.contextLimit;
+        }
+    }
+    // 添加来源事件类型（用于前端时间线灰度区分，如 thinking / ai_request）
+    if (sourceEventType) {
+        payload.sourceEventType = sourceEventType;
     }
     const callbackBaseUrl = resolveRuntimeCallbackBaseUrl(authOptions);
     const headers = runtimeAuthHeaders(authOptions, callbackBaseUrl);
@@ -129,6 +154,28 @@ export async function sendStatus(agentId, sessionId, status, actionInfo, usage,
         });
         return undefined;
     }
+    finally {
+        // 不论 server 回调成功或失败，都在桥接侧本地记录状态事件
+        const eventPayload = {
+            category: "status",
+            agentId,
+            sessionId,
+            status,
+            actionType: actionInfo?.actionType,
+            actionLabel: actionInfo?.actionLabel,
+            actionDetail: actionInfo?.actionDetail,
+            actionInput: actionInfo?.actionInput,
+            actionResult: actionInfo?.actionResult,
+            actionId: actionInfo?.actionId,
+            inputTokens: usage?.inputTokens,
+            outputTokens: usage?.outputTokens,
+            sourceEventType,
+        };
+        bridgeEventBuffer.append(eventPayload);
+        // 同步写入 per-agent 事件存储并调度差量推送
+        const entry = agentEventStore.append(agentId, eventPayload);
+        scheduleEventPush(agentId, entry, authOptions);
+    }
 }
 /**
  * 发送输出到调度器
@@ -174,6 +221,47 @@ export async function sendOutput(agentId, output, sessionId, seq, metadata, auth
             error,
         });
     }
+    finally {
+        // 不论 server 回调成功或失败，都在桥接侧本地记录输出事件
+        // 需求 4.1.3 #1：截断超长 output，确保单条事件体积可控
+        const truncatedOutput = output.length > MAX_SINGLE_OUTPUT_CHARS
+            ? `${output.slice(0, MAX_SINGLE_OUTPUT_CHARS)}...(truncated)`
+            : output;
+        const eventPayload = {
+            category: "output",
+            agentId,
+            sessionId,
+            output: truncatedOutput,
+            seq,
+            sourceEventType: metadata?.sourceEventType,
+            logLevel: metadata?.logLevel,
+            logCategory: metadata?.logCategory,
+        };
+        // output 事件合并写入：同 session + 同 sourceEventType + 10s 窗口内追加到同一条
+        bridgeEventBuffer.appendOrMerge(eventPayload, (lastEntry) => {
+            const last = lastEntry.data;
+            return (last.category === "output" &&
+                last.sessionId === sessionId &&
+                last.sourceEventType === metadata?.sourceEventType &&
+                Date.now() - lastEntry.timestamp <= 10_000);
+        }, (lastData, newData) => {
+            // 内容去重：如果新内容已包含在已合并内容中，跳过拼接防止重复
+            const existingOutput = lastData.output || "";
+            const newOutput = newData.output || "";
+            const merged = existingOutput.includes(newOutput)
+                ? existingOutput
+                : `${existingOutput}${newOutput}`;
+            return {
+                ...lastData,
+                output: merged.length > MAX_SINGLE_OUTPUT_CHARS
+                    ? `${merged.slice(0, MAX_SINGLE_OUTPUT_CHARS)}...(truncated)`
+                    : merged,
+            };
+        });
+        // 同步写入 per-agent 事件存储（同样合并）并调度差量推送
+        const entry = agentEventStore.appendOrMergeOutput(agentId, eventPayload);
+        scheduleEventPush(agentId, entry, authOptions);
+    }
 }
 /**
  * 发送 AskUserQuestion 事件到调度器。
@@ -210,6 +298,18 @@ export async function sendQuestionRequest(agentId, sessionId, questions, authOpt
         }
         // ignore transient callback failures
     }
+    finally {
+        // 记录 question 事件到 per-agent 存储
+        const eventPayload = {
+            category: "question",
+            agentId,
+            sessionId,
+            questions,
+        };
+        bridgeEventBuffer.append(eventPayload);
+        const entry = agentEventStore.append(agentId, eventPayload);
+        scheduleEventPush(agentId, entry, authOptions);
+    }
 }
 /**
  * 发送工作区文件变更事件到调度器，由调度器通过 WebSocket 通知前端刷新预览。
@@ -241,6 +341,19 @@ export async function sendFileChanged(payload) {
         }
         // ignore transient callback failures
     }
+    finally {
+        // 记录 file_changed 事件到 per-agent 存储
+        const eventPayload = {
+            category: "file_changed",
+            agentId: "",
+            sessionId: null,
+            workspacePath: payload.workspacePath,
+            filePath: payload.filePath,
+            eventType: payload.eventType,
+            size: payload.size,
+        };
+        bridgeEventBuffer.append(eventPayload);
+    }
 }
 /**
  * 追加会话输出到有界缓冲区。