wherever-dev 0.24.0 → 0.25.1
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/CHANGELOG.md +23 -0
- package/dist/assistant-channels.d.ts +32 -1
- package/dist/assistant-channels.d.ts.map +1 -1
- package/dist/assistant-channels.js +57 -1
- package/dist/assistant-channels.js.map +1 -1
- package/dist/assistant-controller.d.ts +14 -0
- package/dist/assistant-controller.d.ts.map +1 -1
- package/dist/assistant-controller.js +21 -0
- package/dist/assistant-controller.js.map +1 -1
- package/dist/assistant-schedule.d.ts +42 -3
- package/dist/assistant-schedule.d.ts.map +1 -1
- package/dist/assistant-schedule.js +113 -2
- package/dist/assistant-schedule.js.map +1 -1
- package/dist/assistant-scheduler.d.ts +28 -6
- package/dist/assistant-scheduler.d.ts.map +1 -1
- package/dist/assistant-scheduler.js +59 -12
- package/dist/assistant-scheduler.js.map +1 -1
- package/dist/assistant-tools.d.ts +47 -13
- package/dist/assistant-tools.d.ts.map +1 -1
- package/dist/assistant-tools.js +37 -5
- package/dist/assistant-tools.js.map +1 -1
- package/dist/commands/config.d.ts +28 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +128 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +2 -0
- package/dist/commands/install.js.map +1 -1
- package/dist/config-dir.d.ts +13 -0
- package/dist/config-dir.d.ts.map +1 -1
- package/dist/config-dir.js +13 -0
- package/dist/config-dir.js.map +1 -1
- package/dist/index.js +167 -37
- package/dist/index.js.map +1 -1
- package/dist/protocol.d.ts +7 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/session-pool.d.ts +23 -5
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js +36 -35
- package/dist/session-pool.js.map +1 -1
- package/package.json +2 -2
- package/public/_app/immutable/chunks/{Ba0iJyN2.js → C6iQexJ-.js} +2 -2
- package/public/_app/immutable/chunks/{Ba0iJyN2.js.map → C6iQexJ-.js.map} +1 -1
- package/public/_app/immutable/chunks/Cu1cHhsx.js +2 -0
- package/public/_app/immutable/chunks/{BfCwf84t.js.map → Cu1cHhsx.js.map} +1 -1
- package/public/_app/immutable/chunks/{jBzVXpuo.js → D-x4GEMV.js} +2 -2
- package/public/_app/immutable/chunks/{jBzVXpuo.js.map → D-x4GEMV.js.map} +1 -1
- package/public/_app/immutable/entry/{app.CePvTLA2.js → app.DNzngO5O.js} +3 -3
- package/public/_app/immutable/entry/{app.CePvTLA2.js.map → app.DNzngO5O.js.map} +1 -1
- package/public/_app/immutable/entry/start.B03g92wB.js +2 -0
- package/public/_app/immutable/entry/start.B03g92wB.js.map +1 -0
- package/public/_app/immutable/nodes/{0.ydSaxbgZ.js → 0.BS7xCfzW.js} +2 -2
- package/public/_app/immutable/nodes/{0.ydSaxbgZ.js.map → 0.BS7xCfzW.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.T9BouUHS.js → 1.CkyZ98Lg.js} +2 -2
- package/public/_app/immutable/nodes/{1.T9BouUHS.js.map → 1.CkyZ98Lg.js.map} +1 -1
- package/public/_app/immutable/nodes/2.CHqhOw3H.js +124 -0
- package/public/_app/immutable/nodes/2.CHqhOw3H.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +10 -10
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/chunks/BfCwf84t.js +0 -2
- package/public/_app/immutable/entry/start.MB6ZjVGe.js +0 -2
- package/public/_app/immutable/entry/start.MB6ZjVGe.js.map +0 -1
- package/public/_app/immutable/nodes/2.D_6BVhWL.js +0 -123
- package/public/_app/immutable/nodes/2.D_6BVhWL.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# wherever-dev
|
|
2
2
|
|
|
3
|
+
## 0.25.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- e55f344: Conversation search now uses memonaut 0.4 instead of 0.1. The old range `^0.1.0` meant `<0.2.0` on a 0.x version, so it never picked up newer releases. The index schema (v1) and the transcript extraction are unchanged, so the existing `~/.local/share/memonaut/index.db` is reused as-is, with no rebuild. What changes is how contention is handled: 0.4 sets a 5 s SQLite busy timeout on every connection. The index is written concurrently by the `recall` CLI, by memonaut-pi in every agent session, and by the server's own background `index` child. Under 0.1 that child could fail silently with SQLITE_BUSY, and a `/search` read could return `status: 'error'` while another process was checkpointing the database.
|
|
8
|
+
|
|
9
|
+
## 0.25.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 7e4368f: Reading the config never writes it (ADR 0022). A missing `config.json` now simply means the built-in defaults (the same values the old starter file held, so nothing changes in effect), and the server no longer creates `~/.wherever/config.json` (or the config dir) on first run or on any later read; a read-only or absent config dir is no longer a warning. At start the server logs which config file it reads and whether it was found. Two new CLI verbs: `wherever config init` writes a starter `config.json` with the defaults (refusing, with a non-zero exit, to overwrite an existing one) and `wherever config show` prints the config path, whether the file exists and the effective config with credential values (such as `assistantTelegram.token` and `remote.token`) redacted. An existing `config.json`, including one seeded by an older release, is left untouched.
|
|
14
|
+
- 9040212: A retired assistant session is now read-only for web viewers and never blocks the current one (ADR 0020). After a reset (or a `/new` in the assistant folder), a tab still showing the old assistant session turns read-only live, with a notice that the assistant was reset and an "Open current session" button; "Continue anyway" does not lift it, and its sends are refused with a message naming the reset. The retired session no longer counts as an occupant of the assistant folder, so the new current session opens writable instead of behind the folder-conflict banner. Older assistant sessions opened from the session list are read-only the same way; sessions in `jobs/` are never retired, a terminal `pi -c` on a retired session is not blocked, and with `assistantFolder` unset nothing changes.
|
|
15
|
+
- 2b2f172: The web now reports its timezone to the assistant only when the device actually moved (ADR 0019). Each browser remembers the last zone it reported and sends a `client_timezone` report only when its zone differs, marking its first-ever report with `first: true`. The server applies a first report only when the user's timezone was not set explicitly with `assistant_set_timezone`, so reconnecting a web client no longer undoes "I'm in Tokyo", and two devices in different zones no longer keep switching the setting. A device whose zone really changes (travel with the laptop) still updates it. An older web (no `first` flag) is treated as a non-first report, and an older server simply ignores the new field.
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- f0f9301: A server whose assistant is configured but not active (the folder lock is held by another server, or could not be taken) no longer registers the `assistant_schedule_add`, `assistant_schedule_list`, `assistant_schedule_remove` and `assistant_set_timezone` tools in its sessions, and adds no timezone line: its sessions are exactly as with `assistantFolder` unset, like `assistant_notify` already was. The CLI tool-twin ops still answer the lock-state error on such a server. In the boot window before the scheduler starts, the tools on an active server now answer "still starting" instead of a misleading lock-state message.
|
|
20
|
+
- 015a70b: A disposed session pool no longer finishes its startup session-index warm-up: the late warm-up read the wherever config after shutdown, and in the test suite (where the env had been restored by then) it seeded the runner's real `~/.wherever/config.json`.
|
|
21
|
+
- 996611a: The assistant scheduler now catches up a new job's first run missed while the server was down. When it first saw each job, and when it last saw one re-enabled or its `cron` / `at` / `tz` edited, is persisted in the state dir (`assistant-first-seen.json`, never in `schedule.json`), so after a restart the normal grace rule applies to the first run too: a 9:00 reminder seen at 8:58 with the server down from 8:59 to 9:10 now fires on restart (and is skipped and recorded when the server was down past the grace window). A job hand-added while the server was down still starts from when it is first seen. A corrupt or missing file falls back to the previous behaviour with a warning.
|
|
22
|
+
- 6a36d28: Server test suite: every test file now runs with its own temp HOME and without the ambient WHEREVER_CONFIG_DIR / WHEREVER_STATE_DIR / PI_CODING_AGENT_DIR, and the run fails if the real `~/.wherever` changed, so a leaking test can no longer write into a real home (on CI or locally).
|
|
23
|
+
- 5cbe932: The static-compression test no longer depends on a web build being present: it serves a fixture through a test-only `WHEREVER_TEST_STATIC_DIR` (a no-op when unset), so the server suite passes on CI, which builds no web app.
|
|
24
|
+
- 0c39d7f: Messages dropped from the assistant session are now shown in the web, not only on channels. When a stop or a reset of the assistant session discards queued messages, every web viewer of that session (the retired one, on a reset) gets a notice listing the dropped web messages ("Stopped before it read ..." / "The assistant was reset before it read ..."), and the queued-steer badge and Cancel button clear as before. Messages a scheduled job had queued are logged rather than dropped silently; Telegram messages are still reported on Telegram only. Nothing changes for sessions outside the assistant folder, or with `assistantFolder` unset.
|
|
25
|
+
|
|
3
26
|
## 0.24.0
|
|
4
27
|
|
|
5
28
|
### Minor Changes
|
|
@@ -205,6 +205,36 @@ export declare function destinationIsChannel(destination: string | null, channel
|
|
|
205
205
|
* texts (null = not known); a record without origins attributes nothing.
|
|
206
206
|
*/
|
|
207
207
|
export declare function droppedByOrigin(dropped: DroppedMessages): Map<string, string[]>;
|
|
208
|
+
/**
|
|
209
|
+
* The dropped texts the WEB must be told about (task
|
|
210
|
+
* `web-sees-messages-dropped-from-the-assistant-session`): the web's own
|
|
211
|
+
* (`WEB_ORIGIN`) and those of no known origin. An unknown origin is reported
|
|
212
|
+
* nowhere else, and the web is where the session itself is shown, so it is
|
|
213
|
+
* the one place left that keeps such a drop from being silent. Never a text
|
|
214
|
+
* from a channel or a scheduled job.
|
|
215
|
+
*/
|
|
216
|
+
export declare function webDroppedMessages(dropped: DroppedMessages): string[];
|
|
217
|
+
/** The dropped texts a scheduled job sent (origin `schedule:<jobId>`, ADR 0014). */
|
|
218
|
+
export declare function scheduleDroppedMessages(dropped: DroppedMessages): Array<{
|
|
219
|
+
origin: string;
|
|
220
|
+
text: string;
|
|
221
|
+
}>;
|
|
222
|
+
/** The web `session_notice` naming dropped web texts (the web twin of Telegram's `formatDroppedReport`). */
|
|
223
|
+
export declare function formatWebDroppedNotice(reason: DroppedMessages['reason'], texts: string[]): string;
|
|
224
|
+
/** Where the drops the channels do not take go (the server wires these, index.ts). */
|
|
225
|
+
export interface DroppedSinks {
|
|
226
|
+
/** Tell the web viewers of `sessionFile` (a `session_notice`). */
|
|
227
|
+
notifyWebViewers(sessionFile: string, message: string): void;
|
|
228
|
+
/** Log a line (defaults to `console.log`). */
|
|
229
|
+
log?(line: string): void;
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* The rest of the controller's `onDropped`, beside `ChannelDispatcher.reportDropped`
|
|
233
|
+
* (which reports channel-origin texts to their channel): the web's texts become
|
|
234
|
+
* a notice to the session's web viewers, and a scheduled job's texts are logged,
|
|
235
|
+
* so no drop is silent. Nothing at all for a drop with neither.
|
|
236
|
+
*/
|
|
237
|
+
export declare function reportDroppedBeyondChannels(dropped: DroppedMessages, sinks: DroppedSinks): void;
|
|
208
238
|
export interface ChannelDispatcherOptions {
|
|
209
239
|
controller: ChannelControllerPort;
|
|
210
240
|
pool: ChannelPoolPort;
|
|
@@ -235,7 +265,8 @@ export declare class ChannelDispatcher {
|
|
|
235
265
|
/**
|
|
236
266
|
* The controller's `onDropped`: report each dropped message to the channel of
|
|
237
267
|
* its routing origin. Messages from the web (`none`), the scheduler or no
|
|
238
|
-
* known origin are
|
|
268
|
+
* known origin are not a channel's: `reportDroppedBeyondChannels` shows the
|
|
269
|
+
* web's (and the unknown) to the session's web viewers and logs the jobs'.
|
|
239
270
|
*/
|
|
240
271
|
reportDropped(dropped: DroppedMessages): void;
|
|
241
272
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-channels.d.ts","sourceRoot":"","sources":["../src/assistant-channels.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"assistant-channels.d.ts","sourceRoot":"","sources":["../src/assistant-channels.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
+
import { WEB_ORIGIN } from './reply-routing.js';
|
|
3
4
|
/** Why a channel's `!` / `!!` message is refused (the pool's shell path is never reached). */
|
|
4
5
|
export const CHANNEL_SHELL_REFUSAL = 'shell commands ("!") cannot be run from a channel; ask the assistant instead';
|
|
5
6
|
/** The error `assistant_notify` answers when no channel can notify. */
|
|
@@ -83,6 +84,60 @@ export function droppedByOrigin(dropped) {
|
|
|
83
84
|
add(dropped.followUp, dropped.origins?.followUp);
|
|
84
85
|
return out;
|
|
85
86
|
}
|
|
87
|
+
/** Every dropped text with its routing origin (null = not known), steering first. */
|
|
88
|
+
function droppedWithOrigins(dropped) {
|
|
89
|
+
const out = [];
|
|
90
|
+
const add = (texts, origins) => texts.forEach((text, i) => out.push({ text, origin: origins?.[i] ?? null }));
|
|
91
|
+
add(dropped.steering, dropped.origins?.steering);
|
|
92
|
+
add(dropped.followUp, dropped.origins?.followUp);
|
|
93
|
+
return out;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* The dropped texts the WEB must be told about (task
|
|
97
|
+
* `web-sees-messages-dropped-from-the-assistant-session`): the web's own
|
|
98
|
+
* (`WEB_ORIGIN`) and those of no known origin. An unknown origin is reported
|
|
99
|
+
* nowhere else, and the web is where the session itself is shown, so it is
|
|
100
|
+
* the one place left that keeps such a drop from being silent. Never a text
|
|
101
|
+
* from a channel or a scheduled job.
|
|
102
|
+
*/
|
|
103
|
+
export function webDroppedMessages(dropped) {
|
|
104
|
+
return droppedWithOrigins(dropped)
|
|
105
|
+
.filter((d) => d.origin === null || d.origin === WEB_ORIGIN)
|
|
106
|
+
.map((d) => d.text);
|
|
107
|
+
}
|
|
108
|
+
/** The dropped texts a scheduled job sent (origin `schedule:<jobId>`, ADR 0014). */
|
|
109
|
+
export function scheduleDroppedMessages(dropped) {
|
|
110
|
+
return droppedWithOrigins(dropped)
|
|
111
|
+
.filter((d) => !!d.origin && d.origin.startsWith('schedule:'))
|
|
112
|
+
.map((d) => ({ origin: d.origin, text: d.text }));
|
|
113
|
+
}
|
|
114
|
+
/** The web `session_notice` naming dropped web texts (the web twin of Telegram's `formatDroppedReport`). */
|
|
115
|
+
export function formatWebDroppedNotice(reason, texts) {
|
|
116
|
+
const n = texts.length;
|
|
117
|
+
const what = n === 1 ? 'this message' : `these ${n} messages`;
|
|
118
|
+
const it = n === 1 ? 'it' : 'them';
|
|
119
|
+
const head = reason === 'reset'
|
|
120
|
+
? `The assistant was reset before it read ${what}; send ${it} again if still needed:`
|
|
121
|
+
: `Stopped before it read ${what}; send ${it} again if still needed:`;
|
|
122
|
+
return [head, ...texts.map((t) => `• ${t}`)].join('\n');
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* The rest of the controller's `onDropped`, beside `ChannelDispatcher.reportDropped`
|
|
126
|
+
* (which reports channel-origin texts to their channel): the web's texts become
|
|
127
|
+
* a notice to the session's web viewers, and a scheduled job's texts are logged,
|
|
128
|
+
* so no drop is silent. Nothing at all for a drop with neither.
|
|
129
|
+
*/
|
|
130
|
+
export function reportDroppedBeyondChannels(dropped, sinks) {
|
|
131
|
+
const web = webDroppedMessages(dropped);
|
|
132
|
+
if (web.length > 0)
|
|
133
|
+
sinks.notifyWebViewers(dropped.sessionFile, formatWebDroppedNotice(dropped.reason, web));
|
|
134
|
+
const log = sinks.log ?? ((line) => console.log(line));
|
|
135
|
+
const what = dropped.reason === 'reset' ? 'reset' : 'aborted turn';
|
|
136
|
+
for (const { origin, text } of scheduleDroppedMessages(dropped)) {
|
|
137
|
+
const shown = text.length > 200 ? `${text.slice(0, 200)}...` : text;
|
|
138
|
+
log(`[wherever] assistant ${what} dropped the queued message of scheduled job ${origin} in ${dropped.sessionFile}: ${shown}`);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
86
141
|
export class ChannelDispatcher {
|
|
87
142
|
controller;
|
|
88
143
|
pool;
|
|
@@ -166,7 +221,8 @@ export class ChannelDispatcher {
|
|
|
166
221
|
/**
|
|
167
222
|
* The controller's `onDropped`: report each dropped message to the channel of
|
|
168
223
|
* its routing origin. Messages from the web (`none`), the scheduler or no
|
|
169
|
-
* known origin are
|
|
224
|
+
* known origin are not a channel's: `reportDroppedBeyondChannels` shows the
|
|
225
|
+
* web's (and the unknown) to the session's web viewers and logs the jobs'.
|
|
170
226
|
*/
|
|
171
227
|
reportDropped(dropped) {
|
|
172
228
|
const byOrigin = droppedByOrigin(dropped);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-channels.js","sourceRoot":"","sources":["../src/assistant-channels.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-channels.js","sourceRoot":"","sources":["../src/assistant-channels.ts"],"names":[],"mappings":"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"}
|
|
@@ -154,6 +154,20 @@ export declare class AssistantController {
|
|
|
154
154
|
private ownCreations;
|
|
155
155
|
constructor(opts: AssistantControllerOptions);
|
|
156
156
|
status(): AssistantPointerStatus;
|
|
157
|
+
/**
|
|
158
|
+
* Is this session a RETIRED assistant session (ADR 0020)? True when its cwd is
|
|
159
|
+
* the assistant folder itself (symlinks resolved; never `jobs/` or anywhere
|
|
160
|
+
* else) and it is not the current pointer session. Derived from the pointer,
|
|
161
|
+
* so it needs no state of its own and covers sessions retired before the rule
|
|
162
|
+
* existed. With no pointer yet, no session is current, so every session in
|
|
163
|
+
* the folder is retired (opening the Assistant makes one current).
|
|
164
|
+
*
|
|
165
|
+
* The server turns it into a HARD read-only verdict for web viewers and drops
|
|
166
|
+
* retired sessions from the folder-conflict occupants (index.ts).
|
|
167
|
+
*/
|
|
168
|
+
isRetired(sessionFile: string, cwd: string): boolean;
|
|
169
|
+
/** Is `cwd` the assistant folder itself (symlinks resolved; `jobs/` is not)? */
|
|
170
|
+
isFolder(cwd: string): boolean;
|
|
157
171
|
/** Every batch of dropped messages recorded so far (bounded), oldest first. */
|
|
158
172
|
droppedMessages(): DroppedMessages[];
|
|
159
173
|
/** Resolves once every queued pointer transition has run (tests, shutdown). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-controller.d.ts","sourceRoot":"","sources":["../src/assistant-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-controller.d.ts","sourceRoot":"","sources":["../src/assistant-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,27 @@ export class AssistantController {
|
|
|
58
58
|
currentSessionFile: this.pointer?.sessionFile ?? null,
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Is this session a RETIRED assistant session (ADR 0020)? True when its cwd is
|
|
63
|
+
* the assistant folder itself (symlinks resolved; never `jobs/` or anywhere
|
|
64
|
+
* else) and it is not the current pointer session. Derived from the pointer,
|
|
65
|
+
* so it needs no state of its own and covers sessions retired before the rule
|
|
66
|
+
* existed. With no pointer yet, no session is current, so every session in
|
|
67
|
+
* the folder is retired (opening the Assistant makes one current).
|
|
68
|
+
*
|
|
69
|
+
* The server turns it into a HARD read-only verdict for web viewers and drops
|
|
70
|
+
* retired sessions from the folder-conflict occupants (index.ts).
|
|
71
|
+
*/
|
|
72
|
+
isRetired(sessionFile, cwd) {
|
|
73
|
+
if (!this.isFolder(cwd))
|
|
74
|
+
return false;
|
|
75
|
+
const current = this.pointer?.sessionFile;
|
|
76
|
+
return !current || path.resolve(current) !== path.resolve(sessionFile);
|
|
77
|
+
}
|
|
78
|
+
/** Is `cwd` the assistant folder itself (symlinks resolved; `jobs/` is not)? */
|
|
79
|
+
isFolder(cwd) {
|
|
80
|
+
return isSameFolder(cwd, this.folder);
|
|
81
|
+
}
|
|
61
82
|
/** Every batch of dropped messages recorded so far (bounded), oldest first. */
|
|
62
83
|
droppedMessages() {
|
|
63
84
|
return [...this.dropped];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-controller.js","sourceRoot":"","sources":["../src/assistant-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-controller.js","sourceRoot":"","sources":["../src/assistant-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,6FAA6F;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAwB,CAAC;AAwG/D,oFAAoF;AACpF,MAAM,YAAY,GAAG,EAAE,CAAC;AAcxB,MAAM,OAAO,mBAAmB;IACb,IAAI,CAAoB;IACxB,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,QAAQ,CAA4C;IACpD,SAAS,CAAsC;IACxD,OAAO,CAAoD;IAC3D,OAAO,GAAsB,EAAE,CAAC;IAChC,KAAK,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;IACpD;;;;;OAKG;IACK,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEzC,YAAY,IAAgC;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,OAAO;YACL,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI;YACjD,kBAAkB,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,IAAI;SACtD,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,SAAS,CAAC,WAAmB,EAAE,GAAW;QACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;QAC1C,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,CAAC;IAED,gFAAgF;IAChF,QAAQ,CAAC,GAAW;QAClB,OAAO,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,+EAA+E;IAC/E,eAAe;QACb,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,+EAA+E;IAC/E,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CACpB,GAAG,EAAE,GAAE,CAAC,EACR,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,WAAmB,EAAE,GAAW;QACnD,wEAAwE;QACxE,sDAAsD;QACtD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC;gBAAE,OAAO;YAClD,IAAI,IAAI,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW;gBAAE,OAAO;YACtD,IAAI,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC;YACrE,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,qDAAqD,WAAW,KAAK,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxG,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,MAAuB,EAAE,iBAAwC,EAAE,IAA2B;QACrH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YACvC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK;gBAAE,OAAO,CAAC,CAAC;YAC5B,kEAAkE;YAClE,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,iBAAiB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACxE,IAAI,CAAC;YACH,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;QACnG,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,4CAA4C,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAChG,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;QACvC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QACxD,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;OASG;IACH,eAAe,CAAC,WAAmB;QACjC,IAAI,IAAI,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC;QAC3D,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,4EAA4E;IAEpE,MAAM,CAAI,EAAoB;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,QAAQ;gBAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC7F,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7G,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/G,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,wCAAwC,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QACvD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACnC,qEAAqE;QACrE,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,GAAG;YAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;QACrG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACzC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IACzC,CAAC;IAED,gGAAgG;IACxF,KAAK,CAAC,MAAM,CAAC,WAAmB;QACtC,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;gBAAE,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,kCAAkC,WAAW,qBAAqB,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,wGAAwG;IAChG,cAAc,CAAC,WAAmB,EAAE,MAAiC;QAC3E,IAAI,OAAO,GAAyD,IAAI,CAAC;QACzE,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,+CAA+C,WAAW,KAAK,MAAM,aAAa,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrH,CAAC;QACD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9F,MAAM,MAAM,GAAoB;YAC9B,WAAW;YACX,MAAM;YACN,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC/B,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,OAAO;gBACjB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACnG,CAAC,CAAC,EAAE,CAAC;YACP,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAC7B,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY;YAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;QACnG,OAAO,CAAC,GAAG,CACT,wBAAwB,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,YAAY,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,yBAAyB,WAAW,EAAE,CACvK,CAAC;QACF,IAAI,CAAC;YACH,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,2CAA2C,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,WAAW,CAAC,WAAmB,EAAE,SAAiB;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;QAC3C,IAAI,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,KAAK,SAAS;YAAE,OAAO;QAC9E,IAAI,QAAQ,IAAI,QAAQ,KAAK,WAAW;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAClC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,0CAA0C,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,WAAW;QACjB,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC;YACH,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA2B,CAAC;YACtD,IAAI,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC;YACvF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC;YACxD,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC7G,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,2DAA2D,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,4GAA4G;IACpG,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAC1B,MAAM,GAAG,GAAkB;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACrC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,sBAAsB,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;QAC5E,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACvC,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;YACnE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,wDAAwD,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9G,IAAI,CAAC;gBACH,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;IACH,CAAC;CACF;AAED,SAAS,UAAU,CAAC,GAAY;IAC9B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -3,8 +3,9 @@ import { type CronSpec, type ParsedAt } from './assistant-cron.js';
|
|
|
3
3
|
* The assistant's SCHEDULE (spec `assistant-session-and-channels`, ADR 0015):
|
|
4
4
|
* the job format and its validation, the pure next-run planner, the store that
|
|
5
5
|
* reads and writes `<assistantFolder>/schedule.json`, the append-only run log
|
|
6
|
-
* `<stateDir>/assistant-runs.jsonl`,
|
|
7
|
-
* `<stateDir>/assistant-timezone.json
|
|
6
|
+
* `<stateDir>/assistant-runs.jsonl`, the user's timezone state
|
|
7
|
+
* `<stateDir>/assistant-timezone.json`, and when each job was first seen
|
|
8
|
+
* `<stateDir>/assistant-first-seen.json`. The firing loop is
|
|
8
9
|
* `assistant-scheduler.ts`.
|
|
9
10
|
*
|
|
10
11
|
* Intent vs run state (ADR 0015): `schedule.json` holds only what the user (or
|
|
@@ -22,6 +23,7 @@ import { type CronSpec, type ParsedAt } from './assistant-cron.js';
|
|
|
22
23
|
export declare const SCHEDULE_FILE = "schedule.json";
|
|
23
24
|
export declare const RUN_LOG_FILE = "assistant-runs.jsonl";
|
|
24
25
|
export declare const TIMEZONE_FILE = "assistant-timezone.json";
|
|
26
|
+
export declare const FIRST_SEEN_FILE = "assistant-first-seen.json";
|
|
25
27
|
/** Default restart grace window: a missed run is caught up only if it is this recent. */
|
|
26
28
|
export declare const DEFAULT_GRACE_MS: number;
|
|
27
29
|
export type JobMode = 'inline' | 'isolated';
|
|
@@ -143,7 +145,7 @@ export interface PlanOptions {
|
|
|
143
145
|
/**
|
|
144
146
|
* Occurrences at or before this instant are never "missed". The scheduler sets
|
|
145
147
|
* it to when it first saw the job (a job with no run yet) or when it last saw
|
|
146
|
-
* the job re-enabled or edited, so a job that never existed (or was off) for a
|
|
148
|
+
* the job re-enabled or edited (both persisted, `FirstSeenStore`), so a job that never existed (or was off) for a
|
|
147
149
|
* past occurrence does not catch up on it. Undefined with no run yet = now.
|
|
148
150
|
*/
|
|
149
151
|
since?: number;
|
|
@@ -228,9 +230,46 @@ export declare class UserTimezone {
|
|
|
228
230
|
constructor(stateDir: string, systemTz?: string);
|
|
229
231
|
get(): string;
|
|
230
232
|
history(): readonly TimezoneChange[];
|
|
233
|
+
/** Who set the current zone: the latest history entry's `source` (null when the history is empty). */
|
|
234
|
+
source(): string | null;
|
|
231
235
|
/** Change it. Throws on an unknown zone; resolves false (nothing written) when unchanged. */
|
|
232
236
|
set(timezone: string, source: string): boolean;
|
|
233
237
|
private load;
|
|
234
238
|
private write;
|
|
235
239
|
}
|
|
240
|
+
/** A job's time spec as compared for "edited": `[cron, at, tz]`, null when unset. */
|
|
241
|
+
export type JobTimeSpec = [string | null, string | null, string | null];
|
|
242
|
+
export declare function jobTimeSpec(job: ScheduleJob): JobTimeSpec;
|
|
243
|
+
/** The base the scheduler measures a job's missed runs from, when it has no newer run entry. */
|
|
244
|
+
export interface SeenJob {
|
|
245
|
+
/** When the scheduler first saw the job (ms). */
|
|
246
|
+
firstSeen: number;
|
|
247
|
+
/** Its `enabled` the last time it was seen. */
|
|
248
|
+
enabled: boolean;
|
|
249
|
+
/** Its time spec the last time it was seen. */
|
|
250
|
+
spec: JobTimeSpec;
|
|
251
|
+
/** When it was last seen re-enabled or with its time spec edited (ms). */
|
|
252
|
+
changedAt?: number;
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* `<stateDir>/assistant-first-seen.json` = `{ "jobs": { "<id>": { firstSeen,
|
|
256
|
+
* enabled, spec, changedAt? } } }` (times ISO): when the scheduler first saw
|
|
257
|
+
* each job, and when it last saw one re-enabled or its `cron` / `at` / `tz`
|
|
258
|
+
* edited. Persisting it lets a brand-new job's first run, missed while the
|
|
259
|
+
* server was down, be caught up by the normal grace rule (task
|
|
260
|
+
* `scheduler-catches-up-a-missed-first-run`, reversing the accepted cost of
|
|
261
|
+
* `assistant-scheduler` decision 4). Server state, never in `schedule.json`.
|
|
262
|
+
*
|
|
263
|
+
* A missing file is empty (first start). A file or entry that does not parse is
|
|
264
|
+
* logged as a warning and ignored, so those jobs count from when they are seen
|
|
265
|
+
* now (the behaviour before this file existed) and every valid job still runs;
|
|
266
|
+
* the next save replaces it. Saved atomically (temp file + rename), like the
|
|
267
|
+
* timezone state.
|
|
268
|
+
*/
|
|
269
|
+
export declare class FirstSeenStore {
|
|
270
|
+
readonly filePath: string;
|
|
271
|
+
constructor(stateDir: string);
|
|
272
|
+
load(): Map<string, SeenJob>;
|
|
273
|
+
save(seen: ReadonlyMap<string, SeenJob>): void;
|
|
274
|
+
}
|
|
236
275
|
//# sourceMappingURL=assistant-schedule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-schedule.d.ts","sourceRoot":"","sources":["../src/assistant-schedule.ts"],"names":[],"mappings":"AAGA,OAAO,EAQL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,qBAAqB,CAAC;AAE7B
|
|
1
|
+
{"version":3,"file":"assistant-schedule.d.ts","sourceRoot":"","sources":["../src/assistant-schedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,9 @@ import { atToInstant, isValidTimeZone, nextCronRun, parseAtString, parseCron, pr
|
|
|
6
6
|
* The assistant's SCHEDULE (spec `assistant-session-and-channels`, ADR 0015):
|
|
7
7
|
* the job format and its validation, the pure next-run planner, the store that
|
|
8
8
|
* reads and writes `<assistantFolder>/schedule.json`, the append-only run log
|
|
9
|
-
* `<stateDir>/assistant-runs.jsonl`,
|
|
10
|
-
* `<stateDir>/assistant-timezone.json
|
|
9
|
+
* `<stateDir>/assistant-runs.jsonl`, the user's timezone state
|
|
10
|
+
* `<stateDir>/assistant-timezone.json`, and when each job was first seen
|
|
11
|
+
* `<stateDir>/assistant-first-seen.json`. The firing loop is
|
|
11
12
|
* `assistant-scheduler.ts`.
|
|
12
13
|
*
|
|
13
14
|
* Intent vs run state (ADR 0015): `schedule.json` holds only what the user (or
|
|
@@ -25,6 +26,7 @@ import { atToInstant, isValidTimeZone, nextCronRun, parseAtString, parseCron, pr
|
|
|
25
26
|
export const SCHEDULE_FILE = 'schedule.json';
|
|
26
27
|
export const RUN_LOG_FILE = 'assistant-runs.jsonl';
|
|
27
28
|
export const TIMEZONE_FILE = 'assistant-timezone.json';
|
|
29
|
+
export const FIRST_SEEN_FILE = 'assistant-first-seen.json';
|
|
28
30
|
/** Default restart grace window: a missed run is caught up only if it is this recent. */
|
|
29
31
|
export const DEFAULT_GRACE_MS = 60 * 60 * 1000;
|
|
30
32
|
const isNonEmptyString = (v) => typeof v === 'string' && v.trim() !== '';
|
|
@@ -407,6 +409,10 @@ export class UserTimezone {
|
|
|
407
409
|
history() {
|
|
408
410
|
return this.state.history;
|
|
409
411
|
}
|
|
412
|
+
/** Who set the current zone: the latest history entry's `source` (null when the history is empty). */
|
|
413
|
+
source() {
|
|
414
|
+
return this.state.history.at(-1)?.source ?? null;
|
|
415
|
+
}
|
|
410
416
|
/** Change it. Throws on an unknown zone; resolves false (nothing written) when unchanged. */
|
|
411
417
|
set(timezone, source) {
|
|
412
418
|
if (!isValidTimeZone(timezone))
|
|
@@ -451,4 +457,109 @@ export class UserTimezone {
|
|
|
451
457
|
}
|
|
452
458
|
}
|
|
453
459
|
}
|
|
460
|
+
export function jobTimeSpec(job) {
|
|
461
|
+
return [job.cron ?? null, job.at ?? null, job.tz ?? null];
|
|
462
|
+
}
|
|
463
|
+
/**
|
|
464
|
+
* `<stateDir>/assistant-first-seen.json` = `{ "jobs": { "<id>": { firstSeen,
|
|
465
|
+
* enabled, spec, changedAt? } } }` (times ISO): when the scheduler first saw
|
|
466
|
+
* each job, and when it last saw one re-enabled or its `cron` / `at` / `tz`
|
|
467
|
+
* edited. Persisting it lets a brand-new job's first run, missed while the
|
|
468
|
+
* server was down, be caught up by the normal grace rule (task
|
|
469
|
+
* `scheduler-catches-up-a-missed-first-run`, reversing the accepted cost of
|
|
470
|
+
* `assistant-scheduler` decision 4). Server state, never in `schedule.json`.
|
|
471
|
+
*
|
|
472
|
+
* A missing file is empty (first start). A file or entry that does not parse is
|
|
473
|
+
* logged as a warning and ignored, so those jobs count from when they are seen
|
|
474
|
+
* now (the behaviour before this file existed) and every valid job still runs;
|
|
475
|
+
* the next save replaces it. Saved atomically (temp file + rename), like the
|
|
476
|
+
* timezone state.
|
|
477
|
+
*/
|
|
478
|
+
export class FirstSeenStore {
|
|
479
|
+
filePath;
|
|
480
|
+
constructor(stateDir) {
|
|
481
|
+
this.filePath = path.join(stateDir, FIRST_SEEN_FILE);
|
|
482
|
+
}
|
|
483
|
+
load() {
|
|
484
|
+
const out = new Map();
|
|
485
|
+
let raw;
|
|
486
|
+
try {
|
|
487
|
+
raw = fs.readFileSync(this.filePath, 'utf8');
|
|
488
|
+
}
|
|
489
|
+
catch (err) {
|
|
490
|
+
if (err.code !== 'ENOENT')
|
|
491
|
+
warnFirstSeen(`${this.filePath} is unreadable (${err.message}); jobs count from now`);
|
|
492
|
+
return out;
|
|
493
|
+
}
|
|
494
|
+
let doc;
|
|
495
|
+
try {
|
|
496
|
+
doc = JSON.parse(raw);
|
|
497
|
+
}
|
|
498
|
+
catch (err) {
|
|
499
|
+
warnFirstSeen(`${this.filePath} is not valid JSON (${err.message}); jobs count from now`);
|
|
500
|
+
return out;
|
|
501
|
+
}
|
|
502
|
+
const jobs = doc?.jobs;
|
|
503
|
+
if (!isPlainObject(jobs)) {
|
|
504
|
+
warnFirstSeen(`${this.filePath} has no "jobs" object; jobs count from now`);
|
|
505
|
+
return out;
|
|
506
|
+
}
|
|
507
|
+
for (const [id, value] of Object.entries(jobs)) {
|
|
508
|
+
const entry = parseSeenEntry(value);
|
|
509
|
+
if (entry)
|
|
510
|
+
out.set(id, entry);
|
|
511
|
+
else
|
|
512
|
+
warnFirstSeen(`${this.filePath}: the entry for job ${JSON.stringify(id)} is malformed and ignored; it counts from now`);
|
|
513
|
+
}
|
|
514
|
+
return out;
|
|
515
|
+
}
|
|
516
|
+
save(seen) {
|
|
517
|
+
const jobs = {};
|
|
518
|
+
for (const [id, s] of seen) {
|
|
519
|
+
jobs[id] = {
|
|
520
|
+
firstSeen: new Date(s.firstSeen).toISOString(),
|
|
521
|
+
enabled: s.enabled,
|
|
522
|
+
spec: s.spec,
|
|
523
|
+
...(s.changedAt !== undefined ? { changedAt: new Date(s.changedAt).toISOString() } : {}),
|
|
524
|
+
};
|
|
525
|
+
}
|
|
526
|
+
const dir = path.dirname(this.filePath);
|
|
527
|
+
const tmp = path.join(dir, `.${FIRST_SEEN_FILE}.${process.pid}.tmp`);
|
|
528
|
+
try {
|
|
529
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
530
|
+
fs.writeFileSync(tmp, JSON.stringify({ jobs }, null, 2) + '\n', 'utf8');
|
|
531
|
+
fs.renameSync(tmp, this.filePath);
|
|
532
|
+
}
|
|
533
|
+
catch (err) {
|
|
534
|
+
console.error(`[wherever] assistant scheduler: could not write ${this.filePath}: ${err.message}`);
|
|
535
|
+
try {
|
|
536
|
+
fs.rmSync(tmp, { force: true });
|
|
537
|
+
}
|
|
538
|
+
catch { }
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
}
|
|
542
|
+
function warnFirstSeen(message) {
|
|
543
|
+
console.warn(`[wherever] assistant scheduler: ${message}`);
|
|
544
|
+
}
|
|
545
|
+
function isPlainObject(v) {
|
|
546
|
+
return typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
547
|
+
}
|
|
548
|
+
function parseSeenEntry(v) {
|
|
549
|
+
if (!isPlainObject(v))
|
|
550
|
+
return null;
|
|
551
|
+
const firstSeen = typeof v.firstSeen === 'string' ? Date.parse(v.firstSeen) : NaN;
|
|
552
|
+
if (!Number.isFinite(firstSeen) || typeof v.enabled !== 'boolean')
|
|
553
|
+
return null;
|
|
554
|
+
const spec = v.spec;
|
|
555
|
+
if (!Array.isArray(spec) || spec.length !== 3 || !spec.every((x) => x === null || typeof x === 'string'))
|
|
556
|
+
return null;
|
|
557
|
+
let changedAt;
|
|
558
|
+
if (v.changedAt !== undefined) {
|
|
559
|
+
changedAt = typeof v.changedAt === 'string' ? Date.parse(v.changedAt) : NaN;
|
|
560
|
+
if (!Number.isFinite(changedAt))
|
|
561
|
+
return null;
|
|
562
|
+
}
|
|
563
|
+
return { firstSeen, enabled: v.enabled, spec: spec, ...(changedAt !== undefined ? { changedAt } : {}) };
|
|
564
|
+
}
|
|
454
565
|
//# sourceMappingURL=assistant-schedule.js.map
|