webhelm 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webhelm",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Agent browser automation in a visible managed Chrome with persistent JavaScript sessions",
   "type": "module",
   "bin": {

package/runtime/cli.mjs

@@ -8,7 +8,7 @@ import { ensureDaemon, request, handle, SOCKET } from './node-daemon.mjs';
 import { PLATFORMS, listPlatforms, platformProfile, actionPath, validateConfig } from './platforms.mjs';
 import { ACTIONS_DIR, ensureActions, syncActions, publishActions } from './actions-repo.mjs';
 import { migrateConfig, migrateChromeProfile } from './migrate.mjs';
-import { installLoginGuard } from './login-guard.mjs';
+import { installLoginGuard, stageRuntimeForLoginGuard } from './login-guard.mjs';
 
 const ROOT = path.dirname(fileURLToPath(import.meta.url));
 const emit = value => console.log(JSON.stringify(value));
@@ -25,6 +25,7 @@ Usage:
   webhelm migrate  # after stopping Chrome and the old WebHelm daemon
   webhelm setup
   webhelm status
+  webhelm ensure  # verify/recover managed Chrome and Harness, not just daemon ping
   webhelm capacity [--workspace NAME]
   webhelm session start [--url URL]
   webhelm session list
@@ -109,9 +110,11 @@ async function main(args = process.argv.slice(2)) {
   if (group === 'setup') {
     const repo=await ensureActions();
     const chrome=await ensureDaemon();
-    const login_guard=installLoginGuard();
+    const persisted=stageRuntimeForLoginGuard();
+    const login_guard=installLoginGuard({cliPath:path.join(persisted.path,'bin/webhelm.mjs'),nodePath:process.execPath});
     return emit({status:'ready',...repo,daemon_pid:chrome.pid,managed_chrome:chrome.managed_chrome,login_guard});
   }
+  if (group === 'ensure') return emit(await request({op:'guard-check'}));
   if (group === 'status') {
     const daemon = await ensureDaemon();
     return emit({version:daemon.version, platform_dir:PLATFORMS, root:ROOT,

package/runtime/config-paths.mjs

@@ -2,9 +2,9 @@ import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
 
-export const CONFIG_ROOT = path.join(os.homedir(), '.config', 'webhelm');
-export const LEGACY_ROOT = path.join(os.homedir(), '.config', 'browser-workspace');
-export const LOCAL_ROOT = path.join(os.homedir(), '.local', 'webhelm');
+export const CONFIG_ROOT = path.resolve(process.env.WEBHELM_CONFIG_ROOT || path.join(os.homedir(), '.config', 'webhelm'));
+export const LEGACY_ROOT = path.resolve(process.env.WEBHELM_LEGACY_ROOT || (process.env.WEBHELM_CONFIG_ROOT ? path.join(CONFIG_ROOT,'legacy-browser-workspace') : path.join(os.homedir(), '.config', 'browser-workspace')));
+export const LOCAL_ROOT = path.resolve(process.env.WEBHELM_LOCAL_ROOT || path.join(os.homedir(), '.local', 'webhelm'));
 export const OLD_PROFILE_DIR = path.join(CONFIG_ROOT, 'chrome');
 export const PROFILE_DIR = path.join(LOCAL_ROOT, 'chrome');
 export const RUNTIME_DIR = path.join(CONFIG_ROOT, 'runtime');

package/runtime/extension-manager.mjs

@@ -3,9 +3,10 @@ import os from 'node:os';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import {fileURLToPath} from 'node:url';
+import {LOCAL_ROOT} from './config-paths.mjs';
 
 export const EXTENSION_ID='kkkpgmhpoeceojalkpfdidffdfnlgdog';
-export const EXTENSION_HOME=path.resolve(process.env.WEBHELM_EXTENSION_HOME || path.join(os.homedir(),'.local/webhelm/extension'));
+export const EXTENSION_HOME=path.resolve(process.env.WEBHELM_EXTENSION_HOME || path.join(LOCAL_ROOT,'extension'));
 const SOURCE=fileURLToPath(new URL('./extension/',import.meta.url));
 const FILES=['manifest.json','service-worker.mjs','workspace-manager.mjs','workspace.html','workspace-page.mjs'];
 

package/runtime/login-guard.mjs

@@ -2,23 +2,57 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import {execFileSync} from 'node:child_process';
+import {fileURLToPath} from 'node:url';
 
 const LABEL='com.lalalic.webhelm.keepalive';
+// launchd must never depend on npm's removable npx cache, or on the Skill
+// launcher being present. Stage an immutable, package-backed runtime locally.
+export function stageRuntimeForLoginGuard({home=os.homedir(),source=fileURLToPath(new URL('../',import.meta.url)),yamlSource=null}={}){
+  const manifest=JSON.parse(fs.readFileSync(path.join(source,'package.json'),'utf8'));
+  if(manifest.name!=='webhelm'||!/^\d+\.\d+\.\d+$/.test(manifest.version))throw Error('Invalid WebHelm runtime package');
+  const parent=path.join(home,'.local/share/webhelm');
+  const target=path.join(parent,`runtime-${manifest.version}`);
+  const keyfiles=['package.json','bin/webhelm.mjs','runtime/cli.mjs','runtime/node-daemon.mjs','runtime/login-guard.mjs'];
+  const equal=()=>keyfiles.every(name=>fs.existsSync(path.join(target,name))&&fs.readFileSync(path.join(target,name)).equals(fs.readFileSync(path.join(source,name))))&&fs.existsSync(path.join(target,'node_modules/yaml/package.json'));
+  if(equal())return {path:target,version:manifest.version,updated:false};
+  const yamlDir=yamlSource||path.resolve(fileURLToPath(import.meta.resolve('yaml')),'../..');
+  if(!fs.existsSync(path.join(yamlDir,'package.json')))throw Error('Bundled Runtime yaml dependency missing');
+  fs.mkdirSync(parent,{recursive:true,mode:0o700});
+  const tmp=fs.mkdtempSync(path.join(parent,'.webhelm-runtime-stage-'));
+  try{
+    for(const dirname of ['bin','runtime'])fs.cpSync(path.join(source,dirname),path.join(tmp,dirname),{recursive:true});
+    fs.copyFileSync(path.join(source,'package.json'),path.join(tmp,'package.json'));
+    fs.mkdirSync(path.join(tmp,'node_modules'),{recursive:true});
+    fs.cpSync(yamlDir,path.join(tmp,'node_modules/yaml'),{recursive:true});
+    let old=null;
+    if(fs.existsSync(target)){
+      old=path.join(parent,`.webhelm-runtime-old-${process.pid}-${Date.now()}`);
+      fs.renameSync(target,old);
+    }
+    try{fs.renameSync(tmp,target);}catch(error){if(old)fs.renameSync(old,target);throw error;}
+    if(old)fs.rmSync(old,{recursive:true,force:true});
+    return {path:target,version:manifest.version,updated:true};
+  }finally{if(fs.existsSync(tmp))fs.rmSync(tmp,{recursive:true,force:true});}
+}
+
 const escapeXml=s=>String(s).replace(/[&<>"']/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&apos;'}[c]));
-export function loginGuardDefinition(home=os.homedir()) {
-  const cli=path.join(home,'.local/bin/webhelm');
+export function loginGuardDefinition(home=os.homedir(),{cliPath=path.join(home,'.local/bin/webhelm'),nodePath=null}={}) {
+  const cli=cliPath;
+  const program=nodePath||cli;
+  const args=nodePath?`<string>${escapeXml(cli)}</string><string>ensure</string>`:'<string>ensure</string>';
   const environment=[path.join(home,'.local/bin'),path.join(home,'.local/opt/node22/bin'),
     '/opt/homebrew/bin','/usr/local/bin','/usr/bin','/bin'].join(':');
-  // The short-lived status check starts a missing daemon, and is a no-op if
-  // it already owns the IPC socket. Node daemon independently repairs Chrome.
-  return `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0"><dict>\n<key>Label</key><string>${LABEL}</string>\n<key>ProgramArguments</key><array><string>${escapeXml(cli)}</string><string>status</string></array>\n<key>EnvironmentVariables</key><dict><key>PATH</key><string>${escapeXml(environment)}</string><key>HOME</key><string>${escapeXml(home)}</string></dict>\n<key>RunAtLoad</key><true/>\n<key>StartInterval</key><integer>300</integer>\n<key>StandardOutPath</key><string>/dev/null</string>\n<key>StandardErrorPath</key><string>/dev/null</string>\n</dict></plist>\n`;
+  // Use the cached, tested npm Runtime directly to avoid registry/network
+  // dependency at login or when Chrome has just auto-updated. This must call
+  // 'ensure', not 'status': a live daemon does not imply a live Chrome.
+  return `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0"><dict>\n<key>Label</key><string>${LABEL}</string>\n<key>ProgramArguments</key><array><string>${escapeXml(program)}</string>${args}</array>\n<key>EnvironmentVariables</key><dict><key>PATH</key><string>${escapeXml(environment)}</string><key>HOME</key><string>${escapeXml(home)}</string></dict>\n<key>RunAtLoad</key><true/>\n<key>StartInterval</key><integer>30</integer>\n<key>StandardOutPath</key><string>/dev/null</string>\n<key>StandardErrorPath</key><string>/dev/null</string>\n</dict></plist>\n`;
 }
-export function installLoginGuard({home=os.homedir(), platform=process.platform, apply=true}={}){
+export function installLoginGuard({home=os.homedir(), platform=process.platform, apply=true,cliPath,nodePath}={}){
   if(platform!=='darwin')return {status:'unsupported',label:LABEL};
-  const cli=path.join(home,'.local/bin/webhelm');
-  if(!fs.existsSync(cli))return {status:'skipped',reason:'webhelm Skill launcher missing',label:LABEL};
+  const cli=cliPath||path.join(home,'.local/bin/webhelm');
+  if(!fs.existsSync(cli))return {status:'skipped',reason:'WebHelm runtime launcher missing',label:LABEL};
   const dest=path.join(home,'Library/LaunchAgents',`${LABEL}.plist`);
-  const content=loginGuardDefinition(home);
+  const content=loginGuardDefinition(home,{cliPath,nodePath});
   fs.mkdirSync(path.dirname(dest),{recursive:true});
   if(fs.existsSync(dest)){
     const old=fs.readFileSync(dest,'utf8');

package/runtime/managed-chrome-guard.mjs

@@ -2,15 +2,18 @@
 // close a user's Chrome windows to recover the managed browser.
 export function createManagedChromeGuard(check, {intervalMs=15000, onError=()=>{}}={}) {
   if(typeof check!=='function')throw TypeError('health check must be a function');
-  let timer=null, running=false, stopped=false;
+  let timer=null, inFlight=null, stopped=false;
   let last={status:'not_checked'};
-  const tick=async()=>{
-    if(running||stopped)return last;
-    running=true;
-    try{last={status:'healthy',...(await check())};}
-    catch(error){last={status:'degraded',error:String(error?.message||error)};onError(error);}
-    finally{running=false;}
-    return last;
+  const tick=()=>{
+    if(stopped)return Promise.resolve(last);
+    if(inFlight)return inFlight;
+    inFlight=(async()=>{
+      try{last={status:'healthy',...(await check())};}
+      catch(error){last={status:'degraded',error:String(error?.message||error)};onError(error);}
+      finally{inFlight=null;}
+      return last;
+    })();
+    return inFlight;
   };
   return {
     tick,

package/runtime/node-daemon.mjs

@@ -575,7 +575,7 @@ async function runPlatform(req) {
     self_heal_capable:!auto,result};
 }
 
-export async function handle(req){switch(req.op){case'ping':return {ok:true,pid:process.pid,version:PACKAGE_VERSION,queue_paused:process.env.WEBHELM_CHATGPT_QUEUE_PAUSED==='1',session_count:sessions.size,managed_chrome:managedChrome||{profile_dir:PROFILE_DIR, endpoint:process.env.WEBHELM_CDP_URL||'http://127.0.0.1:9222',reused:true},chrome_guard:managedChromeGuard.status()};case'heartbeat':return heartbeatSession(req.session_id);case'list':return {session_count:sessions.size,sessions:[...sessions.values()].map(s=>({session_id:s.session_id,workspace:s.workspace,target_id:s.targetId,last_used_at:s.last_used_at}))};case'start':return createSession(req);case'exec':return execute(req);case'stop':return stopSession(req.session_id);case'stop-all':{const stopped=[];for(const id of [...sessions.keys()])stopped.push(await stopSession(id));return {stopped_count:stopped.length,error_count:0,stopped,errors:[]}}case'capacity':return workspaceCapacity(req);case'workspace-create':case'workspace-delete':return workspaceOp(req);case'chatgpt-new-turn-enqueue':return getChatGPTQueue().enqueue(req.config);case'platform-run':return runPlatform(req);default:throw Error(`unknown op: ${req.op}`)}}
+export async function handle(req){switch(req.op){case'ping':return {ok:true,pid:process.pid,version:PACKAGE_VERSION,queue_paused:process.env.WEBHELM_CHATGPT_QUEUE_PAUSED==='1',session_count:sessions.size,managed_chrome:managedChrome||{profile_dir:PROFILE_DIR, endpoint:process.env.WEBHELM_CDP_URL||'http://127.0.0.1:9222',reused:true},chrome_guard:managedChromeGuard.status()};case'guard-check':{let status=await managedChromeGuard.tick();for(let retry=0;retry<6 && status.status!=='healthy' && !status.skipped;retry++){await delay(800);status=await managedChromeGuard.tick();}if(status.status!=='healthy' && !status.skipped)throw Error(`WebHelm Chrome health degraded: ${status.error||status.status}`);return {ok:true,chrome_guard:status};}case'heartbeat':return heartbeatSession(req.session_id);case'list':return {session_count:sessions.size,sessions:[...sessions.values()].map(s=>({session_id:s.session_id,workspace:s.workspace,target_id:s.targetId,last_used_at:s.last_used_at}))};case'start':return createSession(req);case'exec':return execute(req);case'stop':return stopSession(req.session_id);case'stop-all':{const stopped=[];for(const id of [...sessions.keys()])stopped.push(await stopSession(id));return {stopped_count:stopped.length,error_count:0,stopped,errors:[]}}case'capacity':return workspaceCapacity(req);case'workspace-create':case'workspace-delete':return workspaceOp(req);case'chatgpt-new-turn-enqueue':return getChatGPTQueue().enqueue(req.config);case'platform-run':return runPlatform(req);default:throw Error(`unknown op: ${req.op}`)}}
 function serve(conn) {
   let buffer = '';
   conn.setEncoding('utf8');