pi-tinychat 0.1.0 → 0.1.1

package/src/pi.js

@@ -1,196 +1,196 @@
-import { spawn } from "node:child_process";
-import { EventEmitter } from "node:events";
-
-/** @typedef {import("./pi-types.js").PiCommand} PiCommand */
-/** @typedef {import("./pi-types.js").PiRecord} PiRecord */
-/** @typedef {import("./pi-types.js").PiResponse} PiResponse */
-
-const MAX_STDERR = 8 * 1024;
-const DEFAULT_TIMEOUT = 60_000;
-
-/**
- * Minimal client for the official Pi RPC mode.
- *
- * Records are framed on LF only (JSON strings may legally contain U+2028 and
- * U+2029), so this intentionally avoids node:readline.
- */
-export class PiBridge extends EventEmitter {
-	#process = null;
-	#buffer = "";
-	/** @type {Map<string, { resolve: (value: any) => void, reject: (reason?: any) => void, timer: NodeJS.Timeout }>} */
-	#pending = new Map();
-	#sequence = 0;
-	#stderr = "";
-	#stopping = false;
-	#exitInfo = null;
-	#launcher;
-
-	constructor({ cwd, launcher, env = process.env, piArgs = [] }) {
-		super();
-		this.cwd = cwd;
-		this.#launcher = launcher;
-		this.env = env;
-		this.piArgs = piArgs;
-	}
-
-	get running() {
-		return this.#process !== null && this.#process.exitCode === null;
-	}
-
-	get lastExit() {
-		return this.#exitInfo;
-	}
-
-	start() {
-		if (this.#process) return;
-		this.#exitInfo = null;
-		this.#stderr = "";
-		this.#buffer = "";
-		this.#stopping = false;
-
-		const args = [...this.#launcher.args, ...this.piArgs, "--mode", "rpc"];
-		const child = spawn(this.#launcher.command, args, {
-			cwd: this.cwd,
-			env: this.env,
-			stdio: ["pipe", "pipe", "pipe"],
-			shell: Boolean(this.#launcher.shell),
-			windowsHide: true,
-		});
-		this.#process = child;
-
-		child.stdout.setEncoding("utf8");
-		child.stdout.on("data", (chunk) => this.#onStdout(chunk));
-		child.stderr.setEncoding("utf8");
-		child.stderr.on("data", (chunk) => {
-			this.#stderr = (this.#stderr + chunk).slice(-MAX_STDERR);
-		});
-		child.stdin.on("error", () => {
-			/* reported through exit */
-		});
-		child.once("error", (error) => this.#onExit(null, null, error));
-		child.once("exit", (code, signal) => this.#onExit(code, signal));
-	}
-
-	#onStdout(chunk) {
-		this.#buffer += chunk;
-		while (true) {
-			const newline = this.#buffer.indexOf("\n");
-			if (newline === -1) break;
-			const line = this.#buffer.slice(0, newline).replace(/\r$/, "");
-			this.#buffer = this.#buffer.slice(newline + 1);
-			if (!line) continue;
-			let record;
-			try {
-				record = JSON.parse(line);
-			} catch {
-				continue;
-			}
-			this.#dispatch(record);
-		}
-	}
-
-	/** @param {PiRecord | PiResponse} record */
-	#dispatch(record) {
-		if (record.type === "response") {
-			const pending = this.#pending.get(record.id);
-			if (!pending) return;
-			this.#pending.delete(record.id);
-			clearTimeout(pending.timer);
-			if (record.success) {
-				pending.resolve("data" in record ? (record.data ?? null) : null);
-			} else {
-				pending.reject(new Error("error" in record ? record.error : "Pi command failed"));
-			}
-			return;
-		}
-		this.emit("record", record);
-	}
-
-	#onExit(code, signal, error) {
-		const child = this.#process;
-		if (!child) return;
-		this.#process = null;
-		const reason = error
-			? `Pi の起動に失敗しました: ${error.message}`
-			: `Pi のプロセスが終了しました (code=${code ?? "-"} signal=${signal ?? "-"})`;
-		const info = { reason, stderr: this.#stderr, stopping: this.#stopping };
-		this.#exitInfo = info;
-		for (const pending of this.#pending.values()) {
-			clearTimeout(pending.timer);
-			pending.reject(new Error(reason));
-		}
-		this.#pending.clear();
-		if (!this.#stopping) this.emit("exit", info);
-	}
-
-	/**
-	 * Send one RPC command and resolve with its `data` payload.
-	 * @template {PiCommand} Command
-	 * @param {Command} command
-	 * @param {{ timeout?: number }} [options]
-	 * @returns {Promise<import("./pi-types.js").PiCommandData<Command["type"]>>}
-	 */
-	request(command, { timeout = DEFAULT_TIMEOUT } = {}) {
-		const child = this.#process;
-		if (!child || child.exitCode !== null) {
-			return Promise.reject(
-				new Error(this.#exitInfo?.reason ?? "Pi に接続されていません"),
-			);
-		}
-		if (this.#exitInfo) return Promise.reject(new Error(this.#exitInfo.reason));
-
-		const id = `req_${++this.#sequence}`;
-		return new Promise((resolve, reject) => {
-			const timer = setTimeout(() => {
-				this.#pending.delete(id);
-				reject(new Error(`Pi の応答がタイムアウトしました (${command.type})`));
-			}, timeout);
-			timer.unref?.();
-			this.#pending.set(id, { resolve, reject, timer });
-			try {
-				child.stdin.write(`${JSON.stringify({ ...command, id })}\n`);
-			} catch (error) {
-				this.#pending.delete(id);
-				clearTimeout(timer);
-				reject(error);
-			}
-		});
-	}
-
-	/**
-	 * Send a fire-and-forget record (no response is expected).
-	 * @param {PiRecord | PiCommand} record
-	 */
-	sendRaw(record) {
-		const stdin = this.#process?.stdin;
-		if (!stdin?.writable) throw new Error("Pi に接続されていません");
-		stdin.write(`${JSON.stringify(record)}\n`);
-	}
-
-	async stop() {
-		const child = this.#process;
-		if (!child) return;
-		this.#stopping = true;
-		await new Promise((resolve) => {
-			const done = () => {
-				clearTimeout(kill);
-				clearTimeout(force);
-				resolve();
-			};
-			const kill = setTimeout(() => child.kill("SIGTERM"), 1500);
-			const force = setTimeout(() => child.kill("SIGKILL"), 3000);
-			child.once("exit", done);
-			try {
-				child.stdin.end();
-			} catch {
-				/* ignore */
-			}
-		});
-		this.#process = null;
-	}
-
-	async restart() {
-		await this.stop();
-		this.start();
-	}
-}
+import { spawn } from "node:child_process";
+import { EventEmitter } from "node:events";
+
+/** @typedef {import("./pi-types.js").PiCommand} PiCommand */
+/** @typedef {import("./pi-types.js").PiRecord} PiRecord */
+/** @typedef {import("./pi-types.js").PiResponse} PiResponse */
+
+const MAX_STDERR = 8 * 1024;
+const DEFAULT_TIMEOUT = 60_000;
+
+/**
+ * Minimal client for the official Pi RPC mode.
+ *
+ * Records are framed on LF only (JSON strings may legally contain U+2028 and
+ * U+2029), so this intentionally avoids node:readline.
+ */
+export class PiBridge extends EventEmitter {
+	#process = null;
+	#buffer = "";
+	/** @type {Map<string, { resolve: (value: any) => void, reject: (reason?: any) => void, timer: NodeJS.Timeout }>} */
+	#pending = new Map();
+	#sequence = 0;
+	#stderr = "";
+	#stopping = false;
+	#exitInfo = null;
+	#launcher;
+
+	constructor({ cwd, launcher, env = process.env, piArgs = [] }) {
+		super();
+		this.cwd = cwd;
+		this.#launcher = launcher;
+		this.env = env;
+		this.piArgs = piArgs;
+	}
+
+	get running() {
+		return this.#process !== null && this.#process.exitCode === null;
+	}
+
+	get lastExit() {
+		return this.#exitInfo;
+	}
+
+	start() {
+		if (this.#process) return;
+		this.#exitInfo = null;
+		this.#stderr = "";
+		this.#buffer = "";
+		this.#stopping = false;
+
+		const args = [...this.#launcher.args, ...this.piArgs, "--mode", "rpc"];
+		const child = spawn(this.#launcher.command, args, {
+			cwd: this.cwd,
+			env: this.env,
+			stdio: ["pipe", "pipe", "pipe"],
+			shell: Boolean(this.#launcher.shell),
+			windowsHide: true,
+		});
+		this.#process = child;
+
+		child.stdout.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => this.#onStdout(chunk));
+		child.stderr.setEncoding("utf8");
+		child.stderr.on("data", (chunk) => {
+			this.#stderr = (this.#stderr + chunk).slice(-MAX_STDERR);
+		});
+		child.stdin.on("error", () => {
+			/* reported through exit */
+		});
+		child.once("error", (error) => this.#onExit(null, null, error));
+		child.once("exit", (code, signal) => this.#onExit(code, signal));
+	}
+
+	#onStdout(chunk) {
+		this.#buffer += chunk;
+		while (true) {
+			const newline = this.#buffer.indexOf("\n");
+			if (newline === -1) break;
+			const line = this.#buffer.slice(0, newline).replace(/\r$/, "");
+			this.#buffer = this.#buffer.slice(newline + 1);
+			if (!line) continue;
+			let record;
+			try {
+				record = JSON.parse(line);
+			} catch {
+				continue;
+			}
+			this.#dispatch(record);
+		}
+	}
+
+	/** @param {PiRecord | PiResponse} record */
+	#dispatch(record) {
+		if (record.type === "response") {
+			const pending = this.#pending.get(record.id);
+			if (!pending) return;
+			this.#pending.delete(record.id);
+			clearTimeout(pending.timer);
+			if (record.success) {
+				pending.resolve("data" in record ? (record.data ?? null) : null);
+			} else {
+				pending.reject(new Error("error" in record ? record.error : "Pi command failed"));
+			}
+			return;
+		}
+		this.emit("record", record);
+	}
+
+	#onExit(code, signal, error) {
+		const child = this.#process;
+		if (!child) return;
+		this.#process = null;
+		const reason = error
+			? `Pi の起動に失敗しました: ${error.message}`
+			: `Pi のプロセスが終了しました (code=${code ?? "-"} signal=${signal ?? "-"})`;
+		const info = { reason, stderr: this.#stderr, stopping: this.#stopping };
+		this.#exitInfo = info;
+		for (const pending of this.#pending.values()) {
+			clearTimeout(pending.timer);
+			pending.reject(new Error(reason));
+		}
+		this.#pending.clear();
+		if (!this.#stopping) this.emit("exit", info);
+	}
+
+	/**
+	 * Send one RPC command and resolve with its `data` payload.
+	 * @template {PiCommand} Command
+	 * @param {Command} command
+	 * @param {{ timeout?: number }} [options]
+	 * @returns {Promise<import("./pi-types.js").PiCommandData<Command["type"]>>}
+	 */
+	request(command, { timeout = DEFAULT_TIMEOUT } = {}) {
+		const child = this.#process;
+		if (!child || child.exitCode !== null) {
+			return Promise.reject(
+				new Error(this.#exitInfo?.reason ?? "Pi に接続されていません"),
+			);
+		}
+		if (this.#exitInfo) return Promise.reject(new Error(this.#exitInfo.reason));
+
+		const id = `req_${++this.#sequence}`;
+		return new Promise((resolve, reject) => {
+			const timer = setTimeout(() => {
+				this.#pending.delete(id);
+				reject(new Error(`Pi の応答がタイムアウトしました (${command.type})`));
+			}, timeout);
+			timer.unref?.();
+			this.#pending.set(id, { resolve, reject, timer });
+			try {
+				child.stdin.write(`${JSON.stringify({ ...command, id })}\n`);
+			} catch (error) {
+				this.#pending.delete(id);
+				clearTimeout(timer);
+				reject(error);
+			}
+		});
+	}
+
+	/**
+	 * Send a fire-and-forget record (no response is expected).
+	 * @param {PiRecord | PiCommand} record
+	 */
+	sendRaw(record) {
+		const stdin = this.#process?.stdin;
+		if (!stdin?.writable) throw new Error("Pi に接続されていません");
+		stdin.write(`${JSON.stringify(record)}\n`);
+	}
+
+	async stop() {
+		const child = this.#process;
+		if (!child) return;
+		this.#stopping = true;
+		await new Promise((resolve) => {
+			const done = () => {
+				clearTimeout(kill);
+				clearTimeout(force);
+				resolve();
+			};
+			const kill = setTimeout(() => child.kill("SIGTERM"), 1500);
+			const force = setTimeout(() => child.kill("SIGKILL"), 3000);
+			child.once("exit", done);
+			try {
+				child.stdin.end();
+			} catch {
+				/* ignore */
+			}
+		});
+		this.#process = null;
+	}
+
+	async restart() {
+		await this.stop();
+		this.start();
+	}
+}

package/src/plan.js

@@ -1,90 +1,91 @@
-export const PLAN_TOOL = "tiny_plan";
-export const PLAN_STATE_ENTRY = "tiny_plan_state";
-
-// Plans saved by the pre-rename Pi Dock build remain readable.
-const LEGACY_PLAN_TOOL = "dock_plan";
-const LEGACY_PLAN_STATE_ENTRY = "dock_plan_state";
-
-/** @typedef {import("./pi-types.js").PiSessionEntry} PiSessionEntry */
-/** @typedef {"pending" | "in_progress" | "done" | "cancelled"} PlanItemStatus */
-/** @typedef {{ id: string, text: string, status: PlanItemStatus }} PlanItem */
-/** @typedef {{ title: string, items: PlanItem[] }} Plan */
-/** @typedef {{ title?: unknown, items?: unknown }} PlanDetails */
-
-const STATUSES = new Set(["pending", "in_progress", "done", "cancelled"]);
-
-/**
- * Normalise the `details` payload of a tiny_plan tool result.
- * Returns null when details is not a plan; a cleared plan is an empty item list.
- * @param {unknown} details
- * @returns {Plan | null}
- */
-export function normalizePlan(details) {
-	if (!details || typeof details !== "object") return null;
-	const plan = /** @type {PlanDetails} */ (details);
-	if (!Array.isArray(plan.items)) return null;
-	const items = [];
-	for (const item of plan.items) {
-		if (!item || typeof item !== "object") continue;
-		if (typeof item.id !== "string" || typeof item.text !== "string") continue;
-		items.push({
-			id: item.id,
-			text: item.text,
-			status: STATUSES.has(item.status) ? item.status : "pending",
-		});
-	}
-	const title =
-		typeof plan.title === "string" && plan.title.trim() ? plan.title.trim() : "";
-	return { title, items };
-}
-
-/** @param {PiSessionEntry} entry */
-function planFromEntry(entry) {
-	if (!entry || typeof entry !== "object") return null;
-	if (
-		entry.type === "custom" &&
-		(entry.customType === PLAN_STATE_ENTRY || entry.customType === LEGACY_PLAN_STATE_ENTRY)
-	) {
-		return normalizePlan(entry.data);
-	}
-	if (entry.type !== "message") return null;
-	const message = entry.message;
-	if (
-		message?.role !== "toolResult" ||
-		(message.toolName !== PLAN_TOOL && message.toolName !== LEGACY_PLAN_TOOL)
-	) {
-		return null;
-	}
-	return normalizePlan(message.details);
-}
-
-/**
- * Pick the newest plan from the active branch. get_entries also returns
- * abandoned branches, so walking from leafId is required.
- * @param {PiSessionEntry[]} entries
- * @param {string | null} [leafId]
- * @returns {Plan | null}
- */
-export function planFromEntries(entries, leafId) {
-	if (!Array.isArray(entries) || !entries.length) return null;
-	const byId = new Map();
-	for (const entry of entries) {
-		if (entry && typeof entry.id === "string") byId.set(entry.id, entry);
-	}
-	let current = typeof leafId === "string" ? leafId : entries[entries.length - 1]?.id;
-	const branch = [];
-	const seen = new Set();
-	while (typeof current === "string" && byId.has(current) && !seen.has(current)) {
-		const entry = byId.get(current);
-		branch.push(entry);
-		seen.add(current);
-		current = entry.parentId ?? null;
-	}
-	// Newest plan on the active branch. Only the agent replaces or clears a
-	// plan; a new user message leaves the previous plan visible.
-	for (const entry of branch) {
-		const plan = planFromEntry(entry);
-		if (plan) return plan;
-	}
-	return null;
-}
+export const PLAN_TOOL = "tiny_plan";
+export const PLAN_STATE_ENTRY = "tiny_plan_state";
+
+// Plans saved by the pre-rename Pi Dock build remain readable.
+const LEGACY_PLAN_TOOL = "dock_plan";
+const LEGACY_PLAN_STATE_ENTRY = "dock_plan_state";
+
+/** @typedef {import("./pi-types.js").PiSessionEntry} PiSessionEntry */
+/** @typedef {"pending" | "in_progress" | "done" | "cancelled"} PlanItemStatus */
+/** @typedef {{ id: string, text: string, status: PlanItemStatus }} PlanItem */
+/** @typedef {{ title: string, items: PlanItem[], note?: string }} Plan */
+/** @typedef {{ title?: unknown, items?: unknown, note?: unknown }} PlanDetails */
+
+const STATUSES = new Set(["pending", "in_progress", "done", "cancelled"]);
+
+/**
+ * Normalise the `details` payload of a tiny_plan tool result.
+ * Returns null when details is not a plan; a cleared plan is an empty item list.
+ * @param {unknown} details
+ * @returns {Plan | null}
+ */
+export function normalizePlan(details) {
+	if (!details || typeof details !== "object") return null;
+	const plan = /** @type {PlanDetails} */ (details);
+	if (!Array.isArray(plan.items)) return null;
+	const items = [];
+	for (const item of plan.items) {
+		if (!item || typeof item !== "object") continue;
+		if (typeof item.id !== "string" || typeof item.text !== "string") continue;
+		items.push({
+			id: item.id,
+			text: item.text,
+			status: STATUSES.has(item.status) ? item.status : "pending",
+		});
+	}
+	const title =
+		typeof plan.title === "string" && plan.title.trim() ? plan.title.trim() : "";
+	const note = typeof plan.note === "string" ? plan.note.replace(/\s+/g, " ").trim() : "";
+	return { title, items, ...(note ? { note } : {}) };
+}
+
+/** @param {PiSessionEntry} entry */
+function planFromEntry(entry) {
+	if (!entry || typeof entry !== "object") return null;
+	if (
+		entry.type === "custom" &&
+		(entry.customType === PLAN_STATE_ENTRY || entry.customType === LEGACY_PLAN_STATE_ENTRY)
+	) {
+		return normalizePlan(entry.data);
+	}
+	if (entry.type !== "message") return null;
+	const message = entry.message;
+	if (
+		message?.role !== "toolResult" ||
+		(message.toolName !== PLAN_TOOL && message.toolName !== LEGACY_PLAN_TOOL)
+	) {
+		return null;
+	}
+	return normalizePlan(message.details);
+}
+
+/**
+ * Pick the newest plan from the active branch. get_entries also returns
+ * abandoned branches, so walking from leafId is required.
+ * @param {PiSessionEntry[]} entries
+ * @param {string | null} [leafId]
+ * @returns {Plan | null}
+ */
+export function planFromEntries(entries, leafId) {
+	if (!Array.isArray(entries) || !entries.length) return null;
+	const byId = new Map();
+	for (const entry of entries) {
+		if (entry && typeof entry.id === "string") byId.set(entry.id, entry);
+	}
+	let current = typeof leafId === "string" ? leafId : entries[entries.length - 1]?.id;
+	const branch = [];
+	const seen = new Set();
+	while (typeof current === "string" && byId.has(current) && !seen.has(current)) {
+		const entry = byId.get(current);
+		branch.push(entry);
+		seen.add(current);
+		current = entry.parentId ?? null;
+	}
+	// Newest plan on the active branch. Only the agent replaces or clears a
+	// plan; a new user message leaves the previous plan visible.
+	for (const entry of branch) {
+		const plan = planFromEntry(entry);
+		if (plan) return plan;
+	}
+	return null;
+}