fraim-hub 2.0.245 → 2.0.246

package/dist/src/ai-hub/restart-recovery-policy.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RestartRecoveryPolicy = exports.DEFAULT_RESTART_RECOVERY_LEASE_MS = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const crypto_1 = require("crypto");
+const conversation_store_1 = require("./conversation-store");
+exports.DEFAULT_RESTART_RECOVERY_LEASE_MS = 60_000;
+function normalizedDirectoryPath(projectPath) {
+    const resolved = path_1.default.resolve(projectPath);
+    return process.platform === 'win32' ? resolved.toLowerCase() : resolved;
+}
+function sameDirectoryPath(left, right) {
+    return normalizedDirectoryPath(left) === normalizedDirectoryPath(right);
+}
+function timestampMs(value) {
+    if (typeof value === 'number')
+        return Number.isFinite(value) ? value : 0;
+    if (typeof value === 'string') {
+        const parsed = Date.parse(value);
+        if (Number.isFinite(parsed))
+            return parsed;
+        const numeric = Number(value);
+        return Number.isFinite(numeric) ? numeric : 0;
+    }
+    return 0;
+}
+function restartRecoveryBucketOwnershipReason(conversation, bucketKey) {
+    if (!bucketKey)
+        return null;
+    const scope = (conversation.scope ?? conversation.invokedArea) || 'project';
+    if (scope === 'manager')
+        return bucketKey === conversation_store_1.MANAGER_SCOPE_KEY ? null : 'bucket_scope_mismatch';
+    if (scope === 'company')
+        return bucketKey === conversation_store_1.COMPANY_SCOPE_KEY ? null : 'bucket_scope_mismatch';
+    if (bucketKey === conversation_store_1.MANAGER_SCOPE_KEY || bucketKey === conversation_store_1.COMPANY_SCOPE_KEY)
+        return 'bucket_scope_mismatch';
+    const ownProjectPath = typeof conversation.projectPath === 'string' ? conversation.projectPath.trim() : '';
+    if (ownProjectPath && !sameDirectoryPath(ownProjectPath, bucketKey))
+        return 'bucket_project_mismatch';
+    return null;
+}
+class RestartRecoveryPolicy {
+    constructor(options = {}) {
+        this.nowMs = options.nowMs || Date.now;
+        this.recoveryLeaseMs = options.recoveryLeaseMs ?? exports.DEFAULT_RESTART_RECOVERY_LEASE_MS;
+        this.projectExists = options.projectExists || ((projectPath) => fs_1.default.existsSync(projectPath));
+        this.machineLevelJobIds = options.machineLevelJobIds || new Set();
+    }
+    classify(conversation, bucketKey, options = {}) {
+        const bucketReason = restartRecoveryBucketOwnershipReason(conversation, bucketKey);
+        if (bucketReason)
+            return { action: 'skip', reason: bucketReason };
+        if (conversation.status !== 'running')
+            return { action: 'skip', reason: 'not_running' };
+        const pauseReason = typeof conversation.pauseReason === 'string' ? conversation.pauseReason : '';
+        if (['stopped', 'done', 'awaiting_review', 'awaiting_user', 'error'].includes(pauseReason)) {
+            return { action: 'skip', reason: `pause_${pauseReason}` };
+        }
+        if (!conversation.sessionId || typeof conversation.sessionId !== 'string' || !conversation.sessionId.trim()) {
+            return { action: 'skip', reason: 'missing_session' };
+        }
+        if (!conversation.jobId || typeof conversation.jobId !== 'string' || !conversation.jobId.trim()) {
+            return { action: 'skip', reason: 'missing_job' };
+        }
+        const scope = conversation.scope || 'project';
+        const projectPath = typeof conversation.projectPath === 'string' ? conversation.projectPath : '';
+        if (scope === 'project' && !this.machineLevelJobIds.has(conversation.jobId) && (!projectPath || !this.projectExists(projectPath))) {
+            return { action: 'skip', reason: 'missing_project' };
+        }
+        if (conversation.reviewHandoff?.reviewRequired) {
+            return { action: 'skip', reason: 'awaiting_review' };
+        }
+        if (options.activeRunExists) {
+            return { action: 'defer', reason: 'active_run_exists' };
+        }
+        const recoveredAt = timestampMs(conversation.restartRecovery?.recoveredAt);
+        if (recoveredAt > 0 && this.nowMs() - recoveredAt < this.recoveryLeaseMs) {
+            return { action: 'defer', reason: 'recent_recovery' };
+        }
+        return { action: 'recover', attempt: 1 };
+    }
+    buildContinueMessage(run, decision) {
+        return [
+            '[FRAIM Hub system recovery]',
+            'The FRAIM Hub process restarted while this run was marked in progress in durable conversation state.',
+            'This is not a manager-authored instruction. Do not say the manager asked you to continue.',
+            `Run id: ${run.id}`,
+            `Conversation id: ${run.conversationId || 'unknown'}`,
+            `Session id: ${run.sessionId || 'unknown'}`,
+            `Restart recovery attempt: ${decision.attempt}`,
+            'Resume only if the tracked FRAIM phase is non-terminal and not waiting for human review or approval.',
+        ].join('\n');
+    }
+    createRecoveryEvent(run, decision) {
+        const now = new Date(this.nowMs()).toISOString();
+        return {
+            id: (0, crypto_1.randomUUID)(),
+            channel: 'system',
+            createdAt: now,
+            text: `Hub restart recovery attempt ${decision.attempt} for run ${run.id} session ${run.sessionId || 'unknown'}.`,
+        };
+    }
+}
+exports.RestartRecoveryPolicy = RestartRecoveryPolicy;

package/dist/src/ai-hub/server.js

@@ -60,6 +60,7 @@ const manager_turns_1 = require("./manager-turns");
 const preferences_1 = require("./preferences");
 const conversation_store_1 = require("./conversation-store");
 const conversation_store_lock_1 = require("./conversation-store-lock");
+const restart_recovery_policy_1 = require("./restart-recovery-policy");
 const remote_hub_gateway_1 = require("./remote-hub-gateway");
 const managed_browser_1 = require("./managed-browser");
 const managed_agent_paths_1 = require("../cli/utils/managed-agent-paths");
@@ -186,7 +187,6 @@ const MACHINE_LEVEL_JOB_IDS = new Set([
 const DEFAULT_CONVERSATION_FLUSH_DELAY_MS = 2000;
 const HUB_RESTART_RECOVERY_LOCK_TIMEOUT_MS = 5000;
 const HUB_RESTART_RECOVERY_LOCK_STALE_MS = 10000;
-const HUB_RESTART_RECOVERY_CONTINUE_MESSAGE = 'Continue where you left off. The Hub process restarted and recovered this in-progress run from durable conversation state.';
 function conversationFlushDelayMs() {
     const configured = Number(process.env.FRAIM_HUB_CONVERSATION_FLUSH_MS);
     if (Number.isFinite(configured) && configured >= 0)
@@ -1578,47 +1578,6 @@ function isHumanActionGate(run) {
     const lastEntry = phaseHistory.length > 0 ? phaseHistory[phaseHistory.length - 1] : null;
     return lastEntry?.latestStatus === 'incomplete' || lastEntry?.latestStatus === 'failure';
 }
-function restartRecoveryBucketOwnershipReason(conversation, bucketKey) {
-    if (!bucketKey)
-        return null;
-    const scope = (conversation.scope ?? conversation.invokedArea) || 'project';
-    if (scope === 'manager')
-        return bucketKey === conversation_store_1.MANAGER_SCOPE_KEY ? null : 'bucket_scope_mismatch';
-    if (scope === 'company')
-        return bucketKey === conversation_store_1.COMPANY_SCOPE_KEY ? null : 'bucket_scope_mismatch';
-    if (bucketKey === conversation_store_1.MANAGER_SCOPE_KEY || bucketKey === conversation_store_1.COMPANY_SCOPE_KEY)
-        return 'bucket_scope_mismatch';
-    const ownProjectPath = typeof conversation.projectPath === 'string' ? conversation.projectPath.trim() : '';
-    if (ownProjectPath && !sameDirectoryPath(ownProjectPath, bucketKey))
-        return 'bucket_project_mismatch';
-    return null;
-}
-function classifyRestartRecoveryEligibility(conversation, bucketKey) {
-    const bucketReason = restartRecoveryBucketOwnershipReason(conversation, bucketKey);
-    if (bucketReason)
-        return { eligible: false, reason: bucketReason };
-    if (conversation.status !== 'running')
-        return { eligible: false, reason: 'not_running' };
-    const pauseReason = typeof conversation.pauseReason === 'string' ? conversation.pauseReason : '';
-    if (['stopped', 'done', 'awaiting_review', 'awaiting_user', 'error'].includes(pauseReason)) {
-        return { eligible: false, reason: `pause_${pauseReason}` };
-    }
-    if (!conversation.sessionId || typeof conversation.sessionId !== 'string' || !conversation.sessionId.trim()) {
-        return { eligible: false, reason: 'missing_session' };
-    }
-    if (!conversation.jobId || typeof conversation.jobId !== 'string' || !conversation.jobId.trim()) {
-        return { eligible: false, reason: 'missing_job' };
-    }
-    const scope = conversation.scope || 'project';
-    const projectPath = typeof conversation.projectPath === 'string' ? conversation.projectPath : '';
-    if (scope === 'project' && !MACHINE_LEVEL_JOB_IDS.has(conversation.jobId) && (!projectPath || !fs_1.default.existsSync(projectPath))) {
-        return { eligible: false, reason: 'missing_project' };
-    }
-    if (conversation.reviewHandoff?.reviewRequired) {
-        return { eligible: false, reason: 'awaiting_review' };
-    }
-    return { eligible: true };
-}
 function classifyExit(run, exitCode) {
     if (run.stoppedByUser) {
         return { action: 'park', pauseReason: 'stopped' };
@@ -1708,6 +1667,7 @@ class AiHubServer {
         this.deploymentStoreProvided = Boolean(options.deploymentStore);
         this.deploymentStore = options.deploymentStore ?? new DeploymentStore();
         this.hostConfigStore = options.hostConfigStore ?? new HostConfigStore();
+        this.restartRecoveryPolicy = new restart_recovery_policy_1.RestartRecoveryPolicy({ machineLevelJobIds: MACHINE_LEVEL_JOB_IDS });
         this.app.use(express_1.default.json({ limit: '10mb' }));
         // CORS + Chrome Private Network Access for browser extensions and Office add-in task panes
         // calling the Hub from a public origin (word-edit.officeapps.live.com, etc.).
@@ -2455,9 +2415,11 @@ class AiHubServer {
                 for (const bucketKey of bucketKeys) {
                     const headers = this.conversationStore.loadProjectHeaders(bucketKey);
                     for (const header of headers) {
-                        const quickDecision = classifyRestartRecoveryEligibility(header, bucketKey);
-                        if (!quickDecision.eligible) {
-                            if (header.status === 'running') {
+                        const quickDecision = this.restartRecoveryPolicy.classify(header, bucketKey, {
+                            activeRunExists: Boolean(header.runId && this.runRegistry.get(header.runId)),
+                        });
+                        if (quickDecision.action !== 'recover') {
+                            if (quickDecision.action === 'skip' && header.status === 'running') {
                                 const skipped = this.conversationStore.loadConversation(bucketKey, header.id);
                                 if (skipped)
                                     this.markRestartRecoverySkipped(bucketKey, skipped, quickDecision.reason || 'ineligible');
@@ -2467,11 +2429,13 @@ class AiHubServer {
                         const conversation = this.conversationStore.loadConversation(bucketKey, header.id);
                         if (!conversation)
                             continue;
-                        const decision = classifyRestartRecoveryEligibility(conversation, bucketKey);
-                        if (decision.eligible) {
-                            candidates.push({ bucketKey, conversation });
+                        const decision = this.restartRecoveryPolicy.classify(conversation, bucketKey, {
+                            activeRunExists: Boolean(conversation.runId && this.runRegistry.get(conversation.runId)),
+                        });
+                        if (decision.action === 'recover') {
+                            candidates.push({ bucketKey, conversation, decision });
                         }
-                        else if (conversation.status === 'running') {
+                        else if (decision.action === 'skip' && conversation.status === 'running') {
                             this.markRestartRecoverySkipped(bucketKey, conversation, decision.reason || 'ineligible');
                         }
                     }
@@ -2498,7 +2462,8 @@ class AiHubServer {
                         const activeId = activeIdByBucket.get(candidate.bucketKey) ?? null;
                         this.persistRunConversationNow(run, activeId);
                         recoveredBucketKeys.add(candidate.bucketKey);
-                        this.continueRecoveredRun(run, HUB_RESTART_RECOVERY_CONTINUE_MESSAGE, {
+                        this.continueRecoveredRun(run, this.restartRecoveryPolicy.buildContinueMessage(run, candidate.decision), {
+                            recoveryEvent: this.restartRecoveryPolicy.createRecoveryEvent(run, candidate.decision),
                             postPark: (updated) => this.maybeStartDelegatedChildRuns(updated),
                             activeId,
                         });
@@ -2616,18 +2581,18 @@ class AiHubServer {
     continueRecoveredRun(run, instructions, options = {}) {
         if (!run.sessionId)
             return;
-        const prepared = this.prepareContinueMessage(run, instructions);
         this.runRegistry.update(run.id, (current) => {
             current.status = 'running';
             current.pauseReason = 'working';
-            current.messages.push((0, hosts_1.createHubMessage)('manager', prepared.display || instructions));
+            if (options.recoveryEvent)
+                current.events.push(options.recoveryEvent);
         });
         const currentRun = this.runRegistry.get(run.id) || run;
         const sessionId = currentRun.sessionId;
         if (!sessionId)
             return;
         const launch = this.resolveLaunchAgent(currentRun.configuredAgentId, currentRun.hostId);
-        const child = this.hostRuntime.continueRun(currentRun.hostId, currentRun.projectPath, sessionId, prepared.message, {
+        const child = this.hostRuntime.continueRun(currentRun.hostId, currentRun.projectPath, sessionId, instructions, {
             onEvent: (event, channel) => {
                 this.runRegistry.update(currentRun.id, (current) => {
                     if (event.sessionId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.245",
+  "version": "2.0.246",
   "description": "FRAIM Hub local companion package.",
   "bin": {
     "fraim-hub": "bin/fraim-hub.js",
@@ -161,7 +161,7 @@
     "electron": "^41.2.2",
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
-    "fraim": "2.0.245",
+    "fraim": "2.0.246",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",