ispyx 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ispyx",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Local desktop-control MCP server: lets an AI use your keyboard, mouse and screen (windows, screenshots, clicks, typing, clipboard). stdio only, Windows and macOS.",
   "type": "module",
   "main": "src/server.js",

package/src/core/launcher.js

@@ -98,12 +98,17 @@ export async function runUpdate() {
     });
     process.exit(code);
   }
+  // "==> <step>" lines: the panel shows them while it runs this (core/updates.js readUpdateLog)
+  const step = (s) => process.stdout.write(`\n==> ${s}\n`);
   const pipe = pipeName();
   const wasRunning = await residentRunning(pipe);
   if (wasRunning) {
-    try { await callOwner(pipe, '__quit', {}); } catch { /* gone before answering */ }
+    step('Stopping ispyx');
+    // quietly: the `ispyx mcp` forwarders stay connected and reach the new resident on their next call
+    try { await callOwner(pipe, '__restart', {}); } catch { /* gone before answering */ }
     for (let i = 0; i < 40 && await residentRunning(pipe); i++) await sleep(150);
   }
+  step('Installing the latest ispyx (npm install -g ispyx@latest)');
   const code = await new Promise((resolve) => {
     const c = spawn('npm', ['install', '-g', 'ispyx@latest'], { stdio: 'inherit', shell: true });
     c.on('error', () => resolve(1));
@@ -111,7 +116,7 @@ export async function runUpdate() {
   });
   if (code !== 0) process.stderr.write('ispyx: the update failed (see the npm output above).\n');
   // Start the new copy: npm replaced the files in place, so a fresh process loads them.
-  if (wasRunning) spawnResident();
+  if (wasRunning) { step('Starting ispyx'); spawnResident(); }
   process.exit(code);
 }
 

package/src/core/panel/page.html

@@ -275,6 +275,12 @@ function render(s){
   var u=s.update;
   show("upd",!!(u&&u.available));
   if(u&&u.available&&!updating)setText("updTxt","Version "+u.latest+" is available.");
+  // while it runs: the installer's current step, or why it gave up; no progress for two minutes means it is stuck
+  if(updating&&u){
+    if(u.error)updateFailed("Update failed: "+u.error);
+    else if(u.step&&u.step!==updStep){updStep=u.step;updAt=Date.now();setText("updTxt",u.step+"\u2026")}
+  }
+  if(updating&&Date.now()-updAt>120000)updateFailed("The update did not finish. Details: update.log in the ispyx data folder.");
 
   show("sPerm",!!(perms&&perms.length));
   if(perms&&perms.length)renderPerms(perms);
@@ -428,13 +434,12 @@ $("log").addEventListener("click",function(){act("openLog")});
 $("showAll").addEventListener("click",function(){expanded=!expanded;if(last&&last.recent)renderRecent(last.recent,last.recentTotal)});
 $("clearAct").addEventListener("click",function(){act("clearRecent").then(poll)});
 // the update quits and restarts ispyx: this window then reports it has quit (macOS opens it again)
-var updating=false;
+// a successful update quits this ispyx (this window reports it has quit; macOS opens the new version)
+var updating=false,updStep="",updAt=0;
 function updateFailed(msg){updating=false;$("updBtn").disabled=false;setText("updTxt",msg)}
 $("updBtn").addEventListener("click",function(){
-  updating=true;$("updBtn").disabled=true;setText("updTxt","Updating, ispyx restarts in a moment…");
+  updating=true;updStep="";updAt=Date.now();$("updBtn").disabled=true;setText("updTxt","Updating, ispyx restarts in a moment…");
   act("update").catch(function(err){updateFailed(err.message)});
-  // a successful update quits this ispyx; still here after two minutes means it did not go through
-  setTimeout(function(){if(updating)updateFailed("The update did not finish. Details: update.log in the ispyx data folder.")},120000);
 });
 $("end").addEventListener("click",function(){
   if(last&&last.platform==="darwin"){act("close");return}

package/src/core/resident.js

@@ -122,6 +122,7 @@ export function panelModel(ctx) {
   const t0 = Date.now();
   // never from tests (fake platform): they must not depend on the network
   const updates = startUpdateCheck({ current: VERSION, enabled: config.updateCheck !== false && w.name !== 'fake' });
+  let running = null; // the update this panel started: its progress() is in the state
   const save = (patch) => {
     try { saveUserConfig(patch); } catch (e) { throw new PanelError(`Could not save the setting: ${e.message}`); }
   };
@@ -138,7 +139,7 @@ export function panelModel(ctx) {
     passwordSet: safe(() => auth.passwordSet(), false),
     authRequired: !!config.auth,
     denylist: config.denylist.slice(),
-    ...(updates.state() ? { update: updates.state() } : {}),
+    ...(updates.state() ? { update: { ...updates.state(), ...(running ? running.progress() : {}) } } : {}),
   });
   const actions = {
     setEffects: (on) => { scan.enabled = !!on; config.animations = !!on; save({ animations: !!on }); return !!on; },
@@ -170,7 +171,8 @@ export function panelModel(ctx) {
     // the newer release: installs it in a process of its own, which quits and restarts ispyx (this one included)
     update: () => {
       if (!updates.state()?.available) throw new PanelError('This is the newest version.');
-      launchUpdate({ platform: w.name, dataDir: w.dataDir() });
+      if (running && !running.progress().error) return true; // already on its way
+      running = launchUpdate({ platform: w.name, dataDir: w.dataDir() });
       return true;
     },
     checkUpdate: async () => { await updates.check(); return updates.state(); },

package/src/core/server.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-// ispyx: local desktop-control MCP server (Windows; macOS in development). stdio only; opens no network port.
+// ispyx: local desktop-control MCP server (Windows and macOS). stdio only; opens no network port.
 import fs from 'node:fs';
+import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -44,6 +45,15 @@ function initCore() {
   guard.log({ tool: 'server_start', auth: config.auth, denylist: config.denylist, pid: process.pid });
 }
 
+/**
+ * Leaves without ordering the forwarders to exit (an update): they stay connected to their AI apps and reach the
+ * new resident on their next call, which starts it if needed. `ispyx quit`, the tray Quit and the stop key end them.
+ */
+function restartQuietly() {
+  residentUi?.stop();
+  setTimeout(() => process.exit(0), 100);
+}
+
 /** Orders every connected server to exit, then leaves (second stop press, tray Quit, `ispyx quit`). */
 function shutdownAll() {
   residentUi?.stop();
@@ -179,6 +189,7 @@ function control(name) {
   if (name === '__ping') return 'pong';
   if (name === '__panel') return Promise.resolve(residentUi?.openPanel?.()).then(() => '');
   if (name === '__quit') { setTimeout(shutdownAll, 50); return 'bye'; }
+  if (name === '__restart') { setTimeout(restartQuietly, 50); return 'bye'; } // `ispyx update`: forwarders stay
   throw new Error(`Unknown control call ${name}`);
 }
 
@@ -808,7 +819,10 @@ if (mode === 'resident') {
   // forwarders too, so tell them first. If the app is gone without that (crash, kill), leave as well.
   const appPid = Number(process.env.ISPYX_APP_PID) || 0;
   if (appPid) {
-    process.on('SIGTERM', shutdownAll);
+    // ...unless the app quits for an update (scripts/install.sh leaves this marker): then the forwarders stay
+    const marker = path.join(w.dataDir(), 'updating');
+    const updating = () => { try { return Date.now() - fs.statSync(marker).mtimeMs < 10 * 60 * 1000; } catch { return false; } };
+    process.on('SIGTERM', () => (updating() ? restartQuietly() : shutdownAll()));
     const t = setInterval(() => { try { process.kill(appPid, 0); } catch { shutdownAll(); } }, 1000);
     t.unref?.();
   }

package/src/core/updates.js

@@ -64,15 +64,33 @@ export function startUpdateCheck({ current, enabled = true, firstDelayMs = 15000
   };
 }
 
+/**
+ * Where a running update is, from its log: { step, error } ("Downloading Ispyx 1.0.6 · 45%", "Checking the app").
+ * The installer (scripts/install.sh) writes "==> <step>" lines, "Downloaded N%" while downloading and
+ * "ispyx: <reason>" when it gives up; `ispyx update` on Windows writes npm's output.
+ */
+export function readUpdateLog(text) {
+  let step = 'Starting', pct = null, error = null;
+  for (const raw of String(text).split(/\r?\n/)) {
+    const line = raw.trim();
+    let m;
+    if ((m = /^==> (.+)$/.exec(line))) { step = m[1]; pct = null; }
+    else if ((m = /^Downloaded (\d+)%$/.exec(line))) pct = Number(m[1]);
+    else if ((m = /^ispyx: (.+)$/.exec(line))) error = m[1];
+  }
+  return { step: pct === null ? step : `${step} \u00b7 ${pct}%`, error };
+}
+
 /**
  * Starts the update in a process of its own (the update quits the running ispyx, this process included) and
- * returns at once. Its output goes to update.log in the data directory.
+ * returns at once. Its output goes to update.log in the data directory; progress() reads it.
  */
 export function launchUpdate({ platform = process.platform, dataDir }) {
   let out = 'ignore';
+  const log = path.join(dataDir, 'update.log');
   try {
     fs.mkdirSync(dataDir, { recursive: true });
-    out = fs.openSync(path.join(dataDir, 'update.log'), 'w');
+    out = fs.openSync(log, 'w');
   } catch { /* no log then */ }
   const child = platform === 'darwin'
     ? spawn('/bin/sh', ['-c', `curl -fsSL ${MAC_INSTALL_URL} | sh`], { detached: true, stdio: ['ignore', out, out] })
@@ -80,4 +98,5 @@ export function launchUpdate({ platform = process.platform, dataDir }) {
   child.on('error', () => {});
   child.unref();
   if (typeof out === 'number') fs.closeSync(out);
+  return { progress: () => { try { return readUpdateLog(fs.readFileSync(log, 'utf8')); } catch { return { step: 'Starting', error: null }; } } };
 }