u1s1-cli 1.2.1 → 1.2.3

package/dist/agent-setup.d.ts

@@ -1,9 +1,15 @@
-import { type CliConfig, type CustomEndpoint, type ModelDef } from "./config.js";
+import { type CliConfig, type CustomEndpoint, type ModelDef, type ThinkingLevel } from "./config.js";
 import type { ShellDoctorResult } from "./shell-doctor.js";
 /** pi auto-appends <agentDir>/APPEND_SYSTEM.md to its system prompt — our branding hook. */
 export declare function ensureBrandPrompt(shell: ShellDoctorResult): void;
+/**
+ * Seed per-model defaults without overwriting a user's Ctrl+S choice. The
+ * marker records values managed by u1s1, so a later Gateway default can update
+ * them while a diverged user value becomes user-owned.
+ */
+export declare function applyModelThinkingDefaults(settings: Record<string, unknown>, models: ModelDef[]): boolean;
 /** Defaults that don't overwrite values the user already set. */
-export declare function ensureDefaultSettings(): void;
+export declare function ensureDefaultSettings(models?: ModelDef[]): void;
 /** ≤0.4.0 wrote u1s1-dark/u1s1-light into the pi themes dir; remove them. */
 export declare function cleanupBrandThemes(): void;
 /**
@@ -54,10 +60,19 @@ export declare function toProviderModels(models: ModelDef[]): {
     id: string;
     name: string;
     reasoning: boolean;
+    thinkingLevelMap?: Partial<Record<ThinkingLevel, string | null>>;
     input: ("text" | "image")[];
     cost: ModelDef["cost"];
     contextWindow: number;
     maxTokens: number;
+    compat?: {
+        supportsStore?: boolean;
+        supportsDeveloperRole?: boolean;
+        supportsReasoningEffort: boolean;
+        maxTokensField?: "max_tokens";
+        requiresReasoningContentOnAssistantMessages?: boolean;
+        thinkingFormat: "openai" | "deepseek" | "qwen";
+    };
 }[];
 /**
  * 自定义端点 → pi provider 条目。密钥走环境变量引用(启动器已 set,见

package/dist/agent-setup.js

@@ -66,8 +66,52 @@ function bundledPiVersion() {
         return undefined;
     }
 }
+const THINKING_DEFAULTS_MARKER = "u1s1ModelThinkingDefaults";
+function recordValue(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+/**
+ * Seed per-model defaults without overwriting a user's Ctrl+S choice. The
+ * marker records values managed by u1s1, so a later Gateway default can update
+ * them while a diverged user value becomes user-owned.
+ */
+export function applyModelThinkingDefaults(settings, models) {
+    const defaults = models.filter((model) => model.thinking !== undefined);
+    if (defaults.length === 0)
+        return false;
+    const levels = { ...(recordValue(settings["modelThinkingLevels"]) ?? {}) };
+    const managed = { ...(recordValue(settings[THINKING_DEFAULTS_MARKER]) ?? {}) };
+    let changed = false;
+    for (const model of defaults) {
+        const key = `${PROVIDER_ID}/${model.id}`;
+        const next = model.thinking.defaultLevel;
+        const current = levels[key];
+        const previousManaged = managed[key];
+        if (current === undefined || current === previousManaged) {
+            if (current !== next) {
+                levels[key] = next;
+                changed = true;
+            }
+            if (previousManaged !== next) {
+                managed[key] = next;
+                changed = true;
+            }
+        }
+        else if (previousManaged !== undefined) {
+            delete managed[key];
+            changed = true;
+        }
+    }
+    if (changed) {
+        settings["modelThinkingLevels"] = levels;
+        settings[THINKING_DEFAULTS_MARKER] = managed;
+    }
+    return changed;
+}
 /** Defaults that don't overwrite values the user already set. */
-export function ensureDefaultSettings() {
+export function ensureDefaultSettings(models = []) {
     mkdirSync(agentDir, { recursive: true });
     const p = join(agentDir, "settings.json");
     let settings = {};
@@ -114,6 +158,8 @@ export function ensureDefaultSettings() {
         settings["autoUpdate"] = true;
         changed = true;
     }
+    if (applyModelThinkingDefaults(settings, models))
+        changed = true;
     // ≤0.4.0 shipped branded themes and forced them as default; the files are
     // gone now, so a settings.json still pointing at them must fall back to
     // pi's default theme.
@@ -333,15 +379,40 @@ export function ensureAuthCredential() {
 }
 /** pi provider 条目里的模型形状(models.json 与 registerProvider 共用)。 */
 export function toProviderModels(models) {
-    return models.map((m) => ({
-        id: m.id,
-        name: m.name,
-        reasoning: m.reasoning,
-        input: m.vision ? ["text", "image"] : ["text"],
-        cost: m.cost,
-        contextWindow: m.contextWindow,
-        maxTokens: m.maxTokens,
-    }));
+    return models.map((m) => {
+        let thinkingLevelMap;
+        let compat;
+        if (m.thinking) {
+            const supported = new Set(m.thinking.levels);
+            thinkingLevelMap = {};
+            for (const level of ["off", "minimal", "low", "medium", "high", "xhigh", "max"]) {
+                thinkingLevelMap[level] = supported.has(level) ? (m.thinking.levelMap[level] ?? level) : null;
+            }
+            compat = {
+                supportsReasoningEffort: true,
+                thinkingFormat: m.thinking.requestFormat,
+                ...(m.thinking.requestFormat === "deepseek"
+                    ? {
+                        supportsStore: false,
+                        supportsDeveloperRole: false,
+                        maxTokensField: "max_tokens",
+                        requiresReasoningContentOnAssistantMessages: true,
+                    }
+                    : {}),
+            };
+        }
+        return {
+            id: m.id,
+            name: m.name,
+            reasoning: m.reasoning,
+            thinkingLevelMap,
+            input: m.vision ? ["text", "image"] : ["text"],
+            cost: m.cost,
+            contextWindow: m.contextWindow,
+            maxTokens: m.maxTokens,
+            compat,
+        };
+    });
 }
 /**
  * 自定义端点 → pi provider 条目。密钥走环境变量引用(启动器已 set,见

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import { type CliConfig } from "./config.js";
+import { type ApiThinkingCapabilities, type CliConfig } from "./config.js";
 export interface MeResponse {
     email: string | null;
     signup_credit_usd?: number;
@@ -35,6 +35,8 @@ export interface ApiModel {
     id: string;
     name: string;
     reasoning: boolean;
+    /** Older gateways omit model-specific thinking metadata. */
+    thinking?: ApiThinkingCapabilities | null;
     /** Older gateways omit this field; missing means text-only. */
     vision?: boolean;
     context_length: number;
@@ -116,6 +118,14 @@ export interface ImageGenRequest {
     /** 1K/2K/4K 或 宽x高(如 2048x2048);缺省由服务端定(2K)。 */
     size?: string;
 }
+/**
+ * 新网关把结果同时放进响应头。这样即使 Cloudflare 到 Node 的 JSON body
+ * 在生成完成后被 Undici 报 `terminated`，也能继续下载已经计费的那张图。
+ */
+export declare function readGeneratedImageResponse(resp: Response): Promise<{
+    url: string;
+    size: string | null;
+}>;
 /** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
 export declare function generateImage(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, req: ImageGenRequest, signal?: AbortSignal): Promise<{
     url: string;

package/dist/api.js

@@ -109,6 +109,52 @@ export async function renderPage(cfg, url, signal) {
     }
     return (await resp.json());
 }
+const IMAGE_URL_HEADER = "x-u1s1-image-url";
+const IMAGE_SIZE_HEADER = "x-u1s1-image-size";
+function imageResultFromHeaders(resp) {
+    const encodedUrl = resp.headers.get(IMAGE_URL_HEADER);
+    if (!encodedUrl)
+        return null;
+    try {
+        const url = decodeURIComponent(encodedUrl);
+        const parsed = new URL(url);
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
+            return null;
+        const encodedSize = resp.headers.get(IMAGE_SIZE_HEADER);
+        return { url, size: encodedSize ? decodeURIComponent(encodedSize) : null };
+    }
+    catch {
+        return null;
+    }
+}
+function responseErrorDetail(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const cause = error instanceof Error ? error.cause : undefined;
+    const code = cause && typeof cause === "object" && "code" in cause && typeof cause.code === "string" ? cause.code : "";
+    return code && !message.includes(code) ? `${message} (${code})` : message;
+}
+/**
+ * 新网关把结果同时放进响应头。这样即使 Cloudflare 到 Node 的 JSON body
+ * 在生成完成后被 Undici 报 `terminated`，也能继续下载已经计费的那张图。
+ */
+export async function readGeneratedImageResponse(resp) {
+    const headerResult = imageResultFromHeaders(resp);
+    if (headerResult) {
+        await resp.body?.cancel().catch(() => undefined);
+        return headerResult;
+    }
+    try {
+        const body = (await resp.json());
+        if (typeof body.url !== "string" || !/^https?:\/\//.test(body.url)) {
+            throw new Error("服务端没有返回图片下载地址");
+        }
+        return { url: body.url, size: typeof body.size === "string" ? body.size : null };
+    }
+    catch (error) {
+        throw new Error(`图片可能已经生成,但客户端下载结果响应失败: ${responseErrorDetail(error)}。` +
+            "不要重新调用 generate_image,请升级 u1s1 后再试", { cause: error });
+    }
+}
 /** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
 export async function generateImage(cfg, req, signal) {
     if (!cfg.apiKey)
@@ -136,7 +182,7 @@ export async function generateImage(cfg, req, signal) {
         const body = (await resp.json().catch(() => null));
         throw new Error(body?.error?.message ?? `图片生成服务返回 ${resp.status},稍后再试`);
     }
-    return (await resp.json());
+    return readGeneratedImageResponse(resp);
 }
 export async function fetchMe(cfg) {
     if (!cfg.apiKey)

package/dist/config.d.ts

@@ -8,14 +8,28 @@ export declare const VERSION: string;
 export declare function isPortableInstall(): boolean;
 export declare const DEFAULT_BASE_URL = "https://api.u1s1.io/v1";
 export declare const PROVIDER_ID = "u1s1";
-/**
- * Convert an API model response to our internal ModelDef.
- * Aliases are derived from the short id; note is left empty (filled by /model command).
- */
-export declare function apiModelToDef(m: {
+export declare const THINKING_LEVELS: readonly ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
+export type ThinkingLevel = (typeof THINKING_LEVELS)[number];
+export type ThinkingRequestFormat = "openai" | "deepseek" | "qwen";
+export interface ThinkingCapabilities {
+    levels: ThinkingLevel[];
+    defaultLevel: ThinkingLevel;
+    canDisable: boolean;
+    levelMap: Partial<Record<ThinkingLevel, string>>;
+    requestFormat: ThinkingRequestFormat;
+}
+export interface ApiThinkingCapabilities {
+    levels: string[];
+    default_level: string;
+    can_disable: boolean;
+    level_map: Record<string, string>;
+    request_format: string;
+}
+interface ApiModelShape {
     id: string;
     name: string;
     reasoning: boolean;
+    thinking?: ApiThinkingCapabilities | null;
     vision?: boolean;
     context_length: number;
     max_tokens: number;
@@ -24,13 +38,20 @@ export declare function apiModelToDef(m: {
         output: number;
         cache_read: number | null;
     };
-}): ModelDef;
+}
+/**
+ * Convert an API model response to our internal ModelDef.
+ * Aliases are derived from the short id; note is left empty (filled by /model command).
+ */
+export declare function apiModelToDef(m: ApiModelShape): ModelDef;
 export interface ModelDef {
     id: string;
     name: string;
     /** short aliases accepted by `u1s1 model <name>` */
     aliases: string[];
     reasoning: boolean;
+    /** Model-specific thinking levels supplied by the Gateway. Missing means legacy pi behavior. */
+    thinking?: ThinkingCapabilities;
     vision: boolean;
     contextWindow: number;
     maxTokens: number;
@@ -137,3 +158,4 @@ export declare function saveConfig(cfg: CliConfig): void;
 export declare function persistPreferredModel(cfg: CliConfig, provider: string, modelId: string): CliConfig;
 export declare function saveEndpointsCache(endpoints: CustomEndpoint[]): void;
 export declare function loadEndpointsCache(): CustomEndpoint[];
+export {};

package/dist/config.js

@@ -28,16 +28,44 @@ function defaultAliases(id) {
     const aliases = [short, ...parts.filter((p) => p.length > 1)];
     return [...new Set(aliases)];
 }
+export const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
+const THINKING_LEVEL_SET = new Set(THINKING_LEVELS);
+function parseThinkingCapabilities(value) {
+    if (!value || !Array.isArray(value.levels))
+        return undefined;
+    const levels = [...new Set(value.levels)].filter((level) => THINKING_LEVEL_SET.has(level));
+    if (levels.length === 0 || !THINKING_LEVEL_SET.has(value.default_level) || !levels.includes(value.default_level)) {
+        return undefined;
+    }
+    const requestFormat = value.request_format;
+    if (requestFormat !== "openai" && requestFormat !== "deepseek" && requestFormat !== "qwen")
+        return undefined;
+    const levelMap = {};
+    for (const level of levels) {
+        const mapped = value.level_map?.[level];
+        if (typeof mapped === "string" && mapped)
+            levelMap[level] = mapped;
+    }
+    return {
+        levels,
+        defaultLevel: value.default_level,
+        canDisable: value.can_disable === true && levels.includes("off"),
+        levelMap,
+        requestFormat,
+    };
+}
 /**
  * Convert an API model response to our internal ModelDef.
  * Aliases are derived from the short id; note is left empty (filled by /model command).
  */
 export function apiModelToDef(m) {
+    const thinking = parseThinkingCapabilities(m.thinking);
     return {
         id: m.id,
         name: m.name,
         aliases: defaultAliases(m.id),
-        reasoning: m.reasoning,
+        reasoning: m.reasoning || thinking !== undefined,
+        thinking,
         vision: m.vision === true,
         contextWindow: m.context_length,
         maxTokens: m.max_tokens,
@@ -55,7 +83,14 @@ export const MODELS = [
         id: "deepseek-v4-flash",
         name: "DeepSeek V4 Flash (u1s1)",
         aliases: ["deepseek", "flash", "v4-flash"],
-        reasoning: false,
+        reasoning: true,
+        thinking: {
+            levels: ["off", "low", "high", "max"],
+            defaultLevel: "high",
+            canDisable: true,
+            levelMap: { off: "none", low: "low", high: "high", max: "max" },
+            requestFormat: "deepseek",
+        },
         vision: false,
         contextWindow: 1_048_576,
         maxTokens: 384_000,

package/dist/index.js

@@ -189,6 +189,9 @@ async function runAgent(cfg, args) {
             setAnnouncement(announcement);
     }
     await endpointsReady;
+    // Gateway metadata owns each official model's default thinking level. Seed
+    // it after the live model list arrives; explicit user choices remain intact.
+    ensureDefaultSettings(MODELS);
     // pi provider 只支持静态 header；指向本机 signing proxy，由它逐请求附 DPoP proof。
     const signing = await ensureSigningProxy(cfg);
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };

package/dist/login.js

@@ -152,8 +152,8 @@ export async function login(keyArg) {
         // 新网关且免费包可领/可续,登录成功时顺手提醒
         quotaNote =
             me.free_claim === "first"
-                ? "免费用量包还没领,去 https://u1s1.io/dashboard 点「领取」(首月每天 1 亿 Token)"
-                : "免费用量包到期了,去 https://u1s1.io/dashboard 续领(每天 3000 万 Token)";
+                ? "有免费用量包可领,去 https://u1s1.io/dashboard 查看"
+                : "免费用量包状态有更新,去 https://u1s1.io/dashboard 查看";
     }
     else if (tpu > 0) {
         const tok = (usd) => {

package/dist/tools.js

@@ -352,6 +352,7 @@ export function createImageTool(cfg) {
         promptGuidelines: [
             "Use generate_image when the user wants a picture created or an existing image modified (logo, illustration, poster, placeholder art, style change).",
             "Each call generates one image and costs the user credits; refine the prompt first instead of regenerating repeatedly.",
+            "If an error says the image may/already has been generated or says not to call generate_image again, stop immediately; never retry with a new generation.",
             "To edit an existing image, pass its path in `images` and describe only the change in `prompt`.",
         ],
         parameters: Type.Object({

package/dist/usage.js

@@ -42,6 +42,8 @@ export async function usage() {
             free_first: "首月免费包",
             free_yearly: "年度免费包",
             invite: "邀请赠送",
+            new_user: "新用户赠送",
+            payment_delay_gift: "临时加量包",
             topup_daily: "每日加量包",
             admin_grant: "官方赠送",
         };
@@ -71,9 +73,11 @@ export async function usage() {
             const label = ((PKG_LABEL[p.kind] ?? p.kind) + (p.count > 1 ? ` ×${p.count}` : "")).padEnd(5, "　");
             const per = daily ? "/天" : "";
             console.log(`  ${label} 还剩 ${fmtTokensCn(p.remaining)} / ${fmtTokensCn(total)}${per}  ${bar(ratio)}`);
-            const scopeNote = p.kind === "invite"
+            const scopeNote = p.kind === "login_checkin"
                 ? "仅限 u1s1 客户端使用 · 全模型可用"
-                : p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";
+                : p.scope === "free"
+                    ? "免费包适用模型 · 0 点恢复"
+                    : "仅限 u1s1 客户端使用 · 免费包适用模型";
             console.log(`             ${scopeNote} · ${p.expires_at ? `${p.expires_at.slice(0, 10)} 到期` : "永不过期"}`);
         }
         if (me.bonus_balance_usd > 0) {
@@ -82,15 +86,8 @@ export async function usage() {
         }
         console.log(`  本月已用   ${tpu > 0 ? `约 ${fmtTokensCn(me.mtd_usd * tpu)} Token($${me.mtd_usd.toFixed(2)})` : `$${me.mtd_usd.toFixed(2)}`}`);
         console.log("");
-        if (me.free_claim === "first") {
-            console.log("  → 你有免费用量包没领:首月每天 1 亿 Token,去 https://u1s1.io/dashboard 点「领取」");
-        }
-        else if (me.free_claim === "renew") {
-            console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 3000 万 Token,一年有效");
-        }
-        else {
-            console.log("  免费包每天 0 点恢复;邀请礼包需受邀人手动领取,仅限 u1s1 客户端 → https://u1s1.io/dashboard");
-        }
+        console.log("  免费用量包覆盖 DeepSeek V4 Flash / Vision、GLM-5.3 Flash、Qwen3.8 Flash 和联网搜索。");
+        console.log("  DeepSeek V4 Pro 仅可使用余额 → https://u1s1.io/dashboard");
         console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
         console.log("");
         return;

package/dist/web.js

@@ -1,7 +1,7 @@
 import { mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeWebToolsExtension, } from "./agent-setup.js";
-import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
+import { agentDir, apiModelToDef, MODELS, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
@@ -38,6 +38,7 @@ export async function prepareWebEnv(cfg) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    ensureDefaultSettings(MODELS);
     const signing = await ensureSigningProxy(cfg, "desktop");
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     ensureBrandPrompt(await shellReady);

package/package.json

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