botmux 3.2.0 → 3.2.1

package/dist/cli.js

@@ -51,6 +51,7 @@ import { expandHomePath, invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
 import { isColdResumeDormant, sessionListDisposition } from './cli/session-list-liveness.js';
 import { dispatchPrimaryMessage, findStdinAliasAttachment, normalizeInteractiveCardInput, sendFileAttachments, sendVideoAttachments, shouldSendAsPureVideo, validateVideoAttachments } from './cli/send-dispatch.js';
+import { resolveDaemonExternalHostEnv } from './cli/daemon-lifecycle-env.js';
 import { buildPm2SpawnCommand } from './cli/pm2-command.js';
 import { callDashboard } from './cli/dashboard-endpoint.js';
 import { globalInstallUpdateLockTargetIn, installLatestBotmuxSync } from './core/maintenance.js';
@@ -70,7 +71,7 @@ import { mergeDashboardConfig, mergeGlobalConfig, readGlobalConfig, setGlobalLoc
 import { createWhiteboard, ensureDefaultWhiteboard, getWhiteboard, listWhiteboards, readWhiteboard, whiteboardEnabled, whiteboardPath, } from './services/whiteboard-store.js';
 import { buildBridgeSendMarkerContent } from './services/bridge-fallback-gate.js';
 import { bindRestartLeaseTo, writeManualIntentIfAbsentTo } from './services/restart-intent-store.js';
-import { stripLegacyPendingCardFields } from './services/session-store.js';
+import { repairMissingChatScope, stripLegacyPendingCardFields } from './services/session-store.js';
 import { evaluateVcMeetingManagedSend, isTrustedVcMeetingHostRelayParent, resolveVcMeetingImTurnOrigin, } from './services/vc-meeting-send-policy.js';
 import { finishVcMeetingImReply, prepareVcMeetingDeliveryReply, prepareVcMeetingImReply, } from './services/vc-meeting-im-reply.js';
 import { recordVcMeetingListenerMessage } from './services/vc-meeting-listener-message-store.js';
@@ -321,6 +322,7 @@ function ecosystemConfig() {
     const daemonScript = join(PKG_ROOT, 'dist', 'index-daemon.js');
     const bots = loadBotsJson();
     ensureUniqueBotProcessNames(bots);
+    const externalHostEnv = resolveDaemonExternalHostEnv(process.env, existsSync(ENV_FILE) ? readFileSync(ENV_FILE, 'utf-8') : undefined);
     const baseApp = {
         script: daemonScript,
         cwd: CONFIG_DIR,
@@ -356,6 +358,7 @@ function ecosystemConfig() {
         error_file: join(LOG_DIR, `daemon-${i}-error.log`),
         out_file: join(LOG_DIR, `daemon-${i}-out.log`),
         env: {
+            ...externalHostEnv,
             SESSION_DATA_DIR: DATA_DIR,
             BOTMUX_BOT_INDEX: String(i),
             // Native-memory diagnostics. Default off; operator can flip it on
@@ -379,6 +382,7 @@ function ecosystemConfig() {
         out_file: join(LOG_DIR, 'dashboard-out.log'),
         merge_logs: true,
         env: {
+            ...externalHostEnv,
             // MUST match the bot daemons' SESSION_DATA_DIR: the dashboard shares
             // pairings/federations/memberships with them via {dataDir}/*.json. Without
             // it the dashboard falls back to an install-relative ../data and reads a
@@ -2726,8 +2730,10 @@ function loadSessions() {
             legacyData = JSON.parse(readFileSync(legacyFp, 'utf-8'));
             for (const [, v] of Object.entries(legacyData)) {
                 const s = v;
-                if (s.sessionId)
-                    sessions.set(s.sessionId, s);
+                if (!s || typeof s !== 'object' || !s.sessionId)
+                    continue;
+                repairMissingChatScope(s);
+                sessions.set(s.sessionId, s);
             }
         }
         catch { /* ignore */ }
@@ -2742,8 +2748,9 @@ function loadSessions() {
                     const data = JSON.parse(readFileSync(join(dataDir, file), 'utf-8'));
                     for (const [, v] of Object.entries(data)) {
                         const session = v;
-                        if (!session.sessionId)
+                        if (!session || typeof session !== 'object' || !session.sessionId)
                             continue;
+                        repairMissingChatScope(session);
                         // Stamp larkAppId so saveSession writes back to the correct file
                         if (!session.larkAppId)
                             session.larkAppId = appId;