draftgo-cli 3.0.33 → 3.0.38

package/src/commands/map.js

@@ -1,105 +1,105 @@
 'use strict';
 
+const fs = require('fs');
+const path = require('path');
 const log = require('../logger');
-const { buildProjectMap } = require('../projectMap');
+const { loadProjectConfig } = require('../projectConfig');
+const { loadManifest, absolutePath } = require('../worktree/manifest');
+const { hashFile } = require('../worktree/streams');
+const { TOOL_NAMES, openToolSession, callStructured } = require('../mcp/tools');
+
+function itemsFrom(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.resources)) return value.resources;
+  if (value.data) return itemsFrom(value.data);
+  return [];
+}
+
+function nextCursor(value) {
+  return value && (value.next_cursor || value.nextCursor || value.cursor && value.has_more && value.cursor);
+}
+
+async function listRemoteResources(session, flags) {
+  const resources = [];
+  const seen = new Set();
+  let cursor = null;
+  for (let page = 0; page < 100; page += 1) {
+    const args = {};
+    if (cursor) args.cursor = cursor;
+    if (flags.type) args.resource_type = String(flags.type);
+    const payload = await callStructured(session, TOOL_NAMES.resourceList, args);
+    resources.push(...itemsFrom(payload));
+    cursor = nextCursor(payload);
+    if (!cursor) break;
+    if (seen.has(cursor)) throw new Error('DraftGo resource_list repeated a cursor.');
+    seen.add(cursor);
+  }
+  if (cursor) throw new Error('DraftGo resource_list exceeded 100 pages.');
+  return resources;
+}
 
-function printList(title, rows, render) {
-  console.log('');
-  log.info(`${title}：${rows.length}`);
-  if (rows.length === 0) {
-    log.dim('  （无）');
-    return;
+async function localCheckouts(projectDir) {
+  const manifest = loadManifest(projectDir);
+  const entries = [];
+  for (const entry of Object.values(manifest.entries)) {
+    const local = absolutePath(projectDir, entry.local_path);
+    let currentHash = null;
+    if (fs.existsSync(local)) currentHash = (await hashFile(local)).hash;
+    entries.push({
+      ...entry,
+      exists: currentHash !== null,
+      current_hash: currentHash,
+      changed: currentHash !== null && currentHash !== entry.base_hash,
+    });
   }
-  for (const row of rows) log.dim(`  • ${render(row)}`);
+  return entries;
 }
 
-function mapCommand(projectDir, flags = {}) {
-  const map = buildProjectMap(projectDir);
+function legacyCaches(projectDir) {
+  return ['pages', 'navigations', 'docs', 'db_meta', 'custom_scripts', 'aihub', 'roles', 'users', 'system_config']
+    .filter((name) => fs.existsSync(path.join(projectDir, '.draftgo', name, 'index.json')));
+}
+
+async function mapCommand(projectDir, flags = {}) {
+  const config = loadProjectConfig(projectDir);
+  const session = await openToolSession(config, [TOOL_NAMES.projectOverview, TOOL_NAMES.resourceList]);
+  const [overview, resources, checkouts] = await Promise.all([
+    callStructured(session, TOOL_NAMES.projectOverview, {}),
+    listRemoteResources(session, flags),
+    localCheckouts(projectDir),
+  ]);
+  const result = {
+    server: config.server,
+    overview,
+    resources,
+    checkouts,
+    legacy_cache: { ignored: true, detected: legacyCaches(projectDir) },
+  };
 
   if (flags.output === 'json') {
-    console.log(JSON.stringify(map, null, 2));
+    console.log(JSON.stringify(result, null, 2));
     return 0;
   }
-
   log.title('draftgo map');
-  log.info(`项目目录：${projectDir}`);
-
-  printList('页面', map.pages, (p) => {
-    const id = p.id == null ? 'new' : p.id;
-    return `${String(id).padEnd(4)} ${p.route || '（无 route）'}  ${p.title || '未命名'}${p.html_file ? `  ${p.html_file}` : ''}`;
-  });
-
-  printList('导航', map.navigations, (n) => {
-    const id = n.id == null ? 'new' : n.id;
-    return `${String(id).padEnd(4)} ${n.code || 'default'}  ${n.name || '未命名'}${n.html_file ? `  ${n.html_file}` : ''}`;
-  });
-
-  printList('动态 DB', map.db_meta, (m) => {
-    const fields = m.fields.length ? ` (${m.fields.slice(0, 8).join(', ')}${m.fields.length > 8 ? ', ...' : ''})` : '';
-    return `${m.type || '（无 type）'}  ${m.label || ''}${fields}`;
-  });
-
-  printList('自定义脚本', map.custom_scripts, (s) => {
-    const bindings = [
-      ...(s.routes || []),
-      ...(s.events || []).map((event) => `EVENT ${event}`),
-      ...(s.schedules || []).map((cron) => `CRON ${cron}`),
-    ];
-    const summary = bindings.length ? `  [${bindings.join(' | ')}]` : '';
-    return `${s.slug || '（无 slug）'}  ${s.mode || 'mode?'}  ${s.name || ''}${summary}${s.code_file ? `  ${s.code_file}` : ''}`;
-  });
-
-  printList('文档', map.docs, (d) => {
-    return `${d.id || 'new'}  ${d.slug || '（无 slug）'}  ${d.title || '未命名'}${d.content_file ? `  ${d.content_file}` : ''}`;
-  });
-
-  printList('文档分类', map.doc_categories, (c) => {
-    const parent = c.parent_id == null ? 'root' : `parent:${c.parent_id}`;
-    return `${c.id || 'new'}  ${c.slug || '（无 slug）'}  ${c.name || '未命名'}  ${parent}`;
-  });
-
-  printList('系统配置', map.system_config, (c) => {
-    const sensitive = c.is_sensitive ? ' sensitive' : '';
-    return `${c.config_key || '（无 key）'}  ${c.category || 'default'}  ${c.value_type || 'value'}${sensitive}`;
-  });
-
-  printList('AIHub', map.aihub, (a) => {
-    const extra = [];
-    if (a.type === 'agent') {
-      if (a.mode) extra.push(a.mode);
-      if (a.output_format && a.output_format.mode === 'json') extra.push(`json:${a.output_format.json_strategy || 'auto'}`);
-      if (a.model_selection && a.model_selection.user_selectable) extra.push('user-model');
-      if (a.tools && a.tools.sources.length) extra.push(`tools:${a.tools.sources.length}`);
-    } else if (a.type === 'model') {
-      extra.push(`models:${a.models_count || 0}`);
-      if (a.supports_response_format === true) extra.push('response_format');
-      if (a.supports_json_schema === true) extra.push('json_schema');
-    } else if (a.type === 'mcp') {
-      extra.push(a.transport || 'transport?');
-      extra.push(`tools:${a.tools_count || 0}`);
-    }
-    return `${a.id || 'new'}  ${a.type || ''}  ${a.name || ''}${extra.length ? `  [${extra.join(', ')}]` : ''}`;
-  });
-  printList('角色', map.roles, (r) => `${r.code || r.id || 'new'}  ${r.name || ''}`);
-
-  console.log('');
-  log.info('页面分区：');
-  const areaRows = [
-    ['home', map.pageGroups.home.length],
-    ['admin', map.pageGroups.admin.length],
-    ['business', map.pageGroups.business.length],
-    ['system', map.pageGroups.system.length],
-    ['unknown', map.pageGroups.unknown.length],
-  ];
-  log.dim('  ' + areaRows.map(([k, v]) => `${k} ${v}`).join('  '));
-
-  console.log('');
-  log.info('入口引用：');
-  const routes = Object.keys(map.routeRefs).sort();
-  if (routes.length === 0) log.dim('  （未发现 data-page-route / href 引用）');
-  else routes.forEach((route) => log.dim(`  • ${route} ← ${map.routeRefs[route].join(', ')}`));
-
+  log.info(`Remote resources: ${resources.length}`);
+  const counts = new Map();
+  for (const resource of resources) {
+    const type = resource.resource_type || resource.type || 'unknown';
+    counts.set(type, (counts.get(type) || 0) + 1);
+  }
+  for (const [type, count] of [...counts.entries()].sort()) log.plain(`  ${type}: ${count}`);
+  log.info(`Local checkouts: ${checkouts.length}`);
+  for (const entry of checkouts) {
+    const state = !entry.exists ? 'missing' : entry.changed ? 'modified' : 'clean';
+    log.plain(`  ${entry.resource_type} ${entry.resource_id}: ${state} (${entry.local_path})`);
+  }
+  if (result.legacy_cache.detected.length) {
+    log.warn(`Ignored legacy cache indexes: ${result.legacy_cache.detected.join(', ')}`);
+  }
   return 0;
 }
 
 module.exports = mapCommand;
+module.exports.itemsFrom = itemsFrom;

package/src/commands/mcp.js

@@ -0,0 +1,126 @@
+'use strict';
+
+const log = require('../logger');
+const { loadProjectConfig } = require('../projectConfig');
+const { testConnection } = require('../mcp/client');
+const { redactText } = require('../mcp/protocol');
+const {
+  HOSTS,
+  detectHostTargets,
+  setupHosts,
+  statusHosts,
+} = require('../mcp/hosts');
+const { serveStdio } = require('../mcp/stdio');
+
+function targetArgs(positional, flags) {
+  const values = positional.slice();
+  if (flags.target) values.push(...String(flags.target).split(','));
+  return values.map((value) => String(value).trim()).filter(Boolean);
+}
+
+function printUsage() {
+  log.plain('Usage:');
+  log.plain('  draftgo mcp setup [target...]');
+  log.plain('  draftgo mcp status [target...]');
+  log.plain('  draftgo mcp test');
+  log.plain('  draftgo mcp serve');
+  log.dim(`  targets: ${HOSTS.map((host) => host.name).join(', ')}`);
+}
+
+function setup(projectDir, positional = [], flags = {}) {
+  const targets = targetArgs(positional, flags);
+  const detected = targets.length ? null : detectHostTargets(projectDir);
+  if (!targets.length && detected.length === 0) {
+    log.err('No supported AI host was detected in this project.');
+    log.dim('  Run `draftgo mcp setup <target>` to select one explicitly.');
+    return 1;
+  }
+
+  const results = setupHosts(projectDir, targets.length ? targets : detected.map((host) => host.name));
+  let configured = 0;
+  let unsupported = 0;
+  for (const result of results) {
+    if (!result.supported) {
+      unsupported += 1;
+      log.warn(`${result.host.displayName}: ${result.reason}`);
+      continue;
+    }
+    configured += 1;
+    if (result.changed) log.ok(`${result.host.displayName}: ${result.host.path}`);
+    else log.info(`${result.host.displayName}: already configured`);
+  }
+  if (!configured && unsupported) return 1;
+  if (!configured) {
+    log.err('No MCP host configuration was written.');
+    return 1;
+  }
+  return 0;
+}
+
+function status(projectDir, positional = [], flags = {}) {
+  const targets = targetArgs(positional, flags);
+  const results = statusHosts(projectDir, targets);
+  log.title('draftgo mcp status');
+  let exitCode = 0;
+  try {
+    const config = loadProjectConfig(projectDir);
+    log.plain(`  project      configured (${config.server}; SAT present)`);
+  } catch (error) {
+    log.plain(`  project      not ready (${error.message})`);
+    exitCode = 1;
+  }
+  for (const result of results) {
+    if (!result.supported) {
+      log.plain(`  - ${result.host.name.padEnd(12)} unsupported`);
+    } else if (result.configured && result.secure) {
+      log.plain(`  OK ${result.host.name.padEnd(12)} ${result.host.path}`);
+    } else if (result.error) {
+      log.plain(`  x  ${result.host.name.padEnd(12)} invalid config`);
+      exitCode = 1;
+    } else {
+      log.plain(`  -  ${result.host.name.padEnd(12)} not configured`);
+    }
+  }
+  return exitCode;
+}
+
+async function test(projectDir, _positional = [], flags = {}) {
+  let config;
+  try {
+    config = loadProjectConfig(projectDir);
+    const result = await testConnection(config, {
+      timeoutMs: flags.timeout ? Number(flags.timeout) : undefined,
+    });
+    log.ok('DraftGo MCP initialize succeeded.');
+    log.ok(`tools/list returned ${result.tools.length} tools.`);
+    log.ok(`tools/call succeeded: ${result.testedTool}`);
+    log.dim(`  protocol: ${result.protocolVersion}`);
+    return 0;
+  } catch (error) {
+    const token = config && String(config.token || config.sat || '');
+    log.err(redactText(error && error.message ? error.message : error, [token]));
+    return 1;
+  }
+}
+
+async function serve(projectDir, _positional = [], _flags = {}) {
+  return serveStdio(projectDir);
+}
+
+async function mcp(projectDir, positional = [], flags = {}) {
+  const [action, ...rest] = positional;
+  if (action === 'setup') return setup(projectDir, rest, flags);
+  if (action === 'status') return status(projectDir, rest, flags);
+  if (action === 'test') return test(projectDir, rest, flags);
+  if (action === 'serve') return serve(projectDir, rest, flags);
+  printUsage();
+  return 1;
+}
+
+mcp.setup = setup;
+mcp.status = status;
+mcp.test = test;
+mcp.serve = serve;
+mcp.printUsage = printUsage;
+
+module.exports = mcp;

package/src/commands/sync.js

@@ -1,61 +1,46 @@
 'use strict';
 
-const path = require('path');
-const { spawnSync } = require('child_process');
 const log = require('../logger');
-const { exists } = require('../fsx');
-const { findPython } = require('../python');
-const { platforms } = require('../platforms');
+const { canonicalResourceType } = require('../worktree/types');
 
-function findSyncScript(projectDir, command) {
-  const scriptName = command === 'pull' ? 'draftgo_pull.py' : 'draftgo_push.py';
-
-  for (const platform of platforms) {
-    const candidate = path.join(projectDir, platform.assetDir, 'scripts', scriptName);
-    if (exists(candidate)) return candidate;
+async function sync(projectDir, command, positional, flags = {}) {
+  if (command === 'pull') {
+    log.err('`draftgo pull` no longer downloads DraftGo resources.');
+    log.dim('  Use MCP project/resource discovery. For complete pages, navigation, or docs, use `draftgo checkout <type> <id...>`.');
+    log.dim('  Existing legacy .draftgo indexes are left untouched and ignored.');
+    return 1;
   }
 
-  const bundled = path.resolve(__dirname, '..', '..', 'resources', 'skill', 'scripts', scriptName);
-  return exists(bundled) ? bundled : null;
-}
-
-function sync(projectDir, command, positional, flags = {}) {
-  const py = findPython();
-  if (!py) {
-    log.err('未检测到 Python，无法运行 DraftGo 同步脚本。');
+  const [rawType, ...ids] = positional;
+  if (!rawType) {
+    log.err('The legacy push-all workflow has been removed.');
+    log.dim('  Use `draftgo commit <pages|nav|docs> <id...>` for checked-out long content.');
+    log.dim('  Use DraftGo MCP for structured resources.');
     return 1;
   }
 
-  const script = findSyncScript(projectDir, command);
-  if (!script) {
-    log.err(`未找到 ${command} 同步脚本。`);
-    log.dim('  请先运行 `draftgo init` 安装 DraftGo skill，或重新安装 CLI。');
+  let resourceType;
+  try {
+    resourceType = canonicalResourceType(rawType);
+  } catch {
+    log.err(`Legacy push for ${rawType} is no longer supported.`);
+    log.dim('  Discover the live API with `draftgo api <query>` and use MCP api_call for structured resources.');
     return 1;
   }
-
-  if (!exists(path.join(projectDir, '.draftgo', 'config.json'))) {
-    log.err('未找到 .draftgo/config.json。');
-    log.dim('  请先运行 `draftgo connect`。');
+  if (!ids.length) {
+    log.err('Refusing legacy push-all behavior; specify checked-out resource ids explicitly.');
     return 1;
   }
 
-  const args = positional.length ? positional : ['--all'];
-  if (command === 'push' && flags['dry-run']) {
-    args.push('--dry-run');
-  }
-  if (command === 'push' && flags['probe-routes']) {
-    args.push('--probe-routes');
-  }
-  const r = spawnSync(py.bin, [script, ...args], {
-    cwd: projectDir,
-    stdio: 'inherit',
-    shell: false,
-  });
-  if (r.error) {
-    log.err(`${command} 启动失败：${r.error.message}`);
-    return 1;
+  log.warn('`draftgo push` is deprecated; forwarding checked-out long content to `draftgo commit`.');
+  if (flags['dry-run']) {
+    for (const id of ids) {
+      const code = require('./diff')(projectDir, [resourceType, id], flags);
+      if (code !== 0) return code;
+    }
+    return 0;
   }
-  return Number.isInteger(r.status) ? r.status : 1;
+  return require('./commit')(projectDir, [resourceType, ...ids], flags);
 }
 
 module.exports = sync;

package/src/commands/verifyUi.js

@@ -14,8 +14,9 @@ function isUiFile(file) {
   if (!['.js', '.ts'].includes(ext)) return false;
   return /(^|\/)(frontend|web|ui|components|pages|views|client)(\/|$)/.test(normalized)
     || /(^|\/)(app|main|client)\.(js|ts)$/.test(normalized)
-    || normalized.startsWith('.draftgo/pages/')
-    || normalized.startsWith('.draftgo/navigations/');
+    || normalized.startsWith('.draftgo/worktree/pages/')
+    || normalized.startsWith('.draftgo/worktree/navigations/')
+    || normalized.startsWith('.draftgo/worktree/docs/');
 }
 
 function gitChangedFiles(projectDir) {

package/src/localdev/index.js

@@ -7,7 +7,7 @@ const { probePort, probeHttp, detectDocker } = require('./detect');
 const compose = require('./compose');
 const { ensureDatabase, testConnection, describeClient } = require('./mysqlClient');
 const { defaults, portOpen, probeRedis, probeMilvus, startService } = require('./services');
-const { writeProjectConfig, maybeRunInit } = require('../projectConfig');
+const { writeProjectConfig } = require('../projectConfig');
 const { appendGitignoreLine } = require('../fsx');
 
 const DEFAULT_APP_PORT = 3000;
@@ -147,7 +147,35 @@ async function waitForApp(appPort) {
   return ok;
 }
 
-async function runWizard(projectDir, { yes = false } = {}) {
+async function finishMcpSetup(projectDir, mcpCommands) {
+  const commands = mcpCommands || require('../commands/mcp');
+  const setupMcp = commands.setupMcp || commands.setup;
+  const testMcp = commands.testMcp || commands.test;
+  if (typeof setupMcp !== 'function' || typeof testMcp !== 'function') {
+    log.warn('  MCP setup helpers are unavailable. Run `draftgo mcp setup` after updating the CLI.');
+    return false;
+  }
+
+  let setupOk = false;
+  try {
+    setupOk = await setupMcp(projectDir, [], { yes: true }) === 0;
+  } catch {
+    log.warn('  MCP host setup failed. Retry with `draftgo mcp setup`.');
+  }
+
+  let testOk = false;
+  try {
+    testOk = await testMcp(projectDir, {}) === 0;
+  } catch {
+    log.warn('  MCP validation failed. Run `draftgo mcp test` for diagnostics.');
+  }
+  if (!testOk) {
+    log.dim('  The local stack and project config are ready; MCP may still be starting.');
+  }
+  return setupOk && testOk;
+}
+
+async function runWizard(projectDir, { yes = false, mcpCommands } = {}) {
   log.title('draftgo local setup');
   if (!yes && !await confirm('Continue with local DraftGo setup?', { default: true })) return 0;
 
@@ -169,14 +197,16 @@ async function runWizard(projectDir, { yes = false } = {}) {
   if (!composeUp(docker, out.dir) || !await waitForApp(appPort)) return 1;
 
   const url = `http://localhost:${appPort}`;
-  const token = await askRequired('Paste a DraftGo system access token (SAT)', {
-    validate: (value) => value.length < 10 ? 'Token appears too short.' : '',
-  });
+  let token = '';
+  while (token.length < 10) {
+    token = String(await askPassword('Paste a DraftGo system access token (SAT)')).trim();
+    if (token.length < 10) log.err('  Token appears too short. Please try again.');
+  }
   const cfgPath = writeProjectConfig(projectDir, url, token);
-  maybeRunInit(projectDir, url, token);
+  await finishMcpSetup(projectDir, mcpCommands);
   log.ok(`DraftGo is ready at ${url}`);
   log.dim(`Project config: ${cfgPath}`);
   return 0;
 }
 
-module.exports = { runWizard };
+module.exports = { finishMcpSetup, runWizard };

package/src/localdev/mysqlClient.js

@@ -60,7 +60,7 @@ function runSQL(client, conn, sql) {
   const args = [
     'run', '--rm', '-i',
     '--add-host', 'host.docker.internal:host-gateway',
-    '-e', `MYSQL_PWD=${conn.password || ''}`,
+    '-e', 'MYSQL_PWD',
     'mysql:8.0',
     'mysql',
     '-h', dockerHost(conn.host),