@gird/ccli 2.18.0 → 2.19.0

package/dist/server/sessions.js

@@ -0,0 +1,181 @@
+/**
+ * 会话管理 —— 让 Server 支持「有状态多轮 + 常驻事件流」。
+ *
+ * 第 114 步的 `/prompt` 是无状态单次调用；本模块给每个会话维护一份**持久历史**与
+ * 一组 **SSE 订阅者**：一次 prompt 触发一个回合，产生的 HarnessEvent 广播给所有订阅
+ * 该会话 stream 的客户端，回合结束把助手文本回给发起方。
+ *
+ * 第 116 步新增「审批回路」：破坏性工具触发 confirm() 时，Server 生成 approvalId
+ * 通过 SSE 推给客户端，再阻塞等待客户端通过 POST /approvals 回执。
+ *
+ * backend 是**注入点**：默认用真实 Harness（每会话一个），测试可换成发假事件的实现，
+ * 从而无需真实 provider 就能验证会话/广播逻辑。
+ */
+import { randomUUID } from 'node:crypto';
+import { createCcliHarness } from '../harness/index.js';
+import { emptyStats } from '../cli/stats/index.js';
+/** 默认后端：真实 Harness，每会话一个。 */
+export const harnessBackend = async (noHooks) => {
+    const result = await createCcliHarness({ noHooks });
+    if (!result.ok)
+        return { ok: false, message: result.message };
+    const harness = result.harness;
+    const systemPrompt = harness.buildSystemPrompt(harness.roleBasePrompt('default'));
+    const stats = emptyStats();
+    const backend = {
+        async runTurn(history, prompt, confirm, emit) {
+            history.push({ role: 'user', content: prompt });
+            await harness.runTurnWithEvents({ history, confirm, stats, emit });
+        },
+        close: () => harness.close(),
+    };
+    return { ok: true, backend, systemPrompt };
+};
+export class SessionManager {
+    createBackend;
+    noHooks;
+    sessions = new Map();
+    constructor(createBackend = harnessBackend, noHooks) {
+        this.createBackend = createBackend;
+        this.noHooks = noHooks;
+    }
+    /** 新建会话：建后端、以 system prompt 起头历史。 */
+    async create() {
+        const made = await this.createBackend(this.noHooks);
+        if (!made.ok)
+            return made;
+        const id = randomUUID();
+        this.sessions.set(id, {
+            id,
+            backend: made.backend,
+            history: [{ role: 'system', content: made.systemPrompt }],
+            subscribers: new Set(),
+            busy: false,
+            pendingApprovals: new Map(),
+        });
+        return { ok: true, id };
+    }
+    has(id) {
+        return this.sessions.has(id);
+    }
+    list() {
+        return [...this.sessions.keys()];
+    }
+    /** 订阅会话事件流；返回退订函数。会话不存在返回 null。 */
+    subscribe(id, onEvent) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return null;
+        s.subscribers.add(onEvent);
+        return () => s.subscribers.delete(onEvent);
+    }
+    /** 向一个会话的所有订阅者广播事件（Server 层用于发带 approvalId 的 permission_request）。 */
+    broadcast(id, event) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return;
+        for (const sub of s.subscribers)
+            sub(event);
+    }
+    /**
+     * 向会话发一个 prompt：跑一个回合，事件广播给订阅者，回合结束返回助手文本。
+     * 会话不存在 → 404；正忙 → 409。
+     *
+     * confirm 回调由调用方构造（Server 层负责阻塞式审批回路）。
+     * emitFilter 可选：在事件广播前拦截/修改事件（如抑制无 approvalId 的 permission_request）。
+     */
+    async prompt(id, prompt, confirm, emitFilter) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return { ok: false, status: 404, error: `会话不存在：${id}` };
+        if (s.busy) {
+            return { ok: false, status: 409, error: '会话正忙，请稍后再试' };
+        }
+        s.busy = true;
+        let text = '';
+        const emit = (event) => {
+            if (event.type === 'text_delta')
+                text += event.text;
+            // 如果有过滤器且返回 false，则不广播此事件
+            if (emitFilter && !emitFilter(event))
+                return;
+            for (const sub of s.subscribers)
+                sub(event);
+        };
+        try {
+            await s.backend.runTurn(s.history, prompt, confirm, emit);
+            return { ok: true, text };
+        }
+        catch (e) {
+            return {
+                ok: false,
+                status: 500,
+                error: e?.message ?? String(e),
+            };
+        }
+        finally {
+            s.busy = false;
+        }
+    }
+    /**
+     * 创建一个审批请求并阻塞等待客户端回执。
+     *
+     * 返回的 Promise 在客户端调用 `resolveApproval()` 或超时后兑现。
+     * 超时默认 5 分钟，自动拒绝并清理。
+     */
+    requestApproval(id, approvalId, timeoutMs = 5 * 60 * 1000) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return Promise.resolve('no');
+        return new Promise((resolve) => {
+            let timer;
+            const done = (choice) => {
+                if (timer)
+                    clearTimeout(timer);
+                s.pendingApprovals.delete(approvalId);
+                resolve(choice);
+            };
+            s.pendingApprovals.set(approvalId, done);
+            // 超时自动拒绝
+            timer = setTimeout(() => {
+                if (s.pendingApprovals.has(approvalId)) {
+                    done('no');
+                }
+            }, timeoutMs);
+        });
+    }
+    /**
+     * 回执一个审批请求，解除 `requestApproval()` 的阻塞。
+     *
+     * 返回 true 表示找到了对应的待审批；false 表示 approvalId 不存在或已超时。
+     */
+    resolveApproval(id, approvalId, choice) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return false;
+        const resolve = s.pendingApprovals.get(approvalId);
+        if (!resolve)
+            return false;
+        resolve(choice);
+        return true;
+    }
+    /** 关闭并移除一个会话。 */
+    async close(id) {
+        const s = this.sessions.get(id);
+        if (!s)
+            return false;
+        // 清理所有挂起的审批（自动拒绝）
+        for (const [, resolve] of s.pendingApprovals)
+            resolve('no');
+        s.pendingApprovals.clear();
+        this.sessions.delete(id);
+        await s.backend.close();
+        return true;
+    }
+    /** 关闭全部会话（server 停机时）。 */
+    async closeAll() {
+        for (const id of [...this.sessions.keys()])
+            await this.close(id);
+    }
+}
+//# sourceMappingURL=sessions.js.map

package/dist/server/sessions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../src/server/sessions.ts"],"names":[],"mappings":"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"}