zixulu 1.80.2 → 1.80.4

package/dist/index.js

@@ -4788,6 +4788,104 @@ async function sortPackageJson() {
     });
     consola.success("排序 package.json 中的依赖成功");
 }
+const AgentRulesSyncTarget = {
+    agentsMd: "AGENTS.md",
+    cursor: "Cursor",
+    antiGravity: "AntiGravity"
+};
+const syncAgentRules_source = join(".cursor-rules");
+const cursorRulesTarget = join(".cursor", "rules");
+const antiGravityRulesTarget = join(".agent", "rules");
+const orders = [
+    "base.mdc",
+    "react.mdc",
+    "api.mdc",
+    "next.mdc"
+];
+function getDefaultSyncTargets() {
+    const targets = [];
+    if (existsSync("AGENTS.md")) targets.push(AgentRulesSyncTarget.agentsMd);
+    if (existsSync(".cursor")) targets.push(AgentRulesSyncTarget.cursor);
+    if (existsSync(".agent")) targets.push(AgentRulesSyncTarget.antiGravity);
+    return targets;
+}
+function sortAgentRuleFiles(files) {
+    return files.toSorted((a, b)=>{
+        const aIndex = orders.indexOf(a);
+        const bIndex = orders.indexOf(b);
+        if (-1 === aIndex && -1 === bIndex) return a.localeCompare(b);
+        if (-1 === aIndex) return 1;
+        if (-1 === bIndex) return -1;
+        return aIndex - bIndex;
+    });
+}
+function transformCursorRuleToAntiGravityRule(source) {
+    return source.replace(/^---\nalwaysApply: (true|false)\n---/, (match, p1)=>`---
+trigger: ${"true" === p1 ? "always_on" : "model_decision"}
+glob:
+description:
+---`);
+}
+function transformCursorRuleToAgentsRule(source) {
+    return source.replace(/^---\nalwaysApply: (true|false)\n---/, "").replace(/^(#+ )/gm, "#$1");
+}
+async function getCursorRuleFileStatusMap(files) {
+    const map = {};
+    if (!existsSync(cursorRulesTarget)) return Object.fromEntries(files.map((file)=>[
+            file,
+            "new"
+        ]));
+    const targetDir = await readdir(cursorRulesTarget);
+    for (const file of files){
+        if (!targetDir.includes(file)) {
+            map[file] = "new";
+            continue;
+        }
+        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
+        const targetContent = await readFile(join(cursorRulesTarget, file), "utf-8");
+        if (sourceContent !== targetContent) map[file] = "modified";
+    }
+    return map;
+}
+async function syncCursorRules(files) {
+    const map = await getCursorRuleFileStatusMap(files);
+    const changedFiles = Object.keys(map);
+    if (0 === changedFiles.length) return;
+    const { files: selectedFiles } = await inquirer_0.prompt({
+        type: "checkbox",
+        name: "files",
+        message: "请选择要添加的 Cursor 规则文件",
+        choices: Object.entries(map).map(([key, value])=>({
+                name: `${key} (${value})`,
+                value: key
+            })),
+        default: changedFiles
+    });
+    await mkdir(cursorRulesTarget, {
+        recursive: true
+    });
+    for (const file of selectedFiles)await copyFile(join(syncAgentRules_source, file), join(cursorRulesTarget, file));
+}
+async function syncAntiGravityRules(files) {
+    await mkdir(antiGravityRulesTarget, {
+        recursive: true
+    });
+    for (const file of files){
+        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
+        const content = transformCursorRuleToAntiGravityRule(sourceContent);
+        await writeFile(join(antiGravityRulesTarget, file.replace(/\.mdc$/, ".md")), content);
+    }
+}
+async function syncAgentsMdRules(files) {
+    let agentsRule = "# Agent Rules";
+    for (const file of files){
+        const sourceContent = await readFile(join(syncAgentRules_source, file), "utf-8");
+        const content = transformCursorRuleToAgentsRule(sourceContent);
+        agentsRule = `${agentsRule}${content}`.replace(/\n+$/, "");
+    }
+    agentsRule = `${agentsRule}\n`;
+    await writeFile("AGENTS.md", agentsRule);
+}
 async function asyncAgentRules() {
     try {
         const packageJson = await readPackageJson();
@@ -4797,70 +4895,29 @@ async function asyncAgentRules() {
         });
     } catch (error) {}
     await spawnAsync("npx gitpick 1adybug/cursor-rule/tree/main/.cursor/rules .cursor-rules");
-    const source = join(".cursor-rules");
-    const target = join(".cursor", "rules");
-    let existed = existsSync(target);
-    if (!existed) await mkdir(target, {
-        recursive: true
-    });
     try {
-        const sourceDir = await readdir(source);
-        const targetDir = await readdir(target);
-        const map = {};
-        for (const file of sourceDir){
-            if (!targetDir.includes(file)) {
-                map[file] = "new";
-                continue;
-            }
-            const sourceContent = await readFile(join(source, file), "utf-8");
-            const targetContent = await readFile(join(target, file), "utf-8");
-            if (sourceContent !== targetContent) map[file] = "modified";
-        }
-        if (0 === Object.keys(map).length) throw new Error("Cursor 规则已是最新");
-        const { files } = await inquirer_0.prompt({
+        const sourceDir = sortAgentRuleFiles(await readdir(syncAgentRules_source));
+        const defaultTargets = getDefaultSyncTargets();
+        const { targets } = await inquirer_0.prompt({
             type: "checkbox",
-            name: "files",
-            message: "请选择要添加的文件",
-            choices: Object.entries(map).map(([key, value])=>({
-                    name: `${key} (${value})`,
-                    value: key
-                })),
-            default: Object.keys(map)
-        });
-        for (const file of files)await copyFile(join(source, file), join(target, file));
-        await rm(source, {
-            recursive: true
+            name: "targets",
+            message: "请选择要同步的 Agent 规则",
+            choices: Object.values(AgentRulesSyncTarget),
+            default: defaultTargets
         });
-        const dir = await readdir(".cursor/rules");
-        await mkdir(".agent/rules", {
-            recursive: true
+        if (0 === targets.length) throw new Error("未选择同步目标");
+        if (targets.includes(AgentRulesSyncTarget.cursor)) await syncCursorRules(sourceDir);
+        if (targets.includes(AgentRulesSyncTarget.antiGravity)) await syncAntiGravityRules(sourceDir);
+        if (targets.includes(AgentRulesSyncTarget.agentsMd)) await syncAgentsMdRules(sourceDir);
+        await rm(syncAgentRules_source, {
+            recursive: true,
+            force: true
         });
-        const orders = [
-            "base.mdc",
-            "react.mdc",
-            "api.mdc",
-            "next.mdc"
-        ];
-        dir.sort((a, b)=>orders.indexOf(a) - orders.indexOf(b));
-        let agentsRule = "# Agent Rules";
-        for (const file of dir){
-            const source = await readFile(join(".cursor/rules", file), "utf-8");
-            const content = source.replace(/^---\nalwaysApply: (true|false)\n---/, (match, p1)=>`---
-trigger: ${"true" === p1 ? "always_on" : "model_decision"}
-glob:
-description:
----`);
-            const content2 = source.replace(/^---\nalwaysApply: (true|false)\n---/, "").replace(/^(#+ )/gm, "#$1");
-            agentsRule += content2;
-            agentsRule = agentsRule.replace(/\n+$/, "");
-            await writeFile(join(".agent/rules", file.replace(/\.mdc$/, ".md")), content);
-        }
-        agentsRule += "\n";
-        await writeFile("AGENTS.md", agentsRule);
         return getCommitMessage("feature", "同步 Agent 规则");
     } catch (error) {
-        await rm(source, {
-            recursive: true
+        await rm(syncAgentRules_source, {
+            recursive: true,
+            force: true
         });
         throw error;
     }
@@ -5312,7 +5369,7 @@ async function pathExists(path) {
     }
 }
 
-// Windows 上优先查找真实的 code.cmd，避免 shell 拼命令时的路径问题
+// Windows 上优先查找 code.cmd，避免直接调用 Code.exe 打开编辑器窗口
 async function resolveCodeCli() {
     if (process.platform !== "win32") return "code"
 
@@ -5328,7 +5385,6 @@ async function resolveCodeCli() {
     const pathDirs = process.env.PATH?.split(delimiter).filter(Boolean) ?? []
     for (const dir of pathDirs) {
         candidates.add(join(dir, "code.cmd"))
-        candidates.add(join(dir, "code.exe"))
         candidates.add(join(dir, "code"))
     }
 
@@ -5339,16 +5395,69 @@ async function resolveCodeCli() {
     throw new Error("未找到 VS Code 命令行工具，请先安装 VS Code，并确认安装时勾选了“添加到 PATH”")
 }
 
+/**
+ * @param {string} value
+ */
+function quoteWindowsArg(value) {
+    return "\\"" + value.replace(/"/g, "\\"\\"") + "\\""
+}
+
+/**
+ * @param {string[]} args
+ * @param {string} output
+ */
+function isCliCommandSuccessful(args, output) {
+    if (args.includes("--install-extension")) return output.includes("was successfully installed.") || output.includes("is already installed.")
+    if (args.includes("--uninstall-extension")) return output.includes("was successfully uninstalled.") || output.includes("is not installed.")
+    return false
+}
+
+/**
+ * @param {Buffer | string} data
+ * @param {string[]} chunks
+ * @param {NodeJS.WriteStream} stream
+ */
+function writeChildOutput(data, chunks, stream) {
+    const text = data.toString()
+    chunks.push(text)
+    stream.write(text)
+}
+
 /**
  * @param {string} command
  * @param {string[]} args
  */
 function spawnAsync(command, args) {
     return new Promise((resolve, reject) => {
-        const child = spawn(command, args, { stdio: "inherit" })
+        // Windows 不能直接 spawn .cmd 或 .bat 文件，需要交给 cmd.exe 执行
+        const needCmdShell = process.platform === "win32" && /\\.(cmd|bat)$/i.test(command)
+        const chunks = []
+        const child = needCmdShell
+            ? spawn(
+                  process.env.ComSpec ?? "cmd.exe",
+                  ["/d", "/s", "/c", "\\"" + quoteWindowsArg(command) + " " + args.map(quoteWindowsArg).join(" ") + "\\""],
+                  {
+                      stdio: ["ignore", "pipe", "pipe"],
+                      windowsVerbatimArguments: true,
+                  },
+              )
+            : spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] })
+
+        child.stdout?.on("data", data => writeChildOutput(data, chunks, process.stdout))
+        child.stderr?.on("data", data => writeChildOutput(data, chunks, process.stderr))
         child.on("error", reject)
         child.on("exit", code => {
-            if (code !== 0) return reject(new Error(\`Command failed with code \${code}: \${command} \${args.join(" ")}\`))
+            const output = chunks.join("")
+
+            if (code !== 0) {
+                if (isCliCommandSuccessful(args, output)) {
+                    console.warn(\`VS Code 命令退出码为 \${code}，但操作已完成，继续执行后续步骤\`)
+                    return resolve(0)
+                }
+
+                return reject(new Error(\`Command failed with code \${code}: \${command} \${args.join(" ")}\`))
+            }
+
             resolve(0)
         })
     })
@@ -5360,8 +5469,18 @@ ${needUserDir ? `    const userDir = homedir()
 ` : ""}${options.includes(VscodeSyncOption.插件) ? `    const extensionsDir = join(workspaceDir, "extensions")
     const codeCli = await resolveCodeCli()
     const dir = await readdir(extensionsDir)
+    const extensionErrors = []
     for (const ext of dir) {
-        await spawnAsync(codeCli, ["--install-extension", join(extensionsDir, ext)])
+        try {
+            await spawnAsync(codeCli, ["--install-extension", join(extensionsDir, ext), "--force"])
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error)
+            extensionErrors.push(\`\${ext}: \${message}\`)
+            console.error(\`扩展同步失败：\${ext}\`)
+        }
+    }
+    if (extensionErrors.length > 0) {
+        throw new Error(\`以下扩展同步失败：\\n\${extensionErrors.join("\\n")}\`)
     }
 ` : ""}${options.includes(VscodeSyncOption.配置) ? `    const codeUserDir = join(userDir, "AppData", "Roaming", "Code", "User")
     await mkdir(codeUserDir, { recursive: true })