refactor: command/query separation — extract CLI wrappers, shared output helper

src/ast.js

@@ -9,8 +9,9 @@
 import path from 'node:path';
 import { openReadonlyOrFail } from './db.js';
 import { debug } from './logger.js';
-import { paginateResult, printNdjson } from './paginate.js';
+import { paginateResult } from './paginate.js';
 import { LANGUAGE_REGISTRY } from './parser.js';
+import { outputResult } from './result-formatter.js';
 
 // ─── Constants ────────────────────────────────────────────────────────
 
@@ -382,15 +383,7 @@ export function astQueryData(pattern, customDbPath, opts = {}) {
 export function astQuery(pattern, customDbPath, opts = {}) {
   const data = astQueryData(pattern, customDbPath, opts);
 
-  if (opts.ndjson) {
-    printNdjson(data, 'results');
-    return;
-  }
-
-  if (opts.json) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
+  if (outputResult(data, 'results', opts)) return;
 
   // Human-readable output
   if (data.results.length === 0) {

src/audit.js

@@ -10,7 +10,9 @@ import path from 'node:path';
 import { loadConfig } from './config.js';
 import { openReadonlyOrFail } from './db.js';
 import { RULE_DEFS } from './manifesto.js';
-import { explainData, isTestFile, kindIcon } from './queries.js';
+import { explainData, kindIcon } from './queries.js';
+import { outputResult } from './result-formatter.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── Threshold resolution ───────────────────────────────────────────
 
@@ -340,10 +342,7 @@ function defaultHealth() {
 export function audit(target, customDbPath, opts = {}) {
   const data = auditData(target, customDbPath, opts);
 
-  if (opts.json) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
+  if (outputResult(data, null, opts)) return;
 
   if (data.functions.length === 0) {
     console.log(`No ${data.kind === 'file' ? 'file' : 'function/symbol'} matching "${target}"`);

src/boundaries.js

@@ -1,5 +1,5 @@
 import { debug } from './logger.js';
-import { isTestFile } from './queries.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── Glob-to-Regex ───────────────────────────────────────────────────
 

src/branch-compare.js

@@ -12,7 +12,9 @@ import os from 'node:os';
 import path from 'node:path';
 import Database from 'better-sqlite3';
 import { buildGraph } from './builder.js';
-import { isTestFile, kindIcon } from './queries.js';
+import { kindIcon } from './queries.js';
+import { outputResult } from './result-formatter.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── Git Helpers ────────────────────────────────────────────────────────
 
@@ -554,10 +556,8 @@ function formatText(data) {
 export async function branchCompare(baseRef, targetRef, opts = {}) {
   const data = await branchCompareData(baseRef, targetRef, opts);
 
-  if (opts.json || opts.format === 'json') {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
+  if (opts.format === 'json') opts = { ...opts, json: true };
+  if (outputResult(data, null, opts)) return;
 
   if (opts.format === 'mermaid') {
     console.log(branchCompareMermaid(data));

src/cfg.js

@@ -10,9 +10,10 @@ import path from 'node:path';
 import { COMPLEXITY_RULES } from './complexity.js';
 import { openReadonlyOrFail } from './db.js';
 import { info } from './logger.js';
-import { paginateResult, printNdjson } from './paginate.js';
+import { paginateResult } from './paginate.js';
 import { LANGUAGE_REGISTRY } from './parser.js';
-import { isTestFile } from './queries.js';
+import { outputResult } from './result-formatter.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── CFG Node Type Rules (extends COMPLEXITY_RULES) ──────────────────────
 
@@ -1437,14 +1438,7 @@ function edgeStyle(kind) {
 export function cfg(name, customDbPath, opts = {}) {
   const data = cfgData(name, customDbPath, opts);
 
-  if (opts.json) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-  if (opts.ndjson) {
-    printNdjson(data.results);
-    return;
-  }
+  if (outputResult(data, 'results', opts)) return;
 
   if (data.warning) {
     console.log(`\u26A0  ${data.warning}`);

src/check.js

@@ -5,7 +5,8 @@ import { loadConfig } from './config.js';
 import { findCycles } from './cycles.js';
 import { findDbPath, openReadonlyOrFail } from './db.js';
 import { matchOwners, parseCodeowners } from './owners.js';
-import { isTestFile } from './queries.js';
+import { outputResult } from './result-formatter.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── Diff Parser ──────────────────────────────────────────────────────
 
@@ -361,8 +362,7 @@ export function check(customDbPath, opts = {}) {
     process.exit(1);
   }
 
-  if (opts.json) {
-    console.log(JSON.stringify(data, null, 2));
+  if (outputResult(data, null, opts)) {
     if (!data.passed) process.exit(1);
     return;
   }