@pab-iprg/huohuo 1.0.0-preview.1 → 1.0.0-preview.2

package/cli.js

@@ -457,10 +457,6 @@ function evaluateResources(sample, policy, costs, phase) {
     blocked = true;
     reasons.push("\u7CFB\u7EDF\u5185\u5B58\u538B\u529B\u4E25\u91CD");
   }
-  if (sample.pressure === "high" || sample.pressure === "unknown") {
-    limited = true;
-    reasons.push(sample.pressure === "high" ? "\u7CFB\u7EDF\u5185\u5B58\u538B\u529B\u504F\u9AD8" : "\u538B\u529B\u4FE1\u53F7\u7F3A\u5931\uFF0C\u4FDD\u5B88\u8FD0\u884C");
-  }
   const disks = diskBudgets(sample, costs, policy.diskReserveBytes);
   for (const disk of disks) {
     if (disk.availableBytes === null) {
@@ -468,9 +464,16 @@ function evaluateResources(sample, policy, costs, phase) {
       reasons.push(`\u6587\u4EF6\u7CFB\u7EDF\u53EF\u7528\u7A7A\u95F4\u672A\u77E5\uFF1A${disk.device}`);
     } else if (disk.availableBytes < disk.requiredBytes) {
       blocked = true;
-      reasons.push(`\u6587\u4EF6\u7CFB\u7EDF\u7A7A\u95F4\u4E0D\u8DB3\uFF1A\u53EF\u7528 ${disk.availableBytes} \u5B57\u8282\uFF0C\u9700\u8981 ${disk.requiredBytes} \u5B57\u8282`);
+      const available = (disk.availableBytes / 1e9).toFixed(2);
+      const required = (disk.requiredBytes / 1e9).toFixed(2);
+      const missing = (Math.ceil((disk.requiredBytes - disk.availableBytes) / 1e7) / 100).toFixed(2);
+      reasons.push(`\u78C1\u76D8\u7A7A\u95F4\u4E0D\u8DB3\uFF1A\u5269\u4F59 ${available} GB\uFF0C\u9700\u8981 ${required} GB\u3002\u8BF7\u81F3\u5C11\u518D\u817E\u51FA ${missing} GB\u3002`);
     }
   }
+  if (sample.pressure === "high" || sample.pressure === "unknown") {
+    limited = true;
+    reasons.push(sample.pressure === "high" ? "\u5F53\u524D\u5185\u5B58\u6BD4\u8F83\u7D27\u5F20\uFF0C\u53EF\u4EE5\u5148\u5173\u95ED\u6682\u65F6\u4E0D\u7528\u7684\u5E94\u7528\u3002" : "\u6682\u65F6\u65E0\u6CD5\u786E\u8BA4\u5185\u5B58\u538B\u529B\u3002");
+  }
   const status = blocked ? "blocked" : unknown ? "unknown" : limited ? "limited" : "pass";
   return { status, reasons, disks, sample, policy, concurrency: status === "pass" ? Math.min(1, availableParallelism()) : 0 };
 }
@@ -656,7 +659,12 @@ async function install(home, candidate, hooks = {}, programsOnly = false) {
       }
       const result = evaluateResources(observation, release.budget, costs, "install");
       await atomicJSON(join3(home, "state/resources.json"), result);
-      if (result.status === "unknown" || result.status === "blocked") throw Object.assign(new Error(result.reasons.join("\uFF1B")), { code: "RESOURCE_BLOCKED" });
+      if (result.status === "unknown" || result.status === "blocked") {
+        const details = result.reasons.map((reason) => `- ${reason}`).join("\n");
+        throw Object.assign(new Error(`\u706B\u706B\u6682\u65F6\u65E0\u6CD5\u7EE7\u7EED\u5B89\u88C5\u3002
+${details}
+\u5904\u7406\u540E\uFF0C\u91CD\u65B0\u8FD0\u884C\u521A\u624D\u7684\u5B89\u88C5\u547D\u4EE4\u3002`), { code: "RESOURCE_BLOCKED" });
+      }
     };
     const stage = async (name, action) => {
       hooks.progress?.(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pab-iprg/huohuo",
-  "version": "1.0.0-preview.1",
+  "version": "1.0.0-preview.2",
   "type": "module",
   "description": "火火投研伙伴安装入口",
   "bin": {

package/release.json

@@ -13,11 +13,11 @@
   "runtime": {
     "name": "@huohuo/research-agent",
     "version": "1.0.0",
-    "url": "https://bundled.invalid/3357844499b0a3ee1e273eccc4ce7c4afde2d354a9ff4f473720e7875cdbabf7.tgz",
-    "sha256": "3357844499b0a3ee1e273eccc4ce7c4afde2d354a9ff4f473720e7875cdbabf7",
-    "integrity": "sha512-Yzy/15UCnJiyFjL5gnGFS5ro0Orkd155EFGs2YTLtY37mo/nxnfkRrLPMsdh4aABEfCS0Dpu6ve+MKqkiyh5qQ==",
-    "downloadBytes": 2542280,
-    "expandedBytes": 8237016,
+    "url": "https://bundled.invalid/3126256d1e3ad445b74f67e0a97a339774bc23cdcc5249578f1c9e1b7f3d8f6d.tgz",
+    "sha256": "3126256d1e3ad445b74f67e0a97a339774bc23cdcc5249578f1c9e1b7f3d8f6d",
+    "integrity": "sha512-KmCItvQmE0LZbNiKdrWeYsUCD4p4YaBfiS+OOwsepOix03nON46tgpFgOeT/effrEWzPROmuwI64IU8g4loTYw==",
+    "downloadBytes": 2542537,
+    "expandedBytes": 8237483,
     "bundled": true
   },
   "python": {