* refactor(#1646): route capability routers through Command Routing Hub per ADR-959 Phase 2 of parent #1641. Converts graphify, intel, and audit command routers from hand-rolled if/else dispatch to routeHubCommandFamily, implementing the ADR-959 §III(B) line 75 mandate. The three routers now share the uniform dispatch shape with the 14 host routers. src/cjs-command-router-adapter.cts * Imported ERROR_REASON from io.cjs. * UnknownCommand translation now passes ERROR_REASON.SDK_UNKNOWN_COMMAND as the second arg to error() — additive for host routers (their existing one-arg error callbacks ignore the second arg), required for capability routers whose tests assert reason === 'sdk_unknown_command' on the JSON-error envelope. src/graphify-command-router.cts * Replaced 4-branch if/else with routeHubCommandFamily + handlers map. * Validation handlers (missing term, missing/invalid --budget) now return makeInvalidArgs(arg, reason, ERROR_REASON.USAGE) Results instead of calling error() directly (Q2=C, Q4=ii from grilling). * Success handlers keep direct output() calls. * Subcommands array is alphabetical for byte-identical 'Available:' text in the unknown-subcommand message. * The unknown-subcommand path is now owned by the Hub's manifest check (the adapter passes SDK_UNKNOWN_COMMAND). src/intel-command-router.cts * Replaced 9-branch if/else with routeHubCommandFamily + handlers map. * Validation handlers (missing term, missing filePath for patch-meta and extract-exports) return makeInvalidArgs Results. * Preserved the timeAgo mutation in the non-raw status handler. * Preserved the lazy require('./intel.cjs') inside the route function. src/audit-command-router.cts * routeAuditUat: routes through the Hub with a synthetic 'run' defaultSubcommand (no real subcommands). Gives uniform observability. * routeAuditOpen: captures --json in a closure, strips it from args before Hub dispatch (so it isn't mistaken for a subcommand by the manifest check), then branches on wantJson inside the handler to preserve the formatAuditReport success-path quirk. docs/CONFIGURATION.md * Observability section: noted capability commands (graphify, intel, audit-uat, audit-open) now emit DispatchEvent records since #1646. .changeset/capability-routers-via-hub.md * Changed fragment describing the user-visible audit-trail expansion. pr:0 placeholder will be backfilled after gh pr create returns the real PR number (DEFECT.CHANGESET-PR-FIELD-DRIFT). Verification * graphify cutover tests: 119/119 pass (all unit, dispatch, behavior, error path, JSON-errors, and registry assertions) * intel cutover tests: 39/39 pass * audit cutover tests: 24/24 pass * bug-974-graphify-budget-missing-value regression test: pass * npm run test:unit (full suite): 2384 tests, 0 fail * gsd-test-summary on docker: outcome=passed, 0 failures (RULESET.PR-FLOW.docker-before-push) JSON-error envelope parity verified byte-identical: reason values ('usage', 'sdk_unknown_command') and message texts are preserved across all three routers' error paths. * chore(#1646): backfill changeset pr: 1647 (DEFECT.CHANGESET-PR-FIELD-DRIFT)
This commit is contained in:
@@ -27,8 +27,15 @@
|
||||
import graphify = require('./graphify.cjs');
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
import io = require('./io.cjs');
|
||||
// Phase 2 (#1646): route through the Hub per ADR-959 §III(B) line 75.
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
import commandRoutingHub = require('./command-routing-hub.cjs');
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
import cjsCommandRouterAdapter = require('./cjs-command-router-adapter.cjs');
|
||||
|
||||
const { output, ERROR_REASON } = io;
|
||||
const { makeInvalidArgs } = commandRoutingHub;
|
||||
const { routeHubCommandFamily } = cjsCommandRouterAdapter;
|
||||
|
||||
// ─── Types ────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -52,42 +59,58 @@ interface RouteGraphifyCommandOptions {
|
||||
// ─── Implementation ───────────────────────────────────────────────────────────
|
||||
|
||||
function routeGraphifyCommand({ args, cwd, raw, error, _graphify }: RouteGraphifyCommandOptions): void {
|
||||
const subcommand = args[1];
|
||||
const g: GraphifyModule = _graphify ?? graphify;
|
||||
|
||||
if (subcommand === 'query') {
|
||||
const term = args[2];
|
||||
if (!term) {
|
||||
error('Usage: gsd-tools graphify query <term>', ERROR_REASON.USAGE);
|
||||
return;
|
||||
}
|
||||
const budgetIdx = args.indexOf('--budget');
|
||||
let budget: number | null = null;
|
||||
if (budgetIdx !== -1) {
|
||||
const rawBudget = args[budgetIdx + 1];
|
||||
if (rawBudget === undefined || Number.isNaN(parseInt(rawBudget, 10))) {
|
||||
error('Usage: gsd-tools graphify query <term> [--budget <N>]', ERROR_REASON.USAGE);
|
||||
return;
|
||||
}
|
||||
budget = parseInt(rawBudget, 10);
|
||||
}
|
||||
output(g.graphifyQuery(cwd, term, { budget }), raw);
|
||||
} else if (subcommand === 'status') {
|
||||
output(g.graphifyStatus(cwd), raw);
|
||||
} else if (subcommand === 'diff') {
|
||||
output(g.graphifyDiff(cwd), raw);
|
||||
} else if (subcommand === 'build') {
|
||||
if (args[2] === 'snapshot') {
|
||||
output(g.writeSnapshot(cwd), raw);
|
||||
} else {
|
||||
output(g.graphifyBuild(cwd), raw);
|
||||
}
|
||||
} else {
|
||||
error(
|
||||
'Unknown graphify subcommand. Available: build, query, status, diff',
|
||||
ERROR_REASON.SDK_UNKNOWN_COMMAND,
|
||||
);
|
||||
}
|
||||
// Phase 2 (#1646): routes through the Command Routing Hub per ADR-959 §III(B)
|
||||
// line 75. Validation handlers return `makeInvalidArgs(...)` Results (Q2=C,
|
||||
// Q4=ii); the Hub → adapter translation preserves ERROR_REASON granularity
|
||||
// via the exitReason field (Phase 1, #1644). Success handlers keep direct
|
||||
// `output()` calls (audit's formatAuditReport quirk sets this precedent).
|
||||
// The unknown-subcommand path is owned by the Hub's manifest check; the
|
||||
// adapter passes SDK_UNKNOWN_COMMAND for UnknownCommand Results.
|
||||
routeHubCommandFamily({
|
||||
family: 'graphify',
|
||||
args,
|
||||
// Alphabetical order produces a stable, byte-identical `Available:` list
|
||||
// in the unknown-subcommand message (matches the pre-conversion text).
|
||||
subcommands: ['build', 'diff', 'query', 'status'],
|
||||
handlers: {
|
||||
query: () => {
|
||||
const term = args[2];
|
||||
if (!term) {
|
||||
return makeInvalidArgs('term', 'Usage: gsd-tools graphify query <term>', ERROR_REASON.USAGE);
|
||||
}
|
||||
const budgetIdx = args.indexOf('--budget');
|
||||
let budget: number | null = null;
|
||||
if (budgetIdx !== -1) {
|
||||
const rawBudget = args[budgetIdx + 1];
|
||||
if (rawBudget === undefined || Number.isNaN(parseInt(rawBudget, 10))) {
|
||||
return makeInvalidArgs(
|
||||
'--budget',
|
||||
'Usage: gsd-tools graphify query <term> [--budget <N>]',
|
||||
ERROR_REASON.USAGE,
|
||||
);
|
||||
}
|
||||
budget = parseInt(rawBudget, 10);
|
||||
}
|
||||
output(g.graphifyQuery(cwd, term, { budget }), raw);
|
||||
},
|
||||
status: () => output(g.graphifyStatus(cwd), raw),
|
||||
diff: () => output(g.graphifyDiff(cwd), raw),
|
||||
build: () => {
|
||||
if (args[2] === 'snapshot') {
|
||||
output(g.writeSnapshot(cwd), raw);
|
||||
} else {
|
||||
output(g.graphifyBuild(cwd), raw);
|
||||
}
|
||||
},
|
||||
},
|
||||
unknownMessage: (subcommand: string, available: string[]) =>
|
||||
`Unknown graphify subcommand. Available: ${available.join(', ')}`,
|
||||
error,
|
||||
cwd,
|
||||
raw,
|
||||
});
|
||||
}
|
||||
|
||||
export = {
|
||||
|
||||
Reference in New Issue
Block a user