@cc-monitoring/proxy-core 0.3.0 → 0.4.0

package/dist/utils/pi-runtime.js

@@ -8,12 +8,13 @@ import path from 'node:path';
 import os from 'node:os';
 import { Type } from 'typebox';
 import { createAgentSession, DefaultResourceLoader, ModelRuntime, createWriteToolDefinition, } from '@earendil-works/pi-coding-agent';
-import { dataDir } from './paths.js';
 import { sandboxWriteOps } from './pi-sandbox-ops.js';
-import { knowledgeStore } from './knowledge-store.js';
+import { vault } from './vault.js';
 import { createCrawlTools } from './pi-crawl-tools.js';
+import { createTimeoutSignal, bindAbort } from './abort-signals.js';
+import { extractAssistantDelta } from './pi-events.js';
 // 知识文档目录：所有文件工具的 cwd 和沙箱白名单根
-const docsDir = path.join(dataDir, 'docs');
+const docsDir = vault.root;
 // pi agent 目录（auth / models / system.md）
 const agentDir = path.join(os.homedir(), '.cc-monitoring', 'pi');
 let runtimePromise = null;
@@ -67,7 +68,7 @@ STRUCTURE (all paths below are RELATIVE TO the knowledge root ~/.cc-monitoring/d
 - Bodies live in <topic-slug>/chunks/chunk-NNN.md
 - Root index.json lists all topics as JSON
 - Fetched source pages for a topic are already prepared in <slug>/sources/ — you only READ them, never write or modify them`;
-export const CHAT_SYSTEM_PROMPT = `You are a knowledge management AI operating inside a sandbox.
+const CHAT_SYSTEM_PROMPT = `You are a knowledge management AI operating inside a sandbox.
 ${KB_STRUCTURE}
 
 ANSWERING QUESTIONS:
@@ -77,7 +78,7 @@ ANSWERING QUESTIONS:
 4. Call read_chunk(topic, chunk_id) for relevant chunks — only read chunks you need
 5. Prefer answering from knowledge base chunks when relevant content exists; cite which chunks you used
 6. If no relevant chunk exists, answer from your general knowledge; if you truly don't know, say so`;
-export const OUTLINE_SYSTEM_PROMPT = `You are an outline-phase worker. The relevant web pages have ALREADY been fetched and saved to sources/ for your assigned topic. Your job: read them and propose an outline of dictionary entries. Do NOT write chunks.
+const OUTLINE_SYSTEM_PROMPT = `You are an outline-phase worker. The relevant web pages have ALREADY been fetched and saved to sources/ for your assigned topic. Your job: read them and propose an outline of dictionary entries. Do NOT write chunks.
 
 ${KB_STRUCTURE}
 
@@ -95,7 +96,7 @@ HARD RULES:
 - Do NOT write chunk files, source files, or index.json.
 - Do NOT summarize prematurely — outline only; distillation happens later.
 - After add_outline succeeds, print the returned slug and item count. Stop.`;
-export const CRAWL_SYSTEM_PROMPT = `You are a crawl-phase worker. You drive the browser YOURSELF to incrementally fetch web pages for your assigned topic and save every useful page into sources/. Do NOT outline or write chunks.
+const CRAWL_SYSTEM_PROMPT = `You are a crawl-phase worker. You drive the browser YOURSELF to incrementally fetch web pages for your assigned topic and save every useful page into sources/. Do NOT outline or write chunks.
 
 WORKFLOW:
 1. Call crawl_open to open the entry URL given in your task.
@@ -109,7 +110,7 @@ HARD RULES:
 - If a tool returns an error, do NOT retry the same URL; pick another link or finish.
 - At most ~20 pages. Prefer a few dense pages over many thin ones.
 - After crawl_finish succeeds, stop.`;
-export const REFINE_SYSTEM_PROMPT = `You are a refine-phase worker. For ONE item from the topic's outline, produce a single dictionary chunk.
+const REFINE_SYSTEM_PROMPT = `You are a refine-phase worker. For ONE item from the topic's outline, produce a single dictionary chunk.
 
 ${KB_STRUCTURE}
 
@@ -141,7 +142,7 @@ HARD RULES:
 - One concept per chunk.
 - If the material is thin on a concept, write what exists; do NOT invent content. Omit empty sections.
 - Do NOT call add_topic. Do NOT write index.json.`;
-export const TAG_SYSTEM_PROMPT = `You are a tag-phase worker. Enrich an existing topic with rich, retrieval-friendly tags.
+const TAG_SYSTEM_PROMPT = `You are a tag-phase worker. Enrich an existing topic with rich, retrieval-friendly tags.
 
 ${KB_STRUCTURE}
 
@@ -189,13 +190,6 @@ function systemPromptForMode(mode) {
 // 工具构造
 const ok = (text) => ({ content: [{ type: 'text', text }], details: undefined });
 const err = (e) => ({ content: [{ type: 'text', text: `error: ${e instanceof Error ? e.message : String(e)}` }], details: undefined });
-// 与 knowledge-store TOPIC_RE 保持一致：防路径穿越（../、绝对路径、反斜杠等）
-const SLUG_RE = /^[a-z0-9][a-z0-9-]*$/;
-function assertSlug(slug, field) {
-    if (!SLUG_RE.test(slug)) {
-        throw new Error(`invalid ${field}: ${slug}`);
-    }
-}
 /** add_outline：对已存在的 slug 目录登记大纲（写 outline.json + seed topic） */
 function buildAddOutlineTool() {
     return {
@@ -212,14 +206,8 @@ function buildAddOutlineTool() {
             })),
         }),
         async execute(_id, params) {
-            assertSlug(params.slug, 'slug');
-            const topicDir = path.join(docsDir, params.slug);
-            if (!fs.existsSync(topicDir))
-                throw new Error(`topic dir not prepared: ${params.slug}`);
-            if (!fs.existsSync(path.join(topicDir, 'sources')))
-                throw new Error(`sources missing for topic: ${params.slug}`);
-            fs.writeFileSync(path.join(topicDir, 'outline.json'), JSON.stringify({ slug: params.slug, source: 'sources/', items: params.items }, null, 2));
-            await knowledgeStore.upsertTopic({
+            vault.writeOutline(params.slug, params.items);
+            await vault.upsertTopic({
                 slug: params.slug,
                 title: params.title,
                 summary: '(refining)',
@@ -237,12 +225,11 @@ function buildReadSourceTool() {
         description: '读取该主题 sources/ 目录下全部已抓取网页（按文件名排序、--- 分隔）。',
         parameters: Type.Object({ topic: Type.String({ description: '主题 slug' }) }),
         async execute(_id, params) {
-            assertSlug(params.topic, 'topic');
-            const dir = path.join(docsDir, params.topic, 'sources');
-            const files = fs.readdirSync(dir).filter((f) => f.endsWith('.md')).sort();
-            if (files.length === 0)
+            vault.assertSlug(params.topic, 'topic');
+            const bodies = vault.readSourceBodies(params.topic);
+            if (bodies.length === 0)
                 throw new Error(`no sources for topic: ${params.topic}`);
-            const merged = files.map((f) => fs.readFileSync(path.join(dir, f), 'utf8')).join('\n\n---\n\n');
+            const merged = bodies.join('\n\n---\n\n');
             return ok(merged);
         },
     };
@@ -257,7 +244,7 @@ function buildKnowledgeTools() {
             parameters: Type.Object({}),
             async execute() {
                 try {
-                    return ok(JSON.stringify(await knowledgeStore.listTopics(), null, 2));
+                    return ok(JSON.stringify(await vault.listTopics(), null, 2));
                 }
                 catch (e) {
                     return err(e);
@@ -271,7 +258,7 @@ function buildKnowledgeTools() {
             parameters: Type.Object({ topic: Type.String({ description: '主题 slug，如 react-hooks' }) }),
             async execute(_id, params) {
                 try {
-                    return ok(JSON.stringify(await knowledgeStore.getTopic(params.topic), null, 2));
+                    return ok(JSON.stringify(await vault.getTopic(params.topic), null, 2));
                 }
                 catch (e) {
                     return err(e);
@@ -285,7 +272,7 @@ function buildKnowledgeTools() {
             parameters: Type.Object({ query: Type.String({ description: '搜索关键词' }) }),
             async execute(_id, params) {
                 try {
-                    return ok(JSON.stringify(await knowledgeStore.searchChunks(params.query), null, 2));
+                    return ok(JSON.stringify(await vault.searchChunks(params.query), null, 2));
                 }
                 catch (e) {
                     return err(e);
@@ -302,7 +289,7 @@ function buildKnowledgeTools() {
             }),
             async execute(_id, params) {
                 try {
-                    return ok(await knowledgeStore.readChunk(params.topic, params.chunk_id));
+                    return ok(await vault.readChunk(params.topic, params.chunk_id));
                 }
                 catch (e) {
                     return err(e);
@@ -321,7 +308,7 @@ function buildKnowledgeTools() {
             }),
             async execute(_id, params) {
                 try {
-                    await knowledgeStore.upsertTopic(params);
+                    await vault.upsertTopic(params);
                     return ok('topic added');
                 }
                 catch (e) {
@@ -342,7 +329,7 @@ function buildKnowledgeTools() {
             }),
             async execute(_id, params) {
                 try {
-                    await knowledgeStore.upsertChunkRef({
+                    await vault.upsertChunkRef({
                         topic: params.topic,
                         chunkId: params.chunk_id,
                         title: params.title,
@@ -362,7 +349,7 @@ const KNOWLEDGE_TOOLS = buildKnowledgeTools();
 const KT = (name) => KNOWLEDGE_TOOLS.find((t) => t.name === name);
 const WRITE_TOOL = createWriteToolDefinition(docsDir, { operations: sandboxWriteOps });
 /** 按模式构建工具集（ToolDefinition 数组，用于 customTools） */
-function buildModeTools(mode, crawlGuard) {
+function buildModeTools(mode, crawlGuard, signal) {
     switch (mode) {
         case 'chat':
             return [KT('list_topics'), KT('get_topic'), KT('search_chunks'), KT('read_chunk')];
@@ -371,7 +358,9 @@ function buildModeTools(mode, crawlGuard) {
         case 'crawl':
             if (!crawlGuard)
                 throw new Error('crawl 模式必须传入 crawlGuard');
-            return createCrawlTools(crawlGuard);
+            if (!signal)
+                throw new Error('crawl 模式必须传入 signal');
+            return createCrawlTools(crawlGuard, signal);
         case 'refine':
             return [buildReadSourceTool(), WRITE_TOOL, KT('add_chunk')];
         case 'tag':
@@ -411,7 +400,7 @@ export async function createPiSession(options) {
     // 所以先放一个可变变量，返回 session 后再填值。
     let currentSessionId = '';
     const systemPrompt = systemPromptForMode(options.mode);
-    const modeTools = buildModeTools(options.mode, options.crawlGuard);
+    const modeTools = buildModeTools(options.mode, options.crawlGuard, options.signal);
     const toolAllowlist = buildToolAllowlist(options.mode);
     const resourceLoader = new DefaultResourceLoader({
         cwd,
@@ -448,6 +437,8 @@ export async function createPiSession(options) {
 }
 // ============================================================
 // 无工具 JSON 调用（reconcile 模式）
+// 单次 JSON 调用超时：5 分钟
+const STAGE_TIMEOUT_MS = 5 * 60 * 1000;
 /**
  * 从任意文本截取第一个 `{` 到最后一个 `}` 之间的子串并解析为 JSON 对象。
  * 容忍 prose / 代码围栏包裹。无 `{` 或解析失败时抛错。
@@ -471,14 +462,16 @@ export function extractJsonObject(raw) {
  */
 export async function runJsonPrompt(opts) {
     const session = await createPiSession({ port: opts.port, mode: 'reconcile' });
+    // 5 分钟超时 + 外部取消：任一触发都调 session.abort()；SDK abort 后 prompt/waitForIdle
+    // 会正常 resolve（不 reject），故 await（经 finally）后需检查 combined.aborted 主动抛错
+    const combined = createTimeoutSignal(STAGE_TIMEOUT_MS, opts.signal);
+    bindAbort(combined, () => session.abort());
     // 订阅累积 assistant 文本 chunk
     let accumulated = '';
     const unsub = session.subscribe((ev) => {
-        if (ev.type === 'message_update') {
-            const ae = ev.assistantMessageEvent;
-            if (ae?.type === 'text_delta' && typeof ae.delta === 'string') {
-                accumulated += ae.delta;
-            }
+        const d = extractAssistantDelta(ev);
+        if (d?.kind === 'text') {
+            accumulated += d.delta;
         }
     });
     try {
@@ -488,5 +481,8 @@ export async function runJsonPrompt(opts) {
     finally {
         unsub();
     }
+    if (combined.aborted) {
+        throw new Error('json prompt 已中止');
+    }
     return extractJsonObject(accumulated);
 }

package/dist/utils/pi-sandbox-ops.d.ts

@@ -1,40 +1,4 @@
-/**
- * 校验传入路径必须在 docsDir 内，并返回归一化后的绝对路径。
- * 越界则抛错，阻断 fs 调用。
- */
-export declare function assertInside(absPath: string): string;
-declare function access(absolutePath: string): Promise<void>;
-export declare const sandboxReadOps: {
-    readFile(absolutePath: string): Promise<Buffer>;
-    access: typeof access;
-    detectImageMimeType: () => Promise<string | null | undefined>;
-};
 export declare const sandboxWriteOps: {
     writeFile(absolutePath: string, content: string): Promise<void>;
     mkdir(dir: string): Promise<void>;
 };
-export declare const sandboxEditOps: {
-    readFile(absolutePath: string): Promise<Buffer>;
-    writeFile(absolutePath: string, content: string): Promise<void>;
-    access: typeof access;
-};
-export declare const sandboxGrepOps: {
-    isDirectory(absolutePath: string): Promise<boolean>;
-    readFile(absolutePath: string): Promise<string>;
-};
-export declare const sandboxFindOps: {
-    exists(absolutePath: string): Promise<boolean>;
-    glob(pattern: string, cwd: string, options: {
-        ignore: string[];
-        limit: number;
-    }): Promise<string[]>;
-};
-export declare function globMatch(relPosixPath: string, pattern: string): boolean;
-export declare const sandboxLsOps: {
-    exists(absolutePath: string): Promise<boolean>;
-    stat(absolutePath: string): Promise<{
-        isDirectory: () => boolean;
-    }>;
-    readdir(absolutePath: string): Promise<string[]>;
-};
-export {};

package/dist/utils/pi-sandbox-ops.js

@@ -1,45 +1,22 @@
 // 为 pi-coding-agent 的文件工具提供沙箱白名单 operations，
 // 把所有 fs 访问限定在 ~/.cc-monitoring/docs/ 目录内。
+// 边界判定（docsDir 内 / 受管 index.json）委托 vault。
 import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { dataDir } from './paths.js';
-// 知识文档目录：所有读写都必须落在它下面
-const docsDir = path.join(dataDir, 'docs');
+import { vault } from './vault.js';
 /**
  * 校验传入路径必须在 docsDir 内，并返回归一化后的绝对路径。
  * 越界则抛错，阻断 fs 调用。
  */
-export function assertInside(absPath) {
-    const resolved = path.resolve(absPath);
-    if (resolved !== docsDir && !resolved.startsWith(docsDir + path.sep)) {
-        throw new Error(`Access denied: ${absPath} is outside the knowledge directory ${docsDir}`);
-    }
-    return resolved;
+function assertInside(absPath) {
+    return vault.assertInside(absPath);
 }
 /**
  * 守卫：index.json 由 add_topic/add_chunk 工具原子维护，
  * 禁止 LLM 通过 write/edit 直接改写。
  */
 function assertNotManagedIndexJson(absPath) {
-    if (path.basename(absPath) === 'index.json') {
-        throw new Error('index.json is managed by add_topic/add_chunk tools, do not write directly');
-    }
+    vault.assertNotManagedIndexJson(absPath);
 }
-// 统一 access：校验可读性
-async function access(absolutePath) {
-    const p = assertInside(absolutePath);
-    await fs.access(p);
-}
-// ============== read ==============
-export const sandboxReadOps = {
-    async readFile(absolutePath) {
-        const p = assertInside(absolutePath);
-        return fs.readFile(p);
-    },
-    access,
-    // 沙箱内不做图片 MIME 检测（pi 会按非图片处理，足够用）
-    detectImageMimeType: async () => undefined,
-};
 // ============== write ==============
 export const sandboxWriteOps = {
     async writeFile(absolutePath, content) {
@@ -52,165 +29,3 @@ export const sandboxWriteOps = {
         await fs.mkdir(p, { recursive: true });
     },
 };
-// ============== edit ==============
-export const sandboxEditOps = {
-    async readFile(absolutePath) {
-        const p = assertInside(absolutePath);
-        return fs.readFile(p);
-    },
-    async writeFile(absolutePath, content) {
-        const p = assertInside(absolutePath);
-        assertNotManagedIndexJson(p);
-        await fs.writeFile(p, content, 'utf8');
-    },
-    access,
-};
-// ============== grep ==============
-// GrepOperations.readFile 签名是 Promise<string> | string（用于返回上下文行）
-export const sandboxGrepOps = {
-    async isDirectory(absolutePath) {
-        // 越界直接 throw，让 pi 在 spawn rg 之前就 reject
-        const p = assertInside(absolutePath);
-        const st = await fs.stat(p);
-        return st.isDirectory();
-    },
-    async readFile(absolutePath) {
-        const p = assertInside(absolutePath);
-        return fs.readFile(p, 'utf8');
-    },
-};
-// ============== find ==============
-export const sandboxFindOps = {
-    async exists(absolutePath) {
-        const p = assertInside(absolutePath);
-        try {
-            await fs.access(p);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    },
-    async glob(pattern, cwd, options) {
-        // cwd 必须落在 docsDir 内
-        const root = assertInside(cwd);
-        // 递归收集 root 下所有文件的相对 posix 路径，再按 pattern + ignore 过滤
-        const all = [];
-        async function walk(dir) {
-            if (all.length >= options.limit * 4)
-                return;
-            let entries;
-            try {
-                entries = await fs.readdir(dir, { withFileTypes: true });
-            }
-            catch {
-                return;
-            }
-            for (const ent of entries) {
-                const full = path.join(dir, ent.name);
-                const rel = path.relative(root, full).split(path.sep).join('/');
-                if (options.ignore.some((ig) => globMatch(rel, ig)))
-                    continue;
-                if (ent.isDirectory()) {
-                    await walk(full);
-                }
-                else if (ent.isFile()) {
-                    all.push(rel);
-                }
-            }
-        }
-        await walk(root);
-        // 按 pattern 过滤，截断到 limit
-        // 语义对齐 fd：pattern 不含 '/' 时按 basename 匹配任意深度；
-        // 含 '/' 时按完整相对路径匹配（等价 '**/<pattern>'）
-        const hasSlash = pattern.includes('/');
-        const out = all
-            .filter((r) => hasSlash ? globMatch(r, pattern) : matchSegment(pattern, path.posix.basename(r)))
-            .slice(0, options.limit);
-        return out;
-    },
-};
-// 极简 glob：支持 *、**、?，与 minimatch 在常见文档搜索场景下等价
-//  - '*.md'           匹配顶层 md 文件
-//  - '**/*.md'        匹配任意层级 md
-//  - 'docs/**'        匹配 docs 子树下所有文件
-//  - 'src/foo.ts'     字面路径
-export function globMatch(relPosixPath, pattern) {
-    // 显式 '**' 段处理
-    const patternSegs = pattern.split('/');
-    const pathSegs = relPosixPath.split('/');
-    return matchSegs(patternSegs, pathSegs, 0, 0);
-}
-function matchSegs(pats, paths, pi, qi) {
-    if (pi === pats.length) {
-        return qi === paths.length;
-    }
-    const p = pats[pi];
-    if (p === '**') {
-        // '**' 匹配 0..n 段（含跨目录）
-        // 试：消耗 0 段；以及让 '**' 吃掉 q 到末尾任意段
-        if (matchSegs(pats, paths, pi + 1, qi))
-            return true;
-        for (let k = qi; k < paths.length; k++) {
-            if (matchSegs(pats, paths, pi + 1, k + 1))
-                return true;
-        }
-        return false;
-    }
-    if (qi === paths.length)
-        return false;
-    if (!matchSegment(p, paths[qi]))
-        return false;
-    return matchSegs(pats, paths, pi + 1, qi + 1);
-}
-function matchSegment(pattern, segment) {
-    if (pattern === '*')
-        return true;
-    // 把 *、? 转成正则，其余字符转义
-    let re = '^';
-    for (let i = 0; i < pattern.length; i++) {
-        const ch = pattern[i];
-        if (ch === '*') {
-            re += '[^/]*';
-        }
-        else if (ch === '?') {
-            re += '[^/]';
-        }
-        else if ('.+^${}()|\\'.includes(ch)) {
-            re += '\\' + ch;
-        }
-        else {
-            re += ch;
-        }
-    }
-    re += '$';
-    try {
-        return new RegExp(re).test(segment);
-    }
-    catch {
-        return false;
-    }
-}
-// ============== ls ==============
-export const sandboxLsOps = {
-    async exists(absolutePath) {
-        const p = assertInside(absolutePath);
-        try {
-            await fs.access(p);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    },
-    async stat(absolutePath) {
-        const p = assertInside(absolutePath);
-        const st = await fs.stat(p);
-        // fs.Stats 自带 isDirectory()，形状已满足 LsOperations
-        return st;
-    },
-    async readdir(absolutePath) {
-        const p = assertInside(absolutePath);
-        return fs.readdir(p);
-    },
-};

package/dist/utils/providers-db.d.ts

@@ -12,6 +12,7 @@ export interface Provider {
     provider: string;
     default: boolean;
     is_openai_compatible: boolean;
+    auth_style: 'bearer' | 'x-api-key';
     created_at: string;
     updated_at: string;
 }
@@ -27,6 +28,7 @@ export interface ProviderInput {
     provider: string;
     default?: boolean;
     is_openai_compatible?: boolean;
+    auth_style?: 'bearer' | 'x-api-key';
 }
 export interface ProviderValidationError {
     index?: number;
@@ -34,6 +36,7 @@ export interface ProviderValidationError {
     message: string;
 }
 export declare function listProviders(db: Database.Database): Provider[];
+export declare function getActiveProvider(db: Database.Database): Provider | null;
 /**
  * Destructive full replacement: deletes ALL existing providers then inserts the given list.
  * Passing an empty array will wipe all provider data with no replacement.

package/dist/utils/providers-db.js

@@ -1,7 +1,6 @@
 const REQUIRED_FIELDS = ['name', 'provider'];
-export function listProviders(db) {
-    const rows = db.prepare('SELECT * FROM providers ORDER BY created_at DESC').all();
-    return rows.map(r => ({
+function mapRow(r) {
+    return {
         id: r.id,
         name: r.name,
         base_url: r.base_url,
@@ -14,9 +13,24 @@ export function listProviders(db) {
         provider: r.provider,
         default: !!r.is_default,
         is_openai_compatible: !!r.is_openai_compatible,
+        auth_style: r.auth_style === 'x-api-key' ? 'x-api-key' : 'bearer',
         created_at: r.created_at,
         updated_at: r.updated_at,
-    }));
+    };
+}
+export function listProviders(db) {
+    const rows = db.prepare('SELECT * FROM providers ORDER BY created_at DESC').all();
+    return rows.map(mapRow);
+}
+const activeProviderStmtCache = new WeakMap();
+export function getActiveProvider(db) {
+    let stmt = activeProviderStmtCache.get(db);
+    if (!stmt) {
+        stmt = db.prepare('SELECT * FROM providers WHERE is_default = 1 LIMIT 1');
+        activeProviderStmtCache.set(db, stmt);
+    }
+    const row = stmt.get();
+    return row ? mapRow(row) : null;
 }
 /**
  * Destructive full replacement: deletes ALL existing providers then inserts the given list.
@@ -28,13 +42,13 @@ export function listProviders(db) {
 export function saveProviders(db, providers) {
     const deleteAll = db.prepare('DELETE FROM providers');
     const insertOne = db.prepare(`
-    INSERT INTO providers (name, base_url, api_key, model, haiku_model, sonnet_model, opus_model, subagent_model, provider, is_default, is_openai_compatible)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO providers (name, base_url, api_key, model, haiku_model, sonnet_model, opus_model, subagent_model, provider, is_default, is_openai_compatible, auth_style)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `);
     const transaction = db.transaction(() => {
         deleteAll.run();
         for (const p of providers) {
-            insertOne.run(p.name, p.base_url && p.base_url.trim() !== '' ? p.base_url : null, p.api_key && p.api_key.trim() !== '' ? p.api_key : null, p.model && p.model.trim() !== '' ? p.model : null, p.haiku_model && p.haiku_model.trim() !== '' ? p.haiku_model : null, p.sonnet_model && p.sonnet_model.trim() !== '' ? p.sonnet_model : null, p.opus_model && p.opus_model.trim() !== '' ? p.opus_model : null, p.subagent_model && p.subagent_model.trim() !== '' ? p.subagent_model : null, p.provider, p.default ? 1 : 0, p.is_openai_compatible ? 1 : 0);
+            insertOne.run(p.name, p.base_url && p.base_url.trim() !== '' ? p.base_url : null, p.api_key && p.api_key.trim() !== '' ? p.api_key : null, p.model && p.model.trim() !== '' ? p.model : null, p.haiku_model && p.haiku_model.trim() !== '' ? p.haiku_model : null, p.sonnet_model && p.sonnet_model.trim() !== '' ? p.sonnet_model : null, p.opus_model && p.opus_model.trim() !== '' ? p.opus_model : null, p.subagent_model && p.subagent_model.trim() !== '' ? p.subagent_model : null, p.provider, p.default ? 1 : 0, p.is_openai_compatible ? 1 : 0, p.auth_style === 'x-api-key' ? 'x-api-key' : 'bearer');
         }
     });
     transaction();

package/dist/utils/request-writer.d.ts

@@ -1,6 +1,6 @@
-export interface RequestData {
-    requestId: string;
+export interface RecordedRequest {
     sessionId: string;
+    localRequestId: string;
     timestamp: string;
     apiKey?: string;
     proxyApiKey?: string;
@@ -13,14 +13,6 @@ export interface RequestData {
         headers: Record<string, string>;
         body?: any;
     };
-    response?: {
-        statusCode: number;
-        headers?: Record<string, string>;
-        events?: any[];
-        completedAt?: string;
-        closedAt?: string;
-        error?: string;
-    };
 }
 export interface TokenUsage {
     input_tokens?: number;
@@ -42,34 +34,72 @@ export interface RequestSummary {
     baseUrl?: string;
     model?: string;
     machineId?: string;
+    userAgent?: string;
     usage?: TokenUsage;
+    closedAt?: string;
+}
+export interface RequestRecorder {
+    pending(): Promise<void>;
+    appendEvent(event: any): void;
+    headers(args: {
+        statusCode: number;
+        headers?: Record<string, string>;
+    }): void;
+    complete(args: {
+        cloudRequestId?: string;
+        statusCode: number;
+        headers?: Record<string, string>;
+    }): Promise<void>;
+    interrupt(args: {
+        statusCode: number;
+        error: string;
+    }): void;
+    fail(args: {
+        statusCode: number;
+        error: string;
+    }): void;
 }
-export declare function extractTokenUsage(events: any[] | undefined): TokenUsage | undefined;
-export declare const EVENT_BATCH_SIZE = 10;
-/**
- * Flush a batch of SSE events to the response_events table.
- * Called during streaming every ~10 events to avoid in-memory accumulation.
- */
-export declare function flushEventBatch(sessionId: string, requestId: string, batch: Array<{
-    index: number;
-    type?: string;
-    data: unknown;
-}>, startIndex: number): void;
-/**
- * Delete response_events rows for a request (used when cloudRequestId differs from local requestId).
- */
-export declare function deleteResponseEvents(requestId: string, sessionId: string): void;
-export declare function saveRequestDB(sessionId: string, requestId: string, data: RequestData): Promise<void>;
-export declare function updateRequestTokens(requestId: string, sessionId: string, usage: TokenUsage | undefined): void;
-export declare function deleteRequestRow(requestId: string, sessionId: string): void;
-export declare function loadRequestDB(compositeId: string): Promise<RequestData>;
+interface LoadedRequest {
+    requestId: string;
+    sessionId: string;
+    timestamp: string;
+    apiKey?: string;
+    proxyApiKey?: string;
+    baseUrl?: string;
+    model?: string;
+    machineId?: string;
+    request: {
+        method: string;
+        path: string;
+        headers: Record<string, string>;
+        body?: any;
+    };
+    response?: {
+        statusCode: number;
+        headers?: Record<string, string>;
+        events?: any[];
+        completedAt?: string;
+        closedAt?: string;
+        error?: string;
+    };
+}
+export declare function createRequestRecorder(meta: RecordedRequest): RequestRecorder;
+export declare function recordIteration(meta: RecordedRequest & {
+    response: {
+        statusCode: number;
+        headers?: Record<string, string>;
+        events?: any[];
+    };
+}): Promise<void>;
+export declare function loadRequestDB(compositeId: string): Promise<LoadedRequest>;
 export declare function listRequestDB(limit?: number, before?: string): Promise<{
     requests: RequestSummary[];
     hasMore: boolean;
 }>;
 export declare function cleanOldRequestsDB(daysToKeep?: number): Promise<void>;
-export declare function sessionIdExists(sessionId: string): boolean;
+export declare function interruptStaleRequestsOnStartup(maxAgeMs?: number): number;
 export declare function loadSessionHistory(sessionId: string): {
     messages: any[];
     system?: any;
 } | null;
+export {};