agentgui 1.0.911 → 1.0.913

package/lib/plugins/stream-plugin.js

@@ -1,6 +1,6 @@
 // Stream plugin - session management, streaming execution, rate limiting
 
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID as uuidv4 } from 'crypto';
 
 export default {
   name: 'stream',

package/lib/tool-spawner.js

@@ -29,17 +29,24 @@ const spawnNpmInstall = (pkg, onProgress) => new Promise((resolve) => {
   proc.on('error', (err) => { clearTimeout(timer); if (!completed) { completed = true; resolve({ success: false, error: err.message }); } });
 });
 
-const spawnBunxProc = (pkg, onProgress) => new Promise((resolve) => {
-  const cmd = isWindows ? 'bun.cmd' : 'bun';
+const BUNX_RUNNERS = [
+  { cmd: isWindows ? 'bun.cmd' : 'bun', args: (pkg) => ['x', pkg] },
+  { cmd: isWindows ? 'npx.cmd' : 'npx', args: (pkg) => ['-y', pkg] },
+];
+
+const isMissingCmdError = (s) => /not recognized|ENOENT|command not found|cannot find/i.test(s || '');
+
+const spawnBunxOnce = (runner, pkg, onProgress) => new Promise((resolve) => {
+  const cmd = runner.cmd;
   let completed = false, stderr = '', stdout = '';
   let lastDataTime = Date.now();
   let proc;
   try {
-    proc = spawn(cmd, ['x', pkg], { stdio: ['pipe', 'pipe', 'pipe'], timeout: 300000, shell: isWindows, windowsHide: true });
+    proc = spawn(cmd, runner.args(pkg), { stdio: ['pipe', 'pipe', 'pipe'], timeout: 300000, shell: isWindows, windowsHide: true });
   } catch (err) {
-    return resolve({ success: false, error: `Failed to spawn bun x: ${err.message}` });
+    return resolve({ success: false, error: `Failed to spawn ${cmd}: ${err.message}`, missing: isMissingCmdError(err.message) });
   }
-  if (!proc) return resolve({ success: false, error: 'Failed to spawn bun x process' });
+  if (!proc) return resolve({ success: false, error: `Failed to spawn ${cmd} process`, missing: true });
 
   const timer = setTimeout(() => {
     if (!completed) { completed = true; try { proc.kill('SIGKILL'); } catch (_) {} resolve({ success: false, error: 'Timeout (5min)' }); }
@@ -48,7 +55,7 @@ const spawnBunxProc = (pkg, onProgress) => new Promise((resolve) => {
   const heartbeatTimer = setInterval(() => {
     if (completed) { clearInterval(heartbeatTimer); return; }
     const elapsed = Date.now() - lastDataTime;
-    if (elapsed > 30000) console.warn(`[tool-manager] No output from bun x ${pkg} for ${elapsed}ms - process may be hung`);
+    if (elapsed > 30000) console.warn(`[tool-manager] No output from ${cmd} ${pkg} for ${elapsed}ms - process may be hung`);
   }, 30000);
 
   const onData = (d) => { lastDataTime = Date.now(); if (onProgress) onProgress({ type: 'progress', data: d.toString() }); };
@@ -64,16 +71,27 @@ const spawnBunxProc = (pkg, onProgress) => new Promise((resolve) => {
     const ok = [code === 0, output.includes('upgraded'), output.includes('registered'),
       output.includes('Hooks registered'), output.includes('successfully'),
       output.includes('Done'), code === 0 && !output.includes('error')].some(Boolean);
-    resolve(ok ? { success: true, error: null, pkg } : { success: false, error: output.substring(0, 1000) || 'Failed' });
+    resolve(ok ? { success: true, error: null, pkg } : { success: false, error: output.substring(0, 1000) || 'Failed', missing: isMissingCmdError(output) });
   });
 
   proc.on('error', (err) => {
     clearTimeout(timer);
     clearInterval(heartbeatTimer);
-    if (!completed) { completed = true; resolve({ success: false, error: `Process error: ${err.message}` }); }
+    if (!completed) { completed = true; resolve({ success: false, error: `Process error: ${err.message}`, missing: isMissingCmdError(err.message) }); }
   });
 });
 
+const spawnBunxProc = async (pkg, onProgress) => {
+  let lastResult = null;
+  for (const runner of BUNX_RUNNERS) {
+    const result = await spawnBunxOnce(runner, pkg, onProgress);
+    if (result.success) return result;
+    lastResult = result;
+    if (!result.missing) return result;
+  }
+  return lastResult || { success: false, error: 'No runner available' };
+};
+
 function spawnForTool(tool, onProgress) {
   const pkg = tool.installPkg || tool.pkg;
   return tool.category === 'cli' ? spawnNpmInstall(pkg, onProgress) : spawnBunxProc(pkg, onProgress);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.911",
+  "version": "1.0.913",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/site/theme.mjs

@@ -1,7 +1,10 @@
 // AnEntrypoint design-system theme for flatspace.
-// Renders site chrome via anentrypoint-design SDK using REAL SDK components.
-// theme.mjs emits HTML shell + bootstrap that consumes YAML baked into <script id="__site__">.
-// SDK provides ALL styling via installStyles(); plus a tiny inline body-margin reset.
+// Renders SDK chrome around home (landing) AND legacy docs/* pages
+// (each rendered as an iframe of the original, preserving scripts/styles).
+
+import { readFileSync, existsSync } from 'fs';
+import { resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
 
 const escapeHtml = (s) => String(s ?? '')
   .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
@@ -12,36 +15,36 @@ const escapeJson = (obj) => JSON.stringify(obj)
   .replace(new RegExp('\\u2028', 'g'), '\\u2028').replace(new RegExp('\\u2029', 'g'), '\\u2029');
 
 const SDK_URL = 'https://unpkg.com/anentrypoint-design@latest/dist/247420.js';
+const THIS_DIR = dirname(fileURLToPath(import.meta.url));
 
-const clientScript = `
+const landingClient = `
 import { h, applyDiff, installStyles, components as C } from 'anentrypoint-design';
 installStyles();
 document.documentElement.classList.add('ds-247420');
-
 const data = JSON.parse(document.getElementById('__site__').textContent);
-const { site, nav, home } = data;
+const { site, nav, page } = data;
 
 function Hero() {
-  if (!home || !home.hero) return null;
+  if (!page || !page.hero) return null;
   return C.Panel({
     style: 'margin:8px',
     children: h('div', { style: 'padding:24px 22px' },
-      C.Heading({ level: 1, style: 'margin:0 0 8px 0', children: home.hero.heading || site.title }),
-      home.hero.subheading ? C.Lede({ children: home.hero.subheading }) : null,
-      home.hero.body ? h('p', { style: 'margin:8px 0 16px 0;color:var(--panel-text-2);max-width:64ch' }, home.hero.body) : null,
-      (home.hero.badges && home.hero.badges.length) ? h('div', { style: 'display:flex;gap:6px;flex-wrap:wrap;margin:0 0 12px 0' },
-        ...home.hero.badges.map((b, i) => C.Chip({ key: 'b' + i, children: b.label }))
+      C.Heading({ level: 1, style: 'margin:0 0 8px 0', children: page.hero.heading || site.title }),
+      page.hero.subheading ? C.Lede({ children: page.hero.subheading }) : null,
+      page.hero.body ? h('p', { style: 'margin:8px 0 16px 0;color:var(--panel-text-2);max-width:64ch' }, page.hero.body) : null,
+      (page.hero.badges && page.hero.badges.length) ? h('div', { style: 'display:flex;gap:6px;flex-wrap:wrap;margin:0 0 12px 0' },
+        ...page.hero.badges.map((b, i) => C.Chip({ key: 'b' + i, children: b.label }))
       ) : null,
-      (home.hero.ctas && home.hero.ctas.length) ? h('div', { style: 'display:flex;gap:8px;flex-wrap:wrap' },
-        ...home.hero.ctas.map((c, i) => C.Btn({ key: 'c' + i, href: c.href, primary: c.primary, children: c.label }))
+      (page.hero.ctas && page.hero.ctas.length) ? h('div', { style: 'display:flex;gap:8px;flex-wrap:wrap' },
+        ...page.hero.ctas.map((c, i) => C.Btn({ key: 'c' + i, href: c.href, primary: c.primary, children: c.label }))
       ) : null
     )
   });
 }
 
 function Features() {
-  if (!home || !home.features || !home.features.items || !home.features.items.length) return null;
-  const rows = home.features.items.map((it, i) => C.RowLink({
+  if (!page || !page.features || !page.features.items || !page.features.items.length) return null;
+  const rows = page.features.items.map((it, i) => C.RowLink({
     key: 'f' + i,
     code: String(i + 1).padStart(2, '0'),
     title: it.name,
@@ -50,15 +53,15 @@ function Features() {
     href: it.href || '#'
   }));
   return C.Panel({
-    title: home.features.heading || 'features',
+    title: page.features.heading || 'features',
     style: 'margin:8px',
     children: rows
   });
 }
 
 function Quickstart() {
-  if (!home || !home.quickstart || !home.quickstart.lines || !home.quickstart.lines.length) return null;
-  const lineNodes = home.quickstart.lines.map((l, i) => {
+  if (!page || !page.quickstart || !page.quickstart.lines || !page.quickstart.lines.length) return null;
+  const lineNodes = page.quickstart.lines.map((l, i) => {
     const isComment = l.kind === 'cmt';
     return h('div', { key: 'q' + i, class: 'cli' },
       h('span', { class: 'prompt' }, isComment ? '#' : '$'),
@@ -66,28 +69,12 @@ function Quickstart() {
     );
   });
   return C.Panel({
-    title: home.quickstart.heading || 'quick start',
+    title: page.quickstart.heading || 'quick start',
     style: 'margin:8px',
     children: h('div', { style: 'padding:16px 22px' }, ...lineNodes)
   });
 }
 
-function Examples() {
-  if (!home || !home.examples || !home.examples.items || !home.examples.items.length) return null;
-  const rows = home.examples.items.map((it, i) => C.RowLink({
-    key: 'e' + i,
-    title: it.name,
-    sub: it.desc || '',
-    meta: it.cta || 'open',
-    href: it.href || '#'
-  }));
-  return C.Panel({
-    title: home.examples.heading || 'examples',
-    style: 'margin:8px',
-    children: rows
-  });
-}
-
 function Footer() {
   return h('footer', { class: 'app-status' },
     h('span', { class: 'item' }, 'styled with '),
@@ -102,64 +89,95 @@ function Footer() {
 const navItems = (nav && nav.links ? nav.links : []).map(l => [String(l.label || ''), l.href]);
 
 const App = C.AppShell({
-  topbar: C.Topbar({
-    brand: '247420',
-    leaf: site.title || '',
-    items: navItems
-  }),
-  crumb: C.Crumb({
-    trail: ['247420'],
-    leaf: site.title || ''
-  }),
-  main: h('div', {},
-    Hero(),
-    Features(),
-    Quickstart(),
-    Examples()
-  ),
+  topbar: C.Topbar({ brand: '247420', leaf: site.title || '', items: navItems }),
+  crumb: C.Crumb({ trail: ['247420'], leaf: site.title || '' }),
+  main: h('div', {}, Hero(), Features(), Quickstart()),
   status: Footer()
 });
+applyDiff(document.getElementById('app'), [App]);
+`;
 
+const embedClient = `
+import { h, applyDiff, installStyles, components as C } from 'anentrypoint-design';
+installStyles();
+document.documentElement.classList.add('ds-247420');
+const data = JSON.parse(document.getElementById('__site__').textContent);
+const { site, nav, page } = data;
+const navItems = (nav && nav.links ? nav.links : []).map(l => [String(l.label || ''), l.href]);
+
+function Footer() {
+  return h('footer', { class: 'app-status' },
+    h('span', { class: 'item' }, 'styled with '),
+    h('a', { class: 'item', href: 'https://anentrypoint.github.io/design/' }, 'anentrypoint-design'),
+    h('span', { class: 'item' }, '·'),
+    h('a', { class: 'item', href: 'https://247420.xyz' }, '247420.xyz'),
+    h('span', { class: 'spread' }),
+    site.repo ? h('a', { class: 'item', href: site.repo }, 'source ↗') : null
+  );
+}
+
+const App = C.AppShell({
+  topbar: C.Topbar({ brand: '247420', leaf: site.title || '', items: navItems }),
+  crumb: C.Crumb({ trail: ['247420', site.title || ''], leaf: page.title || '' }),
+  main: C.Panel({
+    style: 'margin:8px',
+    children: h('iframe', {
+      src: page.embedSrc,
+      style: 'width:100%;height:calc(100vh - 180px);min-height:520px;border:0;border-radius:6px;background:var(--panel-1);display:block',
+      title: page.title || ''
+    })
+  }),
+  status: Footer()
+});
 applyDiff(document.getElementById('app'), [App]);
 `;
 
-const html = ({ site, nav, home }) => `<!DOCTYPE html>
+const renderHtml = ({ site, nav, page, clientScript }) => `<!DOCTYPE html>
 <html lang="en" class="ds-247420">
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>${escapeHtml(site.title)}${site.tagline ? ' — ' + escapeHtml(site.tagline) : ''}</title>
-  <meta name="description" content="${escapeHtml(site.description || site.tagline || site.title)}" />
-  <meta property="og:title" content="${escapeHtml(site.title)}" />
-  <meta property="og:description" content="${escapeHtml(site.description || site.tagline || '')}" />
-  <meta property="og:url" content="${escapeHtml(site.url || '')}" />
-  <link rel="canonical" href="${escapeHtml(site.url || '')}" />
-  <link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Ctext y='26' font-size='26'%3E${encodeURIComponent(site.glyph || '◆')}%3C/text%3E%3C/svg%3E" />
+  <title>${escapeHtml(page.title || site.title)}${site.tagline ? ' — ' + escapeHtml(site.tagline) : ''}</title>
+  <meta name="description" content="${escapeHtml(page.description || site.description || site.tagline || site.title)}" />
   <script type="importmap">{"imports":{"anentrypoint-design":"${SDK_URL}"}}</script>
   <style>html,body{margin:0;padding:0}body{background:var(--app-bg,#FBF6EB);color:var(--ink,#1F1B16);font-family:var(--ff-ui,'Nunito',system-ui,sans-serif)}</style>
 </head>
 <body>
   <div id="app"></div>
-  <script type="application/json" id="__site__">${escapeJson({ site, nav, home })}</script>
+  <script type="application/json" id="__site__">${escapeJson({ site, nav, page })}</script>
   <script type="module">${clientScript}</script>
 </body>
 </html>
 `;
 
 export default {
+  // Copy original docs/* into dist/_legacy/* so iframes can load them.
   assets: {
-    '../docs/demo.html': 'demo.html',
+    '../docs/demo.html': '_legacy/demo.html',
     '../docs/screenshots': 'screenshots',
   },
   render: async (ctx) => {
     const site = ctx.readGlobal('site') || {};
     const nav = ctx.readGlobal('navigation') || { links: [] };
-    const homeDoc = ctx.read('pages').docs.find(p => p.id === 'home');
-    if (!homeDoc) throw new Error('config/pages/home.yaml missing or has no id: home');
+    const docs = ctx.read('pages').docs;
+    const homeDoc = docs.find(p => p.id === 'home');
+    if (!homeDoc) throw new Error('site/content/pages/home.yaml missing or has no id: home');
 
-    return [{
+    const outputs = [{
       path: 'index.html',
-      html: html({ site, nav, home: homeDoc })
+      html: renderHtml({ site, nav, page: homeDoc, clientScript: landingClient })
     }];
+
+    // Wrapped legacy pages: SDK chrome + iframe of original.
+    const embeds = [
+      { path: 'demo.html', title: 'demo', embedSrc: './_legacy/demo.html' },
+    ];
+    for (const e of embeds) {
+      outputs.push({
+        path: e.path,
+        html: renderHtml({ site, nav, page: e, clientScript: embedClient })
+      });
+    }
+    return outputs;
   }
 };