mano-coding 0.1.31 → 0.1.33

package/dist/bin.js

@@ -3441,8 +3441,8 @@ var init_zh = __esm({
       "create.skipped": "- \u65E0\u9700\u5B89\u88C5\uFF1A{0}\n",
       // apply.ts
       "apply.description": "\u5411\u6307\u5B9A\u76EE\u5F55\u589E\u52A0 AI Coding \u77E5\u8BC6\u8D44\u4EA7\u6216\u672C\u5730 MCP",
-      "apply.argPackageSpec": "\u8981\u5E94\u7528\u7684\u6269\u5C55\u5305\u89C4\u683C\uFF08\u81F3\u5C11\u9700\u8981\u4E00\u4E2A\u5305\uFF09",
-      "apply.packageRequired": "apply \u547D\u4EE4\u5FC5\u987B\u663E\u5F0F\u6307\u5B9A\u81F3\u5C11\u4E00\u4E2A\u6269\u5C55\u5305",
+      "apply.argPackageSpec": "\u8981\u5E94\u7528\u7684\u6A21\u677F\u89C4\u683C\uFF08\u81F3\u5C11\u9700\u8981\u4E00\u4E2A\u6A21\u677F\uFF09",
+      "apply.packageRequired": "apply \u547D\u4EE4\u5FC5\u987B\u663E\u5F0F\u6307\u5B9A\u81F3\u5C11\u4E00\u4E2A\u6A21\u677F",
       "apply.optionOnly": "\u4EC5\u5B89\u88C5\u6307\u5B9A\u7684\u53D7\u7BA1\u77E5\u8BC6\u8D44\u4EA7\u7C7B\u578B\uFF08\u9017\u53F7\u5206\u9694\uFF1Askills,rules,subagents,mcp,agents-md\uFF09",
       "apply.optionSkip": "\u8DF3\u8FC7\u6307\u5B9A\u7684\u53D7\u7BA1\u77E5\u8BC6\u8D44\u4EA7\u7C7B\u578B\uFF08\u9017\u53F7\u5206\u9694\uFF1Askills,rules,subagents,mcp,agents-md\uFF09",
       "apply.onlySkipExclusive": "--only \u4E0E --skip \u53C2\u6570\u4E92\u65A5\uFF0C\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528",
@@ -3450,15 +3450,15 @@ var init_zh = __esm({
       "apply.emptyAfterFilter": "\u8FC7\u6EE4\u540E\u65E0\u53EF\u4EA4\u4ED8\u7684\u6838\u5FC3\u53D7\u7BA1\u8D44\u4EA7\u4E14\u5305\u4E0D\u5305\u542B apply \u751F\u547D\u5468\u671F\u4EFB\u52A1",
       "apply.driftDetected": "\u53D7\u7BA1\u8D44\u6E90\u5DF2\u6F02\u79FB\uFF0C\u62D2\u7EDD apply\uFF1B\u8BF7\u5148\u8FD0\u884C sync --drift restore \u6216 accept",
       "apply.packageSpecRequired": "\u9879\u76EE\u65E0 lock \u6587\u4EF6\u65F6 apply \u9700\u8981 <package-spec>\u3002\u4F7F\u7528 --dry-run \u9884\u89C8\u3002",
-      "apply.addonKindMismatch": "\u5305 {0} \u7684\u7C7B\u578B\u4E3A '{1}'\uFF0C\u671F\u671B 'Addon'",
+      "apply.addonKindMismatch": "\u5305 {0} \u7684\u7C7B\u578B\u4E3A '{1}'\uFF0C\u671F\u671B '\u6A21\u677F'",
       "apply.missingInputs": "\u7F3A\u5C11\u5FC5\u586B\u8F93\u5165\uFF1A{0}\u3002\u901A\u8FC7 --set \u63D0\u4F9B\u3002",
       "apply.planConflict": "Plan \u5B58\u5728\u51B2\u7A81",
       "apply.needsConfirmation": "\u6267\u884C Plan \u9700\u8981 --yes\u3002\u4F7F\u7528 --dry-run \u9884\u89C8\u3002",
       "apply.userDeclined": "\u7528\u6237\u62D2\u7EDD\u4E86 Plan \u786E\u8BA4",
       "apply.executionFailed": "\u6267\u884C\u5931\u8D25\uFF1B\u5DF2\u5C1D\u8BD5\u56DE\u6EDA",
       "apply.executionFailedShort": "\u6267\u884C\u5931\u8D25",
-      "apply.projectExtensionFailed": "Addon {0} \u7684\u5DE5\u7A0B\u6269\u5C55 apply \u5931\u8D25\uFF1A{1}",
-      "apply.applied": "\u5DF2\u5C06 Addon \u5E94\u7528\u5230 {0}",
+      "apply.projectExtensionFailed": "\u6A21\u677F {0} \u7684\u5DE5\u7A0B\u6269\u5C55 apply \u5931\u8D25\uFF1A{1}",
+      "apply.applied": "\u5DF2\u5C06\u6A21\u677F\u5E94\u7528\u5230 {0}",
       "apply.lockFile": "Lock \u6587\u4EF6\uFF1A{0}",
       // sync.ts
       "sync.description": "\u4ECE lock \u6587\u4EF6\u6062\u590D\u9879\u76EE\u72B6\u6001\uFF08\u4E0D\u89E3\u6790\u7248\u672C\uFF09",
@@ -3533,6 +3533,7 @@ var init_zh = __esm({
       "selfUpgrade.toMustBeExact": "--to \u5FC5\u987B\u662F\u7CBE\u786E\u7684 SemVer \u7248\u672C\u3002",
       "selfUpgrade.offlineCacheMiss": "\u672C\u5730\u66F4\u65B0\u7F13\u5B58\u4E2D\u6CA1\u6709\u8BF7\u6C42\u7684 CLI \u7248\u672C\u3002",
       "selfUpgrade.fetchMetadataFailed": "\u65E0\u6CD5\u8BFB\u53D6 CLI \u7248\u672C\u5143\u6570\u636E\uFF1A{0}",
+      "selfUpgrade.fetchMetadataTimeout": "\u7F51\u7EDC\u8BF7\u6C42\u8D85\u65F6\uFF08\u8D85\u8FC7 {0} \u79D2\uFF09\uFF0C\u65E0\u6CD5\u8BFB\u53D6 CLI \u7248\u672C\u5143\u6570\u636E\u3002\u5EFA\u8BAE\u68C0\u67E5\u7F51\u7EDC\u8FDE\u63A5\uFF0C\u6216\u901A\u8FC7\u73AF\u5883\u53D8\u91CF AICODING_NPM_REGISTRY \u914D\u7F6E\u56FD\u5185\u955C\u50CF\u6E90\uFF08\u4F8B\u5982 https://registry.npmmirror.com\uFF09",
       "selfUpgrade.noLatestVersion": "Registry \u5143\u6570\u636E\u6CA1\u6709\u6709\u6548\u7684\u6700\u65B0 CLI \u7248\u672C\u3002",
       "selfUpgrade.versionNotInMetadata": "CLI \u7248\u672C {0} \u4E0D\u5B58\u5728\u4E8E Registry \u5143\u6570\u636E\u4E2D\u3002",
       "selfUpgrade.confirmationRequired": "CLI \u5347\u7EA7\u9700\u8981\u786E\u8BA4\u3002\u4F7F\u7528 --yes \u6279\u51C6\u3002",
@@ -23352,9 +23353,9 @@ async function persistGitCheckout(workDir, targetDir) {
   return targetDir;
 }
 async function copyGitCheckout(src, dest) {
-  const { readdir: readdir11, mkdir: mkdir19, copyFile: copyFile2 } = await import("node:fs/promises");
+  const { readdir: readdir11, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
   const { join: joinPath } = await import("node:path");
-  await mkdir19(dest, { recursive: true });
+  await mkdir20(dest, { recursive: true });
   const entries = await readdir11(src, { withFileTypes: true });
   for (const entry of entries) {
     if (entry.name === ".git") continue;
@@ -26934,9 +26935,9 @@ var init_tarball_loader = __esm({
         return targetDir;
       }
       async copyDirRecursive(src, dest) {
-        const { readdir: readdir11, mkdir: mkdir19, copyFile: copyFile2 } = await import("node:fs/promises");
+        const { readdir: readdir11, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
         const { join: joinPath } = await import("node:path");
-        await mkdir19(dest, { recursive: true });
+        await mkdir20(dest, { recursive: true });
         const entries = await readdir11(src, { withFileTypes: true });
         for (const entry of entries) {
           const srcPath = joinPath(src, entry.name);
@@ -31386,7 +31387,20 @@ var init_execute = __esm({
 // packages/core/src/execute/task-runner.ts
 import { spawn } from "node:child_process";
 import { existsSync as existsSync4 } from "node:fs";
+import { writeFile as writeFile6, mkdir as mkdir13 } from "node:fs/promises";
+import { tmpdir as tmpdir5 } from "node:os";
 import { delimiter, isAbsolute as isAbsolute5, join as join13, relative as relative5, resolve as resolve10, sep as sep3 } from "node:path";
+function sanitizeTaskOutput(text, stagingDir, projectDir) {
+  if (!stagingDir || !projectDir || !text) return text;
+  let res = text;
+  const stagingBack = resolve10(stagingDir);
+  const projectBack = resolve10(projectDir);
+  const stagingForward = stagingBack.replaceAll("\\", "/");
+  const projectForward = projectBack.replaceAll("\\", "/");
+  res = res.replaceAll(stagingBack, projectBack);
+  res = res.replaceAll(stagingForward, projectForward);
+  return res;
+}
 function filterTasksByHook(items, hook) {
   return items.filter((item) => {
     const task = "task" in item ? item.task : item;
@@ -31638,7 +31652,6 @@ async function executeTasks(tasks, ctx, options = {}) {
   if (!varValidation.valid) {
     throw new TaskExecutionError(varValidation.errors.join("; "), 1);
   }
-  const stdio = options.stdio ?? "inherit";
   const allowedRoots = [
     ctx.projectDir,
     ctx.templateDir,
@@ -31671,8 +31684,12 @@ async function executeTasks(tasks, ctx, options = {}) {
       }
     }
     const taskLabel = task.name ? `${task.name} (${task.id})` : task.id;
+    if (options.onTaskStart) {
+      options.onTaskStart(task, i, tasks.length);
+    }
     if (options.onProgress) {
-      options.onProgress(`\u6B63\u5728\u6267\u884C\u4EFB\u52A1 [${i + 1}/${tasks.length}] (${taskLabel}): ${command} ${effectiveArgs.join(" ")}`);
+      const sanitizedCmd = sanitizeTaskOutput(`${command} ${effectiveArgs.join(" ")}`, ctx.stagingDir, ctx.projectDir);
+      options.onProgress(`\u6B63\u5728\u6267\u884C\u4EFB\u52A1 [${i + 1}/${tasks.length}] (${taskLabel}): ${sanitizedCmd}`);
     }
     const rawExecutable = resolveTaskExecutable(command, process.platform, env.PATH);
     const { executable, args: spawnArgs } = prepareSpawnCommand(
@@ -31681,35 +31698,96 @@ async function executeTasks(tasks, ctx, options = {}) {
       process.platform
     );
     await new Promise((resolvePromise, reject) => {
+      const isIgnore = options.stdio === "ignore";
+      const isVerbose = Boolean(options.verbose);
+      let childStdio;
+      if (isIgnore) {
+        childStdio = "ignore";
+      } else if (isVerbose) {
+        childStdio = ["inherit", "pipe", "pipe"];
+      } else {
+        childStdio = ["ignore", "pipe", "pipe"];
+      }
       const child = spawn(executable, spawnArgs, {
         cwd: resolvedCwd,
         env,
-        stdio,
+        stdio: childStdio,
         shell: false,
         windowsHide: true
       });
-      child.on("error", (err) => {
-        reject(
-          new TaskExecutionError(
-            `\u6267\u884C\u4EFB\u52A1 '${task.id}' \u5931\u8D25 (${command}): ${err.message}`,
-            1,
-            task.id,
-            command
-          )
+      const stdoutChunks = [];
+      const stderrChunks = [];
+      if (!isIgnore) {
+        child.stdout?.on("data", (chunk) => {
+          stdoutChunks.push(chunk);
+          if (isVerbose) {
+            process.stdout.write(sanitizeTaskOutput(chunk.toString(), ctx.stagingDir, ctx.projectDir));
+          }
+        });
+        child.stderr?.on("data", (chunk) => {
+          stderrChunks.push(chunk);
+          if (isVerbose) {
+            process.stderr.write(sanitizeTaskOutput(chunk.toString(), ctx.stagingDir, ctx.projectDir));
+          }
+        });
+      }
+      const writeErrorLogAndReject = async (code, rawErrorMessage) => {
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const rawStdout = Buffer.concat(stdoutChunks).toString("utf-8");
+        const rawStderr = Buffer.concat(stderrChunks).toString("utf-8");
+        const stdoutStr = sanitizeTaskOutput(rawStdout, ctx.stagingDir, ctx.projectDir);
+        const stderrStr = sanitizeTaskOutput(rawStderr, ctx.stagingDir, ctx.projectDir);
+        const logContent = [
+          `=== Mano Coding \u4EFB\u52A1\u6267\u884C\u9519\u8BEF\u65E5\u5FD7 ===`,
+          `\u65F6\u95F4: ${now}`,
+          `\u4EFB\u52A1 ID: ${task.id}`,
+          `\u4EFB\u52A1\u540D\u79F0: ${task.name ?? task.id}`,
+          `\u5DE5\u4F5C\u76EE\u5F55: ${resolvedCwd}`,
+          `\u547D\u4EE4: ${command} ${effectiveArgs.join(" ")}`,
+          `\u9000\u51FA\u7801: ${code}`,
+          `\u9519\u8BEF\u4FE1\u606F: ${rawErrorMessage}`,
+          `
+--- \u6807\u51C6\u8F93\u51FA (stdout) ---`,
+          stdoutStr || "(\u65E0\u8F93\u51FA)",
+          `
+--- \u6807\u51C6\u9519\u8BEF (stderr) ---`,
+          stderrStr || "(\u65E0\u8F93\u51FA)",
+          ""
+        ].join("\n");
+        const logDir = options.logDir ?? join13(ctx.projectDir, ".mano-coding", "logs");
+        let logFilePath;
+        try {
+          await mkdir13(logDir, { recursive: true });
+          logFilePath = join13(logDir, `task-error-${task.id}-${Date.now()}.log`);
+          await writeFile6(logFilePath, logContent, "utf-8");
+        } catch {
+          try {
+            const fallbackDir = join13(tmpdir5(), "mano-coding-logs");
+            await mkdir13(fallbackDir, { recursive: true });
+            logFilePath = join13(fallbackDir, `task-error-${task.id}-${Date.now()}.log`);
+            await writeFile6(logFilePath, logContent, "utf-8");
+          } catch {
+          }
+        }
+        const taskErr = new TaskExecutionError(
+          `\u4EFB\u52A1 '${taskLabel}' \u6267\u884C\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${code}${logFilePath ? `\u3002\u8BE6\u7EC6\u65E5\u5FD7\u5DF2\u4FDD\u5B58\u81F3: ${logFilePath}` : ""}`,
+          code,
+          task.id,
+          command,
+          logFilePath
         );
+        options.onTaskFail?.(task, i, tasks.length, taskErr, logFilePath);
+        reject(taskErr);
+      };
+      child.on("error", (err) => {
+        void writeErrorLogAndReject(1, err.message);
       });
       child.on("exit", (code) => {
         if (code === 0 || code === null) {
+          options.onTaskSuccess?.(task, i, tasks.length);
           resolvePromise();
         } else {
-          reject(
-            new TaskExecutionError(
-              `\u521D\u59CB\u5316\u4EFB\u52A1 '${task.id}' \u6267\u884C\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${code}`,
-              code,
-              task.id,
-              command
-            )
-          );
+          void writeErrorLogAndReject(code, `\u5B50\u8FDB\u7A0B\u9000\u51FA\u7801\u975E 0: ${code}`);
         }
       });
     });
@@ -31720,11 +31798,12 @@ var init_task_runner = __esm({
   "packages/core/src/execute/task-runner.ts"() {
     "use strict";
     TaskExecutionError = class extends Error {
-      constructor(message, exitCode, taskId, command) {
+      constructor(message, exitCode, taskId, command, logFile) {
         super(message);
         this.exitCode = exitCode;
         this.taskId = taskId;
         this.command = command;
+        this.logFile = logFile;
         this.name = "TaskExecutionError";
       }
     };
@@ -32507,7 +32586,7 @@ var init_plugin = __esm({
 
 // packages/core/src/journal.ts
 import { createHash as createHash12, randomUUID as randomUUID3 } from "node:crypto";
-import { chmod as chmod2, cp as cp2, mkdir as mkdir13, open as open4, readdir as readdir7, readFile as readFile21, rename as rename5, rm as rm5, stat as stat5, writeFile as writeFile6 } from "node:fs/promises";
+import { chmod as chmod2, cp as cp2, mkdir as mkdir14, open as open4, readdir as readdir7, readFile as readFile21, rename as rename5, rm as rm5, stat as stat5, writeFile as writeFile7 } from "node:fs/promises";
 import { dirname as dirname12, join as join16, resolve as resolve12 } from "node:path";
 function projectHash(projectRoot) {
   return createHash12("sha256").update(resolve12(projectRoot)).digest("hex").slice(0, 32);
@@ -32637,9 +32716,9 @@ async function createJournal(userDataDir, projectRoot, options = {}) {
     userDataDir: resolve12(userDataDir),
     ...paths
   };
-  await mkdir13(dirname12(paths.transactionPath), { recursive: true });
-  await mkdir13(paths.transactionPath);
-  await mkdir13(paths.backupPath);
+  await mkdir14(dirname12(paths.transactionPath), { recursive: true });
+  await mkdir14(paths.transactionPath);
+  await mkdir14(paths.backupPath);
   await atomicWrite(paths.journalPath, documentOf(journal));
   return journal;
 }
@@ -32706,7 +32785,7 @@ async function prepareRecoverySnapshots(journal, scope, root, paths) {
         continue;
       }
       if (!info.isFile()) throw new JournalError(`Recovery \u76EE\u6807\u4E0D\u662F\u6587\u4EF6\u6216\u76EE\u5F55: ${path2}`, "JOURNAL_INVALID");
-      await writeFile6(join16(journal.backupPath, backupName), await readFile21(absolutePath));
+      await writeFile7(join16(journal.backupPath, backupName), await readFile21(absolutePath));
       snapshots.push({ scope, path: path2, existed: true, backup: backupName, mode: info.mode & 4095, kind: "file" });
     } catch (error) {
       if (error.code === "ENOENT") {
@@ -32736,8 +32815,8 @@ async function restoreRecovery(journal, projectRoot, recovery) {
       if (snapshot2.mode !== void 0 && process.platform !== "win32") await chmod2(absolutePath, snapshot2.mode);
       continue;
     }
-    await mkdir13(dirname12(absolutePath), { recursive: true });
-    await writeFile6(absolutePath, await readFile21(join16(journal.backupPath, snapshot2.backup)));
+    await mkdir14(dirname12(absolutePath), { recursive: true });
+    await writeFile7(absolutePath, await readFile21(join16(journal.backupPath, snapshot2.backup)));
     if (snapshot2.mode !== void 0 && process.platform !== "win32") await chmod2(absolutePath, snapshot2.mode);
   }
 }
@@ -32806,7 +32885,7 @@ var init_journal = __esm({
 
 // packages/core/src/transaction.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { mkdir as mkdir14, open as open5, lstat as lstat4, readFile as readFile22, readlink, rename as rename6, symlink as symlink2, unlink as unlink8 } from "node:fs/promises";
+import { mkdir as mkdir15, open as open5, lstat as lstat4, readFile as readFile22, readlink, rename as rename6, symlink as symlink2, unlink as unlink8 } from "node:fs/promises";
 import { dirname as dirname13, resolve as resolve13 } from "node:path";
 function errorCode(error) {
   if (error && typeof error === "object" && "code" in error) {
@@ -32882,7 +32961,7 @@ async function removeIfPresent(path2) {
   }
 }
 async function atomicWrite2(path2, content, mode) {
-  await mkdir14(dirname13(path2), { recursive: true });
+  await mkdir15(dirname13(path2), { recursive: true });
   const temporaryPath = `${path2}.${randomUUID4()}.tmp`;
   let handle;
   try {
@@ -32902,7 +32981,7 @@ async function restore(path2, saved) {
     return removeIfPresent(path2);
   }
   await removeIfPresent(path2);
-  await mkdir14(dirname13(path2), { recursive: true });
+  await mkdir15(dirname13(path2), { recursive: true });
   if (saved.kind === "symlink") {
     await symlink2(saved.target, path2);
     return;
@@ -33189,7 +33268,7 @@ var init_types5 = __esm({
 
 // packages/core/src/orchestrator/staging-manager.ts
 import { mkdtemp as mkdtemp5, rm as rm6 } from "node:fs/promises";
-import { tmpdir as tmpdir5 } from "node:os";
+import { tmpdir as tmpdir6 } from "node:os";
 import { join as join17 } from "node:path";
 var StagingManager;
 var init_staging_manager = __esm({
@@ -33203,7 +33282,7 @@ var init_staging_manager = __esm({
         const existing = this.stagingDirs.get(packageId);
         if (existing) return existing;
         if (!this.baseDir) {
-          this.baseDir = await mkdtemp5(join17(tmpdir5(), "mano-staging-"));
+          this.baseDir = await mkdtemp5(join17(tmpdir6(), "mano-staging-"));
         }
         const pkgStaging = await mkdtemp5(join17(this.baseDir, `${sanitizedId}-`));
         this.stagingDirs.set(packageId, pkgStaging);
@@ -33379,7 +33458,7 @@ var init_qualification = __esm({
 
 // packages/core/src/orchestrator/lifecycle-orchestrator.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
-import { writeFile as writeFile7, mkdir as mkdir15 } from "node:fs/promises";
+import { writeFile as writeFile8, mkdir as mkdir16 } from "node:fs/promises";
 import { basename as basename3, dirname as dirname14, join as join19 } from "node:path";
 function resolveStringInputs(globalInputs, packageInputs, packageId) {
   const merged = {};
@@ -33536,8 +33615,8 @@ var init_lifecycle_orchestrator = __esm({
             for (const intent of stagingIntents) {
               if (intent.action === "upsert" && intent.type === "file") {
                 const targetPath = join19(options.projectRoot, intent.path);
-                await mkdir15(dirname14(targetPath), { recursive: true });
-                await writeFile7(targetPath, intent.content);
+                await mkdir16(dirname14(targetPath), { recursive: true });
+                await writeFile8(targetPath, intent.content);
               }
             }
           }
@@ -33780,6 +33859,7 @@ __export(src_exports, {
   resolveTaskExecutable: () => resolveTaskExecutable,
   sanitizeCommand: () => sanitizeCommand,
   sanitizeEnvValue: () => sanitizeEnvValue,
+  sanitizeTaskOutput: () => sanitizeTaskOutput,
   sanitizeUrl: () => sanitizeUrl,
   scanJournals: () => scanJournals,
   scanStagingDirectory: () => scanStagingDirectory,
@@ -43722,7 +43802,7 @@ var require_dist3 = __commonJS({
 });
 
 // packages/cli/src/commands/extension-pipeline.ts
-import { readFile as readFile24, writeFile as writeFile8 } from "node:fs/promises";
+import { readFile as readFile24, writeFile as writeFile9 } from "node:fs/promises";
 import { existsSync as existsSync5 } from "node:fs";
 import { resolve as resolve14 } from "node:path";
 function generateGitlabCiYaml(packageId) {
@@ -43855,7 +43935,7 @@ async function executeExtensionPipeline(directory, options) {
     }
   }
   const ciContent = generateGitlabCiYaml(packageId);
-  await writeFile8(ciFilePath, ciContent, "utf-8");
+  await writeFile9(ciFilePath, ciContent, "utf-8");
   let addedReleaseScript = false;
   if (existsSync5(pkgJsonPath)) {
     try {
@@ -43864,7 +43944,7 @@ async function executeExtensionPipeline(directory, options) {
       parsed.scripts = parsed.scripts || {};
       if (!parsed.scripts.release) {
         parsed.scripts.release = "npm version patch";
-        await writeFile8(pkgJsonPath, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
+        await writeFile9(pkgJsonPath, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
         addedReleaseScript = true;
       }
     } catch {
@@ -43908,7 +43988,7 @@ var init_extension_pipeline = __esm({
 });
 
 // packages/cli/src/commands/extension-create.ts
-import { mkdir as mkdir16, writeFile as writeFile9, readdir as readdir9 } from "node:fs/promises";
+import { mkdir as mkdir17, writeFile as writeFile10, readdir as readdir9 } from "node:fs/promises";
 import { basename as basename4, resolve as resolve15 } from "node:path";
 function createExtensionCreateCommand() {
   const cmd = new Command("create");
@@ -44021,7 +44101,7 @@ async function executeExtensionCreate(directory, options) {
       default: true
     });
   }
-  await mkdir16(targetDir, { recursive: true });
+  await mkdir17(targetDir, { recursive: true });
   const scripts = {
     test: "vitest"
   };
@@ -44047,7 +44127,7 @@ async function executeExtensionCreate(directory, options) {
       vitest: "^3.0.5"
     }
   };
-  await writeFile9(resolve15(targetDir, "package.json"), JSON.stringify(pkgJson, null, 2) + "\n", "utf-8");
+  await writeFile10(resolve15(targetDir, "package.json"), JSON.stringify(pkgJson, null, 2) + "\n", "utf-8");
   const manifestLines = [
     `id: "${packageId}"`,
     "version: 0.1.0",
@@ -44069,7 +44149,7 @@ async function executeExtensionCreate(directory, options) {
     manifestLines.push("    on:");
     manifestLines.push("      - after:create");
   }
-  await writeFile9(resolve15(targetDir, "manifest.yaml"), manifestLines.join("\n") + "\n", "utf-8");
+  await writeFile10(resolve15(targetDir, "manifest.yaml"), manifestLines.join("\n") + "\n", "utf-8");
   const agentsMdContent = `# ${templateName} Agent \u6307\u5357
 
 \u672C\u9879\u76EE\u57FA\u4E8E ${templateName} \u6A21\u677F\u6784\u5EFA\u3002\u5728\u8FDB\u884C AI \u8F85\u52A9\u7F16\u7801\u65F6\uFF0C\u8BF7\u9075\u5FAA\u4EE5\u4E0B\u6838\u5FC3\u539F\u5219\u4E0E\u7EA6\u5B9A\uFF1A
@@ -44081,9 +44161,9 @@ async function executeExtensionCreate(directory, options) {
 ## 2. \u4EA4\u4E92\u4E0E\u6CE8\u91CA
 - \u4EE3\u7801\u6CE8\u91CA\u4E0E\u56DE\u7B54\u8BF7\u59CB\u7EC8\u4F7F\u7528\u7B80\u4F53\u4E2D\u6587\u3002
 `;
-  await writeFile9(resolve15(targetDir, "AGENTS.md"), agentsMdContent, "utf-8");
+  await writeFile10(resolve15(targetDir, "AGENTS.md"), agentsMdContent, "utf-8");
   const skillDir = resolve15(targetDir, "skills", "example-skill");
-  await mkdir16(skillDir, { recursive: true });
+  await mkdir17(skillDir, { recursive: true });
   const skillContent = `---
 name: example-skill
 description: ${templateName} \u793A\u4F8B Agent \u6280\u80FD\uFF0C\u6307\u5BFC AI \u6309\u7167\u6700\u4F73\u5B9E\u8DF5\u5B8C\u6210\u7279\u5B9A\u4EFB\u52A1
@@ -44099,9 +44179,9 @@ description: ${templateName} \u793A\u4F8B Agent \u6280\u80FD\uFF0C\u6307\u5BFC A
 2. \u9075\u5FAA\u672C\u9879\u76EE\u7684\u67B6\u6784\u8BBE\u8BA1\u539F\u5219\u5B9E\u73B0\u4EE3\u7801\u3002
 3. \u7F16\u5199\u5BF9\u5E94\u6D4B\u8BD5\u5E76\u9A8C\u8BC1\u3002
 `;
-  await writeFile9(resolve15(skillDir, "SKILL.md"), skillContent, "utf-8");
+  await writeFile10(resolve15(skillDir, "SKILL.md"), skillContent, "utf-8");
   const cursorRulesDir = resolve15(targetDir, "rules", "cursor");
-  await mkdir16(cursorRulesDir, { recursive: true });
+  await mkdir17(cursorRulesDir, { recursive: true });
   const cursorRuleContent = `---
 description: ${templateName} Cursor \u7F16\u7801\u89C4\u5219
 globs: *
@@ -44113,17 +44193,17 @@ alwaysApply: false
 - \u4F18\u5148\u4F7F\u7528\u73B0\u6709\u7684\u8BBE\u8BA1\u7CFB\u7EDF\u548C\u516C\u5171\u7EC4\u4EF6\u3002
 - \u4FDD\u6301\u51FD\u6570\u4E0E\u6A21\u5757\u7B80\u6D01\uFF0C\u5355\u4E00\u804C\u8D23\u3002
 `;
-  await writeFile9(resolve15(cursorRulesDir, "example-rule.mdc"), cursorRuleContent, "utf-8");
+  await writeFile10(resolve15(cursorRulesDir, "example-rule.mdc"), cursorRuleContent, "utf-8");
   const codebuddyRulesDir = resolve15(targetDir, "rules", "codebuddy");
-  await mkdir16(codebuddyRulesDir, { recursive: true });
+  await mkdir17(codebuddyRulesDir, { recursive: true });
   const codebuddyRuleContent = `# ${templateName} \u7F16\u7801\u89C4\u5219 (CodeBuddy)
 
 - \u9075\u5FAA\u4EE3\u7801\u8BBE\u8BA1\u539F\u5219\u3002
 - \u5355\u5143\u6D4B\u8BD5\u8986\u76D6\u6838\u5FC3\u903B\u8F91\u5206\u652F\u3002
 `;
-  await writeFile9(resolve15(codebuddyRulesDir, "example-rule.md"), codebuddyRuleContent, "utf-8");
+  await writeFile10(resolve15(codebuddyRulesDir, "example-rule.md"), codebuddyRuleContent, "utf-8");
   const mcpDir = resolve15(targetDir, "mcp");
-  await mkdir16(mcpDir, { recursive: true });
+  await mkdir17(mcpDir, { recursive: true });
   const mcpJsonContent = {
     mcpServers: {
       "example-server": {
@@ -44132,9 +44212,9 @@ alwaysApply: false
       }
     }
   };
-  await writeFile9(resolve15(mcpDir, "mcp.json"), JSON.stringify(mcpJsonContent, null, 2) + "\n", "utf-8");
+  await writeFile10(resolve15(mcpDir, "mcp.json"), JSON.stringify(mcpJsonContent, null, 2) + "\n", "utf-8");
   const testDir = resolve15(targetDir, "test");
-  await mkdir16(testDir, { recursive: true });
+  await mkdir17(testDir, { recursive: true });
   const testContent = `import { describe, expect, it } from 'vitest';
 import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
@@ -44147,7 +44227,7 @@ describe('${packageId} template manifest', () => {
   });
 });
 `;
-  await writeFile9(resolve15(testDir, "manifest.test.ts"), testContent, "utf-8");
+  await writeFile10(resolve15(testDir, "manifest.test.ts"), testContent, "utf-8");
   const createdFiles = [
     "manifest.yaml",
     "AGENTS.md",
@@ -44160,7 +44240,7 @@ describe('${packageId} template manifest', () => {
     "test/manifest.test.ts"
   ];
   if (withPipeline) {
-    await writeFile9(
+    await writeFile10(
       resolve15(targetDir, ".gitlab-ci.yml"),
       generateGitlabCiYaml(packageId),
       "utf-8"
@@ -44174,7 +44254,7 @@ describe('${packageId} template manifest', () => {
     withTasks: Boolean(withTasks),
     withPipeline: Boolean(withPipeline)
   });
-  await writeFile9(resolve15(targetDir, "README.md"), readmeContent, "utf-8");
+  await writeFile10(resolve15(targetDir, "README.md"), readmeContent, "utf-8");
   if (output.json) {
     emitSuccessJson("extension create", {
       directory: targetDir,
@@ -44480,7 +44560,7 @@ var init_shared_options = __esm({
 
 // packages/cli/src/commands/extension-dev.ts
 import { mkdtemp as mkdtemp6, readFile as readFile25 } from "node:fs/promises";
-import { tmpdir as tmpdir6 } from "node:os";
+import { tmpdir as tmpdir7 } from "node:os";
 import { join as join20, resolve as resolvePath9, relative as relative8, isAbsolute as isAbsolute6, sep as sep4 } from "node:path";
 function createExtensionDevCommand() {
   const cmd = new Command("dev");
@@ -44535,7 +44615,7 @@ async function executeExtensionDev(packageDirectory, options) {
     return ExitCode.SchemaInvalid;
   }
   const effectiveDryRun = options.dryRun || options.watch;
-  const isolatedUserData = await mkdtemp6(join20(tmpdir6(), "aicoding-dev-userdata-"));
+  const isolatedUserData = await mkdtemp6(join20(tmpdir7(), "aicoding-dev-userdata-"));
   const prevUserData = process.env["AICODING_USER_DATA"];
   process.env["AICODING_USER_DATA"] = isolatedUserData;
   try {
@@ -44775,7 +44855,7 @@ var init_extension_test = __esm({
 });
 
 // packages/cli/src/commands/extension-pack.ts
-import { readFile as readFile27, mkdir as mkdir17 } from "node:fs/promises";
+import { readFile as readFile27, mkdir as mkdir18 } from "node:fs/promises";
 import { resolve as resolve17, join as join21, dirname as dirname15 } from "node:path";
 import { execFile as execFile4 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
@@ -44925,7 +45005,7 @@ async function executeExtensionPack(packageDirectory, options, cliVersion) {
     }
   }
   const outputDir = options.output ? resolve17(options.output) : resolve17(pkgDir, "dist-package");
-  await mkdir17(outputDir, { recursive: true });
+  await mkdir18(outputDir, { recursive: true });
   let tarballName;
   let tarballPath;
   tarballName = `${pkgName.replace(/^@/, "").replace(/\//g, "-")}-${pkgVersion}.tgz`;
@@ -45169,7 +45249,7 @@ var init_extension_submit = __esm({
 });
 
 // packages/cli/src/commands/extension-adapter.ts
-import { readFile as readFile29, mkdir as mkdir18 } from "node:fs/promises";
+import { readFile as readFile29, mkdir as mkdir19 } from "node:fs/promises";
 import { dirname as dirname16, resolve as resolve19 } from "node:path";
 import { execFile as execFile5 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
@@ -45513,7 +45593,7 @@ async function executeAdapterPack(packageDirectory, options) {
     return ExitCode.SchemaInvalid;
   }
   const outputDir = options.output ? resolve19(options.output) : resolve19(pkgDir, "dist-package");
-  await mkdir18(outputDir, { recursive: true });
+  await mkdir19(outputDir, { recursive: true });
   const tarballName = `${pkgName.replace(/^@/, "").replace(/\//g, "-")}-${pkgVersion}.tgz`;
   const tarballPath = resolve19(outputDir, tarballName);
   try {
@@ -46101,7 +46181,7 @@ function summarizePlan(plan) {
 function printPlanSummary(s3) {
   writeHumanOutput(`\u6267\u884C\u6458\u8981\uFF1A
   \u64CD\u4F5C\uFF1A${s3.operation}
-  \u6269\u5C55\u5305\uFF1A${s3.packageCount}
+  \u6A21\u677F\uFF1A${s3.packageCount}
   \u6587\u4EF6\uFF1A${s3.fileCount}
   \u914D\u7F6E\u9879\uFF1A${s3.configEntryCount}
   \u63D2\u4EF6\uFF1A${s3.pluginCount}
@@ -46206,11 +46286,27 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
     });
   }
   const resources = /* @__PURE__ */ new Map();
+  if (existingLock?.resources) {
+    for (const res of existingLock.resources) {
+      const key = `${res.target}:${res.path}:${res.selector ?? ""}`;
+      resources.set(key, { ...res, owners: [...res.owners] });
+    }
+  }
   for (const intent of intents) {
-    if (intent.action === "remove") continue;
     if (!intent.target) continue;
     const targetId = typeof intent.target === "string" ? intent.target : intent.target.id;
     const selector = (intent.type === "config-entry" ? intent.selector : intent.type === "managed-section" ? intent.sectionId : null) ?? null;
+    const key = `${targetId}:${intent.path}:${selector ?? ""}`;
+    if (intent.action === "remove") {
+      const existing2 = resources.get(key);
+      if (existing2) {
+        existing2.owners = existing2.owners.filter((o) => o.packageId !== intent.packageId);
+        if (existing2.owners.length === 0) {
+          resources.delete(key);
+        }
+      }
+      continue;
+    }
     let digest = intent.digest ?? "";
     if (!digest) {
       if (intent.type === "file") {
@@ -46221,7 +46317,6 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
         digest = computeStringDigest(intent.content ?? "");
       }
     }
-    const key = `${targetId}:${intent.path}:${selector ?? ""}`;
     const owner = {
       packageId: intent.packageId ?? templateResolution?.packageId ?? addonResolutions[0]?.packageId ?? "unknown",
       assetType: intent.assetType ?? (intent.type === "file" ? "rule" : "config"),
@@ -46233,6 +46328,11 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
         if (!existing.owners.some((o) => o.packageId === owner.packageId && o.assetType === owner.assetType && o.assetId === owner.assetId)) {
           existing.owners.push(owner);
         }
+      } else {
+        existing.hash = digest;
+        if (!existing.owners.some((o) => o.packageId === owner.packageId && o.assetType === owner.assetType && o.assetId === owner.assetId)) {
+          existing.owners.push(owner);
+        }
       }
       continue;
     }
@@ -46500,6 +46600,85 @@ var init_spinner = __esm({
   }
 });
 
+// packages/cli/src/commands/task-helper.ts
+async function runTasksWithDynamicUI(tasks, ctx, options = {}) {
+  if (tasks.length === 0) return;
+  const isInteractive = !options.json && !options.verbose && Boolean(process.stdout.isTTY) && process.env.NODE_ENV !== "test";
+  if (!options.json && options.title) {
+    writeHumanOutput(`
+${options.title}
+`);
+  }
+  if (isInteractive) {
+    let currentSpinner = null;
+    try {
+      await executeTasks(tasks, ctx, {
+        verbose: false,
+        onTaskStart: (task, index, total) => {
+          const taskLabel = task.name ? `${task.name} (${task.id})` : task.id;
+          currentSpinner = new Spinner(`[${index + 1}/${total}] \u6B63\u5728\u6267\u884C\u4EFB\u52A1: ${taskLabel}...`);
+          currentSpinner.start();
+        },
+        onTaskSuccess: (task, index, total) => {
+          const taskLabel = task.name ? `${task.name}` : task.id;
+          if (currentSpinner) {
+            currentSpinner.succeed(`[${index + 1}/${total}] \u4EFB\u52A1\u5B8C\u6210: ${taskLabel}`);
+          }
+        },
+        onTaskFail: (task, index, total, _error, logFile) => {
+          const taskLabel = task.name ? `${task.name}` : task.id;
+          if (currentSpinner) {
+            currentSpinner.fail(`[${index + 1}/${total}] \u4EFB\u52A1\u6267\u884C\u5931\u8D25: ${taskLabel}`);
+          }
+          if (logFile) {
+            writeHumanOutput(`  \u8BE6\u7EC6\u65E5\u5FD7\u5DF2\u4FDD\u5B58\u81F3: ${logFile}
+`);
+          }
+        }
+      });
+    } catch (err) {
+      currentSpinner?.stop();
+      throw err;
+    }
+  } else {
+    await executeTasks(tasks, ctx, {
+      verbose: Boolean(options.verbose),
+      stdio: options.json ? "ignore" : void 0,
+      onTaskStart: (task, index, total) => {
+        if (!options.json && options.verbose) {
+          writeHumanOutput(`
+> [${index + 1}/${total}] \u5F00\u59CB\u6267\u884C\u4EFB\u52A1: ${task.name ?? task.id}
+`);
+        }
+      },
+      onTaskSuccess: (task, index, total) => {
+        if (!options.json && !options.verbose) {
+          writeHumanOutput(`\u2714 [${index + 1}/${total}] \u4EFB\u52A1\u5B8C\u6210: ${task.name ?? task.id}
+`);
+        }
+      },
+      onTaskFail: (task, index, total, _err, logFile) => {
+        if (!options.json) {
+          writeHumanOutput(`\u2716 [${index + 1}/${total}] \u4EFB\u52A1\u6267\u884C\u5931\u8D25: ${task.name ?? task.id}
+`);
+          if (logFile) {
+            writeHumanOutput(`  \u8BE6\u7EC6\u65E5\u5FD7\u5DF2\u4FDD\u5B58\u81F3: ${logFile}
+`);
+          }
+        }
+      }
+    });
+  }
+}
+var init_task_helper = __esm({
+  "packages/cli/src/commands/task-helper.ts"() {
+    "use strict";
+    init_spinner();
+    init_src2();
+    init_cli_output();
+  }
+});
+
 // packages/cli/src/commands/tty-confirm.ts
 var tty_confirm_exports = {};
 __export(tty_confirm_exports, {
@@ -46756,7 +46935,7 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
         ),
         {
           enabled: spinnerEnabled,
-          successText: (res) => `\u2714 \u6269\u5C55\u5305\u89E3\u6790\u5B8C\u6210: ${res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? spec} (v${res.manifest.version ?? "0.0.0"})`,
+          successText: (res) => `\u2714 \u6A21\u677F\u89E3\u6790\u5B8C\u6210: ${res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? spec} (v${res.manifest.version ?? "0.0.0"})`,
           failText: `\u2716 \u6269\u5C55\u5305\u89E3\u6790\u5931\u8D25: ${spec}`
         }
       ), { packageId: spec });
@@ -46802,7 +46981,7 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
         }
       }
     }
-    const { parseInputFlags: parseInputFlags3, validateTaskInputs: validateTaskInputs2, executeTasks: executeTasks2, filterTasksByHook: filterTasksByHook2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
+    const { parseInputFlags: parseInputFlags3, validateTaskInputs: validateTaskInputs2, filterTasksByHook: filterTasksByHook2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
     const rawInputs = [...options.input ?? [], ...options.set ?? []];
     const { values: inputValues, packageValues, warnings: inputWarnings } = parseInputFlags3(rawInputs);
     writeWarnings(inputWarnings, output);
@@ -46993,18 +47172,12 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
             operation: "create",
             version: resolution.manifest.version
           };
-          if (!output.json) {
-            writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u524D\u7F6E\u521B\u5EFA\u4EFB\u52A1 (before:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):
-`);
-          }
+          const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u521B\u5EFA\u4EFB\u52A1 (before:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
           try {
-            await executeTasks2(pkgTasks, taskContext, {
-              onProgress: (msg) => {
-                if (!output.json) writeHumanOutput(`> ${msg}
-`);
-              },
-              stdio: output.json ? "ignore" : "inherit"
+            await runTasksWithDynamicUI(pkgTasks, taskContext, {
+              title,
+              verbose: options.verbose,
+              json: options.json
             });
           } catch (err) {
             if (err instanceof Error) {
@@ -47123,18 +47296,12 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
             operation: "create",
             version: resolution.manifest.version
           };
-          if (!output.json) {
-            writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u540E\u7F6E\u521D\u59CB\u5316\u4EFB\u52A1 (after:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):
-`);
-          }
+          const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u521D\u59CB\u5316\u4EFB\u52A1 (after:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
           try {
-            await executeTasks2(pkgTasks, taskContext, {
-              onProgress: (msg) => {
-                if (!output.json) writeHumanOutput(`> [${resolution.manifest.id}] ${msg}
-`);
-              },
-              stdio: output.json ? "ignore" : "inherit"
+            await runTasksWithDynamicUI(pkgTasks, taskContext, {
+              title,
+              verbose: options.verbose,
+              json: options.json
             });
           } catch (err) {
             if (err instanceof Error) {
@@ -47214,6 +47381,7 @@ var init_create = __esm({
     init_plan_execution();
     init_searchable_select();
     init_spinner();
+    init_task_helper();
     init_i18n();
   }
 });
@@ -47223,7 +47391,7 @@ import { unlink as unlink10 } from "node:fs/promises";
 import { randomUUID as randomUUID7 } from "node:crypto";
 function createApplyCommand(cliVersion) {
   const cmd = new Command("apply");
-  cmd.description("Apply an Addon package to an existing project").argument("[package-spec]", "Addon package spec (required if no project lock)").action(async (packageSpec, opts) => {
+  cmd.description("Apply a template to an existing project").argument("[package-spec]", "Template spec (required if no project lock)").action(async (packageSpec, opts) => {
     const options = extractMutationOptions(opts);
     const output = {
       json: options.json,
@@ -47328,7 +47496,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       addonResolutions = existing.addons;
     }
     const newAddonResolution = await withSpinner(
-      `\u6B63\u5728\u62C9\u53D6\u5E76\u89E3\u6790\u6269\u5C55 (${packageSpec})...`,
+      `\u6B63\u5728\u62C9\u53D6\u5E76\u89E3\u6790\u6A21\u677F (${packageSpec})...`,
       () => resolvePackageWith2(
         service,
         packageSpec,
@@ -47337,8 +47505,8 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       ),
       {
         enabled: spinnerEnabled,
-        successText: (res) => `\u2714 \u6269\u5C55\u89E3\u6790\u5B8C\u6210: ${res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? packageSpec} (v${res.manifest.version ?? "0.0.0"})`,
-        failText: `\u2716 \u6269\u5C55\u89E3\u6790\u5931\u8D25: ${packageSpec}`
+        successText: (res) => `\u2714 \u6A21\u677F\u89E3\u6790\u5B8C\u6210: ${res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? packageSpec} (v${res.manifest.version ?? "0.0.0"})`,
+        failText: `\u2716 \u6A21\u677F\u89E3\u6790\u5931\u8D25: ${packageSpec}`
       }
     );
     addonResolutions = [...addonResolutions.filter((resolution) => resolution.packageId !== newAddonResolution.packageId), newAddonResolution];
@@ -47396,10 +47564,11 @@ async function executeApply(packageSpec, options, cliVersion, events) {
     );
     const planStartedAt = Date.now();
     const planBuilder = service.getPlanBuilder();
+    const packagesToApply = [newAddonResolution];
     let planResult = planBuilder.build(
       "apply",
       service.projectRoot,
-      allResolutions,
+      packagesToApply,
       projectTargets
     );
     const userInstallationKeys = /* @__PURE__ */ new Set();
@@ -47407,7 +47576,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       "\u6B63\u5728\u8BA1\u7B97\u53D7\u7BA1\u8D44\u6E90\u5E76\u751F\u6210\u6267\u884C\u8BA1\u5212...",
       () => buildIntentsFromPlan(
         planResult.plan,
-        allResolutions,
+        packagesToApply,
         service,
         projectTargets,
         userInstallationKeys,
@@ -47426,6 +47595,28 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         failText: "\u2716 \u6267\u884C\u8BA1\u5212\u751F\u6210\u5931\u8D25"
       }
     );
+    if (existingLock?.resources) {
+      for (const intent of intents) {
+        if (intent.action === "remove" || !intent.target) continue;
+        const targetId = typeof intent.target === "string" ? intent.target : intent.target.id;
+        const selector = (intent.type === "config-entry" ? intent.selector : intent.type === "managed-section" ? intent.sectionId : null) ?? null;
+        const matched = existingLock.resources.find((r) => r.target === targetId && r.path === intent.path && (r.selector ?? null) === selector);
+        if (matched && matched.owners.every((o) => o.packageId !== newAddonResolution.packageId)) {
+          let newDigest = intent.digest ?? "";
+          if (!newDigest && intent.type === "file" && intent.content) {
+            const { computeStringDigest: computeStringDigest2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
+            newDigest = computeStringDigest2(intent.content);
+          }
+          if (newDigest && matched.hash && newDigest !== matched.hash) {
+            throw new CliError(
+              `\u8D44\u6E90 '${intent.path}' \u4E0E\u5DF2\u6709\u6A21\u677F\u8D44\u6E90\u5B58\u5728\u51B2\u7A81`,
+              ExitCode.ConflictOrDrift,
+              "PLAN_CONFLICT"
+            );
+          }
+        }
+      }
+    }
     const { filterTasksByHook: filterTasksByHook2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
     const skippedCreateTasks = [
       ...filterTasksByHook2(newAddonResolution.manifest.tasks ?? [], "before:create"),
@@ -47545,14 +47736,11 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       }
       return ExitCode.Success;
     }
-    const allTasksWithContext = allResolutions.flatMap((resolution) => {
-      const tTasks = resolution.manifest.tasks ?? [];
-      return tTasks.map((task) => ({
-        task,
-        templateDir: service.getPackageRoot(resolution) ?? service.projectRoot
-      }));
-    });
-    const beforeApplyTasks = allTasksWithContext.filter(({ task }) => {
+    const newTasksWithContext = (newAddonResolution.manifest.tasks ?? []).map((task) => ({
+      task,
+      templateDir: service.getPackageRoot(newAddonResolution) ?? service.projectRoot
+    }));
+    const beforeApplyTasks = newTasksWithContext.filter(({ task }) => {
       return filterTasksByHook2([task], "before:apply").length > 0;
     });
     if (beforeApplyTasks.length > 0) {
@@ -47568,16 +47756,11 @@ async function executeApply(packageSpec, options, cliVersion, events) {
           target: projectTargets[0]?.id,
           targets: projectTargets.map((t2) => t2.id)
         };
-        if (!output.json && i === 0) {
-          writeHumanOutput("\n\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5E94\u7528\u4EFB\u52A1 (before:apply):\n");
-        }
         try {
-          await executeTasks([task], taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI([task], taskContext, {
+            title: i === 0 ? "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5E94\u7528\u4EFB\u52A1 (before:apply):" : void 0,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -47623,7 +47806,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       addRollback(userLifecycle.rollback);
       const activeAssetTypes = onlyTypes ?? (skipTypes ? ["skills", "rules", "subagents", "mcp", "agents-md"].filter((t2) => !skipTypes.includes(t2)) : void 0);
       const packageAssetTypes = activeAssetTypes ? { [newAddonResolution.packageId]: activeAssetTypes } : void 0;
-      const lock = await buildLock("apply", templateResolution, addonResolutions, projectTargets, planResult.plan, service.cliVersion, inputValues, service, intents, userInstallationKeys, packageAssetTypes);
+      const lock = await buildLock("apply", templateResolution, addonResolutions, projectTargets, planResult.plan, service.cliVersion, inputValues, service, intents, userInstallationKeys, packageAssetTypes, existingLock);
       for (const desired of [lock.desired.template, ...lock.desired.addons ?? []]) {
         if (!desired) continue;
         const previous = [existingLock?.desired.template, ...existingLock?.desired.addons ?? []].find((item) => item?.id === desired.id);
@@ -47635,7 +47818,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       await finishJournal(journal);
     });
     events.report("record", "success", Date.now() - recordStartedAt, { planDigest: planResult.plan.planDigest });
-    const afterApplyTasks = allTasksWithContext.filter(({ task }) => {
+    const afterApplyTasks = newTasksWithContext.filter(({ task }) => {
       return filterTasksByHook2([task], "after:apply").length > 0;
     });
     if (afterApplyTasks.length > 0) {
@@ -47651,16 +47834,11 @@ async function executeApply(packageSpec, options, cliVersion, events) {
           target: projectTargets[0]?.id,
           targets: projectTargets.map((t2) => t2.id)
         };
-        if (!output.json && i === 0) {
-          writeHumanOutput("\n\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5E94\u7528\u4EFB\u52A1 (after:apply):\n");
-        }
         try {
-          await executeTasks([task], taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI([task], taskContext, {
+            title: i === 0 ? "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5E94\u7528\u4EFB\u52A1 (after:apply):" : void 0,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -47720,6 +47898,7 @@ var init_apply = __esm({
     init_cli_output();
     init_service_locator();
     init_spinner();
+    init_task_helper();
     init_i18n();
     init_plan_execution();
     init_searchable_select();
@@ -47968,18 +48147,12 @@ async function executeSync(options, cliVersion, silent = false, events = new Lif
           operation: "sync",
           version: resolution.manifest.version
         };
-        if (!output.json) {
-          writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u524D\u7F6E\u540C\u6B65\u4EFB\u52A1 (before:sync) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):
-`);
-        }
+        const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u540C\u6B65\u4EFB\u52A1 (before:sync) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
         try {
-          await executeTasks(pkgTasks, taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> [${resolution.manifest.id}] ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI(pkgTasks, taskContext, {
+            title,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -48036,18 +48209,12 @@ async function executeSync(options, cliVersion, silent = false, events = new Lif
           operation: "sync",
           version: resolution.manifest.version
         };
-        if (!output.json) {
-          writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u540E\u7F6E\u540C\u6B65\u4EFB\u52A1 (after:sync) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):
-`);
-        }
+        const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u540C\u6B65\u4EFB\u52A1 (after:sync) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
         try {
-          await executeTasks(pkgTasks, taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> [${resolution.manifest.id}] ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI(pkgTasks, taskContext, {
+            title,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -48082,6 +48249,7 @@ var init_sync = __esm({
     init_cli_output();
     init_service_locator();
     init_plan_execution();
+    init_task_helper();
     init_i18n();
   }
 });
@@ -48345,18 +48513,12 @@ async function executeRemove(packageId, options, cliVersion, events) {
           operation: "remove",
           version: item.manifest.version
         };
-        if (!output.json) {
-          writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u524D\u7F6E\u79FB\u9664\u4EFB\u52A1 (before:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):
-`);
-        }
+        const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u79FB\u9664\u4EFB\u52A1 (before:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):`;
         try {
-          await executeTasks(pkgTasks, taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> [${item.packageId}] ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI(pkgTasks, taskContext, {
+            title,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -48425,18 +48587,12 @@ async function executeRemove(packageId, options, cliVersion, events) {
           operation: "remove",
           version: item.manifest.version
         };
-        if (!output.json) {
-          writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u540E\u7F6E\u79FB\u9664\u4EFB\u52A1 (after:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):
-`);
-        }
+        const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u79FB\u9664\u4EFB\u52A1 (after:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):`;
         try {
-          await executeTasks(pkgTasks, taskContext, {
-            onProgress: (msg) => {
-              if (!output.json) writeHumanOutput(`> [${item.packageId}] ${msg}
-`);
-            },
-            stdio: output.json ? "ignore" : "inherit"
+          await runTasksWithDynamicUI(pkgTasks, taskContext, {
+            title,
+            verbose: options.verbose,
+            json: options.json
           });
         } catch (err) {
           if (err instanceof Error) {
@@ -48534,6 +48690,7 @@ var init_remove = __esm({
     init_cli_output();
     init_service_locator();
     init_plan_execution();
+    init_task_helper();
     init_i18n();
   }
 });
@@ -49641,18 +49798,12 @@ async function executeUpgrade(opts, cliVersion) {
         previousVersion: oldVersion,
         version: templateResolution.resolvedVersion
       };
-      if (!output.json) {
-        writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5347\u7EA7\u4EFB\u52A1 (before:upgrade) (${targetPackageId}):
-`);
-      }
+      const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5347\u7EA7\u4EFB\u52A1 (before:upgrade) (${targetPackageId}):`;
       try {
-        await executeTasks(beforeTasks, taskContext, {
-          onProgress: (msg) => {
-            if (!output.json) writeHumanOutput(`> [${targetPackageId}] ${msg}
-`);
-          },
-          stdio: output.json ? "ignore" : "inherit"
+        await runTasksWithDynamicUI(beforeTasks, taskContext, {
+          title,
+          verbose: Boolean(opts.verbose),
+          json
         });
       } catch (err) {
         if (err instanceof Error) {
@@ -49703,18 +49854,12 @@ async function executeUpgrade(opts, cliVersion) {
         previousVersion: oldVersion,
         version: templateResolution.resolvedVersion
       };
-      if (!output.json) {
-        writeHumanOutput(`
-\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5347\u7EA7\u4EFB\u52A1 (after:upgrade) (${targetPackageId}):
-`);
-      }
+      const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5347\u7EA7\u4EFB\u52A1 (after:upgrade) (${targetPackageId}):`;
       try {
-        await executeTasks(afterTasks, taskContext, {
-          onProgress: (msg) => {
-            if (!output.json) writeHumanOutput(`> [${targetPackageId}] ${msg}
-`);
-          },
-          stdio: output.json ? "ignore" : "inherit"
+        await runTasksWithDynamicUI(afterTasks, taskContext, {
+          title,
+          verbose: Boolean(opts.verbose),
+          json
         });
       } catch (err) {
         if (err instanceof Error) {
@@ -49783,6 +49928,7 @@ var init_upgrade = __esm({
     init_service_locator();
     init_journal_helper();
     init_plan_execution();
+    init_task_helper();
     init_i18n();
   }
 });
@@ -50449,17 +50595,41 @@ async function verifyCliVersion(binPath, expected) {
   const result = await runCommand(process.execPath, [binPath, "--version"]).catch(() => void 0);
   return result?.exitCode === 0 && result.stdout.trim() === expected;
 }
-async function fetchCliMetadata(registry, request = fetch) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 3e3);
-  timer.unref?.();
-  try {
-    const response = await request(`${registry}/${encodeURIComponent(CLI_PACKAGE_NAME)}`, { signal: controller.signal, redirect: "error" });
-    if (!response.ok) throw new Error(`Registry returned HTTP ${response.status}`);
-    return await response.json();
-  } finally {
-    clearTimeout(timer);
+async function fetchCliMetadata(registry, request = fetch, options) {
+  const envTimeout = process.env["AICODING_FETCH_TIMEOUT"] ? Number.parseInt(process.env["AICODING_FETCH_TIMEOUT"], 10) : void 0;
+  const timeoutMs = options?.timeoutMs ?? (Number.isFinite(envTimeout) && (envTimeout ?? 0) > 0 ? envTimeout : 15e3);
+  const maxRetries = options?.retries ?? 1;
+  let lastError;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    const controller = new AbortController();
+    let timedOut = false;
+    const timer = setTimeout(() => {
+      timedOut = true;
+      controller.abort();
+    }, timeoutMs);
+    timer.unref?.();
+    try {
+      const response = await request(`${registry}/${encodeURIComponent(CLI_PACKAGE_NAME)}`, {
+        signal: controller.signal,
+        redirect: "error"
+      });
+      if (!response.ok) throw new Error(`Registry returned HTTP ${response.status}`);
+      return await response.json();
+    } catch (error) {
+      const isAbort = timedOut || error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted"));
+      if (isAbort) {
+        lastError = new Error(t("selfUpgrade.fetchMetadataTimeout", Math.round(timeoutMs / 1e3)));
+      } else {
+        lastError = error;
+      }
+      if (attempt < maxRetries) {
+        await new Promise((resolve28) => setTimeout(resolve28, 200));
+      }
+    } finally {
+      clearTimeout(timer);
+    }
   }
+  throw lastError;
 }
 async function runCommand(command, args) {
   const useCmd = process.platform === "win32" && (command === "pnpm" || command === "npm");
@@ -50538,7 +50708,7 @@ import { createRequire as createRequire2 } from "node:module";
 import { readFileSync as readFileSync4 } from "node:fs";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function resolveVersion() {
-  if (true) return "0.1.31";
+  if (true) return "0.1.33";
   const candidates = [
     new URL("../package.json", import.meta.url),
     new URL("../../package.json", import.meta.url),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mano-coding",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Mano Coding CLI and toolchain",
   "type": "module",
   "main": "index.js",