draftgo-cli 4.0.22 → 4.0.24

package/src/index.js

@@ -1,5 +1,5 @@
-'use strict';
-
+'use strict';
+
 const path = require('path');
 const { parse } = require('./cli');
 const { resolveCommand } = require('./commandRegistry');
@@ -15,32 +15,32 @@ async function run(argv) {
     require('./commands/help')();
     return 1;
   }
-
-  // --version / --help shortcuts
-  if (flags.version || flags.v || command === 'version') {
-    console.log(require('./skill').getPackageVersion());
-    return 0;
-  }
-  if (!command || flags.help || flags.h || command === 'help') {
-    require('./commands/help')();
-    return 0;
-  }
-
-  const projectDir = flags.project
-    ? path.resolve(String(flags.project))
-    : process.cwd();
-
+
+  // --version / --help shortcuts
+  if (flags.version || flags.v || command === 'version') {
+    console.log(require('./skill').getPackageVersion());
+    return 0;
+  }
+  if (!command || flags.help || flags.h || command === 'help') {
+    require('./commands/help')();
+    return 0;
+  }
+
+  const projectDir = flags.project
+    ? path.resolve(String(flags.project))
+    : process.cwd();
+
   try {
     const definition = resolveCommand(command);
     if (definition) return await definition.run(projectDir, positional, flags);
     log.err(`未知命令：${command}`);
     require('./commands/help')();
     return 1;
-  } catch (e) {
-    log.err(e.message || String(e));
-    if (process.env.DEBUG) console.error(e.stack);
-    return 1;
-  }
-}
-
-module.exports = { run };
+  } catch (e) {
+    log.err(e.message || String(e));
+    if (process.env.DEBUG) console.error(e.stack);
+    return 1;
+  }
+}
+
+module.exports = { run };

package/src/localRuntime/detect.js

@@ -1,77 +1,77 @@
-'use strict';
-
+'use strict';
+
 // Environment detection helpers for the local stack setup wizard.
-//   - probePort:      TCP probe (used to find existing MySQL/Redis)
-//   - probeHttp:      HTTP GET probe with retry (used to wait for the app)
-//   - detectDocker:   Find a working `docker` + `docker compose` (or `docker-compose`)
-
-const net = require('net');
-const http = require('http');
-const { spawnSync } = require('child_process');
-
-function probePort(host, port, timeoutMs = 800) {
-  return new Promise((resolve) => {
-    const socket = new net.Socket();
-    let done = false;
-    const finish = (ok) => {
-      if (done) return;
-      done = true;
-      try { socket.destroy(); } catch {}
-      resolve(ok);
-    };
-    socket.setTimeout(timeoutMs);
-    socket.once('connect', () => finish(true));
-    socket.once('timeout', () => finish(false));
-    socket.once('error', () => finish(false));
-    try { socket.connect(port, host); } catch { finish(false); }
-  });
-}
-
-function probeHttpOnce(url, timeoutMs = 2000) {
-  return new Promise((resolve) => {
-    try {
-      const req = http.get(url, { timeout: timeoutMs }, (res) => {
-        // Any HTTP response (including 4xx/5xx) means the app is listening.
-        res.resume();
-        resolve(true);
-      });
-      req.on('timeout', () => { req.destroy(); resolve(false); });
-      req.on('error', () => resolve(false));
-    } catch {
-      resolve(false);
-    }
-  });
-}
-
-async function probeHttp(url, { totalMs = 90000, intervalMs = 1500 } = {}) {
-  const start = Date.now();
-  while (Date.now() - start < totalMs) {
-    if (await probeHttpOnce(url)) return true;
-    await new Promise((r) => setTimeout(r, intervalMs));
-  }
-  return false;
-}
-
-function tryCmd(cmd, args) {
-  try {
-    const r = spawnSync(cmd, args, { encoding: 'utf8', shell: false });
-    return r.status === 0;
-  } catch {
-    return false;
-  }
-}
-
-function detectDocker() {
-  const hasDocker = tryCmd('docker', ['version', '--format', '{{.Client.Version}}']);
-  if (!hasDocker) return { ok: false, reason: 'docker-missing' };
-  // Prefer `docker compose` (plugin); fall back to legacy `docker-compose`.
-  if (tryCmd('docker', ['compose', 'version'])) {
-    return { ok: true, composeCmd: 'docker', composeArgs: ['compose'] };
-  }
-  if (tryCmd('docker-compose', ['version'])) {
-    return { ok: true, composeCmd: 'docker-compose', composeArgs: [] };
-  }
-  return { ok: false, reason: 'compose-missing' };
-}
-
-module.exports = { probePort, probeHttp, probeHttpOnce, detectDocker };
+//   - probePort:      TCP probe (used to find existing MySQL/Redis)
+//   - probeHttp:      HTTP GET probe with retry (used to wait for the app)
+//   - detectDocker:   Find a working `docker` + `docker compose` (or `docker-compose`)
+
+const net = require('net');
+const http = require('http');
+const { spawnSync } = require('child_process');
+
+function probePort(host, port, timeoutMs = 800) {
+  return new Promise((resolve) => {
+    const socket = new net.Socket();
+    let done = false;
+    const finish = (ok) => {
+      if (done) return;
+      done = true;
+      try { socket.destroy(); } catch {}
+      resolve(ok);
+    };
+    socket.setTimeout(timeoutMs);
+    socket.once('connect', () => finish(true));
+    socket.once('timeout', () => finish(false));
+    socket.once('error', () => finish(false));
+    try { socket.connect(port, host); } catch { finish(false); }
+  });
+}
+
+function probeHttpOnce(url, timeoutMs = 2000) {
+  return new Promise((resolve) => {
+    try {
+      const req = http.get(url, { timeout: timeoutMs }, (res) => {
+        // Any HTTP response (including 4xx/5xx) means the app is listening.
+        res.resume();
+        resolve(true);
+      });
+      req.on('timeout', () => { req.destroy(); resolve(false); });
+      req.on('error', () => resolve(false));
+    } catch {
+      resolve(false);
+    }
+  });
+}
+
+async function probeHttp(url, { totalMs = 90000, intervalMs = 1500 } = {}) {
+  const start = Date.now();
+  while (Date.now() - start < totalMs) {
+    if (await probeHttpOnce(url)) return true;
+    await new Promise((r) => setTimeout(r, intervalMs));
+  }
+  return false;
+}
+
+function tryCmd(cmd, args) {
+  try {
+    const r = spawnSync(cmd, args, { encoding: 'utf8', shell: false });
+    return r.status === 0;
+  } catch {
+    return false;
+  }
+}
+
+function detectDocker() {
+  const hasDocker = tryCmd('docker', ['version', '--format', '{{.Client.Version}}']);
+  if (!hasDocker) return { ok: false, reason: 'docker-missing' };
+  // Prefer `docker compose` (plugin); fall back to legacy `docker-compose`.
+  if (tryCmd('docker', ['compose', 'version'])) {
+    return { ok: true, composeCmd: 'docker', composeArgs: ['compose'] };
+  }
+  if (tryCmd('docker-compose', ['version'])) {
+    return { ok: true, composeCmd: 'docker-compose', composeArgs: [] };
+  }
+  return { ok: false, reason: 'compose-missing' };
+}
+
+module.exports = { probePort, probeHttp, probeHttpOnce, detectDocker };

package/src/localRuntime/mysqlClient.js

@@ -1,78 +1,78 @@
-'use strict';
-
+'use strict';
+
 // Lightweight MySQL helper used by the local stack wizard to validate
-// credentials and auto-create the project database when missing.
-//
-// We avoid taking a JS MySQL driver as a dependency. Instead we shell out
-// to one of:
-//   - a native `mysql` client on PATH (preferred — fast, no pull)
-//   - a dockerised `mysql:8.0` client (always available because the wizard
-//     already requires Docker; first call may have to pull the image)
-//
-// Passwords are passed via the `MYSQL_PWD` env var so they don't show up
-// in process listings.
-
-const { spawnSync } = require('child_process');
-const log = require('../logger');
-
-function hasNativeMysql() {
-  try {
-    const r = spawnSync('mysql', ['--version'], { encoding: 'utf8', shell: false });
-    return r.status === 0;
-  } catch { return false; }
-}
-
-function hasDocker() {
-  try {
-    const r = spawnSync('docker', ['version', '--format', '{{.Client.Version}}'], { encoding: 'utf8', shell: false });
-    return r.status === 0;
-  } catch { return false; }
-}
-
-function pickClient() {
-  if (hasNativeMysql()) return { kind: 'native' };
-  if (hasDocker()) return { kind: 'docker' };
-  return null;
-}
-
-// Rewrite localhost/127.0.0.1 to host.docker.internal when running inside
-// a container — the host MySQL is on the host network, not the bridge.
-function dockerHost(host) {
-  return (host === 'localhost' || host === '127.0.0.1') ? 'host.docker.internal' : host;
-}
-
+// credentials and auto-create the project database when missing.
+//
+// We avoid taking a JS MySQL driver as a dependency. Instead we shell out
+// to one of:
+//   - a native `mysql` client on PATH (preferred — fast, no pull)
+//   - a dockerised `mysql:8.0` client (always available because the wizard
+//     already requires Docker; first call may have to pull the image)
+//
+// Passwords are passed via the `MYSQL_PWD` env var so they don't show up
+// in process listings.
+
+const { spawnSync } = require('child_process');
+const log = require('../logger');
+
+function hasNativeMysql() {
+  try {
+    const r = spawnSync('mysql', ['--version'], { encoding: 'utf8', shell: false });
+    return r.status === 0;
+  } catch { return false; }
+}
+
+function hasDocker() {
+  try {
+    const r = spawnSync('docker', ['version', '--format', '{{.Client.Version}}'], { encoding: 'utf8', shell: false });
+    return r.status === 0;
+  } catch { return false; }
+}
+
+function pickClient() {
+  if (hasNativeMysql()) return { kind: 'native' };
+  if (hasDocker()) return { kind: 'docker' };
+  return null;
+}
+
+// Rewrite localhost/127.0.0.1 to host.docker.internal when running inside
+// a container — the host MySQL is on the host network, not the bridge.
+function dockerHost(host) {
+  return (host === 'localhost' || host === '127.0.0.1') ? 'host.docker.internal' : host;
+}
+
 function runSQL(client, conn, sql) {
-  const env = { ...process.env, MYSQL_PWD: conn.password || '' };
-  if (client.kind === 'native') {
-    const args = [
-      '-h', conn.host,
-      '-P', String(conn.port),
-      '-u', conn.user,
-      '--protocol=TCP',
-      '--connect-timeout=5',
-      '-N', '-B',
-      '-e', sql,
-    ];
-    const r = spawnSync('mysql', args, { encoding: 'utf8', env, shell: false });
-    return { ok: r.status === 0, stdout: r.stdout || '', stderr: r.stderr || '', code: r.status };
-  }
-  // docker variant
-  const args = [
-    'run', '--rm', '-i',
-    '--add-host', 'host.docker.internal:host-gateway',
+  const env = { ...process.env, MYSQL_PWD: conn.password || '' };
+  if (client.kind === 'native') {
+    const args = [
+      '-h', conn.host,
+      '-P', String(conn.port),
+      '-u', conn.user,
+      '--protocol=TCP',
+      '--connect-timeout=5',
+      '-N', '-B',
+      '-e', sql,
+    ];
+    const r = spawnSync('mysql', args, { encoding: 'utf8', env, shell: false });
+    return { ok: r.status === 0, stdout: r.stdout || '', stderr: r.stderr || '', code: r.status };
+  }
+  // docker variant
+  const args = [
+    'run', '--rm', '-i',
+    '--add-host', 'host.docker.internal:host-gateway',
     '-e', 'MYSQL_PWD',
-    'mysql:8.0',
-    'mysql',
-    '-h', dockerHost(conn.host),
-    '-P', String(conn.port),
-    '-u', conn.user,
-    '--protocol=TCP',
-    '--connect-timeout=5',
-    '-N', '-B',
-    '-e', sql,
-  ];
-  const r = spawnSync('docker', args, { encoding: 'utf8', env, shell: false });
-  return { ok: r.status === 0, stdout: r.stdout || '', stderr: r.stderr || '', code: r.status };
+    'mysql:8.0',
+    'mysql',
+    '-h', dockerHost(conn.host),
+    '-P', String(conn.port),
+    '-u', conn.user,
+    '--protocol=TCP',
+    '--connect-timeout=5',
+    '-N', '-B',
+    '-e', sql,
+  ];
+  const r = spawnSync('docker', args, { encoding: 'utf8', env, shell: false });
+  return { ok: r.status === 0, stdout: r.stdout || '', stderr: r.stderr || '', code: r.status };
 }
 
 function testConnection(conn) {
@@ -83,73 +83,73 @@ function testConnection(conn) {
   const why = classifyError(probe.stderr);
   return { ok: false, reason: why === 'auth' ? 'auth' : 'unreachable', detail: probe.stderr.trim() };
 }
-
-function classifyError(stderr) {
-  const s = (stderr || '').toLowerCase();
-  if (s.includes('access denied')) return 'auth';
-  if (s.includes("can't connect") || s.includes('connection refused') || s.includes('unknown server host') || s.includes('timed out')) return 'unreachable';
-  if (s.includes('access denied for user') && s.includes("to database")) return 'no-create-privilege';
-  return 'other';
-}
-
-// Escape a db identifier so it can be embedded in a backticked identifier.
-function escIdent(name) {
-  return String(name).replace(/`/g, '``');
-}
-
-// Public API ----------------------------------------------------------------
-//
-// ensureDatabase(conn, { rootPromptFn }) returns one of:
-//   { ok: true,  created: bool, mode: 'existed' | 'created' | 'created-as-root' }
-//   { ok: false, reason: 'no-client' | 'auth' | 'unreachable' | 'create-failed', detail }
-//
-// `rootPromptFn` (optional) is called when the user's account lacks CREATE
-// privilege; it should resolve to `{ user, password }` (or null to abort).
-async function ensureDatabase(conn, { rootPromptFn } = {}) {
+
+function classifyError(stderr) {
+  const s = (stderr || '').toLowerCase();
+  if (s.includes('access denied')) return 'auth';
+  if (s.includes("can't connect") || s.includes('connection refused') || s.includes('unknown server host') || s.includes('timed out')) return 'unreachable';
+  if (s.includes('access denied for user') && s.includes("to database")) return 'no-create-privilege';
+  return 'other';
+}
+
+// Escape a db identifier so it can be embedded in a backticked identifier.
+function escIdent(name) {
+  return String(name).replace(/`/g, '``');
+}
+
+// Public API ----------------------------------------------------------------
+//
+// ensureDatabase(conn, { rootPromptFn }) returns one of:
+//   { ok: true,  created: bool, mode: 'existed' | 'created' | 'created-as-root' }
+//   { ok: false, reason: 'no-client' | 'auth' | 'unreachable' | 'create-failed', detail }
+//
+// `rootPromptFn` (optional) is called when the user's account lacks CREATE
+// privilege; it should resolve to `{ user, password }` (or null to abort).
+async function ensureDatabase(conn, { rootPromptFn } = {}) {
   const client = pickClient();
   const connected = testConnection(conn);
   if (!client || !connected.ok) return connected;
-
-  // 2) Does the database already exist?
-  const showSQL = `SHOW DATABASES LIKE '${String(conn.database).replace(/'/g, "''")}'`;
-  const show = runSQL(client, conn, showSQL);
-  if (show.ok && show.stdout.trim()) {
-    return { ok: true, created: false, mode: 'existed' };
-  }
-
-  // 3) Try to create as the supplied user.
-  const createSQL = `CREATE DATABASE IF NOT EXISTS \`${escIdent(conn.database)}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`;
-  const create = runSQL(client, conn, createSQL);
-  if (create.ok) return { ok: true, created: true, mode: 'created' };
-
-  // 4) Fall back to root if available (privilege issue).
-  if (typeof rootPromptFn === 'function' && /denied/i.test(create.stderr || '')) {
-    const root = await rootPromptFn();
-    if (root && root.user && root.password !== undefined) {
-      const rootConn = { ...conn, user: root.user, password: root.password };
-      const probeRoot = runSQL(client, rootConn, 'SELECT 1');
-      if (!probeRoot.ok) {
-        return { ok: false, reason: 'auth', detail: probeRoot.stderr.trim() };
-      }
-      const createRoot = runSQL(client, rootConn, createSQL);
-      if (!createRoot.ok) {
-        return { ok: false, reason: 'create-failed', detail: createRoot.stderr.trim() };
-      }
-      // Grant privileges on the new DB to the project user so the app can use it.
-      const grantSQL =
-        `GRANT ALL PRIVILEGES ON \`${escIdent(conn.database)}\`.* TO '${conn.user.replace(/'/g, "''")}'@'%'; FLUSH PRIVILEGES;`;
-      runSQL(client, rootConn, grantSQL); // best-effort
-      return { ok: true, created: true, mode: 'created-as-root' };
-    }
-  }
-
-  return { ok: false, reason: 'create-failed', detail: create.stderr.trim() };
-}
-
-function describeClient() {
-  const c = pickClient();
-  if (!c) return 'none';
-  return c.kind === 'native' ? 'native mysql client' : 'docker mysql:8.0';
-}
-
+
+  // 2) Does the database already exist?
+  const showSQL = `SHOW DATABASES LIKE '${String(conn.database).replace(/'/g, "''")}'`;
+  const show = runSQL(client, conn, showSQL);
+  if (show.ok && show.stdout.trim()) {
+    return { ok: true, created: false, mode: 'existed' };
+  }
+
+  // 3) Try to create as the supplied user.
+  const createSQL = `CREATE DATABASE IF NOT EXISTS \`${escIdent(conn.database)}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`;
+  const create = runSQL(client, conn, createSQL);
+  if (create.ok) return { ok: true, created: true, mode: 'created' };
+
+  // 4) Fall back to root if available (privilege issue).
+  if (typeof rootPromptFn === 'function' && /denied/i.test(create.stderr || '')) {
+    const root = await rootPromptFn();
+    if (root && root.user && root.password !== undefined) {
+      const rootConn = { ...conn, user: root.user, password: root.password };
+      const probeRoot = runSQL(client, rootConn, 'SELECT 1');
+      if (!probeRoot.ok) {
+        return { ok: false, reason: 'auth', detail: probeRoot.stderr.trim() };
+      }
+      const createRoot = runSQL(client, rootConn, createSQL);
+      if (!createRoot.ok) {
+        return { ok: false, reason: 'create-failed', detail: createRoot.stderr.trim() };
+      }
+      // Grant privileges on the new DB to the project user so the app can use it.
+      const grantSQL =
+        `GRANT ALL PRIVILEGES ON \`${escIdent(conn.database)}\`.* TO '${conn.user.replace(/'/g, "''")}'@'%'; FLUSH PRIVILEGES;`;
+      runSQL(client, rootConn, grantSQL); // best-effort
+      return { ok: true, created: true, mode: 'created-as-root' };
+    }
+  }
+
+  return { ok: false, reason: 'create-failed', detail: create.stderr.trim() };
+}
+
+function describeClient() {
+  const c = pickClient();
+  if (!c) return 'none';
+  return c.kind === 'native' ? 'native mysql client' : 'docker mysql:8.0';
+}
+
 module.exports = { ensureDatabase, testConnection, describeClient };

package/src/logger.js

@@ -1,37 +1,37 @@
-'use strict';
-
-// Minimal ANSI color helpers - no external deps.
-const isTTY = process.stdout && process.stdout.isTTY;
-const supportsColor = isTTY && !process.env.NO_COLOR;
-const isWindows = process.platform === 'win32';
-const wantsUnicode = process.env.DRAFTGO_UNICODE === '1';
-const useUnicode = wantsUnicode || !isWindows || process.env.TERM_PROGRAM === 'vscode' || process.env.WT_SESSION;
-const sym = useUnicode
-  ? { info: '\u2139', ok: '\u2713', err: '\u2717', step: '\u2192' }
-  : { info: 'i', ok: 'OK', err: 'x', step: '>' };
-
-const wrap = (code) => (s) => supportsColor ? `\x1b[${code}m${s}\x1b[0m` : String(s);
-
-const c = {
-  bold: wrap(1),
-  dim: wrap(2),
-  red: wrap(31),
-  green: wrap(32),
-  yellow: wrap(33),
-  blue: wrap(34),
-  magenta: wrap(35),
-  cyan: wrap(36),
-  gray: wrap(90),
-};
-
-function info(msg) { console.log(`${c.cyan(sym.info)} ${msg}`); }
-function ok(msg) { console.log(`${c.green(sym.ok)} ${msg}`); }
-function warn(msg) { console.warn(`${c.yellow('!')} ${msg}`); }
-function err(msg) { console.error(`${c.red(sym.err)} ${msg}`); }
-function step(msg) { console.log(`${c.blue(sym.step)} ${msg}`); }
-function title(msg) { console.log(`
-${c.bold(c.magenta(msg))}`); }
-function plain(msg) { console.log(msg); }
-function dim(msg) { console.log(c.dim(msg)); }
-
-module.exports = { c, info, ok, warn, err, step, title, plain, dim };
+'use strict';
+
+// Minimal ANSI color helpers - no external deps.
+const isTTY = process.stdout && process.stdout.isTTY;
+const supportsColor = isTTY && !process.env.NO_COLOR;
+const isWindows = process.platform === 'win32';
+const wantsUnicode = process.env.DRAFTGO_UNICODE === '1';
+const useUnicode = wantsUnicode || !isWindows || process.env.TERM_PROGRAM === 'vscode' || process.env.WT_SESSION;
+const sym = useUnicode
+  ? { info: '\u2139', ok: '\u2713', err: '\u2717', step: '\u2192' }
+  : { info: 'i', ok: 'OK', err: 'x', step: '>' };
+
+const wrap = (code) => (s) => supportsColor ? `\x1b[${code}m${s}\x1b[0m` : String(s);
+
+const c = {
+  bold: wrap(1),
+  dim: wrap(2),
+  red: wrap(31),
+  green: wrap(32),
+  yellow: wrap(33),
+  blue: wrap(34),
+  magenta: wrap(35),
+  cyan: wrap(36),
+  gray: wrap(90),
+};
+
+function info(msg) { console.log(`${c.cyan(sym.info)} ${msg}`); }
+function ok(msg) { console.log(`${c.green(sym.ok)} ${msg}`); }
+function warn(msg) { console.warn(`${c.yellow('!')} ${msg}`); }
+function err(msg) { console.error(`${c.red(sym.err)} ${msg}`); }
+function step(msg) { console.log(`${c.blue(sym.step)} ${msg}`); }
+function title(msg) { console.log(`
+${c.bold(c.magenta(msg))}`); }
+function plain(msg) { console.log(msg); }
+function dim(msg) { console.log(c.dim(msg)); }
+
+module.exports = { c, info, ok, warn, err, step, title, plain, dim };