mindwire 0.1.26 → 0.1.28

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { defaultStateDirectory, superviseComputer, ensureComputer, computerPairingURI, stopComputer, computerClient, SDK_VERSION, readJSON, writeJSON, currentProcessIdentity, processStateAlive, acquireProcessLock, computerPairingQRData } from './chunk-L3USUTZZ.js';
+import { defaultStateDirectory, superviseComputer, ensureComputer, computerPairingURI, stopComputer, computerClient, SDK_VERSION, readJSON, writeJSON, currentProcessIdentity, processStateAlive, acquireProcessLock, computerPairingQRData } from './chunk-5WYSGXFN.js';
 import './chunk-T6TD76UA.js';
 import { promisify, parseArgs } from 'util';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -7,16 +7,18 @@ import { realpathSync, mkdtempSync, chmodSync, writeFileSync, rmSync } from 'fs'
 import * as path from 'path';
 import { join } from 'path';
 import { createHash } from 'crypto';
+import { hostname, homedir, tmpdir } from 'os';
 import { createInterface } from 'readline/promises';
 import { setTimeout as setTimeout$1 } from 'timers/promises';
 import { execFile, spawn } from 'child_process';
-import { homedir, tmpdir } from 'os';
 import * as fs from 'fs/promises';
 
 var enterScreen = "\x1B[?1049h\x1B[?25l";
 var leaveScreen = "\x1B[0m\x1B[?25h\x1B[?1049l";
 var clearScreen = "\x1B[H\x1B[2J";
-var scanInstruction = "Mindwire \u2192 Add computer \u2192 Scan QR code";
+function scanInstruction(invitation) {
+  return "mode" in invitation && invitation.mode === "reconnect" ? "Workspaces \u2192 your computer \u2192 Reconnect Computer \u2192 Scan Connection Code" : "Mindwire \u2192 Add computer \u2192 Scan QR code";
+}
 async function createPairingQR(invitation) {
   const QR = await import('qrcode');
   const data = computerPairingQRData(invitation);
@@ -34,16 +36,18 @@ async function createPairingQR(invitation) {
     lines.push("\x1B[30;107m" + line + "\x1B[0m");
   }
   const svg = await QR.toString(data, { ...options, type: "svg" });
-  return { lines, columns: Math.max(width, scanInstruction.length) + 1, rows: lines.length + 5, svg };
+  return { lines, columns: Math.max(width, scanInstruction(invitation).length) + 1, rows: lines.length + 5, svg };
 }
 function escapeHTML(value) {
   return value.replace(/[&<>"']/g, (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[ch]);
 }
 function browserPage(invitation, svg) {
+  const reconnect = "mode" in invitation && invitation.mode === "reconnect";
+  const title = reconnect ? "Reconnect your phone" : "Connect your phone";
   return `<!doctype html>
 <html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'unsafe-inline'; base-uri 'none'; form-action 'none'">
-<title>Connect your phone \xB7 Mindwire</title>
+<title>${title} \xB7 Mindwire</title>
 <style>
 *{box-sizing:border-box}body{margin:0;background:#141416;color:#f5f5f7;font:16px/1.5 system-ui,sans-serif}
 main{width:min(100% - 40px,520px);margin:32px auto;text-align:center}small{color:#a6a6af;letter-spacing:.16em}
@@ -55,18 +59,18 @@ button:disabled{opacity:.45;cursor:default}button:focus-visible{outline:3px soli
 textarea{width:100%;margin-top:12px;padding:8px;color:inherit;background:#252528;border:1px solid #45454b;border-radius:8px}
 [hidden]{display:none!important}#expiry{font-size:14px}footer{font-size:13px;color:#93939d;margin:18px 0}
 </style></head><body><main>
-<small>MINDWIRE</small><h1>Connect your phone</h1><p>${escapeHTML(invitation.name)}</p>
-<div class="code" id="code" role="img" aria-label="Mindwire pairing QR code">${svg}</div>
+<small>MINDWIRE</small><h1>${title}</h1><p>${escapeHTML(invitation.name)}</p>
+<div class="code" id="code" role="img" aria-label="Mindwire connection QR code">${svg}</div>
 <p id="expiry" data-expires="${escapeHTML(invitation.expiresAt)}" aria-live="off"></p>
-<div class="steps"><p>In Mindwire, open <strong>Add computer</strong> and scan.</p>
-<p>Then return to the terminal to approve your phone.</p></div>
-<button type="button" id="copy">Copy pairing link</button>
+<div class="steps"><p>${reconnect ? "In Mindwire, open your computer in <strong>Workspaces</strong>, then <strong>Reconnect Computer \u2192 Scan Connection Code</strong>." : "In Mindwire, open <strong>Add computer</strong> and scan."}</p>
+<p>${reconnect ? "Your saved pairing and workspace stay the same. No new approval is needed." : "Then return to the terminal to approve your phone."}</p></div>
+<button type="button" id="copy">Copy ${reconnect ? "reconnect" : "pairing"} link</button>
 <textarea id="link" readonly hidden aria-label="Pairing link">${escapeHTML(computerPairingURI(invitation))}</textarea>
-<footer>You can close this page after pairing.</footer>
+<footer>You can close this page after ${reconnect ? "reconnecting" : "pairing"}.</footer>
 </main><script>
 const expiry=document.getElementById('expiry'),code=document.getElementById('code'),copy=document.getElementById('copy'),link=document.getElementById('link');
 function tick(){const seconds=Math.max(0,Math.ceil((Date.parse(expiry.dataset.expires)-Date.now())/1000));
-if(!seconds){code.remove();copy.disabled=true;link.value='';link.hidden=true;expiry.textContent='Code expired. Run mindwire connect for a new code.';return;}
+if(!seconds){code.remove();copy.disabled=true;link.value='';link.hidden=true;expiry.textContent='Code expired. Run mindwire ${reconnect ? "reconnect" : "connect pair"} for a new code.';return;}
 expiry.textContent='Expires in '+Math.floor(seconds/60)+':'+String(seconds%60).padStart(2,'0');}
 tick();setInterval(tick,1000);
 copy.addEventListener('click',async()=>{try{await navigator.clipboard.writeText(link.value);copy.textContent='Copied';}
@@ -90,16 +94,22 @@ async function openBrowser(url) {
   });
 }
 async function showPairingInvitation(invitation, options = {}) {
+  const reconnect = "mode" in invitation && invitation.mode === "reconnect";
+  const instruction = scanInstruction(invitation);
+  const nextStep = reconnect ? "Scan with a saved phone, then press Enter here." : "Return here to approve your phone.";
+  const waiting = reconnect ? "Your saved pairing stays the same." : "Waiting for your phone\u2026";
+  const command = reconnect ? "mindwire reconnect" : "mindwire connect pair";
   const output = options.output ?? process.stdout;
   const environment = options.environment ?? process.env;
   const mode = options.mode ?? "auto";
   const interactive = !!output.isTTY && environment.TERM !== "dumb";
   const linkOnly = mode === "none" || !interactive && mode !== "browser";
   if (linkOnly) {
-    output.write(`Paste this link in Mindwire \u2192 Add computer (expires in 5 minutes):
+    const destination = reconnect ? "Workspaces \u2192 your computer \u2192 Reconnect Computer" : "Add computer";
+    output.write(`Paste this link in Mindwire \u2192 ${destination} (expires in 5 minutes):
 ${computerPairingURI(invitation)}
 
-Waiting for your phone\u2026
+${waiting}
 `);
     return { close() {
     } };
@@ -115,10 +125,10 @@ Waiting for your phone\u2026
     if (closed || !useScreen) return;
     let lines;
     if (fits()) {
-      lines = [scanInstruction, "", ...qr.lines, "", "Waiting for your phone\u2026"];
+      lines = [instruction, "", ...qr.lines, "", waiting];
     } else {
       const size = `Terminal QR needs ${qr.columns} columns \xD7 ${qr.rows} rows.`;
-      lines = browser === "opened" ? ["QR opened in your browser.", scanInstruction, "Return here to approve your phone."] : browser === "opening" ? ["Opening a resizable QR in your browser\u2026", "Return here to approve your phone."] : browser === "failed" ? ["Couldn't open a browser here.", size, "Enlarge this terminal, or run:", "mindwire connect --no-qr"] : [size, "Enlarge this terminal, or use --qr browser."];
+      lines = browser === "opened" ? ["QR opened in your browser.", instruction, nextStep] : browser === "opening" ? ["Opening a resizable QR in your browser\u2026", nextStep] : browser === "failed" ? ["Couldn't open a browser here.", size, "Enlarge this terminal, or run:", `${command} --no-qr`] : [size, "Enlarge this terminal, or use --qr browser."];
       lines = lines.map((line) => line.slice(0, Math.max(0, (output.columns ?? 80) - 1))).slice(0, Math.max(0, (output.rows ?? 24) - 1));
     }
     output.write(clearScreen + lines.join("\r\n"));
@@ -143,12 +153,12 @@ Waiting for your phone\u2026
       if (closed) return;
       if (useScreen) draw();
       else output.write(browser === "opened" ? `QR opened in your browser.
-${scanInstruction}
-Return here to approve your phone.
+${instruction}
+${nextStep}
 ` : `Open this local QR page in a browser:
-${pageURL ?? "Page unavailable. Run mindwire connect --no-qr for a pairing link."}
+${pageURL ?? `Page unavailable. Run ${command} --no-qr for a link.`}
 
-Waiting for your phone\u2026
+${waiting}
 `);
     })();
     return browserAttempt;
@@ -401,11 +411,79 @@ async function watchComputer(directory, cliPath) {
   }
 }
 
+// src/computer/connection-flow.ts
+function connectionAction(value) {
+  if (value === void 0) return void 0;
+  if (value === "resume" || value === "reconnect" || value === "pair") return value;
+  throw new Error("Use mindwire connect, mindwire connect resume, mindwire reconnect, or mindwire connect pair.");
+}
+async function chooseConnectionAction(options) {
+  const paired = options.devices.filter((device) => !device.revoked);
+  if (options.requested) {
+    if (options.requested !== "pair" && paired.length === 0) {
+      throw new Error("No saved phones yet. Run mindwire connect to pair one first.");
+    }
+    return options.requested;
+  }
+  if (paired.length === 0) return "pair";
+  if (!options.question) return "resume";
+  for (; ; ) {
+    const answer = (await options.question(
+      "\n  1  Resume saved connection\n  2  Refresh address on a saved phone (QR)\n  3  Pair another phone\n\nChoose [1]: "
+    )).trim().toLowerCase();
+    if (answer === "" || answer === "1" || answer === "resume") return "resume";
+    if (answer === "2" || answer === "reconnect") return "reconnect";
+    if (answer === "3" || answer === "pair") return "pair";
+  }
+}
+async function chooseStartupAction(options) {
+  if (options.startup && options.noStartup) throw new Error("Choose either --startup or --no-startup.");
+  if (options.startup) return !options.state.enabled || !options.state.running ? true : void 0;
+  if (options.noStartup) return options.state.kind ? void 0 : false;
+  if (options.state.kind) return options.state.enabled && !options.state.running ? true : void 0;
+  if (!options.question) return void 0;
+  for (; ; ) {
+    const answer = (await options.question(
+      "\nStart Mindwire automatically after you sign in to this computer? [Y/n] "
+    )).trim().toLowerCase();
+    if (["", "y", "yes"].includes(answer)) return true;
+    if (["n", "no"].includes(answer)) return false;
+  }
+}
+function reconnectCode(info, name, now = /* @__PURE__ */ new Date()) {
+  if (info.routes.length === 0) throw new Error("No connection address is ready. Run mindwire status and retry once the tunnel is online.");
+  return {
+    version: 1,
+    mode: "reconnect",
+    computerId: info.computerId,
+    registryId: info.registryId,
+    fingerprint: info.fingerprint,
+    name,
+    routes: info.routes,
+    expiresAt: new Date(now.getTime() + 5 * 6e4).toISOString()
+  };
+}
+function deviceSummary(devices) {
+  const saved = devices.filter((device) => !device.revoked);
+  const names = /* @__PURE__ */ new Map();
+  const safeName2 = (device) => device.name.replace(/[\x00-\x1f\x7f-\x9f]/g, "");
+  for (const device of saved) names.set(safeName2(device), (names.get(safeName2(device)) ?? 0) + 1);
+  return saved.sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id)).map((device) => {
+    const name = safeName2(device);
+    const status = device.connected === true ? "connected" : "paired";
+    const identity = (names.get(name) ?? 0) > 1 ? ` \xB7 key ${device.id.slice(0, 8)}` : "";
+    return `  ${name} \xB7 ${status}${identity}`;
+  }).join("\n");
+}
+
 // src/cli.ts
 var help = `Mindwire \u2014 connect this computer to your phone
 
   npm install -g mindwire
-  mindwire connect                       Connect across networks, show QR, approve phone
+  mindwire connect                       Resume a saved connection, or pair your first phone
+  mindwire connect resume                Resume without creating another pairing
+  mindwire reconnect                     Refresh a saved phone's address with a QR code
+  mindwire connect pair                  Pair another phone with this computer
   mindwire connect --relay none --host laptop.tailnet  Use your existing VPN
   mindwire connect --relay none           Direct SSH only (reachable network required)
   mindwire connect --relay cloudflare     Cloudflare quick tunnel
@@ -431,7 +509,8 @@ Options:
   --json                                 Structured output (QR invitation includes a secret)
   --qr auto|terminal|browser              Fit the QR to your terminal or open a local page
   --no-qr                                Print only the pairing link
-  --no-startup                           Pair without changing automatic startup
+  --startup                              Enable automatic startup without a prompt
+  --no-startup                            Skip automatic startup setup
 
 The default works across Wi-Fi and mobile networks. Mindwire privately downloads
 a verified Cloudflare helper when needed. Relays carry encrypted SSH.
@@ -460,6 +539,7 @@ async function main(args = process.argv.slice(2)) {
     "websocket-port": { type: "string" },
     version: { type: "string" },
     force: { type: "boolean" },
+    startup: { type: "boolean" },
     "no-startup": { type: "boolean" }
   } });
   const command = positionals[0] ?? "help";
@@ -468,6 +548,7 @@ async function main(args = process.argv.slice(2)) {
     return;
   }
   if (values.qr && !["auto", "terminal", "browser"].includes(values.qr)) throw new Error("Choose --qr auto, terminal or browser.");
+  if (values.startup && values["no-startup"]) throw new Error("Choose either --startup or --no-startup.");
   const directory = path.resolve(values["state-dir"] ?? defaultStateDirectory());
   const emit = (event, data = {}, text) => {
     if (values.json) process.stdout.write(JSON.stringify({ event, ...data }) + "\n");
@@ -488,7 +569,8 @@ async function main(args = process.argv.slice(2)) {
     emit("startup", state, state.enabled ? "Mindwire starts after you sign in to this computer and recovers automatically." : "Automatic startup is off. Use mindwire start to run the service.");
     return;
   }
-  if (["connect", "start"].includes(command)) {
+  if (["connect", "start", "reconnect"].includes(command)) {
+    const requestedAction = command === "reconnect" ? "reconnect" : command === "connect" ? connectionAction(positionals[1]) : void 0;
     const patch = {};
     if (values.directory) patch.directory = path.resolve(values.directory);
     if (values.host) patch.host = values.host;
@@ -521,22 +603,71 @@ async function main(args = process.argv.slice(2)) {
     const info = await client2.computer.info();
     emit("ready", { computerId: info.computerId, routes: info.routes }, "Mindwire is running in the background.");
     if (command === "start") return;
+    if (info.routes.some((route) => route.kind === "websocket")) {
+      emit("secure_connection", {}, "Your phone connects over end-to-end encrypted SSH. The tunnel carries encrypted traffic; only phones you approve can connect.");
+    }
+    const devices = await client2.computer.devices();
+    const saved = devices.filter((device) => !device.revoked);
+    if (saved.length) emit("saved_devices", { devices: saved }, `
+Saved phones
+${deviceSummary(saved)}`);
+    const question = !values.json && process.stdin.isTTY ? async (prompt) => {
+      const input = createInterface({ input: process.stdin, output: process.stderr });
+      try {
+        return await input.question(prompt);
+      } finally {
+        input.close();
+      }
+    } : void 0;
+    const action = await chooseConnectionAction({ requested: requestedAction, devices, question });
     const startupPreference = await startupStatus(directory);
-    if (!values["no-startup"] && (startupPreference.enabled || !startupPreference.kind)) {
+    const startupAction = await chooseStartupAction({
+      state: startupPreference,
+      startup: values.startup,
+      noStartup: values["no-startup"],
+      question: action === "pair" && saved.length === 0 ? question : void 0
+    });
+    if (startupAction !== void 0) {
       try {
-        const startup = await configureStartup(directory, fileURLToPath(import.meta.url), true);
-        emit("startup", startup, "Automatic startup enabled. Mindwire will recover after you sign in to this computer.");
+        const startup = await configureStartup(directory, fileURLToPath(import.meta.url), startupAction);
+        emit("startup", startup, startup.enabled ? "Automatic startup enabled. Saved phones can reconnect after you sign in to this computer." : "Automatic startup is off. Run mindwire connect after restarting, or mindwire startup enable to change this.");
       } catch {
-        emit("startup_unavailable", {}, "Mindwire is running, but automatic startup couldn't be enabled. Run mindwire startup enable to check your system's startup service.");
+        emit("startup_unavailable", {}, "Mindwire is running, but startup setup didn't complete. Run mindwire startup enable to check your system's startup service.");
       }
+    } else {
+      emit("startup", startupPreference, startupPreference.enabled ? "Automatic startup is on. Change it with mindwire startup disable." : "Automatic startup is off. Enable it with mindwire startup enable.");
     }
-    if (info.routes.some((route) => route.kind === "websocket")) {
-      emit("secure_connection", {}, "Your phone connects over end-to-end encrypted SSH. The tunnel carries encrypted traffic; only phones you approve can connect.");
+    if (action === "resume") {
+      emit("resumed", { computerId: info.computerId, devices: saved }, "\nReady for your saved phone. Open this computer in Mindwire.");
+      if (info.routes.some((route) => route.kind === "websocket" && new URL(route.url).hostname.endsWith(".trycloudflare.com"))) {
+        emit("reconnect_hint", {}, "If its temporary tunnel address changed, run mindwire reconnect to refresh your phone.");
+      }
+      return;
     }
-    if (info.routes.some((route) => route.kind === "websocket" && new URL(route.url).hostname.endsWith(".trycloudflare.com"))) {
-      emit("temporary_address", {}, "Cloudflare internet access is ready. For a permanent address, configure a named Cloudflare tunnel or your VPN; a free temporary address can change after a tunnel restart.");
+    if (action === "reconnect") {
+      const code = reconnectCode(await client2.computer.info(), hostname());
+      emit("reconnect_code", { code, uri: computerPairingURI(code) });
+      if (values.json) return;
+      emit("reconnect_instructions", {}, "\nOn your iPhone: Workspaces \u2192 your computer \u2192 Reconnect Computer \u2192 Scan Connection Code.\nThis refreshes the saved connection; it does not pair another phone.");
+      const display2 = await showPairingInvitation(code, {
+        mode: values["no-qr"] ? "none" : values.qr ?? "auto"
+      });
+      try {
+        if (question) await question("\nScan with your saved phone, then press Enter to close this code. ");
+        else if (values.qr === "browser") {
+          emit("waiting", {}, "This code stays open until it expires. Press Ctrl+C to close it; Mindwire keeps running.");
+          await setTimeout$1(Math.max(0, Date.parse(code.expiresAt) - Date.now()));
+        }
+      } finally {
+        display2.close();
+      }
+      const connected = (await client2.computer.devices()).filter((device) => !device.revoked && device.connected);
+      emit(connected.length ? "connected" : "waiting_for_phone", { computerId: info.computerId, devices: connected }, connected.length ? `Connected:
+${deviceSummary(connected)}
+Mindwire continues running in the background.` : "Mindwire is running. Open Reconnect Computer on your iPhone and scan the code to refresh its address.");
+      return;
     }
-    const invitation = await client2.computer.invite(info.routes);
+    const invitation = await client2.computer.invite((await client2.computer.info()).routes);
     const uri = computerPairingURI(invitation);
     emit("invitation", { invitation, uri });
     const display = values.json ? void 0 : await showPairingInvitation(invitation, {