mano-coding 0.1.33 → 0.1.35

package/dist/bin.js

@@ -3404,17 +3404,19 @@ var init_zh = __esm({
       "version.description": "\u663E\u793A CLI \u7248\u672C",
       // create.ts
       "create.description": "\u5411\u6307\u5B9A\u76EE\u5F55\u521B\u5EFA\u5DE5\u7A0B\u5E76\u5B89\u88C5 AI Coding \u8D44\u4EA7",
-      "create.argPackageSpec": "\u6269\u5C55\u5305\u89C4\u683C\u6216\u9879\u76EE\u76EE\u5F55",
+      "create.argTemplateSpec": "\u6A21\u677F\u89C4\u683C\uFF08\u672A\u6307\u5B9A\u65F6\u5728\u4EA4\u4E92\u7EC8\u7AEF\u4E2D\u9009\u62E9\uFF09",
       "create.argDirectory": "\u9879\u76EE\u76EE\u5F55\uFF08\u9ED8\u8BA4\uFF1A\u5F53\u524D\u76EE\u5F55\uFF09",
-      "create.optionPackage": "\u6269\u5C55\u5305\u89C4\u683C\uFF08\u53EF\u91CD\u590D\uFF0C\u6240\u6709\u5305\u6309\u540C\u540D\u751F\u547D\u5468\u671F\u4E32\u884C\u6267\u884C\uFF09",
-      "create.optionTemplate": "\u6269\u5C55\u5305\u89C4\u683C\uFF08\u5411\u540E\u517C\u5BB9\u522B\u540D\uFF0C\u5EFA\u8BAE\u4F7F\u7528 --package\uFF09",
-      "create.optionAddon": "\u6269\u5C55\u5305\u89C4\u683C\uFF08\u5411\u540E\u517C\u5BB9\u522B\u540D\uFF0C\u5EFA\u8BAE\u4F7F\u7528 --package\uFF09",
-      "create.templateRequired": "\u975E\u4EA4\u4E92\u73AF\u5883\u5FC5\u987B\u901A\u8FC7\u53C2\u6570\u63D0\u4F9B\u81F3\u5C11\u4E00\u4E2A\u6269\u5C55\u5305\u89C4\u683C",
-      "create.registryIndexUnsupported": "\u5F53\u524D Registry \u5BA2\u6237\u7AEF\u4E0D\u652F\u6301\u5305\u7D22\u5F15",
-      "create.chooseTemplate": "\u9009\u62E9\u8981\u5B89\u88C5\u7684\u6269\u5C55\u5305",
-      "create.templateSelectionCancelled": "\u6269\u5C55\u5305\u9009\u62E9\u5DF2\u53D6\u6D88",
-      "create.packageKindMismatch": "\u5305 {0} \u7684\u5185\u5BB9\u4E0D\u7B26\u5408 create \u547D\u4EE4\u8981\u6C42",
-      "create.addonKindMismatch": "\u5305 {0} \u7684\u5185\u5BB9\u4E0D\u7B26\u5408\u8981\u6C42",
+      "create.optionTemplate": "\u6A21\u677F\u89C4\u683C\uFF08\u53EF\u91CD\u590D\uFF0C\u652F\u6301\u4E00\u6B21\u6027\u6307\u5B9A\u591A\u4E2A\u6A21\u677F\uFF09",
+      "create.templateRequired": "\u975E\u4EA4\u4E92\u73AF\u5883\u5FC5\u987B\u901A\u8FC7\u53C2\u6570\u63D0\u4F9B\u81F3\u5C11\u4E00\u4E2A\u6A21\u677F\u89C4\u683C",
+      "create.registryIndexUnsupported": "\u5F53\u524D Registry \u5BA2\u6237\u7AEF\u4E0D\u652F\u6301\u6A21\u677F\u7D22\u5F15",
+      "create.chooseTemplate": "\u9009\u62E9\u8981\u5B89\u88C5\u7684\u6A21\u677F",
+      "create.templateSelectionCancelled": "\u6A21\u677F\u9009\u62E9\u5DF2\u53D6\u6D88",
+      "create.templateKindMismatch": "\u6A21\u677F {0} \u7684\u5185\u5BB9\u4E0D\u7B26\u5408 create \u547D\u4EE4\u8981\u6C42",
+      "create.filterUnsupported": "create \u547D\u4EE4\u4E0D\u652F\u6301 --only / --skip \u8D44\u4EA7\u8FC7\u6EE4\uFF0C\u4EE5\u4FDD\u8BC1\u6A21\u677F\u5B8C\u6574\u4EA4\u4ED8\u3002\u5982\u9700\u5B9A\u5236\u53D7\u7BA1\u8D44\u4EA7\u8BF7\u4F7F\u7528 apply \u547D\u4EE4\u3002",
+      "create.templateAlreadyInstalled": "\u6A21\u677F '{0}' \u5DF2\u7ECF\u5B89\u88C5\u5728\u5F53\u524D\u5DE5\u7A0B\u4E2D\u3002\u4E0D\u80FD\u901A\u8FC7 create \u91CD\u65B0\u5B89\u88C5\u3002\u5982\u9700\u66F4\u65B0\u914D\u7F6E\u6216\u540C\u6B65\u8D44\u4EA7\u8BF7\u4F7F\u7528 'apply'\u3001'sync' \u6216 'upgrade' \u547D\u4EE4\u3002",
+      "create.missingTaskInputs": "\u6A21\u677F '{0}' \u7F3A\u5C11\u521D\u59CB\u5316\u53C2\u6570: {1}\uFF0C\u8BF7\u4F7F\u7528\uFF1A\n{2}",
+      "create.promptTaskInput": "[{0}] \u8BF7\u8F93\u5165\u521D\u59CB\u5316\u53C2\u6570 '{1}':",
+      "create.taskValidationFailed": "\u53C2\u6570\u6821\u9A8C\u5931\u8D25",
       "create.missingInputs": "\u7F3A\u5C11\u5FC5\u586B\u8F93\u5165\uFF1A{0}",
       "create.missingInputsHint": "\u7F3A\u5C11\u5FC5\u586B\u8F93\u5165\uFF1A{0}\u3002\u8BF7\u901A\u8FC7 --input <name>=<value> \u63D0\u4F9B",
       "create.chooseTargets": "\u9009\u62E9\u8981\u521D\u59CB\u5316\u7684 IDE \u76EE\u6807",
@@ -3425,7 +3427,7 @@ var init_zh = __esm({
       "create.userDeclined": "\u7528\u6237\u62D2\u7EDD\u4E86 Plan \u786E\u8BA4",
       "create.executionFailed": "\u6267\u884C\u5931\u8D25\uFF1B\u5DF2\u5C1D\u8BD5\u56DE\u6EDA",
       "create.executionFailedShort": "\u6267\u884C\u5931\u8D25",
-      "create.projectExtensionFailed": "\u5DE5\u7A0B\u6269\u5C55 create \u5931\u8D25\uFF1A{0}",
+      "create.projectExtensionFailed": "\u5DE5\u7A0B\u6A21\u677F create \u5931\u8D25\uFF1A{0}",
       "create.createdProject": "\u9879\u76EE\u5DF2\u521B\u5EFA\u5728 {0}",
       "create.lockFile": "Lock \u6587\u4EF6\uFF1A{0}",
       "create.enterInput": "\u8F93\u5165 {0}",
@@ -3434,23 +3436,46 @@ var init_zh = __esm({
       "create.initializingWorkspace": "\u6B63\u5728\u521D\u59CB\u5316\u5DE5\u7A0B\u5DE5\u4F5C\u533A\u2026\n",
       "create.workspaceInitialized": "\u2713 \u5DE5\u7A0B\u5DE5\u4F5C\u533A\u521D\u59CB\u5316\u5B8C\u6210\uFF08{0}\uFF09\n",
       "create.installingUserTools": "\u6B63\u5728\u5B89\u88C5\u7528\u6237\u7EA7\u5DE5\u5177\uFF08{0} \u9879\uFF09\u2026\n",
-      "create.userToolsInstalled": "\u2713 \u7528\u6237\u7EA7\u5DE5\u5177\u5B89\u88C5\u5B8C\u6210\uFF08{0}\uFF09\n",
+      "create.computingPlan": "\u6B63\u5728\u8BA1\u7B97\u53D7\u7BA1\u8D44\u6E90\u5E76\u751F\u6210\u6267\u884C\u8BA1\u5212...",
+      "create.planReady": "\u2714 \u6267\u884C\u8BA1\u5212\u5DF2\u5C31\u7EEA (\u5171 {0} \u9879\u8D44\u6E90\u53D8\u66F4)",
+      "create.planFailed": "\u2716 \u6267\u884C\u8BA1\u5212\u751F\u6210\u5931\u8D25",
       "create.installing": "\u6B63\u5728\u5B89\u88C5\uFF1A{0}\n",
       "create.installed": "\u2713 \u5DF2\u5B89\u88C5\uFF1A{0}\n",
       "create.reused": "\u2713 \u5DF2\u590D\u7528\uFF1A{0}\n",
       "create.skipped": "- \u65E0\u9700\u5B89\u88C5\uFF1A{0}\n",
+      "common.seconds": "{0} \u79D2",
+      // 模板通用解析文案
+      "template.resolving": "\u6B63\u5728\u62C9\u53D6\u5E76\u89E3\u6790\u6A21\u677F ({0})...",
+      "template.resolved": "\u2714 \u6A21\u677F\u89E3\u6790\u5B8C\u6210: {0} (v{1})",
+      "template.resolveFailed": "\u2716 \u6A21\u677F\u89E3\u6790\u5931\u8D25: {0}",
+      // 任务通用执行文案
+      "task.runningBeforeCreate": "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u521B\u5EFA\u4EFB\u52A1 (before:create) [{0}/{1}] ({2}):",
+      "task.runningAfterCreate": "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u521B\u5EFA\u4EFB\u52A1 (after:create) [{0}/{1}] ({2}):",
+      "task.runningBeforeApply": "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5E94\u7528\u4EFB\u52A1 (before:apply) [{0}/{1}] ({2}):",
+      "task.runningAfterApply": "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5E94\u7528\u4EFB\u52A1 (after:apply) [{0}/{1}] ({2}):",
+      "task.runningBeforeRemove": "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u79FB\u9664\u4EFB\u52A1 (before:remove) [{0}/{1}] ({2}):",
+      "task.runningAfterRemove": "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u79FB\u9664\u4EFB\u52A1 (after:remove) [{0}/{1}] ({2}):",
+      "task.runningBeforeSync": "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u540C\u6B65\u4EFB\u52A1 (before:sync) [{0}/{1}] ({2}):",
+      "task.runningAfterSync": "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u540C\u6B65\u4EFB\u52A1 (after:sync) [{0}/{1}] ({2}):",
       // 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\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.argTemplateSpec": "\u8981\u5E94\u7528\u7684\u6A21\u677F\u89C4\u683C\uFF08\u672A\u6307\u5B9A\u65F6\u5728\u4EA4\u4E92\u7EC8\u7AEF\u4E2D\u9009\u62E9\uFF09",
+      "apply.optionTemplate": "\u8981\u5E94\u7528\u7684\u6A21\u677F\u89C4\u683C\uFF08\u53EF\u91CD\u590D\uFF0C\u6240\u6709\u6A21\u677F\u6309\u540C\u540D\u751F\u547D\u5468\u671F\u4E32\u884C\u6267\u884C\uFF09",
+      "apply.templateRequired": "\u975E\u4EA4\u4E92\u73AF\u5883\u5FC5\u987B\u663E\u5F0F\u6307\u5B9A\u81F3\u5C11\u4E00\u4E2A\u6A21\u677F",
+      "apply.chooseTemplate": "\u9009\u62E9\u8981\u5E94\u7528\u7684\u6A21\u677F",
+      "apply.templateSelectionCancelled": "\u6A21\u677F\u9009\u62E9\u5DF2\u53D6\u6D88",
+      "apply.chooseTargets": "\u9009\u62E9\u8981\u5E94\u7528\u7684 IDE \u76EE\u6807",
+      "apply.targetSelectionCancelled": "\u76EE\u6807\u9009\u62E9\u5DF2\u53D6\u6D88",
+      "apply.targetRequired": "\u7F3A\u5C11\u76EE\u6807 IDE \u53C2\u6570\uFF0C\u8BF7\u4F7F\u7528 --target <ide...>",
+      "apply.noAvailableTemplates": "\u6CA1\u6709\u53EF\u4F9B\u5B89\u88C5\u7684\u65B0\u6A21\u677F\u6216\u5168\u90E8\u5019\u9009\u6A21\u677F\u5DF2\u5B89\u88C5",
       "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",
       "apply.invalidAssetType": "\u65E0\u6548\u7684\u8D44\u4EA7\u7C7B\u578B '{0}'\uFF0C\u4EC5\u652F\u6301: skills, rules, subagents, mcp, agents-md",
-      "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.emptyAfterFilter": "\u8FC7\u6EE4\u540E\u65E0\u53EF\u4EA4\u4ED8\u7684\u6838\u5FC3\u53D7\u7BA1\u8D44\u4EA7\u4E14\u6A21\u677F\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 '\u6A21\u677F'",
+      "apply.packageSpecRequired": "\u9879\u76EE\u65E0 lock \u6587\u4EF6\u65F6 apply \u9700\u8981\u6307\u5B9A\u6A21\u677F\u3002\u4F7F\u7528 --dry-run \u9884\u89C8\u3002",
+      "apply.templateKindMismatch": "\u6A21\u677F {0} \u7684\u7C7B\u578B\u4E3A '{1}'\uFF0C\u671F\u671B 'template'",
       "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",
@@ -3460,8 +3485,18 @@ var init_zh = __esm({
       "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}",
+      "apply.alreadyUpToDate": "\u5DF2\u5E94\u7528\uFF0C\u65E0\u53D8\u5316",
+      "apply.computingPlan": "\u6B63\u5728\u8BA1\u7B97\u53D7\u7BA1\u8D44\u6E90\u5E76\u751F\u6210\u6267\u884C\u8BA1\u5212...",
+      "apply.planReady": "\u2714 \u6267\u884C\u8BA1\u5212\u5DF2\u5C31\u7EEA (\u5171 {0} \u9879\u8D44\u6E90\u53D8\u66F4)",
+      "apply.planFailed": "\u2716 \u6267\u884C\u8BA1\u5212\u751F\u6210\u5931\u8D25",
+      "apply.resourceConflict": "\u8D44\u6E90 '{0}' \u4E0E\u5DF2\u6709\u6A21\u677F\u8D44\u6E90\u5B58\u5728\u51B2\u7A81",
+      "apply.lockedConfigLoaded": "\u2714 \u5DF2\u52A0\u8F7D\u9501\u5B9A\u914D\u7F6E",
+      "apply.skippedCreateTasks": "- \u5DF2\u8DF3\u8FC7 {0} \u4E2A create \u751F\u547D\u5468\u671F\u94A9\u5B50\u4EFB\u52A1\uFF08apply \u8BED\u4E49\u4E0D\u6267\u884C before:create / after:create \u94A9\u5B50\uFF09\n",
+      "apply.templateUpdatedNeedsUpgrade": "\u6A21\u677F '{0}' \u7248\u672C\u76F8\u540C\u4F46\u5185\u5BB9\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u4F7F\u7528 upgrade \u547D\u4EE4\u8FDB\u884C\u66F4\u65B0",
       // sync.ts
       "sync.description": "\u4ECE lock \u6587\u4EF6\u6062\u590D\u9879\u76EE\u72B6\u6001\uFF08\u4E0D\u89E3\u6790\u7248\u672C\uFF09",
+      "sync.optionTemplate": "\u4EC5\u540C\u6B65\u6307\u5B9A\u7684\u5DF2\u5B89\u88C5\u6A21\u677F",
+      "sync.templateNotFound": "\u672A\u5728 Lock \u6587\u4EF6\u4E2D\u627E\u5230\u6A21\u677F '{0}'\u3002\u8BE5\u6A21\u677F\u672A\u5B89\u88C5\u6216\u65E0\u6CD5\u540C\u6B65\u3002",
       "sync.lockNotFound": "\u5728 {0} \u672A\u627E\u5230 lock \u6587\u4EF6\u3002\u8BF7\u5148\u4F7F\u7528 create \u6216 apply\u3002",
       "sync.acceptMissing": "sync --drift accept \u4E0D\u5141\u8BB8 missing \u8D44\u6E90\uFF1B\u8BF7\u5148\u6062\u590D\u6216\u4F7F\u7528 remove \u91CA\u653E\uFF1A{0}",
       "sync.driftDetected": "\u68C0\u6D4B\u5230 {0} \u9879\u8D44\u6E90\u6F02\u79FB\uFF1B\u4F7F\u7528 --drift restore \u6062\u590D\u6216 --drift accept \u63A5\u7EB3",
@@ -3475,35 +3510,41 @@ var init_zh = __esm({
       "sync.lockFile": "Lock \u6587\u4EF6\uFF1A{0}",
       "sync.locateDriftFailed": "\u65E0\u6CD5\u5B9A\u4F4D\u6F02\u79FB\u8D44\u6E90 {0}",
       // remove.ts
-      "remove.description": "\u4ECE\u9879\u76EE\u4E2D\u79FB\u9664\u5305\u6216\u5168\u90E8\u53D7\u7BA1\u5185\u5BB9",
-      "remove.optionPackage": "\u8981\u79FB\u9664\u7684\u5305 ID\uFF08\u5355\u4E2A\uFF09",
-      "remove.lockNotFound": "\u5728 {0} \u672A\u627E\u5230 lock \u6587\u4EF6\u3002\u65E0\u5185\u5BB9\u53EF\u79FB\u9664\u3002",
-      "remove.packageNotInLock": "\u5305 {0} \u4E0D\u5728\u9879\u76EE lock \u4E2D\u3002\u53EF\u7528\uFF1A{1}",
+      "remove.description": "\u4ECE\u9879\u76EE\u4E2D\u79FB\u9664\u6307\u5B9A\u7684\u6A21\u677F\u6216\u5168\u90E8\u53D7\u7BA1\u5185\u5BB9",
+      "remove.argTemplate": "\u8981\u79FB\u9664\u7684\u6A21\u677F ID\uFF08\u53EF\u9009\uFF0C\u672A\u6307\u5B9A\u65F6\u79FB\u9664\u5168\u90E8\uFF09",
+      "remove.optionTemplate": "\u8981\u79FB\u9664\u7684\u6A21\u677F ID\uFF08\u5355\u4E2A\uFF09",
+      "remove.chooseTemplate": "\u9009\u62E9\u8981\u79FB\u9664\u7684\u6A21\u677F",
+      "remove.templateSelectionCancelled": "\u6A21\u677F\u79FB\u9664\u9009\u62E9\u5DF2\u53D6\u6D88",
+      "remove.lockNotFound": "\u5728 {0} \u672A\u627E\u5230 lock \u6587\u4EF6\u3002\u65E0\u6A21\u677F\u53EF\u79FB\u9664\u3002",
+      "remove.templateNotInLock": "\u6A21\u677F {0} \u4E0D\u5728\u9879\u76EE lock \u4E2D\u3002\u5F53\u524D\u53EF\u7528\u6A21\u677F\uFF1A{1}",
+      "remove.bootstrapTemplateCannotBeRemoved": "\u6A21\u677F '{0}' \u662F\u9879\u76EE\u7684\u521D\u59CB\u5DE5\u7A0B\u6A21\u677F (bootstrap-only)\uFF0C\u4E0D\u5305\u542B\u53D7\u7BA1\u77E5\u8BC6\u8D44\u4EA7\uFF0C\u65E0\u6CD5\u88AB remove\u3002\u82E5\u9700\u5220\u9664\u6574\u4E2A\u9879\u76EE\uFF0C\u8BF7\u76F4\u63A5\u5220\u9664\u9879\u76EE\u76EE\u5F55\u3002",
       "remove.driftDetected": "\u68C0\u6D4B\u5230 {0} \u9879\u8D44\u6E90\u6F02\u79FB\uFF1B\u5982\u786E\u8BA4\u5220\u9664\u5DF2\u4FEE\u6539\u5185\u5BB9\uFF0C\u8BF7\u4F7F\u7528 --drift accept",
       "remove.needsConfirmation": "\u6267\u884C Remove \u9700\u8981 --yes\u3002\u4F7F\u7528 --dry-run \u9884\u89C8\u3002",
       "remove.userDeclined": "\u7528\u6237\u62D2\u7EDD\u4E86 Plan \u786E\u8BA4",
       "remove.executionFailed": "\u6267\u884C\u5931\u8D25\uFF1B\u5DF2\u5C1D\u8BD5\u56DE\u6EDA",
       "remove.executionFailedShort": "\u6267\u884C\u5931\u8D25",
-      "remove.removed": "\u5DF2\u4ECE {1} \u79FB\u9664 {0}",
-      "remove.allPackages": "\u6240\u6709\u5305",
+      "remove.removed": "\u5DF2\u4ECE {1} \u79FB\u9664\u6A21\u677F {0}",
+      "remove.allTemplates": "\u6240\u6709\u6A21\u677F",
       "remove.lockRemoved": "Lock \u6587\u4EF6\u5DF2\u79FB\u9664\u3002",
       "remove.lockUpdated": "Lock \u6587\u4EF6\u5DF2\u66F4\u65B0\u3002",
       "remove.userReferenceFailed": "\u79FB\u9664 {0}/{1}@{2} \u7684\u7528\u6237\u7EA7\u5F15\u7528\u5931\u8D25\uFF1A{3}",
       // upgrade.ts
       "upgrade.description": "\u5C06 Capability \u5347\u7EA7\u5230\u65B0\u7248\u672C\u5E76\u5207\u6362\u9879\u76EE\u5F15\u7528",
       "upgrade.optionProject": "\u9879\u76EE\u6839\u76EE\u5F55",
-      "upgrade.optionPackage": "Capability \u7684\u5305 ID",
+      "upgrade.optionTemplate": "Capability \u6240\u5C5E\u7684\u6A21\u677F ID",
       "upgrade.optionCapability": "\u8981\u5347\u7EA7\u7684 Capability ID",
       "upgrade.optionVersion": "\u76EE\u6807\u5347\u7EA7\u7248\u672C",
       "upgrade.optionDryRun": "\u4EC5\u9884\u89C8\uFF0C\u4E0D\u6267\u884C",
       "upgrade.optionYes": "\u65E0\u9700\u786E\u8BA4\u5373\u6279\u51C6",
       "upgrade.optionAllow": "\u6388\u6743\u9AD8\u98CE\u9669\u64CD\u4F5C\uFF08\u53EF\u91CD\u590D\uFF09",
-      "upgrade.missingOptions": "upgrade \u9700\u8981 --package\u3001--capability \u548C --version",
+      "upgrade.missingOptions": "upgrade \u9700\u8981 --template\u3001--capability \u548C --version",
+      "upgrade.missingTemplate": "\u8BF7\u901A\u8FC7 --template <template-id> \u6307\u5B9A\u9700\u8981\u5347\u7EA7\u7684\u6A21\u677F\u3002",
+      "upgrade.planSummary": "\u5347\u7EA7\u8BA1\u5212\uFF1A\n  \u6A21\u677F\uFF1A{0}\n  \u5F53\u524D\uFF1A{1}\n  \u76EE\u6807\uFF1A{2}\n  \u9879\u76EE\uFF1A{3}\n",
       "upgrade.lockNotFound": "\u5728 {0} \u672A\u627E\u5230 lock \u6587\u4EF6\u3002\u8BF7\u5148\u4F7F\u7528 create \u6216 apply\u3002",
       "upgrade.driftDetected": "\u53D7\u7BA1\u8D44\u6E90\u5DF2\u6F02\u79FB\uFF0C\u62D2\u7EDD\u5347\u7EA7",
-      "upgrade.packageNotInLock": "\u5728 lock \u6587\u4EF6\u7684 template \u4E2D\u672A\u627E\u5230\u5305 {0}",
+      "upgrade.templateNotInLock": "\u5728 lock \u6587\u4EF6\u7684 template \u4E2D\u672A\u627E\u5230\u6A21\u677F {0}",
       "upgrade.alreadyAtVersion": "\u5DF2\u5904\u4E8E\u7248\u672C {0}\uFF0C\u65E0\u9700\u5347\u7EA7",
-      "upgrade.noDesiredTemplate": "\u5305 {0} \u6CA1\u6709 desired template \u6761\u76EE",
+      "upgrade.noDesiredTemplate": "\u6A21\u677F {0} \u6CA1\u6709 desired template \u6761\u76EE",
       "upgrade.resolveFailed": "\u65E0\u6CD5\u89E3\u6790\u6A21\u677F {0}@{1}\uFF1A{2}",
       "upgrade.resolveInvalid": "\u65E0\u6CD5\u89E3\u6790\u6A21\u677F {0}@{1}",
       "upgrade.capabilityAbsent": "Capability {0}/{1} \u5728 {2} \u4E2D\u4E0D\u5B58\u5728",
@@ -3513,6 +3554,9 @@ var init_zh = __esm({
       "upgrade.upgraded": "\u5DF2\u5347\u7EA7 {0}/{1}\uFF1A{2} -> {3}",
       "upgrade.dryRunPlan": "CLI \u5347\u7EA7\u8BA1\u5212\uFF1A\n  current: {0}\n  target: {1}\n  integrity: {2}\n  manager: {3}\n  bin: {4}\n",
       "upgrade.alreadyCurrent": "aicoding \u5DF2\u662F {0}\u3002",
+      // 任务通用执行文案 (upgrade)
+      "task.runningBeforeUpgrade": "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5347\u7EA7\u4EFB\u52A1 (before:upgrade) ({0}):",
+      "task.runningAfterUpgrade": "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5347\u7EA7\u4EFB\u52A1 (after:upgrade) ({0}):",
       // self-upgrade.ts
       "selfUpgrade.description": "\u68C0\u67E5\u6216\u5347\u7EA7\u7531 npm/pnpm \u5B89\u88C5\u7684 mano-coding CLI",
       "selfUpgrade.optionCheck": "\u4EC5\u5237\u65B0\u7248\u672C\u4FE1\u606F",
@@ -3615,7 +3659,8 @@ var init_zh = __esm({
       // launch.ts
       "launch.description": "\u9690\u85CF\u542F\u52A8\u547D\u4EE4 - \u542F\u52A8\u7CBE\u786E\u5B89\u88C5\uFF08\u8BF7\u52FF\u76F4\u63A5\u4F7F\u7528\uFF09",
       "launch.optionKind": "\u6240\u6709\u8005\u7C7B\u578B\uFF08project|capability|plugin\uFF09",
-      "launch.optionPackage": "\u5305 ID",
+      "launch.optionTemplate": "\u6A21\u677F ID",
+      "launch.optionPackage": "\u6A21\u677F ID",
       "launch.optionId": "\u6240\u6709\u8005 ID",
       "launch.optionVersion": "\u7CBE\u786E\u7248\u672C",
       "launch.optionCommand": "\u547D\u4EE4\u540D\u79F0\uFF08\u53EA\u6709\u4E00\u4E2A\u547D\u4EE4\u65F6\u53EF\u9009\uFF09",
@@ -3644,17 +3689,37 @@ var init_zh = __esm({
       // extension commands
       "extension.create.description": "\u521D\u59CB\u5316\u6807\u51C6\u6269\u5C55/\u6A21\u677F\u5DE5\u7A0B",
       "extension.create.argDirectory": "\u76EE\u6807\u5DE5\u7A0B\u76EE\u5F55",
-      "extension.create.optionName": "\u6269\u5C55\u5305 ID (package-id)",
-      "extension.create.optionCategory": "\u6269\u5C55\u5206\u7C7B",
-      "extension.create.optionWithProject": "\u662F\u5426\u5305\u542B\u5DE5\u7A0B\u6A21\u677F",
+      "extension.create.optionName": "\u6A21\u677F ID (template-id)",
+      "extension.create.optionTemplateName": "\u6A21\u677F\u663E\u793A\u540D\u79F0 (name)",
+      "extension.create.optionDescription": "\u6A21\u677F\u63CF\u8FF0",
+      "extension.create.optionCategory": "\u6A21\u677F\u5206\u7C7B",
+      "extension.create.optionWithProject": "\u662F\u5426\u5305\u542B\u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6 (project/)",
+      "extension.create.optionWithTasks": "\u662F\u5426\u751F\u6210\u521D\u59CB\u5316\u4EFB\u52A1\u793A\u4F8B",
       "extension.create.optionWithCapability": "\u5305\u542B\u7684\u80FD\u529B\u7279\u6027",
       "extension.create.optionWithPipeline": "\u662F\u5426\u751F\u6210 GitLab CI/CD \u81EA\u52A8\u540C\u6B65\u6D41\u6C34\u7EBF\u914D\u7F6E (.gitlab-ci.yml)",
       "extension.create.optionYes": "\u8DF3\u8FC7\u4EA4\u4E92\u786E\u8BA4\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u503C",
       "extension.create.directoryNotEmpty": "\u76EE\u6807\u76EE\u5F55\u5DF2\u5B58\u5728\u4E14\u975E\u7A7A\uFF1A{0}",
-      "extension.pipeline.description": "\u751F\u6210\u6216\u66F4\u65B0\u6269\u5C55\u5305\u7684 GitLab CI/CD \u81EA\u52A8\u540C\u6B65\u6D41\u6C34\u7EBF\u914D\u7F6E (.gitlab-ci.yml)",
-      "extension.pipeline.argDirectory": "\u6269\u5C55\u5305\u5DE5\u7A0B\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09",
+      "extension.create.promptName": "\u8BF7\u8F93\u5165\u6A21\u677F ID (Template ID):",
+      "extension.create.promptTemplateName": "\u8BF7\u8F93\u5165\u6A21\u677F\u540D\u79F0 (Name):",
+      "extension.create.promptDescription": "\u8BF7\u8F93\u5165\u6A21\u677F\u7B80\u8981\u63CF\u8FF0 (Description):",
+      "extension.create.promptWithTasks": "\u662F\u5426\u5305\u542B\u9879\u76EE\u811A\u624B\u67B6\u521D\u59CB\u5316\u4EFB\u52A1 (Tasks) \u793A\u4F8B\uFF1F",
+      "extension.create.promptWithProject": "\u662F\u5426\u751F\u6210\u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6\u76EE\u5F55 (project/)\uFF1F",
+      "extension.create.promptWithPipeline": "\u662F\u5426\u751F\u6210 GitLab CI/CD \u81EA\u52A8\u540C\u6B65\u6D41\u6C34\u7EBF\u914D\u7F6E (.gitlab-ci.yml)\uFF1F",
+      "extension.create.created": "\u6A21\u677F\u5DE5\u7A0B\u5DF2\u521B\u5EFA\u5728\uFF1A{0}",
+      "extension.create.success": "\u2713 \u6210\u529F\u521D\u59CB\u5316\u6A21\u677F\u5DE5\u7A0B: {0}",
+      "extension.create.generatedFiles": "\u5DF2\u751F\u6210\u6587\u4EF6\u6E05\u5355:",
+      "extension.pipeline.description": "\u751F\u6210\u6216\u66F4\u65B0\u6A21\u677F\u5DE5\u7A0B\u7684 GitLab CI/CD \u81EA\u52A8\u540C\u6B65\u6D41\u6C34\u7EBF\u914D\u7F6E (.gitlab-ci.yml)",
+      "extension.pipeline.argDirectory": "\u6A21\u677F\u5DE5\u7A0B\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09",
       "extension.pipeline.optionForce": "\u82E5\u5DF2\u5B58\u5728 .gitlab-ci.yml \u5219\u5F3A\u5236\u8986\u76D6",
-      "extension.pipeline.optionPackageId": "\u6269\u5C55\u5305 ID\uFF08\u9ED8\u8BA4\u4ECE manifest.yaml \u6216 package.json \u89E3\u6790\uFF09"
+      "extension.pipeline.optionTemplateId": "\u6A21\u677F ID\uFF08\u9ED8\u8BA4\u4ECE manifest.yaml \u6216 package.json \u89E3\u6790\uFF09",
+      "extension.pipeline.optionYes": "\u8DF3\u8FC7\u4EA4\u4E92\u786E\u8BA4",
+      "extension.pipeline.idNotFound": "\u672A\u80FD\u81EA\u52A8\u8BC6\u522B\u6A21\u677F ID\u3002\u8BF7\u786E\u4FDD\u5F53\u524D\u76EE\u5F55\u4E0B\u5B58\u5728\u6709\u6548\u7684 manifest.yaml \u6216 package.json\uFF0C\u6216\u4F7F\u7528 --template-id \u663E\u5F0F\u4F20\u5165\u3002",
+      "extension.pipeline.overwritePrompt": "\u68C0\u6D4B\u5230\u5F53\u524D\u76EE\u5F55\u5DF2\u5B58\u5728 .gitlab-ci.yml\uFF0C\u662F\u5426\u8986\u76D6\uFF1F",
+      "extension.pipeline.cancelled": "\u64CD\u4F5C\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FEE\u6539\u73B0\u6709\u6D41\u6C34\u7EBF\u914D\u7F6E\u3002",
+      "extension.pipeline.alreadyExists": "\u5F53\u524D\u76EE\u5F55\u5DF2\u5B58\u5728 .gitlab-ci.yml\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u4F20\u9012 --force \u53C2\u6570\u3002",
+      "extension.pipeline.success": "\u2713 \u6210\u529F\u751F\u6210 CI/CD \u6D41\u6C34\u7EBF\u914D\u7F6E: {0}",
+      "extension.pipeline.addedReleaseScript": '\u2713 \u5DF2\u5728 package.json \u7684 scripts \u4E2D\u6DFB\u52A0\u53D1\u7248\u547D\u4EE4: "release": "npm version patch"',
+      "extension.pipeline.gitlabNotice": '\n\u2699\uFE0F  GitLab \u9879\u76EE\u914D\u7F6E\u63D0\u793A:\n  \u8BF7\u5728\u5F53\u524D\u6A21\u677F\u4ED3\u5E93\u7684\u3010Settings -> CI/CD -> Variables\u3011\u4E2D\u914D\u7F6E\u4EE5\u4E0B\u73AF\u5883\u53D8\u91CF\uFF1A\n    - REGISTRY_TRIGGER_TOKEN: Registry \u4ED3\u5E93\u751F\u6210\u7684 Pipeline Trigger Token\n    - REGISTRY_PROJECT_ID: Registry \u4ED3\u5E93\u5728 GitLab \u4E0A\u7684\u9879\u76EE ID\n\n\u{1F680} \u65E5\u5E38\u53D1\u7248\u5DE5\u4F5C\u6D41:\n  1. \u63D0\u4EA4\u4EE3\u7801: git add . && git commit -m "feat: xxx"\n  2. \u4E00\u952E\u63D0\u5347\u7248\u672C\u5E76\u6253 Tag: npm run release\n  3. \u63A8\u9001\u5230\u8FDC\u7A0B\u89E6\u53D1\u81EA\u52A8\u5408\u5E76: git push --follow-tags origin main\n\n'
     };
   }
 });
@@ -23353,10 +23418,10 @@ async function persistGitCheckout(workDir, targetDir) {
   return targetDir;
 }
 async function copyGitCheckout(src, dest) {
-  const { readdir: readdir11, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
+  const { readdir: readdir12, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
   const { join: joinPath } = await import("node:path");
   await mkdir20(dest, { recursive: true });
-  const entries = await readdir11(src, { withFileTypes: true });
+  const entries = await readdir12(src, { withFileTypes: true });
   for (const entry of entries) {
     if (entry.name === ".git") continue;
     const srcPath = joinPath(src, entry.name);
@@ -23549,8 +23614,8 @@ var init_git_resolver = __esm({
           }
           const cacheBase = join6(cacheRoot, "git", encodePackageId(packageId));
           try {
-            const { readdir: readdir11 } = await import("node:fs/promises");
-            const commits = await readdir11(cacheBase, { withFileTypes: true });
+            const { readdir: readdir12 } = await import("node:fs/promises");
+            const commits = await readdir12(cacheBase, { withFileTypes: true });
             for (const entry of commits) {
               if (!entry.isDirectory()) continue;
               const cacheDir = join6(cacheBase, entry.name);
@@ -26935,10 +27000,10 @@ var init_tarball_loader = __esm({
         return targetDir;
       }
       async copyDirRecursive(src, dest) {
-        const { readdir: readdir11, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
+        const { readdir: readdir12, mkdir: mkdir20, copyFile: copyFile2 } = await import("node:fs/promises");
         const { join: joinPath } = await import("node:path");
         await mkdir20(dest, { recursive: true });
-        const entries = await readdir11(src, { withFileTypes: true });
+        const entries = await readdir12(src, { withFileTypes: true });
         for (const entry of entries) {
           const srcPath = joinPath(src, entry.name);
           const destPath = joinPath(dest, entry.name);
@@ -27001,14 +27066,14 @@ var init_tarball_loader = __esm({
         return readFile34(join7(packageRoot, "manifest.yaml"), "utf-8");
       }
       async findPackageRoot(workDir, packageId, version) {
-        const { access: access12, readdir: readdir11 } = await import("node:fs/promises");
+        const { access: access12, readdir: readdir12 } = await import("node:fs/promises");
         const { resolve: resolvePath10 } = await import("node:path");
         const candidates = [
           resolvePath10(workDir),
           resolvePath10(workDir, "package")
         ];
         try {
-          const entries = await readdir11(workDir, { withFileTypes: true });
+          const entries = await readdir12(workDir, { withFileTypes: true });
           for (const entry of entries) {
             if (entry.isDirectory()) {
               candidates.push(resolvePath10(workDir, entry.name));
@@ -30530,10 +30595,27 @@ var init_toml_editor = __esm({
 });
 
 // packages/core/src/execute/executor.ts
-import { readFile as readFile17, writeFile as writeFile5, unlink as unlink7, mkdir as mkdir12, access as access9, rename as rename4, rm as rm4, mkdtemp as mkdtemp4, chmod } from "node:fs/promises";
+import { readFile as readFile17, writeFile as writeFile5, unlink as unlink7, mkdir as mkdir12, access as access9, rename as rename4, rm as rm4, mkdtemp as mkdtemp4, chmod, readdir as readdir5, rmdir } from "node:fs/promises";
 import { resolve as resolvePath7, dirname as dirname11, join as join12 } from "node:path";
 import { tmpdir as tmpdir4 } from "node:os";
 import { createHash as createHash9 } from "node:crypto";
+async function cleanEmptyParentDirs(startDir, rootDir) {
+  let current = resolvePath7(startDir);
+  const normalizedRoot = resolvePath7(rootDir);
+  while (current !== normalizedRoot && current.startsWith(normalizedRoot)) {
+    try {
+      const files = await readdir5(current);
+      if (files.length === 0) {
+        await rmdir(current);
+        current = dirname11(current);
+      } else {
+        break;
+      }
+    } catch {
+      break;
+    }
+  }
+}
 async function getTmpBase() {
   return mkdtemp4(join12(tmpdir4(), "aicoding-tx-"));
 }
@@ -30931,6 +31013,7 @@ var init_executor = __esm({
                   throw err;
                 }
               });
+              await cleanEmptyParentDirs(dirname11(absPath), projectRoot);
               addFileRollback(absPath, backupPath, rollbackActions, `\u6062\u590D\u5DF2\u5220\u9664\u7684\u6587\u4EF6 ${intent.path}`);
             } else if (intent.type === "config-entry") {
               await removeConfigEntry(absPath, intent.selector, intent.format, backupDir, rollbackActions, intent.path);
@@ -31831,7 +31914,7 @@ var init_task_runner = __esm({
 });
 
 // packages/core/src/execute/template-contract.ts
-import { readFile as readFile19, readdir as readdir5 } from "node:fs/promises";
+import { readFile as readFile19, readdir as readdir6 } from "node:fs/promises";
 import { join as join14, relative as relative6 } from "node:path";
 function validateMcpConfig(rawConfig) {
   if (typeof rawConfig !== "object" || rawConfig === null) {
@@ -31974,7 +32057,7 @@ async function scanTemplateDirectoryContract(options) {
   if (shouldIncludeAssetType("skills", filter)) {
     const skillsDir = join14(templateDir, "skills");
     try {
-      const skillEntries = await readdir5(skillsDir, { withFileTypes: true });
+      const skillEntries = await readdir6(skillsDir, { withFileTypes: true });
       for (const skillEntry of skillEntries) {
         if (!skillEntry.isDirectory()) continue;
         const skillId = skillEntry.name;
@@ -32001,7 +32084,7 @@ async function scanTemplateDirectoryContract(options) {
   if (shouldIncludeAssetType("rules", filter)) {
     const rulesDir = join14(templateDir, "rules");
     try {
-      const ruleIdeEntries = await readdir5(rulesDir, { withFileTypes: true });
+      const ruleIdeEntries = await readdir6(rulesDir, { withFileTypes: true });
       for (const ideEntry of ruleIdeEntries) {
         if (!ideEntry.isDirectory()) continue;
         const ide = ideEntry.name;
@@ -32027,7 +32110,7 @@ async function scanTemplateDirectoryContract(options) {
   if (shouldIncludeAssetType("subagents", filter)) {
     const subagentsDir = join14(templateDir, "subagents");
     try {
-      const agentIdeEntries = await readdir5(subagentsDir, { withFileTypes: true });
+      const agentIdeEntries = await readdir6(subagentsDir, { withFileTypes: true });
       for (const ideEntry of agentIdeEntries) {
         if (!ideEntry.isDirectory()) continue;
         const ide = ideEntry.name;
@@ -32075,12 +32158,30 @@ async function scanTemplateDirectoryContract(options) {
       }
     }
   }
+  if (!filter?.skipProjectDir) {
+    const projectDir = join14(templateDir, "project");
+    try {
+      const allProjectFiles = await listAllFilesRecursive(projectDir);
+      for (const relFile of allProjectFiles) {
+        const fileContent = await readFile19(join14(projectDir, relFile));
+        const normalizedRel = relFile.replaceAll("\\", "/");
+        intents.push({
+          action: "upsert",
+          type: "file",
+          path: normalizedRel,
+          content: fileContent,
+          assetType: "project-seed"
+        });
+      }
+    } catch {
+    }
+  }
   return intents;
 }
 async function listAllFilesRecursive(dir, baseDir = dir) {
   const files = [];
   try {
-    const entries = await readdir5(dir, { withFileTypes: true });
+    const entries = await readdir6(dir, { withFileTypes: true });
     for (const entry of entries) {
       const full = join14(dir, entry.name);
       if (entry.isDirectory()) {
@@ -32109,7 +32210,7 @@ var init_template_contract = __esm({
 });
 
 // packages/core/src/plugin/plugin-delivery.ts
-import { readFile as readFile20, stat as stat4, readdir as readdir6 } from "node:fs/promises";
+import { readFile as readFile20, stat as stat4, readdir as readdir7 } from "node:fs/promises";
 import { join as join15, resolve as resolve11 } from "node:path";
 import { createHash as createHash11 } from "node:crypto";
 function isPluginTargetSupported(target) {
@@ -32467,7 +32568,7 @@ function buildSettingsUpdate(plugin, target) {
 }
 async function collectDirectoryCopyIntents(sourceDir, sourceRelPath, destDir, packageRoot, metadata) {
   const intents = [];
-  const entries = await readdir6(sourceDir, { withFileTypes: true });
+  const entries = await readdir7(sourceDir, { withFileTypes: true });
   for (const entry of entries) {
     const entrySourcePath = join15(sourceDir, entry.name);
     const entryDestPath = `${destDir}/${entry.name}`;
@@ -32586,7 +32687,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 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 { chmod as chmod2, cp as cp2, mkdir as mkdir14, open as open4, readdir as readdir8, 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);
@@ -32734,7 +32835,7 @@ async function scanJournals(userDataDir, projectRoot) {
   const directory = join16(resolve12(userDataDir), "transactions", projectHash(projectRoot));
   let entries;
   try {
-    entries = await readdir7(directory, { withFileTypes: true });
+    entries = await readdir8(directory, { withFileTypes: true });
   } catch (error) {
     if (error.code === "ENOENT") return [];
     throw error;
@@ -33307,7 +33408,7 @@ var init_staging_manager = __esm({
 });
 
 // packages/core/src/orchestrator/staging-scanner.ts
-import { readFile as readFile23, readdir as readdir8, stat as stat6 } from "node:fs/promises";
+import { readFile as readFile23, readdir as readdir9, stat as stat6 } from "node:fs/promises";
 import { join as join18, relative as relative7 } from "node:path";
 async function scanStagingDirectory(options) {
   const { stagingDir, packageId, ownerKind = "template" } = options;
@@ -33316,7 +33417,7 @@ async function scanStagingDirectory(options) {
   async function walk(currentDir) {
     let entries;
     try {
-      entries = await readdir8(currentDir, { withFileTypes: true });
+      entries = await readdir9(currentDir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -43846,9 +43947,9 @@ notify_registry:
 }
 function createExtensionPipelineCommand() {
   const cmd = new Command("pipeline");
-  cmd.alias("ci").description(t("extension.pipeline.description")).argument("[directory]", t("extension.pipeline.argDirectory"), ".").option("--package-id <id>", t("extension.pipeline.optionPackageId")).option("--force", t("extension.pipeline.optionForce")).option("--yes", "\u8DF3\u8FC7\u4EA4\u4E92\u786E\u8BA4").option("--json", t("global.json")).option("--no-color", t("global.noColor")).option("--verbose", t("global.verbose")).action(async (directory, opts) => {
+  cmd.alias("ci").description(t("extension.pipeline.description")).argument("[directory]", t("extension.pipeline.argDirectory"), ".").option("--template-id <id>", t("extension.pipeline.optionTemplateId")).option("--force", t("extension.pipeline.optionForce")).option("--yes", t("extension.pipeline.optionYes")).option("--json", t("global.json")).option("--no-color", t("global.noColor")).option("--verbose", t("global.verbose")).action(async (directory, opts) => {
     const options = {
-      packageId: opts.packageId,
+      templateId: opts.templateId ?? opts.packageId,
       force: Boolean(opts.force),
       yes: Boolean(opts.yes),
       json: Boolean(opts.json),
@@ -43880,35 +43981,35 @@ async function executeExtensionPipeline(directory, options) {
   const pkgJsonPath = resolve14(targetDir, "package.json");
   const ciFilePath = resolve14(targetDir, ".gitlab-ci.yml");
   const isInteractive = !options.yes && !options.json && Boolean(process.stdin.isTTY);
-  let packageId = options.packageId;
-  if (!packageId) {
+  let templateId = options.templateId;
+  if (!templateId) {
     if (existsSync5(manifestPath)) {
       try {
         const manifestContent = await readFile24(manifestPath, "utf-8");
         const parsed = import_yaml4.default.parse(manifestContent);
         if (parsed && typeof parsed.id === "string") {
-          packageId = parsed.id;
+          templateId = parsed.id;
         }
       } catch {
       }
     }
-    if (!packageId && existsSync5(pkgJsonPath)) {
+    if (!templateId && existsSync5(pkgJsonPath)) {
       try {
         const pkgContent = await readFile24(pkgJsonPath, "utf-8");
         const parsed = JSON.parse(pkgContent);
         if (parsed && typeof parsed.name === "string") {
-          packageId = parsed.name;
+          templateId = parsed.name;
         }
       } catch {
       }
     }
   }
-  if (!packageId) {
-    const errorMsg = "\u672A\u80FD\u81EA\u52A8\u8BC6\u522B\u6269\u5C55\u5305 ID\u3002\u8BF7\u786E\u4FDD\u5F53\u524D\u76EE\u5F55\u4E0B\u5B58\u5728\u6709\u6548\u7684 manifest.yaml \u6216 package.json\uFF0C\u6216\u4F7F\u7528 --package-id \u663E\u5F0F\u4F20\u5165\u3002";
+  if (!templateId) {
+    const errorMsg = t("extension.pipeline.idNotFound");
     if (output.json) {
-      emitFailureJson("extension pipeline", "PACKAGE_ID_NOT_FOUND", errorMsg);
+      emitFailureJson("extension pipeline", "TEMPLATE_ID_NOT_FOUND", errorMsg);
     } else {
-      process.stderr.write(`error: PACKAGE_ID_NOT_FOUND: ${errorMsg}
+      process.stderr.write(`error: TEMPLATE_ID_NOT_FOUND: ${errorMsg}
 `);
     }
     return ExitCode.ResolveFailed;
@@ -43916,15 +44017,16 @@ async function executeExtensionPipeline(directory, options) {
   if (existsSync5(ciFilePath) && !options.force) {
     if (isInteractive) {
       const overwrite = await dist_default5({
-        message: "\u68C0\u6D4B\u5230\u5F53\u524D\u76EE\u5F55\u5DF2\u5B58\u5728 .gitlab-ci.yml\uFF0C\u662F\u5426\u8986\u76D6\uFF1F",
+        message: t("extension.pipeline.overwritePrompt"),
         default: false
       });
       if (!overwrite) {
-        process.stdout.write("\u64CD\u4F5C\u5DF2\u53D6\u6D88\uFF0C\u672A\u4FEE\u6539\u73B0\u6709\u6D41\u6C34\u7EBF\u914D\u7F6E\u3002\n");
+        process.stdout.write(`${t("extension.pipeline.cancelled")}
+`);
         return ExitCode.Success;
       }
     } else {
-      const errorMsg = "\u5F53\u524D\u76EE\u5F55\u5DF2\u5B58\u5728 .gitlab-ci.yml\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u4F20\u9012 --force \u53C2\u6570\u3002";
+      const errorMsg = t("extension.pipeline.alreadyExists");
       if (output.json) {
         emitFailureJson("extension pipeline", "FILE_ALREADY_EXISTS", errorMsg);
       } else {
@@ -43934,7 +44036,7 @@ async function executeExtensionPipeline(directory, options) {
       return ExitCode.ConflictOrDrift;
     }
   }
-  const ciContent = generateGitlabCiYaml(packageId);
+  const ciContent = generateGitlabCiYaml(templateId);
   await writeFile9(ciFilePath, ciContent, "utf-8");
   let addedReleaseScript = false;
   if (existsSync5(pkgJsonPath)) {
@@ -43953,25 +44055,18 @@ async function executeExtensionPipeline(directory, options) {
   if (output.json) {
     emitSuccessJson("extension pipeline", {
       directory: targetDir,
-      packageId,
+      templateId,
       ciFile: ciFilePath,
       addedReleaseScript
     });
   } else {
-    process.stdout.write(`\u2713 \u6210\u529F\u751F\u6210 CI/CD \u6D41\u6C34\u7EBF\u914D\u7F6E: ${ciFilePath}
+    process.stdout.write(`${t("extension.pipeline.success", ciFilePath)}
 `);
     if (addedReleaseScript) {
-      process.stdout.write(`\u2713 \u5DF2\u5728 package.json \u7684 scripts \u4E2D\u6DFB\u52A0\u53D1\u7248\u547D\u4EE4: "release": "npm version patch"
+      process.stdout.write(`${t("extension.pipeline.addedReleaseScript")}
 `);
     }
-    process.stdout.write("\n\u2699\uFE0F  GitLab \u9879\u76EE\u914D\u7F6E\u63D0\u793A:\n");
-    process.stdout.write("  \u8BF7\u5728\u5F53\u524D\u6269\u5C55\u5305\u4ED3\u5E93\u7684\u3010Settings -> CI/CD -> Variables\u3011\u4E2D\u914D\u7F6E\u4EE5\u4E0B\u73AF\u5883\u53D8\u91CF\uFF1A\n");
-    process.stdout.write("    - REGISTRY_TRIGGER_TOKEN: Registry \u4ED3\u5E93\u751F\u6210\u7684 Pipeline Trigger Token\n");
-    process.stdout.write("    - REGISTRY_PROJECT_ID: Registry \u4ED3\u5E93\u5728 GitLab \u4E0A\u7684\u9879\u76EE ID\n");
-    process.stdout.write("\n\u{1F680} \u65E5\u5E38\u53D1\u7248\u5DE5\u4F5C\u6D41:\n");
-    process.stdout.write('  1. \u63D0\u4EA4\u4EE3\u7801: git add . && git commit -m "feat: xxx"\n');
-    process.stdout.write("  2. \u4E00\u952E\u63D0\u5347\u7248\u672C\u5E76\u6253 Tag: npm run release\n");
-    process.stdout.write("  3. \u63A8\u9001\u5230\u8FDC\u7A0B\u89E6\u53D1\u81EA\u52A8\u5408\u5E76: git push --follow-tags origin main\n\n");
+    process.stdout.write(t("extension.pipeline.gitlabNotice"));
   }
   return ExitCode.Success;
 }
@@ -43988,18 +44083,18 @@ var init_extension_pipeline = __esm({
 });
 
 // packages/cli/src/commands/extension-create.ts
-import { mkdir as mkdir17, writeFile as writeFile10, readdir as readdir9 } from "node:fs/promises";
+import { mkdir as mkdir17, writeFile as writeFile10, readdir as readdir10 } from "node:fs/promises";
 import { basename as basename4, resolve as resolve15 } from "node:path";
 function createExtensionCreateCommand() {
   const cmd = new Command("create");
-  cmd.description(t("extension.create.description")).argument("<directory>", t("extension.create.argDirectory")).option("--name <package-id>", t("extension.create.optionName")).option("--template-name <name>", "\u6A21\u677F\u663E\u793A\u540D\u79F0 (name)").option("--description <description>", "\u6A21\u677F\u63CF\u8FF0").option("--with-tasks", "\u662F\u5426\u751F\u6210\u521D\u59CB\u5316\u4EFB\u52A1\u793A\u4F8B").option("--with-pipeline", t("extension.create.optionWithPipeline")).option("--category <category>", t("extension.create.optionCategory")).option("--with-project", t("extension.create.optionWithProject")).option("--with-capability <type>", t("extension.create.optionWithCapability"), collectCapability, []).option("--yes", t("extension.create.optionYes")).option("--json", t("global.json")).option("--no-color", t("global.noColor")).option("--verbose", t("global.verbose")).action(async (directory, opts) => {
+  cmd.description(t("extension.create.description")).argument("<directory>", t("extension.create.argDirectory")).option("--name <package-id>", t("extension.create.optionName")).option("--template-name <name>", t("extension.create.optionTemplateName")).option("--description <description>", t("extension.create.optionDescription")).option("--with-tasks", t("extension.create.optionWithTasks")).option("--with-pipeline", t("extension.create.optionWithPipeline")).option("--category <category>", t("extension.create.optionCategory")).option("--with-project", t("extension.create.optionWithProject")).option("--with-capability <type>", t("extension.create.optionWithCapability"), collectCapability, []).option("--yes", t("extension.create.optionYes")).option("--json", t("global.json")).option("--no-color", t("global.noColor")).option("--verbose", t("global.verbose")).action(async (directory, opts) => {
     const options = {
       name: opts.name,
       templateName: opts.templateName,
       description: opts.description,
       category: opts.category,
-      withProject: Boolean(opts.withProject),
-      withTasks: Boolean(opts.withTasks),
+      withProject: opts.withProject !== void 0 ? Boolean(opts.withProject) : void 0,
+      withTasks: opts.withTasks !== void 0 ? Boolean(opts.withTasks) : void 0,
       withPipeline: opts.withPipeline !== void 0 ? Boolean(opts.withPipeline) : void 0,
       withCapability: Array.isArray(opts.withCapability) ? opts.withCapability : [],
       yes: Boolean(opts.yes),
@@ -44037,7 +44132,7 @@ async function executeExtensionCreate(directory, options) {
   const dirBase = basename4(targetDir);
   const isInteractive = !options.yes && !options.json && Boolean(process.stdin.isTTY);
   try {
-    const entries = await readdir9(targetDir);
+    const entries = await readdir10(targetDir);
     if (entries.length > 0) {
       if (output.json) {
         emitFailureJson(
@@ -44058,7 +44153,7 @@ async function executeExtensionCreate(directory, options) {
   if (!packageId) {
     if (isInteractive) {
       packageId = await dist_default6({
-        message: "\u8BF7\u8F93\u5165\u6A21\u677F\u5305\u540D (Package ID):",
+        message: t("extension.create.promptName"),
         default: sanitizePackageId(dirBase) || "my-template"
       });
     } else {
@@ -44069,7 +44164,7 @@ async function executeExtensionCreate(directory, options) {
   if (!templateName) {
     if (isInteractive) {
       templateName = await dist_default6({
-        message: "\u8BF7\u8F93\u5165\u6A21\u677F\u540D\u79F0 (Name):",
+        message: t("extension.create.promptTemplateName"),
         default: packageId.replace(/^@[^/]+\//, "")
       });
     } else {
@@ -44080,24 +44175,31 @@ async function executeExtensionCreate(directory, options) {
   if (!description) {
     if (isInteractive) {
       description = await dist_default6({
-        message: "\u8BF7\u8F93\u5165\u6A21\u677F\u7B80\u8981\u63CF\u8FF0 (Description):",
+        message: t("extension.create.promptDescription"),
         default: `${templateName} template for Mano Coding`
       });
     } else {
       description = `${templateName} template for Mano Coding`;
     }
   }
+  let withProject = options.withProject;
+  if (withProject === void 0 && isInteractive) {
+    withProject = await dist_default5({
+      message: t("extension.create.promptWithProject"),
+      default: false
+    });
+  }
   let withTasks = options.withTasks;
   if (withTasks === void 0 && isInteractive) {
     withTasks = await dist_default5({
-      message: "\u662F\u5426\u5305\u542B\u9879\u76EE\u811A\u624B\u67B6\u521D\u59CB\u5316\u4EFB\u52A1 (Tasks) \u793A\u4F8B\uFF1F",
+      message: t("extension.create.promptWithTasks"),
       default: true
     });
   }
   let withPipeline = options.withPipeline;
   if (withPipeline === void 0 && isInteractive) {
     withPipeline = await dist_default5({
-      message: "\u662F\u5426\u751F\u6210 GitLab CI/CD \u81EA\u52A8\u540C\u6B65\u6D41\u6C34\u7EBF\u914D\u7F6E (.gitlab-ci.yml)\uFF1F",
+      message: t("extension.create.promptWithPipeline"),
       default: true
     });
   }
@@ -44108,6 +44210,17 @@ async function executeExtensionCreate(directory, options) {
   if (withPipeline) {
     scripts.release = "npm version patch";
   }
+  const pkgFiles = [
+    "manifest.yaml",
+    "AGENTS.md",
+    "skills",
+    "rules",
+    "mcp",
+    "README.md"
+  ];
+  if (withProject) {
+    pkgFiles.push("project");
+  }
   const pkgJson = {
     name: packageId,
     version: "0.1.0",
@@ -44115,14 +44228,7 @@ async function executeExtensionCreate(directory, options) {
     type: "module",
     engines: { node: ">=22.0.0" },
     scripts,
-    files: [
-      "manifest.yaml",
-      "AGENTS.md",
-      "skills",
-      "rules",
-      "mcp",
-      "README.md"
-    ],
+    files: pkgFiles,
     devDependencies: {
       vitest: "^3.0.5"
     }
@@ -44239,6 +44345,50 @@ describe('${packageId} template manifest', () => {
     "package.json",
     "test/manifest.test.ts"
   ];
+  if (withProject) {
+    const projectDir = resolve15(targetDir, "project");
+    const projectSrcDir = resolve15(projectDir, "src");
+    await mkdir17(projectSrcDir, { recursive: true });
+    const starterPkgName = `${packageId.replace(/^@[^/]+\//, "")}-starter`;
+    const projectPkgJson = {
+      name: starterPkgName,
+      version: "0.1.0",
+      private: true,
+      type: "module",
+      scripts: {
+        dev: "vite",
+        build: "vite build"
+      }
+    };
+    await writeFile10(
+      resolve15(projectDir, "package.json"),
+      JSON.stringify(projectPkgJson, null, 2) + "\n",
+      "utf-8"
+    );
+    const projectReadme = `# ${starterPkgName}
+
+\u8FD9\u662F\u4E00\u4E2A\u7531 ${packageId} \u6A21\u677F\u63D0\u4F9B\u7684\u521D\u59CB\u5DE5\u7A0B\u811A\u624B\u67B6\uFF08\u9879\u76EE\u9AA8\u67B6\u79CD\u5B50\uFF09\u3002
+
+\u5728\u6267\u884C \`mano-coding create\` \u65F6\uFF0C\u6B64\u76EE\u5F55\u4E2D\u7684\u6587\u4EF6\u5C06\u81EA\u52A8\u91CA\u653E\u5230\u76EE\u6807\u5DE5\u7A0B\u6839\u76EE\u5F55\u3002
+\u6CE8\u610F\uFF1A\u672C\u76EE\u5F55\u4E2D\u7684\u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6\u6587\u4EF6\u4E3A bootstrap \u8D44\u6E90\uFF0C\u4E0D\u7EB3\u5165 \`.ai-coding.lock\` \u53D7\u7BA1\u8D44\u4EA7\u8DDF\u8E2A\u3002
+`;
+    await writeFile10(resolve15(projectDir, "README.md"), projectReadme, "utf-8");
+    const projectIndexTs = `/**
+ * ${starterPkgName} \u5165\u53E3\u6587\u4EF6
+ */
+export function main(): void {
+  console.log('Hello from ${starterPkgName}!');
+}
+
+main();
+`;
+    await writeFile10(resolve15(projectSrcDir, "index.ts"), projectIndexTs, "utf-8");
+    createdFiles.push(
+      "project/package.json",
+      "project/README.md",
+      "project/src/index.ts"
+    );
+  }
   if (withPipeline) {
     await writeFile10(
       resolve15(targetDir, ".gitlab-ci.yml"),
@@ -44252,7 +44402,8 @@ describe('${packageId} template manifest', () => {
     templateName,
     description,
     withTasks: Boolean(withTasks),
-    withPipeline: Boolean(withPipeline)
+    withPipeline: Boolean(withPipeline),
+    withProject: Boolean(withProject)
   });
   await writeFile10(resolve15(targetDir, "README.md"), readmeContent, "utf-8");
   if (output.json) {
@@ -44262,9 +44413,9 @@ describe('${packageId} template manifest', () => {
       files: createdFiles
     });
   } else {
-    process.stdout.write(`\u2713 \u6210\u529F\u521D\u59CB\u5316\u6A21\u677F\u5DE5\u7A0B: ${targetDir}
+    process.stdout.write(`${t("extension.create.success", targetDir)}
 `);
-    process.stdout.write(`\u5DF2\u751F\u6210\u6587\u4EF6\u6E05\u5355:
+    process.stdout.write(`${t("extension.create.generatedFiles")}
   - ${createdFiles.join("\n  - ")}
 `);
   }
@@ -44299,6 +44450,21 @@ git push --follow-tags origin main
 mano-coding extension pipeline .
 \`\`\`
 `;
+  const projectSection = options.withProject ? `
+---
+
+## \u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6 (project/ \u76EE\u5F55)
+
+\u672C\u6A21\u677F\u5305\u542B\u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6\u76EE\u5F55 \`project/\`\uFF1A
+- \u6267\u884C \`mano-coding create <\u9879\u76EE\u540D> --template <\u672C\u6A21\u677F>\` \u65F6\uFF0C\`project/\` \u4E0B\u7684\u6587\u4EF6\u5C06\u81EA\u52A8\u590D\u5236\u5230\u65B0\u5EFA\u5DE5\u7A0B\u6839\u76EE\u5F55\uFF0C\u4F5C\u4E3A\u521D\u59CB\u6E90\u4EE3\u7801\u9AA8\u67B6\u3002
+- \u9759\u6001\u5DE5\u7A0B\u6587\u4EF6\u4F5C\u4E3A bootstrap \u79CD\u5B50\u8D44\u6E90\uFF0C\u4E0D\u4F1A\u8BA1\u5165 \`.ai-coding.lock\` \u53D7\u7BA1\u6E05\u5355\uFF0C\u540E\u7EED\u6267\u884C \`apply\` \u6216 \`sync\` \u65F6\u4E0D\u4F1A\u8986\u76D6\u7528\u6237\u5BF9\u5DE5\u7A0B\u6587\u4EF6\u7684\u4FEE\u6539\u3002
+` : "";
+  const projectTree = options.withProject ? `\u251C\u2500\u2500 project/                # [\u53EF\u9009] \u9759\u6001\u5DE5\u7A0B\u811A\u624B\u67B6\u79CD\u5B50\u76EE\u5F55\uFF08\u5728 create \u65F6\u91CA\u653E\u5230\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u4F5C\u4E3A\u521D\u59CB\u6E90\u7801\u6846\u67B6\uFF09
+\u2502   \u251C\u2500\u2500 package.json
+\u2502   \u251C\u2500\u2500 README.md
+\u2502   \u2514\u2500\u2500 src/
+\u2502       \u2514\u2500\u2500 index.ts
+` : "";
   return `# ${options.templateName} (\`${options.packageId}\`)
 
 ${options.description}
@@ -44314,7 +44480,7 @@ ${options.description}
 \`\`\`text
 \u251C\u2500\u2500 manifest.yaml           # \u6A21\u677F\u58F0\u660E\u6E05\u5355\uFF08\u5143\u6570\u636E\u4E0E\u53EF\u9009\u7684\u4EFB\u52A1\uFF09
 \u251C\u2500\u2500 AGENTS.md               # \u9879\u76EE\u7EA7\u901A\u7528 AI \u7F16\u7801\u6307\u5BFC\uFF0C\u5B89\u88C5\u65F6\u81EA\u52A8\u590D\u5236\u5230\u9879\u76EE\u6839\u76EE\u5F55
-\u251C\u2500\u2500 skills/                 # \u8DE8 IDE \u53EF\u590D\u7528\u7684 Agent Skills\uFF08\u4E00\u9879 Skill \u4E00\u4E2A\u5B50\u76EE\u5F55\uFF09
+${projectTree}\u251C\u2500\u2500 skills/                 # \u8DE8 IDE \u53EF\u590D\u7528\u7684 Agent Skills\uFF08\u4E00\u9879 Skill \u4E00\u4E2A\u5B50\u76EE\u5F55\uFF09
 \u2502   \u2514\u2500\u2500 example-skill/
 \u2502       \u2514\u2500\u2500 SKILL.md
 \u251C\u2500\u2500 rules/                  # IDE \u539F\u751F\u89C4\u5219\u76EE\u5F55
@@ -44325,7 +44491,7 @@ ${options.description}
 \u2502   \u2514\u2500\u2500 mcp.json            # \u8FDC\u7AEF Streamable HTTP MCP \u670D\u52A1\u5668\u914D\u7F6E
 \u251C\u2500\u2500 README.md               # \u6A21\u677F\u4F7F\u7528\u4E0E\u5F00\u53D1\u6587\u6863
 \u2514\u2500\u2500 package.json            # \u6A21\u677F\u5305\u914D\u7F6E
-\`\`\`
+\`\`\`${projectSection}
 
 ---
 
@@ -44635,7 +44801,7 @@ async function executeExtensionDev(packageDirectory, options) {
       argv.push("--source-type", "local");
       argv.push("--source-path", sourcePath);
     }
-    if (options.operation === "remove" && packageId) argv.push("--package", packageId);
+    if (options.operation === "remove" && packageId) argv.push("--template", packageId);
     for (const target of options.target) {
       argv.push("--target", target);
     }
@@ -45989,7 +46155,7 @@ var init_service_locator = __esm({
 });
 
 // packages/cli/src/commands/plan-execution.ts
-import { readFile as readFile30, readdir as readdir10, stat as stat7 } from "node:fs/promises";
+import { readFile as readFile30, readdir as readdir11, stat as stat7 } from "node:fs/promises";
 import { join as join23, resolve as resolve21 } from "node:path";
 import { createHash as createHash15 } from "node:crypto";
 async function buildIntentsFromPlan(_plan, resolutions, service, projectTargets, _userInstallationKeys, options) {
@@ -46004,9 +46170,15 @@ async function buildIntentsFromPlan(_plan, resolutions, service, projectTargets,
       templateDir: packageRoot,
       projectRoot: service.projectRoot,
       targets: projectTargets.map((t2) => t2.id),
-      filter: options?.filter
+      filter: {
+        ...options?.filter,
+        skipProjectDir: options?.skipProjectDir ?? options?.filter?.skipProjectDir
+      }
     });
-    intents.push(...contractIntents);
+    intents.push(...contractIntents.map((intent) => ({
+      ...intent,
+      packageId: manifest.id
+    })));
     for (const asset of manifest.assets ?? []) {
       if (options?.skipProjectDir && (asset.source === "project" || asset.source.startsWith("project/"))) {
         options.onDiscloseSkipped?.(`\u8DF3\u8FC7\u8D44\u4EA7 '${asset.source}' (\u7531\u4E8E\u547D\u4EE4\u8BED\u4E49\u4E0D\u4EA4\u4ED8 project \u76EE\u5F55)`);
@@ -46105,7 +46277,7 @@ async function collectAssetIntents(packageRoot, source, destination, metadata) {
   }
   if (!sourceStat.isDirectory()) throw new Error(`Asset '${source}' \u65E2\u4E0D\u662F\u6587\u4EF6\u4E5F\u4E0D\u662F\u76EE\u5F55`);
   const intents = [];
-  for (const entry of await readdir10(sourcePath, { withFileTypes: true })) {
+  for (const entry of await readdir11(sourcePath, { withFileTypes: true })) {
     intents.push(...await collectAssetIntents(packageRoot, join23(source, entry.name), join23(destination, entry.name).replaceAll("\\", "/"), metadata));
   }
   return intents;
@@ -46263,6 +46435,7 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
   }
   const desiredPackages = [];
   const resolvedPackages = [];
+  const currentPackageIds = new Set(allResolutions.map((r) => r.packageId));
   for (const res of allResolutions) {
     const packageRoot = service?.getPackageRoot(res) ?? process.cwd();
     const contentDigest = await computePackageDigest(packageRoot);
@@ -46285,6 +46458,20 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
       ...res.integrity ? { integrity: res.integrity } : {}
     });
   }
+  if (existingLock) {
+    const existingDesired = existingLock.desired?.packages ?? [];
+    const existingResolved = existingLock.resolved?.packages ?? [];
+    for (const ep of existingDesired) {
+      if (!currentPackageIds.has(ep.id)) {
+        desiredPackages.push(ep);
+      }
+    }
+    for (const ep of existingResolved) {
+      if (!currentPackageIds.has(ep.id)) {
+        resolvedPackages.push(ep);
+      }
+    }
+  }
   const resources = /* @__PURE__ */ new Map();
   if (existingLock?.resources) {
     for (const res of existingLock.resources) {
@@ -46293,6 +46480,7 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
     }
   }
   for (const intent of intents) {
+    if (intent.assetType === "project-seed") 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;
@@ -46364,6 +46552,15 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
       });
     }
   }
+  const mergedTargets = [...targetStrings];
+  if (existingLock?.desired?.targets) {
+    for (const t2 of existingLock.desired.targets) {
+      const tid = typeof t2 === "string" ? t2 : t2.id;
+      if (!mergedTargets.includes(tid)) {
+        mergedTargets.push(tid);
+      }
+    }
+  }
   return {
     apiVersion: "mano-coding/v1",
     kind: "ProjectLock",
@@ -46373,7 +46570,7 @@ async function buildLock(_operation, templateResolution, addonResolutions, proje
     },
     desired: {
       packages: desiredPackages,
-      targets: targetStrings
+      targets: mergedTargets
     },
     resolved: {
       packages: resolvedPackages
@@ -46438,7 +46635,8 @@ function toInquirerChoices(choices) {
   return choices.map((choice) => ({
     value: choice,
     name: choice.label ?? choice.id,
-    description: choice.description
+    description: choice.description,
+    checked: choice.checked
   }));
 }
 function toContext(options) {
@@ -46743,24 +46941,29 @@ async function confirmPlanInteractive(opts) {
 `);
     }
   }
-  process.stderr.write(`
-\u786E\u8BA4\u540E\u5C06\u6267\u884C\u4EE5\u4E0A\u64CD\u4F5C\u3002
-`);
-  const confirmed = await readConfirm();
+  process.stderr.write(t("tty.confirmPrompt"));
+  const confirmed = await readConfirm({
+    input: opts.input,
+    output: opts.interactiveOutput
+  });
   if (!confirmed) {
     return { confirmed: false, granted: [], denied: toConfirm };
   }
   return { confirmed: true, granted: requested, denied: [] };
 }
-async function readConfirm() {
+async function readConfirm(streams) {
   try {
     return await dist_default5(
       {
         message: t("tty.proceedPrompt"),
-        default: false
+        default: true
       },
       // 1 分钟无响应超时视为拒绝
-      { signal: AbortSignal.timeout(6e4) }
+      {
+        signal: AbortSignal.timeout(6e4),
+        ...streams?.input ? { input: streams.input } : {},
+        ...streams?.output ? { output: streams.output } : {}
+      }
     );
   } catch {
     return false;
@@ -46824,10 +47027,11 @@ import { randomUUID as randomUUID6 } from "node:crypto";
 import { unlink as unlink9 } from "node:fs/promises";
 function createCreateCommand(cliVersion) {
   const cmd = new Command("create");
-  cmd.description(t("create.description")).argument("[package-spec]", t("create.argPackageSpec")).argument("[directory]", t("create.argDirectory")).option("--package <package-spec>", t("create.optionPackage"), collectPackage, []).option("--template <package-spec>", t("create.optionTemplate")).option("--addon <package-spec>", t("create.optionAddon"), collectPackage, []).action(async (packageSpec, directory, opts) => {
+  cmd.description(t("create.description")).argument("[template-spec]", t("create.argTemplateSpec")).argument("[directory]", t("create.argDirectory")).option("--template <template-spec>", t("create.optionTemplate"), collectTemplate, []).action(async (templateSpec, directory, opts) => {
+    const templateOptions = Array.isArray(opts.template) ? opts.template : [];
     const options = {
       ...extractMutationOptions(opts),
-      packages: Array.isArray(opts.package) ? opts.package : []
+      templates: templateOptions
     };
     const output = {
       json: options.json,
@@ -46837,7 +47041,7 @@ function createCreateCommand(cliVersion) {
     if (options.only || options.skip) {
       reportCliError(
         new CliError(
-          "create \u547D\u4EE4\u4E0D\u652F\u6301 --only / --skip \u8D44\u4EA7\u8FC7\u6EE4\uFF0C\u4EE5\u4FDD\u8BC1\u6A21\u677F\u5B8C\u6574\u4EA4\u4ED8\u3002\u5982\u9700\u5B9A\u5236\u53D7\u7BA1\u8D44\u4EA7\u8BF7\u4F7F\u7528 apply \u547D\u4EE4\u3002",
+          t("create.filterUnsupported"),
           ExitCode.SchemaInvalid,
           "UNSUPPORTED_OPTION"
         ),
@@ -46847,27 +47051,21 @@ function createCreateCommand(cliVersion) {
       process.exitCode = ExitCode.SchemaInvalid;
       return;
     }
-    const rawPackages = [
-      ...Array.isArray(opts.package) ? opts.package : [],
-      ...Array.isArray(opts.addon) ? opts.addon : []
-    ];
-    if (typeof opts.template === "string" && opts.template.trim().length > 0) {
-      rawPackages.push(opts.template.trim());
-    }
-    let effectivePackages = [...rawPackages];
+    const rawTemplates = [...templateOptions];
+    let effectiveTemplates = [...rawTemplates];
     let effectiveDirectory = directory;
-    if (rawPackages.length > 0) {
-      if (packageSpec && !directory) {
-        effectiveDirectory = packageSpec;
+    if (rawTemplates.length > 0) {
+      if (templateSpec && !directory) {
+        effectiveDirectory = templateSpec;
       }
     } else {
-      if (packageSpec) {
-        effectivePackages.push(packageSpec);
+      if (templateSpec) {
+        effectiveTemplates.push(templateSpec);
       }
     }
     const events = createEventEmitter("create", output);
     const exitCode = await executeCreate(
-      effectivePackages,
+      effectiveTemplates,
       effectiveDirectory,
       options,
       cliVersion,
@@ -46885,7 +47083,7 @@ function createCreateCommand(cliVersion) {
   addMutationOptions(cmd);
   return cmd;
 }
-function collectPackage(value, previous = []) {
+function collectTemplate(value, previous = []) {
   return previous.concat(value);
 }
 async function executeCreate(packageSpecs, directory, options, cliVersion, events) {
@@ -46926,7 +47124,7 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
     const allResolutions = [];
     for (const spec of packageSpecs) {
       const resolution = await events.measure("resolve", () => withSpinner(
-        `\u6B63\u5728\u62C9\u53D6\u5E76\u89E3\u6790\u6269\u5C55\u5305 (${spec})...`,
+        t("template.resolving", spec),
         () => resolvePackageWith(
           service,
           spec,
@@ -46935,8 +47133,8 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
         ),
         {
           enabled: spinnerEnabled,
-          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}`
+          successText: (res) => t("template.resolved", res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? spec, res.manifest.version ?? "0.0.0"),
+          failText: t("template.resolveFailed", spec)
         }
       ), { packageId: spec });
       allResolutions.push(resolution);
@@ -46974,7 +47172,7 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
       for (const res of allResolutions) {
         if (existingPkgIds.has(res.manifest.id)) {
           throw new CliError(
-            `\u5305 '${res.manifest.id}' \u5DF2\u7ECF\u5B89\u88C5\u5728\u5F53\u524D\u5DE5\u7A0B\u4E2D\u3002\u4E0D\u80FD\u901A\u8FC7 create \u91CD\u65B0\u5B89\u88C5\u3002\u5982\u9700\u66F4\u65B0\u914D\u7F6E\u6216\u540C\u6B65\u8D44\u4EA7\u8BF7\u4F7F\u7528 'apply'\u3001'sync' \u6216 'upgrade' \u547D\u4EE4\u3002`,
+            t("create.templateAlreadyInstalled", res.manifest.id),
             ExitCode.ConflictOrDrift,
             "PACKAGE_ALREADY_INSTALLED"
           );
@@ -46995,20 +47193,19 @@ async function executeCreate(packageSpecs, directory, options, cliVersion, event
           if (options.noInput || options.json || !process.stdin.isTTY) {
             const missing = taskValidation.missingInputs.join(", ");
             throw new CliError(
-              `\u5305 '${pkgId}' \u7F3A\u5C11\u521D\u59CB\u5316\u53C2\u6570: ${missing}\uFF0C\u8BF7\u4F7F\u7528\uFF1A
-${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).join("\n")}`,
+              t("create.missingTaskInputs", pkgId, missing, taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).join("\n")),
               ExitCode.NeedsInputOrDenied,
               "INPUT_REQUIRED",
               { inputs: taskValidation.missingInputs }
             );
           }
           for (const missingKey of taskValidation.missingInputs) {
-            const val = await dist_default6({ message: `[${pkgId}] \u8BF7\u8F93\u5165\u521D\u59CB\u5316\u53C2\u6570 '${missingKey}':` });
+            const val = await dist_default6({ message: t("create.promptTaskInput", pkgId, missingKey) });
             inputValues[missingKey] = val;
           }
         } else {
           throw new CliError(
-            taskValidation.error ?? "\u53C2\u6570\u6821\u9A8C\u5931\u8D25",
+            taskValidation.error ?? t("create.taskValidationFailed"),
             ExitCode.SchemaInvalid,
             "INVALID_OPTIONS"
           );
@@ -47018,7 +47215,9 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
     await recoverIncompleteJournals(service, output);
     let cliTargets = options.target;
     if (cliTargets.length === 0) {
-      if (isInteractive) {
+      if (existingLock?.desired?.targets && existingLock.desired.targets.length > 0) {
+        cliTargets = existingLock.desired.targets.map((t2) => typeof t2 === "string" ? t2 : t2.id);
+      } else if (isInteractive) {
         try {
           const selected = await selectSearchableMulti({
             message: t("create.chooseTargets"),
@@ -47068,12 +47267,12 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
       );
       const userInstallationKeys = /* @__PURE__ */ new Set();
       let staticIntents = await withSpinner(
-        "\u6B63\u5728\u8BA1\u7B97\u53D7\u7BA1\u8D44\u6E90\u5E76\u751F\u6210\u6267\u884C\u8BA1\u5212...",
+        t("create.computingPlan"),
         () => buildIntentsFromPlan(planResult.plan, allResolutions, service, projectTargets, userInstallationKeys),
         {
           enabled: spinnerEnabled,
-          successText: (res) => `\u2714 \u6267\u884C\u8BA1\u5212\u5DF2\u5C31\u7EEA (\u5171 ${res.length} \u9879\u8D44\u6E90\u53D8\u66F4)`,
-          failText: "\u2716 \u6267\u884C\u8BA1\u5212\u751F\u6210\u5931\u8D25"
+          successText: (res) => t("create.planReady", res.length),
+          failText: t("create.planFailed")
         }
       );
       planResult = materializePlan(planResult.plan, staticIntents);
@@ -47172,7 +47371,7 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
             operation: "create",
             version: resolution.manifest.version
           };
-          const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u521B\u5EFA\u4EFB\u52A1 (before:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
+          const title = t("task.runningBeforeCreate", pkgIdx + 1, allResolutions.length, resolution.manifest.id);
           try {
             await runTasksWithDynamicUI(pkgTasks, taskContext, {
               title,
@@ -47273,7 +47472,7 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
         );
         if (!output.json && userInstallationKeys.size > 0) writeHumanOutput(t("create.userToolsInstalled", formatElapsed(userInstallationStartedAt)));
         addRollback(userLifecycle.rollback);
-        const lock = await buildLock("create", templateResolution, addonResolutions, projectTargets, planResult.plan, service.cliVersion, inputValues, service, intents, userInstallationKeys);
+        const lock = await buildLock("create", templateResolution, addonResolutions, projectTargets, planResult.plan, service.cliVersion, inputValues, service, intents, userInstallationKeys, void 0, existingLock);
         await lockRepo.write(lock);
         addRollback(async () => previousLock ? lockRepo.write(previousLock) : unlink9(lockRepo.path).catch(() => void 0));
         await userLifecycle.addReferences(lock);
@@ -47296,7 +47495,7 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
             operation: "create",
             version: resolution.manifest.version
           };
-          const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u521D\u59CB\u5316\u4EFB\u52A1 (after:create) [${pkgIdx + 1}/${allResolutions.length}] (${resolution.manifest.id}):`;
+          const title = t("task.runningAfterCreate", pkgIdx + 1, allResolutions.length, resolution.manifest.id);
           try {
             await runTasksWithDynamicUI(pkgTasks, taskContext, {
               title,
@@ -47327,18 +47526,14 @@ ${taskValidation.missingInputs.map((k2) => `--input ${pkgId}:${k2}=<value>`).joi
   });
 }
 function formatElapsed(startedAt) {
-  return `${((Date.now() - startedAt) / 1e3).toFixed(1)} \u79D2`;
+  return t("common.seconds", ((Date.now() - startedAt) / 1e3).toFixed(1));
 }
 function writeUserInstallationProgress(progress) {
   const name = progress.displayName ?? `${progress.packageId}/${progress.capabilityId}`;
-  if (progress.status === "installing") writeHumanOutput(`\u6B63\u5728\u5B89\u88C5\uFF1A${name}
-`);
-  else if (progress.status === "installed") writeHumanOutput(`\u2713 \u5DF2\u5B89\u88C5\uFF1A${name}
-`);
-  else if (progress.status === "reused") writeHumanOutput(`\u2713 \u5DF2\u590D\u7528\uFF1A${name}
-`);
-  else writeHumanOutput(`- \u65E0\u9700\u5B89\u88C5\uFF1A${name}
-`);
+  if (progress.status === "installing") writeHumanOutput(t("create.installing", name));
+  else if (progress.status === "installed") writeHumanOutput(t("create.installed", name));
+  else if (progress.status === "reused") writeHumanOutput(t("create.reused", name));
+  else writeHumanOutput(t("create.skipped", name));
 }
 async function resolvePackageWith(service, spec, options, cliVersion) {
   const req = {
@@ -47391,7 +47586,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 a template to an existing project").argument("[package-spec]", "Template spec (required if no project lock)").action(async (packageSpec, opts) => {
+  cmd.description(t("apply.description")).argument("[template-spec]", t("apply.argTemplateSpec")).option("--template <template-spec>", t("apply.optionTemplate")).action(async (templateSpecArg, opts) => {
     const options = extractMutationOptions(opts);
     const output = {
       json: options.json,
@@ -47399,7 +47594,8 @@ function createApplyCommand(cliVersion) {
       noColor: options.noColor
     };
     const events = createEventEmitter("apply", output);
-    const exitCode = await executeApply(packageSpec, options, cliVersion, events).catch(
+    const templateSpec = (typeof opts.template === "string" ? opts.template : void 0) ?? (typeof templateSpecArg === "string" ? templateSpecArg : void 0);
+    const exitCode = await executeApply(templateSpec, options, cliVersion, events).catch(
       (err) => reportCliError(err, "apply", output, options.json && options.verbose ? getRedactedEvents(events) : void 0)
     );
     if (exitCode !== 0) {
@@ -47409,7 +47605,7 @@ function createApplyCommand(cliVersion) {
   addMutationOptions(cmd);
   return cmd;
 }
-async function executeApply(packageSpec, options, cliVersion, events) {
+async function executeApply(templateSpec, options, cliVersion, events) {
   const output = {
     json: options.json,
     verbose: options.verbose,
@@ -47417,13 +47613,6 @@ async function executeApply(packageSpec, options, cliVersion, events) {
   };
   const jsonEvents = () => options.json && options.verbose ? getRedactedEvents(events) : void 0;
   const isInteractive = !options.noInput && !options.json && Boolean(process.stdin.isTTY);
-  if (!packageSpec) {
-    throw new CliError(
-      t("apply.packageRequired"),
-      ExitCode.SchemaInvalid,
-      "PACKAGE_SPEC_REQUIRED"
-    );
-  }
   if (options.only && options.skip) {
     throw new CliError(
       t("apply.onlySkipExclusive"),
@@ -47485,28 +47674,72 @@ async function executeApply(packageSpec, options, cliVersion, events) {
     const spinnerEnabled = !output.json && Boolean(process.stdout.isTTY) && process.env.NODE_ENV !== "test";
     if (existingLock) {
       const existing = await withSpinner(
-        "\u6B63\u5728\u4ECE\u9501\u5B9A\u6587\u4EF6\u89E3\u6790\u5DF2\u5B89\u88C5\u5305...",
+        t("template.resolving", "lock"),
         () => resolveLockedPackages(existingLock, service),
         {
           enabled: spinnerEnabled,
-          successText: "\u2714 \u5DF2\u52A0\u8F7D\u9501\u5B9A\u914D\u7F6E"
+          successText: t("apply.lockedConfigLoaded")
         }
       );
       templateResolution = existing.template;
       addonResolutions = existing.addons;
     }
+    let effectiveTemplateSpec = templateSpec;
+    if (!effectiveTemplateSpec) {
+      if (!isInteractive) {
+        throw new CliError(
+          t("apply.templateRequired"),
+          ExitCode.SchemaInvalid,
+          "PACKAGE_SPEC_REQUIRED"
+        );
+      }
+      const client = service.getRegistryClient();
+      if (!client.getIndex) {
+        throw new CliError(t("create.registryIndexUnsupported"), ExitCode.ResolveFailed, "REGISTRY_INDEX_UNSUPPORTED");
+      }
+      const indexResult = await client.getIndex({ offline: options.offline });
+      const installedIds = /* @__PURE__ */ new Set();
+      if (existingLock) {
+        for (const p2 of existingLock.desired?.packages ?? []) installedIds.add(p2.id);
+        for (const p2 of existingLock.resolved?.packages ?? []) installedIds.add(p2.id);
+        if (existingLock.desired?.template?.id) installedIds.add(existingLock.desired.template.id);
+        for (const t2 of existingLock.desired?.templates ?? []) installedIds.add(t2.id);
+        for (const a of existingLock.desired?.addons ?? []) installedIds.add(a.id);
+        if (existingLock.resolved?.template?.id) installedIds.add(existingLock.resolved.template.id);
+        for (const t2 of existingLock.resolved?.templates ?? []) installedIds.add(t2.id);
+        for (const a of existingLock.resolved?.addons ?? []) installedIds.add(a.id);
+      }
+      const availableChoices = indexResult.packages.filter((entry) => !installedIds.has(entry.id)).map((entry) => ({
+        id: entry.id,
+        label: entry.name ?? entry.displayName ?? entry.id,
+        description: entry.description ?? "",
+        tags: entry.tags ?? []
+      }));
+      if (availableChoices.length === 0) {
+        throw new CliError(t("apply.noAvailableTemplates"), ExitCode.NeedsInputOrDenied, "NO_TEMPLATES_AVAILABLE");
+      }
+      try {
+        const chosen = await selectSearchable({ message: t("apply.chooseTemplate"), choices: availableChoices });
+        effectiveTemplateSpec = chosen.id;
+      } catch (error) {
+        if (error instanceof SearchableSelectCancelled) {
+          throw new CliError(t("apply.templateSelectionCancelled"), ExitCode.NeedsInputOrDenied, "PERMISSION_DENIED");
+        }
+        throw error;
+      }
+    }
     const newAddonResolution = await withSpinner(
-      `\u6B63\u5728\u62C9\u53D6\u5E76\u89E3\u6790\u6A21\u677F (${packageSpec})...`,
+      t("template.resolving", effectiveTemplateSpec),
       () => resolvePackageWith2(
         service,
-        packageSpec,
+        effectiveTemplateSpec,
         options,
         cliVersion
       ),
       {
         enabled: spinnerEnabled,
-        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}`
+        successText: (res) => t("template.resolved", res.manifest.displayName ?? res.manifest.name ?? res.manifest.id ?? effectiveTemplateSpec, res.manifest.version ?? "0.0.0"),
+        failText: t("template.resolveFailed", effectiveTemplateSpec)
       }
     );
     addonResolutions = [...addonResolutions.filter((resolution) => resolution.packageId !== newAddonResolution.packageId), newAddonResolution];
@@ -47536,24 +47769,31 @@ async function executeApply(packageSpec, options, cliVersion, events) {
     }
     let cliTargets = options.target;
     if (cliTargets.length === 0) {
-      if (existingLock?.desired.targets && existingLock.desired.targets.length > 0) {
-        cliTargets = existingLock.desired.targets.map((t2) => typeof t2 === "string" ? t2 : t2.id);
-      } else if (isInteractive) {
+      if (isInteractive) {
+        const existingTargetIds = new Set(
+          (existingLock?.desired.targets ?? []).map((t2) => typeof t2 === "string" ? t2 : t2.id)
+        );
+        const choices = OFFICIAL_TARGET_CHOICES.map((choice) => ({
+          ...choice,
+          checked: existingTargetIds.size > 0 ? existingTargetIds.has(choice.id) : void 0
+        }));
         try {
           const selected = await selectSearchableMulti({
-            message: t("create.chooseTargets"),
-            choices: OFFICIAL_TARGET_CHOICES
+            message: t("apply.chooseTargets"),
+            choices
           });
           if (selected.length === 0) {
-            throw new CliError(t("create.targetSelectionCancelled"), ExitCode.NeedsInputOrDenied, "PERMISSION_DENIED");
+            throw new CliError(t("apply.targetSelectionCancelled"), ExitCode.NeedsInputOrDenied, "PERMISSION_DENIED");
           }
           cliTargets = selected.map((choice) => choice.id);
         } catch (error) {
           if (error instanceof SearchableSelectCancelled) {
-            throw new CliError(t("create.targetSelectionCancelled"), ExitCode.NeedsInputOrDenied, "PERMISSION_DENIED");
+            throw new CliError(t("apply.targetSelectionCancelled"), ExitCode.NeedsInputOrDenied, "PERMISSION_DENIED");
           }
           throw error;
         }
+      } else if (existingLock?.desired.targets && existingLock.desired.targets.length > 0) {
+        cliTargets = existingLock.desired.targets.map((t2) => typeof t2 === "string" ? t2 : t2.id);
       } else {
         cliTargets = ["codebuddy"];
       }
@@ -47573,7 +47813,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
     );
     const userInstallationKeys = /* @__PURE__ */ new Set();
     const intents = await withSpinner(
-      "\u6B63\u5728\u8BA1\u7B97\u53D7\u7BA1\u8D44\u6E90\u5E76\u751F\u6210\u6267\u884C\u8BA1\u5212...",
+      t("apply.computingPlan"),
       () => buildIntentsFromPlan(
         planResult.plan,
         packagesToApply,
@@ -47581,7 +47821,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         projectTargets,
         userInstallationKeys,
         {
-          filter: { only: onlyTypes, skip: skipTypes },
+          filter: { only: onlyTypes, skip: skipTypes, skipProjectDir: true },
           skipProjectDir: true,
           onDiscloseSkipped: (msg) => {
             if (!output.json) writeHumanOutput(`- ${msg}
@@ -47591,8 +47831,8 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       ),
       {
         enabled: spinnerEnabled,
-        successText: (res) => `\u2714 \u6267\u884C\u8BA1\u5212\u5DF2\u5C31\u7EEA (\u5171 ${res.length} \u9879\u8D44\u6E90\u53D8\u66F4)`,
-        failText: "\u2716 \u6267\u884C\u8BA1\u5212\u751F\u6210\u5931\u8D25"
+        successText: (res) => t("apply.planReady", res.length),
+        failText: t("apply.planFailed")
       }
     );
     if (existingLock?.resources) {
@@ -47609,7 +47849,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
           }
           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`,
+              t("apply.resourceConflict", intent.path),
               ExitCode.ConflictOrDrift,
               "PLAN_CONFLICT"
             );
@@ -47623,8 +47863,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
       ...filterTasksByHook2(newAddonResolution.manifest.tasks ?? [], "after:create")
     ];
     if (skippedCreateTasks.length > 0 && !output.json) {
-      writeHumanOutput(`- \u5DF2\u8DF3\u8FC7 ${skippedCreateTasks.length} \u4E2A create \u751F\u547D\u5468\u671F\u94A9\u5B50\u4EFB\u52A1\uFF08apply \u8BED\u4E49\u4E0D\u6267\u884C before:create / after:create \u94A9\u5B50\uFF09
-`);
+      writeHumanOutput(t("apply.skippedCreateTasks", skippedCreateTasks.length));
     }
     const beforeApplyTasksForCheck = filterTasksByHook2(newAddonResolution.manifest.tasks ?? [], "before:apply");
     const afterApplyTasksForCheck = filterTasksByHook2(newAddonResolution.manifest.tasks ?? [], "after:apply");
@@ -47642,7 +47881,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         if (existingResolved.version === newAddonResolution.resolvedVersion && existingResolved.integrity && newAddonResolution.integrity) {
           if (existingResolved.integrity !== newAddonResolution.integrity) {
             throw new CliError(
-              `\u5305 '${newAddonResolution.packageId}' \u7248\u672C\u76F8\u540C\u4F46\u5185\u5BB9\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u4F7F\u7528 upgrade \u547D\u4EE4\u8FDB\u884C\u66F4\u65B0`,
+              t("apply.templateUpdatedNeedsUpgrade", newAddonResolution.packageId),
               ExitCode.ConflictOrDrift,
               "PACKAGE_UPDATE_REQUIRES_UPGRADE"
             );
@@ -47651,9 +47890,9 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         const hasChanges = planResult.plan.files.length > 0 || planResult.plan.configEntries.length > 0 || planResult.plan.managedSections.length > 0 || planResult.plan.plugins.length > 0 || planResult.plan.userInstallations.length > 0;
         if (sameAssetTypes && !hasChanges) {
           if (output.json) {
-            emitSuccessJson("apply", { dryRun: false, message: "\u5DF2\u5E94\u7528\uFF0C\u65E0\u53D8\u5316", lockPath: lockRepo.path }, [], [], jsonEvents());
+            emitSuccessJson("apply", { dryRun: false, message: t("apply.alreadyUpToDate"), lockPath: lockRepo.path }, [], [], jsonEvents());
           } else {
-            writeHumanOutput("\u5DF2\u5E94\u7528\uFF0C\u65E0\u53D8\u5316\n");
+            writeHumanOutput(t("apply.alreadyUpToDate") + "\n");
           }
           return ExitCode.Success;
         }
@@ -47758,7 +47997,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         };
         try {
           await runTasksWithDynamicUI([task], taskContext, {
-            title: i === 0 ? "\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5E94\u7528\u4EFB\u52A1 (before:apply):" : void 0,
+            title: i === 0 ? t("task.runningBeforeApply", 1, 1, newAddonResolution.packageId) : void 0,
             verbose: options.verbose,
             json: options.json
           });
@@ -47836,7 +48075,7 @@ async function executeApply(packageSpec, options, cliVersion, events) {
         };
         try {
           await runTasksWithDynamicUI([task], taskContext, {
-            title: i === 0 ? "\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5E94\u7528\u4EFB\u52A1 (after:apply):" : void 0,
+            title: i === 0 ? t("task.runningAfterApply", 1, 1, newAddonResolution.packageId) : void 0,
             verbose: options.verbose,
             json: options.json
           });
@@ -47910,10 +48149,10 @@ import { randomUUID as randomUUID8 } from "node:crypto";
 import { basename as basename5, dirname as dirname17, resolve as resolve22 } from "node:path";
 function createSyncCommand(cliVersion) {
   const cmd = new Command("sync");
-  cmd.description(t("sync.description")).option("--package <packageId>", "\u4EC5\u540C\u6B65\u6307\u5B9A\u7684\u5DF2\u5B89\u88C5\u5305").action(async (opts) => {
+  cmd.description(t("sync.description")).option("--template <templateId>", t("sync.optionTemplate")).action(async (opts) => {
     const options = extractMutationOptions(opts);
-    if (typeof opts.package === "string") {
-      options.package = opts.package;
+    if (typeof opts.template === "string") {
+      options.template = opts.template;
     }
     const output = {
       json: options.json,
@@ -47958,11 +48197,11 @@ async function executeSync(options, cliVersion, silent = false, events = new Lif
     }
     const locked = await events.measure("resolve", () => resolveLockedPackages(lock, service));
     let allResolutions = [...locked.template ? [locked.template] : [], ...locked.addons];
-    if (options.package) {
-      allResolutions = allResolutions.filter((r) => r.packageId === options.package);
+    if (options.template) {
+      allResolutions = allResolutions.filter((r) => r.packageId === options.template);
       if (allResolutions.length === 0) {
         throw new CliError(
-          `\u672A\u5728 Lock \u6587\u4EF6\u4E2D\u627E\u5230\u5305 '${options.package}'\u3002\u8BE5\u5305\u672A\u5B89\u88C5\u6216\u65E0\u6CD5\u540C\u6B65\u3002`,
+          t("sync.templateNotFound", options.template),
           ExitCode.SchemaInvalid,
           "PACKAGE_NOT_FOUND"
         );
@@ -48311,7 +48550,7 @@ import { unlink as unlink11, readFile as readFile31 } from "node:fs/promises";
 import { basename as basename6, dirname as dirname18, join as join24, resolve as resolve23 } from "node:path";
 function createRemoveCommand(cliVersion) {
   const cmd = new Command("remove");
-  cmd.description(t("remove.description")).option("--package <package-id>", t("remove.optionPackage")).action(async (opts) => {
+  cmd.description(t("remove.description")).argument("[template-id]", t("remove.argTemplate")).option("--template <template-id>", t("remove.optionTemplate")).action(async (templateArg, opts) => {
     const options = extractMutationOptions(opts);
     const output = {
       json: options.json,
@@ -48319,8 +48558,8 @@ function createRemoveCommand(cliVersion) {
       noColor: options.noColor
     };
     const events = createEventEmitter("remove", output);
-    const packageId = typeof opts.package === "string" ? opts.package : void 0;
-    const exitCode = await executeRemove(packageId, options, cliVersion, events).catch(
+    const templateId = (typeof opts.template === "string" ? opts.template : void 0) ?? (typeof templateArg === "string" ? templateArg : void 0);
+    const exitCode = await executeRemove(templateId, options, cliVersion, events).catch(
       (err) => reportCliError(err, "remove", output, options.json && options.verbose ? getRedactedEvents(events) : void 0)
     );
     if (exitCode !== 0) {
@@ -48330,7 +48569,7 @@ function createRemoveCommand(cliVersion) {
   addMutationOptions(cmd);
   return cmd;
 }
-async function executeRemove(packageId, options, cliVersion, events) {
+async function executeRemove(templateId, options, cliVersion, events) {
   const output = {
     json: options.json,
     verbose: options.verbose,
@@ -48356,47 +48595,56 @@ async function executeRemove(packageId, options, cliVersion, events) {
         "LOCK_NOT_FOUND"
       );
     }
-    if (packageId) {
-      const allPackages = [
+    if (templateId) {
+      const allTemplates = [
         ...lock.desired?.packages ? lock.desired.packages.map((p2) => p2.id) : [],
         ...lock.resolved?.packages ? lock.resolved.packages.map((p2) => p2.id) : [],
         ...lock.resolved.template ? [lock.resolved.template.id] : [],
         ...lock.resolved.templates ? lock.resolved.templates.map((t2) => t2.id) : [],
         ...lock.resolved.addons ? lock.resolved.addons.map((a) => a.id) : []
       ];
-      if (!allPackages.includes(packageId)) {
-        if (lock.createdWith?.packages?.some((p2) => p2.packageId === packageId)) {
+      if (!allTemplates.includes(templateId)) {
+        if (lock.createdWith?.packages?.some((p2) => p2.packageId === templateId)) {
           throw new CliError(
-            `\u5305 '${packageId}' \u662F\u9879\u76EE\u7684\u521D\u59CB\u5DE5\u7A0B\u6A21\u677F (bootstrap-only)\uFF0C\u4E0D\u5305\u542B\u53D7\u7BA1\u77E5\u8BC6\u8D44\u4EA7\uFF0C\u65E0\u6CD5\u88AB remove\u3002\u82E5\u9700\u5220\u9664\u6574\u4E2A\u9879\u76EE\uFF0C\u8BF7\u76F4\u63A5\u5220\u9664\u9879\u76EE\u76EE\u5F55\u3002`,
+            t("remove.bootstrapTemplateCannotBeRemoved", templateId),
             ExitCode.SchemaInvalid,
             "BOOTSTRAP_PACKAGE_CANNOT_BE_REMOVED"
           );
         }
         throw new CliError(
-          t("remove.packageNotInLock", packageId, allPackages.join(", ") || "none"),
+          t("remove.templateNotInLock", templateId, allTemplates.join(", ") || "none"),
           ExitCode.SchemaInvalid,
           "PACKAGE_NOT_IN_LOCK",
-          { packageId, available: allPackages }
+          { templateId, available: allTemplates }
         );
       }
     }
     events.report("resolve", "success", Date.now() - resolveStartedAt, {
       details: { packageCount: (lock.resolved.template ? 1 : 0) + (lock.resolved.addons?.length ?? 0) }
     });
+    const ownerMatches = (owner) => !templateId || owner.packageId === templateId;
+    const intents = lock.resources.filter((resource) => resource.owners.every(ownerMatches)).map((resource) => {
+      const targetId = typeof resource.target === "string" ? resource.target : resource.target?.id;
+      const metadata = { target: targetId, packageId: resource.owners[0]?.packageId };
+      if (resource.type === "file" || !resource.type) return { action: "remove", type: "file", path: resource.path, ...metadata };
+      if (resource.type === "managed-section") return { action: "remove", type: "managed-section", path: resource.path, sectionId: resource.sectionId ?? resource.selector ?? "", ...metadata };
+      return { action: "remove", type: "config-entry", path: resource.path, selector: resource.selector ?? "", format: resource.format ?? "json", ...metadata };
+    });
     const planStartedAt = Date.now();
     const planBuilder = service.getPlanBuilder();
     const projectTargets = lock.desired.targets.map((t2) => typeof t2 === "string" ? { id: t2, scope: "project" } : t2);
-    const planResult = planBuilder.build(
+    let planResult = planBuilder.build(
       "remove",
       service.projectRoot,
       [],
       projectTargets
     );
+    planResult = materializePlan(planResult.plan, intents);
     events.report("plan", "success", Date.now() - planStartedAt, { planDigest: planResult.plan.planDigest });
     const driftDetector = new DriftDetector({ projectRoot: service.projectRoot, driftMode: options.drift });
     const drift = await driftDetector.detect(lock);
     if (driftDetector.shouldAbort(drift)) {
-      throw new CliError(`\u68C0\u6D4B\u5230 ${drift.length} \u9879\u8D44\u6E90\u6F02\u79FB\uFF1B\u5982\u786E\u8BA4\u5220\u9664\u5DF2\u4FEE\u6539\u5185\u5BB9\uFF0C\u8BF7\u4F7F\u7528 --drift accept`, ExitCode.ConflictOrDrift, "RESOURCE_DRIFT", { drift });
+      throw new CliError(t("remove.driftDetected", drift.length), ExitCode.ConflictOrDrift, "RESOURCE_DRIFT", { drift });
     }
     if (!options.dryRun && !options.yes) {
       if (options.noInput || !process.stdin.isTTY) {
@@ -48455,23 +48703,15 @@ async function executeRemove(packageId, options, cliVersion, events) {
       }
       return ExitCode.Success;
     }
-    const ownerMatches = (owner) => !packageId || owner.packageId === packageId;
-    const intents = lock.resources.filter((resource) => resource.owners.every(ownerMatches)).map((resource) => {
-      const targetId = typeof resource.target === "string" ? resource.target : resource.target?.id;
-      const metadata = { target: targetId, packageId: resource.owners[0]?.packageId };
-      if (resource.type === "file" || !resource.type) return { action: "remove", type: "file", path: resource.path, ...metadata };
-      if (resource.type === "managed-section") return { action: "remove", type: "managed-section", path: resource.path, sectionId: resource.sectionId ?? resource.selector ?? "", ...metadata };
-      return { action: "remove", type: "config-entry", path: resource.path, selector: resource.selector ?? "", format: resource.format ?? "json", ...metadata };
-    });
-    const packagesToRemove = packageId ? [packageId] : [
+    const templatesToRemove = templateId ? [templateId] : [
       ...lock.desired?.packages ? lock.desired.packages.map((p2) => p2.id) : [],
       ...lock.resolved?.packages ? lock.resolved.packages.map((p2) => p2.id) : [],
       ...lock.resolved.template ? [lock.resolved.template.id] : [],
       ...lock.resolved.addons ? lock.resolved.addons.map((a) => a.id) : []
     ];
-    const uniquePackagesToRemove = [...new Set(packagesToRemove)];
-    const packageManifests = [];
-    for (const pkg of uniquePackagesToRemove) {
+    const uniqueTemplatesToRemove = [...new Set(templatesToRemove)];
+    const templateManifests = [];
+    for (const pkg of uniqueTemplatesToRemove) {
       const resolved = lock.resolved?.packages?.find((p2) => p2.id === pkg) ?? (lock.resolved?.template?.id === pkg ? lock.resolved.template : void 0);
       const desired = lock.desired?.packages?.find((p2) => p2.id === pkg) ?? (lock.desired?.template?.id === pkg ? lock.desired.template : void 0);
       let templateDir;
@@ -48488,8 +48728,8 @@ async function executeRemove(packageId, options, cliVersion, events) {
         const manifestContent = await readFile31(join24(templateDir, "manifest.yaml"), "utf-8");
         const parsed = parseManifest(manifestContent);
         if (parsed.manifest) {
-          packageManifests.push({
-            packageId: pkg,
+          templateManifests.push({
+            templateId: pkg,
             manifest: parsed.manifest,
             templateDir,
             inputs: Object.fromEntries(Object.entries(desired?.inputs ?? {}).map(([k2, v2]) => [k2, String(v2)]))
@@ -48498,8 +48738,8 @@ async function executeRemove(packageId, options, cliVersion, events) {
       } catch {
       }
     }
-    for (let pkgIdx = 0; pkgIdx < packageManifests.length; pkgIdx++) {
-      const item = packageManifests[pkgIdx];
+    for (let pkgIdx = 0; pkgIdx < templateManifests.length; pkgIdx++) {
+      const item = templateManifests[pkgIdx];
       const pkgTasks = filterTasksByHook(item.manifest.tasks ?? [], "before:remove");
       if (pkgTasks.length > 0) {
         const taskContext = {
@@ -48513,7 +48753,7 @@ async function executeRemove(packageId, options, cliVersion, events) {
           operation: "remove",
           version: item.manifest.version
         };
-        const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u79FB\u9664\u4EFB\u52A1 (before:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):`;
+        const title = t("task.runningBeforeRemove", pkgIdx + 1, templateManifests.length, item.templateId);
         try {
           await runTasksWithDynamicUI(pkgTasks, taskContext, {
             title,
@@ -48544,36 +48784,36 @@ async function executeRemove(packageId, options, cliVersion, events) {
     }
     events.report("execute", "success", Date.now() - executeStartedAt, { planDigest: planResult.plan.planDigest, details: { intentCount: intents.length } });
     const remainingLock = structuredClone(lock);
-    if (packageId) {
-      if (remainingLock.desired.packages) remainingLock.desired.packages = remainingLock.desired.packages.filter((item) => item.id !== packageId);
-      if (remainingLock.resolved.packages) remainingLock.resolved.packages = remainingLock.resolved.packages.filter((item) => item.id !== packageId);
-      if (remainingLock.desired.template?.id === packageId) delete remainingLock.desired.template;
-      if (remainingLock.resolved.template?.id === packageId) delete remainingLock.resolved.template;
-      if (remainingLock.desired.templates) remainingLock.desired.templates = remainingLock.desired.templates.filter((item) => item.id !== packageId);
-      if (remainingLock.resolved.templates) remainingLock.resolved.templates = remainingLock.resolved.templates.filter((item) => item.id !== packageId);
-      if (remainingLock.desired.addons) remainingLock.desired.addons = remainingLock.desired.addons.filter((item) => item.id !== packageId);
-      if (remainingLock.resolved.addons) remainingLock.resolved.addons = remainingLock.resolved.addons.filter((item) => item.id !== packageId);
-      if (remainingLock.desired.capabilities) remainingLock.desired.capabilities = remainingLock.desired.capabilities.filter((item) => item.packageId !== packageId);
-      if (remainingLock.resolved.projects) remainingLock.resolved.projects = remainingLock.resolved.projects.filter((item) => item.packageId !== packageId);
-      if (remainingLock.resolved.capabilities) remainingLock.resolved.capabilities = remainingLock.resolved.capabilities.filter((item) => item.packageId !== packageId);
-      if (remainingLock.resolved.plugins) remainingLock.resolved.plugins = remainingLock.resolved.plugins.filter((item) => item.packageId !== packageId);
-      remainingLock.resources = remainingLock.resources.map((resource) => ({ ...resource, owners: resource.owners.filter((owner) => owner.packageId !== packageId) })).filter((resource) => resource.owners.length > 0);
+    if (templateId) {
+      if (remainingLock.desired.packages) remainingLock.desired.packages = remainingLock.desired.packages.filter((item) => item.id !== templateId);
+      if (remainingLock.resolved.packages) remainingLock.resolved.packages = remainingLock.resolved.packages.filter((item) => item.id !== templateId);
+      if (remainingLock.desired.template?.id === templateId) delete remainingLock.desired.template;
+      if (remainingLock.resolved.template?.id === templateId) delete remainingLock.resolved.template;
+      if (remainingLock.desired.templates) remainingLock.desired.templates = remainingLock.desired.templates.filter((item) => item.id !== templateId);
+      if (remainingLock.resolved.templates) remainingLock.resolved.templates = remainingLock.resolved.templates.filter((item) => item.id !== templateId);
+      if (remainingLock.desired.addons) remainingLock.desired.addons = remainingLock.desired.addons.filter((item) => item.id !== templateId);
+      if (remainingLock.resolved.addons) remainingLock.resolved.addons = remainingLock.resolved.addons.filter((item) => item.id !== templateId);
+      if (remainingLock.desired.capabilities) remainingLock.desired.capabilities = remainingLock.desired.capabilities.filter((item) => item.packageId !== templateId);
+      if (remainingLock.resolved.projects) remainingLock.resolved.projects = remainingLock.resolved.projects.filter((item) => item.packageId !== templateId);
+      if (remainingLock.resolved.capabilities) remainingLock.resolved.capabilities = remainingLock.resolved.capabilities.filter((item) => item.packageId !== templateId);
+      if (remainingLock.resolved.plugins) remainingLock.resolved.plugins = remainingLock.resolved.plugins.filter((item) => item.packageId !== templateId);
+      remainingLock.resources = remainingLock.resources.map((resource) => ({ ...resource, owners: resource.owners.filter((owner) => owner.packageId !== templateId) })).filter((resource) => resource.owners.length > 0);
     }
     const hasPackages = (remainingLock.resolved.packages?.length ?? 0) > 0 || Boolean(remainingLock.resolved.template) || (remainingLock.resolved.templates?.length ?? 0) > 0 || (remainingLock.resolved.addons?.length ?? 0) > 0;
     const recordStartedAt = Date.now();
     await commitExecution(executor, executeResult, async (addRollback) => {
-      if (packageId && hasPackages) await lockRepo.write(remainingLock);
+      if (templateId && hasPackages) await lockRepo.write(remainingLock);
       else await unlink11(lockRepo.path).catch((error) => {
         if (error.code !== "ENOENT") throw error;
       });
       addRollback(() => lockRepo.write(lock));
       await prepareUserDataRecovery(journal, service.getUserDataDir(), ["installations.json"]);
-      await removeUserReferences(lock, packageId, service, output);
+      await removeUserReferences(lock, templateId, service, output);
       await finishJournal(journal);
     });
     events.report("record", "success", Date.now() - recordStartedAt, { planDigest: planResult.plan.planDigest });
-    for (let pkgIdx = 0; pkgIdx < packageManifests.length; pkgIdx++) {
-      const item = packageManifests[pkgIdx];
+    for (let pkgIdx = 0; pkgIdx < templateManifests.length; pkgIdx++) {
+      const item = templateManifests[pkgIdx];
       const pkgTasks = filterTasksByHook(item.manifest.tasks ?? [], "after:remove");
       if (pkgTasks.length > 0) {
         const taskContext = {
@@ -48587,7 +48827,7 @@ async function executeRemove(packageId, options, cliVersion, events) {
           operation: "remove",
           version: item.manifest.version
         };
-        const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u79FB\u9664\u4EFB\u52A1 (after:remove) [${pkgIdx + 1}/${packageManifests.length}] (${item.packageId}):`;
+        const title = t("task.runningAfterRemove", pkgIdx + 1, templateManifests.length, item.templateId);
         try {
           await runTasksWithDynamicUI(pkgTasks, taskContext, {
             title,
@@ -48607,18 +48847,18 @@ async function executeRemove(packageId, options, cliVersion, events) {
       emitSuccessJson("remove", {
         dryRun: false,
         ...summary,
-        removedLock: !packageId || !hasPackages,
-        packageId: packageId ?? "*"
+        removedLock: !templateId || !hasPackages,
+        templateId: templateId ?? "*"
       }, [], [], jsonEvents());
     } else {
       printPlanSummary(summary);
-      writeHumanOutput(t("remove.removed", packageId ?? t("remove.allPackages"), service.projectRoot) + "\n");
-      writeHumanOutput(t(!packageId || !hasPackages ? "remove.lockRemoved" : "remove.lockUpdated") + "\n");
+      writeHumanOutput(t("remove.removed", templateId ?? t("remove.allTemplates"), service.projectRoot) + "\n");
+      writeHumanOutput(t(!templateId || !hasPackages ? "remove.lockRemoved" : "remove.lockUpdated") + "\n");
     }
     return ExitCode.Success;
   });
 }
-async function removeUserReferences(originalLock, packageId, service, output) {
+async function removeUserReferences(originalLock, templateId, service, output) {
   const installationsRepo = service.getInstallationsRepository();
   const lockRec = originalLock;
   const resolved = lockRec["resolved"];
@@ -48637,10 +48877,10 @@ async function removeUserReferences(originalLock, packageId, service, output) {
       }
     }
   }
-  if (packageId) {
+  if (templateId) {
     capabilities = capabilities.filter((cap) => {
       const capPkgId = cap["packageId"];
-      return capPkgId === packageId;
+      return capPkgId === templateId;
     });
   }
   const warnings = [];
@@ -49609,7 +49849,7 @@ import { createHash as createHash17, randomUUID as randomUUID10 } from "node:cry
 import { basename as basename7, dirname as dirname19 } from "node:path";
 function createUpgradeCommand(cliVersion) {
   const cmd = new Command("upgrade");
-  cmd.description(t("upgrade.description")).option("--project <path>", t("upgrade.optionProject"), process.cwd()).option("--package <package-id>", t("upgrade.optionPackage")).option("--capability <id>", t("upgrade.optionCapability")).option("--version <version>", t("upgrade.optionVersion")).option("--dry-run", t("upgrade.optionDryRun")).option("--yes, -y", t("upgrade.optionYes")).option("--allow <permission>", t("upgrade.optionAllow"), collectPermission, []).action(async (opts) => {
+  cmd.description(t("upgrade.description")).option("--project <path>", t("upgrade.optionProject"), process.cwd()).option("--template <template-id>", t("upgrade.optionTemplate")).option("--capability <id>", t("upgrade.optionCapability")).option("--version <version>", t("upgrade.optionVersion")).option("--dry-run", t("upgrade.optionDryRun")).option("--yes, -y", t("upgrade.optionYes")).option("--allow <permission>", t("upgrade.optionAllow"), collectPermission, []).action(async (opts) => {
     const globalOpts = extractGlobalOptions(opts);
     const output = {
       json: globalOpts.json,
@@ -49628,7 +49868,7 @@ function createUpgradeCommand(cliVersion) {
 }
 async function executeUpgrade(opts, cliVersion) {
   const projectRoot = typeof opts.project === "string" ? opts.project : process.cwd();
-  const packageId = typeof opts.package === "string" ? opts.package : void 0;
+  const templateId = typeof opts.template === "string" ? opts.template : void 0;
   const targetVersion = typeof opts.version === "string" ? opts.version : void 0;
   const dryRun = Boolean(opts.dryRun);
   const yes = Boolean(opts.yes);
@@ -49657,7 +49897,7 @@ async function executeUpgrade(opts, cliVersion) {
         { resources: drift.map((item) => ({ type: item.type, path: item.path })) }
       );
     }
-    let targetPackageId = packageId;
+    let targetPackageId = templateId;
     const desiredPackages = lock.desired?.packages ?? [];
     if (!targetPackageId) {
       if (desiredPackages.length === 1) {
@@ -49666,9 +49906,9 @@ async function executeUpgrade(opts, cliVersion) {
         targetPackageId = lock.desired.template.id;
       } else {
         throw new CliError(
-          "\u8BF7\u901A\u8FC7 --package <package-id> \u6307\u5B9A\u9700\u8981\u5347\u7EA7\u7684\u5305\u3002",
+          t("upgrade.missingTemplate"),
           ExitCode.SchemaInvalid,
-          "MISSING_OPTIONS"
+          "PACKAGE_SPEC_REQUIRED"
         );
       }
     }
@@ -49753,12 +49993,7 @@ async function executeUpgrade(opts, cliVersion) {
       if (json) {
         emitSuccessJson("upgrade", { dryRun: true, ...plan });
       } else {
-        writeHumanOutput(`\u5347\u7EA7\u8BA1\u5212\uFF1A
-  \u5305\uFF1A${targetPackageId}
-  \u5F53\u524D\uFF1A${oldVersion}
-  \u76EE\u6807\uFF1A${templateResolution.resolvedVersion}
-  \u9879\u76EE\uFF1A${projectRoot}
-`);
+        writeHumanOutput(t("upgrade.planSummary", targetPackageId, oldVersion, templateResolution.resolvedVersion, projectRoot));
       }
       return ExitCode.Success;
     }
@@ -49798,7 +50033,7 @@ async function executeUpgrade(opts, cliVersion) {
         previousVersion: oldVersion,
         version: templateResolution.resolvedVersion
       };
-      const title = `\u6B63\u5728\u6267\u884C\u524D\u7F6E\u5347\u7EA7\u4EFB\u52A1 (before:upgrade) (${targetPackageId}):`;
+      const title = t("task.runningBeforeUpgrade", targetPackageId);
       try {
         await runTasksWithDynamicUI(beforeTasks, taskContext, {
           title,
@@ -49854,7 +50089,7 @@ async function executeUpgrade(opts, cliVersion) {
         previousVersion: oldVersion,
         version: templateResolution.resolvedVersion
       };
-      const title = `\u6B63\u5728\u6267\u884C\u540E\u7F6E\u5347\u7EA7\u4EFB\u52A1 (after:upgrade) (${targetPackageId}):`;
+      const title = t("task.runningAfterUpgrade", targetPackageId);
       try {
         await runTasksWithDynamicUI(afterTasks, taskContext, {
           title,
@@ -50267,11 +50502,12 @@ import { homedir as homedir4 } from "node:os";
 import { join as join26 } from "node:path";
 function createLaunchCommand() {
   const cmd = new Command("_launch");
-  cmd.description(t("launch.description")).option("--kind <kind>", t("launch.optionKind")).option("--package <package-id>", t("launch.optionPackage")).option("--id <id>", t("launch.optionId")).option("--version <version>", t("launch.optionVersion")).option("--command <name>", t("launch.optionCommand")).allowUnknownOption(true).allowExcessArguments(true).action(async (_opts, command) => {
+  cmd.description(t("launch.description")).option("--kind <kind>", t("launch.optionKind")).option("--template <template-id>", t("launch.optionTemplate")).option("--id <id>", t("launch.optionId")).option("--version <version>", t("launch.optionVersion")).option("--command <name>", t("launch.optionCommand")).allowUnknownOption(true).allowExcessArguments(true).action(async (_opts, command) => {
     const opts = command.opts();
     const launcherArgs = [];
     if (opts.kind) launcherArgs.push("--kind", opts.kind);
-    if (opts.package) launcherArgs.push("--package", opts.package);
+    const pkgOrTemplate = opts.template ?? opts.package;
+    if (pkgOrTemplate) launcherArgs.push("--package", pkgOrTemplate);
     if (opts.id) launcherArgs.push("--id", opts.id);
     if (opts.version) launcherArgs.push("--version", opts.version);
     if (opts.command) launcherArgs.push("--command", opts.command);
@@ -50708,7 +50944,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.33";
+  if (true) return "0.1.35";
   const candidates = [
     new URL("../package.json", import.meta.url),
     new URL("../../package.json", import.meta.url),