weaver-e10-builder 1.1.2 → 1.1.5

package/dist/services/update-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-check.d.ts","sourceRoot":"","sources":["../../src/services/update-check.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,WAAW,CAK7C;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,CAKrD;AAQD,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAUrD;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;gEAEgE;AAChE,wBAAsB,WAAW,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAsCrE;AAED,wDAAwD;AACxD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQvD"}
+{"version":3,"file":"update-check.d.ts","sourceRoot":"","sources":["../../src/services/update-check.ts"],"names":[],"mappings":"AAyBA,6EAA6E;AAC7E,wBAAgB,eAAe,IAAI,MAAM,CASxC;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,WAAW,CAK7C;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,CAKrD;AAsBD,4DAA4D;AAC5D,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAWrD;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CA0CrE;AAED,kEAAkE;AAClE,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAWvD"}

package/dist/services/update-check.js

@@ -1,18 +1,40 @@
 /**
  * e10-cli 版本更新提醒（只提醒，不自动安装）。
  *
- * 设计约定（2026-09-04 与使用者确认）：
- *   - 检查点：`auth status`（每次会话）最多每 24h 查一次；显式 `e10-cli update check` 强查。
- *   - 离线/内网：连不上 registry 时静默跳过（不 nag、不报错、照常写缓存时间戳避免下次再等超时）。
+ * 设计约定（2026-09-04 与使用者确认 + bug review 修订）：
+ *   - 检查点：`auth status`（每次会话）最多每 24h 连网查一次；显式 `e10-cli update check` 强查。
+ *   - 提醒（P0-2 修订）：**缓存里已知道有新版本也要提醒**（不再要求"本次真的连网"），
+ *     用 `lastNotifyAt` 把提醒频率限制为**最多一天一次**，避免每次 auth status 都刷。
+ *   - 失败处理（P1-3 修订）：连网失败**只记 lastFailAt（短 TTL）**，不消耗成功检查的 24h 缓存；
+ *     网络恢复后下一次 auth status 会重试，而不是"整天失明"。
+ *   - registry（P1-4 修订）：跟随 npm 配置（`npm_config_registry` 环境变量或 ~/.npmrc registry），
+ *     缺省官方源——国内/内网用户配了镜像源即生效。
  *   - 动作：只打印「有新版本」一行提醒；真正安装只发生在 `e10-cli update apply` 且用户确认后。
- *   - 状态存 <authRoot>/update.json：{ enabled, lastCheckAt, latestSeen }。
+ *   - 状态存 <authRoot>/update.json：{ enabled, lastCheckAt, lastFailAt, lastNotifyAt, latestSeen }。
  */
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 import { getAuthRoot } from '../core/edition.js';
 import { pkgVersion } from './skill-provision.js';
-const REGISTRY_LATEST = 'https://registry.npmjs.org/weaver-e10-builder/latest';
-const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24h 内不再连网重查
-const FETCH_TIMEOUT_MS = 2500; // 最坏一次等 2.5s，且每天最多一次
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
+const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 成功检查后 24h 内不再连网
+const FAIL_TTL_MS = 30 * 60 * 1000; // 失败后 30min 内不反复连网（避免每次 2.5s 超时）
+const FETCH_TIMEOUT_MS = 2500;
+/** 跟随 npm 配置的 registry（env npm_config_registry > ~/.npmrc registry > 官方源） */
+export function resolveRegistry() {
+    const env = process.env.npm_config_registry;
+    if (env)
+        return String(env).replace(/\/+$/, '');
+    try {
+        const rc = readFileSync(join(homedir(), '.npmrc'), 'utf8');
+        const m = rc.match(/^\s*registry\s*=\s*(\S+)/m);
+        if (m)
+            return m[1].replace(/\/+$/, '');
+    }
+    catch { /* 无 .npmrc 忽略 */ }
+    return DEFAULT_REGISTRY;
+}
 export function updateStateFile() {
     return `${getAuthRoot()}/update.json`;
 }
@@ -31,13 +53,32 @@ export function writeUpdateState(s) {
     }
     catch { /* 写失败不影响功能 */ }
 }
-/** 粗粒度 semver 比较：isNewer(a,b) = a 比 b 新。仅支持 X.Y.Z[-tag]；格式不识别时返回 false（宁可漏报不误报）。 */
+/** 版本号 tag 段做数值感知比较（'beta.2' < 'beta.10'），避免字符串比较出错 */
+function compareTag(a, b) {
+    const as = a.split('.'), bs = b.split('.');
+    const n = Math.max(as.length, bs.length);
+    for (let i = 0; i < n; i++) {
+        const x = as[i] ?? '', y = bs[i] ?? '';
+        if (x === y)
+            continue;
+        const xn = /^\d+$/.test(x), yn = /^\d+$/.test(y);
+        if (xn && yn)
+            return Number(x) - Number(y);
+        if (xn)
+            return 1; // 数字段大于字母段（同位置）
+        if (yn)
+            return -1;
+        return x < y ? -1 : 1;
+    }
+    return 0;
+}
 function parseVer(v) {
     const m = String(v).trim().match(/^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$/);
     if (!m)
         return null;
     return { m: +m[1], n: +m[2], p: +m[3], tag: m[4] || '' };
 }
+/** 粗粒度比较：isNewer(a,b) = a 比 b 新。格式不识别时返回 false（宁可漏报不误报）。 */
 export function isNewer(a, b) {
     const A = parseVer(a), B = parseVer(b);
     if (!A || !B)
@@ -51,27 +92,34 @@ export function isNewer(a, b) {
         return true;
     if (A.tag && !B.tag)
         return false;
-    return A.tag > B.tag;
+    if (!A.tag)
+        return false;
+    return compareTag(A.tag, B.tag) > 0;
 }
-/** 查询是否有新版本。
+/**
+ * 查询是否有新版本。
  *  - force=true：忽略缓存强制连网（`update check` / `update apply` 用）
- *  - force=false：命中 24h 缓存直接返回缓存结论（`auth status` 自动提醒用，不再连网） */
+ *  - force=false：优先返回缓存结论（不连网）；仅在 成功检查过期 且 不在失败静默窗口 时才真正连网
+ */
 export async function checkUpdate(force = false) {
     const current = pkgVersion();
     const st = readUpdateState();
-    const notDue = !!st.lastCheckAt && Date.now() - st.lastCheckAt < CACHE_TTL_MS;
-    if (!force && notDue) {
+    const now = Date.now();
+    const notDue = !!st.lastCheckAt && now - st.lastCheckAt < CACHE_TTL_MS;
+    const inFailWindow = !!st.lastFailAt && now - st.lastFailAt < FAIL_TTL_MS;
+    // 命中成功缓存 / 失败静默窗口：不连网，直接用缓存结论（outdated 用已见过的 latestSeen 判断）
+    if (!force && (notDue || inFailWindow)) {
         const outdated = !!(st.latestSeen && isNewer(st.latestSeen, current));
-        return { current, latest: st.latestSeen || current, outdated, checked: false };
+        return { current, latest: st.latestSeen || current, outdated, checked: false, offline: !notDue && inFailWindow ? true : undefined };
     }
-    // 连网查询（带超时；失败静默并记录时间戳，避免离线环境每次 auth status 都等满超时）
+    // 真正连网（带超时；失败静默，只记 lastFailAt，不消耗成功缓存）
     let latest = '';
     let ok = false;
     try {
         const ctl = new AbortController();
         const timer = setTimeout(() => ctl.abort(), FETCH_TIMEOUT_MS);
         try {
-            const resp = await fetch(REGISTRY_LATEST, {
+            const resp = await fetch(`${resolveRegistry()}/weaver-e10-builder/latest`, {
                 signal: ctl.signal,
                 headers: { accept: 'application/json', 'user-agent': `e10-cli/${current}` },
             });
@@ -85,23 +133,29 @@ export async function checkUpdate(force = false) {
             clearTimeout(timer);
         }
     }
-    catch { /* 离线/超时/解析失败都走离线分支 */ }
-    writeUpdateState({ ...st, lastCheckAt: Date.now(), latestSeen: latest || st.latestSeen });
+    catch { /* 离线/超时/解析失败都走失败分支 */ }
     if (!ok) {
+        writeUpdateState({ ...st, lastFailAt: now, latestSeen: latest || st.latestSeen });
         const outdated = !!(st.latestSeen && isNewer(st.latestSeen, current));
         return { current, latest: st.latestSeen || '', outdated, checked: true, offline: true };
     }
+    writeUpdateState({ ...st, lastCheckAt: now, latestSeen: latest });
     return { current, latest, outdated: isNewer(latest, current), checked: true };
 }
-/** auth status 自动提醒：仅提醒，不安装。任何异常/关闭偏好/非真正连网命中缓存都不打扰。 */
+/** auth status 自动提醒：仅提醒，不安装。缓存里已知有新版本也会提醒（lastNotifyAt 限一天一次）。 */
 export async function maybeNotifyUpdate() {
     try {
-        if (readUpdateState().enabled === false)
+        const st = readUpdateState();
+        if (st.enabled === false)
             return;
         const r = await checkUpdate(false);
-        if (r.checked && r.outdated && !r.offline) {
-            console.log(`💡 检测到新版本: ${r.current} → ${r.latest}（仅提醒，不会自动安装）。升级请运行: e10-cli update apply`);
-        }
+        if (!r.outdated || r.offline)
+            return; // 无新版本 / 明确离线不打扰
+        const now = Date.now();
+        if (st.lastNotifyAt && now - st.lastNotifyAt < CACHE_TTL_MS)
+            return; // 今天已提醒过
+        console.log(`💡 检测到新版本: ${r.current} → ${r.latest}（仅提醒，不会自动安装）。升级请运行: e10-cli update apply`);
+        writeUpdateState({ ...readUpdateState(), lastNotifyAt: now });
     }
     catch { /* 提醒失败静默 */ }
 }

package/dist/services/update-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/services/update-check.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/services/update-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,gBAAgB,GAAG,4BAA4B,CAAC;AACtD,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAE,kBAAkB;AAC7D,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAQ,iCAAiC;AAC5E,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAE9B,6EAA6E;AAC7E,MAAM,UAAU,eAAe;IAC7B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAC5C,IAAI,GAAG;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAChD,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAC7B,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAUD,MAAM,UAAU,eAAe;IAC7B,OAAO,GAAG,WAAW,EAAE,cAAc,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IACjG,CAAC;IAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;IAC1B,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,CAAc;IAC7C,IAAI,CAAC;QACH,SAAS,CAAC,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,aAAa,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;AAC5B,CAAC;AAED,uDAAuD;AACvD,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC;YAAE,SAAS;QACtB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,IAAI,EAAE,IAAI,EAAE;YAAE,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,EAAE;YAAE,OAAO,CAAC,CAAC,CAAC,gBAAgB;QAClC,IAAI,EAAE;YAAE,OAAO,CAAC,CAAC,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AACD,SAAS,QAAQ,CAAC,CAAS;IACzB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACpE,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;AAC3D,CAAC;AACD,4DAA4D;AAC5D,MAAM,UAAU,OAAO,CAAC,CAAS,EAAE,CAAS;IAC1C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACvC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3B,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,EAAE,CAAC;QACzC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IACD,oCAAoC;IACpC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IAClC,IAAI,CAAC,CAAC,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACzB,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAWD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,KAAK,GAAG,KAAK;IAC7C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,WAAW,IAAI,GAAG,GAAG,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC;IACvE,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,CAAC,UAAU,IAAI,GAAG,GAAG,EAAE,CAAC,UAAU,GAAG,WAAW,CAAC;IAE1E,4DAA4D;IAC5D,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,IAAI,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IACtI,CAAC;IAED,uCAAuC;IACvC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,EAAE,GAAG,KAAK,CAAC;IACf,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC9D,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,eAAe,EAAE,4BAA4B,EAAE;gBACzE,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,WAAW,OAAO,EAAE,EAAE;aAC5E,CAAC,CAAC;YACH,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,CAAC,GAAQ,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBACjC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;gBAClC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC;IAElC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1F,CAAC;IAED,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAChF,CAAC;AAED,kEAAkE;AAClE,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC,OAAO,KAAK,KAAK;YAAE,OAAO;QACjC,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO;YAAE,OAAO,CAAC,iBAAiB;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,EAAE,CAAC,YAAY,IAAI,GAAG,GAAG,EAAE,CAAC,YAAY,GAAG,YAAY;YAAE,OAAO,CAAC,SAAS;QAC9E,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,0CAA0C,CAAC,CAAC;QAC7F,gBAAgB,CAAC,EAAE,GAAG,eAAe,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC"}

package/dist/services/workflow-operator.d.ts

@@ -35,4 +35,13 @@ export declare function findRolesByKeywords(roles: any[], keyword: string): {
     found: any[];
     missing: string;
 };
+export interface OrgHit {
+    id: string;
+    name: string;
+}
+/** 按名/精确 ID 解析部门（complete/department 是模糊搜索，无条件取首条会在重名部门时选错）。
+ *  纯数字长 ID 直接命中；模糊结果多匹配时优先「精确同名」，仍多个则报歧义（禁止静默取首条）。 */
+export declare function resolveDepartment(client: OperatorClient, baseUrl: string, keyword: string): Promise<OrgHit>;
+/** 按名/精确 ID 解析岗位（同 D07 规则）。 */
+export declare function resolvePosition(client: OperatorClient, baseUrl: string, keyword: string): Promise<OrgHit>;
 //# sourceMappingURL=workflow-operator.d.ts.map

package/dist/services/workflow-operator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-operator.d.ts","sourceRoot":"","sources":["../../src/services/workflow-operator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,kDAAkD;AAClD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAM7B;AAED;6CAC6C;AAC7C,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,EAAE,CAAC,CAOhB;AAED,4CAA4C;AAC5C,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,GAAG,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;gFAEgF;AAChF,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAUjB;AAcD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CASpG"}
+{"version":3,"file":"workflow-operator.d.ts","sourceRoot":"","sources":["../../src/services/workflow-operator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,kDAAkD;AAClD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAM7B;AAED;6CAC6C;AAC7C,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,EAAE,CAAC,CAOhB;AAED,4CAA4C;AAC5C,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,GAAG,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;gFAEgF;AAChF,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAUjB;AAcD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CASpG;AAID,MAAM,WAAW,MAAM;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE;AAErD;sDACsD;AACtD,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjH;AAED,+BAA+B;AAC/B,wBAAsB,eAAe,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE/G"}

package/dist/services/workflow-operator.js

@@ -63,4 +63,37 @@ export function findRolesByKeywords(roles, keyword) {
     }
     return { found, missing: '' };
 }
+/** 按名/精确 ID 解析部门（complete/department 是模糊搜索，无条件取首条会在重名部门时选错）。
+ *  纯数字长 ID 直接命中；模糊结果多匹配时优先「精确同名」，仍多个则报歧义（禁止静默取首条）。 */
+export async function resolveDepartment(client, baseUrl, keyword) {
+    return resolveOrg(client, baseUrl, keyword, 'department');
+}
+/** 按名/精确 ID 解析岗位（同 D07 规则）。 */
+export async function resolvePosition(client, baseUrl, keyword) {
+    return resolveOrg(client, baseUrl, keyword, 'position');
+}
+async function resolveOrg(client, baseUrl, keyword, kind) {
+    const label = kind === 'department' ? '部门' : '岗位';
+    const kw = String(keyword ?? '').trim();
+    if (!kw)
+        throw new Error(`${label}关键词为空`);
+    // 精确长 ID：直接命中（不搜索，避免把 ID 当名字模糊搜错）
+    if (/^\d{15,}$/.test(kw))
+        return { id: kw, name: kw };
+    const body = kind === 'department'
+        ? { browserMultiple: true, virtualType: 'All', showSanYuan: true, newly: 0, searchValue: kw }
+        : { browserMultiple: true, newly: 0, searchValue: kw };
+    const r = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/${kind}`, body);
+    const list = r?.data?.data || [];
+    if (!list.length)
+        throw new Error(`未找到${label}: ${kw}`);
+    const exact = list.filter((d) => String(d.name ?? d.content ?? '').trim() === kw);
+    const pool = exact.length ? exact : list;
+    if (pool.length > 1) {
+        const names = pool.map((d) => d.name || d.content || d.id).slice(0, 8).join('、');
+        throw new Error(`${label}「${kw}」匹配到多个（${names}），可能重名；请改传精确${label} ID（纯数字）`);
+    }
+    const hit = pool[0];
+    return { id: String(hit.id), name: String(hit.name ?? hit.content ?? kw) };
+}
 //# sourceMappingURL=workflow-operator.js.map

package/dist/services/workflow-operator.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-operator.js","sourceRoot":"","sources":["../../src/services/workflow-operator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-operator.js","sourceRoot":"","sources":["../../src/services/workflow-operator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weaver-e10-builder",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "description": "Eteams/Ebuilder CLI — 泛微 OA 命令行工具",
   "type": "module",
   "files": [

package/skill-docs/SKILL.md

@@ -2,11 +2,11 @@
 name: weaver-e10-builder
 display_name: 泛微E10智能搭建Skill
 display_name_en: E10 Builder
-description: 泛微E10智能搭建skill v2（通用版），辅助编写泛微Ebuilder自定义应用，对应CLI版本1.1.2
-description_zh: 泛微Ebuilder低代码应用智能搭建工具 v2（通用版），辅助编写自定义应用（表单/流程/列表/动作流/权限/分组/编号等），与 e10-cli 配套使用，当前对应 CLI 版本 1.1.2。
-description_en: E10 Ebuilder low-code app builder skill v2 (general) — helps build Weaver E10 custom apps (forms/workflows/lists/actionflows/permissions/groups/numbering) via e10-cli, currently paired with CLI 1.1.2.
+description: 泛微E10智能搭建skill v2（通用版），辅助编写泛微Ebuilder自定义应用，对应CLI版本1.1.5
+description_zh: 泛微Ebuilder低代码应用智能搭建工具 v2（通用版），辅助编写自定义应用（表单/流程/列表/动作流/权限/分组/编号等），与 e10-cli 配套使用，当前对应 CLI 版本 1.1.5。
+description_en: E10 Ebuilder low-code app builder skill v2 (general) — helps build Weaver E10 custom apps (forms/workflows/lists/actionflows/permissions/groups/numbering) via e10-cli, currently paired with CLI 1.1.5.
 category: coding
-version: 1.1.2
+version: 1.1.5
 author: 泛微网络科技股份有限公司
 auto: true
 ---
@@ -15,7 +15,7 @@ auto: true
 
 ## 安装与升级
 
-本 skill 需与 CLI **版本匹配**（当前对应 CLI `1.1.2`）。版本不一致时命令/文档/选项可能对不上——升级前先对齐：
+本 skill 需与 CLI **版本匹配**（当前对应 CLI `1.1.3`）。版本不一致时命令/文档/选项可能对不上——升级前先对齐：
 
 ```shell
 e10-cli --version          # 查 CLI 版本，应与上方 description 标注一致
@@ -57,47 +57,23 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 
 ## 核心理念
 
-> **一份需求文档 = 一个 eb 应用。** 需求里的所有表单、流程、菜单、页面都建在**同一个应用**下，不要按功能点/表单拆成多个应用。只有需求明确要求分属不同业务系统时才建多个应用（此时先跟用户确认再动手）。
+> **默认一份完整业务方案落在一个主应用。** 需求明确指定已有应用、跨应用资源或独立业务边界时，按实际范围处理，并在 `plan.md` 中标明每项资源的所属应用和跨应用关系。
 
 ```
-一份需求文档 → 一个 eb 应用
+一份完整业务方案 → 一个主应用（默认）
  └→ 应用下的资源: 表单 → 流程 → 菜单 → 页面
-     前四个是业务主体
-          页面是最后一步
+跨应用/已有应用增强 → 按实际边界规划并明确资源归属
 ```
 
 接到需求不要一上来就写页面代码。先想清楚这一个应用下需要哪些表单、字段怎么设计、流程怎么走。
 
-**CLI 支持以下能力，均为第一轮就能配好的，不要留到"后续再补"：**
-- 字段显隐联动（`form linkage add`）——效果类型：`hide`隐藏 / `show`显示(只读) / `edit`编辑 / `readonly`只读 / `required`必填 / `hideLine`隐藏行（仅表格布局，`hideRow` 兼容）
-- 动作流常量/公式/加减（`--constants` / `--formula` / mapping `+` `-` 前缀）
-- 动作流新建/保留式更新（`actionflow generate` / `actionflow update`）；动作流禁用/删除使用 `workflow action disable|delete|batch-delete`
-- 动作流事件触发（`ApproveTrigger` / `EventFormData` / `EventButton` / `DateTrigger` / `TimeBatchTrigger` / `SimpleScheduler` / `CustomTrigger` / `InnerMQListener`）和内置 MQ 发送动作（`InnerMQSend`）；各触发器按组件类型联动节点/时机，内置 MQ 监听与发送禁止同流
-- 动作流更新保持原触发器不变，固定保存为新版并回读校验；若需改变触发类型、触发表单、触发时机或触发器参数，必须新建动作流
-- 自定义触发与内置 MQ 监听使用平台原生输入参数结构；参数行、根触发器图标和保存后回读结果均纳入正确性检查
-- 动作流标准函数按每个函数的真实参数名、类型、必填规则和枚举配置生成；`code`/`custom` 仍需按平台或租户能力单独处理，函数接口只作使用时的辅助校验
-- 分支条件 AND/OR 嵌套（`workflow save-condition`）
-- 表单相关人员审批（`set-operator --type form`）
-- 复杂编号/年份编号（`form serial-mark`，如 XM-2026-001）
-- 消息提醒动作流（`workflow message create`）
-- 表单布局管理（`form layout read/init/set-read-only/set-required/move/remove-field`）
-- 表单权限管理（`form permission list/add/remove/rebuild`）
-- 表单视图管理（`form view create/list/populate` + `form table-view create`）
-- 视图权限（`form view-permission list/grant/set`）
-- EBuilder 关联字段数据过滤（`form ebuilder-filter get/set/clear`）
-- 字段函数公式（`form formula set/get/list/functions`）
+**能力范围**：应用与资源、表单与字段、视图与按钮、流程与动作流、权限、页面、数据操作。具体能力、命令与限制以本页决策树路由到的 `_catalog.md` 和 `references/` 为准；规划时应一次覆盖需求中已明确的配置项，不因主文档未枚举某条命令而遗漏。
 
 ---
 
 ## 关于「流程表单 / 工作流程」（非默认路径）
 
-默认一律走 **eb 表单**（低代码应用内，`workflow create`）——本 skill 的主体就是这个路径，不要主动改道。实在不确定的时候，使用UserAsking工具询问用户。通常情况下：工作流程会配表单引擎创建的原生表单。
-
-**只有当用户明确强调「用流程表单 / 工作流程 / 流程中心建流程、不在应用下」时**，才改用 `workflow create-workflow <name> --sub-company <机构>`（`relateForm=0` 自建 / `--form-id` 绑定已有流程表单；表单走 `/api/workflow/core/form/...`；不带 eb 模式的 `source`/`messageParams`）。用户没强调就按 eb 表单走，不要提流程表单。流程表单建好后，加字段 / 明细子表 / 布局用 `wf-form` 系列命令（`wf-form read` / `add-field` / `add-detail-table` / `layout init` / `layout add`），与 eb 表 `form` 命令对齐、机制相同（仅前缀 `/api/workflow/core/form/` 与 `module:'workflow'` 不同）。字段属性（必填/只读/可编辑/独占一行）用 `wf-form field-prop <formId> --required 项目名称 --readonly 审批状态`（getConfig 读→改→initLayout 保存到运行时布局；FLOW 模板默认业务字段只读锁死，建字段后都要跑）。多套布局并存用 `wf-form layout add <formId> --name <布局名> --layout-type FLOW|EXCEL`（流式/表格式，PC/移动端各一套不覆盖）；删布局 `wf-form layout delete <formId> <layoutId>`（emptyNodeLayout 从列表移除）；字段分组用 `wf-form group <formId> --groups '{"基本信息":["字段名"],"系统设置":["字段名"]}'`（折叠容器，对齐 eb 表）。
-
-概念补充：EB应用无法选到表单引擎创建的原生表单。**eb 应用内的流程也有自由流程选项（平台支持），但 CLI 的 `workflow create`（eb）暂不支持（isFree 固定 0）；只有工作流程 `workflow create-workflow` 支持 `--is-free 1`。用户要求 eb 流程自由流转时，须告知 CLI 暂不支持（平台可在浏览器配）。**
-
-概念补充：**表单字段一旦有数据就不能删除了**（`deleteFormField` 会报"当前字段已被布局引用，不允许删除"；先 initLayout 从布局移除再删也删不掉有数据的字段）。因此字段加错了/多余时**不要删，直接从布局隐藏**：getConfig（带 groupFieldIds）→ 把该字段从 Collapse children 里过滤掉 → initLayout 重存，字段定义保留、表单里不再显示。CLI 目前也没有 `wf-form delete-field`（三件套待补）；eb 表 `form delete` 只删整张表单。
+默认使用 **EB 表单**及应用内流程。只有需求明确要求原生流程表单、工作流程或流程中心建流程时，才切换到 `wf-form` / `workflow create-workflow` 路径；两条路径的资源 ID、接口和布局操作不可混用。不确定且选择会改变资源归属时，再向用户确认。具体命令、布局、字段属性、分组、删除限制和自由流程边界，读取 `references/workflow/guide-workflow.md` 与 `references/common/ref-cli-commands.md`。
 ---
 
 ## 面向人群
@@ -113,10 +89,11 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 ### 工作流
 
 ```
-0. 环境确认（每次对话必做）
-   a. 检查当前鉴权：e10-cli auth status（会顺带自动把 skill 文档同步到本机已装 skill）
-   b. 确认文档在 skill 目录内（如 `~/.claude/skills/weaver-e10-builder/references/`）；不在就先 `e10-cli skill sync`
-   c. 用户提到不同系统地址（如"在 xxx 搭建"）→ 必须切换鉴权：
+0. 远程操作前确认环境
+   a. 仅在即将执行远程查询或写入前运行 `e10-cli auth status`；纯文档、代码、日志分析及本地 CLI 修改不鉴权
+   b. 同一连续执行阶段已确认当前环境时不重复检查；切换系统地址、profile 或凭证后必须重新确认
+   c. 需要读取配套文档但 skill 目录内不存在 `references/` 时，执行 `e10-cli skill sync`
+   d. 用户提到不同系统地址（如"在 xxx 搭建"）→ 必须切换鉴权：
       - 已有 profile（凭证已存）：e10-cli auth profile use <name>（直接切，无需重新登录）
       - 新环境：e10-cli auth set --eteamsid "<ETEAMSID>" --base-url <url>
         （ETEAMSID 从浏览器 DevTools → Application → Cookies 复制；浏览器 OIDC 登录暂未实现，不要用 auth login）
@@ -127,12 +104,14 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 
 2. 全局资源设计（复杂需求必经）
    a. 理解需求，不够清楚的地方反问用户
-   b. 在本地写 `plan.md`：**认真阅读用户提供的实施方案/需求文档** **严格按照 `references/common/guide-plan-template.md` 的模板格式，梳理所有需要搭建的资源和配置项**（应用/表单/字段/流程/出口条件/联动/权限/编号/台账配置等编写`plan.md`，需求里提到的每项都要在 plan 中体现，不能凭记忆遗漏），禁止自创格式、禁止预勾。
-   c. **编写完成后打开 `plan.md` 和用户确认**（此阶段 plan 里所有 `[ ]` 保持未勾——是待办清单，不是完成清单）
-   d. 用户确认后按大纲**逐项执行、逐项打勾**：每做完一项、验证通过，才把 `[ ]` 改 `[x]` 并填入实际 ID。**完成一条打勾一条**，禁止预勾。
+   b. 写 plan 前扫描需求中的布局章节和表格。**每张表单建表前先向用户确认布局类型：流式(FLOW)还是表格式(EXCEL)**——平台建表后不可切换，需求没明说就不要默认。出现“表格式布局/Excel样式/按照如下布局”、`[字段名]`、标签与字段交替、分组标题或有意义的空白单元格时，按“布局样表”解析；识别方法读取 `references/form/guide-create-form.md`
+   c. 在本地写 `plan.md`：**认真阅读用户提供的实施方案/需求文档** **严格按照 `references/common/guide-plan-template.md` 的模板格式，梳理所有需要搭建的资源和配置项**（应用/表单/字段/布局蓝图/流程/出口条件/联动/权限/编号/台账配置等编写`plan.md`，需求里提到的每项都要在 plan 中体现，不能凭记忆遗漏），禁止自创格式、禁止预勾。布局样表必须逐行写入对应表单的“表单布局蓝图”，不得仅压缩成 `group`、`singleRow` 或字段顺序
+   d. **编写完成后打开 `plan.md` 和用户确认**（此阶段 plan 里所有 `[ ]` 保持未勾——是待办清单，不是完成清单）
+   e. 用户确认后按大纲**逐项执行、逐项打勾**：每做完一项、验证通过，才把 `[ ]` 改 `[x]` 并填入实际 ID。**完成一条打勾一条**，禁止预勾。
 
 3. 执行搭建（**最多分三段，每段完成停下来让用户确认，确认后才进下一段**）
    - 段① 应用+角色+全部表单（建表+表内项配齐）→ 确认字段设计 → 段② 流程（先列出口条件清单→逐条创建→`condition list` 回读核对）→ 确认流程 → 段③ 菜单+页面。分段细节与表内项清单见 `references/common/guide-plan-template.md`「执行分段」。
+   - 布局样表已进入 plan 时，据蓝图组织 `fields.json`，用现有 `form create --layout EXCEL` 创建并初始化；CLI 不消费蓝图本身。创建后仅在实际需要时读取当前布局并逐项调整，不生成额外布局 JSON、不改初始化逻辑。
    - 简单单步需求（改字段、查数据）不分段，直接执行。
 ```
 
@@ -141,7 +120,7 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 - 本服务运行于 Windows 环境，注意命令行兼容性
 - 不要多说废话，直接干活。用户等的是结果。
 - **写代码不要犹豫**，按模板直接出完整代码，写完用 `e10-cli check` 验证。错了报错再改。
-- **解析 Word 文档**：用 `e10-cli docx read <文件>` 一键转 markdown + 提取图片，**禁止自己写 python-docx 脚本**。读取后必须逐张 Read `_images/` 目录里的图片做多模态理解，**把分析结果写回 md**（替换图片占位符为实际描述，让文档完整可读）。
+- **解析 Word 文档**：用 `e10-cli docx read <文件>` 一键转 markdown + 提取图片，**禁止自己写 python-docx 脚本**。读取后必须逐张 Read `_images/` 目录里的图片做多模态理解，**把分析结果写回 md**（替换图片占位符为实际描述，让文档完整可读）。表格若承载表单布局，还要按布局样表规则保留空白、同排和分组关系；Markdown 无法确定合并范围时才查看原 DOCX 对应页面或表格结构。
 
 ---
 
@@ -167,7 +146,7 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 | form data add、form data list、form data delete、写入数据、查询数据、删除数据 | `references/form/guide-form-data.md` |
 | 编辑回显、handleEdit、getAllData、数据回填 | `references/coding/guide-edit-backfill.md`（前端代码） |
 | 字段联动、显隐联动、条件显示、form linkage | `references/form/guide-form-linkage.md` |
-| 新建表单、form create、字段定义、字段类型、fields.json | `references/form/guide-create-form.md` |
+| 新建表单、form create、字段定义、字段类型、fields.json、Excel样式、表格式布局、布局样表、布局蓝图、标签字段交替 | `references/form/guide-create-form.md` |
 | 流程、审批、workflow、提交流程、预填 | `references/workflow/guide-workflow.md` |
 | 流程节点、操作者、审批人、连线、添加节点、删除连线、删除节点、delete-node、节点操作者、set-operator、出口名称、link-rename、节点字段权限、field-permission | `references/workflow/guide-workflow.md` |
 | 节点校验、提交校验、node validate、智能审批规则、字面值校验、禁止提交 | `references/common/ref-cli-commands.md` |
@@ -180,7 +159,7 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 | CLI命令、打包、build、import、创建应用/表单/菜单 | `references/common/ref-cli-commands.md` |
 | 编译报错、语法不支持、babel | `references/coding/ref-compile-rules.md`（前端代码） |
 | Word文档、docx、需求文档、解析文档 | `e10-cli docx read` 一键转换，禁止自己写脚本 |
-| 新建视图、表格视图、看板、日历、思维导图、form view、台账显示列、显示列、list-columns、搜索条件、排序、list-sort | `references/form/guide-form-view.md` |
+| 新建视图、表格视图、看板、日历、思维导图、form view、台账显示列、显示列、list-columns、搜索条件、排序、list-sort、上下级、父级、树形展示、上级类型、list-hierarchy | `references/form/guide-form-view.md` |
 | 视图权限、查看布局、修改共享权限、view permission | `references/form/guide-form-view-permission.md` |
 | EBuilder关联、关联表单、数据过滤设置、ebuilder-filter、EBuilder显示列、ebuilder-columns、去掉系统字段、只留业务字段 | `references/form/guide-ebuilder-filter.md` |
 | 关联浏览筛选、数据范围设置、浏览数据定义、只选启用状态、关联客户过滤、ebuilder-scope | `references/form/guide-ebuilder-scope.md` |
@@ -191,13 +170,14 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 | 显示列批量设置、批量加列、列宽、列顺序、list-columns --set | `references/form/guide-list-columns.md` |
 | 顶部统计、明细统计、付款记录数、list-stats、子表计数 | `references/form/guide-list-stats.md` |
 | 关联页签、关联视图、association、页签显示布局、关联数据筛选、set-filter | `references/form/guide-form-association.md` |
-| 表单按钮、button、自定义按钮、视图按钮、行上、行末下拉、按钮显示位置 | `references/form/guide-form-button.md`（位置配置）；`references/common/ref-cli-commands.md`（其他按钮命令） |
+| 表单按钮、button、自定义按钮、视图按钮、行上、行末下拉、右上、打开视图、打开布局、发起流程、按钮预填、按钮字段映射、action-set | `references/form/guide-form-button.md`；`references/common/ref-cli-commands.md` |
 | 表单权限、permission、数据权限 | `references/common/ref-cli-commands.md` |
 | 消息提醒、消息动作流、workflow message、IM提醒 | `references/common/ref-cli-commands.md` |
 | 编号规则、serial-mark、自动编号、流水号、年份编号、流程编号、numbering | `references/common/ref-cli-commands.md` |
 | 超时处理、退回设置、节点菜单、node timeout、node reject | `references/common/ref-cli-commands.md` |
 | 流程设置、提交确认、签字意见、批量操作、setting | `references/common/ref-cli-commands.md` |
 | 流程存档、定时触发、高级设置、advanced | `references/common/ref-cli-commands.md` |
+| 页面设计器、配置式页面、仪表盘、看板页、designer、page create、comp-add、工厂模板、factory、组件模板、页面布局、designer layout/save、页面版本、version revert、发布页面菜单、publish-menu | `references/ebuilder-designer/guide-designer.md`（布局层）；组件配置见 `guide-designer-components.md`，工厂模板见 `guide-designer-factory.md`，版本见 `guide-designer-version.md`，命令速查见 `references/common/ref-cli-commands.md`「页面 & 设计器」节 |
 | HRM、矩阵、条件矩阵、matrix、映射表 | `references/hrm/guide-matrix.md` |
 
 > 组件文档（Button/Table/Input/Upload 等）在 `references/` 中按文件名查找。完整索引见 `_catalog.md`。
@@ -210,7 +190,7 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 
 - **Ecode** — 存放和运行代码的平台，自定义页面在这里编码、构建、运行
 - **Ebuilder 应用** — 独立的概念，包含表单、流程等元素（与 Ecode 项目不同）
-- **表单自带台账，无需开发** — 每个表单创建后，平台自动生成默认的台账/列表页面，自带搜索、筛选、导出、批量操作。**台账会自动挂入应用菜单，无需手动建菜单。** 这不是一个「功能」，是一个硬规则——建了表单就有台账页面，不需要写一行代码。只有以下场景才需要自定义页面：图表仪表盘、跨表单聚合视图、特殊交互流程、对外公开页面。
+- **默认台账与菜单入口是两件事** — 表单创建后会生成默认台账/列表视图，但当前 CLI 的 `form create` 默认不添加应用菜单；需求需要入口时使用 `--menu`，或建表后执行 `menu add-table`。不要因默认台账已存在而假定菜单入口也存在。只有图表仪表盘、跨表单聚合视图、特殊交互流程、对外公开页面等场景才需要自定义页面。
 - 所有系统交互命令均通过 `e10-cli` 执行（已全局 link）。auth 文件自动查找，也可 `--auth <path>` 指定。
 - 用户的 userId 是固定的变量 `TEAMS.currentUser.id`，系统里已支持，js 代码里可以直接写。
 
@@ -257,6 +237,8 @@ npx -y skills add ./weaver-e10-builder.zip --skill -y
 
 > **页面是搭建流程的最后一步。** 写页面代码前，确保应用、表单、流程都已建好。
 
+**应用内建页优先用设计器 Ebuilder 页面（配置式）**——`page create` → `designer comp-add --template`（28 个内置工厂模板）→ 绑数据 → `designer save` → `designer unlock` → `page publish-menu`，全程不写前端代码；详见 `references/ebuilder-designer/guide-designer.md`。**只有设计器组件无法满足的深度定制交互（特殊交互逻辑、复杂跨表联动 UI）才用 Ecode React 编码**。
+
 页面编码规范、entry.js 模板、@weapp/ui 组件清单、编译规则、代码质量检查清单 → 详见 `references/coding/guide-page-code.md`（前端代码）。
 
 ---