opencastle 0.11.0 → 0.13.0

package/dist/cli/convoy/events.d.ts

@@ -0,0 +1,10 @@
+import type { ConvoyStore } from './store.js';
+export interface ConvoyEventEmitter {
+    emit(type: string, data?: Record<string, unknown>, ids?: {
+        convoy_id?: string;
+        task_id?: string;
+        worker_id?: string;
+    }): void;
+}
+export declare function createEventEmitter(store: ConvoyStore, logsDir?: string): ConvoyEventEmitter;
+//# sourceMappingURL=events.d.ts.map

package/dist/cli/convoy/events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/events.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,WAAW,kBAAkB;IACjC,IAAI,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,IAAI,CAAA;CACR;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,kBAAkB,CA6B3F"}

package/dist/cli/convoy/events.js

@@ -0,0 +1,27 @@
+import { appendEvent as appendNdjson } from '../log.js';
+export function createEventEmitter(store, logsDir) {
+    return {
+        emit(type, data, ids) {
+            const now = new Date().toISOString();
+            store.insertEvent({
+                convoy_id: ids?.convoy_id ?? null,
+                task_id: ids?.task_id ?? null,
+                worker_id: ids?.worker_id ?? null,
+                type,
+                data: data !== undefined ? JSON.stringify(data) : null,
+                created_at: now,
+            });
+            appendNdjson({
+                timestamp: now,
+                type,
+                convoy_id: ids?.convoy_id ?? null,
+                task_id: ids?.task_id ?? null,
+                worker_id: ids?.worker_id ?? null,
+                ...(data ?? {}),
+            }, logsDir ?? null).catch(() => {
+                // fire-and-forget: NDJSON write failure must not crash the convoy engine
+            });
+        },
+    };
+}
+//# sourceMappingURL=events.js.map

package/dist/cli/convoy/events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/cli/convoy/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AAWvD,MAAM,UAAU,kBAAkB,CAAC,KAAkB,EAAE,OAAgB;IACrE,OAAO;QACL,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG;YAClB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YAEpC,KAAK,CAAC,WAAW,CAAC;gBAChB,SAAS,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI;gBACjC,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,IAAI;gBAC7B,SAAS,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI;gBACjC,IAAI;gBACJ,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;gBACtD,UAAU,EAAE,GAAG;aAChB,CAAC,CAAA;YAEF,YAAY,CACV;gBACE,SAAS,EAAE,GAAG;gBACd,IAAI;gBACJ,SAAS,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI;gBACjC,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,IAAI;gBAC7B,SAAS,EAAE,GAAG,EAAE,SAAS,IAAI,IAAI;gBACjC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;aAChB,EACD,OAAO,IAAI,IAAI,CAChB,CAAC,KAAK,CAAC,GAAG,EAAE;gBACX,yEAAyE;YAC3E,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/cli/convoy/events.test.d.ts

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

package/dist/cli/convoy/events.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.test.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/events.test.ts"],"names":[],"mappings":""}

package/dist/cli/convoy/events.test.js

@@ -0,0 +1,94 @@
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { createConvoyStore } from './store.js';
+import { createEventEmitter } from './events.js';
+vi.mock('../log.js', () => ({
+    appendEvent: vi.fn().mockResolvedValue(undefined),
+}));
+import { appendEvent } from '../log.js';
+const mockAppend = vi.mocked(appendEvent);
+let tmpDir;
+let store;
+beforeEach(() => {
+    tmpDir = mkdtempSync(join(tmpdir(), 'emitter-test-'));
+    store = createConvoyStore(join(tmpDir, 'test.db'));
+    vi.clearAllMocks();
+    store.insertConvoy({
+        id: 'c1',
+        name: 'Test',
+        spec_hash: 'x',
+        status: 'pending',
+        branch: null,
+        created_at: new Date().toISOString(),
+        spec_yaml: 'name: test',
+    });
+});
+afterEach(() => {
+    store.close();
+    rmSync(tmpDir, { recursive: true, force: true });
+});
+describe('createEventEmitter', () => {
+    it('inserts the event into SQLite', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('task_started', { msg: 'started' }, { convoy_id: 'c1' });
+        const events = store.getEvents('c1');
+        expect(events).toHaveLength(1);
+        expect(events[0].type).toBe('task_started');
+        expect(events[0].convoy_id).toBe('c1');
+    });
+    it('serializes event data to JSON in SQLite', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('task_done', { exitCode: 0, output: 'ok' }, { convoy_id: 'c1' });
+        const events = store.getEvents('c1');
+        const parsed = JSON.parse(events[0].data);
+        expect(parsed.exitCode).toBe(0);
+        expect(parsed.output).toBe('ok');
+    });
+    it('stores null data when no data object is provided', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('heartbeat', undefined, { convoy_id: 'c1' });
+        const events = store.getEvents('c1');
+        expect(events[0].data).toBeNull();
+    });
+    it('calls appendEvent for NDJSON dual-write', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('convoy_started', { name: 'test' }, { convoy_id: 'c1' });
+        expect(mockAppend).toHaveBeenCalledOnce();
+    });
+    it('passes logs dir to appendEvent', () => {
+        const emitter = createEventEmitter(store, '/some/logs');
+        emitter.emit('convoy_started', {}, { convoy_id: 'c1' });
+        expect(mockAppend).toHaveBeenCalledWith(expect.objectContaining({ type: 'convoy_started', convoy_id: 'c1' }), '/some/logs');
+    });
+    it('defaults all ids to null when ids are not provided', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('generic_event');
+        const db = require('node:sqlite').DatabaseSync;
+        // Verify via NDJSON mock payload
+        expect(mockAppend).toHaveBeenCalledWith(expect.objectContaining({
+            convoy_id: null,
+            task_id: null,
+            worker_id: null,
+        }), null);
+    });
+    it('includes all provided ids in the NDJSON record', () => {
+        const emitter = createEventEmitter(store, tmpDir);
+        emitter.emit('worker_spawned', {}, { convoy_id: 'c1', task_id: 't1', worker_id: 'w1' });
+        expect(mockAppend).toHaveBeenCalledWith(expect.objectContaining({ convoy_id: 'c1', task_id: 't1', worker_id: 'w1' }), tmpDir);
+    });
+    it('SQLite event stores correct ids', () => {
+        const emitter = createEventEmitter(store);
+        emitter.emit('worker_done', {}, { convoy_id: 'c1', task_id: 'task-x', worker_id: 'wkr-y' });
+        const events = store.getEvents('c1');
+        expect(events[0].task_id).toBe('task-x');
+        expect(events[0].worker_id).toBe('wkr-y');
+    });
+    it('does not throw if NDJSON write fails', () => {
+        mockAppend.mockRejectedValueOnce(new Error('disk full'));
+        const emitter = createEventEmitter(store);
+        expect(() => emitter.emit('test', {}, { convoy_id: 'c1' })).not.toThrow();
+    });
+});
+//# sourceMappingURL=events.test.js.map

package/dist/cli/convoy/events.test.js.map

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

package/dist/cli/convoy/merge.d.ts

@@ -0,0 +1,15 @@
+export interface MergeResult {
+    success: boolean;
+    conflicted: boolean;
+    message: string;
+}
+export interface MergeQueue {
+    /**
+     * Merge a single worktree's changes back onto the target branch.
+     * Stages all changes in the worktree, commits them if necessary, then merges
+     * the worktree branch into the target branch.
+     */
+    merge(worktreePath: string, worktreeBranch: string, targetBranch: string): Promise<MergeResult>;
+}
+export declare function createMergeQueue(repoPath: string): MergeQueue;
+//# sourceMappingURL=merge.d.ts.map

package/dist/cli/convoy/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/merge.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,UAAU;IACzB;;;;OAIG;IACH,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAChG;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAmE7D"}

package/dist/cli/convoy/merge.js

@@ -0,0 +1,62 @@
+import { execFile as execFileCb } from 'node:child_process';
+import { resolve, join, sep } from 'node:path';
+import { promisify } from 'node:util';
+const execFile = promisify(execFileCb);
+export function createMergeQueue(repoPath) {
+    const worktreesDir = resolve(join(repoPath, '.opencastle', 'worktrees'));
+    async function merge(worktreePath, worktreeBranch, targetBranch) {
+        const resolvedWorktree = resolve(worktreePath);
+        if (!resolvedWorktree.startsWith(worktreesDir + sep)) {
+            throw new Error(`Path "${worktreePath}" is outside the managed worktrees directory`);
+        }
+        // Stage all untracked/modified files in the worktree
+        await execFile('git', ['-C', resolvedWorktree, 'add', '-A']);
+        // List staged files — non-empty output means there are changes to commit.
+        // Uses --name-only (exits 0 regardless of diff size) rather than --quiet
+        // (exits 1 when changes exist) so the check is output-based, not exit-code-based.
+        const { stdout: staged } = await execFile('git', [
+            '-C',
+            resolvedWorktree,
+            'diff',
+            '--cached',
+            '--name-only',
+        ]);
+        const hasUncommitted = staged.trim().length > 0;
+        if (hasUncommitted) {
+            await execFile('git', [
+                '-C',
+                resolvedWorktree,
+                'commit',
+                '-m',
+                `convoy: ${worktreeBranch} completed`,
+            ]);
+        }
+        // Merge the worktree branch into the target branch in the main repo
+        await execFile('git', ['-C', repoPath, 'checkout', targetBranch]);
+        try {
+            const { stdout } = await execFile('git', [
+                '-C',
+                repoPath,
+                'merge',
+                worktreeBranch,
+                '--no-edit',
+            ]);
+            if (stdout.includes('Already up to date')) {
+                return { success: true, conflicted: false, message: 'No changes to merge' };
+            }
+            return { success: true, conflicted: false, message: 'Merged successfully' };
+        }
+        catch (err) {
+            const error = err;
+            const isConflict = error.code === 1 &&
+                ((error.stderr ?? '').includes('CONFLICT') || (error.stdout ?? '').includes('CONFLICT'));
+            if (isConflict) {
+                await execFile('git', ['-C', repoPath, 'merge', '--abort']);
+                return { success: false, conflicted: true, message: 'Merge conflict detected; merge aborted' };
+            }
+            throw err;
+        }
+    }
+    return { merge };
+}
+//# sourceMappingURL=merge.js.map

package/dist/cli/convoy/merge.js.map

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

package/dist/cli/convoy/merge.test.d.ts

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

package/dist/cli/convoy/merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/merge.test.ts"],"names":[],"mappings":""}

package/dist/cli/convoy/merge.test.js

@@ -0,0 +1,134 @@
+import { mkdtempSync, rmSync, realpathSync, writeFileSync, mkdirSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { execFile as execFileCb } from 'node:child_process';
+import { promisify } from 'node:util';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { createMergeQueue } from './merge.js';
+const execFile = promisify(execFileCb);
+// ── helpers ───────────────────────────────────────────────────────────────────
+let repoPath;
+let featureBranch;
+let queue;
+async function setupTestRepo() {
+    const path = realpathSync(mkdtempSync(join(tmpdir(), 'merge-test-')));
+    await execFile('git', ['init', path]);
+    await execFile('git', ['-C', path, 'config', 'user.email', 'test@test.com']);
+    await execFile('git', ['-C', path, 'config', 'user.name', 'Test']);
+    writeFileSync(join(path, 'README.md'), '# Test');
+    await execFile('git', ['-C', path, 'add', '-A']);
+    await execFile('git', ['-C', path, 'commit', '-m', 'Initial commit']);
+    await execFile('git', ['-C', path, 'checkout', '-b', 'feat/test']);
+    return { repoPath: path, featureBranch: 'feat/test' };
+}
+async function addWorktree(repo, workerId, branch) {
+    const worktreesDir = join(repo, '.opencastle', 'worktrees');
+    mkdirSync(worktreesDir, { recursive: true });
+    const worktreePath = join(worktreesDir, workerId);
+    await execFile('git', ['-C', repo, 'worktree', 'add', worktreePath, '-b', `convoy-${workerId}`, branch]);
+    return worktreePath;
+}
+beforeEach(async () => {
+    const result = await setupTestRepo();
+    repoPath = result.repoPath;
+    featureBranch = result.featureBranch;
+    queue = createMergeQueue(repoPath);
+});
+afterEach(() => {
+    rmSync(repoPath, { recursive: true, force: true });
+});
+// ── successful merge ──────────────────────────────────────────────────────────
+describe('merge - successful merge', () => {
+    it('stages, commits, and merges worktree changes to the target branch', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        writeFileSync(join(worktreePath, 'output.txt'), 'worker output');
+        const result = await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        expect(result).toEqual({ success: true, conflicted: false, message: 'Merged successfully' });
+    });
+    it('makes the merged file available in the target branch working tree', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        writeFileSync(join(worktreePath, 'output.txt'), 'worker output');
+        await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        const { existsSync } = await import('node:fs');
+        expect(existsSync(join(repoPath, 'output.txt'))).toBe(true);
+    });
+    it('creates an auto-commit on the worktree branch with the convoy message', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        writeFileSync(join(worktreePath, 'output.txt'), 'worker output');
+        await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        const { stdout } = await execFile('git', ['-C', repoPath, 'log', '--oneline', 'convoy-worker1']);
+        expect(stdout).toContain('convoy: convoy-worker1 completed');
+    });
+});
+// ── no changes ────────────────────────────────────────────────────────────────
+describe('merge - no changes', () => {
+    it('returns success with "No changes to merge" when the worker made no file changes', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        const result = await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        expect(result).toEqual({ success: true, conflicted: false, message: 'No changes to merge' });
+    });
+    it('does not create a commit when there is nothing to stage', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        const { stdout } = await execFile('git', ['-C', repoPath, 'log', '--oneline', 'convoy-worker1']);
+        expect(stdout).not.toContain('convoy: convoy-worker1 completed');
+    });
+});
+// ── merge conflict ────────────────────────────────────────────────────────────
+describe('merge - conflict', () => {
+    it('returns conflicted: true and aborts when two worktrees edit the same file', async () => {
+        const worktree1 = await addWorktree(repoPath, 'worker1', featureBranch);
+        const worktree2 = await addWorktree(repoPath, 'worker2', featureBranch);
+        writeFileSync(join(worktree1, 'shared.txt'), 'content from worker 1');
+        writeFileSync(join(worktree2, 'shared.txt'), 'content from worker 2');
+        const first = await queue.merge(worktree1, 'convoy-worker1', featureBranch);
+        expect(first).toEqual({ success: true, conflicted: false, message: 'Merged successfully' });
+        const second = await queue.merge(worktree2, 'convoy-worker2', featureBranch);
+        expect(second.success).toBe(false);
+        expect(second.conflicted).toBe(true);
+        expect(second.message).toContain('conflict');
+    });
+    it('leaves the repo in a clean state (no pending merge) after aborting a conflict', async () => {
+        const worktree1 = await addWorktree(repoPath, 'worker1', featureBranch);
+        const worktree2 = await addWorktree(repoPath, 'worker2', featureBranch);
+        writeFileSync(join(worktree1, 'shared.txt'), 'content from worker 1');
+        writeFileSync(join(worktree2, 'shared.txt'), 'content from worker 2');
+        await queue.merge(worktree1, 'convoy-worker1', featureBranch);
+        await queue.merge(worktree2, 'convoy-worker2', featureBranch);
+        // --untracked-files=no excludes the .opencastle/worktrees/ dir from the check;
+        // we only want to verify there is no pending merge (no staged/modified tracked files).
+        const { stdout } = await execFile('git', ['-C', repoPath, 'status', '--porcelain', '--untracked-files=no']);
+        expect(stdout.trim()).toBe('');
+    });
+});
+// ── already committed changes ─────────────────────────────────────────────────
+describe('merge - already committed changes', () => {
+    it('merges pre-committed changes without auto-committing', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        writeFileSync(join(worktreePath, 'output.txt'), 'pre-committed content');
+        await execFile('git', ['-C', worktreePath, 'add', '-A']);
+        await execFile('git', ['-C', worktreePath, 'commit', '-m', 'Worker manual commit']);
+        const result = await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        expect(result).toEqual({ success: true, conflicted: false, message: 'Merged successfully' });
+    });
+    it('makes pre-committed files available in the target branch after merge', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        writeFileSync(join(worktreePath, 'output.txt'), 'pre-committed content');
+        await execFile('git', ['-C', worktreePath, 'add', '-A']);
+        await execFile('git', ['-C', worktreePath, 'commit', '-m', 'Worker manual commit']);
+        await queue.merge(worktreePath, 'convoy-worker1', featureBranch);
+        const { existsSync } = await import('node:fs');
+        expect(existsSync(join(repoPath, 'output.txt'))).toBe(true);
+    });
+});
+// ── error handling ────────────────────────────────────────────────────────────
+describe('merge - error handling', () => {
+    it('throws when the worktree branch does not exist in the repo', async () => {
+        const worktreePath = await addWorktree(repoPath, 'worker1', featureBranch);
+        await expect(queue.merge(worktreePath, 'nonexistent-branch', featureBranch)).rejects.toThrow();
+    });
+    it('throws when path is outside the managed worktrees directory', async () => {
+        await expect(queue.merge('/tmp/evil', 'some-branch', featureBranch)).rejects.toThrow(/outside the managed worktrees directory/);
+    });
+});
+//# sourceMappingURL=merge.test.js.map

package/dist/cli/convoy/merge.test.js.map

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

package/dist/cli/convoy/store.d.ts

@@ -0,0 +1,23 @@
+import type { ConvoyRecord, ConvoyStatus, TaskRecord, ConvoyTaskStatus, WorkerRecord, WorkerStatus, EventRecord } from './types.js';
+export interface ConvoyStore {
+    insertConvoy(record: Omit<ConvoyRecord, 'started_at' | 'finished_at'>): void;
+    getConvoy(id: string): ConvoyRecord | undefined;
+    updateConvoyStatus(id: string, status: ConvoyStatus, extra?: {
+        started_at?: string;
+        finished_at?: string;
+    }): void;
+    insertTask(record: Omit<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at'>): void;
+    getTask(id: string, convoyId: string): TaskRecord | undefined;
+    getTasksByConvoy(convoyId: string): TaskRecord[];
+    updateTaskStatus(id: string, convoyId: string, status: ConvoyTaskStatus, extra?: Partial<Pick<TaskRecord, 'worker_id' | 'worktree' | 'output' | 'exit_code' | 'started_at' | 'finished_at' | 'retries'>>): void;
+    getReadyTasks(convoyId: string): TaskRecord[];
+    insertWorker(record: Omit<WorkerRecord, 'finished_at' | 'last_heartbeat'>): void;
+    getWorker(id: string): WorkerRecord | undefined;
+    updateWorkerStatus(id: string, status: WorkerStatus, extra?: Partial<Pick<WorkerRecord, 'finished_at' | 'last_heartbeat' | 'pid'>>): void;
+    insertEvent(record: Omit<EventRecord, 'id'>): void;
+    getEvents(convoyId: string): EventRecord[];
+    withTransaction<T>(fn: () => T): T;
+    close(): void;
+}
+export declare function createConvoyStore(dbPath: string): ConvoyStore;
+//# sourceMappingURL=store.d.ts.map

package/dist/cli/convoy/store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/cli/convoy/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,WAAW,EACZ,MAAM,YAAY,CAAA;AAInB,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,YAAY,GAAG,aAAa,CAAC,GAAG,IAAI,CAAA;IAC5E,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAA;IAC/C,kBAAkB,CAChB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,YAAY,EACpB,KAAK,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GACpD,IAAI,CAAA;IACP,UAAU,CACR,MAAM,EAAE,IAAI,CACV,UAAU,EACV,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,aAAa,CACjF,GACA,IAAI,CAAA;IACP,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAA;IAC7D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAAA;IAChD,gBAAgB,CACd,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,EACxB,KAAK,CAAC,EAAE,OAAO,CACb,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,aAAa,GAAG,SAAS,CAAC,CAC/G,GACA,IAAI,CAAA;IACP,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,EAAE,CAAA;IAC7C,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,gBAAgB,CAAC,GAAG,IAAI,CAAA;IAChF,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAA;IAC/C,kBAAkB,CAChB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,YAAY,EACpB,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,gBAAgB,GAAG,KAAK,CAAC,CAAC,GAC5E,IAAI,CAAA;IACP,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,IAAI,CAAA;IAClD,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;IAC1C,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;IAClC,KAAK,IAAI,IAAI,CAAA;CACd;AAgQD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAE7D"}