@knpkv/jira-clockify 0.2.0 → 0.4.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 +4 -1
- package/dist/package.json +12 -13
- package/dist/src/bin.js +30 -13
- package/dist/src/bin.js.map +1 -1
- package/dist/src/cli/auth.js +23 -19
- package/dist/src/cli/auth.js.map +1 -1
- package/dist/src/cli/config.js +4 -4
- package/dist/src/cli/config.js.map +1 -1
- package/dist/src/cli/fetchTicket.js +18 -0
- package/dist/src/cli/fetchTicket.js.map +1 -0
- package/dist/src/cli/fuzzySelect.js +6 -5
- package/dist/src/cli/fuzzySelect.js.map +1 -1
- package/dist/src/cli/layers.js +10 -8
- package/dist/src/cli/layers.js.map +1 -1
- package/dist/src/cli/list.js +1 -1
- package/dist/src/cli/list.js.map +1 -1
- package/dist/src/cli/setup.js +19 -19
- package/dist/src/cli/setup.js.map +1 -1
- package/dist/src/cli/timer/discard.js +2 -2
- package/dist/src/cli/timer/discard.js.map +1 -1
- package/dist/src/cli/timer/edit.js +11 -11
- package/dist/src/cli/timer/edit.js.map +1 -1
- package/dist/src/cli/timer/log.js +52 -79
- package/dist/src/cli/timer/log.js.map +1 -1
- package/dist/src/cli/timer/start.js +52 -40
- package/dist/src/cli/timer/start.js.map +1 -1
- package/dist/src/cli/timer/status.js +7 -7
- package/dist/src/cli/timer/status.js.map +1 -1
- package/dist/src/cli/timer/stop.js +164 -58
- package/dist/src/cli/timer/stop.js.map +1 -1
- package/dist/src/main.js +15 -3
- package/dist/src/main.js.map +1 -1
- package/dist/src/services/ClockifyAuth.js +12 -23
- package/dist/src/services/ClockifyAuth.js.map +1 -1
- package/dist/src/services/ConfigService.js +7 -7
- package/dist/src/services/ConfigService.js.map +1 -1
- package/dist/src/services/HomeDirectory.js +14 -0
- package/dist/src/services/HomeDirectory.js.map +1 -0
- package/dist/src/services/StateWriter.js +8 -8
- package/dist/src/services/StateWriter.js.map +1 -1
- package/dist/src/services/TicketService.js +22 -15
- package/dist/src/services/TicketService.js.map +1 -1
- package/dist/src/services/TimerService.js +116 -58
- package/dist/src/services/TimerService.js.map +1 -1
- package/dist/src/tui/App.js +6 -5
- package/dist/src/tui/App.js.map +1 -1
- package/dist/src/tui/atoms/runtime.js +1 -1
- package/dist/src/tui/atoms/runtime.js.map +1 -1
- package/dist/src/tui/atoms/tickets.js +1 -1
- package/dist/src/tui/atoms/tickets.js.map +1 -1
- package/dist/src/tui/atoms/timer.js +2 -2
- package/dist/src/tui/atoms/timer.js.map +1 -1
- package/dist/src/tui/atoms/ui.js +1 -1
- package/dist/src/tui/atoms/ui.js.map +1 -1
- package/dist/src/tui/components/BigTimer.js +2 -2
- package/dist/src/tui/components/BigTimer.js.map +1 -1
- package/dist/src/tui/components/Footer.js +1 -1
- package/dist/src/tui/components/Footer.js.map +1 -1
- package/dist/src/tui/components/Header.js +3 -2
- package/dist/src/tui/components/Header.js.map +1 -1
- package/dist/src/tui/components/TicketList.js +3 -2
- package/dist/src/tui/components/TicketList.js.map +1 -1
- package/dist/src/tui/context/theme.js.map +1 -1
- package/dist/src/tui/hooks/useElapsedTimer.js +3 -2
- package/dist/src/tui/hooks/useElapsedTimer.js.map +1 -1
- package/dist/src/tui/hooks/useTerminalSize.js +1 -21
- package/dist/src/tui/hooks/useTerminalSize.js.map +1 -1
- package/dist/src/utils/time.js +55 -5
- package/dist/src/utils/time.js.map +1 -1
- package/dist/test/TimerService.test.js +163 -31
- package/dist/test/TimerService.test.js.map +1 -1
- package/dist/test/fetchTicket.test.js +62 -0
- package/dist/test/fetchTicket.test.js.map +1 -0
- package/dist/test/stopPrompts.test.js +93 -0
- package/dist/test/stopPrompts.test.js.map +1 -0
- package/dist/test/time.test.js +84 -0
- package/dist/test/time.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -17
- package/skills/jcf/SKILL.md +89 -0
- package/skills/jcf/agents/openai.yaml +4 -0
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* User home directory lookup as an Effect service.
|
|
3
|
+
*
|
|
4
|
+
* @module
|
|
5
|
+
*/
|
|
6
|
+
import * as Config from "effect/Config";
|
|
7
|
+
import * as Context from "effect/Context";
|
|
8
|
+
import * as Effect from "effect/Effect";
|
|
9
|
+
import * as Layer from "effect/Layer";
|
|
10
|
+
export class HomeDirectory extends Context.Service()("jcf/HomeDirectory") {
|
|
11
|
+
}
|
|
12
|
+
const homePath = Config.string("HOME").pipe(Config.orElse(() => Config.string("USERPROFILE")), Config.orElse(() => Config.succeed("/")));
|
|
13
|
+
export const layer = Layer.effect(HomeDirectory, homePath.pipe(Effect.map((path) => HomeDirectory.of({ path }))));
|
|
14
|
+
//# sourceMappingURL=HomeDirectory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HomeDirectory.js","sourceRoot":"","sources":["../../../src/services/HomeDirectory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAMrC,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,OAAO,EAAqC,CAAC,mBAAmB,CAAC;CAAG;AAE/G,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EACjD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACzC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,aAAa,EACb,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAChE,CAAA"}
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
*
|
|
11
11
|
* @module
|
|
12
12
|
*/
|
|
13
|
-
import * as FileSystem from "@effect/platform/FileSystem";
|
|
14
|
-
import * as Path from "@effect/platform/Path";
|
|
15
13
|
import * as Context from "effect/Context";
|
|
16
14
|
import * as Effect from "effect/Effect";
|
|
15
|
+
import * as FileSystem from "effect/FileSystem";
|
|
17
16
|
import * as Layer from "effect/Layer";
|
|
18
|
-
import
|
|
17
|
+
import * as Path from "effect/Path";
|
|
18
|
+
import { HomeDirectory } from "./HomeDirectory.js";
|
|
19
19
|
const emptyState = {
|
|
20
20
|
active: false,
|
|
21
21
|
ticketKey: null,
|
|
@@ -26,14 +26,14 @@ const emptyState = {
|
|
|
26
26
|
elapsed: 0,
|
|
27
27
|
clockifyEntryId: null
|
|
28
28
|
};
|
|
29
|
-
export class StateWriter extends Context.
|
|
29
|
+
export class StateWriter extends Context.Service()("jcf/StateWriter") {
|
|
30
30
|
}
|
|
31
31
|
const STATE_DIR = ".jcf";
|
|
32
32
|
const STATE_FILE = "state.json";
|
|
33
33
|
export const layer = Layer.effect(StateWriter, Effect.gen(function* () {
|
|
34
34
|
const fs = yield* FileSystem.FileSystem;
|
|
35
35
|
const path = yield* Path.Path;
|
|
36
|
-
const home = yield*
|
|
36
|
+
const home = (yield* HomeDirectory).path;
|
|
37
37
|
const dir = path.join(home, STATE_DIR);
|
|
38
38
|
const filePath = path.join(dir, STATE_FILE);
|
|
39
39
|
const ensureDir = Effect.gen(function* () {
|
|
@@ -47,7 +47,7 @@ export const layer = Layer.effect(StateWriter, Effect.gen(function* () {
|
|
|
47
47
|
const tmpPath = `${filePath}.tmp`;
|
|
48
48
|
yield* fs.writeFileString(tmpPath, JSON.stringify(state, null, 2));
|
|
49
49
|
yield* fs.rename(tmpPath, filePath);
|
|
50
|
-
}).pipe(Effect.
|
|
50
|
+
}).pipe(Effect.catch(() => Effect.void)),
|
|
51
51
|
read: Effect.gen(function* () {
|
|
52
52
|
const exists = yield* fs.exists(filePath);
|
|
53
53
|
if (!exists)
|
|
@@ -57,13 +57,13 @@ export const layer = Layer.effect(StateWriter, Effect.gen(function* () {
|
|
|
57
57
|
try: () => JSON.parse(content),
|
|
58
58
|
catch: () => emptyState
|
|
59
59
|
});
|
|
60
|
-
}).pipe(Effect.
|
|
60
|
+
}).pipe(Effect.catch(() => Effect.succeed(emptyState))),
|
|
61
61
|
clear: Effect.gen(function* () {
|
|
62
62
|
yield* ensureDir;
|
|
63
63
|
const tmpPath = `${filePath}.tmp`;
|
|
64
64
|
yield* fs.writeFileString(tmpPath, JSON.stringify(emptyState, null, 2));
|
|
65
65
|
yield* fs.rename(tmpPath, filePath);
|
|
66
|
-
}).pipe(Effect.
|
|
66
|
+
}).pipe(Effect.catch(() => Effect.void))
|
|
67
67
|
};
|
|
68
68
|
}));
|
|
69
69
|
//# sourceMappingURL=StateWriter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateWriter.js","sourceRoot":"","sources":["../../../src/services/StateWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"StateWriter.js","sourceRoot":"","sources":["../../../src/services/StateWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,26 @@ const extractNested = (fields, key, nested) => {
|
|
|
44
44
|
}
|
|
45
45
|
return null;
|
|
46
46
|
};
|
|
47
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Shape a raw Jira issue (from `/rest/api/3/issue` or `/search/jql`) into a
|
|
49
|
+
* {@link JiraTicket}. Single source of truth for the nested-field extraction —
|
|
50
|
+
* reused by {@link fetchTicketByKey} so the two never drift.
|
|
51
|
+
*/
|
|
52
|
+
export const mapIssueToTicket = (issue, fallbackKey) => {
|
|
53
|
+
const fields = issue["fields"];
|
|
54
|
+
const key = typeof issue["key"] === "string" ? issue["key"] : (fallbackKey ?? "?");
|
|
55
|
+
return {
|
|
56
|
+
key,
|
|
57
|
+
summary: extractString(fields, "summary") ?? (fallbackKey ?? "(no summary)"),
|
|
58
|
+
status: extractNested(fields, "status", "name") ?? "Unknown",
|
|
59
|
+
priority: extractNested(fields, "priority", "name"),
|
|
60
|
+
assignee: extractNested(fields, "assignee", "displayName"),
|
|
61
|
+
type: extractNested(fields, "issuetype", "name") ?? "Task",
|
|
62
|
+
labels: Array.isArray(fields?.["labels"]) ? fields["labels"] : [],
|
|
63
|
+
updated: extractString(fields, "updated") ?? new Date().toISOString()
|
|
64
|
+
};
|
|
65
|
+
};
|
|
66
|
+
export class TicketService extends Context.Service()("jcf/TicketService") {
|
|
48
67
|
}
|
|
49
68
|
export const layer = Layer.effect(TicketService, Effect.gen(function* () {
|
|
50
69
|
const config = yield* ConfigService;
|
|
@@ -63,26 +82,14 @@ export const layer = Layer.effect(TicketService, Effect.gen(function* () {
|
|
|
63
82
|
}
|
|
64
83
|
}
|
|
65
84
|
})).pipe(Effect.mapError((e) => new TicketError({ message: `Jira search failed: ${String(e)}`, cause: e })));
|
|
66
|
-
const tickets = (result.issues ?? []).map((issue) =>
|
|
67
|
-
const fields = issue.fields;
|
|
68
|
-
return {
|
|
69
|
-
key: String(issue.key ?? "?"),
|
|
70
|
-
summary: extractString(fields, "summary") ?? "(no summary)",
|
|
71
|
-
status: extractNested(fields, "status", "name") ?? "Unknown",
|
|
72
|
-
priority: extractNested(fields, "priority", "name"),
|
|
73
|
-
assignee: extractNested(fields, "assignee", "displayName"),
|
|
74
|
-
type: extractNested(fields, "issuetype", "name") ?? "Task",
|
|
75
|
-
labels: Array.isArray(fields?.["labels"]) ? fields["labels"] : [],
|
|
76
|
-
updated: extractString(fields, "updated") ?? new Date().toISOString()
|
|
77
|
-
};
|
|
78
|
-
});
|
|
85
|
+
const tickets = (result.issues ?? []).map((issue) => mapIssueToTicket(issue));
|
|
79
86
|
yield* SubscriptionRef.set(ref, {
|
|
80
87
|
tickets,
|
|
81
88
|
loading: false,
|
|
82
89
|
error: null,
|
|
83
90
|
lastRefreshed: new Date()
|
|
84
91
|
});
|
|
85
|
-
}).pipe(Effect.
|
|
92
|
+
}).pipe(Effect.catch((e) => {
|
|
86
93
|
const msg = e._tag === "TicketError"
|
|
87
94
|
? e.message
|
|
88
95
|
: `Failed to fetch tickets: ${String(e)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TicketService.js","sourceRoot":"","sources":["../../../src/services/TicketService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,eAAe,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAwBlD,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAG7D;CAAG;AAEL,MAAM,UAAU,GAAgB;IAC9B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,MAAM,YAAY,GAAG,CAAC,MAAkD,EAAE,GAAW,EAAW,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,CAAA;AAExH,MAAM,aAAa,GAAG,CAAC,MAAkD,EAAE,GAAW,EAAiB,EAAE;IACvG,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACrC,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;AAC7C,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CACpB,MAAkD,EAClD,GAAW,EACX,MAAc,EACC,EAAE;IACjB,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACrC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,CAAC,GAAI,GAA+B,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACzC,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAYD,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"TicketService.js","sourceRoot":"","sources":["../../../src/services/TicketService.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,6 @@
|
|
|
19
19
|
*
|
|
20
20
|
* @module
|
|
21
21
|
*/
|
|
22
|
-
import * as HttpClient from "@effect/platform/HttpClient";
|
|
23
|
-
import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
|
|
24
22
|
import { ClockifyApiClient } from "@knpkv/clockify-api-client";
|
|
25
23
|
import { JiraApiClient } from "@knpkv/jira-api-client";
|
|
26
24
|
import { JiraAuth } from "@knpkv/jira-cli/JiraAuth";
|
|
@@ -31,6 +29,8 @@ import * as Effect from "effect/Effect";
|
|
|
31
29
|
import * as Layer from "effect/Layer";
|
|
32
30
|
import * as Redacted from "effect/Redacted";
|
|
33
31
|
import * as SubscriptionRef from "effect/SubscriptionRef";
|
|
32
|
+
import * as HttpClient from "effect/unstable/http/HttpClient";
|
|
33
|
+
import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
|
|
34
34
|
import { ClockifyAuth } from "./ClockifyAuth.js";
|
|
35
35
|
import { ConfigService } from "./ConfigService.js";
|
|
36
36
|
import { StateWriter } from "./StateWriter.js";
|
|
@@ -48,7 +48,7 @@ const emptyState = {
|
|
|
48
48
|
billable: null,
|
|
49
49
|
startedViaJcf: false
|
|
50
50
|
};
|
|
51
|
-
export class TimerService extends Context.
|
|
51
|
+
export class TimerService extends Context.Service()("jcf/TimerService") {
|
|
52
52
|
}
|
|
53
53
|
export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
54
54
|
const clockify = yield* ClockifyApiClient;
|
|
@@ -74,32 +74,21 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
74
74
|
return stateWriter.write(file);
|
|
75
75
|
};
|
|
76
76
|
const getAuth = clockifyAuth.getConfig.pipe(Effect.mapError((e) => new TimerError({ message: e.message })));
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
// Resolve projectId: explicit > config default > auto-match by Jira-project name > null
|
|
78
|
+
const resolveProjectId = (ticket, workspaceId, explicit) => Effect.gen(function* () {
|
|
79
79
|
const cfg = yield* config.get;
|
|
80
|
-
|
|
81
|
-
const current = yield* SubscriptionRef.get(ref);
|
|
82
|
-
if (current.active) {
|
|
83
|
-
yield* internalStop().pipe(Effect.catchAll((e) => Effect.logWarning(`Auto-stop failed, Clockify entry may be orphaned: ${e.message}`)));
|
|
84
|
-
}
|
|
85
|
-
// Resolve projectId: explicit > config default > auto-match by name > null
|
|
86
|
-
let projectId = options?.projectId ?? cfg.defaultProjectId ?? null;
|
|
80
|
+
let projectId = explicit ?? cfg.defaultProjectId ?? null;
|
|
87
81
|
if (!projectId) {
|
|
88
82
|
const jiraProject = ticket.key.split("-")[0] ?? "";
|
|
89
83
|
const clockifyProjectName = cfg.projectMap[jiraProject] ?? jiraProject;
|
|
90
|
-
const project = yield* clockify.getProjectByName(
|
|
84
|
+
const project = yield* clockify.getProjectByName(workspaceId, clockifyProjectName).pipe(Effect.catch(() => Effect.succeed(null)));
|
|
91
85
|
if (project)
|
|
92
86
|
projectId = project.id;
|
|
93
87
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
projectName = projects.find((p) => p.id === projectId)?.name ?? null;
|
|
99
|
-
}
|
|
100
|
-
// Resolve billable: explicit > config default > null (will prompt on stop)
|
|
101
|
-
const billable = options?.billable ?? cfg.defaultBillable ?? null;
|
|
102
|
-
// Resolve tags: ticket type + Jira labels → Clockify tags
|
|
88
|
+
return projectId;
|
|
89
|
+
});
|
|
90
|
+
// Resolve tags: ticket type + Jira labels → Clockify tag IDs (cached per process)
|
|
91
|
+
const resolveTagIds = (ticket, workspaceId) => Effect.gen(function* () {
|
|
103
92
|
const tagNames = [ticket.type, ...ticket.labels].filter(Boolean);
|
|
104
93
|
const tagIds = [];
|
|
105
94
|
for (const tagName of tagNames) {
|
|
@@ -108,15 +97,75 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
108
97
|
tagIds.push(cached);
|
|
109
98
|
continue;
|
|
110
99
|
}
|
|
111
|
-
const tag = yield* clockify.findOrCreateTag(
|
|
100
|
+
const tag = yield* clockify.findOrCreateTag(workspaceId, tagName).pipe(Effect.catch(() => Effect.succeed(null)));
|
|
112
101
|
if (tag) {
|
|
113
102
|
tagIds.push(tag.id);
|
|
114
103
|
tagCache.set(tagName, tag.id);
|
|
115
104
|
}
|
|
116
105
|
}
|
|
117
106
|
yield* Effect.logDebug(`Clockify tags: ${tagNames.join(", ")} → ${tagIds.length} tag IDs`);
|
|
118
|
-
|
|
119
|
-
|
|
107
|
+
return tagIds;
|
|
108
|
+
});
|
|
109
|
+
// Post a Jira worklog via raw HTTP (generated client swallows 4xx as void). Returns success.
|
|
110
|
+
const postJiraWorklog = (ticketKey, startedAt, durationSeconds, comment) => Effect.gen(function* () {
|
|
111
|
+
// Jira rejects worklogs <60s — floor to 60s. Clockify keeps actual elapsed.
|
|
112
|
+
const timeSpent = Math.max(60, Math.floor(durationSeconds));
|
|
113
|
+
const started = startedAt.toISOString().replace("Z", "+0000");
|
|
114
|
+
yield* Effect.logDebug(`Jira worklog: ${ticketKey} ${timeSpent}s`);
|
|
115
|
+
const accessToken = yield* jiraAuth.getAccessToken().pipe(Effect.tapError((e) => Effect.logDebug(`Jira getAccessToken failed: ${String(e)}`)), Effect.catch(() => Effect.succeed(Redacted.make(""))));
|
|
116
|
+
const cloudId = yield* jiraAuth.getCloudId().pipe(Effect.catch(() => Effect.succeed("")));
|
|
117
|
+
// Short-circuit: without a token or cloudId the request is guaranteed to
|
|
118
|
+
// 401 against a malformed URL — fail fast locally instead.
|
|
119
|
+
if (Redacted.value(accessToken) === "" || cloudId === "") {
|
|
120
|
+
yield* Effect.logDebug("Jira worklog skipped: missing access token or cloudId");
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
const response = yield* httpClient.execute(HttpClientRequest.post(`https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/issue/${encodeURIComponent(ticketKey)}/worklog`).pipe(HttpClientRequest.setHeader("Authorization", `Bearer ${Redacted.value(accessToken)}`), HttpClientRequest.setHeader("Content-Type", "application/json"), HttpClientRequest.bodyJsonUnsafe({
|
|
124
|
+
started,
|
|
125
|
+
timeSpentSeconds: timeSpent,
|
|
126
|
+
...(comment ?
|
|
127
|
+
{
|
|
128
|
+
comment: {
|
|
129
|
+
type: "doc",
|
|
130
|
+
version: 1,
|
|
131
|
+
content: [{ type: "paragraph", content: [{ type: "text", text: comment }] }]
|
|
132
|
+
}
|
|
133
|
+
} :
|
|
134
|
+
{})
|
|
135
|
+
}))).pipe(Effect.catch((e) => Effect.logDebug(`Jira worklog failed: ${String(e)}`).pipe(Effect.map(() => null))));
|
|
136
|
+
if (response && response.status >= 200 && response.status < 300) {
|
|
137
|
+
yield* Effect.logDebug(`Jira worklog created (${response.status})`);
|
|
138
|
+
return true;
|
|
139
|
+
}
|
|
140
|
+
if (response) {
|
|
141
|
+
const body = yield* response.text.pipe(Effect.catch(() => Effect.succeed("")));
|
|
142
|
+
yield* Effect.logDebug(`Jira worklog failed (${response.status}): ${body.slice(0, 300)}`);
|
|
143
|
+
}
|
|
144
|
+
return false;
|
|
145
|
+
});
|
|
146
|
+
const start = (ticket, options) => Effect.gen(function* () {
|
|
147
|
+
const auth = yield* getAuth;
|
|
148
|
+
const cfg = yield* config.get;
|
|
149
|
+
// The new entry's start (possibly backdated to correct a forgotten start).
|
|
150
|
+
const newStartedAt = options?.startedAt ?? new Date();
|
|
151
|
+
// Auto-stop existing timer. When backdating, close the previous entry at
|
|
152
|
+
// the new start time (not now) to avoid overlapping Clockify intervals.
|
|
153
|
+
const current = yield* SubscriptionRef.get(ref);
|
|
154
|
+
if (current.active) {
|
|
155
|
+
yield* internalStop(undefined, newStartedAt).pipe(Effect.catch((e) => Effect.logWarning(`Auto-stop failed, Clockify entry may be orphaned: ${e.message}`)));
|
|
156
|
+
}
|
|
157
|
+
const projectId = yield* resolveProjectId(ticket, auth.workspaceId, options?.projectId ?? null);
|
|
158
|
+
// Resolve project name
|
|
159
|
+
let projectName = cfg.defaultProjectName ?? null;
|
|
160
|
+
if (projectId && !projectName) {
|
|
161
|
+
const projects = yield* clockify.getProjects(auth.workspaceId).pipe(Effect.catch(() => Effect.succeed([])));
|
|
162
|
+
projectName = projects.find((p) => p.id === projectId)?.name ?? null;
|
|
163
|
+
}
|
|
164
|
+
// Resolve billable: explicit > config default > null (will prompt on stop)
|
|
165
|
+
const billable = options?.billable ?? cfg.defaultBillable ?? null;
|
|
166
|
+
const tagIds = yield* resolveTagIds(ticket, auth.workspaceId);
|
|
167
|
+
// Start timer — `startedAt` may be backdated to correct a forgotten start
|
|
168
|
+
const now = newStartedAt;
|
|
120
169
|
const entry = yield* clockify.createTimeEntry(auth.workspaceId, {
|
|
121
170
|
description: `[${ticket.key}] ${ticket.summary}`,
|
|
122
171
|
start: now.toISOString(),
|
|
@@ -139,13 +188,16 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
139
188
|
yield* writeStateFile(newState);
|
|
140
189
|
yield* SubscriptionRef.set(ref, newState);
|
|
141
190
|
});
|
|
142
|
-
const internalStop = (options) => Effect.gen(function* () {
|
|
191
|
+
const internalStop = (options, endAt) => Effect.gen(function* () {
|
|
143
192
|
const auth = yield* getAuth;
|
|
144
193
|
const current = yield* SubscriptionRef.get(ref);
|
|
145
194
|
if (!current.active || !current.startedAt) {
|
|
146
195
|
return yield* Effect.fail(new TimerError({ message: "No active timer" }));
|
|
147
196
|
}
|
|
148
|
-
|
|
197
|
+
// `endAt` lets `start` close the previous entry at the new (possibly
|
|
198
|
+
// backdated) start time so the two Clockify intervals never overlap.
|
|
199
|
+
// Never end before the entry began.
|
|
200
|
+
const now = endAt && endAt.getTime() >= current.startedAt.getTime() ? endAt : new Date();
|
|
149
201
|
const durationMs = now.getTime() - current.startedAt.getTime();
|
|
150
202
|
const duration = Duration.millis(durationMs);
|
|
151
203
|
// Merge: stop options override current state
|
|
@@ -154,7 +206,7 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
154
206
|
const comment = options?.comment;
|
|
155
207
|
// Stop via PUT — preserve existing tagIds from the entry
|
|
156
208
|
if (current.clockifyEntryId) {
|
|
157
|
-
const existing = yield* clockify.getTimeEntry(auth.workspaceId, current.clockifyEntryId).pipe(Effect.
|
|
209
|
+
const existing = yield* clockify.getTimeEntry(auth.workspaceId, current.clockifyEntryId).pipe(Effect.catch(() => Effect.succeed(null)));
|
|
158
210
|
const tagIds = existing?.tagIds ?? [];
|
|
159
211
|
// Append comment to Clockify description if provided
|
|
160
212
|
const description = comment
|
|
@@ -177,33 +229,7 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
177
229
|
// Log Jira worklog (raw HTTP — generated client swallows 4xx as void)
|
|
178
230
|
let jiraLogged = false;
|
|
179
231
|
if (current.ticketKey) {
|
|
180
|
-
|
|
181
|
-
const timeSpent = Math.max(60, Math.floor(durationMs / 1000));
|
|
182
|
-
const started = current.startedAt.toISOString().replace("Z", "+0000");
|
|
183
|
-
yield* Effect.logDebug(`Jira worklog: ${current.ticketKey} ${timeSpent}s`);
|
|
184
|
-
const accessToken = yield* jiraAuth.getAccessToken().pipe(Effect.tapError((e) => Effect.logDebug(`Jira getAccessToken failed: ${String(e)}`)), Effect.catchAll(() => Effect.succeed(Redacted.make(""))));
|
|
185
|
-
const cloudId = yield* jiraAuth.getCloudId().pipe(Effect.catchAll(() => Effect.succeed("")));
|
|
186
|
-
const response = yield* httpClient.execute(HttpClientRequest.post(`https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/issue/${current.ticketKey}/worklog`).pipe(HttpClientRequest.setHeader("Authorization", `Bearer ${Redacted.value(accessToken)}`), HttpClientRequest.setHeader("Content-Type", "application/json"), HttpClientRequest.bodyUnsafeJson({
|
|
187
|
-
started,
|
|
188
|
-
timeSpentSeconds: timeSpent,
|
|
189
|
-
...(comment ?
|
|
190
|
-
{
|
|
191
|
-
comment: {
|
|
192
|
-
type: "doc",
|
|
193
|
-
version: 1,
|
|
194
|
-
content: [{ type: "paragraph", content: [{ type: "text", text: comment }] }]
|
|
195
|
-
}
|
|
196
|
-
} :
|
|
197
|
-
{})
|
|
198
|
-
}))).pipe(Effect.catchAll((e) => Effect.logDebug(`Jira worklog failed: ${String(e)}`).pipe(Effect.map(() => null))));
|
|
199
|
-
if (response && response.status >= 200 && response.status < 300) {
|
|
200
|
-
jiraLogged = true;
|
|
201
|
-
yield* Effect.logDebug(`Jira worklog created (${response.status})`);
|
|
202
|
-
}
|
|
203
|
-
else if (response) {
|
|
204
|
-
const body = yield* response.text.pipe(Effect.catchAll(() => Effect.succeed("")));
|
|
205
|
-
yield* Effect.logDebug(`Jira worklog failed (${response.status}): ${body.slice(0, 300)}`);
|
|
206
|
-
}
|
|
232
|
+
jiraLogged = yield* postJiraWorklog(current.ticketKey, current.startedAt, durationMs / 1000, comment);
|
|
207
233
|
}
|
|
208
234
|
yield* SubscriptionRef.set(ref, emptyState);
|
|
209
235
|
yield* stateWriter.clear;
|
|
@@ -215,9 +241,41 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
215
241
|
needsBillable: billable === null
|
|
216
242
|
};
|
|
217
243
|
});
|
|
244
|
+
// Log a completed interval after the fact — for when the timer was never started.
|
|
245
|
+
// Writes a closed Clockify entry (start + end) and posts the matching Jira worklog,
|
|
246
|
+
// without ever touching the running-timer state.
|
|
247
|
+
const logManual = (ticket, options) => Effect.gen(function* () {
|
|
248
|
+
// Shared future-time guard for all backdating callers (log + stop-correction).
|
|
249
|
+
// Mirrors `start --since`, which rejects future starts at the command layer.
|
|
250
|
+
if (options.start.getTime() > Date.now()) {
|
|
251
|
+
return yield* Effect.fail(new TimerError({ message: "Start time is in the future. Pick a time at or before now." }));
|
|
252
|
+
}
|
|
253
|
+
const end = new Date(options.start.getTime() + options.durationSeconds * 1000);
|
|
254
|
+
if (end.getTime() > Date.now()) {
|
|
255
|
+
return yield* Effect.fail(new TimerError({ message: "End time is in the future. Shorten the duration or pick an earlier start." }));
|
|
256
|
+
}
|
|
257
|
+
const auth = yield* getAuth;
|
|
258
|
+
const cfg = yield* config.get;
|
|
259
|
+
const projectId = yield* resolveProjectId(ticket, auth.workspaceId, options.projectId ?? null);
|
|
260
|
+
const billable = options.billable ?? cfg.defaultBillable ?? null;
|
|
261
|
+
const tagIds = yield* resolveTagIds(ticket, auth.workspaceId);
|
|
262
|
+
let clockifyLogged = false;
|
|
263
|
+
yield* clockify.createTimeEntry(auth.workspaceId, {
|
|
264
|
+
description: `[${ticket.key}] ${ticket.summary}`,
|
|
265
|
+
start: options.start.toISOString(),
|
|
266
|
+
end: end.toISOString(),
|
|
267
|
+
...(projectId ? { projectId } : {}),
|
|
268
|
+
...(billable !== null ? { billable } : {}),
|
|
269
|
+
...(tagIds.length > 0 ? { tagIds } : {})
|
|
270
|
+
}).pipe(Effect.tap(() => Effect.sync(() => {
|
|
271
|
+
clockifyLogged = true;
|
|
272
|
+
})), Effect.catch((e) => Effect.logDebug(`Clockify correction entry failed: ${e.message}`)));
|
|
273
|
+
const jiraWorklogLogged = yield* postJiraWorklog(ticket.key, options.start, options.durationSeconds, options.comment);
|
|
274
|
+
return { clockifyLogged, jiraWorklogLogged, projectId, billable };
|
|
275
|
+
});
|
|
218
276
|
const detectRunning = Effect.gen(function* () {
|
|
219
277
|
const auth = yield* getAuth;
|
|
220
|
-
const running = yield* clockify.getRunningTimer(auth.workspaceId, auth.userId).pipe(Effect.
|
|
278
|
+
const running = yield* clockify.getRunningTimer(auth.workspaceId, auth.userId).pipe(Effect.catch(() => Effect.succeed(null)));
|
|
221
279
|
if (running && running.timeInterval.start) {
|
|
222
280
|
const startedAt = new Date(running.timeInterval.start);
|
|
223
281
|
// Parse "[KEY] summary" or "KEY: summary" format
|
|
@@ -232,7 +290,7 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
232
290
|
// Resolve project name
|
|
233
291
|
let resolvedProjectName = null;
|
|
234
292
|
if (running.projectId) {
|
|
235
|
-
const projects = yield* clockify.getProjects(auth.workspaceId).pipe(Effect.
|
|
293
|
+
const projects = yield* clockify.getProjects(auth.workspaceId).pipe(Effect.catch(() => Effect.succeed([])));
|
|
236
294
|
resolvedProjectName = projects.find((p) => p.id === running.projectId)?.name ?? null;
|
|
237
295
|
}
|
|
238
296
|
const newState = {
|
|
@@ -266,6 +324,6 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
266
324
|
yield* SubscriptionRef.set(ref, emptyState);
|
|
267
325
|
yield* stateWriter.clear;
|
|
268
326
|
});
|
|
269
|
-
return { state: ref, start, stop: internalStop, discard, detectRunning };
|
|
327
|
+
return { state: ref, start, stop: internalStop, logManual, discard, detectRunning };
|
|
270
328
|
}));
|
|
271
329
|
//# sourceMappingURL=TimerService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimerService.js","sourceRoot":"","sources":["../../../src/services/TimerService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TimerService.js","sourceRoot":"","sources":["../../../src/services/TimerService.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tui/App.js
CHANGED
|
@@ -4,7 +4,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@opentui/reac
|
|
|
4
4
|
*
|
|
5
5
|
* @internal
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
7
|
+
import { useAtomSet, useAtomValue } from "@effect/atom-react";
|
|
8
|
+
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
|
|
8
9
|
import { useKeyboard } from "@opentui/react";
|
|
9
10
|
import { useCallback, useEffect, useState } from "react";
|
|
10
11
|
import { refreshAtom, ticketsAtom } from "./atoms/tickets.js";
|
|
@@ -34,10 +35,10 @@ function AppContent({ onQuit }) {
|
|
|
34
35
|
const [frozenOnTimer, setFrozenOnTimer] = useState(false);
|
|
35
36
|
const [resultMsg, setResultMsg] = useState(null);
|
|
36
37
|
const ticketsResult = useAtomValue(ticketsAtom);
|
|
37
|
-
const ticketState =
|
|
38
|
+
const ticketState = AsyncResult.isSuccess(ticketsResult) ? ticketsResult.value : null;
|
|
38
39
|
const tickets = ticketState?.tickets ?? [];
|
|
39
40
|
const timerResult = useAtomValue(timerStateAtom);
|
|
40
|
-
const timerState =
|
|
41
|
+
const timerState = AsyncResult.isSuccess(timerResult) ? timerResult.value : null;
|
|
41
42
|
const timerActive = timerState?.active ?? false;
|
|
42
43
|
// Auto-switch views — frozen while popup is showing
|
|
43
44
|
const hasPopup = isStopping || isDiscarding || resultMsg !== null;
|
|
@@ -70,7 +71,7 @@ function AppContent({ onQuit }) {
|
|
|
70
71
|
useEffect(() => {
|
|
71
72
|
if (!frozenOnTimer || isStopping)
|
|
72
73
|
return;
|
|
73
|
-
if (
|
|
74
|
+
if (AsyncResult.isSuccess(stopResult)) {
|
|
74
75
|
const jiraOk = stopResult.value.jiraWorklogLogged;
|
|
75
76
|
setResultMsg({
|
|
76
77
|
title: "Timer stopped",
|
|
@@ -83,7 +84,7 @@ function AppContent({ onQuit }) {
|
|
|
83
84
|
type: jiraOk ? "success" : "error"
|
|
84
85
|
});
|
|
85
86
|
}
|
|
86
|
-
else if (
|
|
87
|
+
else if (AsyncResult.isFailure(stopResult)) {
|
|
87
88
|
setResultMsg({
|
|
88
89
|
title: "Timer stop failed",
|
|
89
90
|
lines: [{ text: "Could not stop timer", color: "#FF6666" }],
|
package/dist/src/tui/App.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/tui/App.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/tui/App.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @internal
|
|
5
5
|
*/
|
|
6
|
-
import
|
|
6
|
+
import * as Atom from "effect/unstable/reactivity/Atom";
|
|
7
7
|
import { HeadlessLayer } from "../../cli/layers.js";
|
|
8
8
|
export const runtimeAtom = Atom.runtime(HeadlessLayer);
|
|
9
9
|
//# sourceMappingURL=runtime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/tui/atoms/runtime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/tui/atoms/runtime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,IAAI,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
import { TicketService } from "../../services/TicketService.js";
|
|
8
8
|
import { runtimeAtom } from "./runtime.js";
|
|
9
|
-
export const ticketsAtom = runtimeAtom.
|
|
9
|
+
export const ticketsAtom = runtimeAtom.subscriptionRef(Effect.gen(function* () {
|
|
10
10
|
const service = yield* TicketService;
|
|
11
11
|
return service.state;
|
|
12
12
|
}));
|