@pablopunk/webr 0.1.4 → 0.1.6

package/README.md

@@ -5,7 +5,7 @@
 <p align="center">
   <i align="center">Control your Herdr agents from anywhere.</i>
 </p>
-  
+
 <h1 align="center">webr</h1>
 
 > [!IMPORTANT]
@@ -18,8 +18,8 @@
 Everything is handled automatically via the plugin:
 
 ```sh
-webr plugin install   # start Webr with the Herdr server
-webr open             # open Webr (webr status shows the address)
+webr plugin install
+webr open             # Open the dashboard in your browser
 ```
 
 AGPL-3.0-or-later

package/dist/server/entry.mjs

@@ -2442,7 +2442,7 @@ var pageMap = /* @__PURE__ */ new Map([
 ]);
 //#endregion
 //#region \0virtual:astro:manifest
-var _manifest = deserializeManifest({"rootDir":"file:///home/runner/work/webr/webr/","cacheDir":"file:///home/runner/work/webr/webr/node_modules/.astro/","outDir":"file:///home/runner/work/webr/webr/dist/","srcDir":"file:///home/runner/work/webr/webr/src/","publicDir":"file:///home/runner/work/webr/webr/public/","buildClientDir":"file:///home/runner/work/webr/webr/dist/client/","buildServerDir":"file:///home/runner/work/webr/webr/dist/server/","adapterName":"@astrojs/node","assetsDir":"_astro","routes":[{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"type":"page","component":"_server-islands.astro","params":["name"],"segments":[[{"content":"_server-islands","dynamic":false,"spread":false}],[{"content":"name","dynamic":true,"spread":false}]],"pattern":"^\\/_server-islands\\/([^/]+?)\\/?$","prerender":false,"isIndex":false,"fallbackRoutes":[],"route":"/_server-islands/[name]","origin":"internal","distURL":[],"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/_image","component":"node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node.js","params":[],"pathname":"/_image","pattern":"^\\/_image\\/?$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"type":"endpoint","prerender":false,"fallbackRoutes":[],"distURL":[],"isIndex":false,"origin":"internal","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/new","isIndex":false,"type":"page","pattern":"^\\/new\\/?$","segments":[[{"content":"new","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/new.astro","pathname":"/new","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/sessions/[session]/tabs/[tab]","isIndex":false,"type":"page","pattern":"^\\/sessions\\/([^/]+?)\\/tabs\\/([^/]+?)\\/?$","segments":[[{"content":"sessions","dynamic":false,"spread":false}],[{"content":"session","dynamic":true,"spread":false}],[{"content":"tabs","dynamic":false,"spread":false}],[{"content":"tab","dynamic":true,"spread":false}]],"params":["session","tab"],"component":"src/pages/sessions/[session]/tabs/[tab].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/settings","isIndex":false,"type":"page","pattern":"^\\/settings\\/?$","segments":[[{"content":"settings","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/settings.astro","pathname":"/settings","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/threads/[id]","isIndex":false,"type":"page","pattern":"^\\/threads\\/([^/]+?)\\/?$","segments":[[{"content":"threads","dynamic":false,"spread":false}],[{"content":"id","dynamic":true,"spread":false}]],"params":["id"],"component":"src/pages/threads/[id].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/","isIndex":true,"type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}}],"serverLike":true,"middlewareMode":"classic","base":"/","trailingSlash":"ignore","compressHTML":"jsx","componentMetadata":[["/home/runner/work/webr/webr/src/pages/new.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/sessions/[session]/tabs/[tab].astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/settings.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/threads/[id].astro",{"propagation":"none","containsHead":true}]],"renderers":[],"clientDirectives":[["idle","(()=>{var l=(n,t)=>{let i=async()=>{await(await n())()},e=typeof t.value==\"object\"?t.value:void 0,s={timeout:e==null?void 0:e.timeout};\"requestIdleCallback\"in window?window.requestIdleCallback(i,s):setTimeout(i,s.timeout||200)};(self.Astro||(self.Astro={})).idle=l;window.dispatchEvent(new Event(\"astro:idle\"));})();"],["load","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event(\"astro:load\"));})();"],["media","(()=>{var n=(a,t)=>{let i=async()=>{await(await a())()};if(t.value){let e=matchMedia(t.value);e.matches?i():e.addEventListener(\"change\",i,{once:!0})}};(self.Astro||(self.Astro={})).media=n;window.dispatchEvent(new Event(\"astro:media\"));})();"],["only","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event(\"astro:only\"));})();"],["visible","(()=>{var a=(s,i,o)=>{let r=async()=>{await(await s())()},t=typeof i.value==\"object\"?i.value:void 0,c={rootMargin:t==null?void 0:t.rootMargin},n=new IntersectionObserver(e=>{for(let l of e)if(l.isIntersecting){n.disconnect(),r();break}},c);for(let e of o.children)n.observe(e)};(self.Astro||(self.Astro={})).visible=a;window.dispatchEvent(new Event(\"astro:visible\"));})();"]],"entryModules":{"\u0000noop-middleware":"virtual_astro_middleware.mjs","\u0000virtual:astro:server-island-manifest":"chunks/_virtual_astro_server-island-manifest_C1Q2srgE.mjs","\u0000virtual:astro:session-driver":"chunks/_virtual_astro_session-driver_Dp7RXjOf.mjs","\u0000virtual:astro:actions/noop-entrypoint":"chunks/noop-entrypoint_Z3zFhrGC.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/@astrojs+react@7.0.0_@types+node@22.20.4_@types+react-dom@19.3.0_@types+react@19.3.0__@_02aa85dceaccf3d763325676dd8540a8/node_modules/@astrojs/react/dist/vnode-children.js":"chunks/vnode-children_BSi0H4PL.mjs","@astrojs/node/server.js":"entry.mjs","\u0000virtual:astro:page:src/pages/threads/[id]@_@astro":"chunks/_id__CQzMt2xL.mjs","\u0000virtual:astro:page:src/pages/sessions/[session]/tabs/[tab]@_@astro":"chunks/_tab__D-smYrCo.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/sharp@0.35.5_@types+node@22.20.4/node_modules/sharp/dist/index.mjs":"chunks/dist_CpTFMtqT.mjs","\u0000virtual:astro:page:src/pages/index@_@astro":"chunks/index_DRfLd22k.mjs","\u0000virtual:astro:page:src/pages/new@_@astro":"chunks/new_NXgn74q9.mjs","\u0000virtual:astro:page:node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node@_@js":"chunks/node_BcIF-BVp.mjs","\u0000virtual:astro:page:src/pages/settings@_@astro":"chunks/settings_D1jcCWzt.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/services/sharp.js":"chunks/sharp_qIaxzsTp.mjs","/home/runner/work/webr/webr/src/components/App.tsx":"_astro/App.B3aX6cef.js","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/components/ClientRouter.astro?astro&type=script&index=0&lang.ts":"_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","@astrojs/react/client.js":"_astro/client.BDkzSRUN.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-fit@0.10.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-fit/lib/addon-fit.js":"_astro/addon-fit.jgKqzwky.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-web-links@0.11.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-web-links/lib/addon-web-links.js":"_astro/addon-web-links.C9lyQRxI.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+xterm@5.5.0/node_modules/@xterm/xterm/lib/xterm.js":"_astro/xterm.B-l5AIf6.js","astro:scripts/before-hydration.js":""},"inlinedScripts":[],"assets":["/apple-touch-icon.png","/brand-mark.png","/favicon-16.png","/favicon-32.png","/favicon.ico","/icon-192.png","/icon-512.png","/icon-maskable-512.png","/manifest.webmanifest","/_astro/App.B3aX6cef.js","/_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","/_astro/addon-fit.jgKqzwky.js","/_astro/addon-web-links.C9lyQRxI.js","/_astro/client.BDkzSRUN.js","/_astro/client.Bbg9OBwT.js","/_astro/client.CLSsMr2g.js","/_astro/xterm.B-l5AIf6.js","/_astro/App.1PYvyCIo.css","/_astro/jetbrains-mono.CFJaiWaY.woff2","/_astro/symbols-nerd.CEdkKAK8.woff2"],"buildFormat":"directory","checkOrigin":true,"actionBodySizeLimit":1048576,"serverIslandBodySizeLimit":1048576,"allowedDomains":[],"key":"lwLcVQyIWovoVZ6//dde/3T4ADxhy7SecaHMUhWHECI=","sessionConfig":{"driver":"unstorage/drivers/fs-lite","options":{"base":"/home/runner/work/webr/webr/node_modules/.astro/sessions"}},"image":{},"devToolbar":{"enabled":false,"debugInfoOutput":""},"logLevel":"info","shouldInjectCspMetaTags":false});
+var _manifest = deserializeManifest({"rootDir":"file:///home/runner/work/webr/webr/","cacheDir":"file:///home/runner/work/webr/webr/node_modules/.astro/","outDir":"file:///home/runner/work/webr/webr/dist/","srcDir":"file:///home/runner/work/webr/webr/src/","publicDir":"file:///home/runner/work/webr/webr/public/","buildClientDir":"file:///home/runner/work/webr/webr/dist/client/","buildServerDir":"file:///home/runner/work/webr/webr/dist/server/","adapterName":"@astrojs/node","assetsDir":"_astro","routes":[{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"type":"page","component":"_server-islands.astro","params":["name"],"segments":[[{"content":"_server-islands","dynamic":false,"spread":false}],[{"content":"name","dynamic":true,"spread":false}]],"pattern":"^\\/_server-islands\\/([^/]+?)\\/?$","prerender":false,"isIndex":false,"fallbackRoutes":[],"route":"/_server-islands/[name]","origin":"internal","distURL":[],"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/_image","component":"node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node.js","params":[],"pathname":"/_image","pattern":"^\\/_image\\/?$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"type":"endpoint","prerender":false,"fallbackRoutes":[],"distURL":[],"isIndex":false,"origin":"internal","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/new","isIndex":false,"type":"page","pattern":"^\\/new\\/?$","segments":[[{"content":"new","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/new.astro","pathname":"/new","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/sessions/[session]/tabs/[tab]","isIndex":false,"type":"page","pattern":"^\\/sessions\\/([^/]+?)\\/tabs\\/([^/]+?)\\/?$","segments":[[{"content":"sessions","dynamic":false,"spread":false}],[{"content":"session","dynamic":true,"spread":false}],[{"content":"tabs","dynamic":false,"spread":false}],[{"content":"tab","dynamic":true,"spread":false}]],"params":["session","tab"],"component":"src/pages/sessions/[session]/tabs/[tab].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/settings","isIndex":false,"type":"page","pattern":"^\\/settings\\/?$","segments":[[{"content":"settings","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/settings.astro","pathname":"/settings","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.1PYvyCIo.css"}],"routeData":{"route":"/threads/[id]","isIndex":false,"type":"page","pattern":"^\\/threads\\/([^/]+?)\\/?$","segments":[[{"content":"threads","dynamic":false,"spread":false}],[{"content":"id","dynamic":true,"spread":false}]],"params":["id"],"component":"src/pages/threads/[id].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/","isIndex":true,"type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}}],"serverLike":true,"middlewareMode":"classic","base":"/","trailingSlash":"ignore","compressHTML":"jsx","componentMetadata":[["/home/runner/work/webr/webr/src/pages/new.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/sessions/[session]/tabs/[tab].astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/settings.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/threads/[id].astro",{"propagation":"none","containsHead":true}]],"renderers":[],"clientDirectives":[["idle","(()=>{var l=(n,t)=>{let i=async()=>{await(await n())()},e=typeof t.value==\"object\"?t.value:void 0,s={timeout:e==null?void 0:e.timeout};\"requestIdleCallback\"in window?window.requestIdleCallback(i,s):setTimeout(i,s.timeout||200)};(self.Astro||(self.Astro={})).idle=l;window.dispatchEvent(new Event(\"astro:idle\"));})();"],["load","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event(\"astro:load\"));})();"],["media","(()=>{var n=(a,t)=>{let i=async()=>{await(await a())()};if(t.value){let e=matchMedia(t.value);e.matches?i():e.addEventListener(\"change\",i,{once:!0})}};(self.Astro||(self.Astro={})).media=n;window.dispatchEvent(new Event(\"astro:media\"));})();"],["only","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event(\"astro:only\"));})();"],["visible","(()=>{var a=(s,i,o)=>{let r=async()=>{await(await s())()},t=typeof i.value==\"object\"?i.value:void 0,c={rootMargin:t==null?void 0:t.rootMargin},n=new IntersectionObserver(e=>{for(let l of e)if(l.isIntersecting){n.disconnect(),r();break}},c);for(let e of o.children)n.observe(e)};(self.Astro||(self.Astro={})).visible=a;window.dispatchEvent(new Event(\"astro:visible\"));})();"]],"entryModules":{"\u0000noop-middleware":"virtual_astro_middleware.mjs","\u0000virtual:astro:server-island-manifest":"chunks/_virtual_astro_server-island-manifest_C1Q2srgE.mjs","\u0000virtual:astro:session-driver":"chunks/_virtual_astro_session-driver_Dp7RXjOf.mjs","\u0000virtual:astro:actions/noop-entrypoint":"chunks/noop-entrypoint_Z3zFhrGC.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/@astrojs+react@7.0.0_@types+node@22.20.4_@types+react-dom@19.3.0_@types+react@19.3.0__@_02aa85dceaccf3d763325676dd8540a8/node_modules/@astrojs/react/dist/vnode-children.js":"chunks/vnode-children_BSi0H4PL.mjs","@astrojs/node/server.js":"entry.mjs","\u0000virtual:astro:page:src/pages/threads/[id]@_@astro":"chunks/_id__CQzMt2xL.mjs","\u0000virtual:astro:page:src/pages/sessions/[session]/tabs/[tab]@_@astro":"chunks/_tab__D-smYrCo.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/sharp@0.35.5_@types+node@22.20.4/node_modules/sharp/dist/index.mjs":"chunks/dist_CpTFMtqT.mjs","\u0000virtual:astro:page:src/pages/index@_@astro":"chunks/index_DRfLd22k.mjs","\u0000virtual:astro:page:src/pages/new@_@astro":"chunks/new_NXgn74q9.mjs","\u0000virtual:astro:page:node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node@_@js":"chunks/node_BcIF-BVp.mjs","\u0000virtual:astro:page:src/pages/settings@_@astro":"chunks/settings_D1jcCWzt.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/services/sharp.js":"chunks/sharp_qIaxzsTp.mjs","/home/runner/work/webr/webr/src/components/App.tsx":"_astro/App.B3aX6cef.js","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/components/ClientRouter.astro?astro&type=script&index=0&lang.ts":"_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","@astrojs/react/client.js":"_astro/client.BDkzSRUN.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-fit@0.10.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-fit/lib/addon-fit.js":"_astro/addon-fit.jgKqzwky.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-web-links@0.11.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-web-links/lib/addon-web-links.js":"_astro/addon-web-links.C9lyQRxI.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+xterm@5.5.0/node_modules/@xterm/xterm/lib/xterm.js":"_astro/xterm.B-l5AIf6.js","astro:scripts/before-hydration.js":""},"inlinedScripts":[],"assets":["/apple-touch-icon.png","/brand-mark.png","/favicon-16.png","/favicon-32.png","/favicon.ico","/icon-192.png","/icon-512.png","/icon-maskable-512.png","/manifest.webmanifest","/_astro/App.B3aX6cef.js","/_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","/_astro/addon-fit.jgKqzwky.js","/_astro/addon-web-links.C9lyQRxI.js","/_astro/client.BDkzSRUN.js","/_astro/client.Bbg9OBwT.js","/_astro/client.CLSsMr2g.js","/_astro/xterm.B-l5AIf6.js","/_astro/App.1PYvyCIo.css","/_astro/jetbrains-mono.CFJaiWaY.woff2","/_astro/symbols-nerd.CEdkKAK8.woff2"],"buildFormat":"directory","checkOrigin":true,"actionBodySizeLimit":1048576,"serverIslandBodySizeLimit":1048576,"allowedDomains":[],"key":"5xt2blgxRfJ3NG9MkXy57UVS3zt1EKOycbRTt7HZqU0=","sessionConfig":{"driver":"unstorage/drivers/fs-lite","options":{"base":"/home/runner/work/webr/webr/node_modules/.astro/sessions"}},"image":{},"devToolbar":{"enabled":false,"debugInfoOutput":""},"logLevel":"info","shouldInjectCspMetaTags":false});
 var manifestRoutes = _manifest.routes;
 var manifest = Object.assign(_manifest, {
 	renderers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pablopunk/webr",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Control your Herdr agents from anywhere.",
   "keywords": [
     "herdr",

package/server/cli.ts

@@ -4,9 +4,11 @@ import { renderUnicode } from 'uqr';
 import { webrHome } from './home';
 import { runServer } from './run';
 import { explicitPort, knownPort } from './port';
-import { defaultDeps, installPlugin, pluginStatus, restartPluginWebr, uninstallWebrPlugin } from './plugin';
+import { defaultDeps, installPlugin, pluginStatus, uninstallWebrPlugin, updatePlugin } from './plugin';
 import { checkHerdr } from './herdr-check';
+import { modeLines, pluginMode } from './plugin/mode';
 import { openWebr, statusLines } from './where';
+import { isPortOpen } from './plugin/probe';
 import { packageInfo } from './package-info';
 import { realUpdateEnvironment, runUpdate } from './update';
 import { refreshLatestVersionCache, updateHint } from './update/hint';
@@ -15,7 +17,7 @@ const HELP = `Webr — control your Herdr agents from anywhere.
 
 Usage
   webr [start] [options]        Run the server in this terminal
-  webr plugin install [options]  Start Webr whenever the Herdr server starts
+  webr plugin install [options]  Start Webr whenever the Herdr server starts, and open it
   webr plugin uninstall          Remove the Herdr plugin
   webr plugin status             Show whether the plugin is installed and Webr is running
   webr invite [--port <port>]    Print a one-time code and QR to connect a device
@@ -26,6 +28,7 @@ Usage
 Options
   --port <port>     Port to listen on (default: first free port from 4444, then remembered)
   --host <address>  Listen on a specific address (default 0.0.0.0, every interface)
+  --no-open         Don't open the browser after "plugin install"
   --origin <url>    Public URL when served through a proxy, e.g. https://mac.tailnet.ts.net
   -v, --version     Print the version
   -h, --help        Print this help
@@ -35,7 +38,7 @@ Localhost never needs a token. Any other device asks for access and you approve
 `;
 
 const options = {
-  port: { type: 'string' }, host: { type: 'string' }, origin: { type: 'string' },
+  port: { type: 'string' }, host: { type: 'string' }, origin: { type: 'string' }, 'no-open': { type: 'boolean' },
   help: { type: 'boolean', short: 'h' }, version: { type: 'boolean', short: 'v' },
 } as const;
 
@@ -79,6 +82,14 @@ async function pluginCommand(action: string, values: ReturnType<typeof parseComm
   const deps = defaultDeps();
   const lines = action === 'install' ? await installPlugin(pluginSettings(values), deps) : action === 'uninstall' ? await uninstallWebrPlugin(deps) : await pluginStatus(deps);
   for (const line of lines.filter(Boolean)) console.log(line);
+  if (action === 'install' && !values['no-open']) await openWhenUp(knownPort(values.port ? ['--port', values.port] : []));
+}
+
+async function openWhenUp(port: number) {
+  for (let attempt = 0; attempt < 30; attempt++) {
+    if (await isPortOpen({ host: '127.0.0.1', port })) return void (await openWebr(port)).forEach((line) => console.log(line));
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
 }
 
 export async function main(argv: string[]) {
@@ -87,9 +98,9 @@ export async function main(argv: string[]) {
   if (values.help || command === 'help') return void console.log(HELP);
   if (values.version) { console.log(packageInfo().version); return printUpdateHint(); }
   if (command === 'start') { applyServerFlags(values); await requireHerdr(); return runServer(); }
-  if (command === 'update') return void (await runUpdate(realUpdateEnvironment(() => restartPluginWebr(defaultDeps())))).forEach((line) => console.log(line));
+  if (command === 'update') return void (await runUpdate(realUpdateEnvironment(() => updatePlugin(defaultDeps())))).forEach((line) => console.log(line));
   if (command === 'refresh-update-cache') return refreshLatestVersionCache().catch(() => undefined);
-  if (command === 'status') return void (await statusLines(knownPort(values.port ? ['--port', values.port] : []))).forEach((line) => console.log(line));
+  if (command === 'status') return void (await statusLines(knownPort(values.port ? ['--port', values.port] : []), modeLines(pluginMode(defaultDeps().run, defaultDeps().stateDir)))).forEach((line) => console.log(line));
   if (command === 'open') return void (await openWebr(knownPort(values.port ? ['--port', values.port] : []))).forEach((line) => console.log(line));
   if (command === 'invite') return invite(knownPort(values.port ? ['--port', values.port] : []));
   if (command === 'plugin' && ['install', 'uninstall', 'status'].includes(subcommand ?? '')) return pluginCommand(subcommand!, values);

package/server/plugin/config.ts

@@ -2,7 +2,8 @@ import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { CONFIG_FILE } from './files';
 
-export type PluginConfig = { port?: number; host?: string; origin?: string };
+export type SavedLauncher = { node: string; entry: string };
+export type PluginConfig = { port?: number; host?: string; origin?: string; launcher?: SavedLauncher };
 
 export function writePluginConfig(configDir: string, config: PluginConfig) {
   mkdirSync(configDir, { recursive: true });

package/server/plugin/dev.ts

@@ -3,25 +3,42 @@ import { join } from 'node:path';
 import { realRun } from '../command';
 import type { RunCommand } from '../command';
 import { DEV_FILE, pluginStateDir } from './files';
-import { installFromGithub, installedPlugin, linkLocalPlugin } from './herdr';
+import { readPluginConfig } from './config';
+import { startNow } from './index';
+import { probeAddress } from './probe';
+import { stopPluginWebr } from './stop';
+import { installedPlugin, linkLocalPlugin, pluginConfigDir, replaceWithGithub } from './herdr';
 
 type Restore = () => void;
 const nothingToRestore: Restore = () => {};
 
 function restorePrevious(previous: ReturnType<typeof installedPlugin>, run: RunCommand) {
-  if (previous?.kind === 'github') return installFromGithub(run);
+  if (previous?.kind === 'github') return replaceWithGithub(run);
   if (previous) return linkLocalPlugin(run, previous.root);
 }
 
-export function enterPluginDevMode(checkout: string, run: RunCommand = realRun, stateDir = pluginStateDir()): Restore {
+function startProduction(run: RunCommand, stateDir: string) {
+  const plugin = installedPlugin(run);
+  if (plugin) startNow(plugin.root, pluginConfigDir(run), { run, stateDir });
+}
+
+export async function stopProductionWebr(run: RunCommand = realRun, stateDir = pluginStateDir()) {
+  if (!installedPlugin(run)) return false;
+  const stopped = await stopPluginWebr(stateDir, probeAddress(readPluginConfig(pluginConfigDir(run))));
+  if (stopped) console.log('Stopped the production Webr. It starts again when dev stops.');
+  return stopped;
+}
+
+export function enterPluginDevMode(checkout: string, run: RunCommand = realRun, stateDir = pluginStateDir(), restartProduction = false): Restore {
   const previous = installedPlugin(run);
   if (!previous) return nothingToRestore;
   mkdirSync(stateDir, { recursive: true });
-  writeFileSync(join(stateDir, DEV_FILE), JSON.stringify({ checkout }));
+  writeFileSync(join(stateDir, DEV_FILE), JSON.stringify({ checkout, pid: process.pid }));
   linkLocalPlugin(run, join(checkout, 'plugin'));
   console.log('Webr plugin linked to this checkout. It is restored when dev stops.');
   return () => {
     rmSync(join(stateDir, DEV_FILE), { force: true });
     restorePrevious(previous, run);
+    if (restartProduction) try { startProduction(run, stateDir); } catch { console.error('Could not start production Webr. Run "webr plugin install".'); }
   };
 }

package/server/plugin/herdr.ts

@@ -31,3 +31,8 @@ export const installFromGithub = (run: RunCommand) => succeeded(run('herdr', ['p
 export const uninstallPlugin = (run: RunCommand) => succeeded(run('herdr', ['plugin', 'uninstall', PLUGIN_ID]), 'uninstall the plugin');
 export const linkLocalPlugin = (run: RunCommand, directory: string) => succeeded(run('herdr', ['plugin', 'link', directory]), 'link the plugin');
 export const unlinkLocalPlugin = (run: RunCommand) => succeeded(run('herdr', ['plugin', 'unlink', PLUGIN_ID]), 'unlink the plugin');
+
+export function replaceWithGithub(run: RunCommand) {
+  if (installedPlugin(run)?.kind === 'local') unlinkLocalPlugin(run);
+  installFromGithub(run);
+}

package/server/plugin/index.ts

@@ -1,28 +1,40 @@
-import { rmSync } from 'node:fs';
-import { join } from 'node:path';
+import { realpathSync, rmSync } from 'node:fs';
+import { basename, join } from 'node:path';
 import { realRun, type RunCommand } from '../command';
-import { readPluginConfig, writePluginConfig, type PluginConfig } from './config';
+import { readPluginConfig, writePluginConfig, type PluginConfig, type SavedLauncher } from './config';
 import { pluginStateDir } from './files';
 import { isPortOpen, probeAddress } from './probe';
 import { stopPluginWebr } from './stop';
-import { installFromGithub, installedPlugin, pluginConfigDir, requireGit, requireHerdr, uninstallPlugin, unlinkLocalPlugin } from './herdr';
+import { modeLines, pluginMode } from './mode';
+import { DEV_FILE } from './files';
+import { installedPlugin, replaceWithGithub, pluginConfigDir, requireGit, requireHerdr, uninstallPlugin, unlinkLocalPlugin } from './herdr';
 
 export type PluginDeps = {
   run: RunCommand;
   stateDir: string;
+  launcher?: SavedLauncher;
 };
 
-export const defaultDeps = (): PluginDeps => ({ run: realRun, stateDir: pluginStateDir() });
+function runningLauncher(): SavedLauncher | undefined {
+  try {
+    const entry = realpathSync(process.argv[1]!);
+    return basename(entry) === 'webr.mjs' ? { node: process.execPath, entry } : undefined;
+  } catch { return undefined; }
+}
+
+export const defaultDeps = (): PluginDeps => ({ run: realRun, stateDir: pluginStateDir(), launcher: runningLauncher() });
 
-const startNow = (root: string, configDir: string, deps: PluginDeps) =>
+export const startNow = (root: string, configDir: string, deps: PluginDeps) =>
   deps.run(process.execPath, [join(root, 'launch.mjs')], { HERDR_PLUGIN_CONFIG_DIR: configDir, HERDR_PLUGIN_STATE_DIR: deps.stateDir }).output.trim();
 
 export async function installPlugin(config: PluginConfig, deps: PluginDeps) {
   requireHerdr(deps.run);
   requireGit(deps.run);
+  if (pluginMode(deps.run, deps.stateDir).kind === 'dev') throw new Error('"pnpm dev" is running. Stop it with Ctrl+C first; production comes back by itself.');
   const configDir = pluginConfigDir(deps.run);
-  writePluginConfig(configDir, config);
-  installFromGithub(deps.run);
+  writePluginConfig(configDir, { ...readPluginConfig(configDir), ...config, ...(deps.launcher ? { launcher: deps.launcher } : {}) });
+  rmSync(join(deps.stateDir, DEV_FILE), { force: true });
+  replaceWithGithub(deps.run);
   const plugin = installedPlugin(deps.run);
   if (!plugin) throw new Error('Herdr did not register the Webr plugin.');
   return [
@@ -43,14 +55,15 @@ export async function uninstallWebrPlugin(deps: PluginDeps) {
   return ['Removed the Webr plugin.', ...(stopped ? ['Stopped the running Webr.'] : [])];
 }
 
-export async function restartPluginWebr(deps: PluginDeps) {
+const quiet = (output: string) => output.split('\n').filter((line) => line.trim() && !/ExperimentalWarning|trace-warnings/.test(line));
+
+export async function updatePlugin(deps: PluginDeps) {
   if (!deps.run('herdr', ['--version']).ok) return undefined;
-  const plugin = installedPlugin(deps.run);
-  if (!plugin) return undefined;
-  const configDir = pluginConfigDir(deps.run);
-  const address = probeAddress(readPluginConfig(configDir));
+  if (!installedPlugin(deps.run)) return undefined;
+  const address = probeAddress(readPluginConfig(pluginConfigDir(deps.run)));
   if ((await isPortOpen(address)) && !(await stopPluginWebr(deps.stateDir, address))) return [`Webr is running on port ${address.port} but the plugin did not start it. Stop it and run "webr plugin install" to use the new version.`];
-  return [startNow(plugin.root, configDir, deps)];
+  const refreshed = deps.run('webr', ['plugin', 'install', '--no-open']);
+  return refreshed.ok ? quiet(refreshed.output) : [`The new Webr could not refresh the plugin. Run "webr plugin install". ${quiet(refreshed.output).join(' ')}`];
 }
 
 export async function pluginStatus(deps: PluginDeps) {
@@ -62,6 +75,7 @@ export async function pluginStatus(deps: PluginDeps) {
   return [
     `Installed (${plugin.kind === 'github' ? 'from GitHub' : `linked to ${plugin.root}`}).`,
     `Webr is ${await isPortOpen(address) ? 'running' : 'not running'} on port ${address.port}.`,
+    ...modeLines(pluginMode(deps.run, deps.stateDir)),
     `Settings: ${JSON.stringify(config)}`,
     `Logs and state: ${deps.stateDir}`,
   ];

package/server/plugin/mode.ts

@@ -0,0 +1,40 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import type { RunCommand } from '../command';
+import { DEV_FILE } from './files';
+import { installedPlugin } from './herdr';
+import { isAlive } from './stop';
+
+export type PluginMode =
+  | { kind: 'absent' }
+  | { kind: 'production' }
+  | { kind: 'dev'; checkout: string }
+  | { kind: 'stuck'; where: string };
+
+type DevRecord = { checkout?: string; pid?: number };
+
+function readDevRecord(stateDir: string): DevRecord | undefined {
+  try { return JSON.parse(readFileSync(join(stateDir, DEV_FILE), 'utf8')) as DevRecord; } catch { return undefined; }
+}
+
+const devIsRunning = (record: DevRecord) => record.pid === undefined || isAlive(record.pid);
+
+function installedOrUndefined(run: RunCommand) {
+  try { return installedPlugin(run); } catch { return undefined; }
+}
+
+export function pluginMode(run: RunCommand, stateDir: string): PluginMode {
+  const plugin = installedOrUndefined(run);
+  const record = readDevRecord(stateDir);
+  if (record?.checkout && devIsRunning(record) && plugin?.kind === 'local') return { kind: 'dev', checkout: record.checkout };
+  if (record?.checkout) return { kind: 'stuck', where: record.checkout };
+  if (plugin?.kind === 'local') return { kind: 'stuck', where: plugin.root };
+  return plugin ? { kind: 'production' } : { kind: 'absent' };
+}
+
+export function modeLines(mode: PluginMode) {
+  if (mode.kind === 'production') return ['Mode: production (started by the Herdr plugin).'];
+  if (mode.kind === 'dev') return [`Mode: dev, running from ${mode.checkout}. Stopping "pnpm dev" brings production back.`];
+  if (mode.kind === 'stuck') return [`Mode: the plugin still points at ${mode.where} but dev is not running. Run "webr plugin install" to restore production.`];
+  return [];
+}

package/server/plugin/stop.ts

@@ -18,7 +18,7 @@ function recordedPid(stateDir: string) {
   } catch { return undefined; }
 }
 
-function isAlive(pid: number) {
+export function isAlive(pid: number) {
   try { process.kill(pid, 0); return true; } catch (error) { return (error as NodeJS.ErrnoException).code === 'EPERM'; }
 }
 

package/server/where.ts

@@ -4,14 +4,14 @@ import { isPortOpen } from './plugin/probe';
 const localUrl = (port: number) => `http://localhost:${port}`;
 const launcher = (platform = process.platform) => platform === 'darwin' ? ['open'] : platform === 'win32' ? ['cmd', '/c', 'start', ''] : ['xdg-open'];
 
-export async function statusLines(port: number) {
-  if (await isPortOpen({ host: '127.0.0.1', port })) return [`Webr is running at ${localUrl(port)}`];
-  return [`Webr is not running. Its address is ${localUrl(port)}.`, 'It starts with the Herdr server once the plugin is installed ("webr plugin install"), or run "webr start".'];
+export async function statusLines(port: number, mode: string[] = []) {
+  if (await isPortOpen({ host: '127.0.0.1', port })) return [`Webr is running at ${localUrl(port)}`, ...mode];
+  return [`Webr is not running. Its address is ${localUrl(port)}.`, ...mode, 'It starts with the Herdr server once the plugin is installed ("webr plugin install"), or run "webr start".'];
 }
 
 export async function openWebr(port: number, open = openInBrowser) {
   const lines = await statusLines(port);
-  if (lines.length > 1) return lines;
+  if (lines[0]!.includes('not running')) return lines;
   open(localUrl(port));
   return [`Opening ${localUrl(port)}`];
 }