u1s1-cli 0.19.0 → 0.19.2

package/dist/loop.js

@@ -59,12 +59,15 @@ function parseArgs(ui, raw) {
     const tokens = raw.trim().split(/\s+/).filter(Boolean);
     let intervalMs;
     let intervalIdx = -1;
+    // 命中的是不是末尾 "every 30m" 这种占两个 token 的形式(删除时要一起删掉 "every")
+    let matchedEveryForm = false;
     // 末尾的 "every 30m" 形式占两个 token,先于前置匹配检查
     if (tokens.length >= 2 && tokens[tokens.length - 2].toLowerCase() === "every") {
         const parsed = parseIntervalMs(tokens[tokens.length - 1]);
         if (parsed !== undefined) {
             intervalMs = parsed;
             intervalIdx = tokens.length - 2;
+            matchedEveryForm = true;
         }
     }
     if (intervalMs === undefined) {
@@ -79,7 +82,7 @@ function parseArgs(ui, raw) {
     }
     const rest = tokens.slice();
     if (intervalMs !== undefined) {
-        rest.splice(intervalIdx, intervalIdx === tokens.length - 2 ? 2 : 1);
+        rest.splice(intervalIdx, matchedEveryForm ? 2 : 1);
     }
     const prompt = rest.join(" ").trim();
     if (!prompt) {

package/dist/workflow/templates.js

@@ -12,11 +12,17 @@ function strArray(v) {
 function lit(v) {
     return JSON.stringify(v ?? null);
 }
-/** git 改动文件列表(模板构建期在主进程执行,不进沙箱)。 */
+/** git 改动文件列表(模板构建期在主进程执行,不进沙箱)。
+ * 剔除已删除文件(评审/重构 agent 没法打开),并入未跟踪的新文件。 */
 function gitDiffFiles() {
-    try {
-        const out = execFileSync("git", ["diff", "--name-only", "HEAD"], { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
+    const run = (args) => {
+        const out = execFileSync("git", args, { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
         return out.split("\n").map((s) => s.trim()).filter(Boolean);
+    };
+    try {
+        const changed = run(["diff", "--name-only", "--diff-filter=d", "HEAD"]);
+        const untracked = run(["ls-files", "--others", "--exclude-standard"]);
+        return [...new Set([...changed, ...untracked])];
     }
     catch {
         return [];
@@ -33,20 +39,23 @@ export const TEMPLATES = {
                 throw new Error('i18n 模板需要 langs 数组,例如 { "langs": ["en", "ja"] }');
             const source = str(input.source, "src/locales/zh.json");
             const dir = str(input.dir, source.includes("/") ? source.slice(0, source.lastIndexOf("/")) : "src/locales");
+            // 用户输入一律经 lit() 进脚本,再在运行期拼接——裸内插遇到引号/反斜杠/换行会把生成的脚本弄成语法错误
             return `
 const langs = ${lit(langs)};
-log("i18n:翻译 " + langs.length + " 个语言,源文件 ${source}");
+const source = ${lit(source)};
+const dir = ${lit(dir)};
+log("i18n:翻译 " + langs.length + " 个语言,源文件 " + source);
 const results = await parallel(langs.map(lang => () =>
   subagent({
-    task: "读取 ${source},把所有文案翻译成对应语言(保持所有 key 不变、输出合法 JSON、译文自然地道)," +
-      "写入 ${dir}/" + lang + ".json。写完后重新读一遍文件,确认是合法 JSON 且 key 与源文件完全一致。" +
+    task: "读取 " + source + ",把所有文案翻译成对应语言(保持所有 key 不变、输出合法 JSON、译文自然地道)," +
+      "写入 " + dir + "/" + lang + ".json。写完后重新读一遍文件,确认是合法 JSON 且 key 与源文件完全一致。" +
       "目标语言代码:" + lang
   })
 ));
 const okLangs = langs.filter((_, i) => results[i] !== null);
 if (okLangs.length > 0) {
   await subagent({
-    task: "对照 ${source} 检查 ${dir}/ 目录下这些语言的翻译文件:" + okLangs.join(",") + "." +
+    task: "对照 " + source + " 检查 " + dir + "/ 目录下这些语言的翻译文件:" + okLangs.join(",") + "." +
       "逐个核对 key 是否与源文件完全一致、JSON 是否合法、译文是否有明显机翻痕迹,发现问题直接修复。最后汇报每个语言的状态"
   });
 }
@@ -95,11 +104,12 @@ return { verified };
             const contextLine = context ? `调查背景:${context}。` : "";
             return `
 const questions = ${lit(questions)};
+const contextLine = ${lit(contextLine)};
 log("research:并行调查 " + questions.length + " 个方向");
 const reports = await parallel(questions.map(q => () =>
   subagent({
     task: "调查以下问题,可以用 web_search/web_fetch 联网,也可以读本地代码和文档。" +
-      "输出:关键事实(带来源)、不同观点、你的结论。${contextLine}问题:" + q
+      "输出:关键事实(带来源)、不同观点、你的结论。" + contextLine + "问题:" + q
   })
 ));
 const merged = reports
@@ -123,17 +133,15 @@ return { synthesis };
             const instruction = str(input.instruction);
             if (!instruction)
                 throw new Error('refactor 模板需要 instruction,例如 { "instruction": "把 var 全部改为 const" }');
-            const files = strArray(input.files);
+            // 与 review 模板一致:构建期取 git 改动文件,不花一个 subagent 在沙箱里跑 git
+            let files = strArray(input.files);
+            if (files.length === 0)
+                files = gitDiffFiles();
+            if (files.length === 0)
+                throw new Error("refactor 模板需要 files 数组,或当前仓库有未提交改动");
             return `
 const instruction = ${lit(instruction)};
-let targetFiles = ${lit(files)};
-if (targetFiles.length === 0) {
-  const listed = await subagent({
-    task: "运行 git diff --name-only HEAD,把输出的文件路径一行一个原样返回,不要加任何其他文字。"
-  });
-  targetFiles = listed.split("\\n").map(s => s.trim()).filter(Boolean);
-}
-if (targetFiles.length === 0) throw new Error("没有可处理的文件:files 为空且 git 无改动");
+const targetFiles = ${lit(files)};
 log("refactor:共 " + targetFiles.length + " 个文件,先制定统一规则");
 const rule = await subagent({
   task: "我们要对一批文件做统一重构:" + instruction + "。" +

package/dist/workflow/tool.js

@@ -39,7 +39,7 @@ export function createRunWorkflowTool(getParentModel) {
                 description: "Path to an existing workflow script under .u1s1/workflows/ — rerun it instead of passing `script`.",
             })),
             save_as: Type.Optional(Type.String({
-                description: 'Save this run\'s script as .u1s1/workflows/<name>.mjs (letters/digits/-/_) for easy reuse; rerun later via script_path. Fails if the name already exists.',
+                description: 'Save this run\'s script as .u1s1/workflows/<name>.mjs (letters/digits/-/_) for easy reuse; rerun later via script_path. Fails if the name already exists. Only valid with `script` or `template`, not `script_path`.',
                 pattern: "^[a-zA-Z0-9_-]+$",
             })),
             resume: Type.Optional(Type.Boolean({
@@ -77,6 +77,9 @@ export function createRunWorkflowTool(getParentModel) {
             if (named && !/^[a-zA-Z0-9_-]+$/.test(named)) {
                 throw new Error("save_as 只允许字母、数字、横线和下划线");
             }
+            if (named && params.script_path?.trim()) {
+                throw new Error("script_path 指向的脚本已经落盘,不能再配 save_as;要另存新名字请用 script 传入源码");
+            }
             if (code) {
                 const errors = validateScript(code);
                 if (errors.length > 0) {
@@ -107,12 +110,17 @@ export function createRunWorkflowTool(getParentModel) {
             // 落盘:save_as 用语义化名字(同名报错防覆盖进度配对),否则时间戳名;
             // script_path 分支上面已读入,不重复落盘
             if (!scriptPath) {
-                scriptPath = named ? resolve(workflowsDir(), `${named}.mjs`) : saveWorkflowScript(code ?? "");
-                if (named && existsSync(scriptPath)) {
-                    throw new Error(`工作流 "${named}" 已存在(${scriptPath})。要重跑它请用 script_path 指向该文件(可加 resume:true 续跑);要新建请换个名字`);
+                if (named) {
+                    scriptPath = resolve(workflowsDir(), `${named}.mjs`);
+                    if (existsSync(scriptPath)) {
+                        throw new Error(`工作流 "${named}" 已存在(${scriptPath})。要重跑它请用 script_path 指向该文件(可加 resume:true 续跑);要新建请换个名字`);
+                    }
+                    mkdirSync(dirname(scriptPath), { recursive: true });
+                    writeFileSync(scriptPath, code ?? "");
+                }
+                else {
+                    scriptPath = saveWorkflowScript(code ?? "");
                 }
-                mkdirSync(dirname(scriptPath), { recursive: true });
-                writeFileSync(scriptPath, code ?? "");
             }
             const progressPath = scriptPath.replace(/\.mjs$/, ".progress.jsonl");
             // 流式进度:onProgress 高频触发,节流到 ≥2s 一次才推给 TUI

package/package.json

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