botmux 2.23.2 → 2.23.3-canary.2

package/dist/services/oncall-store.js

@@ -6,49 +6,89 @@
  * Permission model is intentionally simple: anyone in the bot's allowedUsers
  * can bind/unbind/edit (enforced at the call sites — daemon command handler
  * + dashboard token gate). No per-chat owner list.
+ *
+ * Multi-process safety: 12 daemon processes + 1 dashboard process all share
+ * a single `bots.json`. Every write path goes through `withFileLock(path)`
+ * so a burst of concurrent auto-binds (each daemon sees a new chat for its
+ * own bot at roughly the same time) doesn't lose updates via read-modify-
+ * write race. The lock is also re-acquired around the read so the modify
+ * step always works against the latest on-disk snapshot.
  */
-import { readFileSync, writeFileSync } from 'node:fs';
+import { promises as fsp } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { getBot, getLoadedConfigPath } from '../bot-registry.js';
+import { withFileLock } from '../utils/file-lock.js';
 import { logger } from '../utils/logger.js';
-function loadRawConfig() {
-    const path = getLoadedConfigPath();
-    if (!path)
-        throw new Error('Bot config path unknown — cannot persist oncall bindings');
-    const raw = JSON.parse(readFileSync(path, 'utf-8'));
+async function readRawConfig(path) {
+    const raw = JSON.parse(await fsp.readFile(path, 'utf-8'));
     if (!Array.isArray(raw))
         throw new Error(`Config file is not a JSON array: ${path}`);
-    return { path, raw };
+    return raw;
 }
-function writeRawConfig(path, raw) {
-    writeFileSync(path, JSON.stringify(raw, null, 2) + '\n', 'utf-8');
+async function writeRawConfigAtomic(path, raw) {
+    const tmp = path + '.tmp.' + process.pid;
+    await fsp.writeFile(tmp, JSON.stringify(raw, null, 2) + '\n', 'utf-8');
+    await fsp.rename(tmp, path);
 }
 function findEntryIndex(raw, larkAppId) {
     return raw.findIndex((e) => e?.larkAppId === larkAppId);
 }
+function requireConfigPath() {
+    const p = getLoadedConfigPath();
+    if (!p)
+        throw new Error('Bot config path unknown — cannot persist oncall bindings');
+    return p;
+}
+/**
+ * Run a read-modify-write critical section against the bot config file under
+ * a cross-process lock. `mutate` runs against the freshest on-disk snapshot
+ * and decides what to write back; returning `undefined` means "no write".
+ */
+async function rmwBotEntry(larkAppId, mutate) {
+    const path = requireConfigPath();
+    return withFileLock(path, async () => {
+        const raw = await readRawConfig(path);
+        const idx = findEntryIndex(raw, larkAppId);
+        if (idx < 0)
+            return { ok: false, reason: 'bot_not_in_config' };
+        const entry = raw[idx];
+        const out = mutate(entry, raw);
+        if (out && typeof out === 'object' && 'write' in out) {
+            const wrap = out;
+            if (wrap.write)
+                await writeRawConfigAtomic(path, raw);
+            return { ok: true, result: wrap.result };
+        }
+        await writeRawConfigAtomic(path, raw);
+        return { ok: true, result: out };
+    });
+}
+// ─── Manual binding ───────────────────────────────────────────────────────
 /**
  * Upsert an oncall binding. Returns whether it was newly created.
  */
-export function bindOncall(larkAppId, chatId, workingDir) {
-    const bot = getBot(larkAppId);
-    const existingList = bot.config.oncallChats ?? [];
-    const existing = existingList.find(c => c.chatId === chatId);
-    const next = { chatId, workingDir };
-    const { path, raw } = loadRawConfig();
-    const idx = findEntryIndex(raw, larkAppId);
-    if (idx < 0)
-        return { ok: false, reason: 'bot_not_in_config' };
-    const cur = Array.isArray(raw[idx].oncallChats) ? raw[idx].oncallChats : [];
-    const curIdx = cur.findIndex((c) => c?.chatId === chatId);
-    if (curIdx >= 0) {
-        // Replace wholesale — strips legacy fields (e.g. `owners`) so bots.json
-        // converges on the current schema rather than carrying dead keys.
-        cur[curIdx] = next;
+export async function bindOncall(larkAppId, chatId, workingDir) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
     }
-    else {
-        cur.push(next);
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
     }
-    raw[idx].oncallChats = cur;
-    writeRawConfig(path, raw);
+    const next = { chatId, workingDir };
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        const curIdx = cur.findIndex((c) => c?.chatId === chatId);
+        const created = curIdx < 0;
+        if (created)
+            cur.push(next);
+        else
+            cur[curIdx] = next; // wholesale replace strips legacy keys
+        entry.oncallChats = cur;
+        return { write: true, result: { created } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
     // Keep in-memory config in sync
     const inMem = (bot.config.oncallChats ??= []);
     const memIdx = inMem.findIndex(c => c.chatId === chatId);
@@ -57,25 +97,50 @@ export function bindOncall(larkAppId, chatId, workingDir) {
     else
         inMem.push(next);
     logger.info(`[oncall:${larkAppId}] bind chat=${chatId} dir=${workingDir}`);
-    return { ok: true, entry: next, created: !existing };
+    return { ok: true, entry: next, created: r.result.created };
 }
-export function unbindOncall(larkAppId, chatId) {
-    const bot = getBot(larkAppId);
-    const existing = bot.config.oncallChats?.find(c => c.chatId === chatId);
-    if (!existing)
-        return { ok: false, reason: 'not_bound' };
-    const { path, raw } = loadRawConfig();
-    const idx = findEntryIndex(raw, larkAppId);
-    if (idx < 0)
-        return { ok: false, reason: 'bot_not_in_config' };
-    const cur = Array.isArray(raw[idx].oncallChats) ? raw[idx].oncallChats : [];
-    raw[idx].oncallChats = cur.filter((c) => c.chatId !== chatId);
-    writeRawConfig(path, raw);
+/**
+ * Unbind oncall for `chatId` and ALWAYS write a tombstone into
+ * `defaultOncallAutoboundChats`. The tombstone protects against the case
+ * where a user manually fiddled with a chat (bound then unbound, or just
+ * unbound) and we then mis-classify it as "new" on the next observation
+ * and re-auto-bind. Treating unbind as "default's one shot is spent" is
+ * symmetric with auto-bind already adding to the same list.
+ *
+ * Idempotent: never errors on "not bound". `wasBound` reports whether an
+ * existing binding was actually removed so callers can phrase UI text
+ * accordingly (the Lark `/oncall unbind` command still wants to say "未绑定"
+ * vs "已解绑").
+ */
+export async function unbindOncall(larkAppId, chatId) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        const wasBound = cur.some(c => c?.chatId === chatId);
+        entry.oncallChats = cur.filter((c) => c?.chatId !== chatId);
+        const tomb = Array.isArray(entry.defaultOncallAutoboundChats)
+            ? entry.defaultOncallAutoboundChats : [];
+        if (!tomb.includes(chatId))
+            tomb.push(chatId);
+        entry.defaultOncallAutoboundChats = tomb;
+        return { write: true, result: { wasBound } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
     if (bot.config.oncallChats) {
         bot.config.oncallChats = bot.config.oncallChats.filter(c => c.chatId !== chatId);
     }
-    logger.info(`[oncall:${larkAppId}] unbind chat=${chatId}`);
-    return { ok: true };
+    const inMemTomb = (bot.config.defaultOncallAutoboundChats ??= []);
+    if (!inMemTomb.includes(chatId))
+        inMemTomb.push(chatId);
+    logger.info(`[oncall:${larkAppId}] unbind chat=${chatId} wasBound=${r.result.wasBound} (tombstoned)`);
+    return { ok: true, wasBound: r.result.wasBound };
 }
 export function getOncallStatus(larkAppId, chatId) {
     // Defensive: dashboard callers may probe with an app id whose bot isn't
@@ -91,4 +156,139 @@ export function getOncallStatus(larkAppId, chatId) {
     }
     return bot.config.oncallChats?.find(c => c.chatId === chatId);
 }
+// ─── Per-bot defaultOncall ───────────────────────────────────────────────
+/** Read the current defaultOncall config + autobound list for a bot. Used by
+ *  the dashboard GET route and by the daemon's auto-bind judge. Sync because
+ *  it only reads the in-memory snapshot — file-level consistency comes from
+ *  the daemon never racing with itself on reads. */
+export function getBotDefaultOncall(larkAppId) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { defaultOncall: undefined, autoboundChats: [] };
+    }
+    return {
+        defaultOncall: bot.config.defaultOncall,
+        autoboundChats: [...(bot.config.defaultOncallAutoboundChats ?? [])],
+    };
+}
+/**
+ * Persist a defaultOncall change for the given bot. The dashboard PUT route
+ * is the only authorized caller — `since` is server-side authoritative so the
+ * frontend can't backdate the cut-off and accidentally include existing chats.
+ *
+ * `since` is stamped on every enabled save, not just the first transition.
+ * This matches the dashboard copy/requirement and prevents a later workingDir
+ * edit from reaching chats that were first observed before that edit.
+ *
+ * When disabled with an empty `workingDir`, the prior workingDir is preserved
+ * so the UI can round-trip (toggle off → toggle back on) without forcing the
+ * user to retype the path. Disable with a non-empty workingDir overwrites.
+ */
+export async function updateBotDefaultOncall(larkAppId, patch) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    let next = null;
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const prior = entry.defaultOncall;
+        // Cut-off line: every enabled save re-stamps so a workingDir edit while
+        // enabled doesn't reach back to chats observed under the old setting.
+        const nextSince = patch.enabled ? Date.now() : (prior?.since ?? 0);
+        const trimmed = (patch.workingDir ?? '').trim();
+        const resolvedWorkingDir = patch.enabled
+            ? trimmed
+            // Disabled + empty input → keep the prior path so the toggle is round-
+            // trippable. Disabled + explicit non-empty → user is replacing it.
+            : (trimmed || prior?.workingDir || '');
+        next = {
+            enabled: !!patch.enabled,
+            workingDir: resolvedWorkingDir,
+            since: nextSince,
+        };
+        entry.defaultOncall = next;
+        return { write: true, result: next };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
+    bot.config.defaultOncall = next;
+    logger.info(`[oncall:${larkAppId}] defaultOncall ${next.enabled ? 'enabled' : 'disabled'} ` +
+        `(workingDir=${next.workingDir || '∅'}, since=${next.since})`);
+    return { ok: true, defaultOncall: next };
+}
+/**
+ * Auto-bind a chat as part of the defaultOncall flow. Atomically:
+ *   1. RE-CHECK tombstone + existing binding against the freshest on-disk
+ *      snapshot. The daemon's fast-path tombstone check is informational —
+ *      if a concurrent `unbindOncall` wrote a tombstone between then and
+ *      now, the lock-internal view sees it and we skip.
+ *   2. Upsert the oncallChats entry (same shape as manual bindOncall).
+ *   3. Append chatId to defaultOncallAutoboundChats (idempotent).
+ *
+ * Returns `skipped: 'tombstoned'` when the lock-internal tombstone check
+ * trips, `skipped: 'already_bound'` when another writer (manual bind by
+ * the user, or a sibling daemon) bound the chat between the fast-path read
+ * and the lock acquisition. Neither is an error.
+ */
+export async function autoBindOncallFromDefault(larkAppId, chatId, workingDir) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    const next = { chatId, workingDir };
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        // Authoritative re-check #1: tombstone wins. If a concurrent unbind or
+        // earlier autoBind wrote one, the user has effectively opted out — never
+        // overwrite that decision from the auto-bind path.
+        const tomb = Array.isArray(entry.defaultOncallAutoboundChats)
+            ? entry.defaultOncallAutoboundChats : [];
+        if (tomb.includes(chatId)) {
+            return { write: false, result: { kind: 'skipped', reason: 'tombstoned' } };
+        }
+        // Authoritative re-check #2: existing binding wins. Could be from
+        // a sibling daemon, a manual /oncall bind, or a dashboard PUT racing
+        // with us. We never overwrite an existing binding with the default —
+        // the user's explicit choice (or a sibling's earlier auto-bind to its
+        // own default) is authoritative.
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        if (cur.some(c => c?.chatId === chatId)) {
+            return { write: false, result: { kind: 'skipped', reason: 'already_bound' } };
+        }
+        cur.push(next);
+        entry.oncallChats = cur;
+        tomb.push(chatId);
+        entry.defaultOncallAutoboundChats = tomb;
+        return { write: true, result: { kind: 'bound', created: true } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
+    if (r.result.kind === 'skipped') {
+        return { ok: true, skipped: r.result.reason };
+    }
+    // Sync in-memory
+    const inMem = (bot.config.oncallChats ??= []);
+    const memIdx = inMem.findIndex(c => c.chatId === chatId);
+    if (memIdx >= 0)
+        inMem[memIdx] = next;
+    else
+        inMem.push(next);
+    const inMemAutobound = (bot.config.defaultOncallAutoboundChats ??= []);
+    if (!inMemAutobound.includes(chatId))
+        inMemAutobound.push(chatId);
+    logger.info(`[oncall:${larkAppId}] auto-bind (default) chat=${chatId} dir=${workingDir}`);
+    return { ok: true, entry: next, created: r.result.created };
+}
+// Test helper — read raw bots.json synchronously. Not for production use.
+export function _readRawConfigSyncForTesting(path) {
+    return JSON.parse(readFileSync(path, 'utf-8'));
+}
 //# sourceMappingURL=oncall-store.js.map

package/dist/services/oncall-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"oncall-store.js","sourceRoot":"","sources":["../../src/services/oncall-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oncall-store.js","sourceRoot":"","sources":["../../src/services/oncall-store.ts"],"names":[],"mappings":"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"}

package/dist/utils/bot-mention-dedup.d.ts

@@ -21,6 +21,17 @@ export declare function markBotMentionMessageHandled(messageId: string | undefin
 /** Did we already route this messageId? Returns true if the other path got
  *  there first within the TTL window. */
 export declare function isBotMentionMessageHandled(messageId: string | undefined): boolean;
+/** Atomic check-and-set: claim this messageId for processing. Returns `true`
+ *  iff the caller is the first to claim within the TTL window — only that
+ *  caller may enqueue the message.
+ *
+ *  Use this instead of `isBotMentionMessageHandled` + `markBotMentionMessageHandled`
+ *  whenever there is an `await` between the two: JS is single-threaded but the
+ *  yield lets the OTHER dedup path slip in, pass its own check, mark, and
+ *  enqueue — we'd then re-mark (no-op) and enqueue a second time. `tryClaim`
+ *  collapses both halves into one synchronous step so the two paths can't both
+ *  win, regardless of who runs first. */
+export declare function tryClaimBotMentionMessage(messageId: string | undefined): boolean;
 /** Test seam — drop everything. */
 export declare function _resetForTest(): void;
 //# sourceMappingURL=bot-mention-dedup.d.ts.map

package/dist/utils/bot-mention-dedup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot-mention-dedup.d.ts","sourceRoot":"","sources":["../../src/utils/bot-mention-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH;uDACuD;AACvD,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAIhF;AAED;yCACyC;AACzC,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CASjF;AAED,mCAAmC;AACnC,wBAAgB,aAAa,IAAI,IAAI,CAEpC"}
+{"version":3,"file":"bot-mention-dedup.d.ts","sourceRoot":"","sources":["../../src/utils/bot-mention-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH;uDACuD;AACvD,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAIhF;AAED;yCACyC;AACzC,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CASjF;AAED;;;;;;;;;yCASyC;AACzC,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKhF;AAED,mCAAmC;AACnC,wBAAgB,aAAa,IAAI,IAAI,CAEpC"}

package/dist/utils/bot-mention-dedup.js

@@ -39,6 +39,24 @@ export function isBotMentionMessageHandled(messageId) {
     }
     return true;
 }
+/** Atomic check-and-set: claim this messageId for processing. Returns `true`
+ *  iff the caller is the first to claim within the TTL window — only that
+ *  caller may enqueue the message.
+ *
+ *  Use this instead of `isBotMentionMessageHandled` + `markBotMentionMessageHandled`
+ *  whenever there is an `await` between the two: JS is single-threaded but the
+ *  yield lets the OTHER dedup path slip in, pass its own check, mark, and
+ *  enqueue — we'd then re-mark (no-op) and enqueue a second time. `tryClaim`
+ *  collapses both halves into one synchronous step so the two paths can't both
+ *  win, regardless of who runs first. */
+export function tryClaimBotMentionMessage(messageId) {
+    if (!messageId)
+        return false;
+    if (isBotMentionMessageHandled(messageId))
+        return false;
+    markBotMentionMessageHandled(messageId);
+    return true;
+}
 /** Test seam — drop everything. */
 export function _resetForTest() {
     seen.clear();

package/dist/utils/bot-mention-dedup.js.map

@@ -1 +1 @@
-{"version":3,"file":"bot-mention-dedup.js","sourceRoot":"","sources":["../../src/utils/bot-mention-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,MAAM,GAAG,MAAM,CAAC;AAEtB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,mCAAmC;AAE3E;uDACuD;AACvD,MAAM,UAAU,4BAA4B,CAAC,SAA6B;IACxE,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,EAAE,EAAE,CAAC;IACL,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED;yCACyC;AACzC,MAAM,UAAU,0BAA0B,CAAC,SAA6B;IACtE,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;AACf,CAAC;AAED,SAAS,EAAE;IACT,oEAAoE;IACpE,IAAI,IAAI,CAAC,IAAI,GAAG,EAAE;QAAE,OAAO;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG;YAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
+{"version":3,"file":"bot-mention-dedup.js","sourceRoot":"","sources":["../../src/utils/bot-mention-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,MAAM,GAAG,MAAM,CAAC;AAEtB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,mCAAmC;AAE3E;uDACuD;AACvD,MAAM,UAAU,4BAA4B,CAAC,SAA6B;IACxE,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,EAAE,EAAE,CAAC;IACL,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED;yCACyC;AACzC,MAAM,UAAU,0BAA0B,CAAC,SAA6B;IACtE,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;yCASyC;AACzC,MAAM,UAAU,yBAAyB,CAAC,SAA6B;IACrE,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7B,IAAI,0BAA0B,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IACxD,4BAA4B,CAAC,SAAS,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;AACf,CAAC;AAED,SAAS,EAAE;IACT,oEAAoE;IACpE,IAAI,IAAI,CAAC,IAAI,GAAG,EAAE;QAAE,OAAO;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG;YAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}

package/dist/utils/file-lock.d.ts

@@ -0,0 +1,2 @@
+export declare function withFileLock<T>(targetPath: string, fn: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=file-lock.d.ts.map

package/dist/utils/file-lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-lock.d.ts","sourceRoot":"","sources":["../../src/utils/file-lock.ts"],"names":[],"mappings":"AAsCA,wBAAsB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CA6D1F"}

package/dist/utils/file-lock.js

@@ -0,0 +1,114 @@
+/**
+ * Cross-process advisory lock for a single file. Used to serialize
+ * read-modify-write of shared JSON config (e.g. `bots.json` from multiple
+ * daemon processes + the dashboard).
+ *
+ * Acquisition: atomic `open(path + '.lock', 'wx')`. The filesystem makes
+ * O_CREAT|O_EXCL atomic, so exactly one waiter wins.
+ *
+ * Stale-break: a holder that crashes mid-section leaves the lock file
+ * behind with its dead PID. To reclaim it we use the atomic POSIX
+ * `rename(lock, lock.stale-<random>)`: rename succeeds for exactly ONE
+ * caller (the source has to exist), so only ONE waiter is the rightful
+ * stale-breaker. Everyone else gets ENOENT and loops back to acquire.
+ * This avoids the classic "two waiters both unlink, one deletes the other's
+ * just-acquired live lock" race that read+unlink-based schemes have.
+ *
+ * Not reentrant. Don't nest `withFileLock` calls on the same path within
+ * the same process — the inner call would wait MAX_WAIT_MS and then time
+ * out. (We could allow reentrancy via PID-equal check, but our callers
+ * don't need it and the equality check would re-open the stale-break race.)
+ */
+import { promises as fsp } from 'node:fs';
+import { randomBytes } from 'node:crypto';
+import { logger } from './logger.js';
+const MAX_WAIT_MS = 5_000;
+const RETRY_BASE_MS = 25;
+// Minimum age before we'll consider stale-breaking a lock with a dead PID.
+// Prevents racing on freshly-acquired locks where the holder might not have
+// finished writing its PID file yet.
+const MIN_STALE_AGE_MS = 100;
+async function isPidAlive(pid) {
+    if (!pid)
+        return false;
+    if (pid === process.pid)
+        return true;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export async function withFileLock(targetPath, fn) {
+    const lockPath = targetPath + '.lock';
+    const start = Date.now();
+    while (true) {
+        try {
+            const fh = await fsp.open(lockPath, 'wx');
+            await fh.writeFile(String(process.pid));
+            await fh.close();
+            try {
+                return await fn();
+            }
+            finally {
+                try {
+                    await fsp.unlink(lockPath);
+                }
+                catch { /* already gone, tolerate */ }
+            }
+        }
+        catch (e) {
+            if (e.code !== 'EEXIST')
+                throw e;
+            // EEXIST: someone holds the lock. Check whether it's stale (dead PID
+            // + old enough). If so, attempt an atomic rename — POSIX guarantees
+            // exactly one caller succeeds.
+            let holder = 0;
+            let lockAgeMs = Infinity;
+            try {
+                const [raw, stat] = await Promise.all([
+                    fsp.readFile(lockPath, 'utf-8'),
+                    fsp.stat(lockPath),
+                ]);
+                holder = parseInt(raw, 10) || 0;
+                lockAgeMs = Date.now() - stat.mtimeMs;
+            }
+            catch (re) {
+                if (re.code === 'ENOENT')
+                    continue; // released between EEXIST and read
+                throw re;
+            }
+            const breakable = holder
+                && lockAgeMs >= MIN_STALE_AGE_MS
+                && !(await isPidAlive(holder));
+            if (breakable) {
+                // Atomic rename: only ONE caller wins. The winner is responsible
+                // for cleaning up the stale carcass; losers get ENOENT and retry
+                // the lock acquisition on the next iteration.
+                const stalePath = `${lockPath}.stale.${process.pid}.${randomBytes(4).toString('hex')}`;
+                try {
+                    await fsp.rename(lockPath, stalePath);
+                    logger.warn(`[file-lock] broke stale lock at ${lockPath} (dead pid ${holder}, age ${lockAgeMs}ms)`);
+                    try {
+                        await fsp.unlink(stalePath);
+                    }
+                    catch { /* tolerate */ }
+                    continue;
+                }
+                catch (renameErr) {
+                    if (renameErr.code === 'ENOENT')
+                        continue; // another waiter beat us
+                    throw renameErr;
+                }
+            }
+            if (Date.now() - start > MAX_WAIT_MS) {
+                throw new Error(`file-lock timeout waiting for ${lockPath} ` +
+                    `(held by pid ${holder || '?'}, age ${Math.round(lockAgeMs)}ms)`);
+            }
+            await new Promise(r => setTimeout(r, RETRY_BASE_MS + Math.random() * RETRY_BASE_MS));
+        }
+    }
+}
+//# sourceMappingURL=file-lock.js.map

package/dist/utils/file-lock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../src/utils/file-lock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botmux",
-  "version": "2.23.2",
+  "version": "2.23.3-canary.2",
   "description": "Bridge between IM platforms and AI coding CLIs — one topic, one CLI session with live streaming",
   "type": "module",
   "main": "dist/index-daemon.js",