@zetaloop/chappie 0.3.1 → 0.4.0

package/src/session.ts

@@ -13,7 +13,9 @@ import type {
 	SessionEntry,
 } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
+import { type Activity, chatLabel, source } from "./activity.ts";
 import type { DeliveryRecord } from "./delivery.ts";
+import { historyResult } from "./history.ts";
 import {
 	type BrokerMessage,
 	IpcClient,
@@ -27,7 +29,7 @@ import { readSessionResource, rememberImages } from "./resources.ts";
 
 type RemoteRequest = Extract<BrokerMessage, { type: "chat" | "call" }>;
 
-interface Notice {
+interface Notice extends Activity {
 	message: string;
 	type: "info" | "warning" | "error";
 }
@@ -126,9 +128,17 @@ export class LocalSession {
 		this.#pi.on("session_shutdown", () => this.close());
 	}
 
-	#notify(message: string, type: Notice["type"] = "info"): void {
+	#notify(
+		message: string,
+		type: Notice["type"] = "info",
+		activity: Activity = {},
+	): void {
 		if (this.#context)
-			this.#pi.appendEntry<Notice>("chappie.notice", { message, type });
+			this.#pi.appendEntry<Notice>("chappie.notice", {
+				message,
+				type,
+				...activity,
+			});
 	}
 
 	async start(output: ProviderOutput): Promise<void> {
@@ -194,7 +204,6 @@ export class LocalSession {
 			this.#resetInputs(context);
 		}
 		if (!this.#connection) {
-			this.#notify("Connecting to Chappie…");
 			this.#connection = new IpcClient(this.#agentDir, this.#connect, {
 				onOpen: async () => {
 					await this.#sync();
@@ -262,7 +271,7 @@ export class LocalSession {
 				if (
 					message.sessionId === this.#context?.sessionManager.getSessionId()
 				) {
-					this.#notify(message.message);
+					this.#notify(message.message, "info", message.activity);
 				}
 				break;
 			case "inspect":
@@ -277,6 +286,26 @@ export class LocalSession {
 					};
 				});
 				break;
+			case "history":
+				await this.#reply(message.id, message.sessionId, () => {
+					const context = this.#context;
+					if (!context) throw new Error("Chappie session is not available");
+					const history = historyResult(
+						context.sessionManager.getBranch(),
+						message.sessionId,
+						message.range,
+					);
+					this.#notify(
+						`${chatLabel(message)} read history: ${history.count} entries`,
+						"info",
+						{
+							event: "history",
+							...source(message.chatId, message.requestId),
+						},
+					);
+					return { type: "result", id: message.id, cwd: context.cwd, history };
+				});
+				break;
 			case "ackInputs":
 				if (
 					message.sessionId === this.#context?.sessionManager.getSessionId()
@@ -306,8 +335,12 @@ export class LocalSession {
 						? [...new Set(request.calls.map((call) => call.name))].join(", ")
 						: "chat";
 				this.#notify(
-					`${name} cancelled for ChatGPT ${request.chatId.slice(-4)}: ${message.reason}`,
+					`${name} cancelled for ${chatLabel(request)}: ${message.reason}`,
 					"warning",
+					{
+						event: "cancelled",
+						...source(request.chatId, request.requestId),
+					},
 				);
 				if (queued !== -1) {
 					this.#queue.splice(queued, 1);
@@ -371,6 +404,7 @@ export class LocalSession {
 		}
 
 		this.#queue.shift();
+		output.message.chappie = source(request.chatId, request.requestId);
 		this.#active = {
 			request,
 			session: this.#description(),
@@ -432,7 +466,7 @@ export class LocalSession {
 		if (active.cancelled !== undefined) {
 			const delivery: DeliveryRecord = {
 				id: randomUUID(),
-				chatId: active.request.chatId,
+				...source(active.request.chatId, active.request.requestId),
 				sessionId: active.session.id,
 				cwd: active.session.cwd,
 				toolResults: active.toolResults,
@@ -516,7 +550,14 @@ export class LocalSession {
 					await connection.send({ type: "delivery", delivery });
 					await completion.promise;
 					this.#deliveries.delete(delivery.id);
-					this.#notify(`Result saved for ChatGPT ${delivery.chatId.slice(-4)}`);
+					this.#notify(
+						`Result saved for ChatGPT ${delivery.chatId.slice(-4)}`,
+						"info",
+						{
+							event: "result_saved",
+							...source(delivery.chatId, delivery.requestId),
+						},
+					);
 				} finally {
 					this.#stores.delete(delivery.id);
 				}

package/src/state.ts

@@ -5,7 +5,7 @@ import type { QuestionAnswer, QuestionRecord } from "./questions.ts";
 
 interface StateFile {
 	bindings?: Record<string, string>;
-	workflows?: Record<string, string>;
+	codes?: Record<string, string>;
 	deliveries?: DeliveryRecord[];
 	questions?: QuestionRecord[];
 }
@@ -14,7 +14,7 @@ export class State {
 	readonly #path: string;
 	readonly #temporaryPath: string;
 	readonly #bindings = new Map<string, string>();
-	readonly #workflows = new Map<string, string>();
+	readonly #codes = new Map<string, string>();
 	readonly #deliveries = new Map<string, DeliveryRecord>();
 	readonly #questions = new Map<string, QuestionRecord>();
 	#writes = Promise.resolve();
@@ -36,8 +36,8 @@ export class State {
 		for (const [chatId, sessionId] of Object.entries(state.bindings ?? {})) {
 			if (typeof sessionId === "string") this.#bindings.set(chatId, sessionId);
 		}
-		for (const [chatId, id] of Object.entries(state.workflows ?? {})) {
-			this.#workflows.set(chatId, id);
+		for (const [sessionId, code] of Object.entries(state.codes ?? {})) {
+			this.#codes.set(sessionId, code);
 		}
 		for (const delivery of state.deliveries ?? []) {
 			if (delivery?.id) this.#deliveries.set(delivery.id, delivery);
@@ -46,12 +46,13 @@ export class State {
 			this.#questions.set(question.id, question);
 	}
 
-	workflow(chatId: string): string | undefined {
-		return this.#workflows.get(chatId);
+	code(sessionId: string): string | undefined {
+		return this.#codes.get(sessionId);
 	}
 
-	setWorkflow(chatId: string, id: string): Promise<void> {
-		this.#workflows.set(chatId, id);
+	setCode(sessionId: string, code: string | undefined): Promise<void> {
+		if (code === undefined) this.#codes.delete(sessionId);
+		else this.#codes.set(sessionId, code);
 		return this.#save();
 	}
 
@@ -59,12 +60,6 @@ export class State {
 		return this.#bindings.get(chatId);
 	}
 
-	chats(sessionId: string): string[] {
-		return [...this.#bindings]
-			.filter(([, target]) => target === sessionId)
-			.map(([chatId]) => chatId);
-	}
-
 	bindingCounts(): Map<string, number> {
 		const counts = new Map<string, number>();
 		for (const sessionId of this.#bindings.values()) {
@@ -73,7 +68,7 @@ export class State {
 		return counts;
 	}
 
-	setBinding(chatId: string, sessionId: string): Promise<void> {
+	bind(chatId: string, sessionId: string): Promise<void> {
 		this.#bindings.set(chatId, sessionId);
 		return this.#save();
 	}
@@ -168,10 +163,10 @@ export class State {
 	#save(): Promise<void> {
 		const saved = this.#writes.then(async () => {
 			const bindings = Object.fromEntries(this.#bindings);
-			const workflows = Object.fromEntries(this.#workflows);
+			const codes = Object.fromEntries(this.#codes);
 			await writeFile(
 				this.#temporaryPath,
-				`${JSON.stringify({ bindings, workflows, deliveries: [...this.#deliveries.values()], questions: [...this.#questions.values()] }, null, 2)}\n`,
+				`${JSON.stringify({ bindings, codes, deliveries: [...this.#deliveries.values()], questions: [...this.#questions.values()] }, null, 2)}\n`,
 				{
 					mode: 0o600,
 				},

package/src/tools.ts

@@ -6,6 +6,7 @@ import {
 	createWriteToolDefinition,
 } from "@earendil-works/pi-coding-agent";
 import { fromJsonSchema } from "@modelcontextprotocol/server";
+import type { Initialization } from "./broker.ts";
 import { toolResultsContent } from "./delivery.ts";
 import type { SessionInput } from "./ipc.ts";
 import { contentWithImageReferences } from "./resources.ts";
@@ -38,10 +39,18 @@ export function toolResult(
 	sessionId: string,
 	cwd: string,
 	inputs: SessionInput[] = [],
+	initialization?: Initialization,
 ) {
 	return {
 		content: [
-			{ type: "text" as const, text: JSON.stringify({ sessionId, cwd }) },
+			{
+				type: "text" as const,
+				text: JSON.stringify({
+					sessionId,
+					cwd,
+					...(initialization ? { initialization } : {}),
+				}),
+			},
 			...toolResultsContent(toolResults, sessionId),
 			...inputContent(inputs),
 		],
@@ -73,7 +82,8 @@ function withSessionId(
 			...copy.properties,
 			sessionId: {
 				type: "string",
-				description: "Pi session for this operation only",
+				description:
+					"Pi session for this operation; becomes the default if none is set",
 			},
 		},
 		additionalProperties: false,