mindwire 0.1.29 → 0.1.32

package/dist/{chunk-QPZMGVY7.js → chunk-5X5PAFM7.js}

@@ -79,7 +79,16 @@ function computerPairingURI(invitation) {
 }
 
 // src/version.ts
-var SDK_VERSION = "0.1.29" ;
+var SDK_VERSION = "0.1.32" ;
+function versionAtLeast(actual, desired) {
+  if (actual === desired) return true;
+  if (!actual || !/^\d+\.\d+\.\d+$/.test(actual) || !/^\d+\.\d+\.\d+$/.test(desired)) return false;
+  const a = actual.split(".").map(Number), b = desired.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (a[i] !== b[i]) return a[i] > b[i];
+  }
+  return true;
+}
 
 // src/daemon-binary.ts
 function supported(platform, arch) {
@@ -742,6 +751,10 @@ var WorkspaceApi = class {
   snapshot(options = {}) {
     return this.mw.http.request("GET", "/workspace", { query: options });
   }
+  /** Read the saved icon, or preview a candidate relative path within the project. Requires projectIconsVersion >= 1. */
+  projectIcon(projectId, path2) {
+    return this.mw.http.request("GET", `/workspace/projects/${encodeURIComponent(projectId)}/icon`, { query: { path: path2 } });
+  }
   /** Start an operation owned by the daemon. The same ID/payload returns the existing operation. */
   createProject(request) {
     return this.mw.http.request("POST", "/workspace/projects", { body: request });
@@ -798,7 +811,7 @@ var GitAccessApi = class {
   run(projectId, operation, auth) {
     return this.mw.http.request("POST", `/workspace/projects/${encodeURIComponent(projectId)}/git/${operation}`, { body: { auth } });
   }
-  /** Requires health.gitOperationsVersion >= 1 (>= 2 for branches, >= 4 for restore_commit). Acceptance persists before Git runs;
+  /** Requires health.gitOperationsVersion >= 1 (>= 2 for switch/create, >= 4 for restore_commit, >= 5 for rename/delete). Acceptance persists before Git runs;
    * disconnecting only detaches the client. The same ID/intent never runs twice.
    */
   start(projectId, request) {
@@ -808,7 +821,7 @@ var GitAccessApi = class {
     const result = await this.mw.http.request(
       "GET",
       `/workspace/projects/${encodeURIComponent(projectId)}/git/operations`,
-      { query: { active: activeOnly, actionsVersion: 4 } }
+      { query: { active: activeOnly, actionsVersion: 5 } }
     );
     return result.operations;
   }
@@ -1884,6 +1897,7 @@ async function acquireProcessLock(file, options = {}) {
 }
 
 // src/computer/lifecycle.ts
+var CONTROLLER_PROTOCOL = 2;
 var defaultStateDirectory = () => path.join(homedir(), ".mindwire", "computer");
 var defaultComputerConfig = () => ({ directory: homedir(), bind: "0.0.0.0", sshPort: 8791, websocketPort: 8792, relay: { kind: "cloudflare" } });
 async function readJSON(file) {
@@ -1938,41 +1952,48 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
   const configPath = path.join(directory, "computer-config.json");
   const previous = await readJSON(configPath);
   const config = { ...defaultComputerConfig(), ...previous, ...patch };
+  const requestedAt = resume ? Date.now() : 0;
+  if (resume) await writeJSON(path.join(directory, "computer-check.json"), { requestedAt });
+  const compatible = (controller) => (controller?.protocol ?? 0) >= CONTROLLER_PROTOCOL && versionAtLeast(controller?.cliVersion, SDK_VERSION);
   let launchedPID;
   let launchFailure;
   const waitUntilReady = async () => {
     let phase;
+    let lastState;
     for (let attempt = 0; attempt < 1200; attempt++) {
       options.signal?.throwIfAborted();
       const controller = await readJSON(path.join(directory, "computer-controller.json"));
+      lastState = controller;
       if (launchFailure) throw launchFailure;
       if (launchedPID && controller?.pid !== launchedPID) {
         await setTimeout$1(250);
         continue;
       }
       if (controller?.error && !controller.recovering) throw new Error(controller.error);
-      if (controller?.ready && await processStateAlive(controller)) return computerClient(directory);
+      if (controller?.ready && compatible(controller) && (controller.checkedAt ?? 0) >= requestedAt && await processStateAlive(controller)) return computerClient(directory);
       if (controller?.phase && controller.phase !== phase) {
         phase = controller.phase;
         onProgress?.(phase);
       }
       await setTimeout$1(250);
     }
-    throw new Error(`Mindwire did not finish starting. Inspect ${path.join(directory, "computer.log")}.`);
+    const lastStep = lastState?.errorCode === "dns" ? "Your DNS resolver still cannot find the tunnel address." : lastState?.error ?? phase ?? "The background service hasn't reported readiness.";
+    const recovering = lastState?.recovering && await processStateAlive(lastState).catch(() => false);
+    throw new Error(`Mindwire's connection is not ready. ${lastStep}${recovering ? " Background recovery continues." : ""} Run mindwire status for the current state, then mindwire connect to retry.`);
   };
   if (current) {
     if (Object.keys(patch).some((key) => JSON.stringify(config[key]) !== JSON.stringify(previous?.[key]))) {
       throw new Error("Mindwire is running with different connection settings. Run mindwire stop when idle, then retry with the new settings.");
     }
     const controller = await readJSON(path.join(directory, "computer-controller.json"));
-    if (await processStateAlive(controller)) return waitUntilReady();
+    if (compatible(controller) && await processStateAlive(controller)) return waitUntilReady();
   }
   const lockPath = path.join(directory, "launch.lock");
   const lock = await acquireProcessLock(lockPath, {
     signal: options.signal,
     onWait: async () => {
       const controller = await readJSON(path.join(directory, "computer-controller.json"));
-      if (await processStateAlive(controller)) {
+      if (compatible(controller) && await processStateAlive(controller)) {
         const saved = await readJSON(configPath);
         if (Object.keys(patch).some((key) => JSON.stringify(patch[key]) !== JSON.stringify(saved?.[key]))) {
           throw new Error("Another start used different connection settings. Stop Mindwire when idle before changing them.");
@@ -1996,9 +2017,15 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
         throw new Error("Another start used different connection settings. Stop Mindwire when idle before changing them.");
       }
       const controller2 = await readJSON(path.join(directory, "computer-controller.json"));
-      if (await processStateAlive(controller2)) return waitUntilReady();
+      if (compatible(controller2) && await processStateAlive(controller2)) return waitUntilReady();
+    }
+    let controller = await readJSON(path.join(directory, "computer-controller.json"));
+    if (existing && controller && !compatible(controller) && await processStateAlive(controller)) {
+      onProgress?.("Refreshing the background connection service\u2026");
+      const { handoffController } = await import('./controller-handoff-7S6SKFHX.js');
+      await handoffController(directory, controller, config, await existing.computer.info());
+      controller = void 0;
     }
-    const controller = await readJSON(path.join(directory, "computer-controller.json"));
     if (await processStateAlive(controller)) {
       if (controller?.error && !controller.recovering) throw new Error(controller.error);
     } else {
@@ -2029,7 +2056,7 @@ async function ensureComputer(directory, cliPath, patch = {}, onProgress, option
   }
 }
 async function superviseComputer(directory) {
-  const controller = await import('./controller-MNMIJHH5.js');
+  const controller = await import('./controller-CHJ5MMZS.js');
   await controller.superviseComputer(directory);
 }
 async function stopComputer(directory, force = false) {
@@ -2053,6 +2080,6 @@ async function stopComputer(directory, force = false) {
   throw new Error("Mindwire is still stopping. Check computer.log.");
 }
 
-export { SDK_VERSION, acquireProcessLock, adoptProcess, computerClient, computerPairingQRData, computerPairingURI, currentProcessIdentity, defaultStateDirectory, directRoutes, ensureComputer, ensureDaemonBinary, ownChild, processIdentity, processStateAlive, readJSON, stopComputer, superviseComputer, writeJSON };
-//# sourceMappingURL=chunk-QPZMGVY7.js.map
-//# sourceMappingURL=chunk-QPZMGVY7.js.map
+export { CONTROLLER_PROTOCOL, SDK_VERSION, acquireProcessLock, adoptProcess, computerClient, computerPairingQRData, computerPairingURI, currentProcessIdentity, defaultStateDirectory, directRoutes, ensureComputer, ensureDaemonBinary, ownChild, processIdentity, processStateAlive, readJSON, stopComputer, superviseComputer, writeJSON };
+//# sourceMappingURL=chunk-5X5PAFM7.js.map
+//# sourceMappingURL=chunk-5X5PAFM7.js.map