@dptech-corp/bohr-cli 2.6.44 → 2.6.47-preview.964

package/CHANGELOG.md

@@ -16,6 +16,16 @@
 
 ## [Unreleased]
 
+## [2.6.45] - 2026-08-24
+
+### Added
+
+- **`bohr config set openapi_host` 支持 UAT 环境**：白名单新增 `https://open.uat.bohrium.com`。
+
+### Fixed
+
+- **companion 扩展生命周期修复**：配套扩展的发现与管理在特定条件下失效，现已修正。
+
 ## [2.6.44] - 2026-08-24
 
 ### Fixed
@@ -23,6 +33,7 @@
 - **`job list`、`job_group list` 与 notebook 六条命令补回机读输出的 `meta.request_id`**：此前重建信封时丢失，出问题无 ID 可追。
 - **不发请求的命令不再编造 `meta.request_id`**：2.6.43 只把字段改可选，六条命令仍在编；dry run 也不再报。
 - **`billing recharge`、`dataset create`、`sandbox template delete` 的机读输出补上 `meta`**：此前完全没有。
+- **配套扩展可完整管理**：CLI 或 npm 安装的 trisol/wenyon 现可被 list/info/verify/pin/remove 识别；remove 需 `--yes`。
 
 
 ## [2.6.43] - 2026-08-23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dptech-corp/bohr-cli",
-  "version": "2.6.44",
+  "version": "2.6.47-preview.964",
   "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.44",
-    "@dptech-corp/bohr-cli-darwin-amd64": "2.6.44",
-    "@dptech-corp/bohr-cli-linux-amd64": "2.6.44",
-    "@dptech-corp/bohr-cli-linux-arm64": "2.6.44",
-    "@dptech-corp/bohr-cli-windows-amd64": "2.6.44",
-    "@dptech-corp/bohr-cli-windows-arm64": "2.6.44"
+    "@dptech-corp/bohr-cli-darwin-amd64": "2.6.47-preview.964",
+    "@dptech-corp/bohr-cli-darwin-arm64": "2.6.47-preview.964",
+    "@dptech-corp/bohr-cli-linux-amd64": "2.6.47-preview.964",
+    "@dptech-corp/bohr-cli-linux-arm64": "2.6.47-preview.964",
+    "@dptech-corp/bohr-cli-windows-amd64": "2.6.47-preview.964",
+    "@dptech-corp/bohr-cli-windows-arm64": "2.6.47-preview.964"
   }
 }

package/postinstall.js

@@ -14,13 +14,73 @@ const os = require("os");
 const crypto = require("crypto");
 
 const WENYON_SERVER = "https://wenyon.dp.tech";
-const INSTALL_DIR = path.join(os.homedir(), ".bohr", "tools", "wenyon", "current");
+const WENYON_ROOT = path.join(os.homedir(), ".bohr", "tools", "wenyon");
+const INSTALL_DIR = path.join(WENYON_ROOT, "current");
 
 // trisol is installed from the trisol manifest protocol (trisol-manifest).
 // BOHR_TRISOL_SERVER / BOHR_TRISOL_CHANNEL let a dev build point at a non-prod
 // env (e.g. https://trisol-dev.dp.tech + channel dev).
 const TRISOL_SERVER = process.env.BOHR_TRISOL_SERVER || "https://trisol.dp.tech";
-const TRISOL_INSTALL_DIR = path.join(os.homedir(), ".bohr", "tools", "trisol", "current");
+const TRISOL_ROOT = path.join(os.homedir(), ".bohr", "tools", "trisol");
+const TRISOL_INSTALL_DIR = path.join(TRISOL_ROOT, "current");
+
+function readPinnedHash(toolRoot) {
+  const manifestPath = path.join(toolRoot, "manifest.yaml");
+  try {
+    const text = fs.readFileSync(manifestPath, "utf8");
+    try {
+      return JSON.parse(text).pinned_hash || "";
+    } catch (_) {
+      const match = text.match(/^pinned_hash:\s*(?:"([^"]*)"|'([^']*)'|(\S*))\s*$/m);
+      return match ? (match[1] || match[2] || match[3] || "") : "";
+    }
+  } catch (_) {
+    return "";
+  }
+}
+
+function writeManagedManifest(toolRoot, { name, version, executable, sha256, pinnedHash = "" }) {
+  const manifest = {
+    name,
+    version: version || "",
+    description: "Managed companion CLI installed by bohr",
+    binary: path.join("current", executable),
+    scopes: [],
+    trust: "community",
+    billing: "none",
+    signature: "",
+    public_key: "",
+    sha256,
+    pinned_hash: pinnedHash,
+  };
+  fs.mkdirSync(toolRoot, { recursive: true });
+  const manifestPath = path.join(toolRoot, "manifest.yaml");
+  const temporaryPath = `${manifestPath}.${process.pid}.tmp`;
+  fs.writeFileSync(temporaryPath, `${JSON.stringify(manifest, null, 2)}\n`, { mode: 0o600 });
+  try {
+    try {
+      fs.renameSync(temporaryPath, manifestPath);
+    } catch (error) {
+      if (process.platform !== "win32" || !["EEXIST", "EPERM"].includes(error.code)) {
+        throw error;
+      }
+      fs.rmSync(manifestPath, { force: true });
+      fs.renameSync(temporaryPath, manifestPath);
+    }
+  } finally {
+    fs.rmSync(temporaryPath, { force: true });
+  }
+}
+
+function hashFile(filePath) {
+  return new Promise((resolve, reject) => {
+    const hash = crypto.createHash("sha256");
+    const input = fs.createReadStream(filePath);
+    input.on("data", (chunk) => hash.update(chunk));
+    input.on("end", () => resolve(hash.digest("hex")));
+    input.on("error", reject);
+  });
+}
 
 function getPlatform() {
   const p = os.platform();
@@ -113,29 +173,39 @@ async function installTrisol() {
   const ext = osName === "windows" ? ".exe" : "";
   const destPath = path.join(TRISOL_INSTALL_DIR, `trisol${ext}`);
 
-  // Skip re-download when the installed binary already matches this version.
+  let expectedHash;
+  try {
+    const buf = await get(shaURL);
+    expectedHash = buf.toString().trim().split(/\s+/)[0];
+  } catch (e) {
+    console.error(`[postinstall] trisol: could not fetch sha256 (${e.message}), skipping`);
+    return;
+  }
+
+  // Retain an existing binary only when both its reported version and its
+  // publisher-provided hash match. This also repairs metadata omitted by older
+  // postinstall versions without treating the local file as its own authority.
   if (fs.existsSync(destPath)) {
     try {
       const { execFileSync } = require("child_process");
       const out = execFileSync(destPath, ["version"], { encoding: "utf8", timeout: 5000 });
-      if (out.includes(version)) {
+      const localHash = await hashFile(destPath);
+      if (out.includes(version) && localHash === expectedHash) {
+        writeManagedManifest(TRISOL_ROOT, {
+          name: "trisol",
+          version,
+          executable: `trisol${ext}`,
+          sha256: localHash,
+          pinnedHash: readPinnedHash(TRISOL_ROOT),
+        });
         console.log(`[postinstall] trisol ${version} already installed`);
         return;
       }
     } catch (_) {
-      // version check failed, proceed with install
+      // version/hash check failed, proceed with install
     }
   }
 
-  let expectedHash;
-  try {
-    const buf = await get(shaURL);
-    expectedHash = buf.toString().trim().split(/\s+/)[0];
-  } catch (e) {
-    console.error(`[postinstall] trisol: could not fetch sha256 (${e.message}), skipping`);
-    return;
-  }
-
   console.log(`[postinstall] Installing trisol ${version} (${platform}, variant=bohrium)...`);
   fs.mkdirSync(TRISOL_INSTALL_DIR, { recursive: true });
   const tmpPath = destPath + ".tmp";
@@ -148,6 +218,12 @@ async function installTrisol() {
     }
     fs.chmodSync(tmpPath, 0o755);
     fs.renameSync(tmpPath, destPath);
+    writeManagedManifest(TRISOL_ROOT, {
+      name: "trisol",
+      version,
+      executable: `trisol${ext}`,
+      sha256: actualHash,
+    });
     console.log(`[postinstall] trisol ${version} installed to ${destPath}`);
   } catch (e) {
     try { fs.unlinkSync(tmpPath); } catch (_) {}
@@ -185,7 +261,15 @@ async function main() {
     try {
       const { execFileSync } = require("child_process");
       const out = execFileSync(destPath, ["version"], { encoding: "utf8", timeout: 5000 });
-      if (out.includes(meta.version)) {
+      const localHash = await hashFile(destPath);
+      if (out.includes(meta.version) && (!meta.sha256 || localHash === meta.sha256)) {
+        writeManagedManifest(WENYON_ROOT, {
+          name: "wenyon",
+          version: meta.version,
+          executable: `wenyon-cli${ext}`,
+          sha256: localHash,
+          pinnedHash: readPinnedHash(WENYON_ROOT),
+        });
         console.log(`[postinstall] wenyon-cli ${meta.version} already installed`);
         return;
       }
@@ -210,6 +294,12 @@ async function main() {
 
     fs.chmodSync(tmpPath, 0o755);
     fs.renameSync(tmpPath, destPath);
+    writeManagedManifest(WENYON_ROOT, {
+      name: "wenyon",
+      version: meta.version,
+      executable: `wenyon-cli${ext}`,
+      sha256: actualHash,
+    });
     console.log(`[postinstall] wenyon-cli ${meta.version || ""} installed to ${destPath}`);
   } catch (e) {
     try { fs.unlinkSync(tmpPath); } catch (_) {}
@@ -217,7 +307,11 @@ async function main() {
   }
 }
 
-main().catch((e) => {
-  // postinstall failures must not break npm install
-  console.error(`[postinstall] wenyon-cli: ${e.message}`);
-});
+if (require.main === module) {
+  main().catch((e) => {
+    // postinstall failures must not break npm install
+    console.error(`[postinstall] wenyon-cli: ${e.message}`);
+  });
+}
+
+module.exports = { readPinnedHash, writeManagedManifest };