codehost 0.11.1 → 0.13.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.13.0](https://github.com/snomiao/codehost/compare/v0.12.0...v0.13.0) (2026-06-09)
+
+
+### Features
+
+* **web:** host-scoped folder deep links — /host/<hostname>/<path> ([f6955ab](https://github.com/snomiao/codehost/commit/f6955ab37517f312ee780795efc503cb74ccdc36))
+
+# [0.12.0](https://github.com/snomiao/codehost/compare/v0.11.1...v0.12.0) (2026-06-09)
+
+
+### Features
+
+* **web:** URL-driven reconnect — Forward rehydrates, auto-reconnect on drop ([8e1f186](https://github.com/snomiao/codehost/commit/8e1f186bd6611d5d56a9061fed23ed7316c735ca))
+
 ## [0.11.1](https://github.com/snomiao/codehost/compare/v0.11.0...v0.11.1) (2026-06-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehost",
-  "version": "0.11.1",
+  "version": "0.13.0",
   "type": "module",
   "repository": {
     "type": "git",

package/src/cli/commands/dev.ts

@@ -23,7 +23,7 @@ interface DevArgs {
 export const devCommand: CommandModule<{}, DevArgs> = {
   command: "dev [dir]",
   describe:
-    "Serve a single folder over WebRTC; open it at codehost.dev/dev/<path> (or /gh/<owner>/<repo>, /git/<host>/<owner>/<repo> for a git repo)",
+    "Serve a single folder over WebRTC; open it at codehost.dev/host/<hostname>/<path> (or /gh/<owner>/<repo>, /git/<host>/<owner>/<repo> for a git repo)",
   builder: (y) =>
     y
       .positional("dir", {

package/src/shared/repo.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { parseDeepLink, pickRoomMatch, repoKey, shareableDeepLink, toPosixPath } from "./repo";
+import { parseDeepLink, pickRoomMatch, repoKey, resolveDevTarget, shareableDeepLink, toPosixPath } from "./repo";
+import type { PeerInfo } from "./signaling";
 import { parseGitRemote } from "../cli/git";
 
 describe("toPosixPath", () => {
@@ -109,12 +110,60 @@ describe("parseDeepLink + repoKey round-trip", () => {
     expect(dl?.type === "dev" && dl.target.path).toBe("/C:/ws");
   });
 
+  test("/host/<hostname>/<path> -> host-scoped dev target", () => {
+    const dl = parseDeepLink("/host/Mac/Users/taku");
+    expect(dl?.type === "dev" && dl.target.host).toBe("Mac");
+    expect(dl?.type === "dev" && dl.target.path).toBe("/Users/taku");
+  });
+
+  test("/host/<hostname>/<Windows drive path> round-trips", () => {
+    const path = shareableDeepLink({ folder: "/C:/ws", host: "EC2AMAZ-PH8C4K1" })!;
+    expect(path).toBe("/host/EC2AMAZ-PH8C4K1/C:/ws");
+    const dl = parseDeepLink(path);
+    expect(dl?.type === "dev" && dl.target.host).toBe("EC2AMAZ-PH8C4K1");
+    expect(dl?.type === "dev" && dl.target.path).toBe("/C:/ws");
+  });
+
+  test("legacy /dev/<path> still parses host-agnostic (no host)", () => {
+    const dl = parseDeepLink("/dev/C:/ws");
+    expect(dl?.type === "dev" && dl.target.host).toBeUndefined();
+    expect(dl?.type === "dev" && dl.target.path).toBe("/C:/ws");
+  });
+
   test("non-deep-link -> null", () => {
     expect(parseDeepLink("/")).toBeNull();
     expect(parseDeepLink("/settings")).toBeNull();
   });
 });
 
+describe("resolveDevTarget host scoping", () => {
+  const mk = (peerId: string, host: string, cwd: string): PeerInfo => ({
+    peerId,
+    role: "server",
+    meta: { name: host, host, cwd },
+  });
+  // Same served path on two different machines — the ambiguity host scoping fixes.
+  const servers = [mk("pA", "boxA", "/C:/ws"), mk("pB", "boxB", "/C:/ws")];
+
+  test("host-scoped target picks the matching host", () => {
+    expect(resolveDevTarget(servers, { host: "boxB", path: "/C:/ws" })?.peerId).toBe("pB");
+    expect(resolveDevTarget(servers, { host: "boxA", path: "/C:/ws" })?.peerId).toBe("pA");
+  });
+
+  test("host-scoped target with no matching host -> null (won't cross machines)", () => {
+    expect(resolveDevTarget(servers, { host: "boxC", path: "/C:/ws" })).toBeNull();
+  });
+
+  test("legacy host-agnostic target matches by path alone", () => {
+    expect(resolveDevTarget(servers, { path: "/C:/ws" })?.peerId).toBe("pA");
+  });
+
+  test("leading/trailing slash differences still match (e.g. expose cwd)", () => {
+    const ex = [mk("pE", "boxE", "localhost:8090")];
+    expect(resolveDevTarget(ex, { host: "boxE", path: "/localhost:8090" })?.peerId).toBe("pE");
+  });
+});
+
 describe("shareableDeepLink", () => {
   test("GitHub repo -> /gh sugar", () => {
     expect(shareableDeepLink({ repo: "github.com/snomiao/codehost", branch: "main" })).toBe(

package/src/shared/repo.ts

@@ -17,8 +17,12 @@ export interface RepoTarget {
   branch?: string;
 }
 
-/** A direct folder mount address: `/dev/<absolute-fs-path>`. */
+/** A direct folder mount address: host-scoped `/host/<hostname>/<path>`, or the
+ *  legacy host-agnostic `/dev/<path>` (a bare path collides across machines, so
+ *  new links carry the host). */
 export interface DevTarget {
+  /** Hostname the workspace lives on; undefined for a legacy host-agnostic link. */
+  host?: string;
   path: string;
 }
 
@@ -31,7 +35,8 @@ export type DeepLink =
  * Parse a deep-link pathname:
  *   /gh/<owner>/<repo>(/tree/<branch>)            -> GitHub repo target
  *   /git/<host>/<owner>/<repo>(/tree/<branch>)    -> any-host repo target
- *   /dev/<fs-path>                                -> direct folder mount
+ *   /host/<hostname>/<fs-path>                    -> host-scoped folder mount
+ *   /dev/<fs-path>                                -> legacy host-agnostic folder mount
  * Branch may contain slashes. Anything else -> null (normal app).
  */
 export function parseDeepLink(pathname: string): DeepLink {
@@ -50,6 +55,13 @@ export function parseDeepLink(pathname: string): DeepLink {
       target: { host: git[1].toLowerCase(), owner: git[2], name: git[3], branch: git[4] },
     };
   }
+  // Host-scoped folder mount: first segment is the hostname, the rest is the
+  // served path (which itself may contain slashes and a Windows drive colon).
+  const host = clean.match(/^\/host\/([^/]+)\/(.+)$/);
+  if (host) {
+    return { type: "dev", target: { host: host[1], path: `/${host[2].replace(/^\/+/, "")}` } };
+  }
+  // Legacy host-agnostic folder mount.
   const dev = clean.match(/^\/dev\/(.+)$/);
   if (dev) {
     return { type: "dev", target: { path: `/${dev[1].replace(/^\/+/, "")}` } };
@@ -96,11 +108,17 @@ export function fillLayout(layout: string, t: RepoTarget): string {
  * Shareable deep-link pathname for a connected workspace. A git-identified
  * server renders `/gh/<owner>/<repo>` for GitHub or `/git/<host>/<owner>/<repo>`
  * for any other host (with `/tree/<branch>` when known); a non-git workspace is
- * addressed by its opened folder as a `/dev/<path>` mount. Round-trips through
+ * addressed by its opened folder, scoped to its hostname as `/host/<host>/<path>`
+ * (or the legacy `/dev/<path>` when no host is known). Round-trips through
  * parseDeepLink + resolve{Repo,Dev}Target so another room member opening it
  * lands here. Returns null when there's nothing addressable.
  */
-export function shareableDeepLink(opts: { repo?: string; branch?: string; folder?: string }): string | null {
+export function shareableDeepLink(opts: {
+  repo?: string;
+  branch?: string;
+  folder?: string;
+  host?: string;
+}): string | null {
   if (opts.repo) {
     const [host, owner, name] = opts.repo.split("/");
     if (host && owner && name) {
@@ -108,7 +126,10 @@ export function shareableDeepLink(opts: { repo?: string; branch?: string; folder
       return opts.branch ? `${base}/tree/${opts.branch}` : base;
     }
   }
-  if (opts.folder) return `/dev/${opts.folder.replace(/^\/+/, "")}`;
+  if (opts.folder) {
+    const path = opts.folder.replace(/^\/+/, "");
+    return opts.host ? `/host/${opts.host}/${path}` : `/dev/${path}`;
+  }
   return null;
 }
 
@@ -138,10 +159,16 @@ export function resolveRepoTarget(servers: PeerInfo[], target: RepoTarget): Reso
   return null;
 }
 
-/** Pick a `dev`/repo server whose served cwd matches a /dev/<path> target. */
+/** Pick a folder-mount server whose served cwd matches the target path, scoped
+ *  to `target.host` when the link carries one (a bare path is ambiguous across
+ *  machines). Compares with leading + trailing slashes stripped: `parseDeepLink`
+ *  forces a leading "/" on the path, but a served cwd may lack one (e.g. an
+ *  `expose` server's `localhost:<port>`), so a trailing-only trim never matches. */
 export function resolveDevTarget(servers: PeerInfo[], target: DevTarget): Resolution | null {
-  const want = trimSlash(target.path);
-  const hit = servers.find((s) => s.meta && trimSlash(s.meta.cwd) === want);
+  const want = stripEnds(target.path);
+  const hit = servers.find(
+    (s) => s.meta && stripEnds(s.meta.cwd) === want && (!target.host || s.meta.host === target.host),
+  );
   return hit ? { peerId: hit.peerId } : null;
 }
 
@@ -172,3 +199,9 @@ function branchOk(meta: PeerMeta, target: RepoTarget): boolean {
 function trimSlash(p: string): string {
   return p.replace(/\/+$/, "");
 }
+
+/** Strip leading and trailing slashes — for comparing a `/dev/<path>` target to
+ *  a served cwd that may or may not carry a leading slash. */
+function stripEnds(p: string): string {
+  return p.replace(/^\/+|\/+$/g, "");
+}

package/src/web/discovery.tsx

@@ -46,7 +46,8 @@ function tokenFromHash(): string {
 /** Short label for the "looking for…" state from a deep link. */
 function deepLinkLabel(dl: DeepLink): string | null {
   if (!dl) return null;
-  return dl.type === "repo" ? `${dl.target.owner}/${dl.target.name}` : dl.target.path;
+  if (dl.type === "repo") return `${dl.target.owner}/${dl.target.name}`;
+  return dl.target.host ? `${dl.target.host}:${dl.target.path}` : dl.target.path;
 }
 
 function folderQuery(folder?: string): string {
@@ -177,10 +178,19 @@ export function Discovery() {
   const activeRoomRef = useRef<string | null>(null);
   const sendersRef = useRef<Map<string, (to: string, data: unknown) => void>>(new Map());
   // Whether the live connection pushed a history entry (so Disconnect/Back can
-  // pop it), and whether we're currently *viewing* a workspace (so popstate only
-  // tears down from the iframe view, not during a mid-connect URL revert).
+  // pop it back to the list).
   const pushedRef = useRef(false);
-  const viewingRef = useRef(false);
+  // A dial is in flight — a synchronous guard so the several reconnect triggers
+  // (popstate, server-list change, retry timer, deep-link auto-connect) never
+  // double-dial (connState updates a render too late to gate them).
+  const dialingRef = useRef(false);
+  // Set just before a failed-dial history.back() so the resulting popstate is
+  // treated as a URL revert, not a user navigation — the reconciler skips it once.
+  const revertingRef = useRef(false);
+  // Latest merged server list + connection state, read by the URL reconciler
+  // (invoked from the once-at-mount popstate handler) without a stale closure.
+  const allServersRef = useRef<RoomedServer[]>([]);
+  const connStateRef = useRef<ConnState>("idle");
 
   // Deep-link resolution (/gh/<owner>/<repo>/... or /dev/<path>): parse once,
   // auto-connect when a matching server appears, remember the opened folder.
@@ -218,11 +228,16 @@ export function Discovery() {
       const folder = activeFolderRef.current;
       setTimeout(() => setIframeSrc(`/vs/${peerId}/${folderQuery(folder)}`), 400);
     });
-    // Back / Cmd+Left from a workspace returns to the list: the browser restores
-    // the previous URL and we drop the connection. Only when actually viewing —
-    // a mid-connect URL revert (failed dial) must leave the list state untouched.
+    // Back/Forward (Cmd+Left / Cmd+Right) reconcile the connection to the URL: a
+    // workspace deep link (re)connects to its server, the list URL drops the
+    // connection. The browser already changed the URL; we follow it. A failed
+    // dial's revert-back is skipped once (revertingRef) so it keeps the list.
     const onPopState = () => {
-      if (viewingRef.current) teardownConn();
+      if (revertingRef.current) {
+        revertingRef.current = false;
+        return;
+      }
+      syncToUrl();
     };
     window.addEventListener("popstate", onPopState);
     // A valid token in the URL fragment (#t=<token>) joins the room and turns on
@@ -265,6 +280,23 @@ export function Discovery() {
     tryAutoConnect();
   }, [serversByRoom, tokens]);
 
+  // Keep the connection in sync with the URL as servers come and go: reconnect
+  // when the workspace named by the address bar (re)appears in a room — covers a
+  // daemon restart or a dropped channel while the tab stays open.
+  useEffect(() => {
+    syncToUrl();
+  }, [serversByRoom]);
+
+  // Safety-net retry: while the URL names a workspace we're not connected to and
+  // no dial is in flight, retry every few seconds — covers a dropped channel
+  // whose server never left the room (so no list change fires the effect above).
+  useEffect(() => {
+    if (!parseDeepLink(window.location.pathname)) return;
+    if (connState === "connected" || connState === "connecting") return;
+    const id = setInterval(() => syncToUrl(), 5000);
+    return () => clearInterval(id);
+  }, [connState, serversByRoom]);
+
   function joinFromInput(e: React.FormEvent) {
     e.preventDefault();
     const t = draft.trim();
@@ -295,59 +327,70 @@ export function Discovery() {
     sendersRef.current.delete(t);
   }
 
-  async function connectTo(server: PeerInfo, room: string, folder?: string) {
+  async function connectTo(server: PeerInfo, room: string, folder?: string, fromHistory = false) {
     const send = sendersRef.current.get(room);
     if (!send) return;
+    dialingRef.current = true; // synchronous gate against concurrent triggers
+    let didPush = false;
+    try {
+      // Clear any prior connection's broker state first: after an RTC drop the
+      // broker still holds the dead channel in `locals`, so re-dialing the same
+      // peer would otherwise resolve straight to it. Also covers switching peers.
+      if (activePeerRef.current) connBroker.disconnect(activePeerRef.current);
 
-    rtcRef.current?.close();
-    rtcRef.current = null;
-    setIframeSrc(null);
-    setActivePeerId(server.peerId);
-    activePeerRef.current = server.peerId;
-    activeRoomRef.current = room;
-    viewingRef.current = false;
-    setConnState("connecting");
-
-    // Update the address bar the instant Connect is clicked (don't wait for the
-    // WebRTC handshake) and push a history entry, so Back / Cmd+Left returns to
-    // the list. Reverted if the connection fails.
-    const openFolder = folder ?? server.meta?.cwd;
-    const targetPath = shareablePathFor(server, openFolder);
-    const pushed = !!targetPath && targetPath !== window.location.pathname;
-    if (pushed) history.pushState(null, "", targetPath);
-    pushedRef.current = pushed;
-    sharePathRef.current = targetPath ?? window.location.pathname;
-
-    // The broker decides whether this tab owns the connection. `establish` is
-    // only invoked when we're the owner (or get promoted on failover); other
-    // tabs reuse the owner's channel via a proxy, so they never open WebRTC.
-    const establish = () =>
-      new Promise<RTCDataChannel>((resolve, reject) => {
-        const rtc = new RtcClient({
-          sendSignal: (data: RtcSignal) => send(server.peerId, data),
-          onState: (state) => {
-            if (state === "failed" || state === "disconnected") setConnState("failed");
-          },
-          onOpen: (channel) => {
+      rtcRef.current?.close();
+      rtcRef.current = null;
+      setIframeSrc(null);
+      setActivePeerId(server.peerId);
+      activePeerRef.current = server.peerId;
+      activeRoomRef.current = room;
+      setConnState("connecting");
+
+      // Update the address bar the instant Connect is clicked (don't wait for the
+      // handshake) and push a history entry, so Back returns to the list and
+      // Forward returns here. When `fromHistory`, the browser already set the URL
+      // (back/forward/reconnect) — don't push again, but a prior entry exists.
+      const openFolder = folder ?? server.meta?.cwd;
+      if (fromHistory) {
+        pushedRef.current = true;
+        sharePathRef.current = window.location.pathname;
+      } else {
+        const targetPath = shareablePathFor(server, openFolder);
+        didPush = !!targetPath && targetPath !== window.location.pathname;
+        if (didPush) history.pushState(null, "", targetPath);
+        pushedRef.current = didPush;
+        sharePathRef.current = targetPath ?? window.location.pathname;
+      }
+
+      // The broker decides whether this tab owns the connection. `establish` is
+      // only invoked when we're the owner (or get promoted on failover); other
+      // tabs reuse the owner's channel via a proxy, so they never open WebRTC.
+      const establish = () =>
+        new Promise<RTCDataChannel>((resolve, reject) => {
+          const rtc = new RtcClient({
+            sendSignal: (data: RtcSignal) => send(server.peerId, data),
+            onState: (state) => {
+              if (state === "failed" || state === "disconnected") setConnState("failed");
+            },
+            onOpen: (channel) => {
+              clearTimeout(timer);
+              resolve(channel);
+            },
+            onClose: () => setConnState((s) => (s === "connected" ? "idle" : s)),
+          });
+          rtcRef.current = rtc;
+          // Don't hang forever dialing a peer that never answers (e.g. a stale
+          // server still listed in the room): fail the attempt after 15s.
+          const timer = setTimeout(() => {
+            rtc.close();
+            reject(new Error("connection timed out"));
+          }, 15000);
+          rtc.start().catch((err) => {
             clearTimeout(timer);
-            resolve(channel);
-          },
-          onClose: () => setConnState((s) => (s === "connected" ? "idle" : s)),
-        });
-        rtcRef.current = rtc;
-        // Don't hang forever dialing a peer that never answers (e.g. a stale
-        // server still listed in the room): fail the attempt after 15s.
-        const timer = setTimeout(() => {
-          rtc.close();
-          reject(new Error("connection timed out"));
-        }, 15000);
-        rtc.start().catch((err) => {
-          clearTimeout(timer);
-          reject(err);
+            reject(err);
+          });
         });
-      });
 
-    try {
       await connBroker.connect(server.peerId, establish);
       setConnState("connected");
       // The daemon no longer sets a default folder (current VS Code serve-web
@@ -357,15 +400,16 @@ export function Discovery() {
       setIframeSrc(`/vs/${server.peerId}/${folderQuery(openFolder)}`);
       setResolving(null);
       recordConnect(server, room, openFolder);
-      viewingRef.current = true;
     } catch {
       setConnState("failed");
-      // Undo the optimistic history entry / URL change. We never started
-      // viewing, so the popstate handler leaves the "failed" card in place.
-      if (pushed) {
-        pushedRef.current = false;
+      // Undo the optimistic history entry we pushed. revertingRef makes the
+      // resulting popstate a no-op so the "failed" card stays on the list.
+      if (didPush) {
+        revertingRef.current = true;
         history.back();
       }
+    } finally {
+      dialingRef.current = false;
     }
   }
 
@@ -375,7 +419,12 @@ export function Discovery() {
   function shareablePathFor(server: PeerInfo, folder?: string): string | null {
     return deepLinkRef.current
       ? window.location.pathname
-      : shareableDeepLink({ repo: server.meta?.repo, branch: server.meta?.branch, folder });
+      : shareableDeepLink({
+          repo: server.meta?.repo,
+          branch: server.meta?.branch,
+          folder,
+          host: server.meta?.host,
+        });
   }
 
   async function shareLink() {
@@ -449,7 +498,33 @@ export function Discovery() {
     setConnState("idle");
     sharePathRef.current = null;
     pushedRef.current = false;
-    viewingRef.current = false;
+  }
+
+  // Resolve a workspace deep-link path to a live server across all joined rooms.
+  function findServerForDeepLink(dl: DeepLink): (RoomedServer & { folder?: string }) | null {
+    if (!dl) return null;
+    const peers = allServersRef.current.map((x) => x.server);
+    const res = dl.type === "repo" ? resolveRepoTarget(peers, dl.target) : resolveDevTarget(peers, dl.target);
+    if (!res) return null;
+    const match = allServersRef.current.find((x) => x.server.peerId === res.peerId);
+    return match ? { ...match, folder: res.folder } : null;
+  }
+
+  // Reconcile the live connection to the current URL. Drives Back/Forward nav and
+  // auto-reconnect: a workspace deep link connects to (or reconnects to) the
+  // server it resolves to; the list URL ("/") drops the connection. Reads only
+  // refs/window, so it's safe to call from the once-at-mount popstate handler.
+  function syncToUrl() {
+    const dl = parseDeepLink(window.location.pathname);
+    if (!dl) {
+      if (activePeerRef.current) teardownConn();
+      return;
+    }
+    if (dialingRef.current) return; // a dial is already in flight
+    const target = findServerForDeepLink(dl);
+    if (!target) return; // its server isn't present (yet) — wait for it to appear
+    if (activePeerRef.current === target.server.peerId && connStateRef.current === "connected") return;
+    void connectTo(target.server, target.room, target.folder, true);
   }
 
   function disconnect() {
@@ -468,6 +543,10 @@ export function Discovery() {
   const allServers: RoomedServer[] = tokens.flatMap((t) =>
     (serversByRoom[t] ?? []).map((server) => ({ server, room: t })),
   );
+  // Mirror the latest merged servers + connection state into refs so the URL
+  // reconciler (called from event handlers/timers) never reads a stale closure.
+  allServersRef.current = allServers;
+  connStateRef.current = connState;
   const serverCount = allServers.length;
   const onlineRooms = tokens.filter((t) => roomOpen[t]).length;
   const activeServer = allServers.find((x) => x.server.peerId === activePeerId)?.server;