@twinsearth/dsh-master 3.2.10 → 3.3.1

package/dist-host/plugins/superagent-router.js

@@ -27,6 +27,8 @@ const EVENTS_PATH = '/dsh-master/api/superagent/worker-events';
 const STREAM_PATH = '/dsh-master/api/superagent/stream';
 const STREAM_TOKEN_PATH = '/dsh-master/api/superagent/stream-token';
 const STATUS_PATH = '/dsh-master/api/superagent/status';
+/** §5.6：成本事件摘要（状态页 / 分身信息栏读取）。 */
+const COST_PATH = '/dsh-master/api/superagent/cost';
 const SESSION_PATH = '/dsh-master/api/superagent/session';
 const PR_PATH = '/dsh-master/api/superagent/pr';
 const GITHUB_PATH = '/dsh-master/api/superagent/github';
@@ -275,6 +277,95 @@ export function apply(ctx, config = {}) {
         if (token)
             tokenManager.revoke(token, 'ticket-done');
     };
+    /**
+     * §5.6：把 Worker 上报的 `cost` 事件按 ticket 汇成只读摘要，
+     * 供状态页与「分身信息栏」读取（不暴露任何 token）。
+     */
+    const costSummary = (ticketId) => {
+        const id = ticketId === undefined ? null : String(ticketId);
+        // §11：只读成本块的数据源——系统层 savings 两列（A 单价 / B 跳过调用）+ 命中率。
+        const serviceBlock = (() => {
+            try {
+                const cost = safeGet(ctx, SERVICE.cost);
+                if (!cost)
+                    return null;
+                const status = typeof cost.status === 'function' ? cost.status() : null;
+                const report = typeof cost.savingsReport === 'function' ? cost.savingsReport({ amortize: 'even', limit: 2000 }) : null;
+                return {
+                    savings: status?.savings ?? null,
+                    columns: status?.savingsColumns ?? null,
+                    policy: status?.policy ?? null,
+                    ledger: status?.ledger?.entries !== undefined ? { entries: status.ledger.entries } : null,
+                    unitPriceSaved: report?.columns?.unitPrice?.savedTokens ?? 0,
+                    skippedCallSaved: report?.columns?.skippedCalls?.savedTokens ?? 0,
+                    skippedCalls: report?.columns?.skippedCalls?.calls ?? 0,
+                    netLossTasks: report?.netLossTasks?.map((task) => task.taskId) ?? [],
+                    doubleCountGuard: report?.doubleCountGuard === true,
+                    /** 守卫命中率需要各任务上报的 guard 统计聚合；未聚合前如实给 null，不猜。 */
+                    hitRate: null,
+                };
+            }
+            catch {
+                return null;
+            }
+        })();
+        const tickets = id === null ? [...workerEvents.keys()] : [id];
+        /**
+         * §5.6 / M5：回流出口状态来自成本服务（3.3.1 起是真实探测，不再是硬编码）。
+         * 没有成本服务时如实给 `cost-service-unavailable`，不编造“未就绪”原因。
+         */
+        const relayBlock = (() => {
+            try {
+                const cost = safeGet(ctx, SERVICE.cost);
+                if (cost && typeof cost.relayStatus === 'function') {
+                    const relay = cost.relayStatus();
+                    if (relay && typeof relay === 'object')
+                        return relay;
+                }
+            }
+            catch { /* 回流状态读取失败不阻塞成本摘要 */ }
+            return { target: 'fang', available: false, reason: 'cost-service-unavailable' };
+        })();
+        const rows = [];
+        const totals = { events: 0, degraded: 0, substitutions: 0, estimated: 0, savedTokens: 0 };
+        for (const key of tickets) {
+            const events = (workerEvents.get(key) ?? []).filter((event) => event && event.type === 'cost');
+            if (events.length === 0)
+                continue;
+            const row = { ticketId: key, events: 0, degraded: 0, substitutions: 0, estimated: 0, savedTokens: 0, points: {}, modules: {} };
+            for (const event of events) {
+                const payload = event.payload ?? {};
+                row.events += 1;
+                row.points[String(payload.point ?? 'unknown')] = (row.points[String(payload.point ?? 'unknown')] ?? 0) + 1;
+                if (payload.point === 'degraded')
+                    row.degraded += 1;
+                if (payload.estimated === true)
+                    row.estimated += 1;
+                const compaction = payload.compaction;
+                if (compaction && compaction.applied === true) {
+                    row.savedTokens += Math.max(0, Number(compaction.estimatedTokens ?? 0) || 0);
+                    const moduleKey = String(compaction.module ?? 'a1-compact');
+                    row.modules[moduleKey] = (row.modules[moduleKey] ?? 0) + Math.max(0, Number(compaction.estimatedTokens ?? 0) || 0);
+                }
+            }
+            totals.events += row.events;
+            totals.degraded += row.degraded;
+            totals.substitutions += row.substitutions;
+            totals.estimated += row.estimated;
+            totals.savedTokens += row.savedTokens;
+            rows.push(row);
+        }
+        return {
+            ok: true,
+            ticketId: id,
+            tickets: rows,
+            totals,
+            /* §11：只读成本块（A 单价项 / B 跳过调用项分列 + 命中率），面板只读消费。 */
+            service: serviceBlock,
+            /* §5.6 / M5：瓮城回流出口真实状态（不可用必须显式带原因）。 */
+            relay: relayBlock,
+        };
+    };
     const service = {
         id: 'superagent-router',
         version: '3.2.5',
@@ -284,6 +375,8 @@ export function apply(ctx, config = {}) {
             forkerService: hasForker(),
             streaming: { configured: Boolean(origin), ...broadcaster.describe(), tokens: tokenManager.counts() },
             workerEvents: Object.fromEntries([...workerEvents.entries()].map(([k, v]) => [k, v.length])),
+            cost: costSummary().totals,
+            costRelay: costSummary().relay,
             writeback: writeback.describe(),
             quota: quotaStatus(),
             sessions: { count: sessionMap.size, last: [...sessionMap.values()].slice(-3) },
@@ -301,6 +394,8 @@ export function apply(ctx, config = {}) {
         workerEvents(ticketId) {
             return { ok: true, ticketId: String(ticketId ?? ''), events: workerEvents.get(String(ticketId ?? '')) ?? [] };
         },
+        /** §5.6：成本事件摘要（状态页/分身信息栏的数据源）。 */
+        cost(ticketId) { return costSummary(ticketId); },
         tokenAudit(limit) { return tokenManager.audit(limit); },
         rotateStreamToken(oldToken = '') { return tokenManager.rotate(oldToken, { kind: 'ui' }); },
         quota: () => quotaStatus(),
@@ -459,6 +554,14 @@ export function apply(ctx, config = {}) {
                         return jsonResponse(res, 200, { ok: true, session: mapped });
                     },
                 });
+                register({
+                    kind: 'exact', path: COST_PATH, method: 'GET',
+                    handler: async (req, res) => {
+                        const query = new URL(String(req?.url ?? '/'), 'http://x').searchParams;
+                        const ticketId = query.get('ticketId');
+                        return jsonResponse(res, 200, service.cost(ticketId === null ? undefined : String(ticketId)));
+                    },
+                });
                 register({
                     kind: 'exact', path: GITHUB_PATH, method: 'POST',
                     handler: async (req, res) => {
@@ -496,4 +599,4 @@ export function apply(ctx, config = {}) {
     catch { /* 无 webServer 时仍可通过服务调用 ingest */ }
     return service;
 }
-export { EVENTS_PATH, STREAM_PATH, STREAM_TOKEN_PATH, STATUS_PATH, SESSION_PATH, readRawBody };
+export { EVENTS_PATH, STREAM_PATH, STREAM_TOKEN_PATH, STATUS_PATH, SESSION_PATH, COST_PATH, readRawBody };

package/dist-host/superagent/types.js

@@ -142,3 +142,11 @@ export function publicTicket(ticket, extra = {}) {
         ...extra,
     };
 }
+/* ------------------------------------------------------------------ *
+ * 3.3.0 §11：成本域对外类型（宿主侧）
+ *
+ * 这些是**跨进程/跨插件边界的形状**：Worker 侧同名类型在 worker/*.ts，
+ * 宿主侧以本文件为准。字段名保持一致，便于证书与事件在两侧无损传递。
+ * ------------------------------------------------------------------ */
+/** 成本事件类型（§5.6 事件总线）。 */
+export const COST_EVENT_TYPE = Object.freeze(['cost:event', 'cost:degraded', 'cost:substitution']);