@rubytech/create-maxy-lite 0.1.2 → 0.1.3

package/index.mjs

@@ -23,7 +23,7 @@ import { fileURLToPath } from 'node:url'
 
 import { makeLog } from './lib/log.mjs'
 import { readPins } from './lib/pins.mjs'
-import { PATHS, WEBCHAT_DIR, VALIDATOR_CLI, launcherPath, launcherScript } from './lib/paths.mjs'
+import { PATHS, WEBCHAT_DIR, VALIDATOR_CLI, launcherPath, launcherScript, payloadLayCommand } from './lib/paths.mjs'
 import { orchestrate, STEP_NAMES } from './lib/orchestrate.mjs'
 import { claudeOk, validatorOk, vaultOk, webchatOk, healthcheck } from './lib/healthcheck.mjs'
 
@@ -73,11 +73,9 @@ const runStream = (cmd) => spawnStreaming('bash', ['-lc', cmd])
 const runInStream = (cmd) => spawnStreaming('proot-distro', ['login', PATHS.distro, '--', 'bash', '-lc', cmd])
 
 // ---- filesystem primitives --------------------------------------------------
-// The Ubuntu rootfs is a normal directory under the Termux prefix, so the app
-// payload is copied into it directly from bionic Node (no proot round-trip).
-
-const rootfs = `${PREFIX}/var/lib/proot-distro/installed-rootfs/${PATHS.distro}`
-const appHostPath = `${rootfs}${PATHS.appDir}` // appDir is absolute inside the rootfs
+// Host-side fs is used only for genuine host paths (the Termux-prefix launcher
+// and the shared-storage vault). The app payload lands inside the rootfs through
+// proot (see layPayload), never via a reconstructed host rootfs path.
 
 const existsHost = (p) => fs.existsSync(p)
 const mkdirHost = (p) => fs.mkdirSync(p, { recursive: true })
@@ -101,10 +99,12 @@ const storageAccessible = () => {
 const interactive = Boolean(process.stdin.isTTY)
 const STORAGE_POLL_MS = 3000
 
-/** Copy the bundled app payload into the Ubuntu rootfs (idempotent overwrite). */
+/** Lay the bundled app payload into the guest's appDir through proot (idempotent overwrite). */
+// Delivered via a proot bind + guest-side copy so the payload lands in whatever
+// rootfs proot-distro actually uses — no host-side guess at the rootfs location.
 const layPayload = () => {
-  fs.mkdirSync(appHostPath, { recursive: true })
-  fs.cpSync(PAYLOAD, appHostPath, { recursive: true })
+  const r = run(payloadLayCommand({ payloadHost: PAYLOAD }))
+  if (r.code !== 0) throw new Error(`payload lay failed: ${r.stderr.replace(/\s+/g, ' ').trim()}`)
 }
 
 /** Install the app deps (validator's js-yaml) and the webchat deps (node-pty, ws). */

package/lib/paths.mjs

@@ -21,6 +21,25 @@ export const PATHS = {
 export const WEBCHAT_DIR = `${PATHS.appDir}/webchat`
 export const VALIDATOR_CLI = `${PATHS.appDir}/validator/cli.mjs`
 
+// Where the host payload is bind-mounted inside the guest while it is copied into
+// place. A throwaway path under the rootfs's own /tmp, distinct from the app dir.
+export const PAYLOAD_STAGE = '/tmp/maxy-lite-payload'
+
+/**
+ * The bare-Termux command that lays the bundled app payload into the guest's
+ * `appDir`. It binds the host payload directory into the guest under `stage`,
+ * then copies it guest-side — so the payload always lands in whatever rootfs
+ * proot-distro actually uses, with no host-side guess at the rootfs location.
+ * `payloadHost` is the only environment-dependent path (the npm package's
+ * `payload/`), so it is single-quoted; `stage` and `appDir` are pinned constants.
+ */
+export function payloadLayCommand({ payloadHost, distro = PATHS.distro, stage = PAYLOAD_STAGE, appDir = PATHS.appDir }) {
+  return (
+    `proot-distro login ${distro} --bind '${payloadHost}':${stage} -- ` +
+    `bash -lc 'mkdir -p ${appDir} && cp -a ${stage}/. ${appDir}/'`
+  )
+}
+
 /** Absolute path of the `maxy-lite` launcher in the Termux bin dir. */
 export function launcherPath(prefix = process.env.PREFIX || '/data/data/com.termux/files/usr') {
   return `${prefix}/bin/maxy-lite`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-lite",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Install maxy-lite on an Android phone: orchestrates proot-distro Ubuntu, glibc Node, claude, the web-chat relay, the vault and its bind-mount — run via npx in bare Termux.",
   "type": "module",
   "engines": {