draftgo-cli 3.0.33 → 3.0.38

package/src/commands/delete.js

@@ -1,88 +1,103 @@
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
-const { exists } = require('../fsx');
 const log = require('../logger');
 const { confirm } = require('../prompt');
-const { findPython } = require('../python');
-const { spawnSync } = require('child_process');
-const { platforms } = require('../platforms');
+const { loadProjectConfig } = require('../projectConfig');
+const { TOOL_NAMES, openToolSession, callStructured } = require('../mcp/tools');
 
-function findDeleteScript(projectDir) {
-  for (const platform of platforms) {
-    const candidate = path.join(projectDir, platform.assetDir, 'scripts', 'draftgo_delete.py');
-    if (exists(candidate)) return candidate;
-  }
-  const bundled = path.resolve(__dirname, '..', '..', 'resources', 'skill', 'scripts', 'draftgo_delete.py');
-  return exists(bundled) ? bundled : null;
-}
+const LEGACY_TYPES = new Set([
+  'page', 'pages', 'nav', 'navigation', 'navigations', 'doc', 'docs', 'article',
+  'db_meta', 'custom_scripts', 'doc_categories', 'aihub', 'roles', 'users', 'system_config',
+]);
 
-const TYPE_ALIASES = {
-  page: 'pages',
-  pages: 'pages',
-  nav: 'nav',
-  navigations: 'nav',
-  db_meta: 'db_meta',
-  script: 'custom_scripts',
-  scripts: 'custom_scripts',
-  custom_scripts: 'custom_scripts',
-  doc: 'docs',
-  docs: 'docs',
-  doc_category: 'doc_categories',
-  doc_categories: 'doc_categories',
-  aihub: 'aihub',
-};
+function resultItems(value) {
+  if (Array.isArray(value)) return value;
+  if (!value || typeof value !== 'object') return [];
+  if (Array.isArray(value.items)) return value.items;
+  if (Array.isArray(value.operations)) return value.operations;
+  return value.data ? resultItems(value.data) : [];
+}
 
-async function deleteResource(projectDir, positional, flags) {
-  const [typeRaw, id] = positional;
+function operationId(value) {
+  return value && (value.operation_id || value.operationId || value.id);
+}
 
-  if (!typeRaw || !id) {
-    log.err('用法：draftgo delete <type> <id>');
-    log.dim('  支持类型：pages | nav | db_meta | custom_scripts | docs | doc_categories | aihub');
-    return 1;
+function readParams(projectDir, flags) {
+  const raw = flags.params ? String(flags.params)
+    : flags.input ? fs.readFileSync(path.resolve(projectDir, String(flags.input)), 'utf8') : '';
+  if (!raw) return {};
+  const parsed = JSON.parse(raw);
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('Delete MCP parameters must be a JSON object.');
   }
+  return parsed;
+}
 
-  const type = TYPE_ALIASES[typeRaw];
-  if (!type) {
-    log.err(`未知类型：${typeRaw}`);
-    return 1;
-  }
+function pathParameterName(description) {
+  const source = description && (description.parameters || description.params
+    || description.operation && description.operation.parameters) || [];
+  const pathParameters = source.filter((parameter) => parameter && parameter.in === 'path');
+  return pathParameters.length === 1 ? pathParameters[0].name : null;
+}
 
-  if (!exists(path.join(projectDir, '.draftgo', 'config.json'))) {
-    log.err('未找到 .draftgo/config.json，请先运行 /draftgo init');
+async function deleteResource(projectDir, positional, flags = {}) {
+  if (!positional.length && !flags['operation-id']) {
+    log.err('Usage: draftgo delete <operation_id> [id] [--params JSON]');
+    log.dim('  Legacy form is supported when discovery is unambiguous: draftgo delete <type> <id>.');
     return 1;
   }
+  const config = loadProjectConfig(projectDir);
+  const session = await openToolSession(config, [
+    TOOL_NAMES.apiSearch, TOOL_NAMES.apiDescribe, TOOL_NAMES.apiCall,
+  ]);
 
-  const py = findPython();
-  if (!py) {
-    log.err('未检测到 Python，无法运行删除脚本');
-    return 1;
+  const first = String(positional[0] || '');
+  const legacy = LEGACY_TYPES.has(first.toLowerCase()) && !flags['operation-id'];
+  let selectedOperation = flags['operation-id'] ? String(flags['operation-id']) : (legacy ? null : first);
+  const resourceId = legacy ? positional[1] : positional[1];
+  if (legacy) {
+    if (!resourceId) {
+      log.err('Legacy delete form requires a resource id.');
+      return 1;
+    }
+    const search = await callStructured(session, TOOL_NAMES.apiSearch, { query: `delete ${first}` });
+    const candidates = resultItems(search).filter((item) => operationId(item)
+      && (!item.method || String(item.method).toUpperCase() === 'DELETE'));
+    if (candidates.length !== 1) {
+      log.err(`Delete operation discovery was ambiguous (${candidates.length} matches).`);
+      log.dim(`  Run \`draftgo api delete ${first}\`, then pass --operation-id explicitly.`);
+      return 1;
+    }
+    selectedOperation = operationId(candidates[0]);
   }
 
-  const script = findDeleteScript(projectDir);
-  if (!script) {
-    log.err('未找到 draftgo_delete.py，请运行 draftgo update 更新');
-    return 1;
+  const description = await callStructured(session, TOOL_NAMES.apiDescribe, {
+    operation_id: selectedOperation,
+  });
+  const params = readParams(projectDir, flags);
+  if (resourceId && Object.keys(params).length === 0) {
+    const parameterName = pathParameterName(description);
+    if (!parameterName) {
+      log.err('The operation does not expose exactly one path parameter; provide --params JSON explicitly.');
+      return 1;
+    }
+    params.path_params = { [parameterName]: resourceId };
   }
-
   if (!flags.yes && !flags.y) {
-    const ok = await confirm(`确认删除 ${type} id=${id}？此操作不可恢复`);
-    if (!ok) {
-      log.dim('已取消');
-      return 0;
-    }
+    const approved = await confirm(`Call destructive DraftGo operation ${selectedOperation}?`, { default: false });
+    if (!approved) return 0;
   }
-
-  const r = spawnSync(py.bin, [script, type, id], {
-    cwd: projectDir,
-    stdio: 'inherit',
-    shell: false,
+  const result = await callStructured(session, TOOL_NAMES.apiCall, {
+    ...params,
+    operation_id: selectedOperation,
+    confirm: true,
   });
-  if (r.error) {
-    log.err(`删除脚本启动失败：${r.error.message}`);
-    return 1;
-  }
-  return Number.isInteger(r.status) ? r.status : 1;
+  if (flags.output === 'json') console.log(JSON.stringify(result, null, 2));
+  else log.ok(`DraftGo operation completed: ${selectedOperation}`);
+  return 0;
 }
 
 module.exports = deleteResource;
+module.exports.pathParameterName = pathParameterName;

package/src/commands/deploy.js

@@ -2,30 +2,38 @@
 
 const log = require('../logger');
 const check = require('./check');
-const sync = require('./sync');
 
-function deploy(projectDir, positional, flags = {}) {
+async function deploy(projectDir, positional, flags = {}) {
   const delivery = String(flags.delivery || 'deploy').toLowerCase();
   if (!['local', 'preview', 'deploy'].includes(delivery)) {
-    log.err('--delivery 只支持 local、preview、deploy。');
+    log.err('--delivery accepts local, preview, or deploy.');
     return 1;
   }
-  log.step('deploy: 先执行 check …');
+
+  log.step('deploy: validating checked-out content...');
   const checkCode = check(projectDir, { strict: flags.strict });
   if (checkCode !== 0) {
-    log.err('deploy 终止：check 未通过，请修复后重试。');
+    log.err('Deploy stopped because local validation failed.');
     return checkCode;
   }
   if (delivery === 'local') {
-    log.ok('delivery=local：本地检查通过，未修改云端。');
+    log.ok('Local validation passed; no remote content was changed.');
     return 0;
   }
+
+  const [resourceType, ...ids] = positional;
+  if (!resourceType || !ids.length) {
+    log.err('Deploy no longer commits every legacy index. Specify <pages|nav|docs> <id...>.');
+    return 1;
+  }
   if (delivery === 'preview') {
-    log.step('delivery=preview：执行 push dry-run …');
-    return sync(projectDir, 'push', positional, { ...flags, 'dry-run': true });
+    for (const id of ids) {
+      const code = require('./diff')(projectDir, [resourceType, id], flags);
+      if (code !== 0) return code;
+    }
+    return 0;
   }
-  log.step('delivery=deploy：开始 push …');
-  return sync(projectDir, 'push', positional, flags);
+  return require('./commit')(projectDir, [resourceType, ...ids], flags);
 }
 
 module.exports = deploy;

package/src/commands/diff.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const log = require('../logger');
+const { diffResource } = require('../worktree');
+
+function diff(projectDir, positional, flags = {}) {
+  const [resourceType, resourceId] = positional;
+  if (!resourceType || !resourceId) {
+    log.err('Usage: draftgo diff <pages|nav|docs> <id>');
+    return 1;
+  }
+  const result = diffResource(projectDir, resourceType, resourceId);
+  if (flags.output === 'json') {
+    console.log(JSON.stringify({ changed: result.changed, entry: result.entry, diff: result.output }, null, 2));
+  } else if (result.changed) {
+    process.stdout.write(result.output);
+  } else {
+    log.dim(`${result.entry.resource_type} ${result.entry.resource_id}: no local changes`);
+  }
+  return 0;
+}
+
+module.exports = diff;

package/src/commands/help.js

@@ -1,107 +1,131 @@
 'use strict';
 
 const { all } = require('../installers');
+const { HOSTS } = require('../mcp/hosts');
 const { getPackageVersion } = require('../skill');
 
 function help() {
   const targets = all.map((i) => `    ${i.name.padEnd(12)} ${i.displayName}`).join('\n');
-  console.log(`draftgo v${getPackageVersion()} — DraftGo Next workbench CLI for AI coding agents
+  const mcpTargets = HOSTS.map((host) => {
+    const status = host.supported === false ? 'unsupported' : host.path;
+    return `    ${host.name.padEnd(12)} ${status}`;
+  }).join('\n');
+
+  console.log(`draftgo v${getPackageVersion()} - DraftGo workbench CLI for AI coding agents
 
 DraftGo Next frontend baseline: React + Vite.
 Database pages use standard HTML + Tailwind CSS.
-The CLI is the workbench layer for local runtime, resource sync, checks, and push/pull flows.
+MCP handles live discovery and structured resources; complete page, navigation,
+and document bodies use checkout/commit outside MCP context.
 
 Usage:
-  draftgo init [<target>...]       Install skill. No target = auto-detect.
-                                    Use "all" to install every target.
+  draftgo init [<target>...]       Install the DraftGo Skill. No target = detect.
+                                    Use "all" to install every Skill target.
   draftgo update [<target>...]     Fully update the global CLI, then atomically
-                                    refresh skill + entry files.
-  draftgo uninstall <target|all>   Remove entry files for target(s).
-                                    Use explicit "all" to remove every target.
-                                    --purge also removes .draftgo/ (runtime data).
-  draftgo status                   Show installed targets and skill version.
-  draftgo map                      Print a local DraftGo project resource map
-                                    for fast AI orientation.
-  draftgo check                    Check page entry binding, page/navigation
-                                    HTML parsing, and unregistered local files.
+                                    refresh installed or detected Skills.
+  draftgo uninstall <target|all>   Remove Skill files. --purge also removes
+                                    the entire .draftgo/ runtime directory.
+  draftgo status                   Show installed targets and Skill version.
+
+  draftgo connect [<target>...]    Verify and save server/SAT, 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 initialize, tools/list, and tools/call.
+  draftgo mcp serve                Bridge local stdio to the remote /mcp endpoint.
+
+  draftgo map                      Read remote overview/resources through MCP and
+                                    overlay local checkout state.
+  draftgo checkout <type> <id...>  Download pages/nav/docs body + verified base.
+                                    --force explicitly replaces local changes.
+  draftgo check                    Validate checked-out worktree/base files only.
+  draftgo diff <type> <id>         Show checkout base versus local body.
+  draftgo commit <type> <id...>    Validate and upload complete checked-out bodies.
+  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 verify-ui <url>          Run a deterministic browser smoke check.
-                                    Uses one viewport and screenshots on failure.
-  draftgo api <keyword>            Search DraftGo base APIs and show request/
-                                    response/authentication contracts.
-                                    Custom service routes come from app.Route;
-                                    they are not part of the bundled OpenAPI.
-  draftgo delete <type> <id>       Delete resource from server + local index.
-                                    Types: pages | nav | db_meta | custom_scripts
-                                           | docs | doc_categories | aihub
-                                    Alias: del, rm. Flags: --yes / -y skip confirm.
-  draftgo pull [type] [id...]      Pull DraftGo resources via the bundled
-                                    sync script. Defaults to --all.
-  draftgo push <type> [id...]      Push DraftGo resources via the bundled
-                                    sync script.
-  draftgo deploy [type] [id...]    Run check, then push explicitly.
-                                    --delivery local|preview|deploy
-  draftgo auto-push [type] [id...] Run check, then push only when
-                                    config.auto_push is true.
-                                    Supports --batch <type> <ids> ... too.
+
+  draftgo api <query>              Search the live API contract through MCP.
+  draftgo api describe <operation_id>
+                                    Describe one live API operation through MCP.
+  draftgo delete <operation_id> [id]
+                                    Confirm and call a live delete operation.
+                                    Legacy <type> <id> works only when unambiguous.
+  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 pull                     Migration notice only; always downloads nothing.
+  draftgo push <type> <id...>      Deprecated alias to commit for pages/nav/docs.
+                                    Push-all and structured-resource push are removed.
+
   draftgo local setup|start|stop|logs|status
-                                    Manage .draftgo/docker/docker-compose.yaml
-                                    generated by local setup. up/down remain
-                                    compatible aliases for start/stop.
-  draftgo list-targets             List supported AI tools.
-  draftgo connect                  Bind this project to an existing DraftGo
-                                    server. Prompts for BaseURL + access
-                                    token (or pass --server / --token).
-  draftgo local setup              One-click local DraftGo stack via Docker
-                                    (shared MySQL, Redis, Milvus + app). It
-                                    generates an app-only project compose,
-                                    <project>/.draftgo/docker/docker-compose.yaml,
-                                    then guides you to finish setup and paste
-                                    an access token.
+                                    Manage the existing local Docker stack. up/down
+                                    remain aliases for start/stop; status also has ps.
   draftgo local-dev                Compatibility alias for \`draftgo local setup\`.
+  draftgo list-targets             List Skill installation targets.
   draftgo -v | --version           Print CLI version.
   draftgo -h | --help              Show this help.
 
-v3 Workbench:
-  draftgo local start|stop|logs    Local stack lifecycle commands.
-  draftgo check                    Local resource closure gate.
-  draftgo pull|push                First-class resource sync wrappers.
+Resource types:
+  pages | nav/navigations | docs/articles
 
-Flags:
+Important flags:
   --project <dir>          Operate on <dir> instead of the current directory.
-  --force                  Overwrite existing skill body during install/update.
-  --purge                  (uninstall) Also remove the entire .draftgo/ directory.
-  --skip-update-check      Do not contact npm to check for a newer CLI.
-  --yes                    Assume "yes" for interactive prompts.
-  --connect                (init) Skip the prompt and run \`draftgo connect\`.
-  --local-dev              (init) Skip the prompt and run \`draftgo local setup\`.
-  --no-setup               (init) Don't offer either flow after installing.
-  --server <url>           (connect) Provide the DraftGo BaseURL non-interactively.
-  --token <sat>            (connect) Provide the access token non-interactively.
-  --output <json>          (map/check) Print machine-readable JSON.
-  --strict                 (check) Treat warnings as failures.
-  --mobile-check <mode>    (verify-ui) auto | always | never. Default: auto.
+  --target <name,...>      Select one or more MCP setup/status targets.
+  --server <url>           (connect) DraftGo base URL.
+  --token <sat>            (connect) SAT 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) Refresh Skills without contacting npm.
+  --connect                (init) Continue into DraftGo server connection.
+  --local-dev              (init) Continue into local Docker setup.
+  --no-setup               (init) Install the Skill without either setup flow.
+  --output json            Print machine-readable output where supported.
+  --strict                 Treat check warnings as failures.
+  --yes                    Skip supported confirmation prompts.
+  --operation-id <id>      (delete) Select an operation explicitly.
+  --params <json>          (delete) Pass an API parameter object.
+  --input <file>           (delete) Read the parameter object from JSON.
+  --delivery <mode>        (deploy) local | preview | deploy.
+  --dry-run                (push) Show diffs without committing.
+  --mobile-check <mode>    (verify-ui) auto | always | never.
   --screenshot <mode>      (verify-ui) on-failure | always | never.
   --browser <name>         (verify-ui) chromium | chrome | msedge.
-  --selector <css>         (verify-ui) Require a key element to be visible.
+  --selector <css>         (verify-ui) Require a visible key element.
   --width/--height <px>    (verify-ui) Override the default 390x844 viewport.
-  --delivery <mode>        (deploy) local | preview | deploy.
 
-Environment:
-  DRAFTGO_NO_UPDATE_CHECK=1     Disable the cached CLI version check.
+Security:
+  .draftgo/config.json stores the server and SAT and is gitignored. Host MCP
+  files contain only "draftgo mcp serve"; they never contain the SAT.
+
+MCP targets (project config or status):
+${mcpTargets}
 
-Targets:
+Skill targets:
 ${targets}
 
 Examples:
-  draftgo init                 # auto-detect AI tools in this project
-  draftgo init claudecode      # install for Claude Code only
-  draftgo init claudecode kiro # install for both
-  draftgo init all             # install for every supported target
-  draftgo update               # fully update CLI and installed skills
-  draftgo map                  # inspect pages/nav/db/scripts before development
-  draftgo check --strict       # fail on any resource-check warning before push
-  draftgo verify-ui http://localhost:5173 --mobile-check auto
-  draftgo uninstall all --purge # full removal incl. runtime data
+  draftgo init codex
+  draftgo connect codex --server https://draftgo.example --token <sat>
+  draftgo mcp test
+  draftgo map --output json
+  draftgo checkout pages 42
+  draftgo check --strict
+  draftgo diff pages 42
+  draftgo commit pages 42
+  draftgo deploy docs 7 --delivery preview
 `);
 }
 

package/src/commands/init.js

@@ -5,18 +5,12 @@ const log = require('../logger');
 const { detectTargets } = require('../detect');
 const { resolveTargets, all } = require('../installers');
 const { ensureRuntime, writeInstalledVersion, getPackageVersion } = require('../skill');
-const { findPython } = require('../python');
 const { exists } = require('../fsx');
 const { ask } = require('../prompt');
 
-function warnIfNoPython() {
-  const py = findPython();
-  if (!py) {
-    log.warn('Python 未检测到。DraftGo 资源同步需要 Python 3.9+。');
-    log.dim('  安装 Python 3.9+ 后运行 `draftgo pull` 获取项目资源。');
-  } else {
-    log.dim(`  detected ${py.bin} (${py.version})`);
-  }
+function showEnvironment() {
+  log.dim(`  Node.js ${process.versions.node}`);
+  log.dim('  DraftGo resources use MCP discovery; long content uses checkout/commit.');
 }
 
 async function init(projectDir, positional, flags) {
@@ -77,7 +71,7 @@ async function init(projectDir, positional, flags) {
 
   // 3) Environment check (advisory).
   log.step('环境检查');
-  warnIfNoPython();
+  showEnvironment();
 
   // 4) Optional server binding flow.
   const cfgPath = path.join(projectDir, '.draftgo', 'config.json');

package/src/commands/local.js

@@ -27,12 +27,29 @@ function runCompose(projectDir, args, stdio = 'inherit') {
     return 1;
   }
 
-  const r = spawnSync(docker.composeCmd, [...docker.composeArgs, '-f', file, ...args], {
-    cwd: path.dirname(file),
-    stdio,
-    shell: false,
-  });
-  return r.status || 0;
+  let result;
+  try {
+    result = spawnSync(docker.composeCmd, [...docker.composeArgs, '-f', file, ...args], {
+      cwd: path.dirname(file),
+      stdio,
+      shell: false,
+    });
+  } catch (error) {
+    log.err(`Failed to start Docker Compose: ${error.message}`);
+    return 1;
+  }
+
+  if (result.error) {
+    log.err(`Failed to start Docker Compose: ${result.error.message}`);
+    return 1;
+  }
+  if (!Number.isInteger(result.status)) {
+    log.err(result.signal
+      ? `Docker Compose terminated by signal ${result.signal}.`
+      : 'Docker Compose did not report an exit status.');
+    return 1;
+  }
+  return result.status;
 }
 
 function local(projectDir, positional, flags = {}) {