@pstdio/pocketcoder-cli 0.7.0 → 0.7.1

package/dist/index.js

@@ -5214,7 +5214,7 @@ function isYargsInstance(y) {
 var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 // package.json
-var version = "0.7.0";
+var version = "0.7.1";
 
 // src/cli-context.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
@@ -40111,6 +40111,17 @@ ${tail}`] : []
     this.workspace = workspace;
   }
 }
+
+class AgentNotReadyError extends Error {
+  workspaceId;
+  agentState;
+  constructor(workspaceId, agentState, timeoutMs2) {
+    super(`agent in workspace ${workspaceId} was still ${agentState} after ${timeoutMs2}ms and cannot accept a message`);
+    this.name = "AgentNotReadyError";
+    this.workspaceId = workspaceId;
+    this.agentState = agentState;
+  }
+}
 function responseError(response, body) {
   const parsed = ErrorEnvelopeSchema.safeParse(body);
   if (!parsed.success) {
@@ -40126,6 +40137,7 @@ function responseError(response, body) {
 }
 
 // ../sdk/src/attachments.ts
+var DEFAULT_READY_TIMEOUT_MS = 120000;
 function contentDisposition(name2) {
   const clean = name2.replace(/[\r\n]/g, "");
   if (/^[ -~]*$/.test(clean)) {
@@ -40170,10 +40182,13 @@ class AttachmentsApi {
 
 class AgentApi {
   transport;
-  constructor(transport) {
+  workspaces;
+  constructor(transport, workspaces3) {
     this.transport = transport;
+    this.workspaces = workspaces3;
   }
   async sendMessage(workspaceId, input) {
+    await this.workspaces.waitForAgentInput(workspaceId, input.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS, input.signal ? { signal: input.signal } : {});
     const response = await this.transport.raw(`/v1/workspaces/${encodeURIComponent(workspaceId)}/agent/message`, {
       method: "POST",
       ...input.signal ? { signal: input.signal } : {},
@@ -40622,6 +40637,21 @@ class WorkspacesApi {
     }
     return workspace;
   }
+  async waitForAgentInput(id, timeoutMs2, options = {}) {
+    const deadline = Date.now() + timeoutMs2;
+    let workspace = await this.get(id, options);
+    while (workspace.agent_state !== "stable") {
+      if (TERMINAL_STATES.includes(workspace.state))
+        throw new WorkspaceTerminalError(workspace);
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) {
+        throw new AgentNotReadyError(workspace.id, workspace.agent_state, timeoutMs2);
+      }
+      const change = await this.change(workspace.id, workspace.change_cursor, Math.max(1, Math.min(30, Math.ceil(remainingMs / 1000))), options);
+      workspace = change.workspace;
+    }
+    return workspace;
+  }
   preserve(id, input, key, options = {}) {
     return this.jsonOperation(`/v1/workspaces/${encodeURIComponent(id)}/preserve`, input, key, PreserveResponseSchema, options);
   }
@@ -40661,7 +40691,7 @@ class PocketCoderClient {
     this.templates = new TemplatesApi(this.transport);
     this.workspaces = new WorkspacesApi(this.transport);
     this.attachments = new AttachmentsApi(this.transport);
-    this.agent = new AgentApi(this.transport);
+    this.agent = new AgentApi(this.transport, this.workspaces);
     this.conversations = new ConversationsApi(this.transport);
     this.checkpoints = new CheckpointsApi(this.transport);
     this.operations = new OperationsApi(this.transport);
@@ -41053,7 +41083,7 @@ function addDoctorCommand(parser2) {
   }).option("turn-timeout-seconds", {
     type: "number",
     default: 60,
-    description: "Maximum time to wait for the correlated diagnostic response"
+    description: "Maximum wait for agent input readiness and, separately, its diagnostic response"
   }), runDoctor);
 }
 async function runDoctor(flags) {
@@ -41069,8 +41099,10 @@ async function runDoctor(flags) {
     console.log(`doctor: workspace ${workspace.id} queued; waiting for ready`);
     await waitUntilReady(workspace.id);
     console.log("doctor: workspace ready; probing agent status through the relay");
+    const timeoutSeconds = turnTimeout(flags);
     await verifyStatus(workspace.id);
-    await runTurn(workspace.id, turnTimeout(flags));
+    await waitForInput(workspace.id, timeoutSeconds);
+    await runTurn(workspace.id, timeoutSeconds);
     console.log("doctor: correlated agent response received");
   } catch (error51) {
     failure = error51 instanceof Error ? error51 : new Error(String(error51));
@@ -41103,6 +41135,10 @@ async function waitUntilReady(workspaceId) {
   }
   throw new Error("workspace did not become ready within 5 minutes");
 }
+async function waitForInput(workspaceId, timeoutSeconds) {
+  console.log("doctor: waiting for the agent to be ready for input");
+  await controlPlaneClient().workspaces.waitForAgentInput(workspaceId, timeoutSeconds * 1000);
+}
 async function verifyStatus(workspaceId) {
   const response = await api2(`/v1/workspaces/${workspaceId}/agent/status`);
   const text6 = await response.text();
@@ -52359,6 +52395,31 @@ function addTemplateCommands(parser2) {
 // src/commands/workspaces/chat-session.ts
 import { createInterface } from "readline";
 
+// src/commands/workspaces/agent-readiness.ts
+async function readWorkspaceAgentState(id, { api: api3, fail: fail2 }) {
+  const response = await api3(`/v1/workspaces/${id}`);
+  const body = await response.json();
+  if (!response.ok) {
+    fail2(`workspace lookup failed (${response.status}): ${JSON.stringify(body)}`);
+  }
+  if (body.state !== "ready") {
+    fail2(`workspace is ${String(body.state ?? "unavailable")}; it is not live`);
+  }
+  if (body.agent_state !== "unknown" && body.agent_state !== "running" && body.agent_state !== "stable") {
+    fail2(`workspace returned unknown agent state: ${JSON.stringify(body.agent_state)}`);
+  }
+  return typeof body.agent_state === "string" ? body.agent_state : "unknown";
+}
+async function waitForAgentInput(id, options, deps) {
+  const deadline = Date.now() + options.timeoutSeconds * 1000;
+  while (await readWorkspaceAgentState(id, deps) !== "stable") {
+    if (Date.now() >= deadline) {
+      deps.fail(`agent was not ready for input within ${options.timeoutSeconds} seconds`);
+    }
+    await Bun.sleep(options.pollIntervalMs);
+  }
+}
+
 // src/commands/workspaces/attachments.ts
 import { randomUUID as randomUUID27 } from "crypto";
 import { readFileSync as readFileSync5, statSync as statSync4 } from "fs";
@@ -52542,6 +52603,7 @@ function setCursor(id, cursor, value) {
 }
 
 // src/commands/workspaces/chat-session.ts
+var DEFAULT_READINESS = { timeoutSeconds: 120, pollIntervalMs: 500 };
 function need2(flags, key, fail2) {
   const value = flags[key];
   if (typeof value !== "string" || value === "")
@@ -52566,9 +52628,11 @@ async function assertWorkspaceAttachable(id, { api: api3, fail: fail2 }) {
   const restore = workspace.persistence?.latest_checkpoint_id ? ` Restore with: pcd workspaces restore --checkpoint ${workspace.persistence.latest_checkpoint_id} --external-id <new-id>` : "";
   fail2(`workspace is ${workspace.state ?? "unavailable"}; it is not live.${restore}`);
 }
-async function sendWorkspaceMessage(id, message, { api: api3, fail: fail2 }, attachmentIds = []) {
+async function sendWorkspaceMessage(id, message, deps, attachmentIds = [], readiness = DEFAULT_READINESS) {
   if (typeof message !== "string")
     return;
+  const { api: api3, fail: fail2 } = deps;
+  await waitForAgentInput(id, readiness, deps);
   const response = await api3(`/v1/workspaces/${id}/agent/message`, {
     method: "POST",
     body: JSON.stringify({
@@ -52652,20 +52716,6 @@ async function readChatMessages(id, deps) {
   }
   return body.messages ?? [];
 }
-async function readWorkspaceAgentState(id, deps) {
-  const response = await deps.api(`/v1/workspaces/${id}`);
-  const body = await response.json();
-  if (!response.ok) {
-    deps.fail(`workspace lookup failed (${response.status}): ${JSON.stringify(body)}`);
-  }
-  if (body.state !== "ready") {
-    deps.fail(`workspace is ${String(body.state ?? "unavailable")}; it is not live`);
-  }
-  if (body.agent_state !== "unknown" && body.agent_state !== "running" && body.agent_state !== "stable") {
-    deps.fail(`workspace returned unknown agent state: ${JSON.stringify(body.agent_state)}`);
-  }
-  return typeof body.agent_state === "string" ? body.agent_state : "unknown";
-}
 async function pollTurnResponse(id, baseline, cursor, options, deps) {
   const deadline = Date.now() + options.timeoutSeconds * 1000;
   while (!options.interrupted()) {
@@ -52736,7 +52786,10 @@ async function chatWorkspace(flags, deps) {
     const before = await readChatMessages(id, deps);
     const baseline = messageBaseline(before);
     advanceCursor(id, cursor, before);
-    await sendWorkspaceMessage(id, message, deps, attachmentIds);
+    await sendWorkspaceMessage(id, message, deps, attachmentIds, {
+      timeoutSeconds: responseTimeoutSeconds,
+      pollIntervalMs
+    });
     await pollTurnResponse(id, baseline, cursor, {
       json: flags.json === true,
       pollIntervalMs,

package/package.json

@@ -6,7 +6,7 @@
       "type:app"
     ]
   },
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": false,
   "description": "Operator and diagnostics CLI for PocketCoder.",
   "type": "module",