mirror of
https://github.com/morluto/rea.git
synced 2026-11-14 10:43:30 +00:00
* refactor: prune internal seams and preserve configuration ownership * fix(setup): keep YAML aliases and inherited registration settings on refresh - Reuse an unchanged YAML collection only while every alias in it still resolves after the edit; otherwise rebuild it so the alias becomes its value. A sibling anchor replaced or moved in the same refresh no longer leaves an unresolved alias in Hermes or Goose output. - Keep a connection selector whose existing value already chooses stdio (for example an inherited Hermes transport: stdio) instead of superseding it; remote selectors are still replaced. Explicit stdio selectors are therefore no longer rewritten (Kimi expectation updated). - When the whole Hermes registration is inherited through a merge, override it with that merge and write only the changed fields. * fix(setup): edit registration fields whose YAML key is an alias A key written as an alias to a string scalar (for example *field with field: &field env) was treated as a source-only key, so any change to its value was refused in Hermes and Goose. Resolve such keys to their string, keep the aliased spelling while its anchor survives the edit, and write the plain key when the same edit rebuilds the anchor. * test(process): bound cleanup-boundary waits and always release gates Both cancellation tests awaited a bare started promise and released their gates only on success, so a missed boundary waited for the outer deadline and could leave cleanup parked. Use awaitAcknowledgement and release and join the cleanup in finally. * fix(setup): repair only aliases an edit leaves unresolved Replace the pre-edit alias survival guess, which expanded aliases to sibling anchors that survive unchanged, with an exact repair: record what each alias in the replaced value resolves to, write the edit, then replace only aliases left without a preceding anchor by that value. - Keep an aliased key's source position, so its anchor stays ahead of later aliases. - Treat an aliased key as its string only when no other key in the map resolves to the same string; an ambiguous one stays guarded. - Override an inherited Hermes registration only when the requested entry keeps every inherited field, so an explicit replacement can drop remote selectors. * fix(setup): repair aliases whose binding an edit changes, keeping comments An alias whose own anchor was removed could resolve to an earlier anchor with the same name and silently change value. Record the node each alias resolved to and repair any alias that no longer resolves to that node. Carry the alias's comments and spacing onto the repaired value. * test(setup): split the Hermes anchor and merge refresh cases * fix(setup): refuse removing an overridden key its merge would restore The merge-retention check skipped keys the mapping also overrides, so dropping such a key (for example a remote url during an explicit stdio replacement) let the retained merge restore it. Check removal before skipping overridden keys, so the edit is refused with the existing message instead of producing a registration that cannot be applied.
188 lines
6.6 KiB
TypeScript
188 lines
6.6 KiB
TypeScript
import { AnalysisError } from "../../domain/analysisErrorBase.js";
|
|
import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
|
|
import {
|
|
desktopApplicationCaptureSchema,
|
|
desktopCaptureProgressSchema,
|
|
type DesktopApplicationCapture,
|
|
} from "../../domain/desktop/desktopCapture.js";
|
|
import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
|
|
import { AGENTENV_PROVIDER } from "../../desktop/AgentEnvComputerHelper.js";
|
|
import type {
|
|
Answer,
|
|
ControlledComputer,
|
|
} from "../../desktop/BuildComputerController.js";
|
|
import {
|
|
adapterError,
|
|
readOutput,
|
|
reportedFailure,
|
|
} from "./DesktopBuildCommands.js";
|
|
|
|
/** The most lines, and characters, a message quotes from the end of the app's stderr. */
|
|
const STDERR_QUOTE = { lines: 8, characters: 800 } as const;
|
|
/** The most characters a message quotes of a program or a progress line. */
|
|
const LINE_QUOTE = 300;
|
|
|
|
/** The end of `text`, at most `limit` characters, marked when cut. */
|
|
const ending = (text: string, limit: number): string => {
|
|
const characters = [...text.trim()];
|
|
return characters.length <= limit
|
|
? characters.join("")
|
|
: `…${characters.slice(-limit).join("")}`;
|
|
};
|
|
|
|
/** The last whole lines of the app's stderr within the quote's bounds. */
|
|
const stderrEnding = (stderr: string): string => {
|
|
const lines = stderr.trim().split("\n");
|
|
const kept: string[] = [];
|
|
let size = 0;
|
|
for (const line of lines.toReversed()) {
|
|
const grown = size + line.length + 1;
|
|
if (
|
|
kept.length === STDERR_QUOTE.lines ||
|
|
(kept.length > 0 && grown > STDERR_QUOTE.characters)
|
|
)
|
|
break;
|
|
kept.unshift(line);
|
|
size = grown;
|
|
}
|
|
const quoted = ending(kept.join("\n"), STDERR_QUOTE.characters);
|
|
return kept.length < lines.length ? `…\n${quoted}` : quoted;
|
|
};
|
|
|
|
/** The capture's last progress message in a tail of its progress log, or its last line. */
|
|
const lastProgress = (progress: string | undefined): string | undefined => {
|
|
const lines = (progress ?? "")
|
|
.split("\n")
|
|
.map((line) => line.trim())
|
|
.filter((line) => line.length > 0);
|
|
for (let index = lines.length - 1; index >= 0; index -= 1) {
|
|
try {
|
|
const parsed = desktopCaptureProgressSchema.safeParse(
|
|
JSON.parse(lines[index] ?? ""),
|
|
);
|
|
if (parsed.success) return parsed.data.rea_progress.message;
|
|
} catch {
|
|
// A line cut by the tail, or one the capture's runtime wrote.
|
|
}
|
|
}
|
|
return lines.at(-1);
|
|
};
|
|
|
|
/** Text with each declared secret replaced before a quote cuts it. */
|
|
type Redact = (text: string) => string;
|
|
const unredacted: Redact = (text) => text;
|
|
|
|
/** Why the capture is not answering, from what the controller saw instead of the event; its output stays out of the message. */
|
|
export const notAnswered = (
|
|
operation: string,
|
|
answer: Answer,
|
|
redact: Redact = unredacted,
|
|
): AnalysisError => {
|
|
if (answer.error !== undefined) return adapterError(operation, answer.error);
|
|
const last = lastProgress(answer.progress);
|
|
const progress =
|
|
last === undefined
|
|
? ""
|
|
: ` Its last progress: ${ending(redact(last), LINE_QUOTE)}`;
|
|
return adapterError(
|
|
operation,
|
|
answer.exited === undefined
|
|
? `The capture did not answer in time.${progress}`
|
|
: `The capture ended with exit status ${String(answer.exited)} before it answered.${progress}`,
|
|
);
|
|
};
|
|
|
|
/** The step a capture that ended did not answer, as its errors name it. */
|
|
export interface CaptureStep {
|
|
readonly operation: string;
|
|
/** When the capture failed, after "The capture failed", such as "before checkpoint seed". */
|
|
readonly when: string;
|
|
/** What to do when the app itself exited and so ended the capture. */
|
|
readonly afterAppExit: string;
|
|
}
|
|
|
|
/** The app exited and so ended the capture: how it exited and what it said last, with the capture's record kept as details. */
|
|
const appExited = (
|
|
step: CaptureStep,
|
|
recorded: DesktopApplicationCapture,
|
|
exitStatus: number,
|
|
redact: Redact,
|
|
): AnalysisError | undefined => {
|
|
const { application, session } = recorded;
|
|
if (session.end_reason !== "application_exited") return undefined;
|
|
const { exit } = session;
|
|
const ended =
|
|
exit === null
|
|
? "ended"
|
|
: exit.signal === null
|
|
? `exited with code ${String(exit.code)}`
|
|
: `was ended by ${exit.signal}`;
|
|
const window =
|
|
session.first_window_ms === null ? " without opening a window" : "";
|
|
const stderr =
|
|
session.stderr.trim() === ""
|
|
? "it wrote nothing to stderr"
|
|
: `its stderr ends: ${stderrEnding(redact(session.stderr))}`;
|
|
return new ProviderAdapterError(AGENTENV_PROVIDER, step.operation, {
|
|
userMessage: `${ending(redact(application.argv[0] ?? "The app"), LINE_QUOTE)} ${ended} after ${String(session.duration_ms)} ms${window}; ${stderr}`,
|
|
remediationAction: step.afterAppExit,
|
|
diagnostics: {
|
|
capture_exit_status: exitStatus,
|
|
application: { argv: [...application.argv] },
|
|
session: {
|
|
end_reason: session.end_reason,
|
|
duration_ms: session.duration_ms,
|
|
exit: session.exit,
|
|
first_window_ms: session.first_window_ms,
|
|
stderr: session.stderr,
|
|
stderr_truncated: session.stderr_truncated,
|
|
},
|
|
limitations: [...recorded.limitations],
|
|
},
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Why a capture step got no answer. When the capture has ended, its own
|
|
* output says how, read the same way for every step that waits on it: a
|
|
* failure it reported, with its details, or the app exiting; otherwise, or
|
|
* when that output cannot be read, what the controller saw.
|
|
*/
|
|
export const endedCapture = async (
|
|
computer: ControlledComputer,
|
|
step: CaptureStep & { readonly folder: string; readonly redact?: Redact },
|
|
answer: Answer,
|
|
signal: AbortSignal,
|
|
): Promise<AnalysisError> => {
|
|
const { redact = unredacted } = step;
|
|
if (answer.exited === undefined || answer.output_bytes === undefined)
|
|
return notAnswered(step.operation, answer, redact);
|
|
try {
|
|
const output = await readOutput(
|
|
computer,
|
|
`${step.folder}/capture.out`,
|
|
answer.output_bytes,
|
|
signal,
|
|
);
|
|
if (output.kind === "failure")
|
|
return reportedFailure(
|
|
step.operation,
|
|
output,
|
|
`The capture failed ${step.when}: `,
|
|
);
|
|
const recorded = desktopApplicationCaptureSchema.safeParse(output.result);
|
|
return (
|
|
(recorded.success
|
|
? appExited(step, recorded.data, answer.exited, redact)
|
|
: undefined) ?? notAnswered(step.operation, answer, redact)
|
|
);
|
|
} catch (cause: unknown) {
|
|
if (cause instanceof AnalysisError) return cause;
|
|
if (signal.aborted)
|
|
return new AnalysisCancelledError(step.operation, {
|
|
cause: signal.reason,
|
|
});
|
|
return notAnswered(step.operation, answer, redact);
|
|
}
|
|
};
|