u1s1-cli 1.11.8 → 1.12.0

package/dist/import/skills.js

@@ -4,13 +4,17 @@ 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 { isEnglish, tr } from "../i18n.js";
 import { asRecord, asString, formatBytes, listHomeClaudeDirs, oneLine, uniqueExistingDirs, confirm } from "./util.js";
 import { readJsonIfExists, writeJson } from "./write.js";
-const TOOL_LABEL = {
-    claude: "Claude Code",
-    codex: "Codex",
-    custom: "自定义目录",
-};
+// 用时求值:界面语言要等配置读完才定
+function toolLabel(tool) {
+    if (tool === "claude")
+        return "Claude Code";
+    if (tool === "codex")
+        return "Codex";
+    return tr("自定义目录", "Custom directory");
+}
 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;
@@ -38,12 +42,12 @@ export function defaultSkillSources(cwd, home = homedir()) {
         if (!dir || seen.has(dir))
             continue;
         seen.add(dir);
-        out.push({ tool: c.tool, label: TOOL_LABEL[c.tool], dir, scope: c.scope });
+        out.push({ tool: c.tool, label: toolLabel(c.tool), dir, scope: c.scope });
     }
     return out;
 }
 export function customSkillSource(dir) {
-    return { tool: "custom", label: TOOL_LABEL.custom, dir: resolve(dir), scope: "custom" };
+    return { tool: "custom", label: toolLabel("custom"), dir: resolve(dir), scope: "custom" };
 }
 function walkStats(dir, stats, depth = 0) {
     if (stats.truncated || depth > 16)
@@ -87,9 +91,9 @@ function walkStats(dir, stats, depth = 0) {
 function skillHints(stats) {
     const hints = [];
     if (stats.scripts > 0)
-        hints.push(`含 ${stats.scripts} 个脚本,只导可信来源`);
+        hints.push(tr(`含 ${stats.scripts} 个脚本,只导可信来源`, `contains ${stats.scripts} script(s); only import from trusted sources`));
     if (stats.bytes > LARGE_SKILL_BYTES)
-        hints.push(`体积 ${formatBytes(stats.bytes)}`);
+        hints.push(tr(`体积 ${formatBytes(stats.bytes)}`, `size ${formatBytes(stats.bytes)}`));
     return hints;
 }
 const SKILL_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
@@ -137,7 +141,8 @@ export function discoverSkills(sources) {
             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}」不合规:只能用小写字母、数字和连字符` });
+                problems.push({ path: skill.filePath, reason: tr(`技能名「${name}」不合规:只能用小写字母、数字和连字符`, `invalid skill name "${name}": only lowercase letters, digits and hyphens are allowed`),
+                });
                 continue;
             }
             const stats = { files: 0, bytes: 0, scripts: 0, truncated: false };
@@ -156,7 +161,7 @@ export function discoverSkills(sources) {
             if (stats.truncated) {
                 problems.push({
                     path: singleFile ? skill.filePath : skill.baseDir,
-                    reason: `技能目录太大(超过 ${formatBytes(MAX_SKILL_BYTES)} 或 ${MAX_SKILL_FILES} 个文件),先跳过`,
+                    reason: tr(`技能目录太大(超过 ${formatBytes(MAX_SKILL_BYTES)} 或 ${MAX_SKILL_FILES} 个文件),先跳过`, `skill directory too large (over ${formatBytes(MAX_SKILL_BYTES)} or ${MAX_SKILL_FILES} files), skipped`),
                 });
                 continue;
             }
@@ -227,7 +232,7 @@ export function planSkillImport(skills, opts) {
 export function copySkill(skill, destDir) {
     const dest = join(destDir, skill.name);
     if (resolve(skill.baseDir) === resolve(dest))
-        throw new Error("来源就是目标目录");
+        throw new Error(tr("来源就是目标目录", "Source is the destination directory"));
     mkdirSync(destDir, { recursive: true });
     rmSync(dest, { recursive: true, force: true });
     if (skill.singleFile) {
@@ -270,10 +275,13 @@ export function runSkillImport(pending, index, destDir) {
 export function removeImportedSkill(name, index, destDir) {
     const record = index.items[name];
     if (!record)
-        return { ok: false, reason: "不是 u1s1 import skills 导入的技能,请手动处理" };
+        return { ok: false, reason: tr("不是 u1s1 import skills 导入的技能,请手动处理", "not imported by u1s1 import skills; please handle it manually") };
     const expected = join(destDir, name);
     if (resolve(record.destPath) !== resolve(expected)) {
-        return { ok: false, reason: `记录的位置 ${record.destPath} 与技能目录不一致,请手动处理` };
+        return {
+            ok: false,
+            reason: tr(`记录的位置 ${record.destPath} 与技能目录不一致,请手动处理`, `recorded location ${record.destPath} doesn't match the skills directory; please handle it manually`),
+        };
     }
     try {
         if (existsSync(expected) && lstatSync(expected).isDirectory())
@@ -299,7 +307,7 @@ function parseSkillsArgs(args) {
     const needValue = (flag, i) => {
         const next = args[i + 1];
         if (!next || next.startsWith("-")) {
-            console.error(`  ${flag} 后面要跟一个值`);
+            console.error(tr(`  ${flag} 后面要跟一个值`, `  ${flag} requires a value`));
             process.exit(1);
         }
         return next;
@@ -321,7 +329,7 @@ function parseSkillsArgs(args) {
         else if (a === "--remove")
             opts.remove.push(needValue(a, i++));
         else if (a.startsWith("-")) {
-            console.error(`  不认识参数 ${a}`);
+            console.error(tr(`  不认识参数 ${a}`, `  Unknown option ${a}`));
             process.exit(1);
         }
         else {
@@ -342,12 +350,32 @@ function parseToolArg(raw) {
     };
     const tool = aliases[raw.toLowerCase()];
     if (!tool) {
-        console.error(`  不认识来源「${raw}」,可选: claude / codex;其他工具用 --from 目录`);
+        console.error(tr(`  不认识来源「${raw}」,可选: claude / codex;其他工具用 --from 目录`, `  Unknown source "${raw}"; choose claude / codex, or use --from <dir> for other tools`));
         process.exit(1);
     }
     return tool;
 }
 export function printSkillsHelp() {
+    if (isEnglish()) {
+        console.log("");
+        console.log("  Import skills (SKILL.md) from Claude Code / Codex and other tools into u1s1");
+        console.log("");
+        console.log("  Usage:");
+        console.log("    u1s1 import skills                 Find Claude Code / Codex skills on this machine");
+        console.log("    u1s1 import skills claude          Claude Code only");
+        console.log("    u1s1 import skills codex           Codex only");
+        console.log("    u1s1 import skills --from <dir>    Other tools: a directory containing SKILL.md files (repeatable)");
+        console.log("    u1s1 import skills --cwd <dir>     Look for project skills in this directory (default: current directory)");
+        console.log("    u1s1 import skills --dry-run       Show what would be imported without writing anything");
+        console.log("    u1s1 import skills --update        Re-copy skills already imported (same as --force)");
+        console.log("    u1s1 import skills --list          List imported skills");
+        console.log("    u1s1 import skills --remove <name> Remove an imported skill");
+        console.log("");
+        console.log(`  Skills are copied to ${formatHomePath(skillsDestDir())} and are available from your next chat:`);
+        console.log("  the model invokes them automatically based on their description, or type /skill:<name> to invoke one manually.");
+        console.log("");
+        return;
+    }
     console.log("");
     console.log("  把 Claude Code / Codex 等工具的技能(SKILL.md)导入 u1s1");
     console.log("");
@@ -373,37 +401,38 @@ 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(tr("  还没导入过技能。跑 u1s1 import skills 试试。", "  No skills imported yet. Try u1s1 import skills."));
         console.log("");
         return;
     }
-    console.log(`  已导入 ${items.length} 个技能(${formatHomePath(skillsDestDir())}):`);
+    console.log(tr(`  已导入 ${items.length} 个技能(${formatHomePath(skillsDestDir())}):`, `  ${items.length} imported skill(s) (${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)}`);
+        const missing = existsSync(item.destPath) ? "" : tr("(目录已不在)", "(directory missing)");
+        console.log(`    · ${item.name}  [${toolLabel(item.tool)}] ${missing}`);
+        console.log(tr(`      来自 ${formatHomePath(item.sourcePath)}`, `      from ${formatHomePath(item.sourcePath)}`));
     }
     console.log("");
 }
 function printPreview(skills, plan, problems, sources) {
     console.log("");
-    console.log(`  在 ${sources.length} 个目录里找到 ${skills.length} 个技能:`);
+    console.log(tr(`  在 ${sources.length} 个目录里找到 ${skills.length} 个技能:`, `  Found ${skills.length} skill(s) in ${sources.length} director${sources.length === 1 ? "y" : "ies"}:`));
     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(";")}` : ""}`);
+        console.log(`      ${describeSource(skill)}${skill.hints.length ? `  ⚠ ${skill.hints.join(tr(";", "; "))}` : ""}`);
     }
     for (const skill of plan.alreadyImported)
-        console.log(`    · ${skill.name}  已导过(加 --update 重导)`);
+        console.log(tr(`    · ${skill.name}  已导过(加 --update 重导)`, `    · ${skill.name}  already imported (add --update to re-import)`));
     for (const skill of plan.conflicts) {
-        console.log(`    · ${skill.name}  目标目录已有同名技能(不是本命令导的),不覆盖`);
+        console.log(tr(`    · ${skill.name}  目标目录已有同名技能(不是本命令导的),不覆盖`, `    · ${skill.name}  a skill with this name already exists (not imported by this command); not overwriting`));
+    }
+    for (const skill of plan.duplicates) {
+        console.log(tr(`    · ${skill.name}  与前面同名,只保留先发现的(${describeSource(skill)})`, `    · ${skill.name}  duplicate name; keeping the first one found (${describeSource(skill)})`));
     }
-    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)}`);
+        console.log(tr(`    × ${formatHomePath(problem.path)}  不兼容,跳过: ${oneLine(problem.reason, 80)}`, `    × ${formatHomePath(problem.path)}  incompatible, skipped: ${oneLine(problem.reason, 80)}`));
     }
 }
 export async function importSkillsCommand(args) {
@@ -418,7 +447,7 @@ export async function importSkillsCommand(args) {
         for (const name of opts.remove) {
             const result = removeImportedSkill(name, index, destDir);
             if (result.ok)
-                console.log(`  ✓ 已删除技能 ${name}`);
+                console.log(tr(`  ✓ 已删除技能 ${name}`, `  ✓ Removed skill ${name}`));
             else
                 console.log(`  × ${name}: ${result.reason}`);
         }
@@ -435,11 +464,11 @@ export async function importSkillsCommand(args) {
     ];
     const missingFrom = opts.from.filter((dir) => !existsSync(dir));
     for (const dir of missingFrom)
-        console.log(`  --from 目录不存在: ${dir}`);
+        console.log(tr(`  --from 目录不存在: ${dir}`, `  --from directory doesn't exist: ${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(tr("  没找到 Claude Code / Codex 的技能目录(~/.claude/skills、~/.codex/skills、项目里的 .claude/skills 或 .agents/skills)。", "  No Claude Code / Codex skill directories found (~/.claude/skills, ~/.codex/skills, or .claude/skills / .agents/skills in the project)."));
+        console.log(tr("  其他工具的技能可以用 --from 指定目录,只要里面有 SKILL.md。", "  For other tools, point --from at any directory containing SKILL.md files."));
         console.log("");
         return;
     }
@@ -448,18 +477,20 @@ export async function importSkillsCommand(args) {
     printPreview(skills, plan, problems, sources);
     if (plan.pending.length === 0) {
         console.log("");
-        console.log(skills.length === 0 ? "  这些目录里没有能用的技能。" : "  没有新的可导。想重导一遍就加 --update。");
+        console.log(skills.length === 0
+            ? tr("  这些目录里没有能用的技能。", "  No usable skills in these directories.")
+            : tr("  没有新的可导。想重导一遍就加 --update。", "  Nothing new to import. Add --update to re-import."));
         console.log("");
         return;
     }
     if (opts.dryRun) {
         console.log("");
-        console.log(`  预演结束,以上 ${plan.pending.length} 个还没真正导入。`);
+        console.log(tr(`  预演结束,以上 ${plan.pending.length} 个还没真正导入。`, `  Dry run complete; the ${plan.pending.length} skill(s) above were not imported.`));
         console.log("");
         return;
     }
-    if (!opts.yes && !(await confirm(`  导入这 ${plan.pending.length} 个技能?(回车=好 / n=取消) `))) {
-        console.log("  已取消。");
+    if (!opts.yes && !(await confirm(tr(`  导入这 ${plan.pending.length} 个技能?(回车=好 / n=取消) `, `  Import these ${plan.pending.length} skill(s)? (Enter = yes / n = cancel) `)))) {
+        console.log(tr("  已取消。", "  Canceled."));
         return;
     }
     const results = runSkillImport(plan.pending, index, destDir);
@@ -467,12 +498,12 @@ export async function importSkillsCommand(args) {
     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}` : ""}。`);
+    console.log(tr(`  ✓ 导入 ${imported} 个技能到 ${formatHomePath(destDir)}${errors.length ? `,失败 ${errors.length}` : ""}。`, `  ✓ Imported ${imported} skill(s) to ${formatHomePath(destDir)}${errors.length ? `, ${errors.length} failed` : ""}.`));
     for (const item of errors)
-        console.log(`    × ${item.name}: ${item.detail ?? "失败"}`);
+        console.log(`    × ${item.name}: ${item.detail ?? tr("失败", "failed")}`);
     if (imported > 0) {
-        console.log("  下次进 u1s1 对话就能用:模型会按说明自动调用,或输入 /skill:名称 手动调用。");
-        console.log(`  管理: u1s1 import skills --list / --update / --remove 名称`);
+        console.log(tr("  下次进 u1s1 对话就能用:模型会按说明自动调用,或输入 /skill:名称 手动调用。", "  Available from your next u1s1 chat: the model invokes them based on their description, or type /skill:<name>."));
+        console.log(tr("  管理: u1s1 import skills --list / --update / --remove 名称", "  Manage: u1s1 import skills --list / --update / --remove <name>"));
     }
     console.log("");
 }

package/dist/import/util.js

@@ -3,6 +3,7 @@ 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";
+import { tr } from "../i18n.js";
 export const MAX_TOOL_RESULT_CHARS = 80_000;
 export const MAX_TEXT_CHARS = 200_000;
 export const PREVIEW_TITLE_CHARS = 48;
@@ -133,11 +134,11 @@ export function truncateText(text, max) {
     if (text.length <= max)
         return text;
     const omitted = text.length - max;
-    return `${text.slice(0, max)}\n\n[已截断,原文还有约 ${formatBytes(omitted)} ]`;
+    return `${text.slice(0, max)}\n\n${tr(`[已截断,原文还有约 ${formatBytes(omitted)} ]`, `[truncated, about ${formatBytes(omitted)} more omitted]`)}`;
 }
 export function formatBytes(n) {
     if (n < 1024)
-        return `${n} 字`;
+        return tr(`${n} 字`, `${n} B`);
     if (n < 1024 * 1024)
         return `${(n / 1024).toFixed(1)} KB`;
     return `${(n / (1024 * 1024)).toFixed(1)} MB`;

package/dist/import/write.js

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 import { agentDir, loadConfig, resolvePreferredModel } from "../config.js";
+import { tr } from "../i18n.js";
 const EMPTY_USAGE = {
     input: 0,
     output: 0,
@@ -78,7 +79,7 @@ export function writeConvertedSession(converted, destCwd) {
     sm.appendModelChange(pref.provider, pref.id);
     const dest = sm.getSessionFile();
     if (!dest)
-        throw new Error("会话写盘失败");
+        throw new Error(tr("会话写盘失败", "Failed to write session to disk"));
     return dest;
 }
 export function readJsonIfExists(path) {