hzl-cli 1.34.0 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -116
- package/dist/__tests__/integration/cli-integration.test.js +30 -31
- package/dist/__tests__/integration/cli-integration.test.js.map +1 -1
- package/dist/__tests__/integration/config.test.js +3 -3
- package/dist/__tests__/integration/config.test.js.map +1 -1
- package/dist/__tests__/integration/helpers.js +1 -1
- package/dist/__tests__/integration/helpers.js.map +1 -1
- package/dist/__tests__/integration/v2-migration.test.d.ts +2 -0
- package/dist/__tests__/integration/v2-migration.test.d.ts.map +1 -0
- package/dist/__tests__/integration/v2-migration.test.js +45 -0
- package/dist/__tests__/integration/v2-migration.test.js.map +1 -0
- package/dist/commands/agent/index.d.ts +3 -0
- package/dist/commands/agent/index.d.ts.map +1 -0
- package/dist/commands/agent/index.js +8 -0
- package/dist/commands/agent/index.js.map +1 -0
- package/dist/commands/agent/stats.d.ts +21 -0
- package/dist/commands/agent/stats.d.ts.map +1 -0
- package/dist/commands/agent/stats.js +96 -0
- package/dist/commands/agent/stats.js.map +1 -0
- package/dist/commands/agent/stats.test.d.ts +2 -0
- package/dist/commands/agent/stats.test.d.ts.map +1 -0
- package/dist/commands/agent/stats.test.js +56 -0
- package/dist/commands/agent/stats.test.js.map +1 -0
- package/dist/commands/guide-content.d.ts +1 -1
- package/dist/commands/guide-content.d.ts.map +1 -1
- package/dist/commands/guide-content.js +60 -58
- package/dist/commands/guide-content.js.map +1 -1
- package/dist/commands/task/add.d.ts +1 -1
- package/dist/commands/task/add.d.ts.map +1 -1
- package/dist/commands/task/add.js +4 -4
- package/dist/commands/task/add.js.map +1 -1
- package/dist/commands/task/add.test.js +16 -16
- package/dist/commands/task/add.test.js.map +1 -1
- package/dist/commands/task/block.d.ts +1 -1
- package/dist/commands/task/block.d.ts.map +1 -1
- package/dist/commands/task/block.js +2 -2
- package/dist/commands/task/block.js.map +1 -1
- package/dist/commands/task/block.test.js +3 -3
- package/dist/commands/task/block.test.js.map +1 -1
- package/dist/commands/task/claim.d.ts +67 -3
- package/dist/commands/task/claim.d.ts.map +1 -1
- package/dist/commands/task/claim.js +396 -29
- package/dist/commands/task/claim.js.map +1 -1
- package/dist/commands/task/claim.test.js +64 -5
- package/dist/commands/task/claim.test.js.map +1 -1
- package/dist/commands/task/complete.d.ts +1 -0
- package/dist/commands/task/complete.d.ts.map +1 -1
- package/dist/commands/task/complete.js +7 -2
- package/dist/commands/task/complete.js.map +1 -1
- package/dist/commands/task/complete.test.js +14 -0
- package/dist/commands/task/complete.test.js.map +1 -1
- package/dist/commands/task/index.d.ts.map +1 -1
- package/dist/commands/task/index.js +0 -2
- package/dist/commands/task/index.js.map +1 -1
- package/dist/commands/task/list.d.ts +20 -1
- package/dist/commands/task/list.d.ts.map +1 -1
- package/dist/commands/task/list.js +165 -24
- package/dist/commands/task/list.js.map +1 -1
- package/dist/commands/task/list.test.js +65 -4
- package/dist/commands/task/list.test.js.map +1 -1
- package/dist/commands/task/release.d.ts +1 -1
- package/dist/commands/task/release.d.ts.map +1 -1
- package/dist/commands/task/release.js +1 -1
- package/dist/commands/task/release.js.map +1 -1
- package/dist/commands/task/release.test.js +1 -1
- package/dist/commands/task/release.test.js.map +1 -1
- package/dist/commands/task/show.js +4 -4
- package/dist/commands/task/show.js.map +1 -1
- package/dist/commands/task/start.js +2 -2
- package/dist/commands/task/start.js.map +1 -1
- package/dist/commands/task/steal.d.ts +1 -1
- package/dist/commands/task/steal.d.ts.map +1 -1
- package/dist/commands/task/steal.js +13 -13
- package/dist/commands/task/steal.js.map +1 -1
- package/dist/commands/task/steal.test.js +8 -8
- package/dist/commands/task/steal.test.js.map +1 -1
- package/dist/commands/task/stuck.d.ts +1 -1
- package/dist/commands/task/stuck.d.ts.map +1 -1
- package/dist/commands/task/stuck.js +3 -3
- package/dist/commands/task/stuck.js.map +1 -1
- package/dist/commands/task/unblock.d.ts +1 -1
- package/dist/commands/task/unblock.d.ts.map +1 -1
- package/dist/commands/task/unblock.js +1 -1
- package/dist/commands/task/unblock.js.map +1 -1
- package/dist/commands/task/unblock.test.js +2 -2
- package/dist/commands/task/unblock.test.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/config.test.js +9 -1
- package/dist/config.test.js.map +1 -1
- package/dist/db.d.ts.map +1 -1
- package/dist/db.js +3 -1
- package/dist/db.js.map +1 -1
- package/dist/db.test.js +9 -9
- package/dist/db.test.js.map +1 -1
- package/dist/errors.d.ts +4 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +28 -3
- package/dist/errors.js.map +1 -1
- package/dist/errors.test.js +30 -2
- package/dist/errors.test.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +96 -2
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +9 -0
- package/dist/index.test.js.map +1 -1
- package/dist/output.d.ts +17 -0
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +29 -4
- package/dist/output.js.map +1 -1
- package/dist/output.test.d.ts +2 -0
- package/dist/output.test.d.ts.map +1 -0
- package/dist/output.test.js +39 -0
- package/dist/output.test.js.map +1 -0
- package/dist/types.d.ts +21 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +12 -3
- package/dist/types.js.map +1 -1
- package/dist/types.test.js +9 -2
- package/dist/types.test.js.map +1 -1
- package/package.json +3 -3
- package/dist/commands/task/next.d.ts +0 -27
- package/dist/commands/task/next.d.ts.map +0 -1
- package/dist/commands/task/next.js +0 -115
- package/dist/commands/task/next.js.map +0 -1
- package/dist/commands/task/next.test.d.ts +0 -2
- package/dist/commands/task/next.test.d.ts.map +0 -1
- package/dist/commands/task/next.test.js +0 -148
- package/dist/commands/task/next.test.js.map +0 -1
|
@@ -3,7 +3,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
|
3
3
|
import fs from 'fs';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import os from 'os';
|
|
6
|
-
import { runClaim } from './claim.js';
|
|
6
|
+
import { calculateClaimStaggerOffsetMs, runClaim, runClaimNext } from './claim.js';
|
|
7
7
|
import { initializeDbFromPath, closeDb } from '../../db.js';
|
|
8
8
|
import { TaskStatus } from 'hzl-core/events/types.js';
|
|
9
9
|
describe('runClaim', () => {
|
|
@@ -25,12 +25,14 @@ describe('runClaim', () => {
|
|
|
25
25
|
const result = runClaim({
|
|
26
26
|
services,
|
|
27
27
|
taskId: task.task_id,
|
|
28
|
-
|
|
28
|
+
agent: 'test-agent',
|
|
29
29
|
json: false,
|
|
30
30
|
});
|
|
31
31
|
expect(result.task_id).toBe(task.task_id);
|
|
32
32
|
expect(result.status).toBe(TaskStatus.InProgress);
|
|
33
|
-
expect(result.
|
|
33
|
+
expect(result.agent).toBe('test-agent');
|
|
34
|
+
expect(result.decision_trace.mode).toBe('explicit');
|
|
35
|
+
expect(result.decision_trace.outcome.reason_code).toBe('claimed');
|
|
34
36
|
});
|
|
35
37
|
it('sets lease when specified', () => {
|
|
36
38
|
const task = services.taskService.createTask({ title: 'Test', project: 'inbox' });
|
|
@@ -38,7 +40,7 @@ describe('runClaim', () => {
|
|
|
38
40
|
const result = runClaim({
|
|
39
41
|
services,
|
|
40
42
|
taskId: task.task_id,
|
|
41
|
-
|
|
43
|
+
agent: 'test-agent',
|
|
42
44
|
leaseMinutes: 30,
|
|
43
45
|
json: false,
|
|
44
46
|
});
|
|
@@ -50,9 +52,66 @@ describe('runClaim', () => {
|
|
|
50
52
|
expect(() => runClaim({
|
|
51
53
|
services,
|
|
52
54
|
taskId: task.task_id,
|
|
53
|
-
|
|
55
|
+
agent: 'test-agent',
|
|
54
56
|
json: false,
|
|
55
57
|
})).toThrow(/Hint:.*set-status/);
|
|
56
58
|
});
|
|
59
|
+
it('claims next eligible task when using next mode', () => {
|
|
60
|
+
const low = services.taskService.createTask({ title: 'Low', project: 'inbox', priority: 0 });
|
|
61
|
+
const high = services.taskService.createTask({ title: 'High', project: 'inbox', priority: 3 });
|
|
62
|
+
services.taskService.setStatus(low.task_id, TaskStatus.Ready);
|
|
63
|
+
services.taskService.setStatus(high.task_id, TaskStatus.Ready);
|
|
64
|
+
const result = runClaimNext({
|
|
65
|
+
services,
|
|
66
|
+
agent: 'agent-1',
|
|
67
|
+
json: false,
|
|
68
|
+
});
|
|
69
|
+
expect(result.task_id).toBe(high.task_id);
|
|
70
|
+
expect(result.agent).toBe('agent-1');
|
|
71
|
+
expect(result.decision_trace.mode).toBe('next');
|
|
72
|
+
expect(result.decision_trace.outcome.reason_code).toBe('claimed');
|
|
73
|
+
});
|
|
74
|
+
it('returns no-candidates decision trace when no eligible tasks exist in next mode', () => {
|
|
75
|
+
const result = runClaimNext({
|
|
76
|
+
services,
|
|
77
|
+
agent: 'agent-1',
|
|
78
|
+
json: false,
|
|
79
|
+
});
|
|
80
|
+
expect(result.task_id).toBeNull();
|
|
81
|
+
expect(result.task).toBeNull();
|
|
82
|
+
expect(result.decision_trace.outcome.reason_code).toBe('no_candidates');
|
|
83
|
+
});
|
|
84
|
+
it('supports full view payload for explicit claim', () => {
|
|
85
|
+
const task = services.taskService.createTask({
|
|
86
|
+
title: 'Detailed',
|
|
87
|
+
project: 'inbox',
|
|
88
|
+
description: 'Long markdown body',
|
|
89
|
+
tags: ['a', 'b'],
|
|
90
|
+
links: ['https://example.com'],
|
|
91
|
+
metadata: { foo: 'bar' },
|
|
92
|
+
});
|
|
93
|
+
services.taskService.setStatus(task.task_id, TaskStatus.Ready);
|
|
94
|
+
const result = runClaim({
|
|
95
|
+
services,
|
|
96
|
+
taskId: task.task_id,
|
|
97
|
+
agent: 'test-agent',
|
|
98
|
+
view: 'full',
|
|
99
|
+
json: false,
|
|
100
|
+
});
|
|
101
|
+
expect(result.task?.description).toBe('Long markdown body');
|
|
102
|
+
expect(result.task?.metadata).toEqual({ foo: 'bar' });
|
|
103
|
+
expect(result.task?.links).toEqual(['https://example.com']);
|
|
104
|
+
});
|
|
105
|
+
it('computes deterministic anti-herd offsets in range', () => {
|
|
106
|
+
const offset = calculateClaimStaggerOffsetMs('agent-1', 1000, 1_700_000_000_000);
|
|
107
|
+
expect(offset).toBeGreaterThanOrEqual(0);
|
|
108
|
+
expect(offset).toBeLessThan(1000);
|
|
109
|
+
const sameOffset = calculateClaimStaggerOffsetMs('agent-1', 1000, 1_700_000_000_000);
|
|
110
|
+
expect(sameOffset).toBe(offset);
|
|
111
|
+
});
|
|
112
|
+
it('changes offset across time buckets', () => {
|
|
113
|
+
const offsets = Array.from({ length: 6 }, (_, index) => calculateClaimStaggerOffsetMs('agent-1', 1000, 1_700_000_000_000 + index * 1000));
|
|
114
|
+
expect(new Set(offsets).size).toBeGreaterThan(1);
|
|
115
|
+
});
|
|
57
116
|
});
|
|
58
117
|
//# sourceMappingURL=claim.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claim.test.js","sourceRoot":"","sources":["../../../src/commands/task/claim.test.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"claim.test.js","sourceRoot":"","sources":["../../../src/commands/task/claim.test.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,6BAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,OAAe,CAAC;IACpB,IAAI,MAAc,CAAC;IACnB,IAAI,QAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACpE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvC,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClB,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,QAAQ,CAAC;YACtB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,QAAQ,CAAC;YACtB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,KAAK,EAAE,YAAY;YACnB,YAAY,EAAE,EAAE;YAChB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,qCAAqC;QAErC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;YACpB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/F,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,QAAQ;YACR,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,QAAQ;YACR,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC;YAC3C,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,oBAAoB;YACjC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,KAAK,EAAE,CAAC,qBAAqB,CAAC;YAC9B,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;SACzB,CAAC,CAAC;QACH,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,QAAQ,CAAC;YACtB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,MAAM,GAAG,6BAA6B,CAAC,SAAS,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACjF,MAAM,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,UAAU,GAAG,6BAA6B,CAAC,SAAS,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACrF,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CACrD,6BAA6B,CAAC,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,KAAK,GAAG,IAAI,CAAC,CACjF,CAAC;QACF,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../../src/commands/task/complete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMnE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;
|
|
1
|
+
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../../src/commands/task/complete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMnE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAOD,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,cAAc,CA8BjB;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAyB/C"}
|
|
@@ -7,13 +7,13 @@ import { GlobalOptionsSchema } from '../../types.js';
|
|
|
7
7
|
import { resolveId } from '../../resolve-id.js';
|
|
8
8
|
import { TaskStatus } from 'hzl-core/events/types.js';
|
|
9
9
|
export function runComplete(options) {
|
|
10
|
-
const { services, taskId, author, json } = options;
|
|
10
|
+
const { services, taskId, author, comment, json } = options;
|
|
11
11
|
// Check task status before completing to provide actionable error
|
|
12
12
|
const existingTask = services.taskService.getTaskById(taskId);
|
|
13
13
|
if (existingTask && existingTask.status !== TaskStatus.InProgress && existingTask.status !== TaskStatus.Blocked) {
|
|
14
14
|
throw new CLIError(`Cannot complete task ${taskId} (status: ${existingTask.status})\nHint: Claim the task first to start working on it`, ExitCode.InvalidInput);
|
|
15
15
|
}
|
|
16
|
-
const task = services.taskService.completeTask(taskId, { author });
|
|
16
|
+
const task = services.taskService.completeTask(taskId, { author, comment });
|
|
17
17
|
const result = {
|
|
18
18
|
task_id: task.task_id,
|
|
19
19
|
title: task.title,
|
|
@@ -24,6 +24,9 @@ export function runComplete(options) {
|
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
console.log(`✓ Completed task ${task.task_id}: ${task.title}`);
|
|
27
|
+
if (comment) {
|
|
28
|
+
console.log(` Comment: ${comment}`);
|
|
29
|
+
}
|
|
27
30
|
}
|
|
28
31
|
return result;
|
|
29
32
|
}
|
|
@@ -32,6 +35,7 @@ export function createCompleteCommand() {
|
|
|
32
35
|
.description('Mark a task as done')
|
|
33
36
|
.argument('<taskId>', 'Task ID')
|
|
34
37
|
.option('--author <name>', 'Author name')
|
|
38
|
+
.option('--comment <comment>', 'Optional completion note')
|
|
35
39
|
.action(function (rawTaskId, opts) {
|
|
36
40
|
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
37
41
|
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
@@ -42,6 +46,7 @@ export function createCompleteCommand() {
|
|
|
42
46
|
services,
|
|
43
47
|
taskId,
|
|
44
48
|
author: opts.author,
|
|
49
|
+
comment: opts.comment,
|
|
45
50
|
json: globalOpts.json ?? false,
|
|
46
51
|
});
|
|
47
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.js","sourceRoot":"","sources":["../../../src/commands/task/complete.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"complete.js","sourceRoot":"","sources":["../../../src/commands/task/complete.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,5 +38,19 @@ describe('runComplete', () => {
|
|
|
38
38
|
const updated = services.taskService.getTaskById(task.task_id);
|
|
39
39
|
expect(updated?.status).toBe(TaskStatus.Done);
|
|
40
40
|
});
|
|
41
|
+
it('adds completion comment when provided', () => {
|
|
42
|
+
const task = services.taskService.createTask({ title: 'Test', project: 'inbox' });
|
|
43
|
+
services.taskService.setStatus(task.task_id, TaskStatus.Ready);
|
|
44
|
+
services.taskService.claimTask(task.task_id);
|
|
45
|
+
runComplete({
|
|
46
|
+
services,
|
|
47
|
+
taskId: task.task_id,
|
|
48
|
+
comment: 'Implemented and verified',
|
|
49
|
+
json: false,
|
|
50
|
+
});
|
|
51
|
+
const comments = services.taskService.getComments(task.task_id);
|
|
52
|
+
expect(comments).toHaveLength(1);
|
|
53
|
+
expect(comments[0].text).toBe('Implemented and verified');
|
|
54
|
+
});
|
|
41
55
|
});
|
|
42
56
|
//# sourceMappingURL=complete.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.test.js","sourceRoot":"","sources":["../../../src/commands/task/complete.test.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,OAAe,CAAC;IACpB,IAAI,MAAc,CAAC;IACnB,IAAI,QAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvC,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClB,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,WAAW,CAAC;YACzB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7C,WAAW,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"complete.test.js","sourceRoot":"","sources":["../../../src/commands/task/complete.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC,wBAAgB,iBAAiB,IAAI,OAAO,CA6B3C"}
|
|
@@ -18,7 +18,6 @@ import { createCommentCommand } from './comment.js';
|
|
|
18
18
|
import { createCheckpointCommand } from './checkpoint.js';
|
|
19
19
|
import { createHistoryCommand } from './history.js';
|
|
20
20
|
import { createSearchCommand } from './search.js';
|
|
21
|
-
import { createNextCommand } from './next.js';
|
|
22
21
|
import { createStartCommand } from './start.js';
|
|
23
22
|
import { createBlockCommand } from './block.js';
|
|
24
23
|
import { createUnblockCommand } from './unblock.js';
|
|
@@ -46,7 +45,6 @@ export function createTaskCommand() {
|
|
|
46
45
|
command.addCommand(createCheckpointCommand());
|
|
47
46
|
command.addCommand(createHistoryCommand());
|
|
48
47
|
command.addCommand(createSearchCommand());
|
|
49
|
-
command.addCommand(createNextCommand());
|
|
50
48
|
command.addCommand(createBlockCommand());
|
|
51
49
|
command.addCommand(createUnblockCommand());
|
|
52
50
|
command.addCommand(createProgressCommand());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,22 +7,41 @@ export interface TaskListItem {
|
|
|
7
7
|
project: string;
|
|
8
8
|
status: string;
|
|
9
9
|
priority: number;
|
|
10
|
+
agent: string | null;
|
|
10
11
|
parent_id: string | null;
|
|
12
|
+
due_at?: string | null;
|
|
13
|
+
tags?: string[];
|
|
14
|
+
description?: string | null;
|
|
15
|
+
links?: string[];
|
|
16
|
+
metadata?: Record<string, unknown>;
|
|
11
17
|
created_at: string;
|
|
12
18
|
}
|
|
13
19
|
export interface ListResult {
|
|
14
20
|
tasks: TaskListItem[];
|
|
15
21
|
total: number;
|
|
22
|
+
page?: number;
|
|
23
|
+
limit?: number;
|
|
24
|
+
has_more?: boolean;
|
|
25
|
+
groups?: Array<{
|
|
26
|
+
agent: string | null;
|
|
27
|
+
tasks: TaskListItem[];
|
|
28
|
+
total: number;
|
|
29
|
+
}>;
|
|
30
|
+
total_tasks?: number;
|
|
16
31
|
}
|
|
17
32
|
export interface ListOptions {
|
|
18
33
|
services: Services;
|
|
19
34
|
project?: string;
|
|
20
35
|
status?: TaskStatus;
|
|
21
|
-
|
|
36
|
+
agent?: string;
|
|
37
|
+
agentPattern?: string;
|
|
22
38
|
availableOnly?: boolean;
|
|
23
39
|
parent?: string;
|
|
24
40
|
rootOnly?: boolean;
|
|
25
41
|
limit?: number;
|
|
42
|
+
page?: number;
|
|
43
|
+
view?: 'summary' | 'standard' | 'full';
|
|
44
|
+
groupByAgent?: boolean;
|
|
26
45
|
json: boolean;
|
|
27
46
|
}
|
|
28
47
|
export declare function runList(options: ListOptions): ListResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMtD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMtD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,KAAK,EAAE,YAAY,EAAE,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;IACvC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,EAAE,OAAO,CAAC;CACf;AA2FD,wBAAgB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,CAmLxD;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CA2C3C"}
|
|
@@ -7,9 +7,75 @@ import { TaskStatus } from 'hzl-core/events/types.js';
|
|
|
7
7
|
import { GlobalOptionsSchema } from '../../types.js';
|
|
8
8
|
import { createShortId } from '../../short-id.js';
|
|
9
9
|
const validStatuses = Object.values(TaskStatus);
|
|
10
|
+
function globToLikePattern(glob) {
|
|
11
|
+
let result = '';
|
|
12
|
+
let escaped = false;
|
|
13
|
+
for (const char of glob) {
|
|
14
|
+
if (escaped) {
|
|
15
|
+
if (char === '%' || char === '_' || char === '\\')
|
|
16
|
+
result += '\\';
|
|
17
|
+
result += char;
|
|
18
|
+
escaped = false;
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
if (char === '\\') {
|
|
22
|
+
escaped = true;
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
if (char === '*') {
|
|
26
|
+
result += '%';
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (char === '%' || char === '_' || char === '\\') {
|
|
30
|
+
result += '\\';
|
|
31
|
+
}
|
|
32
|
+
result += char;
|
|
33
|
+
}
|
|
34
|
+
if (escaped)
|
|
35
|
+
result += '\\\\';
|
|
36
|
+
return result;
|
|
37
|
+
}
|
|
38
|
+
function shapeTaskForView(row, view) {
|
|
39
|
+
const base = {
|
|
40
|
+
task_id: row.task_id,
|
|
41
|
+
title: row.title,
|
|
42
|
+
project: row.project,
|
|
43
|
+
status: row.status,
|
|
44
|
+
priority: row.priority,
|
|
45
|
+
agent: row.agent,
|
|
46
|
+
parent_id: row.parent_id,
|
|
47
|
+
created_at: row.created_at,
|
|
48
|
+
};
|
|
49
|
+
if (view === 'summary') {
|
|
50
|
+
return base;
|
|
51
|
+
}
|
|
52
|
+
const standard = {
|
|
53
|
+
...base,
|
|
54
|
+
due_at: row.due_at,
|
|
55
|
+
tags: JSON.parse(row.tags || '[]'),
|
|
56
|
+
};
|
|
57
|
+
if (view === 'standard') {
|
|
58
|
+
return standard;
|
|
59
|
+
}
|
|
60
|
+
return {
|
|
61
|
+
...standard,
|
|
62
|
+
description: row.description,
|
|
63
|
+
links: JSON.parse(row.links || '[]'),
|
|
64
|
+
metadata: JSON.parse(row.metadata || '{}'),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
10
67
|
export function runList(options) {
|
|
11
|
-
const { services, project, status,
|
|
68
|
+
const { services, project, status, agent, agentPattern, availableOnly, parent, rootOnly, limit = 50, page = 1, view = 'summary', groupByAgent = false, json, } = options;
|
|
12
69
|
const db = services.cacheDb;
|
|
70
|
+
if (agent && agentPattern) {
|
|
71
|
+
throw new CLIError('Cannot use --agent and --agent-pattern together', ExitCode.InvalidUsage);
|
|
72
|
+
}
|
|
73
|
+
if (page < 1 || !Number.isInteger(page)) {
|
|
74
|
+
throw new CLIError('Page must be an integer >= 1', ExitCode.InvalidInput);
|
|
75
|
+
}
|
|
76
|
+
if (limit < 1 || !Number.isInteger(limit)) {
|
|
77
|
+
throw new CLIError('Limit must be an integer >= 1', ExitCode.InvalidInput);
|
|
78
|
+
}
|
|
13
79
|
// Validate parent exists if specified
|
|
14
80
|
if (parent) {
|
|
15
81
|
const parentTask = services.taskService.getTaskById(parent);
|
|
@@ -18,48 +84,115 @@ export function runList(options) {
|
|
|
18
84
|
}
|
|
19
85
|
}
|
|
20
86
|
// Build query with filters
|
|
21
|
-
|
|
22
|
-
SELECT task_id, title, project, status, priority, parent_id, created_at
|
|
23
|
-
FROM tasks_current
|
|
24
|
-
WHERE status != 'archived'
|
|
25
|
-
`;
|
|
87
|
+
const where = ["status != 'archived'"];
|
|
26
88
|
const params = [];
|
|
27
89
|
if (project) {
|
|
28
|
-
|
|
90
|
+
where.push('project = ?');
|
|
29
91
|
params.push(project);
|
|
30
92
|
}
|
|
31
93
|
if (status) {
|
|
32
|
-
|
|
94
|
+
where.push('status = ?');
|
|
33
95
|
params.push(status);
|
|
34
96
|
}
|
|
35
|
-
if (
|
|
36
|
-
|
|
37
|
-
params.push(
|
|
97
|
+
if (agent) {
|
|
98
|
+
where.push('agent = ?');
|
|
99
|
+
params.push(agent);
|
|
100
|
+
}
|
|
101
|
+
if (agentPattern) {
|
|
102
|
+
where.push("LOWER(COALESCE(agent, '')) LIKE LOWER(?) ESCAPE '\\'");
|
|
103
|
+
params.push(globToLikePattern(agentPattern));
|
|
38
104
|
}
|
|
39
105
|
if (parent) {
|
|
40
|
-
|
|
106
|
+
where.push('parent_id = ?');
|
|
41
107
|
params.push(parent);
|
|
42
108
|
}
|
|
43
109
|
if (rootOnly) {
|
|
44
|
-
|
|
110
|
+
where.push('parent_id IS NULL');
|
|
45
111
|
}
|
|
46
112
|
if (availableOnly) {
|
|
47
113
|
// Match task next semantics: ready, deps satisfied, and leaf-only (no children)
|
|
48
|
-
|
|
114
|
+
where.push(`status = 'ready'`);
|
|
115
|
+
where.push(`NOT EXISTS (
|
|
49
116
|
SELECT 1 FROM task_dependencies td
|
|
50
117
|
JOIN tasks_current dep ON td.depends_on_id = dep.task_id
|
|
51
118
|
WHERE td.task_id = tasks_current.task_id AND dep.status != 'done'
|
|
52
|
-
)
|
|
119
|
+
)`);
|
|
120
|
+
where.push(`NOT EXISTS (
|
|
53
121
|
SELECT 1 FROM tasks_current child WHERE child.parent_id = tasks_current.task_id
|
|
54
|
-
)
|
|
122
|
+
)`);
|
|
123
|
+
}
|
|
124
|
+
const whereClause = `WHERE ${where.join(' AND ')}`;
|
|
125
|
+
const totalRow = db.prepare(`SELECT COUNT(*) AS total FROM tasks_current ${whereClause}`).get(...params);
|
|
126
|
+
const offset = (page - 1) * limit;
|
|
127
|
+
const query = `
|
|
128
|
+
SELECT task_id, title, project, status, priority, agent AS agent, parent_id, created_at,
|
|
129
|
+
due_at, tags, description, links, metadata
|
|
130
|
+
FROM tasks_current
|
|
131
|
+
${whereClause}
|
|
132
|
+
ORDER BY priority DESC, created_at ASC, task_id ASC
|
|
133
|
+
LIMIT ? OFFSET ?
|
|
134
|
+
`;
|
|
135
|
+
const rows = db.prepare(query).all(...params, limit, offset);
|
|
136
|
+
const tasks = rows.map((row) => shapeTaskForView(row, view));
|
|
137
|
+
const hasMore = offset + rows.length < totalRow.total;
|
|
138
|
+
if (groupByAgent) {
|
|
139
|
+
const grouped = new Map();
|
|
140
|
+
for (const task of tasks) {
|
|
141
|
+
const key = task.agent ?? '__unassigned__';
|
|
142
|
+
if (!grouped.has(key)) {
|
|
143
|
+
grouped.set(key, { agent: task.agent, tasks: [] });
|
|
144
|
+
}
|
|
145
|
+
grouped.get(key).tasks.push(task);
|
|
146
|
+
}
|
|
147
|
+
const groups = Array.from(grouped.values())
|
|
148
|
+
.sort((a, b) => {
|
|
149
|
+
if (a.agent === null)
|
|
150
|
+
return 1;
|
|
151
|
+
if (b.agent === null)
|
|
152
|
+
return -1;
|
|
153
|
+
return a.agent.localeCompare(b.agent);
|
|
154
|
+
})
|
|
155
|
+
.map((group) => ({
|
|
156
|
+
agent: group.agent,
|
|
157
|
+
tasks: group.tasks,
|
|
158
|
+
total: group.tasks.length,
|
|
159
|
+
}));
|
|
160
|
+
const groupedResult = {
|
|
161
|
+
tasks,
|
|
162
|
+
total: totalRow.total,
|
|
163
|
+
page,
|
|
164
|
+
limit,
|
|
165
|
+
has_more: hasMore,
|
|
166
|
+
groups,
|
|
167
|
+
total_tasks: totalRow.total,
|
|
168
|
+
};
|
|
169
|
+
if (json) {
|
|
170
|
+
console.log(JSON.stringify(groupedResult));
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
const shortId = createShortId(tasks.map(t => t.task_id));
|
|
174
|
+
if (groups.length === 0) {
|
|
175
|
+
console.log('No tasks found');
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
for (const group of groups) {
|
|
179
|
+
console.log(`Agent: ${group.agent ?? 'unassigned'} (${group.total})`);
|
|
180
|
+
for (const task of group.tasks) {
|
|
181
|
+
const statusIcon = task.status === 'done' ? '✓' : task.status === 'in_progress' ? '→' : '○';
|
|
182
|
+
console.log(` ${statusIcon} [${shortId(task.task_id)}] ${task.title} (${task.project})`);
|
|
183
|
+
}
|
|
184
|
+
console.log('');
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
return groupedResult;
|
|
55
189
|
}
|
|
56
|
-
query += ' ORDER BY priority DESC, created_at ASC, task_id ASC';
|
|
57
|
-
query += ' LIMIT ?';
|
|
58
|
-
params.push(limit);
|
|
59
|
-
const rows = db.prepare(query).all(...params);
|
|
60
190
|
const result = {
|
|
61
|
-
tasks
|
|
62
|
-
total:
|
|
191
|
+
tasks,
|
|
192
|
+
total: totalRow.total,
|
|
193
|
+
page,
|
|
194
|
+
limit,
|
|
195
|
+
has_more: hasMore,
|
|
63
196
|
};
|
|
64
197
|
if (json) {
|
|
65
198
|
console.log(JSON.stringify(result));
|
|
@@ -84,11 +217,15 @@ export function createListCommand() {
|
|
|
84
217
|
.description('List tasks')
|
|
85
218
|
.option('-P, --project <project>', 'Filter by project')
|
|
86
219
|
.option('-s, --status <status>', 'Filter by status')
|
|
87
|
-
.option('--
|
|
220
|
+
.option('--agent <name>', 'Filter by exact agent identity')
|
|
221
|
+
.option('--agent-pattern <glob>', "Filter by case-insensitive agent glob (use '*' wildcard)")
|
|
88
222
|
.option('-a, --available', 'Show only available (ready, no blocking deps)', false)
|
|
89
223
|
.option('--parent <taskId>', 'Filter by parent task')
|
|
90
224
|
.option('--root', 'Show only root tasks (no parent)', false)
|
|
225
|
+
.option('--page <n>', 'Page number (1-based)', '1')
|
|
226
|
+
.option('--group-by-agent', 'Group task details by agent')
|
|
91
227
|
.option('-l, --limit <n>', 'Limit results', '50')
|
|
228
|
+
.option('--view <view>', 'Response view: summary | standard | full', 'summary')
|
|
92
229
|
.action(function (opts) {
|
|
93
230
|
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
94
231
|
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
@@ -101,10 +238,14 @@ export function createListCommand() {
|
|
|
101
238
|
services,
|
|
102
239
|
project: opts.project,
|
|
103
240
|
status,
|
|
104
|
-
|
|
241
|
+
agent: opts.agent,
|
|
242
|
+
agentPattern: opts.agentPattern,
|
|
105
243
|
availableOnly: opts.available,
|
|
106
244
|
parent: opts.parent,
|
|
107
245
|
rootOnly: opts.root,
|
|
246
|
+
page: parseInt(opts.page ?? '1', 10),
|
|
247
|
+
view: opts.view ?? 'summary',
|
|
248
|
+
groupByAgent: opts.groupByAgent,
|
|
108
249
|
limit: parseInt(opts.limit ?? '50', 10),
|
|
109
250
|
json: globalOpts.json ?? false,
|
|
110
251
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"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"}
|