cjsFallbackHandler was a no-op pass-through returning only its last argument, and state-command-router was its sole consumer — every handler wrapped a thunk in a 5-arg projection tuple whose first four args (registryCommand, registryArgs, legacyArgs, rawFormatter) were constructed and immediately discarded (rawFormatter null at 100% of sites). The SDK-dispatch path the metadata was nominally for is a retired shim. - Collapse all 20 state handlers to plain () => state.cmd*(...) thunks, matching the post-#298 inline convention used by the verify/roadmap/ phases routers (complete-phase already used this form). - Remove the local fallback() helper and Handler type from state-command-router.cts. - Drop cjsFallbackHandler from cjs-command-router-adapter.cts exports — no remaining consumers. Behavior-preserving: each thunk body is unchanged. No test referenced cjsFallbackHandler. Adapter test (8/8), state-routing tests (36/36), and the full unit suite (3435 pass / 0 fail) stay green. Source-only diff; gsd-core/bin/lib/*.cjs are built-at-publish per ADR-457. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
This commit is contained in:
@@ -135,19 +135,7 @@ function routeHubCommandFamily({
|
|||||||
error((result as { message: string }).message);
|
error((result as { message: string }).message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Projection helper for family routers that still declare SDK registry metadata
|
|
||||||
* but execute the CJS fallback path at this seam.
|
|
||||||
*
|
|
||||||
* Accepts variable argument shapes so routers can pass legacy projection tuples
|
|
||||||
* (`registryCommand`, `registryArgs`, `legacyArgs`, optional `rawFormatter`, `cjsFallback`).
|
|
||||||
*/
|
|
||||||
function cjsFallbackHandler(...projectionArgs: unknown[]): unknown {
|
|
||||||
return projectionArgs[projectionArgs.length - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
export = {
|
export = {
|
||||||
routeCjsCommandFamily,
|
routeCjsCommandFamily,
|
||||||
routeHubCommandFamily,
|
routeHubCommandFamily,
|
||||||
cjsFallbackHandler,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,19 +17,11 @@
|
|||||||
import { STATE_SUBCOMMANDS } from './command-aliases.cjs';
|
import { STATE_SUBCOMMANDS } from './command-aliases.cjs';
|
||||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||||
import cjsCommandRouterAdapter = require('./cjs-command-router-adapter.cjs');
|
import cjsCommandRouterAdapter = require('./cjs-command-router-adapter.cjs');
|
||||||
const { routeHubCommandFamily, cjsFallbackHandler } = cjsCommandRouterAdapter;
|
const { routeHubCommandFamily } = cjsCommandRouterAdapter;
|
||||||
import { parseNamedArgs } from './command-arg-projection.cjs';
|
import { parseNamedArgs } from './command-arg-projection.cjs';
|
||||||
|
|
||||||
// ─── Types ────────────────────────────────────────────────────────────────────
|
// ─── Types ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
// Handler type matching cjs-command-router-adapter's internal Handler type.
|
|
||||||
type Handler = () => unknown;
|
|
||||||
|
|
||||||
// Helper: cast cjsFallbackHandler result (always the last arg, a Handler) to Handler.
|
|
||||||
function fallback(...projectionArgs: unknown[]): Handler {
|
|
||||||
return cjsFallbackHandler(...projectionArgs) as Handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper: extract string-only named arg value (value flags never return boolean).
|
// Helper: extract string-only named arg value (value flags never return boolean).
|
||||||
function strArg(opts: Record<string, string | boolean | null>, key: string): string | null | undefined {
|
function strArg(opts: Record<string, string | boolean | null>, key: string): string | null | undefined {
|
||||||
const v = opts[key];
|
const v = opts[key];
|
||||||
@@ -94,226 +86,106 @@ function routeStateCommand({ state, args, cwd, raw, error }: RouteStateCommandOp
|
|||||||
raw,
|
raw,
|
||||||
unknownMessage: (subcommand: string, available: string[]) => `Unknown state subcommand: "${subcommand}". Available: ${available.join(', ')}`,
|
unknownMessage: (subcommand: string, available: string[]) => `Unknown state subcommand: "${subcommand}". Available: ${available.join(', ')}`,
|
||||||
handlers: {
|
handlers: {
|
||||||
load: fallback(
|
load: () => state.cmdStateLoad(cwd, raw),
|
||||||
'state.load',
|
json: () => state.cmdStateJson(cwd, raw),
|
||||||
[],
|
get: () => state.cmdStateGet(cwd, args[2], raw),
|
||||||
args.slice(1),
|
update: () => state.cmdStateUpdate(cwd, args[2], args[3]),
|
||||||
null,
|
patch: () => {
|
||||||
() => state.cmdStateLoad(cwd, raw),
|
const patches: Record<string, string> = {};
|
||||||
),
|
if (args.length === 3 && typeof args[2] === 'string' && args[2].trim().startsWith('{')) {
|
||||||
json: fallback(
|
let parsed: unknown;
|
||||||
'state.json',
|
try {
|
||||||
[],
|
parsed = JSON.parse(args[2]);
|
||||||
args.slice(1),
|
} catch (err) {
|
||||||
null,
|
error(`state patch: invalid JSON object: ${(err as Error).message}`);
|
||||||
() => state.cmdStateJson(cwd, raw),
|
return;
|
||||||
),
|
}
|
||||||
get: fallback(
|
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
||||||
'state.get',
|
error('state patch: JSON input must be an object of field/value pairs.');
|
||||||
args.slice(2),
|
return;
|
||||||
args.slice(1),
|
}
|
||||||
null,
|
for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
|
||||||
() => state.cmdStateGet(cwd, args[2], raw),
|
if (key && value !== undefined) {
|
||||||
),
|
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
||||||
update: fallback(
|
patches[key] = String(value);
|
||||||
'state.update',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => state.cmdStateUpdate(cwd, args[2], args[3]),
|
|
||||||
),
|
|
||||||
patch: fallback(
|
|
||||||
'state.patch',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const patches: Record<string, string> = {};
|
|
||||||
if (args.length === 3 && typeof args[2] === 'string' && args[2].trim().startsWith('{')) {
|
|
||||||
let parsed: unknown;
|
|
||||||
try {
|
|
||||||
parsed = JSON.parse(args[2]);
|
|
||||||
} catch (err) {
|
|
||||||
error(`state patch: invalid JSON object: ${(err as Error).message}`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
||||||
error('state patch: JSON input must be an object of field/value pairs.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
|
|
||||||
if (key && value !== undefined) {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
|
||||||
patches[key] = String(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (let i = 2; i < args.length; i += 2) {
|
|
||||||
const key = args[i].replace(/^--/, '');
|
|
||||||
const value = args[i + 1];
|
|
||||||
if (key && value !== undefined) {
|
|
||||||
patches[key] = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
state.cmdStatePatch(cwd, patches, raw);
|
} else {
|
||||||
},
|
for (let i = 2; i < args.length; i += 2) {
|
||||||
),
|
const key = args[i].replace(/^--/, '');
|
||||||
'advance-plan': fallback(
|
const value = args[i + 1];
|
||||||
'state.advance-plan',
|
if (key && value !== undefined) {
|
||||||
[],
|
patches[key] = value;
|
||||||
args.slice(1),
|
}
|
||||||
null,
|
}
|
||||||
() => state.cmdStateAdvancePlan(cwd, raw),
|
}
|
||||||
),
|
state.cmdStatePatch(cwd, patches, raw);
|
||||||
'record-metric': fallback(
|
},
|
||||||
'state.record-metric',
|
'advance-plan': () => state.cmdStateAdvancePlan(cwd, raw),
|
||||||
args.slice(2),
|
'record-metric': () => {
|
||||||
args.slice(1),
|
const a = parseNamedArgs(args, ['phase', 'plan', 'duration', 'tasks', 'files']);
|
||||||
null,
|
state.cmdStateRecordMetric(cwd, {
|
||||||
() => {
|
phase: strArg(a, 'phase'),
|
||||||
const a = parseNamedArgs(args, ['phase', 'plan', 'duration', 'tasks', 'files']);
|
plan: strArg(a, 'plan'),
|
||||||
state.cmdStateRecordMetric(cwd, {
|
duration: strArg(a, 'duration'),
|
||||||
phase: strArg(a, 'phase'),
|
tasks: strArg(a, 'tasks'),
|
||||||
plan: strArg(a, 'plan'),
|
files: strArg(a, 'files'),
|
||||||
duration: strArg(a, 'duration'),
|
}, raw);
|
||||||
tasks: strArg(a, 'tasks'),
|
},
|
||||||
files: strArg(a, 'files'),
|
'update-progress': () => state.cmdStateUpdateProgress(cwd, raw),
|
||||||
}, raw);
|
'add-decision': () => {
|
||||||
},
|
const a = parseNamedArgs(args, ['phase', 'summary', 'summary-file', 'rationale', 'rationale-file']);
|
||||||
),
|
state.cmdStateAddDecision(cwd, {
|
||||||
'update-progress': fallback(
|
phase: strArg(a, 'phase'),
|
||||||
'state.update-progress',
|
summary: strArg(a, 'summary'),
|
||||||
[],
|
summary_file: strArg(a, 'summary-file'),
|
||||||
args.slice(1),
|
rationale: strArg(a, 'rationale') || '',
|
||||||
null,
|
rationale_file: strArg(a, 'rationale-file'),
|
||||||
() => state.cmdStateUpdateProgress(cwd, raw),
|
}, raw);
|
||||||
),
|
},
|
||||||
'add-decision': fallback(
|
'add-blocker': () => {
|
||||||
'state.add-decision',
|
const a = parseNamedArgs(args, ['text', 'text-file']);
|
||||||
args.slice(2),
|
state.cmdStateAddBlocker(cwd, { text: strArg(a, 'text'), text_file: strArg(a, 'text-file') }, raw);
|
||||||
args.slice(1),
|
},
|
||||||
null,
|
'resolve-blocker': () => state.cmdStateResolveBlocker(cwd, strArg(parseNamedArgs(args, ['text']), 'text'), raw),
|
||||||
() => {
|
'record-session': () => {
|
||||||
const a = parseNamedArgs(args, ['phase', 'summary', 'summary-file', 'rationale', 'rationale-file']);
|
const a = parseNamedArgs(args, ['stopped-at', 'resume-file']);
|
||||||
state.cmdStateAddDecision(cwd, {
|
// Pass resume_file as-is (undefined when --resume-file was not provided) so
|
||||||
phase: strArg(a, 'phase'),
|
// cmdStateRecordSession can distinguish "caller explicitly passed a value" from
|
||||||
summary: strArg(a, 'summary'),
|
// "option was not supplied" and apply the template-default-only replacement guard.
|
||||||
summary_file: strArg(a, 'summary-file'),
|
state.cmdStateRecordSession(cwd, { stopped_at: strArg(a, 'stopped-at'), resume_file: strArg(a, 'resume-file') }, raw);
|
||||||
rationale: strArg(a, 'rationale') || '',
|
},
|
||||||
rationale_file: strArg(a, 'rationale-file'),
|
'begin-phase': () => {
|
||||||
}, raw);
|
const a = parseNamedArgs(args, ['phase', 'name', 'plans']);
|
||||||
},
|
state.cmdStateBeginPhase(cwd, strArg(a, 'phase'), strArg(a, 'name'), parsePlans(strArg(a, 'plans')), raw);
|
||||||
),
|
},
|
||||||
'add-blocker': fallback(
|
'signal-waiting': () => {
|
||||||
'state.add-blocker',
|
const a = parseNamedArgs(args, ['type', 'question', 'options', 'phase']);
|
||||||
args.slice(2),
|
state.cmdSignalWaiting(cwd, strArg(a, 'type'), strArg(a, 'question'), strArg(a, 'options'), strArg(a, 'phase'), raw);
|
||||||
args.slice(1),
|
},
|
||||||
null,
|
'signal-resume': () => state.cmdSignalResume(cwd, raw),
|
||||||
() => {
|
'planned-phase': () => {
|
||||||
const a = parseNamedArgs(args, ['text', 'text-file']);
|
const a = parseNamedArgs(args, ['phase', 'name', 'plans']);
|
||||||
state.cmdStateAddBlocker(cwd, { text: strArg(a, 'text'), text_file: strArg(a, 'text-file') }, raw);
|
state.cmdStatePlannedPhase(cwd, strArg(a, 'phase'), parsePlans(strArg(a, 'plans')), raw);
|
||||||
},
|
},
|
||||||
),
|
validate: () => state.cmdStateValidate(cwd, raw),
|
||||||
'resolve-blocker': fallback(
|
sync: () => {
|
||||||
'state.resolve-blocker',
|
const a = parseNamedArgs(args, [], ['verify']);
|
||||||
args.slice(2),
|
state.cmdStateSync(cwd, { verify: a['verify'] }, raw);
|
||||||
args.slice(1),
|
},
|
||||||
null,
|
prune: () => {
|
||||||
() => state.cmdStateResolveBlocker(cwd, strArg(parseNamedArgs(args, ['text']), 'text'), raw),
|
const a = parseNamedArgs(args, ['keep-recent'], ['dry-run']);
|
||||||
),
|
state.cmdStatePrune(cwd, { keepRecent: strArg(a, 'keep-recent') || '3', dryRun: a['dry-run'] === true }, raw);
|
||||||
'record-session': fallback(
|
},
|
||||||
'state.record-session',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['stopped-at', 'resume-file']);
|
|
||||||
// Pass resume_file as-is (undefined when --resume-file was not provided) so
|
|
||||||
// cmdStateRecordSession can distinguish "caller explicitly passed a value" from
|
|
||||||
// "option was not supplied" and apply the template-default-only replacement guard.
|
|
||||||
state.cmdStateRecordSession(cwd, { stopped_at: strArg(a, 'stopped-at'), resume_file: strArg(a, 'resume-file') }, raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'begin-phase': fallback(
|
|
||||||
'state.begin-phase',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['phase', 'name', 'plans']);
|
|
||||||
state.cmdStateBeginPhase(cwd, strArg(a, 'phase'), strArg(a, 'name'), parsePlans(strArg(a, 'plans')), raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'signal-waiting': fallback(
|
|
||||||
'state.signal-waiting',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['type', 'question', 'options', 'phase']);
|
|
||||||
state.cmdSignalWaiting(cwd, strArg(a, 'type'), strArg(a, 'question'), strArg(a, 'options'), strArg(a, 'phase'), raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'signal-resume': fallback(
|
|
||||||
'state.signal-resume',
|
|
||||||
[],
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => state.cmdSignalResume(cwd, raw),
|
|
||||||
),
|
|
||||||
'planned-phase': fallback(
|
|
||||||
'state.planned-phase',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['phase', 'name', 'plans']);
|
|
||||||
state.cmdStatePlannedPhase(cwd, strArg(a, 'phase'), parsePlans(strArg(a, 'plans')), raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
validate: fallback(
|
|
||||||
'state.validate',
|
|
||||||
[],
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => state.cmdStateValidate(cwd, raw),
|
|
||||||
),
|
|
||||||
sync: fallback(
|
|
||||||
'state.sync',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, [], ['verify']);
|
|
||||||
state.cmdStateSync(cwd, { verify: a['verify'] }, raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
prune: fallback(
|
|
||||||
'state.prune',
|
|
||||||
args.slice(2),
|
|
||||||
args.slice(1),
|
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['keep-recent'], ['dry-run']);
|
|
||||||
state.cmdStatePrune(cwd, { keepRecent: strArg(a, 'keep-recent') || '3', dryRun: a['dry-run'] === true }, raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
// complete-phase: CJS-only — no SDK counterpart.
|
// complete-phase: CJS-only — no SDK counterpart.
|
||||||
'complete-phase': () => {
|
'complete-phase': () => {
|
||||||
const a = parseNamedArgs(args, ['phase']);
|
const a = parseNamedArgs(args, ['phase']);
|
||||||
state.cmdStateCompletePhase(cwd, raw, strArg(a, 'phase') || args[2]);
|
state.cmdStateCompletePhase(cwd, raw, strArg(a, 'phase') || args[2]);
|
||||||
},
|
},
|
||||||
'milestone-switch': fallback(
|
'milestone-switch': () => {
|
||||||
'state.milestone-switch',
|
const a = parseNamedArgs(args, ['milestone', 'name']);
|
||||||
args.slice(2),
|
state.cmdStateMilestoneSwitch(cwd, strArg(a, 'milestone'), strArg(a, 'name'), raw);
|
||||||
args.slice(1),
|
},
|
||||||
null,
|
|
||||||
() => {
|
|
||||||
const a = parseNamedArgs(args, ['milestone', 'name']);
|
|
||||||
state.cmdStateMilestoneSwitch(cwd, strArg(a, 'milestone'), strArg(a, 'name'), raw);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user