dsh-remote-local-plugin 0.8.0 → 0.8.2

package/lib/index.js

@@ -1,4 +1,4 @@
-/* dsh-remote-local-plugin@0.8.0 — bundled host entry */
+/* dsh-remote-local-plugin@0.8.2 — bundled host entry */
 
 // src/index.ts
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
@@ -23,6 +23,8 @@ var Config = z.object({
   remoteDshVersion: z.string().default("0.2.1-rc.2"),
   remotePnpmVersion: z.string().default("11.21.0"),
   remoteNodeVersion: z.string().default("22.19.0"),
+  remoteInstallProxy: z.string().default(""),
+  remoteInstallNoProxy: z.string().default("127.0.0.1,localhost"),
   autoInstallNode: z.boolean().default(true),
   remoteStart: z.string().default("systemd"),
   provisionTimeoutMs: z.number().min(6e4).max(18e5).default(6e5),
@@ -80,6 +82,8 @@ function resolveConfig(config = {}, env = process.env) {
     remoteDshVersion: config.remoteDshVersion ?? "0.2.1-rc.2",
     remotePnpmVersion: config.remotePnpmVersion ?? "11.21.0",
     remoteNodeVersion: config.remoteNodeVersion ?? "22.19.0",
+    remoteInstallProxy: config.remoteInstallProxy ?? "",
+    remoteInstallNoProxy: config.remoteInstallNoProxy ?? "127.0.0.1,localhost",
     autoInstallNode: config.autoInstallNode ?? true,
     remoteStart,
     provisionTimeoutMs: config.provisionTimeoutMs ?? 6e5,
@@ -2793,11 +2797,32 @@ AUTO_INSTALL_NODE=${options.autoInstallNode ? "1" : "0"}
 AGENT_TARBALL=${shellLiteral(options.agentTarball)}
 MODEL_BASE_URL=${options.modelBaseUrl === void 0 ? "''" : shellLiteral(options.modelBaseUrl)}
 MODEL_API_KEY=${options.modelApiKey === void 0 ? "''" : shellLiteral(options.modelApiKey)}
+PROXY_URL=${options.proxyUrl === void 0 ? "''" : shellLiteral(options.proxyUrl)}
+PROXY_NO_PROXY=${options.noProxy === void 0 ? "''" : shellLiteral(options.noProxy)}
 STATE_FILE="$DSH_HOME/remote-agent/agent.json"
 WAIT_FOR_STATE=${options.start === "none" ? 0 : 1}
 
 export DSH_HOME
 mkdir -p "$INSTALL_DIR" "$DSH_HOME/remote-agent"
+echo "dsh-remote: preparing remote install"
+if [ -z "$PROXY_URL" ]; then
+  # Reuse a proxy already configured in the remote login environment.
+  PROXY_URL="$(bash -lc 'printf "%s" "\${HTTPS_PROXY:-\${HTTP_PROXY:-}}"' 2>/dev/null | tail -n 1 || true)"
+fi
+if [ -z "$PROXY_URL" ]; then
+  # Some clusters configure the proxy in .bashrc, which login shells skip.
+  PROXY_URL="$(bash -ic 'printf "%s" "\${HTTPS_PROXY:-\${HTTP_PROXY:-}}"' 2>/dev/null | tail -n 1 || true)"
+fi
+if [ -n "$PROXY_URL" ]; then
+  export HTTP_PROXY="$PROXY_URL" http_proxy="$PROXY_URL"
+  export HTTPS_PROXY="$PROXY_URL" https_proxy="$PROXY_URL"
+  export ALL_PROXY="$PROXY_URL" all_proxy="$PROXY_URL"
+  export npm_config_proxy="$PROXY_URL" npm_config_https_proxy="$PROXY_URL"
+  if [ -n "$PROXY_NO_PROXY" ]; then
+    export NO_PROXY="$PROXY_NO_PROXY" no_proxy="$PROXY_NO_PROXY"
+  fi
+  echo "dsh-remote: install proxy configured"
+fi
 
 ${nodePathPrelude()}
 
@@ -2819,6 +2844,7 @@ if ! command -v npm >/dev/null 2>&1; then
   echo "dsh-remote: npm is required; install a Node.js distribution that includes npm" >&2
   exit 23
 fi
+echo "dsh-remote: node ready"
 
 export PATH="$INSTALL_DIR/node_modules/.bin:$PATH"
 if ! command -v pnpm >/dev/null 2>&1; then
@@ -2839,9 +2865,11 @@ fi
 echo "dsh-remote: adding plugin to profile $PROFILE"
 "$DSH_BIN" plugin --profile "$PROFILE" add "$AGENT_TARBALL"
 
+echo "dsh-remote: starting dsh web"
 ${startBlock}
 
 if [ "$WAIT_FOR_STATE" -eq 1 ]; then
+  echo "dsh-remote: waiting for agent state"
   i=0
   while [ "$i" -lt 60 ]; do
     if [ -s "$STATE_FILE" ]; then break; fi
@@ -2853,6 +2881,7 @@ fi
 echo "dsh-remote: installed"
 echo "dsh-remote: state file $STATE_FILE"
 if [ "$WAIT_FOR_STATE" -eq 1 ] && [ -s "$STATE_FILE" ]; then
+  echo "dsh-remote: agent ready"
   PORT_VALUE=$(sed -n 's/.*"port": *\\([0-9][0-9]*\\).*/\\1/p' "$STATE_FILE" | head -1)
   echo "dsh-remote: remote agent port \${PORT_VALUE:-unknown}"
 else
@@ -2875,6 +2904,7 @@ cat > "$UNIT_DIR/dsh-remote-agent.service" <<DSH_REMOTE_UNIT
 ${unit}DSH_REMOTE_UNIT
 chmod 600 "$UNIT_DIR/dsh-remote-agent.service"
 
+echo "dsh-remote: restarting systemd user unit"
 if command -v systemctl >/dev/null 2>&1 && systemctl --user daemon-reload >/dev/null 2>&1; then
   if systemctl --user enable dsh-remote-agent.service >/dev/null 2>&1     && systemctl --user restart dsh-remote-agent.service; then
     echo "dsh-remote: restarted systemd user unit dsh-remote-agent.service"
@@ -2892,6 +2922,7 @@ function renderNohup(options) {
   return `if [ -f "$DSH_HOME/remote-agent/web.pid" ]; then
   kill "$(cat "$DSH_HOME/remote-agent/web.pid")" 2>/dev/null || true
 fi
+echo "dsh-remote: starting dsh web under nohup"
 ${modelEnv}nohup "$DSH_BIN" web --host 127.0.0.1 --port "$PORT" --no-open > "$DSH_HOME/remote-agent/web.log" 2>&1 &
 echo $! > "$DSH_HOME/remote-agent/web.pid"
 echo "dsh-remote: started dsh web under nohup (pid $(cat "$DSH_HOME/remote-agent/web.pid"))"`;
@@ -2987,7 +3018,7 @@ function runRemoteScript(target, script, options) {
       reject(new Error(`remote bootstrap timed out after ${options.timeoutMs}ms`));
     }, options.timeoutMs);
     timer.unref?.();
-    const append = (target2, chunk) => {
+    const append = (target2, stream, chunk) => {
       bytes += chunk.length;
       if (bytes > 4 * 1024 * 1024) {
         child.kill("SIGKILL");
@@ -2995,9 +3026,13 @@ function runRemoteScript(target, script, options) {
       }
       target2.push(chunk);
       if (options.verbose) process.stderr.write(chunk);
+      try {
+        options.onOutput?.(stream, chunk.toString("utf8"));
+      } catch {
+      }
     };
-    child.stdout.on("data", (chunk) => append(stdout, chunk));
-    child.stderr.on("data", (chunk) => append(stderr, chunk));
+    child.stdout.on("data", (chunk) => append(stdout, "stdout", chunk));
+    child.stderr.on("data", (chunk) => append(stderr, "stderr", chunk));
     child.stdin.on("error", (error) => {
       if (settled) return;
       settled = true;
@@ -3019,8 +3054,13 @@ function runRemoteScript(target, script, options) {
         stderr: Buffer.concat(stderr).toString("utf8"),
         code: code ?? (signal === null ? 1 : 137)
       };
-      if (result.code === 0) resolve4(result);
-      else reject(Object.assign(new Error(`remote bootstrap exited with ${String(result.code)}`), { result }));
+      if (result.code === 0) {
+        resolve4(result);
+        return;
+      }
+      const tail = result.stderr.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line !== "").slice(-2).join(" | ").slice(0, 500);
+      const message = `remote bootstrap exited with ${String(result.code)}${tail === "" ? "" : `: ${tail}`}`;
+      reject(Object.assign(new Error(message), { result }));
     });
     child.stdin.end(script);
   });
@@ -3031,7 +3071,9 @@ async function provisionRemoteAgent(options) {
   await access(options.agentTarballPath);
   const remoteTarball = `/tmp/dsh-remote-agent-${Date.now()}-${process.pid}.tgz`;
   const timeoutMs = Math.max(options.timeoutMs ?? 6e5, 6e5);
+  options.onProgress?.("dsh-remote: uploading agent package");
   await uploadFile2(options.agentTarballPath, remoteTarball, target, options);
+  options.onProgress?.("dsh-remote: agent package uploaded");
   const script = renderBootstrapScript({
     profile: options.profile,
     port: 0,
@@ -3044,13 +3086,38 @@ async function provisionRemoteAgent(options) {
     start: options.start,
     agentTarball: remoteTarball,
     ...options.modelBaseUrl === void 0 ? {} : { modelBaseUrl: options.modelBaseUrl },
-    ...options.modelApiKey === void 0 ? {} : { modelApiKey: options.modelApiKey }
+    ...options.modelApiKey === void 0 ? {} : { modelApiKey: options.modelApiKey },
+    ...options.proxyUrl === void 0 ? {} : { proxyUrl: options.proxyUrl },
+    ...options.noProxy === void 0 ? {} : { noProxy: options.noProxy }
   });
+  let stdoutBuffer = "";
+  let stderrBuffer = "";
+  const emitLines = (stream, chunk) => {
+    const key2 = stream === "stdout" ? "stdout" : "stderr";
+    let buffer = key2 === "stdout" ? stdoutBuffer : stderrBuffer;
+    buffer += chunk;
+    let newline = buffer.indexOf("\n");
+    while (newline >= 0) {
+      const line = buffer.slice(0, newline).trim();
+      buffer = buffer.slice(newline + 1);
+      if (line !== "") {
+        try {
+          options.onProgress?.(line);
+        } catch {
+        }
+      }
+      newline = buffer.indexOf("\n");
+    }
+    if (buffer.length > 8192) buffer = buffer.slice(-8192);
+    if (key2 === "stdout") stdoutBuffer = buffer;
+    else stderrBuffer = buffer;
+  };
   const result = await runRemoteScript(target, script, {
     binary: options.sshBinary,
     strictHostKeyChecking: options.strictHostKeyChecking,
     timeoutMs,
-    verbose: options.verbose ?? false
+    verbose: options.verbose ?? false,
+    onOutput: emitLines
   });
   return { stdout: result.stdout, stderr: result.stderr, remoteTarball };
 }
@@ -3181,7 +3248,9 @@ var RemoteProvisioner = class {
    */
   async ensureInstalled(target, options = {}) {
     const tarball = findAgentTarball();
-    options.onProgress?.("\u6B63\u5728\u8FDC\u7AEF\u5B89\u88C5 DSH \u4E0E dsh-remote-agent\uFF08\u9996\u6B21\u7EA6 1\u20133 \u5206\u949F\uFF09\u2026");
+    options.onProgress?.("\u6B63\u5728\u51C6\u5907\u8FDC\u7AEF\u5B89\u88C5\u73AF\u5883\u2026");
+    const proxyUrl = this.#config.remoteInstallProxy.trim() || void 0;
+    if (proxyUrl !== void 0) options.onProgress?.("\u6B63\u5728\u914D\u7F6E\u8FDC\u7AEF\u5B89\u88C5\u4EE3\u7406\u2026");
     try {
       await provisionRemoteAgent({
         target: target.canonical,
@@ -3199,7 +3268,15 @@ var RemoteProvisioner = class {
         timeoutMs: this.#config.provisionTimeoutMs,
         ...options.modelBaseUrl === void 0 ? {} : { modelBaseUrl: options.modelBaseUrl },
         ...options.modelApiKey === void 0 ? {} : { modelApiKey: options.modelApiKey },
-        verbose: false
+        verbose: false,
+        ...proxyUrl === void 0 ? {} : {
+          proxyUrl,
+          noProxy: this.#config.remoteInstallNoProxy
+        },
+        onProgress: (line) => {
+          const message = progressForLine(line);
+          if (message !== void 0) options.onProgress?.(message);
+        }
       });
     } catch (error) {
       const detail = error instanceof Error ? error.message : String(error);
@@ -3209,12 +3286,13 @@ var RemoteProvisioner = class {
         cause: error
       });
     }
-    options.onProgress?.("\u8FDC\u7AEF\u5B89\u88C5\u5B8C\u6210\uFF0C\u7B49\u5F85 DSH web \u542F\u52A8\u2026");
+    options.onProgress?.("\u8FDC\u7AEF\u5B89\u88C5\u5B8C\u6210\uFF0C\u6B63\u5728\u7B49\u5F85 DSH web \u542F\u52A8\u2026");
     await this.#waitForAgent(target, options.onProgress, options.signal);
   }
   async #waitForAgent(target, onProgress, signal) {
     const deadline = Date.now() + 12e4;
     let lastError;
+    onProgress?.("\u6B63\u5728\u7B49\u5F85\u8FDC\u7AEF agent \u72B6\u6001\u2026");
     while (Date.now() < deadline) {
       if (signal?.aborted === true) throw new LocalError("internal", "\u8FDC\u7AEF\u5B89\u88C5\u5DF2\u53D6\u6D88");
       try {
@@ -3224,10 +3302,13 @@ var RemoteProvisioner = class {
           strictHostKeyChecking: this.#config.strictHostKeyChecking,
           remoteStateFile: this.#config.remoteStateFile
         });
-        if (isAgentLive(discovered.state)) return;
+        if (isAgentLive(discovered.state)) {
+          onProgress?.("\u8FDC\u7AEF agent \u5DF2\u5C31\u7EEA\uFF0C\u6B63\u5728\u5EFA\u7ACB\u8FDE\u63A5\u2026");
+          return;
+        }
       } catch (error) {
         lastError = error;
-        onProgress?.("\u7B49\u5F85\u8FDC\u7AEF dsh web \u5C31\u7EEA\u2026");
+        onProgress?.("\u4ECD\u5728\u7B49\u5F85\u8FDC\u7AEF dsh web \u5C31\u7EEA\u2026");
       }
       await new Promise((resolve4) => setTimeout(resolve4, 2e3));
     }
@@ -3237,6 +3318,31 @@ var RemoteProvisioner = class {
     });
   }
 };
+var PROVISION_PROGRESS = [
+  ["uploading agent package", "\u6B63\u5728\u4E0A\u4F20\u8FDC\u7AEF agent \u5B89\u88C5\u5305\u2026"],
+  ["agent package uploaded", "\u5B89\u88C5\u5305\u4E0A\u4F20\u5B8C\u6210\uFF0C\u5F00\u59CB\u8FDC\u7AEF\u5B89\u88C5\u2026"],
+  ["preparing remote install", "\u6B63\u5728\u51C6\u5907\u8FDC\u7AEF\u5B89\u88C5\u73AF\u5883\u2026"],
+  ["install proxy configured", "\u5DF2\u914D\u7F6E\u8FDC\u7AEF\u5B89\u88C5\u4EE3\u7406\u2026"],
+  ["downloading node.js", "\u6B63\u5728\u4E0B\u8F7D Node.js\u2026"],
+  ["installed node.js", "Node.js \u5B89\u88C5\u5B8C\u6210\uFF0C\u7EE7\u7EED\u5B89\u88C5 pnpm/DSH\u2026"],
+  ["node ready", "Node.js \u5DF2\u5C31\u7EEA\uFF0C\u51C6\u5907\u5B89\u88C5 pnpm/DSH\u2026"],
+  ["installing pnpm@", "\u6B63\u5728\u5B89\u88C5 pnpm\u2026"],
+  ["installing @deepseek-ai/dsh@", "\u6B63\u5728\u5B89\u88C5\u8FDC\u7AEF DSH\uFF08\u4E0B\u8F7D\u4F9D\u8D56\u53EF\u80FD\u9700\u8981\u51E0\u5206\u949F\uFF09\u2026"],
+  ["adding plugin to profile", "\u6B63\u5728\u5B89\u88C5\u8FDC\u7AEF agent\u2026"],
+  ["restarting systemd user unit", "\u6B63\u5728\u542F\u52A8\u8FDC\u7AEF DSH Web \u670D\u52A1\u2026"],
+  ["starting dsh web under nohup", "\u6B63\u5728\u542F\u52A8\u8FDC\u7AEF DSH Web\u2026"],
+  ["starting dsh web", "\u6B63\u5728\u542F\u52A8\u8FDC\u7AEF DSH Web \u670D\u52A1\u2026"],
+  ["waiting for agent state", "\u6B63\u5728\u7B49\u5F85\u8FDC\u7AEF agent \u72B6\u6001\u6587\u4EF6\u2026"],
+  ["agent ready", "\u8FDC\u7AEF agent \u5DF2\u5C31\u7EEA\uFF0C\u6B63\u5728\u5EFA\u7ACB\u8FDE\u63A5\u2026"],
+  ["installed", "\u8FDC\u7AEF\u5B89\u88C5\u5B8C\u6210\u2026"]
+];
+function progressForLine(line) {
+  const normalized = line.toLowerCase();
+  for (const [needle, message] of PROVISION_PROGRESS) {
+    if (normalized.includes(needle)) return message;
+  }
+  return void 0;
+}
 function findAgentTarball() {
   const candidates = [
     new URL("../assets", import.meta.url),
@@ -3703,7 +3809,7 @@ var RemoteHostsService = class {
       phase: "installing",
       modelProxy: proxy !== void 0,
       modelDirect: direct !== void 0,
-      detail: "\u6B63\u5728\u91CD\u65B0\u5B89\u88C5\u8FDC\u7AEF agent\u2026"
+      detail: "\u6B63\u5728\u51C6\u5907\u8FDC\u7AEF\u5B89\u88C5\u73AF\u5883\u2026"
     });
     try {
       await this.#provisioner.ensureInstalled(target, {
@@ -3881,13 +3987,14 @@ var RemoteHostsService = class {
         this.#setRuntime(id, {
           ...this.#runtimeFor(id),
           phase: "installing",
-          detail: "\u6B63\u5728\u8FDC\u7AEF\u5B89\u88C5 DSH \u4E0E dsh-remote-agent\uFF0C\u9996\u6B21\u7EA6 1\u20133 \u5206\u949F\u2026"
+          detail: "\u6B63\u5728\u51C6\u5907\u8FDC\u7AEF\u5B89\u88C5\u73AF\u5883\u2026"
         });
         try {
           await this.#provisioner.ensureInstalled(target, {
             ...this.#modelEnvironment(proxy, proxyToken, direct),
             onProgress: (detail) => this.#setRuntime(id, { ...this.#runtimeFor(id), detail })
           });
+          this.#setRuntime(id, { ...this.#runtimeFor(id), detail: "\u6B63\u5728\u8BFB\u53D6\u8FDC\u7AEF agent \u72B6\u6001\u2026" });
           const discovery = await this.#discover(target);
           remotePort = discovery.state.port;
           token = discovery.state.token;
@@ -3924,6 +4031,7 @@ var RemoteHostsService = class {
       phase: "connecting",
       detail: "\u6B63\u5728\u5EFA\u7ACB SSH \u96A7\u9053\u5E76\u6821\u9A8C\u8FDC\u7AEF agent\u2026"
     });
+    this.#setRuntime(id, { ...this.#runtimeFor(id), phase: "connecting", detail: "\u6B63\u5728\u5EFA\u7ACB SSH \u96A7\u9053\u2026" });
     let tunnel;
     try {
       tunnel = await Tunnel.start({
@@ -3940,6 +4048,7 @@ var RemoteHostsService = class {
         token,
         hostId: id
       });
+      this.#setRuntime(id, { ...this.#runtimeFor(id), detail: "\u6B63\u5728\u6821\u9A8C\u8FDC\u7AEF agent\u2026" });
       const health = await client.health();
       if (await this.#reconcileModelEnvironment(id, target, health, proxy, proxyToken, direct, tunnel)) {
         return this.#doConnect(id);
@@ -3977,6 +4086,7 @@ var RemoteHostsService = class {
       return false;
     }
     this.#modelReconciled.add(id);
+    this.#setRuntime(id, { ...this.#runtimeFor(id), detail: "\u6B63\u5728\u540C\u6B65\u8FDC\u7AEF\u6A21\u578B\u73AF\u5883\u2026" });
     this.ctx.logger.warn(
       "dsh-remote: remote model environment for %s is %s, expected %s; reinstalling",
       id,

package/lib/types/config.d.ts

@@ -27,6 +27,10 @@ export interface Config {
     readonly remotePnpmVersion?: string;
     /** Node.js version installed into the remote install dir when none is usable. */
     readonly remoteNodeVersion?: string;
+    /** Optional HTTP(S) proxy for remote provisioning; empty means auto-detect. */
+    readonly remoteInstallProxy?: string;
+    /** Comma-separated proxy bypass list. */
+    readonly remoteInstallNoProxy?: string;
     /** Download Node.js into the remote install dir when it is missing or too old. */
     readonly autoInstallNode?: boolean;
     /** `systemd`, `nohup`, or `none`. */
@@ -71,6 +75,8 @@ export interface ResolvedConfig {
     readonly remoteDshVersion: string;
     readonly remotePnpmVersion: string;
     readonly remoteNodeVersion: string;
+    readonly remoteInstallProxy: string;
+    readonly remoteInstallNoProxy: string;
     readonly autoInstallNode: boolean;
     readonly remoteStart: RemoteStartMode;
     readonly provisionTimeoutMs: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-local-plugin",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "DSH remote-development local plugin: host registry, SSH tunnels, remote workspace/session discovery, an authenticated Connection RPC surface, agent tools, and a Settings page.",
   "keywords": [
     "dsh",

package/lib/types/rpc/contract.d.ts

@@ -1,114 +0,0 @@
-/**
- * RPC contract shared by the host handler and the browser Settings page.
- *
- * The channel rides DSH's authenticated Connection transport, so it works
- * through the web HTTP carrier and the desktop IPC carrier without a second
- * authentication scheme.
- *
- * @module dsh-remote-local/rpc/contract
- */
-import type { HostView } from '../hosts/types.ts';
-import type { HostInfo, RemoteSessionSummary, RemoteWorkspace, SessionSnapshot } from '@dsh-remote/protocol';
-/** Absolute Connection RPC channel. */
-export declare const RPC_CHANNEL = "/dsh-remote";
-/** Endpoint names. */
-export type RpcEndpoint = 'state' | 'target/validate' | 'host/add' | 'host/remove' | 'host/connect' | 'host/disconnect' | 'host/refresh' | 'host/workspaces' | 'host/sessions' | 'host/session' | 'host/web-url';
-/** Browser-safe state snapshot. */
-export interface RemoteHostsState {
-    readonly protocolVersion: number;
-    readonly hosts: readonly HostView[];
-}
-/** Result of parsing a destination. */
-export interface ValidatedTarget {
-    readonly canonical: string;
-    readonly host: string;
-    readonly user: string | null;
-    readonly port: number | null;
-}
-/** Result of listing workspaces. */
-export interface WorkspacesResult {
-    readonly workspaces: readonly RemoteWorkspace[];
-}
-/** Result of listing sessions. */
-export interface SessionsResult {
-    readonly sessions: readonly RemoteSessionSummary[];
-}
-/** Result of resolving the remote Web UI. */
-export interface WebUrlResult {
-    readonly url: string;
-}
-/** Success/failure result used by the Connection RPC handler. */
-export type RpcResult<T> = {
-    readonly ok: true;
-    readonly value: T;
-} | {
-    readonly ok: false;
-    readonly error: {
-        readonly code: string;
-        readonly message: string;
-        readonly details: Record<string, unknown>;
-    };
-};
-/** Payloads accepted by each endpoint. */
-export interface RpcPayloads {
-    state: undefined;
-    'target/validate': {
-        sshTarget: string;
-    };
-    'host/add': {
-        sshTarget: string;
-        label?: string;
-        token?: string;
-        remoteAgentPort?: number;
-        autoConnect?: boolean;
-    };
-    'host/remove': {
-        hostId: string;
-    };
-    'host/connect': {
-        hostId: string;
-    };
-    'host/disconnect': {
-        hostId: string;
-    };
-    'host/refresh': {
-        hostId: string;
-    };
-    'host/workspaces': {
-        hostId: string;
-    };
-    'host/sessions': {
-        hostId: string;
-        workspaceId?: string;
-    };
-    'host/session': {
-        hostId: string;
-        sessionId: string;
-        limit?: number;
-    };
-    'host/web-url': {
-        hostId: string;
-    };
-}
-/** Values returned by each endpoint. */
-export interface RpcValues {
-    state: RemoteHostsState;
-    'target/validate': ValidatedTarget;
-    'host/add': HostView;
-    'host/remove': {
-        removed: true;
-    };
-    'host/connect': HostView;
-    'host/disconnect': HostView;
-    'host/refresh': HostView;
-    'host/workspaces': WorkspacesResult;
-    'host/sessions': SessionsResult;
-    'host/session': SessionSnapshot;
-    'host/web-url': WebUrlResult;
-}
-/** Host capabilities advertised in the UI. */
-export declare const HOST_CAPABILITIES: readonly ["workspace.list", "session.list", "session.snapshot"];
-/** Informational type for the Settings page. */
-export interface HostSummary extends Pick<HostView, 'id' | 'label' | 'sshTarget' | 'phase'> {
-    readonly hostInfo: HostInfo | null;
-}

package/lib/types/rpc/handler.d.ts

@@ -1,12 +0,0 @@
-/**
- * Host-side RPC dispatch for the Settings page.
- *
- * @module dsh-remote-local/rpc/handler
- */
-import type { Context } from '@deepseek-ai/cordis';
-import type { RemoteHostsService } from '../service.ts';
-import { type RpcEndpoint, type RpcResult, type RpcValues } from './contract.ts';
-/** Register the channel; returns its asynchronous disposer. */
-export declare function registerHostRpc(ctx: Context, service: RemoteHostsService): () => Promise<void>;
-/** Narrow a result for callers that want a compiler-checked endpoint name. */
-export type HostRpcResult<K extends RpcEndpoint> = RpcResult<RpcValues[K]>;

package/node_modules/dsh-remote-terminal-controller/lib/client.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../src/client/index.tsx"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport type { Context } from '@deepseek-ai/cordis'\nimport { ClientTerminals } from '@deepseek-ai/dsh-api-terminal-controller/client'\n\nexport const inject = ['remote', 'remote.terminal', 'connection']\nconst ROUTE = '/api/dsh-remote-terminal'\n\ninterface Handle extends AsyncIterable<unknown> {\n  send(item: unknown): void\n  end(): void\n  dispose(): void\n}\n\nexport function apply(ctx: Context): void {\n  const original = (ctx.remote as any).terminal\n  const routed = route(original)\n  new ClientTerminals(ctx as any, routed)\n}\n\nfunction route(original: any): any {\n  const mirrored = new Map<string, Promise<boolean>>()\n  const isMirror = (sessionId: string): Promise<boolean> => {\n    let pending = mirrored.get(sessionId)\n    if (pending === undefined) {\n      pending = post({ action: 'context', sessionId })\n        .then(value => (value as { mirrored?: boolean } | undefined)?.mirrored === true)\n        .catch(() => false)\n      mirrored.set(sessionId, pending)\n    }\n    return pending\n  }\n  const unary = (name: string) => async (...args: any[]) => {\n    const sessionId = String(args[0])\n    if (!await isMirror(sessionId)) return original[name](...args)\n    const value = await post({ action: name, sessionId, ...payload(name, args) })\n    return value === undefined ? original[name](...args) : { ok: true, value }\n  }\n  return {\n    ...original,\n    environment: unary('environment'),\n    shells: unary('shells'),\n    list: unary('list'),\n    create: unary('create'),\n    rename: unary('rename'),\n    close: unary('close'),\n    retain: (sessionId: string, id: string, signal: AbortSignal) => {\n      const local = original.retain(sessionId, id, signal)\n      return (async function* () {\n        if (await isMirror(sessionId)) {\n          yield { type: 'retained' }\n          return\n        }\n        yield* local\n      })()\n    },\n    attach: (sessionId: string, id: string, signal: AbortSignal) => new RoutedHandle(original, sessionId, id, signal, isMirror),\n  }\n}\n\nfunction payload(name: string, args: any[]): Record<string, unknown> {\n  if (name === 'create') {\n    const request = args[1] ?? {}\n    return { id: request.id, cols: request.cols, rows: request.rows, shellPath: request.shellPath }\n  }\n  if (name === 'rename') return { id: args[1], title: args[2] }\n  if (name === 'close') return { id: args[1] }\n  return {}\n}\n\nasync function post(payload: Record<string, unknown>): Promise<any> {\n  const response = await fetch(ROUTE, {\n    method: 'POST',\n    credentials: 'same-origin',\n    headers: { 'content-type': 'application/json' },\n    body: JSON.stringify(payload),\n  })\n  if (!response.ok) return undefined\n  const body = await response.json() as { ok?: boolean; value?: unknown; mirrored?: boolean }\n  if (body.mirrored !== undefined) return body\n  return body.ok === true ? body.value : undefined\n}\n\nclass RoutedHandle implements Handle {\n  #original: any\n  #sessionId: string\n  #id: string\n  #signal: AbortSignal\n  #isMirror: (sessionId: string) => Promise<boolean>\n  #handle: Handle | undefined\n  #pending: unknown[] = []\n  #controller = new AbortController()\n  #opening: Promise<Handle> | undefined\n\n  constructor(original: any, sessionId: string, id: string, signal: AbortSignal, isMirror: (sessionId: string) => Promise<boolean>) {\n    this.#original = original\n    this.#sessionId = sessionId\n    this.#id = id\n    this.#signal = signal\n    this.#isMirror = isMirror\n    signal.addEventListener('abort', () => this.#controller.abort(), { once: true })\n  }\n\n  async *[Symbol.asyncIterator](): AsyncGenerator<unknown> {\n    const handle = await this.#open()\n    yield* handle\n  }\n\n  send(item: unknown): void {\n    if (this.#handle !== undefined) this.#handle.send(item)\n    else this.#pending.push(item)\n  }\n\n  end(): void { this.#handle?.end() }\n\n  dispose(): void {\n    this.#controller.abort()\n    this.#handle?.dispose()\n  }\n\n  async #open(): Promise<Handle> {\n    if (this.#handle !== undefined) return this.#handle\n    this.#opening ??= (async () => {\n      const remote = await this.#isMirror(this.#sessionId)\n      const handle: Handle = remote\n        ? remoteHandle(this.#sessionId, this.#id, this.#controller.signal)\n        : this.#original.attach(this.#sessionId, this.#id, this.#signal)\n      this.#handle = handle\n      for (const item of this.#pending.splice(0)) handle.send(item)\n      return handle\n    })()\n    return this.#opening\n  }\n}\n\nfunction remoteHandle(sessionId: string, id: string, signal: AbortSignal): Handle {\n  let controller = new AbortController()\n  const abort = (): void => controller.abort()\n  signal.addEventListener('abort', abort, { once: true })\n  return {\n    async *[Symbol.asyncIterator]() {\n      const response = await fetch(ROUTE, {\n        method: 'POST',\n        credentials: 'same-origin',\n        headers: { 'content-type': 'application/json', accept: 'text/event-stream' },\n        body: JSON.stringify({ action: 'attach', sessionId, id }),\n        signal: controller.signal,\n      })\n      if (!response.ok || response.body === null) throw new Error('remote terminal attach failed')\n      const reader = response.body.getReader()\n      const decoder = new TextDecoder()\n      let buffer = ''\n      try {\n        for (;;) {\n          const { done, value } = await reader.read()\n          buffer += decoder.decode(value, { stream: !done })\n          let newline = buffer.indexOf('\\n')\n          while (newline >= 0) {\n            const line = buffer.slice(0, newline).replace(/\\r$/u, '')\n            buffer = buffer.slice(newline + 1)\n            if (line.startsWith('data: ')) {\n              const parsed = JSON.parse(line.slice(6).trim())\n              if (parsed.message !== undefined && parsed.type === undefined) throw new Error(parsed.message)\n              yield parsed\n            }\n            newline = buffer.indexOf('\\n')\n          }\n          if (done) return\n        }\n      } finally {\n        reader.releaseLock()\n      }\n    },\n    send(item: unknown) {\n      const input = item as { type?: string; data?: string; cols?: number; rows?: number; sequence?: number }\n      void post(input.type === 'write'\n        ? { action: 'input', sessionId, id, data: input.data ?? '', sequence: input.sequence ?? 0 }\n        : { action: 'resize', sessionId, id, cols: input.cols ?? 80, rows: input.rows ?? 24, sequence: input.sequence ?? 0 })\n    },\n    end() {},\n    dispose() { controller.abort() },\n  }\n}\n"],
-  "mappings": "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",
-  "names": ["payload"]
-}