draftgo-cli 1.0.4 → 1.0.5

package/README.md

@@ -85,7 +85,7 @@ draftgo connect [target...]
 
 `draftgo status` 会通过只读 MCP 诊断显示服务连接健康状态、服务版本和 Registry revision；`--output json` 适合读取 `connection.health` 与 `connection.registry_revision`。
 
-`draftgo update` 和 `draftgo update all` 只刷新项目中已经安装的 DraftGo Skill，不会升级全局 CLI，也不会因为检测到 `.cursor`、`AGENTS.md` 等工具痕迹而新增配置。`draftgo init` 的自动识别只看宿主自有目录或文件（例如 `.cursor`、`.codex`），不把 `AGENTS.md`、`CLAUDE.md`、`GEMINI.md` 这类可共享说明文件当成安装目标。显式指定 target 时（例如 `draftgo update cursor` 或 `draftgo init cursor`），如果该 Skill 尚未安装，会按你的明确请求直接安装；首次接入请使用 `draftgo init <target>`。
+`draftgo update` 和 `draftgo update all` 只刷新项目中已经安装的 DraftGo Skill，不会升级全局 CLI，也不会因为检测到 `.cursor`、`AGENTS.md` 等工具痕迹而新增配置。`draftgo init` 的自动识别只看宿主自有目录或文件（例如 `.cursor`、`.codex`、`.zcode`），不把 `AGENTS.md`、`CLAUDE.md`、`GEMINI.md` 这类可共享说明文件当成安装目标。显式指定 target 时（例如 `draftgo update cursor` 或 `draftgo init cursor`），如果该 Skill 尚未安装，会按你的明确请求直接安装；首次接入请使用 `draftgo init <target>`。
 
 ### 发现与正文
 
@@ -105,7 +105,7 @@ draftgo conflict resolve <type> <id>
 
 `checkout` 下载正文和经过 hash 校验的 base。`commit` 先并发完成所有目标的本地与远端 preflight，全部通过后再并发上传；任何 409/412 都保留 base/local/remote 冲突材料，不 force、不覆盖、不自动合并。
 
-`--route`、`--title` 为精确匹配，同时给出时取交集。CLI 可用资源搜索缩小候选，但最终在本地做精确判定；服务端 `resource_search` 只接受通用 `query`，不能传 route/title。`map --summary` 不输出 project overview、资源列表或 hash。`diff --stat` 输出文件与增删行数，`--summary` 输出资源、版本和变更概要；只有不带这两个参数的 diff 才展开正文。
+`--route`、`--title` 为精确匹配，同时给出时取交集。CLI 可用资源搜索缩小候选，但最终在本地做精确判定。生产 DraftGo MCP 没有 `resource_search` 时，`map --type pages --route` 会改走 `listPageByRoute`。Windows Git Bash 传入的 `/admin/...` 会被还原成页面路由，而不是 Git 安装目录下的绝对路径。`map --summary` 不输出 project overview、资源列表或 hash。`diff --stat` 输出文件与增删行数，`--summary` 输出资源、版本和变更概要；只有不带这两个参数的 diff 才展开正文。
 
 ### Page 组件库
 
@@ -221,7 +221,7 @@ draftgo clean [--dry-run|--yes]
 
 Skill 只放稳定的领域知识、项目边界和操作规则；动态 operation schema 由 MCP 提供并缓存在项目运行时。Reference 不拆成更小文件，保留按任务路由、前端运行时、安全、checkout 和 MCP 契约所需的完整上下文，避免过度拆分损失效果。
 
-支持的 Skill target 包括 Claude Code、Cursor、Windsurf、Antigravity、Kiro、GitHub Copilot、Codex CLI、Gemini CLI 和 Pi。Pi 的项目级 Skill 安装到 `.agents/skills/draftgo/`，可被 Pi 按 Agent Skills 标准自动发现。
+支持的 Skill target 包括 Claude Code、Cursor、Windsurf、Antigravity、Kiro、GitHub Copilot、Codex CLI、Gemini CLI、Pi 和 ZCode。Codex 与 Pi 的项目级 Skill 都安装到 `.agents/skills/draftgo/`，符合 Agent Skills 仓库级发现路径；Codex 仍用 `.codex` 识别并写入 `.codex/config.toml`，旧的 `.codex/skills/draftgo/` 会在 update 时迁走。ZCode 安装到 `.zcode/skills/draftgo/`，MCP 写入 `.zcode/config.json` 的 `mcp.servers`。
 
 ## 开发与测试
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "draftgo-cli",
-  "version": "1.0.4",
-  "description": "Install and manage the DraftGo skill across AI coding agents (Claude Code, Codex, Cursor, Windsurf, Antigravity, Copilot, Gemini, Kiro, Pi).",
+  "version": "1.0.5",
+  "description": "Install and manage the DraftGo skill across AI coding agents (Claude Code, Codex, Cursor, Windsurf, Antigravity, Copilot, Gemini, Kiro, Pi, ZCode).",
   "bin": {
     "draftgo": "bin/draftgo.js"
   },
@@ -30,7 +30,8 @@
     "copilot",
     "gemini",
     "kiro",
-    "pi"
+    "pi",
+    "zcode"
   ],
   "author": "draftgo <cabinai@163.com> (https://github.com/draftgo)",
   "license": "MIT",

package/resources/skill/manifest.json

@@ -2,7 +2,7 @@
   "schema_version": "1.0",
   "id": "draftgo",
   "name": "DraftGo 开发助手",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "entry": "SKILL.md",
   "description": "以 Skill/reference 任务路由、MCP 实时发现、长正文 checkout/commit、统一验证和完成日志为边界的 DraftGo 工作流。",
   "license": "MIT",

package/resources/skill/references/mcp.md

@@ -86,7 +86,7 @@ draftgo mcp serve
 - `test` 建立独立新连接并验证关键工具；它不证明宿主持有的旧 session 仍有效。
 - `serve` 是 stdio bridge。远端 session 明确失效时重新 initialize 并重放当前请求一次；普通超时、服务错误和工具错误不重试。
 
-支持项目级 setup：Codex、Claude Code、Cursor、Gemini CLI、Kiro、GitHub Copilot。Windsurf 和 Antigravity 没有可靠项目级 MCP 配置，CLI 应明确提示不支持。
+支持项目级 setup：Codex、Claude Code、Cursor、Gemini CLI、Kiro、GitHub Copilot、ZCode。Windsurf 和 Antigravity 没有可靠项目级 MCP 配置，CLI 应明确提示不支持。
 
 宿主配置只运行：
 
@@ -94,7 +94,7 @@ draftgo mcp serve
 {"command":"draftgo","args":["mcp","serve"]}
 ```
 
-Codex 使用 `[mcp_servers.draftgo]`；GitHub Copilot 使用 `servers` 且声明 `type="stdio"`；其他支持宿主使用各自 `mcpServers`。配置不得包含 API Key、token、Authorization、headers、远端 `/mcp` URL、`env` 或带凭据命令。bridge 从当前项目 `.draftgo/config.json` 读取 server/API Key。
+Codex 使用 `.codex/config.toml` 的 `[mcp_servers.draftgo]`；GitHub Copilot 使用 `servers` 且声明 `type="stdio"`；ZCode 使用 `.zcode/config.json` 的 `mcp.servers.draftgo` 且声明 `type="stdio"`；其他支持宿主使用各自 `mcpServers`。配置不得包含 API Key、token、Authorization、headers、远端 `/mcp` URL、`env` 或带凭据命令。bridge 从当前项目 `.draftgo/config.json` 读取 server/API Key。
 
 `draftgo connect` 只保存并验证连接，不下载业务资源或创建本地镜像。MCP 不可用时运行 `draftgo mcp test` 收集证据。
 

package/src/commands/help.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { all } = require('../targets');
+const { all } = require('../targets');
 const { HOSTS } = require('../mcp/hosts');
 const { getPackageVersion } = require('../skill');
 
@@ -13,158 +13,158 @@ function help() {
 
   console.log(`draftgo v${getPackageVersion()} - DraftGo workbench CLI for AI coding agents
 
-DraftGo shell baseline: React + Vite. Database Pages default to native HTML,
-Tailwind CSS 4, and the DraftGo built-in component library (draftgo/*).
-Provider brands and shared icons are served from the local /assets/providers and
-/assets/icons directories; the Page runtime does not require third-party CDNs.
-System MCP handles live discovery and structured resources; complete page,
-navigation, and document bodies use checkout/commit outside MCP context.
-The installed Skill routes agents to task-specific References and MCP tools.
+DraftGo shell baseline: React + Vite. Database Pages default to native HTML,
+Tailwind CSS 4, and the DraftGo built-in component library (draftgo/*).
+Provider brands and shared icons are served from the local /assets/providers and
+/assets/icons directories; the Page runtime does not require third-party CDNs.
+System MCP handles live discovery and structured resources; complete page,
+navigation, and document bodies use checkout/commit outside MCP context.
+The installed Skill routes agents to task-specific References and MCP tools.
 
 Usage:
-  draftgo init [<target>...]       Install the DraftGo Skill. Omit the target
-                                    to detect host-owned directories such as
-                                    .cursor or .codex, not shared files like
-                                    AGENTS.md. Use "all" for every Skill target.
-  draftgo update [<target>...]     Refresh already installed Skills. Does not
-                                    upgrade the global CLI. An explicit target
-                                    may also install that target when missing.
+  draftgo init [<target>...]       Install the DraftGo Skill. Omit the target
+                                    to detect host-owned directories such as
+                                    .cursor, .codex, or .zcode, not shared files like
+                                    AGENTS.md. Use "all" for every Skill target.
+  draftgo update [<target>...]     Refresh already installed Skills. Does not
+                                    upgrade the global CLI. An explicit target
+                                    may also install that target when missing.
   draftgo uninstall <target|all>   Remove Skill files. --purge also removes
                                     the entire .draftgo/ runtime directory.
-  draftgo status                   Show connection health, Registry revision, targets, and Skill version.
+  draftgo status                   Show connection health, Registry revision, targets, and Skill version.
 
-  draftgo connect [<target>...]    Verify and save server/API Key, then configure
+  draftgo connect [<target>...]    Verify and save server/API Key, then configure
                                     a detected or explicit MCP host. This never
                                     downloads DraftGo business resources.
   draftgo mcp setup [<target>...]  Merge project-level stdio MCP configuration.
   draftgo mcp status [<target>...] Check host configuration and secret safety.
-  draftgo mcp test                 Test project, resource, and API MCP calls.
-  draftgo mcp serve                Bridge local stdio to the remote /mcp endpoint.
-
-  draftgo map [--type <type>]      Locate bounded remote resource metadata and
-                                    overlay matching local checkout state.
-                                    Use --route/--title for exact selection.
-  draftgo checkout <type> <id...>  Download a long-form body + verified base,
-                                    --force explicitly replaces local changes.
-  draftgo check                    Validate all checked-out content.
-                                    --remote also compares remote hash/version.
-  draftgo verify [<type> <id...>]   Run the default delivery verification.
-                                    Browser options are explicit and optional.
-  draftgo diff <type> <id>         Show checkout base versus local body/files.
-                                    --stat/--summary omit the full patch.
-  draftgo commit <type> <id...>    Validate and upload complete checked-out bodies/files.
-  draftgo components search <query>  Search the live component catalog.
-  draftgo components show <library/component>
-                                    Show HTML, props, slots, CSS variables and revision.
-  draftgo components expand --page <id> --instance <data-dg-instance>
-                                    Expand one component in a checked-out Page worktree.
-  draftgo components libraries list|show|create|update|delete
-                                    Manage component libraries.
-  draftgo components list|create|copy|delete
-                                    Manage component catalog entries.
-  draftgo components checkout|diff|verify|commit|publish <library/component>
-                                    Develop a component draft locally, then publish explicitly.
-  draftgo components import <zip> [--dry-run]
-  draftgo components export <library> [--file <zip>]
-                                    Transfer standard DraftGo component archives.
-  draftgo refresh <type> <id...>   Safely refresh a clean checkout from the cloud.
-  draftgo reconcile <type> <id...> Repair stale metadata only when local equals remote.
+  draftgo mcp test                 Test project, resource, and API MCP calls.
+  draftgo mcp serve                Bridge local stdio to the remote /mcp endpoint.
+
+  draftgo map [--type <type>]      Locate bounded remote resource metadata and
+                                    overlay matching local checkout state.
+                                    Use --route/--title for exact selection.
+  draftgo checkout <type> <id...>  Download a long-form body + verified base,
+                                    --force explicitly replaces local changes.
+  draftgo check                    Validate all checked-out content.
+                                    --remote also compares remote hash/version.
+  draftgo verify [<type> <id...>]   Run the default delivery verification.
+                                    Browser options are explicit and optional.
+  draftgo diff <type> <id>         Show checkout base versus local body/files.
+                                    --stat/--summary omit the full patch.
+  draftgo commit <type> <id...>    Validate and upload complete checked-out bodies/files.
+  draftgo components search <query>  Search the live component catalog.
+  draftgo components show <library/component>
+                                    Show HTML, props, slots, CSS variables and revision.
+  draftgo components expand --page <id> --instance <data-dg-instance>
+                                    Expand one component in a checked-out Page worktree.
+  draftgo components libraries list|show|create|update|delete
+                                    Manage component libraries.
+  draftgo components list|create|copy|delete
+                                    Manage component catalog entries.
+  draftgo components checkout|diff|verify|commit|publish <library/component>
+                                    Develop a component draft locally, then publish explicitly.
+  draftgo components import <zip> [--dry-run]
+  draftgo components export <library> [--file <zip>]
+                                    Transfer standard DraftGo component archives.
+  draftgo refresh <type> <id...>   Safely refresh a clean checkout from the cloud.
+  draftgo reconcile <type> <id...> Repair stale metadata only when local equals remote.
   draftgo conflicts                List unresolved conflicts; --all includes resolved.
   draftgo conflict show <type> <id>
                                     Show preserved base/local/remote paths.
   draftgo conflict resolve <type> <id>
                                     Mark a merged worktree file ready against the
                                     preserved remote base; then check/diff/commit.
-  draftgo clean [--dry-run|--yes]  Plan or remove all tmp and registered artifacts.
-  draftgo work start <item>       Add an active item to .draftgo/worklog.md.
-  draftgo work add <item>         Add an item awaiting a decision.
-  draftgo work wait <ref>         Mark an item waiting; --note records the reason.
-  draftgo work start-item <ref>   Mark an item active; ref is number or date#number.
-  draftgo work complete <ref>     Mark an item complete; --note appends evidence.
-  draftgo work show [<ref>]        Show all history or one item with notes.
-  draftgo work list                Latest first; --status active|waiting|completed,
-                                  --date YYYY-MM-DD, --limit 1-100 (20), --offset N.
+  draftgo clean [--dry-run|--yes]  Plan or remove all tmp and registered artifacts.
+  draftgo work start <item>       Add an active item to .draftgo/worklog.md.
+  draftgo work add <item>         Add an item awaiting a decision.
+  draftgo work wait <ref>         Mark an item waiting; --note records the reason.
+  draftgo work start-item <ref>   Mark an item active; ref is number or date#number.
+  draftgo work complete <ref>     Mark an item complete; --note appends evidence.
+  draftgo work show [<ref>]        Show all history or one item with notes.
+  draftgo work list                Latest first; --status active|waiting|completed,
+                                  --date YYYY-MM-DD, --limit 1-100 (20), --offset N.
 
-  draftgo api <query>              Search the live API contract through MCP.
-  draftgo api search <query>       Search the live operation registry explicitly.
-  draftgo api describe <operation_id>
-                                    Describe one live API operation through MCP.
-  draftgo api call <operation_id> --input <json-file>
-                                    Call one described operation with UTF-8 JSON.
-  draftgo capabilities list|search|show|audit
-                                    Discover and audit the current server's live operation catalog.
-  draftgo group <action>            Manage RBAC groups and group members.
-  draftgo api-key status|create|update|delete|rotate
-                                    Manage the current user's API key through MCP.
-  draftgo role permissions|list|create|get|update|delete
-                                    Manage structured permission templates.
-  draftgo delete <operation_id> [id]
-                                    Confirm and call a live delete operation.
+  draftgo api <query>              Search the live API contract through MCP.
+  draftgo api search <query>       Search the live operation registry explicitly.
+  draftgo api describe <operation_id>
+                                    Describe one live API operation through MCP.
+  draftgo api call <operation_id> --input <json-file>
+                                    Call one described operation with UTF-8 JSON.
+  draftgo capabilities list|search|show|audit
+                                    Discover and audit the current server's live operation catalog.
+  draftgo group <action>            Manage RBAC groups and group members.
+  draftgo api-key status|create|update|delete|rotate
+                                    Manage the current user's API key through MCP.
+  draftgo role permissions|list|create|get|update|delete
+                                    Manage structured permission templates.
+  draftgo delete <operation_id> [id]
+                                    Confirm and call a live delete operation.
   draftgo deploy [<type> <id...>]  Check, then diff or commit checked-out content.
                                     --delivery local needs no IDs; preview/deploy
                                     require an explicit type and IDs.
-  draftgo auto-push [<type> <id...>]
-                                    With config.auto_push=true, check and commit
-                                    changed checkouts. Any conflict stops the run.
-  draftgo local setup|start|stop|logs|status
-                                    Manage the project-local Docker stack.
+  draftgo auto-push [<type> <id...>]
+                                    With config.auto_push=true, check and commit
+                                    changed checkouts. Any conflict stops the run.
+  draftgo local setup|start|stop|logs|status
+                                    Manage the project-local Docker stack.
   draftgo list-targets             List Skill installation targets.
   draftgo -v | --version           Print CLI version.
   draftgo -h | --help              Show this help.
 
-Resource types:
-  pages | nav/navigations | docs/articles
+Resource types:
+  pages | nav/navigations | docs/articles
 
 Important flags:
   --project <dir>          Operate on <dir> instead of the current directory.
   --target <name,...>      Select one or more MCP setup/status targets.
-  --server <url>           (connect) DraftGo base URL.
-  --mcp-url <url>          (connect) Explicit endpoint; standard /mcp derives the
-                           base URL; custom paths also need --server.
-  --api-key <key>          (connect) DraftGo user API Key for non-interactive use.
-  --timeout <ms>           (connect/mcp test) Network timeout.
+  --server <url>           (connect) DraftGo base URL.
+  --mcp-url <url>          (connect) Explicit endpoint; standard /mcp derives the
+                           base URL; custom paths also need --server.
+  --api-key <key>          (connect) DraftGo user API Key for non-interactive use.
+  --timeout <ms>           (connect/mcp test) Network timeout.
   --allow-offline          (connect) Save only after explicitly accepting a
                            failed MCP validation.
   --no-mcp-setup           (connect) Do not write host MCP configuration.
   --force                  (init/checkout) Overwrite Skill or local changes.
   --purge                  (uninstall) Also remove the .draftgo/ directory.
-  --skip-update-check      (update) Compatibility flag; update never upgrades CLI.
-  --connect                (init) Continue into DraftGo server connection.
-  --no-setup               (init) Install the Skill without either setup flow.
-  --output json            Print machine-readable output where supported.
-  --type <type>            (map) pages | nav/navigations | docs/articles;
-                           (capabilities) alias for a Registry module filter.
-  --route <path>           (map) Select resources with this exact route.
-  --title <title>          (map) Select resources with this exact title.
-  --limit <1-100>          (map) Maximum resources returned per type/page;
-                           defaults to 20.
-  --cursor <cursor>        (map) Continue one typed map result page.
-  --summary                (map/diff) Print bounded resource or change summary.
-  --stat                   (diff) Print per-file and total change statistics.
-  --strict                 Treat check warnings as failures.
-  --remote                 (check) Compare checkout hashes/versions with remote.
+  --skip-update-check      (update) Compatibility flag; update never upgrades CLI.
+  --connect                (init) Continue into DraftGo server connection.
+  --no-setup               (init) Install the Skill without either setup flow.
+  --output json            Print machine-readable output where supported.
+  --type <type>            (map) pages | nav/navigations | docs/articles;
+                           (capabilities) alias for a Registry module filter.
+  --route <path>           (map) Select resources with this exact route.
+  --title <title>          (map) Select resources with this exact title.
+  --limit <1-100>          (map) Maximum resources returned per type/page;
+                           defaults to 20.
+  --cursor <cursor>        (map) Continue one typed map result page.
+  --summary                (map/diff) Print bounded resource or change summary.
+  --stat                   (diff) Print per-file and total change statistics.
+  --strict                 Treat check warnings as failures.
+  --remote                 (check) Compare checkout hashes/versions with remote.
   --yes                    Skip supported confirmation prompts.
   --operation-id <id>      (delete) Select an operation explicitly.
-  --params <json>          (api call/delete) Pass an API parameter object.
-  --input <file>           (api call/delete) Read a UTF-8 JSON object.
-  --delivery <mode>        (deploy) local | preview | deploy.
-  --dry-run                Preview supported cleanup or delivery operations.
-  --ui <mode>              (verify) always | never; default never.
-  --remote                 (check/verify) Compare checkout hashes with remote.
-  --viewport <mode>        (verify) mobile | desktop | both.
-  --frame <mode>           (verify) auto | top | all | <iframe-selector>.
-  --token <mode>           (verify) auto | never; auto appends the configured
-                           API Key to same-origin URLs as the token query parameter.
-  --screenshot <mode>      (verify) always | never; always alone captures a screenshot.
-  --browser <name>         (verify) chromium | chrome | msedge.
-  --browser-path <file>    (verify) Explicit browser executable; environment
-                           fallback: DRAFTGO_BROWSER_PATH.
-  --selector <css>         (verify) Require a visible element in top or iframe DOM.
-  --width/--height <px>    (verify) Override the default 1440x900 desktop viewport.
+  --params <json>          (api call/delete) Pass an API parameter object.
+  --input <file>           (api call/delete) Read a UTF-8 JSON object.
+  --delivery <mode>        (deploy) local | preview | deploy.
+  --dry-run                Preview supported cleanup or delivery operations.
+  --ui <mode>              (verify) always | never; default never.
+  --remote                 (check/verify) Compare checkout hashes with remote.
+  --viewport <mode>        (verify) mobile | desktop | both.
+  --frame <mode>           (verify) auto | top | all | <iframe-selector>.
+  --token <mode>           (verify) auto | never; auto appends the configured
+                           API Key to same-origin URLs as the token query parameter.
+  --screenshot <mode>      (verify) always | never; always alone captures a screenshot.
+  --browser <name>         (verify) chromium | chrome | msedge.
+  --browser-path <file>    (verify) Explicit browser executable; environment
+                           fallback: DRAFTGO_BROWSER_PATH.
+  --selector <css>         (verify) Require a visible element in top or iframe DOM.
+  --width/--height <px>    (verify) Override the default 1440x900 desktop viewport.
 
 Security:
-  .draftgo/config.json stores the server and API Key and is gitignored. Host MCP
-  files contain only "draftgo mcp serve"; they never contain the API Key.
+  .draftgo/config.json stores the server and API Key and is gitignored. Host MCP
+  files contain only "draftgo mcp serve"; they never contain the API Key.
 
 MCP targets (project config or status):
 ${mcpTargets}
@@ -174,15 +174,15 @@ ${targets}
 
 Examples:
   draftgo init codex
-  draftgo connect codex --server https://draftgo.example --api-key <key>
-  draftgo mcp test
-  draftgo map --type pages --route /admin/channel-ops --summary --output json
+  draftgo connect codex --server https://draftgo.example --api-key <key>
+  draftgo mcp test
+  draftgo map --type pages --route /admin/channel-ops --summary --output json
   draftgo checkout pages 42
-  draftgo verify pages 42
-  draftgo diff pages 42 --stat
-  draftgo commit pages 42
-  draftgo work start "Build document management and role permissions"
-  draftgo work complete 1 --note "Verification and delivery passed"
+  draftgo verify pages 42
+  draftgo diff pages 42 --stat
+  draftgo commit pages 42
+  draftgo work start "Build document management and role permissions"
+  draftgo work complete 1 --note "Verification and delivery passed"
   draftgo deploy docs 7 --delivery preview
 `);
 }

package/src/commands/map.js

@@ -19,6 +19,9 @@ const LIST_OPERATIONS = Object.freeze({
   navigations: 'listNavigation',
   'docs/articles': 'listDocAdminArticle',
 });
+const EXACT_ROUTE_OPERATIONS = Object.freeze({
+  pages: 'listPageByRoute',
+});
 
 function itemsFrom(value) {
   if (Array.isArray(value)) return value;
@@ -29,6 +32,15 @@ function itemsFrom(value) {
   return [];
 }
 
+function resourcesFrom(value) {
+  const items = itemsFrom(value);
+  if (items.length) return items;
+  if (value && typeof value === 'object' && (value.id != null || value.resource_id != null)) {
+    return [value];
+  }
+  return [];
+}
+
 function nextCursor(value) {
   if (!value || typeof value !== 'object') return null;
   if (Object.prototype.hasOwnProperty.call(value, 'next_cursor')) return value.next_cursor;
@@ -70,20 +82,28 @@ function queryProperties(operation) {
   return query && query.properties && typeof query.properties === 'object' ? query.properties : {};
 }
 
+function registryOperationID(type, flags) {
+  return flags.route != null && EXACT_ROUTE_OPERATIONS[type]
+    ? EXACT_ROUTE_OPERATIONS[type]
+    : LIST_OPERATIONS[type];
+}
+
 function registryQuery(operation, operationID, flags) {
   const properties = queryProperties(operation);
   const query = {};
-  const limit = positiveLimit(flags.limit);
-  const cursor = flags.cursor == null ? '' : String(flags.cursor);
-  if (Object.prototype.hasOwnProperty.call(properties, 'cursor')) {
-    if (cursor) query.cursor = cursor;
-    if (Object.prototype.hasOwnProperty.call(properties, 'limit')) query.limit = limit;
-  } else if (Object.prototype.hasOwnProperty.call(properties, 'page')
-      && Object.prototype.hasOwnProperty.call(properties, 'page_size')) {
-    query.page = registryPageFromCursor(cursor, operationID);
-    query.page_size = limit;
-  } else if (cursor) {
-    throw new Error(`${operationID} does not expose a paginated Registry contract.`);
+  if (operationID !== 'listPageByRoute') {
+    const limit = positiveLimit(flags.limit);
+    const cursor = flags.cursor == null ? '' : String(flags.cursor);
+    if (Object.prototype.hasOwnProperty.call(properties, 'cursor')) {
+      if (cursor) query.cursor = cursor;
+      if (Object.prototype.hasOwnProperty.call(properties, 'limit')) query.limit = limit;
+    } else if (Object.prototype.hasOwnProperty.call(properties, 'page')
+        && Object.prototype.hasOwnProperty.call(properties, 'page_size')) {
+      query.page = registryPageFromCursor(cursor, operationID);
+      query.page_size = limit;
+    } else if (cursor) {
+      throw new Error(`${operationID} does not expose a paginated Registry contract.`);
+    }
   }
 
   const search = flags.route != null ? normalizeRoute(flags.route)
@@ -93,6 +113,7 @@ function registryQuery(operation, operationID, flags) {
       ? 'route'
       : ['search', 'q', 'query'].find((candidate) => Object.prototype.hasOwnProperty.call(properties, candidate));
     if (key) query[key] = search;
+    else if (operationID === 'listPageByRoute') query.route = search;
   }
   return query;
 }
@@ -131,10 +152,22 @@ function requestedResourceTypes(flags = {}) {
     : [normalizeMapResourceType(flags.type)];
 }
 
+function recoverCliRoute(value) {
+  // Git Bash converts POSIX paths like /admin/channel-ops into a Windows path
+  // under the Git install root. Recover the original route before matching.
+  const text = String(value == null ? '' : value).trim().replace(/\\/g, '/');
+  const converted = text.match(/^[A-Za-z]:\/(?:[^/]+\/)*Git(\/.*)$/i);
+  return converted ? converted[1] : text;
+}
+
 function normalizeRoute(value) {
-  // DraftGo stores page routes without surrounding slashes. Accept either the
-  // stored form or the browser form users naturally paste into the CLI.
-  return String(value == null ? '' : value).trim().replace(/^\/+|\/+$/g, '');
+  // DraftGo stores page routes with a leading slash and no trailing slash,
+  // except for `/`. Accept stored, browser, and Git-Bash-converted forms.
+  let route = recoverCliRoute(value);
+  if (!route) return '';
+  if (!route.startsWith('/')) route = `/${route}`;
+  if (route !== '/') route = route.replace(/\/+$/g, '');
+  return route;
 }
 
 function positiveLimit(value, fallback = 20) {
@@ -209,7 +242,7 @@ async function listRegistryResources(projectDir, config, session, resourceTypes,
     throw new Error('Map --cursor requires exactly one --type.');
   }
   const groups = await allWithAbort(resourceTypes.map((type) => async (options) => {
-    const operationID = LIST_OPERATIONS[type];
+    const operationID = registryOperationID(type, flags);
     const revision = await registryRevision(session, operationID);
     const description = await descriptionForRevision(projectDir, config, session, operationID, revision);
     const operation = description.operation || {};
@@ -220,16 +253,25 @@ async function listRegistryResources(projectDir, config, session, resourceTypes,
     };
     if (Object.keys(query).length) invoke.query = query;
     const payload = await callStructured(session, TOOL_NAMES.apiCall, invoke, options);
+    const status = payload && (payload.status_code ?? payload.statusCode);
+    if (Number(status) === 404) {
+      return {
+        resources: [],
+        pagination: { next_cursor: null, has_more: false, total: 0 },
+      };
+    }
     const response = payload && payload.response !== undefined ? payload.response
       : payload && payload.data !== undefined ? payload.data : payload;
-    const responseItems = itemsFrom(response);
+    const responseItems = resourcesFrom(response);
     const resources = responseItems
       .map((item) => ({ ...item, resource_type: type, resource_id: String(item.resource_id ?? item.id) }))
       .filter((item) => item.resource_id && item.resource_id !== 'undefined')
       .filter((item) => resourceMatches(item, flags));
     return {
       resources,
-      pagination: registryPagination(response, operationID, query, responseItems.length),
+      pagination: operationID === 'listPageByRoute'
+        ? { next_cursor: null, has_more: false, total: resources.length }
+        : registryPagination(response, operationID, query, responseItems.length),
     };
   }));
   return {
@@ -378,6 +420,7 @@ async function mapCommand(projectDir, flags = {}) {
 
 module.exports = mapCommand;
 module.exports.itemsFrom = itemsFrom;
+module.exports.resourcesFrom = resourcesFrom;
 module.exports.normalizeMapResourceType = normalizeMapResourceType;
 module.exports.requestedResourceTypes = requestedResourceTypes;
 module.exports.listRemoteResources = listRemoteResources;

package/src/commands/uninstall.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('../logger');
-const { all, resolveTargets } = require('../targets');
+const { all, resolveTargets } = require('../targets');
 const { removePath } = require('../fsx');
 const { dgDir } = require('../paths');
 
@@ -25,11 +25,18 @@ async function uninstall(projectDir, positional, flags) {
     }
   }
 
+  const resolvedNames = new Set(resolved.map((target) => target.name));
   log.step('移除入口文件');
   for (const t of resolved) {
     try {
-      const removed = t.uninstall(projectDir);
-      if (removed) log.ok(`${t.displayName} 入口已移除`);
+      const keepSharedSkill = all.some((other) =>
+        other.name !== t.name
+        && !resolvedNames.has(other.name)
+        && other.assetDir === t.assetDir
+        && other.mainFile === t.mainFile);
+      const removed = t.uninstall(projectDir, { keepSharedSkill });
+      if (keepSharedSkill) log.dim(`${t.displayName} 与其他宿主共用 Skill 目录，已保留`);
+      else if (removed) log.ok(`${t.displayName} 入口已移除`);
       else log.dim(`${t.displayName} 入口不存在，跳过`);
     } catch (e) {
       log.err(`${t.displayName} 卸载失败：${e.message}`);
@@ -38,12 +45,12 @@ async function uninstall(projectDir, positional, flags) {
 
   // Each AI-tool skill directory is self-contained, so per-target uninstall
   // already wiped its content above. Only --purge nukes runtime data under
-  // .draftgo/ (config/worklog/lessons/cache etc.).
-  if (flags.purge) {
-    if (removePath(dgDir(projectDir))) {
-      log.warn('已使用 --purge：.draftgo/（含 config/worklog/lessons 等运行时数据）已删除。');
-    }
-  }
+  // .draftgo/ (config/worklog/lessons/cache etc.).
+  if (flags.purge) {
+    if (removePath(dgDir(projectDir))) {
+      log.warn('已使用 --purge：.draftgo/（含 config/worklog/lessons 等运行时数据）已删除。');
+    }
+  }
 
   log.title('完成');
   return 0;

package/src/mcp/hosts.js

@@ -22,6 +22,7 @@ const HOSTS = Object.freeze([
   { name: 'gemini', displayName: 'Gemini CLI', path: '.gemini/settings.json', format: 'jsonc', registry: 'mcpServers', signals: ['.gemini'] },
   { name: 'kiro', displayName: 'Kiro', path: '.kiro/settings/mcp.json', format: 'jsonc', registry: 'mcpServers', signals: ['.kiro'] },
   { name: 'copilot', aliases: ['github-copilot'], displayName: 'GitHub Copilot', path: '.vscode/mcp.json', format: 'jsonc', registry: 'servers', vscode: true, signals: ['.vscode', '.github/prompts', '.github/copilot-instructions.md'] },
+  { name: 'zcode', displayName: 'ZCode', path: '.zcode/config.json', format: 'jsonc', registry: 'mcp.servers', vscode: true, signals: ['.zcode'] },
   { name: 'windsurf', displayName: 'Windsurf', supported: false, reason: 'Windsurf has no supported project-level MCP configuration adapter.', signals: ['.windsurf'] },
   { name: 'antigravity', displayName: 'Antigravity', supported: false, reason: 'Antigravity has no supported project-level MCP configuration adapter.', signals: ['.agent'] },
 ]);
@@ -249,41 +250,85 @@ function insertObjectProperty(source, open, close, key, value, newline) {
   );
 }
 
+function registryPath(registry) {
+  return String(registry || '').split('.').map((part) => part.trim()).filter(Boolean);
+}
+
+function nestedValue(value, keys) {
+  let current = value;
+  for (const key of keys) {
+    if (!current || typeof current !== 'object' || Array.isArray(current) || !Object.prototype.hasOwnProperty.call(current, key)) {
+      return undefined;
+    }
+    current = current[key];
+  }
+  return current;
+}
+
+function assertRegistryObjects(parsed, keys, file) {
+  let current = parsed;
+  for (let index = 0; index < keys.length; index += 1) {
+    const key = keys[index];
+    if (current[key] === undefined) return;
+    if (!current[key] || typeof current[key] !== 'object' || Array.isArray(current[key])) {
+      throw new Error(`Invalid ${file}: ${keys.slice(0, index + 1).join('.')} must be an object.`);
+    }
+    current = current[key];
+  }
+}
+
+function findNestedObject(source, open, close, keys) {
+  let currentOpen = open;
+  let currentClose = close;
+  let matched = 0;
+  for (const key of keys) {
+    const property = objectProperties(source, currentOpen, currentClose).find((item) => item.key === key);
+    if (!property) break;
+    currentOpen = property.valueStart;
+    currentClose = scanComposite(source, currentOpen) - 1;
+    matched += 1;
+  }
+  return { open: currentOpen, close: currentClose, matched };
+}
+
+function upsertDraftGoEntry(source, open, close, entry, newline) {
+  const serverProperties = objectProperties(source, open, close);
+  const draftgo = serverProperties.find((item) => item.key === 'draftgo');
+  if (draftgo) {
+    const indent = lineIndent(source, draftgo.propertyStart);
+    return replaceRange(
+      source,
+      draftgo.valueStart,
+      draftgo.valueEnd,
+      formatJsonValue(entry, indent, newline),
+    );
+  }
+  return insertObjectProperty(source, open, close, 'draftgo', entry, newline);
+}
+
 function mergeJsoncConfig(source, registry, entry, file = 'MCP config') {
+  const keys = registryPath(registry);
+  if (!keys.length) throw new Error(`Invalid ${file}: MCP registry path is missing.`);
   const initial = source.trim() ? source : '{\n}\n';
   const parsed = parseJsonc(initial, file);
-  if (parsed[registry] !== undefined
-      && (!parsed[registry] || typeof parsed[registry] !== 'object' || Array.isArray(parsed[registry]))) {
-    throw new Error(`Invalid ${file}: ${registry} must be an object.`);
-  }
+  assertRegistryObjects(parsed, keys, file);
 
   const newline = initial.includes('\r\n') ? '\r\n' : '\n';
   const rootOffset = initial.charCodeAt(0) === 0xfeff ? 1 : 0;
   const rootOpen = skipTrivia(initial, rootOffset);
   const rootEnd = scanComposite(initial, rootOpen);
   const rootClose = rootEnd - 1;
-  const rootProperties = objectProperties(initial, rootOpen, rootClose);
-  const registryProperty = rootProperties.find((item) => item.key === registry);
+  const nested = findNestedObject(initial, rootOpen, rootClose, keys);
   let result;
 
-  if (!registryProperty) {
-    result = insertObjectProperty(initial, rootOpen, rootClose, registry, { draftgo: entry }, newline);
+  if (nested.matched === keys.length) {
+    result = upsertDraftGoEntry(initial, nested.open, nested.close, entry, newline);
   } else {
-    const registryOpen = registryProperty.valueStart;
-    const registryClose = scanComposite(initial, registryOpen) - 1;
-    const serverProperties = objectProperties(initial, registryOpen, registryClose);
-    const draftgo = serverProperties.find((item) => item.key === 'draftgo');
-    if (draftgo) {
-      const indent = lineIndent(initial, draftgo.propertyStart);
-      result = replaceRange(
-        initial,
-        draftgo.valueStart,
-        draftgo.valueEnd,
-        formatJsonValue(entry, indent, newline),
-      );
-    } else {
-      result = insertObjectProperty(initial, registryOpen, registryClose, 'draftgo', entry, newline);
+    let value = { draftgo: entry };
+    for (let index = keys.length - 1; index > nested.matched; index -= 1) {
+      value = { [keys[index]]: value };
     }
+    result = insertObjectProperty(initial, nested.open, nested.close, keys[nested.matched], value, newline);
   }
 
   parseJsonc(result, file);
@@ -482,7 +527,7 @@ function statusHost(projectDir, target) {
   if (host.format === 'toml') return { host, supported: true, path: file, ...codexStatus(source) };
   try {
     const value = parseJsonc(source, host.path);
-    const registry = value[host.registry];
+    const registry = nestedValue(value, registryPath(host.registry));
     const entry = registry && typeof registry === 'object' && !Array.isArray(registry)
       ? registry.draftgo
       : undefined;

package/src/platforms.js

@@ -79,10 +79,13 @@ const platforms = [
   {
     name: 'codex',
     displayName: 'Codex CLI',
-    mainFile: '.codex/skills/draftgo/SKILL.md',
-    assetDir: '.codex/skills/draftgo',
-    skillDir: '.codex/skills/draftgo',
+    // Repo-level Codex skills now follow the Agent Skills path.
+    // MCP config still lives in .codex/config.toml, so detection stays on .codex.
+    mainFile: '.agents/skills/draftgo/SKILL.md',
+    assetDir: '.agents/skills/draftgo',
+    skillDir: '.agents/skills/draftgo',
     signals: ['.codex'],
+    legacyAssetDirs: ['.codex/skills/draftgo'],
     frontmatter: { name: SKILL_NAME, description: DESCRIPTION },
   },
   {
@@ -100,7 +103,16 @@ const platforms = [
     mainFile: '.agents/skills/draftgo/SKILL.md',
     assetDir: '.agents/skills/draftgo',
     skillDir: '.agents/skills/draftgo',
-    signals: ['.agents/skills', '.pi'],
+    signals: ['.pi'],
+    frontmatter: { name: SKILL_NAME, description: DESCRIPTION },
+  },
+  {
+    name: 'zcode',
+    displayName: 'ZCode',
+    mainFile: '.zcode/skills/draftgo/SKILL.md',
+    assetDir: '.zcode/skills/draftgo',
+    skillDir: '.zcode/skills/draftgo',
+    signals: ['.zcode'],
     frontmatter: { name: SKILL_NAME, description: DESCRIPTION },
   },
 ];

package/src/skill.js

@@ -193,6 +193,19 @@ function ensureRuntime(projectDir) {
   appendGitignoreLine(projectDir, '.draftgo/conflicts/');
 }
 
+function legacySkillDirs(projectDir, platform) {
+  const destAsset = path.resolve(path.join(projectDir, platform.assetDir));
+  return (platform.legacyAssetDirs || [])
+    .map((relative) => path.join(projectDir, relative))
+    .filter((absolute) => path.resolve(absolute) !== destAsset && exists(absolute));
+}
+
+function skillAlreadyInstalled(projectDir, platform) {
+  const destAsset = path.join(projectDir, platform.assetDir);
+  const destMain = path.join(projectDir, platform.mainFile);
+  return exists(destAsset) || exists(destMain) || legacySkillDirs(projectDir, platform).length > 0;
+}
+
 function installPlatform(projectDir, platform, opts = {}) {
   if (!exists(SKILL_SOURCE_DIR)) {
     throw new Error(
@@ -202,7 +215,7 @@ function installPlatform(projectDir, platform, opts = {}) {
   const destAsset = path.join(projectDir, platform.assetDir);
   const destMain  = path.join(projectDir, platform.mainFile);
   const mainOutsideAsset = path.relative(destAsset, destMain).startsWith('..');
-  if ((exists(destAsset) || exists(destMain)) && !opts.force) {
+  if (skillAlreadyInstalled(projectDir, platform) && !opts.force) {
     return { path: platform.mainFile, skipped: true };
   }
 
@@ -251,24 +264,31 @@ function installPlatform(projectDir, platform, opts = {}) {
 
   if (exists(backupAsset)) removePath(backupAsset);
   if (backupMain && exists(backupMain)) removePath(backupMain);
+  for (const legacyDir of legacySkillDirs(projectDir, platform)) removePath(legacyDir);
   if (!exists(destMain)) throw new Error(`安装后缺少入口文件：${platform.mainFile}`);
 
   return { path: platform.mainFile };
 }
 
-function uninstallPlatform(projectDir, platform) {
+function uninstallPlatform(projectDir, platform, opts = {}) {
   const destAsset = path.join(projectDir, platform.assetDir);
   const destMain  = path.join(projectDir, platform.mainFile);
   let removed = false;
-  if (exists(destAsset)) { removePath(destAsset); removed = true; }
-  if (path.relative(destAsset, destMain).startsWith('..') && exists(destMain)) {
-    removePath(destMain); removed = true;
+  if (!opts.keepSharedSkill) {
+    if (exists(destAsset)) { removePath(destAsset); removed = true; }
+    if (path.relative(destAsset, destMain).startsWith('..') && exists(destMain)) {
+      removePath(destMain); removed = true;
+    }
+  }
+  for (const legacyDir of legacySkillDirs(projectDir, platform)) {
+    removePath(legacyDir);
+    removed = true;
   }
   return removed;
 }
 
 function statusPlatform(projectDir, platform) {
-  return { installed: exists(path.join(projectDir, platform.mainFile)) };
+  return { installed: skillAlreadyInstalled(projectDir, platform) };
 }
 
 function installAll(projectDir, platforms, opts = {}) {

package/src/targets.js

@@ -14,8 +14,8 @@ function makeInstaller(p) {
     install(projectDir, opts) {
       return skill.installPlatform(projectDir, p, opts || {});
     },
-    uninstall(projectDir) {
-      return skill.uninstallPlatform(projectDir, p);
+    uninstall(projectDir, opts) {
+      return skill.uninstallPlatform(projectDir, p, opts || {});
     },
     status(projectDir) {
       return skill.statusPlatform(projectDir, p);