my-pi 0.0.7 → 0.0.8

package/README.md

@@ -112,8 +112,9 @@ await runPrintMode(runtime, {
 ## MCP Servers
 
 MCP servers are configured via `mcp.json` files and managed as a pi
-extension. Servers are spawned on startup and their tools registered
-via `pi.registerTool()`.
+extension. Stdio servers are spawned on startup, HTTP servers are
+connected remotely, and their tools are registered via
+`pi.registerTool()`.
 
 ### Global config
 
@@ -148,6 +149,25 @@ via `pi.registerTool()`.
 }
 ```
 
+HTTP MCP servers are supported too:
+
+```json
+{
+	"mcpServers": {
+		"pm-platform": {
+			"type": "http",
+			"url": "https://project.cloudlobsters.com/api/mcp",
+			"headers": {
+				"Authorization": "Bearer ..."
+			}
+		}
+	}
+}
+```
+
+Use `"type": "http"` or `"type": "streamable-http"` for remote MCP
+servers. If `url` is present, my-pi treats the entry as HTTP.
+
 Project servers merge with global servers. If both define the same
 server name, the project config wins.
 
@@ -185,7 +205,7 @@ In interactive mode:
 ### How it works
 
 1. Pi extension loads `mcp.json` configs (global + project)
-2. Spawns each MCP server as a child process (stdio transport)
+2. Connects to each MCP server using stdio or HTTP transport
 3. Performs the MCP `initialize` handshake
 4. Calls `tools/list` to discover available tools
 5. Registers each tool via `pi.registerTool()` as
@@ -272,6 +292,9 @@ CLI layering is supported too:
 - `--system-prompt "You are terse and technical."`
 - `--append-system-prompt "Prefer one short paragraph."`
 
+Interactive `/preset` selections are also restored on later sessions
+for the same project via `~/.pi/agent/prompt-preset-state.json`.
+
 This repo also includes an example `.pi/presets.json` with sample base
 presets and layers.
 

package/dist/{api-DtthDVIa.js → api-BA6XuDOE.js}

@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
 import { Type } from "@sinclair/typebox";
 import { execFileSync, spawn } from "node:child_process";
 import { homedir } from "node:os";
-import { Container, SettingsList, Text } from "@mariozechner/pi-tui";
+import { Container, SettingsList, Text, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
 import { createHash } from "node:crypto";
 //#region src/extensions/chain.ts
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -821,40 +821,12 @@ var McpClient = class {
 	#nextId = 1;
 	#pending = /* @__PURE__ */ new Map();
 	#buffer = "";
+	#sessionId;
 	constructor(config) {
 		this.#config = config;
 	}
 	async connect() {
-		const { command, args = [], env } = this.#config;
-		this.#proc = spawn(command, args, {
-			stdio: [
-				"pipe",
-				"pipe",
-				"pipe"
-			],
-			env: {
-				...process.env,
-				...env
-			}
-		});
-		this.#proc.stdout.setEncoding("utf8");
-		this.#proc.stdout.on("data", (chunk) => {
-			this.#buffer += chunk;
-			const lines = this.#buffer.split("\n");
-			this.#buffer = lines.pop() || "";
-			for (const line of lines) {
-				if (!line.trim()) continue;
-				try {
-					const msg = JSON.parse(line);
-					if (msg.id != null && this.#pending.has(msg.id)) {
-						const p = this.#pending.get(msg.id);
-						this.#pending.delete(msg.id);
-						if (msg.error) p.reject(/* @__PURE__ */ new Error(`MCP error ${msg.error.code}: ${msg.error.message}`));
-						else p.resolve(msg.result);
-					}
-				} catch {}
-			}
-		});
+		if (this.#config.transport === "stdio") await this.#connect_stdio();
 		await this.#request("initialize", {
 			protocolVersion: "2024-11-05",
 			capabilities: {},
@@ -863,7 +835,7 @@ var McpClient = class {
 				version: "0.0.1"
 			}
 		});
-		this.#send({
+		await this.#send({
 			jsonrpc: "2.0",
 			method: "notifications/initialized"
 		});
@@ -878,12 +850,39 @@ var McpClient = class {
 		});
 	}
 	async disconnect() {
+		if (this.#config.transport === "http") await this.#disconnect_http();
 		if (this.#proc) {
 			this.#proc.kill();
 			this.#proc = null;
 		}
 		this.#pending.clear();
 	}
+	async #connect_stdio() {
+		const { command, args = [], env } = this.#config;
+		this.#proc = spawn(command, args, {
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			],
+			env: {
+				...process.env,
+				...env
+			}
+		});
+		this.#proc.stdout.setEncoding("utf8");
+		this.#proc.stdout.on("data", (chunk) => {
+			this.#buffer += chunk;
+			const lines = this.#buffer.split("\n");
+			this.#buffer = lines.pop() || "";
+			for (const line of lines) {
+				if (!line.trim()) continue;
+				try {
+					this.#handle_message(JSON.parse(line));
+				} catch {}
+			}
+		});
+	}
 	#request(method, params) {
 		return new Promise((resolve, reject) => {
 			const id = this.#nextId++;
@@ -896,6 +895,11 @@ var McpClient = class {
 				id,
 				method,
 				params
+			}).catch((error) => {
+				if (this.#pending.has(id)) {
+					this.#pending.delete(id);
+					reject(error);
+				}
 			});
 			setTimeout(() => {
 				if (this.#pending.has(id)) {
@@ -905,13 +909,156 @@ var McpClient = class {
 			}, 3e4);
 		});
 	}
-	#send(msg) {
+	async #send(msg) {
+		if (this.#config.transport === "http") {
+			await this.#send_http(msg);
+			return;
+		}
 		if (!this.#proc?.stdin?.writable) throw new Error("MCP server not connected");
 		this.#proc.stdin.write(JSON.stringify(msg) + "\n");
 	}
+	async #send_http(msg) {
+		const config = this.#config;
+		const headers = new Headers(config.headers ?? {});
+		headers.set("content-type", "application/json");
+		headers.set("accept", "application/json, text/event-stream");
+		if (this.#sessionId) headers.set("mcp-session-id", this.#sessionId);
+		const response = await fetch(config.url, {
+			method: "POST",
+			headers,
+			body: JSON.stringify(msg)
+		});
+		const sessionId = response.headers.get("mcp-session-id");
+		if (sessionId) this.#sessionId = sessionId;
+		if (!response.ok) {
+			const body = await response.text().catch(() => "");
+			throw new Error(`MCP HTTP ${response.status}${body ? `: ${body}` : ""}`);
+		}
+		if (response.status === 204) return;
+		if ((response.headers.get("content-type") ?? "").includes("text/event-stream")) {
+			await this.#consume_sse_response(response, config.name);
+			return;
+		}
+		const body = await response.text();
+		if (!body.trim()) return;
+		let parsed;
+		try {
+			parsed = JSON.parse(body);
+		} catch {
+			throw new Error(`Invalid MCP HTTP response from ${config.name}: ${body.slice(0, 200)}`);
+		}
+		this.#dispatch_message(parsed);
+	}
+	async #disconnect_http() {
+		const config = this.#config;
+		if (!this.#sessionId) return;
+		const headers = new Headers(config.headers ?? {});
+		headers.set("mcp-session-id", this.#sessionId);
+		const response = await fetch(config.url, {
+			method: "DELETE",
+			headers
+		});
+		if (response.status !== 405 && !response.ok) {
+			const body = await response.text().catch(() => "");
+			throw new Error(`MCP HTTP disconnect ${response.status}${body ? `: ${body}` : ""}`);
+		}
+		this.#sessionId = void 0;
+	}
+	async #consume_sse_response(response, server_name) {
+		if (!response.body) return;
+		const reader = response.body.getReader();
+		const decoder = new TextDecoder();
+		let buffer = "";
+		let event_lines = [];
+		const flush_event = () => {
+			if (event_lines.length === 0) return;
+			const data_lines = event_lines.filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trimStart());
+			event_lines = [];
+			if (data_lines.length === 0) return;
+			const payload = data_lines.join("\n").trim();
+			if (!payload) return;
+			try {
+				this.#dispatch_message(JSON.parse(payload));
+			} catch {
+				throw new Error(`Invalid MCP SSE payload from ${server_name}: ${payload.slice(0, 200)}`);
+			}
+		};
+		while (true) {
+			const { done, value } = await reader.read();
+			buffer += decoder.decode(value ?? new Uint8Array(), { stream: !done });
+			const lines = buffer.replace(/\r\n/g, "\n").split("\n");
+			buffer = lines.pop() ?? "";
+			for (const line of lines) {
+				if (line === "") {
+					flush_event();
+					continue;
+				}
+				if (line.startsWith(":")) continue;
+				event_lines.push(line);
+			}
+			if (done) break;
+		}
+		if (buffer.trim()) event_lines.push(buffer.trim());
+		flush_event();
+	}
+	#dispatch_message(message) {
+		if (Array.isArray(message)) {
+			for (const item of message) this.#dispatch_message(item);
+			return;
+		}
+		if (!message || typeof message !== "object") return;
+		this.#handle_message(message);
+	}
+	#handle_message(msg) {
+		if (msg.id == null || !this.#pending.has(msg.id)) return;
+		const pending = this.#pending.get(msg.id);
+		this.#pending.delete(msg.id);
+		if (msg.error) {
+			pending.reject(/* @__PURE__ */ new Error(`MCP error ${msg.error.code}: ${msg.error.message}`));
+			return;
+		}
+		pending.resolve(msg.result);
+	}
 };
 //#endregion
 //#region src/mcp/config.ts
+function is_string_record(value, label, name) {
+	if (value === void 0) return true;
+	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`Invalid MCP server "${name}": ${label} must be an object of string values`);
+	for (const [key, entry] of Object.entries(value)) if (typeof entry !== "string") throw new Error(`Invalid MCP server "${name}": ${label}.${key} must be a string`);
+	return true;
+}
+function parse_server(name, entry) {
+	const type = typeof entry.type === "string" ? entry.type.trim().toLowerCase() : "";
+	if (type && ![
+		"stdio",
+		"http",
+		"streamable-http"
+	].includes(type)) throw new Error(`Invalid MCP server "${name}": unsupported transport type "${type}"`);
+	if (type === "http" || type === "streamable-http" || entry.url !== void 0) {
+		if (typeof entry.url !== "string" || !entry.url.trim()) throw new Error(`Invalid MCP server "${name}": http transport requires a url`);
+		is_string_record(entry.headers, "headers", name);
+		const headers = entry.headers;
+		return {
+			name,
+			transport: "http",
+			url: entry.url.trim(),
+			...headers ? { headers } : {}
+		};
+	}
+	if (typeof entry.command !== "string" || !entry.command.trim()) throw new Error(`Invalid MCP server "${name}": stdio transport requires a command`);
+	if (entry.args !== void 0 && (!Array.isArray(entry.args) || entry.args.some((value) => typeof value !== "string"))) throw new Error(`Invalid MCP server "${name}": args must be an array of strings`);
+	is_string_record(entry.env, "env", name);
+	const args = entry.args;
+	const env = entry.env;
+	return {
+		name,
+		transport: "stdio",
+		command: entry.command.trim(),
+		...args ? { args } : {},
+		...env ? { env } : {}
+	};
+}
 function read_config(path) {
 	if (!existsSync(path)) return {};
 	const raw = readFileSync(path, "utf-8");
@@ -924,12 +1071,7 @@ function load_mcp_config(cwd) {
 		...global_servers,
 		...project_servers
 	};
-	return Object.entries(merged).map(([name, server]) => ({
-		name,
-		command: server.command,
-		args: server.args,
-		env: server.env
-	}));
+	return Object.entries(merged).map(([name, server]) => parse_server(name, server));
 }
 //#endregion
 //#region src/extensions/mcp.ts
@@ -1144,6 +1286,9 @@ function get_global_presets_path() {
 function get_project_presets_path(cwd) {
 	return join(cwd, ".pi", "presets.json");
 }
+function get_persisted_prompt_state_path() {
+	return join(getAgentDir(), "prompt-preset-state.json");
+}
 function read_prompt_presets_file(path) {
 	if (!existsSync(path)) return {};
 	try {
@@ -1195,6 +1340,61 @@ function remove_project_prompt_preset(cwd, name) {
 		remaining
 	};
 }
+function normalize_prompt_preset_state(input) {
+	if (!input || typeof input !== "object") return void 0;
+	const candidate = input;
+	return {
+		base_name: typeof candidate.base_name === "string" && candidate.base_name.trim() ? candidate.base_name.trim() : null,
+		layer_names: Array.isArray(candidate.layer_names) ? [...new Set(candidate.layer_names.filter((value) => typeof value === "string" && value.trim().length > 0).map((value) => value.trim()))].sort() : []
+	};
+}
+function read_persisted_prompt_states(path = get_persisted_prompt_state_path()) {
+	if (!existsSync(path)) return {
+		version: 1,
+		projects: {}
+	};
+	try {
+		const parsed = JSON.parse(readFileSync(path, "utf-8"));
+		const raw_projects = parsed.projects && typeof parsed.projects === "object" ? parsed.projects : {};
+		const projects = {};
+		for (const [cwd, value] of Object.entries(raw_projects)) {
+			const normalized = normalize_prompt_preset_state(value);
+			if (!normalized) continue;
+			projects[cwd] = normalized;
+		}
+		return {
+			version: typeof parsed.version === "number" ? parsed.version : 1,
+			projects
+		};
+	} catch {
+		return {
+			version: 1,
+			projects: {}
+		};
+	}
+}
+function load_persisted_prompt_state(cwd, path = get_persisted_prompt_state_path()) {
+	return read_persisted_prompt_states(path).projects[cwd];
+}
+function save_persisted_prompt_state(cwd, state, path = get_persisted_prompt_state_path()) {
+	const persisted = read_persisted_prompt_states(path);
+	persisted.projects[cwd] = normalize_prompt_preset_state(state) ?? {
+		base_name: null,
+		layer_names: []
+	};
+	const dir = dirname(path);
+	if (!existsSync(dir)) mkdirSync(dir, {
+		recursive: true,
+		mode: 448
+	});
+	const tmp = `${path}.tmp-${Date.now()}`;
+	writeFileSync(tmp, JSON.stringify({
+		version: 1,
+		projects: Object.fromEntries(Object.entries(persisted.projects).sort(([a], [b]) => a.localeCompare(b)))
+	}, null, "	") + "\n", { mode: 384 });
+	renameSync(tmp, path);
+	return path;
+}
 function get_last_preset_state(ctx) {
 	const entries = ctx.sessionManager.getEntries();
 	for (let i = entries.length - 1; i >= 0; i--) {
@@ -1258,16 +1458,129 @@ function format_active_details(active_base_name, active_layers, presets) {
 	}
 	return parts.join("\n") || "No preset or layers active";
 }
+function get_footer_prompt_status(active_base_name, active_layers) {
+	if (!active_base_name && active_layers.size === 0) return;
+	return `prompt:${active_base_name ?? "none"}${active_layers.size > 0 ? ` +${active_layers.size}` : ""}`;
+}
+function sanitize_status_text(text) {
+	return text.replace(/[\r\n\t]/g, " ").replace(/ +/g, " ").trim();
+}
+function format_token_count(count) {
+	if (count < 1e3) return count.toString();
+	if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
+	if (count < 1e6) return `${Math.round(count / 1e3)}k`;
+	if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
+	return `${Math.round(count / 1e6)}M`;
+}
+function get_current_thinking_level(ctx) {
+	const entries = ctx.sessionManager.getEntries();
+	for (let i = entries.length - 1; i >= 0; i--) {
+		const entry = entries[i];
+		if (entry.type === "thinking_level_change" && typeof entry.thinkingLevel === "string") return entry.thinkingLevel;
+	}
+	return ctx.model?.reasoning ? "high" : "off";
+}
+function render_footer_lines(ctx, theme, footer_data, width, active_base_name, active_layers) {
+	let total_input = 0;
+	let total_output = 0;
+	let total_cache_read = 0;
+	let total_cache_write = 0;
+	let total_cost = 0;
+	for (const entry of ctx.sessionManager.getEntries()) if (entry.type === "message" && entry.message.role === "assistant") {
+		total_input += entry.message.usage.input;
+		total_output += entry.message.usage.output;
+		total_cache_read += entry.message.usage.cacheRead;
+		total_cache_write += entry.message.usage.cacheWrite;
+		total_cost += entry.message.usage.cost.total;
+	}
+	const context_usage = ctx.getContextUsage();
+	const context_window = context_usage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
+	const context_percent_value = context_usage?.percent ?? 0;
+	const context_percent = context_usage?.percent !== null ? context_percent_value.toFixed(1) : "?";
+	let pwd = ctx.cwd;
+	const home = process.env.HOME || process.env.USERPROFILE;
+	if (home && pwd.startsWith(home)) pwd = `~${pwd.slice(home.length)}`;
+	const branch = footer_data.getGitBranch();
+	if (branch) pwd = `${pwd} (${branch})`;
+	const session_name = ctx.sessionManager.getSessionName();
+	if (session_name) pwd = `${pwd} • ${session_name}`;
+	const stats_parts = [];
+	if (total_input) stats_parts.push(`↑${format_token_count(total_input)}`);
+	if (total_output) stats_parts.push(`↓${format_token_count(total_output)}`);
+	if (total_cache_read) stats_parts.push(`R${format_token_count(total_cache_read)}`);
+	if (total_cache_write) stats_parts.push(`W${format_token_count(total_cache_write)}`);
+	const using_subscription = ctx.model ? ctx.modelRegistry.isUsingOAuth(ctx.model) : false;
+	if (total_cost || using_subscription) stats_parts.push(`$${total_cost.toFixed(3)}${using_subscription ? " (sub)" : ""}`);
+	const context_percent_display = context_percent === "?" ? `?/${format_token_count(context_window)}` : `${context_percent}%/${format_token_count(context_window)}`;
+	let context_percent_str = context_percent_display;
+	if (context_percent_value > 90) context_percent_str = theme.fg("error", context_percent_display);
+	else if (context_percent_value > 70) context_percent_str = theme.fg("warning", context_percent_display);
+	stats_parts.push(context_percent_str);
+	let stats_left = stats_parts.join(" ");
+	let stats_left_width = visibleWidth(stats_left);
+	if (stats_left_width > width) {
+		stats_left = truncateToWidth(stats_left, width, "...");
+		stats_left_width = visibleWidth(stats_left);
+	}
+	const model_name = ctx.model?.id || "no-model";
+	const thinking_level = get_current_thinking_level(ctx);
+	let right_side_without_provider = model_name;
+	if (ctx.model?.reasoning) right_side_without_provider = thinking_level === "off" ? `${model_name} • thinking off` : `${model_name} • ${thinking_level}`;
+	let right_side = right_side_without_provider;
+	if (footer_data.getAvailableProviderCount() > 1 && ctx.model) {
+		right_side = `(${ctx.model.provider}) ${right_side_without_provider}`;
+		if (stats_left_width + 2 + visibleWidth(right_side) > width) right_side = right_side_without_provider;
+	}
+	const right_side_width = visibleWidth(right_side);
+	const total_needed = stats_left_width + 2 + right_side_width;
+	let stats_line;
+	if (total_needed <= width) {
+		const padding = " ".repeat(width - stats_left_width - right_side_width);
+		stats_line = stats_left + padding + right_side;
+	} else {
+		const available_for_right = width - stats_left_width - 2;
+		if (available_for_right > 0) {
+			const truncated_right = truncateToWidth(right_side, available_for_right, "");
+			const truncated_right_width = visibleWidth(truncated_right);
+			const padding = " ".repeat(Math.max(0, width - stats_left_width - truncated_right_width));
+			stats_line = stats_left + padding + truncated_right;
+		} else stats_line = stats_left;
+	}
+	const dim_stats_left = theme.fg("dim", stats_left);
+	const remainder = stats_line.slice(stats_left.length);
+	const dim_remainder = theme.fg("dim", remainder);
+	const lines = [truncateToWidth(theme.fg("dim", pwd), width, theme.fg("dim", "...")), dim_stats_left + dim_remainder];
+	const prompt_status = get_footer_prompt_status(active_base_name, active_layers);
+	if (prompt_status) {
+		const themed_status = theme.fg("dim", prompt_status);
+		const status_width = visibleWidth(themed_status);
+		const aligned_status = status_width >= width ? truncateToWidth(themed_status, width, theme.fg("dim", "...")) : `${" ".repeat(width - status_width)}${themed_status}`;
+		lines.push(aligned_status);
+	}
+	const other_statuses = Array.from(footer_data.getExtensionStatuses().entries()).filter(([key]) => key !== "preset").sort(([a], [b]) => a.localeCompare(b)).map(([, text]) => sanitize_status_text(text));
+	if (other_statuses.length > 0) lines.push(truncateToWidth(other_statuses.join(" "), width, theme.fg("dim", "...")));
+	return lines;
+}
 function set_status(ctx, active_base_name, active_layers) {
-	const label = active_base_name ?? "none";
-	const layer_suffix = active_layers.size > 0 ? ` +${active_layers.size}` : "";
-	ctx.ui.setStatus("preset", `prompt:${label}${layer_suffix}`);
+	ctx.ui.setStatus("preset", void 0);
+	if (!ctx.hasUI) return;
+	ctx.ui.setFooter((tui, theme, footer_data) => {
+		return {
+			dispose: footer_data.onBranchChange(() => tui.requestRender()),
+			invalidate() {},
+			render(width) {
+				return render_footer_lines(ctx, theme, footer_data, width, active_base_name, active_layers);
+			}
+		};
+	});
 }
-function persist_state(pi, active_base_name, active_layers) {
-	pi.appendEntry(PRESET_STATE_TYPE, {
+function persist_state(pi, ctx, active_base_name, active_layers) {
+	const state = {
 		base_name: active_base_name ?? null,
 		layer_names: [...active_layers].sort()
-	});
+	};
+	pi.appendEntry(PRESET_STATE_TYPE, state);
+	save_persisted_prompt_state(ctx.cwd, state);
 }
 function normalize_active_state(presets, active_base_name, active_layers) {
 	return {
@@ -1308,7 +1621,7 @@ async function prompt_presets(pi) {
 		active_base_name = next_base_name;
 		active_layers = new Set(next_layers);
 		set_status(ctx, active_base_name, active_layers);
-		if (options?.persist !== false) persist_state(pi, active_base_name, active_layers);
+		if (options?.persist !== false) persist_state(pi, ctx, active_base_name, active_layers);
 		if (options?.notify) ctx.ui.notify(options.notify, "info");
 	}
 	function activate_base(name, ctx, options) {
@@ -1384,7 +1697,7 @@ async function prompt_presets(pi) {
 		active_base_name = normalized.active_base_name;
 		active_layers = normalized.active_layers;
 		set_status(ctx, active_base_name, active_layers);
-		persist_state(pi, active_base_name, active_layers);
+		persist_state(pi, ctx, active_base_name, active_layers);
 		const fallback = presets[name];
 		if (mode === "reset" && fallback) {
 			ctx.ui.notify(`Reset "${name}" to ${get_prompt_source_label(fallback.source)} preset`, "info");
@@ -1681,7 +1994,7 @@ async function prompt_presets(pi) {
 			set_status(ctx, active_base_name, active_layers);
 			return;
 		}
-		const restored = get_last_preset_state(ctx);
+		const restored = get_last_preset_state(ctx) ?? load_persisted_prompt_state(ctx.cwd);
 		if (restored) {
 			active_base_name = restored.base_name ?? void 0;
 			active_layers = new Set(restored.layer_names ?? []);
@@ -1702,6 +2015,7 @@ async function prompt_presets(pi) {
 	});
 	pi.on("session_shutdown", async (_event, ctx) => {
 		ctx.ui.setStatus("preset", void 0);
+		ctx.ui.setFooter(void 0);
 	});
 }
 //#endregion
@@ -2591,4 +2905,4 @@ async function create_my_pi(options = {}) {
 //#endregion
 export { create_my_pi as n, runPrintMode$1 as r, InteractiveMode$1 as t };
 
-//# sourceMappingURL=api-DtthDVIa.js.map
+//# sourceMappingURL=api-BA6XuDOE.js.map