draftgo-cli 3.0.33 → 3.0.38

package/src/commands/api.js

@@ -1,203 +1,40 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
 const log = require('../logger');
+const { loadProjectConfig } = require('../projectConfig');
+const { TOOL_NAMES, openToolSession, callStructured } = require('../mcp/tools');
 
-const API_FILE = path.resolve(__dirname, '..', '..', 'resources', 'skill', 'references', 'api.json');
-const HTTP_METHODS = new Set(['get', 'post', 'put', 'patch', 'delete', 'head', 'options']);
-const AUTH_HEADER_NAMES = new Set(['authorization', 'proxy-authorization', 'x-api-key']);
-
-function resolveRef(spec, ref) {
-  if (!ref || !ref.startsWith('#/')) return null;
-  return ref.slice(2).split('/').reduce((value, part) => value && value[part], spec);
-}
-
-function schemaType(schema, spec) {
-  if (!schema || !Object.keys(schema).length) return 'unspecified';
-  if (schema.$ref) {
-    const target = resolveRef(spec, schema.$ref);
-    return target && (target.title || schema.$ref.split('/').pop()) || schema.$ref;
-  }
-  if (schema.anyOf) return schema.anyOf.map((item) => schemaType(item, spec)).join(' | ');
-  if (schema.oneOf) return schema.oneOf.map((item) => schemaType(item, spec)).join(' | ');
-  if (schema.allOf) return schema.allOf.map((item) => schemaType(item, spec)).join(' & ');
-  if (schema.type === 'array') return `${schemaType(schema.items, spec)}[]`;
-  if (schema.type) return schema.format ? `${schema.type} (${schema.format})` : schema.type;
-  if (schema.properties) return 'object';
-  return 'unspecified';
-}
-
-function schemaNotes(schema) {
-  const notes = [];
-  if (schema.description) notes.push(schema.description);
-  if (schema.default !== undefined) notes.push(`default: ${JSON.stringify(schema.default)}`);
-  if (schema.enum) notes.push(`enum: ${schema.enum.map((item) => JSON.stringify(item)).join(', ')}`);
-  return notes.length ? ` (${notes.join('; ')})` : '';
-}
-
-function printSchema(schema, spec, indent = '      ', seen = new Set()) {
-  if (!schema || !Object.keys(schema).length) {
-    console.log(`${indent}schema: unspecified`);
-    return;
-  }
-
-  let resolved = schema;
-  let refName = '';
-  if (schema.$ref) {
-    refName = schema.$ref.split('/').pop();
-    if (seen.has(schema.$ref)) {
-      console.log(`${indent}${refName} (recursive)`);
-      return;
-    }
-    resolved = resolveRef(spec, schema.$ref) || schema;
-    seen = new Set(seen).add(schema.$ref);
-  }
-
-  console.log(`${indent}schema: ${refName ? `${refName} (${schemaType(resolved, spec)})` : schemaType(resolved, spec)}${schemaNotes(resolved)}`);
-  const variants = resolved.anyOf || resolved.oneOf || resolved.allOf;
-  if (variants) {
-    variants.forEach((variant, index) => {
-      console.log(`${indent}  variant ${index + 1}:`);
-      printSchema(variant, spec, `${indent}    `, seen);
-    });
+function printResult(title, result) {
+  log.title(title);
+  if (Array.isArray(result)) {
+    for (const item of result) log.plain(`  ${JSON.stringify(item)}`);
     return;
   }
-  const required = new Set(resolved.required || []);
-  for (const [name, property] of Object.entries(resolved.properties || {})) {
-    const fieldSchema = property.$ref ? resolveRef(spec, property.$ref) || property : property;
-    const marker = required.has(name) ? ' required' : ' optional';
-    console.log(`${indent}  ${name}: ${schemaType(property, spec)}${marker}${schemaNotes(fieldSchema)}`);
-  }
-  if (resolved.additionalProperties === true) console.log(`${indent}  additional properties: allowed`);
-  if (resolved.items && !resolved.properties) printSchema(resolved.items, spec, `${indent}  `, seen);
-}
-
-function authenticationFor(operation, spec) {
-  const security = operation.security === undefined ? spec.security : operation.security;
-  const schemes = (security || []).flatMap((requirement) => Object.keys(requirement).map((name) => {
-    const definition = spec.components && spec.components.securitySchemes && spec.components.securitySchemes[name] || {};
-    return { name, type: definition.type || 'unknown', scheme: definition.scheme, bearerFormat: definition.bearerFormat };
-  }));
-  const headers = (operation.parameters || []).filter((parameter) =>
-    parameter.in === 'header' && AUTH_HEADER_NAMES.has(String(parameter.name).toLowerCase())
-  );
-  return { schemes, headers };
-}
-
-function printAuthentication(operation, spec) {
-  const auth = authenticationFor(operation, spec);
-  if (!auth.schemes.length && !auth.headers.length) {
-    console.log('  Authentication: no requirement declared in the bundled OpenAPI.');
+  if (result && Array.isArray(result.items)) {
+    for (const item of result.items) log.plain(`  ${JSON.stringify(item)}`);
     return;
   }
-  console.log('  Authentication:');
-  for (const scheme of auth.schemes) {
-    const detail = [scheme.type, scheme.scheme, scheme.bearerFormat].filter(Boolean).join(', ');
-    console.log(`    security scheme ${scheme.name}${detail ? ` (${detail})` : ''}`);
-  }
-  for (const header of auth.headers) {
-    console.log(`    header ${header.name}: ${schemaType(header.schema, spec)}${header.required ? ' (required)' : ' (optional)'}${schemaNotes(header)}`);
-  }
-}
-
-function printOperation(item, spec) {
-  console.log(`\n${item.method} ${item.route}${item.summary ? `  ${item.summary}` : ''}`);
-  if (item.operationId) console.log(`  Operation: ${item.operationId}`);
-  printAuthentication(item.operation, spec);
-
-  const parameters = (item.operation.parameters || []).filter((parameter) =>
-    !(parameter.in === 'header' && AUTH_HEADER_NAMES.has(String(parameter.name).toLowerCase()))
-  );
-  if (parameters.length) {
-    console.log('  Parameters:');
-    for (const parameter of parameters) {
-      console.log(`    ${parameter.in} ${parameter.name}: ${schemaType(parameter.schema, spec)}${parameter.required ? ' (required)' : ' (optional)'}${schemaNotes(parameter)}`);
-    }
-  }
-
-  if (item.operation.requestBody) {
-    console.log(`  Request body: ${item.operation.requestBody.required ? 'required' : 'optional'}`);
-    for (const [contentType, media] of Object.entries(item.operation.requestBody.content || {})) {
-      console.log(`    ${contentType}:`);
-      printSchema(media.schema, spec, '      ');
-    }
-  }
-
-  const responses = Object.entries(item.operation.responses || {});
-  if (responses.length) {
-    console.log('  Responses:');
-    for (const [status, response] of responses) {
-      console.log(`    ${status}${response.description ? ` ${response.description}` : ''}`);
-      for (const [contentType, media] of Object.entries(response.content || {})) {
-        console.log(`      ${contentType}:`);
-        printSchema(media.schema, spec, '        ');
-      }
-    }
-  }
+  console.log(JSON.stringify(result, null, 2));
 }
 
-function apiCommand(positional, flags = {}) {
-  const keyword = String(positional.join(' ') || '').trim().toLowerCase();
-  if (!keyword) {
-    log.err('用法：draftgo api <keyword>');
-    log.dim('  示例：draftgo api pages batch');
+async function apiCommand(projectDir, positional, flags = {}) {
+  const first = String(positional[0] || '').toLowerCase();
+  const describe = first === 'describe';
+  const queryParts = first === 'search' || describe ? positional.slice(1) : positional;
+  const query = queryParts.join(' ').trim();
+  if (!query) {
+    log.err('Usage: draftgo api <query> | draftgo api search <query> | draftgo api describe <operation_id>');
     return 1;
   }
 
-  let spec;
-  try {
-    spec = JSON.parse(fs.readFileSync(API_FILE, 'utf8'));
-  } catch (err) {
-    log.err(`无法读取 OpenAPI：${err.message}`);
-    return 1;
-  }
-
-  const words = keyword.split(/\s+/).filter(Boolean);
-  const matches = [];
-  for (const [route, methods] of Object.entries(spec.paths || {})) {
-    for (const [method, operation] of Object.entries(methods || {})) {
-      if (!HTTP_METHODS.has(method.toLowerCase())) continue;
-      const haystack = [route, method, operation.summary, operation.operationId, ...(operation.tags || [])]
-        .filter(Boolean).join(' ').toLowerCase();
-      if (!words.every((word) => haystack.includes(word))) continue;
-      matches.push({
-        method: method.toUpperCase(),
-        route,
-        summary: operation.summary || '',
-        operationId: operation.operationId || '',
-        tags: operation.tags || [],
-        operation,
-      });
-    }
-  }
-
-  if (flags.output === 'json') {
-    console.log(JSON.stringify({
-      source: {
-        kind: 'DraftGo bundled base OpenAPI',
-        openapi: spec.openapi || null,
-        version: spec.info && spec.info.version || null,
-        customServiceRoutes: {
-          included: false,
-          reason: 'Custom service routes are registered dynamically from local app.Route calls.',
-          derive: '<METHOD> /api/x/<slug><route-path>',
-        },
-      },
-      query: keyword,
-      matches,
-    }, null, 2));
-    return matches.length ? 0 : 1;
-  }
-  if (!matches.length) {
-    log.warn(`未找到包含“${keyword}”的 API。`);
-    return 1;
-  }
-  log.title(`DraftGo base API — ${keyword}`);
-  log.dim(`Source: bundled DraftGo base OpenAPI v${spec.info && spec.info.version || 'unknown'}; these are platform APIs, not project-defined APIs.`);
-  log.dim('Custom service routes are not indexed here: derive them from local app.Route calls as <METHOD> /api/x/<slug><route-path>.');
-  for (const item of matches.slice(0, 50)) printOperation(item, spec);
-  if (matches.length > 50) log.dim(`\nOnly the first 50 of ${matches.length} matches are shown; use --output json for all contracts.`);
+  const config = loadProjectConfig(projectDir);
+  const expected = describe ? TOOL_NAMES.apiDescribe : TOOL_NAMES.apiSearch;
+  const session = await openToolSession(config, [expected]);
+  const result = await callStructured(session, expected, describe
+    ? { operation_id: query }
+    : { query });
+  if (flags.output === 'json') console.log(JSON.stringify(result, null, 2));
+  else printResult(describe ? `DraftGo API ${query}` : `DraftGo API search: ${query}`, result);
   return 0;
 }
 

package/src/commands/autoPush.js

@@ -1,41 +1,72 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
 const log = require('../logger');
 const check = require('./check');
-const sync = require('./sync');
+const { loadProjectConfig } = require('../projectConfig');
+const { loadManifest, absolutePath } = require('../worktree/manifest');
+const { hashFile } = require('../worktree/streams');
+const { listConflicts, commitResources } = require('../worktree');
 
-function autoPush(projectDir, positional, flags = {}) {
-  const configPath = path.join(projectDir, '.draftgo', 'config.json');
-  if (!fs.existsSync(configPath)) {
-    log.dim('自动推送未执行：未连接 DraftGo 服务器（缺少 .draftgo/config.json）。');
-    return 0;
+async function changedEntries(projectDir, manifest) {
+  const changed = [];
+  for (const entry of Object.values(manifest.entries)) {
+    const local = absolutePath(projectDir, entry.local_path);
+    if (!fs.existsSync(local)) continue;
+    if ((await hashFile(local)).hash !== entry.base_hash) changed.push(entry);
   }
+  return changed;
+}
 
+async function autoPush(projectDir, positional, flags = {}) {
   let config;
   try {
-    config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-  } catch (err) {
-    log.err(`自动推送未执行：config.json 解析失败：${err.message}`);
+    config = loadProjectConfig(projectDir);
+  } catch {
+    log.dim('auto-push skipped: this project is not connected to DraftGo.');
+    return 0;
+  }
+
+  if (config.auto_push !== true) {
+    log.dim('auto-push skipped: .draftgo/config.json does not set auto_push to true.');
+    return 0;
+  }
+  const conflicts = listConflicts(projectDir);
+  if (conflicts.length) {
+    log.err(`auto-push stopped: ${conflicts.length} unresolved DraftGo conflict(s).`);
     return 1;
   }
 
-  log.step('auto-push: 先执行 check …');
   const checkCode = check(projectDir, { strict: flags.strict });
   if (checkCode !== 0) {
-    log.err('自动推送终止：check 未通过，请修复后重试。');
+    log.err('auto-push stopped because local validation failed.');
     return checkCode;
   }
 
-  if (config.auto_push !== true) {
-    log.dim('自动推送已跳过：check 已通过，但 .draftgo/config.json 的 auto_push 不为 true。');
+  const groups = new Map();
+  if (positional.length) {
+    const [resourceType, ...ids] = positional;
+    if (!resourceType || !ids.length) {
+      log.err('Usage: draftgo auto-push [<pages|nav|docs> <id...>]');
+      return 1;
+    }
+    groups.set(resourceType, ids);
+  } else {
+    for (const entry of await changedEntries(projectDir, loadManifest(projectDir))) {
+      if (!groups.has(entry.resource_type)) groups.set(entry.resource_type, []);
+      groups.get(entry.resource_type).push(entry.resource_id);
+    }
+  }
+  if (!groups.size) {
+    log.dim('auto-push: no checked-out content changed.');
     return 0;
   }
 
-  log.step('auto_push=true：开始 push …');
-  const pushArgs = flags.batch ? ['--batch', ...positional] : positional;
-  return sync(projectDir, 'push', pushArgs, flags);
+  for (const [resourceType, ids] of groups) {
+    await commitResources(projectDir, resourceType, ids, { config });
+  }
+  log.ok('auto-push committed all changed checked-out content.');
+  return 0;
 }
 
 module.exports = autoPush;

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;
 }