kimaki 0.31.0 → 1.1.0

package/dist/agent-ui.d.ts

@@ -0,0 +1,33 @@
+import { type ModalSubmitInteraction } from 'discord.js';
+import { type Bot } from './bot.ts';
+import { ConfigError } from './errors.ts';
+import type { InteractionRoutes } from './interaction-context.ts';
+import type { AgentButton } from './thread-reducer.ts';
+export declare function parseButton(value: string): ConfigError | AgentButton;
+type UploadResult = {
+    paths: string[];
+} | {
+    cancelled: true;
+};
+type AgentUiInput = {
+    sessionId: string;
+    content: {
+        buttons: AgentButton[];
+    } | {
+        prompt: string;
+        maxFiles: number;
+    };
+    fromShell?: boolean;
+    toolCall?: string;
+    signal: AbortSignal;
+};
+export type AgentUi = {
+    request: (input: AgentUiInput) => Promise<ConfigError | {
+        shown: true;
+    } | UploadResult>;
+    submitUpload: (interaction: ModalSubmitInteraction) => Promise<unknown>;
+    stop: () => void;
+};
+export declare function createAgentUi(bot: Pick<Bot, 'store' | 'eventLoop' | 'opencode'>): AgentUi;
+export declare const agentUiRoutes: InteractionRoutes;
+export {};

package/dist/agent-ui.e2e.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/agent-ui.e2e.test.js

@@ -0,0 +1,140 @@
+import fs from 'node:fs';
+import { ComponentType } from 'discord.js';
+import { afterAll, beforeAll, expect, test } from 'vitest';
+import { TEST_USER_ID, seedProjectChannel, startOpencodeTestServer, startTestBot, startTwin, tempDataDir, waitFor, waitForFooter, warmUp, toolParts, textParts } from "./test/harness.js";
+import { send, shell } from "./prompt.js";
+const dataDir = tempDataDir();
+let server;
+let twin;
+let bot;
+beforeAll(async () => {
+    ;
+    [server, twin] = await Promise.all([startOpencodeTestServer({ matchers: [
+                { id: 'buttons', priority: 100, when: { latestUserTextIncludes: 'button-marker' }, then: { parts: [
+                            { type: 'text-start', id: 'intro' }, { type: 'text-delta', id: 'intro', delta: 'Choose the next action.' }, { type: 'text-end', id: 'intro' },
+                            ...toolParts({ toolCallId: 'buttons-call', toolName: 'shell', input: { command: "kimaki buttons --button 'Proceed' --button 'Build:green'", description: 'Show choices', hasSideEffect: true } }),
+                        ] } },
+                { id: 'buttons-done', priority: 110, when: { latestUserTextIncludes: 'button-marker', rawPromptIncludes: 'buttons-call' }, then: { parts: textParts('Buttons shown.') } },
+                { id: 'click', priority: 200, when: { latestUserTextIncludes: 'User clicked: Proceed' }, then: { parts: textParts('Proceed accepted.') } },
+                { id: 'upload', priority: 100, when: { latestUserTextIncludes: 'upload-marker' }, then: { parts: toolParts({ toolCallId: 'upload-call', toolName: 'shell', input: { command: "kimaki upload-request --prompt 'Send the logo' --max-files 2", timeout: 600000, description: 'Request logo', hasSideEffect: true } }) } },
+                { id: 'upload-done', priority: 110, when: { latestUserTextIncludes: 'upload-marker', rawPromptIncludes: 'upload-call' }, then: { parts: textParts('Upload received.') } },
+                { id: 'branch', priority: 200, when: { latestUserTextIncludes: 'git-marker', rawPromptIncludes: '[current git branch is main]' }, then: { parts: textParts('Git context received.') } },
+            ] }), startTwin()]);
+    await seedProjectChannel({ dataDir, channelId: twin.channelId, guildId: twin.discord.guildId, directory: server.projectDirectory });
+    bot = await startTestBot({ dataDir, twin, server });
+    await warmUp({ server });
+}, 60_000);
+afterAll(async () => {
+    await bot?.stop();
+    await Promise.all([server?.stop(), twin?.stop()]);
+    fs.rmSync(dataDir, { recursive: true, force: true });
+});
+async function start(prompt) {
+    const result = await send(bot, { channelId: twin.channelId, prompt });
+    if (result instanceof Error)
+        throw result;
+    return result.threadId;
+}
+async function ui(threadId, prefix) {
+    return waitFor({ label: prefix, check: async () => {
+            for (const message of await twin.discord.thread(threadId).getMessages())
+                for (const row of message.components ?? []) {
+                    if (row.type !== ComponentType.ActionRow)
+                        continue;
+                    for (const item of row.components)
+                        if (item.type === ComponentType.Button && 'custom_id' in item && item.custom_id.startsWith(prefix))
+                            return { message, button: item };
+                }
+            return null;
+        } });
+}
+test('agent shim shows buttons after text and a click resumes the real session', async () => {
+    const threadId = await start('button-marker');
+    const shown = await ui(threadId, 'action_button:');
+    await waitForFooter({ discord: twin.discord, threadId });
+    const sessionId = bot.store.getState().roots[threadId];
+    const started = shell(bot, { threadId, sessionId, command: 'printf synthetic' });
+    if (started instanceof Error)
+        throw started;
+    await waitFor({ label: 'synthetic shell output', check: async () => (await twin.discord.thread(threadId).text()).includes('```\nsynthetic\n```') });
+    await twin.discord.thread(threadId).user(TEST_USER_ID).clickButton({ messageId: shown.message.id, customId: shown.button.custom_id });
+    await waitForFooter({ discord: twin.discord, threadId, count: 2 });
+    expect(await twin.discord.thread(threadId).text()).toMatchInlineSnapshot(`
+    "--- from: assistant (TestBot)
+    » **CLI:** button-marker
+    -# *using deterministic-provider/deterministic-v2 ⋅ build*
+    Choose the next action.
+
+    -# ┣ shell _Show choices_
+    -# ⬦ clicked "Proceed"
+
+    Buttons shown.
+    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+    -# $ printf synthetic
+    \`\`\`
+    synthetic
+    \`\`\`
+
+    Proceed accepted.
+    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+  `);
+    const messages = await twin.discord.thread(threadId).getMessages();
+    expect(messages.findIndex((message) => message.content.includes('Choose the next action.'))).toBeLessThan(messages.findIndex((message) => message.id === shown.message.id));
+    expect(messages.some((message) => message.content.includes('Proceed accepted.'))).toBe(true);
+});
+test('native file upload modal returns local paths to the agent shell', async () => {
+    const threadId = await start('upload-marker');
+    const shown = await ui(threadId, 'file_upload_btn:');
+    const user = twin.discord.thread(threadId).user(TEST_USER_ID);
+    const clicked = await user.clickButton({ messageId: shown.message.id, customId: shown.button.custom_id });
+    await twin.discord.thread(threadId).waitForInteractionAck({ interactionId: clicked.id });
+    await user.submitModal({ customId: shown.button.custom_id.replace('file_upload_btn:', 'file_upload_modal:'), fields: [], files: [{ customId: 'files', attachments: [{
+                        id: '200000000000009999', filename: 'logo.txt', size: 4, url: 'data:text/plain;base64,bG9nbw==', proxy_url: 'data:text/plain;base64,bG9nbw==',
+                    }] }] });
+    await waitForFooter({ discord: twin.discord, threadId });
+    expect(await twin.discord.thread(threadId).text()).toMatchInlineSnapshot(`
+    "--- from: assistant (TestBot)
+    » **CLI:** upload-marker
+    -# *using deterministic-provider/deterministic-v2 ⋅ build*
+    -# ┣ shell _Request logo_
+    -# ⬦ dismissed
+    Uploaded 1 file(s)
+
+    Upload received.
+    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+  `);
+    const dirs = fs.readdirSync(`${server.projectDirectory}/uploads`);
+    expect(fs.readFileSync(`${server.projectDirectory}/uploads/${dirs[0]}/0-logo.txt`, 'utf8')).toBe('logo');
+});
+test('git context is added only to marked Discord sessions', async () => {
+    const threadId = await start('git-marker');
+    await waitForFooter({ discord: twin.discord, threadId });
+    expect(await twin.discord.thread(threadId).text()).toMatchInlineSnapshot(`
+    "--- from: assistant (TestBot)
+    » **CLI:** git-marker
+    -# *using deterministic-provider/deterministic-v2 ⋅ build*
+    Git context received.
+    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+  `);
+    expect((await twin.discord.thread(threadId).text()).includes('Git context received.')).toBe(true);
+    const client = await server.client();
+    // The branch is a synthetic message before the prompt, added again only when it changes.
+    const sessionId = bot.store.getState().roots[threadId];
+    await client.session.prompt({ sessionID: sessionId, text: 'git-marker again' });
+    await client.session.wait({ sessionID: sessionId });
+    const history = await client.session.context({ sessionID: sessionId });
+    expect(history.flatMap((message) => message.type === 'synthetic' || message.type === 'user' ? [`${message.type}: ${message.text.split('\n')[0]}`] : [])).toMatchInlineSnapshot(`
+    [
+      "synthetic: [current git branch is main]",
+      "user: git-marker",
+      "user: git-marker again",
+    ]
+  `);
+    const plugins = await client.plugin.list({ location: { directory: server.projectDirectory } });
+    expect(plugins.data.find((plugin) => plugin.id === 'kimaki')?.state.status).toBe('active');
+    const session = await client.session.create({ location: { directory: server.projectDirectory } });
+    await client.session.prompt({ sessionID: session.id, text: 'git-marker' });
+    await client.session.wait({ sessionID: session.id });
+    expect(JSON.stringify(await client.message.list({ sessionID: session.id }))).not.toContain('Git context received.');
+});
+//# sourceMappingURL=agent-ui.e2e.test.js.map

package/dist/agent-ui.e2e.test.js.map

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

package/dist/agent-ui.js

@@ -0,0 +1,199 @@
+// Agent UI: `kimaki buttons` and `kimaki upload-request` prompts in a session
+// thread, their buttons and the file upload modal.
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { FileUploadBuilder, LabelBuilder, ModalBuilder, MessageFlags } from 'discord.js';
+import { sessionDirectory } from "./bot.js";
+import { ConfigError, DiscordError } from "./errors.js";
+import { send } from "./prompt.js";
+export function parseButton(value) {
+    const match = value.match(/:(white|blue|green|red)$/);
+    const color = match?.[1] ?? 'white';
+    const label = match ? value.slice(0, -match[0].length) : value;
+    if (!label.trim() || label.length > 80)
+        return new ConfigError({ reason: 'Button labels must have 1 to 80 characters' });
+    if (color !== 'white' && color !== 'blue' && color !== 'green' && color !== 'red')
+        return new ConfigError({ reason: 'Unknown button color' });
+    return { label, color };
+}
+function cancelUpload(pending) {
+    clearTimeout(pending.timer);
+    pending.controller.abort();
+    pending.resolve({ cancelled: true });
+}
+function promptShown(threads, id) {
+    return Object.values(threads).some((view) => view.agentUi.some((prompt) => prompt.id === id));
+}
+function shownPrompt(bot, { id, threadId }) {
+    return bot.store.getState().threads[threadId]?.agentUi.find((prompt) => prompt.id === id);
+}
+// `kimaki buttons --from-shell` must post after its shell's tool line.
+async function waitForShellCall(bot, { toolCall, signal }) {
+    const seen = () => Object.values(bot.store.getState().threads).some((view) => {
+        const tool = view.tools[toolCall];
+        return tool?.name === 'shell' && tool.phase === 'called';
+    });
+    if (seen())
+        return;
+    return new Promise((resolve) => {
+        const finish = (value) => {
+            clearTimeout(timer);
+            off();
+            signal.removeEventListener('abort', abort);
+            resolve(value);
+        };
+        const off = bot.store.subscribe(() => {
+            if (seen())
+                finish();
+        });
+        const abort = () => finish(new ConfigError({ reason: 'Agent UI request cancelled' }));
+        const timer = setTimeout(() => {
+            finish(new ConfigError({ reason: 'No running shell call observed. Run this command from the session shell.' }));
+        }, 10_000);
+        signal.addEventListener('abort', abort, { once: true });
+        if (signal.aborted)
+            abort();
+        else if (seen())
+            finish();
+    });
+}
+// One per bot (bot.features.agentUi). The upload waits stay in this closure.
+export function createAgentUi(bot) {
+    // Agent UI upload id -> the `kimaki upload-request` call waiting for files.
+    const uploads = new Map();
+    // The one reactive side effect of uploads: a prompt that leaves every view
+    // (dismissed by a new message, the session ended) cancels its waiting call.
+    const unsubscribe = bot.store.subscribe((state, previous) => {
+        for (const [id, pending] of uploads) {
+            if (!promptShown(previous.threads, id) || promptShown(state.threads, id))
+                continue;
+            cancelUpload(pending);
+            uploads.delete(id);
+        }
+    });
+    async function request({ sessionId, content, fromShell, toolCall, signal }) {
+        const threadId = bot.store.getState().sessionThreads[sessionId];
+        if (!threadId)
+            return new ConfigError({ reason: 'This session has no local Discord thread' });
+        const prompt = { id: crypto.randomBytes(8).toString('hex'), sessionId, ...content };
+        if (fromShell) {
+            if (!toolCall)
+                return new ConfigError({ reason: 'The Kimaki plugin must provide KIMAKI_TOOL_CALL for agent UI commands' });
+            const waited = await waitForShellCall(bot, { toolCall, signal });
+            if (waited instanceof Error)
+                return waited;
+        }
+        bot.eventLoop.dispatch(threadId, { type: 'kimaki.agent-ui', prompt });
+        if (prompt.buttons)
+            return { shown: true };
+        return new Promise((resolve) => {
+            const finish = (value) => {
+                signal.removeEventListener('abort', abort);
+                resolve(value);
+            };
+            const abort = () => {
+                bot.eventLoop.dispatch(threadId, { type: 'kimaki.agent-ui-dismiss', id: prompt.id });
+                finish({ cancelled: true });
+            };
+            const timer = setTimeout(abort, 6 * 60_000);
+            uploads.set(prompt.id, { resolve: finish, timer, controller: new AbortController() });
+            signal.addEventListener('abort', abort, { once: true });
+            if (signal.aborted)
+                abort();
+        });
+    }
+    async function submitUpload(interaction) {
+        await interaction.deferReply({ flags: MessageFlags.Ephemeral });
+        const threadId = interaction.channelId;
+        if (!threadId)
+            return interaction.editReply({ content: 'Use this upload in its session thread' });
+        const id = interaction.customId.split(':')[1] ?? '';
+        const prompt = shownPrompt(bot, { id, threadId });
+        const pending = uploads.get(id);
+        if (!prompt || !pending)
+            return interaction.editReply({ content: 'Upload request expired' });
+        const active = () => uploads.get(id) === pending && !pending.controller.signal.aborted;
+        const directory = await sessionDirectory(bot, prompt.sessionId);
+        if (!active())
+            return interaction.editReply({ content: 'Upload cancelled' });
+        if (directory instanceof Error)
+            return interaction.editReply({ content: directory.message });
+        const files = [...interaction.fields.getUploadedFiles('files', true).values()];
+        if (files.length < 1 || files.length > (prompt.maxFiles ?? 5))
+            return interaction.editReply({ content: 'Too many files' });
+        const output = path.join(directory, 'uploads', id);
+        const created = await fs.promises
+            .mkdir(output, { recursive: true })
+            .catch((cause) => new DiscordError({ operation: 'create upload directory', cause }));
+        if (created instanceof Error)
+            return interaction.editReply({ content: created.message });
+        const paths = [];
+        for (const [index, file] of files.entries()) {
+            const signal = AbortSignal.any([pending.controller.signal, AbortSignal.timeout(30000)]);
+            const response = await fetch(file.url, { signal }).catch((cause) => new DiscordError({ operation: 'download upload', cause }));
+            if (!active())
+                return interaction.editReply({ content: 'Upload cancelled' });
+            if (response instanceof Error || !response.ok)
+                return interaction.editReply({ content: 'Upload download failed. Try again.' });
+            const bytes = await response.arrayBuffer().catch((cause) => new DiscordError({ operation: 'read upload', cause }));
+            if (!active())
+                return interaction.editReply({ content: 'Upload cancelled' });
+            if (bytes instanceof Error)
+                return interaction.editReply({ content: bytes.message });
+            const destination = path.join(output, `${index}-${path.basename(file.name)}`);
+            const written = await fs.promises
+                .writeFile(destination, Buffer.from(bytes), { signal: pending.controller.signal })
+                .catch((cause) => new DiscordError({ operation: 'save upload', cause }));
+            if (!active())
+                return interaction.editReply({ content: 'Upload cancelled' });
+            if (written instanceof Error)
+                return interaction.editReply({ content: written.message });
+            paths.push(destination);
+        }
+        uploads.delete(id);
+        clearTimeout(pending.timer);
+        pending.resolve({ paths });
+        bot.eventLoop.dispatch(threadId, { type: 'kimaki.agent-ui-dismiss', id });
+        return interaction.editReply({ content: `Uploaded ${paths.length} file(s)` });
+    }
+    return {
+        request,
+        submitUpload,
+        stop() {
+            unsubscribe();
+            for (const pending of uploads.values())
+                cancelUpload(pending);
+            uploads.clear();
+        },
+    };
+}
+// Buttons of an agent prompt: an action button sends `User clicked: <label>`; the
+// upload button opens the file modal.
+async function clickAgentButton(bot, interaction) {
+    const [, id = '', index = '0'] = interaction.customId.split(':');
+    const prompt = shownPrompt(bot, { id, threadId: interaction.channelId });
+    if (!prompt)
+        return interaction.reply({ content: 'This request has expired', flags: MessageFlags.Ephemeral });
+    if (!prompt.buttons) {
+        const files = new FileUploadBuilder().setCustomId('files').setMinValues(1).setMaxValues(prompt.maxFiles ?? 5).setRequired(true);
+        const modal = new ModalBuilder()
+            .setCustomId(`file_upload_modal:${id}`)
+            .setTitle('Upload files')
+            .addLabelComponents(new LabelBuilder().setLabel('Files').setFileUploadComponent(files));
+        return interaction.showModal(modal);
+    }
+    await interaction.deferUpdate();
+    const item = prompt.buttons[Number(index)];
+    if (!item)
+        return;
+    bot.eventLoop.dispatch(interaction.channelId, { type: 'kimaki.agent-ui-dismiss', id, result: `clicked "${item.label}"` });
+    const result = await send(bot, { threadId: interaction.channelId, prompt: `User clicked: ${item.label}`, user: [interaction.user.id] });
+    if (result instanceof Error)
+        await interaction.followUp({ content: result.message, flags: MessageFlags.Ephemeral });
+}
+export const agentUiRoutes = {
+    buttons: { 'action_button:': clickAgentButton, 'file_upload_btn:': clickAgentButton },
+    modals: { 'file_upload_modal:': (bot, interaction) => bot.features.agentUi.submitUpload(interaction) },
+};
+//# sourceMappingURL=agent-ui.js.map

package/dist/agent-ui.js.map

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

package/dist/analytics.d.ts

@@ -0,0 +1,42 @@
+import type { V2Event } from './opencode-server.ts';
+export type AnalyticsEventName = 'bot_started' | 'project_registered' | 'session_created' | 'turn_started' | 'turn_completed' | 'tokens_used';
+export type AnalyticsProps = Record<string, string | number | boolean>;
+export type AnalyticsEvent = {
+    name: AnalyticsEventName;
+    properties: AnalyticsProps;
+};
+type ExecutionUsage = {
+    startedAt: number;
+    steps: number;
+    input: number;
+    output: number;
+    reasoning: number;
+    cacheRead: number;
+    cacheWrite: number;
+    cost: number;
+    model: string | null;
+    provider: string | null;
+};
+export type UsageState = Readonly<Record<string, ExecutionUsage>>;
+export declare function foldAnalytics({ state, event, isRoot, }: {
+    state: UsageState;
+    event: V2Event;
+    isRoot: boolean;
+}): {
+    state: UsageState;
+    events: AnalyticsEvent[];
+};
+export type Analytics = {
+    enabled: boolean;
+    track: (name: AnalyticsEventName, properties?: AnalyticsProps) => void;
+    observe: (event: V2Event, isRoot: boolean) => void;
+    flush: () => Promise<void>;
+};
+export declare const disabledAnalytics: Analytics;
+export declare function createAnalytics({ dataDir, botMode, enabled, endpoint, }: {
+    dataDir: string;
+    botMode: 'gateway' | 'self_hosted';
+    enabled: boolean;
+    endpoint?: string;
+}): Analytics;
+export {};

package/dist/analytics.e2e.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/analytics.e2e.test.js

@@ -0,0 +1,112 @@
+// Product analytics end to end: the real Strada SDK exports OTLP JSON logs to
+// a local receiver instead of strada.sh. One Discord turn produces the funnel
+// events with the common identity props. The deterministic model reports zero
+// tokens, so tokens_used is skipped here; analytics.test.ts covers it.
+import fs from 'node:fs';
+import http from 'node:http';
+import { afterAll, beforeAll, expect, test } from 'vitest';
+import { createAnalytics } from "./analytics.js";
+import { freePort, seedProjectChannel, startOpencodeTestServer, startTestBot, startTwin, tempDataDir, TEST_USER_ID, waitFor, waitForFooter, warmUp, } from "./test/harness.js";
+let server;
+let twin;
+let bot;
+let dataDir;
+let receiver;
+const received = [];
+beforeAll(async () => {
+    dataDir = tempDataDir();
+    receiver = http.createServer((request, response) => {
+        const chunks = [];
+        request.on('data', (chunk) => chunks.push(chunk));
+        request.on('end', () => {
+            if (request.url === '/v1/logs') {
+                const body = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+                for (const record of body.resourceLogs.flatMap((logs) => logs.scopeLogs.flatMap((scope) => scope.logRecords))) {
+                    received.push(Object.fromEntries(record.attributes.map(({ key, value }) => [key, value.stringValue ?? value.boolValue ?? value.doubleValue ?? Number(value.intValue)])));
+                }
+            }
+            response.writeHead(200, { 'content-type': 'application/json' }).end('{}');
+        });
+    });
+    const port = await freePort();
+    await new Promise((resolve) => receiver.listen(port, '127.0.0.1', resolve));
+    [server, twin] = await Promise.all([startOpencodeTestServer(), startTwin()]);
+    await warmUp({ server });
+    await seedProjectChannel({ dataDir, channelId: twin.channelId, guildId: twin.discord.guildId, directory: server.projectDirectory });
+    bot = await startTestBot({
+        dataDir,
+        twin,
+        server,
+        analytics: createAnalytics({ dataDir, botMode: 'self_hosted', enabled: true, endpoint: `http://127.0.0.1:${port}` }),
+    });
+}, 60_000);
+afterAll(async () => {
+    await bot?.stop();
+    await twin?.stop();
+    await server?.stop();
+    await new Promise((resolve) => receiver?.close(() => resolve()));
+    fs.rmSync(dataDir, { recursive: true, force: true });
+});
+test('a Discord turn sends the funnel events with anonymous identity props', async () => {
+    await twin.discord.channel(twin.channelId).user(TEST_USER_ID).sendMessage({ content: 'analytics turn' });
+    const thread = await twin.discord.channel(twin.channelId).waitForThread({ timeout: 8_000 });
+    await waitForFooter({ discord: twin.discord, threadId: thread.id });
+    await waitFor({
+        label: 'turn_completed exported',
+        check: async () => {
+            await bot.analytics.flush();
+            return received.some((event) => event['event.name'] === 'turn_completed');
+        },
+    });
+    const installId = fs.readFileSync(`${dataDir}/install-id`, 'utf8').trim();
+    expect(received.map((event) => {
+        const { ['custom.install_id']: id, ['custom.platform']: platform, ['custom.arch']: arch, ...rest } = event;
+        return {
+            ...rest,
+            'custom.install_id': id === installId ? '<install-id>' : id,
+            'custom.platform': platform === process.platform ? '<platform>' : platform,
+            'custom.arch': arch === process.arch ? '<arch>' : arch,
+        };
+    })).toMatchInlineSnapshot(`
+    [
+      {
+        "custom.arch": "<arch>",
+        "custom.bot_mode": "self_hosted",
+        "custom.guild_count": 1,
+        "custom.install_id": "<install-id>",
+        "custom.platform": "<platform>",
+        "custom.schema_version": 1,
+        "custom.user_project_count": 1,
+        "event.name": "bot_started",
+      },
+      {
+        "custom.arch": "<arch>",
+        "custom.bot_mode": "self_hosted",
+        "custom.has_worktree": false,
+        "custom.install_id": "<install-id>",
+        "custom.platform": "<platform>",
+        "custom.schema_version": 1,
+        "custom.source": "discord",
+        "event.name": "session_created",
+      },
+      {
+        "custom.arch": "<arch>",
+        "custom.bot_mode": "self_hosted",
+        "custom.install_id": "<install-id>",
+        "custom.platform": "<platform>",
+        "custom.schema_version": 1,
+        "event.name": "turn_started",
+      },
+      {
+        "custom.arch": "<arch>",
+        "custom.bot_mode": "self_hosted",
+        "custom.duration_sec": 0,
+        "custom.install_id": "<install-id>",
+        "custom.platform": "<platform>",
+        "custom.schema_version": 1,
+        "event.name": "turn_completed",
+      },
+    ]
+  `);
+});
+//# sourceMappingURL=analytics.e2e.test.js.map

package/dist/analytics.e2e.test.js.map

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