botmux 2.2.7 → 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.en.md +63 -13
- package/README.md +52 -14
- package/dist/adapters/cli/aiden.d.ts.map +1 -1
- package/dist/adapters/cli/aiden.js +0 -40
- package/dist/adapters/cli/aiden.js.map +1 -1
- package/dist/adapters/cli/claude-code.d.ts.map +1 -1
- package/dist/adapters/cli/claude-code.js +21 -67
- package/dist/adapters/cli/claude-code.js.map +1 -1
- package/dist/adapters/cli/coco.d.ts.map +1 -1
- package/dist/adapters/cli/coco.js +0 -33
- package/dist/adapters/cli/coco.js.map +1 -1
- package/dist/adapters/cli/codex.d.ts.map +1 -1
- package/dist/adapters/cli/codex.js +0 -27
- package/dist/adapters/cli/codex.js.map +1 -1
- package/dist/adapters/cli/gemini.d.ts.map +1 -1
- package/dist/adapters/cli/gemini.js +1 -29
- package/dist/adapters/cli/gemini.js.map +1 -1
- package/dist/adapters/cli/opencode.d.ts.map +1 -1
- package/dist/adapters/cli/opencode.js +1 -44
- package/dist/adapters/cli/opencode.js.map +1 -1
- package/dist/adapters/cli/types.d.ts +11 -8
- package/dist/adapters/cli/types.d.ts.map +1 -1
- package/dist/cli.js +737 -16
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +16 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +30 -0
- package/dist/config.js.map +1 -1
- package/dist/core/command-handler.d.ts.map +1 -1
- package/dist/core/command-handler.js +8 -4
- package/dist/core/command-handler.js.map +1 -1
- package/dist/core/scheduler.d.ts +38 -16
- package/dist/core/scheduler.d.ts.map +1 -1
- package/dist/core/scheduler.js +335 -149
- package/dist/core/scheduler.js.map +1 -1
- package/dist/core/session-manager.d.ts +6 -0
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +105 -16
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/types.d.ts +26 -4
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +6 -0
- package/dist/core/types.js.map +1 -1
- package/dist/core/worker-pool.d.ts +15 -3
- package/dist/core/worker-pool.d.ts.map +1 -1
- package/dist/core/worker-pool.js +233 -31
- package/dist/core/worker-pool.js.map +1 -1
- package/dist/daemon.d.ts.map +1 -1
- package/dist/daemon.js +49 -10
- package/dist/daemon.js.map +1 -1
- package/dist/im/lark/card-builder.d.ts +29 -1
- package/dist/im/lark/card-builder.d.ts.map +1 -1
- package/dist/im/lark/card-builder.js +240 -55
- package/dist/im/lark/card-builder.js.map +1 -1
- package/dist/im/lark/card-handler.d.ts +1 -0
- package/dist/im/lark/card-handler.d.ts.map +1 -1
- package/dist/im/lark/card-handler.js +200 -40
- package/dist/im/lark/card-handler.js.map +1 -1
- package/dist/services/schedule-store.d.ts +20 -3
- package/dist/services/schedule-store.d.ts.map +1 -1
- package/dist/services/schedule-store.js +140 -16
- package/dist/services/schedule-store.js.map +1 -1
- package/dist/skills/definitions.d.ts +17 -0
- package/dist/skills/definitions.d.ts.map +1 -0
- package/dist/skills/definitions.js +254 -0
- package/dist/skills/definitions.js.map +1 -0
- package/dist/skills/installer.d.ts +9 -0
- package/dist/skills/installer.d.ts.map +1 -0
- package/dist/skills/installer.js +42 -0
- package/dist/skills/installer.js.map +1 -0
- package/dist/types.d.ts +80 -7
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +1 -5
- package/dist/types.js.map +1 -1
- package/dist/utils/lark-upload.d.ts +2 -0
- package/dist/utils/lark-upload.d.ts.map +1 -0
- package/dist/utils/lark-upload.js +27 -0
- package/dist/utils/lark-upload.js.map +1 -0
- package/dist/utils/screen-analyzer.d.ts +67 -0
- package/dist/utils/screen-analyzer.d.ts.map +1 -0
- package/dist/utils/screen-analyzer.js +256 -0
- package/dist/utils/screen-analyzer.js.map +1 -0
- package/dist/utils/screenshot-renderer.d.ts +11 -0
- package/dist/utils/screenshot-renderer.d.ts.map +1 -0
- package/dist/utils/screenshot-renderer.js +225 -0
- package/dist/utils/screenshot-renderer.js.map +1 -0
- package/dist/utils/terminal-renderer.d.ts +33 -0
- package/dist/utils/terminal-renderer.d.ts.map +1 -1
- package/dist/utils/terminal-renderer.js +33 -0
- package/dist/utils/terminal-renderer.js.map +1 -1
- package/dist/worker.js +283 -14
- package/dist/worker.js.map +1 -1
- package/package.json +2 -5
- package/dist/index.d.ts +0 -3
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js +0 -16
- package/dist/index.js.map +0 -1
- package/dist/server.d.ts +0 -3
- package/dist/server.d.ts.map +0 -1
- package/dist/server.js +0 -133
- package/dist/server.js.map +0 -1
- package/dist/tools/get-thread-messages.d.ts +0 -26
- package/dist/tools/get-thread-messages.d.ts.map +0 -1
- package/dist/tools/get-thread-messages.js +0 -38
- package/dist/tools/get-thread-messages.js.map +0 -1
- package/dist/tools/index.d.ts +0 -9
- package/dist/tools/index.d.ts.map +0 -1
- package/dist/tools/index.js +0 -10
- package/dist/tools/index.js.map +0 -1
- package/dist/tools/list-bots.d.ts +0 -40
- package/dist/tools/list-bots.d.ts.map +0 -1
- package/dist/tools/list-bots.js +0 -77
- package/dist/tools/list-bots.js.map +0 -1
- package/dist/tools/send-to-thread.d.ts +0 -46
- package/dist/tools/send-to-thread.d.ts.map +0 -1
- package/dist/tools/send-to-thread.js +0 -275
- package/dist/tools/send-to-thread.js.map +0 -1
|
@@ -7,13 +7,13 @@ import { execSync } from 'node:child_process';
|
|
|
7
7
|
import { config } from '../../config.js';
|
|
8
8
|
import { getBot, getAllBots } from '../../bot-registry.js';
|
|
9
9
|
import { sendUserMessage, updateMessage, deleteMessage } from './client.js';
|
|
10
|
-
import { buildSessionCard, buildStreamingCard, getCliDisplayName } from './card-builder.js';
|
|
10
|
+
import { buildSessionCard, buildStreamingCard, buildTuiPromptCard, buildTuiPromptProcessingCard, buildTuiPromptResolvedCard, getCliDisplayName } from './card-builder.js';
|
|
11
11
|
import { logger } from '../../utils/logger.js';
|
|
12
12
|
import * as sessionStore from '../../services/session-store.js';
|
|
13
13
|
import { loadFrozenCards, saveFrozenCards } from '../../services/frozen-card-store.js';
|
|
14
14
|
import { forkWorker, killWorker, scheduleCardPatch } from '../../core/worker-pool.js';
|
|
15
|
-
import { getSessionWorkingDir, buildNewTopicPrompt, getAvailableBots } from '../../core/session-manager.js';
|
|
16
|
-
import { sessionKey } from '../../core/types.js';
|
|
15
|
+
import { getSessionWorkingDir, buildNewTopicPrompt, getAvailableBots, persistStreamCardState } from '../../core/session-manager.js';
|
|
16
|
+
import { sessionKey, frozenDisplayMode } from '../../core/types.js';
|
|
17
17
|
// ─── Helpers ──────────────────────────────────────────────────────────────
|
|
18
18
|
function tag(ds) {
|
|
19
19
|
return ds.session.sessionId.substring(0, 8);
|
|
@@ -29,7 +29,7 @@ export async function handleCardAction(data, deps, larkAppId) {
|
|
|
29
29
|
// Use the receiving bot's allowedUsers — the operator open_id in card actions
|
|
30
30
|
// is scoped to the app that received the callback.
|
|
31
31
|
const operatorOpenId = data?.operator?.open_id;
|
|
32
|
-
const isSensitive = value?.action && ['restart', 'close', 'skip_repo', 'get_write_link', 'toggle_stream', 'takeover', 'disconnect'].includes(value.action);
|
|
32
|
+
const isSensitive = value?.action && ['restart', 'close', 'skip_repo', 'get_write_link', 'toggle_stream', 'toggle_display', 'toggle_mode', 'term_action', 'takeover', 'disconnect', 'tui_keys', 'tui_text_input'].includes(value.action);
|
|
33
33
|
if (isSensitive) {
|
|
34
34
|
const rootId = value?.root_id;
|
|
35
35
|
const ds = rootId ? activeSessions.get(rootId) : undefined;
|
|
@@ -126,6 +126,14 @@ export async function handleCardAction(data, deps, larkAppId) {
|
|
|
126
126
|
ds.streamCardPending = undefined;
|
|
127
127
|
ds.lastScreenContent = undefined;
|
|
128
128
|
ds.lastScreenStatus = undefined;
|
|
129
|
+
ds.session.streamCardId = undefined;
|
|
130
|
+
ds.session.streamCardNonce = undefined;
|
|
131
|
+
ds.session.displayMode = undefined;
|
|
132
|
+
ds.session.currentImageKey = undefined;
|
|
133
|
+
ds.session.streamExpanded = undefined;
|
|
134
|
+
ds.session.currentTurnTitle = undefined;
|
|
135
|
+
ds.displayMode = undefined;
|
|
136
|
+
ds.currentImageKey = undefined;
|
|
129
137
|
sessionStore.updateSession(ds.session);
|
|
130
138
|
// Fork standard Botmux worker with resume — BEFORE killing original CLI,
|
|
131
139
|
// so the new worker reads the session file while it's still intact.
|
|
@@ -165,6 +173,106 @@ export async function handleCardAction(data, deps, larkAppId) {
|
|
|
165
173
|
await sessionReply(rootId, '🔄 已接管会话,MCP 已启用');
|
|
166
174
|
logger.info(`[${tag(ds)}] Takeover: resumed session ${originalSessionId} as standard botmux session`);
|
|
167
175
|
}
|
|
176
|
+
if (actionType === 'tui_keys' && ds) {
|
|
177
|
+
let keys = [];
|
|
178
|
+
try {
|
|
179
|
+
keys = JSON.parse(value?.keys ?? '[]');
|
|
180
|
+
}
|
|
181
|
+
catch { /* bad json */ }
|
|
182
|
+
const isFinal = value?.is_final === '1';
|
|
183
|
+
const optionType = value?.option_type ?? 'select';
|
|
184
|
+
const selectedIndex = Number(value?.selected_index ?? 0);
|
|
185
|
+
const selectedText = value?.selected_text ?? `Option ${selectedIndex + 1}`;
|
|
186
|
+
if (optionType === 'toggle') {
|
|
187
|
+
// Toggle: only update card UI, do NOT send keys to terminal yet.
|
|
188
|
+
// Keys will be sent in batch when confirm is clicked.
|
|
189
|
+
if (!ds.tuiToggledIndices)
|
|
190
|
+
ds.tuiToggledIndices = [];
|
|
191
|
+
const idx = ds.tuiToggledIndices.indexOf(selectedIndex);
|
|
192
|
+
if (idx >= 0)
|
|
193
|
+
ds.tuiToggledIndices.splice(idx, 1);
|
|
194
|
+
else
|
|
195
|
+
ds.tuiToggledIndices.push(selectedIndex);
|
|
196
|
+
logger.info(`[${tag(ds)}] TUI toggle (card only): option ${selectedIndex}, toggled: [${ds.tuiToggledIndices}]`);
|
|
197
|
+
// PATCH card to update ☐/☑ state
|
|
198
|
+
if (cardMessageId && ds.tuiPromptOptions) {
|
|
199
|
+
const updatedCard = buildTuiPromptCard(ds.session.rootMessageId, ds.session.sessionId, ds.currentTurnTitle || 'Select options', ds.tuiPromptOptions, true, ds.tuiToggledIndices);
|
|
200
|
+
updateMessage(ds.larkAppId, cardMessageId, updatedCard).catch(err => logger.debug(`[${tag(ds)}] Failed to update TUI toggle card: ${err}`));
|
|
201
|
+
try {
|
|
202
|
+
return JSON.parse(updatedCard);
|
|
203
|
+
}
|
|
204
|
+
catch { /* fall through */ }
|
|
205
|
+
}
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
// For confirm: batch all toggled options' keys first, then confirm keys
|
|
209
|
+
if (ds.worker) {
|
|
210
|
+
let allKeys = [];
|
|
211
|
+
if (ds.tuiToggledIndices?.length && ds.tuiPromptOptions) {
|
|
212
|
+
// Send each toggled option's keys in sequence
|
|
213
|
+
for (const ti of ds.tuiToggledIndices.sort((a, b) => a - b)) {
|
|
214
|
+
const opt = ds.tuiPromptOptions[ti];
|
|
215
|
+
if (opt?.keys?.length) {
|
|
216
|
+
allKeys.push(...opt.keys);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
// Then the action's own keys (confirm/select)
|
|
221
|
+
allKeys.push(...keys);
|
|
222
|
+
if (allKeys.length > 0) {
|
|
223
|
+
ds.worker.send({ type: 'tui_keys', keys: allKeys, isFinal });
|
|
224
|
+
logger.info(`[${tag(ds)}] TUI keys: [${allKeys.join(',')}] final=${isFinal} — "${selectedText}"`);
|
|
225
|
+
}
|
|
226
|
+
if (isFinal) {
|
|
227
|
+
const resolveText = ds.tuiToggledIndices?.length
|
|
228
|
+
? ds.tuiToggledIndices.map(i => ds.tuiPromptOptions?.[i]?.text).filter(Boolean).join(', ')
|
|
229
|
+
: selectedText;
|
|
230
|
+
const finalText = resolveText || selectedText;
|
|
231
|
+
if (cardMessageId) {
|
|
232
|
+
setTimeout(() => {
|
|
233
|
+
const resolvedCard = buildTuiPromptResolvedCard(finalText);
|
|
234
|
+
updateMessage(ds.larkAppId, cardMessageId, resolvedCard).catch(err => logger.debug(`[${tag(ds)}] Failed to update TUI prompt card: ${err}`));
|
|
235
|
+
}, allKeys.length * 100 + 500);
|
|
236
|
+
}
|
|
237
|
+
ds.tuiPromptCardId = undefined;
|
|
238
|
+
ds.tuiPromptOptions = undefined;
|
|
239
|
+
ds.tuiPromptMultiSelect = undefined;
|
|
240
|
+
ds.tuiToggledIndices = undefined;
|
|
241
|
+
try {
|
|
242
|
+
return JSON.parse(buildTuiPromptProcessingCard(finalText));
|
|
243
|
+
}
|
|
244
|
+
catch { /* fall through */ }
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
if (actionType === 'tui_text_input' && ds) {
|
|
249
|
+
const inputText = action?.form_value?.tui_custom_input ?? '';
|
|
250
|
+
let inputKeys = [];
|
|
251
|
+
try {
|
|
252
|
+
inputKeys = JSON.parse(value?.input_keys ?? '[]');
|
|
253
|
+
}
|
|
254
|
+
catch { /* bad json */ }
|
|
255
|
+
if (ds.worker && inputText && inputKeys.length > 0) {
|
|
256
|
+
// First execute the input option's key sequence, then send the text
|
|
257
|
+
ds.worker.send({ type: 'tui_keys', keys: inputKeys, isFinal: true });
|
|
258
|
+
setTimeout(() => {
|
|
259
|
+
if (ds.worker) {
|
|
260
|
+
ds.worker.send({ type: 'message', content: inputText });
|
|
261
|
+
}
|
|
262
|
+
}, 500);
|
|
263
|
+
logger.info(`[${tag(ds)}] TUI text input: "${inputText}" (keys: ${JSON.stringify(inputKeys)})`);
|
|
264
|
+
if (cardMessageId) {
|
|
265
|
+
const resolvedCard = buildTuiPromptResolvedCard(inputText);
|
|
266
|
+
updateMessage(ds.larkAppId, cardMessageId, resolvedCard).catch(err => logger.debug(`[${tag(ds)}] Failed to update TUI prompt card: ${err}`));
|
|
267
|
+
}
|
|
268
|
+
ds.tuiPromptCardId = undefined;
|
|
269
|
+
ds.tuiPromptOptions = undefined;
|
|
270
|
+
}
|
|
271
|
+
try {
|
|
272
|
+
return JSON.parse(buildTuiPromptResolvedCard(inputText || 'Custom input'));
|
|
273
|
+
}
|
|
274
|
+
catch { /* fall through */ }
|
|
275
|
+
}
|
|
168
276
|
if (actionType === 'get_write_link' && ds && operatorOpenId) {
|
|
169
277
|
const botCfg = getBot(ds.larkAppId).config;
|
|
170
278
|
if (ds.workerPort && ds.workerToken) {
|
|
@@ -177,52 +285,97 @@ export async function handleCardAction(data, deps, larkAppId) {
|
|
|
177
285
|
await sessionReply(rootId, '⚠️ 终端尚未就绪,请稍后再试。');
|
|
178
286
|
}
|
|
179
287
|
}
|
|
180
|
-
|
|
288
|
+
// Display & mode toggles (new). 'toggle_stream' is the legacy alias from
|
|
289
|
+
// pre-screenshot cards and is mapped to toggle_display semantics.
|
|
290
|
+
if ((actionType === 'toggle_display' || actionType === 'toggle_stream' || actionType === 'toggle_mode') && ds) {
|
|
181
291
|
const clickedNonce = value?.card_nonce;
|
|
182
|
-
|
|
183
|
-
|
|
292
|
+
const isFrozenClick = clickedNonce && ds.streamCardNonce && clickedNonce !== ds.streamCardNonce;
|
|
293
|
+
// Compute next mode for a current vs frozen card
|
|
294
|
+
function nextMode(current, hasImage) {
|
|
295
|
+
if (actionType === 'toggle_mode') {
|
|
296
|
+
if (current === 'hidden')
|
|
297
|
+
return 'screenshot';
|
|
298
|
+
// Switch text↔screenshot when shown
|
|
299
|
+
return current === 'text' ? 'screenshot' : 'text';
|
|
300
|
+
}
|
|
301
|
+
// toggle_display / legacy toggle_stream: hidden ↔ shown (default screenshot)
|
|
302
|
+
if (current === 'hidden')
|
|
303
|
+
return hasImage || actionType !== 'toggle_stream' ? 'screenshot' : 'text';
|
|
304
|
+
return 'hidden';
|
|
305
|
+
}
|
|
306
|
+
if (isFrozenClick) {
|
|
307
|
+
// Historical card — toggle using cached state
|
|
184
308
|
if (!ds.frozenCards)
|
|
185
309
|
ds.frozenCards = loadFrozenCards(ds.session.sessionId);
|
|
186
310
|
const frozen = ds.frozenCards.get(clickedNonce);
|
|
187
|
-
if (frozen) {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
const readUrl = ds.workerPort
|
|
191
|
-
? `http://${config.web.externalHost}:${ds.workerPort}`
|
|
192
|
-
: '';
|
|
193
|
-
const cardJson = buildStreamingCard(ds.session.sessionId, ds.session.rootMessageId, readUrl, frozen.title, frozen.content, 'idle', botCfg.cliId, frozen.expanded, clickedNonce);
|
|
194
|
-
// PATCH the frozen card directly — no serialization needed (no streaming race)
|
|
195
|
-
updateMessage(ds.larkAppId, frozen.messageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to toggle frozen card: ${err}`));
|
|
196
|
-
saveFrozenCards(ds.session.sessionId, ds.frozenCards);
|
|
197
|
-
logger.info(`[${tag(ds)}] Frozen card toggled: ${frozen.expanded ? 'expanded' : 'collapsed'} (nonce=${clickedNonce})`);
|
|
198
|
-
try {
|
|
199
|
-
return JSON.parse(cardJson);
|
|
200
|
-
}
|
|
201
|
-
catch { /* fall through */ }
|
|
311
|
+
if (!frozen) {
|
|
312
|
+
logger.debug(`[${tag(ds)}] Toggle on unknown frozen card: nonce=${clickedNonce}`);
|
|
313
|
+
return;
|
|
202
314
|
}
|
|
203
|
-
|
|
204
|
-
|
|
315
|
+
const cur = frozenDisplayMode(frozen);
|
|
316
|
+
const next = nextMode(cur, !!frozen.imageKey);
|
|
317
|
+
frozen.displayMode = next;
|
|
318
|
+
frozen.expanded = next !== 'hidden';
|
|
319
|
+
const botCfg = getBot(ds.larkAppId).config;
|
|
320
|
+
const readUrl = ds.workerPort ? `http://${config.web.externalHost}:${ds.workerPort}` : '';
|
|
321
|
+
const cardJson = buildStreamingCard(ds.session.sessionId, ds.session.rootMessageId, readUrl, frozen.title, frozen.content, 'idle', botCfg.cliId, next, clickedNonce, frozen.imageKey);
|
|
322
|
+
updateMessage(ds.larkAppId, frozen.messageId, cardJson).catch(err => logger.debug(`[${tag(ds)}] Failed to toggle frozen card: ${err}`));
|
|
323
|
+
saveFrozenCards(ds.session.sessionId, ds.frozenCards);
|
|
324
|
+
logger.info(`[${tag(ds)}] Frozen card toggled to ${next} (nonce=${clickedNonce})`);
|
|
325
|
+
try {
|
|
326
|
+
return JSON.parse(cardJson);
|
|
205
327
|
}
|
|
328
|
+
catch { /* fall through */ }
|
|
329
|
+
return;
|
|
206
330
|
}
|
|
207
|
-
|
|
208
|
-
|
|
331
|
+
// Current (latest) card — change displayMode + tell worker
|
|
332
|
+
const botCfg = getBot(ds.larkAppId).config;
|
|
333
|
+
const cur = ds.displayMode ?? 'hidden';
|
|
334
|
+
const next = nextMode(cur, !!ds.currentImageKey);
|
|
335
|
+
ds.displayMode = next;
|
|
336
|
+
persistStreamCardState(ds);
|
|
337
|
+
if (ds.worker) {
|
|
338
|
+
ds.worker.send({ type: 'set_display_mode', mode: next });
|
|
339
|
+
}
|
|
340
|
+
if (ds.streamCardId && ds.workerPort) {
|
|
341
|
+
const readUrl = `http://${config.web.externalHost}:${ds.workerPort}`;
|
|
342
|
+
const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(botCfg.cliId);
|
|
343
|
+
const cardJson = buildStreamingCard(ds.session.sessionId, ds.session.rootMessageId, readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', botCfg.cliId, next, ds.streamCardNonce, ds.currentImageKey);
|
|
344
|
+
scheduleCardPatch(ds, cardJson);
|
|
345
|
+
logger.info(`[${tag(ds)}] Display mode → ${next}`);
|
|
346
|
+
try {
|
|
347
|
+
return JSON.parse(cardJson);
|
|
348
|
+
}
|
|
349
|
+
catch { /* fall through */ }
|
|
350
|
+
}
|
|
351
|
+
logger.info(`[${tag(ds)}] Display mode → ${next}`);
|
|
352
|
+
return;
|
|
353
|
+
}
|
|
354
|
+
// Quick-action keys (Esc, ^C, Tab, Space, Enter, ←↑↓→, ½ page) — forward to worker.
|
|
355
|
+
if (actionType === 'term_action' && ds) {
|
|
356
|
+
const key = value?.key;
|
|
357
|
+
if (!key)
|
|
358
|
+
return;
|
|
359
|
+
if (ds.worker) {
|
|
360
|
+
ds.worker.send({ type: 'term_action', key });
|
|
361
|
+
logger.info(`[${tag(ds)}] term_action: ${key}`);
|
|
362
|
+
}
|
|
363
|
+
// Return the current card JSON so Feishu doesn't revert the displayed
|
|
364
|
+
// image to the originally-POSTed initial frame while waiting for the
|
|
365
|
+
// post-action screenshot PATCH (~1s). Keep status unchanged — Feishu's
|
|
366
|
+
// built-in button spinner already shows that the click registered, and
|
|
367
|
+
// overriding to 'analyzing' was confusing (AI analysis uses that color).
|
|
368
|
+
if (ds.streamCardId && ds.streamCardId !== '__posting__' && ds.workerPort) {
|
|
209
369
|
const botCfg = getBot(ds.larkAppId).config;
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
// Queue PATCH as backup — but also return card JSON for instant rendering
|
|
216
|
-
scheduleCardPatch(ds, cardJson);
|
|
217
|
-
logger.info(`[${tag(ds)}] Stream display toggled: ${ds.streamExpanded ? 'expanded' : 'collapsed'}`);
|
|
218
|
-
// Return parsed card so event dispatcher can send it as immediate callback response
|
|
219
|
-
try {
|
|
220
|
-
return JSON.parse(cardJson);
|
|
221
|
-
}
|
|
222
|
-
catch { /* fall through */ }
|
|
370
|
+
const readUrl = `http://${config.web.externalHost}:${ds.workerPort}`;
|
|
371
|
+
const turnTitle = ds.currentTurnTitle || ds.session.title || getCliDisplayName(botCfg.cliId);
|
|
372
|
+
const cardJson = buildStreamingCard(ds.session.sessionId, ds.session.rootMessageId, readUrl, turnTitle, ds.lastScreenContent || '', ds.lastScreenStatus || 'working', botCfg.cliId, ds.displayMode ?? 'screenshot', ds.streamCardNonce, ds.currentImageKey);
|
|
373
|
+
try {
|
|
374
|
+
return JSON.parse(cardJson);
|
|
223
375
|
}
|
|
224
|
-
|
|
376
|
+
catch { /* fall through */ }
|
|
225
377
|
}
|
|
378
|
+
return;
|
|
226
379
|
}
|
|
227
380
|
if (actionType === 'skip_repo' && ds) {
|
|
228
381
|
if (ds.pendingRepo) {
|
|
@@ -329,6 +482,13 @@ export async function handleCardAction(data, deps, larkAppId) {
|
|
|
329
482
|
const session = sessionStore.createSession(targetDs.chatId, rootId, displayName, targetDs.chatType);
|
|
330
483
|
targetDs.session = session;
|
|
331
484
|
targetDs.hasHistory = false;
|
|
485
|
+
// Drop the old turn's streaming-card reference so worker_ready POSTs a
|
|
486
|
+
// fresh card for the new session instead of PATCHing the previous one.
|
|
487
|
+
targetDs.streamCardId = undefined;
|
|
488
|
+
targetDs.streamCardNonce = undefined;
|
|
489
|
+
targetDs.streamCardPending = undefined;
|
|
490
|
+
targetDs.lastScreenContent = undefined;
|
|
491
|
+
targetDs.lastScreenStatus = undefined;
|
|
332
492
|
forkWorker(targetDs, '', false);
|
|
333
493
|
await sessionReply(rootId, `🔄 已切换到 ${displayName}`);
|
|
334
494
|
logger.info(`[${tag(targetDs)}] Repo switched to ${selectedPath}, new session created`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"card-handler.js","sourceRoot":"","sources":["../../../src/im/lark/card-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"card-handler.js","sourceRoot":"","sources":["../../../src/im/lark/card-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,31 @@
|
|
|
1
|
-
import type { ScheduledTask } from '../types.js';
|
|
1
|
+
import type { ScheduledTask, ParsedSchedule } from '../types.js';
|
|
2
|
+
export declare function getTaskOutputDir(taskId: string): string;
|
|
2
3
|
export declare function createTask(params: {
|
|
3
4
|
name: string;
|
|
4
|
-
type: ScheduledTask['type'];
|
|
5
5
|
schedule: string;
|
|
6
|
+
parsed: ParsedSchedule;
|
|
6
7
|
prompt: string;
|
|
7
8
|
workingDir: string;
|
|
8
9
|
chatId: string;
|
|
10
|
+
rootMessageId?: string;
|
|
11
|
+
chatType?: 'group' | 'p2p' | 'topic_group';
|
|
12
|
+
larkAppId?: string;
|
|
13
|
+
nextRunAt?: string;
|
|
14
|
+
repeat?: {
|
|
15
|
+
times: number | null;
|
|
16
|
+
completed: number;
|
|
17
|
+
};
|
|
18
|
+
deliver?: 'origin' | 'local';
|
|
9
19
|
}): ScheduledTask;
|
|
10
20
|
export declare function getTask(id: string): ScheduledTask | undefined;
|
|
11
21
|
export declare function removeTask(id: string): boolean;
|
|
12
|
-
export declare function updateTask(id: string, updates: Partial<Pick<ScheduledTask, 'enabled' | 'lastRunAt'>>): void;
|
|
22
|
+
export declare function updateTask(id: string, updates: Partial<Pick<ScheduledTask, 'enabled' | 'lastRunAt' | 'nextRunAt' | 'lastStatus' | 'lastError' | 'lastDeliveryError' | 'repeat' | 'rootMessageId' | 'chatType'>>): void;
|
|
23
|
+
/**
|
|
24
|
+
* Record a run outcome and auto-manage repeat counter. If the task has a
|
|
25
|
+
* finite repeat count and we've hit it, the task is removed.
|
|
26
|
+
*/
|
|
27
|
+
export declare function markRun(id: string, success: boolean, error?: string, deliveryError?: string): void;
|
|
13
28
|
export declare function listTasks(): ScheduledTask[];
|
|
29
|
+
/** Ensure per-task output dir exists and return path to today's run log. */
|
|
30
|
+
export declare function appendOutputLog(taskId: string, content: string): string;
|
|
14
31
|
//# sourceMappingURL=schedule-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-store.d.ts","sourceRoot":"","sources":["../../src/services/schedule-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"schedule-store.d.ts","sourceRoot":"","sources":["../../src/services/schedule-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAcjE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvD;AAoGD,wBAAgB,UAAU,CAAC,MAAM,EAAE;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,aAAa,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC9B,GAAG,aAAa,CAsBhB;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAG7D;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAQ9C;AAED,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EACjC,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,WAAW,GAAG,mBAAmB,GAAG,QAAQ,GAAG,eAAe,GAAG,UAAU,CACnI,CAAC,GACD,IAAI,CAON;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CA6BlG;AAED,wBAAgB,SAAS,IAAI,aAAa,EAAE,CAG3C;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAOvE"}
|
|
@@ -1,64 +1,147 @@
|
|
|
1
|
-
import { readFileSync, writeFileSync, mkdirSync, existsSync, renameSync } from 'node:fs';
|
|
1
|
+
import { readFileSync, writeFileSync, mkdirSync, existsSync, renameSync, statSync } from 'node:fs';
|
|
2
2
|
import { join, dirname } from 'node:path';
|
|
3
3
|
import { randomUUID } from 'node:crypto';
|
|
4
4
|
import { config } from '../config.js';
|
|
5
5
|
import { logger } from '../utils/logger.js';
|
|
6
6
|
let tasks = new Map();
|
|
7
7
|
let loaded = false;
|
|
8
|
+
let cachedMtime = 0;
|
|
8
9
|
function getFilePath() {
|
|
9
10
|
return join(config.session.dataDir, 'schedules.json');
|
|
10
11
|
}
|
|
11
|
-
function
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
function getOutputDir() {
|
|
13
|
+
return join(config.session.dataDir, 'schedules-output');
|
|
14
|
+
}
|
|
15
|
+
export function getTaskOutputDir(taskId) {
|
|
16
|
+
return join(getOutputDir(), taskId);
|
|
17
|
+
}
|
|
18
|
+
function ensureDir(d) {
|
|
19
|
+
if (!existsSync(d))
|
|
20
|
+
mkdirSync(d, { recursive: true });
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Migrate legacy schedule task (pre-parsed field) to current shape.
|
|
24
|
+
* Legacy tasks had { type, schedule } only — promote schedule+type into parsed.
|
|
25
|
+
*/
|
|
26
|
+
function migrate(raw) {
|
|
27
|
+
if (!raw || typeof raw !== 'object')
|
|
28
|
+
return null;
|
|
29
|
+
let parsed = raw.parsed;
|
|
30
|
+
if (!parsed) {
|
|
31
|
+
// Legacy format: always treat as cron (old parser only produced cron)
|
|
32
|
+
if (raw.type === 'cron' && raw.schedule) {
|
|
33
|
+
parsed = { kind: 'cron', expr: raw.schedule, display: raw.schedule };
|
|
34
|
+
}
|
|
35
|
+
else if (raw.schedule) {
|
|
36
|
+
// Best-effort fallback
|
|
37
|
+
parsed = { kind: 'cron', expr: raw.schedule, display: raw.schedule };
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
logger.warn(`[schedule-store] Dropping un-migratable task ${raw.id}: missing schedule`);
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
15
43
|
}
|
|
44
|
+
return {
|
|
45
|
+
id: raw.id,
|
|
46
|
+
name: raw.name,
|
|
47
|
+
schedule: raw.schedule,
|
|
48
|
+
parsed,
|
|
49
|
+
prompt: raw.prompt,
|
|
50
|
+
workingDir: raw.workingDir,
|
|
51
|
+
chatId: raw.chatId,
|
|
52
|
+
rootMessageId: raw.rootMessageId,
|
|
53
|
+
chatType: raw.chatType,
|
|
54
|
+
larkAppId: raw.larkAppId,
|
|
55
|
+
enabled: raw.enabled !== false,
|
|
56
|
+
createdAt: raw.createdAt,
|
|
57
|
+
lastRunAt: raw.lastRunAt,
|
|
58
|
+
nextRunAt: raw.nextRunAt,
|
|
59
|
+
lastStatus: raw.lastStatus,
|
|
60
|
+
lastError: raw.lastError,
|
|
61
|
+
lastDeliveryError: raw.lastDeliveryError,
|
|
62
|
+
repeat: raw.repeat,
|
|
63
|
+
deliver: raw.deliver ?? 'origin',
|
|
64
|
+
};
|
|
16
65
|
}
|
|
17
66
|
function load() {
|
|
18
|
-
|
|
19
|
-
return;
|
|
20
|
-
ensureDir();
|
|
67
|
+
ensureDir(dirname(getFilePath()));
|
|
21
68
|
const fp = getFilePath();
|
|
69
|
+
let currentMtime = 0;
|
|
70
|
+
if (existsSync(fp)) {
|
|
71
|
+
try {
|
|
72
|
+
currentMtime = statSync(fp).mtimeMs;
|
|
73
|
+
}
|
|
74
|
+
catch { /* ignore */ }
|
|
75
|
+
}
|
|
76
|
+
// Reload if file has been modified externally (e.g. by `botmux schedule add`)
|
|
77
|
+
// or on first load.
|
|
78
|
+
if (loaded && currentMtime === cachedMtime)
|
|
79
|
+
return;
|
|
80
|
+
tasks = new Map();
|
|
22
81
|
if (existsSync(fp)) {
|
|
23
82
|
try {
|
|
24
83
|
const data = JSON.parse(readFileSync(fp, 'utf-8'));
|
|
25
|
-
|
|
26
|
-
|
|
84
|
+
let migratedCount = 0;
|
|
85
|
+
for (const [id, raw] of Object.entries(data)) {
|
|
86
|
+
const migrated = migrate(raw);
|
|
87
|
+
if (migrated) {
|
|
88
|
+
tasks.set(id, migrated);
|
|
89
|
+
if (!raw.parsed)
|
|
90
|
+
migratedCount++;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
if (!loaded) {
|
|
94
|
+
logger.info(`Loaded ${tasks.size} scheduled tasks from ${fp}${migratedCount ? ` (migrated ${migratedCount} legacy)` : ''}`);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
logger.info(`[schedule-store] Reloaded ${tasks.size} tasks (file mtime changed)`);
|
|
98
|
+
}
|
|
99
|
+
if (migratedCount > 0)
|
|
100
|
+
save(); // persist migration
|
|
27
101
|
}
|
|
28
102
|
catch (err) {
|
|
29
103
|
logger.error(`Failed to load schedules: ${err}`);
|
|
30
104
|
tasks = new Map();
|
|
31
105
|
}
|
|
32
106
|
}
|
|
107
|
+
cachedMtime = currentMtime;
|
|
33
108
|
loaded = true;
|
|
34
109
|
}
|
|
35
110
|
function save() {
|
|
36
|
-
ensureDir();
|
|
111
|
+
ensureDir(dirname(getFilePath()));
|
|
37
112
|
const fp = getFilePath();
|
|
38
113
|
const tmpFp = fp + '.tmp';
|
|
39
114
|
const obj = {};
|
|
40
|
-
for (const [k, v] of tasks)
|
|
115
|
+
for (const [k, v] of tasks)
|
|
41
116
|
obj[k] = v;
|
|
42
|
-
}
|
|
43
117
|
writeFileSync(tmpFp, JSON.stringify(obj, null, 2), 'utf-8');
|
|
44
118
|
renameSync(tmpFp, fp);
|
|
119
|
+
try {
|
|
120
|
+
cachedMtime = statSync(fp).mtimeMs;
|
|
121
|
+
}
|
|
122
|
+
catch { /* ignore */ }
|
|
45
123
|
}
|
|
46
124
|
export function createTask(params) {
|
|
47
125
|
load();
|
|
48
126
|
const task = {
|
|
49
127
|
id: randomUUID().substring(0, 8),
|
|
50
128
|
name: params.name,
|
|
51
|
-
type: params.type,
|
|
52
129
|
schedule: params.schedule,
|
|
130
|
+
parsed: params.parsed,
|
|
53
131
|
prompt: params.prompt,
|
|
54
132
|
workingDir: params.workingDir,
|
|
55
133
|
chatId: params.chatId,
|
|
134
|
+
rootMessageId: params.rootMessageId,
|
|
135
|
+
chatType: params.chatType,
|
|
136
|
+
larkAppId: params.larkAppId,
|
|
56
137
|
enabled: true,
|
|
57
138
|
createdAt: new Date().toISOString(),
|
|
139
|
+
nextRunAt: params.nextRunAt,
|
|
140
|
+
repeat: params.repeat,
|
|
141
|
+
deliver: params.deliver ?? 'origin',
|
|
58
142
|
};
|
|
59
143
|
tasks.set(task.id, task);
|
|
60
144
|
save();
|
|
61
|
-
logger.info(`Created scheduled task ${task.id}: "${task.name}" (${task.type}: ${task.schedule})`);
|
|
62
145
|
return task;
|
|
63
146
|
}
|
|
64
147
|
export function getTask(id) {
|
|
@@ -70,7 +153,7 @@ export function removeTask(id) {
|
|
|
70
153
|
const existed = tasks.delete(id);
|
|
71
154
|
if (existed) {
|
|
72
155
|
save();
|
|
73
|
-
logger.info(`Removed
|
|
156
|
+
logger.info(`[schedule-store] Removed task ${id}`);
|
|
74
157
|
}
|
|
75
158
|
return existed;
|
|
76
159
|
}
|
|
@@ -82,8 +165,49 @@ export function updateTask(id, updates) {
|
|
|
82
165
|
save();
|
|
83
166
|
}
|
|
84
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
* Record a run outcome and auto-manage repeat counter. If the task has a
|
|
170
|
+
* finite repeat count and we've hit it, the task is removed.
|
|
171
|
+
*/
|
|
172
|
+
export function markRun(id, success, error, deliveryError) {
|
|
173
|
+
load();
|
|
174
|
+
const task = tasks.get(id);
|
|
175
|
+
if (!task)
|
|
176
|
+
return;
|
|
177
|
+
const now = new Date().toISOString();
|
|
178
|
+
task.lastRunAt = now;
|
|
179
|
+
task.lastStatus = success ? 'ok' : 'error';
|
|
180
|
+
task.lastError = success ? undefined : error;
|
|
181
|
+
task.lastDeliveryError = deliveryError;
|
|
182
|
+
// Advance repeat counter
|
|
183
|
+
if (task.repeat) {
|
|
184
|
+
task.repeat.completed = (task.repeat.completed ?? 0) + 1;
|
|
185
|
+
const times = task.repeat.times;
|
|
186
|
+
if (times !== null && times !== undefined && times > 0 && task.repeat.completed >= times) {
|
|
187
|
+
tasks.delete(id);
|
|
188
|
+
save();
|
|
189
|
+
logger.info(`[schedule-store] Task ${id} removed after completing ${times} runs`);
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
// One-shot: disable after run. Otherwise next_run was already advanced by scheduler.
|
|
194
|
+
if (task.parsed.kind === 'once') {
|
|
195
|
+
task.enabled = false;
|
|
196
|
+
task.nextRunAt = undefined;
|
|
197
|
+
}
|
|
198
|
+
save();
|
|
199
|
+
}
|
|
85
200
|
export function listTasks() {
|
|
86
201
|
load();
|
|
87
202
|
return [...tasks.values()];
|
|
88
203
|
}
|
|
204
|
+
/** Ensure per-task output dir exists and return path to today's run log. */
|
|
205
|
+
export function appendOutputLog(taskId, content) {
|
|
206
|
+
const dir = getTaskOutputDir(taskId);
|
|
207
|
+
ensureDir(dir);
|
|
208
|
+
const fname = new Date().toISOString().replace(/[:.]/g, '-') + '.md';
|
|
209
|
+
const fp = join(dir, fname);
|
|
210
|
+
writeFileSync(fp, content, 'utf-8');
|
|
211
|
+
return fp;
|
|
212
|
+
}
|
|
89
213
|
//# sourceMappingURL=schedule-store.js.map
|