@kevisual/cli 0.1.12 → 0.1.13

package/dist/assistant.js

@@ -27476,6 +27476,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) {
@@ -36742,7 +36749,7 @@ class RemoteApp {
     this.emitter.emit("message", data);
   }
   onError(error2) {
-    console.error("远程应用错误:", this.id, error2);
+    console.error(`[remote-app] 远程应用错误: ${this.id}`, error2);
     this.isError = true;
     this.emitter.emit("error", error2);
   }
@@ -36812,7 +36819,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;
@@ -51107,7 +51114,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;
@@ -70654,7 +70661,7 @@ var source_default = chalk;
 // src/module/chalk.ts
 var chalk2 = new Chalk({ level: 3 });
 
-// ../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;
@@ -71255,7 +71262,7 @@ ${line}`;
   }
 }
 
-// ../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 fs12 from "node:fs";
@@ -71571,6 +71578,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;
@@ -71581,13 +71597,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) {
@@ -71597,27 +71607,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();
@@ -71630,18 +71626,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() {
@@ -71677,22 +71673,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);
   }
 }
@@ -72280,7 +72276,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;
@@ -72391,6 +72387,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;
@@ -87232,7 +87229,7 @@ class AssistantApp extends Manager2 {
           app: this.mainApp,
           autoReconnect: true,
           reconnectDelay: 5000,
-          maxReconnectAttempts: Infinity,
+          maxReconnectAttempts: 50,
           enableBackoff: true
         });
         remoteApp.isConnect();
@@ -87252,7 +87249,7 @@ class AssistantApp extends Manager2 {
           logger.info("[remote-app] 远程连接已关闭，自动重连机制正在处理...");
         });
         remoteApp.on("maxReconnectAttemptsReached", () => {
-          logger.error("远程应用重连达到最大次数，停止重连");
+          logger.error("[remote-app] 远程应用重连达到最大次数，停止重连");
         });
         this.remoteApp = remoteApp;
       } else {

package/dist/envision.js

@@ -22312,8 +22312,8 @@ InitEnv.init();
 var version = useContextKey("version", () => {
   let version2 = "0.0.64";
   try {
-    if ("0.1.12")
-      version2 = "0.1.12";
+    if ("0.1.13")
+      version2 = "0.1.13";
   } catch (e) {}
   return version2;
 });
@@ -25149,7 +25149,7 @@ var dist_default6 = createPrompt((config, done) => {
 var import_md5 = __toESM(require_md5(), 1);
 var import_jsonwebtoken = __toESM(require_jsonwebtoken(), 1);
 
-// 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 isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -25437,7 +25437,7 @@ class Query {
   }
 }
 
-// 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 isTextForContentType2 = (contentType) => {
   if (!contentType)
     return false;
@@ -25750,7 +25750,17 @@ class BaseQuery {
   }
 }
 
-// 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-login/login-cache.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-login/login-cache.ts
+var defaultCacheData = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
+
 class LoginCacheStore {
   cache;
   name;
@@ -25760,13 +25770,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) {
@@ -25776,27 +25780,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();
@@ -25809,18 +25799,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() {
@@ -25856,22 +25846,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);
   }
 }
@@ -26326,7 +26316,7 @@ class BaseLoad3 {
   }
 }
 
-// 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-login/query-login.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-login/query-login.ts
 class QueryLogin extends BaseQuery {
   cacheStore;
   isBrowser;
@@ -26462,7 +26452,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;
@@ -26573,6 +26563,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;
@@ -26717,7 +26708,7 @@ class QueryLogin extends BaseQuery {
   }
 }
 
-// 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-login/login-node-cache.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-login/login-node-cache.ts
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
 import fs4 from "node:fs";
@@ -26861,7 +26852,7 @@ class LoginNodeCache {
   }
 }
 
-// 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-login/query-login-node.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-login/query-login-node.ts
 var cache = new LoginNodeCache;
 
 class QueryLoginNode extends QueryLogin {
@@ -30574,7 +30565,7 @@ var download = new Command("download").option("-d --dir <dir>", "配置目录").
 command8.addCommand(download);
 program.addCommand(command8);
 
-// 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-config.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-config.js
 var isTextForContentType3 = (contentType) => {
   if (!contentType)
     return false;
@@ -31010,7 +31001,7 @@ command9.addCommand(updateCommand);
 command9.addCommand(deleteCommand);
 program.addCommand(command9);
 
-// 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-secret.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-secret.js
 var isTextForContentType4 = (contentType) => {
   if (!contentType)
     return false;
@@ -34327,7 +34318,7 @@ var getJWKS = new Command("get").description("获取 JWKS 内容").option("-d ,
 jwksCmd.addCommand(getJWKS);
 program.addCommand(jwksCmd);
 
-// node_modules/.pnpm/@kevisual+cnb@0.0.28_dotenv@17.3.1_idb-keyval@6.2.2_ioredis@5.9.3/node_modules/@kevisual/cnb/dist/keep.js
+// node_modules/.pnpm/@kevisual+cnb@0.0.32_dotenv@17.3.1_idb-keyval@6.2.2_ioredis@5.9.3/node_modules/@kevisual/cnb/dist/keep.js
 import { createRequire as createRequire3 } from "node:module";
 var __create3 = Object.create;
 var __getProtoOf3 = Object.getPrototypeOf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/cli",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "envision 命令行工具",
   "type": "module",
   "basename": "/root/cli",
@@ -46,7 +46,7 @@
     "@kevisual/auth": "^2.0.3",
     "@kevisual/context": "^0.0.8",
     "@kevisual/use-config": "^1.0.30",
-    "@opencode-ai/sdk": "^1.2.10",
+    "@opencode-ai/sdk": "^1.2.14",
     "@types/busboy": "^1.5.4",
     "busboy": "^1.6.0",
     "eventemitter3": "^5.0.4",
@@ -59,12 +59,12 @@
     "unstorage": "^1.17.4"
   },
   "devDependencies": {
-    "@kevisual/api": "^0.0.59",
-    "@kevisual/cnb": "^0.0.28",
+    "@kevisual/api": "^0.0.60",
+    "@kevisual/cnb": "^0.0.32",
     "@kevisual/dts": "^0.0.4",
     "@kevisual/load": "^0.0.6",
     "@kevisual/logger": "^0.0.4",
-    "@kevisual/query": "0.0.49",
+    "@kevisual/query": "0.0.52",
     "@types/bun": "^1.3.9",
     "@types/crypto-js": "^4.2.2",
     "@types/jsonwebtoken": "^9.0.10",