topchester-ai 0.60.0 → 0.62.0

package/dist/bin.mjs

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

package/dist/{cli-BCDXfYWi.mjs → cli-DfwFfA-w.mjs}

@@ -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"));
@@ -9140,6 +9174,17 @@ const messagePayloadSchema = z.object({
 	text: z.string(),
 	meta: jsonValueSchema.optional()
 });
+const permissionAutoApprovedPayloadSchema = z.object({
+	kind: z.literal("permission_auto_approved"),
+	permissionMode: z.literal("bash"),
+	approvalMode: z.literal("auto_allow"),
+	toolName: z.string(),
+	command: z.string(),
+	workdir: z.string(),
+	reason: z.string(),
+	label: z.string(),
+	toolCallId: z.string().optional()
+});
 const toolCallPayloadSchema = z.object({
 	kind: z.literal("tool_call"),
 	label: z.string(),
@@ -9217,6 +9262,7 @@ const subagentFailedPayloadSchema = subagentLifecycleBasePayloadSchema.extend({
 });
 const sessionEventPayloadSchema = z.discriminatedUnion("kind", [
 	messagePayloadSchema,
+	permissionAutoApprovedPayloadSchema,
 	toolCallPayloadSchema,
 	hookStatusPayloadSchema,
 	taskPlanPayloadSchema,
@@ -9469,6 +9515,7 @@ function rehydrateSession(events) {
 			});
 			if (event.role === "user") visibleOnlyActionValues = /* @__PURE__ */ new Set();
 			break;
+		case "permission_auto_approved": break;
 		case "tool_call":
 			messages.push(toolCallMessage(event.call, event.label, void 0, event.diff));
 			break;
@@ -10192,6 +10239,14 @@ const agentEvent = {
 			meta
 		};
 	},
+	permissionAutoApproved(options) {
+		return {
+			type: "permission_auto_approved",
+			approvalMode: "auto_allow",
+			label: `auto-approved ${options.permissionMode} permission: ${options.command}`,
+			...options
+		};
+	},
 	toolCall(call, label, diff) {
 		return diff === void 0 ? {
 			type: "tool_call",
@@ -12220,6 +12275,17 @@ function runtimeEventToSessionPayload(event) {
 			text: event.text,
 			...event.meta === void 0 ? {} : { meta: event.meta }
 		};
+		case "permission_auto_approved": return {
+			kind: "permission_auto_approved",
+			permissionMode: event.permissionMode,
+			approvalMode: event.approvalMode,
+			toolName: event.toolName,
+			command: event.command,
+			workdir: event.workdir,
+			reason: event.reason,
+			label: event.label,
+			...event.toolCallId === void 0 ? {} : { toolCallId: event.toolCallId }
+		};
 		case "tool_call": return {
 			kind: "tool_call",
 			label: event.label,
@@ -13514,7 +13580,13 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			approvedCommands,
 			events: []
 		};
-		if (!isBashApprovalRequired(decision) || !options.requestBashApproval) return {
+		if (!isBashApprovalRequired(decision)) return {
+			cancelled: false,
+			approvedCommands,
+			events: []
+		};
+		const approvalMode = options.userApprovalMode ?? "interactive";
+		if (approvalMode !== "auto_allow" && !options.requestBashApproval) return {
 			cancelled: false,
 			approvedCommands,
 			events: []
@@ -13525,7 +13597,11 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			permission_mode: "bash",
 			command,
 			workdir: parsed.data.workdir,
-			reason: decision.reason
+			reason: decision.reason,
+			...approvalMode === "auto_allow" ? {
+				approval_mode: "auto_allow",
+				auto_approved: true
+			} : {}
 		}), {
 			toolName: call.tool,
 			abortSignal
@@ -13542,6 +13618,36 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			reason: actionRequiredHook.blocked.message,
 			events
 		};
+		if (approvalMode === "auto_allow") {
+			const event = agentEvent.permissionAutoApproved({
+				permissionMode: "bash",
+				toolName: call.tool,
+				...toolCallId === void 0 ? {} : { toolCallId },
+				command,
+				workdir: parsed.data.workdir,
+				reason: decision.reason
+			});
+			this.context.logger.info({
+				event: "permission_auto_approved",
+				approvalMode: "auto_allow",
+				permissionMode: "bash",
+				toolName: call.tool,
+				toolCallId,
+				command,
+				workdir: parsed.data.workdir,
+				reason: decision.reason
+			}, "permission request auto-approved");
+			return {
+				cancelled: false,
+				approvedCommands: [...approvedCommands, command],
+				events: [...events, event]
+			};
+		}
+		if (!options.requestBashApproval) return {
+			cancelled: false,
+			approvedCommands,
+			events
+		};
 		const approval = await options.requestBashApproval({
 			command,
 			workdir: parsed.data.workdir,
@@ -13704,6 +13810,7 @@ function createInstructionContextEvents(sources, persistedKeys) {
 function renderRuntimeEvent(event) {
 	switch (event.type) {
 		case "message": return [event.role === "assistant" ? agentMessage(event.text, event.meta) : systemMessage(event.text)];
+		case "permission_auto_approved": return [systemMessage(event.label)];
 		case "tool_call": return [toolCallMessage(event.call, event.label, void 0, event.diff)];
 		case "hook_status": return [hookStatusMessage(event.label, event.eventName, event.statusMessage)];
 		case "knowledge_status": return [systemMessage([`KB status: ${formatKnowledgePathStatus(event.status)}${formatKbPathSource(event.status)}`, event.guidance].filter(Boolean).join("\n"))];
@@ -15238,11 +15345,13 @@ async function executeRunCommand(context, options) {
 		promptLength: options.prompt.length,
 		json: Boolean(options.json),
 		outputJson: options.outputJson,
-		timeoutMs
+		timeoutMs,
+		dangerouslyAutoApprove: Boolean(options.dangerouslyAutoApprove)
 	}, "run started");
 	pushJson(jsonEvents, runId, session.sessionId, "run.started", {
 		workspaceRoot: runContext.workspaceRoot,
-		timeoutMs
+		timeoutMs,
+		dangerouslyAutoApprove: Boolean(options.dangerouslyAutoApprove)
 	});
 	try {
 		if (!options.resume) await persistStartupMessages(session, runContext);
@@ -15297,7 +15406,10 @@ async function executeRunCommand(context, options) {
 				text: options.prompt,
 				inputType: "prompt"
 			});
-			for await (const event of runtime.submitMessageStream(conversation, options.prompt, abortController.signal, { session })) await applyRuntimeEvent({
+			for await (const event of runtime.submitMessageStream(conversation, options.prompt, abortController.signal, {
+				session,
+				userApprovalMode: options.dangerouslyAutoApprove ? "auto_allow" : "interactive"
+			})) await applyRuntimeEvent({
 				event,
 				session,
 				jsonEvents,
@@ -15378,6 +15490,10 @@ function printPlainEvent(event) {
 		console.log(event.text);
 		return;
 	}
+	if (event.type === "permission_auto_approved") {
+		console.log(event.label);
+		return;
+	}
 	if (event.type === "tool_call") {
 		console.log(event.label);
 		return;
@@ -15729,7 +15845,26 @@ function createTopchesterProgram() {
 			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) => {
+	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").option("--dangerously-auto-approve", "auto-approve prompt-gated tool calls for this non-interactive run").action(async (promptParts, options) => {
 		const context = createContextFromOptions(program);
 		const globalOptions = program.opts();
 		try {
@@ -15739,7 +15874,8 @@ function createTopchesterProgram() {
 				timeoutMs: options.timeout,
 				json: options.json,
 				outputJson: options.outputJson,
-				resume: globalOptions.resume
+				resume: globalOptions.resume,
+				dangerouslyAutoApprove: options.dangerouslyAutoApprove
 			});
 		} catch (error) {
 			console.error(formatStartupError(error));
@@ -15876,6 +16012,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),
@@ -15950,6 +16097,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(" ");
@@ -15983,6 +16134,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.");
@@ -16004,4 +16165,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-BCDXfYWi.mjs.map
+//# sourceMappingURL=cli-DfwFfA-w.mjs.map