@hybridaione/hybridclaw 0.2.2 → 0.2.6
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/.github/workflows/ci.yml +70 -0
- package/.husky/pre-commit +1 -0
- package/CHANGELOG.md +85 -0
- package/CONTRIBUTING.md +33 -0
- package/README.md +41 -16
- package/SECURITY.md +17 -0
- package/biome.json +35 -0
- package/config.example.json +71 -8
- package/container/package-lock.json +2 -2
- package/container/package.json +1 -1
- package/container/src/approval-policy.ts +1303 -0
- package/container/src/browser-tools.ts +431 -136
- package/container/src/extensions.ts +36 -12
- package/container/src/hybridai-client.ts +34 -13
- package/container/src/index.ts +451 -109
- package/container/src/ipc.ts +5 -3
- package/container/src/token-usage.ts +20 -10
- package/container/src/tools.ts +599 -225
- package/container/src/types.ts +32 -2
- package/container/src/web-fetch.ts +89 -32
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +10 -2
- package/dist/agent.js.map +1 -1
- package/dist/audit-cli.d.ts.map +1 -1
- package/dist/audit-cli.js +4 -2
- package/dist/audit-cli.js.map +1 -1
- package/dist/audit-events.d.ts.map +1 -1
- package/dist/audit-events.js +53 -3
- package/dist/audit-events.js.map +1 -1
- package/dist/audit-trail.d.ts.map +1 -1
- package/dist/audit-trail.js +17 -8
- package/dist/audit-trail.js.map +1 -1
- package/dist/channels/discord/attachments.d.ts.map +1 -1
- package/dist/channels/discord/attachments.js +14 -7
- package/dist/channels/discord/attachments.js.map +1 -1
- package/dist/channels/discord/debounce.d.ts +9 -0
- package/dist/channels/discord/debounce.d.ts.map +1 -0
- package/dist/channels/discord/debounce.js +20 -0
- package/dist/channels/discord/debounce.js.map +1 -0
- package/dist/channels/discord/delivery.d.ts +4 -1
- package/dist/channels/discord/delivery.d.ts.map +1 -1
- package/dist/channels/discord/delivery.js +19 -3
- package/dist/channels/discord/delivery.js.map +1 -1
- package/dist/channels/discord/human-delay.d.ts +16 -0
- package/dist/channels/discord/human-delay.d.ts.map +1 -0
- package/dist/channels/discord/human-delay.js +29 -0
- package/dist/channels/discord/human-delay.js.map +1 -0
- package/dist/channels/discord/inbound.d.ts +4 -0
- package/dist/channels/discord/inbound.d.ts.map +1 -1
- package/dist/channels/discord/inbound.js +45 -4
- package/dist/channels/discord/inbound.js.map +1 -1
- package/dist/channels/discord/mentions.d.ts.map +1 -1
- package/dist/channels/discord/mentions.js +16 -4
- package/dist/channels/discord/mentions.js.map +1 -1
- package/dist/channels/discord/presence.d.ts +33 -0
- package/dist/channels/discord/presence.d.ts.map +1 -0
- package/dist/channels/discord/presence.js +111 -0
- package/dist/channels/discord/presence.js.map +1 -0
- package/dist/channels/discord/rate-limiter.d.ts +14 -0
- package/dist/channels/discord/rate-limiter.d.ts.map +1 -0
- package/dist/channels/discord/rate-limiter.js +49 -0
- package/dist/channels/discord/rate-limiter.js.map +1 -0
- package/dist/channels/discord/reactions.d.ts +38 -0
- package/dist/channels/discord/reactions.d.ts.map +1 -0
- package/dist/channels/discord/reactions.js +151 -0
- package/dist/channels/discord/reactions.js.map +1 -0
- package/dist/channels/discord/runtime.d.ts +6 -3
- package/dist/channels/discord/runtime.d.ts.map +1 -1
- package/dist/channels/discord/runtime.js +621 -125
- package/dist/channels/discord/runtime.js.map +1 -1
- package/dist/channels/discord/stream.d.ts +4 -1
- package/dist/channels/discord/stream.d.ts.map +1 -1
- package/dist/channels/discord/stream.js +16 -8
- package/dist/channels/discord/stream.js.map +1 -1
- package/dist/channels/discord/tool-actions.d.ts.map +1 -1
- package/dist/channels/discord/tool-actions.js +24 -12
- package/dist/channels/discord/tool-actions.js.map +1 -1
- package/dist/channels/discord/typing.d.ts +15 -0
- package/dist/channels/discord/typing.d.ts.map +1 -0
- package/dist/channels/discord/typing.js +106 -0
- package/dist/channels/discord/typing.js.map +1 -0
- package/dist/chunk.d.ts.map +1 -1
- package/dist/chunk.js +4 -2
- package/dist/chunk.js.map +1 -1
- package/dist/cli.js +47 -22
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +19 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +103 -18
- package/dist/config.js.map +1 -1
- package/dist/container-runner.d.ts.map +1 -1
- package/dist/container-runner.js +58 -26
- package/dist/container-runner.js.map +1 -1
- package/dist/container-setup.d.ts.map +1 -1
- package/dist/container-setup.js +10 -9
- package/dist/container-setup.js.map +1 -1
- package/dist/conversation.d.ts +2 -2
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +1 -1
- package/dist/conversation.js.map +1 -1
- package/dist/db.d.ts +118 -2
- package/dist/db.d.ts.map +1 -1
- package/dist/db.js +1568 -50
- package/dist/db.js.map +1 -1
- package/dist/delegation-manager.d.ts.map +1 -1
- package/dist/delegation-manager.js +3 -2
- package/dist/delegation-manager.js.map +1 -1
- package/dist/gateway-client.d.ts +2 -2
- package/dist/gateway-client.d.ts.map +1 -1
- package/dist/gateway-client.js +10 -4
- package/dist/gateway-client.js.map +1 -1
- package/dist/gateway-service.d.ts +3 -3
- package/dist/gateway-service.d.ts.map +1 -1
- package/dist/gateway-service.js +563 -73
- package/dist/gateway-service.js.map +1 -1
- package/dist/gateway-types.d.ts +24 -0
- package/dist/gateway-types.d.ts.map +1 -1
- package/dist/gateway-types.js.map +1 -1
- package/dist/gateway.js +179 -24
- package/dist/gateway.js.map +1 -1
- package/dist/health.d.ts.map +1 -1
- package/dist/health.js +20 -10
- package/dist/health.js.map +1 -1
- package/dist/heartbeat.d.ts +4 -0
- package/dist/heartbeat.d.ts.map +1 -1
- package/dist/heartbeat.js +48 -20
- package/dist/heartbeat.js.map +1 -1
- package/dist/hybridai-bots.d.ts.map +1 -1
- package/dist/hybridai-bots.js +4 -2
- package/dist/hybridai-bots.js.map +1 -1
- package/dist/instruction-approval-audit.d.ts.map +1 -1
- package/dist/instruction-approval-audit.js.map +1 -1
- package/dist/instruction-integrity.d.ts.map +1 -1
- package/dist/instruction-integrity.js +8 -2
- package/dist/instruction-integrity.js.map +1 -1
- package/dist/ipc.d.ts.map +1 -1
- package/dist/ipc.js +6 -1
- package/dist/ipc.js.map +1 -1
- package/dist/logger.js.map +1 -1
- package/dist/memory-consolidation.d.ts +17 -0
- package/dist/memory-consolidation.d.ts.map +1 -0
- package/dist/memory-consolidation.js +25 -0
- package/dist/memory-consolidation.js.map +1 -0
- package/dist/memory-service.d.ts +200 -0
- package/dist/memory-service.d.ts.map +1 -0
- package/dist/memory-service.js +294 -0
- package/dist/memory-service.js.map +1 -0
- package/dist/mount-security.d.ts.map +1 -1
- package/dist/mount-security.js +31 -7
- package/dist/mount-security.js.map +1 -1
- package/dist/observability-ingest.d.ts.map +1 -1
- package/dist/observability-ingest.js +32 -11
- package/dist/observability-ingest.js.map +1 -1
- package/dist/onboarding.d.ts.map +1 -1
- package/dist/onboarding.js +32 -9
- package/dist/onboarding.js.map +1 -1
- package/dist/proactive-policy.d.ts.map +1 -1
- package/dist/proactive-policy.js +2 -1
- package/dist/proactive-policy.js.map +1 -1
- package/dist/prompt-hooks.d.ts.map +1 -1
- package/dist/prompt-hooks.js +9 -7
- package/dist/prompt-hooks.js.map +1 -1
- package/dist/runtime-config.d.ts +98 -1
- package/dist/runtime-config.d.ts.map +1 -1
- package/dist/runtime-config.js +477 -23
- package/dist/runtime-config.js.map +1 -1
- package/dist/scheduled-task-runner.d.ts +1 -0
- package/dist/scheduled-task-runner.d.ts.map +1 -1
- package/dist/scheduled-task-runner.js +29 -10
- package/dist/scheduled-task-runner.js.map +1 -1
- package/dist/scheduler.d.ts +43 -4
- package/dist/scheduler.d.ts.map +1 -1
- package/dist/scheduler.js +530 -56
- package/dist/scheduler.js.map +1 -1
- package/dist/session-export.d.ts +26 -0
- package/dist/session-export.d.ts.map +1 -0
- package/dist/session-export.js +149 -0
- package/dist/session-export.js.map +1 -0
- package/dist/session-maintenance.d.ts.map +1 -1
- package/dist/session-maintenance.js +75 -13
- package/dist/session-maintenance.js.map +1 -1
- package/dist/session-transcripts.d.ts.map +1 -1
- package/dist/session-transcripts.js.map +1 -1
- package/dist/side-effects.d.ts.map +1 -1
- package/dist/side-effects.js +14 -2
- package/dist/side-effects.js.map +1 -1
- package/dist/skills-guard.d.ts.map +1 -1
- package/dist/skills-guard.js +893 -130
- package/dist/skills-guard.js.map +1 -1
- package/dist/skills.d.ts +5 -0
- package/dist/skills.d.ts.map +1 -1
- package/dist/skills.js +29 -15
- package/dist/skills.js.map +1 -1
- package/dist/token-efficiency.d.ts.map +1 -1
- package/dist/token-efficiency.js.map +1 -1
- package/dist/tui.js +92 -11
- package/dist/tui.js.map +1 -1
- package/dist/types.d.ts +146 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +24 -1
- package/dist/types.js.map +1 -1
- package/dist/update.d.ts.map +1 -1
- package/dist/update.js +42 -14
- package/dist/update.js.map +1 -1
- package/dist/workspace.d.ts.map +1 -1
- package/dist/workspace.js +49 -9
- package/dist/workspace.js.map +1 -1
- package/docs/chat.html +9 -3
- package/docs/index.html +37 -13
- package/package.json +8 -2
- package/src/agent.ts +16 -3
- package/src/audit-cli.ts +44 -16
- package/src/audit-events.ts +69 -5
- package/src/audit-trail.ts +41 -15
- package/src/channels/discord/attachments.ts +81 -27
- package/src/channels/discord/debounce.ts +25 -0
- package/src/channels/discord/delivery.ts +57 -13
- package/src/channels/discord/human-delay.ts +48 -0
- package/src/channels/discord/inbound.ts +66 -7
- package/src/channels/discord/mentions.ts +42 -18
- package/src/channels/discord/presence.ts +148 -0
- package/src/channels/discord/rate-limiter.ts +58 -0
- package/src/channels/discord/reactions.ts +211 -0
- package/src/channels/discord/runtime.ts +1048 -182
- package/src/channels/discord/stream.ts +73 -27
- package/src/channels/discord/tool-actions.ts +78 -37
- package/src/channels/discord/typing.ts +140 -0
- package/src/chunk.ts +12 -4
- package/src/cli.ts +141 -56
- package/src/config.ts +192 -34
- package/src/container-runner.ts +132 -42
- package/src/container-setup.ts +57 -22
- package/src/conversation.ts +9 -7
- package/src/db.ts +2217 -84
- package/src/delegation-manager.ts +6 -2
- package/src/gateway-client.ts +41 -17
- package/src/gateway-service.ts +1019 -201
- package/src/gateway-types.ts +33 -0
- package/src/gateway.ts +321 -48
- package/src/health.ts +66 -26
- package/src/heartbeat.ts +84 -22
- package/src/hybridai-bots.ts +14 -5
- package/src/instruction-approval-audit.ts +4 -1
- package/src/instruction-integrity.ts +30 -9
- package/src/ipc.ts +23 -5
- package/src/logger.ts +4 -1
- package/src/memory-consolidation.ts +41 -0
- package/src/memory-service.ts +606 -0
- package/src/mount-security.ts +58 -13
- package/src/observability-ingest.ts +134 -35
- package/src/onboarding.ts +126 -35
- package/src/proactive-policy.ts +3 -1
- package/src/prompt-hooks.ts +40 -17
- package/src/runtime-config.ts +1114 -99
- package/src/scheduled-task-runner.ts +63 -11
- package/src/scheduler.ts +683 -60
- package/src/session-export.ts +196 -0
- package/src/session-maintenance.ts +125 -22
- package/src/session-transcripts.ts +12 -3
- package/src/side-effects.ts +28 -5
- package/src/skills-guard.ts +1067 -219
- package/src/skills.ts +163 -65
- package/src/token-efficiency.ts +31 -9
- package/src/tui.ts +166 -25
- package/src/types.ts +195 -2
- package/src/update.ts +79 -23
- package/src/workspace.ts +63 -11
- package/tests/approval-policy.test.ts +224 -0
- package/tests/discord.basic.test.ts +82 -2
- package/tests/discord.human-presence.test.ts +85 -0
- package/tests/gateway-service.media-routing.test.ts +8 -2
- package/tests/memory-service.test.ts +1114 -0
- package/tests/token-efficiency.basic.test.ts +8 -2
- package/vitest.e2e.config.ts +3 -1
- package/vitest.integration.config.ts +3 -1
- package/vitest.live.config.ts +3 -1
- package/vitest.unit.config.ts +9 -0
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { ActivityType } from 'discord.js';
|
|
2
|
+
import { logger } from '../../logger.js';
|
|
3
|
+
function toDiscordActivityType(type) {
|
|
4
|
+
switch (type) {
|
|
5
|
+
case 'playing':
|
|
6
|
+
return ActivityType.Playing;
|
|
7
|
+
case 'listening':
|
|
8
|
+
return ActivityType.Listening;
|
|
9
|
+
case 'competing':
|
|
10
|
+
return ActivityType.Competing;
|
|
11
|
+
case 'custom':
|
|
12
|
+
return ActivityType.Custom;
|
|
13
|
+
case 'watching':
|
|
14
|
+
default:
|
|
15
|
+
return ActivityType.Watching;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
function presenceTextForState(config, state) {
|
|
19
|
+
if (state === 'degraded')
|
|
20
|
+
return config.degradedText;
|
|
21
|
+
if (state === 'exhausted')
|
|
22
|
+
return config.exhaustedText;
|
|
23
|
+
return config.healthyText;
|
|
24
|
+
}
|
|
25
|
+
function presenceStatusForState(state) {
|
|
26
|
+
if (state === 'maintenance')
|
|
27
|
+
return 'invisible';
|
|
28
|
+
if (state === 'exhausted')
|
|
29
|
+
return 'dnd';
|
|
30
|
+
if (state === 'degraded')
|
|
31
|
+
return 'idle';
|
|
32
|
+
return 'online';
|
|
33
|
+
}
|
|
34
|
+
export class DiscordAutoPresenceController {
|
|
35
|
+
client;
|
|
36
|
+
getConfig;
|
|
37
|
+
resolveState;
|
|
38
|
+
timer = null;
|
|
39
|
+
running = false;
|
|
40
|
+
maintenance = false;
|
|
41
|
+
lastFingerprint = '';
|
|
42
|
+
constructor(params) {
|
|
43
|
+
this.client = params.client;
|
|
44
|
+
this.getConfig = params.getConfig;
|
|
45
|
+
this.resolveState = params.resolveState;
|
|
46
|
+
}
|
|
47
|
+
start() {
|
|
48
|
+
this.stop();
|
|
49
|
+
this.running = true;
|
|
50
|
+
const tick = async () => {
|
|
51
|
+
if (!this.running)
|
|
52
|
+
return;
|
|
53
|
+
await this.evaluateNow();
|
|
54
|
+
if (!this.running)
|
|
55
|
+
return;
|
|
56
|
+
const intervalMs = Math.max(5_000, Math.floor(this.getConfig().intervalMs));
|
|
57
|
+
this.timer = setTimeout(() => {
|
|
58
|
+
void tick();
|
|
59
|
+
}, intervalMs);
|
|
60
|
+
};
|
|
61
|
+
this.timer = setTimeout(() => {
|
|
62
|
+
void tick();
|
|
63
|
+
}, 0);
|
|
64
|
+
}
|
|
65
|
+
stop() {
|
|
66
|
+
this.running = false;
|
|
67
|
+
if (!this.timer)
|
|
68
|
+
return;
|
|
69
|
+
clearTimeout(this.timer);
|
|
70
|
+
this.timer = null;
|
|
71
|
+
}
|
|
72
|
+
async setMaintenance() {
|
|
73
|
+
this.maintenance = true;
|
|
74
|
+
await this.evaluateNow();
|
|
75
|
+
}
|
|
76
|
+
async evaluateNow() {
|
|
77
|
+
const config = this.getConfig();
|
|
78
|
+
if (!this.client.user)
|
|
79
|
+
return;
|
|
80
|
+
if (!config.enabled && !this.maintenance)
|
|
81
|
+
return;
|
|
82
|
+
const state = this.maintenance ? 'maintenance' : this.resolveState();
|
|
83
|
+
const status = presenceStatusForState(state);
|
|
84
|
+
const activityText = state === 'maintenance' ? '' : presenceTextForState(config, state);
|
|
85
|
+
const activityType = toDiscordActivityType(config.activityType);
|
|
86
|
+
const fingerprint = `${state}:${status}:${activityType}:${activityText}`;
|
|
87
|
+
if (fingerprint === this.lastFingerprint)
|
|
88
|
+
return;
|
|
89
|
+
try {
|
|
90
|
+
if (state === 'maintenance') {
|
|
91
|
+
await this.client.user.setPresence({
|
|
92
|
+
status,
|
|
93
|
+
activities: [],
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
await this.client.user.setPresence({
|
|
98
|
+
status,
|
|
99
|
+
activities: activityText
|
|
100
|
+
? [{ name: activityText, type: activityType }]
|
|
101
|
+
: [],
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
this.lastFingerprint = fingerprint;
|
|
105
|
+
}
|
|
106
|
+
catch (error) {
|
|
107
|
+
logger.debug({ error, state }, 'Failed to update Discord presence');
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=presence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"presence.js","sourceRoot":"","sources":["../../../src/channels/discord/presence.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface RateLimitDecision {
|
|
2
|
+
allowed: boolean;
|
|
3
|
+
remaining: number;
|
|
4
|
+
retryAfterMs: number;
|
|
5
|
+
}
|
|
6
|
+
export declare class SlidingWindowRateLimiter {
|
|
7
|
+
private readonly windowMs;
|
|
8
|
+
private readonly buckets;
|
|
9
|
+
private readonly notifyAt;
|
|
10
|
+
constructor(windowMs?: number);
|
|
11
|
+
check(key: string, limit: number, nowMs?: number): RateLimitDecision;
|
|
12
|
+
shouldNotify(key: string, cooldownMs?: number, nowMs?: number): boolean;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=rate-limiter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../../src/channels/discord/rate-limiter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;gBAE1C,QAAQ,SAAS;IAI7B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,SAAa,GAAG,iBAAiB;IAkCxE,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,SAAS,EAAE,KAAK,SAAa,GAAG,OAAO;CAQ5E"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
export class SlidingWindowRateLimiter {
|
|
2
|
+
windowMs;
|
|
3
|
+
buckets = new Map();
|
|
4
|
+
notifyAt = new Map();
|
|
5
|
+
constructor(windowMs = 60_000) {
|
|
6
|
+
this.windowMs = Math.max(1_000, Math.floor(windowMs));
|
|
7
|
+
}
|
|
8
|
+
check(key, limit, nowMs = Date.now()) {
|
|
9
|
+
const boundedLimit = Math.max(0, Math.floor(limit));
|
|
10
|
+
if (!key || boundedLimit === 0) {
|
|
11
|
+
return {
|
|
12
|
+
allowed: true,
|
|
13
|
+
remaining: Number.POSITIVE_INFINITY,
|
|
14
|
+
retryAfterMs: 0,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
const cutoff = nowMs - this.windowMs;
|
|
18
|
+
const timestamps = this.buckets.get(key) ?? [];
|
|
19
|
+
const active = timestamps.filter((ts) => ts > cutoff);
|
|
20
|
+
if (active.length >= boundedLimit) {
|
|
21
|
+
this.buckets.set(key, active);
|
|
22
|
+
const oldest = active[0];
|
|
23
|
+
const retryAfterMs = Math.max(0, oldest + this.windowMs - nowMs);
|
|
24
|
+
return {
|
|
25
|
+
allowed: false,
|
|
26
|
+
remaining: 0,
|
|
27
|
+
retryAfterMs,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
active.push(nowMs);
|
|
31
|
+
this.buckets.set(key, active);
|
|
32
|
+
return {
|
|
33
|
+
allowed: true,
|
|
34
|
+
remaining: Math.max(0, boundedLimit - active.length),
|
|
35
|
+
retryAfterMs: 0,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
shouldNotify(key, cooldownMs = 10_000, nowMs = Date.now()) {
|
|
39
|
+
if (!key)
|
|
40
|
+
return true;
|
|
41
|
+
const boundedCooldown = Math.max(1_000, Math.floor(cooldownMs));
|
|
42
|
+
const nextAllowedAt = this.notifyAt.get(key) ?? 0;
|
|
43
|
+
if (nowMs < nextAllowedAt)
|
|
44
|
+
return false;
|
|
45
|
+
this.notifyAt.set(key, nowMs + boundedCooldown);
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=rate-limiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/channels/discord/rate-limiter.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,wBAAwB;IAClB,QAAQ,CAAS;IACjB,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IACtC,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEtD,YAAY,QAAQ,GAAG,MAAM;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,KAAa,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,MAAM,CAAC,iBAAiB;gBACnC,YAAY,EAAE,CAAC;aAChB,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;QAEtD,IAAI,MAAM,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC;YACjE,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,CAAC;gBACZ,YAAY;aACb,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9B,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;YACpD,YAAY,EAAE,CAAC;SAChB,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,GAAW,EAAE,UAAU,GAAG,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE;QAC/D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,KAAK,GAAG,aAAa;YAAE,OAAO,KAAK,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,eAAe,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { Message as DiscordMessage } from 'discord.js';
|
|
2
|
+
export type LifecyclePhase = 'queued' | 'thinking' | 'toolUse' | 'streaming' | 'done' | 'error';
|
|
3
|
+
export type DiscordRetryFn = <T>(label: string, fn: () => Promise<T>) => Promise<T>;
|
|
4
|
+
export declare function addAckReaction(params: {
|
|
5
|
+
message: DiscordMessage;
|
|
6
|
+
emoji: string;
|
|
7
|
+
withRetry: DiscordRetryFn;
|
|
8
|
+
botUserId: string;
|
|
9
|
+
}): Promise<() => Promise<void>>;
|
|
10
|
+
interface LifecycleReactionConfig {
|
|
11
|
+
enabled: boolean;
|
|
12
|
+
removeOnComplete: boolean;
|
|
13
|
+
phases: Record<LifecyclePhase, string>;
|
|
14
|
+
}
|
|
15
|
+
export declare class LifecycleReactionController {
|
|
16
|
+
private readonly message;
|
|
17
|
+
private readonly withRetry;
|
|
18
|
+
private readonly botUserId;
|
|
19
|
+
private readonly config;
|
|
20
|
+
private currentEmoji;
|
|
21
|
+
private currentPhase;
|
|
22
|
+
private queue;
|
|
23
|
+
private lastReactionAt;
|
|
24
|
+
constructor(params: {
|
|
25
|
+
message: DiscordMessage;
|
|
26
|
+
withRetry: DiscordRetryFn;
|
|
27
|
+
botUserId: string;
|
|
28
|
+
config: LifecycleReactionConfig;
|
|
29
|
+
});
|
|
30
|
+
setPhase(phase: LifecyclePhase): void;
|
|
31
|
+
clear(): Promise<void>;
|
|
32
|
+
private transitionToPhase;
|
|
33
|
+
private waitForReactionWindow;
|
|
34
|
+
private addReaction;
|
|
35
|
+
private removeReaction;
|
|
36
|
+
}
|
|
37
|
+
export {};
|
|
38
|
+
//# sourceMappingURL=reactions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reactions.d.ts","sourceRoot":"","sources":["../../../src/channels/discord/reactions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,YAAY,CAAC;AAI5D,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,UAAU,GACV,SAAS,GACT,WAAW,GACX,MAAM,GACN,OAAO,CAAC;AACZ,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,EAC7B,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KACjB,OAAO,CAAC,CAAC,CAAC,CAAC;AAwBhB,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CA0C/B;AAED,UAAU,uBAAuB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,cAAc,CAAK;gBAEf,MAAM,EAAE;QAClB,OAAO,EAAE,cAAc,CAAC;QACxB,SAAS,EAAE,cAAc,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,uBAAuB,CAAC;KACjC;IAOD,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI;IAqB/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YASd,iBAAiB;YAkBjB,qBAAqB;YAMrB,WAAW;YAoBX,cAAc;CAqB7B"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { logger } from '../../logger.js';
|
|
2
|
+
const MIN_REACTION_GAP_MS = 350;
|
|
3
|
+
const DONE_REACTION_VISIBILITY_MS = 1_000;
|
|
4
|
+
function sleep(ms) {
|
|
5
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
6
|
+
}
|
|
7
|
+
function findReactionByEmoji(message, emoji) {
|
|
8
|
+
const direct = message.reactions.resolve(emoji);
|
|
9
|
+
if (direct)
|
|
10
|
+
return direct;
|
|
11
|
+
const trimmed = emoji.trim();
|
|
12
|
+
if (!trimmed)
|
|
13
|
+
return null;
|
|
14
|
+
const fallback = message.reactions.cache.find((reaction) => reaction.emoji.toString() === trimmed || reaction.emoji.name === trimmed);
|
|
15
|
+
return fallback ?? null;
|
|
16
|
+
}
|
|
17
|
+
export async function addAckReaction(params) {
|
|
18
|
+
const reactionEmoji = params.emoji.trim();
|
|
19
|
+
if (!reactionEmoji) {
|
|
20
|
+
return async () => { };
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
await params.withRetry('reaction-ack-add', () => params.message.react(reactionEmoji));
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
logger.debug({
|
|
27
|
+
error,
|
|
28
|
+
channelId: params.message.channelId,
|
|
29
|
+
messageId: params.message.id,
|
|
30
|
+
reactionEmoji,
|
|
31
|
+
}, 'Failed to add ack reaction');
|
|
32
|
+
return async () => { };
|
|
33
|
+
}
|
|
34
|
+
return async () => {
|
|
35
|
+
try {
|
|
36
|
+
const reaction = findReactionByEmoji(params.message, reactionEmoji);
|
|
37
|
+
if (!reaction)
|
|
38
|
+
return;
|
|
39
|
+
await params.withRetry('reaction-ack-remove', () => reaction.users.remove(params.botUserId));
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
logger.debug({
|
|
43
|
+
error,
|
|
44
|
+
channelId: params.message.channelId,
|
|
45
|
+
messageId: params.message.id,
|
|
46
|
+
reactionEmoji,
|
|
47
|
+
}, 'Failed to remove ack reaction');
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
export class LifecycleReactionController {
|
|
52
|
+
message;
|
|
53
|
+
withRetry;
|
|
54
|
+
botUserId;
|
|
55
|
+
config;
|
|
56
|
+
currentEmoji = null;
|
|
57
|
+
currentPhase = null;
|
|
58
|
+
queue = Promise.resolve();
|
|
59
|
+
lastReactionAt = 0;
|
|
60
|
+
constructor(params) {
|
|
61
|
+
this.message = params.message;
|
|
62
|
+
this.withRetry = params.withRetry;
|
|
63
|
+
this.botUserId = params.botUserId;
|
|
64
|
+
this.config = params.config;
|
|
65
|
+
}
|
|
66
|
+
setPhase(phase) {
|
|
67
|
+
if (!this.config.enabled)
|
|
68
|
+
return;
|
|
69
|
+
if (this.currentPhase === phase)
|
|
70
|
+
return;
|
|
71
|
+
this.currentPhase = phase;
|
|
72
|
+
this.queue = this.queue
|
|
73
|
+
.then(async () => {
|
|
74
|
+
await this.transitionToPhase(phase);
|
|
75
|
+
})
|
|
76
|
+
.catch((error) => {
|
|
77
|
+
logger.debug({
|
|
78
|
+
error,
|
|
79
|
+
channelId: this.message.channelId,
|
|
80
|
+
messageId: this.message.id,
|
|
81
|
+
phase,
|
|
82
|
+
}, 'Lifecycle reaction transition failed');
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
async clear() {
|
|
86
|
+
if (!this.config.enabled)
|
|
87
|
+
return;
|
|
88
|
+
await this.queue;
|
|
89
|
+
if (!this.currentEmoji)
|
|
90
|
+
return;
|
|
91
|
+
await this.removeReaction(this.currentEmoji);
|
|
92
|
+
this.currentEmoji = null;
|
|
93
|
+
this.currentPhase = null;
|
|
94
|
+
}
|
|
95
|
+
async transitionToPhase(phase) {
|
|
96
|
+
const nextEmoji = (this.config.phases[phase] || '').trim();
|
|
97
|
+
if (!nextEmoji)
|
|
98
|
+
return;
|
|
99
|
+
if (this.currentEmoji && this.currentEmoji !== nextEmoji) {
|
|
100
|
+
await this.removeReaction(this.currentEmoji);
|
|
101
|
+
this.currentEmoji = null;
|
|
102
|
+
}
|
|
103
|
+
await this.addReaction(nextEmoji);
|
|
104
|
+
this.currentEmoji = nextEmoji;
|
|
105
|
+
if (phase === 'done' && this.config.removeOnComplete) {
|
|
106
|
+
await sleep(DONE_REACTION_VISIBILITY_MS);
|
|
107
|
+
await this.removeReaction(nextEmoji);
|
|
108
|
+
this.currentEmoji = null;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
async waitForReactionWindow() {
|
|
112
|
+
const elapsed = Date.now() - this.lastReactionAt;
|
|
113
|
+
if (elapsed >= MIN_REACTION_GAP_MS)
|
|
114
|
+
return;
|
|
115
|
+
await sleep(MIN_REACTION_GAP_MS - elapsed);
|
|
116
|
+
}
|
|
117
|
+
async addReaction(emoji) {
|
|
118
|
+
await this.waitForReactionWindow();
|
|
119
|
+
try {
|
|
120
|
+
await this.withRetry('reaction-lifecycle-add', () => this.message.react(emoji));
|
|
121
|
+
this.lastReactionAt = Date.now();
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
logger.debug({
|
|
125
|
+
error,
|
|
126
|
+
channelId: this.message.channelId,
|
|
127
|
+
messageId: this.message.id,
|
|
128
|
+
emoji,
|
|
129
|
+
}, 'Failed to add lifecycle reaction');
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
async removeReaction(emoji) {
|
|
133
|
+
await this.waitForReactionWindow();
|
|
134
|
+
try {
|
|
135
|
+
const reaction = findReactionByEmoji(this.message, emoji);
|
|
136
|
+
if (!reaction)
|
|
137
|
+
return;
|
|
138
|
+
await this.withRetry('reaction-lifecycle-remove', () => reaction.users.remove(this.botUserId));
|
|
139
|
+
this.lastReactionAt = Date.now();
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
logger.debug({
|
|
143
|
+
error,
|
|
144
|
+
channelId: this.message.channelId,
|
|
145
|
+
messageId: this.message.id,
|
|
146
|
+
emoji,
|
|
147
|
+
}, 'Failed to remove lifecycle reaction');
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=reactions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reactions.js","sourceRoot":"","sources":["../../../src/channels/discord/reactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { AttachmentBuilder, Client, type Message as DiscordMessage } from 'discord.js';
|
|
1
|
+
import { type AttachmentBuilder, Client, type Message as DiscordMessage } from 'discord.js';
|
|
2
|
+
import type { MediaContextItem } from '../../types.js';
|
|
2
3
|
import { type MentionLookup } from './mentions.js';
|
|
3
|
-
import { type
|
|
4
|
+
import { type LifecyclePhase } from './reactions.js';
|
|
4
5
|
import { DiscordStreamManager } from './stream.js';
|
|
5
|
-
import type
|
|
6
|
+
import { type DiscordToolActionRequest } from './tool-actions.js';
|
|
6
7
|
export type ReplyFn = (content: string, files?: AttachmentBuilder[]) => Promise<void>;
|
|
7
8
|
export interface MessageRunContext {
|
|
8
9
|
sourceMessage: DiscordMessage;
|
|
@@ -10,11 +11,13 @@ export interface MessageRunContext {
|
|
|
10
11
|
abortSignal: AbortSignal;
|
|
11
12
|
stream: DiscordStreamManager;
|
|
12
13
|
mentionLookup: MentionLookup;
|
|
14
|
+
emitLifecyclePhase: (phase: LifecyclePhase) => void;
|
|
13
15
|
}
|
|
14
16
|
export type MessageHandler = (sessionId: string, guildId: string | null, channelId: string, userId: string, username: string, content: string, media: MediaContextItem[], reply: ReplyFn, context: MessageRunContext) => Promise<void>;
|
|
15
17
|
export type CommandHandler = (sessionId: string, guildId: string | null, channelId: string, args: string[], reply: ReplyFn) => Promise<void>;
|
|
16
18
|
export declare function runDiscordToolAction(request: DiscordToolActionRequest): Promise<Record<string, unknown>>;
|
|
17
19
|
export declare function initDiscord(onMessage: MessageHandler, onCommand: CommandHandler): Client;
|
|
20
|
+
export declare function setDiscordMaintenancePresence(): Promise<void>;
|
|
18
21
|
/**
|
|
19
22
|
* Send a message to a channel by ID (used by scheduler).
|
|
20
23
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/channels/discord/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/channels/discord/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,MAAM,EACN,KAAK,OAAO,IAAI,cAAc,EAG/B,MAAM,YAAY,CAAC;AA2BpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAwBvD,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,eAAe,CAAC;AAMvB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,OAAO,GAAG,CACpB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,iBAAiB,EAAE,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;AAiBnB,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,cAAc,CAAC;IAC9B,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,MAAM,cAAc,GAAG,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,EAAE,EACzB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,iBAAiB,KACvB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,cAAc,GAAG,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,OAAO,KACX,OAAO,CAAC,IAAI,CAAC,CAAC;AAoYnB,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAElC;AAsiBD,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,cAAc,GACxB,MAAM,CAu7BR;AAED,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,IAAI,CAAC,CAGnE;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,iBAAiB,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|