@pstdio/pocketcoder-remote 0.3.1 → 0.3.3

package/dist/bin.js

@@ -3,7 +3,7 @@ import { spawn } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { dirname, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-//#region src/launch.ts
+//#region src/session/launch.ts
 const PI_FLAGS = [
 	"--provider",
 	"pocketcoder-agentapi",
@@ -30,7 +30,8 @@ function piBinPath(resolvePath) {
 	return resolve(packageRoot, bin);
 }
 function extensionPath(moduleDir) {
-	return resolve(moduleDir, moduleDir.endsWith(`${sep}src`) ? "extension.ts" : "extension.js");
+	if (moduleDir.endsWith(`${sep}src${sep}session`)) return resolve(moduleDir, "../extension.ts");
+	return resolve(moduleDir, "extension.js");
 }
 function resolvePiInvocation(options = {}) {
 	const env = options.env ?? process.env;

package/dist/extension.js

@@ -2,9 +2,9 @@ import { readFileSync, statSync } from "node:fs";
 import { basename, extname, isAbsolute, resolve } from "node:path";
 import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
 import { ConversationGoneError, PocketCoderClient, PocketCoderError, TERMINAL_WORKSPACE_STATES, WorkspaceTerminalError, WorkspaceTurnResolutionError, isPocketCoderErrorCode, splitAttachmentManifest } from "@pstdio/pocketcoder-sdk";
-import { randomUUID } from "node:crypto";
 import { Text } from "@earendil-works/pi-tui";
-//#region src/control-plane.ts
+import { randomUUID } from "node:crypto";
+//#region src/client/control-plane.ts
 /** @internal The remote UI keeps its historical config vocabulary at its boundary. */
 var ControlPlaneClient = class extends PocketCoderClient {
 	constructor(config, fetchImpl = fetch) {
@@ -15,7 +15,7 @@ var ControlPlaneClient = class extends PocketCoderClient {
 	}
 };
 //#endregion
-//#region src/remote-request-error.ts
+//#region src/client/remote-request-error.ts
 var RemoteRequestError = class extends Error {
 	phase;
 	promptAccepted;
@@ -73,7 +73,7 @@ async function remoteResponseError(response, phase, promptAccepted) {
 	});
 }
 //#endregion
-//#region src/attachments.ts
+//#region src/attachments/attachments.ts
 const DIRECT_MODE_ATTACHMENT_ERROR = "file attachments need the PocketCoder workspace API; a direct AgentAPI URL (POCKETCODER_AGENTAPI_URL) cannot accept managed uploads";
 const IMAGE_EXTENSIONS = {
 	"image/gif": "gif",
@@ -221,7 +221,119 @@ function registerAttachCommand(pi, deps) {
 	});
 }
 //#endregion
-//#region src/session-target.ts
+//#region src/ui/renderers.ts
+const HISTORY_ENTRY_TYPE = "pocketcoder-conversation";
+const NOTICE_ENTRY_TYPE = "pocketcoder-history-notice";
+function roleHeader(data, theme) {
+	const time = data.occurred_at.replace("T", " ").replace(/\.\d+Z?$|Z$/, "");
+	return theme.fg("muted", `${data.role} · ${time}`);
+}
+function userBody(content, theme) {
+	const { text, attachments } = splitAttachmentManifest(content);
+	const body = theme.fg("userMessageText", text);
+	if (!attachments) return body;
+	return `${body}\n${attachments.map((attachment) => theme.fg("muted", `⌁ ${attachment.name} (${attachment.size_bytes} bytes)`)).join("\n")}`;
+}
+function formatConversationMessage(data, theme) {
+	switch (data.kind ?? "text") {
+		default: {
+			const header = roleHeader(data, theme);
+			let body = data.content;
+			if (data.role === "user") body = userBody(data.content, theme);
+			else if (data.role !== "assistant") body = theme.fg("dim", data.content);
+			return `${header}\n${body}`;
+		}
+	}
+}
+function formatHistoryNotice(data, theme) {
+	return theme.fg(data.level === "warning" ? "warning" : "muted", data.text);
+}
+function registerConversationRenderers(pi) {
+	pi.registerEntryRenderer(HISTORY_ENTRY_TYPE, (entry, _options, theme) => {
+		if (!entry.data) return void 0;
+		return new Text(formatConversationMessage(entry.data, theme), 1, 0);
+	});
+	pi.registerEntryRenderer(NOTICE_ENTRY_TYPE, (entry, _options, theme) => {
+		if (!entry.data) return void 0;
+		return new Text(formatHistoryNotice(entry.data, theme), 1, 0);
+	});
+}
+//#endregion
+//#region src/history/history.ts
+async function collectTranscriptTail(controlPlane, workspaceId, options) {
+	const tail = [];
+	let total = 0;
+	let pages = 0;
+	let cursor;
+	while (pages < options.maxPages) {
+		const page = await controlPlane.conversations.list(workspaceId, {
+			cursor,
+			limit: options.pageLimit
+		});
+		pages += 1;
+		for (const message of page.items) {
+			total += 1;
+			tail.push({
+				role: message.role,
+				content: message.content,
+				seq: message.seq,
+				occurred_at: message.occurred_at,
+				kind: message.metadata?.kind,
+				metadata: message.metadata
+			});
+			if (tail.length > options.maxMessages) tail.shift();
+		}
+		if (page.nextCursor === null) return {
+			tail,
+			total,
+			pages,
+			exhaustedPages: false
+		};
+		cursor = page.nextCursor;
+	}
+	return {
+		tail,
+		total,
+		pages,
+		exhaustedPages: true
+	};
+}
+async function replayHistory(pi, controlPlane, workspaceId, options = {}) {
+	let transcript;
+	try {
+		transcript = await collectTranscriptTail(controlPlane, workspaceId, {
+			pageLimit: options.pageLimit ?? 200,
+			maxMessages: options.maxMessages ?? 1e3,
+			maxPages: options.maxPages ?? 50
+		});
+	} catch (error) {
+		if (error instanceof ConversationGoneError) {
+			pi.appendEntry(NOTICE_ENTRY_TYPE, {
+				text: error.code === "conversation.deleted" ? "conversation history was deleted" : "conversation history has expired",
+				level: "warning"
+			});
+			return {
+				replayed: 0,
+				total: 0,
+				truncated: false,
+				gone: true
+			};
+		}
+		throw error;
+	}
+	const { tail, total, pages, exhaustedPages } = transcript;
+	const truncated = total > tail.length || exhaustedPages;
+	if (truncated) pi.appendEntry(NOTICE_ENTRY_TYPE, { text: exhaustedPages ? `history partially replayed (stopped after ${pages} pages)` : `showing last ${tail.length} of ${total} messages` });
+	for (const message of tail) pi.appendEntry(HISTORY_ENTRY_TYPE, message);
+	return {
+		replayed: tail.length,
+		total,
+		truncated,
+		gone: false
+	};
+}
+//#endregion
+//#region src/session/session-target.ts
 function relayTarget(baseUrl, key, workspaceId) {
 	const base = baseUrl.replace(/\/$/, "");
 	return {
@@ -277,7 +389,7 @@ var TargetRef = class {
 	}
 };
 //#endregion
-//#region src/commands.ts
+//#region src/session/commands.ts
 function workspaceLabel(workspace) {
 	return `${workspace.external_id} · ${workspace.template.name} · ${workspace.id.slice(0, 8)}`;
 }
@@ -364,113 +476,7 @@ function registerWorkspaceCommands(pi, deps) {
 	});
 }
 //#endregion
-//#region src/renderers.ts
-const HISTORY_ENTRY_TYPE = "pocketcoder-conversation";
-const NOTICE_ENTRY_TYPE = "pocketcoder-history-notice";
-function roleHeader(data, theme) {
-	const time = data.occurred_at.replace("T", " ").replace(/\.\d+Z?$|Z$/, "");
-	return theme.fg("muted", `${data.role} · ${time}`);
-}
-function userBody(content, theme) {
-	const { text, attachments } = splitAttachmentManifest(content);
-	const body = theme.fg("userMessageText", text);
-	if (!attachments) return body;
-	return `${body}\n${attachments.map((attachment) => theme.fg("muted", `⌁ ${attachment.name} (${attachment.size_bytes} bytes)`)).join("\n")}`;
-}
-function formatConversationMessage(data, theme) {
-	switch (data.kind ?? "text") {
-		default: return `${roleHeader(data, theme)}\n${data.role === "user" ? userBody(data.content, theme) : data.role === "assistant" ? data.content : theme.fg("dim", data.content)}`;
-	}
-}
-function formatHistoryNotice(data, theme) {
-	return theme.fg(data.level === "warning" ? "warning" : "muted", data.text);
-}
-function registerConversationRenderers(pi) {
-	pi.registerEntryRenderer(HISTORY_ENTRY_TYPE, (entry, _options, theme) => {
-		if (!entry.data) return void 0;
-		return new Text(formatConversationMessage(entry.data, theme), 1, 0);
-	});
-	pi.registerEntryRenderer(NOTICE_ENTRY_TYPE, (entry, _options, theme) => {
-		if (!entry.data) return void 0;
-		return new Text(formatHistoryNotice(entry.data, theme), 1, 0);
-	});
-}
-//#endregion
-//#region src/history.ts
-async function collectTranscriptTail(controlPlane, workspaceId, options) {
-	const tail = [];
-	let total = 0;
-	let pages = 0;
-	let cursor;
-	while (pages < options.maxPages) {
-		const page = await controlPlane.conversations.list(workspaceId, {
-			cursor,
-			limit: options.pageLimit
-		});
-		pages += 1;
-		for (const message of page.items) {
-			total += 1;
-			tail.push({
-				role: message.role,
-				content: message.content,
-				seq: message.seq,
-				occurred_at: message.occurred_at,
-				kind: message.metadata?.kind,
-				metadata: message.metadata
-			});
-			if (tail.length > options.maxMessages) tail.shift();
-		}
-		if (page.nextCursor === null) return {
-			tail,
-			total,
-			pages,
-			exhaustedPages: false
-		};
-		cursor = page.nextCursor;
-	}
-	return {
-		tail,
-		total,
-		pages,
-		exhaustedPages: true
-	};
-}
-async function replayHistory(pi, controlPlane, workspaceId, options = {}) {
-	let transcript;
-	try {
-		transcript = await collectTranscriptTail(controlPlane, workspaceId, {
-			pageLimit: options.pageLimit ?? 200,
-			maxMessages: options.maxMessages ?? 1e3,
-			maxPages: options.maxPages ?? 50
-		});
-	} catch (error) {
-		if (error instanceof ConversationGoneError) {
-			pi.appendEntry(NOTICE_ENTRY_TYPE, {
-				text: error.code === "conversation.deleted" ? "conversation history was deleted" : "conversation history has expired",
-				level: "warning"
-			});
-			return {
-				replayed: 0,
-				total: 0,
-				truncated: false,
-				gone: true
-			};
-		}
-		throw error;
-	}
-	const { tail, total, pages, exhaustedPages } = transcript;
-	const truncated = total > tail.length || exhaustedPages;
-	if (truncated) pi.appendEntry(NOTICE_ENTRY_TYPE, { text: exhaustedPages ? `history partially replayed (stopped after ${pages} pages)` : `showing last ${tail.length} of ${total} messages` });
-	for (const message of tail) pi.appendEntry(HISTORY_ENTRY_TYPE, message);
-	return {
-		replayed: tail.length,
-		total,
-		truncated,
-		gone: false
-	};
-}
-//#endregion
-//#region src/status.ts
+//#region src/ui/status.ts
 const STATUS_KEY = "pocketcoder";
 function statusText(workspace) {
 	return `ws ${workspace.id.slice(0, 8)} · ${workspace.state}/${workspace.agent_state}`;
@@ -553,7 +559,7 @@ var StatusPoller = class {
 	}
 };
 //#endregion
-//#region src/live-session.ts
+//#region src/session/live-session.ts
 var LiveSession = class {
 	targets;
 	createPoller;
@@ -609,57 +615,7 @@ var LiveSession = class {
 	}
 };
 //#endregion
-//#region src/response-stream.ts
-function textOf(message) {
-	const content = message.content[0];
-	return content?.type === "text" ? content.text : "";
-}
-async function emitRemoteResponse(stream, output, send, onOutputStart = () => {}) {
-	let previous = "";
-	let started = false;
-	const update = (snapshot) => {
-		if (snapshot === previous) return;
-		const delta = snapshot.startsWith(previous) ? snapshot.slice(previous.length) : "";
-		if (!started) {
-			output.content.push({
-				type: "text",
-				text: ""
-			});
-			started = true;
-			onOutputStart();
-			stream.push({
-				type: "text_start",
-				contentIndex: 0,
-				partial: output
-			});
-		}
-		const content = output.content[0];
-		if (content?.type === "text") content.text = snapshot;
-		previous = snapshot;
-		stream.push({
-			type: "text_delta",
-			contentIndex: 0,
-			delta,
-			partial: output
-		});
-	};
-	update(await send(update));
-	if (!started) update("");
-	stream.push({
-		type: "text_end",
-		contentIndex: 0,
-		content: textOf(output),
-		partial: output
-	});
-	output.stopReason = "stop";
-	stream.push({
-		type: "done",
-		reason: "stop",
-		message: output
-	});
-}
-//#endregion
-//#region src/agentapi-events.ts
+//#region src/stream/agentapi-events.ts
 function isRecord$2(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -731,7 +687,7 @@ async function* readAgentApiEvents(body, signal) {
 	}
 }
 //#endregion
-//#region src/client-helpers.ts
+//#region src/client/client-helpers.ts
 function delay(ms, signal) {
 	return new Promise((resolve, reject) => {
 		const onAbort = () => {
@@ -775,7 +731,7 @@ function changesUrlFor(serviceUrl) {
 	return url.toString();
 }
 //#endregion
-//#region src/client.ts
+//#region src/client/client.ts
 function isRecord(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -784,6 +740,7 @@ var RemoteAgentClient = class {
 	key;
 	pollIntervalMs;
 	timeoutMs;
+	readyTimeoutMs;
 	fetchImpl;
 	changesUrl;
 	constructor(config, fetchImpl = fetch) {
@@ -791,6 +748,7 @@ var RemoteAgentClient = class {
 		this.key = config.key;
 		this.pollIntervalMs = config.pollIntervalMs ?? 250;
 		this.timeoutMs = config.timeoutMs ?? 6e5;
+		this.readyTimeoutMs = Math.min(config.readyTimeoutMs ?? 12e4, this.timeoutMs);
 		this.fetchImpl = fetchImpl;
 		this.changesUrl = changesUrlFor(this.serviceUrl);
 	}
@@ -851,7 +809,22 @@ var RemoteAgentClient = class {
 			agentState: body.workspace.agent_state
 		};
 	}
+	async waitForInput(signal) {
+		const deadline = Date.now() + this.readyTimeoutMs;
+		let cursor = 0;
+		for (;;) {
+			const remainingMs = deadline - Date.now();
+			const change = await this.workspaceChange(cursor, Math.max(1, Math.min(30, Math.ceil(remainingMs / 1e3))), "submit_readiness", false, signal);
+			const state = change ? change.agentState : await this.status("submit_readiness", false, signal);
+			if (state === "stable") return;
+			const advanced = change !== void 0 && change.cursor !== cursor;
+			if (change) cursor = change.cursor;
+			if (Date.now() >= deadline) throw new Error(`remote agent was still ${state} after ${this.readyTimeoutMs}ms and cannot accept a message`);
+			if (!advanced) await delay(this.pollIntervalMs, signal);
+		}
+	}
 	async submit(prompt, attachmentIds, signal) {
+		await this.waitForInput(signal);
 		const response = await this.request("/message", {
 			method: "POST",
 			body: JSON.stringify({
@@ -961,7 +934,7 @@ var RemoteAgentClient = class {
 	}
 };
 //#endregion
-//#region src/turn.ts
+//#region src/session/turn.ts
 function isRetryableTerminal(error) {
 	return error instanceof RemoteRequestError && error.code === "workspace.terminal" && !error.promptAccepted;
 }
@@ -1006,6 +979,56 @@ async function executeRemoteTurn(options) {
 	throw new Error("remote turn retry invariant failed");
 }
 //#endregion
+//#region src/stream/response-stream.ts
+function textOf(message) {
+	const content = message.content[0];
+	return content?.type === "text" ? content.text : "";
+}
+async function emitRemoteResponse(stream, output, send, onOutputStart = () => {}) {
+	let previous = "";
+	let started = false;
+	const update = (snapshot) => {
+		if (snapshot === previous) return;
+		const delta = snapshot.startsWith(previous) ? snapshot.slice(previous.length) : "";
+		if (!started) {
+			output.content.push({
+				type: "text",
+				text: ""
+			});
+			started = true;
+			onOutputStart();
+			stream.push({
+				type: "text_start",
+				contentIndex: 0,
+				partial: output
+			});
+		}
+		const content = output.content[0];
+		if (content?.type === "text") content.text = snapshot;
+		previous = snapshot;
+		stream.push({
+			type: "text_delta",
+			contentIndex: 0,
+			delta,
+			partial: output
+		});
+	};
+	update(await send(update));
+	if (!started) update("");
+	stream.push({
+		type: "text_end",
+		contentIndex: 0,
+		content: textOf(output),
+		partial: output
+	});
+	output.stopReason = "stop";
+	stream.push({
+		type: "done",
+		reason: "stop",
+		message: output
+	});
+}
+//#endregion
 //#region src/extension.ts
 const PROVIDER = "pocketcoder-agentapi";
 const MODEL = "remote-agent";

package/package.json

@@ -6,7 +6,7 @@
       "type:app"
     ]
   },
-  "version": "0.3.1",
+  "version": "0.3.3",
   "private": false,
   "description": "Pi-based terminal UI for PocketCoder workspaces.",
   "type": "module",
@@ -46,7 +46,7 @@
     "@earendil-works/pi-ai": "0.83.0",
     "@earendil-works/pi-coding-agent": "0.83.0",
     "@earendil-works/pi-tui": "0.83.0",
-    "@pstdio/pocketcoder-sdk": "^0.4.0"
+    "@pstdio/pocketcoder-sdk": "^0.6.0"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",