u1s1-cli 1.11.1 → 1.11.2

package/dist/api.d.ts

@@ -48,7 +48,7 @@ export interface ApiAnnouncement {
 /** 服务端能力开关;字段缺失(老网关)时按开启处理,保持现状。 */
 export interface ApiFeatures {
     web_search?: boolean;
-    /** 网关配了 Browser Rendering 才为 true;老网关没有 /v1/fetch,缺失按关闭处理。 */
+    /** 网关配了云端浏览器渲染才为 true;老网关没有 /v1/fetch,缺失按关闭处理。 */
     web_fetch_render?: boolean;
     /** 网关配了方舟 ARK_API_KEY 才为 true;老网关没有 /v1/image,缺失按关闭处理。 */
     image_gen?: boolean;
@@ -117,7 +117,7 @@ export declare function searchWeb(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, in
     maxResults?: number;
     signal?: AbortSignal;
 }): Promise<SearchResponse>;
-/** web_fetch 直连失败时的回退:网关用 Cloudflare Browser Rendering 渲染后转 markdown。 */
+/** web_fetch 直连失败时的回退:网关用云端真浏览器渲染后转 markdown(能过挑战页)。 */
 export declare function renderPage(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, url: string, signal?: AbortSignal): Promise<{
     url: string;
     markdown: string;

package/dist/api.js

@@ -67,34 +67,47 @@ async function errorMessageFromResponse(resp, fallback) {
     return typeof error?.message === "string" ? error.message.slice(0, 2_000) : fallback;
 }
 export async function fetchModels(cfg) {
-    let resp;
+    const signal = AbortSignal.timeout(15_000);
     try {
-        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/models`, {
-            headers: { "x-u1s1-version": VERSION },
-            signal: AbortSignal.timeout(15_000),
-        });
+        let resp;
+        try {
+            resp = await authorizedFetch(cfg, `${cfg.baseUrl}/models`, {
+                headers: { "x-u1s1-version": VERSION },
+                signal,
+            });
+        }
+        catch (error) {
+            if (signal.aborted || (error instanceof Error && error.name === "TimeoutError"))
+                throw error;
+            throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`, { cause: error });
+        }
+        if (resp.status === 401)
+            throw new AuthError("登录已失效,请重新运行 u1s1 login");
+        if (resp.status === 403)
+            throw new AccessDeniedError(await errorMessageFromResponse(resp, "账号当前无法使用 u1s1"));
+        if (!resp.ok)
+            throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
+        const body = await readJsonResponseCapped(resp);
+        if (!body || !Array.isArray(body.data))
+            throw new Error("服务端模型列表格式不正确");
+        const token = body.client_attestation?.token;
+        const expiresIn = body.client_attestation?.expires_in;
+        return {
+            models: body.data,
+            features: body.features ?? {},
+            announcement: body.announcement,
+            clientAttestation: typeof token === "string" && token.length <= 1024 ? token : undefined,
+            clientAttestationExpiresInSeconds: typeof expiresIn === "number" && Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : undefined,
+        };
     }
-    catch {
-        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+    catch (error) {
+        if (error instanceof AuthError || error instanceof AccessDeniedError)
+            throw error;
+        if (signal.aborted || (error instanceof Error && error.name === "TimeoutError")) {
+            throw new Error("获取模型列表超时（15 秒内未完成）；可能与网络响应或本机繁忙有关，请稍后重试。", { cause: error });
+        }
+        throw error;
     }
-    if (resp.status === 401)
-        throw new AuthError("登录已失效,请重新运行 u1s1 login");
-    if (resp.status === 403)
-        throw new AccessDeniedError(await errorMessageFromResponse(resp, "账号当前无法使用 u1s1"));
-    if (!resp.ok)
-        throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
-    const body = await readJsonResponseCapped(resp);
-    if (!body || !Array.isArray(body.data))
-        throw new Error("服务端模型列表格式不正确");
-    const token = body.client_attestation?.token;
-    const expiresIn = body.client_attestation?.expires_in;
-    return {
-        models: body.data,
-        features: body.features ?? {},
-        announcement: body.announcement,
-        clientAttestation: typeof token === "string" && token.length <= 1024 ? token : undefined,
-        clientAttestationExpiresInSeconds: typeof expiresIn === "number" && Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : undefined,
-    };
 }
 /**
  * 会话内公告轮询用的轻量接口:免鉴权、服务端有缓存,回的就是 /v1/models 里的 announcement
@@ -200,7 +213,7 @@ export async function searchWeb(cfg, input) {
         results,
     };
 }
-/** web_fetch 直连失败时的回退:网关用 Cloudflare Browser Rendering 渲染后转 markdown。 */
+/** web_fetch 直连失败时的回退:网关用云端真浏览器渲染后转 markdown(能过挑战页)。 */
 export async function renderPage(cfg, url, signal) {
     if (!cfg.apiKey)
         throw new Error("没有配置 API Key");

package/dist/index.js

@@ -149,14 +149,11 @@ function ensureTmuxKeyboardProtocol() {
     runTmux(["bind-key", "-n", "S-Enter", "send-keys", "-l", "\x1b[13;2u"]);
     runTmux(["bind-key", "-n", "C-Enter", "send-keys", "-l", "\x1b[13;5u"]);
 }
-/** 取模型列表的请求发出后、发起 pi import 前的让路时间(见 runAgent 内注释)。 */
-const AGENT_IMPORT_DEFER_MS = 200;
 async function runAgent(cfg, args) {
     cleanupBrandThemes();
     ensureDefaultSettings();
-    // pi 在 import/初始化阶段可能读到的常量环境变量先设好(import 在下面网络请求
-    // 发出之后才发起);依赖网络结果的变量(签名代理地址/密钥、端点密钥)仍在进 pi
-    // 之前才设置——pi 只在调用时读它们。
+    // Set constant environment values before startup I/O; values derived from
+    // responses are configured below, before loading the kernel.
     process.env["PI_CODING_AGENT_DIR"] = agentDir;
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
@@ -177,14 +174,6 @@ async function runAgent(cfg, args) {
     let imageGenEnabled = false;
     const endpointsReady = loadCustomEndpoints(cfg);
     const modelsReady = fetchModels(cfg);
-    modelsReady.catch(() => { });
-    // pi 的模块图 import 要 300~800 ms,且 ESM 求值是同步的、会把事件循环卡住;
-    // 若在请求发出前就 import,请求要等它求值完才真正上线,重叠白做(实测总耗时不变)。
-    // 先让 DNS/TLS/写出在事件循环里推进一段,再发起 import,让它落在等服务端应答的空档里。
-    await new Promise((resolve) => setTimeout(resolve, AGENT_IMPORT_DEFER_MS));
-    const agentReady = import("@earendil-works/pi-coding-agent");
-    // 失败留到下面 await 时再抛;这里只是避免在等网络期间被当成未处理的 rejection。
-    agentReady.catch(() => { });
     let modelsResp;
     try {
         modelsResp = await modelsReady;
@@ -289,7 +278,11 @@ async function runAgent(cfg, args) {
         });
     };
     await searchToolsReady;
-    const { CustomEditor, main } = await agentReady;
+    // Module evaluation can block the event loop for seconds on slow filesystems.
+    // Finish startup requests and fallback/login handling before loading the kernel.
+    const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");
+    // Start this optional request after module evaluation so its timeout can progress.
+    void checkForUpdate();
     // 网页终端(如 Taikula)把 Shift+Enter 发成 ESC+CR(\x1b\r)。pi 在没开 Kitty
     // 协议时把它当成 Alt+Enter:空闲就直接发送,忙碌才排队。先改成 CSI-u 的
     // Shift+Enter,输入框就会换行,真·Alt+Enter(\x1b[13;3u)不受影响。
@@ -708,8 +701,6 @@ async function run() {
         return;
     const { ensureAuth } = await import("./login.js");
     const cfg = await ensureAuth();
-    // 在后台检查更新（非阻塞，不影响启动速度）
-    void checkForUpdate();
     await runAgent(cfg, args);
     // autoUpdate 开着且启动时发现了新版:现在装(TUI 已退出,原地重铺安全)
     installPendingUpdate();

package/dist/tools.d.ts

@@ -77,12 +77,12 @@ export declare function createImageTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey
 export interface FetchToolConfig {
     baseUrl: string;
     apiKey?: string;
-    /** 网关配了 Browser Rendering(features.web_fetch_render)才开;老网关没有 /v1/fetch。 */
+    /** 网关配了云端浏览器渲染(features.web_fetch_render)才开;老网关没有 /v1/fetch。 */
     renderFallback?: boolean;
 }
 /**
  * 抓网页工具:先直连(免费、快),打不开或疑似被反爬/JS 空壳时,回退到
- * 网关的 Cloudflare Browser Rendering 渲染(真无头浏览器,按次计费)。
+ * 网关的云端真浏览器渲染(能过人机验证挑战页,按次计费)。
  */
 export declare function createFetchTool(cfg: FetchToolConfig): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{
     url: Type.TString;

package/dist/tools.js

@@ -568,7 +568,7 @@ async function fetchDirect(url, signal) {
 }
 /**
  * 抓网页工具:先直连(免费、快),打不开或疑似被反爬/JS 空壳时,回退到
- * 网关的 Cloudflare Browser Rendering 渲染(真无头浏览器,按次计费)。
+ * 网关的云端真浏览器渲染(能过人机验证挑战页,按次计费)。
  */
 export function createFetchTool(cfg) {
     const canRender = () => !!(cfg.renderFallback && cfg.apiKey);
@@ -581,7 +581,7 @@ 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. 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.",
+        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 browser that can also clear bot-check interstitials. 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.",

package/package.json

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