u1s1-cli 0.9.1 → 0.9.2

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,9 +18,9 @@ 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 只在服务端）。 */
+/** 联网搜索走网关代理（上游 key 只在服务端）。maxResults 不传时由服务端决定默认值。 */
 export async function searchWeb(cfg, query, maxResults, signal) {
     if (!cfg.apiKey)
         throw new Error("没有配置 API Key");
@@ -24,7 +29,7 @@ export async function searchWeb(cfg, query, maxResults, signal) {
         resp = await fetch(`${cfg.baseUrl}/search`, {
             method: "POST",
             headers: {
-                authorization: `Bearer ${cfg.apiKey}`,
+                ...authHeaders(cfg.apiKey),
                 "content-type": "application/json",
             },
             body: JSON.stringify({ query, max_results: maxResults }),
@@ -48,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. */

package/dist/index.js

@@ -1,15 +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 { createFetchTool, createSearchTool } from "./tools.js";
 import { fetchModels } from "./api.js";
-const require = createRequire(import.meta.url);
-const VERSION = require("../package.json").version;
 const PACKAGE_NAME = "u1s1-cli";
 /**
  * 启动时自动检查 npm 最新版，发现更新就静默安装。
@@ -114,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");
@@ -158,9 +160,6 @@ async function runAgent(cfg, args) {
             name: "u1s1",
             factory: (pi) => {
                 applyBrandUi(pi, VERSION);
-                // 联网能力:搜索走网关(上游 key 只在服务端),抓网页在本地直接出网
-                pi.registerTool(createSearchTool(cfg));
-                pi.registerTool(createFetchTool());
                 // pi 内置只有 /quit；补一个更常见的 /exit，方便新手退出
                 pi.registerCommand("exit", {
                     description: "退出 u1s1",

package/dist/tools.js

@@ -1,8 +1,17 @@
+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
@@ -11,12 +20,7 @@ function htmlToText(html) {
         .replace(/<br\s*\/?>/gi, "\n")
         .replace(/<\/(p|div|li|tr|h[1-6])>/gi, "\n")
         .replace(/<[^>]+>/g, " ")
-        .replace(/&nbsp;/g, " ")
-        .replace(/&amp;/g, "&")
-        .replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&quot;/g, '"')
-        .replace(/&#39;/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();
@@ -26,9 +30,48 @@ function truncate(text) {
         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 {
+    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.",
@@ -42,7 +85,7 @@ export function createSearchTool(cfg) {
             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 ?? 5, signal);
+            const data = await searchWeb(cfg, params.query, params.maxResults, signal);
             const lines = [];
             if (data.answer)
                 lines.push(`Answer: ${data.answer}`, "");
@@ -59,63 +102,61 @@ export function createSearchTool(cfg) {
                 details: { query: data.query, count: data.results.length },
             };
         },
-    };
+    });
 }
 /** 抓网页:纯客户端出网,不经过我们的服务器,也不额外计费。 */
-export function createFetchTool() {
-    return {
-        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 {
-                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 buf = await resp.arrayBuffer();
-            const raw = new TextDecoder("utf-8").decode(buf.slice(0, MAX_FETCH_BYTES));
-            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 },
-            };
-        },
-    };
-}
+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/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.9.1",
+  "version": "0.9.2",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {