u1s1-cli 1.11.0 → 1.11.1

package/dist/bench.js

@@ -82,6 +82,24 @@ function listSuites() {
     return suites;
 }
 // ─── 模型调用 ───
+function asRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function tokenCount(value) {
+    return typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0;
+}
+/** 只认 OpenAI 兼容形状:choices[0].message.content 与 usage.prompt/completion_tokens,缺哪项哪项归零。 */
+function parseChatCompletion(value) {
+    const data = asRecord(value);
+    const choices = Array.isArray(data?.choices) ? data.choices : [];
+    const message = asRecord(asRecord(choices[0])?.message);
+    const usage = asRecord(data?.usage);
+    return {
+        response: typeof message?.content === "string" ? message.content : "",
+        tokensIn: tokenCount(usage?.prompt_tokens),
+        tokensOut: tokenCount(usage?.completion_tokens),
+    };
+}
 async function callModel(input) {
     const { baseUrl, apiKey, modelId, prompt, officialCfg } = input;
     const start = performance.now();
@@ -111,30 +129,7 @@ async function callModel(input) {
             const errBody = await readResponseTextCapped(res, 64 * 1024).catch(() => "未知错误");
             return { response: "", latencyMs, tokensIn: 0, tokensOut: 0, error: `HTTP ${res.status}: ${errBody.slice(0, 200)}` };
         }
-        const value = await readJsonResponseCapped(res);
-        const data = value && typeof value === "object" && !Array.isArray(value)
-            ? value
-            : null;
-        const choices = Array.isArray(data?.choices) ? data.choices : [];
-        const firstChoice = choices[0] && typeof choices[0] === "object" && !Array.isArray(choices[0])
-            ? choices[0]
-            : null;
-        const message = firstChoice?.message && typeof firstChoice.message === "object" && !Array.isArray(firstChoice.message)
-            ? firstChoice.message
-            : null;
-        const usage = data?.usage && typeof data.usage === "object" && !Array.isArray(data.usage)
-            ? data.usage
-            : null;
-        return {
-            response: typeof message?.content === "string" ? message.content : "",
-            latencyMs,
-            tokensIn: typeof usage?.prompt_tokens === "number" && Number.isFinite(usage.prompt_tokens)
-                ? Math.max(0, usage.prompt_tokens)
-                : 0,
-            tokensOut: typeof usage?.completion_tokens === "number" && Number.isFinite(usage.completion_tokens)
-                ? Math.max(0, usage.completion_tokens)
-                : 0,
-        };
+        return { ...parseChatCompletion(await readJsonResponseCapped(res)), latencyMs };
     }
     catch (e) {
         const latencyMs = Math.round(performance.now() - start);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {

package/scripts/patch-pi.js

@@ -391,23 +391,31 @@ const TUI_TEXT_TARGETS = [
   [["modes", "interactive", "components", "settings-selector.js"], SETTINGS_REPLACEMENTS, "设置菜单"],
 ];
 
+/**
+ * 逐条套文案替换规则:已替换过的算应用成功(幂等),出现次数与预期不符的跳过
+ * (pi 升级后上下文变了,宁可不改也不误改)。
+ */
+function applyTextRules(text, rules) {
+  let applied = 0;
+  for (const rule of rules) {
+    const { from, to, expected } = Array.isArray(rule) ? { from: rule[0], to: rule[1], expected: 1 } : rule;
+    if (text.includes(to)) {
+      applied++;
+      continue;
+    }
+    if (text.split(from).length !== expected + 1) continue;
+    text = text.split(from).join(to);
+    applied++;
+  }
+  return { text, applied };
+}
+
 function patchTuiText() {
   for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
     for (const [parts, rules, label] of TUI_TEXT_TARGETS) {
       const target = join(piDir, "dist", ...parts);
       try {
-        let text = readFileSync(target, "utf8");
-        let applied = 0;
-        for (const rule of rules) {
-          const { from, to, expected } = Array.isArray(rule) ? { from: rule[0], to: rule[1], expected: 1 } : rule;
-          if (text.includes(to)) {
-            applied++;
-            continue;
-          }
-          if (text.split(from).length !== expected + 1) continue;
-          text = text.split(from).join(to);
-          applied++;
-        }
+        const { text, applied } = applyTextRules(readFileSync(target, "utf8"), rules);
         if (applied < rules.length) {
           console.log(
             `[u1s1] 提示: pi 版本可能已更新，${label}汉化补丁只应用了 ${applied}/${rules.length} 处（不影响使用）`,