u1s1-cli 0.8.0 → 0.9.2

package/README.md

@@ -1,6 +1,6 @@
 # u1s1 — 有一说一,最省心的 AI 编程搭子
 
-在终端里用中文说需求,AI 帮你读文件、改代码、跑命令。不用买模型、不用配 API、不用懂那些名词,注册就送**$10 免费额度**(一次性,用完不补)。
+在终端里用中文说需求,AI 帮你读文件、改代码、跑命令。不用买模型、不用配 API、不用懂那些名词,默认 DeepSeek V4 Flash **每天免费 $2**(北京时间 0 点恢复),新用户另送一次性 $10 加量。
 
 ## 三步开始
 
@@ -48,9 +48,9 @@ u1s1
 
 ## 有一说一
 
-- **背后模型**:默认 DeepSeek V4 Flash(1M 上下文,便宜大碗);难题可随时 `u1s1 model grok` 切 Grok 4.6(更强,但烧额度快约 20 倍)。对话里 `/model` 也会记住,下次启动还是这个。
-- **怎么收费**:额度按 API 实际成本扣,不加价;新用户一次性送 $10,用完不补。
-- **额度不够**:邀请朋友,你俩各得 $1 加量,永不过期 → [u1s1.io/dashboard](https://u1s1.io/dashboard)
+- **背后模型**:默认 DeepSeek V4 Flash(1M 上下文,每天免费 $2);难题可随时 `u1s1 model grok` 切 Grok 4.6。对话里 `/model` 也会记住,下次启动还是这个。
+- **怎么收费**:DeepSeek V4 Flash 每天有 $2 免费用量,北京时间 0 点恢复且不累计。免费用完或切换其他模型后,按 API 实际成本从永久余额扣,不加价;新用户另送一次性 $10 加量。
+- **额度不够**:邀请朋友,你俩各得 $1 永久加量 → [u1s1.io/dashboard](https://u1s1.io/dashboard)
 - **内核**:基于开源的 [pi](https://pi.dev) coding agent,会话管理、斜杠命令、皮肤等能力全都有。
 
 官网:[u1s1.io](https://u1s1.io)

package/dist/agent-setup.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { agentDir, MODELS, PROVIDER_ID } from "./config.js";
+import { agentDir, MODELS, PROVIDER_ID, VERSION } from "./config.js";
 const BRAND_APPEND = `## u1s1
 
 你是 u1s1(有一说一) —— 说人话的 AI 编程搭子,一个面向编程新手的中文 AI 编程助手。用户很可能不熟悉编程术语:
@@ -84,6 +84,28 @@ export function cleanupBrandThemes() {
  * itself holds no secret. Rewritten on every launch so baseUrl/model changes
  * propagate; other providers a user may have added are preserved.
  */
+/**
+ * 联网工具经 <agentDir>/extensions 投影:pi 的资源加载器对 TUI 和 `u1s1 web`
+ * 都会扫描这个目录,两个前端从此共用同一份工具注册,不用各接一遍。
+ * 文件每次启动重写(baseUrl/服务端开关变化随之生效);apiKey 走 U1S1_API_KEY
+ * 环境变量,文件里不落密钥。U1S1_TOOLS_VIA_EXTENSION 守卫:旧版 CLI 仍在
+ * 进程内注册工具且不设该变量,残留的本文件在旧版下自动空转,避免双重注册。
+ */
+export function writeWebToolsExtension(cfg, webSearchEnabled) {
+    const dir = join(agentDir, "extensions");
+    mkdirSync(dir, { recursive: true });
+    const toolsUrl = new URL("./tools.js", import.meta.url).href;
+    const searchLine = webSearchEnabled
+        ? `  pi.registerTool(tools.createSearchTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY }));\n`
+        : "";
+    writeFileSync(join(dir, "u1s1-tools.js"), `// 由 u1s1 每次启动自动生成,请勿手改\n` +
+        `export default async function (pi) {\n` +
+        `  if (process.env.U1S1_TOOLS_VIA_EXTENSION !== "1") return;\n` +
+        `  const tools = await import(${JSON.stringify(toolsUrl)});\n` +
+        searchLine +
+        `  pi.registerTool(tools.webFetchTool);\n` +
+        `}\n`);
+}
 export function ensureProviderModels(cfg) {
     mkdirSync(agentDir, { recursive: true });
     const p = join(agentDir, "models.json");
@@ -104,6 +126,8 @@ export function ensureProviderModels(cfg) {
         baseUrl: cfg.baseUrl,
         api: "openai-completions",
         apiKey: "$U1S1_API_KEY",
+        // 网关按这个头识别客户端版本;不带头的旧版会在会话首轮被追加升级提示
+        headers: { "x-u1s1-version": VERSION },
         models: MODELS.map((m) => ({
             id: m.id,
             name: m.name,

package/dist/api.js

@@ -1,8 +1,13 @@
+import { VERSION } from "./config.js";
+/** 网关按 x-u1s1-version 识别客户端版本(旧版 CLI 不带,提示升级)。 */
+function authHeaders(apiKey) {
+    return { authorization: `Bearer ${apiKey}`, "x-u1s1-version": VERSION };
+}
 export async function fetchModels(cfg) {
     let resp;
     try {
         resp = await fetch(`${cfg.baseUrl}/models`, {
-            headers: { authorization: `Bearer ${cfg.apiKey}` },
+            headers: authHeaders(cfg.apiKey),
         });
     }
     catch {
@@ -13,7 +18,34 @@ export async function fetchModels(cfg) {
     if (!resp.ok)
         throw new Error(`服务端返回 ${resp.status},稍后再试`);
     const body = (await resp.json());
-    return body.data;
+    return { models: body.data, features: body.features ?? {} };
+}
+/** 联网搜索走网关代理（上游 key 只在服务端）。maxResults 不传时由服务端决定默认值。 */
+export async function searchWeb(cfg, query, maxResults, signal) {
+    if (!cfg.apiKey)
+        throw new Error("没有配置 API Key");
+    let resp;
+    try {
+        resp = await fetch(`${cfg.baseUrl}/search`, {
+            method: "POST",
+            headers: {
+                ...authHeaders(cfg.apiKey),
+                "content-type": "application/json",
+            },
+            body: JSON.stringify({ query, max_results: maxResults }),
+            signal,
+        });
+    }
+    catch {
+        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+    }
+    if (resp.status === 401)
+        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+    if (!resp.ok) {
+        const body = (await resp.json().catch(() => null));
+        throw new Error(body?.error?.message ?? `搜索服务返回 ${resp.status},稍后再试`);
+    }
+    return (await resp.json());
 }
 export async function fetchMe(cfg) {
     if (!cfg.apiKey)
@@ -21,7 +53,7 @@ export async function fetchMe(cfg) {
     let resp;
     try {
         resp = await fetch(`${cfg.baseUrl}/me`, {
-            headers: { authorization: `Bearer ${cfg.apiKey}` },
+            headers: authHeaders(cfg.apiKey),
         });
     }
     catch {

package/dist/config.js

@@ -1,6 +1,9 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { join } from "node:path";
+const require = createRequire(import.meta.url);
+export const VERSION = require("../package.json").version;
 export const DEFAULT_BASE_URL = "https://api.u1s1.io/v1";
 export const PROVIDER_ID = "u1s1";
 /** Make a short alias from a model id by stripping common prefixes. */
@@ -40,7 +43,7 @@ export const MODELS = [
         contextWindow: 1_048_576,
         maxTokens: 384_000,
         cost: { input: 0.14, output: 0.28, cacheRead: 0, cacheWrite: 0 },
-        note: "默认 · 便宜大碗,日常写代码首选",
+        note: "默认 · 每日 $2 免费,日常写代码首选",
     },
     {
         id: "x-ai/grok-4.6",

package/dist/index.js

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
 import { writeFileSync } from "node:fs";
-import { createRequire } from "node:module";
-import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, } from "./agent-setup.js";
+import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
-import { agentDir, apiModelToDef, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, } from "./config.js";
+import { agentDir, apiModelToDef, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
 import { applyBrandUi } from "./style.js";
 import { fetchModels } from "./api.js";
-const require = createRequire(import.meta.url);
-const VERSION = require("../package.json").version;
 const PACKAGE_NAME = "u1s1-cli";
 /**
  * 启动时自动检查 npm 最新版，发现更新就静默安装。
@@ -113,18 +110,24 @@ async function runAgent(cfg, args) {
     ensureBrandPrompt();
     ensureDefaultSettings();
     // Fetch model list from server; fall back to built-in MODELS on error.
+    // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search,模型就不会白调
+    let webSearchEnabled = true;
     try {
-        const apiModels = await fetchModels(cfg);
-        setModelsFromApi(apiModels.map(apiModelToDef));
+        const { models, features } = await fetchModels(cfg);
+        setModelsFromApi(models.map(apiModelToDef));
+        webSearchEnabled = features.web_search !== false;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     ensureProviderModels(cfg);
+    // 联网工具经 agentDir/extensions 投影,TUI 和 u1s1 web 共用一份注册
+    writeWebToolsExtension(cfg, webSearchEnabled);
     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;
     process.env["U1S1_API_KEY"] = cfg.apiKey;
+    process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
     process.env["PI_SKIP_VERSION_CHECK"] = "1";
     const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");

package/dist/login.js

@@ -74,7 +74,7 @@ async function promptForKey() {
         process.exit(1);
     }
     console.log("  需要一把 API Key(免费):");
-    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送 $10 额度)`);
+    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,DeepSeek 每天免费 $2)`);
     console.log("  2. 复制你的 API Key,粘贴到下面");
     console.log("");
     tryOpenBrowser(DASHBOARD_URL);
@@ -91,12 +91,12 @@ export async function login(keyArg) {
         const origin = apiOrigin(cfg);
         const start = await startDeviceLogin(origin);
         if (start) {
-            console.log("  用浏览器登录(免费,注册送 $10 额度):");
+            console.log("  用浏览器登录(DeepSeek 每天免费 $2):");
             console.log("");
             console.log(`      ${start.verify_url}`);
             console.log("");
             console.log("  已经帮你打开浏览器了;如果没打开,把上面这行网址复制到浏览器打开。");
-            console.log("  在浏览器里登录成功后,这里会自动继续,等着就行……");
+            console.log("  在浏览器里登录并点「批准」后,这里会自动继续,等着就行……");
             tryOpenBrowser(start.verify_url);
             key = (await pollDeviceLogin(origin, start)) ?? undefined;
             if (!key) {
@@ -119,7 +119,7 @@ export async function login(keyArg) {
         process.exit(1);
     });
     saveConfig(next);
-    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},还剩 $${me.remaining_usd} 额度。`);
+    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},今日免费还剩 $${me.daily_free_remaining_usd},永久余额 $${me.remaining_usd}。`);
     return next;
 }
 /** Returns a config that definitely has an apiKey, prompting the user if needed. */

package/dist/tools.js

@@ -0,0 +1,162 @@
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { searchWeb } from "./api.js";
+const FETCH_TIMEOUT_MS = 20_000;
+const MAX_FETCH_BYTES = 2_000_000;
+const MAX_TEXT_CHARS = 30_000;
+const HTML_ENTITIES = {
+    " ": " ",
+    "&": "&",
+    "&lt;": "<",
+    "&gt;": ">",
+    "&quot;": '"',
+    "&#39;": "'",
+};
+/** 把网页 HTML 榨成纯文本:去掉脚本样式和标签,压掉多余空白。 */
+function htmlToText(html) {
+    return html
+        .replace(/<!--[\s\S]*?-->/g, "")
+        .replace(/<(script|style|noscript|svg|iframe)\b[\s\S]*?<\/\1>/gi, "")
+        .replace(/<br\s*\/?>/gi, "\n")
+        .replace(/<\/(p|div|li|tr|h[1-6])>/gi, "\n")
+        .replace(/<[^>]+>/g, " ")
+        .replace(/&(?:nbsp|amp|lt|gt|quot|#39);/g, (m) => HTML_ENTITIES[m] ?? m)
+        .replace(/[ \t]+/g, " ")
+        .replace(/\n\s*\n\s*\n+/g, "\n\n")
+        .trim();
+}
+function truncate(text) {
+    if (text.length <= MAX_TEXT_CHARS)
+        return text;
+    return `${text.slice(0, MAX_TEXT_CHARS)}\n\n…（内容过长已截断，共 ${text.length} 字符）`;
+}
+/** 只下载前 maxBytes 就断流,超大页面不用整个拉完再丢。 */
+async function readBodyCapped(resp, maxBytes) {
+    if (!resp.body)
+        return new Uint8Array(await resp.arrayBuffer()).subarray(0, maxBytes);
+    const reader = resp.body.getReader();
+    const chunks = [];
+    let total = 0;
+    for (;;) {
+        const { done, value } = await reader.read();
+        if (done)
+            break;
+        chunks.push(value);
+        total += value.byteLength;
+        if (total >= maxBytes) {
+            void reader.cancel().catch(() => { });
+            break;
+        }
+    }
+    const out = new Uint8Array(Math.min(total, maxBytes));
+    let offset = 0;
+    for (const chunk of chunks) {
+        const room = out.byteLength - offset;
+        if (room <= 0)
+            break;
+        out.set(room < chunk.byteLength ? chunk.subarray(0, room) : chunk, offset);
+        offset += chunk.byteLength;
+    }
+    return out;
+}
+/** 按响应头声明的 charset 解码(GBK 等中文页面不至于乱码),没有或不认识就按 UTF-8。 */
+function decodeBody(bytes, contentType) {
+    const charset = /charset=["']?([\w-]+)/i.exec(contentType)?.[1];
+    try {
+        return new TextDecoder(charset || "utf-8").decode(bytes);
+    }
+    catch {
+        return new TextDecoder("utf-8").decode(bytes);
+    }
+}
+/** 联网搜索工具:走 u1s1 网关代理,上游 key 不落到用户机器上。 */
+export function createSearchTool(cfg) {
+    return defineTool({
+        name: "web_search",
+        label: "联网搜索",
+        description: "Search the web for current information. Use it for anything time-sensitive or outside the codebase: library docs, error messages, latest versions, recent events. Returns a short answer plus ranked results with URLs and snippets. Follow up with web_fetch to read a promising result in full.",
+        promptSnippet: "搜索互联网获取最新信息（文档、报错、版本、时事）",
+        promptGuidelines: [
+            "Use web_search when the answer depends on information newer than your knowledge or not present in the repository, instead of guessing.",
+            "Prefer one focused web_search query over several near-duplicate queries; each search costs the user credits.",
+        ],
+        parameters: Type.Object({
+            query: Type.String({ description: "Search query. Be specific; keep it under ~15 words." }),
+            maxResults: Type.Optional(Type.Number({ description: "How many results to return (1-10, default 5).", minimum: 1, maximum: 10 })),
+        }),
+        async execute(_toolCallId, params, signal) {
+            const data = await searchWeb(cfg, params.query, params.maxResults, signal);
+            const lines = [];
+            if (data.answer)
+                lines.push(`Answer: ${data.answer}`, "");
+            if (data.results.length === 0) {
+                lines.push("No results.");
+            }
+            else {
+                data.results.forEach((r, i) => {
+                    lines.push(`${i + 1}. ${r.title}`, `   ${r.url}`, `   ${r.snippet}`, "");
+                });
+            }
+            return {
+                content: [{ type: "text", text: truncate(lines.join("\n").trim()) }],
+                details: { query: data.query, count: data.results.length },
+            };
+        },
+    });
+}
+/** 抓网页:纯客户端出网,不经过我们的服务器,也不额外计费。 */
+export const webFetchTool = defineTool({
+    name: "web_fetch",
+    label: "读取网页",
+    description: "Fetch a URL and return its readable text content (HTML is stripped to text; JSON and plain text are returned as-is). Use it to read a page found via web_search, or any URL the user pasted.",
+    promptSnippet: "抓取指定网址并转成可读文本",
+    promptGuidelines: [
+        "Use web_fetch to read a specific URL, and web_search when you still need to find the URL.",
+    ],
+    parameters: Type.Object({
+        url: Type.String({ description: "Absolute http(s) URL to fetch." }),
+    }),
+    async execute(_toolCallId, params, signal) {
+        let url;
+        try {
+            // 用户从聊天工具粘来的链接常带 "@https://…" 前缀,顺手剥掉
+            url = new URL(params.url.trim().replace(/^@/, ""));
+        }
+        catch {
+            throw new Error(`不是合法的网址: ${params.url}`);
+        }
+        if (url.protocol !== "http:" && url.protocol !== "https:") {
+            throw new Error(`只支持 http/https,收到 ${url.protocol}`);
+        }
+        const timeout = AbortSignal.timeout(FETCH_TIMEOUT_MS);
+        const abort = signal ? AbortSignal.any([signal, timeout]) : timeout;
+        let resp;
+        try {
+            resp = await fetch(url, {
+                redirect: "follow",
+                headers: {
+                    accept: "text/html,application/xhtml+xml,application/json,text/plain;q=0.9,*/*;q=0.8",
+                    "user-agent": "u1s1-cli",
+                },
+                signal: abort,
+            });
+        }
+        catch (e) {
+            throw new Error(`打不开 ${url.href}: ${e.message}`);
+        }
+        if (!resp.ok)
+            throw new Error(`${url.href} 返回 ${resp.status} ${resp.statusText}`);
+        const type = resp.headers.get("content-type") ?? "";
+        if (!/text\/|json|xml|javascript/i.test(type)) {
+            throw new Error(`${url.href} 不是文本内容 (${type || "unknown"}),读不了`);
+        }
+        const raw = decodeBody(await readBodyCapped(resp, MAX_FETCH_BYTES), type);
+        const text = /html|xml/i.test(type) ? htmlToText(raw) : raw.trim();
+        return {
+            content: [
+                { type: "text", text: truncate(`# ${url.href}\n\n${text || "(空白页面)"}`) },
+            ],
+            details: { url: url.href, contentType: type, chars: text.length },
+        };
+    },
+});

package/dist/usage.js

@@ -15,14 +15,16 @@ export async function usage() {
         process.exit(1);
     });
     const remain = me.remaining_usd;
-    const spent = me.mtd_usd;
-    const denom = remain + spent;
-    const remainRatio = denom > 0 ? remain / denom : 0;
+    const freeRemain = me.daily_free_remaining_usd;
+    const freeTotal = me.daily_free_usd;
+    const freeRatio = freeTotal > 0 ? freeRemain / freeTotal : 0;
     console.log("");
-    console.log(`  账号     ${me.email ?? "(未绑定邮箱)"}`);
-    console.log(`  本月已用 $${spent}`);
-    console.log(`  剩余额度 $${remain}  ${bar(remainRatio)}`);
+    console.log(`  账号       ${me.email ?? "(未绑定邮箱)"}`);
+    console.log(`  今日免费   $${freeRemain} / $${freeTotal}  ${bar(freeRatio)}`);
+    console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
+    console.log(`  永久余额   $${remain}`);
+    console.log(`  本月成本   $${me.mtd_usd}`);
     console.log("");
-    console.log("  邀请朋友双方各得加量 → https://u1s1.io/dashboard");
+    console.log("  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard");
     console.log("");
 }

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, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, } from "./agent-setup.js";
+import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { applyWebUiBranding } from "./webui-brand.js";
 import { fetchModels } from "./api.js";
@@ -49,14 +49,19 @@ export async function webCommand(cfg, args) {
     ensureBrandPrompt();
     ensureDefaultSettings();
     // Fetch model list from server; fall back to built-in MODELS on error.
+    // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search
+    let webSearchEnabled = true;
     try {
-        const apiModels = await fetchModels(cfg);
-        setModelsFromApi(apiModels.map(apiModelToDef));
+        const { models, features } = await fetchModels(cfg);
+        setModelsFromApi(models.map(apiModelToDef));
+        webSearchEnabled = features.web_search !== false;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     ensureProviderModels(cfg);
+    // 联网工具经 agentDir/extensions 投影,和 TUI 共用一份注册
+    writeWebToolsExtension(cfg, webSearchEnabled);
     // 网页版新会话从 settings.json 的 defaultModel 取模型(TUI 是每次传 --model),
     // 确保它有值;resolvePreferredModel 优先尊重已有的 in-session 选择,不会回退覆盖。
     writeAgentDefaultModel(resolvePreferredModel(cfg.model));
@@ -70,6 +75,7 @@ export async function webCommand(cfg, args) {
             ...process.env,
             PI_CODING_AGENT_DIR: agentDir,
             U1S1_API_KEY: cfg.apiKey,
+            U1S1_TOOLS_VIA_EXTENSION: "1",
             PI_WEB_DATA_DIR: dataDir,
         },
     });

package/package.json

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