u1s1-cli 1.8.1 → 1.9.1

package/dist/brand.d.ts

@@ -4,6 +4,15 @@ export declare const BRAND_CN = "\u6709\u4E00\u8BF4\u4E00";
 export declare const BRAND_TAGLINE = "\u8BF4\u4EBA\u8BDD\u7684 AI \u7F16\u7A0B\u642D\u5B50";
 export declare const DASHBOARD_URL = "https://u1s1.io/dashboard";
 export declare function formatHomePath(path: string): string;
+/**
+ * 启动目录不对时的一句提醒(工单 b70c901e:用户在 C:\\Users\\1\\.u1s1 里跑 u1s1)。
+ * 配置目录里放着登录凭据与设置,模型的文件工具会直接看到;用户主目录则会让模型
+ * 翻遍整个主目录,又慢又容易改错地方。都不是错误,只提醒换到项目文件夹。
+ */
+export declare function cwdAdvice(cwd: string, dirs?: {
+    home?: string;
+    configDir?: string;
+}): string | undefined;
 export declare const HERO_ART: string[];
 /**
  * Startup hero, responsive to terminal width:
@@ -20,5 +29,9 @@ export declare function renderBrandHeader(theme: Theme, input: {
     };
     /** 当前目录为空时给可照抄的开场 prompt(见 starterLines)。 */
     starterTips?: boolean;
+    /** 启动目录不合适时的提醒(见 cwdAdvice)。 */
+    cwdWarning?: string;
+    /** 登录账号(config.email),跟在 cwd 后面;多账号/换机时一眼看到登的是谁。 */
+    account?: string;
 }): string[];
 export declare function printConsoleBanner(version: string): void;

package/dist/brand.js

@@ -1,5 +1,5 @@
 import { homedir } from "node:os";
-import { resolve } from "node:path";
+import { join, resolve, sep } from "node:path";
 export const BRAND_NAME = "u1s1";
 export const BRAND_CN = "有一说一";
 export const BRAND_TAGLINE = "说人话的 AI 编程搭子";
@@ -14,6 +14,24 @@ export function formatHomePath(path) {
     }
     return path;
 }
+/**
+ * 启动目录不对时的一句提醒(工单 b70c901e:用户在 C:\\Users\\1\\.u1s1 里跑 u1s1)。
+ * 配置目录里放着登录凭据与设置,模型的文件工具会直接看到;用户主目录则会让模型
+ * 翻遍整个主目录,又慢又容易改错地方。都不是错误,只提醒换到项目文件夹。
+ */
+export function cwdAdvice(cwd, dirs = {}) {
+    const home = resolve(dirs.home ?? homedir());
+    const configDir = resolve(dirs.configDir ?? join(home, ".u1s1"));
+    const here = resolve(cwd);
+    const within = (dir) => here === dir || here.startsWith(dir + sep);
+    if (within(configDir)) {
+        return "当前在 u1s1 的配置目录里(存着登录凭据和设置),模型的文件工具会直接看到它们;建议 /exit 后 cd 到你的项目文件夹再运行 u1s1";
+    }
+    if (here === home) {
+        return "当前在用户主目录,模型找文件会翻遍整个主目录,又慢又容易改错地方;建议 /exit 后 cd 到项目文件夹再运行 u1s1";
+    }
+    return undefined;
+}
 // "u1s1" in FIGlet ANSI Shadow. Rows are joined per glyph so widths stay aligned.
 const GLYPH_U = ["██╗   ██╗", "██║   ██║", "██║   ██║", "██║   ██║", "╚██████╔╝", " ╚═════╝ "];
 const GLYPH_1 = [" ██╗", "███║", "╚██║", " ██║", " ██║", " ╚═╝"];
@@ -65,13 +83,16 @@ export function renderBrandHeader(theme, input) {
     const name = theme.bold(theme.fg("text", `${BRAND_NAME} v${input.version}`)) +
         (input.notice ? `  ${theme.fg("accent", input.notice)}` : "");
     const brand = theme.fg("muted", `${BRAND_CN} · ${BRAND_TAGLINE}`);
-    const dir = theme.fg("dim", `cwd: ${formatHomePath(input.cwd)}`);
+    const dir = theme.fg("dim", `cwd: ${formatHomePath(input.cwd)}${input.account ? ` · 账号 ${input.account}` : ""}`);
     const hints = theme.fg("dim", "/help · Ctrl+V 图片 · Shift+Enter 换行 · Esc 中断");
     const starter = input.starterTips ? starterLines(theme) : [];
+    const warning = input.cwdWarning ? [` ${theme.fg("warning", "⚠")} ${theme.fg("warning", input.cwdWarning)}`] : [];
     if (input.width < ART_WIDTH + 4) {
         const lines = ["", ` ${theme.fg("accent", "✻")} ${name}  ${theme.fg("muted", BRAND_CN)}`, `   ${dir}`, `   ${theme.fg("dim", "Ctrl+V 粘贴图片")}`];
         if (input.announcement)
             lines.push(`   ${announcementLine(theme, input.announcement)}`);
+        if (warning.length)
+            lines.push("", ...warning);
         if (starter.length)
             lines.push("", ...starter);
         return [...lines, ""];
@@ -82,6 +103,8 @@ export function renderBrandHeader(theme, input) {
         const lines = ["", ...art, "", ` ${name}  ${brand}`, ` ${dir}`, ` ${hints}`];
         if (input.announcement)
             lines.push(` ${announcementLine(theme, input.announcement)}`);
+        if (warning.length)
+            lines.push("", ...warning);
         if (starter.length)
             lines.push("", ...starter);
         return [...lines, ""];
@@ -95,6 +118,8 @@ export function renderBrandHeader(theme, input) {
     // 公告放信息列末尾(最后一行字模旁),够醒目又不挤掉常规信息
     if (input.announcement)
         rows[5] += `${gap}${announcementLine(theme, input.announcement)}`;
+    if (warning.length)
+        rows.push("", ...warning);
     if (starter.length)
         rows.push("", ...starter);
     return ["", ...rows, ""];

package/dist/config.d.ts

@@ -142,6 +142,8 @@ export interface CliConfig {
     model?: string;
     /** preferred model 所属 provider;缺省 = u1s1(老配置兼容) */
     modelProvider?: string;
+    /** 登录时记下的账号邮箱,只用于横幅「账号」展示(真相以 u1s1 whoami 为准)。 */
+    email?: string;
 }
 export declare const u1s1Dir: string;
 /** pi keeps auth/models/settings/sessions under this dir — isolated from any real pi install. */

package/dist/config.js

@@ -296,6 +296,7 @@ export function loadConfig() {
         // 有效性不在这里裁决:端点列表可能还没拉回来,交给 resolvePreferredModel
         model: file.model,
         modelProvider: typeof file.modelProvider === "string" ? file.modelProvider : undefined,
+        email: typeof file.email === "string" && file.email ? file.email : undefined,
     };
 }
 /**

package/dist/error-humanize.d.ts

@@ -12,8 +12,9 @@
  * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
  * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
  *
- * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
- * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
+ * 额度用尽(reason=exhausted)且今天已打卡时网关还带 error.resets_at(下次可打卡时刻,
+ * 即北京时间 0 点,ISO),这里换算成「距下次可打卡还有 N 小时 M 分」接在正文后:比
+ * 「北京时间 0 点」更省用户脑子。今天没打卡时网关不带 resets_at(现在就能领)。
  */
 export declare function quotaResetHint(resetsAt: unknown, now?: number): string;
 /** 只取错误里的 request_id(纯函数,给 request-trace 记「最近一次请求编号」用)。 */

package/dist/error-humanize.js

@@ -12,8 +12,9 @@
  * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
  * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
  *
- * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
- * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
+ * 额度用尽(reason=exhausted)且今天已打卡时网关还带 error.resets_at(下次可打卡时刻,
+ * 即北京时间 0 点,ISO),这里换算成「距下次可打卡还有 N 小时 M 分」接在正文后:比
+ * 「北京时间 0 点」更省用户脑子。今天没打卡时网关不带 resets_at(现在就能领)。
  */
 export function quotaResetHint(resetsAt, now = Date.now()) {
     if (typeof resetsAt !== "string")
@@ -27,7 +28,7 @@ export function quotaResetHint(resetsAt, now = Date.now()) {
     const hours = Math.floor(remainingMinutes / 60);
     const minutes = remainingMinutes % 60;
     const span = hours > 0 ? `${hours} 小时${minutes > 0 ? ` ${minutes} 分` : ""}` : `${minutes} 分`;
-    return `距免费额度刷新还有 ${span}`;
+    return `距下次可打卡领额度还有 ${span}`;
 }
 function parseErrorPayload(raw) {
     const jsonStart = raw.indexOf("{");

package/dist/feedback.js

@@ -89,27 +89,35 @@ export async function submitFeedback(cfg, body) {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
     const value = await readJsonResponseCapped(resp, MAX_TICKET_RESPONSE_BYTES).catch(() => null);
-    const data = value && typeof value === "object" && !Array.isArray(value)
-        ? value
-        : null;
-    if (resp.status === 201 || resp.status === 200) {
-        const id = typeof data?.id === "string" || typeof data?.id === "number" ? String(data.id) : "";
-        const url = typeof data?.url === "string" && data.url.startsWith("https://") ? data.url : SUPPORT_URL;
-        if (!id)
-            return { ok: false, status: resp.status, message: "服务端工单响应格式不正确" };
-        return { ok: true, id, url };
-    }
+    const data = value && typeof value === "object" && !Array.isArray(value) ? value : null;
+    if (resp.status === 201 || resp.status === 200)
+        return createdOutcome(resp.status, data);
+    return {
+        ok: false,
+        status: resp.status,
+        message: failureMessage(resp.status, data),
+        retryAfterSeconds: retryAfterSeconds(resp, data),
+    };
+}
+function createdOutcome(status, data) {
+    const id = typeof data?.id === "string" || typeof data?.id === "number" ? String(data.id) : "";
+    if (!id)
+        return { ok: false, status, message: "服务端工单响应格式不正确" };
+    const url = typeof data?.url === "string" && data.url.startsWith("https://") ? data.url : SUPPORT_URL;
+    return { ok: true, id, url };
+}
+/** 优先 Retry-After 头,其次响应体里的 retry_after;都没有就不给等待时长。 */
+function retryAfterSeconds(resp, data) {
     const header = Number(resp.headers.get("retry-after"));
+    if (Number.isFinite(header) && header > 0)
+        return header;
     const fromBody = Number(data?.error?.retry_after);
-    const retryAfterSeconds = Number.isFinite(header) && header > 0
-        ? header
-        : Number.isFinite(fromBody) && fromBody > 0 ? fromBody : undefined;
-    const message = typeof data?.error?.message === "string"
-        ? data.error.message.slice(0, 500)
-        : resp.status === 401
-            ? "登录已失效,请重新运行 u1s1 login"
-            : `服务端返回 ${resp.status},稍后再试`;
-    return { ok: false, status: resp.status, message, retryAfterSeconds };
+    return Number.isFinite(fromBody) && fromBody > 0 ? fromBody : undefined;
+}
+function failureMessage(status, data) {
+    if (typeof data?.error?.message === "string")
+        return data.error.message.slice(0, 500);
+    return status === 401 ? "登录已失效,请重新运行 u1s1 login" : `服务端返回 ${status},稍后再试`;
 }
 /** 结果措辞,终端与会话内共用(每项一行)。 */
 export function feedbackOutcomeLines(outcome) {

package/dist/import/index.js

@@ -1,12 +1,10 @@
-import { createInterface } from "node:readline/promises";
-import { stdin as input, stdout as output } from "node:process";
 import { join } from "node:path";
 import { formatHomePath } from "../brand.js";
 import { agentDir } from "../config.js";
 import { claudeAdapter, hydrateClaudeSession } from "./claude.js";
 import { codexAdapter, hydrateCodexSession } from "./codex.js";
 import { statSync } from "node:fs";
-import { asRecord, asString, formatBytes, oneLine, sessionBelongsToCwd } from "./util.js";
+import { asRecord, asString, formatBytes, oneLine, sessionBelongsToCwd, confirm } from "./util.js";
 import { readJsonIfExists, writeConvertedSession, writeJson } from "./write.js";
 const ADAPTERS = {
     claude: claudeAdapter,
@@ -141,18 +139,6 @@ function printHelp() {
     console.log("  导入后在对应项目里跑 u1s1,输入 /resume 就能看到。");
     console.log("");
 }
-async function confirm(question) {
-    if (!input.isTTY || !output.isTTY)
-        return true;
-    const rl = createInterface({ input, output });
-    try {
-        const ans = (await rl.question(question)).trim().toLowerCase();
-        return ans === "" || ans === "y" || ans === "yes" || ans === "是";
-    }
-    finally {
-        rl.close();
-    }
-}
 async function hydrateSession(session) {
     try {
         if (session.source === "claude")

package/dist/import/skills.js

@@ -1,12 +1,10 @@
-import { createInterface } from "node:readline/promises";
-import { stdin as input, stdout as output } from "node:process";
 import { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, join, resolve } from "node:path";
 import { loadSkillsFromDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { formatHomePath } from "../brand.js";
 import { agentDir } from "../config.js";
-import { asRecord, asString, formatBytes, listHomeClaudeDirs, oneLine, uniqueExistingDirs } from "./util.js";
+import { asRecord, asString, formatBytes, listHomeClaudeDirs, oneLine, uniqueExistingDirs, confirm } from "./util.js";
 import { readJsonIfExists, writeJson } from "./write.js";
 const TOOL_LABEL = {
     claude: "Claude Code",
@@ -368,18 +366,6 @@ export function printSkillsHelp() {
     console.log("  模型会按说明自动调用,也可以在会话里输入 /skill:名称 手动调用。");
     console.log("");
 }
-async function confirm(question) {
-    if (!input.isTTY || !output.isTTY)
-        return true;
-    const rl = createInterface({ input, output });
-    try {
-        const ans = (await rl.question(question)).trim().toLowerCase();
-        return ans === "" || ans === "y" || ans === "yes" || ans === "是";
-    }
-    finally {
-        rl.close();
-    }
-}
 function describeSource(skill) {
     return formatHomePath(skill.singleFile ? skill.skillFile : skill.baseDir);
 }

package/dist/import/util.d.ts

@@ -5,7 +5,6 @@ export declare function resolveExistingDir(path: string): string | undefined;
 export declare function listHomeClaudeDirs(home?: string): string[];
 export declare function uniqueExistingDirs(paths: Array<string | undefined>): string[];
 export declare function encodeClaudeProjectDir(cwd: string): string;
-export declare function samePath(a: string, b: string): boolean;
 /** Nearest git root at or above cwd. Stops at home so `~/` is never treated as a mega-project. */
 export declare function projectRoot(cwd: string): string | undefined;
 /** cwd + ancestors up to the git root (or just cwd when there is no repo). */
@@ -24,3 +23,5 @@ export declare function parseArgsJson(raw: string): Record<string, unknown>;
 export declare function fileMtimeMs(path: string): number;
 export declare function isProbablyInjection(text: string): boolean;
 export declare function readFirstJsonObject(path: string): Record<string, unknown> | undefined;
+/** 交互式确认:回车/y/yes/是 视为同意;非 TTY(脚本、CI)直接放行,不阻塞。 */
+export declare function confirm(question: string): Promise<boolean>;

package/dist/import/util.js

@@ -1,3 +1,5 @@
+import { createInterface } from "node:readline/promises";
+import { stdin as input, stdout as output } from "node:process";
 import { closeSync, existsSync, openSync, readSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -46,11 +48,6 @@ export function encodeClaudeProjectDir(cwd) {
     const normalized = cwd.replace(/\\/g, "/");
     return normalized.replace(/[/:]/g, "-");
 }
-export function samePath(a, b) {
-    const na = a.replace(/\\/g, "/").replace(/\/+$/, "");
-    const nb = b.replace(/\\/g, "/").replace(/\/+$/, "");
-    return na === nb;
-}
 function normPath(p) {
     return p.replace(/\\/g, "/").replace(/\/+$/, "") || "/";
 }
@@ -228,3 +225,16 @@ export function readFirstJsonObject(path) {
         }
     }
 }
+/** 交互式确认:回车/y/yes/是 视为同意;非 TTY(脚本、CI)直接放行,不阻塞。 */
+export async function confirm(question) {
+    if (!input.isTTY || !output.isTTY)
+        return true;
+    const rl = createInterface({ input, output });
+    try {
+        const ans = (await rl.question(question)).trim().toLowerCase();
+        return ans === "" || ans === "y" || ans === "yes" || ans === "是";
+    }
+    finally {
+        rl.close();
+    }
+}

package/dist/index.js

@@ -518,144 +518,172 @@ async function runAgent(cfg, args) {
         await telemetry.shutdown();
     }
 }
-async function run() {
-    const args = process.argv.slice(2);
-    const cmd = args[0];
-    if (cmd === "--version" || cmd === "-v") {
-        console.log(`u1s1 v${VERSION}`);
+function printHelp() {
+    printConsoleBanner(VERSION);
+    console.log(" 命令:");
+    console.log("   u1s1                   进入对话界面(最常用,不带参数)");
+    console.log("   u1s1 -p \"一句话\"       不进界面直接回答,适合脚本里用");
+    console.log("   u1s1 login / logout    登录 / 退出登录");
+    console.log("   u1s1 model             查看或切换默认模型");
+    console.log("   u1s1 usage             查看剩余额度");
+    console.log("   u1s1 whoami            查看当前登录的账号");
+    console.log("   u1s1 update            升级到最新版");
+    console.log("   u1s1 deploy            发布网页(--public / --private)");
+    console.log("   u1s1 deploy list       查看已发布的站点");
+    console.log("   u1s1 deploy remove     删除已发布的站点");
+    console.log("   u1s1 feedback \"一句话\"  反馈问题或建议(自动建工单,--bug/--question…)");
+    console.log("   u1s1 import            导入历史会话(import skills 导入技能)");
+    console.log("   u1s1 mcp               配置第三方 MCP 服务(add/list/test/remove/import)");
+    console.log("   u1s1 bench             模型编码能力评测");
+    console.log("   u1s1 --version         查看版本");
+    console.log("");
+    console.log(" 对话里输入 /help 看会话内命令(/model /clear /feedback /exit …)");
+    console.log(" 匿名使用统计只记会话开始/结束等节点,不含内容;设 U1S1_TELEMETRY=0 关闭");
+    console.log(" 更多帮助 → https://u1s1.io/guides");
+}
+function wantsHelp(rest) {
+    return rest.includes("--help") || rest.includes("-h");
+}
+async function deployEntry(rest) {
+    const { deployCommand, printDeployHelp } = await import("./deploy.js");
+    // --help 不该先被拽去登录
+    if (wantsHelp(rest)) {
+        printDeployHelp();
         return;
     }
-    if (cmd === "--help" || cmd === "-h" || cmd === "help") {
-        printConsoleBanner(VERSION);
-        console.log(" 命令:");
-        console.log("   u1s1                   进入对话界面(最常用,不带参数)");
-        console.log("   u1s1 -p \"一句话\"       不进界面直接回答,适合脚本里用");
-        console.log("   u1s1 login / logout    登录 / 退出登录");
-        console.log("   u1s1 model             查看或切换默认模型");
-        console.log("   u1s1 usage             查看剩余额度");
-        console.log("   u1s1 update            升级到最新版");
-        console.log("   u1s1 deploy            发布网页(--public / --private)");
-        console.log("   u1s1 deploy list       查看已发布的站点");
-        console.log("   u1s1 deploy remove     删除已发布的站点");
-        console.log("   u1s1 feedback \"一句话\"  反馈问题或建议(自动建工单,--bug/--question…)");
-        console.log("   u1s1 import            导入历史会话(import skills 导入技能)");
-        console.log("   u1s1 mcp               配置第三方 MCP 服务(add/list/test/remove/import)");
-        console.log("   u1s1 bench             模型编码能力评测");
-        console.log("   u1s1 --version         查看版本");
-        console.log("");
-        console.log(" 对话里输入 /help 看会话内命令(/model /clear /feedback /exit …)");
-        console.log(" 匿名使用统计只记会话开始/结束等节点,不含内容;设 U1S1_TELEMETRY=0 关闭");
-        console.log(" 更多帮助 → https://u1s1.io/guides");
-        return;
+    const { ensureAuth } = await import("./login.js");
+    const cfg = await ensureAuth();
+    await deployCommand(cfg, rest);
+}
+async function whoamiCommand() {
+    // 多账号/换机时最常见的问题是「我现在登的是哪个号」,usage 里那一行埋得太深
+    const { hasDeviceCredential } = await import("./device-auth.js");
+    const cfg = loadConfig();
+    if (!hasDeviceCredential(cfg)) {
+        console.error("还没登录,先跑 u1s1 login");
+        process.exit(1);
     }
-    if (cmd === "web") {
-        console.error("u1s1 web 已下线，请使用 Desktop App：https://u1s1.io/#download");
-        process.exitCode = 1;
+    const { fetchMe } = await import("./api.js");
+    const me = await fetchMe(cfg).catch((e) => {
+        console.error(e.message);
+        process.exit(1);
+    });
+    console.log(me.email ?? "(未绑定邮箱)");
+    console.log(`  服务器  ${cfg.baseUrl}`);
+    console.log("  换账号:u1s1 logout 再 u1s1 login;看额度:u1s1 usage");
+}
+async function logoutCommand() {
+    const { saveConfig } = await import("./config.js");
+    const current = loadConfig();
+    if (!current.deviceToken && !current.apiKey) {
+        console.log("当前本来就没有登录。运行 u1s1 即可登录。");
         return;
     }
-    // `u1s1 login --help` 不该真的去登录、`logout --help` 不该真的退出:先看是不是在问用法
-    if (cmd && SIMPLE_COMMAND_HELP[cmd] && (args[1] === "--help" || args[1] === "-h")) {
-        for (const line of SIMPLE_COMMAND_HELP[cmd])
-            console.log(line);
-        return;
+    let serverRevoked = false;
+    if (current.deviceToken) {
+        const { authorizedFetch } = await import("./device-auth.js");
+        const resp = await authorizedFetch(current, `${current.baseUrl}/device`, { method: "DELETE" }).catch(() => null);
+        serverRevoked = resp?.ok ?? false;
     }
-    if (cmd === "deploy") {
-        const { deployCommand, printDeployHelp } = await import("./deploy.js");
-        // --help 不该先被拽去登录
-        if (args.slice(1).includes("--help") || args.slice(1).includes("-h")) {
-            printDeployHelp();
-            return;
-        }
-        const { ensureAuth } = await import("./login.js");
-        const cfg = await ensureAuth();
-        await deployCommand(cfg, args.slice(1));
-        return;
+    saveConfig({
+        ...current,
+        apiKey: undefined,
+        deviceToken: undefined,
+        deviceId: undefined,
+        devicePrivateJwk: undefined,
+        devicePublicJwk: undefined,
+        email: undefined,
+    });
+    if (serverRevoked) {
+        console.log("已退出登录,这台设备在服务端的授权也已注销。");
     }
-    if (cmd === "login") {
-        const { login } = await import("./login.js");
-        await login(args[1]);
-        return;
+    else {
+        console.log("已退出本机登录。");
+        console.log("(没连上服务器注销这台设备;如有需要,可在 https://u1s1.io/dashboard 的设备列表里手动移除。)");
     }
-    if (cmd === "usage") {
+}
+/** 子命令表:每条都按需 import,不带子命令直接进对话界面的路径不多加载任何模块。 */
+const COMMANDS = {
+    deploy: deployEntry,
+    login: async (rest) => {
+        const { login } = await import("./login.js");
+        await login(rest[0]);
+    },
+    logout: logoutCommand,
+    usage: async () => {
         const { usage } = await import("./usage.js");
         await usage();
-        return;
-    }
-    if (cmd === "feedback") {
+    },
+    whoami: whoamiCommand,
+    feedback: async (rest) => {
         const { feedbackCommand } = await import("./feedback.js");
-        await feedbackCommand(args.slice(1));
-        return;
-    }
-    if (cmd === "mcp") {
+        await feedbackCommand(rest);
+    },
+    mcp: async (rest) => {
         const { mcpCommand } = await import("./mcp/command.js");
-        await mcpCommand(args.slice(1));
-        return;
-    }
-    if (cmd === "model") {
+        await mcpCommand(rest);
+    },
+    model: async (rest) => {
         const { modelCommand } = await import("./model.js");
-        await modelCommand(args[1]);
-        return;
-    }
-    if (cmd === "logout") {
-        const { saveConfig } = await import("./config.js");
-        const current = loadConfig();
-        if (!current.deviceToken && !current.apiKey) {
-            console.log("当前本来就没有登录。运行 u1s1 即可登录。");
-            return;
-        }
-        let serverRevoked = false;
-        if (current.deviceToken) {
-            const { authorizedFetch } = await import("./device-auth.js");
-            const resp = await authorizedFetch(current, `${current.baseUrl}/device`, { method: "DELETE" }).catch(() => null);
-            serverRevoked = resp?.ok ?? false;
-        }
-        saveConfig({
-            ...current,
-            apiKey: undefined,
-            deviceToken: undefined,
-            deviceId: undefined,
-            devicePrivateJwk: undefined,
-            devicePublicJwk: undefined,
-        });
-        if (serverRevoked) {
-            console.log("已退出登录,这台设备在服务端的授权也已注销。");
-        }
-        else {
-            console.log("已退出本机登录。");
-            console.log("(没连上服务器注销这台设备;如有需要,可在 https://u1s1.io/dashboard 的设备列表里手动移除。)");
-        }
-        return;
-    }
-    if (cmd === "update") {
+        await modelCommand(rest[0]);
+    },
+    update: async () => {
         const { update } = await import("./update.js");
         await update();
+    },
+    import: async (rest) => {
+        const { importCommand } = await import("./import/index.js");
+        await importCommand(rest);
+    },
+    bench: async (rest) => {
+        const { benchCommand } = await import("./bench.js");
+        await benchCommand(rest);
+    },
+    web: async () => {
+        console.error("u1s1 web 已下线，请使用 Desktop App：https://u1s1.io/#download");
+        process.exitCode = 1;
+    },
+};
+/**
+ * 拼错的子命令(如 `u1s1 depoly`)不该被静默当成第一条消息发给模型白烧 token。
+ * 只拦「单个短英文词 + 与已知命令编辑距离很近」的情况,正常 prompt 不受影响;
+ * `u1s1 delpoy list` 这类带参数的拼错也拦;长句(≥4 个词)才当 prompt 放行。
+ */
+function rejectMistypedCommand(cmd, argCount) {
+    if (argCount > 3 || !/^[a-z][a-z0-9-]{1,15}$/.test(cmd) || KNOWN_COMMANDS.includes(cmd))
+        return false;
+    const near = KNOWN_COMMANDS.find((k) => editDistance(k, cmd) <= (k.length <= 4 ? 1 : 2));
+    if (!near)
+        return false;
+    console.error(`不认识的命令「${cmd}」,你是不是想运行:u1s1 ${near}`);
+    console.error("查看全部命令:u1s1 --help;直接开始对话:运行 u1s1(不带参数)");
+    process.exitCode = 1;
+    return true;
+}
+async function run() {
+    const args = process.argv.slice(2);
+    const cmd = args[0];
+    const rest = args.slice(1);
+    if (cmd === "--version" || cmd === "-v") {
+        console.log(`u1s1 v${VERSION}`);
         return;
     }
-    if (cmd === "import") {
-        const { importCommand } = await import("./import/index.js");
-        await importCommand(args.slice(1));
+    if (cmd === "--help" || cmd === "-h" || cmd === "help") {
+        printHelp();
         return;
     }
-    if (cmd === "bench") {
-        const { benchCommand } = await import("./bench.js");
-        await benchCommand(args.slice(1));
+    // `u1s1 login --help` 不该真的去登录、`logout --help` 不该真的退出:先看是不是在问用法
+    if (cmd && Object.hasOwn(SIMPLE_COMMAND_HELP, cmd) && wantsHelp(rest)) {
+        for (const line of SIMPLE_COMMAND_HELP[cmd])
+            console.log(line);
         return;
     }
-    // 拼错的子命令(如 `u1s1 depoly`)不该被静默当成第一条消息发给模型白烧 token。
-    // 只拦「单个短英文词 + 与已知命令编辑距离很近」的情况,正常 prompt 不受影响。
-    // `u1s1 delpoy list` 这类带参数的拼错也拦;长句(≥4 个词)才当 prompt 放行
-    if (cmd
-        && args.length <= 3
-        && /^[a-z][a-z0-9-]{1,15}$/.test(cmd)
-        && !KNOWN_COMMANDS.includes(cmd)) {
-        const near = KNOWN_COMMANDS.find((k) => editDistance(k, cmd) <= (k.length <= 4 ? 1 : 2));
-        if (near) {
-            console.error(`不认识的命令「${cmd}」,你是不是想运行:u1s1 ${near}`);
-            console.error("查看全部命令:u1s1 --help;直接开始对话:运行 u1s1(不带参数)");
-            process.exitCode = 1;
-            return;
-        }
+    if (cmd && Object.hasOwn(COMMANDS, cmd)) {
+        await COMMANDS[cmd](rest);
+        return;
     }
+    if (cmd && rejectMistypedCommand(cmd, args.length))
+        return;
     const { ensureAuth } = await import("./login.js");
     const cfg = await ensureAuth();
     // 在后台检查更新（非阻塞，不影响启动速度）
@@ -664,7 +692,7 @@ async function run() {
     // autoUpdate 开着且启动时发现了新版:现在装(TUI 已退出,原地重铺安全)
     installPendingUpdate();
 }
-const KNOWN_COMMANDS = ["deploy", "login", "logout", "usage", "model", "update", "import", "mcp", "bench", "feedback", "help"];
+const KNOWN_COMMANDS = ["deploy", "login", "logout", "usage", "whoami", "model", "update", "import", "mcp", "bench", "feedback", "help"];
 /** 没有自己 --help 处理的简单子命令:问用法时只打印说明,不执行任何动作。 */
 const SIMPLE_COMMAND_HELP = {
     login: [
@@ -680,6 +708,10 @@ const SIMPLE_COMMAND_HELP = {
         "用法: u1s1 usage",
         "  查看剩余额度:免费包、已购用量包与余额。会话内也可输入 /usage。",
     ],
+    whoami: [
+        "用法: u1s1 whoami",
+        "  打印当前登录的账号邮箱和服务器地址;换账号先 u1s1 logout 再 u1s1 login。",
+    ],
     update: [
         "用法: u1s1 update",
         "  检查并升级到最新版;npm 安装的走 npm,便携版原地自更新。",

package/dist/login.js

@@ -228,7 +228,10 @@ export async function login(keyArg) {
         quotaNote = `今日免费还剩 $${me.daily_free_remaining_usd.toFixed(2)},永久余额 $${me.remaining_usd.toFixed(2)}`;
     }
     console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`);
-    return next;
+    // 邮箱记进 config,启动横幅直接显示「账号」,不用再问「我现在登的是哪个号」
+    const withAccount = { ...next, email: me.email ?? undefined };
+    saveConfig(withAccount);
+    return withAccount;
 }
 /** Returns a config with a browser-approved, sender-constrained device credential. */
 export async function ensureAuth() {

package/dist/mcp/client.js

@@ -315,36 +315,33 @@ class HttpTransport {
 /** 把 tools/call 返回的 content 数组压成模型可读的文本 */
 export function contentToText(result) {
     const rec = asRecord(result) ?? {};
-    const parts = [];
     const content = Array.isArray(rec["content"]) ? rec["content"] : [];
-    for (const raw of content) {
-        const item = asRecord(raw);
-        if (!item)
-            continue;
-        const type = item["type"];
-        if (type === "text" && typeof item["text"] === "string") {
-            parts.push(item["text"]);
-        }
-        else if (type === "image" || type === "audio") {
-            const data = typeof item["data"] === "string" ? item["data"] : "";
-            parts.push(`[${type} ${String(item["mimeType"] ?? "")} ${Buffer.from(data, "base64").length} bytes, omitted]`);
-        }
-        else if (type === "resource") {
-            const res = asRecord(item["resource"]);
-            if (res && typeof res["text"] === "string")
-                parts.push(res["text"]);
-            else
-                parts.push(`[resource ${String(res?.["uri"] ?? "")} (binary, omitted)]`);
-        }
-        else if (type === "resource_link") {
-            parts.push(`[link] ${String(item["uri"] ?? "")}${item["name"] ? ` ${String(item["name"])}` : ""}`);
-        }
-    }
+    const parts = content.map(contentPartText).filter((part) => part !== null);
     if (parts.length === 0 && rec["structuredContent"] !== undefined) {
         parts.push(JSON.stringify(rec["structuredContent"], null, 2));
     }
     return { text: parts.join("\n").trim(), isError: rec["isError"] === true };
 }
+/** 单个 content 项的文本表示:文本原样,二进制只留类型与大小,未知类型忽略。 */
+function contentPartText(raw) {
+    const item = asRecord(raw);
+    if (!item)
+        return null;
+    const type = item["type"];
+    if (type === "text")
+        return typeof item["text"] === "string" ? item["text"] : null;
+    if (type === "image" || type === "audio") {
+        const data = typeof item["data"] === "string" ? item["data"] : "";
+        return `[${type} ${String(item["mimeType"] ?? "")} ${Buffer.from(data, "base64").length} bytes, omitted]`;
+    }
+    if (type === "resource") {
+        const res = asRecord(item["resource"]);
+        return res && typeof res["text"] === "string" ? res["text"] : `[resource ${String(res?.["uri"] ?? "")} (binary, omitted)]`;
+    }
+    if (type === "resource_link")
+        return `[link] ${String(item["uri"] ?? "")}${item["name"] ? ` ${String(item["name"])}` : ""}`;
+    return null;
+}
 export function normalizeToolInfo(raw) {
     const rec = asRecord(raw);
     if (!rec || typeof rec["name"] !== "string" || !rec["name"])

package/dist/mcp/command.js

@@ -75,74 +75,82 @@ function dropCache(name) {
     delete cache.servers[name];
     saveMcpToolCache(cache);
 }
+/** `--flag=value` 直接取值;`--flag value` 消费下一个参数并推进游标。 */
+function optionValue(arg, inlinePrefix, args, cursor) {
+    return arg.startsWith(inlinePrefix) ? arg.slice(inlinePrefix.length) : args[++cursor.i];
+}
+function applyAddOption(arg, args, cursor, opts) {
+    if (arg === "--force" || arg === "-f") {
+        opts.force = true;
+    }
+    else if (arg === "--url" || arg.startsWith("--url=")) {
+        opts.url = optionValue(arg, "--url=", args, cursor);
+        if (!opts.url)
+            fail("--url 后面要跟地址");
+    }
+    else if (arg === "--env" || arg === "-e" || arg.startsWith("--env=")) {
+        const raw = optionValue(arg, "--env=", args, cursor);
+        const kv = raw ? parseKeyValue(raw, "=") : undefined;
+        if (!kv)
+            fail(`--env 要写成 KEY=VALUE:${raw ?? ""}`);
+        opts.env[kv[0]] = kv[1];
+    }
+    else if (arg === "--header" || arg === "-H" || arg.startsWith("--header=")) {
+        const raw = optionValue(arg, "--header=", args, cursor);
+        const kv = raw ? parseKeyValue(raw, ":") : undefined;
+        if (!kv)
+            fail(`--header 要写成 "Name: value":${raw ?? ""}`);
+        opts.headers[kv[0]] = kv[1];
+    }
+    else if (arg.startsWith("-") && arg.length > 1) {
+        fail(`不认识的选项 ${arg}(命令自己的参数请放在命令后面,或用 -- 隔开)`);
+    }
+    else {
+        opts.command = arg;
+    }
+}
+/** --url 走 HTTP 型(只认 --header),否则命令型(只认 --env);两者互斥。 */
+function serverFromAddOptions(name, opts) {
+    const { url, command, force } = opts;
+    if (url && command)
+        fail("--url 和命令只能二选一");
+    if (url) {
+        if (!/^https?:\/\//i.test(url))
+            fail(`--url 必须是 http(s) 地址:${url}`);
+        if (Object.keys(opts.env).length)
+            fail("HTTP 型服务不支持 --env,鉴权请用 --header");
+        return { name, server: { type: "http", url, headers: opts.headers }, force };
+    }
+    if (!command)
+        fail("请给出启动命令(如 npx -y some-mcp-server)或 --url 地址");
+    if (Object.keys(opts.headers).length)
+        fail("命令型服务不支持 --header,请用 --env 传密钥");
+    return { name, server: { type: "stdio", command, args: opts.commandArgs, env: opts.env }, force };
+}
 export function parseAddArgs(args) {
     const name = args[0];
     if (!name || name.startsWith("-"))
         fail("请给服务起个名字,例:u1s1 mcp add tavily npx -y tavily-mcp");
     if (!MCP_SERVER_NAME_RE.test(name))
         fail(`服务名只能用小写字母、数字、- 和 _,且以字母或数字开头(最长 32 位):${name}`);
-    let url;
-    const env = {};
-    const headers = {};
-    let force = false;
-    let command;
-    const commandArgs = [];
-    for (let i = 1; i < args.length; i++) {
-        const a = args[i];
-        if (command !== undefined) {
-            commandArgs.push(a);
+    const opts = { commandArgs: [], env: {}, headers: {}, force: false };
+    const cursor = { i: 1 };
+    for (; cursor.i < args.length; cursor.i++) {
+        const a = args[cursor.i];
+        if (opts.command !== undefined) {
+            opts.commandArgs.push(a);
             continue;
         }
         if (a === "--") {
-            command = args[i + 1];
-            commandArgs.push(...args.slice(i + 2));
-            if (command === undefined)
+            opts.command = args[cursor.i + 1];
+            opts.commandArgs.push(...args.slice(cursor.i + 2));
+            if (opts.command === undefined)
                 fail("-- 后面要跟命令");
             break;
         }
-        if (a === "--force" || a === "-f") {
-            force = true;
-        }
-        else if (a === "--url" || a.startsWith("--url=")) {
-            url = a.includes("=") ? a.slice(6) : args[++i];
-            if (!url)
-                fail("--url 后面要跟地址");
-        }
-        else if (a === "--env" || a === "-e" || a.startsWith("--env=")) {
-            const raw = a.includes("=") && a.startsWith("--env=") ? a.slice(6) : args[++i];
-            const kv = raw ? parseKeyValue(raw, "=") : undefined;
-            if (!kv)
-                fail(`--env 要写成 KEY=VALUE:${raw ?? ""}`);
-            env[kv[0]] = kv[1];
-        }
-        else if (a === "--header" || a === "-H" || a.startsWith("--header=")) {
-            const raw = a.startsWith("--header=") ? a.slice(9) : args[++i];
-            const kv = raw ? parseKeyValue(raw, ":") : undefined;
-            if (!kv)
-                fail(`--header 要写成 "Name: value":${raw ?? ""}`);
-            headers[kv[0]] = kv[1];
-        }
-        else if (a.startsWith("-") && a.length > 1) {
-            fail(`不认识的选项 ${a}(命令自己的参数请放在命令后面,或用 -- 隔开)`);
-        }
-        else {
-            command = a;
-        }
-    }
-    if (url && command)
-        fail("--url 和命令只能二选一");
-    if (url) {
-        if (!/^https?:\/\//i.test(url))
-            fail(`--url 必须是 http(s) 地址:${url}`);
-        if (Object.keys(env).length)
-            fail("HTTP 型服务不支持 --env,鉴权请用 --header");
-        return { name, server: { type: "http", url, headers }, force };
+        applyAddOption(a, args, cursor, opts);
     }
-    if (!command)
-        fail("请给出启动命令(如 npx -y some-mcp-server)或 --url 地址");
-    if (Object.keys(headers).length)
-        fail("命令型服务不支持 --header,请用 --env 传密钥");
-    return { name, server: { type: "stdio", command, args: commandArgs, env }, force };
+    return serverFromAddOptions(name, opts);
 }
 async function addCommand(args) {
     const { name, server, force } = parseAddArgs(args);

package/dist/style.js

@@ -1,8 +1,8 @@
 import { readdirSync } from "node:fs";
 import { basename } from "node:path";
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { readSettings } from "./config.js";
-import { renderBrandHeader } from "./brand.js";
+import { loadConfig, readSettings } from "./config.js";
+import { cwdAdvice, renderBrandHeader } from "./brand.js";
 /**
  * 启动横幅版本号后面的升级状态(如「发现新版 v0.9.3,自动更新中…」)。
  * checkAndAutoUpdate 异步写入;横幅已挂载时主动触发一次重绘,否则等首帧渲染。
@@ -36,6 +36,17 @@ export function applyBrandUi(pi, version) {
                 return false;
             }
         })();
+        // 在配置目录 / 用户主目录里启动:横幅下提醒换到项目文件夹
+        const cwdWarning = cwdAdvice(process.cwd());
+        // 登录账号:login 时记进 config.email;/clear 重新 session_start 也会重读
+        const account = (() => {
+            try {
+                return loadConfig().email;
+            }
+            catch {
+                return undefined;
+            }
+        })();
         // 检查设置:关掉就不显示启动横幅
         const settings = readSettings();
         if (settings.showStartupBanner !== false) {
@@ -51,6 +62,8 @@ export function applyBrandUi(pi, version) {
                             notice: updateNotice,
                             announcement,
                             starterTips,
+                            cwdWarning,
+                            account,
                         }).map((line) => truncateToWidth(line, width));
                     },
                     invalidate() { },

package/dist/tools.d.ts

@@ -3,6 +3,17 @@ import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import type { CliConfig } from "./config.js";
 export declare function truncate(text: string): string;
+/**
+ * 长网页按 30k 字符开窗返回:光截断而不给「怎么读下一段」,模型会拿前 30k 硬答
+ * (工单「内置搜索动不动就截断」)。尾注写明本窗范围和下一次该传的 offset。
+ */
+export declare function windowText(text: string, offset: number): {
+    text: string;
+    truncated: boolean;
+    nextOffset: number | null;
+};
+/** 测试用:清掉进程内页面缓存。 */
+export declare function resetPageCacheForTests(): void;
 /** 只下载前 maxBytes 就断流,超大页面不用整个拉完再丢。 */
 export declare function readBodyCapped(resp: Response, maxBytes: number): Promise<Uint8Array>;
 /** 联网工具通用渲染:调用行不占位,收起时只显一行摘要,ctrl+o 展开全文,出错显一行 ✗ */
@@ -75,4 +86,5 @@ export interface FetchToolConfig {
  */
 export declare function createFetchTool(cfg: FetchToolConfig): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{
     url: Type.TString;
+    offset: Type.TOptional<Type.TNumber>;
 }>, unknown, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;

package/dist/tools.js

@@ -40,6 +40,50 @@ export function truncate(text) {
         return text;
     return `${text.slice(0, MAX_TEXT_CHARS)}\n\n…（内容过长已截断，共 ${text.length} 字符）`;
 }
+/**
+ * 长网页按 30k 字符开窗返回:光截断而不给「怎么读下一段」,模型会拿前 30k 硬答
+ * (工单「内置搜索动不动就截断」)。尾注写明本窗范围和下一次该传的 offset。
+ */
+export function windowText(text, offset) {
+    const start = Math.min(Math.max(0, Math.floor(offset || 0)), text.length);
+    const end = Math.min(start + MAX_TEXT_CHARS, text.length);
+    const body = text.slice(start, end);
+    if (start === 0 && end === text.length)
+        return { text: body, truncated: false, nextOffset: null };
+    const head = start > 0 ? `（从第 ${start} 字符起继续）\n\n` : "";
+    const tail = end < text.length
+        ? `\n\n…（内容过长已截断：本次为第 ${start}–${end} 字符，共 ${text.length} 字符；要继续读取，用同一 url 再调一次 web_fetch 并传 offset=${end}）`
+        : `\n\n（已到末尾：第 ${start}–${end} 字符，共 ${text.length} 字符）`;
+    return { text: `${head}${body}${tail}`, truncated: end < text.length, nextOffset: end < text.length ? end : null };
+}
+/** 同一页面带 offset 续读时直接命中,不再重新抓取(云端渲染是按次计费的)。 */
+const PAGE_CACHE_MAX = 8;
+const PAGE_CACHE_TTL_MS = 10 * 60_000;
+const pageCache = new Map();
+function rememberPage(url, entry) {
+    pageCache.delete(url);
+    pageCache.set(url, { ...entry, at: Date.now() });
+    while (pageCache.size > PAGE_CACHE_MAX) {
+        const oldest = pageCache.keys().next().value;
+        if (oldest === undefined)
+            break;
+        pageCache.delete(oldest);
+    }
+}
+function recallPage(url) {
+    const hit = pageCache.get(url);
+    if (!hit)
+        return null;
+    if (Date.now() - hit.at > PAGE_CACHE_TTL_MS) {
+        pageCache.delete(url);
+        return null;
+    }
+    return hit;
+}
+/** 测试用:清掉进程内页面缓存。 */
+export function resetPageCacheForTests() {
+    pageCache.clear();
+}
 /** 只下载前 maxBytes 就断流,超大页面不用整个拉完再丢。 */
 export async function readBodyCapped(resp, maxBytes) {
     if (!resp.body)
@@ -109,6 +153,8 @@ export function compactResultRender(input) {
     const text = resultText(result);
     return new Text(text, 0, 0);
 }
+/** 网关 search.ts 的 MAX_DOUBAO_QUERY_CHARS:豆包 Query 超 100 字符服务端自行截断。 */
+const SEARCH_QUERY_MAX_CHARS = 100;
 /** 联网搜索工具:走 u1s1 网关代理,上游 key 不落到用户机器上。 */
 export function createSearchTool(cfg) {
     return defineTool({
@@ -121,7 +167,9 @@ export function createSearchTool(cfg) {
             "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." }),
+            query: Type.String({
+                description: "Search query. Be specific; keep it under ~15 words / 100 characters (the search engine only reads the first 100).",
+            }),
             maxResults: Type.Optional(Type.Number({ description: "How many results to return (1-10, default 5).", minimum: 1, maximum: 10 })),
         }),
         // 精简展示:收起时一行摘要(🔍 搜索 "…" · N 条结果),ctrl+o 展开全文
@@ -139,6 +187,10 @@ export function createSearchTool(cfg) {
         async execute(_toolCallId, params, signal) {
             const data = await searchWeb(cfg, { query: params.query, maxResults: params.maxResults, signal });
             const lines = [];
+            // 上游(豆包)只按前 100 字符检索,长句子会被悄悄砍掉后半段;提醒模型下次改短
+            if (params.query.length > SEARCH_QUERY_MAX_CHARS) {
+                lines.push(`Note: the query was ${params.query.length} characters; the search engine only used the first ${SEARCH_QUERY_MAX_CHARS}. Retry with a shorter keyword query if the results look off.`, "");
+            }
             if (data.answer)
                 lines.push(`Answer: ${data.answer}`, "");
             if (data.results.length === 0) {
@@ -529,13 +581,17 @@ export function createFetchTool(cfg) {
     return 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. If the direct fetch fails or the page needs JavaScript, it automatically retries through a cloud headless browser.",
-        promptSnippet: "抓取指定网址并转成可读文本",
+        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. If the direct fetch fails or the page needs JavaScript, it automatically retries through a cloud headless browser. Long pages are returned in 30,000-character windows: when the result says it was truncated, call again with the same url and the offset it gives to read the next part.",
+        promptSnippet: "Fetch a URL and convert it to readable text",
         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." }),
+            offset: Type.Optional(Type.Number({
+                description: "Character offset to start from (default 0). Use the offset given at the end of a truncated result to continue reading the same page.",
+                minimum: 0,
+            })),
         }),
         // 精简展示:收起时一行摘要(🌐 url · N 字符 · ☁ 渲染),ctrl+o 展开全文
         renderShell: "self",
@@ -547,8 +603,9 @@ export function createFetchTool(cfg) {
             const d = result.details;
             const u = previewLine(d?.url ?? "…", 90);
             const n = typeof d?.chars === "number" ? ` · ${d.chars} 字符` : "";
+            const win = d?.offset ? ` · 从第 ${d.offset} 字符续读` : d?.truncated ? " · 只读了开头" : "";
             const cloud = d?.via === "render" ? " · ☁ 浏览器渲染" : "";
-            return compactResultRender({ result, options, theme, context, summaryLine: `🌐 ${u}${n}${cloud}` });
+            return compactResultRender({ result, options, theme, context, summaryLine: `🌐 ${u}${n}${win}${cloud}` });
         },
         async execute(_toolCallId, params, signal) {
             let url;
@@ -562,10 +619,19 @@ export function createFetchTool(cfg) {
             if (url.protocol !== "http:" && url.protocol !== "https:") {
                 throw new Error(`只支持 http/https,收到 ${url.protocol}`);
             }
-            const ok = (text, via, contentType) => ({
-                content: [{ type: "text", text: truncate(`# ${url.href}\n\n${text || "(空白页面)"}`) }],
-                details: { url: url.href, contentType, via, chars: text.length },
-            });
+            const offset = Math.max(0, Math.floor(params.offset ?? 0));
+            const ok = (text, via, contentType) => {
+                rememberPage(url.href, { text, via, contentType });
+                const win = windowText(text || "(空白页面)", offset);
+                return {
+                    content: [{ type: "text", text: `# ${url.href}\n\n${win.text}` }],
+                    details: { url: url.href, contentType, via, chars: text.length, offset, truncated: win.truncated, nextOffset: win.nextOffset },
+                };
+            };
+            // 续读同一页:10 分钟内直接用上次抓到的正文,不重新请求(渲染按次计费)
+            const cached = offset > 0 ? recallPage(url.href) : null;
+            if (cached)
+                return ok(cached.text, cached.via, cached.contentType);
             let direct = null;
             try {
                 direct = await fetchDirect(url, signal);

package/dist/usage.d.ts

@@ -1,7 +1,8 @@
 import { type MeResponse } from "./api.js";
 export declare const TOPUP_URL = "https://u1s1.io/dashboard#usage-topup-card";
 /**
- * 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。
+ * 报告尾巴的两条行动入口:打卡/邀请领包与充值(撞线用户的直接出口,运营清单 A2)。
+ * 08-25 起没有「每天自动恢复」的免费池,邀请包也和打卡包一样有有效期,别再写「永久加量」。
  * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
  * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
  */

package/dist/usage.js

@@ -54,9 +54,11 @@ function packageScopeNote(pkg) {
     if (pkg.kind === "login_checkin") {
         return "仅限 u1s1 客户端使用 · 全模型可用";
     }
-    return pkg.scope === "free"
-        ? "免费包适用模型 · 0 点恢复"
-        : "仅限 u1s1 客户端使用 · 免费包适用模型";
+    if (pkg.scope === "free") {
+        // 只有按日发放的免费包(首月/年度包的每日额度)才 0 点恢复;一次性免费包用完就没了。
+        return pkg.daily_tokens != null ? "免费包适用模型 · 每日额度北京时间 0 点恢复" : "免费包适用模型";
+    }
+    return "仅限 u1s1 客户端使用 · 免费包适用模型";
 }
 function packageLabel(pkg) {
     const count = pkg.count > 1 ? ` ×${pkg.count}` : "";
@@ -123,14 +125,15 @@ function legacyUsageLines(me, tokensPerUsd) {
 }
 export const TOPUP_URL = "https://u1s1.io/dashboard#usage-topup-card";
 /**
- * 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。
+ * 报告尾巴的两条行动入口:打卡/邀请领包与充值(撞线用户的直接出口,运营清单 A2)。
+ * 08-25 起没有「每天自动恢复」的免费池,邀请包也和打卡包一样有有效期,别再写「永久加量」。
  * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
  * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
  */
 export function usageCtaLines(me) {
     const payClosed = me?.pay_enabled === false;
     return [
-        "  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard",
+        "  每天到仪表盘打卡领免费包；邀请朋友双方都加量 → https://u1s1.io/dashboard",
         payClosed
             ? "  充值通道即将开放；额度不够先到仪表盘领加量包、每日打卡 → https://u1s1.io/dashboard"
             : `  额度不够用?充值 → ${TOPUP_URL}`,

package/package.json

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