mindwire 0.1.52 → 0.1.53

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { enableAddressDiscovery, disableAddressDiscovery, discoveryDescription, connectionAddress, saveDiscoveryPreference, discoveryPreference, reconcileAddressDiscovery, connectionInfo, connectionDescription, updateComputer, updateProgress, activeUpdate } from './chunk-RTMQJIKW.js';
-import { SDK_VERSION, defaultStateDirectory, computerClient, superviseComputer, ensureComputer, readJSON, defaultComputerConfig, computerPairingURI, stopComputer, processStateAlive, providerFailure, acquireProcessLock, writeJSON, currentProcessIdentity, CONTROLLER_PROTOCOL, versionAtLeast, websocketURL, providerNeedsAction, cloudflareCommand, computerPairingQRData, ProviderConnectionError } from './chunk-4XL565EU.js';
+import { enableAddressDiscovery, disableAddressDiscovery, discoveryDescription, connectionAddress, saveDiscoveryPreference, discoveryPreference, reconcileAddressDiscovery, connectionInfo, updateComputer, updateProgress, activeUpdate } from './chunk-MZ4OTZFH.js';
+import { SDK_VERSION, defaultStateDirectory, computerClient, superviseComputer, ensureComputer, readJSON, defaultComputerConfig, computerPairingURI, stopComputer, processStateAlive, providerFailure, acquireProcessLock, writeJSON, currentProcessIdentity, CONTROLLER_PROTOCOL, versionAtLeast, websocketURL, providerNeedsAction, cloudflareCommand, computerPairingQRData, ProviderConnectionError } from './chunk-O5DWL7MH.js';
 import { ApiError } from './chunk-PFYKJ6LX.js';
 import { promisify, parseArgs } from 'util';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -22,7 +22,7 @@ var enterScreen = "\x1B[?1049h\x1B[?25l";
 var leaveScreen = "\x1B[0m\x1B[?25h\x1B[?1049l";
 var clearScreen = "\x1B[H\x1B[2J";
 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";
+  return "mode" in invitation && invitation.mode === "reconnect" ? "Workspaces \u2192 your computer \u2192 Reconnect Computer \u2192 Scan Connection Code" : "In Mindwire on your phone, tap Scan QR code.";
 }
 async function createPairingQR(invitation) {
   const QR = await import('qrcode');
@@ -67,15 +67,15 @@ textarea{width:100%;margin-top:12px;padding:8px;color:inherit;background:#252528
 <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>${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." : "Saved keys reconnect automatically. Approve on this computer only if asked."}</p></div>
+<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 on your phone, tap <strong>Scan QR code</strong>."}</p>
+<p>${reconnect ? "Your saved pairing stays the same." : "Then approve your phone in the terminal."}</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 ${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 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';}
@@ -103,7 +103,7 @@ async function showPairingInvitation(invitation, options = {}) {
   const instruction = scanInstruction(invitation);
   const nextStep = reconnect ? "Scan with a saved phone." : "Approve on this computer only if asked.";
   const waiting = reconnect ? "Your saved pairing stays the same." : "Waiting for your phone\u2026";
-  const command = "mindwire connect";
+  const command = "mindwire connect pair";
   const output = options.output ?? process.stdout;
   const environment = options.environment ?? process.env;
   const mode = options.mode ?? "auto";
@@ -1229,8 +1229,8 @@ async function computerDashboard(directory, run2) {
     const saved = state.devices.filter((device) => !device.revoked);
     const running = state.service === "running";
     const action = await chooseTerminal([...inspectionText(state).split("\n"), "", "Manage this computer"], [
-      { value: "reconnect", label: running ? "Reconnect" : "Start connection" },
-      { value: "pair", label: "Pair or repair a phone" },
+      { value: "pair", label: "Show QR code \xB7 connect a phone" },
+      { value: "reconnect", label: running ? "Retry saved connections" : "Start connection" },
       { value: "devices", label: `Phones${saved.length ? ` \xB7 ${saved.length} paired` : ""}` },
       { value: "startup", label: `Start at login \xB7 ${state.startup.enabled ? state.startup.running ? "On" : "Needs repair" : "Off"}` },
       { value: "connection", label: "Connection provider" },
@@ -1261,7 +1261,7 @@ async function computerDashboard(directory, run2) {
           break;
         case "devices": {
           if (!saved.length) {
-            process.stdout.write("No paired phones. Choose Pair or repair a phone to connect one.\n");
+            process.stdout.write("No paired phones. Choose Show QR code to connect one.\n");
             break;
           }
           const id = await chooseTerminal("Paired phones", saved.map((device2) => ({ value: device2.id, label: deviceSummary([device2], true).trim() })));
@@ -1324,7 +1324,6 @@ async function computerDashboard(directory, run2) {
       process.stderr.write(`Mindwire: ${terminalText(error instanceof Error ? error.message : String(error))}
 `);
     }
-    if (!await chooseTerminal("", [{ value: "continue", label: "Back to Mindwire" }])) return;
   }
 }
 function desktopSummary(info) {
@@ -1423,7 +1422,7 @@ var help = `Mindwire \u2014 connect this computer to your phone
   mindwire                               Interactive status and connection controls
   mindwire connect                       Connect your phone; saved keys reconnect automatically
   mindwire reconnect                     Retry the saved connection
-  mindwire connect pair                  Pair a phone, or repair a lost phone key/address
+  mindwire connect pair                  Show a QR code to pair or reconnect a phone
   mindwire connection                    Choose a persistent connection provider
   mindwire connection automatic          Cloudflare traffic with encrypted Mindwire address recovery
   mindwire connection oblien             Sign in and use an Oblien tunnel
@@ -1652,18 +1651,18 @@ async function main(args = process.argv.slice(2)) {
     }
     const info = await client2.computer.info();
     const connection = connectionInfo(savedConfig?.relay ?? { kind: "cloudflare" }, savedConfig?.host);
-    emit("ready", { computerId: info.computerId, routes: info.routes, connection }, "Mindwire is running in the background.");
-    emit("connection", connection, info.discovery?.enabled && connection.address === "temporary" ? "Cloudflare \xB7 encrypted Mindwire address recovery" : connectionDescription(connection));
+    emit("ready", { computerId: info.computerId, routes: info.routes, connection }, "Mindwire is running.");
+    emit("connection", connection);
     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.");
+      emit("secure_connection");
     }
     const devices = await client2.computer.devices();
     const saved = devices.filter((device) => !device.revoked);
     if (addressChanged && !saved.some((device) => device.addressRecovery)) requestedAction = "pair";
-    if (info.discovery?.enabled) emit("discovery", info.discovery, discoveryDescription(info.discovery));
+    if (info.discovery?.enabled) emit("discovery", info.discovery);
     if (saved.length) emit("saved_devices", { devices: saved }, `
-Saved approvals on this computer
+Saved phones
 ${deviceSummary(saved)}`);
     const question2 = !values.json && process.stdin.isTTY ? async (prompt) => {
       const input = createInterface({ input: process.stdin, output: process.stderr });
@@ -1684,21 +1683,18 @@ ${deviceSummary(saved)}`);
     if (startupAction !== void 0) {
       try {
         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.");
+        emit("startup", startup, startup.enabled ? "Start at login: On" : "Start at login: Off. Enable with mindwire startup enable.");
       } catch {
         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 ? startupPreference.running ? "Automatic startup is on. Change it with mindwire startup disable." : "Automatic startup needs repair. Run mindwire startup repair." : "Automatic startup is off. Enable it with mindwire startup enable.");
+      emit("startup", startupPreference, startupPreference.enabled ? startupPreference.running ? "Start at login: On" : "Automatic startup needs repair. Run mindwire startup repair." : "Start at login: Off. Enable with mindwire startup enable.");
     }
     if (action === "resume") {
       const connected = saved.filter((device) => device.connected);
-      if (connected.length) emit("connected", { computerId: info.computerId, devices: connected }, `
-Connected:
-${deviceSummary(connected)}
-Mindwire continues running in the background.`);
-      else emit("waiting_for_phone", { computerId: info.computerId }, "\nReady for your saved phone. Open Mindwire; it will retry this computer's saved connection.");
-      emit("connect_hint", {}, "If the connection was removed from your phone, run mindwire connect pair to scan again.");
+      if (connected.length) emit("connected", { computerId: info.computerId, devices: connected }, "\nYour phone is connected.");
+      else emit("waiting_for_phone", { computerId: info.computerId }, "\nOpen Mindwire on your phone and choose your saved computer.");
+      emit("connect_hint", {}, "Need a QR code? Run mindwire connect pair.");
       return;
     }
     const invitation = await client2.computer.invite((await client2.computer.info()).routes);