Keep kernel core failures typed

Rhys Sullivan committed 6 months ago

Commit 025cdf61 parent b039b6e3 files · +16 −13Browse files

Unified · Split

3 files

packages/kernel/core/src/code-recovery.ts +1 −0
packages/kernel/core/src/effect-errors.ts +1 −3
packages/kernel/core/src/validation.ts +14 −10

packages/kernel/core/src/code-recovery.ts+1−0

@@ -139,6 +139,7 @@ export const recoverExecutionBody = (code: string): string => { · 138 unmodified lines
139	139	const source = extractCandidateSource(code);
140	140	if (!source) return "";
141	141
	142	+ // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: Babel parser throws for malformed candidate code, then recovery falls back to heuristics
142	143	try {
143	144	return renderParsedBody(source);
144	145	} catch {

packages/kernel/core/src/effect-errors.ts+1−3

@@ -3,11 +3,9 @@ import * as Data from "effect/Data"; · 2 unmodified lines
3	3	export class KernelCoreEffectError extends Data.TaggedError("KernelCoreEffectError")<{
4	4	readonly module: string;
5	5	readonly message: string;
	6	+ readonly cause?: unknown;
6	7	}> {}
7	8
8		−export const kernelCoreEffectError = (module: string, message: string) =>
9		− new KernelCoreEffectError({ module, message });
10		−
11	9	/**
12	10	* Default failure type for any `CodeExecutor.execute` implementation —
13	11	* surfaces sandbox-level defects (isolate crash, module load failure,

packages/kernel/core/src/validation.ts+14−10

@@ -1,7 +1,7 @@
1	1	import type { StandardSchemaV1 } from "@standard-schema/spec";
2	2	import * as Effect from "effect/Effect";
3	3
4		−import { kernelCoreEffectError } from "./effect-errors";
	4	+import { KernelCoreEffectError } from "./effect-errors";
5	5
6	6	const getSchemaValidator = (
7	7	schema: unknown,
@@ -55,25 +55,29 @@ export const validateInput = (input: { · 47 unmodified lines
55	55	const validate = getSchemaValidator(input.schema);
56	56	if (!validate) {
57	57	return Effect.fail(
58		− kernelCoreEffectError(
59		− "validation",
60		− `Tool ${input.path} has no Standard Schema validator on inputSchema`,
61		− ),
	58	+ new KernelCoreEffectError({
	59	+ module: "validation",
	60	+ message: `Tool ${input.path} has no Standard Schema validator on inputSchema`,
	61	+ }),
62	62	);
63	63	}
64	64
65	65	return Effect.tryPromise({
66	66	try: () => Promise.resolve(validate(input.value)),
67	67	catch: (cause) =>
68		− kernelCoreEffectError("validation", `Validation error for ${input.path}: ${String(cause)}`),
	68	+ new KernelCoreEffectError({
	69	+ module: "validation",
	70	+ message: `Validation error for ${input.path}`,
	71	+ cause,
	72	+ }),
69	73	}).pipe(
70	74	Effect.flatMap((result) => {
71	75	if ("issues" in result && result.issues) {
72	76	return Effect.fail(
73		− kernelCoreEffectError(
74		− "validation",
75		− `Input validation failed for ${input.path}: ${formatIssues(result.issues)}`,
76		− ),
	77	+ new KernelCoreEffectError({
	78	+ module: "validation",
	79	+ message: `Input validation failed for ${input.path}: ${formatIssues(result.issues)}`,
	80	+ }),
77	81	);
78	82	}
79	83	return Effect.succeed(result.value);