u1s1-cli 1.4.0 → 1.4.1

package/dist/agent-setup.d.ts

@@ -41,6 +41,14 @@ export declare function writeWebToolsExtension(cfg: CliConfig, features: {
  * 宁可回到原始错误文本,也不能让扩展报错刷英文堆栈。
  */
 export declare function writeErrorHumanizeExtension(): void;
+/**
+ * 生成「会话内公告触达」扩展到 <agentDir>/extensions/u1s1-announcements.js:
+ * 启动横幅只渲染一次公告,维护窗口里挂着会话的用户只会撞裸错误(审计 F14)。
+ * 轮询逻辑在 announcements-poll.ts(5 分钟一次、首拉只建基线不打扰);
+ * 公告变化时 appendEntry 进会话 + 尽力弹 notify。TUI 和 Desktop App 共用。
+ * print/json 一次性模式不起轮询;import 失败静默跳过(同 error-humanize)。
+ */
+export declare function writeAnnouncementsExtension(): void;
 /**
  * 生成「OpenRouter 应用归因」扩展到 <agentDir>/extensions/u1s1-attribution.js。
  * 用户自己配 OPENROUTER_API_KEY 直连时，pi 内置的归因头归到 pi.dev 名下（且受遥测
@@ -71,7 +79,7 @@ export declare function toProviderModels(models: ModelDef[]): {
     reasoning: boolean;
     thinkingLevelMap?: Partial<Record<ThinkingLevel, string | null>>;
     input: ("text" | "image")[];
-    cost: ModelDef["cost"];
+    cost: NonNullable<ModelDef["cost"]>;
     contextWindow: number;
     maxTokens: number;
     compat?: {

package/dist/agent-setup.js

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
-import { agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, endpointKeyEnvName, MODELS, PROVIDER_ID, VERSION, } from "./config.js";
+import { agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, endpointKeyEnvName, MODELS, PROVIDER_ID, UNKNOWN_MODEL_COST, VERSION, } from "./config.js";
 const BRAND_APPEND = `## u1s1
 
 You are u1s1 — a plain-spoken AI coding buddy for programming beginners. Most users are unfamiliar with jargon:
@@ -264,6 +264,49 @@ export function writeErrorHumanizeExtension() {
         `  });\n` +
         `}\n`);
 }
+/**
+ * 生成「会话内公告触达」扩展到 <agentDir>/extensions/u1s1-announcements.js:
+ * 启动横幅只渲染一次公告,维护窗口里挂着会话的用户只会撞裸错误(审计 F14)。
+ * 轮询逻辑在 announcements-poll.ts(5 分钟一次、首拉只建基线不打扰);
+ * 公告变化时 appendEntry 进会话 + 尽力弹 notify。TUI 和 Desktop App 共用。
+ * print/json 一次性模式不起轮询;import 失败静默跳过(同 error-humanize)。
+ */
+export function writeAnnouncementsExtension() {
+    const dir = join(agentDir, "extensions");
+    mkdirSync(dir, { recursive: true });
+    const url = new URL("./announcements-poll.js", import.meta.url).href;
+    writeFileSync(join(dir, "u1s1-announcements.js"), `// 由 u1s1 每次启动自动生成,请勿手改\n` +
+        `export default async function (pi) {\n` +
+        `  let startAnnouncementPoll;\n` +
+        `  try {\n` +
+        `    startAnnouncementPoll = (await import(${JSON.stringify(url)})).startAnnouncementPoll;\n` +
+        `  } catch {\n` +
+        `    return;\n` +
+        `  }\n` +
+        `  const { Text } = await import("@earendil-works/pi-tui");\n` +
+        `  pi.registerEntryRenderer("u1s1-announcement", (entry, _opts, theme) => {\n` +
+        `    const d = entry.data ?? {};\n` +
+        `    let text = theme.fg("text", theme.bold("📢 " + String(d.text ?? "")));\n` +
+        `    if (d.url) text += "\\n" + theme.fg("dim", String(d.url));\n` +
+        `    return new Text(text, 1, 0);\n` +
+        `  });\n` +
+        `  let ui;\n` +
+        `  let started = false;\n` +
+        `  pi.on("session_start", (_event, ctx) => {\n` +
+        `    if (ctx.hasUI) ui = ctx.ui;\n` +
+        `    if (started || ctx.mode === "print" || ctx.mode === "json") return;\n` +
+        `    started = true;\n` +
+        `    startAnnouncementPoll({\n` +
+        `      onNew: (a) => {\n` +
+        `        pi.appendEntry("u1s1-announcement", { text: a.text, url: a.url });\n` +
+        `        try {\n` +
+        `          ui?.notify("📢 " + a.text, "info");\n` +
+        `        } catch {}\n` +
+        `      },\n` +
+        `    });\n` +
+        `  });\n` +
+        `}\n`);
+}
 /**
  * 生成「OpenRouter 应用归因」扩展到 <agentDir>/extensions/u1s1-attribution.js。
  * 用户自己配 OPENROUTER_API_KEY 直连时，pi 内置的归因头归到 pi.dev 名下（且受遥测
@@ -438,7 +481,7 @@ export function toProviderModels(models) {
             reasoning: m.reasoning,
             thinkingLevelMap,
             input: m.vision ? ["text", "image"] : ["text"],
-            cost: m.cost,
+            cost: m.cost ?? UNKNOWN_MODEL_COST,
             contextWindow: m.contextWindow,
             maxTokens: m.maxTokens,
             compat,

package/dist/announcements-poll.d.ts

@@ -0,0 +1,22 @@
+import { type ApiAnnouncement } from "./api.js";
+/**
+ * 会话内公告轮询(审计 F14):启动横幅只渲染一次公告,维护窗口里挂着
+ * 会话的用户只会撞裸错误。这里每 5 分钟带凭证拉一次模型列表(与启动同一
+ * 接口,公告随响应捎回,服务端零新增开销),公告发生变化时推进会话。
+ *
+ * 首次成功拉取只做基线、不打扰——启动横幅已经展示过当前公告;之后
+ * 「出现新公告」或「公告内容变化」才触发 onNew。公告被清空不提示。
+ */
+export declare const ANNOUNCEMENT_POLL_INTERVAL_MS: number;
+export declare function announcementKey(a?: ApiAnnouncement | null): string;
+/** 基线跟踪器:observe 返回「需要通知的新公告」,否则 undefined。 */
+export declare function createAnnouncementTracker(): {
+    observe(a: ApiAnnouncement | null | undefined): ApiAnnouncement | undefined;
+};
+export declare function startAnnouncementPoll(deps: {
+    onNew: (a: ApiAnnouncement) => void;
+    fetch?: () => Promise<{
+        announcement?: ApiAnnouncement | null;
+    }>;
+    intervalMs?: number;
+}): () => void;

package/dist/announcements-poll.js

@@ -0,0 +1,58 @@
+import { fetchModels } from "./api.js";
+import { loadConfig } from "./config.js";
+import { hasDeviceCredential } from "./device-auth.js";
+/**
+ * 会话内公告轮询(审计 F14):启动横幅只渲染一次公告,维护窗口里挂着
+ * 会话的用户只会撞裸错误。这里每 5 分钟带凭证拉一次模型列表(与启动同一
+ * 接口,公告随响应捎回,服务端零新增开销),公告发生变化时推进会话。
+ *
+ * 首次成功拉取只做基线、不打扰——启动横幅已经展示过当前公告;之后
+ * 「出现新公告」或「公告内容变化」才触发 onNew。公告被清空不提示。
+ */
+export const ANNOUNCEMENT_POLL_INTERVAL_MS = 5 * 60_000;
+export function announcementKey(a) {
+    return a?.text ? `${a.text}\u0000${a.url ?? ""}` : "";
+}
+/** 基线跟踪器:observe 返回「需要通知的新公告」,否则 undefined。 */
+export function createAnnouncementTracker() {
+    let baseline;
+    return {
+        observe(a) {
+            const key = announcementKey(a);
+            if (baseline === undefined) {
+                baseline = key;
+                return undefined;
+            }
+            const changed = key !== "" && key !== baseline;
+            baseline = key;
+            return changed ? a : undefined;
+        },
+    };
+}
+export function startAnnouncementPoll(deps) {
+    const doFetch = deps.fetch ?? (async () => {
+        const cfg = loadConfig();
+        if (!hasDeviceCredential(cfg))
+            throw new Error("not logged in");
+        return fetchModels(cfg);
+    });
+    const tracker = createAnnouncementTracker();
+    const tick = async () => {
+        let announcement;
+        try {
+            announcement = (await doFetch()).announcement;
+        }
+        catch {
+            return; // 网络抖动/未登录:静默,下一轮再试
+        }
+        const fresh = tracker.observe(announcement ?? null);
+        if (fresh)
+            deps.onNew(fresh);
+    };
+    void tick(); // 立刻建基线,避免把启动前就存在的公告当成"新公告"
+    const timer = setInterval(() => {
+        void tick();
+    }, deps.intervalMs ?? ANNOUNCEMENT_POLL_INTERVAL_MS);
+    timer.unref?.();
+    return () => clearInterval(timer);
+}

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import { type ApiThinkingCapabilities, type CliConfig } from "./config.js";
+import { type ApiModel, type CliConfig } from "./config.js";
 /** Preserve caller cancellation while always enforcing the operation deadline. */
 export declare function signalWithTimeout(signal: AbortSignal | undefined, timeoutMs: number): AbortSignal;
 /** Read a complete response without allowing a custom or faulty server to exhaust CLI memory. */
@@ -37,22 +37,7 @@ export interface MePackage {
     expires_at: string | null;
     note: string | null;
 }
-export interface ApiModel {
-    id: string;
-    name: string;
-    reasoning: boolean;
-    /** Older gateways omit model-specific thinking metadata. */
-    thinking?: ApiThinkingCapabilities | null;
-    /** Older gateways omit this field; missing means text-only. */
-    vision?: boolean;
-    context_length: number;
-    max_tokens: number;
-    price: {
-        input: number;
-        output: number;
-        cache_read: number | null;
-    };
-}
+export type { ApiModel };
 /** 启动横幅公告(后台「全局设置」下发);url 可选。老网关没有该字段,undefined = 不显示。 */
 export interface ApiAnnouncement {
     text: string;

package/dist/config.d.ts

@@ -48,6 +48,14 @@ export interface ApiModel {
  * Aliases are derived from the short id; note is left empty (filled by /model command).
  */
 export declare function apiModelToDef(m: ApiModel): ModelDef;
+export interface ModelCost {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+}
+/** pi 的 Model 类型要求 cost 非空;价格未知时按 0 交给 pi(与自有端点同一约定)。 */
+export declare const UNKNOWN_MODEL_COST: ModelCost;
 export interface ModelDef {
     id: string;
     name: string;
@@ -59,13 +67,11 @@ export interface ModelDef {
     vision: boolean;
     contextWindow: number;
     maxTokens: number;
-    /** USD per million tokens — display/estimation only; billing is server-side */
-    cost: {
-        input: number;
-        output: number;
-        cacheRead: number;
-        cacheWrite: number;
-    };
+    /**
+     * USD per million tokens — display/estimation only; billing is server-side.
+     * null = 价格未知(内置兜底目录不再硬编码价格,权威在网关 D1;09-01 评审 D5 拍板删)。
+     */
+    cost: ModelCost | null;
     /** 网关下发的免费用量包覆盖标记;老网关缺失时为 undefined(不派生 note)。 */
     freeEligible?: boolean;
     note: string;

package/dist/config.js

@@ -80,6 +80,8 @@ export function apiModelToDef(m) {
         note: "",
     };
 }
+/** pi 的 Model 类型要求 cost 非空;价格未知时按 0 交给 pi(与自有端点同一约定)。 */
+export const UNKNOWN_MODEL_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 export const MODELS = [
     {
         id: "deepseek-v4-flash",
@@ -96,7 +98,7 @@ export const MODELS = [
         vision: false,
         contextWindow: 1_048_576,
         maxTokens: 384_000,
-        cost: { input: 0.14, output: 0.28, cacheRead: 0, cacheWrite: 0 },
+        cost: null,
         note: "默认 · 免费用量包额度内免费,日常写代码首选",
     },
     {
@@ -107,7 +109,7 @@ export const MODELS = [
         vision: false,
         contextWindow: 500_000,
         maxTokens: 65_536,
-        cost: { input: 2, output: 6, cacheRead: 0, cacheWrite: 0 },
+        cost: null,
         note: "更强 · 但烧额度快约 20 倍,难题再用",
     },
 ];
@@ -120,8 +122,8 @@ function deriveModelNote(m, base) {
     if (m.freeEligible === true)
         return "免费用量包可抵扣";
     if (m.freeEligible === false) {
-        const blended = (m.cost.input + m.cost.output) / 2;
-        const baseBlended = base ? (base.cost.input + base.cost.output) / 2 : 0;
+        const blended = m.cost ? (m.cost.input + m.cost.output) / 2 : 0;
+        const baseBlended = base?.cost ? (base.cost.input + base.cost.output) / 2 : 0;
         const mult = baseBlended > 0 ? Math.round(blended / baseBlended) : 0;
         return mult >= 2
             ? `不走免费包 · 费用约为默认模型 ${mult} 倍`

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, writeAttributionExtension, writeCompactUiExtension, writeErrorHumanizeExtension, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, ensureWorkflowPromptTemplate, scrubForeignProviderEnv, toProviderModels, writeAnnouncementsExtension, writeAttributionExtension, writeCompactUiExtension, writeErrorHumanizeExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { Text } from "@earendil-works/pi-tui";
 import { printConsoleBanner } from "./brand.js";
 import { agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
@@ -223,6 +223,8 @@ async function runAgent(cfg, args) {
     writeCompactUiExtension();
     // 模型调用错误人话化（同样投影,Desktop App 共享）
     writeErrorHumanizeExtension();
+    // 会话内公告触达:5 分钟轮询,公告变化时推进会话(同样投影,Desktop 共享)
+    writeAnnouncementsExtension();
     // OpenRouter 应用归因：直连流量计入 u1s1 的公开排行
     writeAttributionExtension();
     ensureTmuxKeyboardProtocol();

package/dist/model.js

@@ -32,12 +32,11 @@ export async function modelCommand(nameOrAlias) {
         for (const m of MODELS) {
             const mark = current.provider === PROVIDER_ID && m.id === current.id ? "●" : " ";
             console.log(`  ${mark} ${m.aliases[0].padEnd(10)} ${m.name}`);
-            if (m.note) {
-                console.log(`               ${m.note} · $${m.cost.input}/$${m.cost.output} 每百万 token`);
-            }
-            else {
-                console.log(`               $${m.cost.input}/$${m.cost.output} 每百万 token`);
-            }
+            // 价格来自网关目录;离线兜底目录不带价格,只列名字与提示
+            const price = m.cost ? `$${m.cost.input}/$${m.cost.output} 每百万 token` : "";
+            const detail = [m.note, price].filter(Boolean).join(" · ");
+            if (detail)
+                console.log(`               ${detail}`);
         }
         for (const ep of CUSTOM_ENDPOINTS) {
             console.log("");

package/package.json

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