feat: win bl update exe file test

Author: duck-bubi-ya

INSTALL.md

@@ -24,6 +24,8 @@ irm https://bailian.aliyun.com/cli/install.ps1 | iex
 
 带参时先落盘再执行（`irm | iex` 不便传参），或使用仓外静态资源文档中的预发入口。
 
+二进制安装布局为 `versions/<ver>/` + `current` 指针；`bl update` 只切换指针并清理旧版本（保留当前与上一版）。更新进程退出后，下次执行 `bl` 即使用新版本（无需「重启应用」）。
+
 校验：
 
 ```bash
@@ -79,9 +81,10 @@ bl auth status --output json
 
 ## 5. 常见问题
 
-| 现象                    | 可能原因                     | 建议动作                               |
-| ----------------------- | ---------------------------- | -------------------------------------- |
-| `bl: command not found` | bin 不在 PATH                | 检查 `~/.local/bin` 或 `npm prefix -g` |
-| curl 安装 404           | GitHub Release 资产未上传    | 改用 `npm install -g bailian-cli`      |
-| `plugin` 需要 npm       | 二进制安装无本机 npm         | 安装 Node，或改用 npm 版 CLI           |
-| 安装报错 engines        | Node 版本过低（仅 npm 路径） | 升级到 ≥ 18.17.0                       |
+| 现象                     | 可能原因                     | 建议动作                                         |
+| ------------------------ | ---------------------------- | ------------------------------------------------ |
+| `bl: command not found`  | bin 不在 PATH                | 检查 `~/.local/bin` 或 `npm prefix -g`           |
+| curl 安装 404            | GitHub Release 资产未上传    | 改用 `npm install -g bailian-cli`                |
+| Windows `bl update` 失败 | 旧布局 / 文件锁 / 网络       | 重跑 `irm .../install.ps1 \| iex` 迁移布局后重试 |
+| `plugin` 需要 npm        | 二进制安装无本机 npm         | 安装 Node，或改用 npm 版 CLI                     |
+| 安装报错 engines         | Node 版本过低（仅 npm 路径） | 升级到 ≥ 18.17.0                                 |

README.md

@@ -216,8 +216,9 @@ bl config set --key base_url --value https://dashscope-us.aliyuncs.com
 bl config set --key default_text_model --value qwen-turbo
 bl config set --key timeout --value 600
 
-# Self-update to latest version
+# Self-update to latest or a specific version
 bl update
+bl update --to 0.1.14
 ```
 
 Config file location: `~/.bailian/config.json`

README.zh.md

@@ -216,6 +216,9 @@ bl config set --key timeout --value 600
 
 # 自更新到最新版本
 bl update
+
+# 安装指定版本
+bl update --to 0.1.14
 ```
 
 配置文件位置：`~/.bailian/config.json`

packages/commands/src/commands/update.ts

@@ -2,16 +2,19 @@ import { execSync } from "child_process";
 import { writeFileSync } from "fs";
 import { join } from "path";
 import {
+  BailianError,
+  DEFAULT_INSTALL_PS1_URL,
   DEFAULT_INSTALL_SCRIPT_URL,
   defineCommand,
   getConfigDir,
-  getInstallMethod,
+  getUpdateInstallMethod,
   type InstallMethod,
 } from "bailian-cli-core";
 import {
   ansi,
   fetchLatestVersion,
   fetchBinaryChannelVersion,
+  normalizeBinaryVersion,
   performBinaryUpdate,
   type AnsiStyles,
 } from "bailian-cli-runtime";
@@ -50,64 +53,108 @@ async function resolveLatest(method: InstallMethod, npmPackage: string): Promise
   return fetchLatestVersion(5000, npmPackage);
 }
 
+function binaryReinstallHint(): string {
+  if (process.platform === "win32") {
+    return `  irm ${DEFAULT_INSTALL_PS1_URL} | iex\n`;
+  }
+  return `  curl -fsSL ${DEFAULT_INSTALL_SCRIPT_URL} | bash\n`;
+}
+
 export default defineCommand({
-  description: "Update the CLI to the latest version",
+  description: "Update the CLI to the latest or a specified version",
   auth: "none",
-  exampleArgs: [""],
+  usageArgs: "[--to <version>]",
+  flags: {
+    to: {
+      type: "string",
+      valueHint: "<version>",
+      description: "Install this exact version instead of the latest",
+    },
+  },
+  exampleArgs: ["", "--to 0.1.14"],
+  validate(flags) {
+    if (flags.to !== undefined && !flags.to.trim()) {
+      return "--to requires a non-empty version";
+    }
+    return undefined;
+  },
   async run(ctx) {
     const { identity } = ctx;
     const npmPackage = identity.npmPackage;
     const binName = identity.binName;
     const currentVersion = identity.version;
     const color = ansi(process.stderr);
-    const method = getInstallMethod();
+    const method = getUpdateInstallMethod(identity);
+    const requestedTo = ctx.flags.to?.trim();
+    const pinnedVersion = requestedTo ? normalizeBinaryVersion(requestedTo) : undefined;
 
     process.stderr.write(`Current version: ${color.yellow(currentVersion)}\n`);
     process.stderr.write(`Install method: ${color.dim(method)}\n`);
-    process.stderr.write("Checking for updates...\n");
+    if (pinnedVersion) {
+      process.stderr.write(`Target version: ${color.green(pinnedVersion)}\n`);
+    } else {
+      process.stderr.write("Checking for updates...\n");
+    }
 
     if (method === "brew" || method === "winget") {
       const cmd =
         method === "brew" ? "brew upgrade bailian-cli" : "winget upgrade Aliyun.BailianCLI";
       process.stderr.write(
         `${color.yellow(`This CLI was installed via ${method}. Update with:`)}\n  ${cmd}\n`,
       );
+      if (pinnedVersion) {
+        process.stderr.write(
+          `${color.dim(`Note: --to is not supported for ${method} installs.`)}\n`,
+        );
+      }
       return;
     }
 
-    const latest = await resolveLatest(method, npmPackage);
+    const targetVersion = pinnedVersion ?? (await resolveLatest(method, npmPackage));
+
+    if (!targetVersion) {
+      process.stderr.write(`${color.yellow("Could not determine the latest version.")}\n`);
+      return;
+    }
 
-    if (latest && latest === currentVersion) {
-      process.stderr.write(`${color.green(`\u2713 Already up to date (${currentVersion}).`)}\n`);
+    if (targetVersion === currentVersion) {
+      const message = pinnedVersion
+        ? `\u2713 Already at ${currentVersion}.`
+        : `\u2713 Already up to date (${currentVersion}).`;
+      process.stderr.write(`${color.green(message)}\n`);
       if (method === "npm") updateAgentSkill(color);
       return;
     }
 
-    if (latest) {
-      process.stderr.write(`Latest version: ${color.green(latest)}\n\n`);
+    if (!pinnedVersion) {
+      process.stderr.write(`Latest version: ${color.green(targetVersion)}\n\n`);
     } else {
-      process.stderr.write(`${color.yellow("Could not determine the latest version.")}\n`);
-      return;
+      process.stderr.write("\n");
     }
 
     if (method === "binary") {
       process.stderr.write(`Updating via binary channel...\n\n`);
       try {
-        const newVer = await performBinaryUpdate(latest);
+        const newVer = await performBinaryUpdate(targetVersion);
         process.stderr.write(
           `\n${color.green(`\u2713 Update complete: ${currentVersion} \u2192 ${newVer}`)}\n`,
         );
         writeUpdateState(newVer);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
+        const reinstall =
+          error instanceof BailianError && error.hint
+            ? error.hint.replace(/^Re-run:\s*/i, "")
+            : binaryReinstallHint().trim();
         process.stderr.write(`\nAutomatic binary update failed: ${message}\n`);
         process.stderr.write("Re-run the install script:\n");
-        process.stderr.write(`  curl -fsSL ${DEFAULT_INSTALL_SCRIPT_URL} | bash\n\n`);
+        process.stderr.write(`  ${reinstall}\n\n`);
       }
       return;
     }
 
-    const cmd = `npm install -g ${npmPackage}@latest`;
+    const npmSpec = pinnedVersion ? `${npmPackage}@${pinnedVersion}` : `${npmPackage}@latest`;
+    const cmd = `npm install -g ${npmSpec}`;
     process.stderr.write(`Updating ${npmPackage} via npm...\n\n`);
 
     try {

packages/commands/tests/e2e/topic-routes.ts

@@ -10,6 +10,10 @@ export const AUTH_ROUTES: E2eRouteExports = {
   "auth logout": "authLogout",
 };
 
+export const UPDATE_ROUTES: E2eRouteExports = {
+  update: "update",
+};
+
 export const TEXT_CHAT_ROUTES: E2eRouteExports = { "text chat": "textChat" };
 
 export const CONFIG_ROUTES: E2eRouteExports = {

packages/commands/tests/e2e/update.e2e.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, test } from "vite-plus/test";
+import { runCommandE2e } from "./helpers.ts";
+import { UPDATE_ROUTES } from "./topic-routes.ts";
+
+describe("e2e: update", () => {
+  test("update --help 正常退出并展示 --to", async () => {
+    const { stderr, exitCode } = await runCommandE2e(UPDATE_ROUTES, ["update", "--help"]);
+    expect(exitCode, stderr).toBe(0);
+    expect(stderr).toMatch(/--to/);
+    expect(stderr).toMatch(/<version>/);
+  });
+
+  test("update --help 包含 --to 示例", async () => {
+    const { stderr, exitCode } = await runCommandE2e(UPDATE_ROUTES, ["update", "--help"]);
+    expect(exitCode, stderr).toBe(0);
+    expect(stderr).toContain("--to 0.1.14");
+  });
+
+  test("update --to 缺值时退出为用法错误 (2)", async () => {
+    const { stderr, exitCode } = await runCommandE2e(UPDATE_ROUTES, ["update", "--to"]);
+    expect(exitCode, stderr).toBe(2);
+  });
+});

packages/core/src/install/index.ts

@@ -1,9 +1,12 @@
 export {
+  BINARY_PRODUCT_CLIENT_NAME,
   detectInstallMethod,
   getInstallMethod,
+  getUpdateInstallMethod,
   isCompiledBinary,
   writeInstallMethodSync,
   type InstallMethod,
+  type InstallMethodIdentity,
 } from "./method.ts";
 export {
   DEFAULT_CLI_CDN_BASE,

packages/core/src/install/method.ts

@@ -5,11 +5,19 @@ import { getConfigDir } from "../config/paths.ts";
 /** How the CLI was installed on this machine. */
 export type InstallMethod = "binary" | "npm" | "brew" | "winget" | "unknown";
 
+/** Product that currently ships standalone binary artifacts (`bl` / `bailian`). */
+export const BINARY_PRODUCT_CLIENT_NAME = "bailian-cli";
+
 const INSTALL_METHOD_FILE = "install-method";
 const VALID_METHODS = new Set<InstallMethod>(["binary", "npm", "brew", "winget", "unknown"]);
 
-function installMethodPath(): string {
-  return join(getConfigDir(), INSTALL_METHOD_FILE);
+export type InstallMethodIdentity = {
+  clientName: string;
+};
+
+function installMethodPath(clientName?: string): string {
+  if (!clientName) return join(getConfigDir(), INSTALL_METHOD_FILE);
+  return join(getConfigDir(), `${INSTALL_METHOD_FILE}.${clientName}`);
 }
 
 /**
@@ -32,6 +40,15 @@ function parseInstallMethod(raw: string | undefined): InstallMethod | null {
   return VALID_METHODS.has(value) ? value : null;
 }
 
+function readInstallMethodFile(path: string): InstallMethod | null {
+  try {
+    const raw = readFileSync(path, "utf-8");
+    return parseInstallMethod(raw.split("\n")[0]);
+  } catch {
+    return null;
+  }
+}
+
 /** Infer install method when no marker file / env override is present. */
 export function detectInstallMethod(): InstallMethod {
   const fromEnv = parseInstallMethod(process.env.BAILIAN_INSTALL_METHOD);
@@ -46,30 +63,68 @@ export function detectInstallMethod(): InstallMethod {
   return "npm";
 }
 
-/** Read the persisted install method, falling back to detection. */
-export function getInstallMethod(): InstallMethod {
+/**
+ * Read the persisted install method, falling back to detection.
+ *
+ * When `identity` is provided, prefer `install-method.<clientName>`.
+ * Legacy `~/.bailian/install-method` is only consulted for `bailian-cli`
+ * so other products (e.g. kscli) are not polluted by a shared binary marker.
+ */
+export function getInstallMethod(identity?: InstallMethodIdentity): InstallMethod {
   const fromEnv = parseInstallMethod(process.env.BAILIAN_INSTALL_METHOD);
   if (fromEnv) return fromEnv;
 
-  try {
-    const raw = readFileSync(installMethodPath(), "utf-8");
-    const parsed = parseInstallMethod(raw.split("\n")[0]);
-    if (parsed) return parsed;
-  } catch {
-    /* missing or unreadable */
+  if (identity?.clientName) {
+    const productMethod = readInstallMethodFile(installMethodPath(identity.clientName));
+    if (productMethod) return productMethod;
+
+    if (identity.clientName === BINARY_PRODUCT_CLIENT_NAME) {
+      const legacyMethod = readInstallMethodFile(installMethodPath());
+      if (legacyMethod) return legacyMethod;
+    }
+
+    return detectInstallMethod();
   }
 
+  const legacyMethod = readInstallMethodFile(installMethodPath());
+  if (legacyMethod) return legacyMethod;
+
   return detectInstallMethod();
 }
 
-/** Persist install method under `~/.bailian/install-method` (best-effort). */
-export function writeInstallMethodSync(method: InstallMethod): void {
+/**
+ * Install method for update / auto-update routing.
+ * Only `bailian-cli` may follow the binary channel; other products always use npm
+ * even if env or a mistaken marker claims `binary`.
+ */
+export function getUpdateInstallMethod(identity: {
+  clientName: string;
+  npmPackage: string;
+}): InstallMethod {
+  const method = getInstallMethod(identity);
+  if (method === "binary" && identity.npmPackage !== BINARY_PRODUCT_CLIENT_NAME) {
+    return "npm";
+  }
+  return method;
+}
+
+/**
+ * Persist install method under `~/.bailian/install-method.<clientName>` (best-effort).
+ * For `bailian-cli`, also write the legacy `install-method` file for older readers.
+ */
+export function writeInstallMethodSync(
+  method: InstallMethod,
+  identity: InstallMethodIdentity = { clientName: BINARY_PRODUCT_CLIENT_NAME },
+): void {
   try {
     const dir = getConfigDir();
     if (!existsSync(dir)) {
       mkdirSync(dir, { recursive: true, mode: 0o700 });
     }
-    writeFileSync(installMethodPath(), `${method}\n`, { mode: 0o600 });
+    writeFileSync(installMethodPath(identity.clientName), `${method}\n`, { mode: 0o600 });
+    if (identity.clientName === BINARY_PRODUCT_CLIENT_NAME) {
+      writeFileSync(installMethodPath(), `${method}\n`, { mode: 0o600 });
+    }
   } catch {
     /* best effort */
   }