@prd-improve/cli 1.2.0 → 2.0.0

package/dist/completion/generate.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Static shell-completion generator (v1.32 #6). Introspects the live commander
+ * program tree and emits a zsh/bash completion script. Pure — no I/O.
+ */
+import type { Command } from "commander";
+export interface CompletionNode {
+    path: string;
+    commands: {
+        name: string;
+        desc: string;
+    }[];
+    options: {
+        long: string;
+        desc: string;
+    }[];
+    valueOptionLongs: string[];
+}
+/** Walk the program via commander's Help helpers (exact `--help` parity). */
+export declare function collectNodes(program: Command): CompletionNode[];
+/**
+ * Reference implementation of the path tokenizer. NOTE: this JS function is not
+ * called at completion time — `renderZsh`/`renderBash` hand-transliterate this
+ * exact algorithm into shell (the shell can't call back into Node at tab-time).
+ * It exists to (a) document the canonical algorithm and (b) be unit-tested in
+ * isolation. The shell transliterations are guarded by the `zsh -n`/`bash -n`
+ * syntax gates plus a behavioral bash test that drives the generated `_prd` for
+ * the `--lang en …` case; keep all three copies in sync when editing.
+ *
+ * Rebuild the active subcommand path from the words before the cursor:
+ *  - skip an option flag; if it is a value-taking option, also skip its value;
+ *  - descend on a word that completes a known command path;
+ *  - stop at the first positional value / cursor word.
+ * Handles commander's global value-option (e.g. `--lang en`) before subcommands.
+ */
+export declare function resolveCommandPath(tokens: string[], validPaths: Set<string>, valueOptionLongs: Set<string>): string;
+export type Shell = "zsh" | "bash";
+export declare function generateCompletion(program: Command, shell: Shell): string;

package/dist/completion/generate.js

@@ -0,0 +1,175 @@
+/**
+ * Static shell-completion generator (v1.32 #6). Introspects the live commander
+ * program tree and emits a zsh/bash completion script. Pure — no I/O.
+ */
+import { Help } from "commander";
+/** Walk the program via commander's Help helpers (exact `--help` parity). */
+export function collectNodes(program) {
+    const help = new Help();
+    const nodes = [];
+    const walk = (cmd, path) => {
+        const subcmds = help.visibleCommands(cmd);
+        const opts = help.visibleOptions(cmd).filter((o) => o.long);
+        nodes.push({
+            path,
+            commands: subcmds.map((c) => ({ name: c.name(), desc: c.description() })),
+            options: opts.map((o) => ({ long: o.long, desc: o.description })),
+            valueOptionLongs: opts
+                .filter((o) => o.required || o.optional)
+                .map((o) => o.long),
+        });
+        for (const c of subcmds) {
+            // Don't recurse into the implicit `help` command (no meaningful subtree).
+            if (c.name() === "help")
+                continue;
+            walk(c, path === "" ? c.name() : `${path} ${c.name()}`);
+        }
+    };
+    walk(program, "");
+    return nodes;
+}
+/**
+ * Reference implementation of the path tokenizer. NOTE: this JS function is not
+ * called at completion time — `renderZsh`/`renderBash` hand-transliterate this
+ * exact algorithm into shell (the shell can't call back into Node at tab-time).
+ * It exists to (a) document the canonical algorithm and (b) be unit-tested in
+ * isolation. The shell transliterations are guarded by the `zsh -n`/`bash -n`
+ * syntax gates plus a behavioral bash test that drives the generated `_prd` for
+ * the `--lang en …` case; keep all three copies in sync when editing.
+ *
+ * Rebuild the active subcommand path from the words before the cursor:
+ *  - skip an option flag; if it is a value-taking option, also skip its value;
+ *  - descend on a word that completes a known command path;
+ *  - stop at the first positional value / cursor word.
+ * Handles commander's global value-option (e.g. `--lang en`) before subcommands.
+ */
+export function resolveCommandPath(tokens, validPaths, valueOptionLongs) {
+    let path = "";
+    let skipNext = false;
+    for (const tok of tokens) {
+        if (skipNext) {
+            skipNext = false;
+            continue;
+        }
+        if (tok.startsWith("-")) {
+            if (valueOptionLongs.has(tok))
+                skipNext = true;
+            continue;
+        }
+        const cand = path === "" ? tok : `${path} ${tok}`;
+        if (validPaths.has(cand))
+            path = cand;
+        else
+            break;
+    }
+    return path;
+}
+export function generateCompletion(program, shell) {
+    if (shell !== "zsh" && shell !== "bash") {
+        throw new Error(`Unsupported shell: ${shell}`);
+    }
+    const nodes = collectNodes(program);
+    return shell === "zsh" ? renderZsh(nodes) : renderBash(nodes);
+}
+// Wrap an arbitrary string as a safely single-quoted shell literal.
+function sq(s) {
+    return "'" + s.replace(/'/g, "'\\''") + "'";
+}
+function oneLine(s) {
+    return s.replace(/\s+/g, " ").trim();
+}
+// Union of all value-taking option longs across the tree (used by the tokenizer).
+function valueOptionUnion(nodes) {
+    const set = new Set();
+    for (const n of nodes)
+        for (const l of n.valueOptionLongs)
+            set.add(l);
+    return [...set];
+}
+function nonRootPaths(nodes) {
+    return nodes.map((n) => n.path).filter((p) => p !== "");
+}
+function renderZsh(nodes) {
+    const vopts = valueOptionUnion(nodes).join(" ");
+    const paths = nonRootPaths(nodes)
+        .map((p) => sq(p))
+        .join(" ");
+    const branches = nodes
+        .map((n) => {
+        const cmds = n.commands.map((c) => sq(`${c.name}:${oneLine(c.desc)}`)).join(" ");
+        const opts = n.options.map((o) => sq(`${o.long}:${oneLine(o.desc)}`)).join(" ");
+        const pat = n.path === "" ? '"")' : `${sq(n.path)})`;
+        return `    ${pat}
+      cmds=(${cmds})
+      opts=(${opts})
+      ;;`;
+    })
+        .join("\n");
+    return `#compdef prd
+# Static completion for prd — generated by \`prd completion zsh\`.
+_prd() {
+  local -a vopts paths cmds opts
+  vopts=(${vopts})
+  paths=(${paths})
+  local path="" tok cand skipnext=0
+  local -a toks
+  toks=(\${words[2,$((CURRENT-1))]})
+  for tok in $toks; do
+    if (( skipnext )); then skipnext=0; continue; fi
+    if [[ $tok == -* ]]; then
+      (( \${vopts[(I)$tok]} )) && skipnext=1
+      continue
+    fi
+    if [[ -z $path ]]; then cand="$tok"; else cand="$path $tok"; fi
+    if (( \${paths[(I)$cand]} )); then path="$cand"; else break; fi
+  done
+  case "$path" in
+${branches}
+  esac
+  (( \${#cmds} )) && _describe -t commands 'command' cmds
+  (( \${#opts} )) && _describe -t options 'option' opts
+}
+compdef _prd prd 2>/dev/null
+`;
+}
+function renderBash(nodes) {
+    const vopts = valueOptionUnion(nodes).join(" ");
+    const paths = nonRootPaths(nodes)
+        .map((p) => sq(p))
+        .join(" ");
+    const branches = nodes
+        .map((n) => {
+        const words = [...n.commands.map((c) => c.name), ...n.options.map((o) => o.long)].join(" ");
+        const pat = n.path === "" ? '"")' : `${sq(n.path)})`;
+        return `    ${pat} words=${sq(words)} ;;`;
+    })
+        .join("\n");
+    return `# Static completion for prd — generated by \`prd completion bash\`.
+_prd() {
+  local cur tok cand path="" skipnext=0 found v p
+  local -a toks vopts paths
+  vopts=(${vopts})
+  paths=(${paths})
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  toks=("\${COMP_WORDS[@]:1:COMP_CWORD-1}")
+  for tok in "\${toks[@]}"; do
+    if [[ $skipnext == 1 ]]; then skipnext=0; continue; fi
+    if [[ $tok == -* ]]; then
+      for v in "\${vopts[@]}"; do [[ $tok == "$v" ]] && skipnext=1; done
+      continue
+    fi
+    if [[ -z $path ]]; then cand="$tok"; else cand="$path $tok"; fi
+    found=0
+    for p in "\${paths[@]}"; do [[ "$cand" == "$p" ]] && { found=1; break; }; done
+    if [[ $found == 1 ]]; then path="$cand"; else break; fi
+  done
+  local words=""
+  case "$path" in
+${branches}
+  esac
+  COMPREPLY=( $(compgen -W "$words" -- "$cur") )
+}
+complete -F _prd prd
+`;
+}
+//# sourceMappingURL=generate.js.map

package/dist/completion/generate.js.map

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

package/dist/config/rc.d.ts

@@ -1,5 +1,7 @@
 import { type PrdRc, type ResolvedBackend } from "./schema.js";
 export declare const RC_PATH: string;
+/** 测试隔离用:重置一次性警告守卫。 */
+export declare function __resetAdminBackendsDeprecationWarning(): void;
 export type LoadRcResult = {
     ok: true;
     rc: PrdRc;
@@ -24,7 +26,9 @@ export type LoadRcResult = {
  * Load ~/.prdrc — returns typed result rather than throwing.
  * `pathOverride` exists for tests (HOME juggling is fragile in vitest workers).
  */
-export declare function loadRc(pathOverride?: string): LoadRcResult;
+export declare function loadRc(pathOverride?: string, opts?: {
+    silent?: boolean;
+}): LoadRcResult;
 export declare function saveRc(rc: PrdRc, pathOverride?: string): {
     ok: true;
     path: string;
@@ -33,15 +37,20 @@ export declare function saveRc(rc: PrdRc, pathOverride?: string): {
     message: string;
 };
 /**
- * Override precedence (design §6.9):
- *   1. opts.backend  (CLI --backend <name>) — selects from rc
- *   2. PRDSERVER_URL + PRDSERVER_TOKEN env (both set) → ad-hoc backend
- *   3. PRDSERVER_BACKEND env → selects from rc
- *   4. rc.default_backend
- *
- * `PRDSERVER_URL` alone (no token) is an explicit error — callers must
- * surface "rc_env_url_without_token".
+ * v2.0 §C2-3 — 懒迁移:把 deprecated `admin_backends.<name>.token` 折进
+ * `backends.<name>.admin_token`。纯函数(便于单测);loadRc 调它,警告渲染交 loadRc。
+ *  - backends[name] 不存在 → 新建 { url: admin.url, admin_token }。
+ *  - 存在且 url 同 → 补 admin_token。
+ *  - 存在但 url 异(罕见)→ 保留用户轨 url + 补 admin_token + 记 urlConflicts。
+ *  - admin entry 无 token → 跳过。
+ * 折叠后 delete rc.admin_backends → saveRc 不回写。
  */
+export declare function foldAdminBackends(rc: PrdRc): {
+    rc: PrdRc;
+    folded: string[];
+    urlConflicts: string[];
+};
+export type BackendRole = "user" | "admin";
 export type ResolveBackendResult = {
     ok: true;
     backend: ResolvedBackend;
@@ -60,8 +69,21 @@ export type ResolveBackendResult = {
     ok: false;
     reason: "env_url_without_token";
 };
+/**
+ * 统一 backend 解析(v2.0 §C2-2)。`role` 选 token 字段 + token env:
+ *   user  → entry.token  / PRDSERVER_TOKEN
+ *   admin → entry.admin_token / PRDSERVER_ADMIN_TOKEN
+ * 优先级(两轨统一,flag-first):
+ *   1. opts.backend → backends[name]
+ *   2. PRDSERVER_URL + (role token env) 都设 → ad-hoc (env)
+ *   3. PRDSERVER_BACKEND → backends[name]
+ *   4. rc.default_backend → backends[name]
+ * env 规则「URL 触发」:URL 设但 role-token 缺 → env_url_without_token;
+ * URL 没设 → 忽略 env(含游离 token)走 rc。
+ */
 export declare function resolveBackend(rc: PrdRc | null, opts?: {
     backend?: string;
+    role?: BackendRole;
 }, env?: NodeJS.ProcessEnv): ResolveBackendResult;
 /**
  * Token masking for `prd config show` / `prd whoami` output.

package/dist/config/rc.js

@@ -14,12 +14,20 @@ import { join } from "node:path";
 import { load as yamlLoad, dump as yamlDump } from "js-yaml";
 import { PrdRcSchema, } from "./schema.js";
 import { writeFileAtomic } from "../fs/atomicWrite.js";
+import { getMessages, readLocale } from "../i18n/index.js";
+import * as c from "../formatter/colors.js";
 export const RC_PATH = join(homedir(), ".prdrc");
+// 进程内一次性 deprecation 警告守卫(loadRc 可能被多命令多次调用)。
+let adminBackendsDeprecationWarned = false;
+/** 测试隔离用:重置一次性警告守卫。 */
+export function __resetAdminBackendsDeprecationWarning() {
+    adminBackendsDeprecationWarned = false;
+}
 /**
  * Load ~/.prdrc — returns typed result rather than throwing.
  * `pathOverride` exists for tests (HOME juggling is fragile in vitest workers).
  */
-export function loadRc(pathOverride) {
+export function loadRc(pathOverride, opts) {
     const path = pathOverride ?? RC_PATH;
     if (!existsSync(path))
         return { ok: false, reason: "missing" };
@@ -67,7 +75,18 @@ export function loadRc(pathOverride) {
                 .join("; "),
         };
     }
-    return { ok: true, rc: parsed.data, path };
+    const { rc: folded, folded: foldedNames, urlConflicts } = foldAdminBackends(parsed.data);
+    if (foldedNames.length > 0 && !opts?.silent && !adminBackendsDeprecationWarned) {
+        // 必须在 readLocale() 之前置 true:readLocale→readRcLang→loadRc 会重入,
+        // 不先置位则无界递归。
+        adminBackendsDeprecationWarned = true;
+        const m = getMessages(readLocale());
+        process.stderr.write(c.warn(m.rc_admin_backends_deprecated) + "\n");
+        if (urlConflicts.length > 0) {
+            process.stderr.write(c.warn(m.rc_admin_backends_url_conflict({ names: urlConflicts.join(", ") })) + "\n");
+        }
+    }
+    return { ok: true, rc: folded, path };
 }
 export function saveRc(rc, pathOverride) {
     const path = pathOverride ?? RC_PATH;
@@ -87,48 +106,82 @@ export function saveRc(rc, pathOverride) {
         return { ok: false, message: e.message };
     }
 }
+/**
+ * v2.0 §C2-3 — 懒迁移:把 deprecated `admin_backends.<name>.token` 折进
+ * `backends.<name>.admin_token`。纯函数(便于单测);loadRc 调它,警告渲染交 loadRc。
+ *  - backends[name] 不存在 → 新建 { url: admin.url, admin_token }。
+ *  - 存在且 url 同 → 补 admin_token。
+ *  - 存在但 url 异(罕见)→ 保留用户轨 url + 补 admin_token + 记 urlConflicts。
+ *  - admin entry 无 token → 跳过。
+ * 折叠后 delete rc.admin_backends → saveRc 不回写。
+ */
+export function foldAdminBackends(rc) {
+    const adminNs = rc.admin_backends;
+    if (!adminNs || Object.keys(adminNs).length === 0) {
+        return { rc, folded: [], urlConflicts: [] };
+    }
+    const backends = { ...rc.backends };
+    const folded = [];
+    const urlConflicts = [];
+    for (const [name, admin] of Object.entries(adminNs)) {
+        if (!admin.token)
+            continue;
+        const existing = backends[name];
+        if (!existing) {
+            backends[name] = { url: admin.url, admin_token: admin.token };
+        }
+        else {
+            backends[name] = { ...existing, admin_token: admin.token };
+            if (existing.url !== admin.url)
+                urlConflicts.push(name);
+        }
+        folded.push(name);
+    }
+    const next = { ...rc, backends };
+    delete next.admin_backends;
+    return { rc: next, folded, urlConflicts };
+}
+/**
+ * 统一 backend 解析(v2.0 §C2-2)。`role` 选 token 字段 + token env:
+ *   user  → entry.token  / PRDSERVER_TOKEN
+ *   admin → entry.admin_token / PRDSERVER_ADMIN_TOKEN
+ * 优先级(两轨统一,flag-first):
+ *   1. opts.backend → backends[name]
+ *   2. PRDSERVER_URL + (role token env) 都设 → ad-hoc (env)
+ *   3. PRDSERVER_BACKEND → backends[name]
+ *   4. rc.default_backend → backends[name]
+ * env 规则「URL 触发」:URL 设但 role-token 缺 → env_url_without_token;
+ * URL 没设 → 忽略 env(含游离 token)走 rc。
+ */
 export function resolveBackend(rc, opts = {}, env = process.env) {
-    // Step 1: --backend flag → select from rc
-    if (opts.backend) {
+    const role = opts.role ?? "user";
+    const tokenEnvVar = role === "admin" ? "PRDSERVER_ADMIN_TOKEN" : "PRDSERVER_TOKEN";
+    const selectFromRc = (name) => {
         if (!rc)
             return { ok: false, reason: "no_backend" };
-        const entry = rc.backends[opts.backend];
+        const entry = rc.backends[name];
         if (!entry)
-            return { ok: false, reason: "unknown_name", name: opts.backend };
-        if (!entry.token)
-            return { ok: false, reason: "no_token", name: opts.backend };
-        return { ok: true, backend: { name: opts.backend, url: entry.url, token: entry.token } };
-    }
-    // Step 2: PRDSERVER_URL + PRDSERVER_TOKEN env (both) → ad-hoc backend
+            return { ok: false, reason: "unknown_name", name };
+        const tok = role === "admin" ? entry.admin_token : entry.token;
+        if (!tok)
+            return { ok: false, reason: "no_token", name };
+        return { ok: true, backend: { name, url: entry.url, token: tok } };
+    };
+    if (opts.backend)
+        return selectFromRc(opts.backend);
     const envUrl = env.PRDSERVER_URL;
-    const envTok = env.PRDSERVER_TOKEN;
+    const envTok = env[tokenEnvVar];
     if (envUrl && envTok) {
         return { ok: true, backend: { name: "(env)", url: envUrl, token: envTok } };
     }
-    if (envUrl && !envTok) {
+    if (envUrl && !envTok)
         return { ok: false, reason: "env_url_without_token" };
-    }
-    // Step 3: PRDSERVER_BACKEND env → select from rc
     const envName = env.PRDSERVER_BACKEND;
-    if (envName) {
-        if (!rc)
-            return { ok: false, reason: "no_backend" };
-        const entry = rc.backends[envName];
-        if (!entry)
-            return { ok: false, reason: "unknown_name", name: envName };
-        if (!entry.token)
-            return { ok: false, reason: "no_token", name: envName };
-        return { ok: true, backend: { name: envName, url: entry.url, token: entry.token } };
-    }
-    // Step 4: rc.default_backend
+    if (envName)
+        return selectFromRc(envName);
     if (!rc || !rc.default_backend)
         return { ok: false, reason: "no_backend" };
-    const entry = rc.backends[rc.default_backend];
-    if (!entry)
-        return { ok: false, reason: "unknown_name", name: rc.default_backend };
-    if (!entry.token)
-        return { ok: false, reason: "no_token", name: rc.default_backend };
-    return { ok: true, backend: { name: rc.default_backend, url: entry.url, token: entry.token } };
+    return selectFromRc(rc.default_backend);
 }
 /**
  * Token masking for `prd config show` / `prd whoami` output.

package/dist/config/rc.js.map

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

package/dist/config/schema.d.ts

@@ -8,18 +8,21 @@ import { z } from "zod";
 export declare const BackendEntrySchema: z.ZodObject<{
     url: z.ZodString;
     token: z.ZodOptional<z.ZodString>;
+    admin_token: z.ZodOptional<z.ZodString>;
     last_login_at: z.ZodOptional<z.ZodString>;
     default_team: z.ZodOptional<z.ZodString>;
     default_project: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     url: string;
     token?: string | undefined;
+    admin_token?: string | undefined;
     last_login_at?: string | undefined;
     default_team?: string | undefined;
     default_project?: string | undefined;
 }, {
     url: string;
     token?: string | undefined;
+    admin_token?: string | undefined;
     last_login_at?: string | undefined;
     default_team?: string | undefined;
     default_project?: string | undefined;
@@ -39,37 +42,43 @@ export declare const PrdRcSchema: z.ZodObject<{
     backends: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         url: z.ZodString;
         token: z.ZodOptional<z.ZodString>;
+        admin_token: z.ZodOptional<z.ZodString>;
         last_login_at: z.ZodOptional<z.ZodString>;
         default_team: z.ZodOptional<z.ZodString>;
         default_project: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
     }, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
     }>>>;
-    admin_backends: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
+    admin_backends: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         url: z.ZodString;
         token: z.ZodOptional<z.ZodString>;
+        admin_token: z.ZodOptional<z.ZodString>;
         last_login_at: z.ZodOptional<z.ZodString>;
         default_team: z.ZodOptional<z.ZodString>;
         default_project: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
     }, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
@@ -79,13 +88,7 @@ export declare const PrdRcSchema: z.ZodObject<{
     backends: Record<string, {
         url: string;
         token?: string | undefined;
-        last_login_at?: string | undefined;
-        default_team?: string | undefined;
-        default_project?: string | undefined;
-    }>;
-    admin_backends: Record<string, {
-        url: string;
-        token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
@@ -95,6 +98,14 @@ export declare const PrdRcSchema: z.ZodObject<{
         email?: string | undefined;
     } | undefined;
     default_backend?: string | undefined;
+    admin_backends?: Record<string, {
+        url: string;
+        token?: string | undefined;
+        admin_token?: string | undefined;
+        last_login_at?: string | undefined;
+        default_team?: string | undefined;
+        default_project?: string | undefined;
+    }> | undefined;
     lang?: string | undefined;
 }, {
     user?: {
@@ -105,6 +116,7 @@ export declare const PrdRcSchema: z.ZodObject<{
     backends?: Record<string, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;
@@ -112,6 +124,7 @@ export declare const PrdRcSchema: z.ZodObject<{
     admin_backends?: Record<string, {
         url: string;
         token?: string | undefined;
+        admin_token?: string | undefined;
         last_login_at?: string | undefined;
         default_team?: string | undefined;
         default_project?: string | undefined;

package/dist/config/schema.js

@@ -8,6 +8,9 @@ import { z } from "zod";
 export const BackendEntrySchema = z.object({
     url: z.string().url(),
     token: z.string().optional(),
+    // v2.0 §C2-1 — admin 轨 token,与 `token` 共享同 entry 的 `url`。
+    // resolveBackend(role:'admin') 读此字段。统一前是独立的 admin_backends.<name>.token。
+    admin_token: z.string().optional(),
     last_login_at: z.string().optional(),
     // v1.1 §6.3 — default scope for `prd init` / `prd migrate-yaml` so users
     // don't have to retype --team / --project every command. Kept optional so
@@ -25,11 +28,11 @@ export const PrdRcSchema = z.object({
         .optional(),
     default_backend: z.string().optional(),
     backends: z.record(z.string(), BackendEntrySchema).default({}),
-    // v1.3 §A.1 — separate admin namespace; admin CLI reads here, never falls
-    // back to `backends.<name>.token`. Same BackendEntry shape (url required,
-    // token optional, last_login_at/default_team/default_project ignored for
-    // admin track).
-    admin_backends: z.record(z.string(), BackendEntrySchema).default({}),
+    // v2.0 §C2 DEPRECATED — 旧的独立 admin 命名空间。仅 loadRc 读以懒迁移
+    // (foldAdminBackends 折进 backends.<name>.admin_token),不再是写目标。
+    // optional 无 default:用 undefined 区分「缺省」与「显式空」,使折叠后 delete
+    // 该属性→saveRc 不回写→文件干净迁移。
+    admin_backends: z.record(z.string(), BackendEntrySchema).optional(),
     // v1.16 — 全局 UX 语言偏好(顶层,非 per-backend);resolveLang 优先级 config 层
     lang: z.string().optional(),
 });

package/dist/config/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACrB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,yEAAyE;IACzE,0EAA0E;IAC1E,wEAAwE;IACxE,iEAAiE;IACjE,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,IAAI,EAAE,CAAC;SACJ,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAClC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;KACrC,CAAC;SACD,QAAQ,EAAE;IACb,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC9D,0EAA0E;IAC1E,0EAA0E;IAC1E,yEAAyE;IACzE,gBAAgB;IAChB,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACpE,gEAAgE;IAChE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACrB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,0DAA0D;IAC1D,yEAAyE;IACzE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,yEAAyE;IACzE,0EAA0E;IAC1E,wEAAwE;IACxE,iEAAiE;IACjE,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,IAAI,EAAE,CAAC;SACJ,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAClC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;KACrC,CAAC;SACD,QAAQ,EAAE;IACb,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC9D,uDAAuD;IACvD,6DAA6D;IAC7D,0DAA0D;IAC1D,yBAAyB;IACzB,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,QAAQ,EAAE;IACnE,gEAAgE;IAChE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC"}

package/dist/diff/engine.js

@@ -137,6 +137,7 @@ const META_FIELDS = [
     "created_at",
     "source_materials",
     "lifecycle",
+    "schema_version",
 ];
 const BG_FIELDS = ["background", "goals"];
 const ENTITY_FIELDS = ["name", "description", "fields", "relations", "lifecycle_states"];
@@ -163,7 +164,7 @@ const ROLE_FIELDS = ["description", "typical_goals"];
 // ---------- 主入口 ----------
 export function diffPRDs(left, right) {
     const perModule = {};
-    perModule.meta = diffObjectModule(left?.meta, right?.meta, "meta", "版本信息", META_FIELDS);
+    perModule.meta = diffObjectModule({ ...left?.meta, schema_version: left?.schema_version }, { ...right?.meta, schema_version: right?.schema_version }, "meta", "版本信息", META_FIELDS);
     perModule.background_and_goals = diffObjectModule(left?.background_and_goals, right?.background_and_goals, "background_and_goals", "背景与目标", BG_FIELDS);
     perModule.users_and_roles = diffList(left?.users_and_roles, right?.users_and_roles, {
         module_key: "users_and_roles",