hzl-cli 1.5.1 → 1.7.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 +307 -127
- package/dist/__tests__/integration/cli-integration.test.js +10 -9
- package/dist/__tests__/integration/cli-integration.test.js.map +1 -1
- package/dist/__tests__/integration/config.test.js +1 -1
- package/dist/__tests__/integration/config.test.js.map +1 -1
- package/dist/__tests__/integration/helpers.d.ts +1 -0
- package/dist/__tests__/integration/helpers.d.ts.map +1 -1
- package/dist/__tests__/integration/helpers.js +2 -0
- package/dist/__tests__/integration/helpers.js.map +1 -1
- package/dist/__tests__/integration/project-workflow.test.js +6 -5
- package/dist/__tests__/integration/project-workflow.test.js.map +1 -1
- package/dist/commands/config.test.js +2 -2
- package/dist/commands/config.test.js.map +1 -1
- package/dist/commands/doctor.d.ts +39 -0
- package/dist/commands/doctor.d.ts.map +1 -0
- package/dist/commands/doctor.js +249 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/doctor.test.d.ts +2 -0
- package/dist/commands/doctor.test.d.ts.map +1 -0
- package/dist/commands/doctor.test.js +54 -0
- package/dist/commands/doctor.test.js.map +1 -0
- package/dist/commands/export-events.js +3 -3
- package/dist/commands/export-events.js.map +1 -1
- package/dist/commands/export-events.test.js +2 -2
- package/dist/commands/export-events.test.js.map +1 -1
- package/dist/commands/init.d.ts +13 -7
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +97 -34
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/init.test.js +83 -81
- package/dist/commands/init.test.js.map +1 -1
- package/dist/commands/lock.d.ts +39 -0
- package/dist/commands/lock.d.ts.map +1 -0
- package/dist/commands/lock.js +142 -0
- package/dist/commands/lock.js.map +1 -0
- package/dist/commands/lock.test.d.ts +2 -0
- package/dist/commands/lock.test.d.ts.map +1 -0
- package/dist/commands/lock.test.js +130 -0
- package/dist/commands/lock.test.js.map +1 -0
- package/dist/commands/project/create.js +3 -3
- package/dist/commands/project/create.js.map +1 -1
- package/dist/commands/project/create.test.js +2 -2
- package/dist/commands/project/create.test.js.map +1 -1
- package/dist/commands/project/delete.js +12 -12
- package/dist/commands/project/delete.js.map +1 -1
- package/dist/commands/project/delete.test.js +2 -2
- package/dist/commands/project/delete.test.js.map +1 -1
- package/dist/commands/project/list.js +4 -4
- package/dist/commands/project/list.js.map +1 -1
- package/dist/commands/project/list.test.js +2 -2
- package/dist/commands/project/list.test.js.map +1 -1
- package/dist/commands/project/rename.js +3 -3
- package/dist/commands/project/rename.js.map +1 -1
- package/dist/commands/project/rename.test.js +2 -2
- package/dist/commands/project/rename.test.js.map +1 -1
- package/dist/commands/project/show.js +4 -4
- package/dist/commands/project/show.js.map +1 -1
- package/dist/commands/project/show.test.js +2 -2
- package/dist/commands/project/show.test.js.map +1 -1
- package/dist/commands/sample-project.d.ts +10 -6
- package/dist/commands/sample-project.d.ts.map +1 -1
- package/dist/commands/sample-project.js +23 -13
- package/dist/commands/sample-project.js.map +1 -1
- package/dist/commands/sample-project.test.js +26 -24
- package/dist/commands/sample-project.test.js.map +1 -1
- package/dist/commands/stats.js +12 -12
- package/dist/commands/stats.js.map +1 -1
- package/dist/commands/stats.test.js +2 -2
- package/dist/commands/stats.test.js.map +1 -1
- package/dist/commands/status.d.ts +28 -0
- package/dist/commands/status.d.ts.map +1 -0
- package/dist/commands/status.js +88 -0
- package/dist/commands/status.js.map +1 -0
- package/dist/commands/status.test.d.ts +2 -0
- package/dist/commands/status.test.d.ts.map +1 -0
- package/dist/commands/status.test.js +47 -0
- package/dist/commands/status.test.js.map +1 -0
- package/dist/commands/sync.d.ts +47 -0
- package/dist/commands/sync.d.ts.map +1 -0
- package/dist/commands/sync.js +218 -0
- package/dist/commands/sync.js.map +1 -0
- package/dist/commands/sync.test.d.ts +2 -0
- package/dist/commands/sync.test.d.ts.map +1 -0
- package/dist/commands/sync.test.js +49 -0
- package/dist/commands/sync.test.js.map +1 -0
- package/dist/commands/task/add-dep.js +5 -5
- package/dist/commands/task/add-dep.js.map +1 -1
- package/dist/commands/task/add-dep.test.js +2 -2
- package/dist/commands/task/add-dep.test.js.map +1 -1
- package/dist/commands/task/add.js +3 -3
- package/dist/commands/task/add.js.map +1 -1
- package/dist/commands/task/add.test.js +2 -2
- package/dist/commands/task/add.test.js.map +1 -1
- package/dist/commands/task/archive.js +3 -3
- package/dist/commands/task/archive.js.map +1 -1
- package/dist/commands/task/archive.test.js +2 -2
- package/dist/commands/task/archive.test.js.map +1 -1
- package/dist/commands/task/checkpoint.js +3 -3
- package/dist/commands/task/checkpoint.js.map +1 -1
- package/dist/commands/task/checkpoint.test.js +2 -2
- package/dist/commands/task/checkpoint.test.js.map +1 -1
- package/dist/commands/task/claim.js +3 -3
- package/dist/commands/task/claim.js.map +1 -1
- package/dist/commands/task/claim.test.js +2 -2
- package/dist/commands/task/claim.test.js.map +1 -1
- package/dist/commands/task/comment.js +3 -3
- package/dist/commands/task/comment.js.map +1 -1
- package/dist/commands/task/comment.test.js +2 -2
- package/dist/commands/task/comment.test.js.map +1 -1
- package/dist/commands/task/complete.js +3 -3
- package/dist/commands/task/complete.js.map +1 -1
- package/dist/commands/task/complete.test.js +2 -2
- package/dist/commands/task/complete.test.js.map +1 -1
- package/dist/commands/task/history.js +3 -3
- package/dist/commands/task/history.js.map +1 -1
- package/dist/commands/task/history.test.js +2 -2
- package/dist/commands/task/history.test.js.map +1 -1
- package/dist/commands/task/list.js +4 -4
- package/dist/commands/task/list.js.map +1 -1
- package/dist/commands/task/list.test.js +2 -2
- package/dist/commands/task/list.test.js.map +1 -1
- package/dist/commands/task/move.js +3 -3
- package/dist/commands/task/move.js.map +1 -1
- package/dist/commands/task/move.test.js +2 -2
- package/dist/commands/task/move.test.js.map +1 -1
- package/dist/commands/task/next.js +3 -3
- package/dist/commands/task/next.js.map +1 -1
- package/dist/commands/task/next.test.js +2 -2
- package/dist/commands/task/next.test.js.map +1 -1
- package/dist/commands/task/release.js +3 -3
- package/dist/commands/task/release.js.map +1 -1
- package/dist/commands/task/release.test.js +2 -2
- package/dist/commands/task/release.test.js.map +1 -1
- package/dist/commands/task/remove-dep.js +3 -3
- package/dist/commands/task/remove-dep.js.map +1 -1
- package/dist/commands/task/remove-dep.test.js +2 -2
- package/dist/commands/task/remove-dep.test.js.map +1 -1
- package/dist/commands/task/reopen.js +3 -3
- package/dist/commands/task/reopen.js.map +1 -1
- package/dist/commands/task/reopen.test.js +2 -2
- package/dist/commands/task/reopen.test.js.map +1 -1
- package/dist/commands/task/search.js +4 -4
- package/dist/commands/task/search.js.map +1 -1
- package/dist/commands/task/search.test.js +2 -2
- package/dist/commands/task/search.test.js.map +1 -1
- package/dist/commands/task/set-status.js +3 -3
- package/dist/commands/task/set-status.js.map +1 -1
- package/dist/commands/task/set-status.test.js +2 -2
- package/dist/commands/task/set-status.test.js.map +1 -1
- package/dist/commands/task/show.js +3 -3
- package/dist/commands/task/show.js.map +1 -1
- package/dist/commands/task/show.test.js +2 -2
- package/dist/commands/task/show.test.js.map +1 -1
- package/dist/commands/task/steal.js +3 -3
- package/dist/commands/task/steal.js.map +1 -1
- package/dist/commands/task/steal.test.js +2 -2
- package/dist/commands/task/steal.test.js.map +1 -1
- package/dist/commands/task/stuck.js +4 -4
- package/dist/commands/task/stuck.js.map +1 -1
- package/dist/commands/task/stuck.test.js +2 -2
- package/dist/commands/task/stuck.test.js.map +1 -1
- package/dist/commands/task/update.js +3 -3
- package/dist/commands/task/update.js.map +1 -1
- package/dist/commands/task/update.test.js +2 -2
- package/dist/commands/task/update.test.js.map +1 -1
- package/dist/commands/validate.js +3 -3
- package/dist/commands/validate.js.map +1 -1
- package/dist/commands/validate.test.js +3 -3
- package/dist/commands/validate.test.js.map +1 -1
- package/dist/commands/which-db.d.ts +4 -4
- package/dist/commands/which-db.d.ts.map +1 -1
- package/dist/commands/which-db.js +8 -11
- package/dist/commands/which-db.js.map +1 -1
- package/dist/commands/which-db.test.js +9 -8
- package/dist/commands/which-db.test.js.map +1 -1
- package/dist/config.d.ts +18 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +120 -13
- package/dist/config.js.map +1 -1
- package/dist/config.test.js +34 -110
- package/dist/config.test.js.map +1 -1
- package/dist/db.d.ts +16 -2
- package/dist/db.d.ts.map +1 -1
- package/dist/db.js +47 -17
- package/dist/db.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -2
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +1 -1
- package/dist/index.test.js.map +1 -1
- package/dist/types.d.ts +22 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +6 -6
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { createStatusCommand, runStatus } from './status.js';
|
|
3
|
+
import fs from 'fs';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import os from 'os';
|
|
6
|
+
describe('hzl status command', () => {
|
|
7
|
+
const testDir = path.join(os.tmpdir(), `status-test-${Date.now()}`);
|
|
8
|
+
const eventsDb = path.join(testDir, 'events.db');
|
|
9
|
+
const cacheDb = path.join(testDir, 'cache.db');
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
fs.mkdirSync(testDir, { recursive: true });
|
|
12
|
+
});
|
|
13
|
+
afterEach(() => {
|
|
14
|
+
fs.rmSync(testDir, { recursive: true, force: true });
|
|
15
|
+
});
|
|
16
|
+
describe('runStatus', () => {
|
|
17
|
+
it('returns database status', () => {
|
|
18
|
+
const result = runStatus({
|
|
19
|
+
eventsDbPath: eventsDb,
|
|
20
|
+
cacheDbPath: cacheDb,
|
|
21
|
+
json: true,
|
|
22
|
+
});
|
|
23
|
+
expect(result.success).toBe(true);
|
|
24
|
+
expect(result.data.mode).toBe('local-only');
|
|
25
|
+
expect(result.data.eventsDb).toBe(eventsDb);
|
|
26
|
+
expect(result.data.cacheDb).toBe(cacheDb);
|
|
27
|
+
expect(result.data.instanceId).toBeDefined();
|
|
28
|
+
expect(result.data.deviceId).toBeDefined();
|
|
29
|
+
});
|
|
30
|
+
it('shows no sync info for local-only mode', () => {
|
|
31
|
+
const result = runStatus({
|
|
32
|
+
eventsDbPath: eventsDb,
|
|
33
|
+
cacheDbPath: cacheDb,
|
|
34
|
+
json: true,
|
|
35
|
+
});
|
|
36
|
+
expect(result.data.syncUrl).toBeUndefined();
|
|
37
|
+
expect(result.data.lastSyncAt).toBeUndefined();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
describe('createStatusCommand', () => {
|
|
41
|
+
it('creates a command with correct name', () => {
|
|
42
|
+
const cmd = createStatusCommand();
|
|
43
|
+
expect(cmd.name()).toBe('status');
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
//# sourceMappingURL=status.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.test.js","sourceRoot":"","sources":["../../src/commands/status.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE/C,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;YAC/B,MAAM,MAAM,GAAG,SAAS,CAAC;gBACrB,YAAY,EAAE,QAAQ;gBACtB,WAAW,EAAE,OAAO;gBACpB,IAAI,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAC9C,MAAM,MAAM,GAAG,SAAS,CAAC;gBACrB,YAAY,EAAE,QAAQ;gBACtB,WAAW,EAAE,OAAO;gBACpB,IAAI,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;YAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC3C,MAAM,GAAG,GAAG,mBAAmB,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Command } from 'commander';
|
|
2
|
+
import { type ConflictStrategy, type SyncStats } from 'hzl-core';
|
|
3
|
+
export interface SyncResult {
|
|
4
|
+
success: boolean;
|
|
5
|
+
mode: string;
|
|
6
|
+
message?: string;
|
|
7
|
+
data?: {
|
|
8
|
+
status: string;
|
|
9
|
+
lastSyncAt?: string;
|
|
10
|
+
framesSynced?: number;
|
|
11
|
+
frameNo?: number;
|
|
12
|
+
merged?: {
|
|
13
|
+
localEvents?: number;
|
|
14
|
+
remoteEvents?: number;
|
|
15
|
+
};
|
|
16
|
+
localEvents?: number;
|
|
17
|
+
lastSyncFrameNo?: number | null;
|
|
18
|
+
};
|
|
19
|
+
sync?: SyncStats;
|
|
20
|
+
error?: {
|
|
21
|
+
code: string;
|
|
22
|
+
message: string;
|
|
23
|
+
recoverable: boolean;
|
|
24
|
+
actions?: Array<{
|
|
25
|
+
command: string;
|
|
26
|
+
description: string;
|
|
27
|
+
}>;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
export interface SyncOptions {
|
|
31
|
+
eventsDbPath: string;
|
|
32
|
+
cacheDbPath: string;
|
|
33
|
+
json: boolean;
|
|
34
|
+
conflictStrategy?: ConflictStrategy;
|
|
35
|
+
force?: boolean;
|
|
36
|
+
syncUrl?: string;
|
|
37
|
+
authToken?: string;
|
|
38
|
+
}
|
|
39
|
+
export declare class ConflictError extends Error {
|
|
40
|
+
readonly localEvents: number;
|
|
41
|
+
readonly remoteFrameNo: number;
|
|
42
|
+
readonly lastSyncFrameNo: number | null;
|
|
43
|
+
constructor(message: string, localEvents: number, remoteFrameNo: number, lastSyncFrameNo: number | null);
|
|
44
|
+
}
|
|
45
|
+
export declare function runSync(options: SyncOptions): Promise<SyncResult>;
|
|
46
|
+
export declare function createSyncCommand(): Command;
|
|
47
|
+
//# sourceMappingURL=sync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAGH,KAAK,gBAAgB,EACrB,KAAK,SAAS,EAIjB,MAAM,UAAU,CAAC;AAUlB,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QACH,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE;YAAE,WAAW,CAAC,EAAE,MAAM,CAAC;YAAC,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACzD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,KAAK,CAAC;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KAC7D,CAAC;CACL;AAED,MAAM,WAAW,WAAW;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,aAAc,SAAQ,KAAK;aAGhB,WAAW,EAAE,MAAM;aACnB,aAAa,EAAE,MAAM;aACrB,eAAe,EAAE,MAAM,GAAG,IAAI;gBAH9C,OAAO,EAAE,MAAM,EACC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,GAAG,IAAI;CAKrD;AAgED,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA0HvE;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CA8D3C"}
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import { Command } from 'commander';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { createDatastore, getDirtySince, getLastSyncFrameNo, clearDirtySince } from 'hzl-core';
|
|
4
|
+
import { GlobalOptionsSchema } from '../types.js';
|
|
5
|
+
import { resolveDbPaths, readConfig, getConfigPath } from '../config.js';
|
|
6
|
+
const SyncOptionsSchema = z.object({
|
|
7
|
+
conflictStrategy: z.enum(['merge', 'discard-local', 'fail']).optional(),
|
|
8
|
+
force: z.boolean().optional(),
|
|
9
|
+
reset: z.boolean().optional(),
|
|
10
|
+
});
|
|
11
|
+
export class ConflictError extends Error {
|
|
12
|
+
localEvents;
|
|
13
|
+
remoteFrameNo;
|
|
14
|
+
lastSyncFrameNo;
|
|
15
|
+
constructor(message, localEvents, remoteFrameNo, lastSyncFrameNo) {
|
|
16
|
+
super(message);
|
|
17
|
+
this.localEvents = localEvents;
|
|
18
|
+
this.remoteFrameNo = remoteFrameNo;
|
|
19
|
+
this.lastSyncFrameNo = lastSyncFrameNo;
|
|
20
|
+
this.name = 'ConflictError';
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Detect if there are local changes that conflict with remote.
|
|
25
|
+
* Returns null if no conflict, or conflict details if there is one.
|
|
26
|
+
*/
|
|
27
|
+
function detectConflict(datastore) {
|
|
28
|
+
const dirtySince = getDirtySince(datastore.cacheDb);
|
|
29
|
+
if (!dirtySince) {
|
|
30
|
+
return { hasLocalChanges: false, localEventCount: 0, dirtySince: null };
|
|
31
|
+
}
|
|
32
|
+
// Count events created since last sync
|
|
33
|
+
const lastSyncFrameNo = getLastSyncFrameNo(datastore.cacheDb) ?? 0;
|
|
34
|
+
const localEventCount = datastore.eventsDb
|
|
35
|
+
.prepare('SELECT COUNT(*) as count FROM events WHERE id > ?')
|
|
36
|
+
.get(lastSyncFrameNo);
|
|
37
|
+
return {
|
|
38
|
+
hasLocalChanges: localEventCount.count > 0,
|
|
39
|
+
localEventCount: localEventCount.count,
|
|
40
|
+
dirtySince,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Apply conflict resolution strategy.
|
|
45
|
+
* - merge: Push local changes, then pull remote (default, safe for append-only)
|
|
46
|
+
* - discard-local: Drop local changes since last sync, pull remote
|
|
47
|
+
* - fail: Abort with error, let user decide
|
|
48
|
+
*/
|
|
49
|
+
function resolveConflict(datastore, strategy, conflictInfo) {
|
|
50
|
+
switch (strategy) {
|
|
51
|
+
case 'merge':
|
|
52
|
+
// For append-only events, merge is safe - just sync and both sides get all events
|
|
53
|
+
// The ULID ordering ensures consistent final state
|
|
54
|
+
return { resolved: true, action: 'merge' };
|
|
55
|
+
case 'discard-local':
|
|
56
|
+
// WARNING: This discards local work! Only use if explicitly requested.
|
|
57
|
+
// We don't actually delete events (append-only), but we mark them as superseded
|
|
58
|
+
// by clearing dirty state and letting remote state take precedence in projections
|
|
59
|
+
clearDirtySince(datastore.cacheDb);
|
|
60
|
+
return { resolved: true, action: 'discard-local' };
|
|
61
|
+
case 'fail':
|
|
62
|
+
throw new ConflictError(`Conflict detected: ${conflictInfo.localEventCount} local events since last sync. ` +
|
|
63
|
+
`Use --conflict-strategy=merge to sync anyway, or --conflict-strategy=discard-local to discard local changes.`, conflictInfo.localEventCount, 0, // Will be filled by sync
|
|
64
|
+
getLastSyncFrameNo(datastore.cacheDb));
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
export async function runSync(options) {
|
|
68
|
+
const { eventsDbPath, cacheDbPath, json, conflictStrategy = 'merge', force = false, syncUrl, authToken, } = options;
|
|
69
|
+
const datastore = createDatastore({
|
|
70
|
+
events: {
|
|
71
|
+
path: eventsDbPath,
|
|
72
|
+
syncUrl,
|
|
73
|
+
authToken,
|
|
74
|
+
syncMode: 'offline',
|
|
75
|
+
readYourWrites: true
|
|
76
|
+
},
|
|
77
|
+
cache: { path: cacheDbPath },
|
|
78
|
+
});
|
|
79
|
+
try {
|
|
80
|
+
if (datastore.mode === 'local-only') {
|
|
81
|
+
const result = {
|
|
82
|
+
success: true,
|
|
83
|
+
mode: 'local-only',
|
|
84
|
+
message: 'Database is in local-only mode. No sync configured.',
|
|
85
|
+
data: {
|
|
86
|
+
status: 'local-only',
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
if (!json) {
|
|
90
|
+
console.log('✓ Database is in local-only mode. No sync configured.');
|
|
91
|
+
console.log(' To enable sync, run: hzl init --sync-url <url> --auth-token <token>');
|
|
92
|
+
}
|
|
93
|
+
return result;
|
|
94
|
+
}
|
|
95
|
+
// Check for conflicts before syncing
|
|
96
|
+
const conflictInfo = detectConflict(datastore);
|
|
97
|
+
if (conflictInfo.hasLocalChanges && !force) {
|
|
98
|
+
try {
|
|
99
|
+
const resolution = resolveConflict(datastore, conflictStrategy, conflictInfo);
|
|
100
|
+
if (!json) {
|
|
101
|
+
console.log(`ℹ Conflict resolution: ${resolution.action} (${conflictInfo.localEventCount} local events)`);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
if (err instanceof ConflictError) {
|
|
106
|
+
return {
|
|
107
|
+
success: false,
|
|
108
|
+
mode: datastore.mode,
|
|
109
|
+
error: {
|
|
110
|
+
code: 'SYNC_CONFLICT',
|
|
111
|
+
message: err.message,
|
|
112
|
+
recoverable: true,
|
|
113
|
+
actions: [
|
|
114
|
+
{ command: 'hzl sync --conflict-strategy=merge', description: 'Merge local and remote changes' },
|
|
115
|
+
{ command: 'hzl sync --conflict-strategy=discard-local', description: 'Discard local changes' },
|
|
116
|
+
],
|
|
117
|
+
},
|
|
118
|
+
data: {
|
|
119
|
+
status: 'conflict',
|
|
120
|
+
localEvents: err.localEvents,
|
|
121
|
+
lastSyncFrameNo: err.lastSyncFrameNo,
|
|
122
|
+
},
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
throw err;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
// Perform sync
|
|
129
|
+
const syncStats = await datastore.sync();
|
|
130
|
+
if (!syncStats.success) {
|
|
131
|
+
const result = {
|
|
132
|
+
success: false,
|
|
133
|
+
mode: datastore.mode,
|
|
134
|
+
error: {
|
|
135
|
+
code: 'SYNC_FAILED',
|
|
136
|
+
message: syncStats.error ?? 'Sync failed',
|
|
137
|
+
recoverable: true,
|
|
138
|
+
actions: [
|
|
139
|
+
{ command: 'hzl doctor', description: 'Check configuration and connectivity' },
|
|
140
|
+
{ command: 'hzl sync --force', description: 'Retry sync' },
|
|
141
|
+
],
|
|
142
|
+
},
|
|
143
|
+
sync: syncStats,
|
|
144
|
+
};
|
|
145
|
+
if (!json) {
|
|
146
|
+
console.error(`✗ Sync failed: ${syncStats.error}`);
|
|
147
|
+
}
|
|
148
|
+
return result;
|
|
149
|
+
}
|
|
150
|
+
const result = {
|
|
151
|
+
success: true,
|
|
152
|
+
mode: datastore.mode,
|
|
153
|
+
data: {
|
|
154
|
+
status: 'synced',
|
|
155
|
+
lastSyncAt: new Date().toISOString(),
|
|
156
|
+
framesSynced: syncStats.framesSynced,
|
|
157
|
+
frameNo: syncStats.frameNo,
|
|
158
|
+
},
|
|
159
|
+
sync: syncStats,
|
|
160
|
+
};
|
|
161
|
+
if (!json) {
|
|
162
|
+
console.log(`✓ Sync complete`);
|
|
163
|
+
console.log(` Frames synced: ${syncStats.framesSynced ?? 0}`);
|
|
164
|
+
console.log(` Current frame: ${syncStats.frameNo ?? 'unknown'}`);
|
|
165
|
+
}
|
|
166
|
+
return result;
|
|
167
|
+
}
|
|
168
|
+
finally {
|
|
169
|
+
datastore.close();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
export function createSyncCommand() {
|
|
173
|
+
return new Command('sync')
|
|
174
|
+
.description('Synchronize local database with remote Turso instance')
|
|
175
|
+
.option('--conflict-strategy <strategy>', 'Conflict resolution strategy: merge, discard-local, fail', 'merge')
|
|
176
|
+
.option('-f, --force', 'Force sync even if rate limited or recently synced. Use with --reset to force full re-sync.')
|
|
177
|
+
.option('--reset', 'Reset sync state and perform full re-sync (requires --force). ' +
|
|
178
|
+
'WARNING: This rebuilds all projections from scratch.')
|
|
179
|
+
.action(async function () {
|
|
180
|
+
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
181
|
+
const localOpts = SyncOptionsSchema.parse(this.opts());
|
|
182
|
+
// --reset requires --force as safety measure
|
|
183
|
+
if (localOpts.reset && !localOpts.force) {
|
|
184
|
+
console.error('Error: --reset requires --force flag');
|
|
185
|
+
process.exit(1);
|
|
186
|
+
}
|
|
187
|
+
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
188
|
+
const config = readConfig(getConfigPath());
|
|
189
|
+
// Get sync URL and auth token from config or env
|
|
190
|
+
const syncUrl = process.env.HZL_SYNC_URL ?? config.syncUrl ?? config.db?.events?.syncUrl;
|
|
191
|
+
const authToken = process.env.HZL_AUTH_TOKEN ?? config.authToken ?? config.db?.events?.authToken;
|
|
192
|
+
// Handle --reset: clear sync state to force full re-sync
|
|
193
|
+
if (localOpts.reset && localOpts.force) {
|
|
194
|
+
const datastore = createDatastore({
|
|
195
|
+
events: { path: eventsDbPath, syncUrl, authToken, syncMode: 'offline', readYourWrites: true },
|
|
196
|
+
cache: { path: cacheDbPath }
|
|
197
|
+
});
|
|
198
|
+
clearDirtySince(datastore.cacheDb);
|
|
199
|
+
datastore.cacheDb.prepare('DELETE FROM hzl_local_meta WHERE key LIKE ?').run('last_sync%');
|
|
200
|
+
datastore.close();
|
|
201
|
+
console.log('ℹ Sync state reset. Performing full re-sync...');
|
|
202
|
+
}
|
|
203
|
+
const result = await runSync({
|
|
204
|
+
eventsDbPath,
|
|
205
|
+
cacheDbPath,
|
|
206
|
+
json: globalOpts.json,
|
|
207
|
+
conflictStrategy: localOpts.conflictStrategy,
|
|
208
|
+
force: localOpts.force,
|
|
209
|
+
syncUrl,
|
|
210
|
+
authToken,
|
|
211
|
+
});
|
|
212
|
+
if (globalOpts.json) {
|
|
213
|
+
console.log(JSON.stringify(result, null, 2));
|
|
214
|
+
}
|
|
215
|
+
process.exit(result.success ? 0 : 1);
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
//# sourceMappingURL=sync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.test.d.ts","sourceRoot":"","sources":["../../src/commands/sync.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { createSyncCommand, runSync } from './sync.js';
|
|
3
|
+
import fs from 'fs';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import os from 'os';
|
|
6
|
+
describe('hzl sync command', () => {
|
|
7
|
+
const testDir = path.join(os.tmpdir(), `sync-test-${Date.now()}`);
|
|
8
|
+
const eventsDb = path.join(testDir, 'events.db');
|
|
9
|
+
const cacheDb = path.join(testDir, 'cache.db');
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
fs.mkdirSync(testDir, { recursive: true });
|
|
12
|
+
});
|
|
13
|
+
afterEach(() => {
|
|
14
|
+
fs.rmSync(testDir, { recursive: true, force: true });
|
|
15
|
+
});
|
|
16
|
+
describe('runSync', () => {
|
|
17
|
+
it('returns success for local-only database', async () => {
|
|
18
|
+
const result = await runSync({
|
|
19
|
+
eventsDbPath: eventsDb,
|
|
20
|
+
cacheDbPath: cacheDb,
|
|
21
|
+
json: false,
|
|
22
|
+
});
|
|
23
|
+
expect(result.success).toBe(true);
|
|
24
|
+
expect(result.mode).toBe('local-only');
|
|
25
|
+
expect(result.message).toContain('local-only');
|
|
26
|
+
});
|
|
27
|
+
it('returns JSON output when requested', async () => {
|
|
28
|
+
const result = await runSync({
|
|
29
|
+
eventsDbPath: eventsDb,
|
|
30
|
+
cacheDbPath: cacheDb,
|
|
31
|
+
json: true,
|
|
32
|
+
});
|
|
33
|
+
expect(result.success).toBe(true);
|
|
34
|
+
expect(typeof result.data).toBe('object');
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
describe('createSyncCommand', () => {
|
|
38
|
+
it('creates a command with correct name', () => {
|
|
39
|
+
const cmd = createSyncCommand();
|
|
40
|
+
expect(cmd.name()).toBe('sync');
|
|
41
|
+
});
|
|
42
|
+
it('has conflict-strategy option', () => {
|
|
43
|
+
const cmd = createSyncCommand();
|
|
44
|
+
const opts = cmd.options.map((o) => o.long);
|
|
45
|
+
expect(opts).toContain('--conflict-strategy');
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
//# sourceMappingURL=sync.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.test.js","sourceRoot":"","sources":["../../src/commands/sync.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
|
-
import {
|
|
2
|
+
import { resolveDbPaths } from '../../config.js';
|
|
3
3
|
import { initializeDb, closeDb } from '../../db.js';
|
|
4
4
|
import { handleError, CLIError, ExitCode } from '../../errors.js';
|
|
5
5
|
import { EventType } from 'hzl-core/events/types.js';
|
|
@@ -29,7 +29,7 @@ function wouldCreateCycle(db, taskId, dependsOnId) {
|
|
|
29
29
|
}
|
|
30
30
|
export function runAddDep(options) {
|
|
31
31
|
const { services, taskId, dependsOnId, json } = options;
|
|
32
|
-
const {
|
|
32
|
+
const { cacheDb, eventStore, projectionEngine } = services;
|
|
33
33
|
// Check both tasks exist
|
|
34
34
|
const task = services.taskService.getTaskById(taskId);
|
|
35
35
|
if (!task) {
|
|
@@ -40,7 +40,7 @@ export function runAddDep(options) {
|
|
|
40
40
|
throw new CLIError(`Dependency task not found: ${dependsOnId}`, ExitCode.NotFound);
|
|
41
41
|
}
|
|
42
42
|
// Check for cycles - would adding taskId -> dependsOnId create a cycle?
|
|
43
|
-
if (wouldCreateCycle(
|
|
43
|
+
if (wouldCreateCycle(cacheDb, taskId, dependsOnId)) {
|
|
44
44
|
throw new CLIError(`Adding this dependency would create a cycle`, ExitCode.InvalidInput);
|
|
45
45
|
}
|
|
46
46
|
// Add the dependency via event
|
|
@@ -70,8 +70,8 @@ export function createAddDepCommand() {
|
|
|
70
70
|
.argument('<dependsOnId>', 'Task ID that must be completed first')
|
|
71
71
|
.action(function (taskId, dependsOnId) {
|
|
72
72
|
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
73
|
-
const
|
|
74
|
-
const services = initializeDb(
|
|
73
|
+
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
74
|
+
const services = initializeDb({ eventsDbPath, cacheDbPath });
|
|
75
75
|
try {
|
|
76
76
|
runAddDep({ services, taskId, dependsOnId, json: globalOpts.json ?? false });
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dep.js","sourceRoot":"","sources":["../../../src/commands/task/add-dep.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add-dep.js","sourceRoot":"","sources":["../../../src/commands/task/add-dep.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import fs from 'fs';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import os from 'os';
|
|
6
6
|
import { runAddDep } from './add-dep.js';
|
|
7
|
-
import {
|
|
7
|
+
import { initializeDbFromPath, closeDb } from '../../db.js';
|
|
8
8
|
describe('runAddDep', () => {
|
|
9
9
|
let tempDir;
|
|
10
10
|
let dbPath;
|
|
@@ -12,7 +12,7 @@ describe('runAddDep', () => {
|
|
|
12
12
|
beforeEach(() => {
|
|
13
13
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hzl-add-dep-test-'));
|
|
14
14
|
dbPath = path.join(tempDir, 'test.db');
|
|
15
|
-
services =
|
|
15
|
+
services = initializeDbFromPath(dbPath);
|
|
16
16
|
});
|
|
17
17
|
afterEach(() => {
|
|
18
18
|
closeDb(services);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-dep.test.js","sourceRoot":"","sources":["../../../src/commands/task/add-dep.test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add-dep.test.js","sourceRoot":"","sources":["../../../src/commands/task/add-dep.test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AAE3E,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,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,mBAAmB,CAAC,CAAC,CAAC;QACtE,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,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAErF,MAAM,MAAM,GAAG,SAAS,CAAC;YACvB,QAAQ;YACR,MAAM,EAAE,KAAK,CAAC,OAAO;YACrB,WAAW,EAAE,KAAK,CAAC,OAAO;YAC1B,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAElH,sFAAsF;QACtF,kIAAkI;QAClI,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;YACrB,QAAQ;YACR,MAAM,EAAE,KAAK,CAAC,OAAO;YACrB,WAAW,EAAE,KAAK,CAAC,OAAO;YAC1B,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// packages/hzl-cli/src/commands/add.ts
|
|
2
2
|
import { Command } from 'commander';
|
|
3
|
-
import {
|
|
3
|
+
import { resolveDbPaths } from '../../config.js';
|
|
4
4
|
import { initializeDb, closeDb } from '../../db.js';
|
|
5
5
|
import { handleError } from '../../errors.js';
|
|
6
6
|
import { GlobalOptionsSchema } from '../../types.js';
|
|
@@ -41,8 +41,8 @@ export function createAddCommand() {
|
|
|
41
41
|
.option('--depends-on <ids>', 'Comma-separated task IDs this depends on')
|
|
42
42
|
.action(function (title, opts) {
|
|
43
43
|
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
44
|
-
const
|
|
45
|
-
const services = initializeDb(
|
|
44
|
+
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
45
|
+
const services = initializeDb({ eventsDbPath, cacheDbPath });
|
|
46
46
|
try {
|
|
47
47
|
runAdd({
|
|
48
48
|
services,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/task/add.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/task/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import fs from 'fs';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import os from 'os';
|
|
6
6
|
import { runAdd } from './add.js';
|
|
7
|
-
import {
|
|
7
|
+
import { initializeDbFromPath, closeDb } from '../../db.js';
|
|
8
8
|
describe('runAdd', () => {
|
|
9
9
|
let tempDir;
|
|
10
10
|
let dbPath;
|
|
@@ -12,7 +12,7 @@ describe('runAdd', () => {
|
|
|
12
12
|
beforeEach(() => {
|
|
13
13
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hzl-add-test-'));
|
|
14
14
|
dbPath = path.join(tempDir, 'test.db');
|
|
15
|
-
services =
|
|
15
|
+
services = initializeDbFromPath(dbPath);
|
|
16
16
|
});
|
|
17
17
|
afterEach(() => {
|
|
18
18
|
closeDb(services);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.test.js","sourceRoot":"","sources":["../../../src/commands/task/add.test.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,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,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add.test.js","sourceRoot":"","sources":["../../../src/commands/task/add.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// packages/hzl-cli/src/commands/archive.ts
|
|
2
2
|
import { Command } from 'commander';
|
|
3
|
-
import {
|
|
3
|
+
import { resolveDbPaths } from '../../config.js';
|
|
4
4
|
import { initializeDb, closeDb } from '../../db.js';
|
|
5
5
|
import { handleError } from '../../errors.js';
|
|
6
6
|
import { GlobalOptionsSchema } from '../../types.js';
|
|
@@ -30,8 +30,8 @@ export function createArchiveCommand() {
|
|
|
30
30
|
.option('--author <name>', 'Author name')
|
|
31
31
|
.action(function (taskId, opts) {
|
|
32
32
|
const globalOpts = GlobalOptionsSchema.parse(this.optsWithGlobals());
|
|
33
|
-
const
|
|
34
|
-
const services = initializeDb(
|
|
33
|
+
const { eventsDbPath, cacheDbPath } = resolveDbPaths(globalOpts.db);
|
|
34
|
+
const services = initializeDb({ eventsDbPath, cacheDbPath });
|
|
35
35
|
try {
|
|
36
36
|
runArchive({
|
|
37
37
|
services,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/commands/task/archive.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/commands/task/archive.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,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,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAarD,MAAM,UAAU,UAAU,CAAC,OAM1B;IACC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE3D,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1E,MAAM,MAAM,GAAkB;QAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,CAAC;IAEF,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9D,IAAI,MAAM;YAAE,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC;SAC1B,WAAW,CAAC,gBAAgB,CAAC;SAC7B,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC;SAC/B,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;SAC7C,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC;SACxC,MAAM,CAAC,UAAyB,MAAc,EAAE,IAA2B;QAC1E,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QACrE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC;YACH,UAAU,CAAC;gBACT,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,KAAK;aAC/B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -4,7 +4,7 @@ import fs from 'fs';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import os from 'os';
|
|
6
6
|
import { runArchive } from './archive.js';
|
|
7
|
-
import {
|
|
7
|
+
import { initializeDbFromPath, closeDb } from '../../db.js';
|
|
8
8
|
import { TaskStatus } from 'hzl-core/events/types.js';
|
|
9
9
|
describe('runArchive', () => {
|
|
10
10
|
let tempDir;
|
|
@@ -13,7 +13,7 @@ describe('runArchive', () => {
|
|
|
13
13
|
beforeEach(() => {
|
|
14
14
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hzl-archive-test-'));
|
|
15
15
|
dbPath = path.join(tempDir, 'test.db');
|
|
16
|
-
services =
|
|
16
|
+
services = initializeDbFromPath(dbPath);
|
|
17
17
|
});
|
|
18
18
|
afterEach(() => {
|
|
19
19
|
closeDb(services);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.test.js","sourceRoot":"","sources":["../../../src/commands/task/archive.test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,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,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"archive.test.js","sourceRoot":"","sources":["../../../src/commands/task/archive.test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,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,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,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,mBAAmB,CAAC,CAAC,CAAC;QACtE,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,sBAAsB,EAAE,GAAG,EAAE;QAC9B,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;QAC7C,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC;YACxB,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,QAAQ,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,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;QAC7C,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC;YACxB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,MAAM,EAAE,mBAAmB;YAC3B,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|