im-hub-pro 0.2.29

package/dist/plugins/agents/claude-code/mcp-approval-server.js

@@ -0,0 +1,235 @@
+// MCP sidecar — Claude Code 通过 --permission-prompt-tool 调用本进程的 `request` 工具，
+// 本进程把请求转发给 im-hub 主进程的 approval-bus（unix socket），等用户决策回包后
+// 翻译成 MCP tool result。
+//
+// 这是个独立进程，由 claude 子进程通过 --mcp-config 启动；与 im-hub 通信只走 socket。
+// 启动需要两个 env：
+//   IMHUB_APPROVAL_SOCK  unix socket 路径
+//   IMHUB_RUN_ID         本次 claude run 的 ID（与 approvalBus.registerRun 配套）
+//
+// 协议见 src/core/approval-bus.ts。
+//
+// 入口（编译后）：node dist/plugins/agents/claude-code/mcp-approval-server.js
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { z } from 'zod';
+import { createConnection } from 'net';
+import { randomUUID } from 'crypto';
+const SERVER_NAME = 'imhub';
+const TOOL_NAME = 'request';
+class ApprovalClient {
+    socketPath;
+    runId;
+    socket = null;
+    buf = '';
+    pending = new Map();
+    connectErr = null;
+    closed = false;
+    connectPromise;
+    constructor(socketPath, runId) {
+        this.socketPath = socketPath;
+        this.runId = runId;
+        this.connectPromise = this.connect();
+    }
+    connect() {
+        return new Promise((resolve) => {
+            const sock = createConnection(this.socketPath);
+            sock.setEncoding('utf8');
+            const onConnectError = (err) => {
+                this.connectErr = err;
+                this.closed = true;
+                // stderr surfaces inside Claude Code's MCP log
+                process.stderr.write(`[mcp-approval-server] connect failed: ${err.message}\n`);
+                resolve();
+            };
+            sock.once('error', onConnectError);
+            sock.once('connect', () => {
+                sock.removeListener('error', onConnectError);
+                sock.on('error', (err) => {
+                    process.stderr.write(`[mcp-approval-server] socket error: ${err.message}\n`);
+                });
+                sock.on('data', (chunk) => this.onData(chunk));
+                sock.on('close', () => this.onClose());
+                this.socket = sock;
+                resolve();
+            });
+        });
+    }
+    onData(chunk) {
+        this.buf += chunk;
+        let nl;
+        while ((nl = this.buf.indexOf('\n')) !== -1) {
+            const line = this.buf.slice(0, nl);
+            this.buf = this.buf.slice(nl + 1);
+            if (!line)
+                continue;
+            let msg;
+            try {
+                msg = JSON.parse(line);
+            }
+            catch {
+                process.stderr.write(`[mcp-approval-server] bad json from bus: ${line.slice(0, 200)}\n`);
+                continue;
+            }
+            this.dispatch(msg);
+        }
+    }
+    dispatch(msg) {
+        if (!msg || typeof msg !== 'object')
+            return;
+        const m = msg;
+        if (m.v !== 1 || m.type !== 'decision')
+            return;
+        const reqId = typeof m.reqId === 'string' ? m.reqId : null;
+        if (!reqId)
+            return;
+        const p = this.pending.get(reqId);
+        if (!p)
+            return;
+        this.pending.delete(reqId);
+        if (m.behavior === 'allow') {
+            const updatedInput = (m.updatedInput && typeof m.updatedInput === 'object' && !Array.isArray(m.updatedInput))
+                ? m.updatedInput
+                : p.originalInput; // Claude Code requires updatedInput; echo original
+            p.resolve({ behavior: 'allow', updatedInput });
+        }
+        else {
+            const message = typeof m.message === 'string' ? m.message : undefined;
+            p.resolve({ behavior: 'deny', ...(message ? { message } : {}) });
+        }
+    }
+    onClose() {
+        this.closed = true;
+        // Drain pending with deny — claude is left hanging otherwise
+        for (const [, p] of this.pending) {
+            p.resolve({ behavior: 'deny', message: 'approval bus disconnected' });
+        }
+        this.pending.clear();
+    }
+    // request(): see below — request → register pending → write payload
+    /**
+     * Send an approval request and wait for the decision. If the bus is
+     * unreachable or the connection has dropped, returns a deny synchronously.
+     */
+    async request(args) {
+        await this.connectPromise;
+        if (this.connectErr || this.closed || !this.socket) {
+            return { behavior: 'deny', message: `approval bus unavailable: ${this.connectErr?.message ?? 'closed'}` };
+        }
+        const reqId = randomUUID();
+        const payload = JSON.stringify({
+            v: 1,
+            type: 'approval',
+            runId: this.runId,
+            reqId,
+            toolName: args.toolName,
+            input: args.input,
+            toolUseId: args.toolUseId,
+        }) + '\n';
+        return new Promise((resolve) => {
+            this.pending.set(reqId, { resolve, originalInput: args.input });
+            this.socket.write(payload, (err) => {
+                if (err) {
+                    this.pending.delete(reqId);
+                    resolve({ behavior: 'deny', message: `write failed: ${err.message}` });
+                }
+            });
+        });
+    }
+    async close() {
+        this.closed = true;
+        if (this.socket && !this.socket.destroyed) {
+            await new Promise((resolve) => {
+                this.socket.once('close', () => resolve());
+                this.socket.end();
+                setTimeout(() => { if (this.socket && !this.socket.destroyed)
+                    this.socket.destroy(); }, 200).unref();
+            });
+        }
+    }
+}
+/**
+ * Build the MCP server. Exposed as a function (rather than top-level `await`)
+ * so tests can construct it without spinning up stdio.
+ */
+export function buildServer(client) {
+    const server = new McpServer({
+        name: SERVER_NAME,
+        version: '0.1.0',
+    });
+    // Accept both snake_case (what Claude Code sends over the wire) and
+    // camelCase (defensive — some forks normalize). passthrough so unknown
+    // future fields are not stripped before we see them.
+    const inputSchema = {
+        tool_name: z.string().optional(),
+        toolName: z.string().optional(),
+        input: z.record(z.string(), z.unknown()).optional(),
+        tool_use_id: z.string().optional(),
+        toolUseId: z.string().optional(),
+    };
+    server.registerTool(TOOL_NAME, {
+        title: 'IM hub permission prompt',
+        description: 'Routes Claude Code permission prompts to im-hub for human approval over IM. ' +
+            'Returns {behavior: "allow"|"deny", ...} as a JSON-encoded text block.',
+        inputSchema,
+    }, async (args) => {
+        const toolName = args.tool_name ?? args.toolName ?? '<unknown>';
+        const input = (args.input ?? {});
+        const toolUseId = args.tool_use_id ?? args.toolUseId ?? '';
+        const decision = await client.request({ toolName, input, toolUseId });
+        return {
+            content: [
+                { type: 'text', text: JSON.stringify(decision) },
+            ],
+        };
+    });
+    return server;
+}
+export { ApprovalClient };
+async function main() {
+    const sockPath = process.env.IMHUB_APPROVAL_SOCK;
+    const runId = process.env.IMHUB_RUN_ID;
+    if (!sockPath || !runId) {
+        process.stderr.write('[mcp-approval-server] missing IMHUB_APPROVAL_SOCK or IMHUB_RUN_ID\n');
+        process.exit(1);
+    }
+    const client = new ApprovalClient(sockPath, runId);
+    const server = buildServer(client);
+    const transport = new StdioServerTransport();
+    await server.connect(transport);
+    // When stdio closes (claude went away), shut down cleanly.
+    const shutdown = async () => {
+        try {
+            await client.close();
+        }
+        catch { /* ignore */ }
+        try {
+            await server.close();
+        }
+        catch { /* ignore */ }
+        process.exit(0);
+    };
+    process.on('SIGTERM', shutdown);
+    process.on('SIGINT', shutdown);
+}
+// Detect "run as script" — when imported by tests we don't want to spin up stdio.
+const isMainModule = (() => {
+    if (typeof process === 'undefined' || !process.argv[1])
+        return false;
+    try {
+        const url = new URL(import.meta.url);
+        return url.pathname.endsWith(process.argv[1].replace(/^.*?(?=\/|$)/, '')) ||
+            url.pathname === process.argv[1] ||
+            process.argv[1].endsWith('mcp-approval-server.js');
+    }
+    catch {
+        return false;
+    }
+})();
+if (isMainModule) {
+    main().catch((err) => {
+        process.stderr.write(`[mcp-approval-server] fatal: ${err}\n`);
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=mcp-approval-server.js.map

package/dist/plugins/agents/claude-code/mcp-approval-server.js.map

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

package/dist/plugins/agents/claude-code/mcp-approval-server.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-approval-server.test.d.ts.map

package/dist/plugins/agents/claude-code/mcp-approval-server.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-approval-server.test.d.ts","sourceRoot":"","sources":["../../../../src/plugins/agents/claude-code/mcp-approval-server.test.ts"],"names":[],"mappings":""}

package/dist/plugins/agents/claude-code/mcp-approval-server.test.js

@@ -0,0 +1,188 @@
+// mcp-approval-server e2e — 端到端串 ApprovalBus ←→ ApprovalClient ←→ McpServer ←→ MCP Client，
+// 用 InMemoryTransport 替代 stdio，避免依赖 build / 子进程。
+import { describe, it, expect, beforeEach, afterEach } from 'bun:test';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { randomBytes } from 'crypto';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
+import { ApprovalBus } from '../../../core/approval-bus.js';
+import { ApprovalClient, buildServer } from './mcp-approval-server.js';
+const RUN_ID = 'run-test-1';
+const RUN_CTX = {
+    threadId: 'thread-A',
+    platform: 'feishu',
+    userId: 'u1',
+    channelId: 'c1',
+};
+function uniqueSocketPath() {
+    return join(tmpdir(), `imhub-mcp-test-${process.pid}-${randomBytes(4).toString('hex')}.sock`);
+}
+async function setup() {
+    const sockPath = uniqueSocketPath();
+    const bus = new ApprovalBus({ approvalTimeoutMs: 500 });
+    await bus.start(sockPath);
+    bus.registerRun(RUN_ID, RUN_CTX);
+    const client = new ApprovalClient(sockPath, RUN_ID);
+    const server = buildServer(client);
+    const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+    await server.connect(serverTransport);
+    const mcpClient = new Client({ name: 'test-client', version: '0.0.0' });
+    await mcpClient.connect(clientTransport);
+    return {
+        bus,
+        client,
+        mcpClient,
+        cleanup: async () => {
+            await mcpClient.close();
+            await server.close();
+            await client.close();
+            await bus.stop();
+        },
+    };
+}
+describe('mcp-approval-server', () => {
+    let h;
+    beforeEach(async () => { h = await setup(); });
+    afterEach(async () => { await h.cleanup(); });
+    it('exposes a `request` tool', async () => {
+        const tools = await h.mcpClient.listTools();
+        const names = tools.tools.map((t) => t.name);
+        expect(names).toContain('request');
+    });
+    it('round-trip: tools/call → bus notifier → resolvePending(allow) → MCP result', async () => {
+        let captured = null;
+        h.bus.setNotifier(async (n) => {
+            captured = { toolName: n.toolName, input: n.input };
+            // Simulate IM user clicking "approve" by resolving in the next tick
+            queueMicrotask(() => {
+                h.bus.resolvePending('thread-A', { behavior: 'allow' });
+            });
+        });
+        const result = await h.mcpClient.callTool({
+            name: 'request',
+            arguments: {
+                tool_name: 'Bash',
+                input: { command: 'git status' },
+                tool_use_id: 'tu-1',
+            },
+        });
+        expect(captured).not.toBeNull();
+        expect(captured.toolName).toBe('Bash');
+        expect(captured.input).toEqual({ command: 'git status' });
+        const content = result.content;
+        expect(content[0].type).toBe('text');
+        const decision = JSON.parse(content[0].text);
+        // When allow has no explicit updatedInput, sidecar echoes the original
+        // input back — Claude Code rejects allow without updatedInput.
+        expect(decision.behavior).toBe('allow');
+        expect(decision.updatedInput).toEqual({ command: 'git status' });
+    });
+    it('forwards updatedInput on allow', async () => {
+        h.bus.setNotifier(async () => {
+            queueMicrotask(() => {
+                h.bus.resolvePending('thread-A', {
+                    behavior: 'allow',
+                    updatedInput: { command: 'echo sandboxed' },
+                });
+            });
+        });
+        const result = await h.mcpClient.callTool({
+            name: 'request',
+            arguments: { tool_name: 'Bash', input: { command: 'echo raw' }, tool_use_id: 'tu' },
+        });
+        const content = result.content;
+        const decision = JSON.parse(content[0].text);
+        expect(decision.behavior).toBe('allow');
+        expect(decision.updatedInput).toEqual({ command: 'echo sandboxed' });
+    });
+    it('forwards deny + message', async () => {
+        h.bus.setNotifier(async () => {
+            queueMicrotask(() => {
+                h.bus.resolvePending('thread-A', { behavior: 'deny', message: '用户拒绝' });
+            });
+        });
+        const result = await h.mcpClient.callTool({
+            name: 'request',
+            arguments: { tool_name: 'Bash', input: {}, tool_use_id: 'tu' },
+        });
+        const content = result.content;
+        const decision = JSON.parse(content[0].text);
+        expect(decision).toEqual({ behavior: 'deny', message: '用户拒绝' });
+    });
+    it('approval timeout (no resolvePending) → MCP returns deny', async () => {
+        let notified = false;
+        h.bus.setNotifier(async () => { notified = true; /* never resolve */ });
+        const result = await h.mcpClient.callTool({
+            name: 'request',
+            arguments: { tool_name: 'Bash', input: {}, tool_use_id: 'tu' },
+        });
+        expect(notified).toBe(true);
+        const content = result.content;
+        const decision = JSON.parse(content[0].text);
+        expect(decision.behavior).toBe('deny');
+        expect(decision.message).toBe('approval timeout');
+    });
+    it('also accepts camelCase argument names', async () => {
+        let captured = null;
+        h.bus.setNotifier(async (n) => {
+            captured = n.toolName;
+            queueMicrotask(() => {
+                h.bus.resolvePending('thread-A', { behavior: 'allow' });
+            });
+        });
+        await h.mcpClient.callTool({
+            name: 'request',
+            arguments: { toolName: 'Read', input: { file_path: '/etc/hosts' }, toolUseId: 'tu' },
+        });
+        expect(captured).not.toBeNull();
+        expect(captured).toBe('Read');
+    });
+    it('unknown runId is denied immediately', async () => {
+        // Build a fresh client whose runId is never registered with the bus
+        const sockPath = h.bus.getSocketPath();
+        const orphanClient = new ApprovalClient(sockPath, 'never-registered');
+        const orphanServer = buildServer(orphanClient);
+        const [ct, st] = InMemoryTransport.createLinkedPair();
+        await orphanServer.connect(st);
+        const orphanMcp = new Client({ name: 'orphan', version: '0.0.0' });
+        await orphanMcp.connect(ct);
+        h.bus.setNotifier(async () => { throw new Error('notifier should not be called'); });
+        const result = await orphanMcp.callTool({
+            name: 'request',
+            arguments: { tool_name: 'Bash', input: {}, tool_use_id: 'tu' },
+        });
+        const content = result.content;
+        const decision = JSON.parse(content[0].text);
+        expect(decision.behavior).toBe('deny');
+        expect(decision.message).toContain('unknown runId');
+        await orphanMcp.close();
+        await orphanServer.close();
+        await orphanClient.close();
+    });
+});
+describe('ApprovalClient (without MCP layer)', () => {
+    it('returns deny synchronously when bus socket does not exist', async () => {
+        const client = new ApprovalClient('/tmp/imhub-nonexistent-socket-xyz', RUN_ID);
+        const decision = await client.request({ toolName: 'Bash', input: {}, toolUseId: 'tu' });
+        expect(decision.behavior).toBe('deny');
+        expect(decision.message).toContain('approval bus unavailable');
+        await client.close();
+    });
+    it('returns deny on all in-flight requests when bus is stopped mid-call', async () => {
+        const sockPath = uniqueSocketPath();
+        const bus = new ApprovalBus({ approvalTimeoutMs: 5000 });
+        await bus.start(sockPath);
+        bus.registerRun(RUN_ID, RUN_CTX);
+        bus.setNotifier(async () => { });
+        const client = new ApprovalClient(sockPath, RUN_ID);
+        const inFlight = client.request({ toolName: 'Bash', input: {}, toolUseId: 'tu' });
+        // Give the request time to land in pending, then stop the bus
+        await new Promise((r) => setTimeout(r, 50));
+        await bus.stop();
+        const decision = await inFlight;
+        expect(decision.behavior).toBe('deny');
+        await client.close();
+    });
+});
+//# sourceMappingURL=mcp-approval-server.test.js.map

package/dist/plugins/agents/claude-code/mcp-approval-server.test.js.map

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

package/dist/plugins/agents/codex/adapter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=adapter.test.d.ts.map

package/dist/plugins/agents/codex/adapter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.test.d.ts","sourceRoot":"","sources":["../../../../src/plugins/agents/codex/adapter.test.ts"],"names":[],"mappings":""}

package/dist/plugins/agents/codex/adapter.test.js

@@ -0,0 +1,192 @@
+// CodexAdapter — verify session-id capture, exec resume args, text extraction,
+// and usage callbacks. Mirrors the opencode regression net for codex's
+// `--json` event stream (codex 0.128).
+//
+// Reference event shapes (real codex output):
+//   {"type":"thread.started","thread_id":"<uuid>"}
+//   {"type":"turn.started"}
+//   {"type":"item.completed","item":{"id":"item_0","type":"agent_message","text":"hi!"}}
+//   {"type":"turn.completed","usage":{"input_tokens":13299,"cached_input_tokens":11648,"output_tokens":6,"reasoning_output_tokens":0}}
+import { describe, it, expect } from 'bun:test';
+import { CodexAdapter, _testInternals } from './index.js';
+const { buildArgs, extractText, inspectEvent } = _testInternals;
+describe('CodexAdapter buildArgs', () => {
+    it('starts a fresh session when no agentSessionId provided', () => {
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'hello', {});
+        expect(args[0]).toBe('exec');
+        expect(args).not.toContain('resume');
+        expect(args).toContain('--json');
+        expect(args[args.length - 1]).toBe('hello');
+    });
+    it('uses `exec resume <id>` when agentSessionId + agentSessionResume are set', () => {
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'hello', {
+            agentSessionId: '019df376-0ec9-77c3-9d7d-1a15fd8cc9c9',
+            agentSessionResume: true,
+        });
+        expect(args[0]).toBe('exec');
+        expect(args[1]).toBe('resume');
+        expect(args[2]).toBe('019df376-0ec9-77c3-9d7d-1a15fd8cc9c9');
+        expect(args).toContain('--json');
+        expect(args[args.length - 1]).toBe('hello');
+    });
+    it('does NOT use resume when agentSessionId is set without agentSessionResume', () => {
+        // Defensive: agentSessionId without resume means "we know the id but
+        // codex hasn't been told yet" — happens nowhere in practice but we want
+        // a deterministic fallback rather than an undefined positional.
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'p', { agentSessionId: 'abc' });
+        expect(args).not.toContain('resume');
+        expect(args[0]).toBe('exec');
+    });
+    it('keeps --skip-git-repo-check on every call (post --full-auto removal)', () => {
+        // --full-auto was dropped in favor of explicit `-s workspace-write`
+        // (without auto-approval) — see codex/index.ts BASE_FLAGS comment.
+        const adapter = new CodexAdapter();
+        expect(buildArgs(adapter, 'p', {})).toContain('--skip-git-repo-check');
+        expect(buildArgs(adapter, 'p', {})).not.toContain('--full-auto');
+        expect(buildArgs(adapter, 'p', {
+            agentSessionId: 'abc', agentSessionResume: true,
+        })).toContain('--skip-git-repo-check');
+    });
+    it('passes -s workspace-write by default (no plan mode)', () => {
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'p', {});
+        expect(args).toContain('-s');
+        expect(args).toContain('workspace-write');
+    });
+    it('passes -s read-only when planMode is true', () => {
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'p', { planMode: true });
+        expect(args).toContain('-s');
+        expect(args).toContain('read-only');
+        expect(args).not.toContain('workspace-write');
+    });
+    it('passes -s read-only on a resume turn when planMode is set', () => {
+        const adapter = new CodexAdapter();
+        const args = buildArgs(adapter, 'p', {
+            agentSessionId: 'abc', agentSessionResume: true, planMode: true,
+        });
+        expect(args).toContain('-s');
+        expect(args).toContain('read-only');
+    });
+});
+describe('CodexAdapter extractText', () => {
+    it('extracts text from item.completed agent_message', () => {
+        const adapter = new CodexAdapter();
+        const text = extractText(adapter, {
+            type: 'item.completed',
+            item: { id: 'item_0', type: 'agent_message', text: 'hello world' },
+        });
+        expect(text).toBe('hello world');
+    });
+    it('returns empty string for non-agent_message item types', () => {
+        const adapter = new CodexAdapter();
+        expect(extractText(adapter, {
+            type: 'item.completed',
+            item: { id: 'item_1', type: 'tool_call', text: 'should not surface' },
+        })).toBe('');
+    });
+    it('returns empty for orchestration events (thread.started / turn.*)', () => {
+        const adapter = new CodexAdapter();
+        expect(extractText(adapter, { type: 'thread.started', thread_id: 'abc' })).toBe('');
+        expect(extractText(adapter, { type: 'turn.started' })).toBe('');
+        expect(extractText(adapter, { type: 'turn.completed', usage: { input_tokens: 10 } })).toBe('');
+    });
+    // Regression guard for the v0 adapter that hunted for {type:"message"} —
+    // that event shape never fires in real codex 0.128 output.
+    it('does NOT match the legacy {type:"message"} shape', () => {
+        const adapter = new CodexAdapter();
+        expect(extractText(adapter, {
+            type: 'message',
+            message: { content: [{ type: 'text', text: 'should-not-match' }] },
+        })).toBe('');
+    });
+});
+describe('CodexAdapter inspectEvent — session id capture', () => {
+    it('forwards thread_id from thread.started via opts.onAgentSessionId', () => {
+        const adapter = new CodexAdapter();
+        const ids = [];
+        inspectEvent(adapter, { type: 'thread.started', thread_id: 'uuid-1' }, {
+            onAgentSessionId: (id) => ids.push(id),
+        });
+        expect(ids).toEqual(['uuid-1']);
+    });
+    it('does not fire for events other than thread.started', () => {
+        const adapter = new CodexAdapter();
+        const ids = [];
+        const opts = { onAgentSessionId: (id) => ids.push(id) };
+        inspectEvent(adapter, { type: 'turn.started' }, opts);
+        inspectEvent(adapter, {
+            type: 'item.completed',
+            item: { type: 'agent_message', text: 'hi' },
+        }, opts);
+        expect(ids.length).toBe(0);
+    });
+    it('does nothing when callback is absent', () => {
+        const adapter = new CodexAdapter();
+        inspectEvent(adapter, { type: 'thread.started', thread_id: 'x' }, {});
+        // Absence of throw is the assertion.
+        expect(true).toBe(true);
+    });
+    it('survives a callback that throws', () => {
+        const adapter = new CodexAdapter();
+        inspectEvent(adapter, { type: 'thread.started', thread_id: 'x' }, {
+            onAgentSessionId: () => { throw new Error('boom'); },
+        });
+        expect(true).toBe(true);
+    });
+});
+describe('CodexAdapter inspectEvent — usage capture', () => {
+    it('forwards input/output tokens from turn.completed.usage', () => {
+        const adapter = new CodexAdapter();
+        const deltas = [];
+        inspectEvent(adapter, {
+            type: 'turn.completed',
+            usage: {
+                input_tokens: 13299,
+                cached_input_tokens: 11648,
+                output_tokens: 6,
+                reasoning_output_tokens: 0,
+            },
+        }, { onUsage: (d) => deltas.push(d) });
+        expect(deltas.length).toBe(1);
+        expect(deltas[0].tokensInput).toBe(13299);
+        expect(deltas[0].tokensOutput).toBe(6);
+        // codex doesn't surface cost — should remain undefined.
+        expect(deltas[0].costUsd).toBeUndefined();
+    });
+    it('does NOT fire onUsage for non-turn.completed events', () => {
+        const adapter = new CodexAdapter();
+        const deltas = [];
+        inspectEvent(adapter, { type: 'turn.started' }, { onUsage: (d) => deltas.push(d) });
+        inspectEvent(adapter, {
+            type: 'item.completed',
+            item: { type: 'agent_message', text: 'hi' },
+        }, { onUsage: (d) => deltas.push(d) });
+        expect(deltas.length).toBe(0);
+    });
+    it('skips onUsage when turn.completed carries no usage block', () => {
+        const adapter = new CodexAdapter();
+        const deltas = [];
+        inspectEvent(adapter, { type: 'turn.completed' }, { onUsage: (d) => deltas.push(d) });
+        expect(deltas.length).toBe(0);
+    });
+});
+describe('CodexAdapter prepareCommand', () => {
+    it('does not pin cwd for non-IM calls (no threadId/platform)', async () => {
+        const adapter = new CodexAdapter();
+        const plan = await _testInternals.prepareCommand(adapter, 'p', {});
+        expect(plan.cwd).toBeUndefined();
+    });
+    it('pins cwd to ~/.im-hub-workspaces/codex when threadId+platform present', async () => {
+        const adapter = new CodexAdapter();
+        const plan = await _testInternals.prepareCommand(adapter, 'p', {
+            threadId: 't1', platform: 'wechat', channelId: 'c1', userId: 'u1',
+        });
+        expect(plan.cwd).toBeDefined();
+        expect(plan.cwd.endsWith('/codex')).toBe(true);
+    });
+});
+//# sourceMappingURL=adapter.test.js.map