happy-imou-cloud 2.1.41 → 2.1.43

package/dist/{command-D0FxDynx.mjs → command-W01qXC9C.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-D5m2Duxd.mjs';
+import { c as createDefaultRuntimeShell } from './index-CiHiCC31.mjs';
 import 'chalk';
-import './api-CwNEbJBM.mjs';
+import './api-B89O-SC-.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';

package/dist/{command-C3RwwPVD.cjs → command-_qNFoJ-l.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-Dh0qGrEd.cjs');
+var index = require('./index-DVVbyQGZ.cjs');
 require('chalk');
-require('./api-C_Tnx4UG.cjs');
+require('./api-zMic8QXq.cjs');
 require('axios');
 require('fs');
 require('node:fs');

package/dist/{index-D5m2Duxd.mjs → index-CiHiCC31.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, n as encodeBase64, c as configuration, o as readCredentials, q as ensureSigningCredentials, r as readSettings, u as updateSettings, t as encodeBase64Url, k as delay, v as buildClientHeaders, w as decodeBase64, x as writeCredentialsLegacy, y as writeCredentialsDataKey, z as readDaemonState, B as HAPPY_CLOUD_DAEMON_PORT, C as clearDaemonState, D as packageJson, i as isAuthenticationRequiredError, E as acquireDaemonLock, F as writeDaemonState, A as ApiClient, G as releaseDaemonLock, I as validateProfileForAgent, J as getProfileEnvironmentVariables, K as clearCredentials, L as clearMachineId, M as readHappyOrgDispatchTruthSnapshot, N as processHappyOrgRepoRequests, O as readHappyOrgRepoTaskBoard, P as HappyOrgTurnReportSchema, Q as recordHappyOrgTurnReport, R as MessageContentSchema, S as buildSocketAuth, T as encrypt, H as HeadTailPreviewBuffer, U as getLatestDaemonLog } from './api-CwNEbJBM.mjs';
+import { l as logger, q as encodeBase64, c as configuration, t as readCredentials, u as ensureSigningCredentials, r as readSettings, v as updateSettings, w as encodeBase64Url, m as delay, x as buildClientHeaders, y as decodeBase64, z as writeCredentialsLegacy, B as writeCredentialsDataKey, C as readDaemonState, D as HAPPY_CLOUD_DAEMON_PORT, E as clearDaemonState, F as packageJson, i as isAuthenticationRequiredError, G as acquireDaemonLock, I as writeDaemonState, A as ApiClient, J as releaseDaemonLock, K as validateProfileForAgent, L as getProfileEnvironmentVariables, M as clearCredentials, N as clearMachineId, O as readHappyOrgDispatchTruthSnapshot, P as processHappyOrgRepoRequests, Q as readHappyOrgRepoTaskBoard, R as HappyOrgTurnReportSchema, S as recordHappyOrgTurnReport, T as MessageContentSchema, U as buildSocketAuth, V as encrypt, H as HeadTailPreviewBuffer, W as getLatestDaemonLog } from './api-B89O-SC-.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';
@@ -2334,14 +2334,19 @@ function resolveDaemonSpawnAgent(agent) {
       throw new Error(`Unsupported agent type: '${agent}'. Please update your CLI to the latest version.`);
   }
 }
-function buildDaemonSpawnArgs(agent) {
-  return [
+function buildDaemonSpawnArgs(agent, resume) {
+  const args = [
     resolveDaemonSpawnAgent(agent),
     "--happy-starting-mode",
     "remote",
     "--started-by",
     "daemon"
   ];
+  const providerSessionId = typeof resume?.providerSessionId === "string" ? resume.providerSessionId.trim() : "";
+  if (providerSessionId.length > 0) {
+    args.push("--resume", providerSessionId);
+  }
+  return args;
 }
 
 const SPAWN_SESSION_ERROR_CODES = {
@@ -2456,8 +2461,10 @@ async function runDaemonHealthCheck({
   });
   const projectVersion = readProjectCliVersion();
   if (projectVersion && projectVersion !== currentCliVersion) {
-    await onDaemonOutdated();
-    return;
+    const restartStarted = await onDaemonOutdated();
+    if (restartStarted !== false) {
+      return;
+    }
   }
   const daemonState = await readDaemonState();
   if (daemonState && daemonState.pid !== daemonPid) {
@@ -3655,7 +3662,7 @@ async function startDaemon() {
           const tmux = getTmuxUtilities(tmuxSessionName);
           const cliPath = join$1(projectPath(), "dist", "index.mjs");
           const agent = resolveDaemonSpawnAgent(options.agent);
-          const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${buildDaemonSpawnArgs(agent).join(" ")}`;
+          const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${buildDaemonSpawnArgs(agent, options.resume).join(" ")}`;
           const windowName = `happy-${Date.now()}-${agent}`;
           const tmuxEnv = buildDaemonChildEnv(process.env, extraEnv);
           if (managedSessionTag && api) {
@@ -3740,7 +3747,7 @@ async function startDaemon() {
           logger.debug(`[DAEMON RUN] Using regular process spawning`);
           let args;
           try {
-            args = buildDaemonSpawnArgs(options.agent);
+            args = buildDaemonSpawnArgs(options.agent, options.resume);
           } catch (error) {
             const spawnError = createSpawnSessionError(
               SPAWN_SESSION_ERROR_CODES.INVALID_REQUEST,
@@ -4139,16 +4146,18 @@ ${stderrSnapshot}`);
           },
           currentCliVersion: configuration.currentCliVersion,
           onDaemonOutdated: async () => {
-            logger.debug("[DAEMON RUN] Daemon is outdated, triggering self-restart with latest version, clearing heartbeat interval");
-            clearInterval(restartOnStaleVersionAndHeartbeat);
+            logger.debug("[DAEMON RUN] Daemon is outdated, attempting self-restart with latest version");
             try {
               spawnHappyCLI(["daemon", "start"], {
                 detached: true,
                 stdio: "ignore"
               });
             } catch (error) {
-              logger.debug("[DAEMON RUN] Failed to spawn new daemon, this is quite likely to happen during integration tests as we are cleaning out dist/ directory", error);
+              logger.debug("[DAEMON RUN] Failed to spawn new daemon; keeping current daemon alive and retrying on the next health check", error);
+              return false;
             }
+            logger.debug("[DAEMON RUN] Replacement daemon spawned, clearing heartbeat interval");
+            clearInterval(restartOnStaleVersionAndHeartbeat);
             logger.debug("[DAEMON RUN] Hanging for a bit - waiting for CLI to kill us because we are running outdated version of the code");
             await new Promise((resolve) => setTimeout(resolve, 1e4));
             process.exit(0);
@@ -5379,6 +5388,7 @@ function formatDispatchReceipt(receipt) {
 }
 function formatRepoTaskBoard(view) {
   const lines = [
+    `organization_manifest_id=${view.organizationManifestId ?? ""}`,
     `total_count=${view.totalCount}`,
     `in_progress_count=${view.inProgressCount}`,
     `needs_handoff_count=${view.handoffCount}`,
@@ -5391,10 +5401,15 @@ function formatRepoTaskBoard(view) {
     for (const item of section.items) {
       lines.push([
         `task_id=${item.taskId}`,
+        `position_id=${item.positionId ?? ""}`,
         `status=${item.status}`,
+        `merge_state=${item.mergeState ?? ""}`,
+        `machine_id=${item.machineId ?? ""}`,
+        `runtime_session_id=${item.runtimeSessionId ?? ""}`,
         `title=${item.title}`,
         `owner=${item.ownerName}`,
         `responsibility=${item.responsibilityLabel ?? ""}`,
+        `merge_detail=${item.mergeStateSummary ?? ""}`,
         `detail=${item.blockerOrDecision ?? item.latestResult ?? item.currentProgress ?? item.path ?? ""}`
       ].join(" | "));
     }
@@ -11877,14 +11892,14 @@ var launch = /*#__PURE__*/Object.freeze({
 const unifiedProviderExecutors = {
   claude: async (opts) => {
     const claudeOptions = opts.claudeOptions ?? {};
-    const { runClaude } = await import('./runClaude-Bng_IsE7.mjs');
+    const { runClaude } = await import('./runClaude-0U7kV07_.mjs');
     await runClaude(opts.credentials, {
       ...claudeOptions,
       startingMode: claudeOptions.startingMode ?? (claudeOptions.startedBy === "daemon" ? "remote" : void 0)
     });
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-DAc6flez.mjs');
+    const { runCodex } = await import('./runCodex-DnDmHm7E.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -11893,7 +11908,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-DdXj8ltI.mjs');
+    const { runGemini } = await import('./runGemini-DcsIBQSc.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -11976,7 +11991,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-D0FxDynx.mjs');
+      const { renderRuntimeProviders } = await import('./command-W01qXC9C.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -12182,8 +12197,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./api-CwNEbJBM.mjs').then(function (n) { return n.V; });
-        const { ApiClient: ApiClient2 } = await import('./api-CwNEbJBM.mjs').then(function (n) { return n.W; });
+        const { readCredentials: readCredentials2 } = await import('./api-B89O-SC-.mjs').then(function (n) { return n.X; });
+        const { ApiClient: ApiClient2 } = await import('./api-B89O-SC-.mjs').then(function (n) { return n.Y; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-Dh0qGrEd.cjs → index-DVVbyQGZ.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var persistence = require('./api-C_Tnx4UG.cjs');
+var persistence = require('./api-zMic8QXq.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-Dh0qGrEd.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-DVVbyQGZ.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();
@@ -637,7 +637,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-Dh0qGrEd.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-DVVbyQGZ.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -2356,14 +2356,19 @@ function resolveDaemonSpawnAgent(agent) {
       throw new Error(`Unsupported agent type: '${agent}'. Please update your CLI to the latest version.`);
   }
 }
-function buildDaemonSpawnArgs(agent) {
-  return [
+function buildDaemonSpawnArgs(agent, resume) {
+  const args = [
     resolveDaemonSpawnAgent(agent),
     "--happy-starting-mode",
     "remote",
     "--started-by",
     "daemon"
   ];
+  const providerSessionId = typeof resume?.providerSessionId === "string" ? resume.providerSessionId.trim() : "";
+  if (providerSessionId.length > 0) {
+    args.push("--resume", providerSessionId);
+  }
+  return args;
 }
 
 const SPAWN_SESSION_ERROR_CODES = {
@@ -2478,8 +2483,10 @@ async function runDaemonHealthCheck({
   });
   const projectVersion = readProjectCliVersion();
   if (projectVersion && projectVersion !== currentCliVersion) {
-    await onDaemonOutdated();
-    return;
+    const restartStarted = await onDaemonOutdated();
+    if (restartStarted !== false) {
+      return;
+    }
   }
   const daemonState = await readDaemonState();
   if (daemonState && daemonState.pid !== daemonPid) {
@@ -3677,7 +3684,7 @@ async function startDaemon() {
           const tmux = getTmuxUtilities(tmuxSessionName);
           const cliPath = path$1.join(projectPath(), "dist", "index.mjs");
           const agent = resolveDaemonSpawnAgent(options.agent);
-          const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${buildDaemonSpawnArgs(agent).join(" ")}`;
+          const fullCommand = `node --no-warnings --no-deprecation ${cliPath} ${buildDaemonSpawnArgs(agent, options.resume).join(" ")}`;
           const windowName = `happy-${Date.now()}-${agent}`;
           const tmuxEnv = buildDaemonChildEnv(process.env, extraEnv);
           if (managedSessionTag && api) {
@@ -3762,7 +3769,7 @@ async function startDaemon() {
           persistence.logger.debug(`[DAEMON RUN] Using regular process spawning`);
           let args;
           try {
-            args = buildDaemonSpawnArgs(options.agent);
+            args = buildDaemonSpawnArgs(options.agent, options.resume);
           } catch (error) {
             const spawnError = createSpawnSessionError(
               SPAWN_SESSION_ERROR_CODES.INVALID_REQUEST,
@@ -4161,16 +4168,18 @@ ${stderrSnapshot}`);
           },
           currentCliVersion: persistence.configuration.currentCliVersion,
           onDaemonOutdated: async () => {
-            persistence.logger.debug("[DAEMON RUN] Daemon is outdated, triggering self-restart with latest version, clearing heartbeat interval");
-            clearInterval(restartOnStaleVersionAndHeartbeat);
+            persistence.logger.debug("[DAEMON RUN] Daemon is outdated, attempting self-restart with latest version");
             try {
               spawnHappyCLI(["daemon", "start"], {
                 detached: true,
                 stdio: "ignore"
               });
             } catch (error) {
-              persistence.logger.debug("[DAEMON RUN] Failed to spawn new daemon, this is quite likely to happen during integration tests as we are cleaning out dist/ directory", error);
+              persistence.logger.debug("[DAEMON RUN] Failed to spawn new daemon; keeping current daemon alive and retrying on the next health check", error);
+              return false;
             }
+            persistence.logger.debug("[DAEMON RUN] Replacement daemon spawned, clearing heartbeat interval");
+            clearInterval(restartOnStaleVersionAndHeartbeat);
             persistence.logger.debug("[DAEMON RUN] Hanging for a bit - waiting for CLI to kill us because we are running outdated version of the code");
             await new Promise((resolve) => setTimeout(resolve, 1e4));
             process.exit(0);
@@ -5401,6 +5410,7 @@ function formatDispatchReceipt(receipt) {
 }
 function formatRepoTaskBoard(view) {
   const lines = [
+    `organization_manifest_id=${view.organizationManifestId ?? ""}`,
     `total_count=${view.totalCount}`,
     `in_progress_count=${view.inProgressCount}`,
     `needs_handoff_count=${view.handoffCount}`,
@@ -5413,10 +5423,15 @@ function formatRepoTaskBoard(view) {
     for (const item of section.items) {
       lines.push([
         `task_id=${item.taskId}`,
+        `position_id=${item.positionId ?? ""}`,
         `status=${item.status}`,
+        `merge_state=${item.mergeState ?? ""}`,
+        `machine_id=${item.machineId ?? ""}`,
+        `runtime_session_id=${item.runtimeSessionId ?? ""}`,
         `title=${item.title}`,
         `owner=${item.ownerName}`,
         `responsibility=${item.responsibilityLabel ?? ""}`,
+        `merge_detail=${item.mergeStateSummary ?? ""}`,
         `detail=${item.blockerOrDecision ?? item.latestResult ?? item.currentProgress ?? item.path ?? ""}`
       ].join(" | "));
     }
@@ -10574,7 +10589,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-Dh0qGrEd.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-DVVbyQGZ.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -11899,14 +11914,14 @@ var launch = /*#__PURE__*/Object.freeze({
 const unifiedProviderExecutors = {
   claude: async (opts) => {
     const claudeOptions = opts.claudeOptions ?? {};
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-mIFO7YxF.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-C1xfptKt.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-cNuxGshy.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BBgKpYLO.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -11915,7 +11930,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DsRFV8WN.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-CUwQHJ9y.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -11998,7 +12013,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-C3RwwPVD.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-_qNFoJ-l.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -12204,8 +12219,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-C_Tnx4UG.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-C_Tnx4UG.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./api-zMic8QXq.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-zMic8QXq.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 require('chalk');
-require('./api-C_Tnx4UG.cjs');
+require('./api-zMic8QXq.cjs');
 require('zod');
-require('./index-Dh0qGrEd.cjs');
+require('./index-DVVbyQGZ.cjs');
 require('node:child_process');
 require('node:fs');
 require('cross-spawn');

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import 'chalk';
-import './api-CwNEbJBM.mjs';
+import './api-B89O-SC-.mjs';
 import 'zod';
-import './index-D5m2Duxd.mjs';
+import './index-CiHiCC31.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-C_Tnx4UG.cjs');
+var persistence = require('./api-zMic8QXq.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');