lampson 0.2.2 → 0.2.3

package/lib/workspaces.syn

@@ -24,7 +24,8 @@ export let REGISTRY be ".lampson/workspaces.json"
 export let HUB_PORT be 8080
 export let HUB_FILE be "hub.syn"
 export let HUB_TEMPLATE be "hub.tpl.syn"
-let FIRST_PORT be 8081
+-- rango alto para no chocar con lo que usan las apps (3000, 5173, 8000, 8080-8090…): solo el hub queda en 8080
+let FIRST_PORT be 47101
 let LINKS be ["lib", "public", "skills", "lamps", "memory"]
 let COPIES be ["web.syn", "chat.syn"]
 
@@ -82,6 +83,38 @@ task load_reg()
 task save_reg(doc)
     write_file(REGISTRY, json_encode(doc))
 
+-- registros hechos con puertos 808N (antes de 0.2.3): reasignar al rango alto; los procesos viejos se paran en
+-- ensure/tick (por puerto) y el supervisor los levanta en el nuevo
+export task migrate_ports()
+    require exec
+    require time
+    require env("LAMPSON_*")
+    require env("OS")
+    require file(".lampson")
+    require file(".lampson/*")
+    require file.read("hub.tpl.syn")
+    require file("hub.syn")
+    let doc be load_reg()
+    let changed be false
+    when doc["next_port"] < FIRST_PORT
+        set doc["next_port"] to FIRST_PORT
+        set changed to true
+    each k in keys(doc["workspaces"])
+        let w be doc["workspaces"][k]
+        when w["port"] < FIRST_PORT
+            let old be w["port"]
+            each l in proc.listeners()
+                when l["port"] == old
+                    proc.kill_pid(l["pid"])
+            set w["port"] to doc["next_port"]
+            set doc["next_port"] to doc["next_port"] + 1
+            set doc["workspaces"][k] to w
+            set changed to true
+    when changed
+        save_reg(doc)
+        regen_hub()
+    give changed
+
 export task all()
     require file(".lampson")
     require file(".lampson/*")
@@ -241,6 +274,7 @@ export task ensure(path)
     require file.read("chat.syn")
     require file.read("hub.tpl.syn")
     require file("hub.syn")
+    migrate_ports()
     let existing be by_path(path)
     let w be existing
     when w == nothing
@@ -490,6 +524,8 @@ export task tick()
     require file(".lampson/*")
     require file.read("web.syn")
     require file.read("chat.syn")
+    when migrate_ports() and hub_alive()
+        restart_hub_later()
     let started be []
     let stopped be []
     each w in all()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lampson",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "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/sidebar.css

@@ -78,3 +78,7 @@
 .del.ask .yes { color:var(--rubric); cursor:pointer; font-weight:600; }
 .del.ask .no { color:var(--ink-2); cursor:pointer; }
 .del.ask .yes:hover, .del.ask .no:hover { text-decoration:underline; text-underline-offset:.18em; }
+
+/* puertos ocupados por lampson: visibles pero sin link ni ✕ */
+.p .port.own { color:var(--ink-3); font-weight:400; }
+.p.own .cm { color:var(--ink-3); }

package/public/js/app.js

@@ -14,7 +14,7 @@ async function loadCfg() {
   sel.onchange = () => { localStorage.setItem('lampson.agent', sel.value); hint(); }; hint();
   if (!log.children.length) empty();
 }
-loadCfg().then(() => { loadTree(); loadSessions(); loadProcs(); loadMemory(); loadAgents(); loadMcp(); loadLsp(); loadLamps(); loadTodo(); loadSched(); loadApprovals(); checkUpdate(); const pq = new URLSearchParams(location.search).get('proc'); if (pq) openProc(pq); else if (session) open(session); });
+loadCfg().then(() => { loadTree(); loadSessions(); loadProcs(); loadMemory(); loadAgents(); loadMcp(); loadLsp(); loadLamps(); loadTodo(); loadSched(); loadApprovals(); checkUpdate(); const pq = new URLSearchParams(location.search).get('proc'); if (pq) openProc(pq); else if (session) openSession(session); });
 // respaldos lentos por si el stream de eventos se cae
 setInterval(loadProcs, events ? 60000 : 10000);
 setInterval(() => { loadSched(); if (!events) loadApprovals(); }, events ? 60000 : 15000);

package/public/js/procs.js

@@ -3,13 +3,16 @@ 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 = '';
-  // 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);
+  // los procesos de lampson (hub :8080, un workspace por puerto alto) OCUPAN el puerto: se ven, identificados,
+  // sin link (la UI se usa por el hub) y sin ✕ (un workspace se apaga desde su Panel; matarlo lo relanza el supervisor)
+  let wsByPort = {}; try { const ws = (await (await fetch('/api/workspaces')).json()).workspaces || []; for (const w of ws) wsByPort[w.port] = w; } catch (e) {}
+  const list = (r.ports || []).map(p => { const own = /\b(web|hub)\.syn\b/.test(p.command || '') || (p.port === 8080 && /synsema/.test(p.name || '')); return Object.assign({}, p, { lampson: own, wsName: own && wsByPort[p.port] ? wsByPort[p.port].name : (own && p.port === 8080 ? 'hub' : '') }); });
   $('#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) {
-    const d = document.createElement('div'); d.className = 'p'; d.style.cursor = 'default'; d.title = `pid ${p.pid}\n${p.command || '(línea de comando no disponible)'}`;
+    const d = document.createElement('div'); d.className = 'p' + (p.lampson ? ' own' : ''); d.style.cursor = 'default'; d.title = `pid ${p.pid}\n${p.command || '(línea de comando no disponible)'}`;
     const what = p.command ? p.command.replace(/^"?[A-Za-z]:\\[^"]*\\([^"\\]+)"?/, '$1') : p.name;
+    if (p.lampson) { d.innerHTML = `<span class="port own" title="puerto ocupado por lampson">:${p.port}</span><span class="cm">lampson · ${esc(p.wsName ? (p.port === 8080 ? 'hub' : 'workspace ' + p.wsName) : 'proceso')}</span>`; box.appendChild(d); continue; }
     d.innerHTML = `<a class="port" href="http://127.0.0.1:${p.port}" target="_blank" rel="noopener" title="abrir http://127.0.0.1:${p.port} en otra pestaña">:${p.port}</a><span class="cm">${esc(what)}</span><button title="matar este proceso (pid ${p.pid}; no lo gestiona lampson)">✕</button>`;
     const kb = d.querySelector('button'); kb.onclick = () => { const holder = document.createElement('span'); holder.className = 'del'; kb.replaceWith(holder); inlineConfirm(holder, `¿matar pid ${p.pid}?`, async () => { await api(BASE + '/api/ports/kill', { pid: p.pid }); loadPorts(); }); setTimeout(() => { if (!holder.classList.contains('ask')) loadPorts(); }, 6100); };
     box.appendChild(d);

package/public/js/schedules.js

@@ -68,7 +68,7 @@ function openSched(selectId) {
         if (t === SCHED_NEW) { schedFormWire(box, err); return; }
         box.querySelector('[data-run]').onclick = async () => { const r = await api(BASE + '/api/schedules/run', { id: t.id }); add('meta', '⏰ ' + esc(r.data.result || r.data.error || '')); setTimeout(loadSched, 1500); setTimeout(() => Panel.is('schedules') && Panel.detail(), 2500); };
         box.querySelector('[data-toggle]').onclick = async () => { const r = await api(BASE + '/api/schedules/toggle', { id: t.id, enabled: !t.enabled }); if (!r.ok) { err(r.data.error || 'error'); return; } loadSched(); };
-        box.querySelectorAll('[data-session]').forEach(a => a.onclick = (e) => { e.preventDefault(); Panel.close(); open(a.dataset.session); });
+        box.querySelectorAll('[data-session]').forEach(a => a.onclick = (e) => { e.preventDefault(); Panel.close(); openSession(a.dataset.session); });
         const del = box.querySelector('.dfoot .del');
         del.onclick = () => inlineConfirm(del, `¿quitar ${t.name}?`, async () => { await api(BASE + '/api/schedules/remove', { id: t.id }); loadSched(); });
         const live = box.querySelector('[data-live]'); if (live) live.scrollTop = live.scrollHeight;

package/public/js/sessions.js

@@ -9,7 +9,7 @@ async function loadSessions() {
   if (!r.sessions.length) { box.innerHTML = '<div class="s none">todavía ninguna</div>'; return; }
   const shown = r.sessions.slice(0, 4);
   for (const s of shown) {
-    const d = document.createElement('div'); d.className = 's' + (s.id === session ? ' active' : ''); d.innerHTML = '<span class="id">' + esc(s.id.slice(-6)) + '</span><span class="title">' + esc(s.title || '') + '</span><span class="del tr" title="traza: qué hizo el agente en esta sesión (pasos, tools, tiempos, tokens)">≡</span><span class="del" title="borrar esta sesión">✕</span>'; d.title = s.id; d.onclick = () => open(s.id);
+    const d = document.createElement('div'); d.className = 's' + (s.id === session ? ' active' : ''); d.innerHTML = '<span class="id">' + esc(s.id.slice(-6)) + '</span><span class="title">' + esc(s.title || '') + '</span><span class="del tr" title="traza: qué hizo el agente en esta sesión (pasos, tools, tiempos, tokens)">≡</span><span class="del" title="borrar esta sesión">✕</span>'; d.title = s.id; d.onclick = () => openSession(s.id);
     d.querySelector('.tr').onclick = (ev) => { ev.stopPropagation(); openTrace(s.id); };
     d.querySelector('.del:not(.tr)').onclick = (ev) => { ev.stopPropagation(); inlineConfirm(d.querySelector('.del:not(.tr)'), '¿borrar?', () => deleteSession(s.id)); };
     box.appendChild(d);
@@ -35,18 +35,18 @@ function openSessionsPanel() {
           + `<div class="dfoot"><span>.lampson/sessions/${esc(s.id)}.json</span><span class="del">borrar</span></div>`;
       },
       wire: (s, box) => {
-        box.querySelector('[data-act="open"]').onclick = () => { Panel.close(); open(s.id); };
+        box.querySelector('[data-act="open"]').onclick = () => { Panel.close(); openSession(s.id); };
         box.querySelector('[data-act="trace"]').onclick = () => { Panel.close(); openTrace(s.id); };
         const del = box.querySelector('.dfoot .del');
         del.onclick = () => inlineConfirm(del, `¿borrar ${s.id}?`, async () => { await deleteSession(s.id); Panel.refresh(); });
       },
-      onPick: (s) => open(s.id),
+      onPick: (s) => openSession(s.id),
       count: (rows, q) => q ? `${rows.length} coincidencia${rows.length === 1 ? '' : 's'}` : `${rows.length} sesión${rows.length === 1 ? '' : 'es'}`,
       emptyHtml: 'todavía no hay sesiones'
     }
   });
 }
-async function open(id) {
+async function openSession(id) {
   session = id; localStorage.setItem('lampson.session', id); log.innerHTML = ''; log.classList.remove('hero'); showPane('log'); loadTodo();
   const r = await fetch(BASE + '/api/sessions/' + id); if (!r.ok) { session = ''; empty(); return loadSessions(); }
   const d = await r.json();

package/public/js/workspaces.js

@@ -1,6 +1,9 @@
 // workspaces.js — el selector de workspace de la cabecera (dentro de un workspace) y el Panel de workspaces.
 // La API de workspaces es del HUB (raíz, sin BASE): /api/workspaces…  Sin hub (standalone) el selector se oculta.
 let wsList = [], wsIdle = 4;
+// abierto por el puerto de un proceso (:808N) las URLs de otros workspaces tienen que ir al hub (:8080), no a este proceso
+const HUB_BASE = (location.port && location.port !== '8080') ? location.protocol + '//' + location.hostname + ':8080' : '';
+function wsUrl(w) { return HUB_BASE + w.url; }
 async function fetchWorkspaces() {
   try { const r = await (await fetch('/api/workspaces')).json(); wsList = r.workspaces || []; wsIdle = r.idle_hours; return true; } catch (e) { wsList = []; return false; }
 }
@@ -31,12 +34,12 @@ function openWorkspaces(selectSlug) {
       wire: (w, box) => {
         const err = (m) => { const e = box.querySelector('.derr'); if (e) e.textContent = m || ''; };
         if (w === WS_NEW) { wsNewWire(box, err); return; }
-        box.querySelector('[data-open]').onclick = () => { if (w.slug !== WS_SLUG) location.href = w.url; else Panel.close(); };
+        box.querySelector('[data-open]').onclick = () => { if (w.slug !== WS_SLUG) location.href = wsUrl(w); else Panel.close(); };
         const st = box.querySelector('[data-start]'); if (st) st.onclick = async () => { err('arrancando…'); const r = await api('/api/workspaces/start', { slug: w.slug }); err(r.data.ok ? '' : 'no respondió a tiempo'); Panel.refresh(); };
         const sp = box.querySelector('[data-stop]'); if (sp) sp.onclick = async () => { await api('/api/workspaces/stop', { slug: w.slug }); setTimeout(() => Panel.refresh(), 800); };
         box.querySelector('[name="policy"]').onchange = async (ev) => { const r = await api('/api/workspaces/policy', { slug: w.slug, policy: ev.target.value }); if (!r.ok) err(r.data.error || 'error'); };
         const del = box.querySelector('.dfoot .del');
-        del.onclick = () => inlineConfirm(del, `¿quitar ${w.name} del registro?`, async () => { const r = await api('/api/workspaces/remove', { slug: w.slug }); if (!r.ok) { err(r.data.error || 'error'); return; } if (w.slug === WS_SLUG) location.href = '/'; else Panel.refresh(); });
+        del.onclick = () => inlineConfirm(del, `¿quitar ${w.name} del registro?`, async () => { const r = await api('/api/workspaces/remove', { slug: w.slug }); if (!r.ok) { err(r.data.error || 'error'); return; } if (w.slug === WS_SLUG) location.href = HUB_BASE + '/'; else Panel.refresh(); });
       }
     }
   });
@@ -87,11 +90,9 @@ function wsNewWire(box, err0) {
     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: esperar a que vuelva y navegar
-    const url = r.data.url; let tries = 0;
+    const url = HUB_BASE + r.data.url; let tries = 0;
     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);
   };
 }
-// 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(); } }
+if ($('#wsPill')) { $('#wsPill').onclick = () => openWorkspaces(); paintWorkspacePill(); }

package/web.syn

@@ -138,11 +138,29 @@ serve on 8080
     auth with check_client
     static "./public"
 
-    -- standalone (sin hub: docker, `synsema serve web.syn`): la UI vive igual bajo /w/<slug> (BASE en js/core.js)
-    route "GET /"
-        give redirect("/w/" + (when env("LAMPSON_WS", "") == "" then "local" otherwise env("LAMPSON_WS", "")))
+    -- la UI vive bajo /w/<slug> (BASE en js/core.js); si alguien entra por el puerto del proceso, es lo mismo
+    -- Acceso DIRECTO por el puerto del proceso (sin X-Forwarded-Host, que solo agrega el hub al proxyear): la UI se
+    -- usa siempre por el hub → redirigir a http://127.0.0.1:8080/w/<slug>. Standalone sin hub (docker) no hay
+    -- LAMPSON_WS y se sirve acá mismo.
     route "GET /w/:slug"
+        let h be headers of request
+        when env("LAMPSON_WS", "") != "" and not contains(h, "x-forwarded-host")
+            give redirect("http://127.0.0.1:8080/w/" + params.slug)
         give html(read_file("public/index.html"))
+    route "GET /"
+        when env("LAMPSON_WS", "") == ""
+            give redirect("/w/local")
+        give redirect("http://127.0.0.1:8080/w/" + env("LAMPSON_WS", ""))
+    route "GET /api/hub"
+        proxy to "http://127.0.0.1:8080"
+    route "GET /api/workspaces"
+        proxy to "http://127.0.0.1:8080"
+    route "GET /api/workspaces/*path"
+        proxy to "http://127.0.0.1:8080"
+    route "POST /api/workspaces"
+        proxy to "http://127.0.0.1:8080"
+    route "POST /api/workspaces/*path"
+        proxy to "http://127.0.0.1:8080"
 
     -- salud para el hub/supervisor y la terminal (último uso = chat, terminal, eventos o abrir la UI)
     route "GET /w/:slug/api/health"