u1s1-cli 1.5.0 → 1.7.0

package/dist/agent-setup.js

@@ -221,8 +221,10 @@ export function writeWebToolsExtension(cfg, features) {
         `      }\n` +
         `    });\n` +
         `    pi.registerTool(tools.createSubagentTool(getParentModel));\n` +
-        `    const workflow = await import(${JSON.stringify(new URL("./workflow/tool.js", import.meta.url).href)});\n` +
-        `    pi.registerTool(workflow.createRunWorkflowTool(getParentModel));\n` +
+        `    try {\n` +
+        `      const workflow = await import(${JSON.stringify(new URL("./workflow/tool.js", import.meta.url).href)});\n` +
+        `      pi.registerTool(workflow.createRunWorkflowTool(getParentModel));\n` +
+        `    } catch {}\n` +
         `  }\n`;
     // 密钥剥离守卫也从这里装:Desktop App 的 pi 跑在 pi-web-ui 子进程里,没有
     // 启动器代码,只有扩展能替它把 U1S1_API_KEY / U1S1_EP_KEY_* 挡在子进程之外
@@ -232,7 +234,17 @@ export function writeWebToolsExtension(cfg, features) {
         `  (await import(${JSON.stringify(secretEnvUrl)})).installChildEnvGuard();\n` +
         `  if (process.env.U1S1_TOOLS_VIA_EXTENSION !== "1") return;\n` +
         `  const baseUrl = process.env.U1S1_SIGNING_PROXY_URL || ${JSON.stringify(cfg.baseUrl)};\n` +
-        `  const tools = await import(${JSON.stringify(toolsUrl)});\n` +
+        // 升级半途 / 权限问题导致 CLI dist 不可读时,宁可这一会话没有联网工具,
+        // 也不能让扩展加载失败刷英文堆栈(审计 B4);只在 UI 里提示一句中文
+        `  let tools;\n` +
+        `  try {\n` +
+        `    tools = await import(${JSON.stringify(toolsUrl)});\n` +
+        `  } catch {\n` +
+        `    pi.on("session_start", (_event, ctx) => {\n` +
+        `      try { if (ctx.hasUI) ctx.ui.notify("联网工具本次未能加载(程序文件可能正在更新),重启 u1s1 即可恢复", "warning"); } catch {}\n` +
+        `    });\n` +
+        `    return;\n` +
+        `  }\n` +
         searchLine +
         `  pi.registerTool(tools.createFetchTool({ baseUrl, apiKey: process.env.U1S1_API_KEY, renderFallback: ${features.webFetchRender} }));\n` +
         imageLine +
@@ -291,7 +303,12 @@ export function writeAnnouncementsExtension() {
         `  } catch {\n` +
         `    return;\n` +
         `  }\n` +
-        `  const { Text } = await import("@earendil-works/pi-tui");\n` +
+        `  let Text;\n` +
+        `  try {\n` +
+        `    Text = (await import("@earendil-works/pi-tui")).Text;\n` +
+        `  } catch {\n` +
+        `    return;\n` +
+        `  }\n` +
         `  pi.registerEntryRenderer("u1s1-announcement", (entry, _opts, theme) => {\n` +
         `    const d = entry.data ?? {};\n` +
         `    let text = theme.fg("text", theme.bold("📢 " + String(d.text ?? "")));\n` +

package/dist/deploy.d.ts

@@ -1,4 +1,9 @@
 import { type CliConfig } from "./config.js";
+/**
+ * `u1s1 deploy remove` 的站点参数可以是 slug、完整网址或域名:
+ * `my-site` / `https://my-site.u1abc123.u1s1.app/` / `my-site.u1abc123.u1s1.app` 都指向 my-site。
+ */
+export declare function siteReferenceFromInput(input: string): string;
 interface SiteFile {
     path: string;
     abs: string;

package/dist/deploy.js

@@ -38,6 +38,30 @@ function rememberSite(dir, site) {
         // ignore
     }
 }
+/** 站点删掉后把 deploys.json 里指向它的目录记录一并清掉,下次 deploy 重新问名字。 */
+function forgetSite(site) {
+    try {
+        const all = readDeploys();
+        const remaining = Object.fromEntries(Object.entries(all).filter(([, value]) => value !== site));
+        if (Object.keys(remaining).length !== Object.keys(all).length) {
+            writeFileSync(deploysFile, JSON.stringify(remaining, null, 2) + "\n");
+        }
+    }
+    catch {
+        // ignore
+    }
+}
+/**
+ * `u1s1 deploy remove` 的站点参数可以是 slug、完整网址或域名:
+ * `my-site` / `https://my-site.u1abc123.u1s1.app/` / `my-site.u1abc123.u1s1.app` 都指向 my-site。
+ */
+export function siteReferenceFromInput(input) {
+    let value = input.trim().toLowerCase();
+    value = value.replace(/^[a-z]+:\/\//, "");
+    value = value.replace(/[/?#].*$/, "");
+    const firstLabel = value.split(".")[0] ?? "";
+    return firstLabel;
+}
 /** 找要部署的目录:显式参数 > 含 index.html 的构建产物目录 > 当前目录本身。 */
 function resolveSiteDir(explicit) {
     if (explicit) {
@@ -242,6 +266,44 @@ async function listDeployments(cfg) {
     }
     console.log("");
 }
+async function confirmRemoval(url) {
+    const answer = (await askLine(`  确定删除 ${url} 吗?网址会立即失效,站点文件会被清除,无法恢复。输入 y 确认:`)).toLowerCase();
+    return answer === "y" || answer === "yes";
+}
+async function removeDeployment(cfg, args) {
+    const yes = args.some((arg) => arg === "--yes" || arg === "-y");
+    const positional = args.filter((arg) => !arg.startsWith("-"));
+    if (positional.length !== 1) {
+        throw new Error("用法:u1s1 deploy remove <站点名或网址> [--yes]");
+    }
+    const reference = siteReferenceFromInput(positional[0]);
+    if (!reference)
+        throw new Error("站点名不能为空");
+    // 先按列表核对,拿到完整网址给确认提示;名字打错在这里就能提前发现
+    const { sites } = await api(cfg, { method: "GET", path: "/deploy/sites" });
+    const site = sites.find((s) => (s.slug || s.name) === reference || s.name === reference);
+    if (!site) {
+        throw new Error(`没有找到站点「${reference}」。运行 u1s1 deploy list 查看已有站点`);
+    }
+    if (!yes) {
+        if (!process.stdin.isTTY) {
+            throw new Error("非交互环境下删除站点需要加 --yes 明确确认");
+        }
+        if (!(await confirmRemoval(site.url))) {
+            console.log("  已取消,站点保留。");
+            return;
+        }
+    }
+    await api(cfg, {
+        method: "DELETE",
+        path: `/deploy/sites/${encodeURIComponent(site.name)}`,
+    });
+    forgetSite(site.slug || site.name);
+    console.log("");
+    console.log(`  ✓ 已删除 ${site.url}`);
+    console.log("  同一个名字可以再次 u1s1 deploy 重新发布。");
+    console.log("");
+}
 async function selectDeployment(args) {
     const parsed = parseDeployArgs(args);
     let { name, dirArg, visibility } = parsed;
@@ -336,11 +398,13 @@ export function printDeployHelp() {
     console.log("    不带参数时自动找构建产物目录(dist/build/out 等),否则用当前目录。");
     console.log("    首次发布会问项目名和公开/私密,之后记住;再跑一次即为更新。");
     console.log("");
-    console.log("  u1s1 deploy list    查看已发布的站点");
+    console.log("  u1s1 deploy list                    查看已发布的站点");
+    console.log("  u1s1 deploy remove <站点名或网址>    删除站点(会二次确认,--yes 跳过)");
     console.log("");
 }
 export async function deployCommand(cfg, args) {
-    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点
+    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点;
+    // u1s1 deploy remove <站点> 删除站点(rm/delete 同义)
     if (args.includes("--help") || args.includes("-h")) {
         printDeployHelp();
         return;
@@ -349,6 +413,10 @@ export async function deployCommand(cfg, args) {
         await listDeployments(cfg);
         return;
     }
+    if (args[0] === "remove" || args[0] === "rm" || args[0] === "delete") {
+        await removeDeployment(cfg, args.slice(1));
+        return;
+    }
     const selection = await selectDeployment(args);
     const { name, start } = await startDeployment(cfg, selection.name);
     validateDeploymentLimits(start, selection.files, selection.totalBytes);

package/dist/error-humanize.d.ts

@@ -1,3 +1,21 @@
+/**
+ * 模型调用失败时,网关的中文说明会被 OpenAI SDK + pi-ai 包成
+ * `429: {"message":"…","type":"…","code":"…"}` 直出到聊天区。
+ * 这里把 JSON 里的 message 提出来当正文,状态码与错误代号收进尾巴。
+ *
+ * 尾巴不是装饰,必须保留:pi 按 errorMessage 正则做三类分类——
+ * - 重试:429/5xx 数字、rate_limit、fetch failed 等(retry.js RETRYABLE)
+ * - 不重试:insufficient_quota(额度用尽时快速失败,不做无谓退避)
+ * - 上下文超长:context_length_exceeded(触发自动压缩而非重试)
+ * 改写后的文本必须与原文落进同一分类,否则会破坏重试/压缩行为。
+ *
+ * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
+ * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
+ *
+ * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
+ * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
+ */
+export declare function quotaResetHint(resetsAt: unknown, now?: number): string;
 /** 只取错误里的 request_id(纯函数,给 request-trace 记「最近一次请求编号」用)。 */
 export declare function extractRequestId(raw: string): string | undefined;
-export declare function humanizeModelError(raw: string): string | undefined;
+export declare function humanizeModelError(raw: string, now?: number): string | undefined;

package/dist/error-humanize.js

@@ -11,7 +11,24 @@
  *
  * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
  * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
+ *
+ * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
+ * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
  */
+export function quotaResetHint(resetsAt, now = Date.now()) {
+    if (typeof resetsAt !== "string")
+        return "";
+    const at = Date.parse(resetsAt);
+    if (!Number.isFinite(at))
+        return "";
+    const remainingMinutes = Math.ceil((at - now) / 60_000);
+    if (remainingMinutes <= 0 || remainingMinutes > 48 * 60)
+        return "";
+    const hours = Math.floor(remainingMinutes / 60);
+    const minutes = remainingMinutes % 60;
+    const span = hours > 0 ? `${hours} 小时${minutes > 0 ? ` ${minutes} 分` : ""}` : `${minutes} 分`;
+    return `距免费额度刷新还有 ${span}`;
+}
 function parseErrorPayload(raw) {
     const jsonStart = raw.indexOf("{");
     const jsonEnd = raw.lastIndexOf("}");
@@ -38,7 +55,7 @@ export function extractRequestId(raw) {
     const id = payload?.err["request_id"];
     return typeof id === "string" && id.length > 0 && id.length <= 128 ? id : undefined;
 }
-export function humanizeModelError(raw) {
+export function humanizeModelError(raw, now = Date.now()) {
     const payload = parseErrorPayload(raw);
     if (!payload)
         return undefined;
@@ -55,6 +72,8 @@ export function humanizeModelError(raw) {
         type === "insufficient_quota" || code === "quota_exceeded" ? "insufficient_quota" : code,
         requestId ? `请求编号 ${requestId}` : "",
     ].filter(Boolean);
-    const friendly = tags.length ? `${message} (${tags.join(" · ")})` : message;
+    const resetHint = err["reason"] === "exhausted" ? quotaResetHint(err["resets_at"], now) : "";
+    const body = resetHint ? `${message}〔${resetHint}〕` : message;
+    const friendly = tags.length ? `${body} (${tags.join(" · ")})` : body;
     return friendly === raw ? undefined : friendly;
 }

package/dist/import/index.js

@@ -126,7 +126,7 @@ function parseFlags(args) {
 }
 function printHelp() {
     console.log("");
-    console.log("  把 Claude Code / Codex 的历史对话导入 u1s1");
+    console.log("  把 Claude Code / Codex 的历史对话和技能导入 u1s1");
     console.log("");
     console.log("  用法:");
     console.log("    u1s1 import              导入当前目录的对话");
@@ -136,6 +136,7 @@ function printHelp() {
     console.log("    u1s1 import --cwd 目录     指定项目目录(默认当前目录)");
     console.log("    u1s1 import --dry-run    只看会导哪些,不写盘");
     console.log("    u1s1 import --force      已经导过的也再导一遍");
+    console.log("    u1s1 import skills       导入 Claude Code / Codex 等工具的技能(SKILL.md),详见 u1s1 import skills -h");
     console.log("");
     console.log("  导入后在对应项目里跑 u1s1,输入 /resume 就能看到。");
     console.log("");
@@ -255,6 +256,11 @@ function printImportSummary(summary) {
     console.log("");
 }
 export async function importCommand(args) {
+    if (args[0] === "skills" || args[0] === "skill") {
+        const { importSkillsCommand } = await import("./skills.js");
+        await importSkillsCommand(args.slice(1));
+        return;
+    }
     if (args.includes("-h") || args.includes("--help")) {
         printHelp();
         return;

package/dist/import/skills.d.ts

@@ -0,0 +1,89 @@
+/**
+ * `u1s1 import skills`: 把 Claude Code / Codex(以及任意 --from 目录)里的
+ * Agent Skills(SKILL.md)复制进 ~/.u1s1/agent/skills。pi 用同一套 SKILL.md
+ * 规范,所以只需要按 pi 自己的加载器校验一遍,合规的原样复制,不合规的列出来跳过。
+ */
+export type SkillTool = "claude" | "codex" | "custom";
+export interface SkillSource {
+    tool: SkillTool;
+    label: string;
+    dir: string;
+    scope: "user" | "project" | "custom";
+}
+export interface DiscoveredSkill {
+    name: string;
+    description: string;
+    tool: SkillTool;
+    label: string;
+    /** SKILL.md 所在目录;单文件技能时为该 .md 文件所在目录。 */
+    baseDir: string;
+    skillFile: string;
+    /** 单文件技能(skills 根目录直接放 foo.md)只复制那一个文件。 */
+    singleFile: boolean;
+    files: number;
+    bytes: number;
+    hints: string[];
+}
+export interface SkillProblem {
+    path: string;
+    reason: string;
+}
+export interface SkillImportRecord {
+    name: string;
+    tool: SkillTool;
+    sourcePath: string;
+    destPath: string;
+    importedAt: string;
+}
+export interface SkillImportIndex {
+    version: 1;
+    items: Record<string, SkillImportRecord>;
+}
+export interface SkillImportPlan {
+    pending: DiscoveredSkill[];
+    /** 已由本命令导过、这次不重复导(--force 可重导)。 */
+    alreadyImported: DiscoveredSkill[];
+    /** 目标目录已有同名技能但不是本命令导入的,不覆盖。 */
+    conflicts: DiscoveredSkill[];
+    /** 多个来源同名,只保留先发现的那个。 */
+    duplicates: DiscoveredSkill[];
+}
+export interface SkillImportResultItem {
+    name: string;
+    status: "imported" | "error";
+    destPath?: string;
+    detail?: string;
+}
+/** 超过这个体积的技能目录多半塞了数据集或依赖,先不动。 */
+export declare const MAX_SKILL_BYTES: number;
+export declare function skillsDestDir(): string;
+export declare function skillIndexPath(): string;
+/** Claude Code / Codex 各自约定的技能目录;项目级排在用户级前面,先发现的同名技能优先。 */
+export declare function defaultSkillSources(cwd: string, home?: string): SkillSource[];
+export declare function customSkillSource(dir: string): SkillSource;
+/**
+ * 用 pi 自己的加载器扫一遍来源目录:能被 pi 认出来、且没有任何告警(名称/说明不合规)
+ * 的才算兼容,其他的进 problems 并带上 pi 给的原因。
+ */
+export declare function discoverSkills(sources: SkillSource[]): {
+    skills: DiscoveredSkill[];
+    problems: SkillProblem[];
+};
+export declare function loadSkillIndex(path?: string): SkillImportIndex;
+export declare function planSkillImport(skills: DiscoveredSkill[], opts: {
+    destDir: string;
+    index: SkillImportIndex;
+    force: boolean;
+}): SkillImportPlan;
+/** 复制到 <destDir>/<name>;单文件技能落成 <name>/SKILL.md,这样 --remove 只需删一个目录。 */
+export declare function copySkill(skill: DiscoveredSkill, destDir: string): string;
+export declare function runSkillImport(pending: DiscoveredSkill[], index: SkillImportIndex, destDir: string): SkillImportResultItem[];
+/** 只删本命令导入过的技能,别人手放进去的同名目录不碰。 */
+export declare function removeImportedSkill(name: string, index: SkillImportIndex, destDir: string): {
+    ok: true;
+} | {
+    ok: false;
+    reason: string;
+};
+export declare function printSkillsHelp(): void;
+export declare function importSkillsCommand(args: string[]): Promise<void>;

package/dist/import/skills.js

@@ -0,0 +1,492 @@
+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 { readJsonIfExists, writeJson } from "./write.js";
+const TOOL_LABEL = {
+    claude: "Claude Code",
+    codex: "Codex",
+    custom: "自定义目录",
+};
+const SCRIPT_EXTENSIONS = new Set([".sh", ".bash", ".zsh", ".ps1", ".bat", ".cmd", ".py", ".js", ".mjs", ".cjs", ".ts", ".rb", ".pl"]);
+/** 超过这个体积的技能目录多半塞了数据集或依赖,先不动。 */
+export const MAX_SKILL_BYTES = 20 * 1024 * 1024;
+const MAX_SKILL_FILES = 2000;
+const LARGE_SKILL_BYTES = 1024 * 1024;
+export function skillsDestDir() {
+    return join(agentDir, "skills");
+}
+export function skillIndexPath() {
+    return join(agentDir, "imported-skills.json");
+}
+/** Claude Code / Codex 各自约定的技能目录;项目级排在用户级前面,先发现的同名技能优先。 */
+export function defaultSkillSources(cwd, home = homedir()) {
+    const candidates = [
+        { tool: "claude", scope: "project", dir: join(cwd, ".claude", "skills") },
+        { tool: "codex", scope: "project", dir: join(cwd, ".agents", "skills") },
+        ...listHomeClaudeDirs(home).map((dir) => ({ tool: "claude", scope: "user", dir: join(dir, "skills") })),
+        { tool: "codex", scope: "user", dir: join(home, ".codex", "skills") },
+        { tool: "codex", scope: "user", dir: join(home, ".agents", "skills") },
+    ];
+    const seen = new Set();
+    const out = [];
+    for (const c of candidates) {
+        const [dir] = uniqueExistingDirs([c.dir]);
+        if (!dir || seen.has(dir))
+            continue;
+        seen.add(dir);
+        out.push({ tool: c.tool, label: TOOL_LABEL[c.tool], dir, scope: c.scope });
+    }
+    return out;
+}
+export function customSkillSource(dir) {
+    return { tool: "custom", label: TOOL_LABEL.custom, dir: resolve(dir), scope: "custom" };
+}
+function walkStats(dir, stats, depth = 0) {
+    if (stats.truncated || depth > 16)
+        return;
+    let entries;
+    try {
+        entries = readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry.name === "node_modules" || entry.name === ".git")
+            continue;
+        const full = join(dir, entry.name);
+        let st;
+        try {
+            st = statSync(full);
+        }
+        catch {
+            continue;
+        }
+        if (st.isDirectory()) {
+            walkStats(full, stats, depth + 1);
+        }
+        else if (st.isFile()) {
+            stats.files += 1;
+            stats.bytes += st.size;
+            const dot = entry.name.lastIndexOf(".");
+            const ext = dot >= 0 ? entry.name.slice(dot).toLowerCase() : "";
+            const executable = process.platform !== "win32" && (st.mode & 0o111) !== 0;
+            if (SCRIPT_EXTENSIONS.has(ext) || executable)
+                stats.scripts += 1;
+        }
+        if (stats.files > MAX_SKILL_FILES || stats.bytes > MAX_SKILL_BYTES) {
+            stats.truncated = true;
+            return;
+        }
+    }
+}
+function skillHints(stats) {
+    const hints = [];
+    if (stats.scripts > 0)
+        hints.push(`含 ${stats.scripts} 个脚本,只导可信来源`);
+    if (stats.bytes > LARGE_SKILL_BYTES)
+        hints.push(`体积 ${formatBytes(stats.bytes)}`);
+    return hints;
+}
+const SKILL_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+/** 单文件技能(skills 根目录直接放 foo.md)没写 name 时 pi 会拿父目录名,导入后按文件名落目录更合理。 */
+function singleFileSkillName(filePath, fallback) {
+    try {
+        const { frontmatter } = parseFrontmatter(readFileSync(filePath, "utf8"));
+        const declared = frontmatter["name"];
+        if (typeof declared === "string" && declared.trim())
+            return declared.trim();
+    }
+    catch {
+        return fallback;
+    }
+    return basename(filePath).replace(/\.md$/i, "");
+}
+/**
+ * 用 pi 自己的加载器扫一遍来源目录:能被 pi 认出来、且没有任何告警(名称/说明不合规)
+ * 的才算兼容,其他的进 problems 并带上 pi 给的原因。
+ */
+export function discoverSkills(sources) {
+    const skills = [];
+    const problems = [];
+    for (const source of sources) {
+        let result;
+        try {
+            result = loadSkillsFromDir({ dir: source.dir, source: source.label });
+        }
+        catch (e) {
+            problems.push({ path: source.dir, reason: e instanceof Error ? e.message : String(e) });
+            continue;
+        }
+        const reasons = new Map();
+        for (const diag of result.diagnostics) {
+            if (diag.type === "collision")
+                continue;
+            const key = diag.path ?? source.dir;
+            reasons.set(key, [...(reasons.get(key) ?? []), diag.message]);
+        }
+        for (const [path, list] of reasons)
+            problems.push({ path, reason: list.join("; ") });
+        for (const skill of result.skills) {
+            if (reasons.has(skill.filePath))
+                continue;
+            const singleFile = basename(skill.filePath) !== "SKILL.md";
+            const name = singleFile ? singleFileSkillName(skill.filePath, skill.name) : skill.name;
+            if (!SKILL_NAME_RE.test(name) || name.length > 64) {
+                problems.push({ path: skill.filePath, reason: `技能名「${name}」不合规:只能用小写字母、数字和连字符` });
+                continue;
+            }
+            const stats = { files: 0, bytes: 0, scripts: 0, truncated: false };
+            if (singleFile) {
+                try {
+                    stats.files = 1;
+                    stats.bytes = statSync(skill.filePath).size;
+                }
+                catch {
+                    stats.files = 0;
+                }
+            }
+            else {
+                walkStats(skill.baseDir, stats);
+            }
+            if (stats.truncated) {
+                problems.push({
+                    path: singleFile ? skill.filePath : skill.baseDir,
+                    reason: `技能目录太大(超过 ${formatBytes(MAX_SKILL_BYTES)} 或 ${MAX_SKILL_FILES} 个文件),先跳过`,
+                });
+                continue;
+            }
+            skills.push({
+                name,
+                description: skill.description,
+                tool: source.tool,
+                label: source.label,
+                baseDir: skill.baseDir,
+                skillFile: skill.filePath,
+                singleFile,
+                files: stats.files,
+                bytes: stats.bytes,
+                hints: skillHints(stats),
+            });
+        }
+    }
+    return { skills, problems };
+}
+export function loadSkillIndex(path = skillIndexPath()) {
+    const rec = asRecord(readJsonIfExists(path));
+    const items = asRecord(rec?.["items"]);
+    const out = { version: 1, items: {} };
+    if (!items)
+        return out;
+    for (const [key, value] of Object.entries(items)) {
+        const item = asRecord(value);
+        if (!item)
+            continue;
+        const name = asString(item["name"]);
+        const tool = asString(item["tool"]);
+        const sourcePath = asString(item["sourcePath"]);
+        const destPath = asString(item["destPath"]);
+        const importedAt = asString(item["importedAt"]);
+        if (!name || !sourcePath || !destPath || !importedAt)
+            continue;
+        if (tool !== "claude" && tool !== "codex" && tool !== "custom")
+            continue;
+        out.items[key] = { name, tool, sourcePath, destPath, importedAt };
+    }
+    return out;
+}
+export function planSkillImport(skills, opts) {
+    const plan = { pending: [], alreadyImported: [], conflicts: [], duplicates: [] };
+    const seen = new Set();
+    for (const skill of skills) {
+        if (seen.has(skill.name)) {
+            plan.duplicates.push(skill);
+            continue;
+        }
+        seen.add(skill.name);
+        const dest = join(opts.destDir, skill.name);
+        const record = opts.index.items[skill.name];
+        const destExists = existsSync(dest);
+        if (record && destExists && !opts.force) {
+            plan.alreadyImported.push(skill);
+            continue;
+        }
+        if (!record && destExists) {
+            plan.conflicts.push(skill);
+            continue;
+        }
+        plan.pending.push(skill);
+    }
+    return plan;
+}
+/** 复制到 <destDir>/<name>;单文件技能落成 <name>/SKILL.md,这样 --remove 只需删一个目录。 */
+export function copySkill(skill, destDir) {
+    const dest = join(destDir, skill.name);
+    if (resolve(skill.baseDir) === resolve(dest))
+        throw new Error("来源就是目标目录");
+    mkdirSync(destDir, { recursive: true });
+    rmSync(dest, { recursive: true, force: true });
+    if (skill.singleFile) {
+        mkdirSync(dest, { recursive: true });
+        cpSync(skill.skillFile, join(dest, "SKILL.md"));
+    }
+    else {
+        cpSync(skill.baseDir, dest, {
+            recursive: true,
+            dereference: true,
+            filter: (src) => {
+                const name = basename(src);
+                return name !== "node_modules" && name !== ".git";
+            },
+        });
+    }
+    return dest;
+}
+export function runSkillImport(pending, index, destDir) {
+    const items = [];
+    for (const skill of pending) {
+        try {
+            const destPath = copySkill(skill, destDir);
+            index.items[skill.name] = {
+                name: skill.name,
+                tool: skill.tool,
+                sourcePath: skill.singleFile ? skill.skillFile : skill.baseDir,
+                destPath,
+                importedAt: new Date().toISOString(),
+            };
+            items.push({ name: skill.name, status: "imported", destPath });
+        }
+        catch (e) {
+            items.push({ name: skill.name, status: "error", detail: e instanceof Error ? e.message : String(e) });
+        }
+    }
+    return items;
+}
+/** 只删本命令导入过的技能,别人手放进去的同名目录不碰。 */
+export function removeImportedSkill(name, index, destDir) {
+    const record = index.items[name];
+    if (!record)
+        return { ok: false, reason: "不是 u1s1 import skills 导入的技能,请手动处理" };
+    const expected = join(destDir, name);
+    if (resolve(record.destPath) !== resolve(expected)) {
+        return { ok: false, reason: `记录的位置 ${record.destPath} 与技能目录不一致,请手动处理` };
+    }
+    try {
+        if (existsSync(expected) && lstatSync(expected).isDirectory())
+            rmSync(expected, { recursive: true, force: true });
+    }
+    catch (e) {
+        return { ok: false, reason: e instanceof Error ? e.message : String(e) };
+    }
+    delete index.items[name];
+    return { ok: true };
+}
+function parseSkillsArgs(args) {
+    const opts = {
+        cwd: process.cwd(),
+        from: [],
+        tools: undefined,
+        dryRun: false,
+        force: false,
+        yes: false,
+        list: false,
+        remove: [],
+    };
+    const needValue = (flag, i) => {
+        const next = args[i + 1];
+        if (!next || next.startsWith("-")) {
+            console.error(`  ${flag} 后面要跟一个值`);
+            process.exit(1);
+        }
+        return next;
+    };
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === "--dry-run")
+            opts.dryRun = true;
+        else if (a === "--force" || a === "--update")
+            opts.force = true;
+        else if (a === "-y" || a === "--yes")
+            opts.yes = true;
+        else if (a === "--list")
+            opts.list = true;
+        else if (a === "--from")
+            opts.from.push(needValue(a, i++));
+        else if (a === "--cwd")
+            opts.cwd = needValue(a, i++);
+        else if (a === "--remove")
+            opts.remove.push(needValue(a, i++));
+        else if (a.startsWith("-")) {
+            console.error(`  不认识参数 ${a}`);
+            process.exit(1);
+        }
+        else {
+            const tool = parseToolArg(a);
+            opts.tools = opts.tools ? [...opts.tools, tool] : [tool];
+        }
+    }
+    return opts;
+}
+function parseToolArg(raw) {
+    const aliases = {
+        claude: "claude",
+        "claude-code": "claude",
+        cc: "claude",
+        anthropic: "claude",
+        codex: "codex",
+        openai: "codex",
+    };
+    const tool = aliases[raw.toLowerCase()];
+    if (!tool) {
+        console.error(`  不认识来源「${raw}」,可选: claude / codex;其他工具用 --from 目录`);
+        process.exit(1);
+    }
+    return tool;
+}
+export function printSkillsHelp() {
+    console.log("");
+    console.log("  把 Claude Code / Codex 等工具的技能(SKILL.md)导入 u1s1");
+    console.log("");
+    console.log("  用法:");
+    console.log("    u1s1 import skills                自动找本机 Claude Code / Codex 的技能");
+    console.log("    u1s1 import skills claude         只导 Claude Code 的");
+    console.log("    u1s1 import skills codex          只导 Codex 的");
+    console.log("    u1s1 import skills --from 目录     其他工具:指定放 SKILL.md 的目录(可重复)");
+    console.log("    u1s1 import skills --cwd 目录      项目级技能按这个目录找(默认当前目录)");
+    console.log("    u1s1 import skills --dry-run      只看会导哪些,不写盘");
+    console.log("    u1s1 import skills --update       已导过的重新复制一遍(同 --force)");
+    console.log("    u1s1 import skills --list         看已导入的技能");
+    console.log("    u1s1 import skills --remove 名称   删掉某个导入的技能");
+    console.log("");
+    console.log(`  技能会复制到 ${formatHomePath(skillsDestDir())},下次进对话就能用:`);
+    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);
+}
+function printList(index) {
+    const items = Object.values(index.items).sort((a, b) => a.name.localeCompare(b.name));
+    console.log("");
+    if (items.length === 0) {
+        console.log("  还没导入过技能。跑 u1s1 import skills 试试。");
+        console.log("");
+        return;
+    }
+    console.log(`  已导入 ${items.length} 个技能(${formatHomePath(skillsDestDir())}):`);
+    for (const item of items) {
+        const missing = existsSync(item.destPath) ? "" : "(目录已不在)";
+        console.log(`    · ${item.name}  [${TOOL_LABEL[item.tool]}] ${missing}`);
+        console.log(`      来自 ${formatHomePath(item.sourcePath)}`);
+    }
+    console.log("");
+}
+function printPreview(skills, plan, problems, sources) {
+    console.log("");
+    console.log(`  在 ${sources.length} 个目录里找到 ${skills.length} 个技能:`);
+    for (const source of sources)
+        console.log(`    ${formatHomePath(source.dir)}  [${source.label}]`);
+    console.log("");
+    for (const skill of plan.pending) {
+        console.log(`    + ${skill.name}  [${skill.label}]  ${oneLine(skill.description, 60)}`);
+        console.log(`      ${describeSource(skill)}${skill.hints.length ? `  ⚠ ${skill.hints.join(";")}` : ""}`);
+    }
+    for (const skill of plan.alreadyImported)
+        console.log(`    · ${skill.name}  已导过(加 --update 重导)`);
+    for (const skill of plan.conflicts) {
+        console.log(`    · ${skill.name}  目标目录已有同名技能(不是本命令导的),不覆盖`);
+    }
+    for (const skill of plan.duplicates)
+        console.log(`    · ${skill.name}  与前面同名,只保留先发现的(${describeSource(skill)})`);
+    for (const problem of problems) {
+        console.log(`    × ${formatHomePath(problem.path)}  不兼容,跳过: ${oneLine(problem.reason, 80)}`);
+    }
+}
+export async function importSkillsCommand(args) {
+    if (args.includes("-h") || args.includes("--help")) {
+        printSkillsHelp();
+        return;
+    }
+    const opts = parseSkillsArgs(args);
+    const destDir = skillsDestDir();
+    const index = loadSkillIndex();
+    if (opts.remove.length > 0) {
+        for (const name of opts.remove) {
+            const result = removeImportedSkill(name, index, destDir);
+            if (result.ok)
+                console.log(`  ✓ 已删除技能 ${name}`);
+            else
+                console.log(`  × ${name}: ${result.reason}`);
+        }
+        writeJson(skillIndexPath(), index);
+        return;
+    }
+    if (opts.list) {
+        printList(index);
+        return;
+    }
+    const sources = [
+        ...opts.from.map(customSkillSource),
+        ...defaultSkillSources(opts.cwd).filter((s) => !opts.tools || opts.tools.includes(s.tool)),
+    ];
+    const missingFrom = opts.from.filter((dir) => !existsSync(dir));
+    for (const dir of missingFrom)
+        console.log(`  --from 目录不存在: ${dir}`);
+    if (sources.length === 0) {
+        console.log("");
+        console.log("  没找到 Claude Code / Codex 的技能目录(~/.claude/skills、~/.codex/skills、项目里的 .claude/skills 或 .agents/skills)。");
+        console.log("  其他工具的技能可以用 --from 指定目录,只要里面有 SKILL.md。");
+        console.log("");
+        return;
+    }
+    const { skills, problems } = discoverSkills(sources);
+    const plan = planSkillImport(skills, { destDir, index, force: opts.force });
+    printPreview(skills, plan, problems, sources);
+    if (plan.pending.length === 0) {
+        console.log("");
+        console.log(skills.length === 0 ? "  这些目录里没有能用的技能。" : "  没有新的可导。想重导一遍就加 --update。");
+        console.log("");
+        return;
+    }
+    if (opts.dryRun) {
+        console.log("");
+        console.log(`  预演结束,以上 ${plan.pending.length} 个还没真正导入。`);
+        console.log("");
+        return;
+    }
+    if (!opts.yes && !(await confirm(`  导入这 ${plan.pending.length} 个技能?(回车=好 / n=取消) `))) {
+        console.log("  已取消。");
+        return;
+    }
+    const results = runSkillImport(plan.pending, index, destDir);
+    writeJson(skillIndexPath(), index);
+    const imported = results.filter((r) => r.status === "imported").length;
+    const errors = results.filter((r) => r.status === "error");
+    console.log("");
+    console.log(`  ✓ 导入 ${imported} 个技能到 ${formatHomePath(destDir)}${errors.length ? `,失败 ${errors.length}` : ""}。`);
+    for (const item of errors)
+        console.log(`    × ${item.name}: ${item.detail ?? "失败"}`);
+    if (imported > 0) {
+        console.log("  下次进 u1s1 对话就能用:模型会按说明自动调用,或输入 /skill:名称 手动调用。");
+        console.log(`  管理: u1s1 import skills --list / --update / --remove 名称`);
+    }
+    console.log("");
+}

package/dist/import/util.d.ts

@@ -2,7 +2,7 @@ export declare const MAX_TOOL_RESULT_CHARS = 80000;
 export declare const MAX_TEXT_CHARS = 200000;
 export declare const PREVIEW_TITLE_CHARS = 48;
 export declare function resolveExistingDir(path: string): string | undefined;
-export declare function listHomeClaudeDirs(): string[];
+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;

package/dist/import/util.js

@@ -15,8 +15,7 @@ export function resolveExistingDir(path) {
         return undefined;
     }
 }
-export function listHomeClaudeDirs() {
-    const home = homedir();
+export function listHomeClaudeDirs(home = homedir()) {
     const out = [];
     try {
         for (const name of readdirSync(home)) {

package/dist/index.js

@@ -349,7 +349,7 @@ async function runAgent(cfg, args) {
                         theme.fg("text", "/model 切换模型(留意免费/价格提示) · /clear 清空上下文开新会话"),
                         theme.fg("text", "/usage 查剩余额度 · /resume 恢复历史会话 · /settings 设置"),
                         theme.fg("text", "/feedback 一句话反馈问题或建议(自动附带版本与请求编号建工单)"),
-                        theme.fg("dim", "/compact 压缩上下文 · /hotkeys 全部快捷键(英文) · /exit 退出"),
+                        theme.fg("dim", "/compact 压缩上下文 · /hotkeys 全部快捷键 · /exit 退出"),
                         theme.fg("dim", "退出后在终端:u1s1 deploy 发布网页 · u1s1 update 升级"),
                         theme.fg("dim", "匿名使用统计只记会话开始/结束等节点,不含任何内容;U1S1_TELEMETRY=0 可关闭"),
                         theme.fg("dim", "新手教程 → https://u1s1.io/guides"),
@@ -527,8 +527,9 @@ async function run() {
         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            导入历史会话");
+        console.log("   u1s1 import            导入历史会话(import skills 导入技能)");
         console.log("   u1s1 bench             模型编码能力评测");
         console.log("   u1s1 --version         查看版本");
         console.log("");

package/package.json

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

package/scripts/patch-pi.js

@@ -90,7 +90,7 @@ const SLASH_COMMANDS_REPLACEMENTS = [
   ['{ name: "name", description: "Set session display name" },', '{ name: "name", description: "给当前会话起个名字" },'],
   ['{ name: "session", description: "Show session info and stats" },', '{ name: "session", description: "查看会话信息与统计" },'],
   ['{ name: "changelog", description: "Show changelog entries" },', '{ name: "changelog", description: "查看引擎更新日志(英文)" },'],
-  ['{ name: "hotkeys", description: "Show all keyboard shortcuts" },', '{ name: "hotkeys", description: "查看全部快捷键(英文)" },'],
+  ['{ name: "hotkeys", description: "Show all keyboard shortcuts" },', '{ name: "hotkeys", description: "查看全部快捷键" },'],
   ['{ name: "fork", description: "Create a new fork from a previous user message" },', '{ name: "fork", description: "从之前某条消息分叉出一个新会话" },'],
   ['{ name: "clone", description: "Duplicate the current session at the current position" },', '{ name: "clone", description: "复制当前会话再继续" },'],
   ['{ name: "trust", description: "Save project trust decision for future sessions" },', '{ name: "trust", description: "记住对这个项目目录的信任选择" },'],
@@ -103,6 +103,114 @@ const SLASH_COMMANDS_REPLACEMENTS = [
   ['{ name: "quit", description: `Quit ${APP_NAME}` },', '{ name: "quit", description: `退出 ${APP_NAME}` },'],
 ];
 
+// 扩展报错文案汉化 + 默认不刷堆栈(dist/modes/interactive/interactive-mode.js),与 pnpm coding-agent patch 同步。
+// 小白看到一屏英文 JS 堆栈只会以为程序坏了;一句中文 + 下一步(重启 / u1s1 feedback)就够。
+const EXTENSION_ERROR_REPLACEMENTS = [
+  ['const errorMsg = `Extension "${extensionPath}" error: ${error}`;', 'const errorMsg = `扩展 ${String(extensionPath).split(/[\\\\/]/).pop()} 出错(重启 u1s1 一般可恢复;反复出现请运行 u1s1 feedback 反馈):${error}`;'],
+  ['if (stack) {', 'if (stack && process.env.U1S1_DEBUG_EXTENSIONS === "1") {'],
+];
+
+function patchExtensionError() {
+  for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    const target = join(piDir, "dist", "modes", "interactive", "interactive-mode.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      let applied = 0;
+      for (const [from, to] of EXTENSION_ERROR_REPLACEMENTS) {
+        if (text.includes(to)) {
+          applied++;
+          continue;
+        }
+        if (text.split(from).length !== 2) continue;
+        text = text.replace(from, to);
+        applied++;
+      }
+      if (applied < EXTENSION_ERROR_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，扩展报错文案补丁只应用了 ${applied}/${EXTENSION_ERROR_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
+    }
+  }
+}
+
+// /hotkeys 快捷键表汉化(dist/modes/interactive/interactive-mode.js),与 pnpm coding-agent patch 同步。
+// 表格由 pi 硬编码英文拼出来,启动横幅/help 都在引导新手输入 /hotkeys,整页英文等于没给。
+// 只译说明列,按键显示(`${cursorUp}` 等)原样保留;表头出现 4 次,用 expected 计数整体替换。
+const HOTKEYS_REPLACEMENTS = [
+  ['"Keyboard Shortcuts"', '"快捷键一览"'],
+  ["**Navigation**", "**移动**"],
+  ["**Editing**", "**编辑**"],
+  ["**Other**", "**其他**"],
+  ["**Extensions**", "**扩展**"],
+  { from: "| Key | Action |", to: "| 按键 | 操作 |", expected: 4 },
+  ["| Move cursor / browse history |", "| 移动光标 / 翻看输入历史 |"],
+  ["| Move by word |", "| 按词移动 |"],
+  ["| Start of line |", "| 跳到行首 |"],
+  ["| End of line |", "| 跳到行尾 |"],
+  ["| Jump forward to character |", "| 向后跳到指定字符 |"],
+  ["| Jump backward to character |", "| 向前跳到指定字符 |"],
+  ["| Scroll by page |", "| 整页滚动 |"],
+  ["| Send message |", "| 发送消息 |"],
+  ['| New line${process.platform === "win32" ? " (Ctrl+Enter on Windows Terminal)" : ""} |', '| 换行${process.platform === "win32" ? "(Windows Terminal 用 Ctrl+Enter)" : ""} |'],
+  ["| Delete word backwards |", "| 删除光标前一个词 |"],
+  ["| Delete word forwards |", "| 删除光标后一个词 |"],
+  ["| Delete to start of line |", "| 删到行首 |"],
+  ["| Delete to end of line |", "| 删到行尾 |"],
+  ["| Paste the most-recently-deleted text |", "| 粘贴最近删除的文本 |"],
+  ["| Cycle through the deleted text after pasting |", "| 粘贴后在更早删除的文本间循环 |"],
+  ["| Undo |", "| 撤销 |"],
+  ["| Path completion / accept autocomplete |", "| 路径补全 / 接受自动补全 |"],
+  ["| Cancel autocomplete / abort streaming |", "| 取消补全 / 中断模型回复 |"],
+  ["| Clear editor (first) / exit (second) |", "| 清空输入框(再按一次退出) |"],
+  ["| Exit (when editor is empty) |", "| 退出(输入框为空时) |"],
+  ["| Suspend to background |", "| 挂起到后台 |"],
+  ["| Cycle thinking level |", "| 切换思考深度 |"],
+  ["| Cycle models |", "| 轮换模型 |"],
+  ["| Open model selector |", "| 打开模型选择器 |"],
+  ["| Toggle tool output expansion |", "| 展开 / 收起工具输出 |"],
+  ["| Toggle thinking block visibility |", "| 显示 / 隐藏思考过程 |"],
+  ["| Edit message in external editor |", "| 用外部编辑器写消息 |"],
+  ["| Copy last assistant message |", "| 复制最近一条回复 |"],
+  ["| Queue follow-up message |", "| 把消息排到当前回复之后 |"],
+  ["| Restore queued messages |", "| 取回排队中的消息 |"],
+  ["| Paste image or text from clipboard |", "| 从剪贴板粘贴图片或文本 |"],
+  ["| Slash commands |", "| 斜杠命令(/help 看常用操作) |"],
+  ["| Run bash command |", "| 运行终端命令 |"],
+  ["| Run bash command (excluded from context) |", "| 运行终端命令(结果不进上下文) |"],
+];
+
+function patchHotkeys() {
+  for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    const target = join(piDir, "dist", "modes", "interactive", "interactive-mode.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      let applied = 0;
+      for (const rule of HOTKEYS_REPLACEMENTS) {
+        const { from, to, expected } = Array.isArray(rule) ? { from: rule[0], to: rule[1], expected: 1 } : rule;
+        if (text.includes(to)) {
+          applied++;
+          continue;
+        }
+        if (text.split(from).length !== expected + 1) continue;
+        text = text.split(from).join(to);
+        applied++;
+      }
+      if (applied < HOTKEYS_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，/hotkeys 汉化补丁只应用了 ${applied}/${HOTKEYS_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
+    }
+  }
+}
+
 function patchSlashCommands() {
   for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
     const target = join(piDir, "dist", "core", "slash-commands.js");
@@ -219,6 +327,8 @@ const ENABLE_AUTOWRAP = "\\x1b[?7h";`,
 try {
   patchCompactUi();
   patchSlashCommands();
+  patchExtensionError();
+  patchHotkeys();
   patchMainScreenAutowrap();
 } catch (err) {
   console.log(`[u1s1] 提示: pi 运行时补丁未生效（${err?.message ?? err}），不影响安装`);