@dptech-corp/bohr-cli 2.6.103 → 2.7.1

package/CHANGELOG.md

@@ -22,6 +22,59 @@
 
 ## [Unreleased]
 
+## [2.7.1] - 2026-09-19
+
+### Changed
+
+- **中断后的退出码**：自行处理中断的命令（如 structure search 下载）被 Ctrl-C 后返回自身的退出码，不再是 130；未处理中断的命令不变。
+
+### Fixed
+
+- **只停启动器也能停下 CLI**：`timeout`、Agent 框架超时只给 `bohr` 进程发信号时，CLI 不再成为孤儿继续运行、占着输出，而是照常处理中断后退出。
+- **结构下载被挂断时不留临时文件**：关掉终端或收到 SIGHUP 时，`structure search --download` 同样清理临时文件并报下载已取消。
+
+## [2.7.0] - 2026-09-18
+
+### Breaking
+
+- **`bohr file list -o json` 改为标准列表**：`objects` 改名 `items`，翻页改读 `pagination.has_more`、`next_token`。
+- **`sandbox`/`batchjob machine list -o json` 合成一张表**：`cpu`、`gpu` 并入 `items`，按每行新增的 `class` 区分。
+- **`bohr project list -o json` 去掉顶层 `totalPage`**：判断有无下一页改读 `data.pagination.has_more`。
+- **移除 15 条已过公示期的弃用项**（3 条命令、11 处 flag 旧名、`-o pretty`）：此前带告警仍可用，现在直接报错；改法见下表。
+
+本版移除下列已过公示期的弃用项。旧名 → 新名的映射只在这里，运行时的报错不会说新名字。
+
+**命令**
+
+| 移除 | 改用 |
+|-|-|
+| `bohr database list` | `bohr database polymer list` |
+| `bohr mentor` | `bohr agents mentor` |
+| `bohr sandbox image` | `bohr image` |
+
+**flag 与格式常量**
+
+| 移除 | 改用 |
+|-|-|
+| `--space` （bohr file list） | pass the space as a path prefix instead: --space personal with <path> becomes personal/<path>, and --space share becomes share/<path> |
+| `--space` （bohr file upload） | pass the space as a path prefix instead: --space personal with <path> becomes personal/<path>, and --space share becomes share/<path> |
+| `--projectId` （bohr dataset list） | `--project-id` |
+| `--project_id` （bohr job submit） | `--project-id` |
+| `--project_id` （bohr job_group create） | `--project-id` |
+| `--projectId` （bohr job_group list） | `--project-id` |
+| `--project_id` （bohr node create） | `--project-id` |
+| `--project_id` （bohr project delete） | `--project-id` |
+| `--datasetId` （bohr dataset delete） | `--dataset-id` |
+| `--imageId` （bohr image delete） | `--image-id` |
+| `--chooseType` （bohr machine list） | `--choose-type` |
+| `-o pretty` | `-o json` |
+
+- **`bohr file upload` 的远端路径须带 `personal/` 或 `share/` 前缀**：此前无前缀会被补全并告警，现在报 `VALIDATION_FAILED`。
+
+### Added
+
+- **`bohr file list --next-token`**：把上一页的 `data.pagination.next_token` 传回来取下一页；人读输出在还有下一页时直接给出这条命令。
+
 ## [2.6.103] - 2026-09-18
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dptech-corp/bohr-cli",
-  "version": "2.6.103",
+  "version": "2.7.1",
   "description": "CLI tool for Bohrium scientific computing platform",
   "bin": {
     "bohr": "run.js"
@@ -32,11 +32,11 @@
     "CHANGELOG.md"
   ],
   "optionalDependencies": {
-    "@dptech-corp/bohr-cli-darwin-arm64": "2.6.103",
-    "@dptech-corp/bohr-cli-darwin-amd64": "2.6.103",
-    "@dptech-corp/bohr-cli-linux-amd64": "2.6.103",
-    "@dptech-corp/bohr-cli-linux-arm64": "2.6.103",
-    "@dptech-corp/bohr-cli-windows-amd64": "2.6.103",
-    "@dptech-corp/bohr-cli-windows-arm64": "2.6.103"
+    "@dptech-corp/bohr-cli-darwin-arm64": "2.7.1",
+    "@dptech-corp/bohr-cli-darwin-amd64": "2.7.1",
+    "@dptech-corp/bohr-cli-linux-amd64": "2.7.1",
+    "@dptech-corp/bohr-cli-linux-arm64": "2.7.1",
+    "@dptech-corp/bohr-cli-windows-amd64": "2.7.1",
+    "@dptech-corp/bohr-cli-windows-arm64": "2.7.1"
   }
 }

package/run.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { execFileSync } = require("child_process");
+const { spawn } = require("child_process");
 const path = require("path");
 const os = require("os");
 
@@ -66,18 +66,58 @@ try {
   );
 }
 
-try {
-  execFileSync(binaryPath, process.argv.slice(2), { stdio: "inherit" });
-} catch (e) {
-  // e.status is null when the child was killed by a signal; exiting 1 there
-  // would report an ordinary failure for a SIGINT. Exit codes are how the
-  // billing gate (10) and every other envelope code reach the caller, so this
-  // must pass through untouched when there is one.
-  if (typeof e.status === "number") {
-    process.exit(e.status);
-  }
-  if (e.signal) {
-    process.exit(128 + (os.constants.signals[e.signal] || 0));
+// Signals sent to this launcher must reach the binary. A caller that stops bohr
+// by pid — `timeout`, Python's Popen.terminate(), an agent framework's step
+// timeout — only ever signals this process. It used to run the binary with
+// execFileSync, which blocks the event loop, so node took the default action and
+// died on the spot while the binary kept running as an orphan, still holding the
+// caller's stdout. The caller then waited on a pipe nothing would close.
+//
+// A terminal Ctrl-C reaches both processes (same process group), so the binary
+// sees SIGINT twice. That is the usual trade-off of a forwarding launcher
+// (internal/toolproxy/exec.go makes the same one): a command without a SIGINT
+// handler is already gone when the copy arrives, and a command with one keeps
+// catching until it has written its envelope, so the copy is absorbed.
+//
+// Windows is left alone. Console Ctrl-C already reaches every process on the
+// console, and child.kill() there is TerminateProcess, which would cut off the
+// binary's own cancellation handling. Listening is still worth it: node then
+// waits for the binary instead of exiting first and handing the prompt back
+// while it is still writing.
+const FORWARDED_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+const forward = platform !== "win32";
+
+const child = spawn(binaryPath, process.argv.slice(2), { stdio: "inherit" });
+
+const listeners = new Map();
+for (const signal of FORWARDED_SIGNALS) {
+  const listener = () => {
+    if (forward) child.kill(signal);
+  };
+  listeners.set(signal, listener);
+  process.on(signal, listener);
+}
+
+child.on("error", () => {
+  // Only a spawn failure (missing binary, no exec bit) ends up here with no
+  // pid; execFileSync reported those as a bare exit 1 and so does this. A
+  // failed kill also emits "error", but the binary is still running then and
+  // "exit" will follow.
+  if (child.pid === undefined) process.exit(1);
+});
+
+child.on("exit", (code, signal) => {
+  // Exit codes are how the billing gate (10) and every other envelope code
+  // reach the caller, so they pass through untouched.
+  if (typeof code === "number") process.exit(code);
+  for (const [name, listener] of listeners) process.removeListener(name, listener);
+  if (signal) {
+    // Die of the same signal instead of exiting 128+n: a shell script only
+    // stops at a Ctrl-C when the process it waited on was killed by SIGINT; an
+    // ordinary exit 130 means "handled it", and the script carries on. The
+    // exit after it is only the fallback for a signal that does not end us.
+    process.kill(process.pid, signal);
+    process.exit(128 + (os.constants.signals[signal] || 0));
   }
   process.exit(1);
-}
+});