mirror of
https://github.com/morluto/rea.git
synced 2026-11-14 18:52:48 +00:00
morluto
b138f52e12
* 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.
79 lines
2.6 KiB
TypeScript
79 lines
2.6 KiB
TypeScript
import type { ClientRegistrationDialect } from "./ClientConfigurationDocument.js";
|
|
|
|
/** Proven native conditions incompatible with selecting the retained stdio launcher. */
|
|
export type NativeStdioIncompatibility =
|
|
| {
|
|
readonly kind:
|
|
| "truthy"
|
|
| "non-nullish"
|
|
| "present"
|
|
| "missing"
|
|
| "nullish"
|
|
| "string"
|
|
| "invalid-string";
|
|
readonly field: string;
|
|
}
|
|
| {
|
|
readonly kind: "required-enum" | "optional-enum";
|
|
readonly field: string;
|
|
readonly values: readonly string[];
|
|
}
|
|
| { readonly kind: "equals"; readonly field: string; readonly value: string }
|
|
| {
|
|
readonly kind: "all";
|
|
readonly conditions: readonly NativeStdioIncompatibility[];
|
|
};
|
|
|
|
/** Native connection semantics, separate from the format storing the document. */
|
|
export type ClientRegistrationConnectionProfile =
|
|
| {
|
|
readonly kind: "flat";
|
|
/** Proven native selectors/aliases in addition to canonical stdio fields. */
|
|
readonly fields: readonly string[];
|
|
readonly stdio: readonly NativeStdioIncompatibility[];
|
|
}
|
|
| { readonly kind: "cline" }
|
|
| { readonly kind: "commandcode" }
|
|
| {
|
|
readonly kind: "stdio-only";
|
|
/** Documented local members; other row members leave write applicability unknown. */
|
|
readonly documentedFields: readonly string[];
|
|
}
|
|
| { readonly kind: "unavailable"; readonly reason: string };
|
|
|
|
/** Resolved by the client definition owner, never inferred from display text. */
|
|
export interface ClientRegistrationProfile {
|
|
readonly nativeClient: string;
|
|
readonly connection: ClientRegistrationConnectionProfile;
|
|
}
|
|
|
|
export interface ClientRegistrationTarget {
|
|
readonly dialect: ClientRegistrationDialect;
|
|
readonly profile: ClientRegistrationProfile;
|
|
}
|
|
|
|
/**
|
|
* Enum selectors whose current value already chooses stdio. Replacing the
|
|
* launcher with a stdio launcher leaves them correct, so a refresh keeps them
|
|
* instead of superseding them like a remote selector.
|
|
*/
|
|
export const stdioSelectingFields = (
|
|
source: Readonly<Record<string, unknown>>,
|
|
connection: Extract<ClientRegistrationConnectionProfile, { kind: "flat" }>,
|
|
): ReadonlySet<string> =>
|
|
new Set(
|
|
connection.stdio.flatMap((condition) => {
|
|
if (
|
|
condition.kind !== "required-enum" &&
|
|
condition.kind !== "optional-enum"
|
|
)
|
|
return [];
|
|
const value = Object.hasOwn(source, condition.field)
|
|
? source[condition.field]
|
|
: undefined;
|
|
return typeof value === "string" && condition.values.includes(value)
|
|
? [condition.field]
|
|
: [];
|
|
}),
|
|
);
|