@blue-soda/dsh-remote 0.4.30 → 0.4.31

package/dist/index.js

@@ -14812,6 +14812,100 @@ async function readHarnessDistributionVersion(entrypoint = process.argv[1]) {
   }
 }
 
+// src/rpc-binary-attachments.ts
+function hydrateRpcAttachments(result) {
+  if (!isRecord2(result)) return result;
+  const envelope = result;
+  if (!Array.isArray(envelope.attachments) || envelope.attachments.length === 0) return result;
+  const { attachments, ...rest } = result;
+  const base = Object.hasOwn(rest, "value") ? rest.value : void 0;
+  for (const attachment of attachments) {
+    const entry = attachment;
+    const path = Array.isArray(entry.path) ? entry.path : void 0;
+    if (path === void 0 || path.length === 0) {
+      throw new Error("The remote Host returned a byte attachment without a path.");
+    }
+    assignAtPath(base, path, decodeAttachmentBytes(entry.bytes));
+  }
+  return rest;
+}
+function assignAtPath(base, path, bytes) {
+  if (base === null || typeof base !== "object") {
+    throw new Error("The remote Host returned a byte attachment that its result cannot hold.");
+  }
+  let cursor2 = base;
+  for (let index = 0; index < path.length - 1; index += 1) {
+    const key = pathKey(path[index]);
+    const next = cursor2[key];
+    if (next === null || typeof next !== "object") {
+      throw new Error("The remote Host returned a byte attachment at an unknown result path.");
+    }
+    cursor2 = next;
+  }
+  cursor2[pathKey(path[path.length - 1])] = bytes;
+}
+function pathKey(segment) {
+  if (typeof segment === "string") return segment;
+  if (typeof segment === "number" && Number.isInteger(segment) && segment >= 0) return String(segment);
+  throw new Error("The remote Host returned a byte attachment with an invalid path segment.");
+}
+function decodeAttachmentBytes(value) {
+  if (value instanceof Uint8Array) return value;
+  if (typeof value === "string") return decodeBase64(value);
+  if (Array.isArray(value)) return Uint8Array.from(value);
+  if (!isRecord2(value)) throw new Error("The remote Host returned invalid byte attachment data.");
+  if (Array.isArray(value.data)) {
+    return Uint8Array.from(value.data);
+  }
+  const keys = Object.keys(value);
+  if (keys.every((key) => /^\d+$/u.test(key))) {
+    const ordered = keys.map(Number).sort((left, right) => left - right);
+    return Uint8Array.from(ordered.map((key) => value[String(key)]));
+  }
+  throw new Error("The remote Host returned invalid byte attachment data.");
+}
+function decodeBase64(value) {
+  const binary = atob(value);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
+  return bytes;
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function collectRpcAttachments(result) {
+  if (!isRecord2(result) || !Object.hasOwn(result, "value")) return result;
+  const attachments = [];
+  const value = replaceBytes(result.value, [], attachments);
+  if (attachments.length === 0) return result;
+  return { ...result, value, attachments };
+}
+function replaceBytes(value, path, attachments) {
+  if (value instanceof Uint8Array) {
+    attachments.push({ path: [...path], bytes: encodeBase64(value) });
+    return null;
+  }
+  if (Array.isArray(value)) return value.map((item, index) => replaceBytes(item, [...path, index], attachments));
+  if (!isRecord2(value)) return value;
+  const clone = {};
+  for (const [key, item] of Object.entries(value)) clone[key] = replaceBytes(item, [...path, key], attachments);
+  return clone;
+}
+function encodeBase64(bytes) {
+  let binary = "";
+  for (let offset = 0; offset < bytes.byteLength; offset += 32768) {
+    binary += String.fromCharCode(...bytes.subarray(offset, offset + 32768));
+  }
+  return btoa(binary);
+}
+function decodeByteValue(value) {
+  try {
+    return decodeAttachmentBytes(value);
+  } catch {
+    return void 0;
+  }
+}
+
 // src/remote-api-proxy.ts
 var DIRECT_API_CALL_BYTES = 2 * 1024 * 1024;
 var AGENT_PRESET_SETTINGS_NS = "agent-presets";
@@ -14919,12 +15013,13 @@ var RemoteHarnessApiProxy = class {
     if (String(response.rpcId) !== String(request.rpcId) || typeof response.result !== "object" || response.result === null) {
       throw new Error("The remote Host returned an invalid Harness API response.");
     }
-    const normalized = normalizeLegacyResponse(method, response);
+    const hydrated = { ...response, result: hydrateRpcAttachments(response.result) };
+    const normalized = normalizeLegacyResponse(method, normalizeByteResult(method, hydrated));
     return this.normalizeLegacyWelcomeSettings(method, params.payload, normalized);
   }
   normalizeLegacyWelcomeSettings(method, payload, response) {
     if (!isLegacyRemoteHost(this.harnessVersion)) return response;
-    if (method === "settings.describe" && response.result.ok && isRecord2(response.result.value)) {
+    if (method === "settings.describe" && response.result.ok && isRecord3(response.result.value)) {
       this.settingsDescribeValue = response.result.value;
       return this.legacyWelcomeAcknowledged ? patchWelcomeDescribe(response) : response;
     }
@@ -15036,7 +15131,7 @@ function normalizeLegacyResponse(method, response) {
   };
 }
 function normalizeLegacyRequest(method, payload) {
-  if (!isRecord2(payload)) return payload;
+  if (!isRecord3(payload)) return payload;
   if (method === "agentPreset.read") return replaceAgentPreset(payload, "agentPreset");
   if (method === "agentPreset.select") return replaceAgentPreset(payload, "agentPreset");
   if (method === "agentPreset.copy") return replaceAgentPreset(payload, "from");
@@ -15051,7 +15146,7 @@ function replaceAgentPreset(payload, key) {
   return replacement === void 0 ? payload : { ...payload, [key]: replacement };
 }
 function replaceAgentPresetSettings(payload) {
-  if (payload.ns !== AGENT_PRESET_SETTINGS_NS || !isRecord2(payload.patch)) return payload;
+  if (payload.ns !== AGENT_PRESET_SETTINGS_NS || !isRecord3(payload.patch)) return payload;
   const patch = replaceAgentPreset(payload.patch, "default");
   return patch === payload.patch ? payload : { ...payload, patch };
 }
@@ -15061,11 +15156,11 @@ function isLegacyRemoteHost(version) {
   return match !== null && Number(match[1]) === 0 && Number(match[2]) === 1 && Number(match[3]) < 7;
 }
 function isWelcomeNoticeRequest(payload) {
-  if (!isRecord2(payload) || payload.ns !== WELCOME_NOTICE_NAMESPACE || !Array.isArray(payload.ops)) return false;
-  return payload.ops.some((operation) => isRecord2(operation) && operation.op === "set" && Array.isArray(operation.path) && operation.path.length === 1 && operation.path[0] === WELCOME_NOTICE_FIELD && operation.value === WELCOME_NOTICE_VERSION);
+  if (!isRecord3(payload) || payload.ns !== WELCOME_NOTICE_NAMESPACE || !Array.isArray(payload.ops)) return false;
+  return payload.ops.some((operation) => isRecord3(operation) && operation.op === "set" && Array.isArray(operation.path) && operation.path.length === 1 && operation.path[0] === WELCOME_NOTICE_FIELD && operation.value === WELCOME_NOTICE_VERSION);
 }
 function patchWelcomeDescribe(response) {
-  if (!response.result.ok || !isRecord2(response.result.value) || !Array.isArray(response.result.value.namespaces)) return response;
+  if (!response.result.ok || !isRecord3(response.result.value) || !Array.isArray(response.result.value.namespaces)) return response;
   return {
     ...response,
     result: {
@@ -15073,8 +15168,8 @@ function patchWelcomeDescribe(response) {
       value: {
         ...response.result.value,
         namespaces: response.result.value.namespaces.map((namespace) => {
-          if (!isRecord2(namespace) || namespace.ns !== WELCOME_NOTICE_NAMESPACE) return namespace;
-          const value = isRecord2(namespace.value) ? namespace.value : {};
+          if (!isRecord3(namespace) || namespace.ns !== WELCOME_NOTICE_NAMESPACE) return namespace;
+          const value = isRecord3(namespace.value) ? namespace.value : {};
           return { ...namespace, value: { ...value, [WELCOME_NOTICE_FIELD]: WELCOME_NOTICE_VERSION } };
         })
       }
@@ -15088,8 +15183,8 @@ function patchWelcomeMutate(value, rpcId2) {
   };
   const namespaces = Array.isArray(value.namespaces) ? value.namespaces : [];
   response.result.value.namespaces = namespaces.map((namespace) => {
-    if (!isRecord2(namespace) || namespace.ns !== WELCOME_NOTICE_NAMESPACE) return namespace;
-    const current = isRecord2(namespace.value) ? namespace.value : {};
+    if (!isRecord3(namespace) || namespace.ns !== WELCOME_NOTICE_NAMESPACE) return namespace;
+    const current = isRecord3(namespace.value) ? namespace.value : {};
     return { ...namespace, value: { ...current, [WELCOME_NOTICE_FIELD]: WELCOME_NOTICE_VERSION } };
   });
   return response;
@@ -15097,7 +15192,7 @@ function patchWelcomeMutate(value, rpcId2) {
 function isRemoteDisconnect(error) {
   return error instanceof RemoteClientError && (error.code === "TRANSPORT_CLOSED" || error.code === "CLIENT_CLOSED");
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var AsyncFrameQueue = class {
@@ -15161,67 +15256,23 @@ function base64ToBytes2(value) {
   }
   return bytes;
 }
-
-// src/rpc-binary-attachments.ts
-function hydrateRpcAttachments(result) {
-  if (!isRecord3(result)) return result;
-  const envelope = result;
-  if (!Array.isArray(envelope.attachments) || envelope.attachments.length === 0) return result;
-  const { attachments, ...rest } = result;
-  const base = Object.hasOwn(rest, "value") ? rest.value : void 0;
-  for (const attachment of attachments) {
-    const entry = attachment;
-    const path = Array.isArray(entry.path) ? entry.path : void 0;
-    if (path === void 0 || path.length === 0) {
-      throw new Error("The remote Host returned a byte attachment without a path.");
-    }
-    assignAtPath(base, path, decodeAttachmentBytes(entry.bytes));
-  }
-  return rest;
-}
-function assignAtPath(base, path, bytes) {
-  if (base === null || typeof base !== "object") {
-    throw new Error("The remote Host returned a byte attachment that its result cannot hold.");
-  }
-  let cursor2 = base;
-  for (let index = 0; index < path.length - 1; index += 1) {
-    const key = pathKey(path[index]);
-    const next = cursor2[key];
-    if (next === null || typeof next !== "object") {
-      throw new Error("The remote Host returned a byte attachment at an unknown result path.");
+function normalizeByteResult(method, response) {
+  if (method !== "workspaceFiles.readBytes") return response;
+  const result = response.result;
+  if (result === void 0 || result.ok !== true) return response;
+  const value = result.value;
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return response;
+  const raw = value.data;
+  const data2 = raw instanceof Uint8Array ? raw : decodeByteValue(raw);
+  if (data2 === void 0) return response;
+  return {
+    ...response,
+    result: {
+      ...result,
+      value: { ...value, data: null },
+      attachments: [{ path: ["data"], bytes: data2 }]
     }
-    cursor2 = next;
-  }
-  cursor2[pathKey(path[path.length - 1])] = bytes;
-}
-function pathKey(segment) {
-  if (typeof segment === "string") return segment;
-  if (typeof segment === "number" && Number.isInteger(segment) && segment >= 0) return String(segment);
-  throw new Error("The remote Host returned a byte attachment with an invalid path segment.");
-}
-function decodeAttachmentBytes(value) {
-  if (value instanceof Uint8Array) return value;
-  if (typeof value === "string") return decodeBase64(value);
-  if (Array.isArray(value)) return Uint8Array.from(value);
-  if (!isRecord3(value)) throw new Error("The remote Host returned invalid byte attachment data.");
-  if (Array.isArray(value.data)) {
-    return Uint8Array.from(value.data);
-  }
-  const keys = Object.keys(value);
-  if (keys.every((key) => /^\d+$/u.test(key))) {
-    const ordered = keys.map(Number).sort((left, right) => left - right);
-    return Uint8Array.from(ordered.map((key) => value[String(key)]));
-  }
-  throw new Error("The remote Host returned invalid byte attachment data.");
-}
-function decodeBase64(value) {
-  const binary = atob(value);
-  const bytes = new Uint8Array(binary.length);
-  for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
-  return bytes;
-}
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+  };
 }
 
 // src/session-format-compat.ts
@@ -16173,7 +16224,7 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
     try {
       if (isHostWorkspaceEndpoint(endpoint)) {
         if (this.hostCarrier === void 0) return fail("method-not-found", `CodeX virtual Harness does not implement ${endpoint}.`);
-        return await this.hostCarrier.dispatch(endpoint, payload, signal);
+        return normalizeByteResult2(endpoint, await this.hostCarrier.dispatch(endpoint, payload, signal));
       }
       const args = carrierArgs(payload);
       switch (endpoint) {
@@ -18412,6 +18463,19 @@ var AsyncValueQueue2 = class {
     }
   }
 };
+function normalizeByteResult2(endpoint, result) {
+  if (endpoint !== "workspaceFiles/readBytes" || !result.ok) return result;
+  const value = result.value;
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return result;
+  const raw = value.data;
+  const data2 = raw instanceof Uint8Array ? raw : decodeByteValue(raw);
+  if (data2 === void 0) return result;
+  return {
+    ...result,
+    value: { ...value, data: null },
+    attachments: [{ path: ["data"], bytes: data2 }]
+  };
+}
 
 // src/server-api.ts
 import { platform } from "node:os";
@@ -18692,7 +18756,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.4.30";
+var PLUGIN_VERSION = "0.4.31";
 
 // src/server-api.ts
 var ENABLED_QR_PROVIDERS = ["github"];
@@ -19239,25 +19303,39 @@ var TypertGatewaySwitch = class {
   install() {
     if (this.installed) return;
     this.runtime.invoke = (request) => this.selectInvoke(request);
-    if (this.originalStream !== void 0) {
-      this.runtime.stream = (request) => !this.routesToRemote(endpointOf(request)) ? this.localStream(request) : this.withLocalFallback(
+    const previousStream = this.runtime.stream?.bind(this.runtime);
+    const previousDispatch = this.runtime.dispatchRpc?.bind(this.runtime);
+    const previousOpen = this.runtime.openWireStream;
+    const forwards = (endpoint) => this.remoteTarget === void 0 && this.remoteAvailability() && !isLocalOnlyEndpoint(endpoint);
+    if (previousStream !== void 0) {
+      this.runtime.stream = (request) => forwards(endpointOf(request)) ? previousStream(request) : !this.routesToRemote(endpointOf(request)) ? this.localStream(request) : this.withLocalFallback(
         endpointOf(request),
         () => this.remoteTarget.open(endpointOf(request), { args: request.args }, request.signal ?? new AbortController().signal),
         () => this.localStream(request)
       );
     }
-    if (this.originalDispatch !== void 0) {
-      this.runtime.dispatchRpc = (endpoint, payload, signal) => !this.routesToRemote(endpoint) ? this.localDispatch(endpoint, payload, signal) : this.withLocalFallback(
+    if (previousDispatch !== void 0) {
+      this.runtime.dispatchRpc = (endpoint, payload, signal) => forwards(endpoint) ? Promise.resolve(previousDispatch(endpoint, payload, signal)).catch((error) => {
+        console.warn("[dsh-remote] local call failed with no remote target selected", {
+          endpoint,
+          code: typeof error === "object" && error !== null && "code" in error ? String(error.code) : void 0,
+          message: error instanceof Error ? error.message : String(error)
+        });
+        throw error;
+      }) : !this.routesToRemote(endpoint) ? this.localDispatch(endpoint, payload, signal) : this.withLocalFallback(
         endpoint,
         () => Promise.resolve(this.remoteTarget.dispatch(endpoint, payload, signal)),
         () => this.localDispatch(endpoint, payload, signal)
-      );
+      ).then((result) => normalizeByteResult3(endpoint, result));
     }
-    if (this.originalOpen !== void 0) {
-      const open = this.originalOpen;
+    if (previousOpen !== void 0) {
+      const open = previousOpen;
       const rc1 = usesRc1Arity(open);
       this.runtime.openWireStream = (...callArgs) => {
         const endpoint = callArgs[0];
+        if (forwards(endpoint)) {
+          return rc1 ? Reflect.apply(open, this.runtime, callArgs) : open.call(this.runtime, endpoint, callArgs[1], callArgs[2]);
+        }
         if (!this.routesToRemote(endpoint)) {
           return rc1 ? Reflect.apply(open, this.runtime, callArgs) : open.call(this.runtime, endpoint, callArgs[1], callArgs[2]);
         }
@@ -19328,7 +19406,7 @@ var TypertGatewaySwitch = class {
   selectInvoke(request) {
     if (isLocalOnlyEndpoint(endpointOf(request))) return this.localInvoke(request);
     if (this.remoteTarget !== void 0 && this.remoteAvailability()) {
-      return this.remoteTarget.invoke(request).catch((error) => {
+      return this.remoteTarget.invoke(request).then((result) => normalizeByteResult3(endpointOf(request), result)).catch((error) => {
         if (!localFallbackAllowed(endpointOf(request), error)) throw error;
         console.warn(`[dsh-remote] serving ${endpointOf(request)} locally: the peer did not answer it`, error);
         return this.localInvoke(request);
@@ -19458,6 +19536,21 @@ var UNANSWERED_BY_PEER_CODES = /* @__PURE__ */ new Set([
 function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function normalizeByteResult3(endpoint, result) {
+  if (endpoint !== "workspaceFiles/readBytes") return result;
+  if (typeof result !== "object" || result === null || Array.isArray(result)) return result;
+  const envelope = result;
+  const value = envelope.value;
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return result;
+  const raw = value.data;
+  const data2 = raw instanceof Uint8Array ? raw : decodeByteValue(raw);
+  if (data2 === void 0) return result;
+  return {
+    ...envelope,
+    value: { ...value, data: null },
+    attachments: [{ path: ["data"], bytes: data2 }]
+  };
+}
 
 // src/werift-rtc.ts
 import { createSocket } from "node:dgram";
@@ -26354,7 +26447,15 @@ var HarnessApiBridge = class {
   mux;
   host;
   answer;
+  /** Answer one ApiProxy call, sending bytes in the form DSH's own connection layer expects. */
   async call(input2) {
+    const response = await this.dispatchCall(input2);
+    const result = response.result;
+    if (result === void 0) return response;
+    const tagged = collectRpcAttachments(result);
+    return tagged === result ? response : { ...response, result: tagged };
+  }
+  async dispatchCall(input2) {
     const params = callSchema2.parse(input2);
     const signal = AbortSignal.timeout(NATIVE_CALL_TIMEOUT_MS);
     const method = this.methods.get(params.method);
@@ -27065,7 +27166,17 @@ var HarnessRemoteBridge = class {
   streams = /* @__PURE__ */ new Map();
   incomingTransfers = /* @__PURE__ */ new Map();
   outgoingTransfers = /* @__PURE__ */ new Map();
+  /**
+   * Answer one remote Gateway call.
+   *
+   * Bytes have to leave in DSH's own form: this result is JSON-encoded on its way to the client, and a
+   * \`Uint8Array\` would arrive there as \`{"0":…}\` and fail the generated schema (the image-preview
+   * failure). Tagging here, hydrating on the client, keeps one convention on both sides.
+   */
   async call(input2) {
+    return collectRpcAttachments(await this.dispatchCall(input2));
+  }
+  async dispatchCall(input2) {
     const params = callSchema3.parse(input2);
     this.assertAllowed(params.endpoint);
     if (TERMINAL_STREAMS.has(params.endpoint)) throw new RpcError("METHOD_NOT_ALLOWED", "Use a stream for this terminal endpoint.");
@@ -27285,7 +27396,7 @@ var HarnessRemoteBridge = class {
         await this.publish("harness.remote.frame", {
           streamId,
           hasValue: true,
-          ...value === void 0 ? {} : { value }
+          ...value === void 0 ? {} : { value: collectRpcAttachments(value) }
         });
       }
       if (signal.aborted) reason = "cancelled";