@elefunc/send 0.1.3 → 0.1.4

package/README.md

@@ -19,7 +19,7 @@ send
 send peers
 send offer ./file.txt
 send accept
-send tui --events
+send tui
 ```
 
 When no subcommand is provided, `send` launches the TUI by default.
@@ -28,7 +28,7 @@ When no subcommand is provided, `send` launches the TUI by default.
 
 `--room` is optional on all commands. If you omit it, `send` creates a random room and prints or shows it.
 
-In the TUI, the room row includes a `📋` invite link that opens the equivalent web app URL for the current committed room and toggle state. Set `SEND_WEB_URL` to change its base URL; it defaults to `https://send.rt.ht/`.
+In the TUI, the room row includes a `📋` invite link that opens the equivalent web app URL for the current committed room and toggle state.
 
 ## Self Identity
 
@@ -59,4 +59,4 @@ bun run typecheck
 bun test
 ```
 
-The package is Bun-native and keeps its runtime patches in `patches/`.
+The package is Bun-native and keeps its runtime patches in `runtime/`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elefunc/send",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Browser-compatible file transfer CLI and TUI powered by Bun, WebRTC, and Rezi.",
   "license": "MIT",
   "type": "module",
@@ -13,7 +13,7 @@
   },
   "files": [
     "src",
-    "patches",
+    "runtime",
     "README.md",
     "LICENSE",
     "package.json"
@@ -41,10 +41,6 @@
     "cac": "^7.0.0",
     "werift": "^0.22.9"
   },
-  "patchedDependencies": {
-    "@rezi-ui/core@0.1.0-alpha.60": "patches/@rezi-ui%2Fcore@0.1.0-alpha.60.patch",
-    "werift@0.22.9": "patches/werift@0.22.9.patch"
-  },
   "devDependencies": {
     "@types/node": "^24.5.2",
     "typescript": "^5.8.3"

package/runtime/install.ts

@@ -0,0 +1,22 @@
+import { ensureReziFilePatches } from "./rezi-files"
+import { ensureReziInputCaretPatch } from "./rezi-input-caret"
+
+let sessionInstallPromise: Promise<void> | null = null
+let tuiInstallPromise: Promise<void> | null = null
+
+export const ensureSessionRuntimePatches = () => {
+  if (sessionInstallPromise) return sessionInstallPromise
+  sessionInstallPromise = Promise.resolve()
+  return sessionInstallPromise
+}
+
+export const ensureTuiRuntimePatches = () => {
+  if (tuiInstallPromise) return tuiInstallPromise
+  tuiInstallPromise = (async () => {
+    await ensureReziFilePatches()
+    await ensureReziInputCaretPatch()
+  })()
+  return tuiInstallPromise
+}
+
+export const ensureRuntimeFilePatches = ensureTuiRuntimePatches

package/runtime/rezi-files.ts

@@ -0,0 +1,90 @@
+import { readFile, writeFile } from "node:fs/promises"
+
+type Replacement = readonly [before: string, after: string]
+type FilePatch = { relativeUrl: string; replacements: readonly Replacement[] }
+
+const REZI_FILE_PATCHES: readonly FilePatch[] = [
+  {
+    relativeUrl: "./layout/kinds/box.js",
+    replacements: [
+      [
+        'import { validateBoxProps } from "../validateProps.js";',
+        'import { validateBoxProps } from "../validateProps.js";\nconst OVERFLOW_CONTENT_LIMIT = 2147483647;',
+      ],
+      [
+        'const ch = clampNonNegative(outerHLimit - bt - bb - spacing.top - spacing.bottom);\n            // Children are laid out as a Column inside the content rect.',
+        'const ch = clampNonNegative(outerHLimit - bt - bb - spacing.top - spacing.bottom);\n            const flowMeasureH = propsRes.value.overflow === "scroll" ? OVERFLOW_CONTENT_LIMIT : ch;\n            // Children are laid out as a Column inside the content rect.',
+      ],
+      [
+        'const innerRes = measureNode(columnNode, cw, ch, "column");',
+        'const innerRes = measureNode(columnNode, cw, flowMeasureH, "column");',
+      ],
+      [
+        'const columnNode = getSyntheticColumn(vnode, propsRes.value.gap);\n                // The synthetic column wrapper must fill the box content rect so that\n                // percentage constraints resolve against the actual available space.\n                const innerRes = layoutNode(columnNode, cx, cy, cw, ch, "column", cw, ch);',
+        'const columnNode = getSyntheticColumn(vnode, propsRes.value.gap);\n                const flowMeasureH = propsRes.value.overflow === "scroll" ? OVERFLOW_CONTENT_LIMIT : ch;\n                const flowMeasureRes = measureNode(columnNode, cw, flowMeasureH, "column");\n                if (!flowMeasureRes.ok)\n                    return flowMeasureRes;\n                const flowLayoutH = propsRes.value.overflow === "scroll"\n                    ? Math.max(ch, flowMeasureRes.value.h)\n                    : ch;\n                // The synthetic column wrapper must fill the box content rect so that\n                // percentage constraints resolve against the actual available space.\n                const innerRes = layoutNode(columnNode, cx, cy, cw, flowLayoutH, "column", cw, flowLayoutH, flowMeasureRes.value);',
+      ],
+    ],
+  },
+  {
+    relativeUrl: "./app/widgetRenderer.js",
+    replacements: [
+      [
+        "    scrollOverrides = new Map();",
+        "    scrollOverrides = new Map();\n    hasPendingScrollOverride = false;",
+      ],
+      [
+        "            scrollOverrides: this.scrollOverrides,\n            findScrollableAncestors: (targetId) => this.findScrollableAncestors(targetId),",
+        '            scrollOverrides: this.scrollOverrides,\n            markScrollOverrideDirty: () => {\n                this.hasPendingScrollOverride = true;\n            },\n            findScrollableAncestors: (targetId) => this.findScrollableAncestors(targetId),',
+      ],
+      [
+        "        return Object.freeze([]);\n    }\n    applyScrollOverridesToVNode(vnode, overrides = this",
+        '        return Object.freeze([]);\n    }\n    syncScrollOverridesFromLayoutTree() {\n        if (!this.committedRoot || !this.layoutTree) {\n            this.scrollOverrides.clear();\n            return;\n        }\n        const nextOverrides = new Map();\n        const stack = [\n            {\n                runtimeNode: this.committedRoot,\n                layoutNode: this.layoutTree,\n            },\n        ];\n        while (stack.length > 0) {\n            const frame = stack.pop();\n            if (!frame)\n                continue;\n            const runtimeNode = frame.runtimeNode;\n            const layoutNode = frame.layoutNode;\n            const props = runtimeNode.vnode.props;\n            const nodeId = typeof props.id === "string" && props.id.length > 0 ? props.id : null;\n            if (nodeId !== null && props.overflow === "scroll" && layoutNode.meta) {\n                const meta = layoutNode.meta;\n                const hasScrollableAxis = meta.contentWidth > meta.viewportWidth || meta.contentHeight > meta.viewportHeight;\n                if (hasScrollableAxis) {\n                    nextOverrides.set(nodeId, Object.freeze({\n                        scrollX: meta.scrollX,\n                        scrollY: meta.scrollY,\n                    }));\n                }\n            }\n            const childCount = Math.min(runtimeNode.children.length, layoutNode.children.length);\n            for (let i = childCount - 1; i >= 0; i--) {\n                const runtimeChild = runtimeNode.children[i];\n                const layoutChild = layoutNode.children[i];\n                if (!runtimeChild || !layoutChild)\n                    continue;\n                stack.push({\n                    runtimeNode: runtimeChild,\n                    layoutNode: layoutChild,\n                });\n            }\n        }\n        this.scrollOverrides.clear();\n        for (const [nodeId, override] of nextOverrides) {\n            this.scrollOverrides.set(nodeId, override);\n        }\n    }\n    applyScrollOverridesToVNode(vnode, overrides = this',
+      ],
+      [
+        "        if (override) {",
+        '        if (override && propsForRead.overflow === "scroll") {',
+      ],
+      [
+        "            if (this.scrollOverrides.size > 0)",
+        "            if (this.hasPendingScrollOverride)",
+      ],
+      [
+        "                this.scrollOverrides.clear();",
+        "                this.hasPendingScrollOverride = false;",
+      ],
+      [
+        "                this.layoutTree = nextLayoutTree;",
+        "                this.layoutTree = nextLayoutTree;\n                this.syncScrollOverridesFromLayoutTree();",
+      ],
+    ],
+  },
+  {
+    relativeUrl: "./app/widgetRenderer/mouseRouting.js",
+    replacements: [[
+      "            ctx.scrollOverrides.set(nodeId, {\n                scrollX: r.nextScrollX ?? meta.scrollX,\n                scrollY: r.nextScrollY ?? meta.scrollY,\n            });\n            return ROUTE_RENDER;",
+      '            ctx.scrollOverrides.set(nodeId, {\n                scrollX: r.nextScrollX ?? meta.scrollX,\n                scrollY: r.nextScrollY ?? meta.scrollY,\n            });\n            ctx.markScrollOverrideDirty?.();\n            return ROUTE_RENDER;',
+    ]],
+  },
+] as const
+
+let patchedRoots: Set<string> | null = null
+
+const applyFilePatch = async (baseUrl: string, patch: FilePatch) => {
+  const fileUrl = new URL(patch.relativeUrl, baseUrl)
+  const source = await readFile(fileUrl, "utf8")
+  let next = source
+  for (const [before, after] of patch.replacements) {
+    if (next.includes(after)) continue
+    if (!next.includes(before)) throw new Error(`Unsupported @rezi-ui/core runtime patch target at ${fileUrl.href}`)
+    next = next.replace(before, after)
+  }
+  if (next !== source) await writeFile(fileUrl, next)
+}
+
+export const ensureReziFilePatches = async () => {
+  const baseUrl = await import.meta.resolve("@rezi-ui/core")
+  patchedRoots ??= new Set<string>()
+  if (patchedRoots.has(baseUrl)) return
+  for (const patch of REZI_FILE_PATCHES) await applyFilePatch(baseUrl, patch)
+  patchedRoots.add(baseUrl)
+}

package/runtime/rezi-input-caret.ts

@@ -0,0 +1,61 @@
+import { readFile, writeFile } from "node:fs/promises"
+
+type Replacement = readonly [before: string, after: string]
+type FilePatch = { relativeUrl: string; replacements: readonly Replacement[] }
+
+const CARET_SAMPLE = "user"
+const CARET_EXPECTED_WIDTH = CARET_SAMPLE.length + 3
+const CARET_RULE_TEXT = "single-line ui.input width must equal value.length + 3"
+
+const REZI_INPUT_CARET_PATCHES: readonly FilePatch[] = [
+  {
+    relativeUrl: "./layout/engine/intrinsic.js",
+    replacements: [[
+      "return ok(clampSize({ w: textW + 2, h: 1 }));",
+      "return ok(clampSize({ w: textW + 3, h: 1 }));",
+    ]],
+  },
+  {
+    relativeUrl: "./layout/kinds/leaf.js",
+    replacements: [[
+      "const w = Math.min(maxW, textW + 2);",
+      "const w = Math.min(maxW, textW + 3);",
+    ]],
+  },
+] as const
+
+let verifiedRoots: Set<string> | null = null
+
+const applyFilePatch = async (baseUrl: string, patch: FilePatch) => {
+  const fileUrl = new URL(patch.relativeUrl, baseUrl)
+  const source = await readFile(fileUrl, "utf8")
+  let next = source
+  for (const [before, after] of patch.replacements) {
+    if (next.includes(after)) continue
+    if (!next.includes(before)) throw new Error(`Unsupported @rezi-ui/core caret patch target at ${fileUrl.href}`)
+    next = next.replace(before, after)
+  }
+  if (next !== source) await writeFile(fileUrl, next)
+}
+
+const verifyInputCaretWidth = async () => {
+  const { createTestRenderer, ui } = await import("@rezi-ui/core")
+  const renderer = createTestRenderer({ viewport: { cols: 40, rows: 8 } })
+  const view = renderer.render(ui.input({ id: "caret-probe", value: CARET_SAMPLE, onInput: () => {} }))
+  const field = view.findById("caret-probe")
+  if (!field) throw new Error("Rezi caret probe could not find the rendered input node")
+  return field.rect.w
+}
+
+export const ensureReziInputCaretPatch = async () => {
+  const baseUrl = await import.meta.resolve("@rezi-ui/core")
+  verifiedRoots ??= new Set<string>()
+  if (verifiedRoots.has(baseUrl)) return
+  for (const patch of REZI_INPUT_CARET_PATCHES) await applyFilePatch(baseUrl, patch)
+  const width = await verifyInputCaretWidth()
+  if (width !== CARET_EXPECTED_WIDTH) {
+    const installRoot = new URL("../", baseUrl).href
+    throw new Error(`Rezi input caret verification failed for ${installRoot}: ${CARET_RULE_TEXT}; expected ${CARET_EXPECTED_WIDTH} for "${CARET_SAMPLE}", got ${width}. This usually means @rezi-ui/core was imported before runtime patches were applied or the upstream Rezi input layout changed.`)
+  }
+  verifiedRoots.add(baseUrl)
+}

package/src/core/session.ts

@@ -170,8 +170,6 @@ const STATS_POLL_MS = 1000
 const PROFILE_URL = "https://ip.rt.ht/"
 const PULSE_URL = "https://sig.efn.kr/pulse"
 
-type StatsEntry = { id?: string; type?: string; [key: string]: unknown }
-
 export interface PeerConnectivitySnapshot {
   rttMs: number
   localCandidateType: string
@@ -191,7 +189,6 @@ export interface PulseSnapshot {
 
 const progressOf = (transfer: TransferState) => transfer.size ? Math.max(0, Math.min(100, transfer.bytes / transfer.size * 100)) : FINAL_STATUSES.has(transfer.status as never) ? 100 : 0
 const isFinal = (transfer: TransferState) => FINAL_STATUSES.has(transfer.status as never)
-const candidateTypeRank = (type: string) => ({ host: 0, srflx: 1, prflx: 1, relay: 2 }[type] ?? Number.NaN)
 export const candidateTypeLabel = (type: string) => ({ host: "Direct", srflx: "NAT", prflx: "NAT", relay: "TURN" }[type] || "—")
 const emptyConnectivitySnapshot = (): PeerConnectivitySnapshot => ({ rttMs: Number.NaN, localCandidateType: "", remoteCandidateType: "", pathLabel: "—" })
 const emptyPulseSnapshot = (): PulseSnapshot => ({ state: "idle", at: 0, ms: 0, error: "" })
@@ -262,74 +259,54 @@ export const turnUsageState = (
 
 const timeoutSignal = (ms: number) => typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(ms) : undefined
 
-const statsEntriesFromReport = (report: unknown): StatsEntry[] => {
-  if (!report) return []
-  if (Array.isArray(report)) return report as StatsEntry[]
-  if (typeof report === "object") {
-    const values = report as { values?: () => Iterable<StatsEntry> }
-    if (typeof values.values === "function") return [...values.values()]
-    const forEachable = report as { forEach?: (fn: (value: StatsEntry) => void) => void }
-    if (typeof forEachable.forEach === "function") {
-      const entries: StatsEntry[] = []
-      forEachable.forEach(value => entries.push(value))
-      return entries
-    }
-    const iterable = report as Iterable<StatsEntry>
-    if (typeof (iterable as { [Symbol.iterator]?: () => Iterator<StatsEntry> })[Symbol.iterator] === "function") return [...iterable]
-  }
-  return []
-}
-
-const candidatePairEntries = (entries: StatsEntry[], transportId?: string) => entries.filter(entry =>
-  entry.type === "candidate-pair"
-  && (!transportId || entry.transportId === transportId))
-
-const preferredCandidatePair = (entries: StatsEntry[]) => {
-  let selectedFallback: StatsEntry | null = null
-  let succeededFallback: StatsEntry | null = null
-  for (const entry of entries) {
-    const selected = entry.selected === true || entry.nominated === true
-    const succeeded = entry.state === "succeeded"
-    if (selected && succeeded) return entry
-    if (!selectedFallback && selected) selectedFallback = entry
-    if (!succeededFallback && succeeded) succeededFallback = entry
-  }
-  return selectedFallback || succeededFallback
+const normalizeCandidateType = (value: unknown) => typeof value === "string" ? value.toLowerCase() : ""
+const validCandidateType = (value: string) => ["host", "srflx", "prflx", "relay"].includes(value)
+
+export const activeIcePairFromPeerConnection = (pc: { iceTransports?: unknown[] } | null | undefined) => {
+  const transports = Array.isArray(pc?.iceTransports) ? pc.iceTransports as Array<Record<string, any>> : []
+  let fallback: { transport: Record<string, any>; connection: Record<string, any>; pair: Record<string, any> } | null = null
+  for (const transport of transports) {
+    const connection = transport?.connection
+    const pair = connection?.nominated
+    if (!pair) continue
+    fallback ||= { transport, connection, pair }
+    const state = `${transport?.state ?? ""}`.toLowerCase()
+    if (!state || state === "connected" || state === "completed") return { transport, connection, pair }
+  }
+  return fallback
 }
 
-const selectedCandidatePair = (entries: StatsEntry[], byId: Map<string, StatsEntry>) => {
-  const transport = entries.find(entry => entry.type === "transport" && typeof entry.selectedCandidatePairId === "string")
-  const transportId = typeof transport?.id === "string" ? transport.id : undefined
-  if (transport && typeof transport.selectedCandidatePairId === "string") {
-    const pair = byId.get(transport.selectedCandidatePairId)
-    if (pair?.type === "candidate-pair") return pair
-  }
-  return preferredCandidatePair(candidatePairEntries(entries, transportId)) || preferredCandidatePair(candidatePairEntries(entries))
-}
-
-export const connectivitySnapshotFromReport = (report: unknown, previous: PeerConnectivitySnapshot = emptyConnectivitySnapshot()): PeerConnectivitySnapshot => {
-  const entries = statsEntriesFromReport(report)
-  const byId = new Map(entries.flatMap(entry => typeof entry.id === "string" && entry.id ? [[entry.id, entry] as const] : []))
-  const pair = selectedCandidatePair(entries, byId)
-  const rttMs = typeof pair?.currentRoundTripTime === "number" ? pair.currentRoundTripTime * 1000 : previous.rttMs
-  const localCandidate = typeof pair?.localCandidateId === "string" ? byId.get(pair.localCandidateId) : undefined
-  const remoteCandidate = typeof pair?.remoteCandidateId === "string" ? byId.get(pair.remoteCandidateId) : undefined
-  const localCandidateType = typeof localCandidate?.candidateType === "string" ? localCandidate.candidateType : ""
-  const remoteCandidateType = typeof remoteCandidate?.candidateType === "string" ? remoteCandidate.candidateType : ""
-  if (!pair || !Number.isFinite(candidateTypeRank(localCandidateType)) || !Number.isFinite(candidateTypeRank(remoteCandidateType))) {
-    return { ...previous, rttMs }
-  }
+export const connectivitySnapshotFromPeerConnection = (
+  pc: { iceTransports?: unknown[] } | null | undefined,
+  previous: PeerConnectivitySnapshot = emptyConnectivitySnapshot(),
+): PeerConnectivitySnapshot => {
+  const pair = activeIcePairFromPeerConnection(pc)?.pair
+  const localCandidateType = normalizeCandidateType(pair?.localCandidate?.type ?? pair?.localCandidate?.candidateType)
+  const remoteCandidateType = normalizeCandidateType(pair?.remoteCandidate?.type ?? pair?.remoteCandidate?.candidateType)
+  if (!validCandidateType(localCandidateType) || !validCandidateType(remoteCandidateType)) return previous
   return {
     ...previous,
-    rttMs,
     localCandidateType,
     remoteCandidateType,
     pathLabel: `${candidateTypeLabel(localCandidateType)} ↔ ${candidateTypeLabel(remoteCandidateType)}`,
   }
 }
 
+export const probeIcePairConsentRtt = async (connection: Record<string, any> | null | undefined, pair: Record<string, any> | null | undefined) => {
+  if (!connection || !pair?.protocol?.request || typeof connection.buildRequest !== "function" || typeof connection.remotePassword !== "string") return Number.NaN
+  const request = connection.buildRequest({
+    nominate: false,
+    localUsername: connection.localUsername,
+    remoteUsername: connection.remoteUsername,
+    iceControlling: connection.iceControlling,
+  })
+  const startedAt = performance.now()
+  await pair.protocol.request(request, pair.remoteAddr, Buffer.from(connection.remotePassword, "utf8"), 0)
+  return performance.now() - startedAt
+}
+
 const sameConnectivity = (left: PeerConnectivitySnapshot, right: PeerConnectivitySnapshot) =>
-  left.rttMs === right.rttMs
+  (left.rttMs === right.rttMs || Number.isNaN(left.rttMs) && Number.isNaN(right.rttMs))
   && left.localCandidateType === right.localCandidateType
   && left.remoteCandidateType === right.remoteCandidateType
   && left.pathLabel === right.pathLabel
@@ -710,18 +687,23 @@ export class SendSession {
     if (this.stopped) return
     let dirty = false
     for (const peer of this.peers.values()) {
-      if (peer.presence !== "active" || !peer.pc) continue
-      try {
-        const next = connectivitySnapshotFromReport(await peer.pc.getStats(), peer.connectivity)
-        if (sameConnectivity(peer.connectivity, next)) continue
-        peer.connectivity = next
-        dirty = true
-        this.emit({ type: "peer", peer: this.peerSnapshot(peer) })
-      } catch {}
+      if (peer.presence !== "active") continue
+      dirty = await this.refreshPeerConnectivity(peer) || dirty
     }
     if (dirty) this.notify()
   }
 
+  private async refreshPeerConnectivity(peer: PeerState) {
+    const activePair = activeIcePairFromPeerConnection(peer.pc as { iceTransports?: unknown[] } | null | undefined)
+    const next = connectivitySnapshotFromPeerConnection(peer.pc as { iceTransports?: unknown[] } | null | undefined, peer.connectivity)
+    const rttMs = await probeIcePairConsentRtt(activePair?.connection, activePair?.pair).catch(() => Number.NaN)
+    if (Number.isFinite(rttMs)) next.rttMs = rttMs
+    if (sameConnectivity(peer.connectivity, next)) return false
+    peer.connectivity = next
+    this.emit({ type: "peer", peer: this.peerSnapshot(peer) })
+    return true
+  }
+
   private pushLog(kind: string, payload: unknown, level: "info" | "error" = "info") {
     const log = { id: uid(6), at: Date.now(), kind, level, payload }
     this.logs.unshift(log)
@@ -1319,8 +1301,8 @@ export class SendSession {
   }
 
   private async handleTransferControl(peer: PeerState, message: DataMessage) {
-    this.pushLog("data:in", message)
     if (message.to && message.to !== this.localId && message.to !== "*") return
+    this.pushLog("data:in", message)
     switch (message.kind) {
       case "file-offer": {
         if (!this.transfers.has(message.transferId)) {

package/src/index.ts

@@ -2,9 +2,9 @@
 import { resolve } from "node:path"
 import { cac, type CAC } from "cac"
 import { cleanRoom } from "./core/protocol"
-import { SendSession, type SessionConfig, type SessionEvent } from "./core/session"
+import type { SendSession, SessionConfig, SessionEvent } from "./core/session"
 import { resolvePeerTargets } from "./core/targeting"
-import { ensureReziInputCaretPatch } from "./tui/rezi-input-caret"
+import { ensureSessionRuntimePatches, ensureTuiRuntimePatches } from "../runtime/install"
 
 export class ExitError extends Error {
   constructor(message: string, readonly code = 1) {
@@ -122,6 +122,27 @@ const waitForFinalTransfers = async (session: SendSession, transferIds: string[]
   }
 }
 
+let sessionRuntimePromise: Promise<typeof import("./core/session")> | null = null
+let tuiRuntimePromise: Promise<typeof import("./tui/app")> | null = null
+
+const loadSessionRuntime = () => {
+  if (sessionRuntimePromise) return sessionRuntimePromise
+  sessionRuntimePromise = (async () => {
+    await ensureSessionRuntimePatches()
+    return import("./core/session")
+  })()
+  return sessionRuntimePromise
+}
+
+const loadTuiRuntime = () => {
+  if (tuiRuntimePromise) return tuiRuntimePromise
+  tuiRuntimePromise = (async () => {
+    await ensureTuiRuntimePatches()
+    return import("./tui/app")
+  })()
+  return tuiRuntimePromise
+}
+
 const handleSignals = (session: SendSession) => {
   const onSignal = async () => {
     await session.close()
@@ -132,6 +153,7 @@ const handleSignals = (session: SendSession) => {
 }
 
 const peersCommand = async (options: Record<string, unknown>) => {
+  const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, {}))
   handleSignals(session)
   printRoomAnnouncement(session.room, !!options.json)
@@ -158,6 +180,7 @@ const offerCommand = async (files: string[], options: Record<string, unknown>) =
   if (!files.length) throw new ExitError("offer requires at least one file path", 1)
   const selectors = offerSelectors(options.to)
   const timeoutMs = waitPeerTimeout(options.waitPeer)
+  const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, {}))
   handleSignals(session)
   printRoomAnnouncement(session.room, !!options.json)
@@ -173,6 +196,7 @@ const offerCommand = async (files: string[], options: Record<string, unknown>) =
 }
 
 const acceptCommand = async (options: Record<string, unknown>) => {
+  const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, { autoAcceptIncoming: true, autoSaveIncoming: true }))
   handleSignals(session)
   printRoomAnnouncement(session.room, !!options.json)
@@ -194,8 +218,7 @@ const acceptCommand = async (options: Record<string, unknown>) => {
 
 const tuiCommand = async (options: Record<string, unknown>) => {
   const initialConfig = sessionConfigFrom(options, { autoAcceptIncoming: true, autoSaveIncoming: true })
-  await ensureReziInputCaretPatch()
-  const { startTui } = await import("./tui/app")
+  const { startTui } = await loadTuiRuntime()
   await startTui(initialConfig, !!options.events)
 }
 

package/src/tui/app.ts

@@ -5,7 +5,7 @@ import { SendSession, type PeerSnapshot, type SessionConfig, type SessionSnapsho
 import { cleanLocalId, cleanName, cleanRoom, displayPeerName, fallbackName, formatBytes, type LogEntry, peerDefaultsToken, type PeerProfile, uid } from "../core/protocol"
 import { FILE_SEARCH_VISIBLE_ROWS, type FileSearchEvent, type FileSearchMatch, type FileSearchRequest } from "./file-search-protocol"
 import { deriveFileSearchScope, formatFileSearchDisplayPath, normalizeSearchQuery, offsetFileSearchMatchIndices } from "./file-search"
-import { installCheckboxClickPatch } from "./rezi-checkbox-click"
+import { installCheckboxClickPatch } from "../../runtime/rezi-checkbox-click"
 
 type Notice = { text: string; variant: "info" | "success" | "warning" | "error" }
 type DraftItem = { id: string; path: string; name: string; size: number; createdAt: number }

package/patches/@rezi-ui%2Fcore@0.1.0-alpha.60.patch

@@ -1,227 +0,0 @@
-diff --git a/dist/layout/engine/intrinsic.js b/dist/layout/engine/intrinsic.js
-index 8df3d41..d29496d 100644
---- a/dist/layout/engine/intrinsic.js
-+++ b/dist/layout/engine/intrinsic.js
-@@ -168,7 +168,7 @@ function measureLeafMaxContent(vnode, axis, measureNode) {
-             const placeholder = typeof placeholderRaw === "string" ? placeholderRaw : "";
-             const content = propsRes.value.value.length > 0 ? propsRes.value.value : placeholder;
-             const textW = measureTextCells(content);
--            return ok(clampSize({ w: textW + 2, h: 1 }));
-+            return ok(clampSize({ w: textW + 3, h: 1 }));
-         }
-         case "progress": {
-             const props = vnode.props;
-@@ -388,4 +388,4 @@ export function measureMaxContent(vnode, axis, measureNode) {
-             return measureLeafMaxContent(vnode, axis, measureNode);
-     }
- }
--//# sourceMappingURL=intrinsic.js.map
-
-+//# sourceMappingURL=intrinsic.js.map
-diff --git a/dist/layout/kinds/leaf.js b/dist/layout/kinds/leaf.js
-index 255750a..4daf5da 100644
---- a/dist/layout/kinds/leaf.js
-+++ b/dist/layout/kinds/leaf.js
-@@ -71,7 +71,7 @@ export function measureLeaf(vnode, maxW, maxH, axis) {
-             const placeholder = typeof placeholderRaw === "string" ? placeholderRaw : "";
-             const content = propsRes.value.value.length > 0 ? propsRes.value.value : placeholder;
-             const textW = measureTextCells(content);
--            const w = Math.min(maxW, textW + 2);
-+            const w = Math.min(maxW, textW + 3);
-             const h = Math.min(maxH, 1);
-             return ok({ w, h });
-         }
-@@ -533,4 +533,4 @@ export function layoutLeafKind(vnode, x, y, rectW, rectH) {
-             };
-     }
- }
--//# sourceMappingURL=leaf.js.map
-
-+//# sourceMappingURL=leaf.js.map
-diff --git a/dist/layout/kinds/box.js b/dist/layout/kinds/box.js
-index dca103c..14f2973 100644
---- a/dist/layout/kinds/box.js
-+++ b/dist/layout/kinds/box.js
-@@ -4,6 +4,7 @@ import { childHasAbsolutePosition } from "../engine/guards.js";
- import { ok } from "../engine/result.js";
- import { resolveMargin as resolveMarginProps, resolveSpacing as resolveSpacingProps, } from "../spacing.js";
- import { validateBoxProps } from "../validateProps.js";
-+const OVERFLOW_CONTENT_LIMIT = 2147483647;
- const syntheticColumnCache = new WeakMap();
- function computeFlowSignature(children) {
-     let signature = `${children.length}:`;
-@@ -88,12 +89,13 @@ export function measureBoxKinds(vnode, maxW, maxH, axis, measureNode) {
-             const outerHLimit = forcedH ?? maxHCap;
-             const cw = clampNonNegative(outerWLimit - bl - br - spacing.left - spacing.right);
-             const ch = clampNonNegative(outerHLimit - bt - bb - spacing.top - spacing.bottom);
-+            const flowMeasureH = propsRes.value.overflow === "scroll" ? OVERFLOW_CONTENT_LIMIT : ch;
-             // Children are laid out as a Column inside the content rect.
-             let contentUsedW = 0;
-             let contentUsedH = 0;
-             if (vnode.children.length > 0) {
-                 const columnNode = getSyntheticColumn(vnode, propsRes.value.gap);
--                const innerRes = measureNode(columnNode, cw, ch, "column");
-+                const innerRes = measureNode(columnNode, cw, flowMeasureH, "column");
-                 if (!innerRes.ok)
-                     return innerRes;
-                 contentUsedW = innerRes.value.w;
-@@ -154,9 +156,16 @@ export function layoutBoxKinds(vnode, x, y, rectW, rectH, axis, measureNode, lay
-             const children = [];
-             if (vnode.children.length > 0) {
-                 const columnNode = getSyntheticColumn(vnode, propsRes.value.gap);
-+                const flowMeasureH = propsRes.value.overflow === "scroll" ? OVERFLOW_CONTENT_LIMIT : ch;
-+                const flowMeasureRes = measureNode(columnNode, cw, flowMeasureH, "column");
-+                if (!flowMeasureRes.ok)
-+                    return flowMeasureRes;
-+                const flowLayoutH = propsRes.value.overflow === "scroll"
-+                    ? Math.max(ch, flowMeasureRes.value.h)
-+                    : ch;
-                 // The synthetic column wrapper must fill the box content rect so that
-                 // percentage constraints resolve against the actual available space.
--                const innerRes = layoutNode(columnNode, cx, cy, cw, ch, "column", cw, ch);
-+                const innerRes = layoutNode(columnNode, cx, cy, cw, flowLayoutH, "column", cw, flowLayoutH, flowMeasureRes.value);
-                 if (!innerRes.ok)
-                     return innerRes;
-                 // Attach the box's children (not the synthetic column wrapper).
-@@ -234,4 +243,4 @@ export function layoutBoxKinds(vnode, x, y, rectW, rectH, axis, measureNode, lay
-             };
-     }
- }
--//# sourceMappingURL=box.js.map
-
-+//# sourceMappingURL=box.js.map
-diff --git a/dist/app/widgetRenderer.js b/dist/app/widgetRenderer.js
-index 38d4a5f..69ee099 100644
---- a/dist/app/widgetRenderer.js
-+++ b/dist/app/widgetRenderer.js
-@@ -614,6 +614,7 @@ export class WidgetRenderer {
-     tableStore = createTableStateStore();
-     treeStore = createTreeStateStore();
-     scrollOverrides = new Map();
-+    hasPendingScrollOverride = false;
-     /* --- Tree Lazy-Loading Cache (per tree id, per node key) --- */
-     loadedTreeChildrenByTreeId = new Map();
-     treeLoadTokenByTreeAndKey = new Map();
-@@ -1472,6 +1473,9 @@ export class WidgetRenderer {
-             diffViewerById: this.diffViewerById,
-             rectById: this.rectById,
-             scrollOverrides: this.scrollOverrides,
-+            markScrollOverrideDirty: () => {
-+                this.hasPendingScrollOverride = true;
-+            },
-             findScrollableAncestors: (targetId) => this.findScrollableAncestors(targetId),
-         });
-         if (wheelRoute)
-@@ -1750,6 +1754,53 @@ export class WidgetRenderer {
-         }
-         return Object.freeze([]);
-     }
-+    syncScrollOverridesFromLayoutTree() {
-+        if (!this.committedRoot || !this.layoutTree) {
-+            this.scrollOverrides.clear();
-+            return;
-+        }
-+        const nextOverrides = new Map();
-+        const stack = [
-+            {
-+                runtimeNode: this.committedRoot,
-+                layoutNode: this.layoutTree,
-+            },
-+        ];
-+        while (stack.length > 0) {
-+            const frame = stack.pop();
-+            if (!frame)
-+                continue;
-+            const runtimeNode = frame.runtimeNode;
-+            const layoutNode = frame.layoutNode;
-+            const props = runtimeNode.vnode.props;
-+            const nodeId = typeof props.id === "string" && props.id.length > 0 ? props.id : null;
-+            if (nodeId !== null && props.overflow === "scroll" && layoutNode.meta) {
-+                const meta = layoutNode.meta;
-+                const hasScrollableAxis = meta.contentWidth > meta.viewportWidth || meta.contentHeight > meta.viewportHeight;
-+                if (hasScrollableAxis) {
-+                    nextOverrides.set(nodeId, Object.freeze({
-+                        scrollX: meta.scrollX,
-+                        scrollY: meta.scrollY,
-+                    }));
-+                }
-+            }
-+            const childCount = Math.min(runtimeNode.children.length, layoutNode.children.length);
-+            for (let i = childCount - 1; i >= 0; i--) {
-+                const runtimeChild = runtimeNode.children[i];
-+                const layoutChild = layoutNode.children[i];
-+                if (!runtimeChild || !layoutChild)
-+                    continue;
-+                stack.push({
-+                    runtimeNode: runtimeChild,
-+                    layoutNode: layoutChild,
-+                });
-+            }
-+        }
-+        this.scrollOverrides.clear();
-+        for (const [nodeId, override] of nextOverrides) {
-+            this.scrollOverrides.set(nodeId, override);
-+        }
-+    }
-     applyScrollOverridesToVNode(vnode, overrides = this
-         .scrollOverrides) {
-         const propsRecord = (vnode.props ?? {});
-@@ -1763,7 +1814,7 @@ export class WidgetRenderer {
-                 nextPropsMutable = { ...propsRecord };
-             return nextPropsMutable;
-         };
--        if (override) {
-+        if (override && propsForRead.overflow === "scroll") {
-             if (propsForRead.scrollX !== override.scrollX || propsForRead.scrollY !== override.scrollY) {
-                 const mutable = ensureMutableProps();
-                 mutable.scrollX = override.scrollX;
-@@ -2643,7 +2694,7 @@ export class WidgetRenderer {
-             // layout when explicitly requested (resize/layout dirty), bootstrap lacks
-             // a tree, or committed layout signatures changed.
-             let doLayout = plan.layout || this.layoutTree === null;
--            if (this.scrollOverrides.size > 0)
-+            if (this.hasPendingScrollOverride)
-                 doLayout = true;
-             const frameNowMs = typeof plan.nowMs === "number" && Number.isFinite(plan.nowMs)
-                 ? plan.nowMs
-@@ -2916,7 +2967,7 @@ export class WidgetRenderer {
-                 const layoutRootVNode = pendingScrollOverrides !== null
-                     ? this.applyScrollOverridesToVNode(constrainedLayoutRootVNode, pendingScrollOverrides)
-                     : constrainedLayoutRootVNode;
--                this.scrollOverrides.clear();
-+                this.hasPendingScrollOverride = false;
-                 const initialLayoutRes = this.layoutWithShapeFallback(layoutRootVNode, constrainedLayoutRootVNode, rootPad, rootW, rootH, true);
-                 if (!initialLayoutRes.ok) {
-                     perfMarkEnd("layout", layoutToken);
-@@ -3001,6 +3052,7 @@ export class WidgetRenderer {
-                 }
-                 perfMarkEnd("layout", layoutToken);
-                 this.layoutTree = nextLayoutTree;
-+                this.syncScrollOverridesFromLayoutTree();
-                 if (doCommit) {
-                     // Seed/refresh per-instance layout stability signatures after a real
-                     // layout pass so subsequent commits can take the signature fast path.
-@@ -4076,4 +4128,4 @@ export class WidgetRenderer {
-         }
-     }
- }
--//# sourceMappingURL=widgetRenderer.js.map
-
-+//# sourceMappingURL=widgetRenderer.js.map
-diff --git a/dist/app/widgetRenderer/mouseRouting.js b/dist/app/widgetRenderer/mouseRouting.js
-index d3b08cf..00b77a3 100644
---- a/dist/app/widgetRenderer/mouseRouting.js
-+++ b/dist/app/widgetRenderer/mouseRouting.js
-@@ -1205,9 +1205,10 @@ export function routeMouseWheel(event, ctx) {
-                 scrollX: r.nextScrollX ?? meta.scrollX,
-                 scrollY: r.nextScrollY ?? meta.scrollY,
-             });
-+            ctx.markScrollOverrideDirty?.();
-             return ROUTE_RENDER;
-         }
-     }
-     return null;
- }
--//# sourceMappingURL=mouseRouting.js.map
-
-+//# sourceMappingURL=mouseRouting.js.map

package/patches/werift@0.22.9.patch

@@ -1,31 +0,0 @@
-diff --git a/lib/webrtc/src/transport/ice.js b/lib/webrtc/src/transport/ice.js
-index 25c8489..cd06dbf 100644
---- a/lib/webrtc/src/transport/ice.js
-+++ b/lib/webrtc/src/transport/ice.js
-@@ -230,25 +230,25 @@ class RTCIceTransport {
-             stats.push(candidateStats);
-         }
-         // Candidate pairs
-         const pairs = this.connection?.candidatePairs
-             ? [
-                 ...this.connection.candidatePairs.filter((p) => p.nominated),
-                 ...this.connection.candidatePairs.filter((p) => !p.nominated),
-             ]
-             : [];
-         for (const pair of pairs) {
-             const pairStats = {
-                 type: "candidate-pair",
--                id: (0, stats_1.generateStatsId)("candidate-pair", pair.foundation),
-+                id: (0, stats_1.generateStatsId)("candidate-pair", pair.localCandidate.foundation, pair.remoteCandidate.foundation),
-                 timestamp,
-                 transportId: (0, stats_1.generateStatsId)("transport", this.id),
-                 localCandidateId: (0, stats_1.generateStatsId)("local-candidate", pair.localCandidate.foundation),
-                 remoteCandidateId: (0, stats_1.generateStatsId)("remote-candidate", pair.remoteCandidate.foundation),
-                 state: pair.state,
-                 nominated: pair.nominated,
-                 packetsSent: pair.packetsSent,
-                 packetsReceived: pair.packetsReceived,
-                 bytesSent: pair.bytesSent,
-                 bytesReceived: pair.bytesReceived,
-                 currentRoundTripTime: pair.rtt,
-             };

package/src/tui/rezi-input-caret.ts

@@ -1,46 +0,0 @@
-import { readFile, writeFile } from "node:fs/promises"
-import { fileURLToPath } from "node:url"
-
-const PATCH_FLAG = Symbol.for("send.rezi.inputCaretPatchInstalled")
-
-type PatchedRuntime = {
-  [PATCH_FLAG]?: Set<string>
-}
-
-type FilePatchSpec = {
-  relativeUrl: string
-  before: string
-  after: string
-}
-
-const INPUT_PATCHES: readonly FilePatchSpec[] = [
-  {
-    relativeUrl: "./layout/engine/intrinsic.js",
-    before: "return ok(clampSize({ w: textW + 2, h: 1 }));",
-    after: "return ok(clampSize({ w: textW + 3, h: 1 }));",
-  },
-  {
-    relativeUrl: "./layout/kinds/leaf.js",
-    before: "const w = Math.min(maxW, textW + 2);",
-    after: "const w = Math.min(maxW, textW + 3);",
-  },
-] as const
-
-const patchRuntime = globalThis as PatchedRuntime
-
-const patchFile = async (spec: FilePatchSpec, coreIndexUrl: string) => {
-  const path = fileURLToPath(new URL(spec.relativeUrl, coreIndexUrl))
-  const source = await readFile(path, "utf8")
-  if (source.includes(spec.after)) return
-  if (!source.includes(spec.before)) throw new Error(`Unsupported @rezi-ui/core input layout at ${path}`)
-  await writeFile(path, source.replace(spec.before, spec.after))
-}
-
-export const ensureReziInputCaretPatch = async () => {
-  const coreIndexUrl = await import.meta.resolve("@rezi-ui/core")
-  const patchedRoots = patchRuntime[PATCH_FLAG] ?? new Set<string>()
-  if (patchedRoots.has(coreIndexUrl)) return
-  for (const spec of INPUT_PATCHES) await patchFile(spec, coreIndexUrl)
-  patchedRoots.add(coreIndexUrl)
-  patchRuntime[PATCH_FLAG] = patchedRoots
-}