cli-jaw 2.2.25 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -2
- package/dist/bin/cli-jaw.js +6 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/doctor.js +39 -18
- package/dist/bin/commands/doctor.js.map +1 -1
- package/dist/bin/commands/init.js +82 -23
- package/dist/bin/commands/init.js.map +1 -1
- package/dist/bin/commands/messaging.js +262 -0
- package/dist/bin/commands/messaging.js.map +1 -0
- package/dist/server.js +30 -6
- package/dist/server.js.map +1 -1
- package/dist/src/cli/commands.js +6 -2
- package/dist/src/cli/commands.js.map +1 -1
- package/dist/src/cli/handlers/remote-session-commands.js +94 -0
- package/dist/src/cli/handlers/remote-session-commands.js.map +1 -0
- package/dist/src/command-contract/catalog.js +1 -1
- package/dist/src/command-contract/catalog.js.map +1 -1
- package/dist/src/core/chat-sessions.js +4 -0
- package/dist/src/core/chat-sessions.js.map +1 -1
- package/dist/src/core/config.js +63 -22
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +6 -0
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/dispatch-approval-ingress.js +45 -3
- package/dist/src/core/dispatch-approval-ingress.js.map +1 -1
- package/dist/src/core/dispatch-approval.js +46 -0
- package/dist/src/core/dispatch-approval.js.map +1 -1
- package/dist/src/core/logger.js +67 -0
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/session-generation.js +74 -0
- package/dist/src/core/session-generation.js.map +1 -0
- package/dist/src/discord/bot.js +91 -5
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/commands.js +34 -1
- package/dist/src/discord/commands.js.map +1 -1
- package/dist/src/discord/forwarder.js +4 -1
- package/dist/src/discord/forwarder.js.map +1 -1
- package/dist/src/discord/send-only-client.js +14 -7
- package/dist/src/discord/send-only-client.js.map +1 -1
- package/dist/src/messaging/access-policy.js +26 -0
- package/dist/src/messaging/access-policy.js.map +1 -0
- package/dist/src/messaging/approval-presentation.js +89 -0
- package/dist/src/messaging/approval-presentation.js.map +1 -0
- package/dist/src/messaging/channel-adapter.js +47 -0
- package/dist/src/messaging/channel-adapter.js.map +1 -0
- package/dist/src/messaging/channel-capabilities.js +47 -15
- package/dist/src/messaging/channel-capabilities.js.map +1 -1
- package/dist/src/messaging/channel-health.js +23 -3
- package/dist/src/messaging/channel-health.js.map +1 -1
- package/dist/src/messaging/delivery-outcome.js +12 -0
- package/dist/src/messaging/delivery-outcome.js.map +1 -1
- package/dist/src/messaging/durable-ingress.js +458 -0
- package/dist/src/messaging/durable-ingress.js.map +1 -0
- package/dist/src/messaging/effect-once.js +204 -0
- package/dist/src/messaging/effect-once.js.map +1 -0
- package/dist/src/messaging/inbound-envelope.js +168 -0
- package/dist/src/messaging/inbound-envelope.js.map +1 -0
- package/dist/src/messaging/ingress-audit.js +41 -0
- package/dist/src/messaging/ingress-audit.js.map +1 -0
- package/dist/src/messaging/ingress-generation.js +22 -0
- package/dist/src/messaging/ingress-generation.js.map +1 -0
- package/dist/src/messaging/metrics.js +69 -0
- package/dist/src/messaging/metrics.js.map +1 -0
- package/dist/src/messaging/outbound-outbox.js +184 -0
- package/dist/src/messaging/outbound-outbox.js.map +1 -0
- package/dist/src/messaging/remote-command-context.js +30 -0
- package/dist/src/messaging/remote-command-context.js.map +1 -0
- package/dist/src/messaging/retry.js +11 -2
- package/dist/src/messaging/retry.js.map +1 -1
- package/dist/src/messaging/runtime.js +129 -30
- package/dist/src/messaging/runtime.js.map +1 -1
- package/dist/src/messaging/send.js +31 -6
- package/dist/src/messaging/send.js.map +1 -1
- package/dist/src/messaging/trace-context.js +56 -0
- package/dist/src/messaging/trace-context.js.map +1 -0
- package/dist/src/messaging/types.js +39 -1
- package/dist/src/messaging/types.js.map +1 -1
- package/dist/src/routes/orchestrate.js +10 -3
- package/dist/src/routes/orchestrate.js.map +1 -1
- package/dist/src/routes/settings.js +26 -1
- package/dist/src/routes/settings.js.map +1 -1
- package/dist/src/slack/bot.js +182 -70
- package/dist/src/slack/bot.js.map +1 -1
- package/dist/src/slack/commands.js +16 -1
- package/dist/src/slack/commands.js.map +1 -1
- package/dist/src/slack/format.js +4 -1
- package/dist/src/slack/format.js.map +1 -1
- package/dist/src/slack/manifest.js +5 -0
- package/dist/src/slack/manifest.js.map +1 -1
- package/dist/src/slack/send-handler.js +26 -4
- package/dist/src/slack/send-handler.js.map +1 -1
- package/dist/src/slack/send-only-client.js +26 -2
- package/dist/src/slack/send-only-client.js.map +1 -1
- package/dist/src/slack/socket.js +36 -13
- package/dist/src/slack/socket.js.map +1 -1
- package/dist/src/telegram/bot.js +122 -14
- package/dist/src/telegram/bot.js.map +1 -1
- package/package.json +4 -1
- package/public/dist/assets/ChannelEnablementControl-Da_t_jq6.js +1 -0
- package/public/dist/assets/ChannelsDiscord-kNjCCJcA.js +1 -0
- package/public/dist/assets/ChannelsSlack-BOuoCfeN.js +1 -0
- package/public/dist/assets/ChannelsTelegram-DBIFDz4R.js +1 -0
- package/public/dist/assets/{app-DUbf-v7B.js → app-TWwXw3iD.js} +4 -4
- package/public/dist/assets/bgtask-badge-BhzSqQHG.js +1 -0
- package/public/dist/assets/{bgtask-badge-jIH69Dp3.js → bgtask-badge-DaAUnoKD.js} +1 -1
- package/public/dist/assets/{employees-BNy8a6XX.js → employees-BFKkaVAe.js} +1 -1
- package/public/dist/assets/iframe-renderer-BxEzdKIA.js +1 -0
- package/public/dist/assets/{iframe-renderer-C6Zwg9w4.js → iframe-renderer-CvnKi77F.js} +2 -2
- package/public/dist/assets/{manager-DzCR6Pam.js → manager-BTpvAFwX.js} +1 -1
- package/public/dist/assets/memory-DHOtCiw5.js +1 -0
- package/public/dist/assets/{memory-C4O44HMr.js → memory-db_s-38T.js} +1 -1
- package/public/dist/assets/{message-history-DCxD21J1.js → message-history-BX9shNKA.js} +1 -1
- package/public/dist/assets/message-history-DaSxkyy0.js +1 -0
- package/public/dist/assets/{render-A--hkukv.js → render-DZnFK8Kv.js} +1 -1
- package/public/dist/assets/{settings-3ZdoKHIf.js → settings-BuFMKcQ-.js} +1 -1
- package/public/dist/assets/settings-DotRDITm.js +1 -0
- package/public/dist/assets/{settings-core-CQe1uP6x.js → settings-core-3fj0DVoa.js} +17 -17
- package/public/dist/assets/settings-core-DohSnMad.js +1 -0
- package/public/dist/assets/{sidebar-DxFp_449.js → sidebar-D5TP7TCO.js} +3 -3
- package/public/dist/assets/{skills-BU4q8Q8n.js → skills-CQzHFYJS.js} +1 -1
- package/public/dist/assets/skills-DZHEvl1x.js +1 -0
- package/public/dist/assets/{slash-commands-BiXOgZ5B.js → slash-commands-BWEWWf-c.js} +1 -1
- package/public/dist/assets/slash-commands-CuJdloNC.js +1 -0
- package/public/dist/assets/{trace-drawer-2BTQCor6.js → trace-drawer-CBR-PZB4.js} +1 -1
- package/public/dist/assets/ui-CWl27eMl.js +1 -0
- package/public/dist/assets/{ui-Csy42uNW.js → ui-Ca1Q-VFQ.js} +1 -1
- package/public/dist/index.html +1 -1
- package/public/dist/manager/index.html +1 -1
- package/public/js/features/settings-channel.ts +35 -5
- package/public/js/features/settings-types.ts +7 -0
- package/public/js/features/transport-status-row.ts +23 -4
- package/public/manager/src/settings/pages/ChannelsDiscord.tsx +39 -11
- package/public/manager/src/settings/pages/ChannelsSlack.tsx +24 -7
- package/public/manager/src/settings/pages/ChannelsTelegram.tsx +38 -10
- package/public/manager/src/settings/pages/components/ChannelEnablementControl.tsx +98 -0
- package/public/manager/src/settings/pages/components/TransportStatusChips.tsx +23 -2
- package/scripts/docs/extract-commands.mts +3 -0
- package/scripts/generate-channel-capability-table.mts +161 -0
- package/scripts/promote-to-main.sh +175 -0
- package/scripts/release-gates.mjs +57 -3
- package/scripts/release-preview.sh +19 -0
- package/scripts/require-release-evidence.mjs +35 -1
- package/scripts/validate-messaging-certification.mts +83 -0
- package/scripts/write-messaging-certification.mts +65 -0
- package/public/dist/assets/ChannelsDiscord-D4fD-9hP.js +0 -1
- package/public/dist/assets/ChannelsSlack-_KBwRonM.js +0 -1
- package/public/dist/assets/ChannelsTelegram-tihzSWVE.js +0 -1
- package/public/dist/assets/TransportStatusChips-B0NR0ljO.js +0 -1
- package/public/dist/assets/bgtask-badge-B8KhuBa7.js +0 -1
- package/public/dist/assets/iframe-renderer-DBmV8gCQ.js +0 -1
- package/public/dist/assets/memory-Dt_Ji6aP.js +0 -1
- package/public/dist/assets/message-history-DyISauiv.js +0 -1
- package/public/dist/assets/settings-C6Pku2GC.js +0 -1
- package/public/dist/assets/settings-core-DqwLJkgP.js +0 -1
- package/public/dist/assets/skills-x2gH-1Ry.js +0 -1
- package/public/dist/assets/slash-commands-s8eR7Kd1.js +0 -1
- package/public/dist/assets/ui-CB0L33o0.js +0 -1
- package/scripts/release.sh +0 -224
- /package/public/dist/assets/{HealthBadge-CUaJ1PQH.js → HealthBadge-CiNMS-1k.js} +0 -0
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
// Persistent conversation generation — not the process-local spawn owner token.
|
|
2
|
+
//
|
|
3
|
+
// `src/agent/session-persistence.ts` tracks whether *this process* still owns a
|
|
4
|
+
// running spawn (`globalGeneration` / `scopeGenerations`). That dies with the
|
|
5
|
+
// process. This module is the integer that survives a restart, lives on
|
|
6
|
+
// `chat_sessions.generation`, and is what a stale /approve callback will be
|
|
7
|
+
// checked against in M4-A2. The two numbers must not be added, compared, or
|
|
8
|
+
// migrated into each other.
|
|
9
|
+
let database = null;
|
|
10
|
+
export function initSessionGeneration(db) {
|
|
11
|
+
database = db;
|
|
12
|
+
}
|
|
13
|
+
export function __resetSessionGenerationForTests() {
|
|
14
|
+
database = null;
|
|
15
|
+
}
|
|
16
|
+
function requireDb() {
|
|
17
|
+
if (!database)
|
|
18
|
+
throw new Error('session-generation: initSessionGeneration() has not run');
|
|
19
|
+
return database;
|
|
20
|
+
}
|
|
21
|
+
function assertId(value, label) {
|
|
22
|
+
if (!value || typeof value !== 'string')
|
|
23
|
+
throw new Error(`session-generation: ${label} is required`);
|
|
24
|
+
return value;
|
|
25
|
+
}
|
|
26
|
+
export function readSessionGeneration(ref) {
|
|
27
|
+
const db = requireDb();
|
|
28
|
+
const row = db.prepare('SELECT generation FROM chat_sessions WHERE id = ?').get(assertId(ref.chatSessionId, 'chatSessionId'));
|
|
29
|
+
if (!row)
|
|
30
|
+
throw new Error(`session-generation: unknown session ${ref.chatSessionId}`);
|
|
31
|
+
return row.generation;
|
|
32
|
+
}
|
|
33
|
+
export function isCurrentSessionGeneration(ref, expected) {
|
|
34
|
+
return readSessionGeneration(ref) === expected;
|
|
35
|
+
}
|
|
36
|
+
export function bumpSessionGeneration(ref, _reason) {
|
|
37
|
+
const db = requireDb();
|
|
38
|
+
const chatSessionId = assertId(ref.chatSessionId, 'chatSessionId');
|
|
39
|
+
const run = db.transaction(() => {
|
|
40
|
+
const row = db.prepare('UPDATE chat_sessions SET generation = generation + 1, updated_at = CURRENT_TIMESTAMP WHERE id = ? RETURNING generation').get(chatSessionId);
|
|
41
|
+
if (!row)
|
|
42
|
+
throw new Error(`session-generation: unknown session ${chatSessionId}`);
|
|
43
|
+
return row.generation;
|
|
44
|
+
});
|
|
45
|
+
return run.immediate();
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Point one conversation at a session and reset that session to generation 0.
|
|
49
|
+
* `remote_session_bindings.chat_session_id` is UNIQUE, so a leftover binding on
|
|
50
|
+
* the target session has to leave in the same transaction or the upsert throws
|
|
51
|
+
* and two remotes would share one session.
|
|
52
|
+
*/
|
|
53
|
+
export function replaceRemoteSessionGeneration(conversationKey, nextChatSessionId) {
|
|
54
|
+
const db = requireDb();
|
|
55
|
+
const remoteKey = assertId(conversationKey, 'conversationKey');
|
|
56
|
+
const nextId = assertId(nextChatSessionId, 'nextChatSessionId');
|
|
57
|
+
const run = db.transaction(() => {
|
|
58
|
+
const exists = db.prepare('SELECT id FROM chat_sessions WHERE id = ?').get(nextId);
|
|
59
|
+
if (!exists)
|
|
60
|
+
throw new Error(`session-generation: unknown session ${nextId}`);
|
|
61
|
+
db.prepare('DELETE FROM remote_session_bindings WHERE chat_session_id = ? AND remote_key != ?').run(nextId, remoteKey);
|
|
62
|
+
db.prepare(`
|
|
63
|
+
INSERT INTO remote_session_bindings (remote_key, chat_session_id)
|
|
64
|
+
VALUES (?, ?)
|
|
65
|
+
ON CONFLICT(remote_key) DO UPDATE SET
|
|
66
|
+
chat_session_id = excluded.chat_session_id,
|
|
67
|
+
last_seen_at = CURRENT_TIMESTAMP
|
|
68
|
+
`).run(remoteKey, nextId);
|
|
69
|
+
db.prepare('UPDATE chat_sessions SET generation = 0, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(nextId);
|
|
70
|
+
return { generation: 0 };
|
|
71
|
+
});
|
|
72
|
+
return run.immediate();
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=session-generation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-generation.js","sourceRoot":"","sources":["../../../src/core/session-generation.ts"],"names":[],"mappings":"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"}
|
package/dist/src/discord/bot.js
CHANGED
|
@@ -8,9 +8,14 @@ import { orchestrateAndCollect } from '../orchestrator/collect.js';
|
|
|
8
8
|
import { isResetIntent } from '../orchestrator/pipeline.js';
|
|
9
9
|
import { addBroadcastListener, removeBroadcastListener } from '../core/bus.js';
|
|
10
10
|
import { saveUpload, buildMediaPromptMany } from '../agent/spawn.js';
|
|
11
|
-
import { setLastActiveTarget, setLatestSeenTarget, getLastActiveTarget } from '../messaging/runtime.js';
|
|
11
|
+
import { setLastActiveTarget, setLatestSeenTarget, getLastActiveTarget, transportStarted, transportNotStarted, } from '../messaging/runtime.js';
|
|
12
|
+
import { createHash } from 'node:crypto';
|
|
13
|
+
import { admitIngress, getIngressJournal, settleIngress, } from '../messaging/durable-ingress.js';
|
|
14
|
+
import { currentGenerationForEnvelope } from '../messaging/ingress-generation.js';
|
|
15
|
+
import { discordInboundEnvelope } from '../messaging/inbound-envelope.js';
|
|
12
16
|
import { t, normalizeLocale } from '../core/i18n.js';
|
|
13
|
-
import { handleApprovalCommand, registerProductionTransport } from '../core/dispatch-approval-ingress.js';
|
|
17
|
+
import { handleApprovalCommand, handleApprovalCallback, registerProductionTransport } from '../core/dispatch-approval-ingress.js';
|
|
18
|
+
import { parseApprovalCallbackData } from '../messaging/approval-presentation.js';
|
|
14
19
|
import { handleDiscordSlashCommand, registerDiscordSlashCommands } from './commands.js';
|
|
15
20
|
import { createDiscordForwarder, chunkDiscordMessage, relayDiscordImages } from './forwarder.js';
|
|
16
21
|
import { sendDiscordFile } from './discord-file.js';
|
|
@@ -191,6 +196,18 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
|
|
|
191
196
|
}
|
|
192
197
|
}
|
|
193
198
|
// ─── Init / Shutdown ────────────────────────────────
|
|
199
|
+
async function handleDiscordApprovalButton(interaction) {
|
|
200
|
+
const parsed = parseApprovalCallbackData(interaction.customId);
|
|
201
|
+
if (!parsed) {
|
|
202
|
+
await interaction.deferUpdate().catch(() => undefined);
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
await interaction.deferUpdate();
|
|
206
|
+
const result = handleApprovalCallback(discordApprovalIngress, { author: interaction.user }, parsed.opaqueId, parsed.action, { conversationKey: interaction.user.id, sessionGeneration: 0 });
|
|
207
|
+
const reply = result.approved ? 'approved' : (result.reason || 'rejected');
|
|
208
|
+
await interaction.editReply({ components: [] }).catch(() => undefined);
|
|
209
|
+
await interaction.followUp({ content: redactOutboundText(reply), ephemeral: true }).catch(() => undefined);
|
|
210
|
+
}
|
|
194
211
|
async function installDiscordGeneration(port, client) {
|
|
195
212
|
const messageHandler = (msg) => {
|
|
196
213
|
void handleDiscordMessage(client, msg, discordApprovalIngress).catch((error) => {
|
|
@@ -198,6 +215,12 @@ async function installDiscordGeneration(port, client) {
|
|
|
198
215
|
});
|
|
199
216
|
};
|
|
200
217
|
const interactionHandler = (interaction) => {
|
|
218
|
+
if (interaction.isButton()) {
|
|
219
|
+
void handleDiscordApprovalButton(interaction).catch((error) => {
|
|
220
|
+
log.error('[discord:approval]', logErrorText(error));
|
|
221
|
+
});
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
201
224
|
if (!interaction.isChatInputCommand())
|
|
202
225
|
return;
|
|
203
226
|
void handleDiscordSlashCommand(interaction).catch((error) => {
|
|
@@ -244,6 +267,48 @@ async function retireDiscordGeneration(port) {
|
|
|
244
267
|
if (discordClient === resources.client)
|
|
245
268
|
discordClient = null;
|
|
246
269
|
}
|
|
270
|
+
/**
|
|
271
|
+
* Journal the message before it is handled. Discord differs from the other two
|
|
272
|
+
* channels in where the account id comes from: `client.user.id` is null before READY
|
|
273
|
+
* and can change across reconnects, so it is read here at handler time rather than
|
|
274
|
+
* captured at startup.
|
|
275
|
+
*
|
|
276
|
+
* When it cannot be resolved the message is NOT admitted. Handling it would put work
|
|
277
|
+
* through a path whose durability record could not be written, and dropping it
|
|
278
|
+
* silently is what this milestone exists to stop; the gateway still has it and will
|
|
279
|
+
* redeliver on the next generation.
|
|
280
|
+
*/
|
|
281
|
+
function admitDiscordMessage(client, msg, target) {
|
|
282
|
+
const journal = getIngressJournal();
|
|
283
|
+
if (!journal)
|
|
284
|
+
return { admit: true, journaled: false };
|
|
285
|
+
const botUserId = client.user?.id;
|
|
286
|
+
if (!botUserId) {
|
|
287
|
+
log.warn(redactOutboundText(`[discord:ingress] bot identity unavailable — not admitting message ${msg.id}`));
|
|
288
|
+
return { admit: false, reason: 'already_handled' };
|
|
289
|
+
}
|
|
290
|
+
const envelope = discordInboundEnvelope({
|
|
291
|
+
botUserId,
|
|
292
|
+
messageId: msg.id,
|
|
293
|
+
channelId: msg.channelId,
|
|
294
|
+
authorId: msg.author.id,
|
|
295
|
+
guildId: msg.guildId,
|
|
296
|
+
isThread: msg.channel?.isThread?.() ?? false,
|
|
297
|
+
parentId: asThreadLike(msg.channel)?.parentId,
|
|
298
|
+
target,
|
|
299
|
+
});
|
|
300
|
+
const admission = admitIngress(journal, envelope, discordPayloadDigest(msg), undefined, envelope ? currentGenerationForEnvelope(envelope) : 0);
|
|
301
|
+
if (!admission.admit) {
|
|
302
|
+
log.info(redactOutboundText(`[discord:ingress] message ${msg.id} already handled — not re-running`));
|
|
303
|
+
}
|
|
304
|
+
return admission;
|
|
305
|
+
}
|
|
306
|
+
/** Identity of the message body. Never the body itself: the journal is not an archive. */
|
|
307
|
+
function discordPayloadDigest(msg) {
|
|
308
|
+
return createHash('sha256')
|
|
309
|
+
.update(JSON.stringify({ id: msg.id, content: msg.content ?? '', attachments: msg.attachments.size }))
|
|
310
|
+
.digest('hex');
|
|
311
|
+
}
|
|
247
312
|
export async function handleDiscordMessage(client, msg, transport = discordApprovalIngress) {
|
|
248
313
|
const approval = handleApprovalCommand(transport, {
|
|
249
314
|
...msg,
|
|
@@ -272,6 +337,13 @@ export async function handleDiscordMessage(client, msg, transport = discordAppro
|
|
|
272
337
|
}
|
|
273
338
|
markChannelActive(msg.channelId);
|
|
274
339
|
const target = buildDiscordTarget(msg);
|
|
340
|
+
// Durable record of this message. The seen-set above stays as the hot in-process
|
|
341
|
+
// filter; this is what survives a restart, which is the whole difference between
|
|
342
|
+
// Discord and the other two channels before M3.
|
|
343
|
+
const admission = admitDiscordMessage(client, msg, target);
|
|
344
|
+
if (!admission.admit)
|
|
345
|
+
return;
|
|
346
|
+
const settle = (error) => settleIngress(getIngressJournal(), admission, error);
|
|
275
347
|
setLastActiveTarget('discord', target);
|
|
276
348
|
setLatestSeenTarget('discord', target);
|
|
277
349
|
let normalizedText = msg.content?.trim() || '';
|
|
@@ -284,6 +356,8 @@ export async function handleDiscordMessage(client, msg, transport = discordAppro
|
|
|
284
356
|
if (saved.length === 0) {
|
|
285
357
|
const warning = buildAttachmentFailureWarning(failed) || '❌ No attachment could be processed';
|
|
286
358
|
await msg.reply(warning).catch(() => { });
|
|
359
|
+
// The user was told; there is nothing left to retry on redelivery.
|
|
360
|
+
settle();
|
|
287
361
|
return;
|
|
288
362
|
}
|
|
289
363
|
const prompt = buildMediaPromptMany(saved.map(item => item.filePath), normalizedText);
|
|
@@ -294,16 +368,20 @@ export async function handleDiscordMessage(client, msg, transport = discordAppro
|
|
|
294
368
|
if (warning)
|
|
295
369
|
await msg.reply(warning).catch(() => { });
|
|
296
370
|
dcOrchestrate(msg, prompt, fileLabel).catch(e => log.error('[discord:orchestrate]', logErrorText(e)));
|
|
371
|
+
settle();
|
|
297
372
|
}
|
|
298
373
|
catch (error) {
|
|
299
374
|
log.error('[discord:attachment]', logErrorText(error));
|
|
300
375
|
await msg.reply(`❌ ${userErrorText(error)}`).catch(() => { });
|
|
376
|
+
settle(error);
|
|
301
377
|
}
|
|
302
378
|
return;
|
|
303
379
|
}
|
|
304
380
|
const text = normalizedText;
|
|
305
|
-
if (!text)
|
|
381
|
+
if (!text) {
|
|
382
|
+
settle();
|
|
306
383
|
return;
|
|
384
|
+
}
|
|
307
385
|
log.info(`[discord:in] ${msg.channelId}: ${redactOutboundText(text).slice(0, 80)}`);
|
|
308
386
|
// Reset intent: use submitMessage gateway for consistency
|
|
309
387
|
if (isResetIntent(text)) {
|
|
@@ -314,9 +392,11 @@ export async function handleDiscordMessage(client, msg, transport = discordAppro
|
|
|
314
392
|
else {
|
|
315
393
|
await msg.reply(t('tg.resetDone', {}, currentLocale()));
|
|
316
394
|
}
|
|
395
|
+
settle();
|
|
317
396
|
return;
|
|
318
397
|
}
|
|
319
398
|
dcOrchestrate(msg, text, text).catch(e => log.error('[discord:orchestrate]', logErrorText(e)));
|
|
399
|
+
settle();
|
|
320
400
|
}
|
|
321
401
|
function observeGatewaySnapshot(snapshot) {
|
|
322
402
|
if (snapshot.lastEventCode === lastGatewayEventCode)
|
|
@@ -336,14 +416,14 @@ function observeGatewaySnapshot(snapshot) {
|
|
|
336
416
|
export async function initDiscord() {
|
|
337
417
|
if (dcInitLock) {
|
|
338
418
|
log.warn('[discord] initDiscord already in progress, skipping');
|
|
339
|
-
return;
|
|
419
|
+
return transportNotStarted('superseded');
|
|
340
420
|
}
|
|
341
421
|
dcInitLock = true;
|
|
342
422
|
try {
|
|
343
423
|
await shutdownDiscord();
|
|
344
424
|
if (!settings["discord"]?.enabled || !settings["discord"]?.token) {
|
|
345
425
|
log.info('[discord] ⏭️ Discord pending (disabled or no token)');
|
|
346
|
-
return;
|
|
426
|
+
return transportNotStarted('not_configured');
|
|
347
427
|
}
|
|
348
428
|
const supervisor = new DiscordGatewaySupervisor({
|
|
349
429
|
token: settings["discord"].token,
|
|
@@ -371,6 +451,12 @@ export async function initDiscord() {
|
|
|
371
451
|
gatewaySupervisor = supervisor;
|
|
372
452
|
discordApprovalIngress = createDiscordGatewayIngress();
|
|
373
453
|
await supervisor.start();
|
|
454
|
+
// ACCEPTED, not ready. start() resolves once replaceClient has been issued, and
|
|
455
|
+
// replaceClient swallows a login failure into scheduleReplacement('login_failed')
|
|
456
|
+
// instead of rethrowing; the message handler is installed later by
|
|
457
|
+
// onGenerationReady. Readiness belongs to channel health — do not "fix" this
|
|
458
|
+
// into a guarantee the supervisor never makes.
|
|
459
|
+
return transportStarted;
|
|
374
460
|
}
|
|
375
461
|
finally {
|
|
376
462
|
dcInitLock = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../../src/discord/bot.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../../../src/discord/bot.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,13 @@
|
|
|
2
2
|
// Guild-scoped command registration + execution.
|
|
3
3
|
import { REST, Routes, SlashCommandBuilder } from 'discord.js';
|
|
4
4
|
import { settings } from '../core/config.js';
|
|
5
|
+
import { getActiveChatSession, resolveOrCreateRemoteSession } from '../core/chat-sessions.js';
|
|
6
|
+
import { withSessionScope } from '../core/session-context.js';
|
|
7
|
+
import { buildRemoteBindingKey } from '../messaging/session-key.js';
|
|
8
|
+
import { channelGateOn, scopeForChatSession } from '../orchestrator/scope.js';
|
|
5
9
|
import { stripUndefined } from '../core/strip-undefined.js';
|
|
6
10
|
import { parseCommand, executeCommand } from '../cli/commands.js';
|
|
11
|
+
import { authorizePrivilegedRemote, isPrivilegedRemoteCommand } from '../cli/handlers/remote-session-commands.js';
|
|
7
12
|
import { makeCommandCtx } from '../cli/command-context.js';
|
|
8
13
|
import { normalizeLocale } from '../core/i18n.js';
|
|
9
14
|
import { resetFallbackState } from '../agent/spawn.js';
|
|
@@ -68,7 +73,35 @@ export async function handleDiscordSlashCommand(interaction) {
|
|
|
68
73
|
return;
|
|
69
74
|
}
|
|
70
75
|
await interaction.deferReply();
|
|
71
|
-
const
|
|
76
|
+
const multiSessionEnabled = settings["multiSession"]?.enabled === true;
|
|
77
|
+
const gateOn = multiSessionEnabled && channelGateOn('discord');
|
|
78
|
+
const peerKind = interaction.guildId ? 'channel' : 'direct';
|
|
79
|
+
const target = stripUndefined({
|
|
80
|
+
channel: 'discord',
|
|
81
|
+
targetKind: 'channel',
|
|
82
|
+
peerKind,
|
|
83
|
+
targetId: interaction.channelId,
|
|
84
|
+
guildId: interaction.guildId ?? undefined,
|
|
85
|
+
});
|
|
86
|
+
const remoteKey = multiSessionEnabled && gateOn ? buildRemoteBindingKey(target) : undefined;
|
|
87
|
+
const chatSessionId = multiSessionEnabled && !gateOn
|
|
88
|
+
? 'default'
|
|
89
|
+
: remoteKey ? resolveOrCreateRemoteSession(remoteKey) : getActiveChatSession();
|
|
90
|
+
const scope = scopeForChatSession(chatSessionId, remoteKey, gateOn);
|
|
91
|
+
const cmdName = parsed.type === 'known' ? (parsed.cmd?.name ?? parsed.name) : parsed.name;
|
|
92
|
+
if (isPrivilegedRemoteCommand(cmdName)) {
|
|
93
|
+
const auth = authorizePrivilegedRemote(cmdName, {
|
|
94
|
+
channel: 'discord',
|
|
95
|
+
actorId: interaction.user.id,
|
|
96
|
+
conversationKey: remoteKey || interaction.channelId,
|
|
97
|
+
chatSessionId,
|
|
98
|
+
});
|
|
99
|
+
if (!auth.ok) {
|
|
100
|
+
await interaction.editReply(redactOutboundText(auth.text));
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
const result = await withSessionScope({ scope, chatSessionId }, () => executeCommand(parsed, makeDiscordCommandCtx()));
|
|
72
105
|
if (result?.steerPrompt) {
|
|
73
106
|
await interaction.editReply(redactOutboundText(result.text || 'Redirecting...'));
|
|
74
107
|
const channel = asSendable(interaction.channel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/discord/commands.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/discord/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,10 @@ export async function relayDiscordImages(client, target, text) {
|
|
|
39
39
|
* Discord text passes through this function, and masking per call site is how
|
|
40
40
|
* the audit kept finding one that had been missed.
|
|
41
41
|
*/
|
|
42
|
-
|
|
42
|
+
/** Discord's hard per-message ceiling. Exported so the capability declaration is
|
|
43
|
+
* derived from the limit that actually chunks, not a second copy of the number. */
|
|
44
|
+
export const DISCORD_MESSAGE_LIMIT = 2000;
|
|
45
|
+
export function chunkDiscordMessage(text, limit = DISCORD_MESSAGE_LIMIT) {
|
|
43
46
|
return chunkFenceAware(redactOutboundText(text), limit);
|
|
44
47
|
}
|
|
45
48
|
export function createDiscordForwarder(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../../src/discord/forwarder.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,mDAAmD;AAGnD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,MAAc,EACd,MAAoB,EACpB,IAAY;IAEZ,KAAK,MAAM,SAAS,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,kBAAkB,CAC/B,SAAS,EACT,QAAQ,CAAC,YAAY,CAAC,IAAI,SAAS,EACnC,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,CAClC,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACb,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE;oBAC1C,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,eAAe;iBACzC,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE;gBACtC,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;aAC7B,CAAC,CAAC;QACP,CAAC;IACL,CAAC;AACL,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY,EAAE,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../../src/discord/forwarder.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,9 +40,12 @@ function sendResult(result) {
|
|
|
40
40
|
...('status' in result && result.status !== undefined ? { status: result.status } : {}),
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
|
-
export async function sendDiscordTextRest(token, channelId, text) {
|
|
43
|
+
export async function sendDiscordTextRest(token, channelId, text, extra) {
|
|
44
44
|
const chunks = chunkDiscordMessage(text);
|
|
45
|
-
for (const chunk of chunks) {
|
|
45
|
+
for (const [index, chunk] of chunks.entries()) {
|
|
46
|
+
const body = { content: chunk };
|
|
47
|
+
if (index === 0 && extra?.components)
|
|
48
|
+
body['components'] = extra.components;
|
|
46
49
|
const result = await schedulerFor(token).schedule({
|
|
47
50
|
method: 'POST',
|
|
48
51
|
path: `/channels/${encodeURIComponent(channelId)}/messages`,
|
|
@@ -50,7 +53,7 @@ export async function sendDiscordTextRest(token, channelId, text) {
|
|
|
50
53
|
majorKey: channelId,
|
|
51
54
|
makeInit: () => ({
|
|
52
55
|
headers: { 'Content-Type': 'application/json' },
|
|
53
|
-
body: JSON.stringify(
|
|
56
|
+
body: JSON.stringify(body),
|
|
54
57
|
}),
|
|
55
58
|
parse: async () => undefined,
|
|
56
59
|
});
|
|
@@ -76,15 +79,19 @@ export async function openDiscordDm(token, userId, fetchImpl) {
|
|
|
76
79
|
return { ok: false, error: result.ok ? 'discord_dm_channel_missing' : result.failure.message };
|
|
77
80
|
return { ok: true, channelId: result.value.id };
|
|
78
81
|
}
|
|
79
|
-
export async function sendDiscordDm(token, userId, text, fetchImpl) {
|
|
82
|
+
export async function sendDiscordDm(token, userId, text, fetchImpl, extra) {
|
|
80
83
|
const dm = await openDiscordDm(token, userId, fetchImpl);
|
|
81
84
|
if (!dm.ok)
|
|
82
85
|
return { ok: false, failure: discordDeliveryError({ channel: 'discord', message: dm.error, dispatched: false }), error: dm.error };
|
|
83
86
|
if (!fetchImpl)
|
|
84
|
-
return sendDiscordTextRest(token, dm.channelId, text);
|
|
87
|
+
return sendDiscordTextRest(token, dm.channelId, text, extra);
|
|
85
88
|
const scheduler = new DiscordRestScheduler({ token, fetchImpl });
|
|
86
|
-
|
|
87
|
-
|
|
89
|
+
const chunks = chunkDiscordMessage(text);
|
|
90
|
+
for (const [index, chunk] of chunks.entries()) {
|
|
91
|
+
const body = { content: chunk };
|
|
92
|
+
if (index === 0 && extra?.components)
|
|
93
|
+
body['components'] = extra.components;
|
|
94
|
+
const result = await scheduler.schedule({ method: 'POST', path: `/channels/${encodeURIComponent(dm.channelId)}/messages`, routeKey: 'POST:/channels/:channel/messages', majorKey: dm.channelId, makeInit: () => ({ headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }), parse: async () => undefined });
|
|
88
95
|
if (!result.ok)
|
|
89
96
|
return sendResult(result);
|
|
90
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-only-client.js","sourceRoot":"","sources":["../../../src/discord/send-only-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACH,oBAAoB,GAEvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,oBAAoB,GAEvB,MAAM,kCAAkC,CAAC;AAM1C,IAAI,eAAe,GAA8D,IAAI,CAAC;AAEtF,MAAM,UAAU,2BAA2B;IACvC,eAAe,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IACnC,eAAe,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,oBAAoB;IAChC,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACpE,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzE,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC;AAMD,SAAS,YAAY,CAAC,KAAa;IAC/B,IAAI,eAAe,EAAE,KAAK,KAAK,KAAK;QAAE,OAAO,eAAe,CAAC,SAAS,CAAC;IACvE,eAAe,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,eAAe,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACvC,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,UAAU,CAAI,MAA4B;IAC/C,IAAI,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACnC,OAAO;QACH,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;QAC7B,GAAG,CAAC,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1F,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACrC,KAAa,EACb,SAAiB,EACjB,IAAY;
|
|
1
|
+
{"version":3,"file":"send-only-client.js","sourceRoot":"","sources":["../../../src/discord/send-only-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
// Messaging access policy substrate (M4-A0).
|
|
2
|
+
//
|
|
3
|
+
// No production caller in this milestone — the same shape as the M3a journal
|
|
4
|
+
// before any transport imported it. M4-A1 is what will ask this module whether
|
|
5
|
+
// a remote actor may run /stop or /approve. Until then the tests are the only
|
|
6
|
+
// clients, and default-deny is the only safe unused default.
|
|
7
|
+
const DEFAULT_POLICY = { mode: 'deny' };
|
|
8
|
+
export function evaluateMessagingAccess(request, policy = DEFAULT_POLICY) {
|
|
9
|
+
if (!request.actorId || !request.conversationKey)
|
|
10
|
+
return 'deny';
|
|
11
|
+
switch (policy.mode) {
|
|
12
|
+
case 'all':
|
|
13
|
+
return 'allow';
|
|
14
|
+
case 'allowlist':
|
|
15
|
+
return policy.allowlist?.includes(request.actorId) ? 'allow' : 'deny';
|
|
16
|
+
case 'paired':
|
|
17
|
+
return request.actorId === request.pairedActorId
|
|
18
|
+
&& request.conversationKey === request.pairedConversationKey
|
|
19
|
+
? 'allow'
|
|
20
|
+
: 'deny';
|
|
21
|
+
case 'deny':
|
|
22
|
+
default:
|
|
23
|
+
return 'deny';
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=access-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access-policy.js","sourceRoot":"","sources":["../../../src/messaging/access-policy.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,EAAE;AACF,6EAA6E;AAC7E,+EAA+E;AAC/E,8EAA8E;AAC9E,6DAA6D;AAkB7D,MAAM,cAAc,GAA0B,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAE/D,MAAM,UAAU,uBAAuB,CACnC,OAA+B,EAC/B,SAAgC,cAAc;IAE9C,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe;QAAE,OAAO,MAAM,CAAC;IAChE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,KAAK;YACN,OAAO,OAAO,CAAC;QACnB,KAAK,WAAW;YACZ,OAAO,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1E,KAAK,QAAQ;YACT,OAAO,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,aAAa;mBACzC,OAAO,CAAC,eAAe,KAAK,OAAO,CAAC,qBAAqB;gBAC5D,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,MAAM,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ;YACI,OAAO,MAAM,CAAC;IACtB,CAAC;AACL,CAAC"}
|