@solidrt/cli 0.0.32 → 0.0.34

package/AGENTS.md

@@ -10,8 +10,8 @@ bundled `flux` runtime, not on Bun. Invoke via `bunx srt <command>`.
 ## Commands
 
 - `bunx srt init <dir>` - scaffold a new SolidRT project into a new (empty)
-  folder: package.json, tsconfig.json, AGENTS.md, a starter src/index.tsx, then
-  installs deps. Greenfield shortcut (no install needed first):
+  folder: package.json, tsconfig.json, AGENTS.md, a starter src/index.tsx, an
+  empty assets/ (everything in it ships with the app), then installs deps. Greenfield shortcut (no install needed first):
   `bun create solidrt <dir>`.
 - `bunx srt run src/index.tsx` - dev server + a local client window, watches and
   hot-reloads. NEEDS A DISPLAY (opens a GUI window). Not usable headless.
@@ -45,9 +45,7 @@ Two reliable checks that need no GUI:
 ## Dev server proxies (when clients on other devices need your machine's data)
 
 - `--proxy-http` - route `fetch` through the dev server; responses cached in
-  `.srt-cache.db` (delete the file to clear).
-- `--proxy-files` - route flux:fs (`file`/`dir`/`write`) through the dev server.
-  Exposes your dev machine's files to all clients; use with care.
+  `.srt-data/http-cache.db` (delete the file to clear).
 
 ## REPL (opened by `run`/`server`)
 

package/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidrt/cli",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "license": "MIT",
   "author": "Antoine van Wel",
   "type": "module",
@@ -12,6 +12,7 @@
     "src/",
     "server/",
     "scaffold/",
+    "fonts/",
     "AGENTS.md"
   ],
   "dependencies": {
@@ -27,17 +28,17 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@solidrt/darwin-arm64": "0.0.32",
-    "@solidrt/linux-arm64-gnu": "0.0.32",
-    "@solidrt/linux-x64-gnu": "0.0.32",
-    "@solidrt/win32-x64-msvc": "0.0.32"
+    "@solidrt/darwin-arm64": "0.0.34",
+    "@solidrt/linux-arm64-gnu": "0.0.34",
+    "@solidrt/linux-x64-gnu": "0.0.34",
+    "@solidrt/win32-x64-msvc": "0.0.34"
   },
   "peerDependencies": {
-    "@solidrt/core": "0.0.32",
+    "@solidrt/core": "0.0.34",
     "typescript": "^7"
   },
   "devDependencies": {
-    "@solidrt/flux-types": "0.0.32",
+    "@solidrt/flux-types": "0.0.34",
     "@types/bun": "latest"
   }
 }

package/scaffold/AGENTS.md

@@ -153,6 +153,32 @@ nearly free. Rules, in order of leverage:
    creating many at once (dealing a board of 64 sprites) is a visible
    one-frame hiccup - pool or pre-warm if that moment matters.
 
+## Assets and app identity
+
+- Everything under `assets/` ships with the app: the folder is collected
+  wholesale into each build's version manifest (no bundler analysis, no
+  registration step). Reference assets by path - `file("assets/sounds/x.ogg")`
+  from `flux:fs` - and treat them as read-only at runtime; writes belong in
+  plain relative paths, which land in the app's private data dir.
+- Small text-like assets (SVG documents, shaders) can instead be inlined via
+  imports (`import icon from "./icon.svg"` yields the file's text;
+  `with { type: "binary" }` yields a Uint8Array). Inlining trades update
+  granularity for zero I/O - keep big or streamable files (audio, images) in
+  `assets/`.
+- Custom fonts go in `assets/fonts/` and are declared in the `solidrt.fonts`
+  map in package.json (alias -> file path; role aliases `sans`/`serif`/`mono`
+  replace the built-in defaults, `false` drops one, other keys add fonts
+  selectable via fontFamily). A newly added font shows after restarting the
+  client.
+- The `solidrt` key in package.json is the app's identity: set a stable
+  reverse-DNS `appId` before distributing - it keys the app's storage
+  folder, defaults from the package name in dev, and `srt pack` warns
+  while defaulted. `org` and `displayName` are optional display metadata
+  (future launcher/window naming) with no storage meaning.
+- `bunx srt pack src/index.tsx` builds a single-file executable;
+  `bunx srt pack --folder src/index.tsx` writes the flat app folder
+  (runner + manifest.json + bundle + assets/) to `dist/`.
+
 ## Run / verify
 
 - bunx srt run src/index.tsx     - dev server + window (needs a display)

package/scaffold/gitignore

@@ -1,4 +1,5 @@
 node_modules/
 *.srt.js
 *.srt.bin
-.srt-cache.db
+.srt-data/
+dist/

package/scaffold/package.json

@@ -9,12 +9,12 @@
     "android": "srt client --android"
   },
   "dependencies": {
-    "@solidrt/core": "0.0.32",
-    "@solidrt/components": "0.0.32"
+    "@solidrt/core": "0.0.34",
+    "@solidrt/components": "0.0.34"
   },
   "devDependencies": {
-    "@solidrt/cli": "0.0.32",
-    "@solidrt/flux-types": "0.0.32",
+    "@solidrt/cli": "0.0.34",
+    "@solidrt/flux-types": "0.0.34",
     "typescript": "^7"
   }
 }

package/server/cache.ts

@@ -1,7 +1,7 @@
 // SQLite-backed HTTP response cache for the dev server's /__proxy__ endpoint.
 //
-// Project-local: stored at <dir>/.srt-cache.db. Entries live forever; delete
-// .srt-cache.db to drop them.
+// Project-local: stored at <dir>/http-cache.db, where <dir> is the project's
+// .srt-data. Entries live forever; delete the file to drop them.
 //
 // Cached: GET (and HEAD) 2xx responses with no Authorization on the request
 // and no Cache-Control: no-store on either side. The cache key is
@@ -10,9 +10,10 @@
 // old hashed entries simply miss and re-populate.)
 
 import { Database } from "flux:sqlite"
+import { dir } from "flux:fs"
 import { join } from "flux:path"
 
-const CACHE_FILE = ".srt-cache.db"
+const CACHE_FILE = "http-cache.db"
 
 export type Decision = "hit" | "miss" | "bypass" | "skip"
 
@@ -29,6 +30,7 @@ let db: Database | null = null
 let enabled = false
 
 export async function initCache(opts: { dir: string }) {
+  await dir(opts.dir).create()
   let d = await Database.connect(join(opts.dir, CACHE_FILE), "rw+")
   await d.exec(`CREATE TABLE IF NOT EXISTS entries (
     key         TEXT PRIMARY KEY,

package/server/main.ts

@@ -6,9 +6,9 @@
 
 import { serve } from "flux:http"
 import type { FluxRequest, Server } from "flux:http"
-import { file, dir } from "flux:fs"
+import { file } from "flux:fs"
 import { argv } from "flux:process"
-import { resolveWithin, join } from "flux:path"
+import { resolveWithin } from "flux:path"
 import { state, type Config } from "./state"
 import * as cache from "./cache"
 import { handleProxy } from "./proxy"
@@ -20,6 +20,7 @@ import { createTunnelEndpoint, TUNNEL_PROTOCOL } from "./tunnel"
 let config: Config = JSON.parse(argv[argv.length - 1]!)
 state.config = config
 state.sourceDir = config.sourceDir
+state.projectDir = config.projectDir
 state.stats = config.stats
 state.serverUrl = `${config.address}:${config.port}`
 
@@ -74,14 +75,16 @@ async function handleInternal(req: FluxRequest, server: Server, path: string): P
 
   switch (path) {
     case "/__internal__/reload": {
-      // { message, clients?, latch?, sourceDir?, map? }: send `message` (a full
-      // client-protocol message, built by srt) to the listed client ids, or to
-      // all when omitted. `latch` keeps it for late-joining clients (code
-      // reloads latch, one-shot bytecode loads do not); `sourceDir` moves the
-      // file-serving root (repl `load`); `map` is the bundle's sourcemap for
-      // log remapping, replaced on every reload (absent means none).
+      // { message, clients?, latch?, sourceDir?, projectDir?, map? }: send
+      // `message` (a full client-protocol message, built by srt) to the listed
+      // client ids, or to all when omitted. `latch` keeps it for late-joining
+      // clients (code reloads latch, one-shot bytecode loads do not);
+      // `sourceDir` moves the file-serving root and `projectDir` the /assets/
+      // root (repl `load`); `map` is the bundle's sourcemap for log remapping,
+      // replaced on every reload (absent means none).
       let body = await req.json()
       if (typeof body.sourceDir === "string") state.sourceDir = body.sourceDir
+      if (typeof body.projectDir === "string") state.projectDir = body.projectDir
       // Keep the rebuild entry in sync when `load` moves it, so a later MCP
       // reload bundles the newly loaded file, not the launch-time one.
       if (typeof body.entry === "string") state.config.entry = body.entry
@@ -119,21 +122,15 @@ async function handleInternal(req: FluxRequest, server: Server, path: string): P
   }
 }
 
-// The file routes: GET file (with single-range 206 support) or directory
-// listing, PUT file write. All paths are contained in the source directory.
-async function handleFiles(req: FluxRequest, path: string): Promise<Response> {
-  let filePath = resolveWithin(state.sourceDir, "." + path)
+// The file routes: GET file with single-range 206 support. All paths are
+// contained in `root` (the source directory, or the project dir for the
+// /assets/ convention route).
+async function handleFiles(req: FluxRequest, path: string, root: string): Promise<Response> {
+  let filePath = resolveWithin(root, "." + path)
   if (!filePath) {
     return new Response("Forbidden", { status: 403 })
   }
 
-  if (req.method === "PUT") {
-    console.log("[cli] put " + path)
-    let bytes = await req.bytes()
-    await file(filePath).write(bytes)
-    return new Response("", { status: 204 })
-  }
-
   console.log("[cli] get " + path)
 
   let stat
@@ -143,27 +140,11 @@ async function handleFiles(req: FluxRequest, path: string): Promise<Response> {
     console.log(`[cli] file not found ${path}`)
     return new Response("Not found", { status: 404 })
   }
-
   if (stat.type === "directory") {
-    let dirents = await dir(filePath).entries()
-    let entries = await Promise.all(
-      dirents.map(async (d) => {
-        let entry = { name: d.name, type: d.type === "directory" ? 2 : 1, size: 0, modified: 0 }
-        if (d.type !== "directory") {
-          try {
-            let s = await file(join(filePath, d.name)).stat()
-            entry.size = s.size
-            entry.modified = Math.floor(s.mtime ?? 0)
-          } catch {}
-        }
-        return entry
-      }),
-    )
-    entries.sort((a, b) => a.name.localeCompare(b.name))
-    return Response.json(entries, { headers: { "X-SRT-Type": "directory" } })
+    return new Response("Not found", { status: 404 })
   }
 
-  let baseHeaders: Record<string, string> = { "X-SRT-Type": "file", "Accept-Ranges": "bytes" }
+  let baseHeaders: Record<string, string> = { "Accept-Ranges": "bytes" }
 
   // Honor a single byte-range request (e.g. streaming audio decoding on the
   // client, which seeks and reads on demand). Only the common "bytes=a-b" /
@@ -206,7 +187,7 @@ async function handleFiles(req: FluxRequest, path: string): Promise<Response> {
 
 // Ticket-paired clients connect through this endpoint; serve() accepts its
 // connections directly alongside the TCP listener.
-let tunnel = config.tunnel ? await createTunnelEndpoint(config.port, config.cacheDir) : null
+let tunnel = config.tunnel ? await createTunnelEndpoint(config.port, config.keyDir) : null
 
 serve({
   port: config.port,
@@ -225,7 +206,13 @@ serve({
     if (path.startsWith("/__internal__/")) {
       return handleInternal(req, server, path)
     }
-    return handleFiles(req, path)
+    // The assets/ convention roots at the project dir (package.json), which is
+    // not necessarily the entry's dir the file routes serve; clients fetch
+    // manifest asset paths here (live proxy reads and store installs alike).
+    if (path === "/assets" || path.startsWith("/assets/")) {
+      return handleFiles(req, path, state.projectDir)
+    }
+    return handleFiles(req, path, state.sourceDir)
   },
   websocket: {
     open(ws) {

package/server/rebuild.ts

@@ -10,10 +10,15 @@ import { state } from "./state"
 
 // Build the reload message the same way srt's buildReload does, so a
 // server-triggered reload is indistinguishable from a repl-triggered one to
-// clients. proxyFiles/proxyHttp are message flags, not build inputs.
-function buildReload(code: string) {
+// clients. proxyHttp is a message flag, not a build input.
+function buildReload(code: string, manifest?: string) {
   let config = state.config
-  return { type: "reload", proxyFiles: config.proxyFiles, proxyHttp: config.proxyHttp, code }
+  return {
+    type: "reload",
+    proxyHttp: config.proxyHttp,
+    ...(manifest ? { manifest } : {}),
+    code,
+  }
 }
 
 // Rebuild from state.config.entry via the external bundle-cli subprocess, then
@@ -39,15 +44,15 @@ export async function rebuildAndBroadcast(): Promise<string | null> {
     return `Rebuild failed:\n${stderr.trim()}`
   }
 
-  // bundle-cli writes one JSON object { code, map } to stdout.
-  let bundle: { code?: string; map?: string | null }
+  // bundle-cli writes one JSON object { code, map, manifest } to stdout.
+  let bundle: { code?: string; map?: string | null; manifest?: string }
   try {
     bundle = JSON.parse(typeof result.stdout === "string" ? result.stdout : "")
   } catch {
     return "Rebuild failed: unreadable bundler output"
   }
   state.currentMap = bundle.map ?? null
-  let text = JSON.stringify(buildReload(bundle.code ?? ""))
+  let text = JSON.stringify(buildReload(bundle.code ?? "", bundle.manifest))
   state.currentReload = text
   for (let ws of state.clients.keys()) ws.send(text)
   return null

package/server/state.ts

@@ -7,9 +7,11 @@ export type Config = {
   port: number
   /** Directory served by the file routes (updatable via /__internal__/reload). */
   sourceDir: string
+  /** Project root whose assets/ folder the /assets/ route serves (updatable
+   * via /__internal__/reload, moves with the repl `load`). */
+  projectDir: string
   /** The address clients can reach this machine on (LAN IP or 127.0.0.1). */
   address: string
-  proxyFiles: boolean
   proxyHttp: boolean
   /** The app entry (absolute .tsx/.jsx path) the server rebuilds on an
    * MCP-triggered reload, or undefined when srt was started without a source.
@@ -22,8 +24,10 @@ export type Config = {
   bundlerCmd: string[]
   /** Enable the sqlite-backed proxy cache. */
   cache: boolean
-  /** Directory holding .srt-cache.db. */
+  /** Directory holding the proxy cache db (the project-local .srt-data). */
   cacheDir: string
+  /** Directory holding .srt-tunnel-key (the project root). */
+  keyDir: string
   /** Destination for captured key events, or unset when off. */
   capture?: string
   stats: boolean
@@ -57,6 +61,7 @@ export let state = {
    */
   currentMap: null as string | null,
   sourceDir: "",
+  projectDir: "",
   serverUrl: "",
   stats: false,
   /**

package/server/tunnel.ts

@@ -15,21 +15,21 @@ import { printQr } from "./qr"
 // the handshake instead of desyncing.
 export const TUNNEL_PROTOCOL = "solidrt-dev/0"
 
-// The persisted identity file, project-local next to the HTTP cache. Delete it
-// to rotate the tunnel's identity (which invalidates any old ticket).
+// The persisted identity file, at the project root. Delete it to rotate the
+// tunnel's identity (which invalidates any old ticket).
 const KEY_FILE = ".srt-tunnel-key"
 
 /**
  * Bind the tunnel endpoint and print its ticket (text + QR). The endpoint is
  * kept stable across restarts so a paired client can re-dial the old ticket
  * without re-scanning: the UDP port is pinned to the dev server's port, and the
- * secret key is persisted in <cacheDir>/.srt-tunnel-key (generated on first
+ * secret key is persisted in <keyDir>/.srt-tunnel-key (generated on first
  * run). Both are needed - a moving port or a fresh key each start would change
  * the ticket. Stable across restarts on the same network only; a new machine IP
  * still stales the ticket's addresses (that is the discovery/off-LAN story).
  */
-export async function createTunnelEndpoint(port: number, cacheDir: string): Promise<Endpoint> {
-  let keyPath = join(cacheDir, KEY_FILE)
+export async function createTunnelEndpoint(port: number, keyDir: string): Promise<Endpoint> {
+  let keyPath = join(keyDir, KEY_FILE)
 
   let secretKey: string | undefined
   let keyFile = file(keyPath)

package/src/args.ts

@@ -1,4 +1,5 @@
 import { parseArgs } from "node:util"
+import { resolve } from "node:path"
 
 export let { values, positionals } = parseArgs({
   options: {
@@ -6,9 +7,9 @@ export let { values, positionals } = parseArgs({
     minify: { type: "boolean", short: "m", default: false },
     compile: { type: "boolean", short: "c", default: false },
     flux: { type: "boolean", short: "f", default: false },
+    folder: { type: "boolean", default: false },
     stdout: { type: "boolean", default: false },
     output: { type: "string", short: "o" },
-    "proxy-files": { type: "boolean", default: false },
     "proxy-http": { type: "boolean", default: false },
     fps: { type: "string" },
     duration: { type: "string" },
@@ -17,6 +18,9 @@ export let { values, positionals } = parseArgs({
     capture: { type: "string" },
     tunnel: { type: "boolean", default: false },
     stats: { type: "boolean", default: false },
+    "data-root": { type: "string" },
+    client: { type: "string" },
+    server: { type: "string" },
     android: { type: "boolean", default: false },
     device: { type: "string" },
     template: { type: "string", short: "t" },
@@ -24,6 +28,16 @@ export let { values, positionals } = parseArgs({
   allowPositionals: true,
 })
 
+// Storage flags for a locally spawned client. The data root defaults to the
+// project-local .srt-data so dev state stays with the project; it is passed
+// absolute because the client chdirs into its app sandbox at startup. Remote
+// clients resolve their own local root instead (see lattice/src/storage.rs).
+export function clientStorageArgs(): string[] {
+  let args = ["--data-root", resolve(values["data-root"] ?? ".srt-data")]
+  if (values.client) args.push("--client", values.client)
+  return args
+}
+
 export let command = positionals[0]
 export let source = positionals[1]
 export let isTsx = source?.endsWith(".tsx") || source?.endsWith(".jsx")
@@ -66,6 +80,11 @@ export function validateArgs() {
   if (values.android && command !== "client") {
     usage("srt client --android  (--android is only valid with the client command)")
   }
+  // --server points a standalone client at a dev server; `run` and `server`
+  // own their server side, so it is only valid for `client`.
+  if (values.server && command !== "client") {
+    usage("srt client --server <host[:port]>  (--server is only valid with the client command)")
+  }
 }
 
 export function printUsage() {
@@ -86,7 +105,6 @@ init options:
   -t, --template <name>  Start from a named template (skips the interactive picker)
 
 run/server options:
-      --proxy-files      Route file/dir access through the dev server
       --proxy-http       Route fetch calls through the dev server (HTTP cache enabled)
       --capture <file>   Record connected clients' key events to a script file
       --tunnel           Accept ticket-paired clients through the p2p tunnel
@@ -94,8 +112,11 @@ run/server options:
 run/client options:
       --size <WxH>       Window size (default: 1280x720)
       --stats            Show the debug stats overlay (FPS, memory, frame timings)
+      --data-root <dir>  Client data root (default: ./.srt-data)
+      --client <name>    Client name: its own data dir under the data root (default: "default")
 
 client options:
+      --server <host[:port]>  Connect to a dev server at this address (default port: 34884)
       --android          Install and launch the client on a connected Android device
       --device <serial>  Target a specific adb device by serial or unique prefix
 
@@ -108,6 +129,8 @@ bundle options:
       --stdout           Write bundle to stdout
 
 pack options:
+      --folder           Write the flat app folder (runner + manifest + bundle + assets)
+                         instead of the single-file executable
   -f, --flux             Pack for the bare Flux runtime instead of SolidRT (entry must be .ts|.js)
   -m, --minify           Minify the output
   -o, --output <name>    Output filename

package/src/bundler.ts

@@ -8,6 +8,7 @@ import { readFileSync } from "node:fs"
 import { dirname, resolve as resolvePath } from "node:path"
 import { values, source } from "./args"
 import { state, print, requireBinary } from "./util"
+import { buildManifest } from "./project"
 
 // Babel plugin: rewrite `import data from "./x" with { type: "binary" }` into an
 // inline Uint8Array of the file's bytes. The import attribute is invisible to
@@ -96,6 +97,8 @@ export type BundleResult = {
   code: string
   /** Composed sourcemap JSON (bundle -> original .tsx sources), dev builds only. */
   map: string | null
+  /** Version manifest JSON for this bundle; clients install pushes under its hash. */
+  manifest: string
 }
 
 // The pure bundle: every input is explicit, so it runs identically in the srt
@@ -134,7 +137,8 @@ export async function bundleWith(opts: BundleOptions): Promise<BundleResult | nu
     return null
   }
 
-  return { code: await codeFromOutputs(result.outputs), map: await composeMap(result.outputs, babelMaps) }
+  let code = await codeFromOutputs(result.outputs)
+  return { code, map: await composeMap(result.outputs, babelMaps), manifest: buildManifest(code, opts.entry) }
 }
 
 // Compose Bun's bundle map (babel output -> bundle) with the per-file Babel

package/src/commands/client.ts

@@ -1,11 +1,13 @@
-import { values } from "../args"
+import { values, clientStorageArgs } from "../args"
 import { requireBinary, run } from "../util"
 import { spawnAndroidClient } from "../dev-android"
+import { DEV_PORT } from "../dev-server"
 
 // Standalone solidrt-go client (no dev server). The `run` command instead uses
-// spawnClient() to launch a client tied to the dev-server lifecycle. Either way
-// the client discovers a dev server over the LAN; with --android it is installed
-// and launched on a connected Android device instead of run locally.
+// spawnClient() to launch a client tied to the dev-server lifecycle. --server
+// auto-connects to a dev server at the given address (otherwise the client
+// starts on the connect screen); with --android it is installed and launched
+// on a connected Android device instead of run locally.
 export async function runClientCommand() {
   if (values.android) {
     await spawnAndroidClient()
@@ -13,10 +15,12 @@ export async function runClientCommand() {
   }
 
   let runner = requireBinary("solidrt-go")
-  let args: string[] = []
+  let args: string[] = [...clientStorageArgs()]
   if (values.size) args.push("--size", values.size)
-  //TODO add dev server connection
-  // if (source) args.push("--dev-server", source)
+  if (values.server) {
+    let address = values.server.includes(":") ? values.server : `${values.server}:${DEV_PORT}`
+    args.push("--dev-server", address)
+  }
   let exit = await run(runner, args)
   process.exit(exit)
 }

package/src/commands/init.ts

@@ -139,6 +139,12 @@ export async function runInitCommand() {
     console.log(`   Write src/${file}`)
   }
 
+  // The assets/ convention folder, created up front: everything in it ships
+  // with the app, and the dev watcher only picks up an assets/ folder that
+  // exists when it starts.
+  await mkdir(join(dir, "assets"), { recursive: true })
+  console.log("   Write assets/")
+
   // The scaffold package.json carries a placeholder name; set it from the
   // target folder. A core-level app gets no component framework dependency.
   let pkgPath = join(dir, "package.json")