@songsid/agend 2.3.4-beta.7 → 2.3.4-beta.9
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/THIRD_PARTY_NOTICES.md +37 -0
- package/dist/agent-cli-instructions.md +1 -1
- package/dist/agent-credentials.d.ts +24 -0
- package/dist/agent-credentials.js +66 -0
- package/dist/agent-credentials.js.map +1 -0
- package/dist/agent-endpoint.d.ts +3 -1
- package/dist/agent-endpoint.js +13 -0
- package/dist/agent-endpoint.js.map +1 -1
- package/dist/authority/session-authorizations.d.ts +28 -4
- package/dist/authority/session-authorizations.js +63 -17
- package/dist/authority/session-authorizations.js.map +1 -1
- package/dist/backend/antigravity.js +3 -1
- package/dist/backend/antigravity.js.map +1 -1
- package/dist/backend/codex-footer-hints.d.ts +4 -0
- package/dist/backend/codex-footer-hints.js +27 -0
- package/dist/backend/codex-footer-hints.js.map +1 -0
- package/dist/backend/codex.js +8 -3
- package/dist/backend/codex.js.map +1 -1
- package/dist/backend/kiro.d.ts +3 -0
- package/dist/backend/kiro.js +39 -1
- package/dist/backend/kiro.js.map +1 -1
- package/dist/backend/muse.js +5 -3
- package/dist/backend/muse.js.map +1 -1
- package/dist/backend/types.d.ts +6 -1
- package/dist/backend/types.js +3 -0
- package/dist/backend/types.js.map +1 -1
- package/dist/cache-ledger.d.ts +85 -0
- package/dist/cache-ledger.js +236 -1
- package/dist/cache-ledger.js.map +1 -1
- package/dist/cache-service.d.ts +5 -0
- package/dist/cache-service.js +16 -4
- package/dist/cache-service.js.map +1 -1
- package/dist/channel/adapters/discord.js +11 -3
- package/dist/channel/adapters/discord.js.map +1 -1
- package/dist/channel/adapters/telegram.js +4 -3
- package/dist/channel/adapters/telegram.js.map +1 -1
- package/dist/channel/mcp-tools.js +1 -1
- package/dist/channel/mcp-tools.js.map +1 -1
- package/dist/cross-instance-notice.d.ts +10 -0
- package/dist/cross-instance-notice.js +67 -5
- package/dist/cross-instance-notice.js.map +1 -1
- package/dist/daemon.d.ts +43 -0
- package/dist/daemon.js +361 -17
- package/dist/daemon.js.map +1 -1
- package/dist/delivery-consumed-watch.d.ts +23 -1
- package/dist/delivery-consumed-watch.js +30 -3
- package/dist/delivery-consumed-watch.js.map +1 -1
- package/dist/delivery-reconciliation.d.ts +7 -0
- package/dist/delivery-reconciliation.js +9 -1
- package/dist/delivery-reconciliation.js.map +1 -1
- package/dist/export-import.d.ts +7 -0
- package/dist/export-import.js +44 -10
- package/dist/export-import.js.map +1 -1
- package/dist/fleet-context.d.ts +2 -0
- package/dist/fleet-manager.d.ts +85 -4
- package/dist/fleet-manager.js +375 -30
- package/dist/fleet-manager.js.map +1 -1
- package/dist/general-knowledge/skills/concepts/SKILL.md +390 -0
- package/dist/general-knowledge/skills/cross-instance-messaging/SKILL.md +1 -0
- package/dist/general-knowledge/skills/instance-lifecycle/SKILL.md +3 -1
- package/dist/general-knowledge/skills/kiro-engine-migration/SKILL.md +41 -4
- package/dist/general-knowledge/skills/worker-collaboration/SKILL.md +1 -1
- package/dist/instance-lifecycle.d.ts +8 -2
- package/dist/instance-lifecycle.js +37 -6
- package/dist/instance-lifecycle.js.map +1 -1
- package/dist/instance-topic-delete.d.ts +77 -0
- package/dist/instance-topic-delete.js +123 -0
- package/dist/instance-topic-delete.js.map +1 -0
- package/dist/instructions.d.ts +1 -1
- package/dist/instructions.js +1 -1
- package/dist/instructions.js.map +1 -1
- package/dist/kiro-engine-status.d.ts +11 -0
- package/dist/kiro-engine-status.js +6 -0
- package/dist/kiro-engine-status.js.map +1 -1
- package/dist/locale.js +47 -1
- package/dist/locale.js.map +1 -1
- package/dist/log-steps.d.ts +4 -3
- package/dist/log-steps.js +32 -7
- package/dist/log-steps.js.map +1 -1
- package/dist/login-flows.d.ts +2 -0
- package/dist/login-flows.js +5 -2
- package/dist/login-flows.js.map +1 -1
- package/dist/needs-you-hub.js +1 -1
- package/dist/needs-you-hub.js.map +1 -1
- package/dist/needs-you.d.ts +6 -0
- package/dist/needs-you.js +8 -2
- package/dist/needs-you.js.map +1 -1
- package/dist/outbound-handlers.js +3 -3
- package/dist/outbound-handlers.js.map +1 -1
- package/dist/outbound-schemas.js +5 -2
- package/dist/outbound-schemas.js.map +1 -1
- package/dist/queued-handoffs.d.ts +33 -0
- package/dist/queued-handoffs.js +75 -0
- package/dist/queued-handoffs.js.map +1 -0
- package/dist/scheduler/db.d.ts +2 -1
- package/dist/scheduler/db.js +23 -9
- package/dist/scheduler/db.js.map +1 -1
- package/dist/settings-api.d.ts +13 -0
- package/dist/settings-api.js +12 -1
- package/dist/settings-api.js.map +1 -1
- package/dist/tool-permissions.d.ts +5 -2
- package/dist/tool-permissions.js +6 -5
- package/dist/tool-permissions.js.map +1 -1
- package/dist/tool-progress.d.ts +2 -0
- package/dist/tool-progress.js +19 -3
- package/dist/tool-progress.js.map +1 -1
- package/dist/topic-commands.js +4 -0
- package/dist/topic-commands.js.map +1 -1
- package/dist/ui/chat-strings.js +2 -2
- package/dist/ui/fleet-usage.js +90 -27
- package/dist/ui/panel-chat.js +2 -0
- package/dist/ui/panel-needs.js +4 -3
- package/dist/ui/settings-strings.js +2 -2
- package/dist/ui/shared/app-i18n.js +2 -2
- package/dist/ui/shared/app-needs.js +1 -1
- package/dist/ui/shared/app.css +15 -0
- package/dist/ui/shared/usage-dialog.js +18 -1
- package/dist/ui/shared/view-strings.js +16 -0
- package/dist/usage/capacity.d.ts +69 -0
- package/dist/usage/capacity.js +119 -0
- package/dist/usage/capacity.js.map +1 -0
- package/dist/usage/i18n-keys.d.ts +1 -1
- package/dist/usage/i18n-keys.js +3 -0
- package/dist/usage/i18n-keys.js.map +1 -1
- package/dist/usage/profile-timeline.d.ts +16 -0
- package/dist/usage/profile-timeline.js +58 -0
- package/dist/usage/profile-timeline.js.map +1 -0
- package/dist/usage/quota-history.d.ts +43 -0
- package/dist/usage/quota-history.js +168 -0
- package/dist/usage/quota-history.js.map +1 -0
- package/dist/usage/usage-api.d.ts +31 -0
- package/dist/usage/usage-api.js +80 -1
- package/dist/usage/usage-api.js.map +1 -1
- package/dist/usage-report.d.ts +25 -1
- package/dist/usage-report.js +55 -4
- package/dist/usage-report.js.map +1 -1
- package/dist/usage-rollup.d.ts +4 -1
- package/dist/usage-rollup.js +12 -3
- package/dist/usage-rollup.js.map +1 -1
- package/dist/web-api.d.ts +6 -0
- package/dist/web-api.js +8 -2
- package/dist/web-api.js.map +1 -1
- package/dist/web-session-authorization.d.ts +13 -2
- package/dist/web-session-authorization.js +10 -3
- package/dist/web-session-authorization.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,6 +16,12 @@ export declare const CONSUMED_WATCH: {
|
|
|
16
16
|
maxTickMs: number;
|
|
17
17
|
/** A watch ends after this long (monotonic) whatever it saw. */
|
|
18
18
|
lifetimeMs: number;
|
|
19
|
+
/**
|
|
20
|
+
* #3030: a watch that can tell when its CLI went idle ends "not taken" once the CLI has stayed idle this long with
|
|
21
|
+
* the whole transcript read and no consumed marker: a queued message is submitted when the turn ends, so an idle CLI
|
|
22
|
+
* that still has not written it did not take it.
|
|
23
|
+
*/
|
|
24
|
+
notTakenIdleMs: number;
|
|
19
25
|
};
|
|
20
26
|
export interface ConsumedWatchTarget {
|
|
21
27
|
deliveryId: string;
|
|
@@ -27,13 +33,24 @@ export interface ConsumedWatchTarget {
|
|
|
27
33
|
current(): boolean;
|
|
28
34
|
/** The hit: record it (the outbox decides what it changes). */
|
|
29
35
|
consumed(via: ConsumedVia, evidence: string): void;
|
|
36
|
+
/** #3030: the leading marker to look for; default the delivery's own `[agend-delivery-id:<deliveryId>]`. */
|
|
37
|
+
marker?: string;
|
|
38
|
+
/**
|
|
39
|
+
* #3030: how long (ms, monotonic) the CLI has been idle without a break, or null while it is busy or unknown. With
|
|
40
|
+
* `notTaken`, an idle stretch of CONSUMED_WATCH.notTakenIdleMs after the transcript was read to its end, and no
|
|
41
|
+
* consumed marker, ends the watch "not-taken".
|
|
42
|
+
*/
|
|
43
|
+
idleForMs?(): number | null;
|
|
44
|
+
notTaken?(): void;
|
|
45
|
+
/** How long this watch lives (monotonic); default CONSUMED_WATCH.lifetimeMs. */
|
|
46
|
+
lifetimeMs?: number;
|
|
30
47
|
logger?: {
|
|
31
48
|
info(obj: unknown, msg?: string): void;
|
|
32
49
|
warn(obj: unknown, msg?: string): void;
|
|
33
50
|
debug?(obj: unknown, msg?: string): void;
|
|
34
51
|
};
|
|
35
52
|
}
|
|
36
|
-
type Ended = "consumed" | "fenced" | "unavailable" | "expired" | "stopped";
|
|
53
|
+
type Ended = "consumed" | "fenced" | "unavailable" | "expired" | "stopped" | "not-taken";
|
|
37
54
|
/** One attempt's watch. Exported for its tests; the fleet starts watches through ConsumedWatchRegistry. */
|
|
38
55
|
export declare class ConsumedWatch {
|
|
39
56
|
private readonly target;
|
|
@@ -63,6 +80,11 @@ export declare class ConsumedWatch {
|
|
|
63
80
|
* (stop, pause, respawn) or its lifetime over ends it — a read that returns after any of those proves nothing.
|
|
64
81
|
*/
|
|
65
82
|
private stillLive;
|
|
83
|
+
/**
|
|
84
|
+
* #3030: the transcript is read to its end, nothing consumed it, and the CLI has stayed idle long enough: not taken.
|
|
85
|
+
* The idle stretch is asked last, with every read already done — a turn that started meanwhile writes first.
|
|
86
|
+
*/
|
|
87
|
+
private notTakenNow;
|
|
66
88
|
/** One bounded look. Never throws; every outcome either schedules the next look or ends the watch. */
|
|
67
89
|
look(): Promise<void>;
|
|
68
90
|
/**
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import { open, stat } from "node:fs/promises";
|
|
22
22
|
import { performance } from "node:perf_hooks";
|
|
23
|
-
import { transcriptDeltaDeliveryMarker } from "./delivery-reconciliation.js";
|
|
23
|
+
import { transcriptDeltaDeliveryMarker, transcriptDeltaMarkerKind } from "./delivery-reconciliation.js";
|
|
24
24
|
import { measureSyncWork } from "./sync-work-attribution.js";
|
|
25
25
|
export const CONSUMED_WATCH = {
|
|
26
26
|
/** Watches alive at once across the fleet. */
|
|
@@ -39,6 +39,12 @@ export const CONSUMED_WATCH = {
|
|
|
39
39
|
maxTickMs: 60_000,
|
|
40
40
|
/** A watch ends after this long (monotonic) whatever it saw. */
|
|
41
41
|
lifetimeMs: 30 * 60_000,
|
|
42
|
+
/**
|
|
43
|
+
* #3030: a watch that can tell when its CLI went idle ends "not taken" once the CLI has stayed idle this long with
|
|
44
|
+
* the whole transcript read and no consumed marker: a queued message is submitted when the turn ends, so an idle CLI
|
|
45
|
+
* that still has not written it did not take it.
|
|
46
|
+
*/
|
|
47
|
+
notTakenIdleMs: 90_000,
|
|
42
48
|
};
|
|
43
49
|
/** One attempt's watch. Exported for its tests; the fleet starts watches through ConsumedWatchRegistry. */
|
|
44
50
|
export class ConsumedWatch {
|
|
@@ -92,12 +98,26 @@ export class ConsumedWatch {
|
|
|
92
98
|
this.end("fenced");
|
|
93
99
|
return false;
|
|
94
100
|
}
|
|
95
|
-
if (performance.now() - this.startedAt >= CONSUMED_WATCH.lifetimeMs) {
|
|
101
|
+
if (performance.now() - this.startedAt >= (this.target.lifetimeMs ?? CONSUMED_WATCH.lifetimeMs)) {
|
|
96
102
|
this.end("expired");
|
|
97
103
|
return false;
|
|
98
104
|
}
|
|
99
105
|
return true;
|
|
100
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* #3030: the transcript is read to its end, nothing consumed it, and the CLI has stayed idle long enough: not taken.
|
|
109
|
+
* The idle stretch is asked last, with every read already done — a turn that started meanwhile writes first.
|
|
110
|
+
*/
|
|
111
|
+
notTakenNow() {
|
|
112
|
+
if (!this.target.notTaken || !this.target.idleForMs)
|
|
113
|
+
return false;
|
|
114
|
+
const idle = this.target.idleForMs();
|
|
115
|
+
if (idle === null || idle < CONSUMED_WATCH.notTakenIdleMs)
|
|
116
|
+
return false;
|
|
117
|
+
this.target.notTaken();
|
|
118
|
+
this.end("not-taken");
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
101
121
|
/** One bounded look. Never throws; every outcome either schedules the next look or ends the watch. */
|
|
102
122
|
async look() {
|
|
103
123
|
if (this.ended)
|
|
@@ -117,6 +137,8 @@ export class ConsumedWatch {
|
|
|
117
137
|
if (size < this.offset)
|
|
118
138
|
return this.end("unavailable"); // rotated or truncated below our offset
|
|
119
139
|
if (size === this.offset) {
|
|
140
|
+
if (this.carry.length === 0 && this.notTakenNow())
|
|
141
|
+
return;
|
|
120
142
|
if (++this.idleLooks >= CONSUMED_WATCH.idleLooksBeforeBackoff) {
|
|
121
143
|
this.idleLooks = 0;
|
|
122
144
|
this.interval = Math.min(this.interval * 2, CONSUMED_WATCH.maxTickMs);
|
|
@@ -136,6 +158,8 @@ export class ConsumedWatch {
|
|
|
136
158
|
this.target.consumed(found.via, found.evidence);
|
|
137
159
|
return this.end("consumed");
|
|
138
160
|
}
|
|
161
|
+
if (this.offset >= size && this.carry.length === 0 && this.notTakenNow())
|
|
162
|
+
return;
|
|
139
163
|
this.schedule(this.offset < size ? CONSUMED_WATCH.catchUpMs : this.interval);
|
|
140
164
|
}
|
|
141
165
|
catch (err) {
|
|
@@ -173,7 +197,10 @@ export class ConsumedWatch {
|
|
|
173
197
|
start = nl + 1;
|
|
174
198
|
}
|
|
175
199
|
if (kept.length) {
|
|
176
|
-
const
|
|
200
|
+
const text = Buffer.concat(kept).toString("utf8");
|
|
201
|
+
const kind = this.target.marker
|
|
202
|
+
? transcriptDeltaMarkerKind(text, this.target.backend, this.target.marker)
|
|
203
|
+
: transcriptDeltaDeliveryMarker(text, this.target.backend, this.target.deliveryId);
|
|
177
204
|
if (kind === "user")
|
|
178
205
|
found = { via: "turn", evidence: "transcript-consumed:user-entry" };
|
|
179
206
|
else if (kind === "absorbed")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-consumed-watch.js","sourceRoot":"","sources":["../src/delivery-consumed-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"delivery-consumed-watch.js","sourceRoot":"","sources":["../src/delivery-consumed-watch.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,12 +36,19 @@ export type TranscriptMarkerKind = "user" | "absorbed" | "queued";
|
|
|
36
36
|
/** Whether a marker kind means the CLI took the message (as its own turn, or into the running one). */
|
|
37
37
|
export declare function markerConsumed(kind: TranscriptMarkerKind | null | undefined): kind is "user" | "absorbed";
|
|
38
38
|
export declare function transcriptDeltaDeliveryMarker(rawDelta: string, backend: string, deliveryId: string): TranscriptMarkerKind | null;
|
|
39
|
+
/**
|
|
40
|
+
* #3030: the same reading for any unique leading marker — a delivery's `[agend-delivery-id:…]` or a person's
|
|
41
|
+
* `[agend-human-id:…]` (both lead the pasted body).
|
|
42
|
+
*/
|
|
43
|
+
export declare function transcriptDeltaMarkerKind(rawDelta: string, backend: string, marker: string): TranscriptMarkerKind | null;
|
|
39
44
|
/**
|
|
40
45
|
* What a transcript proof looks for: an enveloped delivery's id marker (a delivery id string), or — for a raw paste,
|
|
41
46
|
* which carries no envelope (a silent schedule, a system command) — its exact text (#1647).
|
|
42
47
|
*/
|
|
43
48
|
export type TranscriptNeedle = string | {
|
|
44
49
|
readonly rawText: string;
|
|
50
|
+
} | {
|
|
51
|
+
readonly marker: string;
|
|
45
52
|
};
|
|
46
53
|
/**
|
|
47
54
|
* #1647: a raw paste's exact text as a user entry of the CLI's own — a message that, whitespace aside and without Claude
|
|
@@ -215,7 +215,13 @@ function claudeAbsorbedText(value) {
|
|
|
215
215
|
return null;
|
|
216
216
|
}
|
|
217
217
|
export function transcriptDeltaDeliveryMarker(rawDelta, backend, deliveryId) {
|
|
218
|
-
|
|
218
|
+
return transcriptDeltaMarkerKind(rawDelta, backend, ENTER_MARKER(deliveryId));
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* #3030: the same reading for any unique leading marker — a delivery's `[agend-delivery-id:…]` or a person's
|
|
222
|
+
* `[agend-human-id:…]` (both lead the pasted body).
|
|
223
|
+
*/
|
|
224
|
+
export function transcriptDeltaMarkerKind(rawDelta, backend, marker) {
|
|
219
225
|
let queued = false;
|
|
220
226
|
let absorbed = false;
|
|
221
227
|
for (const line of rawDelta.split(/\r?\n/)) {
|
|
@@ -302,6 +308,8 @@ export function transcriptDeltaHasRawText(rawDelta, backend, rawText) {
|
|
|
302
308
|
export function transcriptDeltaNeedle(rawDelta, backend, needle) {
|
|
303
309
|
if (typeof needle === "string")
|
|
304
310
|
return transcriptDeltaDeliveryMarker(rawDelta, backend, needle);
|
|
311
|
+
if ("marker" in needle)
|
|
312
|
+
return transcriptDeltaMarkerKind(rawDelta, backend, needle.marker);
|
|
305
313
|
return transcriptDeltaHasRawText(rawDelta, backend, needle.rawText) ? "user" : null;
|
|
306
314
|
}
|
|
307
315
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-reconciliation.js","sourceRoot":"","sources":["../src/delivery-reconciliation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"delivery-reconciliation.js","sourceRoot":"","sources":["../src/delivery-reconciliation.ts"],"names":[],"mappings":"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"}
|
package/dist/export-import.d.ts
CHANGED
|
@@ -1,2 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The archive file, private from its first byte: created here, exclusively, 0600 (the umask can only narrow it), and
|
|
3
|
+
* never through a link. The archive holds the fleet's secrets (.env), so it must never exist readable by others, not
|
|
4
|
+
* even for the moment a chmod afterwards would leave. An existing destination — a file, a directory or a symlink — is
|
|
5
|
+
* refused, never replaced or followed.
|
|
6
|
+
*/
|
|
7
|
+
export declare function openPrivateArchive(path: string): number;
|
|
1
8
|
export declare function exportConfig(dataDir: string, outputPath: string | undefined, full: boolean): Promise<void>;
|
|
2
9
|
export declare function importConfig(dataDir: string, filePath: string): Promise<void>;
|
package/dist/export-import.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ensureAgendHome } from "./agend-home.js";
|
|
2
2
|
import { execFileSync } from "node:child_process";
|
|
3
3
|
import { t } from "./locale.js";
|
|
4
|
-
import { existsSync, statSync, copyFileSync, readFileSync, } from "node:fs";
|
|
4
|
+
import { existsSync, statSync, copyFileSync, readFileSync, openSync, closeSync, fsyncSync, unlinkSync, constants as fsConstants, } from "node:fs";
|
|
5
5
|
import { join, basename, resolve, sep as pathSep } from "node:path";
|
|
6
6
|
import { homedir } from "node:os";
|
|
7
7
|
const MINIMAL_FILES = ["fleet.yaml", ".env", "scheduler.db", "classicBot.yaml"];
|
|
@@ -13,6 +13,43 @@ const RUNTIME_EXCLUDES = [
|
|
|
13
13
|
"fleet.log",
|
|
14
14
|
"node_modules",
|
|
15
15
|
];
|
|
16
|
+
/**
|
|
17
|
+
* The archive file, private from its first byte: created here, exclusively, 0600 (the umask can only narrow it), and
|
|
18
|
+
* never through a link. The archive holds the fleet's secrets (.env), so it must never exist readable by others, not
|
|
19
|
+
* even for the moment a chmod afterwards would leave. An existing destination — a file, a directory or a symlink — is
|
|
20
|
+
* refused, never replaced or followed.
|
|
21
|
+
*/
|
|
22
|
+
export function openPrivateArchive(path) {
|
|
23
|
+
// O_CREAT | O_EXCL fails on any existing path — a symlink included, which it never follows (POSIX open(2)).
|
|
24
|
+
const flags = fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL;
|
|
25
|
+
try {
|
|
26
|
+
return openSync(path, flags, 0o600);
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
if (err.code === "EEXIST") {
|
|
30
|
+
console.error(`${path} already exists. Choose another output path, or move that file away first.`);
|
|
31
|
+
process.exit(1);
|
|
32
|
+
}
|
|
33
|
+
throw err;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/** tar into the private archive (its stdout is the archive's fd); on failure the partial archive is removed. */
|
|
37
|
+
function tarInto(outFile, args) {
|
|
38
|
+
const fd = openPrivateArchive(outFile);
|
|
39
|
+
try {
|
|
40
|
+
execFileSync("tar", ["czf", "-", ...args], { stdio: ["ignore", fd, "pipe"] });
|
|
41
|
+
fsyncSync(fd);
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
closeSync(fd);
|
|
45
|
+
try {
|
|
46
|
+
unlinkSync(outFile);
|
|
47
|
+
}
|
|
48
|
+
catch { /* already gone */ }
|
|
49
|
+
throw err;
|
|
50
|
+
}
|
|
51
|
+
closeSync(fd);
|
|
52
|
+
}
|
|
16
53
|
// Reject tarballs above this size to blunt zip-bomb style exhaustion.
|
|
17
54
|
const MAX_IMPORT_BYTES = 500 * 1024 * 1024;
|
|
18
55
|
export async function exportConfig(dataDir, outputPath, full) {
|
|
@@ -20,14 +57,13 @@ export async function exportConfig(dataDir, outputPath, full) {
|
|
|
20
57
|
console.error(`Data directory not found: ${dataDir}`);
|
|
21
58
|
process.exit(1);
|
|
22
59
|
}
|
|
23
|
-
|
|
24
|
-
|
|
60
|
+
// The default name carries the time to the second (UTC), so a second export on the same day gets its own file
|
|
61
|
+
// instead of meeting an existing one (which openPrivateArchive refuses). An explicit path is used as given.
|
|
62
|
+
const stamp = new Date().toISOString().slice(0, 19).replace(/[-:]/g, "").replace("T", "-");
|
|
63
|
+
const outFile = resolve(outputPath ?? `agend-export-${stamp}.tar.gz`);
|
|
25
64
|
if (full) {
|
|
26
65
|
const excludeArgs = RUNTIME_EXCLUDES.flatMap((p) => ["--exclude", p]);
|
|
27
|
-
|
|
28
|
-
"czf", outFile, ...excludeArgs,
|
|
29
|
-
"-C", join(dataDir, ".."), basename(dataDir),
|
|
30
|
-
], { stdio: "pipe" });
|
|
66
|
+
tarInto(outFile, [...excludeArgs, "-C", join(dataDir, ".."), basename(dataDir)]);
|
|
31
67
|
}
|
|
32
68
|
else {
|
|
33
69
|
// Minimal: only config files that exist
|
|
@@ -37,9 +73,7 @@ export async function exportConfig(dataDir, outputPath, full) {
|
|
|
37
73
|
process.exit(1);
|
|
38
74
|
}
|
|
39
75
|
const fileArgs = existing.map((f) => `${basename(dataDir)}/${f}`);
|
|
40
|
-
|
|
41
|
-
"czf", outFile, "-C", join(dataDir, ".."), ...fileArgs,
|
|
42
|
-
], { stdio: "pipe" });
|
|
76
|
+
tarInto(outFile, ["-C", join(dataDir, ".."), ...fileArgs]);
|
|
43
77
|
}
|
|
44
78
|
const size = statSync(outFile).size;
|
|
45
79
|
const sizeStr = size < 1024
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-import.js","sourceRoot":"","sources":["../src/export-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAChC,OAAO,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EAEZ,YAAY,
|
|
1
|
+
{"version":3,"file":"export-import.js","sourceRoot":"","sources":["../src/export-import.ts"],"names":[],"mappings":"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"}
|
package/dist/fleet-context.d.ts
CHANGED
|
@@ -120,6 +120,8 @@ export interface FleetContext {
|
|
|
120
120
|
saveFleetConfig(): void;
|
|
121
121
|
getInstanceDir(name: string): string;
|
|
122
122
|
createForumTopic(topicName: string, adapterId?: string): Promise<number | string>;
|
|
123
|
+
/** #3055: a topic with this id is being deleted right now (its agent was deleted); binding it waits until it is over. */
|
|
124
|
+
isTopicDeletionInFlight?(topicId: number | string): boolean;
|
|
123
125
|
removeInstance(name: string, authorization: ExplicitInstanceRemoval): Promise<void>;
|
|
124
126
|
/** Quarantine a provider-confirmed missing topic without deleting user data. */
|
|
125
127
|
quarantineMissingTopic(threadId: string, target: RouteTarget, evidence: {
|
package/dist/fleet-manager.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ import type { FleetConfig, RawFleetConfig, InstanceConfig, WebVerifiedAuthorityC
|
|
|
15
15
|
import { type DeliveryStatus, type GuildEmoji, type GuildEmojiGroup, type ResolvedStatusEmojis } from "./status-emojis.js";
|
|
16
16
|
import { type RouteTarget } from "./fleet-context.js";
|
|
17
17
|
import { EventLog } from "./event-log.js";
|
|
18
|
+
import { type TopicDeleteOutcome } from "./instance-topic-delete.js";
|
|
18
19
|
import { BackendAvailabilityStore, type AvailabilityProbes, type BackendAvailability } from "./backend-availability.js";
|
|
19
20
|
import { AdapterWorld } from "./adapter-world.js";
|
|
20
21
|
import { CostGuard } from "./cost-guard.js";
|
|
@@ -87,6 +88,7 @@ import { WebBackendLogins, type SignInTarget } from "./web-backend-login.js";
|
|
|
87
88
|
import { BrowserBackendSignIns } from "./browser-backend-signins.js";
|
|
88
89
|
import { type RawConfigPatch } from "./settings-api.js";
|
|
89
90
|
import { type AgentEndpointContext } from "./agent-endpoint.js";
|
|
91
|
+
import { AgentCredentials } from "./agent-credentials.js";
|
|
90
92
|
import { ClassicChannelManager } from "./classic-channel-manager.js";
|
|
91
93
|
import { type ExplicitInstanceRemoval } from "./instance-removal.js";
|
|
92
94
|
import { type SessionOomRetry } from "./session-oom-stop.js";
|
|
@@ -448,6 +450,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
448
450
|
private startupRetryNotices;
|
|
449
451
|
/** Unsupported-CLI refusals waiting to go out, grouped by reason (#1109). */
|
|
450
452
|
private unsupportedCliNotices;
|
|
453
|
+
private kiroCompatibilityHolds;
|
|
451
454
|
private kiroIncompatNotices;
|
|
452
455
|
/** Backoff between automatic startup retries; the last step repeats while the backend is down. */
|
|
453
456
|
static readonly STARTUP_RETRY_BACKOFF_MS: number[];
|
|
@@ -583,6 +586,9 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
583
586
|
private discordPresenceEagerPending;
|
|
584
587
|
private discordPresenceInFlight;
|
|
585
588
|
private static readonly DISCORD_PRESENCE_REFRESH_MS;
|
|
589
|
+
/** #3066 §1d: how often a fleet with no Discord bot reads the quota for its history (the user's choice: 30 min). */
|
|
590
|
+
static readonly QUOTA_BACKGROUND_READ_MS: number;
|
|
591
|
+
private quotaReadTimer;
|
|
586
592
|
/** Days of event/activity history to keep. */
|
|
587
593
|
private static readonly EVENT_LOG_RETENTION_DAYS;
|
|
588
594
|
private watchdogTimer;
|
|
@@ -883,6 +889,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
883
889
|
* startup-only key at startup. See checkStartupSignatureConsistency(). */
|
|
884
890
|
private fleetSignatureMismatch;
|
|
885
891
|
private healthServerListening;
|
|
892
|
+
private agentCredentialsCache?;
|
|
893
|
+
get agentCredentials(): AgentCredentials;
|
|
886
894
|
constructor(dataDir: string);
|
|
887
895
|
/** #1266: a reply's buttons — the store (reply-buttons.db) and what a click does. Created on first use. */
|
|
888
896
|
private replyButtonsCtl;
|
|
@@ -1586,6 +1594,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
1586
1594
|
* first unattended start and every scheduled retry.
|
|
1587
1595
|
*/
|
|
1588
1596
|
private stopOnUnsupportedCli;
|
|
1597
|
+
/** No pane is needed for a compatibility refusal to remain in Needs you. */
|
|
1598
|
+
setKiroCompatibilityHold(name: string, message: string | null): void;
|
|
1589
1599
|
/**
|
|
1590
1600
|
* LifecycleContext: a kiro instance the installed kiro-cli cannot run as
|
|
1591
1601
|
* configured (#1109) — at start, or at a respawn after kiro-cli replaced
|
|
@@ -2043,6 +2053,35 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
2043
2053
|
/** Start all instances from fleet config */
|
|
2044
2054
|
startAll(configPath: string): Promise<void>;
|
|
2045
2055
|
private startAllWithinDeadline;
|
|
2056
|
+
/**
|
|
2057
|
+
* #3066 §1d (the user: yes, every 30 min): the quota history (usage/quota-history.ts) records only the readings AgEnD
|
|
2058
|
+
* makes. A Discord bot's presence refresh reads every 15 min; without one, nothing reads while nobody looks. So, with no
|
|
2059
|
+
* Discord bot and while some account has a running agent, read every 30 min — the same cached read (its 5-minute TTL
|
|
2060
|
+
* still bounds the vendor calls), recorded like any other.
|
|
2061
|
+
*/
|
|
2062
|
+
private startQuotaBackgroundReads;
|
|
2063
|
+
/** #3066 §1: the latest estimates, by `provider\0metric` (what usage-api's lookup reads, synchronously). */
|
|
2064
|
+
private capacityEstimates;
|
|
2065
|
+
private capacityTimer;
|
|
2066
|
+
static readonly CAPACITY_REFRESH_MS: number;
|
|
2067
|
+
/**
|
|
2068
|
+
* #3066 §1: estimate each account's weekly 100% from the quota history (§1d) and the usage ledger's hours — both read
|
|
2069
|
+
* asynchronously, the arithmetic small (usage/capacity.ts). An account is its usage provider id ("claude",
|
|
2070
|
+
* "claude:hsinlin", "codex:yanxianchen"): its hours are the ledger sources of that backend under that credential profile
|
|
2071
|
+
* (Codex's "unrecorded" hours are no account's). A per-model weekly ("Sonnet (weekly)") counts only that model's tokens.
|
|
2072
|
+
*
|
|
2073
|
+
* Prism #3073: no estimate rather than a wrong one —
|
|
2074
|
+
* - a window is measured only where the ledger has its hours: kept (31 days) and scanned (`days.coverage`) for every
|
|
2075
|
+
* instance of the account's backend, and every instance whose hours count for it; the quota history goes back 12 weeks;
|
|
2076
|
+
* - a profile literally named "default", "unknown" or "unrecorded" (configured, on disk, or in the quota history) makes
|
|
2077
|
+
* those hours ambiguous: neither the host
|
|
2078
|
+
* account nor the named one is estimated (each would be credited the other's use, or lose its own);
|
|
2079
|
+
* - only a metric the vendor marks per-model (`scope: "model"`) is filtered by model; another named weekly pool
|
|
2080
|
+
* ("Luna Reserve (weekly)", Antigravity pools) is no model name and is not estimated.
|
|
2081
|
+
*/
|
|
2082
|
+
refreshCapacity(): Promise<number>;
|
|
2083
|
+
/** One background quota read, when nothing else reads (no Discord bot) and an account has a running agent. */
|
|
2084
|
+
backgroundQuotaRead(): Promise<boolean>;
|
|
2046
2085
|
/** Keep Discord profile activity aligned with the same cached usage source as /usage. */
|
|
2047
2086
|
private startDiscordUsagePresence;
|
|
2048
2087
|
/**
|
|
@@ -2425,6 +2464,12 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
2425
2464
|
* of the schedule response on IPC.
|
|
2426
2465
|
*/
|
|
2427
2466
|
private performScheduleOp;
|
|
2467
|
+
/**
|
|
2468
|
+
* `post_decision` with `supersedes` changes a decision someone else may have recorded (it stops being active): the
|
|
2469
|
+
* same permission as `update_decision`, asked through the same live check (tool set + dashboard switches), on both
|
|
2470
|
+
* create paths. An empty or absent value supersedes nothing and needs nothing; anything else must be an id.
|
|
2471
|
+
*/
|
|
2472
|
+
private decisionSupersedes;
|
|
2428
2473
|
handleDecisionCrudHttp(instance: string, op: string, args: Record<string, unknown>): Promise<unknown>;
|
|
2429
2474
|
handleTaskCrudHttp(instance: string, args: Record<string, unknown>): Promise<unknown>;
|
|
2430
2475
|
handleSetDisplayNameHttp(instance: string, name: string): Promise<unknown>;
|
|
@@ -2440,7 +2485,41 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
2440
2485
|
private handleTaskCrud;
|
|
2441
2486
|
/** Create a forum topic via the adapter. Returns the message_thread_id. */
|
|
2442
2487
|
createForumTopic(topicName: string, adapterId?: string): Promise<number | string>;
|
|
2443
|
-
|
|
2488
|
+
/**
|
|
2489
|
+
* Delete an agent and, unless asked not to, its own chat topic (user decision: by default). The topic is planned
|
|
2490
|
+
* before the removal (its id and bot go with the fleet.yaml entry) and deleted through the agent's OWN bot after it;
|
|
2491
|
+
* the outcome is the platform's answer (instance-topic-delete.ts). A topic that cannot go never fails the removal.
|
|
2492
|
+
*/
|
|
2493
|
+
removeInstanceAndTopic(name: string, authorization: ExplicitInstanceRemoval, opts: {
|
|
2494
|
+
deleteTopic: boolean;
|
|
2495
|
+
execution?: SettingsExecution;
|
|
2496
|
+
}): Promise<TopicDeleteOutcome>;
|
|
2497
|
+
/** #3055: destinations whose platform deletion is running now; a binding to one waits until it is over. */
|
|
2498
|
+
private readonly topicDeletionsInFlight;
|
|
2499
|
+
/** True while a topic with this id is being deleted on any connection (a new binding of it is refused meanwhile). */
|
|
2500
|
+
isTopicDeletionInFlight(topicId: number | string): boolean;
|
|
2501
|
+
/**
|
|
2502
|
+
* #3055 review r2 (Prism P1-3): would this instance config bind a topic whose deletion is running now? Compared by
|
|
2503
|
+
* physical destination, so the same thread number in another Telegram group is not held. Settings asks it at commit.
|
|
2504
|
+
*/
|
|
2505
|
+
topicBindingInFlight(inst: {
|
|
2506
|
+
channel_id?: unknown;
|
|
2507
|
+
topic_id?: unknown;
|
|
2508
|
+
}): boolean;
|
|
2509
|
+
/** Any topic deletion running now (a connection's group or General may not be re-pointed meanwhile). */
|
|
2510
|
+
topicDeletionPending(): boolean;
|
|
2511
|
+
/** The physical destination of `topicId` on the bot `adapterId`. */
|
|
2512
|
+
private destinationFor;
|
|
2513
|
+
/** The adapter of the bot `adapterId` names — never a substitute for a bot that is not there. */
|
|
2514
|
+
private instanceTopicAdapter;
|
|
2515
|
+
/**
|
|
2516
|
+
* Topic ownership by physical destination (#3055 review, Prism P1): an instance's topic is where its bot's platform
|
|
2517
|
+
* puts it (a Telegram group + thread, a Discord channel), so two bots in one group, or two instances on one
|
|
2518
|
+
* channel, are seen to share it; and every connection's own General is protected, with or without a General agent.
|
|
2519
|
+
*/
|
|
2520
|
+
private topicOwnership;
|
|
2521
|
+
/** What deleting `name`'s topic would act on: its own bot only — a bot that is not there is never substituted. */
|
|
2522
|
+
private planInstanceTopicDelete;
|
|
2444
2523
|
getForumTopicDeleter(adapterId?: string): ((topicId: number | string) => Promise<void>) | null;
|
|
2445
2524
|
private topicCleanupTimer;
|
|
2446
2525
|
private sessionPruneTimer;
|
|
@@ -3426,9 +3505,11 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
|
|
|
3426
3505
|
* Make a tool summary safe to paste into a channel message.
|
|
3427
3506
|
*
|
|
3428
3507
|
* The text is agent-controlled (it is built from tool inputs — file paths,
|
|
3429
|
-
* shell commands), so it gets flattened to one line, capped,
|
|
3430
|
-
* the two Discord mass-mention triggers.
|
|
3431
|
-
*
|
|
3508
|
+
* shell commands), so it gets flattened to one line, secrets masked, capped,
|
|
3509
|
+
* and stripped of the two Discord mass-mention triggers. Masking comes BEFORE
|
|
3510
|
+
* the cap: a cap can cut a mask's context but must never be what hides (or
|
|
3511
|
+
* fails to hide) a secret. Neither channel renders it with a parse mode, so no
|
|
3512
|
+
* markup escaping is needed beyond that.
|
|
3432
3513
|
*/
|
|
3433
3514
|
private static sanitizeActivity;
|
|
3434
3515
|
/**
|