topchester-ai 0.59.0 → 0.61.0

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as runTopchesterCli } from "./cli-DNu9mjMF.mjs";
+import { t as runTopchesterCli } from "./cli-YPKTdpQH.mjs";
 //#region src/bin.ts
 await runTopchesterCli();
 //#endregion

package/dist/{cli-DNu9mjMF.mjs → cli-YPKTdpQH.mjs}

@@ -249,7 +249,7 @@ async function readAuthStore(options = {}) {
 	try {
 		source = await readFile(path, "utf8");
 	} catch (error) {
-		if (isNodeError$5(error) && error.code === "ENOENT") return createEmptyAuthStore();
+		if (isNodeError$4(error) && error.code === "ENOENT") return createEmptyAuthStore();
 		throw error;
 	}
 	let parsed;
@@ -297,7 +297,7 @@ async function getAuthStoreStatus(options = {}) {
 	try {
 		await stat(path);
 	} catch (error) {
-		if (isNodeError$5(error) && error.code === "ENOENT") return {
+		if (isNodeError$4(error) && error.code === "ENOENT") return {
 			path,
 			exists: false,
 			providers: []
@@ -388,14 +388,14 @@ function redactProviderStatus(id, record, now) {
 }
 async function setModeIfSupported(path, mode) {
 	await chmod(path, mode).catch((error) => {
-		if (isNodeError$5(error) && (error.code === "ENOSYS" || error.code === "EPERM" || error.code === "EINVAL")) return;
+		if (isNodeError$4(error) && (error.code === "ENOSYS" || error.code === "EPERM" || error.code === "EINVAL")) return;
 		throw error;
 	});
 }
 function isPlainObject$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isNodeError$5(error) {
+function isNodeError$4(error) {
 	return error instanceof Error && "code" in error;
 }
 function formatErrorMessage$3(error) {
@@ -1299,7 +1299,7 @@ async function statExistingFile(resolvedPath, originalPath) {
 	try {
 		fileStat = await stat(resolvedPath);
 	} catch (error) {
-		if (isNodeError$4(error) && error.code === "ENOENT") throw new Error(`edit_file can only edit existing files: ${originalPath}`);
+		if (isNodeError$3(error) && error.code === "ENOENT") throw new Error(`edit_file can only edit existing files: ${originalPath}`);
 		throw error;
 	}
 	if (!fileStat.isFile()) throw new Error(`edit_file can only edit regular files: ${originalPath}`);
@@ -1341,7 +1341,7 @@ function summarizeDiff(diff) {
 	}
 	return `+${added}/-${removed}`;
 }
-function isNodeError$4(error) {
+function isNodeError$3(error) {
 	return error instanceof Error && "code" in error;
 }
 function normalizeEdits(edits) {
@@ -4859,7 +4859,7 @@ async function statTarget(path) {
 	try {
 		return await stat(path);
 	} catch (error) {
-		if (isNodeError$3(error) && error.code === "ENOENT") return;
+		if (isNodeError$2(error) && error.code === "ENOENT") return;
 		throw error;
 	}
 }
@@ -4869,7 +4869,7 @@ async function ensureParentDirectory(workspaceRoot, path, relativePath, createPa
 		if (!(await stat(parent)).isDirectory()) throw new Error(`write_file parent path is not a directory: ${dirname(relativePath)}`);
 		return [];
 	} catch (error) {
-		if (!isNodeError$3(error) || error.code !== "ENOENT") throw error;
+		if (!isNodeError$2(error) || error.code !== "ENOENT") throw error;
 	}
 	if (!createParentDirs) throw new Error(`write_file parent directory does not exist: ${dirname(relativePath)}`);
 	const createdParentDirs = await collectMissingParentDirs(workspaceRoot, parent);
@@ -4883,7 +4883,7 @@ async function collectMissingParentDirs(workspaceRoot, parent) {
 		if (!(await stat(current)).isDirectory()) throw new Error(`write_file parent path is not a directory: ${relative(workspaceRoot, current)}`);
 		break;
 	} catch (error) {
-		if (!isNodeError$3(error) || error.code !== "ENOENT") throw error;
+		if (!isNodeError$2(error) || error.code !== "ENOENT") throw error;
 		missing.push(relative(workspaceRoot, current));
 		current = dirname(current);
 	}
@@ -4924,7 +4924,7 @@ function countLogicalLines$1(content) {
 	const withoutTrailingLineEnding = content.replace(/\r?\n$/u, "");
 	return withoutTrailingLineEnding.length === 0 ? 1 : withoutTrailingLineEnding.split(/\r?\n/u).length;
 }
-function isNodeError$3(error) {
+function isNodeError$2(error) {
 	return error instanceof Error && "code" in error;
 }
 //#endregion
@@ -6555,6 +6555,37 @@ async function addProjectBashAllowExactRule(workspaceRoot, command) {
 		allowExact
 	};
 }
+async function addMcpStdioServerConfig(configPath, options) {
+	const serverName = options.serverName.trim();
+	if (!isValidMcpServerName(serverName)) throw new Error(`invalid MCP server name "${options.serverName}" (use letters, numbers, "-", "_")`);
+	const command = options.command.trim();
+	if (!command) throw new Error("MCP stdio command is required.");
+	const config = readConfigObject(configPath);
+	const mcp = ensurePlainObjectProperty(config, "mcp");
+	const replaced = mcp[serverName] !== void 0;
+	const env = options.env ?? {};
+	const server = {
+		type: "stdio",
+		command,
+		args: options.args ?? [],
+		...Object.keys(env).length > 0 ? { env } : {}
+	};
+	mcp[serverName] = server;
+	mkdirSync(dirname(configPath), {
+		recursive: true,
+		mode: 448
+	});
+	parseConfigFile(configPath, config);
+	await writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`);
+	return {
+		path: configPath,
+		serverName,
+		command,
+		args: server.args,
+		env,
+		replaced
+	};
+}
 function readProjectConfigObject(configPath) {
 	return readConfigObject(configPath);
 }
@@ -6592,6 +6623,9 @@ function ensureStringArrayProperty(parent, key) {
 	if (!Array.isArray(value) || !value.every((entry) => typeof entry === "string")) throw new Error(`Invalid Topchester config property '${key}': expected a string array.`);
 	return value;
 }
+function isValidMcpServerName(name) {
+	return name.length > 0 && /^[A-Za-z0-9_-]+$/u.test(name);
+}
 function readConfigFile(path) {
 	try {
 		return parseJsonc(readFileSync(path, "utf8"));
@@ -8215,11 +8249,11 @@ async function directoryExists(path) {
 		if (!(await stat(path)).isDirectory()) throw new Error(`${path} exists but is not a folder`);
 		return true;
 	} catch (error) {
-		if (isNodeError$2(error) && error.code === "ENOENT") return false;
+		if (isNodeError$1(error) && error.code === "ENOENT") return false;
 		throw error;
 	}
 }
-function isNodeError$2(error) {
+function isNodeError$1(error) {
 	return error instanceof Error && "code" in error;
 }
 //#endregion
@@ -8258,7 +8292,7 @@ async function removeIfPresent(path) {
 		});
 		return true;
 	} catch (error) {
-		if (isNodeError$1(error) && error.code === "ENOENT") return false;
+		if (isNodeError(error) && error.code === "ENOENT") return false;
 		throw error;
 	}
 }
@@ -8271,7 +8305,7 @@ function assertSafeResetPath(workspaceRoot, path) {
 	if (target === workspace) throw new Error(`Refusing to reset KB because the configured KB path is the workspace root: ${target}`);
 	if (dirname(target) === target) throw new Error(`Refusing to reset KB because the configured KB path is a filesystem root: ${target}`);
 }
-function isNodeError$1(error) {
+function isNodeError(error) {
 	return error instanceof Error && "code" in error;
 }
 //#endregion
@@ -12124,16 +12158,10 @@ const agentMetadataSchema = z.object({
 	capabilities: z.array(z.string().min(1)).optional(),
 	model_support: agentModelSupportSchema.optional()
 }).strict();
-const agentsMetadata = z.object({
+z.object({
 	version: z.literal(1),
 	agents: z.record(z.string().min(1), agentMetadataSchema)
 }).strict().parse(agents_default);
-function listAgentMetadata() {
-	return Object.entries(agentsMetadata.agents).map(([id, metadata]) => ({
-		id,
-		metadata
-	})).sort((left, right) => left.id.localeCompare(right.id));
-}
 //#endregion
 //#region src/agent/prompts.ts
 function getChatSystemPrompt(options = {}) {
@@ -15677,135 +15705,6 @@ function formatInfoError(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
-//#region src/cli/integrations.ts
-const TOPCHESTER_CODEX_BLOCK_START = "# >>> topchester integration: codex";
-const TOPCHESTER_CODEX_BLOCK_END = "# <<< topchester integration: codex";
-function listIntegrationStatuses() {
-	return listAgentMetadata().filter(({ id }) => id !== "topchester").map(({ id, metadata }) => getIntegrationStatus(id, metadata.display_name));
-}
-function getIntegrationStatus(agent, displayName) {
-	const normalizedAgent = normalizeAgentId(agent);
-	const metadata = listAgentMetadata().find(({ id }) => id === normalizedAgent)?.metadata;
-	const name = displayName ?? metadata?.display_name ?? normalizedAgent;
-	if (normalizedAgent !== "codex") return {
-		agent: normalizedAgent,
-		displayName: name,
-		supported: false,
-		installed: false,
-		detail: "not supported yet"
-	};
-	return {
-		agent: normalizedAgent,
-		displayName: name,
-		supported: true,
-		installed: false,
-		configPath: getCodexConfigPath(),
-		detail: "not installed"
-	};
-}
-async function getIntegrationStatusAsync(agent) {
-	const status = getIntegrationStatus(agent);
-	if (status.agent !== "codex" || !status.configPath) return status;
-	const contents = await readTextIfExists(status.configPath);
-	const installed = contents.includes(TOPCHESTER_CODEX_BLOCK_START) && contents.includes(TOPCHESTER_CODEX_BLOCK_END);
-	return {
-		...status,
-		installed,
-		detail: installed ? "installed" : "not installed"
-	};
-}
-async function listIntegrationStatusesAsync(agent) {
-	if (agent) return [await getIntegrationStatusAsync(agent)];
-	return await Promise.all(listIntegrationStatuses().map((status) => getIntegrationStatusAsync(status.agent)));
-}
-async function installIntegration(agent, action = "installed") {
-	const status = await getIntegrationStatusAsync(agent);
-	if (!status.supported || status.agent !== "codex" || !status.configPath) throw new Error(`Unsupported integration: ${agent}`);
-	const next = appendMarkedBlock(removeMarkedBlock(await readTextIfExists(status.configPath)), formatCodexIntegrationBlock());
-	await mkdir(dirname(status.configPath), { recursive: true });
-	await writeFile(status.configPath, next);
-	return {
-		action,
-		status: await getIntegrationStatusAsync(status.agent)
-	};
-}
-async function removeIntegration(agent) {
-	const status = await getIntegrationStatusAsync(agent);
-	if (!status.supported || status.agent !== "codex" || !status.configPath) throw new Error(`Unsupported integration: ${agent}`);
-	const before = await readTextIfExists(status.configPath);
-	await mkdir(dirname(status.configPath), { recursive: true });
-	await writeFile(status.configPath, ensureTrailingNewline(removeMarkedBlock(before)));
-	return {
-		action: "removed",
-		status: await getIntegrationStatusAsync(status.agent)
-	};
-}
-function formatIntegrationStatuses(statuses) {
-	const lines = ["Integrations"];
-	for (const status of statuses) {
-		const state = status.supported ? status.installed ? "installed" : "not installed" : "unsupported";
-		lines.push(`${status.agent}: ${state}`);
-		if (status.configPath) lines.push(`  config: ${status.configPath}`);
-		if (!status.supported) lines.push(`  detail: ${status.detail}`);
-	}
-	return lines;
-}
-function formatIntegrationAction(action, status) {
-	return [
-		action === "installed" ? "Integration installed" : action === "repaired" ? "Integration repaired" : "Integration removed",
-		`agent: ${status.agent}`,
-		`state: ${status.installed ? "installed" : "not installed"}`,
-		...status.configPath ? [`config: ${status.configPath}`] : []
-	];
-}
-async function executeHookStop(agent) {
-	if (normalizeAgentId(agent ?? "") !== "codex") throw new Error(agent ? `Unsupported hook agent: ${agent}` : "Usage: topchester hook stop <agent>");
-}
-function getCodexConfigPath() {
-	return join(process.env.CODEX_HOME?.trim() || join(process.env.HOME || homedir(), ".codex"), "config.toml");
-}
-function formatCodexIntegrationBlock() {
-	return [
-		TOPCHESTER_CODEX_BLOCK_START,
-		"[[Stop]]",
-		"",
-		"[[Stop.hooks]]",
-		"type = \"command\"",
-		"command = \"topchester hook stop codex\"",
-		"timeout = 10",
-		"statusMessage = \"Notifying Topchester\"",
-		TOPCHESTER_CODEX_BLOCK_END
-	].join("\n");
-}
-function appendMarkedBlock(contents, block) {
-	const base = contents.trimEnd();
-	return `${base ? `${base}\n\n` : ""}${block}\n`;
-}
-function removeMarkedBlock(contents) {
-	const start = contents.indexOf(TOPCHESTER_CODEX_BLOCK_START);
-	if (start === -1) return contents;
-	const end = contents.indexOf(TOPCHESTER_CODEX_BLOCK_END, start);
-	if (end === -1) return contents;
-	return `${contents.slice(0, start)}${contents.slice(end + 35)}`.trimEnd();
-}
-async function readTextIfExists(path) {
-	try {
-		return await readFile(path, "utf8");
-	} catch (error) {
-		if (isNodeError(error) && error.code === "ENOENT") return "";
-		throw error;
-	}
-}
-function ensureTrailingNewline(value) {
-	return value ? `${value.trimEnd()}\n` : "";
-}
-function normalizeAgentId(value) {
-	return value.trim().toLowerCase();
-}
-function isNodeError(error) {
-	return error instanceof Error && "code" in error;
-}
-//#endregion
 //#region src/cli.ts
 async function runTopchesterCli(argv = process.argv, options = {}) {
 	const program = createTopchesterProgram();
@@ -15864,6 +15763,25 @@ function createTopchesterProgram() {
 			process.exitCode = 1;
 		}
 	});
+	program.command("mcp").description("manage MCP servers").command("add").usage("[options] <server-name> -- <stdio server-command>").description("add or replace a stdio MCP server").argument("<server-name>", "server name").argument("<command...>", "stdio server command after --").option("--env <KEY=VALUE>", "environment variable for the server process", collectEnvPair, {}).addHelpText("after", formatMcpAddHelp).action(async (serverName, commandParts, options) => {
+		try {
+			const [command, ...args] = commandParts;
+			if (!command) throw new Error("Usage: topchester mcp add <server-name> -- <stdio server-command>");
+			const result = await addMcpStdioServerConfig(getWritableConfigPathFromProgram(program), {
+				serverName,
+				command,
+				args,
+				env: options.env
+			});
+			console.log(`${result.replaced ? "Updated" : "Added"} MCP stdio server "${result.serverName}".`);
+			console.log(`config: ${result.path}`);
+			console.log(`command: ${[result.command, ...result.args].join(" ")}`);
+			if (Object.keys(result.env).length > 0) console.log(`env: ${Object.keys(result.env).join(", ")}`);
+		} catch (error) {
+			console.error(formatStartupError(error));
+			process.exitCode = 1;
+		}
+	});
 	program.command("run").description("run one prompt or slash command without opening the TUI").argument("<prompt...>", "prompt text or slash command").option("--model <model>", "override the agent.primary model for this run").option("--timeout <ms>", "timeout for the run in milliseconds", parsePositiveInteger).option("--json", "write JSONL run events to stdout").option("--output-json <path>", "write JSONL run events to a file").action(async (promptParts, options) => {
 		const context = createContextFromOptions(program);
 		const globalOptions = program.opts();
@@ -15896,58 +15814,6 @@ function createTopchesterProgram() {
 	program.command("search").description("search compiled L1 knowledge entries").argument("<query...>", "search query").option("--limit <count>", "maximum number of matches", parsePositiveInteger).option("--json", "write full JSON search result to stdout").action(async (queryParts, options) => {
 		await executeKbSearchCommand(program, queryParts, options);
 	});
-	const integrationsCommand = program.command("integrations").description("manage Topchester integrations with other agents");
-	integrationsCommand.command("list").description("list supported integrations").action(async () => {
-		try {
-			console.log(formatIntegrationStatuses(await listIntegrationStatusesAsync()).join("\n"));
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
-	integrationsCommand.command("status").description("check whether integrations are installed").argument("[agent]", "agent id").action(async (agent) => {
-		try {
-			console.log(formatIntegrationStatuses(await listIntegrationStatusesAsync(agent)).join("\n"));
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
-	integrationsCommand.command("install").description("install Topchester lifecycle hooks for another agent").argument("<agent>", "agent id").action(async (agent) => {
-		try {
-			const result = await installIntegration(agent);
-			console.log(formatIntegrationAction(result.action, result.status).join("\n"));
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
-	integrationsCommand.command("repair").description("repair a Topchester integration").argument("<agent>", "agent id").action(async (agent) => {
-		try {
-			const result = await installIntegration(agent, "repaired");
-			console.log(formatIntegrationAction(result.action, result.status).join("\n"));
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
-	integrationsCommand.command("remove").description("remove a Topchester integration").argument("<agent>", "agent id").action(async (agent) => {
-		try {
-			const result = await removeIntegration(agent);
-			console.log(formatIntegrationAction(result.action, result.status).join("\n"));
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
-	program.command("hook").description("low-level lifecycle hook endpoints").command("stop").description("receive a Stop hook from another agent").argument("<agent>", "agent id").action(async (agent) => {
-		try {
-			await executeHookStop(agent);
-		} catch (error) {
-			console.error(formatStartupError(error));
-			process.exitCode = 1;
-		}
-	});
 	const kbCommand = program.command("kb").description("knowledge base commands");
 	kbCommand.command("init").description("initialize a project knowledge base").action(async () => {
 		const context = createContextFromOptions(program);
@@ -16063,6 +15929,17 @@ function formatAuthLoginHelp() {
 		"  Topchester prints a browser URL and one-time code, waits for approval, then stores tokens in the global auth store."
 	].join("\n");
 }
+function formatMcpAddHelp() {
+	return [
+		"",
+		ui.label("Examples:"),
+		"  topchester mcp add filesystem -- npx -y @modelcontextprotocol/server-filesystem .",
+		"  topchester mcp add github --env GITHUB_PERSONAL_ACCESS_TOKEN=ghp_xxx -- npx -y @modelcontextprotocol/server-github",
+		"",
+		ui.label("What happens:"),
+		"  Writes to --config when provided, otherwise to the global user config."
+	].join("\n");
+}
 function formatAuthLoginUsageError(reason) {
 	return [
 		ui.error(reason),
@@ -16137,6 +16014,10 @@ function getContextOptionsFromProgram(program) {
 		devFlags: options.dev
 	};
 }
+function getWritableConfigPathFromProgram(program) {
+	const options = program.opts();
+	return options.config ? isAbsolute(options.config) ? options.config : resolve(cwd(), options.config) : getGlobalTopchesterConfigPath();
+}
 async function executeKbSearchCommand(program, queryParts, options) {
 	const context = createContextFromOptions(program);
 	const query = queryParts.join(" ");
@@ -16170,6 +16051,16 @@ function formatStartupError(error) {
 function collectDevFlag(flag, flags) {
 	return [...flags, flag];
 }
+function collectEnvPair(raw, env) {
+	const separatorIndex = raw.indexOf("=");
+	if (separatorIndex <= 0) throw new Error("Environment entries must be in KEY=VALUE form.");
+	const key = raw.slice(0, separatorIndex).trim();
+	if (!key) throw new Error("Environment entries must be in KEY=VALUE form.");
+	return {
+		...env,
+		[key]: raw.slice(separatorIndex + 1)
+	};
+}
 function parsePositiveInteger(value) {
 	const parsed = Number(value);
 	if (!Number.isInteger(parsed) || parsed <= 0) throw new Error("Expected a positive integer.");
@@ -16191,4 +16082,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-DNu9mjMF.mjs.map
+//# sourceMappingURL=cli-YPKTdpQH.mjs.map