@helixlife-ai/xiantao 0.1.8 → 0.1.10

package/README.md

@@ -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. Run `xt login` first to refresh both tokens in one step.
+`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. When a tool exposes multiple downloadable results, `--download <path>` uses the output file extension to select the matching artifact.
 
 `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/plot/download.js

@@ -16,7 +16,7 @@ export default class PlotDownload extends XtzCommand {
         }),
         output: Flags.string({
             char: 'o',
-            description: 'Destination path; defaults to the file name inferred from the URL',
+            description: 'Destination path; defaults to ~/Downloads/<file name>',
         }),
     };
     async run() {

package/dist/commands/plot/run.js

@@ -135,30 +135,60 @@ export class ToolRunCommandBase extends XtzCommand {
         return lines.join('\n');
     }
     async downloadResult(auth, input) {
+        if (input.downloads.length > 0) {
+            const item = this.pickDownloadItem(input.downloads, input.downloadPath);
+            if (!item) {
+                throw new XtzError('当前模块返回多个可下载结果，请将 `--download` 路径改为带目标扩展名的文件名，或使用 `--interactive` 选择。');
+            }
+            const resolved = await resolveXiantaoDownload(auth, {
+                item,
+                moduleId: input.moduleId,
+                uuid: input.uuid,
+            });
+            return [await downloadToPath(resolved.url, input.downloadPath)];
+        }
         if (input.file) {
             return [await downloadToPath(input.file, input.downloadPath)];
         }
-        const item = this.pickDownloadItem(input.downloads);
-        if (!item) {
-            throw new XtzError('当前模块未返回可下载文件。');
-        }
-        const resolved = await resolveXiantaoDownload(auth, {
-            item,
-            moduleId: input.moduleId,
-            uuid: input.uuid,
-        });
-        return [await downloadToPath(resolved.url, input.downloadPath)];
+        throw new XtzError('当前模块未返回可下载文件。');
     }
-    pickDownloadItem(downloads) {
-        const report = downloads.find((item) => item.endpoint === 'public.output.download-report');
-        if (report) {
-            return report;
+    pickDownloadItem(downloads, downloadPath) {
+        const expectedDevice = this.inferDownloadDevice(downloadPath);
+        if (expectedDevice) {
+            const matched = downloads.filter((item) => this.normalizeDevice(item.device) === expectedDevice);
+            if (matched.length === 1) {
+                return matched[0];
+            }
+        }
+        const results = downloads.filter((item) => item.endpoint === 'public.output.download-result');
+        if (results.length === 1) {
+            return results[0];
         }
         if (downloads.length === 1) {
             return downloads[0];
         }
         return undefined;
     }
+    inferDownloadDevice(downloadPath) {
+        if (!downloadPath) {
+            return undefined;
+        }
+        const extension = downloadPath.trim().split('.').pop()?.toLowerCase();
+        if (!extension) {
+            return undefined;
+        }
+        return this.normalizeDevice(extension);
+    }
+    normalizeDevice(device) {
+        const normalized = device.trim().toLowerCase();
+        if (normalized === 'tif') {
+            return 'tiff';
+        }
+        if (normalized === 'jpg') {
+            return 'jpeg';
+        }
+        return normalized;
+    }
     async downloadSelectedResults(auth, input) {
         const paths = [];
         for (const item of input.downloads) {

package/dist/lib/download.js

@@ -1,5 +1,6 @@
-import { writeFile } from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
+import { writeFile } from 'node:fs/promises';
 import { XtzError } from './errors.js';
 export async function downloadToPath(url, outputPath) {
     let response;
@@ -12,18 +13,20 @@ export async function downloadToPath(url, outputPath) {
     if (!response.ok) {
         throw new XtzError(`下载失败 (${response.status})`);
     }
-    const targetPath = path.resolve(outputPath ?? inferFileName(url));
+    const targetPath = outputPath
+        ? path.resolve(outputPath)
+        : inferDownloadPath(url);
     const buffer = Buffer.from(await response.arrayBuffer());
     await writeFile(targetPath, buffer);
     return targetPath;
 }
-function inferFileName(url) {
+function inferDownloadPath(url) {
     try {
         const pathname = new URL(url).pathname;
         const name = decodeURIComponent(path.basename(pathname));
-        return name || 'download.bin';
+        return path.join(os.homedir(), 'Downloads', name || 'download.bin');
     }
     catch {
-        return 'download.bin';
+        return path.join(os.homedir(), 'Downloads', 'download.bin');
     }
 }

package/dist/lib/errors.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helixlife-ai/xiantao",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "CLI for Xiantao bioinformatics tools",
   "type": "module",
   "main": "dist/index.js",

package/dist/commands/auth/bind.js

@@ -1,53 +0,0 @@
-import { Flags } from '@oclif/core';
-import { XtzCommand } from '../../base-command.js';
-import { loginAuth, waitForAuthorizedToken } from '../../lib/auth.js';
-import { globalFlags } from '../../lib/flags.js';
-import { bindUserWithXiantaoToken } from '../../lib/xiantao-auth.js';
-import { getTokenPath, getXiantaoTokenPath, loadXiantaoToken, saveToken } from '../../lib/storage.js';
-export default class AuthBind extends XtzCommand {
-    static description = 'Bind login remotely with a Xiantao web token without the localhost callback flow';
-    static flags = {
-        ...globalFlags,
-        'auth-key': Flags.string({
-            char: 'k',
-            description: 'Existing auth key returned by the upload authorization flow',
-        }),
-        'token-key': Flags.string({
-            description: 'Existing upload token key paired with --auth-key',
-        }),
-        'xiantao-token': Flags.string({
-            description: 'Bearer token for api.helixlife.net xiantao APIs; falls back to XIANTAO_TOKEN or the stored Xiantao web token',
-        }),
-    };
-    async run() {
-        this.warnIfLegacyAuthCommand();
-        const { flags } = await this.parse(AuthBind);
-        const agent = await this.getProfile(flags.profile);
-        const token = flags['xiantao-token']?.trim() || process.env.XIANTAO_TOKEN?.trim() || await loadXiantaoToken(agent);
-        if (!token) {
-            this.error(`未找到 ${agent} 的仙桃网页 token，请传 --xiantao-token、设置 XIANTAO_TOKEN，或先准备 ${getXiantaoTokenPath(agent)}`, { exit: 1 });
-        }
-        const auth = flags['auth-key']
-            ? {
-                authKey: flags['auth-key'],
-                token: flags['token-key']?.trim(),
-                tokenPath: getTokenPath(agent),
-            }
-            : await loginAuth(agent, false);
-        if (!auth.token) {
-            this.error('传 --auth-key 时必须同时传 --token-key', { exit: 1 });
-        }
-        if (flags['auth-key']) {
-            await saveToken(agent, auth.token);
-        }
-        const result = await bindUserWithXiantaoToken(agent, auth.authKey, token);
-        await waitForAuthorizedToken(auth.token);
-        this.print(flags, {
-            agent,
-            auth_key: auth.authKey,
-            bound: true,
-            token_path: auth.tokenPath,
-            xiantao_token_path: result.tokenPath,
-        }, `profile: ${agent}\nbound: true\nauth_key: ${auth.authKey}\ntoken: ${auth.tokenPath}\nxiantao_token: ${result.tokenPath}`);
-    }
-}

package/dist/commands/bind.js

@@ -1,3 +0,0 @@
-import AuthBind from './auth/bind.js';
-export default class Bind extends AuthBind {
-}