golem15/msd-core
3
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

refactor: split subprocess timeout and failure error seams

Browse Source
This commit is contained in:
Tom Boucher
2026-05-04 20:05:09 -04:00
parent 41683b2f53
commit 6fe4af2546
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/src/query-gsd-tools-runtime.ts
View File

@@ -33,10 +33,10 @@ export function createGSDToolsRuntime(opts: {
gsdToolsPath: opts.gsdToolsPath,
timeoutMs: opts.timeoutMs,
workstream: opts.workstream,
createToolsError: (message, command, args, exitCode, stderr, classification) =>
classification?.kind === 'timeout'
? GSDToolsError.timeout(message, command, args, stderr, classification.timeoutMs, { exitCode })
: GSDToolsError.failure(message, command, args, exitCode, stderr),
createTimeoutError: (message, command, args, stderr, timeoutMs) =>
GSDToolsError.timeout(message, command, args, stderr, timeoutMs),
createFailureError: (message, command, args, exitCode, stderr) =>
GSDToolsError.failure(message, command, args, exitCode, stderr),
});
const nativeDirectAdapter = new QueryNativeDirectAdapter({

4
sdk/src/query-subprocess-adapter.test.ts
View File

@@ -41,7 +41,9 @@ describe('QuerySubprocessAdapter', () => {
projectDir: dir,
gsdToolsPath,
timeoutMs: 2_000,
createToolsError: (message, command, args, exitCode, stderr) =>
createTimeoutError: (message, command, args, stderr) =>
new FakeToolsError(message, command, args, null, stderr) as never,
createFailureError: (message, command, args, exitCode, stderr) =>
new FakeToolsError(message, command, args, exitCode, stderr) as never,
});
}

32
sdk/src/query-subprocess-adapter.ts
View File

@@ -1,20 +1,26 @@
import { execFile } from 'node:child_process';
import { readFile } from 'node:fs/promises';
import { timeoutMessage } from './query-failure-classification.js';
import type { GSDToolsError, GSDToolsErrorClassification } from './gsd-tools-error.js';
import type { GSDToolsError } from './gsd-tools-error.js';
export interface QuerySubprocessAdapterDeps {
projectDir: string;
gsdToolsPath: string;
timeoutMs: number;
workstream?: string;
createToolsError: (
createTimeoutError: (
message: string,
command: string,
args: string[],
stderr: string,
timeoutMs: number,
) => GSDToolsError;
createFailureError: (
message: string,
command: string,
args: string[],
exitCode: number | null,
stderr: string,
classification?: GSDToolsErrorClassification,
) => GSDToolsError;
}
@@ -41,20 +47,19 @@ export class QuerySubprocessAdapter {
if (error) {
if (error.killed || (error as NodeJS.ErrnoException).code === 'ETIMEDOUT') {
reject(
this.deps.createToolsError(
this.deps.createTimeoutError(
timeoutMessage(command, args, this.deps.timeoutMs),
command,
args,
null,
stderrStr,
{ kind: 'timeout', timeoutMs: this.deps.timeoutMs },
this.deps.timeoutMs,
),
);
return;
}
reject(
this.deps.createToolsError(
this.deps.createFailureError(
`gsd-tools exited with code ${error.code ?? 'unknown'}: ${command} ${args.join(' ')}${stderrStr ? `\n${stderrStr}` : ''}`,
command,
args,
@@ -71,7 +76,7 @@ export class QuerySubprocessAdapter {
resolve(parsed);
} catch (parseErr) {
reject(
this.deps.createToolsError(
this.deps.createFailureError(
`Failed to parse gsd-tools output for "${command}": ${parseErr instanceof Error ? parseErr.message : String(parseErr)}\nRaw output: ${raw.slice(0, 500)}`,
command,
args,
@@ -84,7 +89,7 @@ export class QuerySubprocessAdapter {
);
child.on('error', (err) => {
reject(this.deps.createToolsError(`Failed to execute gsd-tools: ${err.message}`, command, args, null, ''));
reject(this.deps.createFailureError(`Failed to execute gsd-tools: ${err.message}`, command, args, null, ''));
});
});
}
@@ -108,19 +113,18 @@ export class QuerySubprocessAdapter {
if (error) {
if (error.killed || (error as NodeJS.ErrnoException).code === 'ETIMEDOUT') {
reject(
this.deps.createToolsError(
this.deps.createTimeoutError(
timeoutMessage(command, args, this.deps.timeoutMs),
command,
args,
null,
stderrStr,
{ kind: 'timeout', timeoutMs: this.deps.timeoutMs },
this.deps.timeoutMs,
),
);
return;
}
reject(
this.deps.createToolsError(
this.deps.createFailureError(
`gsd-tools exited with code ${error.code ?? 'unknown'}: ${command} ${args.join(' ')}${stderrStr ? `\n${stderrStr}` : ''}`,
command,
args,
@@ -135,7 +139,7 @@ export class QuerySubprocessAdapter {
);
child.on('error', (err) => {
reject(this.deps.createToolsError(`Failed to execute gsd-tools: ${err.message}`, command, args, null, ''));
reject(this.deps.createFailureError(`Failed to execute gsd-tools: ${err.message}`, command, args, null, ''));
});
});
}