* fix(7): raise concurrency-safety roadmap-analyze budget 2000ms → 5000ms The 50-phase roadmap-analyze wall-clock test consistently flaked on Mac under realistic load (empirical floor ~2100-3000ms), independently reproduced by three fixers on PRs #3795, #3792, #3799. Extract the magic 2000 to named constant ROADMAP_ANALYZE_BUDGET_MS with an explanatory comment. Raise to 5000ms (2.5x observed worst-case) — large enough to eliminate Mac flakes without masking real regressions. Long-term: convert to behavior-anchored assertion per PR #3803 pattern; tracked as follow-up, out of scope here. Acceptance criteria from #7: > "Replace hardcoded 2000ms with higher budget (e.g., 5000ms) or make > configurable; add comment documenting rationale; confirm no > false-negative on healthy machine." Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(7): guard executeForCjs with try/catch fallback in all CJS routers When the synckit bridge throws (worker crash, Atomics failure on Windows/Node 24, or any other transient OS-level failure), the exception propagated uncaught through the sdkHandler closure up to Node.js's unhandled-rejection handler. On Windows, the async stderr write for the rejection message may not flush before process exit, producing an empty- stderr non-zero exit that manifests as 'init failed: Command failed: ...' in workspace.test.cjs. Wrap getExecuteForCjs() in a try/catch in every CJS router that has this pattern (gsd-tools.cjs _dispatchNonFamily, init-, roadmap-, state-, validate-, verify-command-router.cjs). On catch: fall through to the CJS handler, which is the designed safety net for bridge failures and produces identical output. Verified: workspace.test.cjs (26/26), concurrency-safety.test.cjs (31/31), cjs-sdk-bridge-integration.test.cjs (4/4), and bug-3631-router-raw-flag.test.cjs (2/2) all pass locally on Mac. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
137 lines
5.5 KiB
JavaScript
137 lines
5.5 KiB
JavaScript
'use strict';
|
|
|
|
const { VALIDATE_SUBCOMMANDS } = require('./command-aliases.generated.cjs');
|
|
const { formatGsdSlash, resolveRuntime } = require('./runtime-slash.cjs');
|
|
const { routeCjsCommandFamily } = require('./cjs-command-router-adapter.cjs');
|
|
const { output } = require('./core.cjs');
|
|
|
|
// ─── SDK bridge (Phase 6) — shared loader via cjs-sdk-bridge.cjs ──────────────
|
|
const { tryLoadSdk, getExecuteForCjs } = require('./cjs-sdk-bridge.cjs');
|
|
|
|
/**
|
|
* Manifest-backed validate subcommand router.
|
|
* Keeps gsd-tools.cjs thin while preserving existing command semantics.
|
|
*
|
|
* Phase 6: validate.consistency, validate.health, validate.agents are
|
|
* dispatched via executeForCjs when the SDK is available. CJS fallback
|
|
* retained when:
|
|
* - GSD_WORKSTREAM is active (workstream-scoped requests fall through to CJS).
|
|
* - SDK is unavailable (build not present).
|
|
*
|
|
* CJS-only subcommands:
|
|
* - context: complex inline logic using classifyContextUtilization and
|
|
* output formatting that has no direct SDK counterpart. Remains CJS-native.
|
|
*
|
|
* SDK-only (unsupported in CJS router): none.
|
|
*/
|
|
function routeValidateCommand({ verify, args, cwd, raw, parseNamedArgs, output: outputFn, error }) {
|
|
const activeWorkstream = process.env.GSD_WORKSTREAM;
|
|
const sdkAvailable = !activeWorkstream && tryLoadSdk();
|
|
|
|
function sdkHandler(registryCommand, registryArgs, legacyArgs, cjsFallback) {
|
|
if (!sdkAvailable) return cjsFallback;
|
|
return () => {
|
|
let result;
|
|
try {
|
|
result = getExecuteForCjs()({
|
|
registryCommand,
|
|
registryArgs,
|
|
legacyCommand: 'validate',
|
|
legacyArgs,
|
|
// #3631: under --raw, request mode:'raw' so the bridge runs the SDK's
|
|
// raw projection (formatQueryRawOutput) and returns the scalar string
|
|
// CJS callers used to print. We then bypass output()'s JSON-stringify
|
|
// path by passing rawValue (the third positional). With mode:'json',
|
|
// output() emits the JSON IR as before.
|
|
mode: raw ? 'raw' : 'json',
|
|
projectDir: cwd,
|
|
});
|
|
} catch {
|
|
// Bridge threw (e.g. synckit worker crash, Atomics failure on Windows).
|
|
// Fall through to CJS handler — the CJS path is the designed safety net.
|
|
return cjsFallback();
|
|
}
|
|
if (!result.ok) {
|
|
error(result.errorDetails && result.errorDetails.message
|
|
? result.errorDetails.message
|
|
: `validate ${registryCommand} failed (${result.errorKind})`);
|
|
return;
|
|
}
|
|
if (raw) {
|
|
output(null, true, typeof result.data === 'string' ? result.data : String(result.data ?? ''));
|
|
} else {
|
|
output(result.data);
|
|
}
|
|
};
|
|
}
|
|
|
|
routeCjsCommandFamily({
|
|
args,
|
|
subcommands: VALIDATE_SUBCOMMANDS,
|
|
unsupported: {},
|
|
error,
|
|
unknownMessage: (_subcommand, available) => `Unknown validate subcommand. Available: ${available.join(', ')}`,
|
|
handlers: {
|
|
consistency: sdkHandler(
|
|
'validate.consistency',
|
|
args.slice(2),
|
|
args.slice(1),
|
|
() => verify.cmdValidateConsistency(cwd, raw),
|
|
),
|
|
// Keep health on CJS for now so fix hints are rendered via runtime-slash
|
|
// helpers (codex expects $gsd-* command shape).
|
|
health: () => {
|
|
const repairFlag = args.includes('--repair');
|
|
const backfillFlag = args.includes('--backfill');
|
|
verify.cmdValidateHealth(cwd, { repair: repairFlag, backfill: backfillFlag }, raw);
|
|
},
|
|
agents: sdkHandler(
|
|
'validate.agents',
|
|
args.slice(2),
|
|
args.slice(1),
|
|
() => verify.cmdValidateAgents(cwd, raw),
|
|
),
|
|
// context: CJS-only — complex inline logic using classifyContextUtilization
|
|
// with custom output formatting that has no direct SDK counterpart.
|
|
context: () => {
|
|
const opts = parseNamedArgs(args, ['tokens-used', 'context-window']);
|
|
if (opts['tokens-used'] === null) {
|
|
error('--tokens-used <integer> is required for `validate context`');
|
|
return;
|
|
}
|
|
if (opts['context-window'] === null) {
|
|
error('--context-window <integer> is required for `validate context`');
|
|
return;
|
|
}
|
|
const { classifyContextUtilization, STATES } = require('./context-utilization.cjs');
|
|
const threadCmd = formatGsdSlash('thread', resolveRuntime(cwd));
|
|
const RECOMMENDATIONS = {
|
|
[STATES.HEALTHY]: null,
|
|
[STATES.WARNING]: `Context is approaching the fracture zone — consider ${threadCmd} to continue in a fresh window.`,
|
|
[STATES.CRITICAL]: `Reasoning quality may degrade past 70% utilization (fracture point). Run ${threadCmd} now to preserve output quality.`,
|
|
};
|
|
let classified;
|
|
try {
|
|
classified = classifyContextUtilization(Number(opts['tokens-used']), Number(opts['context-window']));
|
|
} catch (e) {
|
|
const flag = /tokensUsed/.test(e.message) ? '--tokens-used' : '--context-window';
|
|
error(`${flag} must be a non-negative integer (window > 0), got the values supplied`);
|
|
return;
|
|
}
|
|
const result = { ...classified, recommendation: RECOMMENDATIONS[classified.state] };
|
|
if (args.includes('--json')) {
|
|
outputFn(result, raw);
|
|
} else {
|
|
const lines = [`Context utilization: ${result.percent}% (${result.state})`];
|
|
if (result.recommendation) lines.push(result.recommendation);
|
|
outputFn(result, true, lines.join('\n'));
|
|
}
|
|
},
|
|
},
|
|
});
|
|
}
|
|
|
|
module.exports = {
|
|
routeValidateCommand,
|
|
};
|