@kevisual/cli 0.1.12 → 0.1.14

package/dist/assistant-opencode.js

@@ -42679,6 +42679,13 @@ var envKevisualDir = process.env.ASSISTANT_CONFIG_DIR;
 if (envKevisualDir) {
   kevisualDir = envKevisualDir;
   logger.debug("使用环境变量 ASSISTANT_CONFIG_DIR 作为 kevisual 目录:", kevisualDir);
+} else {
+  if (!kevisualDir) {
+    const isCNB = process.env.CNB_GROUP_SLUG;
+    if (isCNB) {
+      kevisualDir = path.join("/workspace/kevisual");
+    }
+  }
 }
 var HomeConfigDir = path.join(kevisualDir, "assistant-app");
 function parseArgs(args) {
@@ -51957,7 +51964,7 @@ class RemoteApp {
     this.emitter.emit("message", data);
   }
   onError(error49) {
-    console.error("远程应用错误:", this.id, error49);
+    console.error(`[remote-app] 远程应用错误: ${this.id}`, error49);
     this.isError = true;
     this.emitter.emit("error", error49);
   }
@@ -52027,7 +52034,7 @@ class RemoteApp {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query-browser.js
+// ../node_modules/.pnpm/@kevisual+query@0.0.52/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -66322,7 +66329,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.59_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.60_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -80963,7 +80970,7 @@ class AssistantApp extends Manager2 {
           app: this.mainApp,
           autoReconnect: true,
           reconnectDelay: 5000,
-          maxReconnectAttempts: Infinity,
+          maxReconnectAttempts: 50,
           enableBackoff: true
         });
         remoteApp.isConnect();
@@ -80983,7 +80990,7 @@ class AssistantApp extends Manager2 {
           logger.info("[remote-app] 远程连接已关闭，自动重连机制正在处理...");
         });
         remoteApp.on("maxReconnectAttemptsReached", () => {
-          logger.error("远程应用重连达到最大次数，停止重连");
+          logger.error("[remote-app] 远程应用重连达到最大次数，停止重连");
         });
         this.remoteApp = remoteApp;
       } else {
@@ -81149,7 +81156,7 @@ var checkLocalUser = async (opts) => {
     }
   }
 };
-// ../node_modules/.pnpm/@kevisual+query@0.0.49/node_modules/@kevisual/query/dist/query.js
+// ../node_modules/.pnpm/@kevisual+query@0.0.52/node_modules/@kevisual/query/dist/query.js
 var isTextForContentType2 = (contentType) => {
   if (!contentType)
     return false;
@@ -81437,7 +81444,7 @@ class Query2 {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.59_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
+// ../node_modules/.pnpm/@kevisual+api@0.0.60_@types+react@19.2.10_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
 import { homedir as homedir2 } from "node:os";
 import { join, dirname } from "node:path";
 import fs13 from "node:fs";
@@ -81753,6 +81760,15 @@ class BaseQuery {
     return this.query.get(data, options);
   }
 }
+var defaultCacheData = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
 
 class LoginCacheStore {
   cache;
@@ -81763,13 +81779,7 @@ class LoginCacheStore {
       throw new Error("cache is required");
     }
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
     this.name = opts.name;
   }
   async setValue(value) {
@@ -81779,27 +81789,13 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
   }
   getValue() {
     return this.cache.get(this.name);
   }
   async init() {
-    const defaultData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined
-    };
+    const defaultData = { ...this.cacheData };
     if (this.cache.init) {
       try {
         const cacheData = await this.cache.init();
@@ -81812,18 +81808,18 @@ class LoginCacheStore {
     }
     return this.cacheData;
   }
-  async setLoginUser(user) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
-    }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    this.cacheData.id = user.id;
-    this.cacheData.accessToken = user.accessToken;
-    this.cacheData.refreshToken = user.refreshToken;
-    this.cacheData.accessTokenExpiresIn = user.accessTokenExpiresIn;
-    this.cacheData.createdAt = user.createdAt;
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
+    }
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -81859,22 +81855,22 @@ class LoginCacheStore {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData };
     await this.setValue(this.cacheData);
   }
 }
@@ -82462,7 +82458,7 @@ class QueryLogin extends BaseQuery {
   async queryRefreshToken(opts) {
     const refreshToken = opts?.refreshToken;
     let accessToken = opts?.accessToken;
-    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
+    const _refreshToken = refreshToken ?? await this.cacheStore.getRefreshToken();
     let data = {};
     if (accessToken) {
       data.accessToken = accessToken;
@@ -82573,6 +82569,7 @@ class QueryLogin extends BaseQuery {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log("token过期，正在刷新token", this.cacheStore.cacheData);
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;
@@ -100310,7 +100307,7 @@ app.route({
 }).addTo(app, {
   overwrite: false
 });
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
 var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url: url4, ...options }) => {
   let lastEventId;
   const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -100419,7 +100416,7 @@ var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseVa
   return { stream: stream2 };
 };
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/auth.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/auth.gen.js
 var getAuthToken = async (auth, callback) => {
   const token = typeof callback === "function" ? await callback(auth) : callback;
   if (!token) {
@@ -100434,12 +100431,12 @@ var getAuthToken = async (auth, callback) => {
   return token;
 };
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/bodySerializer.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/bodySerializer.gen.js
 var jsonBodySerializer = {
   bodySerializer: (body) => JSON.stringify(body, (_key, value) => typeof value === "bigint" ? value.toString() : value)
 };
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/pathSerializer.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/pathSerializer.gen.js
 var separatorArrayExplode = (style) => {
   switch (style) {
     case "label":
@@ -100542,7 +100539,7 @@ var serializeObjectParam = ({ allowReserved, explode, name, style, value, valueO
   return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
 };
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/utils.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/utils.gen.js
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var defaultPathSerializer = ({ path: path14, url: _url5 }) => {
   let url4 = _url5;
@@ -100610,7 +100607,7 @@ var getUrl = ({ baseUrl, path: path14, query: query2, querySerializer, url: _url
   return url4;
 };
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/client/utils.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/client/utils.gen.js
 var createQuerySerializer = ({ allowReserved, array: array6, object: object5 } = {}) => {
   const querySerializer = (queryParams) => {
     const search = [];
@@ -100818,7 +100815,7 @@ var createConfig = (override = {}) => ({
   ...override
 });
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/client/client.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/client/client.gen.js
 var createClient = (config7 = {}) => {
   let _config = mergeConfigs(createConfig(), config7);
   const getConfig2 = () => ({ ..._config });
@@ -100965,7 +100962,7 @@ var createClient = (config7 = {}) => {
     trace: makeMethod("TRACE")
   };
 };
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/core/params.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/core/params.gen.js
 var extraPrefixesMap = {
   $body_: "body",
   $headers_: "headers",
@@ -100973,12 +100970,12 @@ var extraPrefixesMap = {
   $query_: "query"
 };
 var extraPrefixes = Object.entries(extraPrefixesMap);
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/client.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/client.gen.js
 var client = createClient(createConfig({
   baseUrl: "http://localhost:4096"
 }));
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/gen/sdk.gen.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/gen/sdk.gen.js
 class _HeyApiClient {
   _client = client;
   constructor(args2) {
@@ -101648,7 +101645,7 @@ class OpencodeClient extends _HeyApiClient {
   event = new Event({ client: this._client });
 }
 
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/client.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/client.js
 function createOpencodeClient(config7) {
   if (!config7?.fetch) {
     const customFetch = (req) => {
@@ -101669,7 +101666,7 @@ function createOpencodeClient(config7) {
   const client2 = createClient(config7);
   return new OpencodeClient({ client: client2 });
 }
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/server.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/server.js
 import { spawn as spawn3 } from "node:child_process";
 async function createOpencodeServer(options) {
   options = Object.assign({
@@ -101738,7 +101735,7 @@ Server output: ${output}`;
     }
   };
 }
-// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.10/node_modules/@opencode-ai/sdk/dist/index.js
+// ../node_modules/.pnpm/@opencode-ai+sdk@1.2.14/node_modules/@opencode-ai/sdk/dist/index.js
 async function createOpencode(options) {
   const server2 = await createOpencodeServer({
     ...options
@@ -102197,11 +102194,6 @@ var getLiveMdContent = (opts) => {
 - OpenWebUI: ${openWebUrl}
 - Kevisual: ${kevisualUrl}
 
-### 直接访问
-- Kevisual: ${kevisualUrl}
-- OpenCode: ${url4?.replace("{{port}}", "4096")}
-- VSCode Web: ${vscodeWebUrl}
-
 ### 密码访问
 - OpenClaw: ${openclawUrlSecret}
 - OpenCode: ${opencodeUrlSecret}
@@ -102213,6 +102205,9 @@ var getLiveMdContent = (opts) => {
 
 使用插件访问vscode web获取wss进行保活,避免长时间不操作导致的自动断开连接。
 
+保活说明
+方法1： 使用插件访问vscode web获取wss进行保活,避免长时间不操作导致的自动断开连接。
+
 1. 安装插件[CNB LIVE](https://chromewebstore.google.com/detail/cnb-live/iajpiophkcdghonpijkcgpjafbcjhkko?pli=1)
 2. 打开vscode web获取,点击插件，获取json数据，替换keep.json中的数据，保持在线状态。
 3. keep.json中的数据结构说明：
@@ -102221,6 +102216,7 @@ var getLiveMdContent = (opts) => {
 - url: vscode web的访问地址，可以直接访问vscode web
 4. 运行cli命令，ev cnb live -c /workspace/live/keep.json.(直接对话opencode或者openclaw调用cnb-live技能即可)
 
+方法2：环境变量设置CNB_COOKIE，直接opencode或者openclaw的ui界面对话说，cnb-keep-live保活，他会自动调用保活，同时不需要点cnb-lie插件获取配置。
 `;
   const labels = [
     {
@@ -102250,7 +102246,7 @@ var getLiveMdContent = (opts) => {
     {
       key: "openclawUrl",
       title: "OpenClaw 地址",
-      value: openclawUrl,
+      value: openclawUrl + "/openclaw",
       description: "OpenClaw 的访问地址，可以通过该地址访问 OpenClaw 服务"
     },
     {
@@ -102351,7 +102347,7 @@ var createOSInfo = (more = false) => {
   }, {
     key: "cpuCores",
     title: "CPU 核心数",
-    value: `${cpus.length}`,
+    value: cpus.length,
     description: "CPU 核心数"
   }, {
     key: "memoryUsed",
@@ -102393,8 +102389,8 @@ var createOSInfo = (more = false) => {
     }, {
       key: "buildUptime",
       title: "构建已运行时间",
-      value: buildUptimeStr,
-      description: "构建已运行时间"
+      value: buildUptime,
+      description: `构建已运行时间: ${buildUptimeStr}`
     });
     if (maxRunTime > 0) {
       const now = import_dayjs.default();
@@ -102413,8 +102409,8 @@ var createOSInfo = (more = false) => {
       labels.unshift({
         key: "remainingTime",
         title: "剩余时间",
-        value: formatUptime(Math.floor((maxRunTime - buildUptime) / 1000)) + " " + timeTo4Str,
-        description: "构建剩余时间"
+        value: maxRunTime - buildUptime,
+        description: "构建剩余时间" + formatUptime(Math.floor((maxRunTime - buildUptime) / 1000)) + " " + timeTo4Str
       });
     }
   }
@@ -102484,9 +102480,9 @@ app.route({
   }
 }).define(async (ctx) => {
   const more = ctx.query?.more ?? false;
-  const list4 = getLiveMdContent({ more });
   if (notCNBCheck(ctx))
     return;
+  const list4 = getLiveMdContent({ more });
   ctx.body = {
     title: "开发环境模式配置",
     list: list4