@knpkv/jira-clockify 0.5.0 → 1.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 +10 -10
- package/dist/package.json +1 -1
- package/dist/src/bin.js +1 -15
- package/dist/src/bin.js.map +1 -1
- package/dist/src/cli/layers.js +7 -2
- package/dist/src/cli/layers.js.map +1 -1
- package/dist/src/cli/list.js +1 -0
- package/dist/src/cli/list.js.map +1 -1
- package/dist/src/cli/reconcile.js +131 -0
- package/dist/src/cli/reconcile.js.map +1 -0
- package/dist/src/cli/root.js +25 -0
- package/dist/src/cli/root.js.map +1 -0
- package/dist/src/cli/setup.js +1 -1
- package/dist/src/cli/setup.js.map +1 -1
- package/dist/src/cli/timer/start.js +1 -1
- package/dist/src/cli/timer/start.js.map +1 -1
- package/dist/src/cli/timer/stop.js +26 -10
- package/dist/src/cli/timer/stop.js.map +1 -1
- package/dist/src/cli/timer.js +4 -0
- package/dist/src/cli/timer.js.map +1 -1
- package/dist/src/services/ReconcileService.js +0 -0
- package/dist/src/services/ReconcileService.js.map +1 -0
- package/dist/src/services/TimerService.js +45 -22
- package/dist/src/services/TimerService.js.map +1 -1
- package/dist/src/tui/App.js +41 -49
- package/dist/src/tui/App.js.map +1 -1
- package/dist/test/ReconcileService.test.js +146 -0
- package/dist/test/ReconcileService.test.js.map +1 -0
- package/dist/test/TimerService.test.js +56 -15
- package/dist/test/TimerService.test.js.map +1 -1
- package/dist/test/commandSurface.test.js +42 -0
- package/dist/test/commandSurface.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/nvim/lua/jcf/init.lua +8 -8
- package/nvim/lua/jcf/state.lua +3 -3
- package/nvim/lua/jcf/telescope.lua +3 -3
- package/package.json +4 -4
- package/skills/jcf/SKILL.md +17 -17
- package/skills/jcf/agents/openai.yaml +1 -1
|
@@ -48,6 +48,23 @@ const emptyState = {
|
|
|
48
48
|
billable: null,
|
|
49
49
|
startedViaJcf: false
|
|
50
50
|
};
|
|
51
|
+
// Distil a Jira worklog error body (usually `{ "errorMessages": [...] }`) into a short phrase.
|
|
52
|
+
// Pure helper kept at module scope so the JSON parse isn't a try/catch inside an Effect.gen.
|
|
53
|
+
const summariseJiraError = (status, body) => {
|
|
54
|
+
const trimmed = body.trim();
|
|
55
|
+
if (!trimmed)
|
|
56
|
+
return `HTTP ${status}`;
|
|
57
|
+
try {
|
|
58
|
+
const parsed = JSON.parse(trimmed);
|
|
59
|
+
if (parsed.errorMessages && parsed.errorMessages.length > 0) {
|
|
60
|
+
return `HTTP ${status}: ${parsed.errorMessages.join("; ")}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
// Non-JSON body — fall through to the raw snippet.
|
|
65
|
+
}
|
|
66
|
+
return `HTTP ${status}: ${trimmed.slice(0, 200)}`;
|
|
67
|
+
};
|
|
51
68
|
export class TimerService extends Context.Service()("jcf/TimerService") {
|
|
52
69
|
}
|
|
53
70
|
export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
@@ -106,7 +123,7 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
106
123
|
yield* Effect.logDebug(`Clockify tags: ${tagNames.join(", ")} → ${tagIds.length} tag IDs`);
|
|
107
124
|
return tagIds;
|
|
108
125
|
});
|
|
109
|
-
// Post a Jira worklog via raw HTTP (generated client swallows 4xx as void).
|
|
126
|
+
// Post a Jira worklog via raw HTTP (generated client swallows 4xx as void).
|
|
110
127
|
const postJiraWorklog = (ticketKey, startedAt, durationSeconds, comment) => Effect.gen(function* () {
|
|
111
128
|
// Jira rejects worklogs <60s — floor to 60s. Clockify keeps actual elapsed.
|
|
112
129
|
const timeSpent = Math.max(60, Math.floor(durationSeconds));
|
|
@@ -115,12 +132,12 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
115
132
|
const accessToken = yield* jiraAuth.getAccessToken().pipe(Effect.tapError((e) => Effect.logDebug(`Jira getAccessToken failed: ${String(e)}`)), Effect.catch(() => Effect.succeed(Redacted.make(""))));
|
|
116
133
|
const cloudId = yield* jiraAuth.getCloudId().pipe(Effect.catch(() => Effect.succeed("")));
|
|
117
134
|
// Short-circuit: without a token or cloudId the request is guaranteed to
|
|
118
|
-
// 401 against a malformed URL —
|
|
135
|
+
// 401 against a malformed URL — report not-logged-in so retrying is suppressed.
|
|
119
136
|
if (Redacted.value(accessToken) === "" || cloudId === "") {
|
|
120
137
|
yield* Effect.logDebug("Jira worklog skipped: missing access token or cloudId");
|
|
121
|
-
return
|
|
138
|
+
return { _tag: "NotLoggedIn" };
|
|
122
139
|
}
|
|
123
|
-
const
|
|
140
|
+
const exec = 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
141
|
started,
|
|
125
142
|
timeSpentSeconds: timeSpent,
|
|
126
143
|
...(comment ?
|
|
@@ -132,16 +149,18 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
132
149
|
}
|
|
133
150
|
} :
|
|
134
151
|
{})
|
|
135
|
-
}))).pipe(Effect.catch((e) => Effect.logDebug(`Jira worklog failed: ${String(e)}`).pipe(Effect.
|
|
136
|
-
if (
|
|
137
|
-
|
|
138
|
-
return true;
|
|
152
|
+
}))).pipe(Effect.map((response) => ({ ok: true, response })), Effect.catch((e) => Effect.logDebug(`Jira worklog failed: ${String(e)}`).pipe(Effect.as({ ok: false, message: `Network error: ${String(e)}` }))));
|
|
153
|
+
if (!exec.ok) {
|
|
154
|
+
return { _tag: "Failed", message: exec.message };
|
|
139
155
|
}
|
|
140
|
-
if (response) {
|
|
141
|
-
|
|
142
|
-
|
|
156
|
+
if (exec.response.status >= 200 && exec.response.status < 300) {
|
|
157
|
+
yield* Effect.logDebug(`Jira worklog created (${exec.response.status})`);
|
|
158
|
+
return { _tag: "Posted" };
|
|
143
159
|
}
|
|
144
|
-
|
|
160
|
+
const body = yield* exec.response.text.pipe(Effect.catch(() => Effect.succeed("")));
|
|
161
|
+
const message = summariseJiraError(exec.response.status, body);
|
|
162
|
+
yield* Effect.logDebug(`Jira worklog failed: ${message}`);
|
|
163
|
+
return { _tag: "Failed", message };
|
|
145
164
|
});
|
|
146
165
|
const start = (ticket, options) => Effect.gen(function* () {
|
|
147
166
|
const auth = yield* getAuth;
|
|
@@ -227,24 +246,23 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
227
246
|
}).pipe(Effect.mapError((e) => new TimerError({ message: `Failed to stop timer: ${e.message}`, cause: e })));
|
|
228
247
|
}
|
|
229
248
|
// Log Jira worklog (raw HTTP — generated client swallows 4xx as void)
|
|
230
|
-
let jiraLogged = false;
|
|
231
249
|
const worklog = current.ticketKey
|
|
232
250
|
? { ticketKey: current.ticketKey, startedAt: current.startedAt, durationSeconds: durationMs / 1000, comment }
|
|
233
251
|
: null;
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
252
|
+
// Use worklog.* throughout so the live POST and the stored retry params can never drift.
|
|
253
|
+
const jiraWorklog = worklog
|
|
254
|
+
? yield* postJiraWorklog(worklog.ticketKey, worklog.startedAt, worklog.durationSeconds, worklog.comment)
|
|
255
|
+
: null;
|
|
238
256
|
yield* SubscriptionRef.set(ref, emptyState);
|
|
239
257
|
yield* stateWriter.clear;
|
|
240
258
|
return {
|
|
241
259
|
duration,
|
|
242
260
|
clockifyLogged: true,
|
|
243
|
-
jiraWorklogLogged: jiraLogged,
|
|
244
261
|
needsProjectId: !projectId,
|
|
245
262
|
needsBillable: billable === null,
|
|
246
|
-
|
|
247
|
-
|
|
263
|
+
jiraWorklog,
|
|
264
|
+
// Only a retryable `Failed` exposes retry params — `NotLoggedIn` can't be fixed by retrying.
|
|
265
|
+
worklog: jiraWorklog?._tag === "Failed" ? worklog : null
|
|
248
266
|
};
|
|
249
267
|
});
|
|
250
268
|
// Retry a worklog post in isolation (Clockify already saved during the failed stop).
|
|
@@ -278,8 +296,13 @@ export const layer = Layer.effect(TimerService, Effect.gen(function* () {
|
|
|
278
296
|
}).pipe(Effect.tap(() => Effect.sync(() => {
|
|
279
297
|
clockifyLogged = true;
|
|
280
298
|
})), Effect.catch((e) => Effect.logDebug(`Clockify correction entry failed: ${e.message}`)));
|
|
281
|
-
const
|
|
282
|
-
return {
|
|
299
|
+
const jiraOutcome = yield* postJiraWorklog(ticket.key, options.start, options.durationSeconds, options.comment);
|
|
300
|
+
return {
|
|
301
|
+
clockifyLogged,
|
|
302
|
+
jiraWorklogLogged: jiraOutcome._tag === "Posted",
|
|
303
|
+
projectId,
|
|
304
|
+
billable
|
|
305
|
+
};
|
|
283
306
|
});
|
|
284
307
|
const detectRunning = Effect.gen(function* () {
|
|
285
308
|
const auth = yield* getAuth;
|
|
@@ -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":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,eAAe,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAC7D,OAAO,KAAK,iBAAiB,MAAM,wCAAwC,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAA;AAuDnE,MAAM,OAAO,UAAW,SAAQ,IAAI,CAAC,WAAW,CAAC,YAAY,CAG3D;CAAG;AAEL,MAAM,UAAU,GAAe;IAC7B,MAAM,EAAE,KAAK;IACb,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,IAAI;IACrB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,KAAK;CACrB,CAAA;AAED,+FAA+F;AAC/F,6FAA6F;AAC7F,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,IAAY,EAAU,EAAE;IAClE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAC3B,IAAI,CAAC,OAAO;QAAE,OAAO,QAAQ,MAAM,EAAE,CAAA;IACrC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA8C,CAAA;QAC/E,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5D,OAAO,QAAQ,MAAM,KAAK,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QAC7D,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mDAAmD;IACrD,CAAC;IACD,OAAO,QAAQ,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAA;AACnD,CAAC,CAAA;AAqDD,MAAM,OAAO,YAAa,SAAQ,OAAO,CAAC,OAAO,EAAmC,CAAC,kBAAkB,CAAC;CAAG;AAE3G,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAC/B,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAA;IACzC,KAAK,CAAC,CAAC,aAAa,CAAA,CAAC,yBAAyB;IAC9C,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAA;IAChC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAA;IACnC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,WAAW,CAAA;IACtC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAa,UAAU,CAAC,CAAA;IAC/D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;IAE1C,MAAM,cAAc,GAAG,CAAC,KAAiB,EAAE,EAAE;QAC3C,MAAM,IAAI,GAAmB;YAC3B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,IAAI;YACjD,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACrF,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1F,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAA;QACD,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CACzC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAC/D,CAAA;IAED,wFAAwF;IACxF,MAAM,gBAAgB,GAAG,CAAC,MAAkB,EAAE,WAAmB,EAAE,QAAuB,EAAE,EAAE,CAC5F,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;QAC7B,IAAI,SAAS,GAAG,QAAQ,IAAI,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAA;QACxD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAClD,MAAM,mBAAmB,GAAG,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,WAAW,CAAA;YACtE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,IAAI,CACrF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACzC,CAAA;YACD,IAAI,OAAO;gBAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAA;QACrC,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,CAAA;IAEJ,kFAAkF;IAClF,MAAM,aAAa,GAAG,CAAC,MAAkB,EAAE,WAAmB,EAAE,EAAE,CAChE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAChE,MAAM,MAAM,GAAkB,EAAE,CAAA;QAChC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACpC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACnB,SAAQ;YACV,CAAC;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,CACpE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACzC,CAAA;YACD,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACnB,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QACD,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,MAAM,UAAU,CAAC,CAAA;QAC1F,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;IAEJ,4EAA4E;IAC5E,MAAM,eAAe,GAAG,CACtB,SAAiB,EACjB,SAAe,EACf,eAAuB,EACvB,OAAgB,EACmB,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,4EAA4E;QAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAC7D,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAS,IAAI,SAAS,GAAG,CAAC,CAAA;QAElE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,CACvD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACnF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CACtD,CAAA;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAEzF,yEAAyE;QACzE,gFAAgF;QAChF,IAAI,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACzD,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,uDAAuD,CAAC,CAAA;YAC/E,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAA;QAChC,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CACpC,iBAAiB,CAAC,IAAI,CACpB,qCAAqC,OAAO,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,UAAU,CACzG,CAAC,IAAI,CACJ,iBAAiB,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EACrF,iBAAiB,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,EAC/D,iBAAiB,CAAC,cAAc,CAAC;YAC/B,OAAO;YACP,gBAAgB,EAAE,SAAS;YAC3B,GAAG,CAAC,OAAO,CAAC,CAAC;gBACX;oBACE,OAAO,EAAE;wBACP,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;qBAC7E;iBACF,CAAC,CAAC;gBACH,EAAE,CAAC;SACN,CAAC,CACH,CACF,CAAC,IAAI,CACJ,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,EAC3D,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACjB,MAAM,CAAC,QAAQ,CAAC,wBAAwB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CACvD,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAc,EAAE,OAAO,EAAE,kBAAkB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAC1E,CACF,CACF,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAA;QAClD,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC9D,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;YACxE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QAC3B,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACnF,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC9D,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAA;QACzD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IAEJ,MAAM,KAAK,GAAG,CAAC,MAAkB,EAAE,OAAsB,EAAE,EAAE,CAC3D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;QAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;QAE7B,2EAA2E;QAC3E,MAAM,YAAY,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,IAAI,EAAE,CAAA;QAErD,yEAAyE;QACzE,wEAAwE;QACxE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,KAAK,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,qDAAqD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CACzG,CAAA;QACH,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,CAAA;QAE/F,uBAAuB;QACvB,IAAI,WAAW,GAAkB,GAAG,CAAC,kBAAkB,IAAI,IAAI,CAAA;QAC/D,IAAI,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACjE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAW,CAAC,CAAC,CAChD,CAAA;YACD,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,IAAI,IAAI,IAAI,CAAA;QACtE,CAAC;QAED,2EAA2E;QAC3E,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,GAAG,CAAC,eAAe,IAAI,IAAI,CAAA;QAEjE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAE7D,0EAA0E;QAC1E,MAAM,GAAG,GAAG,YAAY,CAAA;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE;YAC9D,WAAW,EAAE,IAAI,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,OAAO,EAAE;YAChD,KAAK,EAAE,GAAG,CAAC,WAAW,EAAE;YACxB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CACrG,CAAA;QAED,MAAM,QAAQ,GAAe;YAC3B,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,MAAM,CAAC,GAAG;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI;YACzC,SAAS,EAAE,GAAG;YACd,eAAe,EAAE,KAAK,CAAC,EAAE;YACzB,SAAS;YACT,WAAW;YACX,QAAQ;YACR,aAAa,EAAE,IAAI;SACpB,CAAA;QAED,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC/B,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAEJ,MAAM,YAAY,GAAG,CAAC,OAAqB,EAAE,KAAY,EAAE,EAAE,CAC3D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;QAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE/C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAA;QAC3E,CAAC;QAED,qEAAqE;QACrE,qEAAqE;QACrE,oCAAoC;QACpC,MAAM,GAAG,GAAG,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAA;QACxF,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAA;QAC9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAE5C,6CAA6C;QAC7C,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,CAAA;QACjE,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAA;QAC9D,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAA;QAEhC,yDAAyD;QACzD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAC3F,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACzC,CAAA;YACD,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAA;YAErC,qDAAqD;YACrD,MAAM,WAAW,GAAG,OAAO;gBACzB,CAAC,CAAC,GAAG,QAAQ,EAAE,WAAW,IAAI,EAAE,MAAM,OAAO,EAAE;gBAC/C,CAAC,CAAC,SAAS,CAAA;YAEb,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,EAAE;gBACzE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE;gBACtC,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;gBACtB,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtD,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,yBAAyB,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CACpG,CAAA;QACH,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;gBACvD,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;aACvB,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,yBAAyB,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CACpG,CAAA;QACH,CAAC;QAED,sEAAsE;QACtE,MAAM,OAAO,GAAyB,OAAO,CAAC,SAAS;YACrD,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,GAAG,IAAI,EAAE,OAAO,EAAE;YAC7G,CAAC,CAAC,IAAI,CAAA;QACR,yFAAyF;QACzF,MAAM,WAAW,GAA8B,OAAO;YACpD,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC;YACxG,CAAC,CAAC,IAAI,CAAA;QAER,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC3C,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;QAExB,OAAO;YACL,QAAQ;YACR,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,CAAC,SAAS;YAC1B,aAAa,EAAE,QAAQ,KAAK,IAAI;YAChC,WAAW;YACX,6FAA6F;YAC7F,OAAO,EAAE,WAAW,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SACpC,CAAA;IACxB,CAAC,CAAC,CAAA;IAEJ,qFAAqF;IACrF,MAAM,UAAU,GAAG,CAAC,MAAqB,EAAE,EAAE,CAC3C,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;IAE7F,kFAAkF;IAClF,oFAAoF;IACpF,iDAAiD;IACjD,MAAM,SAAS,GAAG,CAAC,MAAkB,EAAE,OAAyB,EAAE,EAAE,CAClE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,+EAA+E;QAC/E,6EAA6E;QAC7E,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,4DAA4D,EAAE,CAAC,CAC1F,CAAA;QACH,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAA;QAC9E,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,2EAA2E,EAAE,CAAC,CACzG,CAAA;QACH,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;QAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;QAE7B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAA;QAC9F,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,GAAG,CAAC,eAAe,IAAI,IAAI,CAAA;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAE7D,IAAI,cAAc,GAAG,KAAK,CAAA;QAC1B,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE;YAChD,WAAW,EAAE,IAAI,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,OAAO,EAAE;YAChD,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE;YAClC,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;YACtB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,cAAc,GAAG,IAAI,CAAA;QACvB,CAAC,CAAC,CACH,EACD,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CACvF,CAAA;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,eAAe,CACxC,MAAM,CAAC,GAAG,EACV,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,OAAO,CAChB,CAAA;QAED,OAAO;YACL,cAAc;YACd,iBAAiB,EAAE,WAAW,CAAC,IAAI,KAAK,QAAQ;YAChD,SAAS;YACT,QAAQ;SACiB,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEJ,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;QAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CACjF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACzC,CAAA;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YACtD,iDAAiD;YACjD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAA;YACtC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAClD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAA;YAC9E,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAA;YAE5E,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACtB,wDAAwD,IAAI,GAAG,CAChE,CAAA;YACH,CAAC;YAED,uBAAuB;YACvB,IAAI,mBAAmB,GAAkB,IAAI,CAAA;YAC7C,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACjE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAW,CAAC,CAAC,CAChD,CAAA;gBACD,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,IAAI,IAAI,CAAA;YACtF,CAAC;YAED,MAAM,QAAQ,GAAe;gBAC3B,MAAM,EAAE,IAAI;gBACZ,SAAS;gBACT,OAAO;gBACP,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI;gBACzC,SAAS;gBACT,eAAe,EAAE,OAAO,CAAC,EAAE;gBAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;gBACpC,WAAW,EAAE,mBAAmB;gBAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;gBAClC,aAAa,EAAE,KAAK;aACrB,CAAA;YAED,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;YAC/B,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,mEAAmE;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC,CAAA;QACtF,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;QAC3B,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,KAAK,CAAC,CAAC,QAAQ;iBACZ,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC;iBAC1D,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,EACnE,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CACjD,CAAA;QACL,CAAC;QACD,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC3C,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,CAAA;AACjG,CAAC,CAAC,CACH,CAAA"}
|
package/dist/src/tui/App.js
CHANGED
|
@@ -16,6 +16,26 @@ import { Footer, Header, TicketList } from "./components/index.js";
|
|
|
16
16
|
import { PopupInput } from "./components/PopupInput.js";
|
|
17
17
|
import { PopupMessage } from "./components/PopupMessage.js";
|
|
18
18
|
import { ThemeProvider } from "./context/theme.js";
|
|
19
|
+
// Popup lines describing a Jira worklog outcome — shows *why* a post failed so the
|
|
20
|
+
// user isn't left guessing. Shared by the stop-result and retry-result observers.
|
|
21
|
+
function worklogLines(outcome) {
|
|
22
|
+
if (outcome === null)
|
|
23
|
+
return [{ text: "Jira worklog: skipped", color: "#888888" }];
|
|
24
|
+
switch (outcome._tag) {
|
|
25
|
+
case "Posted":
|
|
26
|
+
return [{ text: "Jira worklog: saved ✓", color: "#00CC66" }];
|
|
27
|
+
case "NotLoggedIn":
|
|
28
|
+
return [
|
|
29
|
+
{ text: "Jira worklog: not logged in ✗", color: "#FF6666" },
|
|
30
|
+
{ text: "Run: jcf auth jira login", color: "#FFCC00" }
|
|
31
|
+
];
|
|
32
|
+
case "Failed":
|
|
33
|
+
return [
|
|
34
|
+
{ text: "Jira worklog: failed ✗", color: "#FF6666" },
|
|
35
|
+
{ text: outcome.message.slice(0, 48), color: "#888888" }
|
|
36
|
+
];
|
|
37
|
+
}
|
|
38
|
+
}
|
|
19
39
|
function AppContent({ onQuit }) {
|
|
20
40
|
const refresh = useAtomSet(refreshAtom);
|
|
21
41
|
const detectRunning = useAtomSet(detectRunningAtom);
|
|
@@ -80,18 +100,13 @@ function AppContent({ onQuit }) {
|
|
|
80
100
|
if (!frozenOnTimer || isStopping || AsyncResult.isWaiting(stopResult))
|
|
81
101
|
return;
|
|
82
102
|
if (AsyncResult.isSuccess(stopResult)) {
|
|
83
|
-
const
|
|
84
|
-
//
|
|
85
|
-
setRetryParams(
|
|
103
|
+
const outcome = stopResult.value.jiraWorklog;
|
|
104
|
+
// Only arm Retry for a retryable Failed — NotLoggedIn can't be fixed by retrying.
|
|
105
|
+
setRetryParams(outcome?._tag === "Failed" ? stopResult.value.worklog : null);
|
|
86
106
|
setResultMsg({
|
|
87
107
|
title: "Timer stopped",
|
|
88
|
-
lines: [
|
|
89
|
-
|
|
90
|
-
jiraOk
|
|
91
|
-
? { text: "Jira worklog: saved ✓", color: "#00CC66" }
|
|
92
|
-
: { text: "Jira worklog: failed ✗", color: "#FF6666" }
|
|
93
|
-
],
|
|
94
|
-
type: jiraOk ? "success" : "error"
|
|
108
|
+
lines: [{ text: "Clockify: saved ✓", color: "#00CC66" }, ...worklogLines(outcome)],
|
|
109
|
+
type: outcome?._tag === "Posted" ? "success" : "error"
|
|
95
110
|
});
|
|
96
111
|
}
|
|
97
112
|
else if (AsyncResult.isFailure(stopResult)) {
|
|
@@ -107,51 +122,28 @@ function AppContent({ onQuit }) {
|
|
|
107
122
|
const retryResult = useAtomValue(retryWorklogAtom);
|
|
108
123
|
useEffect(() => {
|
|
109
124
|
// Ignore the in-flight refresh; only act once the retry has settled.
|
|
110
|
-
|
|
125
|
+
// logWorklog has no error channel, so the only settled state is Success(outcome).
|
|
126
|
+
if (!isRetrying || AsyncResult.isWaiting(retryResult) || !AsyncResult.isSuccess(retryResult))
|
|
111
127
|
return;
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
type: "success"
|
|
123
|
-
});
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
// Still failing — keep retryParams so the user can try again.
|
|
127
|
-
setResultMsg({
|
|
128
|
-
title: "Timer stopped",
|
|
129
|
-
lines: [
|
|
130
|
-
{ text: "Clockify: saved ✓", color: "#00CC66" },
|
|
131
|
-
{ text: "Jira worklog: still failing ✗", color: "#FF6666" }
|
|
132
|
-
],
|
|
133
|
-
type: "error"
|
|
134
|
-
});
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
else if (AsyncResult.isFailure(retryResult)) {
|
|
138
|
-
setIsRetrying(false);
|
|
139
|
-
setResultMsg({
|
|
140
|
-
title: "Timer stopped",
|
|
141
|
-
lines: [
|
|
142
|
-
{ text: "Clockify: saved ✓", color: "#00CC66" },
|
|
143
|
-
{ text: "Jira worklog: retry failed ✗", color: "#FF6666" }
|
|
144
|
-
],
|
|
145
|
-
type: "error"
|
|
146
|
-
});
|
|
147
|
-
}
|
|
128
|
+
setIsRetrying(false);
|
|
129
|
+
const outcome = retryResult.value;
|
|
130
|
+
// Keep retryParams (and the Retry button) only while the failure stays retryable.
|
|
131
|
+
if (outcome._tag !== "Failed")
|
|
132
|
+
setRetryParams(null);
|
|
133
|
+
setResultMsg({
|
|
134
|
+
title: "Timer stopped",
|
|
135
|
+
lines: [{ text: "Clockify: saved ✓", color: "#00CC66" }, ...worklogLines(outcome)],
|
|
136
|
+
type: outcome._tag === "Posted" ? "success" : "error"
|
|
137
|
+
});
|
|
148
138
|
}, [retryResult, isRetrying]);
|
|
149
139
|
const handleRetryWorklog = useCallback(() => {
|
|
150
|
-
|
|
140
|
+
// Guard `isRetrying` too: two quick `r` presses before the state commits would
|
|
141
|
+
// otherwise fire two POSTs and double-log the worklog.
|
|
142
|
+
if (!retryParams || isRetrying)
|
|
151
143
|
return;
|
|
152
144
|
setIsRetrying(true);
|
|
153
145
|
retryWorklog(retryParams);
|
|
154
|
-
}, [retryParams, retryWorklog]);
|
|
146
|
+
}, [retryParams, isRetrying, retryWorklog]);
|
|
155
147
|
// Stop handler with comment — freeze view so popup stays visible
|
|
156
148
|
const handleStop = useCallback((comment) => {
|
|
157
149
|
setFrozenOnTimer(true); // keep big timer visible while popup shows
|
package/dist/src/tui/App.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/tui/App.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/tui/App.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { describe, expect, it } from "@effect/vitest";
|
|
2
|
+
import { deltaToApply, resolvePeriod } from "../src/cli/reconcile.js";
|
|
3
|
+
import { buildReconcileRows, combineDescriptions, localDay, parseTicketKey, stripTicketPrefix } from "../src/services/ReconcileService.js";
|
|
4
|
+
describe("parseTicketKey", () => {
|
|
5
|
+
it("parses the bracket form `[KEY] summary`", () => {
|
|
6
|
+
expect(parseTicketKey("[PROJ-12] Fix the widget")).toBe("PROJ-12");
|
|
7
|
+
});
|
|
8
|
+
it("parses the colon form `KEY: summary`", () => {
|
|
9
|
+
expect(parseTicketKey("PROJ-12: Fix the widget")).toBe("PROJ-12");
|
|
10
|
+
});
|
|
11
|
+
// A bare colon prefix that isn't a ticket key must not be mistaken for one.
|
|
12
|
+
it("does not treat arbitrary `word:` prefixes as a key", () => {
|
|
13
|
+
expect(parseTicketKey("Meeting: standup")).toBeNull();
|
|
14
|
+
});
|
|
15
|
+
it("returns null for empty / missing descriptions", () => {
|
|
16
|
+
expect(parseTicketKey("")).toBeNull();
|
|
17
|
+
expect(parseTicketKey(null)).toBeNull();
|
|
18
|
+
expect(parseTicketKey(undefined)).toBeNull();
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
describe("localDay", () => {
|
|
22
|
+
it("formats a date as local YYYY-MM-DD", () => {
|
|
23
|
+
// Construct from local components to stay timezone-independent.
|
|
24
|
+
expect(localDay(new Date(2026, 5, 23, 9, 30))).toBe("2026-06-23");
|
|
25
|
+
expect(localDay(new Date(2026, 0, 1, 0, 0))).toBe("2026-01-01");
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
describe("buildReconcileRows", () => {
|
|
29
|
+
// Multiple entries on the same (ticket, day) on one side must sum, not duplicate.
|
|
30
|
+
it("sums per (ticket, day) bucket across both sides", () => {
|
|
31
|
+
const rows = buildReconcileRows([
|
|
32
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 },
|
|
33
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 1800 }
|
|
34
|
+
], [{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 }]);
|
|
35
|
+
expect(rows).toHaveLength(1);
|
|
36
|
+
expect(rows[0]).toMatchObject({ ticketKey: "PROJ-1", day: "2026-06-23", clockifySeconds: 5400, jiraSeconds: 3600 });
|
|
37
|
+
});
|
|
38
|
+
// A bucket present on only one side still appears, with 0 on the other.
|
|
39
|
+
it("includes one-sided buckets with zero on the missing side", () => {
|
|
40
|
+
const rows = buildReconcileRows([{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 }], [{ ticketKey: "PROJ-2", day: "2026-06-24", seconds: 1800 }]);
|
|
41
|
+
expect(rows).toEqual([
|
|
42
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", clockifySeconds: 3600, jiraSeconds: 0, clockifyDescription: null },
|
|
43
|
+
{ ticketKey: "PROJ-2", day: "2026-06-24", clockifySeconds: 0, jiraSeconds: 1800, clockifyDescription: null }
|
|
44
|
+
]);
|
|
45
|
+
});
|
|
46
|
+
it("sorts by day then ticket for stable output", () => {
|
|
47
|
+
const rows = buildReconcileRows([
|
|
48
|
+
{ ticketKey: "PROJ-9", day: "2026-06-24", seconds: 60 },
|
|
49
|
+
{ ticketKey: "PROJ-2", day: "2026-06-23", seconds: 60 },
|
|
50
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 60 }
|
|
51
|
+
], []);
|
|
52
|
+
expect(rows.map((r) => `${r.day} ${r.ticketKey}`)).toEqual([
|
|
53
|
+
"2026-06-23 PROJ-1",
|
|
54
|
+
"2026-06-23 PROJ-2",
|
|
55
|
+
"2026-06-24 PROJ-9"
|
|
56
|
+
]);
|
|
57
|
+
});
|
|
58
|
+
it("returns an empty list when both sides are empty", () => {
|
|
59
|
+
expect(buildReconcileRows([], [])).toEqual([]);
|
|
60
|
+
});
|
|
61
|
+
// The Clockify description becomes the worklog comment, prefix stripped and deduped.
|
|
62
|
+
it("combines Clockify descriptions per bucket into clockifyDescription", () => {
|
|
63
|
+
const rows = buildReconcileRows([
|
|
64
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600, description: "[PROJ-1] Fix the widget" },
|
|
65
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 1800, description: "[PROJ-1] Write tests" },
|
|
66
|
+
{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 600, description: "[PROJ-1] Fix the widget" }
|
|
67
|
+
], []);
|
|
68
|
+
expect(rows[0]?.clockifyDescription).toBe("Fix the widget; Write tests");
|
|
69
|
+
});
|
|
70
|
+
it("yields a null clockifyDescription when descriptions are only the ticket prefix", () => {
|
|
71
|
+
const rows = buildReconcileRows([{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600, description: "[PROJ-1]" }], []);
|
|
72
|
+
expect(rows[0]?.clockifyDescription).toBeNull();
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
describe("stripTicketPrefix", () => {
|
|
76
|
+
it("strips the bracket and colon ticket markers", () => {
|
|
77
|
+
expect(stripTicketPrefix("[PROJ-12] Fix the widget")).toBe("Fix the widget");
|
|
78
|
+
expect(stripTicketPrefix("PROJ-12: Fix the widget")).toBe("Fix the widget");
|
|
79
|
+
});
|
|
80
|
+
it("keeps the prefix appended after a Clockify stop comment", () => {
|
|
81
|
+
expect(stripTicketPrefix("[PROJ-12] Fix the widget | extra note")).toBe("Fix the widget | extra note");
|
|
82
|
+
});
|
|
83
|
+
it("returns empty when only the marker is present", () => {
|
|
84
|
+
expect(stripTicketPrefix("[PROJ-12]")).toBe("");
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
describe("combineDescriptions", () => {
|
|
88
|
+
it("strips prefixes, dedupes, and joins with '; '", () => {
|
|
89
|
+
expect(combineDescriptions(["[A-1] one", "[A-1] two", "[A-1] one"])).toBe("one; two");
|
|
90
|
+
});
|
|
91
|
+
it("returns null when nothing meaningful remains", () => {
|
|
92
|
+
expect(combineDescriptions([null, undefined, "[A-1]", " "])).toBeNull();
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
describe("deltaToApply", () => {
|
|
96
|
+
const row = (clockifySeconds, jiraSeconds) => ({
|
|
97
|
+
ticketKey: "PROJ-1",
|
|
98
|
+
day: "2026-06-23",
|
|
99
|
+
clockifySeconds,
|
|
100
|
+
jiraSeconds,
|
|
101
|
+
clockifyDescription: null
|
|
102
|
+
});
|
|
103
|
+
it("returns the gap the target is short in the chosen direction", () => {
|
|
104
|
+
expect(deltaToApply(row(7200, 3600), "clockify-to-jira")).toBe(3600);
|
|
105
|
+
expect(deltaToApply(row(3600, 7200), "jira-to-clockify")).toBe(3600);
|
|
106
|
+
});
|
|
107
|
+
// Reconciling clockify->jira never proposes shrinking Jira when Jira already has more.
|
|
108
|
+
it("returns 0 when the target already has at least as much", () => {
|
|
109
|
+
expect(deltaToApply(row(3600, 7200), "clockify-to-jira")).toBe(0);
|
|
110
|
+
expect(deltaToApply(row(7200, 3600), "jira-to-clockify")).toBe(0);
|
|
111
|
+
});
|
|
112
|
+
// Sub-minute differences are noise (Jira floors to 60s) and must not be flagged.
|
|
113
|
+
it("ignores differences under the 60s tolerance", () => {
|
|
114
|
+
expect(deltaToApply(row(3630, 3600), "clockify-to-jira")).toBe(0);
|
|
115
|
+
expect(deltaToApply(row(3660, 3600), "clockify-to-jira")).toBe(60);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
describe("resolvePeriod", () => {
|
|
119
|
+
// A custom window is inclusive of both days → half-open [from 00:00, until+1 00:00).
|
|
120
|
+
it("builds an inclusive custom window from --since/--until", () => {
|
|
121
|
+
const period = resolvePeriod({ week: false, since: "2026-06-01", until: "2026-06-07" });
|
|
122
|
+
expect("error" in period).toBe(false);
|
|
123
|
+
if ("error" in period)
|
|
124
|
+
return;
|
|
125
|
+
expect(localDay(period.from)).toBe("2026-06-01");
|
|
126
|
+
// `to` is exclusive: the instant just before it is still 2026-06-07.
|
|
127
|
+
expect(localDay(new Date(period.to.getTime() - 1))).toBe("2026-06-07");
|
|
128
|
+
});
|
|
129
|
+
it("spans 7 local days for --week (inclusive of today)", () => {
|
|
130
|
+
const period = resolvePeriod({ week: true, since: undefined, until: undefined });
|
|
131
|
+
expect("error" in period).toBe(false);
|
|
132
|
+
if ("error" in period)
|
|
133
|
+
return;
|
|
134
|
+
const days = Math.round((period.to.getTime() - period.from.getTime()) / (24 * 60 * 60 * 1000));
|
|
135
|
+
expect(days).toBe(7);
|
|
136
|
+
});
|
|
137
|
+
it("rejects a reversed custom window", () => {
|
|
138
|
+
const period = resolvePeriod({ week: false, since: "2026-06-07", until: "2026-06-01" });
|
|
139
|
+
expect("error" in period).toBe(true);
|
|
140
|
+
});
|
|
141
|
+
it("rejects a malformed date", () => {
|
|
142
|
+
const period = resolvePeriod({ week: false, since: "june 1", until: undefined });
|
|
143
|
+
expect("error" in period).toBe(true);
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
//# sourceMappingURL=ReconcileService.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ReconcileService.test.js","sourceRoot":"","sources":["../../test/ReconcileService.test.ts"],"names":[],"mappings":"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"}
|