cli-jaw 2.2.18 → 2.2.20
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 +106 -3
- package/dist/bin/cli-jaw.js +1 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/dispatch.js +14 -4
- package/dist/bin/commands/dispatch.js.map +1 -1
- package/dist/bin/commands/service.js +322 -222
- package/dist/bin/commands/service.js.map +1 -1
- package/dist/bin/postinstall.js +20 -4
- package/dist/bin/postinstall.js.map +1 -1
- package/dist/server.js +39 -2
- package/dist/server.js.map +1 -1
- package/dist/src/agent/spawn/process-kill.js +96 -2
- package/dist/src/agent/spawn/process-kill.js.map +1 -1
- package/dist/src/agent/spawn.js +35 -77
- package/dist/src/agent/spawn.js.map +1 -1
- package/dist/src/bgtask/runner.js +26 -21
- package/dist/src/bgtask/runner.js.map +1 -1
- package/dist/src/cli/acp-client.js +11 -5
- package/dist/src/cli/acp-client.js.map +1 -1
- package/dist/src/cli/cli-status-worker.js +59 -6
- package/dist/src/cli/cli-status-worker.js.map +1 -1
- package/dist/src/cli/employee-handler.js +3 -2
- package/dist/src/cli/employee-handler.js.map +1 -1
- package/dist/src/code-mode/acp-host.js +22 -10
- package/dist/src/code-mode/acp-host.js.map +1 -1
- package/dist/src/core/cli-detect.js +54 -8
- package/dist/src/core/cli-detect.js.map +1 -1
- package/dist/src/core/config.js +24 -0
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +16 -0
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/employees.js +22 -4
- package/dist/src/core/employees.js.map +1 -1
- package/dist/src/core/instance-lifecycle.js +120 -0
- package/dist/src/core/instance-lifecycle.js.map +1 -0
- package/dist/src/core/runtime-path.js +92 -12
- package/dist/src/core/runtime-path.js.map +1 -1
- package/dist/src/core/runtime-settings.js +4 -1
- package/dist/src/core/runtime-settings.js.map +1 -1
- package/dist/src/core/settings-watch.js +12 -1
- package/dist/src/core/settings-watch.js.map +1 -1
- package/dist/src/core/windows-shell.js +63 -0
- package/dist/src/core/windows-shell.js.map +1 -0
- package/dist/src/discord/bot.js +199 -147
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/gateway-supervisor.js +303 -0
- package/dist/src/discord/gateway-supervisor.js.map +1 -0
- package/dist/src/discord/rest-scheduler.js +448 -0
- package/dist/src/discord/rest-scheduler.js.map +1 -0
- package/dist/src/discord/send-only-client.js +59 -43
- package/dist/src/discord/send-only-client.js.map +1 -1
- package/dist/src/manager/lifecycle.js +7 -2
- package/dist/src/manager/lifecycle.js.map +1 -1
- package/dist/src/manager/notes/capabilities.js +9 -7
- package/dist/src/manager/notes/capabilities.js.map +1 -1
- package/dist/src/memory/bootstrap.js +5 -1
- package/dist/src/memory/bootstrap.js.map +1 -1
- package/dist/src/memory/host-toolchain.js +156 -0
- package/dist/src/memory/host-toolchain.js.map +1 -0
- package/dist/src/messaging/channel-capabilities.js +30 -0
- package/dist/src/messaging/channel-capabilities.js.map +1 -0
- package/dist/src/messaging/delivery-outcome.js +73 -0
- package/dist/src/messaging/delivery-outcome.js.map +1 -0
- package/dist/src/messaging/draft-stream.js +154 -0
- package/dist/src/messaging/draft-stream.js.map +1 -0
- package/dist/src/messaging/runtime.js +3 -9
- package/dist/src/messaging/runtime.js.map +1 -1
- package/dist/src/messaging/send.js +40 -8
- package/dist/src/messaging/send.js.map +1 -1
- package/dist/src/messaging/types.js +22 -1
- package/dist/src/messaging/types.js.map +1 -1
- package/dist/src/notes/search.js +31 -6
- package/dist/src/notes/search.js.map +1 -1
- package/dist/src/prompt/builder.js +169 -13
- package/dist/src/prompt/builder.js.map +1 -1
- package/dist/src/prompt/conversation-context.js +23 -0
- package/dist/src/prompt/conversation-context.js.map +1 -0
- package/dist/src/prompt/templates/a1-system.md +28 -12
- package/dist/src/prompt/templates/control-system.md +19 -6
- package/dist/src/prompt/templates/employee.md +16 -3
- package/dist/src/routes/settings.js +8 -1
- package/dist/src/routes/settings.js.map +1 -1
- package/dist/src/routes/system.js +5 -1
- package/dist/src/routes/system.js.map +1 -1
- package/dist/src/routes/wiki.js +17 -12
- package/dist/src/routes/wiki.js.map +1 -1
- package/dist/src/search/coordinator.js +13 -5
- package/dist/src/search/coordinator.js.map +1 -1
- package/dist/src/search/provider.js.map +1 -1
- package/dist/src/search/providers/wiki.js +17 -9
- package/dist/src/search/providers/wiki.js.map +1 -1
- package/dist/src/security/path-guards.js +124 -27
- package/dist/src/security/path-guards.js.map +1 -1
- package/dist/src/slack/api.js +38 -5
- package/dist/src/slack/api.js.map +1 -1
- package/dist/src/slack/bot.js +214 -35
- package/dist/src/slack/bot.js.map +1 -1
- package/dist/src/slack/context.js +192 -0
- package/dist/src/slack/context.js.map +1 -0
- package/dist/src/slack/conversation.js +275 -0
- package/dist/src/slack/conversation.js.map +1 -0
- package/dist/src/slack/enrichment-cache.js +334 -0
- package/dist/src/slack/enrichment-cache.js.map +1 -0
- package/dist/src/slack/history.js +47 -8
- package/dist/src/slack/history.js.map +1 -1
- package/dist/src/slack/identity.js +99 -190
- package/dist/src/slack/identity.js.map +1 -1
- package/dist/src/slack/ingress.js +78 -2
- package/dist/src/slack/ingress.js.map +1 -1
- package/dist/src/slack/manifest.js +14 -3
- package/dist/src/slack/manifest.js.map +1 -1
- package/dist/src/slack/progress.js +39 -51
- package/dist/src/slack/progress.js.map +1 -1
- package/dist/src/slack/thread-tracker.js +78 -0
- package/dist/src/slack/thread-tracker.js.map +1 -1
- package/dist/src/telegram/bot.js +105 -56
- package/dist/src/telegram/bot.js.map +1 -1
- package/dist/src/telegram/update-offset.js +152 -0
- package/dist/src/telegram/update-offset.js.map +1 -0
- package/dist/src/wiki/config.js +42 -14
- package/dist/src/wiki/config.js.map +1 -1
- package/dist/src/wiki/prompt.js +2 -2
- package/dist/src/wiki/prompt.js.map +1 -1
- package/package.json +1 -1
- package/public/dist/assets/Agent-C5EvX-_v.js +1 -0
- package/public/dist/assets/{app-DqSJmDwP.js → app-is76CHGZ.js} +4 -4
- package/public/dist/assets/{bgtask-badge-D6XYRFI5.js → bgtask-badge-B0B1nXUs.js} +1 -1
- package/public/dist/assets/bgtask-badge-B2jUZ5mC.js +1 -0
- package/public/dist/assets/{employees-B_wKPfTO.js → employees-eiW0cC8z.js} +1 -1
- package/public/dist/assets/{iframe-renderer-D1-zDg8V.js → iframe-renderer-C7qQJX4c.js} +2 -2
- package/public/dist/assets/iframe-renderer-D7PB_yrC.js +1 -0
- package/public/dist/assets/{manager-Bjuh1jpq.js → manager-CP-Au860.js} +1 -1
- package/public/dist/assets/{memory-CNUpXWEC.js → memory--Q8Tb5SZ.js} +1 -1
- package/public/dist/assets/memory-rsKN0aa2.js +1 -0
- package/public/dist/assets/message-history-BttkY77h.js +1 -0
- package/public/dist/assets/{message-history-DB1rynP-.js → message-history-CfAHmCDW.js} +1 -1
- package/public/dist/assets/{render-DXwQzjsJ.js → render-BDso7Yb5.js} +1 -1
- package/public/dist/assets/{settings-CXndjCad.js → settings-CqnIqxkG.js} +1 -1
- package/public/dist/assets/{settings-core-t5yYVRrv.js → settings-core-BxuFkt4a.js} +4 -4
- package/public/dist/assets/settings-core-CdZ7oKhM.js +1 -0
- package/public/dist/assets/settings-pPMHNs0G.js +1 -0
- package/public/dist/assets/{sidebar-DgIj-LuT.js → sidebar-BNT58qR0.js} +3 -3
- package/public/dist/assets/{skills-QqxjqDHg.js → skills-CwRBcm3m.js} +1 -1
- package/public/dist/assets/skills-DiVoaVdS.js +1 -0
- package/public/dist/assets/slash-commands-Bx4saHwR.js +1 -0
- package/public/dist/assets/{slash-commands-B2V_jngP.js → slash-commands-cm0U58n7.js} +1 -1
- package/public/dist/assets/{trace-drawer-CBe9nRjS.js → trace-drawer-BuwO4m2P.js} +1 -1
- package/public/dist/assets/{ui-CDozpEQt.js → ui-C-LHMki1.js} +1 -1
- package/public/dist/assets/ui-XPQDPe-5.js +1 -0
- package/public/dist/index.html +1 -1
- package/public/dist/manager/index.html +1 -1
- package/public/js/features/channel-onboarding.ts +8 -5
- package/public/locales/en.json +3 -2
- package/public/locales/ja.json +3 -2
- package/public/locales/ko.json +3 -2
- package/public/locales/zh.json +3 -2
- package/public/manager/src/settings/cli-status-polling.ts +84 -0
- package/public/manager/src/settings/pages/Agent.tsx +84 -5
- package/scripts/install-officecli.ps1 +38 -2
- package/scripts/install-officecli.sh +28 -0
- package/scripts/install.ps1 +1 -1
- package/public/dist/assets/Agent-nMPZsMfN.js +0 -1
- package/public/dist/assets/bgtask-badge-CjWz0F6U.js +0 -1
- package/public/dist/assets/iframe-renderer-qRVLHPnT.js +0 -1
- package/public/dist/assets/memory-CcWGiPy_.js +0 -1
- package/public/dist/assets/message-history-BamMPUnL.js +0 -1
- package/public/dist/assets/settings-RGpifFHy.js +0 -1
- package/public/dist/assets/settings-core-X_5UHfr3.js +0 -1
- package/public/dist/assets/skills-CbwIimit.js +0 -1
- package/public/dist/assets/slash-commands-tCNRlNTC.js +0 -1
- package/public/dist/assets/ui-o-VpvrSv.js +0 -1
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
export async function startDraftStream(transport, initialText, options) {
|
|
2
|
+
const now = options.now ?? Date.now;
|
|
3
|
+
const setTimer = options.setTimer ?? setTimeout;
|
|
4
|
+
const clearTimer = options.clearTimer ?? clearTimeout;
|
|
5
|
+
const report = (operation, error) => {
|
|
6
|
+
try {
|
|
7
|
+
options.onError?.(operation, error);
|
|
8
|
+
}
|
|
9
|
+
catch {
|
|
10
|
+
// Diagnostics are best-effort too.
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
let draftHandle = null;
|
|
14
|
+
let state = 'active';
|
|
15
|
+
let lastSentText = null;
|
|
16
|
+
// Match Slack's current behavior: the first update is immediately eligible.
|
|
17
|
+
let lastEditAt = now() - options.minEditIntervalMs;
|
|
18
|
+
let pendingText = null;
|
|
19
|
+
let timer = null;
|
|
20
|
+
let inFlight = null;
|
|
21
|
+
let terminalOperation = null;
|
|
22
|
+
try {
|
|
23
|
+
draftHandle = await transport.post(initialText);
|
|
24
|
+
if (draftHandle)
|
|
25
|
+
lastSentText = initialText;
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
report('post', error);
|
|
29
|
+
draftHandle = null;
|
|
30
|
+
}
|
|
31
|
+
const clearScheduledFlush = () => {
|
|
32
|
+
if (!timer)
|
|
33
|
+
return;
|
|
34
|
+
clearTimer(timer);
|
|
35
|
+
timer = null;
|
|
36
|
+
};
|
|
37
|
+
const removeDraft = async () => {
|
|
38
|
+
const handle = draftHandle;
|
|
39
|
+
draftHandle = null;
|
|
40
|
+
pendingText = null;
|
|
41
|
+
if (!handle)
|
|
42
|
+
return;
|
|
43
|
+
try {
|
|
44
|
+
await transport.remove(handle);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
report('remove', error);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
const editText = async (text) => {
|
|
51
|
+
const handle = draftHandle;
|
|
52
|
+
if (!handle)
|
|
53
|
+
return false;
|
|
54
|
+
if (text === lastSentText)
|
|
55
|
+
return true;
|
|
56
|
+
// Failed attempts are rate-limited too, preventing a tight retry loop.
|
|
57
|
+
lastEditAt = now();
|
|
58
|
+
try {
|
|
59
|
+
await transport.edit(handle, text);
|
|
60
|
+
lastSentText = text;
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
report('edit', error);
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
const flushPending = async () => {
|
|
69
|
+
if (state !== 'active' || !draftHandle || pendingText === null)
|
|
70
|
+
return false;
|
|
71
|
+
const text = pendingText;
|
|
72
|
+
pendingText = null;
|
|
73
|
+
const operation = editText(text);
|
|
74
|
+
inFlight = operation;
|
|
75
|
+
try {
|
|
76
|
+
return await operation;
|
|
77
|
+
}
|
|
78
|
+
finally {
|
|
79
|
+
if (inFlight === operation)
|
|
80
|
+
inFlight = null;
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const schedule = () => {
|
|
84
|
+
if (state !== 'active' || !draftHandle || pendingText === null || timer || inFlight)
|
|
85
|
+
return;
|
|
86
|
+
const waitMs = Math.max(0, options.minEditIntervalMs - (now() - lastEditAt));
|
|
87
|
+
timer = setTimer(() => {
|
|
88
|
+
timer = null;
|
|
89
|
+
void flushPending().finally(() => schedule());
|
|
90
|
+
}, waitMs);
|
|
91
|
+
timer.unref?.();
|
|
92
|
+
};
|
|
93
|
+
return {
|
|
94
|
+
update(text) {
|
|
95
|
+
if (state !== 'active' || !draftHandle || !text)
|
|
96
|
+
return;
|
|
97
|
+
if (text === pendingText || (pendingText === null && text === lastSentText))
|
|
98
|
+
return;
|
|
99
|
+
pendingText = text;
|
|
100
|
+
schedule();
|
|
101
|
+
},
|
|
102
|
+
async finalize(text) {
|
|
103
|
+
if (state === 'finalized')
|
|
104
|
+
return true;
|
|
105
|
+
if (state === 'discarded' || !draftHandle)
|
|
106
|
+
return false;
|
|
107
|
+
if (terminalOperation)
|
|
108
|
+
return await terminalOperation;
|
|
109
|
+
state = 'finalizing';
|
|
110
|
+
terminalOperation = (async () => {
|
|
111
|
+
clearScheduledFlush();
|
|
112
|
+
if (inFlight)
|
|
113
|
+
await inFlight;
|
|
114
|
+
if (!draftHandle) {
|
|
115
|
+
state = 'discarded';
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
pendingText = null;
|
|
119
|
+
if (text.length > options.maxChars) {
|
|
120
|
+
state = 'discarded';
|
|
121
|
+
await removeDraft();
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
// Finalization deliberately bypasses the edit interval.
|
|
125
|
+
const committed = await editText(text);
|
|
126
|
+
if (committed) {
|
|
127
|
+
state = 'finalized';
|
|
128
|
+
return true;
|
|
129
|
+
}
|
|
130
|
+
state = 'discarded';
|
|
131
|
+
await removeDraft();
|
|
132
|
+
return false;
|
|
133
|
+
})();
|
|
134
|
+
return await terminalOperation;
|
|
135
|
+
},
|
|
136
|
+
async discard() {
|
|
137
|
+
if (state === 'discarded' || state === 'finalized')
|
|
138
|
+
return;
|
|
139
|
+
if (terminalOperation) {
|
|
140
|
+
await terminalOperation;
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
state = 'discarded';
|
|
144
|
+
clearScheduledFlush();
|
|
145
|
+
if (inFlight)
|
|
146
|
+
await inFlight;
|
|
147
|
+
await removeDraft();
|
|
148
|
+
},
|
|
149
|
+
handle() {
|
|
150
|
+
return draftHandle;
|
|
151
|
+
},
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
//# sourceMappingURL=draft-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"draft-stream.js","sourceRoot":"","sources":["../../../src/messaging/draft-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Active channel runtime lifecycle: init, shutdown, restart.
|
|
3
3
|
// Transport modules register themselves via registerTransport() to avoid circular deps.
|
|
4
4
|
import { settings, saveSettings } from '../core/config.js';
|
|
5
|
+
import { isRemoteTarget } from './types.js';
|
|
5
6
|
import { log } from '../core/logger.js';
|
|
6
7
|
import { logErrorText } from './redact.js';
|
|
7
8
|
const transports = new Map();
|
|
@@ -62,13 +63,6 @@ function persistTargetsNow() {
|
|
|
62
63
|
log.warn('[messaging:persist]', logErrorText(e));
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
|
-
/** Check if a target has the minimum required shape */
|
|
66
|
-
function isValidTarget(t) {
|
|
67
|
-
return !!t && typeof t === 'object'
|
|
68
|
-
&& typeof t.channel === 'string'
|
|
69
|
-
&& typeof t.targetId === 'string'
|
|
70
|
-
&& t.targetId.length > 0;
|
|
71
|
-
}
|
|
72
66
|
/** Hydrate target state from persisted settings.messaging (skip malformed) */
|
|
73
67
|
export function hydrateTargetsFromSettings(s) {
|
|
74
68
|
const messaging = s?.["messaging"];
|
|
@@ -76,11 +70,11 @@ export function hydrateTargetsFromSettings(s) {
|
|
|
76
70
|
return;
|
|
77
71
|
for (const ch of ['telegram', 'discord', 'slack']) {
|
|
78
72
|
const la = messaging.lastActive?.[ch];
|
|
79
|
-
if (
|
|
73
|
+
if (isRemoteTarget(la) && la.channel === ch) {
|
|
80
74
|
lastActiveTargets.set(ch, la);
|
|
81
75
|
}
|
|
82
76
|
const ls = messaging.latestSeen?.[ch];
|
|
83
|
-
if (
|
|
77
|
+
if (isRemoteTarget(ls) && ls.channel === ch) {
|
|
84
78
|
latestSeenTargets.set(ch, ls);
|
|
85
79
|
}
|
|
86
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/messaging/runtime.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,6DAA6D;AAC7D,wFAAwF;AAExF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/messaging/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import { settings } from '../core/config.js';
|
|
4
4
|
import { stripUndefined } from '../core/strip-undefined.js';
|
|
5
5
|
import { assertSendFilePath } from '../security/path-guards.js';
|
|
6
|
+
import { isRemoteTarget } from './types.js';
|
|
6
7
|
import { getLastActiveTarget, getLatestSeenTarget, clearTargetState } from './runtime.js';
|
|
7
8
|
import { slackTargetFromId, slackPeerKind } from './slack-target.js';
|
|
8
9
|
import { applyOutputPolicy } from '../core/policy-hooks.js';
|
|
@@ -14,8 +15,8 @@ export function registerSendTransport(channel, fn) {
|
|
|
14
15
|
sendFns.set(channel, fn);
|
|
15
16
|
}
|
|
16
17
|
// ─── Normalize ──────────────────────────────────────
|
|
17
|
-
function badRequest(code) {
|
|
18
|
-
return Object.assign(new Error(
|
|
18
|
+
function badRequest(code, message = code) {
|
|
19
|
+
return Object.assign(new Error(message), { statusCode: 400, code });
|
|
19
20
|
}
|
|
20
21
|
function normalizeOutboundType(value) {
|
|
21
22
|
const type = value == null || value === ''
|
|
@@ -31,6 +32,9 @@ function normalizeChannel(value) {
|
|
|
31
32
|
? 'active'
|
|
32
33
|
: String(value).trim().toLowerCase();
|
|
33
34
|
if (!CHANNELS.has(channel)) {
|
|
35
|
+
if (/^[CDG][A-Z0-9]+$/i.test(channel)) {
|
|
36
|
+
throw badRequest('invalid_channel', 'invalid_channel: channel is a transport; use channel:"slack" with chat_id or target.targetId for a Slack conversation id');
|
|
37
|
+
}
|
|
34
38
|
throw badRequest('invalid_channel');
|
|
35
39
|
}
|
|
36
40
|
return channel;
|
|
@@ -98,7 +102,7 @@ function getConfiguredFallbackTarget(channel) {
|
|
|
98
102
|
* Returns true if the target is valid for the given channel.
|
|
99
103
|
*/
|
|
100
104
|
export function validateTarget(target, channel, options = {}) {
|
|
101
|
-
if (!target
|
|
105
|
+
if (!isRemoteTarget(target))
|
|
102
106
|
return false;
|
|
103
107
|
if (target.channel !== channel)
|
|
104
108
|
return false;
|
|
@@ -155,6 +159,31 @@ function targetFromChatId(channel, chatId) {
|
|
|
155
159
|
export function validateExplicitChatId(channel, chatId) {
|
|
156
160
|
return validateTarget(targetFromChatId(channel, chatId), channel, { requireConfiguredAllowlist: true });
|
|
157
161
|
}
|
|
162
|
+
function sameSlackDestination(explicit, known) {
|
|
163
|
+
if (!isRemoteTarget(known) || known.channel !== 'slack')
|
|
164
|
+
return false;
|
|
165
|
+
if (!validateTarget(known, 'slack'))
|
|
166
|
+
return false;
|
|
167
|
+
if (explicit.targetId !== known.targetId)
|
|
168
|
+
return false;
|
|
169
|
+
if (explicit.threadId != null && explicit.threadId !== known.threadId)
|
|
170
|
+
return false;
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
173
|
+
function authorizeExplicitTarget(target, channel) {
|
|
174
|
+
if (!isRemoteTarget(target) || target.channel !== channel)
|
|
175
|
+
return null;
|
|
176
|
+
if (validateTarget(target, channel, { requireConfiguredAllowlist: true }))
|
|
177
|
+
return target;
|
|
178
|
+
if (channel !== 'slack' || settings["slack"]?.channelIds?.length)
|
|
179
|
+
return null;
|
|
180
|
+
for (const known of [getLastActiveTarget('slack'), getLatestSeenTarget('slack')]) {
|
|
181
|
+
if (known && sameSlackDestination(target, known)) {
|
|
182
|
+
return target.threadId == null && known.threadId != null ? known : target;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
return null;
|
|
186
|
+
}
|
|
158
187
|
export async function sendChannelOutput(req) {
|
|
159
188
|
const channel = resolveChannel(req);
|
|
160
189
|
if (!OUTBOUND_TYPES.has(req.type)) {
|
|
@@ -162,19 +191,22 @@ export async function sendChannelOutput(req) {
|
|
|
162
191
|
}
|
|
163
192
|
if (req.chatId != null && String(req.chatId).trim()) {
|
|
164
193
|
const explicitTarget = targetFromChatId(channel, req.chatId);
|
|
165
|
-
if (!validateTarget(explicitTarget, channel, { requireConfiguredAllowlist: true })) {
|
|
166
|
-
return { ok: false, status: 403, error: `Explicit ${channel} chatId is not in the configured allowlist` };
|
|
167
|
-
}
|
|
168
194
|
if (req.target && (req.target.targetId !== explicitTarget.targetId || req.target.channel !== explicitTarget.channel)) {
|
|
169
195
|
return { ok: false, status: 400, error: 'chatId and target refer to different destinations' };
|
|
170
196
|
}
|
|
171
|
-
|
|
197
|
+
const authorized = authorizeExplicitTarget(req.target || explicitTarget, channel);
|
|
198
|
+
if (!authorized) {
|
|
199
|
+
return { ok: false, status: 403, error: `Explicit ${channel} chatId is not configured or the current active conversation` };
|
|
200
|
+
}
|
|
201
|
+
req.target = authorized;
|
|
172
202
|
}
|
|
173
203
|
// Validate explicit target (shape + allowlist)
|
|
174
204
|
if (req.target) {
|
|
175
|
-
|
|
205
|
+
const authorized = authorizeExplicitTarget(req.target, channel);
|
|
206
|
+
if (!authorized) {
|
|
176
207
|
return { ok: false, status: 403, error: `Invalid or disallowed target for ${channel}: ${req.target.targetId || '(empty)'}` };
|
|
177
208
|
}
|
|
209
|
+
req.target = authorized;
|
|
178
210
|
}
|
|
179
211
|
// Resolve target: explicit > validated lastActive > validated latestSeen > configured fallback > error
|
|
180
212
|
if (!req.target) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/messaging/send.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,qDAAqD;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/messaging/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,27 @@
|
|
|
1
1
|
// ─── Messaging Types ─────────────────────────────────
|
|
2
2
|
// Canonical type model for multi-channel messaging runtime.
|
|
3
3
|
// Phase 0 spec → Phase 1 implementation.
|
|
4
|
-
|
|
4
|
+
const MESSENGER_CHANNELS = new Set(['telegram', 'discord', 'slack']);
|
|
5
|
+
const REMOTE_TARGET_KINDS = new Set(['user', 'channel']);
|
|
6
|
+
const REMOTE_PEER_KINDS = new Set(['direct', 'group', 'channel']);
|
|
7
|
+
/** Validate persisted or network-derived target data before it becomes routing authority. */
|
|
8
|
+
export function isRemoteTarget(value) {
|
|
9
|
+
if (!value || typeof value !== 'object')
|
|
10
|
+
return false;
|
|
11
|
+
const target = value;
|
|
12
|
+
if (!MESSENGER_CHANNELS.has(target['channel']))
|
|
13
|
+
return false;
|
|
14
|
+
if (!REMOTE_TARGET_KINDS.has(target['targetKind']))
|
|
15
|
+
return false;
|
|
16
|
+
if (!REMOTE_PEER_KINDS.has(target['peerKind']))
|
|
17
|
+
return false;
|
|
18
|
+
if (typeof target['targetId'] !== 'string' || !target['targetId'].trim())
|
|
19
|
+
return false;
|
|
20
|
+
for (const field of ['threadId', 'guildId', 'parentTargetId']) {
|
|
21
|
+
if (target[field] != null && typeof target[field] !== 'string')
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
5
26
|
// targetId is always string. Legacy number chatIds are String()-converted at ingest.
|
|
6
27
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/messaging/types.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,4DAA4D;AAC5D,yCAAyC
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/messaging/types.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,4DAA4D;AAC5D,yCAAyC;AA8BzC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AACvF,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAC3E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AAElF,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAAC,KAAc;IACzC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAqB,CAAC;QAAE,OAAO,KAAK,CAAC;IACjF,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAqB,CAAC;QAAE,OAAO,KAAK,CAAC;IACrF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAmB,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/E,IAAI,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IACvF,KAAK,MAAM,KAAK,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,gBAAgB,CAAU,EAAE,CAAC;QACrE,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;IACjF,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,qFAAqF"}
|
package/dist/src/notes/search.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import { existsSync, readdirSync } from 'node:fs';
|
|
2
|
+
import { accessSync, constants as fsConstants, existsSync, readdirSync } from 'node:fs';
|
|
3
3
|
import { readdir as readDir } from 'node:fs/promises';
|
|
4
4
|
import { homedir } from 'node:os';
|
|
5
|
-
import { isAbsolute, join, posix, relative, resolve, sep } from 'node:path';
|
|
5
|
+
import { extname, isAbsolute, join, posix, relative, resolve, sep } from 'node:path';
|
|
6
|
+
import { ownProcess } from '../agent/spawn/process-kill.js';
|
|
6
7
|
import { hasReservedNoteSegment, NOTES_RESERVED_DIRS } from './constants.js';
|
|
7
8
|
import { isPathInside, NOTE_FILE_EXT, notePathError } from './path-guards.js';
|
|
8
9
|
const MIN_QUERY_LENGTH = 2;
|
|
@@ -164,6 +165,29 @@ export function resolveRipgrepCommand() {
|
|
|
164
165
|
return configured;
|
|
165
166
|
return findBundledRipgrep() || 'rg';
|
|
166
167
|
}
|
|
168
|
+
export function isRipgrepAvailable(command = resolveRipgrepCommand(), env = process.env, platform = process.platform) {
|
|
169
|
+
const isWindows = platform === 'win32';
|
|
170
|
+
const listDelimiter = isWindows ? ';' : ':';
|
|
171
|
+
// Windows has no execute bit: presence is the only honest check there.
|
|
172
|
+
const mode = isWindows ? fsConstants.F_OK : fsConstants.X_OK;
|
|
173
|
+
const canExecute = (candidate) => {
|
|
174
|
+
try {
|
|
175
|
+
accessSync(candidate, mode);
|
|
176
|
+
return true;
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
return false;
|
|
180
|
+
}
|
|
181
|
+
};
|
|
182
|
+
if (isAbsolute(command) || command.includes('/') || command.includes('\\')) {
|
|
183
|
+
return canExecute(resolve(command));
|
|
184
|
+
}
|
|
185
|
+
const pathText = env['PATH'] ?? env['Path'] ?? env['path'] ?? '';
|
|
186
|
+
const extensions = isWindows && !extname(command)
|
|
187
|
+
? (env['PATHEXT'] ?? '.COM;.EXE;.BAT;.CMD').split(';').filter(Boolean)
|
|
188
|
+
: [''];
|
|
189
|
+
return pathText.split(listDelimiter).filter(Boolean).some(dir => extensions.some(extension => canExecute(resolve(dir, `${command}${extension}`))));
|
|
190
|
+
}
|
|
167
191
|
function pushMatch(root, rawLine, results, limit, skipPaths) {
|
|
168
192
|
if (results.length >= limit || !rawLine.trim())
|
|
169
193
|
return;
|
|
@@ -219,6 +243,7 @@ export async function searchNotes(root, rawQuery, options = {}) {
|
|
|
219
243
|
shell: false,
|
|
220
244
|
env: { ...process.env, RIPGREP_CONFIG_PATH: '' },
|
|
221
245
|
});
|
|
246
|
+
const ownedChild = ownProcess(child, options.ownedProcessOptions);
|
|
222
247
|
let settled = false;
|
|
223
248
|
let outputBytes = 0;
|
|
224
249
|
let stderr = '';
|
|
@@ -235,7 +260,7 @@ export async function searchNotes(root, rawQuery, options = {}) {
|
|
|
235
260
|
resolvePromise(value || results);
|
|
236
261
|
};
|
|
237
262
|
const timer = setTimeout(() => {
|
|
238
|
-
|
|
263
|
+
ownedChild.terminate('timeout');
|
|
239
264
|
finish(notePathError(504, 'notes_search_timeout', 'notes search timed out'));
|
|
240
265
|
}, timeoutMs);
|
|
241
266
|
child.stdout?.setEncoding('utf8');
|
|
@@ -246,7 +271,7 @@ export async function searchNotes(root, rawQuery, options = {}) {
|
|
|
246
271
|
const text = String(chunk);
|
|
247
272
|
outputBytes += Buffer.byteLength(text);
|
|
248
273
|
if (outputBytes > MAX_OUTPUT_BYTES) {
|
|
249
|
-
|
|
274
|
+
ownedChild.terminate('output-limit');
|
|
250
275
|
finish(notePathError(413, 'notes_search_output_too_large', 'notes search output was too large'));
|
|
251
276
|
return;
|
|
252
277
|
}
|
|
@@ -257,7 +282,7 @@ export async function searchNotes(root, rawQuery, options = {}) {
|
|
|
257
282
|
lineBuffer = lineBuffer.slice(newline + 1);
|
|
258
283
|
if (results.length >= limit) {
|
|
259
284
|
killedForLimit = true;
|
|
260
|
-
|
|
285
|
+
ownedChild.terminate('completion');
|
|
261
286
|
finish(undefined, results);
|
|
262
287
|
return;
|
|
263
288
|
}
|
|
@@ -267,7 +292,7 @@ export async function searchNotes(root, rawQuery, options = {}) {
|
|
|
267
292
|
child.stderr?.on('data', chunk => {
|
|
268
293
|
stderr += String(chunk);
|
|
269
294
|
if (Buffer.byteLength(stderr) > MAX_OUTPUT_BYTES) {
|
|
270
|
-
|
|
295
|
+
ownedChild.terminate('output-limit');
|
|
271
296
|
finish(notePathError(413, 'notes_search_output_too_large', 'notes search output was too large'));
|
|
272
297
|
}
|
|
273
298
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/notes/search.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/notes/search.ts"],"names":[],"mappings":"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"}
|