@enderfga/claw-orchestrator 4.0.0 → 4.0.3

package/dist/src/dashboard/index.html

@@ -533,7 +533,9 @@
         cursor: pointer;
       }
       .forge-spec-msg { font-size: 11px; color: var(--muted); }
-      #forgeNew {
+      #forgeNew,
+      #councilNew,
+      #autoloopNew {
         margin: 8px 12px;
         padding: 6px 12px;
         border-radius: 4px;
@@ -543,6 +545,109 @@
         cursor: pointer;
         width: calc(100% - 24px);
       }
+      #forgeNew:hover,
+      #councilNew:hover,
+      #autoloopNew:hover {
+        filter: brightness(0.95);
+      }
+
+      /* ─── Launcher modal (Council / Autoloop forms) ─────────────── */
+      .modal-root {
+        position: fixed;
+        inset: 0;
+        background: rgba(0, 0, 0, 0.45);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 100;
+      }
+      .modal-root[hidden] { display: none; }
+      .modal {
+        background: var(--surface);
+        border-radius: 8px;
+        min-width: 440px;
+        max-width: 600px;
+        box-shadow: 0 20px 40px rgba(0, 0, 0, 0.25);
+      }
+      .modal-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 14px 20px;
+        border-bottom: 1px solid var(--border);
+      }
+      .modal-header h2 { margin: 0; font-size: 15px; }
+      .modal-header button {
+        background: transparent;
+        border: none;
+        font-size: 22px;
+        cursor: pointer;
+        color: var(--muted);
+        padding: 0 6px;
+      }
+      .modal-body {
+        padding: 16px 20px;
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+      }
+      .modal-body label {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        font-size: 12px;
+        color: var(--muted);
+      }
+      .modal-body input,
+      .modal-body textarea {
+        padding: 6px 8px;
+        border: 1px solid var(--border);
+        border-radius: 4px;
+        font: inherit;
+        color: var(--text);
+        background: var(--bg);
+      }
+      .modal-footer {
+        display: flex;
+        justify-content: flex-end;
+        gap: 8px;
+        padding: 12px 20px 18px;
+      }
+      .modal-footer button {
+        padding: 6px 14px;
+        border-radius: 4px;
+        border: 1px solid var(--border);
+        background: var(--surface);
+        cursor: pointer;
+        font: inherit;
+      }
+      .modal-footer button.primary {
+        background: var(--accent);
+        color: white;
+        border-color: var(--accent);
+      }
+      .modal-footer button:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+      }
+
+      /* ─── Empty-state CTA ──────────────────────────────────────── */
+      .empty-cta {
+        text-align: center;
+        margin: 80px auto 0;
+        max-width: 420px;
+      }
+      .empty-cta h2 { margin: 0 0 8px; font-size: 16px; }
+      .empty-cta p { margin: 0 0 16px; color: var(--muted); }
+      .empty-cta button {
+        padding: 8px 16px;
+        border-radius: 4px;
+        border: 1px solid var(--accent);
+        background: var(--accent);
+        color: white;
+        cursor: pointer;
+        font: inherit;
+      }
       #forgeStartBuild {
         margin-top: 8px;
         padding: 8px 14px;
@@ -602,7 +707,9 @@
       <div class="body">
         <aside class="sidebar">
           <h2 id="sidebarTitle">Runs</h2>
-          <button id="forgeNew" hidden>+ New</button>
+          <button id="autoloopNew" hidden>+ New autoloop</button>
+          <button id="councilNew" hidden>+ New council</button>
+          <button id="forgeNew" hidden>+ New forge</button>
           <ul class="runlist" id="runlist"></ul>
         </aside>
 
@@ -614,6 +721,60 @@
       <div class="footer">SSE-driven dashboard • served by claw-orchestrator embedded server</div>
     </div>
 
+    <!-- ─── Launcher modal (tab-aware) ───────────────────────────────── -->
+    <div id="modalRoot" class="modal-root" hidden>
+      <div class="modal" role="dialog" aria-modal="true" aria-labelledby="modalTitle">
+        <div class="modal-header">
+          <h2 id="modalTitle">New run</h2>
+          <button id="modalClose" type="button" aria-label="Close">×</button>
+        </div>
+        <form id="modalForm" class="modal-body" autocomplete="off">
+          <!-- Council fields -->
+          <div data-for-tab="council" style="display: contents">
+            <label>
+              Task
+              <textarea
+                name="task"
+                rows="3"
+                placeholder="What should the council achieve?"
+              ></textarea>
+            </label>
+            <label>
+              Project directory
+              <input
+                name="projectDir"
+                type="text"
+                placeholder="/abs/path/to/workspace"
+              />
+            </label>
+            <label>
+              Max rounds
+              <input name="maxRounds" type="number" min="1" max="50" value="15" />
+            </label>
+          </div>
+          <!-- Autoloop fields -->
+          <div data-for-tab="autoloop" style="display: contents">
+            <label>
+              Workspace
+              <input
+                name="workspace"
+                type="text"
+                placeholder="/abs/path/to/git/workspace"
+              />
+            </label>
+            <label>
+              Planner model (optional)
+              <input name="planner_model" type="text" placeholder="claude-opus-4-7" />
+            </label>
+          </div>
+          <div class="modal-footer">
+            <button type="button" id="modalCancel">Cancel</button>
+            <button type="submit" id="modalSubmit" class="primary">Start</button>
+          </div>
+        </form>
+      </div>
+    </div>
+
     <script>
       // ─── State ────────────────────────────────────────────────────
       const state = {
@@ -671,6 +832,8 @@
               ? 'Council sessions'
               : 'Forge apps';
         $('forgeNew').hidden = tab !== 'forge';
+        $('councilNew').hidden = tab !== 'council';
+        $('autoloopNew').hidden = tab !== 'autoloop';
         state.selectedId = null;
         closeStreams();
         renderEmptyMain();
@@ -705,7 +868,33 @@
       }
 
       function renderEmptyMain() {
-        $('main').innerHTML = '<div class="empty" style="margin-top:80px">Select a run to view.</div>';
+        // When the sidebar list is empty, invite the user to start their
+        // first run. Otherwise just say "pick one". The button delegates
+        // to the same launcher trigger as the sidebar "+ New" button.
+        const labels = {
+          autoloop: 'autoloop run',
+          council: 'council session',
+          forge: 'forge app',
+        };
+        const noun = labels[state.tab] || 'run';
+        if (state.runs.length === 0) {
+          const triggerId =
+            state.tab === 'autoloop'
+              ? 'autoloopNew'
+              : state.tab === 'council'
+                ? 'councilNew'
+                : 'forgeNew';
+          $('main').innerHTML = `
+            <div class="empty empty-cta">
+              <h2>No ${escapeHtml(noun)}s yet</h2>
+              <p>Click <strong>+ New</strong> in the sidebar to start your first one.</p>
+              <button type="button" onclick="document.getElementById('${triggerId}').click()">+ New ${escapeHtml(noun)}</button>
+            </div>
+          `;
+        } else {
+          $('main').innerHTML =
+            '<div class="empty" style="margin-top:80px">Select a run to view.</div>';
+        }
       }
 
       // ─── List polling ─────────────────────────────────────────────
@@ -727,6 +916,9 @@
                 ? j.councils || []
                 : j.runs || [];
           renderList();
+          // Refresh the empty-state CTA — runs may have just appeared or
+          // disappeared, and renderEmptyMain's text depends on state.runs.length.
+          if (!state.selectedId) renderEmptyMain();
           $('status').textContent = 'connected';
         } catch (err) {
           $('status').textContent = 'disconnected';
@@ -756,6 +948,9 @@
                     <span>iter ${r.iter}</span>
                     <span>↑${r.push_log_count}</span>
                   </div>
+                  <div class="lifecycle-actions">
+                    <button data-act="delete">Delete</button>
+                  </div>
                 </li>`;
             } else if (state.tab === 'council') {
               return `
@@ -801,6 +996,30 @@
               ev.stopPropagation();
               const action = btn.dataset.act;
               const id = el.dataset.id;
+              if (state.tab === 'autoloop') {
+                if (action !== 'delete') return;
+                if (!confirm(`Delete autoloop run "${id}"? The registry entry is removed; the ledger directory under tasks/${id}/ is kept on disk.`)) return;
+                try {
+                  const r = await fetch(`/autoloop/${encodeURIComponent(id)}/delete`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' });
+                  if (!r.ok) {
+                    let detail = `HTTP ${r.status}`;
+                    try { const j = await r.json(); if (j && j.error) detail = j.error; } catch { /* ignore */ }
+                    alert(`Delete failed: ${detail}`);
+                    return;
+                  }
+                  // If we were viewing this run, close the detail pane and pick another.
+                  if (state.selectedId === id) {
+                    closeStreams();
+                    state.selectedId = null;
+                    $('main').innerHTML = '<div class="empty">Select a run from the left.</div>';
+                  }
+                } catch (err) {
+                  alert(`Delete failed: ${(err && err.message) || err}`);
+                  return;
+                }
+                refreshList();
+                return;
+              }
               if (action === 'delete' && !confirm('Delete this run? Container, image, and on-disk artifacts are removed.')) return;
               await forgeLifecycleAction(id, action);
               refreshList();
@@ -1291,9 +1510,21 @@
         });
         es.addEventListener('planner_reply', (e) => {
           const { text } = JSON.parse(e.data);
+          // Clear the "waiting…" placeholder, if any, before appending the reply.
+          state.autoloop.plannerLog = state.autoloop.plannerLog.filter((m) => m.who !== 'pending');
           state.autoloop.plannerLog.push({ who: 'planner', text, ts: new Date().toISOString() });
           paintPlanner();
         });
+        es.addEventListener('planner_error', (e) => {
+          const { message } = JSON.parse(e.data);
+          state.autoloop.plannerLog = state.autoloop.plannerLog.filter((m) => m.who !== 'pending');
+          state.autoloop.plannerLog.push({
+            who: 'system',
+            text: `[planner error] ${message}`,
+            ts: new Date().toISOString(),
+          });
+          paintPlanner();
+        });
         es.addEventListener('coder_reply', (e) => {
           const { text } = JSON.parse(e.data);
           state.autoloop.coderLog.push({ who: 'coder', text, ts: new Date().toISOString() });
@@ -1442,16 +1673,47 @@
         const btn = $('auto-send');
         btn.disabled = true;
         ta.disabled = true;
+        // Clear input optimistically — the message is already echoed in the
+        // planner log below, and the new server contract is fire-and-forget
+        // (returns 202 immediately; reply streams via SSE). If the POST fails
+        // synchronously we surface the error in the log.
+        ta.value = '';
         state.autoloop.plannerLog.push({ who: 'user', text, ts: new Date().toISOString() });
+        state.autoloop.plannerLog.push({
+          who: 'pending',
+          text: 'Planner is thinking…',
+          ts: new Date().toISOString(),
+        });
         paintPlanner();
         try {
-          await fetch('/v1/openclaw/tools/autoloop_chat', {
+          const r = await fetch(`/autoloop/${encodeURIComponent(id)}/chat`, {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ run_id: id, text }),
+            body: JSON.stringify({ text }),
           });
-          ta.value = '';
+          // Server returns 202 on accepted (queued); 200 is also fine for
+          // legacy clients. Anything else is a real failure.
+          if (!r.ok) {
+            let detail = `HTTP ${r.status}`;
+            try {
+              const j = await r.json();
+              if (j && typeof j.error === 'string') detail = j.error;
+            } catch {
+              /* non-JSON body — keep the status code */
+            }
+            state.autoloop.plannerLog = state.autoloop.plannerLog.filter((m) => m.who !== 'pending');
+            state.autoloop.plannerLog.push({
+              who: 'system',
+              text: `[error] ${detail}`,
+              ts: new Date().toISOString(),
+            });
+            paintPlanner();
+          }
+          // On success, do nothing — the planner_reply / planner_error SSE
+          // handler upstairs clears the "thinking…" placeholder when the
+          // Planner actually replies (or errors).
         } catch (err) {
+          state.autoloop.plannerLog = state.autoloop.plannerLog.filter((m) => m.who !== 'pending');
           state.autoloop.plannerLog.push({
             who: 'system',
             text: `[error] ${(err && err.message) || 'send failed'}`,
@@ -1604,7 +1866,98 @@
         el.scrollTop = el.scrollHeight;
       }
 
+      // ─── Modal launcher (Council / Autoloop) ─────────────────────
+      //
+      // forgeNew uses a different shape (no form: ultraapp is interview-
+      // driven, so POST /ultraapp/new with an empty body is enough). For
+      // Council / Autoloop we need real form input; one modal handles
+      // both, switching visible fields by state.tab.
+      function openLauncherModal() {
+        const root = $('modalRoot');
+        $('modalTitle').textContent =
+          state.tab === 'council' ? 'New Council session' : 'New Autoloop run';
+        root.querySelectorAll('[data-for-tab]').forEach((el) => {
+          const visible = el.dataset.forTab === state.tab;
+          el.style.display = visible ? 'contents' : 'none';
+          // Only the visible group's required fields actually count.
+          el.querySelectorAll('input,textarea').forEach((f) => {
+            if (visible && (f.name === 'task' || f.name === 'projectDir' || f.name === 'workspace')) {
+              f.required = true;
+            } else {
+              f.required = false;
+            }
+          });
+        });
+        root.hidden = false;
+        setTimeout(() => {
+          const firstVisible = root.querySelector(
+            `[data-for-tab="${state.tab}"] input, [data-for-tab="${state.tab}"] textarea`,
+          );
+          firstVisible?.focus();
+        }, 0);
+      }
+      function closeLauncherModal() {
+        $('modalRoot').hidden = true;
+        $('modalForm').reset();
+      }
+      $('councilNew').addEventListener('click', openLauncherModal);
+      $('autoloopNew').addEventListener('click', openLauncherModal);
+      $('modalClose').addEventListener('click', closeLauncherModal);
+      $('modalCancel').addEventListener('click', closeLauncherModal);
+      $('modalRoot').addEventListener('click', (e) => {
+        if (e.target.id === 'modalRoot') closeLauncherModal();
+      });
+      document.addEventListener('keydown', (e) => {
+        if (e.key === 'Escape' && !$('modalRoot').hidden) closeLauncherModal();
+      });
+      $('modalForm').addEventListener('submit', async (e) => {
+        e.preventDefault();
+        const fd = new FormData(e.target);
+        const body = {};
+        if (state.tab === 'council') {
+          body.task = (fd.get('task') || '').toString().trim();
+          body.projectDir = (fd.get('projectDir') || '').toString().trim();
+          const mr = (fd.get('maxRounds') || '').toString().trim();
+          if (mr) body.maxRounds = Number(mr);
+        } else if (state.tab === 'autoloop') {
+          body.workspace = (fd.get('workspace') || '').toString().trim();
+          const pm = (fd.get('planner_model') || '').toString().trim();
+          if (pm) body.planner_model = pm;
+        }
+        const url = state.tab === 'council' ? '/council/new' : '/autoloop/new';
+        const submitBtn = $('modalSubmit');
+        submitBtn.disabled = true;
+        submitBtn.textContent = 'Starting...';
+        try {
+          const r = await fetch(url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          });
+          const j = await r.json();
+          if (!j.ok) {
+            alert('Failed: ' + (j.error || `HTTP ${r.status}`));
+            return;
+          }
+          const id = j.id ?? j.run_id;
+          closeLauncherModal();
+          await refreshList();
+          state.selectedId = id;
+          renderList();
+          openDetail(id);
+        } catch (err) {
+          alert('Failed: ' + err.message);
+        } finally {
+          submitBtn.disabled = false;
+          submitBtn.textContent = 'Start';
+        }
+      });
+
       // ─── Boot ────────────────────────────────────────────────────
+      // Make the right "+ New" button visible for the default tab.
+      $('autoloopNew').hidden = state.tab !== 'autoloop';
+      $('councilNew').hidden = state.tab !== 'council';
+      $('forgeNew').hidden = state.tab !== 'forge';
       refreshList();
     </script>
   </body>

package/dist/src/embedded-server.d.ts

@@ -18,6 +18,13 @@ export declare class EmbeddedServer {
     private host;
     constructor(manager: SessionManager, port?: number, host?: string);
     private _checkRateLimit;
+    /**
+     * Try to reuse the token persisted by a previous server. Returns null if
+     * the file is absent, unreadable, the wrong shape, or the wrong perms.
+     * We accept any 32+ hex-char string (the format crypto.randomBytes(32)
+     * produces) — anything else is treated as garbage and rotated out.
+     */
+    private _readPersistedToken;
     private _writeTokenFile;
     start(): Promise<number>;
     stop(): Promise<void>;