happy-imou-cloud 2.0.21 → 2.0.23

package/dist/{api-MGlKcEf3.cjs → api-C4bF6GEA.cjs}

@@ -18,7 +18,7 @@ var node_child_process = require('node:child_process');
 var expoServerSdk = require('expo-server-sdk');
 
 var name = "happy-imou-cloud";
-var version = "2.0.21";
+var version = "2.0.23";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -432,7 +432,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-DLFUNI9q.cjs'); });
+      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-CdqBfAwo.cjs'); });
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -568,6 +568,7 @@ function decrypt(key, variant, data) {
 
 const HAPPY_ORG_REPEAT_THRESHOLD = 3;
 const HAPPY_ORG_TURN_REPORT_TAG = "HAPPY_TURN_REPORT";
+const HAPPY_ORG_SUMMARY_MAX_LENGTH = 120;
 const HappyOrgInterventionTypeSchema = z.z.enum([
   "none",
   "review_needed",
@@ -575,6 +576,7 @@ const HappyOrgInterventionTypeSchema = z.z.enum([
   "decision_needed"
 ]);
 const HappyOrgTurnStatusSchema = z.z.enum([
+  "turn_update",
   "task_complete",
   "turn_aborted"
 ]);
@@ -596,6 +598,7 @@ const HappyOrgMessageMetaSchema = z.z.object({
   control: HappyOrgTaskControlSchema.optional()
 });
 z.z.object({
+  turnStatus: HappyOrgTurnStatusSchema.optional().nullable(),
   summary: z.z.string().optional().nullable(),
   interventionType: HappyOrgInterventionTypeSchema.optional().nullable(),
   blockerCode: z.z.string().optional().nullable(),
@@ -616,7 +619,13 @@ const HappyOrgRepeatEntrySchema = z.z.object({
   lastSeenAt: z.z.number().int().nonnegative()
 });
 const HappyOrgRuntimeStateSchema = z.z.object({
-  status: z.z.enum(["active", "terminated"]),
+  status: z.z.enum([
+    "active",
+    "waiting_review",
+    "waiting_decision",
+    "waiting_close",
+    "terminated"
+  ]),
   reason: z.z.string().optional().nullable(),
   terminatedAt: z.z.number().int().nonnegative().optional(),
   reopenedAt: z.z.number().int().nonnegative().optional()
@@ -2811,6 +2820,28 @@ class ApiUserObserverClient extends node_events.EventEmitter {
   offUpdate(callback) {
     this.off("update", callback);
   }
+  syncSessionRuntimeIndex(sessionId, sessionIndex, opts = {}) {
+    if (!this.socket.connected) {
+      logger.debug("[API USER OBSERVER] Skipping session runtime index sync because socket is disconnected", {
+        sessionId
+      });
+      return false;
+    }
+    const now = Date.now();
+    this.socket.emit("session-alive", {
+      sid: sessionId,
+      time: now,
+      thinking: false,
+      sessionIndex
+    });
+    if (opts.markInactive) {
+      this.socket.emit("session-end", {
+        sid: sessionId,
+        time: now
+      });
+    }
+    return true;
+  }
   async close() {
     this.clearReconnectAfterServerDisconnectTimer();
     this.protocolV3Descriptor = null;
@@ -3620,6 +3651,7 @@ exports.ApiSessionClient = ApiSessionClient;
 exports.AsyncLock = AsyncLock;
 exports.HAPPY_CLOUD_DAEMON_PORT = HAPPY_CLOUD_DAEMON_PORT;
 exports.HAPPY_ORG_REPEAT_THRESHOLD = HAPPY_ORG_REPEAT_THRESHOLD;
+exports.HAPPY_ORG_SUMMARY_MAX_LENGTH = HAPPY_ORG_SUMMARY_MAX_LENGTH;
 exports.HAPPY_ORG_TURN_REPORT_TAG = HAPPY_ORG_TURN_REPORT_TAG;
 exports.HeadTailPreviewBuffer = HeadTailPreviewBuffer;
 exports.SIGNING_BOOTSTRAP_REQUIRED_MESSAGE = SIGNING_BOOTSTRAP_REQUIRED_MESSAGE;

package/dist/{api-DJe9WP9M.mjs → api-DX7Vg4Hz.mjs}

@@ -16,7 +16,7 @@ import { spawn } from 'node:child_process';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.0.21";
+var version = "2.0.23";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -430,7 +430,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await import('./persistence-CkP90vEt.mjs');
+      const { readDaemonState } = await import('./persistence-xypxp7ei.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -566,6 +566,7 @@ function decrypt(key, variant, data) {
 
 const HAPPY_ORG_REPEAT_THRESHOLD = 3;
 const HAPPY_ORG_TURN_REPORT_TAG = "HAPPY_TURN_REPORT";
+const HAPPY_ORG_SUMMARY_MAX_LENGTH = 120;
 const HappyOrgInterventionTypeSchema = z.enum([
   "none",
   "review_needed",
@@ -573,6 +574,7 @@ const HappyOrgInterventionTypeSchema = z.enum([
   "decision_needed"
 ]);
 const HappyOrgTurnStatusSchema = z.enum([
+  "turn_update",
   "task_complete",
   "turn_aborted"
 ]);
@@ -594,6 +596,7 @@ const HappyOrgMessageMetaSchema = z.object({
   control: HappyOrgTaskControlSchema.optional()
 });
 z.object({
+  turnStatus: HappyOrgTurnStatusSchema.optional().nullable(),
   summary: z.string().optional().nullable(),
   interventionType: HappyOrgInterventionTypeSchema.optional().nullable(),
   blockerCode: z.string().optional().nullable(),
@@ -614,7 +617,13 @@ const HappyOrgRepeatEntrySchema = z.object({
   lastSeenAt: z.number().int().nonnegative()
 });
 const HappyOrgRuntimeStateSchema = z.object({
-  status: z.enum(["active", "terminated"]),
+  status: z.enum([
+    "active",
+    "waiting_review",
+    "waiting_decision",
+    "waiting_close",
+    "terminated"
+  ]),
   reason: z.string().optional().nullable(),
   terminatedAt: z.number().int().nonnegative().optional(),
   reopenedAt: z.number().int().nonnegative().optional()
@@ -2809,6 +2818,28 @@ class ApiUserObserverClient extends EventEmitter {
   offUpdate(callback) {
     this.off("update", callback);
   }
+  syncSessionRuntimeIndex(sessionId, sessionIndex, opts = {}) {
+    if (!this.socket.connected) {
+      logger.debug("[API USER OBSERVER] Skipping session runtime index sync because socket is disconnected", {
+        sessionId
+      });
+      return false;
+    }
+    const now = Date.now();
+    this.socket.emit("session-alive", {
+      sid: sessionId,
+      time: now,
+      thinking: false,
+      sessionIndex
+    });
+    if (opts.markInactive) {
+      this.socket.emit("session-end", {
+        sid: sessionId,
+        time: now
+      });
+    }
+    return true;
+  }
   async close() {
     this.clearReconnectAfterServerDisconnectTimer();
     this.protocolV3Descriptor = null;
@@ -3613,4 +3644,4 @@ var api = /*#__PURE__*/Object.freeze({
   ApiClient: ApiClient
 });
 
-export { ApiClient as A, HAPPY_ORG_TURN_REPORT_TAG as H, SigningBootstrapRequiredError as S, ApiSessionClient as a, connectionState as b, configuration as c, HAPPY_ORG_REPEAT_THRESHOLD as d, encodeBase64 as e, backoff as f, delay as g, AsyncLock as h, isAuthenticationRequiredError as i, buildAuthenticatedHeaders as j, SIGNING_BOOTSTRAP_REQUIRED_MESSAGE as k, logger as l, encodeBase64Url as m, buildClientHeaders as n, decodeBase64 as o, packageJson as p, HAPPY_CLOUD_DAEMON_PORT as q, HeadTailPreviewBuffer as r, startOfflineReconnection as s, getLatestDaemonLog as t, api as u };
+export { ApiClient as A, HAPPY_ORG_REPEAT_THRESHOLD as H, SigningBootstrapRequiredError as S, ApiSessionClient as a, HAPPY_ORG_TURN_REPORT_TAG as b, configuration as c, HAPPY_ORG_SUMMARY_MAX_LENGTH as d, encodeBase64 as e, connectionState as f, backoff as g, delay as h, isAuthenticationRequiredError as i, AsyncLock as j, buildAuthenticatedHeaders as k, logger as l, SIGNING_BOOTSTRAP_REQUIRED_MESSAGE as m, encodeBase64Url as n, buildClientHeaders as o, packageJson as p, decodeBase64 as q, HAPPY_CLOUD_DAEMON_PORT as r, startOfflineReconnection as s, HeadTailPreviewBuffer as t, getLatestDaemonLog as u, api as v };

package/dist/{command-DAlFmWmr.cjs → command-CF6Wi_v2.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-CgVjDJpt.cjs');
+var index = require('./index-BybqdOf2.cjs');
 require('chalk');
-require('./api-MGlKcEf3.cjs');
+require('./api-C4bF6GEA.cjs');
 require('axios');
 require('fs');
 require('node:fs');
@@ -18,7 +18,7 @@ require('crypto');
 require('path');
 require('node:child_process');
 require('expo-server-sdk');
-require('./persistence-DLFUNI9q.cjs');
+require('./persistence-CdqBfAwo.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');

package/dist/{command-CfyFnMv2.mjs → command-DicPZ-Up.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-CHXCgpwi.mjs';
+import { c as createDefaultRuntimeShell } from './index-CEJmASSW.mjs';
 import 'chalk';
-import './api-DJe9WP9M.mjs';
+import './api-DX7Vg4Hz.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -16,7 +16,7 @@ import 'crypto';
 import 'path';
 import 'node:child_process';
 import 'expo-server-sdk';
-import './persistence-CkP90vEt.mjs';
+import './persistence-xypxp7ei.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';

package/dist/{index-CgVjDJpt.cjs → index-BybqdOf2.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-MGlKcEf3.cjs');
-var persistence = require('./persistence-DLFUNI9q.cjs');
+var api = require('./api-C4bF6GEA.cjs');
+var persistence = require('./persistence-CdqBfAwo.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -72,7 +72,7 @@ async function openBrowser(url) {
   }
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CgVjDJpt.cjs', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BybqdOf2.cjs', document.baseURI).href)));
 const QRCode = require$1("qrcode-terminal/vendor/QRCode");
 const QRErrorCorrectLevel = require$1("qrcode-terminal/vendor/QRCode/QRErrorCorrectLevel");
 const pendingTempFiles = /* @__PURE__ */ new Set();
@@ -695,7 +695,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CgVjDJpt.cjs', document.baseURI).href))));
+const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BybqdOf2.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -2541,16 +2541,36 @@ function createTrackedSessionFromRemoteIndexEntry(entry) {
     pid: entry.sessionIndex?.hostPid ?? 0
   };
 }
+async function archiveStaleRemoteSession(userScopedObserver, session) {
+  if (!userScopedObserver || !session.sessionIndex) {
+    api.logger.debug(
+      `[REMOTE SESSION INDEX] Stale remote session ${session.id} cannot be archived because user-scoped observer is unavailable`
+    );
+    return false;
+  }
+  const archived = userScopedObserver.syncSessionRuntimeIndex(session.id, {
+    ...session.sessionIndex,
+    lifecycleState: "archived"
+  }, {
+    markInactive: true
+  });
+  if (archived) {
+    api.logger.debug(`[REMOTE SESSION INDEX] Archived stale remote session ${session.id}`);
+  }
+  return archived;
+}
 async function recoverTrackedSessionsFromRemoteIndex({
   api: api$1,
   machineId,
   trackedSessionPids,
   trackSession,
+  userScopedObserver,
   lookupHappyProcessByPid = findHappyProcessByPid
 }) {
   const sessions = await api$1.listSessionsIndex();
   const alreadyTracked = new Set(trackedSessionPids);
   let recoveredCount = 0;
+  let archivedStaleCount = 0;
   let skippedStaleCount = 0;
   for (const session of sessions) {
     const sessionIndex = session.sessionIndex;
@@ -2579,7 +2599,12 @@ async function recoverTrackedSessionsFromRemoteIndex({
     }
     const sessionPidIsAlive = lookupResult !== null && !NON_SESSION_PROCESS_TYPES$1.has(lookupResult.type);
     if (!sessionPidIsAlive) {
-      skippedStaleCount++;
+      const archived = await archiveStaleRemoteSession(userScopedObserver, session);
+      if (archived) {
+        archivedStaleCount++;
+      } else {
+        skippedStaleCount++;
+      }
       continue;
     }
     trackSession(pid, createTrackedSessionFromRemoteIndexEntry(session));
@@ -2589,6 +2614,7 @@ async function recoverTrackedSessionsFromRemoteIndex({
   }
   return {
     recoveredCount,
+    archivedStaleCount,
     skippedStaleCount
   };
 }
@@ -3315,11 +3341,12 @@ async function startDaemon() {
         trackedSessionPids: pidToTrackedSession.keys(),
         trackSession: (pid, trackedSession) => {
           pidToTrackedSession.set(pid, trackedSession);
-        }
+        },
+        userScopedObserver
       });
-      if (recoveryResult.recoveredCount > 0 || recoveryResult.skippedStaleCount > 0) {
+      if (recoveryResult.recoveredCount > 0 || recoveryResult.archivedStaleCount > 0 || recoveryResult.skippedStaleCount > 0) {
         api.logger.debug(
-          `[DAEMON RUN] Remote session index recovery ${label} completed: recovered=${recoveryResult.recoveredCount}, skippedStale=${recoveryResult.skippedStaleCount}`
+          `[DAEMON RUN] Remote session index recovery ${label} completed: recovered=${recoveryResult.recoveredCount}, archivedStale=${recoveryResult.archivedStaleCount}, skippedStale=${recoveryResult.skippedStaleCount}`
         );
       }
     };
@@ -5131,6 +5158,21 @@ class GeminiTransport {
 }
 const geminiTransport = new GeminiTransport();
 
+const DEFAULT_CODEX_EXECUTE_TIMEOUT_MS = 15 * 6e4;
+function readPositiveIntegerEnv$1(name) {
+  const raw = typeof process.env[name] === "string" ? process.env[name].trim() : "";
+  if (!raw) {
+    return null;
+  }
+  const value = Number(raw);
+  if (!Number.isFinite(value) || !Number.isInteger(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
+function resolveCodexExecuteTimeoutMs() {
+  return readPositiveIntegerEnv$1("HAPPY_CODEX_EXECUTE_TIMEOUT_MS") ?? readPositiveIntegerEnv$1("HAPPIER_CODEX_EXECUTE_TIMEOUT_MS") ?? DEFAULT_CODEX_EXECUTE_TIMEOUT_MS;
+}
 class CodexTransport extends DefaultTransport {
   constructor() {
     super("codex");
@@ -5141,6 +5183,12 @@ class CodexTransport extends DefaultTransport {
   getIdleTimeout() {
     return 800;
   }
+  getToolCallTimeout(toolCallId, toolKind) {
+    if (toolKind === "execute") {
+      return resolveCodexExecuteTimeoutMs();
+    }
+    return super.getToolCallTimeout(toolCallId, toolKind);
+  }
 }
 new CodexTransport();
 
@@ -7745,7 +7793,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CgVjDJpt.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BybqdOf2.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -8996,11 +9044,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-BGSgcyUp.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-CT3jCZjH.cjs'); });
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-earICaxw.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DodH9jhh.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -9009,7 +9057,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-D5RAIaR0.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-CeHCZ1l4.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9085,7 +9133,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-DAlFmWmr.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-CF6Wi_v2.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9263,8 +9311,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-DLFUNI9q.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-MGlKcEf3.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-CdqBfAwo.cjs'); });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-C4bF6GEA.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-CHXCgpwi.mjs → index-CEJmASSW.mjs}

@@ -1,6 +1,6 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, e as encodeBase64, c as configuration, j as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, k as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, m as encodeBase64Url, g as delay, n as buildClientHeaders, o as decodeBase64, q as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, r as HeadTailPreviewBuffer, t as getLatestDaemonLog } from './api-DJe9WP9M.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-CkP90vEt.mjs';
+import { l as logger, e as encodeBase64, c as configuration, k as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, m as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, n as encodeBase64Url, h as delay, o as buildClientHeaders, q as decodeBase64, r as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, t as HeadTailPreviewBuffer, u as getLatestDaemonLog } from './api-DX7Vg4Hz.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-xypxp7ei.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os, { homedir } from 'os';
@@ -2519,16 +2519,36 @@ function createTrackedSessionFromRemoteIndexEntry(entry) {
     pid: entry.sessionIndex?.hostPid ?? 0
   };
 }
+async function archiveStaleRemoteSession(userScopedObserver, session) {
+  if (!userScopedObserver || !session.sessionIndex) {
+    logger.debug(
+      `[REMOTE SESSION INDEX] Stale remote session ${session.id} cannot be archived because user-scoped observer is unavailable`
+    );
+    return false;
+  }
+  const archived = userScopedObserver.syncSessionRuntimeIndex(session.id, {
+    ...session.sessionIndex,
+    lifecycleState: "archived"
+  }, {
+    markInactive: true
+  });
+  if (archived) {
+    logger.debug(`[REMOTE SESSION INDEX] Archived stale remote session ${session.id}`);
+  }
+  return archived;
+}
 async function recoverTrackedSessionsFromRemoteIndex({
   api,
   machineId,
   trackedSessionPids,
   trackSession,
+  userScopedObserver,
   lookupHappyProcessByPid = findHappyProcessByPid
 }) {
   const sessions = await api.listSessionsIndex();
   const alreadyTracked = new Set(trackedSessionPids);
   let recoveredCount = 0;
+  let archivedStaleCount = 0;
   let skippedStaleCount = 0;
   for (const session of sessions) {
     const sessionIndex = session.sessionIndex;
@@ -2557,7 +2577,12 @@ async function recoverTrackedSessionsFromRemoteIndex({
     }
     const sessionPidIsAlive = lookupResult !== null && !NON_SESSION_PROCESS_TYPES$1.has(lookupResult.type);
     if (!sessionPidIsAlive) {
-      skippedStaleCount++;
+      const archived = await archiveStaleRemoteSession(userScopedObserver, session);
+      if (archived) {
+        archivedStaleCount++;
+      } else {
+        skippedStaleCount++;
+      }
       continue;
     }
     trackSession(pid, createTrackedSessionFromRemoteIndexEntry(session));
@@ -2567,6 +2592,7 @@ async function recoverTrackedSessionsFromRemoteIndex({
   }
   return {
     recoveredCount,
+    archivedStaleCount,
     skippedStaleCount
   };
 }
@@ -3293,11 +3319,12 @@ async function startDaemon() {
         trackedSessionPids: pidToTrackedSession.keys(),
         trackSession: (pid, trackedSession) => {
           pidToTrackedSession.set(pid, trackedSession);
-        }
+        },
+        userScopedObserver
       });
-      if (recoveryResult.recoveredCount > 0 || recoveryResult.skippedStaleCount > 0) {
+      if (recoveryResult.recoveredCount > 0 || recoveryResult.archivedStaleCount > 0 || recoveryResult.skippedStaleCount > 0) {
         logger.debug(
-          `[DAEMON RUN] Remote session index recovery ${label} completed: recovered=${recoveryResult.recoveredCount}, skippedStale=${recoveryResult.skippedStaleCount}`
+          `[DAEMON RUN] Remote session index recovery ${label} completed: recovered=${recoveryResult.recoveredCount}, archivedStale=${recoveryResult.archivedStaleCount}, skippedStale=${recoveryResult.skippedStaleCount}`
         );
       }
     };
@@ -5109,6 +5136,21 @@ class GeminiTransport {
 }
 const geminiTransport = new GeminiTransport();
 
+const DEFAULT_CODEX_EXECUTE_TIMEOUT_MS = 15 * 6e4;
+function readPositiveIntegerEnv$1(name) {
+  const raw = typeof process.env[name] === "string" ? process.env[name].trim() : "";
+  if (!raw) {
+    return null;
+  }
+  const value = Number(raw);
+  if (!Number.isFinite(value) || !Number.isInteger(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
+function resolveCodexExecuteTimeoutMs() {
+  return readPositiveIntegerEnv$1("HAPPY_CODEX_EXECUTE_TIMEOUT_MS") ?? readPositiveIntegerEnv$1("HAPPIER_CODEX_EXECUTE_TIMEOUT_MS") ?? DEFAULT_CODEX_EXECUTE_TIMEOUT_MS;
+}
 class CodexTransport extends DefaultTransport {
   constructor() {
     super("codex");
@@ -5119,6 +5161,12 @@ class CodexTransport extends DefaultTransport {
   getIdleTimeout() {
     return 800;
   }
+  getToolCallTimeout(toolCallId, toolKind) {
+    if (toolKind === "execute") {
+      return resolveCodexExecuteTimeoutMs();
+    }
+    return super.getToolCallTimeout(toolCallId, toolKind);
+  }
 }
 new CodexTransport();
 
@@ -8974,11 +9022,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await import('./runClaude-DAQAEmHe.mjs');
+    const { runClaude } = await import('./runClaude-B-ex_tr3.mjs');
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-B2UpSn82.mjs');
+    const { runCodex } = await import('./runCodex-DhbvUtJC.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -8987,7 +9035,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-BBUmH1Qh.mjs');
+    const { runGemini } = await import('./runGemini-BsFR5Pd3.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9063,7 +9111,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-CfyFnMv2.mjs');
+      const { renderRuntimeProviders } = await import('./command-DicPZ-Up.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9241,8 +9289,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-CkP90vEt.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-DJe9WP9M.mjs').then(function (n) { return n.u; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-xypxp7ei.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-DX7Vg4Hz.mjs').then(function (n) { return n.v; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
 require('chalk');
-require('./api-MGlKcEf3.cjs');
-require('./persistence-DLFUNI9q.cjs');
+require('./api-C4bF6GEA.cjs');
+require('./persistence-CdqBfAwo.cjs');
 require('zod');
-require('./index-CgVjDJpt.cjs');
+require('./index-BybqdOf2.cjs');
 require('node:child_process');
 require('node:fs');
 require('cross-spawn');

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import 'chalk';
-import './api-DJe9WP9M.mjs';
-import './persistence-CkP90vEt.mjs';
+import './api-DX7Vg4Hz.mjs';
+import './persistence-xypxp7ei.mjs';
 import 'zod';
-import './index-CHXCgpwi.mjs';
+import './index-CEJmASSW.mjs';
 import 'node:child_process';
 import 'node:fs';
 import 'cross-spawn';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var api = require('./api-MGlKcEf3.cjs');
+var api = require('./api-C4bF6GEA.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');