Kaoru0822andClaude Opus 5.5
b83b9caf4a
JSON.parse, JSONC parse, and native Claude Code keep the last duplicate object member, and parseClientConfiguration therefore validates the last one. The shared setup/uninstall serializer instead edited text through jsonc-parser's modify and findNodeAtLocation, which select the first matching member, so setup and uninstall on configurations with repeated server tables or rea members wrote into a shadowed member and failed readback. Locate every JSON text edit by the effective (last) member in one place, replacing the first-member modify path. Removing an effective member that shadows an earlier duplicate would activate that duplicate, whatever its ownership, so the serializer now returns a tagged shadowed_member failure and setup and uninstall refuse before writing a backup or the configuration. Fixes #4952 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
82 lines
3.9 KiB
TypeScript
82 lines
3.9 KiB
TypeScript
import type {
|
|
ClientConfigurationResult,
|
|
SetupHost,
|
|
SetupProviderEnvironment,
|
|
SetupProgressEvent,
|
|
} from "./SetupTypes.js";
|
|
import type { SetupClient } from "./SupportedClients.js";
|
|
|
|
export const failedConfigurationMessage = (
|
|
result: Extract<ClientConfigurationResult, { readonly status: "failed" }>,
|
|
): string => {
|
|
switch (result.reason) {
|
|
case "target_changed":
|
|
return "The client began reading a different configuration file after the plan was shown, so no change was made. Rerun setup to review the new target.";
|
|
case "target_unavailable":
|
|
return `The client configuration read target could not be established because ${result.failure.path} could not be inspected: ${result.failure.detail}. Repair access to that path, then rerun setup.`;
|
|
case "path":
|
|
return "Agent configuration path could not be safely verified. Check its permissions and, if it is a symbolic link, verify that the link resolves to a regular file owned by the current user, then rerun setup.";
|
|
case "backup":
|
|
return "Agent configuration could not be backed up, so no change was made. Check file permissions, then rerun setup.";
|
|
case "write":
|
|
return "Agent configuration could not be updated. Check file permissions, then rerun setup.";
|
|
case "shadowed_member":
|
|
return `Agent configuration repeats the member at ${JSON.stringify(result.path)}; removing the member the client reads would activate an earlier duplicate, so no change was made. Remove the duplicate members, then rerun setup.`;
|
|
case "rollback":
|
|
return result.backupPath === undefined
|
|
? `Agent configuration rollback failed at ${result.failure.path}: ${result.failure.detail}; the failed first-run file may remain. Remove or repair it before rerunning setup.`
|
|
: `Agent configuration rollback failed at ${result.failure.path}: ${result.failure.detail}. Inspect the preserved backup at ${result.backupPath} and restore the intended configuration, then rerun setup.`;
|
|
case "readback":
|
|
return result.backupPath === undefined
|
|
? "Agent configuration could not be verified. Repair the configuration file, then rerun setup."
|
|
: `Agent configuration could not be verified after writing. The original was restored and its backup at ${result.backupPath} was retained. Repair the configuration file or restore that backup, then rerun setup.`;
|
|
}
|
|
};
|
|
|
|
/** Configure every detected agent and report the first failed transaction. */
|
|
export const configureDetectedClients = async (options: {
|
|
readonly host: SetupHost;
|
|
readonly detectedClients: readonly SetupClient[];
|
|
readonly providerEnvironment: SetupProviderEnvironment;
|
|
readonly command: readonly string[];
|
|
readonly clients: Record<string, ClientConfigurationResult>;
|
|
readonly appliedActions: string[];
|
|
readonly onProgress?: (event: SetupProgressEvent) => void;
|
|
}): Promise<string | undefined> => {
|
|
let failure: string | undefined;
|
|
for (const client of options.detectedClients) {
|
|
const actionId = `configure_client:${client.name}`;
|
|
const label = client.displayName ?? client.name;
|
|
options.onProgress?.({ actionId, label, state: "started" });
|
|
const result = await options.host.configureClient(
|
|
client,
|
|
options.providerEnvironment,
|
|
options.command,
|
|
);
|
|
options.clients[client.name] = result;
|
|
if (result.status === "failed") {
|
|
failure ??= failedConfigurationMessage(result);
|
|
options.onProgress?.({
|
|
actionId,
|
|
label,
|
|
state: "failed",
|
|
detail: failedConfigurationMessage(result),
|
|
});
|
|
} else if (result.status === "configured") {
|
|
options.appliedActions.push(`configured_${client.name}`);
|
|
options.onProgress?.({ actionId, label, state: "completed" });
|
|
} else {
|
|
options.onProgress?.({
|
|
actionId,
|
|
label,
|
|
state: "warning",
|
|
detail:
|
|
result.status === "unchanged"
|
|
? "Already current"
|
|
: "Manual configuration required",
|
|
});
|
|
}
|
|
}
|
|
return failure;
|
|
};
|