@helixlife-ai/xiantao 0.1.2 → 0.1.3

package/README.md

@@ -15,13 +15,13 @@ Install with `npm i -g @helixlife-ai/xiantao` and run it as `xt`.
 ### First Use
 
 ```bash
-xt tool login
+xt login
 xt tool search violin
 xt tool inspect violin_flat
 xt tool run violin_flat ./data.xlsx
 ```
 
-`xt tool login` is the recommended first-use entrypoint. It signs in to the Xiantao web APIs and automatically backfills the upload token when it is missing. `xt login` does the inverse: it signs in for upload-related APIs and backfills the Xiantao web token when needed.
+`xt login` is the recommended first-use entrypoint. It refreshes both the upload token and the Xiantao web token for the current profile. `xt tool login` is kept as an equivalent entrypoint under the `tool` topic.
 
 ### Interactive Tool Run
 
@@ -67,7 +67,7 @@ For machine callers, use `xt tool exec`, keep `--json`, pass an explicit profile
 
 For the common Xiantao tool product, `tool search`, `tool inspect`, `tool run`, `tool resolve`, and `tool menu` default `toolProductUuid` to `c0b6febb-52dd-4525-970a-61bbe9e263ff`. You can override it with `--toolProductUuid`, `XIANTAO_TOOL_PRODUCT_UUID`, or `~/.config/xtz/config.json` under `xiantao.toolProductUuid`.
 
-`xt tool search <keyword>` searches cached or remote tool menus by tool id, title, path, and route. `xt tool inspect <tool_id>` prints resolved metadata together with the dynamic `args_main` schema used by the tool. `xt tool run <tool_id>` runs a Xiantao bioinformatics tool. `xt tool resolve <tool_id>` remains available as the low-level UUID and route lookup. `--demo` reuses the demo file metadata returned by `tool fetch-all`; otherwise `tool run` uploads the local file first and therefore also needs upload auth, which `xt tool login` or `xt login` will backfill automatically when missing.
+`xt tool search <keyword>` searches cached or remote tool menus by tool id, title, path, and route. `xt tool inspect <tool_id>` prints resolved metadata together with the dynamic `args_main` schema used by the tool. `xt tool run <tool_id>` runs a Xiantao bioinformatics tool. `xt tool resolve <tool_id>` remains available as the low-level UUID and route lookup. `--demo` reuses the demo file metadata returned by `tool fetch-all`; otherwise `tool run` uploads the local file first and therefore also needs upload auth. Run `xt login` first to refresh both tokens in one step.
 
 `xt tool run <tool_id> ... --interactive` prompts for dynamic `args_main` values before the final submit, prints reusable `--set` flags, and supports `<` for the previous item plus `/skip` for the current section.
 

package/dist/commands/auth/login.js

@@ -1,11 +1,10 @@
 import { Flags } from '@oclif/core';
 import { XtzCommand } from '../../base-command.js';
-import { loginAuth } from '../../lib/auth.js';
 import { globalFlags } from '../../lib/flags.js';
+import { loginAll } from '../../lib/login-flow.js';
 import { getTokenPath, getXiantaoTokenPath } from '../../lib/storage.js';
-import { ensureXiantaoLogin } from '../../lib/xiantao-auth.js';
 export default class AuthLogin extends XtzCommand {
-    static description = 'Get an authorization link for the current profile, save the token locally, and backfill the Xiantao web token when missing';
+    static description = 'Sign in for the current profile and refresh both the upload token and the Xiantao web token';
     static flags = {
         ...globalFlags,
         open: Flags.boolean({
@@ -18,28 +17,35 @@ export default class AuthLogin extends XtzCommand {
         this.warnIfLegacyAuthCommand();
         const { flags } = await this.parse(AuthLogin);
         const agent = await this.getProfile(flags.profile);
-        const authResult = await loginAuth(agent, flags.open);
-        const xiantaoResult = await ensureXiantaoLogin(agent);
+        const result = await loginAll(agent, flags.open, ({ auth, phase }) => {
+            if (flags.json) {
+                return;
+            }
+            if (phase === 'auth_started') {
+                this.log(auth.browserOpened ? '浏览器已打开上传授权链接，等待授权完成...' : `请先在浏览器中打开上传授权链接: ${auth.linkUrl}`);
+                return;
+            }
+            this.log('上传授权已确认，继续仙桃网页登录...');
+        });
         this.print(flags, {
             agent,
-            browser_opened: authResult.browserOpened,
-            link_url: authResult.linkUrl,
-            token_path: authResult.tokenPath,
+            browser_opened: result.auth.browserOpened,
+            link_url: result.auth.linkUrl,
+            token_path: result.auth.tokenPath,
             xiantao: {
-                browser_opened: xiantaoResult.browserOpened,
-                callback_url: xiantaoResult.callbackUrl,
-                jump_url: xiantaoResult.jumpUrl,
-                supplemented: xiantaoResult.created,
-                token_path: xiantaoResult.tokenPath,
+                browser_opened: result.xiantao.browserOpened,
+                callback_url: result.xiantao.callbackUrl,
+                jump_url: result.xiantao.jumpUrl,
+                token_path: result.xiantao.tokenPath,
             },
         }, [
             `profile: ${agent}`,
             `token: ${getTokenPath(agent)}`,
             `xiantao_token: ${getXiantaoTokenPath(agent)}`,
-            authResult.browserOpened
+            result.xiantao.browserOpened ? '仙桃网页登录成功，token 已刷新。' : `请在浏览器中打开: ${result.xiantao.jumpUrl}`,
+            result.auth.browserOpened
                 ? '浏览器已打开授权链接，请完成授权后运行 `xt status`。'
-                : `请在浏览器中打开: ${authResult.linkUrl}`,
-            xiantaoResult.created ? '已自动补齐仙桃网页登录 token。' : '仙桃网页登录 token 已存在，跳过补齐。',
+                : `请在浏览器中打开: ${result.auth.linkUrl}`,
         ].join('\n'));
     }
 }

package/dist/commands/plot/login.js

@@ -1,41 +1,51 @@
+import { Flags } from '@oclif/core';
 import { XtzCommand } from '../../base-command.js';
-import { ensureAuthLogin } from '../../lib/auth.js';
 import { globalFlags } from '../../lib/flags.js';
+import { loginAll } from '../../lib/login-flow.js';
 import { getTokenPath, getXiantaoTokenPath } from '../../lib/storage.js';
-import { loginXiantao } from '../../lib/xiantao-auth.js';
 export default class PlotLogin extends XtzCommand {
-    static description = 'Sign in to Xiantao web APIs for the current profile, save the returned token locally, and backfill the upload token when missing';
+    static description = 'Sign in for the current profile and refresh both the upload token and the Xiantao web token';
     static flags = {
         ...globalFlags,
+        open: Flags.boolean({
+            allowNo: true,
+            default: true,
+            description: 'Open the authorization link in the browser',
+        }),
     };
     async run() {
         this.warnIfLegacyPlotCommand();
         const { flags } = await this.parse(PlotLogin);
         const agent = await this.getProfile(flags.profile);
-        const result = await loginXiantao(agent);
-        const authResult = await ensureAuthLogin(agent);
+        const result = await loginAll(agent, flags.open, ({ auth, phase }) => {
+            if (flags.json) {
+                return;
+            }
+            if (phase === 'auth_started') {
+                this.log(auth.browserOpened ? '浏览器已打开上传授权链接，等待授权完成...' : `请先在浏览器中打开上传授权链接: ${auth.linkUrl}`);
+                return;
+            }
+            this.log('上传授权已确认，继续仙桃网页登录...');
+        });
         this.print(flags, {
             agent,
-            browser_opened: result.browserOpened,
-            callback_url: result.callbackUrl,
-            jump_url: result.jumpUrl,
-            token_path: result.tokenPath,
-            auth: {
-                browser_opened: authResult.browserOpened,
-                link_url: authResult.linkUrl,
-                supplemented: authResult.created,
-                token_path: authResult.tokenPath,
+            browser_opened: result.auth.browserOpened,
+            link_url: result.auth.linkUrl,
+            token_path: result.auth.tokenPath,
+            xiantao: {
+                browser_opened: result.xiantao.browserOpened,
+                callback_url: result.xiantao.callbackUrl,
+                jump_url: result.xiantao.jumpUrl,
+                token_path: result.xiantao.tokenPath,
             },
         }, [
             `profile: ${agent}`,
             `token: ${getTokenPath(agent)}`,
             `xiantao_token: ${getXiantaoTokenPath(agent)}`,
-            result.browserOpened ? '仙桃网页登录成功，token 已保存。' : `请在浏览器中打开: ${result.jumpUrl}`,
-            authResult.created
-                ? authResult.browserOpened
-                    ? '已自动补齐上传授权 token，请完成浏览器授权后运行 `xt status`。'
-                    : `已自动补齐上传授权 token，请在浏览器中打开: ${authResult.linkUrl}`
-                : '上传授权 token 已存在，跳过补齐。',
+            result.xiantao.browserOpened ? '仙桃网页登录成功，token 已刷新。' : `请在浏览器中打开: ${result.xiantao.jumpUrl}`,
+            result.auth.browserOpened
+                ? '浏览器已打开授权链接，请完成授权后运行 `xt status`。'
+                : `请在浏览器中打开: ${result.auth.linkUrl}`,
         ].join('\n'));
     }
 }

package/dist/lib/auth.js

@@ -1,7 +1,8 @@
 import { AUTH_URL_ENDPOINT, CHECK_TOKEN_ENDPOINT } from './constants.js';
+import { XtzError } from './errors.js';
 import { openUrl } from './open-url.js';
 import { requestJson } from './http.js';
-import { getTokenPath, loadToken, requireToken, saveToken } from './storage.js';
+import { requireToken, saveToken } from './storage.js';
 export async function fetchAuthLink(agent) {
     const response = await requestJson(AUTH_URL_ENDPOINT);
     const link = new URL(response.data.link_url);
@@ -22,22 +23,6 @@ export async function loginAuth(agent, openBrowser = true) {
         tokenPath,
     };
 }
-export async function ensureAuthLogin(agent, openBrowser = true) {
-    const token = await loadToken(agent);
-    if (token) {
-        return {
-            browserOpened: false,
-            created: false,
-            token,
-            tokenPath: getTokenPath(agent),
-        };
-    }
-    const result = await loginAuth(agent, openBrowser);
-    return {
-        ...result,
-        created: true,
-    };
-}
 export async function getAuthContext(agent) {
     const token = await requireToken(agent);
     return { agent, token };
@@ -49,3 +34,40 @@ export async function checkToken(agent, token) {
     const response = await requestJson(url.toString(), {}, { agent });
     return response.data;
 }
+export async function waitForAuthorizedToken(token, options = {}) {
+    const timeoutMs = options.timeoutMs ?? 2 * 60 * 1000;
+    const intervalMs = options.intervalMs ?? 1500;
+    const deadline = Date.now() + timeoutMs;
+    let lastMessage = '';
+    while (Date.now() < deadline) {
+        const result = await pollAuthorizedToken(token);
+        if (result.success) {
+            return;
+        }
+        lastMessage = result.message?.trim() || lastMessage;
+        await new Promise((resolve) => setTimeout(resolve, intervalMs));
+    }
+    throw new XtzError(lastMessage ? `等待上传授权完成超时: ${lastMessage}` : '等待上传授权完成超时，请重新运行 `xt login`。');
+}
+async function pollAuthorizedToken(token) {
+    const url = new URL(CHECK_TOKEN_ENDPOINT);
+    url.searchParams.set('token_key', token);
+    let response;
+    try {
+        response = await fetch(url.toString());
+    }
+    catch {
+        throw new XtzError('网络请求失败，请稍后重试。');
+    }
+    const body = await response.text();
+    try {
+        const payload = JSON.parse(body);
+        return {
+            message: payload.message,
+            success: response.ok && payload.success !== false,
+        };
+    }
+    catch {
+        throw new XtzError('服务返回了无法解析的响应。');
+    }
+}

package/dist/lib/errors.js

@@ -19,9 +19,9 @@ export async function raiseApiError(payload, options = {}) {
             }
         }
         if (tokenKind === 'xiantao') {
-            throw new XtzError('您的仙桃网页授权已过期或无效，请重新运行 `xt tool login` 或 `xt login`。');
+            throw new XtzError('您的仙桃网页授权已过期或无效，请重新运行 `xt login`。');
         }
-        throw new XtzError('您的授权已过期或无效，请重新运行 `xt login` 或 `xt tool login`。');
+        throw new XtzError('您的授权已过期或无效，请重新运行 `xt login`。');
     }
     if (message.includes('无权限') || message.includes('权限')) {
         throw new XtzError('需购买仙桃高级版 https://www.xiantaozi.com/');

package/dist/lib/login-flow.js

@@ -0,0 +1,13 @@
+import { loginAuth, waitForAuthorizedToken } from './auth.js';
+import { loginXiantao } from './xiantao-auth.js';
+export async function loginAll(agent, openAuthBrowser = true, onProgress) {
+    const auth = await loginAuth(agent, openAuthBrowser);
+    onProgress?.({ auth, phase: 'auth_started' });
+    await waitForAuthorizedToken(auth.token);
+    onProgress?.({ auth, phase: 'auth_confirmed' });
+    const xiantao = await loginXiantao(agent);
+    return {
+        auth,
+        xiantao,
+    };
+}

package/dist/lib/storage.js

@@ -57,14 +57,14 @@ export async function requireToken(agent) {
     if (token) {
         return token;
     }
-    throw new XtzError(`未找到 ${agent} 的 token，请先运行 \`xt login --profile ${agent}\` 或 \`xt tool login --profile ${agent}\``);
+    throw new XtzError(`未找到 ${agent} 的 token，请先运行 \`xt login --profile ${agent}\``);
 }
 export async function requireXiantaoToken(agent) {
     const token = await loadXiantaoToken(agent);
     if (token) {
         return token;
     }
-    throw new XtzError(`未找到 ${agent} 的仙桃网页 token，请先运行 \`xt tool login --profile ${agent}\` 或 \`xt login --profile ${agent}\``);
+    throw new XtzError(`未找到 ${agent} 的仙桃网页 token，请先运行 \`xt login --profile ${agent}\``);
 }
 export async function deleteToken(agent) {
     const tokenPath = getTokenPath(agent);

package/dist/lib/xiantao-auth.js

@@ -2,7 +2,7 @@ import http from 'node:http';
 import { PASSPORT_JUMP_ENDPOINT } from './constants.js';
 import { openUrl } from './open-url.js';
 import { XtzError } from './errors.js';
-import { getXiantaoTokenPath, loadXiantaoToken, requireXiantaoToken, saveXiantaoToken } from './storage.js';
+import { loadXiantaoToken, requireXiantaoToken, saveXiantaoToken } from './storage.js';
 export async function getXiantaoAuthContext(agent, tokenOverride) {
     const token = tokenOverride?.trim() || process.env.XIANTAO_TOKEN?.trim() || await requireXiantaoToken(agent);
     return { agent, token };
@@ -27,22 +27,6 @@ export async function loginXiantao(agent) {
         tokenPath,
     };
 }
-export async function ensureXiantaoLogin(agent) {
-    const token = await loadXiantaoToken(agent);
-    if (token) {
-        return {
-            browserOpened: false,
-            created: false,
-            token,
-            tokenPath: getXiantaoTokenPath(agent),
-        };
-    }
-    const result = await loginXiantao(agent);
-    return {
-        ...result,
-        created: true,
-    };
-}
 async function createLoginSession() {
     let resolveToken;
     let rejectToken;

package/dist/xtz-help.js

@@ -4,14 +4,14 @@ export default class XtzHelp extends Help {
         this.log(this.formatRoot());
         this.log('');
         this.log(this.section('MAIN FLOWS', [
-            ['First use', '$ xt tool login\n$ xt tool search violin\n$ xt tool inspect violin_flat\n$ xt tool run violin_flat ./data.xlsx'],
+            ['First use', '$ xt login\n$ xt tool search violin\n$ xt tool inspect violin_flat\n$ xt tool run violin_flat ./data.xlsx'],
             ['Interactive tool run', '$ xt tool run --interactive'],
             ['Agent automation', '$ xt tool:prepare violin_flat --file ./data.xlsx --profile openclaw --json\n$ xt tool exec violin_flat --file ./data.xlsx --profile openclaw --json'],
         ]));
         this.log('');
         this.log(this.section('COMMON COMMANDS', this.renderCommandItems([
             {
-                description: 'Sign in for upload-related APIs and backfill Xiantao web auth if missing',
+                description: 'Sign in for the current profile and refresh both auth tokens',
                 id: 'login',
             },
             {
@@ -23,7 +23,7 @@ export default class XtzHelp extends Help {
                 id: 'logout',
             },
             {
-                description: 'Sign in for Xiantao web APIs and backfill upload auth if missing',
+                description: 'Alias of xt login under the tool topic',
                 id: 'tool:login',
             },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helixlife-ai/xiantao",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "CLI for Xiantao bioinformatics tools",
   "type": "module",
   "main": "dist/index.js",
@@ -55,7 +55,7 @@
     }
   },
   "dependencies": {
-    "@helixlife-ai/xiantao": "^0.1.2",
+    "@helixlife-ai/xiantao": "^0.1.3",
     "@oclif/core": "^4.9.0",
     "@oclif/plugin-autocomplete": "^3.2.41"
   },