draftgo-cli 1.0.4 → 1.0.6

package/src/commands/checkout.js

@@ -1,15 +1,62 @@
 'use strict';
 
 const log = require('../logger');
+const { loadProjectConfig } = require('../projectConfig');
+const { TOOL_NAMES, openToolSession } = require('../mcp/tools');
+const { canonicalResourceType } = require('../worktree/types');
 const { checkoutResources } = require('../worktree');
+const map = require('./map');
+
+const USAGE = 'Usage: draftgo checkout <pages|nav|docs|services> <id...>';
+
+async function resolveUniqueHit(projectDir, resourceType, flags) {
+  const canonical = canonicalResourceType(resourceType);
+  if (canonical === 'services') {
+    log.err('Checkout --route and --title are not supported for services.');
+    return null;
+  }
+  const config = loadProjectConfig(projectDir);
+  const resourceTypes = [map.normalizeMapResourceType(resourceType)];
+  const searching = flags.route != null || flags.title != null;
+  let remote;
+  try {
+    const session = await openToolSession(config, [searching ? TOOL_NAMES.resourceSearch : TOOL_NAMES.resourceList]);
+    remote = await map.listMapResources(session, resourceTypes, flags);
+  } catch (error) {
+    if (!error || error.code !== 'MCP_TOOL_UNAVAILABLE') throw error;
+    const session = await openToolSession(config, [TOOL_NAMES.apiSearch, TOOL_NAMES.apiDescribe, TOOL_NAMES.apiCall]);
+    remote = await map.listRegistryResources(projectDir, config, session, resourceTypes, flags);
+  }
+  const matches = (remote && remote.resources || []).filter((resource) => map.resourceMatches(resource, flags));
+  if (matches.length === 0) {
+    log.err(`No ${canonical} matched the given --route/--title.`);
+    return null;
+  }
+  if (matches.length !== 1) {
+    log.err(`Checkout --route/--title matched ${matches.length} ${canonical}; require exactly one.`);
+    return null;
+  }
+  return String(matches[0].resource_id);
+}
 
 async function checkout(projectDir, positional, flags = {}) {
   const [resourceType, ...ids] = positional;
-  if (!resourceType || !ids.length) {
-    log.err('Usage: draftgo checkout <pages|nav|docs> <id...>');
+  const selecting = flags.route != null || flags.title != null;
+  if (!resourceType || (!ids.length && !selecting)) {
+    log.err(USAGE);
     return 1;
   }
-  const results = await checkoutResources(projectDir, resourceType, ids, { force: Boolean(flags.force) });
+  let resourceIds = ids;
+  if (selecting) {
+    if (ids.length) {
+      log.err('Checkout --route/--title cannot be combined with resource ids.');
+      return 1;
+    }
+    const resourceId = await resolveUniqueHit(projectDir, resourceType, flags);
+    if (!resourceId) return 1;
+    resourceIds = [resourceId];
+  }
+  const results = await checkoutResources(projectDir, resourceType, resourceIds, { force: Boolean(flags.force) });
   if (flags.output === 'json') console.log(JSON.stringify(results, null, 2));
   else for (const entry of results) log.ok(`Checked out ${entry.resource_type} ${entry.resource_id} -> ${entry.local_path}`);
   return 0;

package/src/commands/commit.js

@@ -6,7 +6,7 @@ const { commitResources } = require('../worktree');
 async function commit(projectDir, positional, flags = {}) {
   const [resourceType, ...ids] = positional;
   if (!resourceType || !ids.length) {
-    log.err('Usage: draftgo commit <pages|nav|docs> <id...>');
+    log.err('Usage: draftgo commit <pages|nav|docs|services> <id...>');
     return 1;
   }
   const streamed = [];

package/src/commands/conflict.js

@@ -15,7 +15,7 @@ function printRecord(record) {
 async function conflict(projectDir, positional, flags = {}) {
   const [action, resourceType, resourceId] = positional;
   if (!['show', 'resolve'].includes(action) || !resourceType || !resourceId) {
-    log.err('Usage: draftgo conflict <show|resolve> <pages|nav|docs> <id>');
+    log.err('Usage: draftgo conflict <show|resolve> <pages|nav|docs|services> <id>');
     return 1;
   }
   const record = action === 'show'

package/src/commands/diff.js

@@ -8,7 +8,7 @@ const { absolutePath } = require('../worktree/manifest');
 function diff(projectDir, positional, flags = {}) {
   const [resourceType, resourceId] = positional;
   if (!resourceType || !resourceId) {
-    log.err('Usage: draftgo diff <pages|nav|docs> <id>');
+    log.err('Usage: draftgo diff <pages|nav|docs|services> <id>');
     return 1;
   }
   const result = diffResource(projectDir, resourceType, resourceId);

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, document, and Go source 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 | services
 
 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/checkout) Select resources with this exact route.
+  --title <title>          (map/checkout) 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/reconcile.js

@@ -6,7 +6,7 @@ const { reconcileResources } = require('../worktree');
 async function reconcile(projectDir, positional, flags = {}) {
   const [resourceType, ...ids] = positional;
   if (!resourceType || !ids.length) {
-    log.err('Usage: draftgo reconcile <pages|nav|docs> <id...>');
+    log.err('Usage: draftgo reconcile <pages|nav|docs|services> <id...>');
     return 1;
   }
   const results = await reconcileResources(projectDir, resourceType, ids);

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;