@keyou007/agent-bot 0.1.13 → 0.1.14-alpha.1

package/dist/startup/StartupNotifier.js

@@ -15,27 +15,68 @@ export class StartupNotifier {
         this.options = options;
         this.metadataHydrator = metadataHydrator;
     }
-    async notify(startedAt, restartReason, restartGroupContextKeys = []) {
+    async notify(startedAt, restartReason, restartTargets = []) {
         let targets;
         try {
             const activeGroupSince = new Date(startedAt.getTime() - 60_000);
             const knownGroups = new Map(this.store.listChatContexts("group")
                 .filter((chat) => !isThreadContextKey(chat.contextKey))
                 .map((chat) => [chat.contextKey, chat]));
-            const targetGroups = new Map(this.store.listRecentlyActiveChatContexts(activeGroupSince)
-                .filter((chat) => chat.chatType === "group" && !isThreadContextKey(chat.contextKey))
-                .map((chat) => [chat.contextKey, chat]));
-            for (const contextKey of restartGroupContextKeys) {
-                const baseContextKey = baseChatContextKey(contextKey.trim());
-                const group = knownGroups.get(baseContextKey);
-                if (group)
-                    targetGroups.set(baseContextKey, group);
+            const targetsByContext = new Map();
+            for (const chat of this.store.listChatContexts("p2p")) {
+                targetsByContext.set(chat.contextKey, {
+                    contextKey: chat.contextKey,
+                    context: this.store.getUserContext(chat.contextKey),
+                });
+            }
+            const recentGroups = this.store.listRecentlyActiveChatContexts(activeGroupSince)
+                .filter((chat) => chat.chatType === "group" && !isThreadContextKey(chat.contextKey));
+            for (const chat of recentGroups) {
+                targetsByContext.set(chat.contextKey, {
+                    contextKey: chat.contextKey,
+                    context: this.store.getUserContext(chat.contextKey),
+                });
+            }
+            const explicitBaseContextKeys = new Set(restartTargets
+                .map((target) => target.contextKey.trim())
+                .filter((contextKey) => contextKey && !isThreadContextKey(contextKey)));
+            for (const target of restartTargets) {
+                const contextKey = target.contextKey.trim();
+                if (!contextKey)
+                    continue;
+                if (isThreadContextKey(contextKey)) {
+                    const baseContextKey = baseChatContextKey(contextKey);
+                    if (!knownGroups.has(baseContextKey))
+                        continue;
+                    const replyMessageId = target.replyMessageId?.trim();
+                    if (replyMessageId) {
+                        if (!explicitBaseContextKeys.has(baseContextKey)) {
+                            targetsByContext.delete(baseContextKey);
+                        }
+                        targetsByContext.set(contextKey, {
+                            contextKey,
+                            replyMessageId,
+                            context: this.store.getUserContext(contextKey),
+                        });
+                    }
+                    else {
+                        const group = knownGroups.get(baseContextKey);
+                        targetsByContext.set(baseContextKey, {
+                            contextKey: baseContextKey,
+                            context: this.store.getUserContext(baseContextKey),
+                        });
+                    }
+                    continue;
+                }
+                const group = knownGroups.get(contextKey);
+                if (group) {
+                    targetsByContext.set(contextKey, {
+                        contextKey,
+                        context: this.store.getUserContext(contextKey),
+                    });
+                }
             }
-            const chats = [...this.store.listChatContexts("p2p"), ...targetGroups.values()];
-            targets = chats.map((chat) => ({
-                contextKey: chat.contextKey,
-                context: this.store.getUserContext(chat.contextKey),
-            }));
+            targets = [...targetsByContext.values()];
         }
         catch (error) {
             this.logger.warn({ error }, "Failed to load startup notification targets.");
@@ -47,7 +88,7 @@ export class StartupNotifier {
                 return;
             targets = [{ contextKey: `open_id:${defaultUserOpenId}` }];
         }
-        const deliveries = await Promise.all(targets.map(async ({ contextKey, context }) => {
+        const deliveries = await Promise.all(targets.map(async ({ contextKey, replyMessageId, context }) => {
             let session = context?.currentSessionId ? this.store.getSession(context.currentSessionId) : undefined;
             if (session && this.metadataHydrator) {
                 try {
@@ -84,7 +125,15 @@ export class StartupNotifier {
                     : undefined,
             });
             try {
-                await this.outbound.sendInteractiveCard(contextKey, card);
+                if (replyMessageId) {
+                    if (!this.outbound.replyInteractiveCard) {
+                        throw new Error("The outbound transport cannot preserve the safe-restart topic.");
+                    }
+                    await this.outbound.replyInteractiveCard(contextKey, { messageId: replyMessageId, replyInThread: true }, card);
+                }
+                else {
+                    await this.outbound.sendInteractiveCard(contextKey, card);
+                }
                 return true;
             }
             catch (error) {

package/dist/startup/StartupNotifier.js.map

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

package/dist/startup/startFeishu.js

@@ -1,7 +1,7 @@
-export async function startFeishu(connector, notifier, startedAt, restartReason, prepare, onConnected, restartGroupContextKeys = []) {
+export async function startFeishu(connector, notifier, startedAt, restartReason, prepare, onConnected, restartTargets = []) {
     await prepare?.();
     await connector.start();
-    await notifier.notify(startedAt, restartReason, restartGroupContextKeys);
+    await notifier.notify(startedAt, restartReason, restartTargets);
     onConnected?.();
 }
 //# sourceMappingURL=startFeishu.js.map

package/dist/startup/startFeishu.js.map

@@ -1 +1 @@
-{"version":3,"file":"startFeishu.js","sourceRoot":"","sources":["../../src/startup/startFeishu.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,SAAmC,EACnC,QAAmC,EACnC,SAAe,EACf,aAAqB,EACrB,OAA6B,EAC7B,WAAwB,EACxB,uBAAuB,GAAa,EAAE;IAEtC,MAAM,OAAO,EAAE,EAAE,CAAC;IAClB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,uBAAuB,CAAC,CAAC;IACzE,WAAW,EAAE,EAAE,CAAC;AAClB,CAAC"}
+{"version":3,"file":"startFeishu.js","sourceRoot":"","sources":["../../src/startup/startFeishu.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,SAAmC,EACnC,QAAmC,EACnC,SAAe,EACf,aAAqB,EACrB,OAA6B,EAC7B,WAAwB,EACxB,cAAc,GAAgC,EAAE;IAEhD,MAAM,OAAO,EAAE,EAAE,CAAC;IAClB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IAChE,WAAW,EAAE,EAAE,CAAC;AAClB,CAAC"}

package/dist/state/StateStore.js

@@ -16,6 +16,7 @@ export class StateStore {
         this.ensureSessionColumns();
         this.ensureTurnSnapshotColumns();
         this.ensureChatContextColumns();
+        this.ensureTurnAttemptColumns();
         this.initializeContextSessionMappings();
         this.db.exec("DROP INDEX IF EXISTS idx_sessions_remote_session_id_unique");
         this.reconcileDuplicateRemoteSessions();
@@ -75,6 +76,27 @@ export class StateStore {
         updated_at = excluded.updated_at
     `).run(contextKey, chatType, now, now);
     }
+    getChatContext(contextKey) {
+        const row = this.db.prepare("SELECT * FROM chat_contexts WHERE context_key = ?")
+            .get(contextKey);
+        return row ? mapChatContext(row) : undefined;
+    }
+    setChatRequiresMention(contextKey, requiresMention) {
+        const now = new Date().toISOString();
+        this.db.prepare(`
+      UPDATE chat_contexts
+      SET require_mention = ?, updated_at = ?
+      WHERE context_key = ? AND chat_type = 'group'
+    `).run(requiresMention ? 1 : 0, now, contextKey);
+    }
+    chatRequiresMention(contextKey) {
+        const row = this.db.prepare(`
+      SELECT require_mention
+      FROM chat_contexts
+      WHERE context_key = ? AND chat_type = 'group'
+    `).get(contextKey);
+        return row?.require_mention === 1;
+    }
     listChatContexts(chatType) {
         const rows = chatType
             ? this.db.prepare(`
@@ -83,13 +105,7 @@ export class StateStore {
           ORDER BY updated_at DESC
         `).all(chatType)
             : this.db.prepare("SELECT * FROM chat_contexts ORDER BY updated_at DESC").all();
-        return rows.map((row) => ({
-            contextKey: row.context_key,
-            chatType: row.chat_type,
-            lastActivityAt: row.last_activity_at ?? undefined,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at,
-        }));
+        return rows.map(mapChatContext);
     }
     markChatActive(contextKey, activeAt = new Date()) {
         const timestamp = activeAt.toISOString();
@@ -105,13 +121,7 @@ export class StateStore {
       WHERE last_activity_at >= ?
       ORDER BY last_activity_at DESC
     `).all(since.toISOString());
-        return rows.map((row) => ({
-            contextKey: row.context_key,
-            chatType: row.chat_type,
-            lastActivityAt: row.last_activity_at ?? undefined,
-            createdAt: row.created_at,
-            updatedAt: row.updated_at,
-        }));
+        return rows.map(mapChatContext);
     }
     enqueuePrompt(input) {
         const createdAt = new Date().toISOString();
@@ -177,6 +187,131 @@ export class StateStore {
         });
         return cancel();
     }
+    createTurnAttempt(input) {
+        const createdAt = input.createdAt ?? new Date().toISOString();
+        const updatedAt = input.updatedAt ?? createdAt;
+        const status = input.status ?? (input.turnId ? "running" : "accepted");
+        this.db.prepare(`
+      INSERT INTO turn_attempts (
+        attempt_id, local_session_id, context_key, prompt_text, local_image_paths_json,
+        message_id, reply_message_id, pending_turn_id, turn_id, recovered_from_turn_id,
+        recovery_count, retry_count, status, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(input.attemptId, input.localSessionId, input.contextKey, input.promptText, JSON.stringify(input.localImagePaths ?? []), input.messageId ?? null, input.replyMessageId ?? null, input.pendingTurnId ?? null, input.turnId ?? null, input.recoveredFromTurnId ?? null, input.recoveryCount ?? 0, input.retryCount ?? 0, status, createdAt, updatedAt);
+        return this.getTurnAttempt(input.attemptId);
+    }
+    getTurnAttempt(attemptId) {
+        const row = this.db.prepare("SELECT * FROM turn_attempts WHERE attempt_id = ?")
+            .get(attemptId);
+        return row ? mapTurnAttempt(row) : undefined;
+    }
+    findIncompleteTurnAttemptForSession(localSessionId) {
+        const row = this.db.prepare(`
+      SELECT * FROM turn_attempts
+      WHERE local_session_id = ?
+        AND status IN ('accepted', 'running', 'recovering')
+      ORDER BY updated_at DESC, rowid DESC
+      LIMIT 1
+    `).get(localSessionId);
+        return row ? mapTurnAttempt(row) : undefined;
+    }
+    listIncompleteTurnAttempts() {
+        const rows = this.db.prepare(`
+      SELECT * FROM turn_attempts
+      WHERE status IN ('accepted', 'running', 'recovering')
+      ORDER BY created_at ASC, rowid ASC
+    `).all();
+        return rows.map(mapTurnAttempt);
+    }
+    updateTurnAttempt(attemptId, patch) {
+        const existing = this.getTurnAttempt(attemptId);
+        if (!existing)
+            return;
+        const value = (candidate, fallback) => candidate === undefined ? fallback ?? null : candidate;
+        this.db.prepare(`
+      UPDATE turn_attempts
+      SET message_id = ?, reply_message_id = ?, pending_turn_id = ?, turn_id = ?,
+          recovered_from_turn_id = ?, recovery_count = ?, retry_count = ?, status = ?, updated_at = ?
+      WHERE attempt_id = ?
+    `).run(value(patch.messageId, existing.messageId), value(patch.replyMessageId, existing.replyMessageId), value(patch.pendingTurnId, existing.pendingTurnId), value(patch.turnId, existing.turnId), value(patch.recoveredFromTurnId, existing.recoveredFromTurnId), patch.recoveryCount ?? existing.recoveryCount, patch.retryCount ?? existing.retryCount, patch.status ?? existing.status, new Date().toISOString(), attemptId);
+    }
+    bindTurnAttempt(localSessionId, turnId) {
+        const attempt = this.findIncompleteTurnAttemptForSession(localSessionId);
+        if (!attempt || (attempt.turnId && attempt.turnId !== turnId))
+            return undefined;
+        this.updateTurnAttempt(attempt.attemptId, { turnId, status: "running" });
+        return this.getTurnAttempt(attempt.attemptId);
+    }
+    markTurnAttemptTerminal(turnId, status) {
+        this.db.prepare(`
+      UPDATE turn_attempts
+      SET status = ?, updated_at = ?
+      WHERE turn_id = ?
+    `).run(status, new Date().toISOString(), turnId);
+    }
+    findIncompleteTurnAttemptByTurnId(turnId) {
+        const row = this.db.prepare(`
+      SELECT * FROM turn_attempts
+      WHERE turn_id = ? AND status IN ('accepted', 'running', 'recovering')
+      ORDER BY updated_at DESC, rowid DESC
+      LIMIT 1
+    `).get(turnId);
+        return row ? mapTurnAttempt(row) : undefined;
+    }
+    touchTurnAttempt(turnId, activityAt = new Date()) {
+        const timestamp = activityAt.toISOString();
+        const throttleCutoff = new Date(activityAt.getTime() - 15_000).toISOString();
+        this.db.prepare(`
+      UPDATE turn_attempts
+      SET updated_at = ?
+      WHERE turn_id = ?
+        AND status IN ('accepted', 'running', 'recovering')
+        AND updated_at < ?
+    `).run(timestamp, turnId, throttleCutoff);
+    }
+    prepareTurnAttemptRecovery(attemptId, recoveredFromTurnId) {
+        const existing = this.getTurnAttempt(attemptId);
+        if (!existing)
+            return undefined;
+        this.updateTurnAttempt(attemptId, {
+            pendingTurnId: null,
+            turnId: null,
+            recoveredFromTurnId: recoveredFromTurnId ?? existing.turnId ?? existing.recoveredFromTurnId ?? null,
+            recoveryCount: existing.recoveryCount + 1,
+            status: "recovering",
+        });
+        return this.getTurnAttempt(attemptId);
+    }
+    prepareTurnAttemptRetry(attemptId, failedTurnId) {
+        const existing = this.getTurnAttempt(attemptId);
+        if (!existing || existing.turnId !== failedTurnId || !isIncompleteTurnAttemptStatus(existing.status)) {
+            return undefined;
+        }
+        this.updateTurnAttempt(attemptId, {
+            pendingTurnId: null,
+            turnId: null,
+            recoveredFromTurnId: failedTurnId,
+            retryCount: existing.retryCount + 1,
+            status: "recovering",
+        });
+        return this.getTurnAttempt(attemptId);
+    }
+    rebindPendingTurnMessages(localSessionId, sourceTurnId, targetTurnId) {
+        const now = new Date().toISOString();
+        const rebind = this.db.transaction(() => {
+            this.db.prepare(`
+        UPDATE message_reactions
+        SET turn_id = ?, updated_at = ?
+        WHERE local_session_id = ? AND turn_id = ? AND status = 'pending'
+      `).run(targetTurnId, now, localSessionId, sourceTurnId);
+            this.db.prepare(`
+        UPDATE message_turn_bindings
+        SET turn_id = ?, updated_at = ?
+        WHERE local_session_id = ? AND turn_id = ?
+      `).run(targetTurnId, now, localSessionId, sourceTurnId);
+        });
+        rebind();
+    }
     nextForkTitle(sourceTitle) {
         const baseTitle = forkBaseTitle(sourceTitle);
         const allocate = this.db.transaction(() => {
@@ -193,59 +328,6 @@ export class StateStore {
         });
         return formatForkTitle(baseTitle, allocate());
     }
-    reconcileInterruptedAcpSessions(acpAgentNames) {
-        const agentClause = acpAgentNames.length
-            ? ` OR (runtime_kind IS NULL AND agent_name IN (${acpAgentNames.map(() => "?").join(", ")}))`
-            : "";
-        const rows = this.db
-            .prepare(`SELECT * FROM sessions WHERE status = 'running' AND (runtime_kind = 'acp'${agentClause})`)
-            .all(...acpAgentNames);
-        if (rows.length === 0)
-            return [];
-        const now = new Date().toISOString();
-        const completedAt = Date.now();
-        const reconcile = this.db.transaction(() => {
-            for (const row of rows) {
-                this.db.prepare(`
-          UPDATE sessions
-          SET status = 'failed',
-              last_turn_status = CASE WHEN last_turn_id IS NULL THEN last_turn_status ELSE 'failed' END,
-              updated_at = ?
-          WHERE local_session_id = ?
-        `).run(now, row.local_session_id);
-                if (!row.last_turn_id)
-                    continue;
-                const snapshotRow = this.db
-                    .prepare("SELECT snapshot_json FROM turn_snapshots WHERE turn_id = ?")
-                    .get(row.last_turn_id);
-                if (!snapshotRow)
-                    continue;
-                try {
-                    const snapshot = JSON.parse(snapshotRow.snapshot_json);
-                    if (!["starting", "running", "tool_running", "waiting_for_approval"].includes(String(snapshot.status)))
-                        continue;
-                    const startedAt = typeof snapshot.startedAt === "number" ? snapshot.startedAt : undefined;
-                    const failedSnapshot = {
-                        ...snapshot,
-                        status: "failed",
-                        completedAt,
-                        ...(startedAt === undefined ? {} : { durationMs: Math.max(0, completedAt - startedAt) }),
-                        error: "Agent Bot 已重启，原 ACP 进程中的执行无法继续。",
-                    };
-                    delete failedSnapshot.activeTool;
-                    delete failedSnapshot.approval;
-                    this.db.prepare(`
-            UPDATE turn_snapshots SET snapshot_json = ?, updated_at = ? WHERE turn_id = ?
-          `).run(JSON.stringify(failedSnapshot), now, row.last_turn_id);
-                }
-                catch {
-                    // Keep an unreadable historical snapshot intact while still correcting the session state.
-                }
-            }
-        });
-        reconcile();
-        return rows.map(mapSession);
-    }
     setDefaultAgent(contextKey, agentName) {
         const now = new Date().toISOString();
         this.db
@@ -369,6 +451,27 @@ export class StateStore {
             .get(turnId);
         return row ? JSON.parse(row.snapshot_json) : undefined;
     }
+    findLatestTurnSnapshotForSession(localSessionId) {
+        const row = this.db.prepare(`
+      SELECT turn_id, local_session_id, context_key, snapshot_json, updated_at
+      FROM turn_snapshots
+      WHERE local_session_id = ?
+      ORDER BY
+        coalesce(json_extract(snapshot_json, '$.startedAt'), 0) DESC,
+        updated_at DESC,
+        rowid DESC
+      LIMIT 1
+    `).get(localSessionId);
+        return row
+            ? {
+                turnId: row.turn_id,
+                localSessionId: row.local_session_id,
+                contextKey: row.context_key ?? undefined,
+                snapshot: JSON.parse(row.snapshot_json),
+                updatedAt: row.updated_at,
+            }
+            : undefined;
+    }
     saveTurnRuntimeOrigin(turnId, localSessionId, agentName, remoteSessionId) {
         this.db.prepare(`
       INSERT OR IGNORE INTO turn_runtime_origins (
@@ -642,6 +745,41 @@ export class StateStore {
             .all();
         return rows.map(mapSession);
     }
+    listUndeliveredCompletedTurns() {
+        const rows = this.db.prepare(`
+      SELECT snapshots.turn_id, snapshots.local_session_id, snapshots.context_key
+      FROM turn_snapshots AS snapshots
+      LEFT JOIN turn_deliveries AS deliveries ON deliveries.turn_id = snapshots.turn_id
+      WHERE json_extract(snapshots.snapshot_json, '$.status') = 'completed'
+        AND length(coalesce(json_extract(snapshots.snapshot_json, '$.finalResponse'), '')) > 0
+        AND deliveries.final_delivered_at IS NULL
+      ORDER BY snapshots.updated_at ASC
+    `).all();
+        return rows.map((row) => ({
+            turnId: row.turn_id,
+            localSessionId: row.local_session_id,
+            contextKey: row.context_key ?? undefined,
+        }));
+    }
+    findMessageIdForTurn(turnId) {
+        const binding = this.db.prepare(`
+      SELECT message_id
+      FROM message_turn_bindings
+      WHERE turn_id = ?
+      ORDER BY updated_at DESC, rowid DESC
+      LIMIT 1
+    `).get(turnId);
+        if (binding)
+            return binding.message_id;
+        const reaction = this.db.prepare(`
+      SELECT message_id
+      FROM message_reactions
+      WHERE turn_id = ?
+      ORDER BY updated_at DESC, rowid DESC
+      LIMIT 1
+    `).get(turnId);
+        return reaction?.message_id;
+    }
     findLatestMessageIdForSession(localSessionId, contextKey) {
         const row = this.db.prepare(`
       SELECT message_id
@@ -991,6 +1129,15 @@ export class StateStore {
         if (!existing.has("last_activity_at")) {
             this.db.exec("ALTER TABLE chat_contexts ADD COLUMN last_activity_at TEXT");
         }
+        if (!existing.has("require_mention")) {
+            this.db.exec("ALTER TABLE chat_contexts ADD COLUMN require_mention INTEGER NOT NULL DEFAULT 0");
+        }
+    }
+    ensureTurnAttemptColumns() {
+        const existing = new Set(this.db.pragma("table_info(turn_attempts)").map((column) => column.name));
+        if (!existing.has("retry_count")) {
+            this.db.exec("ALTER TABLE turn_attempts ADD COLUMN retry_count INTEGER NOT NULL DEFAULT 0");
+        }
     }
 }
 const MAX_TASK_TITLE_LENGTH = 120;
@@ -1018,6 +1165,16 @@ function mapUserContext(row) {
         updatedAt: row.updated_at,
     };
 }
+function mapChatContext(row) {
+    return {
+        contextKey: row.context_key,
+        chatType: row.chat_type,
+        requiresMention: row.require_mention === 1,
+        lastActivityAt: row.last_activity_at ?? undefined,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+    };
+}
 function mapSession(row) {
     return {
         localSessionId: row.local_session_id,
@@ -1068,4 +1225,30 @@ function mapQueuedPrompt(row) {
         createdAt: row.created_at,
     };
 }
+function mapTurnAttempt(row) {
+    const parsedPaths = JSON.parse(row.local_image_paths_json);
+    const localImagePaths = Array.isArray(parsedPaths)
+        ? parsedPaths.filter((value) => typeof value === "string")
+        : [];
+    return {
+        attemptId: row.attempt_id,
+        localSessionId: row.local_session_id,
+        contextKey: row.context_key,
+        promptText: row.prompt_text,
+        localImagePaths: localImagePaths.length > 0 ? localImagePaths : undefined,
+        messageId: row.message_id ?? undefined,
+        replyMessageId: row.reply_message_id ?? undefined,
+        pendingTurnId: row.pending_turn_id ?? undefined,
+        turnId: row.turn_id ?? undefined,
+        recoveredFromTurnId: row.recovered_from_turn_id ?? undefined,
+        recoveryCount: row.recovery_count,
+        retryCount: row.retry_count,
+        status: row.status,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+    };
+}
+function isIncompleteTurnAttemptStatus(status) {
+    return status === "accepted" || status === "running" || status === "recovering";
+}
 //# sourceMappingURL=StateStore.js.map