happy-imou-cloud 2.1.19 → 2.1.21

package/dist/{BaseReasoningProcessor-Dtna0CRw.mjs → BaseReasoningProcessor-DdPnQSmQ.mjs}

@@ -1,5 +1,5 @@
-import { a as createSessionMetadata, p as publishSessionRegistration } from './index-CYRsGHXJ.mjs';
-import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-LMpXb-Ju.mjs';
+import { a as createSessionMetadata, p as publishSessionRegistration } from './index-krVv4CWK.mjs';
+import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-DB30ctmX.mjs';
 import { EventEmitter } from 'node:events';
 import { randomUUID } from 'node:crypto';
 

package/dist/{BaseReasoningProcessor-CuB78Igh.cjs → BaseReasoningProcessor-DxFwO2z9.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-SnNF4vVI.cjs');
-var persistence = require('./api-ljzPqsrQ.cjs');
+var index = require('./index-D4A092LJ.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
 var node_events = require('node:events');
 var node_crypto = require('node:crypto');
 

package/dist/{ProviderSelectionHandler-SWCNmor4.cjs → ProviderSelectionHandler-B5Aq5gA_.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var persistence = require('./api-ljzPqsrQ.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-C4IlzmJl.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{ProviderSelectionHandler-DJSSjBOW.mjs → ProviderSelectionHandler-DQITIqZK.mjs}

@@ -1,5 +1,5 @@
-import { l as logger } from './api-LMpXb-Ju.mjs';
-import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-BD-ChYZJ.mjs';
+import { l as logger } from './api-DB30ctmX.mjs';
+import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-beu2g-Qo.mjs';
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{api-ljzPqsrQ.cjs → api-8xtJZeXZ.cjs}

@@ -38,7 +38,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "happy-imou-cloud";
-var version = "2.1.19";
+var version = "2.1.21";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -120,7 +120,8 @@ var scripts = {
 	doctor: "node scripts/env-wrapper.cjs stable doctor",
 	"// ==== Development Linking ====": "",
 	"link:dev": "node scripts/link-dev.cjs",
-	"unlink:dev": "node scripts/link-dev.cjs unlink"
+	"unlink:dev": "node scripts/link-dev.cjs unlink",
+	"test:happy-org-1.2-quality": "node ../../node_modules/vitest/vitest.mjs run --config vitest.happy-org-1.2.config.mjs"
 };
 var dependencies = {
 	"@agentclientprotocol/sdk": "0.16.1",
@@ -2605,6 +2606,7 @@ class ApiSessionClient extends node_events.EventEmitter {
   protocolV3SocketCapabilities = null;
   protocolV3SessionSyncWaitTimer = null;
   committedSessionWriteAckMode;
+  pendingBackgroundTasks = /* @__PURE__ */ new Set();
   pendingHappyOrgDispatchBusinessAcks = /* @__PURE__ */ new Set();
   recordedHappyOrgDispatchBusinessAcks = /* @__PURE__ */ new Set();
   pendingHappyOrgTaskTurnReports = /* @__PURE__ */ new Set();
@@ -3010,7 +3012,7 @@ class ApiSessionClient extends node_events.EventEmitter {
    * @param handler - Handler function that returns the updated metadata
    */
   updateMetadata(handler) {
-    void this.metadataLock.inLock(async () => {
+    this.trackPendingBackgroundTask(this.metadataLock.inLock(async () => {
       await backoff(async () => {
         let updated = this.mergeRuntimeMetadata(handler(this.metadata));
         const sessionIndex = buildSessionRuntimeIndex(updated);
@@ -3039,7 +3041,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       });
     }).catch((error) => {
       logger.debug("[API] Metadata update failed unexpectedly", error);
-    });
+    }));
   }
   /**
    * Update session agent state
@@ -3047,7 +3049,7 @@ class ApiSessionClient extends node_events.EventEmitter {
    */
   updateAgentState(handler) {
     logger.debugLargeJson("Updating agent state", this.agentState);
-    void this.agentStateLock.inLock(async () => {
+    this.trackPendingBackgroundTask(this.agentStateLock.inLock(async () => {
       await backoff(async () => {
         let updated = handler(this.agentState || {});
         const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(this.encryptionKey, this.encryptionVariant, updated)) : null });
@@ -3067,7 +3069,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       });
     }).catch((error) => {
       logger.debug("[API] Agent state update failed unexpectedly", error);
-    });
+    }));
   }
   /**
    * Wait for socket buffer to flush
@@ -3077,6 +3079,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       return;
     }
     await this.waitForReliableSessionMessagesToDrain();
+    await this.waitForPendingBackgroundTasksToDrain();
     if (!this.socket.connected) {
       return;
     }
@@ -3090,11 +3093,27 @@ class ApiSessionClient extends node_events.EventEmitter {
     });
   }
   async close() {
+    if (this.socket.connected) {
+      await this.waitForPendingBackgroundTasksToDrain();
+    }
     logger.debug("[API] socket.close() called");
     this.clearReconnectAfterServerDisconnectTimer();
     this.invalidateProtocolV3SessionSync();
     this.socket.close();
   }
+  trackPendingBackgroundTask(task) {
+    let trackedTask;
+    trackedTask = task.finally(() => {
+      this.pendingBackgroundTasks.delete(trackedTask);
+    });
+    this.pendingBackgroundTasks.add(trackedTask);
+    return trackedTask;
+  }
+  async waitForPendingBackgroundTasksToDrain() {
+    while (this.pendingBackgroundTasks.size > 0) {
+      await Promise.allSettled(Array.from(this.pendingBackgroundTasks));
+    }
+  }
   handleSocketUpdate(data) {
     if (!data.body) {
       logger.debug("[SOCKET] [UPDATE] [ERROR] No body in update!");
@@ -3176,9 +3195,9 @@ class ApiSessionClient extends node_events.EventEmitter {
       return;
     }
     this.pendingHappyOrgDispatchBusinessAcks.add(ackKey);
-    void this.submitHappyOrgDispatchBusinessAck(candidate).finally(() => {
+    this.trackPendingBackgroundTask(this.submitHappyOrgDispatchBusinessAck(candidate).finally(() => {
       this.pendingHappyOrgDispatchBusinessAcks.delete(ackKey);
-    });
+    }));
   }
   resolveHappyOrgDispatchBusinessAckCandidate(message) {
     const taskContext = message.meta?.happyOrg?.taskContext ?? this.metadata?.happyOrg?.taskContext;
@@ -3208,9 +3227,9 @@ class ApiSessionClient extends node_events.EventEmitter {
       return;
     }
     this.pendingHappyOrgTaskTurnReports.add(submissionKey);
-    void this.submitHappyOrgTaskTurnReport(message.report, submissionKey).finally(() => {
+    this.trackPendingBackgroundTask(this.submitHappyOrgTaskTurnReport(message.report, submissionKey).finally(() => {
       this.pendingHappyOrgTaskTurnReports.delete(submissionKey);
-    });
+    }));
   }
   async ensureHappyOrgControlCredentials() {
     if (this.credentials.signing) {

package/dist/{api-LMpXb-Ju.mjs → api-DB30ctmX.mjs}

@@ -18,7 +18,7 @@ import { unlink, readFile, mkdir, open, stat, writeFile, rename } from 'node:fs/
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.1.19";
+var version = "2.1.21";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -100,7 +100,8 @@ var scripts = {
 	doctor: "node scripts/env-wrapper.cjs stable doctor",
 	"// ==== Development Linking ====": "",
 	"link:dev": "node scripts/link-dev.cjs",
-	"unlink:dev": "node scripts/link-dev.cjs unlink"
+	"unlink:dev": "node scripts/link-dev.cjs unlink",
+	"test:happy-org-1.2-quality": "node ../../node_modules/vitest/vitest.mjs run --config vitest.happy-org-1.2.config.mjs"
 };
 var dependencies = {
 	"@agentclientprotocol/sdk": "0.16.1",
@@ -2585,6 +2586,7 @@ class ApiSessionClient extends EventEmitter {
   protocolV3SocketCapabilities = null;
   protocolV3SessionSyncWaitTimer = null;
   committedSessionWriteAckMode;
+  pendingBackgroundTasks = /* @__PURE__ */ new Set();
   pendingHappyOrgDispatchBusinessAcks = /* @__PURE__ */ new Set();
   recordedHappyOrgDispatchBusinessAcks = /* @__PURE__ */ new Set();
   pendingHappyOrgTaskTurnReports = /* @__PURE__ */ new Set();
@@ -2990,7 +2992,7 @@ class ApiSessionClient extends EventEmitter {
    * @param handler - Handler function that returns the updated metadata
    */
   updateMetadata(handler) {
-    void this.metadataLock.inLock(async () => {
+    this.trackPendingBackgroundTask(this.metadataLock.inLock(async () => {
       await backoff(async () => {
         let updated = this.mergeRuntimeMetadata(handler(this.metadata));
         const sessionIndex = buildSessionRuntimeIndex(updated);
@@ -3019,7 +3021,7 @@ class ApiSessionClient extends EventEmitter {
       });
     }).catch((error) => {
       logger.debug("[API] Metadata update failed unexpectedly", error);
-    });
+    }));
   }
   /**
    * Update session agent state
@@ -3027,7 +3029,7 @@ class ApiSessionClient extends EventEmitter {
    */
   updateAgentState(handler) {
     logger.debugLargeJson("Updating agent state", this.agentState);
-    void this.agentStateLock.inLock(async () => {
+    this.trackPendingBackgroundTask(this.agentStateLock.inLock(async () => {
       await backoff(async () => {
         let updated = handler(this.agentState || {});
         const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(this.encryptionKey, this.encryptionVariant, updated)) : null });
@@ -3047,7 +3049,7 @@ class ApiSessionClient extends EventEmitter {
       });
     }).catch((error) => {
       logger.debug("[API] Agent state update failed unexpectedly", error);
-    });
+    }));
   }
   /**
    * Wait for socket buffer to flush
@@ -3057,6 +3059,7 @@ class ApiSessionClient extends EventEmitter {
       return;
     }
     await this.waitForReliableSessionMessagesToDrain();
+    await this.waitForPendingBackgroundTasksToDrain();
     if (!this.socket.connected) {
       return;
     }
@@ -3070,11 +3073,27 @@ class ApiSessionClient extends EventEmitter {
     });
   }
   async close() {
+    if (this.socket.connected) {
+      await this.waitForPendingBackgroundTasksToDrain();
+    }
     logger.debug("[API] socket.close() called");
     this.clearReconnectAfterServerDisconnectTimer();
     this.invalidateProtocolV3SessionSync();
     this.socket.close();
   }
+  trackPendingBackgroundTask(task) {
+    let trackedTask;
+    trackedTask = task.finally(() => {
+      this.pendingBackgroundTasks.delete(trackedTask);
+    });
+    this.pendingBackgroundTasks.add(trackedTask);
+    return trackedTask;
+  }
+  async waitForPendingBackgroundTasksToDrain() {
+    while (this.pendingBackgroundTasks.size > 0) {
+      await Promise.allSettled(Array.from(this.pendingBackgroundTasks));
+    }
+  }
   handleSocketUpdate(data) {
     if (!data.body) {
       logger.debug("[SOCKET] [UPDATE] [ERROR] No body in update!");
@@ -3156,9 +3175,9 @@ class ApiSessionClient extends EventEmitter {
       return;
     }
     this.pendingHappyOrgDispatchBusinessAcks.add(ackKey);
-    void this.submitHappyOrgDispatchBusinessAck(candidate).finally(() => {
+    this.trackPendingBackgroundTask(this.submitHappyOrgDispatchBusinessAck(candidate).finally(() => {
       this.pendingHappyOrgDispatchBusinessAcks.delete(ackKey);
-    });
+    }));
   }
   resolveHappyOrgDispatchBusinessAckCandidate(message) {
     const taskContext = message.meta?.happyOrg?.taskContext ?? this.metadata?.happyOrg?.taskContext;
@@ -3188,9 +3207,9 @@ class ApiSessionClient extends EventEmitter {
       return;
     }
     this.pendingHappyOrgTaskTurnReports.add(submissionKey);
-    void this.submitHappyOrgTaskTurnReport(message.report, submissionKey).finally(() => {
+    this.trackPendingBackgroundTask(this.submitHappyOrgTaskTurnReport(message.report, submissionKey).finally(() => {
       this.pendingHappyOrgTaskTurnReports.delete(submissionKey);
-    });
+    }));
   }
   async ensureHappyOrgControlCredentials() {
     if (this.credentials.signing) {

package/dist/{command-C4nFEFfU.cjs → command-79M8Bz4I.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-SnNF4vVI.cjs');
+var index = require('./index-D4A092LJ.cjs');
 require('chalk');
-require('./api-ljzPqsrQ.cjs');
+require('./api-8xtJZeXZ.cjs');
 require('axios');
 require('fs');
 require('node:fs');

package/dist/{command-wiV8CFFG.mjs → command-C6injNJE.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-CYRsGHXJ.mjs';
+import { c as createDefaultRuntimeShell } from './index-krVv4CWK.mjs';
 import 'chalk';
-import './api-LMpXb-Ju.mjs';
+import './api-DB30ctmX.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';

package/dist/{index-SnNF4vVI.cjs → index-D4A092LJ.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var persistence = require('./api-ljzPqsrQ.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -71,7 +71,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-SnNF4vVI.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-D4A092LJ.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();
@@ -636,7 +636,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-SnNF4vVI.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-D4A092LJ.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -2988,6 +2988,28 @@ const initialMachineMetadata = {
   happyHomeDir: persistence.configuration.happyCloudHomeDir,
   happyLibDir: projectPath()
 };
+function createOfflineMachine(credentials, machineId, daemonState) {
+  if (credentials.encryption.type === "dataKey") {
+    return {
+      id: machineId,
+      encryptionKey: credentials.encryption.machineKey,
+      encryptionVariant: "dataKey",
+      metadata: initialMachineMetadata,
+      metadataVersion: 0,
+      daemonState,
+      daemonStateVersion: 0
+    };
+  }
+  return {
+    id: machineId,
+    encryptionKey: credentials.encryption.secret,
+    encryptionVariant: "legacy",
+    metadata: initialMachineMetadata,
+    metadataVersion: 0,
+    daemonState,
+    daemonStateVersion: 0
+  };
+}
 async function getProfileEnvironmentVariablesForAgent(profileId, agentType) {
   try {
     const settings = await persistence.readSettings();
@@ -3562,19 +3584,41 @@ ${stderrSnapshot}`);
         persistence.logger.debug("[DAEMON RUN] Failed to start user-scoped observer, continuing without it", error);
       }
     }
-    const machine = await activeApi.getOrCreateMachine({
-      machineId,
-      metadata: initialMachineMetadata,
-      daemonState: initialDaemonState
-    });
-    persistence.logger.debug(`[DAEMON RUN] Machine registered: ${machine.id}`);
-    const apiMachine = activeApi.machineSyncClient(machine);
-    apiMachine.setRPCHandlers({
+    let machine = createOfflineMachine(credentials, machineId, initialDaemonState);
+    let daemonHasAuthenticatedSync = false;
+    try {
+      machine = await activeApi.getOrCreateMachine({
+        machineId,
+        metadata: initialMachineMetadata,
+        daemonState: initialDaemonState
+      });
+      daemonHasAuthenticatedSync = true;
+      persistence.logger.debug(`[DAEMON RUN] Machine registered: ${machine.id}`);
+    } catch (error) {
+      if (!persistence.isAuthenticationRequiredError(error)) {
+        throw error;
+      }
+      persistence.logger.warn(
+        "[DAEMON RUN] Machine registration rejected by the server. Continuing with local-only daemon control until authentication is refreshed.",
+        error instanceof Error ? error.message : String(error)
+      );
+      try {
+        await userScopedObserver?.close();
+      } catch (observerCloseError) {
+        persistence.logger.debug("[DAEMON RUN] Failed to close user-scoped observer after auth fallback", observerCloseError);
+      }
+      userScopedObserver = null;
+    }
+    const apiMachine = daemonHasAuthenticatedSync ? activeApi.machineSyncClient(machine) : null;
+    apiMachine?.setRPCHandlers({
       spawnSession,
       stopSession,
       requestShutdown: () => requestShutdown("happy-app")
     });
     const runRemoteSessionIndexRecovery = async (label) => {
+      if (!daemonHasAuthenticatedSync) {
+        return;
+      }
       const recoveryResult = await recoverTrackedSessionsFromRemoteIndex({
         api: activeApi,
         machineId,
@@ -3609,7 +3653,7 @@ ${stderrSnapshot}`);
       scheduleRemoteSessionIndexRecovery();
     };
     userScopedObserver?.onUpdate(handleUserScopedObserverUpdate);
-    apiMachine.connect();
+    apiMachine?.connect();
     void runSessionRegistryRecovery("startup").catch((error) => {
       persistence.logger.debug("[DAEMON RUN] Session registry startup recovery failed", error);
     });
@@ -3713,14 +3757,16 @@ ${stderrSnapshot}`);
         remoteSessionIndexRefreshTimer = null;
       }
       userScopedObserver?.offUpdate(handleUserScopedObserverUpdate);
-      await apiMachine.updateDaemonState((state) => ({
-        ...state,
-        status: "shutting-down",
-        shutdownRequestedAt: Date.now(),
-        shutdownSource: source
-      }));
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      apiMachine.shutdown();
+      if (apiMachine) {
+        await apiMachine.updateDaemonState((state) => ({
+          ...state,
+          status: "shutting-down",
+          shutdownRequestedAt: Date.now(),
+          shutdownSource: source
+        }));
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        apiMachine.shutdown();
+      }
       await userScopedObserver?.close();
       await stopControlServer();
       await cleanupDaemonState();
@@ -9097,7 +9143,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-SnNF4vVI.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-D4A092LJ.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -10415,11 +10461,15 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-khz1woP5.cjs'); });
-    await runClaude(opts.credentials, opts.claudeOptions ?? {});
+    const claudeOptions = opts.claudeOptions ?? {};
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-DmXinUiz.cjs'); });
+    await runClaude(opts.credentials, {
+      ...claudeOptions,
+      startingMode: claudeOptions.startingMode ?? (claudeOptions.startedBy === "daemon" ? "remote" : void 0)
+    });
   },
   codex: async (opts) => {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Vb_tfdTK.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CoqsQ-cb.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -10428,7 +10478,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-MIoPtN_R.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BC_5rNMt.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -10511,7 +10561,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-C4nFEFfU.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-79M8Bz4I.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -10700,8 +10750,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('./api-ljzPqsrQ.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-ljzPqsrQ.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./api-8xtJZeXZ.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-8xtJZeXZ.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-CYRsGHXJ.mjs → index-krVv4CWK.mjs}

@@ -1,5 +1,5 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, j as encodeBase64, c as configuration, k as readCredentials, m as ensureSigningCredentials, r as readSettings, u as updateSettings, n as encodeBase64Url, g as delay, o as buildClientHeaders, q as decodeBase64, w as writeCredentialsLegacy, t as writeCredentialsDataKey, v as readDaemonState, x as HAPPY_CLOUD_DAEMON_PORT, y as clearDaemonState, z as packageJson, B as acquireDaemonLock, C as writeDaemonState, A as ApiClient, D as releaseDaemonLock, E as validateProfileForAgent, F as getProfileEnvironmentVariables, G as clearCredentials, I as clearMachineId, J as HeadTailPreviewBuffer, K as getLatestDaemonLog } from './api-LMpXb-Ju.mjs';
+import { l as logger, j as encodeBase64, c as configuration, k as readCredentials, m as ensureSigningCredentials, r as readSettings, u as updateSettings, n as encodeBase64Url, g as delay, o as buildClientHeaders, q as decodeBase64, w as writeCredentialsLegacy, t as writeCredentialsDataKey, v as readDaemonState, x as HAPPY_CLOUD_DAEMON_PORT, y as clearDaemonState, z as packageJson, B as acquireDaemonLock, C as writeDaemonState, A as ApiClient, i as isAuthenticationRequiredError, D as releaseDaemonLock, E as validateProfileForAgent, F as getProfileEnvironmentVariables, G as clearCredentials, I as clearMachineId, J as HeadTailPreviewBuffer, K as getLatestDaemonLog } from './api-DB30ctmX.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os$1, { homedir } from 'os';
@@ -2966,6 +2966,28 @@ const initialMachineMetadata = {
   happyHomeDir: configuration.happyCloudHomeDir,
   happyLibDir: projectPath()
 };
+function createOfflineMachine(credentials, machineId, daemonState) {
+  if (credentials.encryption.type === "dataKey") {
+    return {
+      id: machineId,
+      encryptionKey: credentials.encryption.machineKey,
+      encryptionVariant: "dataKey",
+      metadata: initialMachineMetadata,
+      metadataVersion: 0,
+      daemonState,
+      daemonStateVersion: 0
+    };
+  }
+  return {
+    id: machineId,
+    encryptionKey: credentials.encryption.secret,
+    encryptionVariant: "legacy",
+    metadata: initialMachineMetadata,
+    metadataVersion: 0,
+    daemonState,
+    daemonStateVersion: 0
+  };
+}
 async function getProfileEnvironmentVariablesForAgent(profileId, agentType) {
   try {
     const settings = await readSettings();
@@ -3540,19 +3562,41 @@ ${stderrSnapshot}`);
         logger.debug("[DAEMON RUN] Failed to start user-scoped observer, continuing without it", error);
       }
     }
-    const machine = await activeApi.getOrCreateMachine({
-      machineId,
-      metadata: initialMachineMetadata,
-      daemonState: initialDaemonState
-    });
-    logger.debug(`[DAEMON RUN] Machine registered: ${machine.id}`);
-    const apiMachine = activeApi.machineSyncClient(machine);
-    apiMachine.setRPCHandlers({
+    let machine = createOfflineMachine(credentials, machineId, initialDaemonState);
+    let daemonHasAuthenticatedSync = false;
+    try {
+      machine = await activeApi.getOrCreateMachine({
+        machineId,
+        metadata: initialMachineMetadata,
+        daemonState: initialDaemonState
+      });
+      daemonHasAuthenticatedSync = true;
+      logger.debug(`[DAEMON RUN] Machine registered: ${machine.id}`);
+    } catch (error) {
+      if (!isAuthenticationRequiredError(error)) {
+        throw error;
+      }
+      logger.warn(
+        "[DAEMON RUN] Machine registration rejected by the server. Continuing with local-only daemon control until authentication is refreshed.",
+        error instanceof Error ? error.message : String(error)
+      );
+      try {
+        await userScopedObserver?.close();
+      } catch (observerCloseError) {
+        logger.debug("[DAEMON RUN] Failed to close user-scoped observer after auth fallback", observerCloseError);
+      }
+      userScopedObserver = null;
+    }
+    const apiMachine = daemonHasAuthenticatedSync ? activeApi.machineSyncClient(machine) : null;
+    apiMachine?.setRPCHandlers({
       spawnSession,
       stopSession,
       requestShutdown: () => requestShutdown("happy-app")
     });
     const runRemoteSessionIndexRecovery = async (label) => {
+      if (!daemonHasAuthenticatedSync) {
+        return;
+      }
       const recoveryResult = await recoverTrackedSessionsFromRemoteIndex({
         api: activeApi,
         machineId,
@@ -3587,7 +3631,7 @@ ${stderrSnapshot}`);
       scheduleRemoteSessionIndexRecovery();
     };
     userScopedObserver?.onUpdate(handleUserScopedObserverUpdate);
-    apiMachine.connect();
+    apiMachine?.connect();
     void runSessionRegistryRecovery("startup").catch((error) => {
       logger.debug("[DAEMON RUN] Session registry startup recovery failed", error);
     });
@@ -3691,14 +3735,16 @@ ${stderrSnapshot}`);
         remoteSessionIndexRefreshTimer = null;
       }
       userScopedObserver?.offUpdate(handleUserScopedObserverUpdate);
-      await apiMachine.updateDaemonState((state) => ({
-        ...state,
-        status: "shutting-down",
-        shutdownRequestedAt: Date.now(),
-        shutdownSource: source
-      }));
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      apiMachine.shutdown();
+      if (apiMachine) {
+        await apiMachine.updateDaemonState((state) => ({
+          ...state,
+          status: "shutting-down",
+          shutdownRequestedAt: Date.now(),
+          shutdownSource: source
+        }));
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        apiMachine.shutdown();
+      }
       await userScopedObserver?.close();
       await stopControlServer();
       await cleanupDaemonState();
@@ -10393,11 +10439,15 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await import('./runClaude-DrWj6fju.mjs');
-    await runClaude(opts.credentials, opts.claudeOptions ?? {});
+    const claudeOptions = opts.claudeOptions ?? {};
+    const { runClaude } = await import('./runClaude-nzLh-orP.mjs');
+    await runClaude(opts.credentials, {
+      ...claudeOptions,
+      startingMode: claudeOptions.startingMode ?? (claudeOptions.startedBy === "daemon" ? "remote" : void 0)
+    });
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-CfQgQ4gD.mjs');
+    const { runCodex } = await import('./runCodex-C-Pjpbxn.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -10406,7 +10456,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-BOdeej1A.mjs');
+    const { runGemini } = await import('./runGemini-CIVm6NWC.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -10489,7 +10539,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-wiV8CFFG.mjs');
+      const { renderRuntimeProviders } = await import('./command-C6injNJE.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -10678,8 +10728,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./api-LMpXb-Ju.mjs').then(function (n) { return n.L; });
-        const { ApiClient: ApiClient2 } = await import('./api-LMpXb-Ju.mjs').then(function (n) { return n.M; });
+        const { readCredentials: readCredentials2 } = await import('./api-DB30ctmX.mjs').then(function (n) { return n.L; });
+        const { ApiClient: ApiClient2 } = await import('./api-DB30ctmX.mjs').then(function (n) { return n.M; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 require('chalk');
-require('./api-ljzPqsrQ.cjs');
+require('./api-8xtJZeXZ.cjs');
 require('zod');
-require('./index-SnNF4vVI.cjs');
+require('./index-D4A092LJ.cjs');
 require('node:child_process');
 require('node:fs');
 require('cross-spawn');

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import 'chalk';
-import './api-LMpXb-Ju.mjs';
+import './api-DB30ctmX.mjs';
 import 'zod';
-import './index-CYRsGHXJ.mjs';
+import './index-krVv4CWK.mjs';
 import 'node:child_process';
 import 'node:fs';
 import 'cross-spawn';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var persistence = require('./api-ljzPqsrQ.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');

package/dist/lib.d.cts

@@ -2349,6 +2349,7 @@ declare class ApiSessionClient extends EventEmitter {
     private protocolV3SocketCapabilities;
     private protocolV3SessionSyncWaitTimer;
     private committedSessionWriteAckMode;
+    private pendingBackgroundTasks;
     private pendingHappyOrgDispatchBusinessAcks;
     private recordedHappyOrgDispatchBusinessAcks;
     private pendingHappyOrgTaskTurnReports;
@@ -2416,6 +2417,8 @@ declare class ApiSessionClient extends EventEmitter {
      */
     flush(): Promise<void>;
     close(): Promise<void>;
+    private trackPendingBackgroundTask;
+    private waitForPendingBackgroundTasksToDrain;
     private handleSocketUpdate;
     private dispatchEncryptedSessionMessage;
     private maybeAutoAcknowledgeHappyOrgDispatch;

package/dist/lib.d.mts

@@ -2349,6 +2349,7 @@ declare class ApiSessionClient extends EventEmitter {
     private protocolV3SocketCapabilities;
     private protocolV3SessionSyncWaitTimer;
     private committedSessionWriteAckMode;
+    private pendingBackgroundTasks;
     private pendingHappyOrgDispatchBusinessAcks;
     private recordedHappyOrgDispatchBusinessAcks;
     private pendingHappyOrgTaskTurnReports;
@@ -2416,6 +2417,8 @@ declare class ApiSessionClient extends EventEmitter {
      */
     flush(): Promise<void>;
     close(): Promise<void>;
+    private trackPendingBackgroundTask;
+    private waitForPendingBackgroundTasksToDrain;
     private handleSocketUpdate;
     private dispatchEncryptedSessionMessage;
     private maybeAutoAcknowledgeHappyOrgDispatch;

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-LMpXb-Ju.mjs';
+export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-DB30ctmX.mjs';
 export { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import 'axios';
 import 'chalk';

package/dist/{registerKillSessionHandler-C4IlzmJl.cjs → registerKillSessionHandler-Cl_er9rg.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-SnNF4vVI.cjs');
-var persistence = require('./api-ljzPqsrQ.cjs');
+var index = require('./index-D4A092LJ.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 var crypto = require('crypto');

package/dist/{registerKillSessionHandler-BD-ChYZJ.mjs → registerKillSessionHandler-beu2g-Qo.mjs}

@@ -1,5 +1,5 @@
-import { k as initialMachineMetadata, R as RuntimeShell, l as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-CYRsGHXJ.mjs';
-import { r as readSettings, H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, e as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-LMpXb-Ju.mjs';
+import { k as initialMachineMetadata, R as RuntimeShell, l as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-krVv4CWK.mjs';
+import { r as readSettings, H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, e as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-DB30ctmX.mjs';
 import { randomUUID } from 'node:crypto';
 import { basename } from 'node:path';
 import { createHash } from 'crypto';

package/dist/{runClaude-khz1woP5.cjs → runClaude-DmXinUiz.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var persistence = require('./api-ljzPqsrQ.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
-var index = require('./index-SnNF4vVI.cjs');
+var index = require('./index-D4A092LJ.cjs');
 require('ps-list');
 require('fs');
 require('path');
@@ -25,9 +25,9 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-SWCNmor4.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-B5Aq5gA_.cjs');
 var types = require('./types-DVk3crez.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-C4IlzmJl.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
 require('socket.io-client');
 require('expo-server-sdk');
 var node_util = require('node:util');

package/dist/{runClaude-DrWj6fju.mjs → runClaude-nzLh-orP.mjs}

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, f as backoff, g as delay, h as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-LMpXb-Ju.mjs';
+import { l as logger, f as backoff, g as delay, h as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DB30ctmX.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
-import { m as getProjectPath, F as Future, n as claudeLocal, E as ExitCodeError, o as trimIdent, q as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, u as claudeCheckSession, w as projectPath, x as mapToClaudeMode, P as PushableAsyncIterable, y as query, A as AbortError, e as stopCaffeinate, p as publishSessionRegistration, z as getEnvironmentInfo, a as createSessionMetadata, B as startCaffeinate, b as closeProviderSession } from './index-CYRsGHXJ.mjs';
+import { m as getProjectPath, F as Future, n as claudeLocal, E as ExitCodeError, o as trimIdent, q as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, u as claudeCheckSession, w as projectPath, x as mapToClaudeMode, P as PushableAsyncIterable, y as query, A as AbortError, e as stopCaffeinate, p as publishSessionRegistration, z as getEnvironmentInfo, a as createSessionMetadata, B as startCaffeinate, b as closeProviderSession } from './index-krVv4CWK.mjs';
 import 'ps-list';
 import 'fs';
 import 'path';
@@ -23,9 +23,9 @@ import 'tweetnacl';
 import 'open';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DJSSjBOW.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DQITIqZK.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
-import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, k as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler } from './registerKillSessionHandler-BD-ChYZJ.mjs';
+import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, k as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler } from './registerKillSessionHandler-beu2g-Qo.mjs';
 import 'socket.io-client';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';

package/dist/{runCodex-CfQgQ4gD.mjs → runCodex-C-Pjpbxn.mjs}

@@ -1,6 +1,6 @@
-import { p as preserveSessionRuntimeMetadata, l as logger, b as connectionState, A as ApiClient } from './api-LMpXb-Ju.mjs';
-import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-BD-ChYZJ.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-CYRsGHXJ.mjs';
+import { p as preserveSessionRuntimeMetadata, l as logger, b as connectionState, A as ApiClient } from './api-DB30ctmX.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-beu2g-Qo.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-krVv4CWK.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
@@ -24,8 +24,8 @@ import 'tweetnacl';
 import 'open';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DJSSjBOW.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Dtna0CRw.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DQITIqZK.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DdPnQSmQ.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';

package/dist/{runCodex-Vb_tfdTK.cjs → runCodex-CoqsQ-cb.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var persistence = require('./api-ljzPqsrQ.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-C4IlzmJl.cjs');
-var index = require('./index-SnNF4vVI.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
+var index = require('./index-D4A092LJ.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
@@ -26,8 +26,8 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-SWCNmor4.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CuB78Igh.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-B5Aq5gA_.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DxFwO2z9.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');

package/dist/{runGemini-MIoPtN_R.cjs → runGemini-BC_5rNMt.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var persistence = require('./api-ljzPqsrQ.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-C4IlzmJl.cjs');
-var index = require('./index-SnNF4vVI.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CuB78Igh.cjs');
+var persistence = require('./api-8xtJZeXZ.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
+var index = require('./index-D4A092LJ.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DxFwO2z9.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');

package/dist/{runGemini-BOdeej1A.mjs → runGemini-CIVm6NWC.mjs}

@@ -1,10 +1,10 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient } from './api-LMpXb-Ju.mjs';
-import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-BD-ChYZJ.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-CYRsGHXJ.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Dtna0CRw.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-DB30ctmX.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-beu2g-Qo.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-krVv4CWK.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DdPnQSmQ.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.1.19",
+  "version": "2.1.21",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",
@@ -82,7 +82,8 @@
     "doctor": "node scripts/env-wrapper.cjs stable doctor",
     "// ==== Development Linking ====": "",
     "link:dev": "node scripts/link-dev.cjs",
-    "unlink:dev": "node scripts/link-dev.cjs unlink"
+    "unlink:dev": "node scripts/link-dev.cjs unlink",
+    "test:happy-org-1.2-quality": "node ../../node_modules/vitest/vitest.mjs run --config vitest.happy-org-1.2.config.mjs"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "0.16.1",

package/scripts/build.mjs

@@ -1,41 +1,21 @@
 #!/usr/bin/env node
 
 import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { readFileSync, rmSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { ensureAcpSdkCompat } from './ensureAcpSdkCompat.mjs';
+import {
+  ensurePackageResolvableFromPackageRoot,
+  resolveTool,
+  shouldUseShell,
+} from './tooling-utils.mjs';
 
 const here = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(here, '..');
 const workspaceRoot = resolve(packageRoot, '..', '..');
 const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
 
-function resolveTool(binName, packageSpecs) {
-  const suffix = process.platform === 'win32' ? '.cmd' : '';
-  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-
-  if (existsSync(packageLocalBin)) {
-    return {
-      command: packageLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  if (existsSync(workspaceLocalBin)) {
-    return {
-      command: workspaceLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  return {
-    command: 'npx',
-    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
-  };
-}
-
 function runStep(name, command, args) {
   console.log(`\n[build] ${name}`);
   console.log(`> ${command} ${args.join(' ')}`);
@@ -43,7 +23,7 @@ function runStep(name, command, args) {
   const result = spawnSync(command, args, {
     cwd: packageRoot,
     stdio: 'inherit',
-    shell: process.platform === 'win32',
+    shell: shouldUseShell(command),
     env: process.env,
   });
 
@@ -56,13 +36,37 @@ function runTool(name, tool, args) {
   runStep(name, tool.command, [...tool.prefixArgs, ...args]);
 }
 
-const tsc = resolveTool('tsc', [`typescript@${packageJson.devDependencies.typescript}`]);
-const pkgroll = resolveTool('pkgroll', [
-  `pkgroll@${packageJson.devDependencies.pkgroll}`,
-  `typescript@${packageJson.devDependencies.typescript}`,
-]);
+const tsc = resolveTool({
+  binName: 'tsc',
+  packageName: 'typescript',
+  packageRoot,
+  workspaceRoot,
+  packageSpecs: [`typescript@${packageJson.devDependencies.typescript}`],
+  entryCandidates: ['bin/tsc'],
+});
+const pkgroll = resolveTool({
+  binName: 'pkgroll',
+  packageName: 'pkgroll',
+  packageRoot,
+  workspaceRoot,
+  packageSpecs: [
+    `pkgroll@${packageJson.devDependencies.pkgroll}`,
+    `typescript@${packageJson.devDependencies.typescript}`,
+  ],
+  entryCandidates: ['dist/cli.mjs'],
+});
+const cleanupTypeScriptResolution = ensurePackageResolvableFromPackageRoot({
+  packageName: 'typescript',
+  version: packageJson.devDependencies.typescript,
+  packageRoot,
+  workspaceRoot,
+});
 
 ensureAcpSdkCompat();
 rmSync(resolve(packageRoot, 'dist'), { recursive: true, force: true });
-runTool('typecheck', tsc, ['--noEmit']);
-runTool('bundle', pkgroll, []);
+try {
+  runTool('typecheck', tsc, ['--noEmit']);
+  runTool('bundle', pkgroll, []);
+} finally {
+  cleanupTypeScriptResolution();
+}

package/scripts/release-smoke.mjs

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
 import { ensureAcpSdkCompat } from './ensureAcpSdkCompat.mjs';
 import { shouldSkipPackedInstallVerification } from './release-smoke-utils.mjs';
+import { resolveTool, shouldUseShell } from './tooling-utils.mjs';
 
 const here = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(here, '..');
@@ -14,43 +15,6 @@ const workspaceRoot = resolve(packageRoot, '..', '..');
 const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
 const scriptPath = fileURLToPath(import.meta.url);
 
-function resolveTool(binName, packageName) {
-  const suffix = process.platform === 'win32' ? '.cmd' : '';
-  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-
-  if (existsSync(packageLocalBin)) {
-    return {
-      command: packageLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  if (existsSync(workspaceLocalBin)) {
-    return {
-      command: workspaceLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  const version =
-    packageJson.devDependencies?.[packageName]
-    ?? packageJson.dependencies?.[packageName];
-
-  return {
-    command: 'npx',
-    prefixArgs: ['-y', '-p', `${packageName}@${version}`, binName],
-  };
-}
-
-function shouldUseShell(command) {
-  if (process.platform !== 'win32') {
-    return false;
-  }
-
-  return !/\.exe$/i.test(command);
-}
-
 function runStep(name, command, args, options = {}) {
   console.log(`\n[release-smoke] ${name}`);
   console.log(`> ${command} ${args.join(' ')}`);
@@ -186,8 +150,22 @@ function isDirectExecution() {
 }
 
 function main() {
-  const tsc = resolveTool('tsc', 'typescript');
-  const vitest = resolveTool('vitest', 'vitest');
+  const tsc = resolveTool({
+    binName: 'tsc',
+    packageName: 'typescript',
+    packageRoot,
+    workspaceRoot,
+    packageSpecs: [`typescript@${packageJson.devDependencies.typescript}`],
+    entryCandidates: ['bin/tsc'],
+  });
+  const vitest = resolveTool({
+    binName: 'vitest',
+    packageName: 'vitest',
+    packageRoot,
+    workspaceRoot,
+    packageSpecs: [`vitest@${packageJson.devDependencies.vitest}`],
+    entryCandidates: ['vitest.mjs'],
+  });
 
   ensureAcpSdkCompat();
   runToolStep('typecheck', tsc, ['--noEmit']);

package/scripts/tooling-utils.mjs

@@ -0,0 +1,167 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+
+function getLocalPackageDirs(packageName, packageRoot, workspaceRoot) {
+  return [
+    resolve(packageRoot, 'node_modules', packageName),
+    resolve(workspaceRoot, 'node_modules', packageName),
+  ];
+}
+
+function getLocalBinPaths(binName, packageRoot, workspaceRoot) {
+  const suffix = process.platform === 'win32' ? '.cmd' : '';
+
+  return [
+    resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`),
+    resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`),
+  ];
+}
+
+function resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot) {
+  return getLocalPackageDirs(packageName, packageRoot, workspaceRoot)
+    .find((candidatePath) => existsSync(candidatePath))
+    ?? null;
+}
+
+export function shouldUseShell(command) {
+  if (process.platform !== 'win32') {
+    return false;
+  }
+
+  return !/\.exe$/i.test(command);
+}
+
+export function resolveTool({
+  binName,
+  packageName,
+  packageRoot,
+  workspaceRoot,
+  packageSpecs,
+  entryCandidates = [],
+}) {
+  for (const packageDir of getLocalPackageDirs(packageName, packageRoot, workspaceRoot)) {
+    for (const entryCandidate of entryCandidates) {
+      const entryPath = resolve(packageDir, entryCandidate);
+
+      if (existsSync(entryPath)) {
+        return {
+          command: process.execPath,
+          prefixArgs: [entryPath],
+        };
+      }
+    }
+  }
+
+  for (const localBinPath of getLocalBinPaths(binName, packageRoot, workspaceRoot)) {
+    if (existsSync(localBinPath)) {
+      return {
+        command: localBinPath,
+        prefixArgs: [],
+      };
+    }
+  }
+
+  return {
+    command: 'npx',
+    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
+  };
+}
+
+export function resolvePackageDirWithNpx({
+  packageName,
+  version,
+  packageRoot,
+  env = process.env,
+  spawn = spawnSync,
+}) {
+  const cacheKey = `${packageName.replace(/[@/]/g, '_')}-${version}`;
+  const installRoot = resolve(packageRoot, 'node_modules', '.tool-cache', cacheKey);
+  const installPackagePath = resolve(installRoot, 'node_modules', packageName);
+
+  if (existsSync(installPackagePath)) {
+    return installPackagePath;
+  }
+
+  mkdirSync(installRoot, { recursive: true });
+  writeFileSync(
+    resolve(installRoot, 'package.json'),
+    JSON.stringify(
+      {
+        private: true,
+        name: `happy-cli-tool-cache-${cacheKey}`,
+      },
+      null,
+      2
+    )
+  );
+
+  const commandArgs = [
+    'install',
+    '--no-save',
+    '--ignore-scripts',
+    '--no-package-lock',
+    '--no-audit',
+    '--fund=false',
+    `${packageName}@${version}`,
+  ];
+  const result = spawn('npm', commandArgs, {
+    cwd: installRoot,
+    encoding: 'utf8',
+    shell: shouldUseShell('npm'),
+    env,
+  });
+
+  if (result.status !== 0) {
+    const stderr = result.stderr?.trim();
+    const stdout = result.stdout?.trim();
+    throw new Error(
+      stderr && stderr.length > 0
+        ? stderr
+        : stdout && stdout.length > 0
+          ? stdout
+          : `Failed to install ${packageName}@${version} for local resolution`
+    );
+  }
+
+  if (!existsSync(installPackagePath)) {
+    throw new Error(`Installed package path missing for ${packageName}@${version}`);
+  }
+
+  return installPackagePath;
+}
+
+export function ensurePackageResolvableFromPackageRoot({
+  packageName,
+  version,
+  packageRoot,
+  workspaceRoot,
+  env = process.env,
+  spawn = spawnSync,
+  fallbackResolver = resolvePackageDirWithNpx,
+}) {
+  const linkPath = resolve(packageRoot, 'node_modules', packageName);
+
+  if (existsSync(linkPath)) {
+    return () => {};
+  }
+
+  const localPackageDir = resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot);
+  const targetPath = localPackageDir ?? fallbackResolver({
+    packageName,
+    version,
+    packageRoot,
+    workspaceRoot,
+    env,
+    spawn,
+  });
+
+  mkdirSync(dirname(linkPath), { recursive: true });
+  symlinkSync(targetPath, linkPath, process.platform === 'win32' ? 'junction' : 'dir');
+
+  return () => {
+    try {
+      rmSync(linkPath, { recursive: true, force: true });
+    } catch {}
+  };
+}