botmux 2.91.1 → 2.93.0

package/dist/daemon.d.ts

@@ -6,13 +6,17 @@ import type { WorkflowRuntimeContext } from './workflows/runtime.js';
 export declare function noteTurnReceived(ds: DaemonSession, triggerMessageId: string, _prompt?: string, _sender?: {
     name?: string;
 }, _turnId?: string): Promise<void>;
+declare function sessionReply(anchor: string, content: string, msgType?: string, larkAppId?: string, turnId?: string): Promise<string>;
+export declare const __testOnly_sessionReply: typeof sessionReply;
+export declare const __testOnly_activeSessions: Map<string, DaemonSession>;
 export declare function enforceMessageQuotaForCliInput(larkAppId: string, chatId: string, senderOpenId: string | undefined, messageId: string, anchor: string): Promise<boolean>;
 export declare function grantRestrictedCommandText(larkAppId: string, chatId: string | undefined, senderOpenId: string | undefined, cmd: string): string | undefined;
 export declare function grantRestrictedSlashCommandText(larkAppId: string, chatId: string | undefined, senderOpenId: string | undefined, cmd: string): string | undefined;
 export declare function attachWorkflowEventWatcher(runId: string, ctx?: WorkflowRuntimeContext): WorkflowEventWatcher;
 /**
  * Resolve the pinned working dir for a brand-new topic via the layered lookup:
- *   1) an existing oncall binding (this bot or a sibling)
+ *   1) this bot's OWN oncall binding (per-bot: another bot's binding never pins
+ *      this bot — cross-bot dir alignment is handled by layer 3 inherit-peer)
  *   2) this bot's defaultOncall — auto-binds a brand-new chat when the flag is on
  *      (this WRITES state, so it must run identically on every spawn path)
  *   3) a sibling session's workingDir (cross-bot / chat-scope inheritance)

package/dist/daemon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAkBA,OAAO,EAA2F,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkB7I,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiFrD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAqPpF,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmClK;AA0FD,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CA6ClB;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAMpB;AAoKD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AAgtCD;;;;;;;;;;GAUG;AACH,iBAAe,uBAAuB,CAAC,GAAG,EAAE;IAC1C,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;;;;GAaA;AAED,eAAO,MAAM,kCAAkC,gCAA0B,CAAC;AA88C1E,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8blE"}
+{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAkF,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkBpI,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiFrD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAqPpF,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmClK;AAED,iBAAe,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,MAAe,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8D3I;AAMD,eAAO,MAAM,uBAAuB,qBAAe,CAAC;AACpD,eAAO,MAAM,yBAAyB,4BAAiB,CAAC;AAqCxD,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CA6ClB;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAMpB;AAoKD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AAgtCD;;;;;;;;;;;GAWG;AACH,iBAAe,uBAAuB,CAAC,GAAG,EAAE;IAC1C,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;;;;GAaA;AAED,eAAO,MAAM,kCAAkC,gCAA0B,CAAC;AA88C1E,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8blE"}

package/dist/daemon.js

@@ -15,7 +15,7 @@ import { sendRestartReportIfPending } from './core/restart-report.js';
 import { statSync } from 'node:fs';
 import { addReaction, getChatMode, listChatMemberOpenIds, replyMessage, resolveAllowedUsersWithMap, sendMessage, sendUserMessage, updateMessage } from './im/lark/client.js';
 import { resolveGroupJoinPrompt, waitForAllowedUserInChat } from './core/auto-start.js';
-import { loadBotConfigs, registerBot, getBot, getAllBots, findOncallChatForAnyBot } from './bot-registry.js';
+import { loadBotConfigs, registerBot, getBot, getAllBots, findOncallChat } from './bot-registry.js';
 import * as sessionStore from './services/session-store.js';
 import * as chatFirstSeenStore from './services/chat-first-seen-store.js';
 import { ensureDefaultOncallBound } from './services/oncall-store.js';
@@ -50,7 +50,7 @@ import { isCallbackUrl, handleCallbackUrl } from './utils/user-token.js';
 import { consumeQuota, removeChatGrant, removeGlobalGrant } from './services/grant-store.js';
 import { abortCharge, commitCharge, beginCharge } from './services/quota-dedup.js';
 import { getSessionWorkingDir, getProjectScanDirs, expandHome, downloadResources, formatAttachmentsHint, buildNewTopicPrompt, buildFollowUpContent, buildBridgeInputContent, buildReforkPrompt, getAvailableBots, restoreActiveSessions, executeScheduledTask, persistStreamCardState, rememberLastCliInput, ensureTerminalWorkerPort, ensureSessionWhiteboard, } from './core/session-manager.js';
-import { beginReplyTargetTurn, resolveSessionReplyTarget, syncReplyTargetState } from './core/reply-target.js';
+import { beginReplyTargetTurn, fallbackTurnId, resolveSessionReplyTarget, syncReplyTargetState } from './core/reply-target.js';
 import { sweepOrphanSandboxes } from './adapters/backend/sandbox.js';
 import { sweepIdleWorkers, DEFAULT_MAX_LIVE_WORKERS } from './core/idle-worker-sweeper.js';
 import { handleCardAction } from './im/lark/card-handler.js';
@@ -344,7 +344,18 @@ async function sessionReply(anchor, content, msgType = 'text', larkAppId, turnId
             const fresh = readSessionFreshFromDisk(ds.session.sessionId, ds.larkAppId);
             if (fresh)
                 syncReplyTargetState(ds, fresh);
-            const target = resolveSessionReplyTarget(ds, turnId);
+            // Resolve through fallbackTurnId so daemon-side sends that carry no turn of
+            // their own (the repo-select card, skip/switch confirmations, crash notices)
+            // still anchor into the current shared fold-back topic instead of leaking to
+            // the chat top level. Callers that DO pass an explicit turnId are unchanged —
+            // fallbackTurnId returns it verbatim, so the stale-turn hijack guard stays
+            // authoritative. Baking the fallback in HERE (the single chat-scope send
+            // chokepoint) means no individual send site can re-introduce the leak by
+            // forgetting to thread — the recurring failure mode behind this and the
+            // earlier e619250d fix. Guarded by test/session-reply-thread-anchor.test.ts
+            // (drives the real sessionReply) and test/reply-target-fallback.test.ts
+            // (the resolveSessionReplyTarget × fallbackTurnId composition it relies on).
+            const target = resolveSessionReplyTarget(ds, fallbackTurnId(ds, turnId));
             if (target.mode === 'thread')
                 return replyMessage(appId, target.rootMessageId, content, msgType, true, undefined, hookContext);
             if (ds.session.rootMessageId) {
@@ -360,6 +371,12 @@ async function sessionReply(anchor, content, msgType = 'text', larkAppId, turnId
     // Thread-scope (or unknown / legacy): reply in thread.
     return replyMessage(appId, anchor, content, msgType, true, undefined, hookContext);
 }
+// Test seams: drive the real sessionReply (the chat-scope thread/top-level
+// chokepoint) against a seeded session, so the shared fold-back leak is guarded
+// at the function that actually routes — not just the resolveSessionReplyTarget
+// composition it relies on. See test/reply-target-fallback.test.ts.
+export const __testOnly_sessionReply = sessionReply;
+export const __testOnly_activeSessions = activeSessions;
 async function revokeQuotaGrant(larkAppId, chatId, senderOpenId, ev) {
     const result = ev.reason === 'chatGrant'
         ? await removeChatGrant(larkAppId, chatId, senderOpenId)
@@ -1628,7 +1645,7 @@ function parseTriggerChatBinding(raw) {
  * Default-oncall is a uniform forward-only policy: whenever the toggle is
  * on, ANY chat the bot is currently in — old or newly added, doesn't matter —
  * gets auto-bound to the configured workingDir on its next observed topic,
- * unless it's already bound (`findOncallChatForAnyBot` upstream) or the user
+ * unless it's already bound (`findOncallChat`, per-bot, upstream) or the user
  * has opted out via tombstone.
  *
  * Thin wrapper around the shared `ensureDefaultOncallBound` in oncall-store,
@@ -1666,7 +1683,8 @@ function resolveBotDefaultWorkingDir(larkAppId) {
 }
 /**
  * Resolve the pinned working dir for a brand-new topic via the layered lookup:
- *   1) an existing oncall binding (this bot or a sibling)
+ *   1) this bot's OWN oncall binding (per-bot: another bot's binding never pins
+ *      this bot — cross-bot dir alignment is handled by layer 3 inherit-peer)
  *   2) this bot's defaultOncall — auto-binds a brand-new chat when the flag is on
  *      (this WRITES state, so it must run identically on every spawn path)
  *   3) a sibling session's workingDir (cross-bot / chat-scope inheritance)
@@ -1676,7 +1694,7 @@ function resolveBotDefaultWorkingDir(larkAppId) {
  * both honor the defaultOncall auto-bind the same way.
  */
 async function resolvePinnedWorkingDir(ctx) {
-    let oncallEntry = findOncallChatForAnyBot(ctx.chatId);
+    let oncallEntry = findOncallChat(ctx.larkAppId, ctx.chatId);
     if (!oncallEntry) {
         oncallEntry = await maybeAutoBindDefaultOncall(ctx.larkAppId, ctx.chatId, ctx.chatType);
     }