botmux 3.2.1 → 3.3.0

package/dist/core/dashboard-ipc-server.d.ts

@@ -19,7 +19,7 @@ export type BotAvatarOutcome = {
 };
 export declare function setBotAvatarChanger(fn: ((image: Buffer) => Promise<BotAvatarOutcome>) | null): void;
 import { composeRowFromActive, composeRowFromClosed, type SessionRow } from './dashboard-rows.js';
-import type { ParsedSchedule } from '../types.js';
+import type { ParsedSchedule, ScheduleExecutionPosition } from '../types.js';
 export interface IpcServerHandle {
     port: number;
     close: () => Promise<void>;
@@ -49,6 +49,9 @@ export interface ScheduleRow {
     workingDir: string;
     chatId: string;
     rootMessageId?: string;
+    scope?: 'thread' | 'chat';
+    executionPosition?: ScheduleExecutionPosition;
+    topicTitle?: string;
     larkAppId?: string;
     botName?: string;
     enabled: boolean;

package/dist/core/dashboard-ipc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard-ipc-server.d.ts","sourceRoot":"","sources":["../../src/core/dashboard-ipc-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAe,MAAM,WAAW,CAAC;AAiGjG,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,wBAAgB,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAE/F;AAID,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAEnG;AACD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EAIpB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,KAAK,EAAiC,cAAc,EAAW,MAAM,aAAa,CAAC;AAK1F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,MAAM,MAAM,OAAO,GAAG,CACpB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAe1B,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAErE;AAED,0FAA0F;AAC1F,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAM7E;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAGhF;AAED,wBAAsB,YAAY,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,CAKhF;AAaD,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAgC;AAM7F;;;wBAGwB;AACxB,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAS/D;AAyED,YAAY,EAAE,UAAU,EAAE,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;AAMtD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAA0B;AAKxE,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAA0B;AAq6BxE,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,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,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC;IAC5B,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,GAAG,WAAW,CAAC;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB;AAynDD,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;;+EAG2E;IAC3E,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmD3B"}
+{"version":3,"file":"dashboard-ipc-server.d.ts","sourceRoot":"","sources":["../../src/core/dashboard-ipc-server.ts"],"names":[],"mappings":"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"}

package/dist/core/dashboard-ipc-server.js

@@ -102,6 +102,7 @@ import { repinSessionWorkingDir } from './session-cwd.js';
 import { authorizeSessionScopedIpc } from './daemon-ipc-session-auth.js';
 import { updateSessionTitle } from './session-title.js';
 import { requestAgentSessionRename } from './session-rename.js';
+import { sessionAnchorId } from './types.js';
 import { attachSkillPolicy, detachSkillPolicy } from './skills/im-command.js';
 import { readSkillRegistry } from '../services/skill-registry-store.js';
 const routes = [];
@@ -1111,7 +1112,7 @@ ipcRoute('POST', '/api/sessions/migrate-to-chat', async (req, res) => {
         return jsonRes(res, 503, { ok: false, error: 'registry_unavailable' });
     let ds = undefined;
     for (const candidate of reg.values()) {
-        const candAnchor = candidate.scope === 'chat' ? candidate.chatId : candidate.session.rootMessageId;
+        const candAnchor = sessionAnchorId(candidate);
         if (candAnchor === sourceAnchor && candidate.larkAppId === cachedLarkAppId) {
             ds = candidate;
             break;
@@ -1215,6 +1216,9 @@ function composeScheduleRow(t) {
         workingDir: t.workingDir,
         chatId: t.chatId,
         rootMessageId: t.rootMessageId,
+        scope: t.scope,
+        executionPosition: scheduler.resolveTaskExecutionPosition(t),
+        topicTitle: t.topicTitle,
         larkAppId: t.larkAppId,
         botName: getBotName(),
         enabled: t.enabled,
@@ -1239,9 +1243,29 @@ ipcRoute('GET', '/api/schedules', (_req, res) => {
 ipcRoute('POST', '/api/schedules/:id/run', (_req, res, p) => jsonRes(res, 200, scheduler.runNow(p.id)));
 ipcRoute('POST', '/api/schedules/:id/pause', (_req, res, p) => jsonRes(res, 200, scheduler.setEnabled(p.id, false)));
 ipcRoute('POST', '/api/schedules/:id/resume', (_req, res, p) => jsonRes(res, 200, scheduler.setEnabled(p.id, true)));
-// Toggle delivery mode between 'origin' (reply in original thread) and
-// 'new-topic' (open a brand-new topic + fresh session on every fire).
-ipcRoute('POST', '/api/schedules/:id/delivery', (_req, res, p) => jsonRes(res, 200, scheduler.toggleDelivery(p.id)));
+// Backward-compatible route used by Lark cards and cached dashboard clients.
+// Modern callers send an exact target; body-less legacy callers keep the
+// historical toggle behavior, now cycling topic → top-level → fresh topic.
+ipcRoute('POST', '/api/schedules/:id/delivery', async (req, res, p) => {
+    let body;
+    try {
+        body = await readJsonBody(req);
+    }
+    catch {
+        return jsonRes(res, 400, { ok: false, error: 'invalid_json' });
+    }
+    const requested = body && typeof body === 'object'
+        ? body.executionPosition
+        : undefined;
+    if (requested !== undefined) {
+        if (requested !== 'top-level' && requested !== 'topic' && requested !== 'new-topic') {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_execution_position', field: 'executionPosition' });
+        }
+        const result = scheduler.updateTask(p.id, { executionPosition: requested });
+        return jsonRes(res, 200, result.ok ? { ...result, executionPosition: requested } : result);
+    }
+    return jsonRes(res, 200, scheduler.toggleDelivery(p.id));
+});
 // Create a new scheduled task from the dashboard. chatId selects which chat
 // the task fires into; workingDir defaults to the daemon's cwd.
 ipcRoute('POST', '/api/schedules', async (req, res) => {
@@ -1263,6 +1287,7 @@ ipcRoute('POST', '/api/schedules', async (req, res) => {
     const schedule = typeof b.schedule === 'string' ? b.schedule.trim() : '';
     const prompt = typeof b.prompt === 'string' ? b.prompt : '';
     const chatId = typeof b.chatId === 'string' ? b.chatId.trim() : '';
+    const rootMessageId = typeof b.rootMessageId === 'string' ? b.rootMessageId.trim() : '';
     // Validate silent type — if present, must be boolean (no silent degradation).
     let silent = false;
     if (b.silent !== undefined) {
@@ -1271,14 +1296,30 @@ ipcRoute('POST', '/api/schedules', async (req, res) => {
         }
         silent = b.silent;
     }
-    // `local` (log-only, no delivery) is not implemented in the executor —
-    // reject it from the dashboard API rather than silently degrading to origin.
+    let executionPosition = 'top-level';
+    if (b.executionPosition !== undefined) {
+        if (b.executionPosition !== 'top-level' && b.executionPosition !== 'topic' && b.executionPosition !== 'new-topic') {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_execution_position', field: 'executionPosition' });
+        }
+        executionPosition = b.executionPosition;
+    }
+    const topicTitle = typeof b.topicTitle === 'string' ? b.topicTitle.trim() : '';
+    if (b.topicTitle !== undefined && typeof b.topicTitle !== 'string') {
+        return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'topicTitle' });
+    }
+    if (Array.from(topicTitle).length > 200) {
+        return jsonRes(res, 400, { ok: false, error: 'topic_title_too_long', field: 'topicTitle' });
+    }
+    // Legacy clients sending deliver:new-topic retain the historical meaning:
+    // open a fresh topic/session on every run.
     let deliver = 'origin';
     if (b.deliver !== undefined) {
         if (b.deliver !== 'origin' && b.deliver !== 'new-topic') {
             return jsonRes(res, 400, { ok: false, error: 'invalid_deliver', field: 'deliver' });
         }
         deliver = b.deliver;
+        if (b.executionPosition === undefined && deliver === 'new-topic')
+            executionPosition = 'new-topic';
     }
     // Validate required fields are present AND non-empty after trim.
     if (!name)
@@ -1289,6 +1330,9 @@ ipcRoute('POST', '/api/schedules', async (req, res) => {
         return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'prompt' });
     if (!chatId)
         return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'chatId' });
+    if (executionPosition === 'topic' && !rootMessageId) {
+        return jsonRes(res, 400, { ok: false, error: 'topic_root_required', field: 'rootMessageId' });
+    }
     // Note: bot↔chat membership is intentionally NOT validated here.
     // listChatBotMembers returns [] both when the API is unavailable and when
     // no bot has been observed in the chat yet, so we cannot reliably tell
@@ -1303,7 +1347,10 @@ ipcRoute('POST', '/api/schedules', async (req, res) => {
             prompt,
             workingDir: typeof b.workingDir === 'string' ? b.workingDir : process.cwd(),
             chatId,
-            scope: 'chat',
+            rootMessageId: rootMessageId || undefined,
+            scope: executionPosition === 'topic' ? 'thread' : 'chat',
+            executionPosition,
+            topicTitle: topicTitle || undefined,
             chatType: 'group',
             larkAppId: cachedLarkAppId,
             deliver,
@@ -1317,7 +1364,8 @@ ipcRoute('POST', '/api/schedules', async (req, res) => {
         jsonRes(res, 400, { ok: false, error: msg });
     }
 });
-// Update editable fields of an existing task (name, prompt, schedule, deliver, silent).
+// Update editable fields of an existing task. Execution position is explicit;
+// topic execution requires a retained/provided topic root message id.
 ipcRoute('PATCH', '/api/schedules/:id', async (req, res, p) => {
     let body;
     try {
@@ -1357,6 +1405,28 @@ ipcRoute('PATCH', '/api/schedules/:id', async (req, res, p) => {
         }
         updates.deliver = b.deliver;
     }
+    if (b.executionPosition !== undefined) {
+        if (b.executionPosition !== 'top-level' && b.executionPosition !== 'topic' && b.executionPosition !== 'new-topic') {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_execution_position', field: 'executionPosition' });
+        }
+        updates.executionPosition = b.executionPosition;
+    }
+    if (b.rootMessageId !== undefined) {
+        if (typeof b.rootMessageId !== 'string') {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'rootMessageId' });
+        }
+        updates.rootMessageId = b.rootMessageId.trim();
+    }
+    if (b.topicTitle !== undefined) {
+        if (typeof b.topicTitle !== 'string') {
+            return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'topicTitle' });
+        }
+        const topicTitle = b.topicTitle.trim();
+        if (Array.from(topicTitle).length > 200) {
+            return jsonRes(res, 400, { ok: false, error: 'topic_title_too_long', field: 'topicTitle' });
+        }
+        updates.topicTitle = topicTitle;
+    }
     if (b.silent !== undefined) {
         if (typeof b.silent !== 'boolean') {
             return jsonRes(res, 400, { ok: false, error: 'invalid_field', field: 'silent' });