oltc-selector 1.1.0 → 1.2.1

package/README.md

@@ -2,7 +2,7 @@
 
 填工况，给出 2025 目录里**最低满足**的型号。网页和 `oltc` CLI 共用同一份 `selectOltc` 引擎。
 
-**CLI（无报价）：** `npm i -g oltc-selector`，命令是 `oltc`。Agent 技能包：`skills/oltc-selector/`（站点 `/agents/` 可下载 zip）。  
+**CLI（无报价）：** `npm i -g oltc-selector`，命令是 `oltc`。Agent 技能包：`skills/huaming-oltc-selector/`（站点 `/agents/` 可下载 zip）。  
 **网页：** [oltc-selector.vercel.app](https://oltc-selector.vercel.app/) · [GitHub Pages](https://erict16.github.io/oltc-selector/)
 
 私人辅助，不是厂家官网。型号是起点，出 OS 前要工程确认。

package/bin/oltc.js

@@ -1543,11 +1543,12 @@ function selectOltc(input) {
         const reasonsZh = [];
         const warningsEn = [];
         const warningsZh = [];
+        const dutyA = input.throughCurrentA >= 100 ? String(Math.round(input.throughCurrentA)) : String(Math.round(input.throughCurrentA * 10) / 10);
         reasonsEn.push(
-          `Minimum-adequate path: ${s.nameEn}, Ium ${current} A \u2265 ${input.throughCurrentA} A, Um ${att.um} kV.`
+          `Minimum-adequate path: ${s.nameEn}, Ium ${current} A \u2265 ${dutyA} A, Um ${att.um} kV.`
         );
         reasonsZh.push(
-          `\u6700\u4F4E\u6EE1\u8DB3\u8DEF\u5F84\uFF1A${s.nameZh}\uFF0CIum ${current} A \u2265 \u9700\u6C42 ${input.throughCurrentA} A\uFF0CUm ${att.um} kV\u3002`
+          `\u6700\u4F4E\u6EE1\u8DB3\u8DEF\u5F84\uFF1A${s.nameZh}\uFF0CIum ${current} A \u2265 \u9700\u6C42 ${dutyA} A\uFF0CUm ${att.um} kV\u3002`
         );
         if (s.structure === "compound" && !octc) {
           reasonsEn.push(
@@ -1757,7 +1758,8 @@ function parseCliArgs(argv) {
     phases: "III",
     json: false,
     help: false,
-    pm: 8
+    pm: 8,
+    given: /* @__PURE__ */ new Set()
   };
   const take = (i, flag) => {
     const v = argv[i + 1];
@@ -1777,62 +1779,73 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--octc") {
+      out.given.add("octc");
       out.octc = true;
       continue;
     }
     if (a === "--oil") {
+      out.given.add("medium");
       out.oil = true;
       out.vacuum = false;
       continue;
     }
     if (a === "--vacuum") {
+      out.given.add("medium");
       out.vacuum = true;
       out.oil = false;
       continue;
     }
     if (a === "--iu" || a === "--imax") {
+      out.given.add("iu");
       const [v, n] = take(i, a);
       out.iu = num(v, a);
       i = n;
       continue;
     }
     if (a === "--mva") {
+      out.given.add("mva");
       const [v, n] = take(i, a);
       out.mva = num(v, a);
       i = n;
       continue;
     }
     if (a === "--kv") {
+      out.given.add("kv");
       const [v, n] = take(i, a);
       out.kv = num(v, a);
       i = n;
       continue;
     }
     if (a === "--um") {
+      out.given.add("um");
       const [v, n] = take(i, a);
       out.um = num(v, a);
       i = n;
       continue;
     }
     if (a === "--ust") {
+      out.given.add("ust");
       const [v, n] = take(i, a);
       out.ust = num(v, a);
       i = n;
       continue;
     }
     if (a === "--step-pct") {
+      out.given.add("stepPct");
       const [v, n] = take(i, a);
       out.stepPct = num(v, a);
       i = n;
       continue;
     }
     if (a === "--k") {
+      out.given.add("k");
       const [v, n] = take(i, a);
       out.k = num(v, a);
       i = n;
       continue;
     }
     if (a === "--conn" || a === "--connection") {
+      out.given.add("conn");
       const [v, n] = take(i, a);
       const c = v.toUpperCase();
       if (c !== "Y" && c !== "D") throw new CliError(`--conn must be Y or D`);
@@ -1841,6 +1854,7 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--reg") {
+      out.given.add("reg");
       const [v, n] = take(i, a);
       const r = v.toUpperCase();
       if (r === "W" || r === "REVERSING") out.reg = "reversing";
@@ -1852,18 +1866,21 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--pm") {
+      out.given.add("pm");
       const [v, n] = take(i, a);
       out.pm = num(v, a);
       i = n;
       continue;
     }
     if (a === "--positions" || a === "--pos") {
+      out.given.add("positions");
       const [v, n] = take(i, a);
       out.positions = num(v, a);
       i = n;
       continue;
     }
     if (a === "--structure") {
+      out.given.add("structure");
       const [v, n] = take(i, a);
       const s = v.toLowerCase();
       const map = {
@@ -1887,6 +1904,7 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--series") {
+      out.given.add("series");
       const [v, n] = take(i, a);
       const r = v.toUpperCase();
       const ok = ["II", "IV", "V", "VI", "VII", "VIII", "AUTO"];
@@ -1898,6 +1916,7 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--mount") {
+      out.given.add("mount");
       const [v, n] = take(i, a);
       const m = v.toLowerCase().replace("_", "-");
       if (m === "in-tank" || m === "intank") out.mount = "in_tank";
@@ -1908,12 +1927,14 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--contact") {
+      out.given.add("contact");
       const [v, n] = take(i, a);
       out.contact = v;
       i = n;
       continue;
     }
     if (a === "--phases") {
+      out.given.add("phases");
       const [v, n] = take(i, a);
       const p = v.toUpperCase();
       if (p !== "I" && p !== "II" && p !== "III") {
@@ -1924,6 +1945,7 @@ function parseCliArgs(argv) {
       continue;
     }
     if (a === "--duty") {
+      out.given.add("octc");
       const [v, n] = take(i, a);
       const d = v.toLowerCase();
       if (d === "octc" || d === "off" || d === "detc") out.octc = true;
@@ -1950,7 +1972,7 @@ Flags:
   --um kV            Equipment Um (OLTC). With --mva/--kv, derived if omitted.
   --ust V            Step voltage. With --mva/--kv/--step-pct, derived if omitted.
   --step-pct %       Step as percent (1.25 means 1.25%). Capacity path only.
-  --k n              Safety factor on capacity path only (default 1.2).
+  --k n              Safety factor on capacity path only (default 1.0, same as the web app).
   --conn Y|D         Switch connection (star / delta). Default Y.
   --reg W|G|0        Reversing / coarse-fine / linear. Default W.
   --pm N             \xB1 steps. Default 8.
@@ -1986,7 +2008,7 @@ function cliToSelectInput(args) {
     const pct = args.stepPct != null && args.stepPct > 0 ? args.stepPct / 100 : 0.0125;
     const minus = args.pm != null && args.pm > 0 ? args.pm : 8;
     const iMax = maxThroughCurrent(rated, minus, pct);
-    const k = args.k != null && args.k > 0 ? args.k : 1.2;
+    const k = args.k != null && args.k > 0 ? args.k : 1;
     iu = iMax * k;
     if (um == null || !(um > 0)) {
       um = oltcUmFromRatedKv(args.kv, args.conn);
@@ -2021,7 +2043,7 @@ function cliToSelectInput(args) {
     input.octcSeries = args.series ?? "auto";
     if (args.contact) input.octcContact = args.contact;
     if (args.positions != null) input.positions = args.positions;
-    else if (args.pm != null && args.pm > 0) {
+    else if (args.given.has("pm") && args.pm != null && args.pm > 0) {
       input.positions = Math.round(2 * args.pm + 1);
     }
   } else if (args.reg === "linear") {
@@ -2035,7 +2057,65 @@ function cliToSelectInput(args) {
   }
   return input;
 }
-function formatCliText(input) {
+var MOUNT_ZH = {
+  in_tank: "\u7BB1\u5185",
+  on_tank: "\u7BB1\u9876",
+  dry_type: "\u5E72\u5F0F",
+  // CLI 不会接收这两种，列上只为 Record 完整性
+  external_compartment: "\u5916\u7F6E\u9694\u5BA4",
+  reactor: "\u7535\u6297\u5668"
+};
+function assumptionsFromArgs(args) {
+  const mark = (key) => args.given.has(key) ? "" : "\uFF08\u9ED8\u8BA4\uFF09";
+  const items = [
+    `conn=${args.conn} ${args.conn === "Y" ? "\u661F\u70B9" : "\u7EBF\u7AEF"}${mark("conn")}`
+  ];
+  if (args.mva != null) {
+    items.push(args.given.has("k") ? `k=${args.k}` : "k=1.0\uFF08\u9ED8\u8BA4\uFF09");
+    items.push(
+      args.given.has("stepPct") ? `step=${args.stepPct}%` : "step=1.25%\uFF08\u9ED8\u8BA4\uFF09"
+    );
+  }
+  const phases = `\u76F8\u6570=${args.phases}${mark("phases")}`;
+  if (args.octc) {
+    if (args.positions != null) {
+      items.push(`${args.positions} \u6863`);
+    } else if (args.given.has("pm") && args.pm != null && args.pm > 0) {
+      items.push(`${Math.round(2 * args.pm + 1)} \u6863\uFF08\u7531 \xB1${args.pm} \u63A8\uFF09`);
+    } else if (!args.given.has("contact")) {
+      items.push("\u6863\u6570\u672A\u6307\u5B9A");
+    }
+    const s = args.series ?? "auto";
+    items.push(
+      s === "auto" ? `\u63A5\u7EBF=\u81EA\u52A8\uFF08${args.conn === "Y" ? "IV" : "II"}\uFF09${mark("series")}` : `\u63A5\u7EBF=${s}${mark("series")}`
+    );
+    items.push(`${MOUNT_ZH[args.mount]}${mark("mount")}`);
+    items.push(phases);
+    return items;
+  }
+  items.push(
+    `reg=${args.reg === "reversing" ? "W \u6B63\u53CD\u8C03" : args.reg === "coarse_fine" ? "G \u7C97\u7EC6\u8C03" : "0 \u7EBF\u6027\u8C03"}${mark("reg")}`
+  );
+  if (args.reg === "linear") {
+    items.push(
+      args.positions != null ? `${args.positions} \u6863${mark("positions")}` : "\u6863\u6570\u672A\u6307\u5B9A"
+    );
+  } else {
+    items.push(`\xB1${args.pm ?? 8} \u6863${mark("pm")}`);
+  }
+  items.push(`${args.oil || !args.vacuum ? "\u6CB9\u6D78" : "\u771F\u7A7A"}${mark("medium")}`);
+  items.push(`${MOUNT_ZH[args.mount]}${mark("mount")}`);
+  items.push(phases);
+  return items;
+}
+function assumptionsLine(args) {
+  const items = assumptionsFromArgs(args);
+  if (items.every((i) => !i.includes("\uFF08\u9ED8\u8BA4\uFF09") && !i.includes("\u672A\u6307\u5B9A"))) {
+    return null;
+  }
+  return `\u5047\u5B9A\uFF1A${items.join(" \xB7 ")}`;
+}
+function formatCliText(input, args) {
   const out = selectOltc(input);
   if (!out.ok || !out.results.length) {
     const err = [...out.errorsZh, ...out.errorsEn].join("\n") || "No type found.";
@@ -2055,9 +2135,16 @@ function formatCliText(input) {
     lines.push("\u5176\u4ED6");
     for (const a of alts) lines.push(a.model);
   }
+  if (args) {
+    const assumed = assumptionsLine(args);
+    if (assumed) {
+      lines.push("");
+      lines.push(assumed);
+    }
+  }
   return lines.join("\n") + "\n";
 }
-function formatCliJson(input) {
+function formatCliJson(input, args) {
   const out = selectOltc(input);
   const primary = out.results[0] ?? null;
   const alts = pickOtherOptions(out.results, 3).map((r) => r.model);
@@ -2066,6 +2153,7 @@ function formatCliJson(input) {
     model: primary?.model ?? null,
     why: primary?.reasonsZh[0] ?? primary?.reasonsEn[0] ?? null,
     alts,
+    assumptions: args ? assumptionsFromArgs(args) : [],
     errors: out.errorsZh.length ? out.errorsZh : out.errorsEn
   };
   return JSON.stringify(payload, null, 2) + "\n";
@@ -2081,7 +2169,7 @@ function runCli(argv, io = {
       return 0;
     }
     const input = cliToSelectInput(args);
-    io.stdout(args.json ? formatCliJson(input) : formatCliText(input));
+    io.stdout(args.json ? formatCliJson(input, args) : formatCliText(input, args));
     return 0;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oltc-selector",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Huaming OLTC/OCTC type selection CLI. No prices. Same engine as the web app.",
   "bin": {
     "oltc": "bin/oltc.js"