ds-harness-remote 0.3.20 → 0.3.21

package/dist/index.js

@@ -4111,7 +4111,8 @@ var helloPayloadSchema = external_exports.object({
   accessToken: external_exports.string().min(1),
   protocols: external_exports.array(external_exports.number().int()).min(1),
   capabilities: external_exports.array(external_exports.string()),
-  clientVersion: external_exports.string().optional()
+  clientVersion: external_exports.string().optional(),
+  harnessVersion: external_exports.string().optional()
 });
 var helloAckPayloadSchema = external_exports.object({
   protocol: external_exports.literal(PROTOCOL_VERSION),
@@ -4359,6 +4360,14 @@ function cryptoRandomId() {
 }
 
 // ../client-core/dist/index.js
+var RemoteClientError = class extends Error {
+  code;
+  constructor(code, message, options) {
+    super(message, options);
+    this.code = code;
+    this.name = "RemoteClientError";
+  }
+};
 var RemoteClientCore = class {
   transport;
   timeoutMs;
@@ -4367,6 +4376,7 @@ var RemoteClientCore = class {
   unsubscribeTransport;
   unsubscribeClose;
   closeHandlers = /* @__PURE__ */ new Set();
+  closeNotified = false;
   constructor(transport, timeoutMs = 3e4) {
     this.transport = transport;
     this.timeoutMs = timeoutMs;
@@ -4374,6 +4384,7 @@ var RemoteClientCore = class {
   async connect() {
     if (this.unsubscribeTransport !== void 0)
       return;
+    this.closeNotified = false;
     this.unsubscribeTransport = this.transport.onMessage((data) => this.handleMessage(data));
     this.unsubscribeClose = this.transport.onClose?.(() => this.handleTransportClose());
     try {
@@ -4387,23 +4398,24 @@ var RemoteClientCore = class {
     }
   }
   async rpc(method, params, signal) {
-    signal?.throwIfAborted();
+    if (signal?.aborted)
+      throw rpcAbortedError(method, signal.reason);
     const request = createRpcRequest(method, params);
     const result = new Promise((resolve2, reject) => {
       const timer = setTimeout(() => {
-        const pending2 = this.pending.get(request.id);
-        pending2?.removeAbort?.();
-        this.pending.delete(request.id);
-        reject(new Error(`RPC ${method} timed out`));
+        this.rejectPending(request.id, new RemoteClientError("RPC_TIMEOUT", `RPC ${method} timed out after ${this.timeoutMs}ms`));
       }, this.timeoutMs);
-      const pending = { resolve: resolve2, reject, timer };
+      const pending = {
+        method,
+        resolve: resolve2,
+        reject,
+        timer
+      };
       if (signal !== void 0) {
         const onAbort = () => {
           if (this.pending.get(request.id) !== pending)
             return;
-          clearTimeout(timer);
-          this.pending.delete(request.id);
-          reject(signal.reason instanceof Error ? signal.reason : new Error("RPC was cancelled"));
+          this.rejectPending(request.id, rpcAbortedError(method, signal.reason));
         };
         signal.addEventListener("abort", onAbort, { once: true });
         pending.removeAbort = () => signal.removeEventListener("abort", onAbort);
@@ -4411,15 +4423,12 @@ var RemoteClientCore = class {
       this.pending.set(request.id, pending);
     });
     try {
-      await this.transport.send(encodeMessage(request));
+      const send = this.transport.send(encodeMessage(request));
+      void send.catch((error) => {
+        this.rejectPending(request.id, transportSendError(error));
+      });
     } catch (error) {
-      const pending = this.pending.get(request.id);
-      if (pending !== void 0) {
-        clearTimeout(pending.timer);
-        pending.removeAbort?.();
-      }
-      this.pending.delete(request.id);
-      throw error;
+      this.rejectPending(request.id, transportSendError(error));
     }
     return result;
   }
@@ -4439,23 +4448,13 @@ var RemoteClientCore = class {
     this.unsubscribeTransport = void 0;
     this.unsubscribeClose?.();
     this.unsubscribeClose = void 0;
+    this.rejectAllPending((pending) => new RemoteClientError("CLIENT_CLOSED", `RPC ${pending.method} terminated because the remote client closed`));
+    this.notifyClose();
     await this.transport.close();
-    for (const pending of this.pending.values()) {
-      clearTimeout(pending.timer);
-      pending.removeAbort?.();
-      pending.reject(new Error("remote client closed"));
-    }
-    this.pending.clear();
   }
   handleTransportClose() {
-    for (const pending of this.pending.values()) {
-      clearTimeout(pending.timer);
-      pending.removeAbort?.();
-      pending.reject(new Error("remote transport closed"));
-    }
-    this.pending.clear();
-    for (const handler of this.closeHandlers)
-      handler();
+    this.rejectAllPending((pending) => new RemoteClientError("TRANSPORT_CLOSED", `RPC ${pending.method} terminated because the remote transport closed`));
+    this.notifyClose();
   }
   handleMessage(data) {
     const message = decodeMessage(data);
@@ -4470,24 +4469,54 @@ var RemoteClientCore = class {
     }
   }
   handleResponse(message) {
-    const pending = this.pending.get(message.payload.requestId);
+    const pending = this.takePending(message.payload.requestId);
     if (pending === void 0)
       return;
-    this.pending.delete(message.payload.requestId);
-    clearTimeout(pending.timer);
-    pending.removeAbort?.();
     pending.resolve(message.payload.result);
   }
   handleError(message) {
-    const pending = this.pending.get(message.payload.requestId);
+    const pending = this.takePending(message.payload.requestId);
     if (pending === void 0)
       return;
-    this.pending.delete(message.payload.requestId);
+    pending.reject(Object.assign(new Error(message.payload.message), { code: message.payload.code }));
+  }
+  takePending(requestId) {
+    const pending = this.pending.get(requestId);
+    if (pending === void 0)
+      return void 0;
+    this.pending.delete(requestId);
     clearTimeout(pending.timer);
     pending.removeAbort?.();
-    pending.reject(Object.assign(new Error(message.payload.message), { code: message.payload.code }));
+    return pending;
+  }
+  rejectPending(requestId, error) {
+    const pending = this.takePending(requestId);
+    if (pending === void 0)
+      return false;
+    pending.reject(error);
+    return true;
+  }
+  rejectAllPending(createError) {
+    for (const requestId of [...this.pending.keys()]) {
+      const pending = this.takePending(requestId);
+      if (pending !== void 0)
+        pending.reject(createError(pending));
+    }
+  }
+  notifyClose() {
+    if (this.closeNotified)
+      return;
+    this.closeNotified = true;
+    for (const handler of this.closeHandlers)
+      handler();
   }
 };
+function rpcAbortedError(method, reason) {
+  return new RemoteClientError("RPC_ABORTED", `RPC ${method} was aborted`, reason === void 0 ? void 0 : { cause: reason });
+}
+function transportSendError(error) {
+  return error instanceof Error ? error : new Error("remote transport send failed", { cause: error });
+}
 
 // ../webrtc/dist/transport.js
 var BaseTransport = class {
@@ -12966,7 +12995,7 @@ function normalizeLegacyResponse(method, response) {
   };
 }
 function isRemoteDisconnect(error) {
-  return error instanceof Error && (error.message === "remote transport closed" || error.message === "remote client closed");
+  return error instanceof RemoteClientError && (error.code === "TRANSPORT_CLOSED" || error.code === "CLIENT_CLOSED");
 }
 var AsyncFrameQueue = class {
   values = [];
@@ -13092,7 +13121,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.3.20";
+var PLUGIN_VERSION = "0.3.21";
 
 // src/server-api.ts
 var HostServerApi = class {
@@ -13315,8 +13344,7 @@ var HostServerApi = class {
       role: this.role,
       platform: platform(),
       identityKey: identity.publicKey,
-      clientVersion: PLUGIN_VERSION,
-      ...this.role === "host" ? { harnessVersion: "0.1.0-rc.6" } : {}
+      clientVersion: PLUGIN_VERSION
     };
   }
   saveTokens(identity, tokens, authorization) {
@@ -13735,6 +13763,7 @@ var ClientModeRuntime = class {
   }
   identity;
   connected;
+  pendingWorkspaceSelection;
   proxySwitch;
   gatewaySwitch;
   closed = false;
@@ -13764,6 +13793,7 @@ var ClientModeRuntime = class {
       connected: this.connected !== void 0,
       transport: this.connected?.client.getStats().mode ?? "Disconnected",
       remoteFeatures: this.connected?.features ?? remoteHostFeatures(),
+      ...this.pendingWorkspaceSelection === void 0 ? {} : { workspaceSelection: { ...this.pendingWorkspaceSelection } },
       hostAuthorizationAvailable: this.host !== void 0,
       ...this.host === void 0 ? {} : { host: this.host.hostStatus() }
     };
@@ -13832,6 +13862,7 @@ var ClientModeRuntime = class {
   async clearClientAuthorization() {
     const previous = this.connected;
     this.connected = void 0;
+    this.pendingWorkspaceSelection = void 0;
     this.proxySwitch.selectLocal();
     this.gatewaySwitch.selectLocal();
     await previous?.client.close().catch(() => void 0);
@@ -13855,6 +13886,7 @@ var ClientModeRuntime = class {
       this.gatewaySwitch.selectLocal();
       const previous2 = this.connected;
       this.connected = void 0;
+      this.pendingWorkspaceSelection = void 0;
       await previous2?.client.close().catch(() => void 0);
       this.logger.info("Harness target switched", { mode: "local" });
       return this.status();
@@ -13865,6 +13897,7 @@ var ClientModeRuntime = class {
     const next = await this.connect(targetDeviceId, signal);
     const previous = this.connected;
     this.connected = next;
+    this.pendingWorkspaceSelection = void 0;
     const remoteApi = new RemoteHarnessApiProxy(next.client).api;
     this.proxySwitch.selectRemote(remoteApi, { deviceId: next.target.deviceId, name: next.target.name });
     this.selectRemoteCommands(next);
@@ -13902,14 +13935,24 @@ var ClientModeRuntime = class {
     const workspace = unwrapNativeResult(response);
     this.proxySwitch.selectRemote(api, { deviceId: remote.target.deviceId, name: remote.target.name });
     this.selectRemoteCommands(remote);
+    const workspaceId = workspaceRecordId(workspace.workspace);
+    this.pendingWorkspaceSelection = { targetDeviceId: remote.target.deviceId, workspaceId };
     this.logger.info("Remote workspace opened", { targetDeviceId: shortId(remote.target.deviceId) });
     return { ...this.status(), workspace };
   }
+  consumeWorkspaceSelection(selection) {
+    const pending = this.pendingWorkspaceSelection;
+    if (pending?.targetDeviceId === selection.targetDeviceId && pending.workspaceId === selection.workspaceId) {
+      this.pendingWorkspaceSelection = void 0;
+    }
+    return this.status();
+  }
   async close() {
     if (this.closed) return;
     this.closed = true;
     this.proxySwitch.selectLocal();
     this.gatewaySwitch.selectLocal();
+    this.pendingWorkspaceSelection = void 0;
     await this.connected?.client.close().catch(() => void 0);
     this.connected = void 0;
     this.proxySwitch.restore();
@@ -13982,6 +14025,7 @@ var ClientModeRuntime = class {
       client.onClose(() => {
         if (this.connected?.client !== client) return;
         this.connected = void 0;
+        this.pendingWorkspaceSelection = void 0;
         this.proxySwitch.selectLocal();
         this.gatewaySwitch.selectLocal();
         void client.close().catch(() => void 0);
@@ -14047,6 +14091,16 @@ var ClientModeRuntime = class {
         }
         return ok(await this.openRemoteWorkspace(value.targetDeviceId, value.path, signal));
       }
+      if (endpoint === "workspace.selection.consume") {
+        const value = record(payload);
+        if (typeof value.targetDeviceId !== "string" || typeof value.workspaceId !== "string") {
+          throw new ClientModeError("INVALID_MESSAGE", "A Host and Workspace are required.");
+        }
+        return ok(this.consumeWorkspaceSelection({
+          targetDeviceId: value.targetDeviceId,
+          workspaceId: value.workspaceId
+        }));
+      }
       if (endpoint === "fileviewer.stat" || endpoint === "fileviewer.readRange" || endpoint === "fileviewer.list") {
         const method = endpoint === "fileviewer.stat" ? "stat" : endpoint === "fileviewer.readRange" ? "readRange" : "list";
         return ok(await this.callRemoteFileViewer(method, payload, signal));
@@ -14157,6 +14211,12 @@ function unwrapNativeResult(response) {
   }
   return result.value;
 }
+function workspaceRecordId(value) {
+  if (typeof value !== "object" || value === null || !("workspaceId" in value) || typeof value.workspaceId !== "string" || value.workspaceId.length === 0) {
+    throw new ClientModeError("INVALID_MESSAGE", "The remote Host returned an invalid Workspace.");
+  }
+  return value.workspaceId;
+}
 function fail(error) {
   const source = error instanceof Error ? error : void 0;
   const remoteCode = source !== void 0 && "code" in source && typeof source.code === "string" ? source.code : source instanceof ClientModeError ? source.code : void 0;
@@ -14704,6 +14764,10 @@ function redact(value, key = "") {
   return Object.fromEntries(Object.entries(value).map(([childKey, child]) => [childKey, redact(child, childKey)]));
 }
 
+// src/service.ts
+import { randomUUID } from "node:crypto";
+import { RpcId } from "@deepseek-ai/dsh-host-apiproxy/api";
+
 // src/connection-controller.ts
 var ConnectionController = class {
   constructor(identities, createRouter, logger) {
@@ -14872,6 +14936,36 @@ function shortId2(value) {
   return value.length <= 12 ? value : `${value.slice(0, 8)}\u2026${value.slice(-4)}`;
 }
 
+// src/harness-version.ts
+import { readFile as readFile3 } from "node:fs/promises";
+import { dirname as dirname3, isAbsolute, join as join3 } from "node:path";
+var LEGACY_PLACEHOLDER_VERSION = "0.0.1";
+function normalizeHarnessVersion(value) {
+  if (typeof value !== "string") return void 0;
+  const version = value.trim();
+  if (version.length === 0 || version.length > 64 || /[\u0000-\u001f]/u.test(version)) return void 0;
+  return version;
+}
+function selectHarnessVersion(reportedVersion, distributionVersion) {
+  if (reportedVersion !== void 0 && reportedVersion !== LEGACY_PLACEHOLDER_VERSION) return reportedVersion;
+  return distributionVersion;
+}
+async function readHarnessDistributionVersion(entrypoint = process.argv[1]) {
+  if (entrypoint === void 0 || !isAbsolute(entrypoint)) return void 0;
+  let directory = dirname3(entrypoint);
+  for (let depth = 0; depth < 8; depth += 1) {
+    try {
+      const manifest = JSON.parse(await readFile3(join3(directory, "package.json"), "utf8"));
+      if (manifest.name === "@deepseek-ai/dsh") return normalizeHarnessVersion(manifest.version);
+    } catch {
+    }
+    const parent = dirname3(directory);
+    if (parent === directory) break;
+    directory = parent;
+  }
+  return void 0;
+}
+
 // src/rpc-router.ts
 var wireRequestSchema = external_exports.object({ method: external_exports.string().min(1), params: external_exports.unknown() }).strict();
 var apiMethods = /* @__PURE__ */ new Set([
@@ -15091,7 +15185,7 @@ function isOversizedListing(value) {
 // src/server-connection.ts
 var DEFAULT_WEBRTC_NEGOTIATE_TIMEOUT_MS = 8e3;
 var HostServerConnection = class {
-  constructor(config, identity, identities, api, connections, logger, createWebSocket = (url) => new WebSocket(url), rtcFactoryProvider, hostCapabilities = () => ["harness.api.v1"]) {
+  constructor(config, identity, identities, api, connections, logger, createWebSocket = (url) => new WebSocket(url), rtcFactoryProvider, hostCapabilities = () => ["harness.api.v1"], harnessVersion) {
     this.config = config;
     this.identity = identity;
     this.identities = identities;
@@ -15101,6 +15195,7 @@ var HostServerConnection = class {
     this.createWebSocket = createWebSocket;
     this.rtcFactoryProvider = rtcFactoryProvider;
     this.hostCapabilities = hostCapabilities;
+    this.harnessVersion = harnessVersion;
   }
   socket;
   running;
@@ -15224,6 +15319,7 @@ var HostServerConnection = class {
           accessToken: credentials.accessToken,
           protocols: [PROTOCOL_VERSION],
           clientVersion: PLUGIN_VERSION,
+          ...this.harnessVersion === void 0 ? {} : { harnessVersion: this.harnessVersion },
           capabilities: this.rtcFactoryProvider === void 0 || this.config.forceRelay ? ["transport.relay", ...this.hostCapabilities()] : ["transport.p2p", "transport.turn", "transport.relay", ...this.hostCapabilities()]
         });
       };
@@ -15776,13 +15872,13 @@ function closeCode(code) {
 // src/remote-directory-browser.ts
 import { readdir, stat as stat3 } from "node:fs/promises";
 import { homedir as homedir2, platform as platform2 } from "node:os";
-import { basename, dirname as dirname3, isAbsolute, parse, resolve } from "node:path";
+import { basename, dirname as dirname4, isAbsolute as isAbsolute2, parse, resolve } from "node:path";
 var MAX_ENTRIES = 500;
 async function listRemoteDirectory(path, signal) {
   signal?.throwIfAborted();
   const home = resolve(homedir2());
   const target = path === void 0 || path.trim() === "" ? home : resolve(path);
-  if (!isAbsolute(target)) throw new Error("The remote directory path must be absolute.");
+  if (!isAbsolute2(target)) throw new Error("The remote directory path must be absolute.");
   const rows = await readdir(target, { withFileTypes: true });
   const directories = [];
   for (const row of rows) {
@@ -15809,7 +15905,7 @@ function crumbs(path) {
   let current = path;
   while (current !== root) {
     segments.unshift(basename(current));
-    current = dirname3(current);
+    current = dirname4(current);
   }
   for (const segment of segments) {
     current = resolve(current, segment);
@@ -16173,11 +16269,12 @@ var HostPluginRuntime = class {
   constructor(config, identities, apiProxy, logger, typertGateway, fileViewerHost) {
     this.config = config;
     this.identities = identities;
+    this.apiProxy = apiProxy;
     this.logger = logger;
     this.fileViewerHost = fileViewerHost;
     this.connections = new ConnectionController(this.identities, (_context, send) => {
       const harnessApi = new HarnessApiBridge(
-        apiProxy,
+        this.apiProxy,
         (event, data) => send(createEvent(event, data)),
         void 0,
         this.logger,
@@ -16197,6 +16294,7 @@ var HostPluginRuntime = class {
   identity;
   serverApi;
   serverConnection;
+  harnessVersion;
   closed = false;
   async start() {
     if (this.closed) throw new Error("remote runtime is closed");
@@ -16207,6 +16305,7 @@ var HostPluginRuntime = class {
       server: this.config.serverUrl ?? "not configured"
     });
     if (this.serverApi !== void 0) {
+      this.harnessVersion = await this.readHarnessVersion();
       this.serverApi.bindIdentity(this.identity);
       this.serverConnection = this.createServerConnection(this.identity);
       this.serverConnection.start();
@@ -16325,9 +16424,28 @@ var HostPluginRuntime = class {
       this.logger,
       void 0,
       this.config.forceRelay ? void 0 : loadWeriftFactory,
-      () => this.fileViewerHost?.() === void 0 ? ["harness.api.v1"] : ["harness.api.v1", "fileviewer.read.v1"]
+      () => this.fileViewerHost?.() === void 0 ? ["harness.api.v1"] : ["harness.api.v1", "fileviewer.read.v1"],
+      this.harnessVersion
     );
   }
+  async readHarnessVersion() {
+    let reportedVersion;
+    let errorCode2;
+    try {
+      const response = await this.apiProxy.host.describe({ rpcId: RpcId(randomUUID()), payload: {} });
+      if (!response.result.ok) {
+        errorCode2 = response.result.error.code;
+      } else {
+        reportedVersion = normalizeHarnessVersion(response.result.value.version);
+      }
+    } catch {
+    }
+    const distributionVersion = reportedVersion === void 0 || reportedVersion === "0.0.1" ? await readHarnessDistributionVersion() : void 0;
+    const version = selectHarnessVersion(reportedVersion, distributionVersion);
+    if (version !== void 0) return version;
+    this.logger.warn("Harness version is unavailable", errorCode2 === void 0 ? void 0 : { code: errorCode2 });
+    return void 0;
+  }
 };
 function shortId5(value) {
   return value.length <= 12 ? value : `${value.slice(0, 8)}\u2026${value.slice(-4)}`;