@mclean-capital/neura 3.4.0 → 3.5.0

package/stores/task-comment-queries.test.js

@@ -0,0 +1,321 @@
+/**
+ * Tests for task-comment-queries.ts — the Phase 6b comments CRUD.
+ *
+ * Uses an in-memory PGlite via the PgliteStore facade. Comments are tied to
+ * a work_item (FK CASCADE), so every test creates a parent task first.
+ */
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { PGlite } from '@electric-sql/pglite';
+import { vector } from '@electric-sql/pglite/vector';
+import crypto from 'crypto';
+import { runMigrations } from './migrations.js';
+import { insertComment, listComments, pruneHeartbeats, countOpenRequests, TASK_COMMENT_CONTENT_MAX_BYTES, } from './task-comment-queries.js';
+describe('task-comment-queries', () => {
+    let db;
+    let taskId;
+    beforeEach(async () => {
+        db = await PGlite.create({ extensions: { vector } });
+        await runMigrations(db);
+        // Seed a work_item to anchor comments to.
+        taskId = crypto.randomUUID();
+        await db.query(`INSERT INTO work_items (id, title, priority) VALUES ($1, $2, $3)`, [
+            taskId,
+            'Test task',
+            'medium',
+        ]);
+    });
+    afterEach(async () => {
+        await db.close();
+    });
+    describe('insertComment', () => {
+        it('inserts a progress comment and returns the entry', async () => {
+            const comment = await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:abc-123',
+                content: 'Halfway done',
+            });
+            expect(comment.taskId).toBe(taskId);
+            expect(comment.type).toBe('progress');
+            expect(comment.author).toBe('worker:abc-123');
+            expect(comment.content).toBe('Halfway done');
+            expect(comment.urgency).toBeNull();
+            expect(comment.metadata).toBeNull();
+            expect(comment.attachmentPath).toBeNull();
+            expect(comment.createdAt).toBeTruthy();
+        });
+        it('inserts a clarification_request with urgency + metadata', async () => {
+            const comment = await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:abc-123',
+                content: 'Which branch should I push to?',
+                urgency: 'high',
+                metadata: { topic: 'git-branch-selection' },
+            });
+            expect(comment.type).toBe('clarification_request');
+            expect(comment.urgency).toBe('high');
+            expect(comment.metadata).toEqual({ topic: 'git-branch-selection' });
+        });
+        it('supports attachment_path for overflow content', async () => {
+            const comment = await insertComment(db, {
+                taskId,
+                type: 'error',
+                author: 'worker:abc-123',
+                content: 'Traceback summary (first 10 lines)…',
+                attachmentPath: '/tmp/worker/abc-123/_attachments/traceback-1.txt',
+            });
+            expect(comment.attachmentPath).toBe('/tmp/worker/abc-123/_attachments/traceback-1.txt');
+        });
+        it('rejects content exceeding the 32 KB cap', async () => {
+            const big = 'a'.repeat(TASK_COMMENT_CONTENT_MAX_BYTES + 1);
+            await expect(insertComment(db, { taskId, type: 'progress', author: 'worker:1', content: big })).rejects.toThrow(/exceeds/);
+        });
+        it('accepts content exactly at the 32 KB cap', async () => {
+            const exact = 'a'.repeat(TASK_COMMENT_CONTENT_MAX_BYTES);
+            const comment = await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: exact,
+            });
+            expect(Buffer.byteLength(comment.content)).toBe(TASK_COMMENT_CONTENT_MAX_BYTES);
+        });
+        it('rejects insertion for an unknown task_id (FK enforced)', async () => {
+            await expect(insertComment(db, {
+                taskId: 'does-not-exist',
+                type: 'progress',
+                author: 'worker:1',
+                content: 'orphan',
+            })).rejects.toThrow();
+        });
+    });
+    describe('listComments', () => {
+        it('returns comments in chronological order', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'first',
+            });
+            // Small delay so timestamps differ enough for ordering
+            await new Promise((r) => setTimeout(r, 5));
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'second',
+            });
+            await new Promise((r) => setTimeout(r, 5));
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'third',
+            });
+            const comments = await listComments(db, { taskId });
+            expect(comments).toHaveLength(3);
+            expect(comments[0].content).toBe('first');
+            expect(comments[1].content).toBe('second');
+            expect(comments[2].content).toBe('third');
+        });
+        it('filters by single comment type', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'p',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'q',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'result',
+                author: 'worker:1',
+                content: 'done',
+            });
+            const requests = await listComments(db, { taskId, type: 'clarification_request' });
+            expect(requests).toHaveLength(1);
+            expect(requests[0].content).toBe('q');
+        });
+        it('filters by multiple comment types', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'p',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'q',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'approval_request',
+                author: 'worker:1',
+                content: 'a',
+            });
+            const requests = await listComments(db, {
+                taskId,
+                type: ['clarification_request', 'approval_request'],
+            });
+            expect(requests).toHaveLength(2);
+        });
+        it('respects limit', async () => {
+            for (let i = 0; i < 5; i++) {
+                await insertComment(db, {
+                    taskId,
+                    type: 'progress',
+                    author: 'worker:1',
+                    content: `msg ${i}`,
+                });
+            }
+            const limited = await listComments(db, { taskId, limit: 3 });
+            expect(limited).toHaveLength(3);
+        });
+        it('cascades delete when parent task is deleted', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:1',
+                content: 'orphan-to-be',
+            });
+            await db.query('DELETE FROM work_items WHERE id = $1', [taskId]);
+            const comments = await listComments(db, { taskId });
+            expect(comments).toHaveLength(0);
+        });
+    });
+    describe('pruneHeartbeats', () => {
+        it('deletes only heartbeat comments from the named author', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'heartbeat',
+                author: 'worker:alpha',
+                content: 'alive',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'heartbeat',
+                author: 'worker:alpha',
+                content: 'still alive',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'heartbeat',
+                author: 'worker:beta',
+                content: 'unrelated',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'progress',
+                author: 'worker:alpha',
+                content: 'keep-me',
+            });
+            const pruned = await pruneHeartbeats(db, taskId, 'worker:alpha');
+            expect(pruned).toBe(2);
+            const remaining = await listComments(db, { taskId });
+            expect(remaining).toHaveLength(2);
+            expect(remaining.some((c) => c.author === 'worker:beta' && c.type === 'heartbeat')).toBe(true);
+            expect(remaining.some((c) => c.author === 'worker:alpha' && c.type === 'progress')).toBe(true);
+        });
+    });
+    describe('countOpenRequests', () => {
+        it('counts unresolved clarification_request + approval_request comments', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'q1',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'approval_request',
+                author: 'worker:1',
+                content: 'approve?',
+            });
+            expect(await countOpenRequests(db, taskId)).toBe(2);
+        });
+        it('excludes requests with a matching response comment', async () => {
+            const clarifyReq = await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'q1',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_response',
+                author: 'orchestrator',
+                content: 'use main',
+                metadata: { resolves_comment_id: clarifyReq.id },
+            });
+            expect(await countOpenRequests(db, taskId)).toBe(0);
+        });
+        it('returns 0 on a task with no comments at all', async () => {
+            expect(await countOpenRequests(db, taskId)).toBe(0);
+        });
+        it('ignores orchestrator responses that point at a nonexistent request id', async () => {
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'real question',
+            });
+            // A malformed response that points at an id that doesn't exist on
+            // this task (e.g. from a prior session or a bug). Must not
+            // accidentally "resolve" the unrelated real request.
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_response',
+                author: 'orchestrator',
+                content: 'dangling answer',
+                metadata: { resolves_comment_id: crypto.randomUUID() },
+            });
+            expect(await countOpenRequests(db, taskId)).toBe(1);
+        });
+        it('scopes resolution lookup to the current task — cross-task response ids do not resolve', async () => {
+            // Create a second task with its own request + response.
+            const otherTaskId = crypto.randomUUID();
+            await db.query(`INSERT INTO work_items (id, title, priority) VALUES ($1, $2, $3)`, [
+                otherTaskId,
+                'Other task',
+                'medium',
+            ]);
+            const otherReq = await insertComment(db, {
+                taskId: otherTaskId,
+                type: 'clarification_request',
+                author: 'worker:other',
+                content: 'other question',
+            });
+            // On our original task, have a request and then a malformed response
+            // that references the OTHER task's request id.
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_request',
+                author: 'worker:1',
+                content: 'q1',
+            });
+            await insertComment(db, {
+                taskId,
+                type: 'clarification_response',
+                author: 'orchestrator',
+                content: 'cross-task leak attempt',
+                metadata: { resolves_comment_id: otherReq.id },
+            });
+            // The original task's request should still count as open.
+            // (countOpenRequests's subquery scopes to task_id = $1, so the
+            // cross-task response is invisible.)
+            expect(await countOpenRequests(db, taskId)).toBe(1);
+            // The other task's request should also still be open — the only
+            // response in the system references it from the wrong task.
+            expect(await countOpenRequests(db, otherTaskId)).toBe(1);
+        });
+    });
+});
+//# sourceMappingURL=task-comment-queries.test.js.map

package/stores/task-comment-queries.test.js.map

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

package/stores/work-item-queries.d.ts

@@ -1,5 +1,5 @@
 import type { PGlite } from '@electric-sql/pglite';
-import type { WorkItemEntry, WorkItemPriority } from '@neura/types';
+import type { TaskContext, TaskSource, WorkItemEntry, WorkItemPriority, WorkItemStatus } from '@neura/types';
 export declare function getOpenWorkItems(db: PGlite, limit?: number): Promise<WorkItemEntry[]>;
 export declare function getWorkItems(db: PGlite, options?: {
     status?: string;
@@ -11,7 +11,52 @@ export declare function createWorkItem(db: PGlite, title: string, priority: Work
     dueAt?: string;
     parentId?: string;
     sourceSessionId?: string;
+    goal?: string;
+    context?: TaskContext;
+    relatedSkills?: string[];
+    repoPath?: string;
+    baseBranch?: string;
+    source?: TaskSource;
 }): Promise<string>;
-export declare function updateWorkItem(db: PGlite, id: string, updates: Partial<Pick<WorkItemEntry, 'status' | 'priority' | 'title' | 'description' | 'dueAt'>>): Promise<void>;
+/**
+ * Fields the caller may update via {@link updateWorkItem}. Excludes
+ * system-managed columns (version, lease_expires_at, completed_at,
+ * updated_at — those are maintained by the DB layer).
+ */
+export interface UpdateWorkItemFields {
+    status?: WorkItemStatus;
+    priority?: WorkItemPriority;
+    title?: string;
+    description?: string | null;
+    dueAt?: string | null;
+    goal?: string | null;
+    context?: TaskContext | null;
+    relatedSkills?: string[];
+    repoPath?: string | null;
+    baseBranch?: string | null;
+    workerId?: string | null;
+    leaseExpiresAt?: string | null;
+}
+/**
+ * Error thrown when an optimistic-lock version check fails. Caller should
+ * re-read the task and decide whether to retry or abort.
+ */
+export declare class VersionConflictError extends Error {
+    readonly id: string;
+    readonly expectedVersion: number;
+    constructor(id: string, expectedVersion: number);
+}
+/**
+ * Update a work item. Increments `version` on every call. Pass
+ * `expectVersion` to enforce optimistic locking — the caller should have
+ * read the current version first and pass it here to prevent races
+ * between concurrent `update_task` calls (worker + orchestrator).
+ *
+ * Returns the new version on success. Throws {@link VersionConflictError}
+ * if `expectVersion` was supplied and the row's version has moved.
+ */
+export declare function updateWorkItem(db: PGlite, id: string, updates: UpdateWorkItemFields, opts?: {
+    expectVersion?: number;
+}): Promise<number>;
 export declare function deleteWorkItem(db: PGlite, id: string): Promise<void>;
 //# sourceMappingURL=work-item-queries.d.ts.map

package/stores/work-item-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-item-queries.d.ts","sourceRoot":"","sources":["../../src/stores/work-item-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAKpE,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAwBvF;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5C,OAAO,CAAC,aAAa,EAAE,CAAC,CA+B1B;AAED,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAevF;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC,GAC/F,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E"}
+{"version":3,"file":"work-item-queries.d.ts","sourceRoot":"","sources":["../../src/stores/work-item-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf,MAAM,cAAc,CAAC;AAKtB,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAYvF;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5C,OAAO,CAAC,aAAa,EAAE,CAAC,CAmB1B;AAED,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAGvF;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,GACA,OAAO,CAAC,MAAM,CAAC,CAyBjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;aAE3B,EAAE,EAAE,MAAM;aACV,eAAe,EAAE,MAAM;gBADvB,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM;CAK1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAkFjB;AAED,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E"}

package/stores/work-item-queries.js

@@ -3,7 +3,7 @@ import { mapWorkItem } from './mappers.js';
 // --- Work items ---
 export async function getOpenWorkItems(db, limit = 50) {
     const result = await db.query(`SELECT * FROM work_items
-     WHERE status IN ('pending', 'in_progress')
+     WHERE status IN ('pending', 'awaiting_dispatch', 'in_progress', 'awaiting_clarification', 'awaiting_approval', 'paused')
      ORDER BY
        CASE priority WHEN 'high' THEN 0 WHEN 'medium' THEN 1 WHEN 'low' THEN 2 END,
        due_at ASC NULLS LAST,
@@ -35,8 +35,11 @@ export async function getWorkItem(db, id) {
 }
 export async function createWorkItem(db, title, priority, options) {
     const id = crypto.randomUUID();
-    await db.query(`INSERT INTO work_items (id, title, priority, description, due_at, parent_id, source_session_id)
-     VALUES ($1, $2, $3, $4, $5, $6, $7)`, [
+    await db.query(`INSERT INTO work_items (
+       id, title, priority, description, due_at, parent_id, source_session_id,
+       goal, context, related_skills, repo_path, base_branch, source
+     )
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`, [
         id,
         title,
         priority,
@@ -44,11 +47,40 @@ export async function createWorkItem(db, title, priority, options) {
         options?.dueAt ?? null,
         options?.parentId ?? null,
         options?.sourceSessionId ?? null,
+        options?.goal ?? null,
+        options?.context ? JSON.stringify(options.context) : null,
+        JSON.stringify(options?.relatedSkills ?? []),
+        options?.repoPath ?? null,
+        options?.baseBranch ?? null,
+        options?.source ?? 'user',
     ]);
     return id;
 }
-export async function updateWorkItem(db, id, updates) {
-    const sets = ['updated_at = NOW()'];
+/**
+ * Error thrown when an optimistic-lock version check fails. Caller should
+ * re-read the task and decide whether to retry or abort.
+ */
+export class VersionConflictError extends Error {
+    id;
+    expectedVersion;
+    constructor(id, expectedVersion) {
+        super(`version conflict on work_item ${id} (expected ${expectedVersion})`);
+        this.id = id;
+        this.expectedVersion = expectedVersion;
+        this.name = 'VersionConflictError';
+    }
+}
+/**
+ * Update a work item. Increments `version` on every call. Pass
+ * `expectVersion` to enforce optimistic locking — the caller should have
+ * read the current version first and pass it here to prevent races
+ * between concurrent `update_task` calls (worker + orchestrator).
+ *
+ * Returns the new version on success. Throws {@link VersionConflictError}
+ * if `expectVersion` was supplied and the row's version has moved.
+ */
+export async function updateWorkItem(db, id, updates, opts) {
+    const sets = ['updated_at = NOW()', 'version = version + 1'];
     const values = [];
     let paramIdx = 1;
     if (updates.title !== undefined) {
@@ -76,8 +108,49 @@ export async function updateWorkItem(db, id, updates) {
         sets.push(`due_at = $${paramIdx++}`);
         values.push(updates.dueAt);
     }
+    if (updates.goal !== undefined) {
+        sets.push(`goal = $${paramIdx++}`);
+        values.push(updates.goal);
+    }
+    if (updates.context !== undefined) {
+        sets.push(`context = $${paramIdx++}`);
+        values.push(updates.context === null ? null : JSON.stringify(updates.context));
+    }
+    if (updates.relatedSkills !== undefined) {
+        sets.push(`related_skills = $${paramIdx++}`);
+        values.push(JSON.stringify(updates.relatedSkills));
+    }
+    if (updates.repoPath !== undefined) {
+        sets.push(`repo_path = $${paramIdx++}`);
+        values.push(updates.repoPath);
+    }
+    if (updates.baseBranch !== undefined) {
+        sets.push(`base_branch = $${paramIdx++}`);
+        values.push(updates.baseBranch);
+    }
+    if (updates.workerId !== undefined) {
+        sets.push(`worker_id = $${paramIdx++}`);
+        values.push(updates.workerId);
+    }
+    if (updates.leaseExpiresAt !== undefined) {
+        sets.push(`lease_expires_at = $${paramIdx++}`);
+        values.push(updates.leaseExpiresAt);
+    }
+    // Build the WHERE clause — include version guard if provided.
+    let whereClause = `WHERE id = $${paramIdx++}`;
     values.push(id);
-    await db.query(`UPDATE work_items SET ${sets.join(', ')} WHERE id = $${paramIdx}`, values);
+    if (opts?.expectVersion !== undefined) {
+        whereClause += ` AND version = $${paramIdx}`;
+        values.push(opts.expectVersion);
+    }
+    const result = await db.query(`UPDATE work_items SET ${sets.join(', ')} ${whereClause} RETURNING version`, values);
+    if (result.rows.length === 0) {
+        if (opts?.expectVersion !== undefined) {
+            throw new VersionConflictError(id, opts.expectVersion);
+        }
+        throw new Error(`work_item ${id} not found`);
+    }
+    return result.rows[0].version;
 }
 export async function deleteWorkItem(db, id) {
     await db.query('DELETE FROM work_items WHERE id = $1', [id]);

package/stores/work-item-queries.js.map

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