u1s1-cli 1.14.4 → 1.14.5

package/dist/api.d.ts

@@ -26,6 +26,8 @@ export interface MeResponse {
     free_claim?: "first" | "renew" | null;
     /** 支付通道是否开放;老网关没有该字段,按开放处理(保留充值入口) */
     pay_enabled?: boolean;
+    /** 拉新收口:false = 收口后注册的账号,没有打卡等活动;老网关没有该字段,按可参与处理 */
+    incentives_eligible?: boolean;
 }
 export interface MePackage {
     id: number;

package/dist/config.d.ts

@@ -94,7 +94,7 @@ export interface ModelDef {
  * 而 deepseek-flash 的窗口是 1M,会话逼近 100 万 token 才压缩——每轮 2 MB 请求体对渠道、
  * 时延、成本都是负担(近 7 天 >200K 的请求占 28% 却吃掉 54% 采购)。所以把注册给 pi 的
  * contextWindow 钉在 min(模型窗口, 预算),压缩、/context 百分比、溢出判定都随之按预算算。
- * 只影响自动压缩时机,不改模型能力。见 docs/dev-plan-long-session-auto-compact-2026-09-14.md。
+ * 只影响自动压缩时机,不改模型能力。
  */
 export declare const DEFAULT_COMPACTION_BUDGET_TOKENS = 200000;
 /**

package/dist/config.js

@@ -100,7 +100,7 @@ export const UNKNOWN_MODEL_COST = { input: 0, output: 0, cacheRead: 0, cacheWrit
  * 而 deepseek-flash 的窗口是 1M,会话逼近 100 万 token 才压缩——每轮 2 MB 请求体对渠道、
  * 时延、成本都是负担(近 7 天 >200K 的请求占 28% 却吃掉 54% 采购)。所以把注册给 pi 的
  * contextWindow 钉在 min(模型窗口, 预算),压缩、/context 百分比、溢出判定都随之按预算算。
- * 只影响自动压缩时机,不改模型能力。见 docs/dev-plan-long-session-auto-compact-2026-09-14.md。
+ * 只影响自动压缩时机,不改模型能力。
  */
 export const DEFAULT_COMPACTION_BUDGET_TOKENS = 200_000;
 /**

package/dist/device-auth.d.ts

@@ -53,7 +53,7 @@ interface SigningProxy {
 }
 /** Attach a fresh (self-healing) attestation header to an outbound proxy request. */
 export declare function attachAttestationHeader(holder: AttestationHolder, headers: Headers): Promise<void>;
-export type ClientSurface = "terminal" | "web" | "desktop" | "cloud";
+export type ClientSurface = "terminal" | "web" | "desktop";
 /** What a failed gateway fetch looked like at the socket level; never carries request content. */
 export interface GatewayFetchFailure {
     /** Node/undici error code such as ECONNRESET or UND_ERR_CONNECT_TIMEOUT; "unknown" when absent. */
@@ -68,6 +68,7 @@ export interface GatewayFetchFailure {
  * agent's retry patterns still match.
  */
 export declare function describeFetchFailure(error: unknown): GatewayFetchFailure;
+export declare function isConnectPhaseFailure(failure: GatewayFetchFailure): boolean;
 /** One listener per process (telemetry); failures are reported only when the local caller is still waiting. */
 export declare function onGatewayFetchFailure(listener: ((failure: GatewayFetchFailure) => void) | undefined): void;
 /**

package/dist/device-auth.js

@@ -2,6 +2,7 @@ import { createHash, randomBytes, randomUUID, webcrypto } from "node:crypto";
 import { createServer } from "node:http";
 import { VERSION } from "./config.js";
 import { tr } from "./i18n.js";
+import { edgeFallbackOrigin } from "./site.js";
 const enc = new TextEncoder();
 const SIGNING_PROXY_REQUEST_LIMIT_BYTES = 32 * 1024 * 1024;
 let cachedPrivate;
@@ -204,7 +205,7 @@ export async function attachAttestationHeader(holder, headers) {
 }
 function clientSurface(fallback) {
     const explicit = process.env["U1S1_CLIENT"];
-    if (explicit === "terminal" || explicit === "web" || explicit === "desktop" || explicit === "cloud") {
+    if (explicit === "terminal" || explicit === "web" || explicit === "desktop") {
         return explicit;
     }
     return process.versions.electron ? "desktop" : fallback;
@@ -234,6 +235,16 @@ export function describeFetchFailure(error) {
         : causeMessage || code;
     return { code, detail: `${message} (${reason})` };
 }
+/**
+ * 只认建连阶段的失败(请求还没发出去,换个入口重发不会重复扣费)。ECONNRESET / 读超时这类
+ * 可能发生在请求已送达之后,不重试,照旧报给用户。
+ */
+const CONNECT_PHASE_CODES = new Set([
+    "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ENETUNREACH", "EHOSTUNREACH", "ETIMEDOUT", "UND_ERR_CONNECT_TIMEOUT",
+]);
+export function isConnectPhaseFailure(failure) {
+    return CONNECT_PHASE_CODES.has(failure.code);
+}
 let gatewayFetchFailureListener;
 /** One listener per process (telemetry); failures are reported only when the local caller is still waiting. */
 export function onGatewayFetchFailure(listener) {
@@ -256,6 +267,9 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
     updateAttestationHolder(attestation, attestationSource);
     const localKey = `local-${randomBytes(32).toString("hex")}`;
     const upstreamOrigin = new URL(cfg.baseUrl).origin;
+    // 中国站主域建连失败时换到大陆加速入口重试一次,本进程之后都走它(site.ts edgeFallbackOrigin)
+    const fallbackOrigin = edgeFallbackOrigin(upstreamOrigin);
+    let activeOrigin = upstreamOrigin;
     const server = createServer(async (req, res) => {
         try {
             if (req.headers.authorization !== `Bearer ${localKey}` || !req.url) {
@@ -278,7 +292,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
                 }
             };
             res.once("close", abortUpstream);
-            const target = new URL(`${localUrl.pathname}${localUrl.search}`, upstreamOrigin).toString();
+            const pathAndQuery = `${localUrl.pathname}${localUrl.search}`;
             try {
                 const body = await readSigningProxyRequestBody(req);
                 const outboundHeaders = requestHeaders(req.headers);
@@ -288,12 +302,24 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
                 outboundHeaders.set("x-u1s1-version", VERSION);
                 outboundHeaders.set("x-u1s1-platform", `${process.platform}-${process.arch}`);
                 await attachAttestationHeader(attestation, outboundHeaders);
-                const upstream = await authorizedFetch(cfg, target, {
+                const send = (origin) => authorizedFetch(cfg, new URL(pathAndQuery, origin).toString(), {
                     method: req.method ?? "GET",
                     headers: outboundHeaders,
                     body,
                     signal: upstreamAbort.signal,
                 });
+                const origin = activeOrigin;
+                let upstream;
+                try {
+                    upstream = await send(origin);
+                }
+                catch (error) {
+                    if (!fallbackOrigin || origin === fallbackOrigin || upstreamAbort.signal.aborted
+                        || !isConnectPhaseFailure(describeFetchFailure(error)))
+                        throw error;
+                    upstream = await send(fallbackOrigin);
+                    activeOrigin = fallbackOrigin;
+                }
                 res.writeHead(upstream.status, forwardedResponseHeaders(upstream.headers));
                 if (upstream.body) {
                     for await (const chunk of upstream.body)

package/dist/site.d.ts

@@ -27,6 +27,13 @@ export interface Site {
  * api.u1s1.io 由 migrateStoredBaseUrl 在下次保存时改写到新 apiBase。
  */
 export declare const CN_ORIGIN = "https://u1s1app.com";
+/**
+ * 中国站的大陆加速入口(EdgeOne → 同一个网关)。直连 api 主域在建连阶段就失败时,签名代理
+ * 换到这里重试一次,本进程之后都走它(device-auth.ts)。只在大陆有解析,海外解析不到也无妨。
+ */
+export declare const CN_EDGE_API_HOST = "api-cn.u1s1app.com";
+/** 这个网关 origin 连不上时可以换到的备用 origin;不是中国站官方 API 域名就没有备用。 */
+export declare function edgeFallbackOrigin(origin: string): string | null;
 /** origin → https://api.<host>/v1 */
 export declare function apiBaseForOrigin(origin: string): string;
 export declare const SITES: Readonly<Record<SiteId, Site>>;

package/dist/site.js

@@ -14,6 +14,25 @@
  */
 export const CN_ORIGIN = "https://u1s1app.com";
 const INTL_ORIGIN = "https://u1s1.dev";
+/**
+ * 中国站的大陆加速入口(EdgeOne → 同一个网关)。直连 api 主域在建连阶段就失败时,签名代理
+ * 换到这里重试一次,本进程之后都走它(device-auth.ts)。只在大陆有解析,海外解析不到也无妨。
+ */
+export const CN_EDGE_API_HOST = "api-cn.u1s1app.com";
+const CN_EDGE_FALLBACK_FROM = ["api.u1s1app.com", "api.u1s1.io"];
+/** 这个网关 origin 连不上时可以换到的备用 origin;不是中国站官方 API 域名就没有备用。 */
+export function edgeFallbackOrigin(origin) {
+    let url;
+    try {
+        url = new URL(origin);
+    }
+    catch {
+        return null;
+    }
+    if (url.protocol !== "https:" || url.port || !CN_EDGE_FALLBACK_FROM.includes(url.hostname.toLowerCase()))
+        return null;
+    return `https://${CN_EDGE_API_HOST}`;
+}
 /** origin → https://api.<host>/v1 */
 export function apiBaseForOrigin(origin) {
     const url = new URL(origin);
@@ -27,7 +46,7 @@ export const SITES = {
         releaseOrigin: CN_ORIGIN,
         // 邮件域已切到 u1s1app.com(2026-09-30);contact@u1s1.io 仍能收信,老版本照旧可用
         contactEmail: "contact@u1s1app.com",
-        hosts: ["u1s1.io", "www.u1s1.io", "api.u1s1.io", "u1s1app.com", "www.u1s1app.com", "api.u1s1app.com"],
+        hosts: ["u1s1.io", "www.u1s1.io", "api.u1s1.io", "u1s1app.com", "www.u1s1app.com", "api.u1s1app.com", CN_EDGE_API_HOST],
     },
     intl: {
         id: "intl",

package/dist/usage.d.ts

@@ -3,12 +3,14 @@ import { type Site } from "./site.js";
 /** 当前站点的充值深链(仪表盘充值卡片)。 */
 export declare function topupUrl(site?: Site): string;
 /**
- * 报告尾巴的两条行动入口:打卡/邀请领包与充值(撞线用户的直接出口,运营清单 A2)。
- * 08-25 起没有「每天自动恢复」的免费池,邀请包也和打卡包一样有有效期,别再写「永久加量」。
+ * 报告尾巴的两条行动入口:打卡领包与充值(撞线用户的直接出口,运营清单 A2)。
+ * 08-25 起没有「每天自动恢复」的免费池,打卡包有有效期,别再写「永久加量」。
+ * 2026-10-26 起邀请不再带来新奖励,不再提邀请;拉新收口后注册的账号(incentives_eligible=false)
+ * 也没有打卡,第一行只指仪表盘。
  * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
  * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
  */
-export declare function usageCtaLines(me?: Pick<MeResponse, "pay_enabled">, site?: Site): string[];
+export declare function usageCtaLines(me?: Pick<MeResponse, "pay_enabled" | "incentives_eligible">, site?: Site): string[];
 /** 额度报告正文(不含首尾空行),终端 `u1s1 usage` 和会话内 /usage 共用。 */
 export declare function usageReportLines(me: MeResponse, site?: Site): string[];
 /** 会话内 /usage 用:拉取额度并打包成 entry data,错误转成提示文字而不是抛出。 */

package/dist/usage.js

@@ -179,8 +179,10 @@ export function topupUrl(site = activeSite()) {
     return siteLinks(site).topup;
 }
 /**
- * 报告尾巴的两条行动入口:打卡/邀请领包与充值(撞线用户的直接出口,运营清单 A2)。
- * 08-25 起没有「每天自动恢复」的免费池,邀请包也和打卡包一样有有效期,别再写「永久加量」。
+ * 报告尾巴的两条行动入口:打卡领包与充值(撞线用户的直接出口,运营清单 A2)。
+ * 08-25 起没有「每天自动恢复」的免费池,打卡包有有效期,别再写「永久加量」。
+ * 2026-10-26 起邀请不再带来新奖励,不再提邀请;拉新收口后注册的账号(incentives_eligible=false)
+ * 也没有打卡,第一行只指仪表盘。
  * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
  * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
  */
@@ -188,7 +190,9 @@ export function usageCtaLines(me, site = activeSite()) {
     const payClosed = me?.pay_enabled === false;
     const { dashboard, topup } = siteLinks(site);
     return [
-        tr(`  每天到仪表盘打卡领免费包；邀请朋友双方都加量 → ${dashboard}`, `  Check in daily on the dashboard for free packs; invite friends and you both get more → ${dashboard}`),
+        me?.incentives_eligible === false
+            ? tr(`  用量包与充值记录在仪表盘 → ${dashboard}`, `  Packs and top-up history are on the dashboard → ${dashboard}`)
+            : tr(`  每天到仪表盘打卡领免费包 → ${dashboard}`, `  Check in daily on the dashboard for free packs → ${dashboard}`),
         payClosed
             ? tr(`  充值通道即将开放；额度不够先到仪表盘领加量包、每日打卡 → ${dashboard}`, `  Top-ups are coming soon; meanwhile grab extra packs and check in on the dashboard → ${dashboard}`)
             : tr(`  额度不够用?充值 → ${topup}`, `  Need more? Top up → ${topup}`),

package/package.json

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