draftgo-cli 3.0.35 → 3.0.38

package/src/commands/check.js

@@ -1,62 +1,32 @@
 'use strict';
 
+const fs = require('fs');
+const path = require('path');
 const log = require('../logger');
 const { analyzeProject } = require('../projectMap');
 
+function legacyCacheDetected(projectDir) {
+  return ['pages', 'navigations', 'docs', 'db_meta', 'custom_scripts', 'aihub', 'roles', 'users', 'system_config']
+    .some((name) => fs.existsSync(path.join(projectDir, '.draftgo', name, 'index.json')));
+}
+
 function check(projectDir, flags = {}) {
   const result = analyzeProject(projectDir);
-
   if (flags.output === 'json') {
-    console.log(JSON.stringify(result, null, 2));
+    console.log(JSON.stringify({ ...result, legacy_cache_ignored: legacyCacheDetected(projectDir) }, null, 2));
     return result.errors.length || (flags.strict && result.warnings.length) ? 1 : 0;
   }
 
   log.title('draftgo check');
-  log.info(`项目目录：${projectDir}`);
-
-  const m = result.map;
-  console.log('');
-  const overview = [
-    ['pages', m.pages.length],
-    ['nav', m.navigations.length],
-    ['db', m.db_meta.length],
-    ['scripts', m.custom_scripts.length],
-    ['aihub', m.aihub.length],
-    ['docs', m.docs.length],
-  ];
-  console.log('  ' + overview.map(([k, v]) => `${log.c.cyan(k)} ${v}`).join('  '));
-  const pageAreas = [
-    ['home', m.pageGroups.home.length],
-    ['admin', m.pageGroups.admin.length],
-    ['business', m.pageGroups.business.length],
-    ['system', m.pageGroups.system.length],
-  ];
-  console.log('  ' + pageAreas.map(([k, v]) => `${log.c.cyan(k)} ${v}`).join('  '));
-
-  if (result.errors.length) {
-    console.log('');
-    result.errors.forEach((msg) => console.log(`  ${log.c.red('x')} ${msg}`));
-  }
-
-  if (result.warnings.length) {
-    console.log('');
-    result.warnings.forEach((msg) => {
-      const detail = (result.warningDetails || []).find((item) => item.message === msg);
-      const prefix = detail ? `[${detail.code}/${detail.confidence}] ` : '';
-      console.log(`  ${log.c.yellow('!')} ${prefix}${msg}`);
-    });
-  }
-
-  console.log('');
-  if (result.errors.length) {
-    log.err('检查未通过：请先修复错误。');
-    return 1;
-  }
-  if (flags.strict && result.warnings.length) {
-    log.err('strict 模式：存在提醒项，检查未通过。');
-    return 1;
-  }
-  log.ok(result.warnings.length ? '检查完成（有提醒项）。' : '检查通过。');
+  log.info(`Checked-out pages: ${result.map.pages.length}`);
+  log.info(`Checked-out navigations: ${result.map.navigations.length}`);
+  log.info(`Checked-out docs: ${result.map.docs.length}`);
+  for (const message of result.errors) log.err(message);
+  for (const detail of result.warningDetails) log.warn(`[${detail.code}/${detail.confidence}] ${detail.message}`);
+  if (legacyCacheDetected(projectDir)) log.dim('  Legacy .draftgo index caches were detected and ignored.');
+
+  if (result.errors.length || (flags.strict && result.warnings.length)) return 1;
+  log.ok(result.warnings.length ? 'Local checkout validation completed with warnings.' : 'Local checkout validation passed.');
   return 0;
 }
 

package/src/commands/checkout.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const log = require('../logger');
+const { checkoutResources } = require('../worktree');
+
+async function checkout(projectDir, positional, flags = {}) {
+  const [resourceType, ...ids] = positional;
+  if (!resourceType || !ids.length) {
+    log.err('Usage: draftgo checkout <pages|nav|docs> <id...>');
+    return 1;
+  }
+  const results = await checkoutResources(projectDir, resourceType, ids, { 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;
+}
+
+module.exports = checkout;

package/src/commands/commit.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const log = require('../logger');
+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...>');
+    return 1;
+  }
+  const results = await commitResources(projectDir, resourceType, ids);
+  if (flags.output === 'json') console.log(JSON.stringify(results, null, 2));
+  else for (const result of results) {
+    if (result.status === 'unchanged') log.dim(`${result.resource_type} ${result.resource_id}: unchanged`);
+    else log.ok(`Committed ${result.resource_type} ${result.resource_id}`);
+  }
+  return 0;
+}
+
+module.exports = commit;

package/src/commands/conflict.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const log = require('../logger');
+const { showConflict, resolveConflict } = require('../worktree');
+
+function printRecord(record) {
+  log.info(`${record.resource_type} ${record.resource_id}: ${record.status}`);
+  log.plain(`  base:   ${record.base_path}`);
+  log.plain(`  local:  ${record.local_path}`);
+  log.plain(`  remote: ${record.remote_path}`);
+  log.plain(`  worktree local: ${record.worktree_local_path}`);
+  log.plain(`  manifest: ${record.manifest_path}`);
+}
+
+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>');
+    return 1;
+  }
+  const record = action === 'show'
+    ? showConflict(projectDir, resourceType, resourceId)
+    : await resolveConflict(projectDir, resourceType, resourceId);
+  if (flags.output === 'json') console.log(JSON.stringify(record, null, 2));
+  else printRecord(record);
+  if (action === 'resolve') log.info('The remote revision is now the base; run check, diff, and commit the merged worktree file.');
+  return 0;
+}
+
+module.exports = conflict;

package/src/commands/conflicts.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const log = require('../logger');
+const { listConflicts } = require('../worktree');
+
+function conflicts(projectDir, _positional, flags = {}) {
+  const records = listConflicts(projectDir, { all: Boolean(flags.all) });
+  if (flags.output === 'json') console.log(JSON.stringify(records, null, 2));
+  else if (!records.length) log.ok('No unresolved DraftGo conflicts.');
+  else for (const record of records) {
+    log.warn(`${record.resource_type} ${record.resource_id}: ${record.status} (${record.manifest_path})`);
+  }
+  return records.some((record) => record.status === 'unresolved') ? 1 : 0;
+}
+
+module.exports = conflicts;

package/src/commands/connect.js

@@ -1,61 +1,73 @@
 'use strict';
 
-// `draftgo connect` — wire this project to an already-deployed DraftGo base.
-// Prompts for server URL + access token, writes .draftgo/config.json, and
-// (if Python is available) runs draftgo_init.py to pull initial context.
-
 const log = require('../logger');
-const { ask, askRequired, askPassword } = require('../prompt');
-const { writeProjectConfig, maybeRunInit } = require('../projectConfig');
-
-function normalizeServer(raw) {
-  let v = String(raw || '').trim();
-  if (!v) return '';
-  if (!/^https?:\/\//i.test(v)) v = 'http://' + v;
-  return v.replace(/\/+$/, '');
-}
+const { ask, askPassword } = require('../prompt');
+const { normalizeServer, writeProjectConfig } = require('../projectConfig');
+const { testConnection } = require('../mcp/client');
+const { redactText } = require('../mcp/protocol');
 
-async function promptServer(defaultVal) {
+async function promptServer(defaultValue) {
   while (true) {
-    const v = await ask('DraftGo 服务器地址 (BaseURL)', { default: defaultVal });
-    const norm = normalizeServer(v);
-    if (!norm) { log.dim('  不能为空'); continue; }
+    const raw = await ask('DraftGo server (Base URL)', { default: defaultValue });
     try {
-      // Sanity-parse the URL so we fail fast on obvious typos.
-      // eslint-disable-next-line no-new
-      new URL(norm);
-    } catch {
-      log.dim(`  不是合法 URL：${norm}`);
-      continue;
+      const value = normalizeServer(raw);
+      if (value) return value;
+    } catch (error) {
+      log.dim(`  ${error.message}`);
     }
-    return norm;
   }
 }
 
-async function connect(projectDir, positional, flags) {
-  log.title('draftgo connect — 连接已有的 DraftGo 服务器');
-  log.dim('  把本项目绑定到一台已部署的 DraftGo 基座。');
-
-  const server = flags.server
-    ? normalizeServer(flags.server)
-    : await promptServer('https://');
-  const token = flags.token
-    ? String(flags.token)
-    : await askRequired('系统访问令牌 (SAT)', {
-        validate: (v) => v.length < 10 ? 'token 看起来太短了，请检查后重试' : '',
-      });
-
-  const cfgPath = writeProjectConfig(projectDir, server, token);
-  log.ok(`已写入 ${cfgPath}`);
-  maybeRunInit(projectDir, server, token);
-
-  log.title('完成');
-  log.plain(`  - 服务器:    ${server}`);
-  log.plain(`  - 配置文件:  ${cfgPath}`);
-  log.dim('  之后在 AI 工具里说「同步页面 xxx」即可。');
-  // Silence unused-arg lint if any future tooling complains.
-  void positional;
-  void askPassword;
+async function promptToken() {
+  while (true) {
+    const value = String(await askPassword('DraftGo system access token (SAT)') || '').trim();
+    if (value) return value;
+    log.dim('  A SAT is required.');
+  }
+}
+
+async function connect(projectDir, positional, flags = {}) {
+  log.title('draftgo connect');
+  const server = flags.server ? normalizeServer(flags.server) : await promptServer('https://');
+  const token = flags.token ? String(flags.token).trim() : await promptToken();
+  if (!token) {
+    log.err('A non-empty SAT is required.');
+    return 1;
+  }
+
+  log.step('Validating SAT and DraftGo MCP capabilities...');
+  try {
+    const diagnostic = await testConnection({ server, token }, {
+      timeoutMs: flags.timeout ? Number(flags.timeout) : undefined,
+    });
+    log.ok(`MCP ready (${diagnostic.tools.length} tools; tested ${diagnostic.testedTool}).`);
+  } catch (error) {
+    const message = redactText(error && error.message ? error.message : error, [token]);
+    if (!flags['allow-offline']) {
+      log.err(message);
+      log.dim('  The project config was not changed. Run `draftgo mcp test` after checking the server and SAT.');
+      return 1;
+    }
+    log.warn(`MCP validation unavailable: ${message}`);
+    log.warn('Continuing only because --allow-offline was explicitly supplied.');
+  }
+
+  const configFile = writeProjectConfig(projectDir, server, token);
+  log.ok(`Project configuration written: ${configFile}`);
+
+  if (!flags['no-mcp-setup']) {
+    try {
+      const setupCode = require('./mcp').setup(projectDir, positional, flags);
+      if (setupCode !== 0) log.dim('  Run `draftgo mcp setup <target>` when the AI host is known.');
+    } catch (error) {
+      log.warn(`MCP host setup was not completed: ${redactText(error.message || error, [token])}`);
+    }
+  }
+
+  log.title('Connected');
+  log.plain(`  server: ${server}`);
+  log.plain(`  config: ${configFile}`);
+  log.dim('  No DraftGo business resources were downloaded. Use MCP discovery or checkout long content explicitly.');
   return 0;
 }
 

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;