lampson 0.2.0 → 0.2.2

package/lib/workspaces.syn

@@ -526,7 +526,9 @@ export task pick_folder()
     require env("OS")
     try
         when is_win()
-            let ps be "Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.FolderBrowserDialog; $d.Description = 'Elegí la carpeta del proyecto (workspace de Lampson)'; $d.ShowNewFolderButton = $true; $f = New-Object System.Windows.Forms.Form; $f.TopMost = $true; if ($d.ShowDialog($f) -eq 'OK') { Write-Output $d.SelectedPath }"
+            -- Shell.Application.BrowseForFolder: el diálogo del Explorador; sale al frente aunque este proceso no tenga
+            -- ventana (FolderBrowserDialog de WinForms quedaba detrás desde un proceso oculto). 0x40 = con campo de ruta, 0x1 = solo carpetas
+            let ps be "$s = New-Object -ComObject Shell.Application; $f = $s.BrowseForFolder(0, 'Elegí la carpeta del proyecto (workspace de Lampson)', 0x41, 0); if ($f) { Write-Output $f.Self.Path }"
             let r be run("powershell", ["-NoProfile", "-STA", "-Command", ps], 300)
             give trim(text(r["stdout"]))
         let r be run("sh", ["-c", "if command -v osascript >/dev/null; then osascript -e 'POSIX path of (choose folder with prompt \"Carpeta del proyecto\")'; elif command -v zenity >/dev/null; then zenity --file-selection --directory --title='Carpeta del proyecto'; else exit 3; fi"], 300)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lampson",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A coding agent written in Synsema: terminal + web, tools confined to the mounted project, lamps (your own tool plugins), LSP, MCP, sub-agents.",
   "license": "MIT",
   "repository": {

package/public/css/panel.css

@@ -123,3 +123,30 @@
 .panel .phelp p { margin:0 0 12px; max-width:78ch; }
 .panel .phelp ul { margin:0 0 16px 20px; padding:0; display:grid; gap:4px; max-width:78ch; }
 .panel .phelp button { text-transform:none; letter-spacing:0; font:400 12px/1 var(--mono); padding:6px 10px; }
+
+/* detalle: la prosa y los formularios de las vistas no heredan la mono del contenedor */
+.panel .bdetail .lead, .panel .bdetail .ddesc, .panel .bdetail .ds, .panel .bdetail .none { font-family:var(--serif); }
+.panel .bdetail .ds { display:block; color:var(--ink-3); font:400 11.5px/1.45 var(--serif); }
+.panel .bdetail .dform input, .panel .bdetail .dform select, .panel .bdetail .dform textarea { max-width:560px; }
+.panel .bdetail .dform label { color:var(--ink-3); }
+.panel .bdetail .dform label.col { max-width:560px; }
+.panel .bdetail .dacts .ds { display:inline; color:var(--ink-3); }
+.panel .bdetail .dfoot { font-family:var(--mono); }
+
+/* nuevo workspace: elegir carpeta → carpeta elegida → crear */
+.panel .pickrow { display:flex; align-items:center; gap:12px; margin:6px 0 12px; }
+.panel .pickrow .ds { display:inline; margin:0; }
+.panel .pickrow a { color:var(--accent); text-decoration:none; }
+.panel .pickrow a:hover { text-decoration:underline; text-underline-offset:.18em; }
+.panel .chosen { display:flex; align-items:center; gap:10px; padding:10px 12px; border:1px solid var(--rule-2); border-radius:var(--r); background:var(--paper-2); margin:0 0 6px; max-width:640px; }
+.panel .chosen .lk { font:400 10.5px/1 var(--mono); text-transform:uppercase; letter-spacing:.1em; color:var(--ink-3); }
+.panel .chosen code { font:400 12.5px/1.4 var(--mono); color:var(--ink); overflow:hidden; text-overflow:ellipsis; white-space:nowrap; flex:1; }
+.panel .chosen .del { color:var(--ink-3); cursor:pointer; font-size:11px; }
+.panel .chosen .del:hover { color:var(--rubric); }
+.panel .wsbrowser { border:1px solid var(--rule); border-radius:var(--r); max-width:640px; margin:0 0 10px; display:flex; flex-direction:column; }
+.panel .wsbrowser .bhead { display:flex; align-items:center; gap:10px; padding:8px 10px; border-bottom:1px solid var(--rule); }
+.panel .wsbrowser .bhead .ds { flex:1; min-width:0; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-family:var(--mono); color:var(--ink); display:inline; }
+.panel .wsbrowser .bhead input { flex:0 0 240px; height:28px; padding:0 8px; font-size:12px; background:transparent; }
+.panel .wsbrowser .bitems { max-height:30vh; overflow-y:auto; padding:4px; }
+.panel .wsbrowser .bfoot { padding:8px 10px; border-top:1px solid var(--rule); display:flex; justify-content:flex-end; }
+.panel .wsbrowser .bfoot button { font:400 12px/1 var(--mono); padding:6px 12px; }

package/public/hub.html

@@ -32,5 +32,6 @@
 </main>
 <script src="/js/panel.js"></script>
 <script src="/js/hub.js"></script>
+<script src="/js/workspaces.js"></script>
 </body>
 </html>

package/public/js/hub.js

@@ -22,9 +22,8 @@ paintTheme();
 // tarjetas
 async function paintGrid() {
   const grid = $('#wsGrid'); let r; try { r = await (await fetch(BASE + '/api/workspaces')).json(); } catch (e) { grid.innerHTML = '<div class="card"><p>el hub no responde</p></div>'; return; }
-  wsList = r.workspaces || []; wsIdle = r.idle_hours;
   grid.innerHTML = '';
-  for (const w of wsList) {
+  for (const w of (r.workspaces || [])) {
     const c = document.createElement('a'); c.className = 'card ws' + (w.alive ? ' on' : ''); c.href = w.url;
     c.innerHTML = `<h3>${w.alive ? '● vivo' : '○ apagado'}${w.schedules_on ? ' · ⏰ ' + w.schedules_on : ''}</h3><p class="nm">${esc(w.name)}</p><p class="pth">${esc(w.path)}</p><p class="meta">último uso ${esc(fmtWhen(w.last_used))}</p>`;
     grid.appendChild(c);

package/public/js/procs.js

@@ -3,7 +3,8 @@ let procOpen = null, procTimer = null;
 async function loadPorts() {
   let r; try { r = await (await fetch(BASE + '/api/ports')).json(); } catch (e) { return; }
   const box = $('#ports'); box.innerHTML = '';
-  const list = (r.ports || []).filter(p => p.port !== 8080 || p.name !== 'synsema.exe');
+  // los procesos de lampson (hub :8080 y los workspaces :808N) no son «servidores del proyecto»
+  const list = (r.ports || []).filter(p => !(p.name === 'synsema.exe' || p.name === 'synsema') || !/\b(web|hub)\.syn\b/.test(p.command || '') && p.port !== 8080);
   $('#portCount').textContent = list.length || ''; autoSec('ports', list.length > 0);
   if (!list.length) { box.innerHTML = '<div class="p none">ninguno</div>'; return; }
   for (const p of list) {

package/public/js/workspaces.js

@@ -27,7 +27,7 @@ function openWorkspaces(selectSlug) {
         <div class="ddesc">${w.schedules_on ? `${w.schedules_on} tarea${w.schedules_on === 1 ? '' : 's'} programada${w.schedules_on === 1 ? '' : 's'} encendida${w.schedules_on === 1 ? '' : 's'} (lo mantienen vivo). ` : ''}Último uso: ${esc(fmtWhen(w.last_used))}.</div>
         <div class="dacts"><button class="primary" data-open>${w.slug === WS_SLUG ? 'Ya estás acá' : 'Abrir'}</button>${w.alive ? '<button data-stop>■ apagar</button>' : '<button data-start>▶ encender</button>'}</div>
         <div class="dform" style="margin-top:14px"><label>vida <select name="policy"><option value="auto" ${w.policy === 'auto' ? 'selected' : ''}>auto — vivo mientras se use (${wsIdle === 0 ? 'nunca se apaga' : 'se apaga tras ' + wsIdle + ' h sin uso'}) o tenga tareas</option><option value="always" ${w.policy === 'always' ? 'selected' : ''}>siempre vivo</option><option value="off" ${w.policy === 'off' ? 'selected' : ''}>apagado — solo cuando lo abrís</option></select></label><span class="ds">las horas de inactividad se cambian en ⚙ → General</span></div>
-        <div class="dfoot"><span>/w/${esc(w.slug)}/ · :${w.port} (solo loopback)</span><span class="del">quitar del registro</span></div><div class="derr"></div>`,
+        <div class="dfoot"><span>/w/${esc(w.slug)} · :${w.port} (solo loopback)</span><span class="del">quitar del registro</span></div><div class="derr"></div>`,
       wire: (w, box) => {
         const err = (m) => { const e = box.querySelector('.derr'); if (e) e.textContent = m || ''; };
         if (w === WS_NEW) { wsNewWire(box, err); return; }
@@ -44,40 +44,54 @@ function openWorkspaces(selectSlug) {
 function wsNewForm() {
   return `<div class="dhead"><span class="nm serif">Nuevo workspace</span></div><div class="dform">
     <p class="lead">Un workspace es una carpeta de tu disco: el agente solo puede tocar lo que hay adentro. Corre en su propio proceso, con sus sesiones, tareas programadas, MCP y lámparas.</p>
-    <div class="dacts" style="margin-top:0"><button class="primary" data-pick>Elegir carpeta…</button><span class="ds" data-pickhint>abre el diálogo de tu sistema</span></div>
-    <label style="margin-top:14px">ruta <input name="path" spellcheck="false" autocomplete="off" placeholder="C:\\proyectos\\mi-app  ·  /home/yo/proyectos/mi-app"></label>
-    <div data-browser style="display:none"><div class="dcap" data-here></div><div class="bitems" data-dirs style="max-height:32vh;border:1px solid var(--rule);border-radius:var(--r);padding:4px"></div></div>
-    <div class="pfoot"><button class="primary" data-go>Crear y abrir</button><button data-browse>explorar en el servidor</button><span class="derr"></span></div></div>`;
+    <div class="pickrow"><button class="primary" data-pick>Elegir carpeta…</button><span class="ds">se abre el diálogo de carpetas de tu sistema · <a href="#" data-browse>o explorá desde acá</a></span></div>
+    <div class="chosen" data-chosen style="display:none"><span class="lk">carpeta</span><code data-chosen-path></code><span class="del" data-clear title="elegir otra">✕</span></div>
+    <div data-browser class="wsbrowser" style="display:none">
+      <div class="bhead"><span class="ds" data-here></span><input name="path" spellcheck="false" autocomplete="off" placeholder="o pegá una ruta y Enter"></div>
+      <div class="bitems" data-dirs></div>
+      <div class="bfoot"><button data-use>Usar esta carpeta</button></div>
+    </div>
+    <div class="pfoot" data-go-row style="display:none;justify-content:flex-end"><span class="derr" style="margin:0 auto 0 0"></span><button class="primary" data-go>Crear y abrir</button></div>
+    <div class="derr" data-err2></div></div>`;
 }
-function wsNewWire(box, err) {
+function wsNewWire(box, err0) {
+  const chosenBox = box.querySelector('[data-chosen]'), goRow = box.querySelector('[data-go-row]'), browser = box.querySelector('[data-browser]');
   const f = n => box.querySelector(`[name="${n}"]`);
-  const browser = box.querySelector('[data-browser]');
+  const err = (m) => { const e = goRow.style.display === 'none' ? box.querySelector('[data-err2]') : goRow.querySelector('.derr'); box.querySelectorAll('.derr').forEach(x => x.textContent = ''); if (e) e.textContent = m || ''; };
+  let chosen = '';
+  const choose = (p) => { chosen = (p || '').trim(); chosenBox.style.display = chosen ? '' : 'none'; goRow.style.display = chosen ? 'flex' : 'none'; box.querySelector('[data-chosen-path]').textContent = chosen; if (chosen) { browser.style.display = 'none'; err(''); } };
+  let here = '';
   const showDir = async (p) => {
+    err('');
     const r = await (await fetch('/api/workspaces/browse?path=' + encodeURIComponent(p || ''))).json();
     browser.style.display = '';
-    box.querySelector('[data-here]').textContent = r.path + (r.error ? ' — ' + r.error : '');
-    f('path').value = r.path || '';
+    here = r.path || ''; box.querySelector('[data-here]').textContent = here + (r.error ? ' — ' + r.error : ''); f('path').value = '';
     const list = box.querySelector('[data-dirs]'); list.innerHTML = '';
-    const up = document.createElement('div'); up.className = 'li nodot'; up.innerHTML = '<div><div class="nm">..</div></div>'; up.onclick = () => showDir(r.parent); list.appendChild(up);
-    for (const d of (r.dirs || [])) { const it = document.createElement('div'); it.className = 'li nodot'; it.innerHTML = `<div><div class="nm" style="font-weight:400">${esc(d)}/</div></div>`; it.onclick = () => showDir(r.path.replace(/[\\/]$/, '') + (r.path.includes('\\') ? '\\' : '/') + d); list.appendChild(it); }
+    const up = document.createElement('div'); up.className = 'li nodot'; up.innerHTML = '<div><div class="nm">..</div><div class="meta">subir un nivel</div></div>'; up.onclick = () => showDir(r.parent); list.appendChild(up);
+    for (const d of (r.dirs || [])) { const it = document.createElement('div'); it.className = 'li nodot'; it.innerHTML = `<div><div class="nm" style="font-weight:400">${esc(d)}/</div></div>`; it.onclick = () => showDir(here.replace(/[\\/]$/, '') + (here.includes('\\') ? '\\' : '/') + d); list.appendChild(it); }
   };
-  box.querySelector('[data-browse]').onclick = () => showDir(f('path').value.trim());
+  box.querySelector('[data-browse]').onclick = (e) => { e.preventDefault(); showDir(chosen || ''); };
+  box.querySelector('[data-use]').onclick = () => choose(here);
+  f('path').addEventListener('keydown', (e) => { if (e.key === 'Enter') { e.preventDefault(); const v = f('path').value.trim(); if (v) showDir(v); } });
+  box.querySelector('[data-clear]').onclick = () => choose('');
   box.querySelector('[data-pick]').onclick = async () => {
-    err('esperando el diálogo… (mirá la barra de tareas)');
+    err('esperando el diálogo de carpetas… (si no lo ves, mirá la barra de tareas)');
     const r = await api('/api/workspaces/pick', {});
-    if (!r.data.native) { err(''); box.querySelector('[data-pickhint]').textContent = 'no hay diálogo en este equipo (VPS): usá el explorador'; showDir(''); return; }
-    err(''); if (r.data.path) f('path').value = r.data.path;
+    if (!r.ok) { err('esta página no es el hub: abrí ' + location.protocol + '//' + location.hostname + ':8080/'); return; }
+    if (!r.data.native) { err('no hay diálogo en este equipo (VPS): explorá desde acá'); showDir(''); return; }
+    err(''); if (r.data.path) choose(r.data.path);
   };
   box.querySelector('[data-go]').onclick = async () => {
-    const path = f('path').value.trim(); if (!path) { err('elegí una carpeta'); return; }
+    if (!chosen) { err('elegí una carpeta'); return; }
     err('creando y arrancando… (el hub se reinicia un instante)');
-    const r = await api('/api/workspaces', { path });
+    const r = await api('/api/workspaces', { path: chosen });
     if (!r.ok) { err(r.data.error || ('error ' + r.status)); return; }
-    // el hub se regenera con la ruta nueva y se reinicia (--watch): esperar a que vuelva y navegar
+    // el hub se regenera con la ruta nueva y se reinicia: esperar a que vuelva y navegar
     const url = r.data.url; let tries = 0;
-    const poll = async () => { tries++; try { const h = await fetch(BASE + '/api/hub'); if (h.ok && tries > 2) { location.href = url; return; } } catch (e) {} if (tries < 40) setTimeout(poll, 500); else err('el hub no volvió: abrí ' + url + ' a mano'); };
+    const poll = async () => { tries++; try { const h = await fetch('/api/hub'); if (h.ok && tries > 2) { location.href = url; return; } } catch (e) {} if (tries < 40) setTimeout(poll, 500); else err('el hub no volvió: abrí ' + url + ' a mano'); };
     setTimeout(poll, 1200);
   };
-  f('path').focus();
 }
-if ($('#wsPill')) { $('#wsPill').onclick = () => openWorkspaces(); paintWorkspacePill(); }
+// standalone (abierto por el puerto del workspace, no por el hub): la pill lleva al hub
+const HUB_URL = (location.port && location.port !== '8080') ? location.protocol + '//' + location.hostname + ':8080/' : '';
+if ($('#wsPill')) { if (HUB_URL) { const pill = $('#wsPill'); pill.style.display = ''; pill.textContent = 'workspaces ↗'; pill.title = 'esta pestaña es el proceso del workspace; los workspaces se gestionan en el hub'; pill.onclick = () => window.open(HUB_URL, '_blank'); } else { $('#wsPill').onclick = () => openWorkspaces(); paintWorkspacePill(); } }