u1s1-cli 0.19.2 → 0.19.4

package/dist/agent-setup.d.ts

@@ -26,6 +26,14 @@ export declare function writeWebToolsExtension(cfg: CliConfig, features: {
     webFetchRender: boolean;
     imageGen: boolean;
 }): void;
+/**
+ * 生成「OpenRouter 应用归因」扩展到 <agentDir>/extensions/u1s1-attribution.js。
+ * 用户自己配 OPENROUTER_API_KEY 直连时，pi 内置的归因头归到 pi.dev 名下（且受遥测
+ * 开关控制）；这里用 before_provider_headers 钩子覆盖为 u1s1，让这部分流量也计入
+ * u1s1 的 OpenRouter 公开排行与数据分析（openrouter.ai/docs/app-attribution）。
+ * 只在请求目标确认为 OpenRouter 时才改头，其它供应商不加多余头。
+ */
+export declare function writeAttributionExtension(): void;
 /**
  * 生成「精简 UI」扩展到 <agentDir>/extensions/u1s1-compact-ui.js：
  * - 隐藏内置工具调用（read/bash/edit/write/grep/find/ls），出错才显示一行；ctrl+o 可展开

package/dist/agent-setup.js

@@ -162,6 +162,27 @@ export function writeWebToolsExtension(cfg, features) {
         subagentBlock +
         `}\n`);
 }
+/**
+ * 生成「OpenRouter 应用归因」扩展到 <agentDir>/extensions/u1s1-attribution.js。
+ * 用户自己配 OPENROUTER_API_KEY 直连时，pi 内置的归因头归到 pi.dev 名下（且受遥测
+ * 开关控制）；这里用 before_provider_headers 钩子覆盖为 u1s1，让这部分流量也计入
+ * u1s1 的 OpenRouter 公开排行与数据分析（openrouter.ai/docs/app-attribution）。
+ * 只在请求目标确认为 OpenRouter 时才改头，其它供应商不加多余头。
+ */
+export function writeAttributionExtension() {
+    const dir = join(agentDir, "extensions");
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(join(dir, "u1s1-attribution.js"), `// 由 u1s1 每次启动自动生成，请勿手改\n` +
+        `export default async function (pi) {\n` +
+        `  pi.on("before_provider_headers", (event, ctx) => {\n` +
+        `    const m = ctx.model;\n` +
+        `    if (!m || !(m.provider === "openrouter" || String(m.baseUrl ?? "").includes("openrouter.ai"))) return;\n` +
+        `    event.headers["HTTP-Referer"] = "https://u1s1.io";\n` +
+        `    event.headers["X-OpenRouter-Title"] = "u1s1";\n` +
+        `    event.headers["X-OpenRouter-Categories"] = "cli-agent";\n` +
+        `  });\n` +
+        `}\n`);
+}
 /**
  * 生成「精简 UI」扩展到 <agentDir>/extensions/u1s1-compact-ui.js：
  * - 隐藏内置工具调用（read/bash/edit/write/grep/find/ls），出错才显示一行；ctrl+o 可展开

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { execSync, spawnSync } from "node:child_process";
 import { writeFileSync } from "node:fs";
-import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, ensureWorkflowPromptTemplate, scrubForeignProviderEnv, toProviderModels, writeCompactUiExtension, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, ensureWorkflowPromptTemplate, scrubForeignProviderEnv, toProviderModels, writeAttributionExtension, writeCompactUiExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
 import { agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
 import { registerLoopCommand } from "./loop.js";
@@ -175,6 +175,8 @@ async function runAgent(cfg, args) {
     });
     // 精简 UI：隐藏工具调用 + 汇总行 + 隐藏思考标签（同样投影到 agentDir/extensions）
     writeCompactUiExtension();
+    // OpenRouter 应用归因：直连流量计入 u1s1 的公开排行
+    writeAttributionExtension();
     ensureTmuxKeyboardProtocol();
     // must be set before pi reads them (getAgentDir() reads at call time, env at import is fine too)
     process.env["PI_CODING_AGENT_DIR"] = agentDir;

package/dist/usage.js

@@ -46,11 +46,28 @@ export async function usage() {
         };
         if (me.packages.length === 0)
             console.log("  用量包     (无生效中的用量包)");
+        // 同种类、同范围、同有效期的包合并成一条展示(比如邀请多个好友拿到的多份邀请赠送)
+        const groups = new Map();
         for (const p of me.packages) {
+            const key = `${p.kind}|${p.scope}|${p.daily_tokens != null}|${p.expires_at || ""}`;
+            const g = groups.get(key);
+            // 可空字段求和:两边都是 null 就保持 null,别把「一次性包没有日额度」污染成 0
+            const sumOpt = (a, b) => (a == null && b == null ? null : (a ?? 0) + (b ?? 0));
+            if (g) {
+                g.count += 1;
+                g.daily_tokens = sumOpt(g.daily_tokens, p.daily_tokens);
+                g.total_tokens = sumOpt(g.total_tokens, p.total_tokens);
+                g.remaining += p.remaining;
+            }
+            else {
+                groups.set(key, { ...p, count: 1 });
+            }
+        }
+        for (const p of groups.values()) {
             const daily = p.daily_tokens != null;
             const total = daily ? (p.daily_tokens ?? 0) : (p.total_tokens ?? 0);
             const ratio = total > 0 ? p.remaining / total : 0;
-            const label = (PKG_LABEL[p.kind] ?? p.kind).padEnd(5, "　");
+            const label = ((PKG_LABEL[p.kind] ?? p.kind) + (p.count > 1 ? ` ×${p.count}` : "")).padEnd(5, "　");
             const per = daily ? "/天" : "";
             console.log(`  ${label} 还剩 ${fmtTokensCn(p.remaining)} / ${fmtTokensCn(total)}${per}  ${bar(ratio)}`);
             const scopeNote = p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";

package/dist/web.js

@@ -2,7 +2,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
-import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
@@ -58,6 +58,8 @@ export async function prepareWebEnv(cfg) {
         webFetchRender: webFetchRenderEnabled,
         imageGen: imageGenEnabled,
     });
+    // OpenRouter 应用归因：直连流量计入 u1s1 的公开排行（与 TUI 同源）
+    writeAttributionExtension();
     // 网页版新会话从 settings.json 的 defaultModel 取模型(TUI 是每次传 --model),
     // 确保它有值;resolvePreferredModel 优先尊重已有的 in-session 选择,不会回退覆盖。
     const pref = resolvePreferredModel(cfg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.19.2",
+  "version": "0.19.4",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -43,8 +43,8 @@
   "license": "MIT",
   "homepage": "https://u1s1.io",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.2",
-    "@earendil-works/pi-tui": "0.84.2",
+    "@earendil-works/pi-coding-agent": "0.84.3",
+    "@earendil-works/pi-tui": "0.84.3",
     "typebox": "1.3.7"
   },
   "optionalDependencies": {