happy-imou-cloud 2.1.1 → 2.1.2

package/dist/ProviderSelectionHandler-Q8pl7e-d.mjs

@@ -0,0 +1,261 @@
+import { l as logger } from './api-Cxifhw5r.mjs';
+import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-BFBkz_XT.mjs';
+
+async function runModeLoop(opts) {
+  let currentMode = opts.startingMode;
+  if (opts.notifyInitialMode) {
+    await opts.onModeChange?.(currentMode);
+  }
+  while (true) {
+    opts.onIteration?.(currentMode);
+    const result = await opts.launchers[currentMode]();
+    if (result.type === "exit") {
+      return result.value;
+    }
+    currentMode = result.mode;
+    await opts.onModeChange?.(currentMode);
+  }
+}
+
+function createKeepAliveController(opts) {
+  let thinking = opts.initialThinking ?? false;
+  let mode = opts.initialMode;
+  let disposed = false;
+  const sync = () => {
+    if (disposed) {
+      return;
+    }
+    opts.send(thinking, mode);
+  };
+  sync();
+  const intervalId = setInterval(sync, opts.intervalMs ?? 2e3);
+  return {
+    dispose: () => {
+      if (disposed) {
+        return;
+      }
+      disposed = true;
+      clearInterval(intervalId);
+    },
+    getMode: () => mode,
+    getThinking: () => thinking,
+    setMode: (nextMode) => {
+      mode = nextMode;
+      sync();
+    },
+    setThinking: (nextThinking) => {
+      thinking = nextThinking;
+      sync();
+    },
+    sync
+  };
+}
+
+class ProviderSelectionHandler {
+  pendingRequests = /* @__PURE__ */ new Map();
+  session;
+  providerLabel;
+  constructor(session, providerLabel) {
+    this.session = session;
+    this.providerLabel = providerLabel;
+    this.setupRpcHandler();
+  }
+  updateSession(newSession) {
+    this.session = newSession;
+    this.setupRpcHandler();
+  }
+  async requestSelection(request) {
+    return new Promise((resolve, reject) => {
+      const pending = {
+        resolve,
+        reject,
+        request
+      };
+      pending.timeoutHandle = setTimeout(() => {
+        this.handleSelectionTimeout(request.id, pending);
+      }, getPendingInteractionTimeoutMs());
+      this.pendingRequests.set(request.id, pending);
+      this.session.updateAgentState((currentState) => ({
+        ...currentState,
+        requests: {
+          ...currentState.requests,
+          [request.id]: {
+            tool: "AskUserQuestion",
+            arguments: {
+              requestKind: "selection",
+              questions: [
+                {
+                  header: this.providerLabel,
+                  question: request.message,
+                  multiSelect: false,
+                  options: request.options.map((option) => ({
+                    label: option.label,
+                    description: option.description || option.optionId,
+                    optionId: option.optionId
+                  }))
+                }
+              ]
+            },
+            createdAt: Date.now(),
+            requestKind: "selection",
+            options: request.options,
+            defaultOptionId: request.defaultOptionId
+          }
+        }
+      }));
+      logger.debug(`[${this.providerLabel}] Selection request sent (${request.id}) with ${request.options.length} options`);
+    });
+  }
+  hasPendingRequests() {
+    return this.pendingRequests.size > 0;
+  }
+  supersedePendingRequests(reason = INTERACTION_SUPERSEDED_ERROR) {
+    const pendingSnapshot = Array.from(this.pendingRequests.entries());
+    if (pendingSnapshot.length === 0) {
+      return 0;
+    }
+    this.pendingRequests.clear();
+    const completedAt = Date.now();
+    for (const [, pending] of pendingSnapshot) {
+      this.clearPendingRequestTimeout(pending);
+      pending.reject(new Error(reason));
+    }
+    this.session.updateAgentState((currentState) => {
+      const requests = { ...currentState.requests || {} };
+      const completedRequests = { ...currentState.completedRequests || {} };
+      for (const [id, request] of Object.entries(requests)) {
+        if (request.requestKind !== "selection") {
+          continue;
+        }
+        completedRequests[id] = {
+          ...request,
+          completedAt,
+          status: "canceled",
+          reason,
+          requestKind: "selection"
+        };
+        delete requests[id];
+      }
+      return {
+        ...currentState,
+        requests,
+        completedRequests
+      };
+    });
+    logger.debug(`[${this.providerLabel}] Superseded ${pendingSnapshot.length} pending selection request(s)`);
+    return pendingSnapshot.length;
+  }
+  reset(reason = "Session reset") {
+    const pendingSnapshot = Array.from(this.pendingRequests.entries());
+    this.pendingRequests.clear();
+    for (const [, pending] of pendingSnapshot) {
+      this.clearPendingRequestTimeout(pending);
+      pending.reject(new Error(reason));
+    }
+    this.session.updateAgentState((currentState) => {
+      const requests = { ...currentState.requests || {} };
+      const completedRequests = { ...currentState.completedRequests || {} };
+      for (const [id, request] of Object.entries(requests)) {
+        if (request.requestKind !== "selection") {
+          continue;
+        }
+        completedRequests[id] = {
+          ...request,
+          completedAt: Date.now(),
+          status: "canceled",
+          reason,
+          requestKind: "selection"
+        };
+        delete requests[id];
+      }
+      return {
+        ...currentState,
+        requests,
+        completedRequests
+      };
+    });
+  }
+  setupRpcHandler() {
+    this.session.rpcHandlerManager.registerHandler("selection", async (response) => {
+      const pending = this.pendingRequests.get(response.id);
+      if (!pending) {
+        logger.debug(`[${this.providerLabel}] Selection request not found or already resolved`);
+        return;
+      }
+      this.pendingRequests.delete(response.id);
+      this.clearPendingRequestTimeout(pending);
+      pending.resolve(response);
+      this.session.updateAgentState((currentState) => {
+        const request = currentState.requests?.[response.id];
+        if (!request) {
+          return currentState;
+        }
+        const { [response.id]: _, ...remainingRequests } = currentState.requests || {};
+        return {
+          ...currentState,
+          requests: remainingRequests,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [response.id]: {
+              ...request,
+              completedAt: Date.now(),
+              status: "approved",
+              requestKind: "selection",
+              selectedOptionId: response.optionId
+            }
+          }
+        };
+      });
+    });
+  }
+  clearPendingRequestTimeout(pending) {
+    if (pending?.timeoutHandle) {
+      clearTimeout(pending.timeoutHandle);
+      pending.timeoutHandle = void 0;
+    }
+  }
+  handleSelectionTimeout(requestId, pending) {
+    const active = this.pendingRequests.get(requestId);
+    if (!active || active !== pending) {
+      return;
+    }
+    this.pendingRequests.delete(requestId);
+    this.clearPendingRequestTimeout(active);
+    active.reject(new Error(INTERACTION_TIMED_OUT_ERROR));
+    this.session.updateAgentState((currentState) => {
+      const request = currentState.requests?.[requestId] || {
+        tool: "AskUserQuestion",
+        arguments: {
+          requestKind: "selection",
+          questions: []
+        },
+        createdAt: Date.now(),
+        requestKind: "selection",
+        options: active.request.options,
+        defaultOptionId: active.request.defaultOptionId
+      };
+      const { [requestId]: _, ...remainingRequests } = currentState.requests || {};
+      return {
+        ...currentState,
+        requests: remainingRequests,
+        completedRequests: {
+          ...currentState.completedRequests,
+          [requestId]: {
+            ...request,
+            completedAt: Date.now(),
+            status: "canceled",
+            reason: INTERACTION_TIMED_OUT_ERROR,
+            requestKind: "selection"
+          }
+        }
+      };
+    });
+    this.session.sendSessionEvent({
+      type: "message",
+      message: "Pending interaction timed out waiting for a response. Send a new message to continue."
+    });
+    logger.debug(`[${this.providerLabel}] Selection request timed out (${requestId})`);
+  }
+}
+
+export { ProviderSelectionHandler as P, createKeepAliveController as c, runModeLoop as r };

package/dist/ProviderSelectionHandler-wwbfeK_s.cjs

@@ -0,0 +1,265 @@
+'use strict';
+
+var api = require('./api-DZimmN4C.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BapPCRmp.cjs');
+
+async function runModeLoop(opts) {
+  let currentMode = opts.startingMode;
+  if (opts.notifyInitialMode) {
+    await opts.onModeChange?.(currentMode);
+  }
+  while (true) {
+    opts.onIteration?.(currentMode);
+    const result = await opts.launchers[currentMode]();
+    if (result.type === "exit") {
+      return result.value;
+    }
+    currentMode = result.mode;
+    await opts.onModeChange?.(currentMode);
+  }
+}
+
+function createKeepAliveController(opts) {
+  let thinking = opts.initialThinking ?? false;
+  let mode = opts.initialMode;
+  let disposed = false;
+  const sync = () => {
+    if (disposed) {
+      return;
+    }
+    opts.send(thinking, mode);
+  };
+  sync();
+  const intervalId = setInterval(sync, opts.intervalMs ?? 2e3);
+  return {
+    dispose: () => {
+      if (disposed) {
+        return;
+      }
+      disposed = true;
+      clearInterval(intervalId);
+    },
+    getMode: () => mode,
+    getThinking: () => thinking,
+    setMode: (nextMode) => {
+      mode = nextMode;
+      sync();
+    },
+    setThinking: (nextThinking) => {
+      thinking = nextThinking;
+      sync();
+    },
+    sync
+  };
+}
+
+class ProviderSelectionHandler {
+  pendingRequests = /* @__PURE__ */ new Map();
+  session;
+  providerLabel;
+  constructor(session, providerLabel) {
+    this.session = session;
+    this.providerLabel = providerLabel;
+    this.setupRpcHandler();
+  }
+  updateSession(newSession) {
+    this.session = newSession;
+    this.setupRpcHandler();
+  }
+  async requestSelection(request) {
+    return new Promise((resolve, reject) => {
+      const pending = {
+        resolve,
+        reject,
+        request
+      };
+      pending.timeoutHandle = setTimeout(() => {
+        this.handleSelectionTimeout(request.id, pending);
+      }, registerKillSessionHandler.getPendingInteractionTimeoutMs());
+      this.pendingRequests.set(request.id, pending);
+      this.session.updateAgentState((currentState) => ({
+        ...currentState,
+        requests: {
+          ...currentState.requests,
+          [request.id]: {
+            tool: "AskUserQuestion",
+            arguments: {
+              requestKind: "selection",
+              questions: [
+                {
+                  header: this.providerLabel,
+                  question: request.message,
+                  multiSelect: false,
+                  options: request.options.map((option) => ({
+                    label: option.label,
+                    description: option.description || option.optionId,
+                    optionId: option.optionId
+                  }))
+                }
+              ]
+            },
+            createdAt: Date.now(),
+            requestKind: "selection",
+            options: request.options,
+            defaultOptionId: request.defaultOptionId
+          }
+        }
+      }));
+      api.logger.debug(`[${this.providerLabel}] Selection request sent (${request.id}) with ${request.options.length} options`);
+    });
+  }
+  hasPendingRequests() {
+    return this.pendingRequests.size > 0;
+  }
+  supersedePendingRequests(reason = registerKillSessionHandler.INTERACTION_SUPERSEDED_ERROR) {
+    const pendingSnapshot = Array.from(this.pendingRequests.entries());
+    if (pendingSnapshot.length === 0) {
+      return 0;
+    }
+    this.pendingRequests.clear();
+    const completedAt = Date.now();
+    for (const [, pending] of pendingSnapshot) {
+      this.clearPendingRequestTimeout(pending);
+      pending.reject(new Error(reason));
+    }
+    this.session.updateAgentState((currentState) => {
+      const requests = { ...currentState.requests || {} };
+      const completedRequests = { ...currentState.completedRequests || {} };
+      for (const [id, request] of Object.entries(requests)) {
+        if (request.requestKind !== "selection") {
+          continue;
+        }
+        completedRequests[id] = {
+          ...request,
+          completedAt,
+          status: "canceled",
+          reason,
+          requestKind: "selection"
+        };
+        delete requests[id];
+      }
+      return {
+        ...currentState,
+        requests,
+        completedRequests
+      };
+    });
+    api.logger.debug(`[${this.providerLabel}] Superseded ${pendingSnapshot.length} pending selection request(s)`);
+    return pendingSnapshot.length;
+  }
+  reset(reason = "Session reset") {
+    const pendingSnapshot = Array.from(this.pendingRequests.entries());
+    this.pendingRequests.clear();
+    for (const [, pending] of pendingSnapshot) {
+      this.clearPendingRequestTimeout(pending);
+      pending.reject(new Error(reason));
+    }
+    this.session.updateAgentState((currentState) => {
+      const requests = { ...currentState.requests || {} };
+      const completedRequests = { ...currentState.completedRequests || {} };
+      for (const [id, request] of Object.entries(requests)) {
+        if (request.requestKind !== "selection") {
+          continue;
+        }
+        completedRequests[id] = {
+          ...request,
+          completedAt: Date.now(),
+          status: "canceled",
+          reason,
+          requestKind: "selection"
+        };
+        delete requests[id];
+      }
+      return {
+        ...currentState,
+        requests,
+        completedRequests
+      };
+    });
+  }
+  setupRpcHandler() {
+    this.session.rpcHandlerManager.registerHandler("selection", async (response) => {
+      const pending = this.pendingRequests.get(response.id);
+      if (!pending) {
+        api.logger.debug(`[${this.providerLabel}] Selection request not found or already resolved`);
+        return;
+      }
+      this.pendingRequests.delete(response.id);
+      this.clearPendingRequestTimeout(pending);
+      pending.resolve(response);
+      this.session.updateAgentState((currentState) => {
+        const request = currentState.requests?.[response.id];
+        if (!request) {
+          return currentState;
+        }
+        const { [response.id]: _, ...remainingRequests } = currentState.requests || {};
+        return {
+          ...currentState,
+          requests: remainingRequests,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [response.id]: {
+              ...request,
+              completedAt: Date.now(),
+              status: "approved",
+              requestKind: "selection",
+              selectedOptionId: response.optionId
+            }
+          }
+        };
+      });
+    });
+  }
+  clearPendingRequestTimeout(pending) {
+    if (pending?.timeoutHandle) {
+      clearTimeout(pending.timeoutHandle);
+      pending.timeoutHandle = void 0;
+    }
+  }
+  handleSelectionTimeout(requestId, pending) {
+    const active = this.pendingRequests.get(requestId);
+    if (!active || active !== pending) {
+      return;
+    }
+    this.pendingRequests.delete(requestId);
+    this.clearPendingRequestTimeout(active);
+    active.reject(new Error(registerKillSessionHandler.INTERACTION_TIMED_OUT_ERROR));
+    this.session.updateAgentState((currentState) => {
+      const request = currentState.requests?.[requestId] || {
+        tool: "AskUserQuestion",
+        arguments: {
+          requestKind: "selection",
+          questions: []
+        },
+        createdAt: Date.now(),
+        requestKind: "selection",
+        options: active.request.options,
+        defaultOptionId: active.request.defaultOptionId
+      };
+      const { [requestId]: _, ...remainingRequests } = currentState.requests || {};
+      return {
+        ...currentState,
+        requests: remainingRequests,
+        completedRequests: {
+          ...currentState.completedRequests,
+          [requestId]: {
+            ...request,
+            completedAt: Date.now(),
+            status: "canceled",
+            reason: registerKillSessionHandler.INTERACTION_TIMED_OUT_ERROR,
+            requestKind: "selection"
+          }
+        }
+      };
+    });
+    this.session.sendSessionEvent({
+      type: "message",
+      message: "Pending interaction timed out waiting for a response. Send a new message to continue."
+    });
+    api.logger.debug(`[${this.providerLabel}] Selection request timed out (${requestId})`);
+  }
+}
+
+exports.ProviderSelectionHandler = ProviderSelectionHandler;
+exports.createKeepAliveController = createKeepAliveController;
+exports.runModeLoop = runModeLoop;

package/dist/{api-DBy5lPZw.mjs → api-Cxifhw5r.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.1.1";
+var version = "2.1.2";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -431,7 +431,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-BOWh1NER.mjs');
+      const { readDaemonState } = await import('./persistence-6d4U4Sh8.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -3645,4 +3645,4 @@ var api = /*#__PURE__*/Object.freeze({
   ApiClient: ApiClient
 });
 
-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 };
+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_SUMMARY_MAX_LENGTH as d, encodeBase64 as e, HAPPY_ORG_REPEAT_THRESHOLD 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/{api-DId_j3C2.cjs → api-DZimmN4C.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.1.1";
+var version = "2.1.2";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -433,7 +433,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-Dzr6sFwD.cjs'); });
+      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-C8-MtdQK.cjs'); });
       const state = await readDaemonState();
       if (!state) {
         return logs;

package/dist/{command-CeaBwYCW.mjs → command-B6LM3Nml.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-66vjECEd.mjs';
+import { c as createDefaultRuntimeShell } from './index-Des7I5WX.mjs';
 import 'chalk';
-import './api-DBy5lPZw.mjs';
+import './api-Cxifhw5r.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-BOWh1NER.mjs';
+import './persistence-6d4U4Sh8.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';

package/dist/{command-DwfUpmId.cjs → command-RcCJI1jl.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-CuuYSKiv.cjs');
+var index = require('./index-Cuvs0lFS.cjs');
 require('chalk');
-require('./api-DId_j3C2.cjs');
+require('./api-DZimmN4C.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-Dzr6sFwD.cjs');
+require('./persistence-C8-MtdQK.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');