ds-harness-remote 0.5.1 → 0.5.3

package/dist/index.js

@@ -16344,7 +16344,7 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
         case "commands/execute":
           return ok(await this.executeCommand(args, signal));
         default:
-          return fail("method-not-found", `CodeX virtual Harness does not implement ${endpoint}.`);
+          return this.hostCarrier === void 0 ? fail("method-not-found", `CodeX virtual Harness does not implement ${endpoint}.`) : await this.hostCarrier.dispatch(endpoint, payload, signal);
       }
     } catch (error) {
       return failFrom(error);
@@ -16366,6 +16366,8 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
     if (endpoint === "session/control") return this.sessionControl(signal);
     if (endpoint === "session/follow") return this.sessionFollow(requestArg(args), signal);
     if (endpoint === "$events") return this.remoteEvents(signal);
+    if (endpoint === "job/list" || endpoint === "job/follow") return this.emptyJobStream(endpoint, signal);
+    if (this.hostCarrier !== void 0) return this.hostCarrier.open(endpoint, payload, signal);
     throw Object.assign(new Error(`CodeX virtual Harness does not implement stream ${endpoint}.`), {
       isDSHRemoteError: true,
       code: "method-not-found",
@@ -16592,6 +16594,17 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
     queue.push({ type: "baseline", value: { queues: {}, jobs: {}, projections: {} } });
     return queue.iterate(() => this.controlStreams.delete(queue));
   }
+  /**
+   * Background jobs belong to the Host Harness session, not to a CodeX virtual
+   * Workspace. The native session header mounts a job roster stream as soon as a
+   * Session opens, so answer it with an authoritative empty roster instead of a
+   * terminal `method-not-found` failure that tears the page down.
+   */
+  emptyJobStream(endpoint, signal) {
+    const queue = new AsyncValueQueue2(signal);
+    if (endpoint === "job/list") queue.push({ type: "rows", jobs: [] });
+    return queue.iterate(() => queue.close());
+  }
   async remoteEvents(signal) {
     const queue = new AsyncValueQueue2(signal);
     const clientId = `codex-events:${this.host.deviceId}:${Date.now().toString(36)}`;
@@ -18585,10 +18598,11 @@ async function discoverAcpVirtualWorkspaces(client, backend, signal) {
   return [];
 }
 var AcpVirtualHarness = class _AcpVirtualHarness {
-  constructor(client, host, backend = "cursor") {
+  constructor(client, host, backend = "cursor", hostCarrier) {
     this.client = client;
     this.host = host;
     this.backend = backend;
+    this.hostCarrier = hostCarrier;
     this.api = this.createApiProxy();
   }
   api;
@@ -18606,8 +18620,8 @@ var AcpVirtualHarness = class _AcpVirtualHarness {
   lastProjectionSeq = 0;
   imageAttachments = /* @__PURE__ */ new Map();
   closed = false;
-  static remote(core, host, backend = "cursor", capabilities = []) {
-    return new _AcpVirtualHarness(new AgentAcpClient(core, capabilities), host, backend);
+  static remote(core, host, backend = "cursor", capabilities = [], hostCarrier) {
+    return new _AcpVirtualHarness(new AgentAcpClient(core, capabilities), host, backend, hostCarrier);
   }
   async workspaces() {
     return [...this.workspaceById.values()];
@@ -18762,7 +18776,7 @@ var AcpVirtualHarness = class _AcpVirtualHarness {
         case "commands/execute":
           return business2(void 0);
         default:
-          return fail2("method-not-found", `${this.backendLabel()} virtual Harness does not implement ${endpoint}.`);
+          return this.hostCarrier === void 0 ? fail2("method-not-found", `${this.backendLabel()} virtual Harness does not implement ${endpoint}.`) : await this.hostCarrier.dispatch(endpoint, payload, signal);
       }
     } catch (error) {
       return failFrom2(error);
@@ -18784,6 +18798,8 @@ var AcpVirtualHarness = class _AcpVirtualHarness {
     if (endpoint === "session/control") return this.sessionControl(signal);
     if (endpoint === "session/follow") return this.sessionFollow(requestArg2(args), signal);
     if (endpoint === "$events") return this.remoteEvents(signal);
+    if (endpoint === "job/list" || endpoint === "job/follow") return this.emptyJobStream(endpoint, signal);
+    if (this.hostCarrier !== void 0) return this.hostCarrier.open(endpoint, payload, signal);
     throw Object.assign(new Error(`${this.backendLabel()} virtual Harness does not implement stream ${endpoint}.`), {
       isDSHRemoteError: true,
       code: "method-not-found",
@@ -18944,6 +18960,11 @@ var AcpVirtualHarness = class _AcpVirtualHarness {
     if (session === void 0) return failure2("session-not-found", "The Session was not found.");
     await this.client.cancel(session.acpSessionId, signal);
     session.running = false;
+    for (const follow of this.follows) {
+      if (follow.sessionId === sessionId) {
+        this.closeFollowAfterRemoteStreamClosed(follow);
+      }
+    }
     this.emitRemoteEvent("api-session/status", [sessionId, false]);
     return success2({ accepted: true });
   }
@@ -19101,6 +19122,17 @@ var AcpVirtualHarness = class _AcpVirtualHarness {
     queue.push({ type: "baseline", value: { projections: {} } });
     return queue.iterate(() => this.controlStreams.delete(queue));
   }
+  /**
+   * Background jobs belong to the Host Harness session, not to a backend-scoped
+   * virtual Workspace. The native session header mounts a job roster stream as
+   * soon as a Session opens, so answer it with an authoritative empty roster
+   * instead of a terminal `method-not-found` failure that tears the page down.
+   */
+  emptyJobStream(endpoint, signal) {
+    const queue = new AsyncValueQueue3(signal);
+    if (endpoint === "job/list") queue.push({ type: "rows", jobs: [] });
+    return queue.iterate(() => queue.close());
+  }
   async remoteEvents(signal) {
     const id5 = `cursor-events:${Date.now()}:${Math.random()}`;
     const queue = new AsyncValueQueue3(signal);
@@ -20206,7 +20238,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.5.1";
+var PLUGIN_VERSION = "0.5.3";
 
 // src/server-api.ts
 var TERMINAL_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/u;
@@ -20257,7 +20289,7 @@ var HostServerApi = class {
       await this.clearAuthorization();
     }
   }
-  async authorizeWithAccount(identity, email, password) {
+  async authorizeWithAccount(identity, email, password, recoverIdentity) {
     this.bindIdentity(identity);
     const account = email.trim();
     if (account.length === 0 || password.length === 0) {
@@ -20267,11 +20299,19 @@ var HostServerApi = class {
       method: "POST",
       body: JSON.stringify({ email: account, password })
     }));
-    await this.register(identity, {
+    const authorization = {
       accountToken: login2.token,
       account: login2.account,
       authorizationMethod: "account"
-    });
+    };
+    try {
+      await this.register(identity, authorization);
+    } catch (error) {
+      if (!(error instanceof ServerApiError) || error.code !== "DEVICE_REVOKED" || recoverIdentity === void 0) throw error;
+      const nextIdentity = await recoverIdentity();
+      this.bindIdentity(nextIdentity);
+      await this.register(nextIdentity, authorization);
+    }
     return {
       method: "account",
       account: login2.account,
@@ -22285,7 +22325,7 @@ var ClientModeRuntime = class {
     const virtual = AcpVirtualHarness.remote(remote.client, {
       deviceId: remote.target.deviceId,
       name: remote.target.name
-    }, backend, remote.features.acpModelLoadsSession ? ["agent.acp.antigravity.model-load.v1"] : []);
+    }, backend, remote.features.acpModelLoadsSession ? ["agent.acp.antigravity.model-load.v1"] : [], new RemoteTypertGateway2(remote.client));
     let workspace;
     try {
       workspace = await virtual.selectWorkspace(workspaceId);
@@ -22320,7 +22360,7 @@ var ClientModeRuntime = class {
     const virtual = AcpVirtualHarness.remote(remote.client, {
       deviceId: remote.target.deviceId,
       name: remote.target.name
-    }, backend, remote.features.acpModelLoadsSession ? ["agent.acp.antigravity.model-load.v1"] : []);
+    }, backend, remote.features.acpModelLoadsSession ? ["agent.acp.antigravity.model-load.v1"] : [], new RemoteTypertGateway2(remote.client));
     const workspace = await virtual.selectOrCreateWorkspace(trimmedPath);
     await this.closeCodexVirtual();
     await this.closeCursorVirtual();
@@ -26418,6 +26458,7 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
     this.readModels = options.sessionWorker ? loadModels : cachedAgyModels(loadModels);
     this.args = options.args ?? ["--input-format", "stream-json", "--output-format", "stream-json"];
     this.cwd = options.cwd ?? process.cwd();
+    this.brainDir = options.brainDir;
     this.sessionWorker = options.sessionWorker === true;
     this.initialConversationClaimed = options.conversationId !== void 0;
     this.skipPermissions = options.skipPermissions === true;
@@ -26442,6 +26483,8 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
   args;
   cwd;
   readModels;
+  brainDir;
+  dispatchedThinkingSteps = /* @__PURE__ */ new Set();
   selections = /* @__PURE__ */ new Map();
   selecting = /* @__PURE__ */ new Set();
   currentPromptPending;
@@ -26464,6 +26507,7 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
       skipPermissions: this.skipPermissions,
       sessionWorker: true,
       cwd: cwd2,
+      brainDir: this.brainDir,
       ...conversationId === void 0 ? {} : { conversationId }
     });
     worker.onInbound((frame) => {
@@ -26501,6 +26545,13 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
     this.warmNextSession(cwd2);
   }
   async call(method, params, timeoutMs) {
+    if (!this.ready) {
+      if (this.startPromise) {
+        await this.startPromise;
+      } else if (!this.closed) {
+        await this.start();
+      }
+    }
     if (!this.ready) throw new AntigravityAcpError("ANTIGRAVITY_UNAVAILABLE", "Antigravity ACP is not ready.");
     if (method === "initialize") {
       return {
@@ -26597,12 +26648,7 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
       return { sessionId };
     }
     if (method === "session/cancel") {
-      if (this.currentPromptPending) {
-        clearTimeout(this.currentPromptPending.timer);
-        const pending = this.currentPromptPending;
-        this.currentPromptPending = void 0;
-        pending.resolve({ stopReason: "cancelled" });
-      }
+      await this.cancelTurn();
       return { cancelled: true };
     }
     if (method === "session/prompt") {
@@ -26631,6 +26677,36 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
     this.unavailableHandlers.add(handler);
     return () => this.unavailableHandlers.delete(handler);
   }
+  async cancelTurn() {
+    if (this.currentPromptPending) {
+      clearTimeout(this.currentPromptPending.timer);
+      const pending = this.currentPromptPending;
+      this.currentPromptPending = void 0;
+      pending.resolve({ stopReason: "cancelled" });
+    }
+    if (this.watcher) {
+      this.watcher.stop();
+      this.watcher = void 0;
+    }
+    const child = this.process;
+    this.process = void 0;
+    this.ready = false;
+    this.stdoutBuffer = Buffer5.alloc(0);
+    if (child !== void 0 && child.exitCode === null && !child.killed) {
+      child.stdout.removeAllListeners("data");
+      child.stderr.removeAllListeners("data");
+      child.kill("SIGINT");
+      const timer = setTimeout(() => {
+        if (child.exitCode === null && !child.killed) child.kill("SIGKILL");
+      }, 1e3);
+      timer.unref?.();
+    }
+    if (this.activeConversationId && !this.closed) {
+      void this.start().catch((err) => {
+        this.logger?.warn("Failed to restart Antigravity process after cancellation", { error: String(err) });
+      });
+    }
+  }
   async close() {
     if (this.closed) return;
     this.closed = true;
@@ -26701,8 +26777,7 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
             const conversationId = event.conversation_id;
             if (typeof conversationId === "string") {
               this.activeConversationId = conversationId;
-              this.watcher = new TranscriptWatcher(conversationId);
-              this.watcher.start();
+              this.attachWatcher(conversationId);
             }
             resolve6();
           }
@@ -26781,6 +26856,32 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
       this.process?.stdin.write(data2);
     });
   }
+  attachWatcher(conversationId) {
+    if (this.watcher) {
+      this.watcher.stop();
+      this.watcher = void 0;
+    }
+    const watcher = new TranscriptWatcher(conversationId, this.brainDir);
+    this.watcher = watcher;
+    this.dispatchedThinkingSteps.clear();
+    watcher.on("thinking", ({ stepIndex, thinking }) => {
+      if (this.dispatchedThinkingSteps.has(stepIndex)) return;
+      this.dispatchedThinkingSteps.add(stepIndex);
+      const trimmed = thinking?.trim();
+      if (!trimmed) return;
+      const sessionId = this.currentPromptPending?.sessionId ?? this.activeConversationId ?? "default";
+      this.emitNotification("session/update", {
+        sessionId,
+        update: {
+          sessionUpdate: "agent_thought_chunk",
+          text: `${trimmed}
+
+`
+        }
+      });
+    });
+    watcher.start();
+  }
   consumeStdout(chunk, onRawEvent) {
     this.stdoutBuffer = Buffer5.concat([this.stdoutBuffer, chunk]);
     while (true) {
@@ -26795,6 +26896,7 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
           onRawEvent(parsed);
         }
         this.handleAgyEvent(parsed);
+        void this.watcher?.flush();
       } catch (err) {
         this.logger?.debug("Failed to parse agy stdout line", { code: "INVALID_AGY_STREAM_EVENT" });
       }
@@ -26818,6 +26920,9 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
       } else if (stepType === "thought" || stepType === "reasoning") {
         const text = typeof step.text_delta === "string" ? step.text_delta : typeof step.thought === "string" ? step.thought : typeof step.reasoning === "string" ? step.reasoning : void 0;
         if (text) {
+          if (typeof step.step_index === "number") {
+            this.dispatchedThinkingSteps.add(step.step_index);
+          }
           this.emitNotification("session/update", {
             sessionId,
             update: {
@@ -26841,11 +26946,13 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
             }
           });
         } else if (step.state === "DONE") {
+          const status2 = step.status === "ERROR" ? "failed" : "completed";
           this.emitNotification("session/update", {
             sessionId,
             update: {
               sessionUpdate: "tool_call_update",
               callId,
+              status: status2,
               output: typeof toolInfo.output === "string" ? toolInfo.output : JSON.stringify(toolInfo.output ?? "")
             }
           });
@@ -26856,11 +26963,18 @@ var AntigravityAcpClient = class _AntigravityAcpClient {
       if (current) {
         clearTimeout(current.timer);
         this.currentPromptPending = void 0;
-        if (result.status === "ERROR") {
-          current.reject(new AntigravityAcpError("ANTIGRAVITY_TURN_FAILED", String(result.error ?? "Execution error")));
-        } else {
-          current.resolve({ stopReason: "end_turn", response: result.response });
-        }
+        const finish = async () => {
+          try {
+            await this.watcher?.flush();
+          } catch {
+          }
+          if (result.status === "ERROR") {
+            current.reject(new AntigravityAcpError("ANTIGRAVITY_TURN_FAILED", String(result.error ?? "Execution error")));
+          } else {
+            current.resolve({ stopReason: "end_turn", response: result.response });
+          }
+        };
+        void finish();
       }
     }
   }
@@ -28640,7 +28754,7 @@ var PluginControlRuntime = class {
     const identities = new IdentityStore({
       directory: serverStorageDirectory(this.identityDirectory, next.serverUrl, value.role)
     });
-    const identity = await identities.loadOrCreate(hostname2());
+    let identity = await identities.loadOrCreate(hostname2());
     const api = value.role === "host" ? new HostServerApi(next.serverUrl, new ServerCredentialStore(identities.directory)) : new ClientServerApi(next.serverUrl, new ServerCredentialStore(identities.directory));
     let authorization;
     if (value.role === "host" && typeof value.registrationCode === "string" && value.registrationCode.trim() !== "") {
@@ -28649,7 +28763,10 @@ var PluginControlRuntime = class {
       if (typeof value.email !== "string" || typeof value.password !== "string") {
         throw new ClientModeError("INVALID_MESSAGE", "Email and password are required for account authorization.");
       }
-      authorization = await api.authorizeWithAccount(identity, value.email, value.password);
+      authorization = await api.authorizeWithAccount(identity, value.email, value.password, async () => {
+        identity = await identities.reset(hostname2());
+        return identity;
+      });
     }
     if (value.role === "client" && resolveConfig(this.settings.get()).hostControl?.enabled !== false) {
       await this.client?.authorizeHostByDefault();
@@ -29246,8 +29363,10 @@ var RpcRouter = class {
       return createRpcResponse(request.id, result);
     } catch (error) {
       const response = errorResponse2(request.id, error);
+      const failedEndpoint = typeof request.payload.params?.endpoint === "string" ? String(request.payload.params.endpoint) : void 0;
       this.logger?.warn("host rpc failed", {
         method: request.payload.method,
+        ...failedEndpoint ? { endpoint: failedEndpoint } : {},
         durationMs: Math.round(performance.now() - startedAt),
         code: response.payload.code,
         retryable: response.payload.retryable
@@ -31354,6 +31473,8 @@ var HARNESS_REMOTE_ALLOWLIST = [
   "goals/edit",
   "goals/pause",
   "goals/resume",
+  "job/list",
+  "job/follow",
   "llm/discoverModels",
   "llm/listConfigurableProviders",
   "llm/listProviders",
@@ -31463,7 +31584,8 @@ var HarnessRemoteBridge = class {
         endpoint: params.endpoint,
         durationMs: Math.round(performance.now() - startedAt)
       });
-      return reservation === void 0 ? result : this.terminal.result(params.endpoint, params.payload, result, reservation);
+      const wireResult = normalizeWorkspaceBinaryResult(params.endpoint, result);
+      return reservation === void 0 ? wireResult : this.terminal.result(params.endpoint, params.payload, wireResult, reservation);
     } catch (error) {
       if (reservation !== void 0) this.terminal.result(params.endpoint, params.payload, { ok: false, error: { code: "FAILED", message: "", details: {} } }, reservation);
       if (params.endpoint === "directoryPicker/list") {
@@ -31726,6 +31848,23 @@ function decodeCanonicalBase644(value) {
   if (bytes.toString("base64") !== value) throw new RpcError("INVALID_MESSAGE", "The Harness Remote transfer chunk is invalid.");
   return bytes;
 }
+function normalizeWorkspaceBinaryResult(endpoint, result) {
+  if (result.ok !== true || endpoint !== "workspaceFiles/readBytes" && endpoint !== "officeToPdf/render") return result;
+  if (!isJsonRecord(result.value) || !isBinary(result.value.data)) return result;
+  return {
+    ...result,
+    value: {
+      ...result.value,
+      data: Buffer.from(result.value.data).toString("base64")
+    }
+  };
+}
+function isBinary(value) {
+  return value instanceof Uint8Array;
+}
+function isJsonRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function concatChunks4(chunks, totalBytes) {
   const result = new Uint8Array(totalBytes);
   let offset = 0;
@@ -31918,7 +32057,7 @@ var HostPluginRuntime = class {
       ...error === void 0 ? {} : { error },
       ...authorization?.account === void 0 ? {} : { account: authorization.account },
       authorized: authorization !== void 0,
-      accountRequired: error === "ACCOUNT_AUTH_REQUIRED" || error === "AUTH_INVALID" || error === "TOKEN_EXPIRED",
+      accountRequired: error === "ACCOUNT_AUTH_REQUIRED" || error === "AUTH_INVALID" || error === "TOKEN_EXPIRED" || error === "DEVICE_REVOKED",
       connectedClients: this.listConnectedClients()
     };
   }
@@ -32007,7 +32146,14 @@ var HostPluginRuntime = class {
     if (this.serverApi === void 0) {
       throw new ServerApiError("SERVER_NOT_CONFIGURED", "Configure serverUrl before signing in.", false);
     }
-    const result = await this.serverApi.authorizeWithAccount(this.currentIdentity(), email, password);
+    const result = await this.serverApi.authorizeWithAccount(this.currentIdentity(), email, password, async () => {
+      await this.serverConnection?.stop();
+      this.identity = await this.identities.reset(this.config.deviceName);
+      this.serverApi.bindIdentity(this.identity);
+      this.serverConnection = this.createServerConnection(this.identity);
+      this.logger.info("Rotated revoked Host identity before account authorization");
+      return this.identity;
+    });
     this.serverConnection?.resume();
     this.logger.info("Host account authorized");
     return result;