ds-harness-remote 0.4.26 → 0.4.27

package/dist/index.js

@@ -4646,22 +4646,22 @@ function headerPairs(headers) {
   return Object.entries(headers).flatMap(([name2, value]) => value === void 0 ? [] : (Array.isArray(value) ? value : [value]).map((item) => [name2, item]));
 }
 var LoopbackHost = class {
-  handles = /* @__PURE__ */ new Map();
-  ports;
-  closed = false;
-  timer;
-  constructor(ports) {
-    this.ports = [...ports];
+  constructor(getPorts, onClose) {
+    this.onClose = onClose;
+    this.ports = [...getPorts()];
     this.timer = setInterval(() => {
       for (const [id4, handle] of this.handles) if (Date.now() - handle.touched > 6e4) this.close(id4);
     }, 1e4);
     this.timer.unref();
   }
+  handles = /* @__PURE__ */ new Map();
+  ports;
+  closed = false;
+  timer;
   setPorts(ports) {
     this.ports = [...ports];
-  }
-  hasPorts() {
-    return this.ports.length > 0;
+    const allowed = new Set(ports);
+    for (const [id4, handle] of this.handles) if (!allowed.has(handle.port)) this.close(id4);
   }
   async call(input2) {
     if (this.closed) throw new RpcError("TRANSPORT_CLOSED", "Preview connection closed.");
@@ -4678,10 +4678,13 @@ var LoopbackHost = class {
       );
       if (this.handles.has(value.id)) throw new RpcError("REQUEST_CONFLICT", "Preview handle is already in use.");
       if (this.handles.size >= LOOPBACK_MAX_CONNECTIONS) throw new RpcError("RATE_LIMITED", "Too many active preview requests.");
+      let openedHandle;
       try {
-        return value.op === "http.open" ? await this.openHttp(value) : await this.openWs(value);
+        const opening = value.op === "http.open" ? this.openHttp(value) : this.openWs(value);
+        openedHandle = this.handles.get(value.id);
+        return await opening;
       } catch {
-        this.close(value.id);
+        this.close(value.id, openedHandle);
         throw new RpcError("LOOPBACK_UNAVAILABLE", "The allowed loopback service did not respond. Check that it is running on the Host.");
       }
     }
@@ -4712,6 +4715,7 @@ var LoopbackHost = class {
             response.once("close", ready);
             response.once("error", fail4);
           });
+          if (this.handles.get(value.id) !== handle) throw new Error("closed");
           chunk = response.read(Math.min(response.readableLength || LOOPBACK_CHUNK_BYTES, LOOPBACK_CHUNK_BYTES));
           if (chunk === null && response.readableLength > 0) chunk = response.read(Math.min(response.readableLength, LOOPBACK_CHUNK_BYTES));
         }
@@ -4719,10 +4723,10 @@ var LoopbackHost = class {
         if (done && !response.complete) throw new Error("truncated");
         handle.total += chunk?.length ?? 0;
         if (handle.total > 64 * 1024 * 1024) throw new Error("size");
-        if (done) this.close(value.id);
+        if (done) this.close(value.id, handle);
         return { data: chunk?.toString("base64") ?? "", done };
       } catch {
-        this.close(value.id);
+        this.close(value.id, handle);
         throw new RpcError("LOOPBACK_READ_FAILED", "Preview response ended or exceeded its limit; reload to retry.");
       } finally {
         handle.reading = false;
@@ -4762,7 +4766,7 @@ var LoopbackHost = class {
           }
           handle.bytes -= bytes;
           const closed = handle.closed && handle.messages.length === 0;
-          if (closed) this.close(value.id);
+          if (closed) this.close(value.id, handle);
           return { messages, closed };
         } finally {
           handle.reading = false;
@@ -4772,12 +4776,15 @@ var LoopbackHost = class {
     throw new RpcError("INVALID_MESSAGE", "Preview handle kind does not match the operation.");
   }
   closeAll() {
+    if (this.closed) return;
     this.closed = true;
     clearInterval(this.timer);
     for (const id4 of this.handles.keys()) this.close(id4);
+    this.onClose?.();
   }
-  close(id4) {
+  close(id4, expected) {
     const handle = this.handles.get(id4);
+    if (expected !== void 0 && handle !== expected) return;
     this.handles.delete(id4);
     if (handle?.kind === "http") {
       handle.response?.destroy();
@@ -4785,6 +4792,8 @@ var LoopbackHost = class {
     }
     if (handle?.kind === "ws") {
       handle.closed = true;
+      handle.messages = [];
+      handle.bytes = 0;
       handle.wake?.();
       handle.socket.terminate();
     }
@@ -4794,6 +4803,7 @@ var LoopbackHost = class {
     if ((body?.length ?? 0) > LOOPBACK_MAX_BODY_BYTES) throw new Error("body limit");
     return new Promise((resolve4, reject) => {
       const headers = Object.fromEntries(cleanHeaders(value.headers));
+      let handle;
       const request = httpRequest({
         hostname: "127.0.0.1",
         port: value.port,
@@ -4803,8 +4813,7 @@ var LoopbackHost = class {
         agent: false,
         maxHeaderSize: 32 * 1024
       }, (response) => {
-        const handle = this.handles.get(value.id);
-        if (handle?.kind !== "http") {
+        if (this.handles.get(value.id) !== handle) {
           response.destroy();
           return;
         }
@@ -4821,7 +4830,8 @@ var LoopbackHost = class {
         clearTimeout(timer);
         reject(new Error("upstream"));
       });
-      this.handles.set(value.id, { kind: "http", request, reading: false, total: 0, touched: Date.now() });
+      handle = { kind: "http", port: value.port, request, reading: false, total: 0, touched: Date.now() };
+      this.handles.set(value.id, handle);
       request.end(body);
     });
   }
@@ -4834,13 +4844,14 @@ var LoopbackHost = class {
         maxPayload: LOOPBACK_MAX_WS_BYTES,
         perMessageDeflate: false
       });
-      const handle = { kind: "ws", socket, messages: [], bytes: 0, reading: false, closed: false, touched: Date.now() };
+      const handle = { kind: "ws", port: value.port, socket, messages: [], bytes: 0, reading: false, closed: false, touched: Date.now() };
       this.handles.set(value.id, handle);
       socket.once("open", () => resolve4({ protocol: socket.protocol }));
       socket.on("message", (data2, binary) => {
+        if (handle.closed) return;
         const message = { data: Buffer.from(data2).toString("base64"), binary };
         if (handle.bytes + message.data.length > 1024 * 1024 || handle.messages.length >= 256) {
-          this.close(value.id);
+          this.close(value.id, handle);
           return;
         }
         handle.messages.push(message);
@@ -14745,7 +14756,7 @@ function uuidV7(now = Date.now()) {
 }
 
 // src/harness-version.ts
-import { readFile } from "node:fs/promises";
+import { readFile, realpath as realpathEntrypoint } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join } from "node:path";
 var LEGACY_PLACEHOLDER_VERSION = "0.0.1";
@@ -14780,7 +14791,13 @@ async function readHarnessManifestVersion(manifestPath) {
 }
 async function readHarnessDistributionVersion(entrypoint = process.argv[1]) {
   if (entrypoint === void 0 || !isAbsolute(entrypoint)) return void 0;
-  let directory = dirname(entrypoint);
+  let resolvedEntrypoint = entrypoint;
+  try {
+    resolvedEntrypoint = await realpathEntrypoint(entrypoint);
+  } catch {
+  }
+  if (!isAbsolute(resolvedEntrypoint)) return void 0;
+  let directory = dirname(resolvedEntrypoint);
   for (let depth = 0; depth < 8; depth += 1) {
     const version = await readHarnessManifestVersion(join(directory, "package.json"));
     if (version !== void 0) return version;
@@ -14789,7 +14806,7 @@ async function readHarnessDistributionVersion(entrypoint = process.argv[1]) {
     directory = parent;
   }
   try {
-    return await readHarnessManifestVersion(createRequire(entrypoint).resolve(`${HARNESS_PACKAGE_NAME}/package.json`));
+    return await readHarnessManifestVersion(createRequire(resolvedEntrypoint).resolve(`${HARNESS_PACKAGE_NAME}/package.json`));
   } catch {
     return void 0;
   }
@@ -18286,6 +18303,7 @@ var entryConfigSchema = s.object({
   serverUrl: s.string(),
   deviceName: s.string(),
   terminal: s.object({ enabled: s.boolean() }),
+  hostControl: s.object({ enabled: s.boolean() }),
   loopback: s.object({ ports: s.array(s.number()) }),
   forceRelay: s.boolean(),
   logLevel: s.union(["debug", "info", "warn", "error"]),
@@ -18322,6 +18340,7 @@ var configSchema = external_exports.object({
   serverUrl: external_exports.string().url().optional(),
   deviceName: external_exports.string().trim().min(1).max(80).optional(),
   terminal: external_exports.object({ enabled: external_exports.boolean().optional() }).strict().optional(),
+  hostControl: external_exports.object({ enabled: external_exports.boolean().optional() }).strict().optional(),
   loopback: external_exports.object({ ports: external_exports.array(external_exports.number().int().min(1024).max(65535)).max(16).optional() }).strict().optional(),
   forceRelay: external_exports.boolean().optional(),
   logLevel: external_exports.enum(["debug", "info", "warn", "error"]).optional(),
@@ -18347,7 +18366,8 @@ function resolveConfig(input2 = {}, env = process.env) {
     role: parsed.role ?? "host",
     ...serverUrl === void 0 ? {} : { serverUrl },
     deviceName: parsed.deviceName ?? hostname(),
-    terminal: { enabled: parsed.terminal?.enabled ?? env.DSH_REMOTE_TERMINAL_ENABLED === "true" },
+    hostControl: { enabled: parsed.hostControl?.enabled ?? true },
+    terminal: { enabled: parsed.terminal?.enabled ?? (env.DSH_REMOTE_TERMINAL_ENABLED === void 0 || env.DSH_REMOTE_TERMINAL_ENABLED === "true") },
     loopback: { ports: [...new Set(parsed.loopback?.ports ?? [])] },
     forceRelay: parsed.forceRelay ?? false,
     logLevel: parsed.logLevel ?? "info",
@@ -18387,7 +18407,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.4.26";
+var PLUGIN_VERSION = "0.4.27";
 
 // src/server-api.ts
 var TERMINAL_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/u;
@@ -18416,6 +18436,11 @@ var HostServerApi = class {
       ...this.credentials.account === void 0 ? {} : { account: this.credentials.account }
     };
   }
+  /** Check the persisted device credential without issuing or refreshing one. */
+  async hasStoredAuthorization() {
+    const identity = this.requireIdentity();
+    return await this.store.load(this.baseUrl, identity.deviceId) !== void 0;
+  }
   async clearAuthorization() {
     this.credentials = void 0;
     this.credentialsPromise = void 0;
@@ -20061,6 +20086,13 @@ var REMOTE_COMMAND_LIST_MIN_VERSION = [0, 3, 16];
 var REMOTE_FILE_VIEWER_MIN_VERSION = [0, 3, 17];
 var DIRECT_WEBRTC_NEGOTIATE_TIMEOUT_MS = 12e3;
 var DIRECT_LAN_PROGRESS_DISPLAY_MS = 1400;
+var HOST_AUTHORIZATION_ERRORS = /* @__PURE__ */ new Set([
+  "ACCOUNT_AUTH_REQUIRED",
+  "AUTH_INVALID",
+  "DEVICE_OWNERSHIP_REQUIRED",
+  "DEVICE_REVOKED",
+  "TOKEN_EXPIRED"
+]);
 var ClientModeRuntime = class {
   constructor(config, identities, server, apiProxy, typertGateway, logger, host, rtcFactoryProvider = loadNodeRtcFactory) {
     this.config = config;
@@ -20093,6 +20125,27 @@ var ClientModeRuntime = class {
       deviceId: shortId(this.identity.deviceId),
       fingerprint: this.identity.fingerprint
     });
+    if (this.config.hostControl?.enabled !== false && this.host !== void 0 && this.server.hasStoredAuthorization !== void 0) {
+      try {
+        if (await this.server.hasStoredAuthorization() && (this.host.hasStoredAuthorization === void 0 || !await this.host.hasStoredAuthorization())) {
+          await this.authorizeHostByDefault();
+        }
+      } catch (error) {
+        this.logger.warn("automatic Host authorization failed", { code: safeErrorCode(error) });
+      }
+    }
+  }
+  async authorizeHostByDefault() {
+    try {
+      if (this.host === void 0) return;
+      if (this.config.hostControl?.enabled === false) return;
+      if (this.host.hostStatus().authorized) return;
+      if (this.host.hasStoredAuthorization !== void 0 && await this.host.hasStoredAuthorization()) return;
+      const credentials = await this.server.authenticate(this.requireIdentity());
+      await this.host.authorizeHostAsOwned(credentials.accessToken, credentials.account);
+    } catch (error) {
+      this.logger.warn("automatic Host authorization failed", { code: safeErrorCode(error) });
+    }
   }
   registerControl(connection, webServer) {
     return registerControlRoute(connection, (endpoint, payload, signal) => this.handleControl(endpoint, payload, signal), webServer);
@@ -20152,6 +20205,7 @@ var ClientModeRuntime = class {
     };
   }
   async devices() {
+    this.assertHostAuthorizationForDeviceDiscovery();
     this.requireIdentity();
     const serverDevices = await this.server.listDevices();
     const remoteDevices = serverDevices.filter((device) => device.deviceId !== this.host?.hostStatus().deviceId);
@@ -20161,6 +20215,20 @@ var ClientModeRuntime = class {
       return { ...device, ...presence };
     }));
   }
+  /**
+   * Device discovery is exposed through the local app control route. When this
+   * installation also runs a Host, keep that route closed after the Host's
+   * Server credential has become terminally invalid. The Client credential can
+   * remain usable for a short time after a revoke, so checking only
+   * `ClientServerApi.listDevices()` would otherwise leak the device directory
+   * from a Host that the user has already been told to re-authorize.
+   */
+  assertHostAuthorizationForDeviceDiscovery() {
+    const status2 = this.host?.hostStatus();
+    if (status2 === void 0 || status2.error === void 0 || !HOST_AUTHORIZATION_ERRORS.has(status2.error)) return;
+    const message = status2.error === "DEVICE_REVOKED" ? "The local Host was revoked on the Server. Sign out and authorize this Host again." : "The local Host authorization is no longer valid. Sign out and authorize this Host again.";
+    throw new ClientModeError(status2.error, message);
+  }
   async authorizeClientWithAccount(email, password) {
     let authorization;
     try {
@@ -20171,6 +20239,7 @@ var ClientModeRuntime = class {
       this.server.bindIdentity(this.identity);
       authorization = await this.server.authorizeWithAccount(this.identity, email, password);
     }
+    await this.authorizeHostByDefault();
     this.logger.info("Client account authorized");
     return authorization;
   }
@@ -20185,6 +20254,7 @@ var ClientModeRuntime = class {
       return this.identity;
     });
     if (result.status === "complete") this.logger.info("Client account authorized with QR login");
+    if (result.status === "complete") await this.authorizeHostByDefault();
     return result;
   }
   async clearClientAuthorization() {
@@ -21518,6 +21588,16 @@ var PluginControlRuntime = class {
       if (endpoint === "settings.acp.add") return ok3(await this.addAcp(payload));
       if (endpoint === "settings.acp.remove") return ok3(await this.removeAcp(payload));
       if (endpoint === "settings.logout") return ok3(await this.logout());
+      if (endpoint === "host.authorization.set" && this.client !== void 0) {
+        const value = record5(payload);
+        if (typeof value.enabled !== "boolean") throw new ClientModeError("INVALID_MESSAGE", "Host authorization state is required.");
+        const status2 = await this.client.setHostAuthorization(value.enabled);
+        if (this.settings !== void 0) {
+          const current = resolveConfig(this.settings.get());
+          await this.settings.replace(editableConfig({ ...current, hostControl: { enabled: value.enabled } }));
+        }
+        return ok3(status2);
+      }
       if (endpoint === "host.reconnect") {
         if (this.host === void 0) throw new ClientModeError("METHOD_NOT_ALLOWED", "This plugin is not running as a Host.");
         this.host.reconnectHost();
@@ -21575,6 +21655,9 @@ var PluginControlRuntime = class {
       }
       authorization = await api.authorizeWithAccount(identity, value.email, value.password);
     }
+    if (value.role === "client" && resolveConfig(this.settings.get()).hostControl?.enabled !== false) {
+      await this.client?.authorizeHostByDefault();
+    }
     await this.settings.replace(editableConfig(next));
     return {
       status: "authorized",
@@ -21621,7 +21704,7 @@ var PluginControlRuntime = class {
     const current = editableConfig(resolveConfig(this.settings.get()));
     const next = resolveConfig({
       ...current,
-      terminal: { enabled: value.terminalEnabled === void 0 ? current.terminal?.enabled ?? false : value.terminalEnabled },
+      terminal: { enabled: value.terminalEnabled === void 0 ? current.terminal?.enabled ?? true : value.terminalEnabled },
       loopback: { ports: value.ports === void 0 ? current.loopback?.ports ?? [] : value.ports }
     });
     await this.settings.replace(editableConfig(next));
@@ -21769,6 +21852,7 @@ function editableConfig(config) {
     role: config.role,
     ...config.serverUrl === void 0 ? {} : { serverUrl: config.serverUrl },
     terminal: config.terminal,
+    hostControl: config.hostControl ?? { enabled: true },
     loopback: config.loopback,
     forceRelay: config.forceRelay,
     logLevel: config.logLevel,
@@ -22549,6 +22633,13 @@ var HostServerConnection = class {
         if (TERMINAL_AUTH_ERRORS.has(code)) {
           this.logger.warn(code === "CONNECTION_REPLACED" ? "Another instance is using this Host identity. Stop it or use a separate DSH_HOME; automatic reconnect is paused." : code === "SERVER_CREDENTIALS_BUSY" ? "Credential refresh is locked. Stop other instances; after a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again." : "Host authorization failed. Run /remote login or authorize this Host again in Remote settings.");
         }
+        if (code === "DEVICE_REVOKED") {
+          try {
+            await this.api.clearAuthorization();
+          } catch (clearError) {
+            this.logger.error("failed to clear revoked Host authorization", { code: errorCode2(clearError) });
+          }
+        }
         if (TERMINAL_AUTH_ERRORS.has(code) || !this.config.reconnect.enabled) return;
       }
       if (this.stopped) return;
@@ -24666,6 +24757,7 @@ function isRecord10(value) {
 
 // src/codex/domain.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
+import { accessSync, constants, existsSync as existsSync2, readFileSync } from "node:fs";
 import { readdir as readdir2, realpath, stat as stat4 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
 import { basename as basename3, isAbsolute as isAbsolute3, join as join5, relative, resolve as resolve2 } from "node:path";
@@ -26114,7 +26206,26 @@ var CodexRemoteDomain = class {
 };
 function codexBinaryCandidates(configured, hostPlatform = process.platform, userHome = homedir3()) {
   if (configured !== "codex" || hostPlatform !== "darwin") return [configured];
+  const bundledCandidates = [
+    "/Applications/ChatGPT.app",
+    join5(userHome, "Applications", "ChatGPT.app")
+  ].flatMap((chatGptApp) => {
+    const codexCli = join5(chatGptApp, "Contents", "Resources", "codex-cli");
+    try {
+      const manifest = JSON.parse(readFileSync(join5(codexCli, "codex-package.json"), "utf8"));
+      if (!isRecord13(manifest) || typeof manifest.entrypoint !== "string" || manifest.entrypoint.length === 0) {
+        return [];
+      }
+      const candidate = join5(codexCli, manifest.entrypoint);
+      if (!existsSync2(candidate)) return [];
+      accessSync(candidate, constants.X_OK);
+      return [candidate];
+    } catch {
+      return [];
+    }
+  });
   return [.../* @__PURE__ */ new Set([
+    ...bundledCandidates,
     "/Applications/ChatGPT.app/Contents/Resources/codex",
     join5(userHome, "Applications", "ChatGPT.app", "Contents", "Resources", "codex"),
     configured
@@ -26935,7 +27046,7 @@ var HostPluginRuntime = class {
     this.fileViewerHost = fileViewerHost;
     this.terminalSpawner = terminalSpawner;
     this.terminalEnabled = config.terminal.enabled;
-    this.loopback = new LoopbackHost(config.loopback.ports);
+    this.loopbackPorts = [...config.loopback.ports];
     this.codex = new CodexRemoteDomain(config.codex, logger);
     this.connections = new ConnectionController(this.identities, (context, send) => {
       const harnessApi = this.apiProxy === void 0 ? void 0 : new HarnessApiBridge(
@@ -26978,7 +27089,8 @@ var HostPluginRuntime = class {
         () => this.hostCapabilities(),
         codex,
         acp,
-        this.loopback
+        // Handles and their lifetime belong to this connection; only policy is shared.
+        this.createLoopbackHost()
       );
     }, this.logger);
     if (config.serverUrl !== void 0) {
@@ -26987,8 +27099,9 @@ var HostPluginRuntime = class {
   }
   connections;
   terminalOwners = /* @__PURE__ */ new Map();
+  loopbackHosts = /* @__PURE__ */ new Set();
   terminalEnabled;
-  loopback;
+  loopbackPorts;
   identity;
   serverApi;
   serverConnection;
@@ -27002,7 +27115,14 @@ var HostPluginRuntime = class {
     this.terminalEnabled = enabled;
   }
   setLoopbackPorts(ports) {
-    this.loopback.setPorts(ports);
+    this.loopbackPorts = [...ports];
+    for (const loopback of this.loopbackHosts) loopback.setPorts(this.loopbackPorts);
+  }
+  createLoopbackHost() {
+    let loopback;
+    loopback = new LoopbackHost(() => this.loopbackPorts, () => this.loopbackHosts.delete(loopback));
+    this.loopbackHosts.add(loopback);
+    return loopback;
   }
   async start() {
     if (this.closed) throw new Error("remote runtime is closed");
@@ -27045,6 +27165,9 @@ var HostPluginRuntime = class {
       connectedClients: this.listConnectedClients()
     };
   }
+  async hasStoredAuthorization() {
+    return this.serverApi?.hasStoredAuthorization() ?? false;
+  }
   listConnectedClients() {
     return this.connections.connectedPeers().map((peer) => {
       const trusted = this.identities.trustedPeer(peer.deviceId);
@@ -27228,7 +27351,7 @@ var HostPluginRuntime = class {
   }
   hostCapabilities() {
     const capabilities = [];
-    if (this.loopback.hasPorts()) capabilities.push("loopback.http-ws.v1");
+    if (this.loopbackPorts.length > 0) capabilities.push("loopback.http-ws.v1");
     if (this.localGateway?.supportsCarrier === true) {
       capabilities.push(
         harnessSessionGeneration(this.harnessVersion) === "v3" ? "harness.remote.v3" : "harness.remote.v1",