@thinkingai/ae-cli 6.0.31 → 6.0.33

package/skills/ae-engage/references/scene-strategy.md

@@ -0,0 +1,47 @@
+# engage-scene strategy
+
+> Capability ids: `engage-scene.strategy.{create,update,log,batch-copy}` · Domain: `engage`.
+
+场景管理 / 配置中心 - 配置项策略管理。create/update 使用 `--payload` 直传后端 DTO（原生 camelCase 结构），`project_id` 会注入 payload。
+
+## Commands
+
+```bash
+# Create a config strategy (draft)
+ae-cli engage-scene strategy create --project-id <project_id> \
+  --payload '{"configId":"cfg-1","templateId":"tpl-1","strategyName":"s1", ...}'
+
+# Update a config strategy
+ae-cli engage-scene strategy update --project-id <project_id> \
+  --payload '{"strategyUuid":"uuid-1","strategyName":"s2", ...}'
+
+# Query a strategy's log
+ae-cli engage-scene strategy log --project-id <project_id> --strategy-uuid <uuid>
+
+# Batch-copy strategies
+ae-cli engage-scene strategy batch-copy --project-id <project_id> --config-id <config_id> \
+  --strategy-ids '["s1","s2"]' [--op-mode batch]
+```
+
+## Parameters
+
+| Command | Required flags | Notes |
+|---|---|---|
+| create | `--project-id`, `--payload` | payload = `ConfigStrategyAddDTO`. |
+| update | `--project-id`, `--payload` | payload = `ConfigStrategyModifyDTO` (`strategyUuid` + fields). |
+| log | `--project-id`, `--strategy-uuid` | read. |
+| batch-copy | `--project-id`, `--config-id`, `--strategy-ids` | `--op-mode` optional (default `batch`). |
+
+## Output
+
+- `create`: `data.strategy_uuid`.
+- `update`: `data.success`.
+- `log`: `data.log`.
+- `batch-copy`: `data.result`.
+
+## Decision Rules
+
+- Discover real strategy UUIDs / config IDs first; never invent IDs.
+- **`create` requires an enabled template** on the same config item. Enable workflow: `config-param batch-add` → `template create` → `template update` (non-empty `config[]` with real `paramId`) → `template update-status --status 1`. Otherwise `create` returns `TEMPLATE_ENABLE`.
+- `create` output field is `data.strategy_uuid` (not `strategy_id`).
+- Save-and-submit and strategy test-send are not exposed via `engage-scene` CLI; use legacy `engage +manage_strategy` or the product UI.

package/skills/ae-engage/references/scene-template.md

@@ -0,0 +1,71 @@
+# engage-scene template
+
+> Capability ids: `engage-scene.template.{list,get,create,update,update-status,delete}` · Domain: `engage`.
+
+场景管理 / 配置中心 - 配置项模板管理。create/update 使用 `--payload` 直传后端 DTO（原生 camelCase 结构），`project_id` 会注入 payload。
+
+## Commands
+
+```bash
+# List templates of a config item
+ae-cli engage-scene template list --project-id <project_id> --config-id <config_id>
+
+# Get a template's detail
+ae-cli engage-scene template get --project-id <project_id> --config-id <config_id> --template-id <template_id>
+
+# Create a template
+ae-cli engage-scene template create --project-id <project_id> \
+  --payload '{"configId":"cfg-1","templateId":"tpl-1","templateName":"t1","remark":""}'
+
+# Update a template (bind config-item params into template.config — required before enable)
+ae-cli engage-scene template update --project-id <project_id> \
+  --payload '{
+    "configId":"cfg-1",
+    "templateId":"tpl-1",
+    "templateName":"t1",
+    "config":[{
+      "paramId":48,
+      "paramName":"title",
+      "paramDisplayName":"标题",
+      "paramType":"STRING",
+      "paramSubType":"SHORT_TEXT",
+      "isRequired":1,
+      "defaultValue":"hello"
+    }]
+  }'
+
+# Enable / disable a template (only after config[] is non-empty)
+ae-cli engage-scene template update-status \
+  --project-id <project_id> --config-id <config_id> --template-id <template_id> --status <1|0>
+
+# Delete a template (high-risk)
+ae-cli engage-scene template delete --project-id <project_id> --config-id <config_id> --template-id <template_id> --yes
+```
+
+## Parameters
+
+| Command | Required flags | Notes |
+|---|---|---|
+| list | `--project-id`, `--config-id` | read. |
+| get | `--project-id`, `--config-id`, `--template-id` | read. |
+| create | `--project-id`, `--payload` | payload = `ConfigTemplateAddDTO`. |
+| update | `--project-id`, `--payload` | payload = `ConfigTemplateModifyDTO`. |
+| update-status | `--project-id`, `--config-id`, `--template-id`, `--status` | status 1 enable / 0 disable. |
+| delete | `--project-id`, `--config-id`, `--template-id` | high-risk. |
+
+`template update-status --validate` and `--dry-run` perform the same read-only business preflight as execution. They reject incomplete template fields, missing dependency configuration, unsupported status transitions, and status values other than `0` or `1` before any template state is changed.
+
+## Output
+
+- `list`: `data.items` + `data.total`.
+- `get`: `data.template`.
+- `create` / `update` / `update-status` / `delete`: `data.success`.
+
+## Decision Rules
+
+- `delete` is `high-risk-write`; requires `--yes` and does not support dry-run.
+- Discover real template IDs with `list`/`get` first; never invent IDs.
+- **`create` requires `templateId` in payload** (unique within config item, <=80 chars), not only `templateName`.
+- **Enable workflow:** (1) `config-param batch-add` on the config item → (2) `template create` → (3) **`template update` with non-empty `config[]`** referencing real `paramId` values from `config-param list` → (4) `template update-status --status 1`. Skipping step 3 returns `TEMPLATE_FIELDS_INCOMPLETE`.
+- Enabling a template is a prerequisite for `strategy create` on the same config (`TEMPLATE_ENABLE` if template disabled).
+- Template test-send is not exposed via `engage-scene` CLI; use the product UI.

package/skills/ae-engage/references/{ops-delete.md → task-delete.md}

@@ -1,11 +1,11 @@
-# engage-task ops delete
+# engage-task task delete
 
 Delete an engagement task. High-risk write; requires `--yes` to skip confirmation.
 
-> Capability id: `engage-task.ops.delete` · Domain: `engage`.
+> Capability id: `engage-task.task.delete` · Domain: `engage`.
 
 ```bash
-ae-cli engage-task ops delete --project-id <project-id> --task-id <task-id> --yes
+ae-cli engage-task task delete --project-id <project-id> --task-id <task-id> --yes
 ```
 
 ## Parameters

package/skills/ae-engage/references/whitelist.md

@@ -0,0 +1,72 @@
+# engage-setting whitelist
+
+> Capability ids: `engage-setting.whitelist.{add,update,delete,verify}` · Domain: `engage`.
+
+## Commands
+
+```bash
+# Add whitelist entries
+ae-cli engage-setting whitelist add \
+  --project-id <project_id> --prop-code <prop_code> --column-name <column_name> \
+  --column-type <column_type> \
+  --whitelist-list '[{"entity_id":"u1","source_value":"v1","note_name":"n"}]'
+
+# Update a whitelist entry's note name
+ae-cli engage-setting whitelist update --project-id <project_id> --whitelist-id <id> --note-name <name>
+
+# Delete whitelist entries (high-risk)
+ae-cli engage-setting whitelist delete --project-id <project_id> --whitelist-ids '["wl-1","wl-2"]' --yes
+
+# Verify property values against the whitelist
+ae-cli engage-setting whitelist verify \
+  --project-id <project_id> --prop-code <prop_code> --column-type <column_type> \
+  --whitelist-prop-list '["v1","v2"]'
+```
+
+## Parameters
+
+### add
+
+| Parameter | Required | Description |
+|---|---|---|
+| `--project-id` / `-p` | Yes | Numeric project ID. |
+| `--prop-code` | Yes | Associated user property code. |
+| `--column-name` | Yes | Associated user property field name. |
+| `--column-type` | Yes | Associated user property field type. |
+| `--whitelist-list` | Yes | JSON array of entries (`entity_id`, `source_value`, `note_name`). |
+
+### update
+
+| Parameter | Required | Description |
+|---|---|---|
+| `--project-id` / `-p` | Yes | Numeric project ID. |
+| `--whitelist-id` | Yes | Whitelist entry ID to modify. |
+| `--note-name` | No | New note name. |
+
+### delete
+
+| Parameter | Required | Description |
+|---|---|---|
+| `--project-id` / `-p` | Yes | Numeric project ID. |
+| `--whitelist-ids` | Yes | JSON array of whitelist entry IDs. |
+
+### verify
+
+| Parameter | Required | Description |
+|---|---|---|
+| `--project-id` / `-p` | Yes | Numeric project ID. |
+| `--prop-code` | Yes | Associated user property code. |
+| `--column-type` | Yes | Associated user property field type. |
+| `--whitelist-prop-list` | Yes | JSON array of property values to verify. |
+
+## Output
+
+- `add`: `data.success_num` — number of entries successfully added.
+- `update` / `delete`: `data.success` — whether the operation succeeded.
+- `verify`: `data.items` (verified entries with `entity_id`, `source_value`, `note_name`, `fail_msg`) and `data.total`.
+
+## Decision Rules
+
+- Use these commands when the user asks to add / edit / delete / verify project whitelist entries.
+- Discover existing whitelist IDs with `ae-cli engage +whitelist_list --project_id <project_id>` first; never invent IDs.
+- `delete` is `high-risk-write` and requires `--yes` (or interactive confirmation).

package/skills/ae-engage/references/workbench-workbench.md

@@ -0,0 +1,48 @@
+# engage-workbench workbench
+
+> Capability ids: `engage-workbench.workbench.{list,add,update,delete}` · Domain: `engage`.
+
+工作台 - 工作台指标卡槽（workbench slot）管理。每个用户在每个项目下最多 4 个指标卡；卡槽按当前登录用户隔离，`update`/`delete` 只能操作本人卡槽。首次 `list` 会自动初始化 4 个默认卡槽。
+
+## Commands
+
+```bash
+# List the current user's workbench metric slots
+ae-cli engage-workbench workbench list --project-id <project_id>
+
+# Add a metric slot (metric + date range + order)
+ae-cli engage-workbench workbench add --project-id <project_id> \
+  --metric-type <metric_type> --date-type <date_type> [--order-id <1-4>]
+
+# Update a slot (own slot only)
+ae-cli engage-workbench workbench update --project-id <project_id> \
+  --slot-id <slot_id> --metric-type <metric_type> --date-type <date_type> [--order-id <1-4>]
+
+# Delete a slot (own slot only, high-risk)
+ae-cli engage-workbench workbench delete --project-id <project_id> --slot-id <slot_id> --yes
+```
+
+## Parameters
+
+| Command | Required flags | Notes |
+|---|---|---|
+| list | `--project-id` / `-p` | read; auto-inits 4 defaults on first access. |
+| add | `--project-id`, `--metric-type`, `--date-type` | write; `--order-id` optional (1-4); max 4 slots. |
+| update | `--project-id`, `--slot-id`, `--metric-type`, `--date-type` | write; own slot only; `--order-id` optional. |
+| delete | `--project-id`, `--slot-id` | high-risk; requires `--yes`; no dry-run; soft-delete. |
+
+- `--metric-type`: `WorkbenchSlotMetricTypeEnum` code (1-12), e.g. 1=PLAN, 2=PUSH_SUCCESS_PERSON, 5=NEW_USER_COUNT.
+- `--date-type`: `WorkbenchSlotDateTypeEnum` code (1-13), e.g. 8=LAST_7_DAYS, 10=LAST_30_DAYS, 11=CURRENT.
+
+## Output
+
+- `list`: `data.slots` (array of slot cards: `slot_id`, `metric_code`, `metric_name`, `date_code`, `date_name`, `value`, `order_id`, `status`, ...).
+- `add` / `update`: `data.slot` (the created/updated slot card).
+- `delete`: `data.success`.
+
+## Decision Rules
+
+- Discover real `slot_id` via `list` first; never invent slot IDs.
+- The same `(metric_type, date_type)` combination cannot be added twice for the same user+project.
+- `add` fails once the user already has 4 slots; remove one with `delete` first.
+- `delete` is `high-risk-write`; it requires `--yes` and does not support dry-run.

package/skills/ae-generate-tracking-code/SKILL.md

@@ -118,15 +118,15 @@ First, check if both `.ae-cli/draft.json` and `.ae-cli/draft.xlsx` exist:
    - Reference: tracking plan document (Feishu: https://www.feishu.cn/docx/Jt0VdhNB6oSJ4TxISs1cq2Ebnmg)
 
 2. **If you already have a tracking plan**
-   - Provide the xlsx file path and use `ae-cli tracking code import-xlsx` to import
+   - Provide the xlsx file path and use `ae-cli tracking code import-template --template` to import
    - Or place the xlsx file at `.ae-cli/draft.xlsx` and re-run
 
-**If xlsx file exists** (provided via `ae-cli tracking code import-xlsx` or placed at `.ae-cli/draft.xlsx`):
+**If xlsx file exists** (provided via `ae-cli tracking code import-template --template` or placed at `.ae-cli/draft.xlsx`):
 
 **Step 1: Parse the xlsx file**
 
 ```bash
-ae-cli tracking code import-xlsx --xlsx <xlsx-path> --out .ae-cli/draft.json
+ae-cli tracking code import-template --template <xlsx-path> --out .ae-cli/draft.json
 ```
 
 This command:
@@ -155,7 +155,7 @@ This command:
 - `服务端` / `server` → server-only collection, parsed as `platform: "server"`
 - `客户端,服务端` / `client,server` / `服务端,客户端` / `server,client` → both platforms, parsed as `platform: "both"`
 
-**Internal representation**: xlsx "Platform" column values are parsed by `ae-cli tracking code import-xlsx` into internal `platform` field values:
+**Internal representation**: xlsx "Platform" column values are parsed by `ae-cli tracking code import-template --template` into internal `platform` field values:
 - `client` → client-side collection
 - `server` → server-side collection
 - `both` → both platforms

package/skills/ae-generate-tracking-plan/SKILL.md

@@ -9,7 +9,8 @@ description: "Interactive generation of an AE tracking plan and upload. Trigger
 > English input → English reply; Chinese input → Chinese reply; Japanese input → Japanese reply.
 > If uncertain, default to English.
 > This applies to all output: section titles, phase names, template prompts, example text, option lists, etc.
-> **⚠️ CRITICAL: Template localization is CLI-owned. Do NOT manually translate imported template content with the model. Use the `src/tracking` i18n pipeline by setting `AE_LANG=<user_lang>`, writing `draft.meta.lang`, and regenerating through `ae-cli tracking code import-template` / `ae-cli tracking plan draft`.**
+> **⚠️ CRITICAL: Template localization is CLI-owned. Do NOT manually translate imported template content with the model. Use the `src/tracking/i18n` module as the source of truth by setting `AE_LANG=<user_lang>`, writing `draft.meta.lang`, and regenerating through `ae-cli tracking code import-template` / `ae-cli tracking plan draft`.**
+> **Before changing any template-owned localized label, first look up the corresponding translation in `src/tracking/i18n` (for example `resources/xlsx/sheets.ts`, `resources/xlsx/headers.ts`, `resources/xlsx/types.ts`, and `resources/cli/*.json`). If no matching translation exists there, preserve the imported text and ask before rewriting business semantics.**
 > Do NOT copy Chinese text verbatim from this document into English/Japanese replies unless it is an identifier, template name needed for CLI import, or original source material quoted for traceability.
 
 ## Terminology Glossary
@@ -32,8 +33,9 @@ description: "Interactive generation of an AE tracking plan and upload. Trigger
 | 用户属性 | User Property | Property on the user profile (persistent state) |
 | 预置属性 | Preset Property | System property prefixed with `#` (`#device_id`, `#time`, etc.) |
 | 自动采集事件 | Auto-track Event | SDK auto-collected events (`ta_app_start`, `ta_page_show`, etc.) |
-| 系统事件 | System Event | Auto-track event tag category |
-| 业务事件 | Business Event | Custom business event tag category |
+| 系统事件 | System Event | event_tag value reserved for SDK auto-track events (`ta_*`). One of two non-module tags (together with 基础事件). |
+| 基础事件 | Basic | event_tag value for account-level lifecycle/progression events (register, login, level_up, create_role, etc.). Not tied to any functional module. |
+| 功能模块 | Functional Module | event_tag value for feature-specific business events; identifies which module the event belongs to (e.g. Battle, Shop, Ads, Payment, Basic) |
 | SDK 集成模式 | SDK Integration Mode | `client_only` / `server_only` / `both` / `none` |
 | 客户端平台 | Client Platform | Android, iOS, Web, Unity, Mini-program, etc. |
 | 服务端语言 | Server Language | Java, Python, Go, Node.js, PHP, etc. |
@@ -53,7 +55,7 @@ description: "Interactive generation of an AE tracking plan and upload. Trigger
 | xlsx 格式契约 | xlsx Format Contract | Column rules for AE-compatible Excel generation |
 | draft.json | draft.json | Internal intermediate representation (JSON) of the tracking plan |
 | display_name | Display Name | Human-readable name in the user's language |
-| event_tag | Event Tag | Category label for grouping events |
+| event_tag | Event Tag | Functional module the event belongs to (e.g. Battle, Shop, Ads, Payment). Auto-track events use "System Event". |
 | snake_case | snake_case | Canonical naming format: `lowercase_with_underscores` |
 
 ## When to Trigger
@@ -72,6 +74,7 @@ Phase 0 → 1 → 2 → 3 → 4, do not skip steps.
 > property `display_name`, property `desc`, etc.) should be generated in the **user's input language**.
 > For imported templates, do NOT translate those fields manually. Template sheet names, headers, property type display values,
 > CLI messages, and auto-track/i18n-owned labels must come from `src/tracking/i18n` via `AE_LANG=<user_lang>` and `draft.meta.lang`.
+> When a localized label is needed, inspect `src/tracking/i18n` and use the existing resource key/value; do not invent translations from the model.
 > If template business text needs localization and the CLI/i18n resources do not provide it, preserve the imported text and ask the user before rewriting business semantics.
 > Only identifier fields like `event_name`, `prop_name` remain in English snake_case (canonical format).
 > This skill only cares about command behavior, not internal implementation.
@@ -86,7 +89,7 @@ Phase 0 → 1 → 2 → 3 → 4, do not skip steps.
 > All subsequent CLI commands must be prefixed with `AE_LANG=<user_lang>` to ensure CLI output and generated xlsx headers match the user's language.
 > When uploading the xlsx, pass `--lang <user_lang>` as well; it must match `draft.meta.lang` / the generated xlsx language.
 
-Collect the following **4 items** sequentially, **do NOT ask all at once**:
+Collect the following **5 items** sequentially, **do NOT ask all at once**:
 
 ### Item 1 — Application Scenario
 
@@ -109,8 +112,9 @@ Choose your source material (up to 2):
 2 - Detailed description (conversational) — Describe app business flow, core features, user behaviors, monetization model, etc.
 3 - Codebase (local project path; hidden in sandbox) — Analyze source code to extract events and properties
 4 - Pre-built template (built-in industry and game genre templates) — Select a built-in template
+5 - Modify existing tracking plan (local AE format xlsx file) — Import an existing tracking plan xlsx as baseline for modification; can be combined with Product doc / Description / Codebase, but NOT with Pre-built template
 
-Reply with number(s), e.g. 1 or 1,4. Select up to 2.
+Reply with number(s), e.g. 1,5 or 4. Select up to 2.
 ```
 
 If in a sandbox environment, ask exactly:
@@ -121,8 +125,9 @@ Choose your source material (up to 2):
 1 - Product document (sandbox workspace path, uploaded attachment, URL, image file, or folder) — Extract events and properties from product docs; supports md/pdf/docx/URL/images (png/jpg/jpeg/webp). You can attach/upload relevant files here.
 2 - Detailed description (conversational) — Describe app business flow, core features, user behaviors, monetization model, etc.
 3 - Pre-built template (built-in industry and game genre templates) — Select a built-in template
+4 - Modify existing tracking plan (sandbox workspace path) — Import an existing tracking plan xlsx as baseline for modification; can be combined with Product doc / Description, but NOT with Pre-built template
 
-Reply with number(s), e.g. 1 or 1,3. Select up to 2.
+Reply with number(s), e.g. 1,4 or 3. Select up to 2.
 ```
 
 Do not rewrite this source material list as unnumbered bullets, cards, or prose. The user must be able to reply with the visible numbers.
@@ -145,9 +150,11 @@ Based on user selection, determine source material type and record to `meta.sour
 | Description only | `chat` | Construct events in Draft phase based on description |
 | Codebase only | `codebase` | Scan source code, extract events/properties from business logic |
 | Template only | `template` | Provide built-in template selection |
-| Any two-item combo | Join two types with `_` | First as baseline, second as supplement (priority: template → codebase → prd → chat) |
+| Existing plan only | `existing_plan` | Import xlsx as baseline (see "Modify Existing Tracking Plan Flow" below) |
+| Any two-item combo | Join two types with `_` | First as baseline, second as supplement (priority: existing_plan → template → codebase → prd → chat) |
+| Existing plan + Pre-built template | **NOT allowed** | Both provide event baselines; semantic conflict |
 
-**Follow-up questions** (ask in selection order):
+**Follow-up questions** (ask in follow-up order defined in Multi-Source Combination Rules below):
 - Product doc → if not in a sandbox environment, ask exactly:
   ```text
   What is the product document path?
@@ -174,6 +181,49 @@ Based on user selection, determine source material type and record to `meta.sour
 - Detailed description → If too vague, follow up on core features, user behaviors, business flows, monetization
 - Codebase → ask **"What is the project directory path?"**, then scan source to extract business logic
 - Pre-built template → display matching templates for user confirmation
+- Modify existing tracking plan → ask **"Please provide the xlsx file path of your existing tracking plan"**, then follow the flow below
+
+**Modify Existing Tracking Plan Flow** (when user selects this option):
+
+1. **Import**: Ask user for the file path, then immediately import:
+   ```bash
+   AE_LANG=<user_lang> ae-cli tracking code import-template --template <path> --out .ae-cli/draft.json
+   ```
+2. **Check result**:
+   - If CLI errors (file not found / parse failure) → report error, ask user to fix the file and retry
+   - If `draft.json` has `events` array empty → 🛑 **Severe: No AE-format sheets found** (missing `#` prefix sheets like `#事件数据`). Tell user the file does not appear to be an AE tracking plan xlsx. User must fix the original file and re-import.
+3. **Content validation** (when events are non-empty):
+   ```bash
+   AE_LANG=<user_lang> ae-cli tracking plan validate --in .ae-cli/draft.json --fix
+   ```
+4. **Handle validation results by severity**:
+   - If validate passes with **no issues at all** → skip to Step 5.
+
+   | Severity | Examples | Handling | User Action |
+   |---|---|---|---|
+   | 🔧 **Minor** (auto-fixable) | `display_name` duplicate, `array_row` sub-property inconsistency, event name duplicate | `--fix` auto-fixes, writes to `draft.json`. Inform user of what was fixed. | None (informed) |
+   | ⚠️ **Medium** (needs confirmation) | snake_case violation, property name duplicate, invalid property type, nested property parent is not a composite type | List each issue with current value → suggested fix. User confirms item by item before writing to `draft.json`. | Confirm each fix |
+   | 🛑 **Severe** | File cannot be parsed, or events array is empty after import | Reject. Tell user the specific issue. User fixes **original file** and re-imports. | Fix original file |
+
+   **Medium issue confirmation format**:
+   ```
+   ⚠️ The following content needs to be fixed:
+
+   | # | Issue | Location | Current | Suggested |
+   |---|-------|----------|---------|------------|
+   | 1 | snake_case | event_name | UserLogin | user_login |
+   | 2 | snake_case | prop_name | vipLevel | vip_level |
+   | 3 | invalid type | property "level" | integer | number |
+
+   Apply all suggested fixes? ok / specify per item / skip
+   ```
+   - `ok` → apply all suggested fixes to `draft.json`
+   - `specify per item` → confirm each item one by one
+   - `skip` → keep current values, handle in Refine phase later
+
+   ⚠️ **Never modify the user's original xlsx file.** All changes go into `draft.json`.
+
+5. **Re-validate** after fixes → loop until clean, then continue to the next follow-up question (if combined with another source material), or Item 3 (if existing_plan is the only source).
 
 **Codebase analysis flow** (when source_type includes `codebase`):
 
@@ -194,9 +244,11 @@ After source material is confirmed, **must** process business dimension info bas
 | source_type | Handling |
 |---|---|
 | `template` | Directly display template's inherited business dimensions; skip detailed inference |
+| `existing_plan` | Infer business dimensions from existing plan content (analyze event modules, payment events, currency properties); follow up on missing items; event injection preview |
 | `prd` / `codebase` / `chat` | Infer business dimensions → follow up on missing items → event injection preview |
+| Combo (e.g. `template_prd`) | See detailed rules below — baseline source's method is primary, supplementary source contributes additional context |
 
-**If source_type = template**:
+**If source_type is template or starts with template_** (covers `template`, `template_prd`, `template_codebase`, `template_chat`):
 
 Display template's preset business dimensions:
 
@@ -213,6 +265,27 @@ Confirm using these business dimensions? ok / modify
 
 - User `ok` → proceed to next step
 - User says "modify" → switch to prd/chat flow for user to supplement
+- For combos (e.g. `template_prd`): after confirming template dimensions, also note any supplementary insights from `prd`/`chat` as context for Phase 1.2.
+
+**If source_type includes existing_plan**:
+
+Infer business dimensions from the imported plan content:
+
+1. **Analyze existing events**: Examine `event_tag` values to identify functional modules (e.g. events tagged "Battle" → 战斗 module). Examine event names for payment/ad-related patterns to infer revenue model.
+2. **Inference display**: Format inference results as a summary:
+   ```
+   Business Dimension (inferred from existing plan: <filename>)
+
+   Revenue Model: <inferred from payment/ad events>
+   Core Loop: <inferred from event flow>
+   Functional Entries: <inferred from event_tag values>
+   Currency System: <inferred from currency-related properties>
+
+   Confirm these business dimensions? ok / modify
+   ```
+3. **Follow up missing**: Only ask about items that could not be inferred
+4. **Event injection preview**: Show suggested injected event modules (only add events not already in the plan); user `ok` to proceed
+- For combos (e.g. `existing_plan_prd`): after confirming dimensions from the plan, also note any supplementary insights from `prd`/`chat` as context for Phase 1.2.
 
 **If source_type is prd / codebase / chat**:
 
@@ -222,7 +295,7 @@ Confirm using these business dimensions? ok / modify
 
 Platform validation: Use `business-dimension-mapping.md` Chapter 5 decision rules to check if injected events' platform assignments are reasonable.
 
-**Template matching** (prd / codebase / chat scenarios, optional):
+**Template matching** (prd / codebase / chat scenarios, optional; **NOT applicable to existing_plan or template scenarios**):
 
 After business dimension confirmation, auto-detect matching templates based on app type:
 ```bash
@@ -231,6 +304,51 @@ AE_LANG=<user_lang> ae-cli tracking plan list-templates --json
 
 Show matching templates to user for confirmation. Confirmed templates serve as baseline and participate in Phase 1 event merging.
 
+### Multi-Source Combination Rules (when user selects 2 source materials)
+
+**Follow-up Order** (Phase 0 questioning sequence):
+
+Do **not** follow user's selection order. Instead, use this order:
+
+```
+existing_plan（blocking validation, always first）→ codebase/prd（user's selection order）→ chat → template
+```
+
+Rationale:
+- `existing_plan` must go first — import + validate may require the user to fix their file; processing it early avoids wasted context
+- `codebase` / `prd` — directly reflect actual business requirements, prioritized over generic descriptions and templates
+- `chat` — conversational description, supplements business context
+- `template` — generic industry template, least specific to the user's business
+
+Source material processing happens primarily in Phase 1.2 (Merge Source Materials). The one exception is `existing_plan`: it is imported and validated in Phase 0 because user-provided files may need fixing before proceeding. All other sources are processed in Phase 1.2 per their standard flow.
+
+Merge priority (Phase 1.2): `existing_plan → template → codebase → prd → chat → autotrack`
+Earlier sources take precedence — same-name events keep the earlier version, later sources only add new events or merge `prop_names` without overwriting.
+
+**Business Dimension Inference (combined scenarios)**:
+
+Use the baseline source's inference method as primary. Supplementary sources (especially prd/chat) may contribute additional information — present a merged view for user confirmation.
+
+**Valid Combinations**:
+
+> The "Baseline" column identifies which source has higher merge priority (see Phase 1.2 merge order), which may differ from the user's selection order. Follow-up questioning uses the fixed order in "Multi-Source Combination Rules" above, not the user's selection order.
+
+| Baseline | Supplementary | Phase 0 for supplementary |
+|---|---|---|
+| existing_plan | codebase | Collect path + quick tech stack detection |
+| existing_plan | prd | Collect path |
+| existing_plan | chat | Collect description; participates in dimension inference |
+| template | codebase | Collect path + quick tech stack detection; template matching/import deferred to Phase 1.2 |
+| template | prd | Collect path; template matching/import deferred to Phase 1.2 |
+| template | chat | Collect description |
+| codebase | prd | Collect path |
+| codebase | chat | Collect description |
+| prd | chat | Collect description |
+| codebase | template | Same as template+codebase row above (template is baseline per merge priority) |
+| prd | template | Same as template+prd row above (template is baseline per merge priority) |
+
+**Forbidden**: `existing_plan + template` (both provide event baselines; semantic conflict).
+
 **Record business dimension info to `meta.business_dimension`**:
 ```json
 "business_dimension": {
@@ -491,15 +609,19 @@ Draft
 
 ### 1.2 Merge Source Materials
 
-Priority from low to high: **template → codebase → prd → chat → autotrack**
+Merge order: **existing_plan → template → codebase → prd → chat → autotrack**
 
+Earlier sources take precedence — same-name events keep the earlier version, later sources only add new events or merge `prop_names` without overwriting.
+
+- **existing_plan**: Already imported and validated in Phase 0 (see "Modify Existing Tracking Plan Flow"). Events are in draft.json as the baseline; each item marked `source: "existing_plan"`. Higher-priority sources supplement with new events only; same-name events keep the existing_plan version.
 - **template**: User-selected industry template (see "Template Lookup Convention" below) as baseline; each item marked `source: "template"`
   - Templates are resolved by ae-cli from the ae-cli package root and user template directory
   - Import command: `AE_LANG=<user_lang> ae-cli tracking code import-template --template-name "<template name>" --out .ae-cli/draft.json`
   - ⚠️ **Must validate immediately after template import** (see Phase 1.6); template content may not be fully correct
   - ⚠️ **Do not manually translate template content after import**: Do NOT read draft.json and model-translate `display_name`, `event_desc`, `event_tag`, or property `display_name`/`desc`. Keep imported business content as produced by the CLI/template reader unless the user explicitly asks for semantic rewriting.
-  - ⚠️ **Use `src/tracking` i18n for localization owned by the CLI**: `AE_LANG=<user_lang>` + `draft.meta.lang` control CLI messages, xlsx sheet names, xlsx headers, property type display values, and auto-track/i18n-owned labels. If these are wrong, regenerate with the intended locale instead of editing labels by hand.
-  - ⚠️ **event_tag is not free-form model translation**: Do not manually map `业务事件`/`系统事件` to another language. Preserve template tags, or rely on `src/tracking` i18n/autotrack generation for system labels when the CLI owns them.
+  - ⚠️ **Use `src/tracking/i18n` for localization owned by the CLI**: `AE_LANG=<user_lang>` + `draft.meta.lang` control CLI messages, xlsx sheet names, xlsx headers, property type display values, and auto-track/i18n-owned labels. If these are wrong, inspect the existing translations under `src/tracking/i18n`, then regenerate with the intended locale instead of editing labels by hand.
+  - ⚠️ **No model-invented translations for template labels**: When replacing or explaining a localized template-owned label, use the exact value from `src/tracking/i18n` resources. If no corresponding resource exists, preserve the template text and ask the user before changing semantics.
+  - ⚠️ **event_tag is not free-form model translation**: Do not manually map `业务事件`/`系统事件` to another language. Preserve template tags, or rely on `src/tracking/i18n` and autotrack generation for system labels when the CLI owns them.
 - **codebase**: Scan project source directory, extract events/properties from business logic; **same-name events merge prop_names without overwriting existing fields**; new items `source: "codebase"`
 - **prd**: Read all user-provided product documents (md / pdf / docx / URL / images), extract events and properties from each file; **same-name events merge prop_names without overwriting existing fields**; image files analyzed via multimodal interpretation of UI elements and interaction flows; all new items `source: "prd"`
   - **prd path is a folder**: Recursively scan all files in the directory:
@@ -654,6 +776,8 @@ AE_LANG=<user_lang> ae-cli tracking plan draft --in .ae-cli/draft.json --out .ae
 
 **Note**: Display names can be the same across different property pools (e.g. `vip_level` can be both an event property and a user property).
 
+> **Relationship to Phase 0 existing_plan validation**: The underlying rule engine is the same, but Phase 0 uses **interactive 3-tier** (Minor/Medium/Severe) because the user is present to confirm each fix. Phase 1.6 uses **batch 2-tier** (auto-fixable / manual-fix-needed) because it runs as part of the automated draft generation. Rules that are "Medium (needs confirmation)" in Phase 0 appear as "❌ Manual fix needed" here — the same rule, just without the interactive prompt.
+
 ### 1.7 Show Summary
 
 Display to user via markdown table: event count / event property pool size / super property count / user property count; show deliverable paths.
@@ -673,7 +797,7 @@ Run the following command to dynamically discover available templates:
 AE_LANG=<user_lang> ae-cli tracking plan list-templates --json
 ```
 
-**Language rules**: Template names and template business content must not be model-translated. Use localized names only when they are returned by the CLI / `src/tracking` i18n resources. If `list-templates --json` only returns the original template `name`, display that name as-is and keep it unchanged for import.
+**Language rules**: Template names and template business content must not be model-translated. Use localized names only when they are returned by the CLI or found in `src/tracking/i18n` resources. If `list-templates --json` only returns the original template `name`, display that name as-is and keep it unchanged for import. Before presenting or modifying any localized template-owned label, look it up in `src/tracking/i18n`; do not invent a translation.
 
 Built-in templates are resolved by ae-cli from the ae-cli package root. User templates are resolved from the ae-cli user template directory. Do **not** manually construct `./tracking-plan-template/...` paths from the user's current workspace.
 
@@ -1116,7 +1240,7 @@ AE_LANG=<user_lang> ae-cli tracking plan upload --project <projectId> --xlsx .ae
 - **With `--replace`**: Delete existing project plan first then upload (when user chooses "Replace", or severe conflict switches to replace)
 - **Without `--replace`**: AE merge-by-name merge (no conflicts, or advisory only with user confirmation to append)
 
-Upload language is controlled locally by `AE_LANG`, `--lang`, or `draft.meta.lang`. Do not call AE user language config APIs and do not use `--switch-lang`. If the xlsx language is wrong, regenerate the xlsx with the intended language before uploading:
+Upload commands MUST pass `--lang <user_lang>` explicitly. `--lang` must match the generated xlsx language and `draft.meta.lang`; `AE_LANG` is only used for CLI messages and xlsx regeneration context. Do not call AE user language config APIs and do not use `--switch-lang`. If the xlsx language is wrong, regenerate the xlsx with the intended language before uploading:
 ```bash
 AE_LANG=<user_lang> ae-cli tracking plan draft --in .ae-cli/draft.json --out .ae-cli/draft.xlsx
 AE_LANG=<user_lang> ae-cli tracking plan upload --project <projectId> --xlsx .ae-cli/draft.xlsx --draft .ae-cli/draft.json --lang <user_lang> [--replace]