mirror of
https://github.com/morluto/rea
synced 2026-10-28 06:46:47 -04:00
08561e0eb7
* feat(clients): register Grok Build and Grok Bot during setup Detect both clients and install the local REA MCP registration the same way setup already handles the other agents. Grok Build edits only the REA tables in its TOML config and sets startup_timeout_sec to 30. Grok Bot writes the mcpServers.rea entry into mcp.json. That file is the registration to add to the signed-in account; setup does not call the account API. Filed by Grok. * fix(clients): clear a disabled Grok Build registration during setup Grok Build keeps a server suppressed when its name stays in disabled_mcp_servers, and setup was treating that file as already aligned. Setup now removes only that name, doctor reports the registration stale until it is gone, and uninstall keeps comments in an inline table whose only server was REA. Split the lifecycle suite and reflow the get-started page so static checks pass. * fix(verify): check packed Hopper search as literal-only The package verifier still called a regex probe that main deleted. The native bridge refuses regex and joins string hits with typed records, so the restored probe stubs that inventory and the check asserts the literal matches and the regex refusal. The new README translations also name Grok Build and Grok Bot. * fix(clients): stop treating a Grok Bot data directory as registered Grok Bot stores connectors in the signed-in account and runs them on its hosted computer. Setup no longer writes mcp.json or reports that file as aligned. Doctor and setup tell the caller to add the server from the Grok Bot chat. * fix(clients): drop multiline Grok disable-list entries Decode disabled_mcp_servers strings with the document parser so a multiline basic or literal string that loads as rea is removed. --------- Co-authored-by: Grok <eugene.ray@gmail.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: morluto <morluto@users.noreply.github.com>
278 lines
8.1 KiB
TypeScript
278 lines
8.1 KiB
TypeScript
import {
|
|
effectiveClientServer,
|
|
grokServerListedDisabled,
|
|
parseClientConfiguration,
|
|
} from "./ClientConfigurationDocument.js";
|
|
import { access, readFile } from "node:fs/promises";
|
|
import { resolve } from "node:path";
|
|
|
|
import { z } from "zod";
|
|
|
|
import { PRODUCT_IDENTITY } from "../identity.js";
|
|
import { MCP_STARTUP_POLICY } from "../mcpStartupPolicy.js";
|
|
import {
|
|
isOwnedClientRegistrationCommand,
|
|
npxRegistrationCommand,
|
|
} from "./ClientRegistrationIdentity.js";
|
|
import {
|
|
manualRegistrationRemediation,
|
|
supportedClients,
|
|
} from "./SupportedClients.js";
|
|
import type { SetupClient } from "./SupportedClients.js";
|
|
|
|
interface ClientRegistrationStatusBase {
|
|
readonly client: string;
|
|
readonly config_path: string;
|
|
}
|
|
|
|
type RegistrationCommand = readonly [string, ...string[]];
|
|
|
|
export type ClientRegistrationStatus = ClientRegistrationStatusBase &
|
|
(
|
|
| {
|
|
readonly command: RegistrationCommand;
|
|
readonly state: "aligned";
|
|
readonly remediation: null;
|
|
}
|
|
| {
|
|
readonly command: RegistrationCommand;
|
|
readonly state: "stale";
|
|
readonly remediation: string;
|
|
}
|
|
| {
|
|
readonly command: readonly [];
|
|
readonly state: "missing" | "invalid" | "manual";
|
|
readonly remediation: string;
|
|
}
|
|
);
|
|
|
|
export type UnhealthyClientRegistrationStatus = Exclude<
|
|
ClientRegistrationStatus,
|
|
{ readonly state: "aligned" }
|
|
>;
|
|
|
|
const registrationSchema = z
|
|
.object({
|
|
command: z.string().min(1),
|
|
args: z.array(z.string()).default([]),
|
|
startup_timeout_sec: z.number().positive().optional(),
|
|
type: z.string().optional(),
|
|
transport: z.string().optional(),
|
|
tools: z.array(z.string()).optional(),
|
|
disabled: z.boolean().optional(),
|
|
enabled: z.boolean().optional(),
|
|
})
|
|
.passthrough();
|
|
|
|
/** Inspect supported client registrations without reading their environment. */
|
|
export const readClientRegistrationStatuses = async (
|
|
home: string,
|
|
currentCommandPath: string = resolve(process.argv[1] ?? "unknown"),
|
|
options: {
|
|
readonly platform?: NodeJS.Platform;
|
|
readonly environment?: NodeJS.ProcessEnv;
|
|
} = {},
|
|
): Promise<readonly ClientRegistrationStatus[]> => {
|
|
const statuses: ClientRegistrationStatus[] = [];
|
|
for (const client of supportedClients(
|
|
home,
|
|
options.platform,
|
|
options.environment === undefined
|
|
? undefined
|
|
: {
|
|
APPDATA: options.environment.APPDATA,
|
|
CLAUDE_CONFIG_DIR: options.environment.CLAUDE_CONFIG_DIR,
|
|
CODEX_HOME: options.environment.CODEX_HOME,
|
|
COPILOT_HOME: options.environment.COPILOT_HOME,
|
|
GROK_HOME: options.environment.GROK_HOME,
|
|
OPENCODE_CONFIG: options.environment.OPENCODE_CONFIG,
|
|
SAND_DATA_ROOT: options.environment.SAND_DATA_ROOT,
|
|
XDG_CONFIG_HOME: options.environment.XDG_CONFIG_HOME,
|
|
},
|
|
)) {
|
|
if (
|
|
!(await exists(client.markerPath)) &&
|
|
!(await exists(client.configPath))
|
|
)
|
|
continue;
|
|
const manualRemediation = manualRegistrationRemediation(client.name);
|
|
if (client.format === "unsupported") {
|
|
if (manualRemediation !== undefined)
|
|
statuses.push({
|
|
client: client.name,
|
|
config_path: client.markerPath ?? client.configPath,
|
|
command: [],
|
|
state: "manual",
|
|
remediation: manualRemediation,
|
|
});
|
|
continue;
|
|
}
|
|
try {
|
|
const content = await readFile(client.configPath, "utf8");
|
|
const parsed = parseClientConfiguration(content, client.format);
|
|
const raw = effectiveClientServer(parsed, PRODUCT_IDENTITY.mcpServerKey);
|
|
if (raw === undefined) {
|
|
statuses.push(
|
|
unavailableStatus(client.name, client.configPath, "missing"),
|
|
);
|
|
continue;
|
|
}
|
|
const registration = parseRegistration(raw, client);
|
|
const command: RegistrationCommand = [
|
|
registration.command,
|
|
...registration.args,
|
|
];
|
|
statuses.push(
|
|
configuredStatus(
|
|
client.name,
|
|
client.configPath,
|
|
command,
|
|
registrationAligned(
|
|
registration,
|
|
client,
|
|
currentCommandPath,
|
|
options.platform ?? process.platform,
|
|
) &&
|
|
!(
|
|
client.format === "grok" &&
|
|
grokServerListedDisabled(
|
|
parsed.document,
|
|
PRODUCT_IDENTITY.mcpServerKey,
|
|
)
|
|
)
|
|
? "aligned"
|
|
: "stale",
|
|
),
|
|
);
|
|
} catch (cause: unknown) {
|
|
statuses.push(
|
|
unavailableStatus(
|
|
client.name,
|
|
client.configPath,
|
|
isMissing(cause) ? "missing" : "invalid",
|
|
),
|
|
);
|
|
}
|
|
}
|
|
return statuses.sort((left, right) =>
|
|
left.client.localeCompare(right.client),
|
|
);
|
|
};
|
|
|
|
const registrationAligned = (
|
|
registration: z.output<typeof registrationSchema>,
|
|
client: SetupClient,
|
|
currentCommandPath: string,
|
|
platform: NodeJS.Platform,
|
|
): boolean => {
|
|
const command = [registration.command, ...registration.args];
|
|
if (registration.disabled === true || registration.enabled === false)
|
|
return false;
|
|
if (!isOwnedClientRegistrationCommand(command, currentCommandPath))
|
|
return false;
|
|
if (
|
|
(client.name === "codex" || client.name === "grok_build") &&
|
|
registration.startup_timeout_sec !==
|
|
MCP_STARTUP_POLICY.codexStartupTimeoutSeconds
|
|
)
|
|
return false;
|
|
if (client.format === "vscode" && registration.type !== "stdio") return false;
|
|
if (
|
|
client.format === "copilot_cli" &&
|
|
(registration.type !== "stdio" ||
|
|
JSON.stringify(registration.tools) !== JSON.stringify(["*"]))
|
|
)
|
|
return false;
|
|
if (client.format === "commandcode" && registration.transport !== "stdio")
|
|
return false;
|
|
if (
|
|
command.length === 3 &&
|
|
command[2] === "mcp" &&
|
|
resolve(command[0] ?? "") === resolve(process.execPath) &&
|
|
resolve(command[1] ?? "") === currentCommandPath
|
|
)
|
|
return true;
|
|
const npxCommand = npxRegistrationCommand(platform);
|
|
if (
|
|
command.length === npxCommand.length &&
|
|
command.every((argument, index) => argument === npxCommand[index])
|
|
)
|
|
return true;
|
|
return (
|
|
command.length === 2 &&
|
|
command[1] === "mcp" &&
|
|
resolve(command[0] ?? "") === currentCommandPath
|
|
);
|
|
};
|
|
|
|
const parseRegistration = (
|
|
value: unknown,
|
|
client: SetupClient,
|
|
): z.output<typeof registrationSchema> => {
|
|
if (client.format === "opencode") {
|
|
const entry = z
|
|
.object({
|
|
type: z.literal("local"),
|
|
command: z.array(z.string()).min(1),
|
|
environment: z.record(z.string(), z.string()).optional(),
|
|
})
|
|
.passthrough()
|
|
.parse(value);
|
|
const [command = "", ...args] = entry.command;
|
|
return registrationSchema.parse({
|
|
...entry,
|
|
command,
|
|
args,
|
|
});
|
|
}
|
|
const registration = registrationSchema.parse(value);
|
|
if (
|
|
(client.format === "vscode" || client.format === "copilot_cli") &&
|
|
registration.type !== "stdio"
|
|
)
|
|
throw new TypeError("Expected an stdio registration");
|
|
if (client.format === "commandcode" && registration.transport !== "stdio")
|
|
throw new TypeError("Expected an stdio registration");
|
|
return registration;
|
|
};
|
|
|
|
const remediation =
|
|
"Run rea setup to refresh this registration, then restart the client.";
|
|
|
|
const configuredStatus = (
|
|
client: string,
|
|
configPath: string,
|
|
command: RegistrationCommand,
|
|
state: "aligned" | "stale",
|
|
): ClientRegistrationStatus =>
|
|
state === "aligned"
|
|
? { client, config_path: configPath, command, state, remediation: null }
|
|
: { client, config_path: configPath, command, state, remediation };
|
|
|
|
const unavailableStatus = (
|
|
client: string,
|
|
configPath: string,
|
|
state: "missing" | "invalid",
|
|
): ClientRegistrationStatus => ({
|
|
client,
|
|
config_path: configPath,
|
|
command: [],
|
|
state,
|
|
remediation,
|
|
});
|
|
|
|
const exists = async (path: string | undefined): Promise<boolean> => {
|
|
if (path === undefined) return false;
|
|
try {
|
|
await access(path);
|
|
return true;
|
|
} catch (cause: unknown) {
|
|
// best-effort cleanup: optional registration probing; absence means unregistered.
|
|
void cause;
|
|
return false;
|
|
}
|
|
};
|
|
|
|
const isMissing = (cause: unknown): boolean =>
|
|
cause instanceof Error && "code" in cause && cause.code === "ENOENT";
|