codex-autorunner 1.0.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

codex_autorunner/static/hub.js

@@ -2,6 +2,7 @@
 import { api, flash, statusPill, resolvePath, escapeHtml, confirmModal, inputModal, openModal, } from "./utils.js";
 import { registerAutoRefresh } from "./autoRefresh.js";
 import { HUB_BASE } from "./env.js";
+import { preserveScroll } from "./preserve.js";
 let hubData = { repos: [], last_scan_at: null };
 const prefetchedUrls = new Set();
 const HUB_CACHE_TTL_MS = 30000;
@@ -12,18 +13,17 @@ const HUB_REFRESH_IDLE_MS = 30000;
 let lastHubAutoRefreshAt = 0;
 const repoListEl = document.getElementById("hub-repo-list");
 const lastScanEl = document.getElementById("hub-last-scan");
+const pmaLastScanEl = document.getElementById("pma-last-scan");
 const totalEl = document.getElementById("hub-count-total");
 const runningEl = document.getElementById("hub-count-running");
 const missingEl = document.getElementById("hub-count-missing");
-const hubUsageList = document.getElementById("hub-usage-list");
 const hubUsageMeta = document.getElementById("hub-usage-meta");
 const hubUsageRefresh = document.getElementById("hub-usage-refresh");
 const hubUsageChartCanvas = document.getElementById("hub-usage-chart-canvas");
 const hubUsageChartRange = document.getElementById("hub-usage-chart-range");
 const hubUsageChartSegment = document.getElementById("hub-usage-chart-segment");
 const hubVersionEl = document.getElementById("hub-version");
-const hubInboxList = document.getElementById("hub-inbox-list");
-const hubInboxRefresh = document.getElementById("hub-inbox-refresh");
+const pmaVersionEl = document.getElementById("pma-version");
 const UPDATE_STATUS_SEEN_KEY = "car_update_status_seen";
 const HUB_JOB_POLL_INTERVAL_MS = 1200;
 const HUB_JOB_TIMEOUT_MS = 180000;
@@ -34,6 +34,8 @@ const hubUsageChartState = {
 };
 let hubUsageSeriesRetryTimer = null;
 let hubUsageSummaryRetryTimer = null;
+let hubUsageIndex = {};
+let hubUsageUnmatched = null;
 function saveSessionCache(key, value) {
     try {
         const payload = { at: Date.now(), value };
@@ -81,9 +83,7 @@ function formatLastActivity(repo) {
 }
 function setButtonLoading(scanning) {
     const buttons = [
-        document.getElementById("hub-scan"),
         document.getElementById("hub-quick-scan"),
-        document.getElementById("hub-refresh"),
     ];
     buttons.forEach((btn) => {
         if (!btn)
@@ -153,6 +153,9 @@ function renderSummary(repos) {
     if (lastScanEl) {
         lastScanEl.textContent = formatTimeCompact(hubData.last_scan_at);
     }
+    if (pmaLastScanEl) {
+        pmaLastScanEl.textContent = formatTimeCompact(hubData.last_scan_at);
+    }
 }
 function formatTokensCompact(val) {
     if (val === null || val === undefined)
@@ -176,49 +179,30 @@ function formatTokensAxis(val) {
         return `${(num / 1000).toFixed(1)}k`;
     return Math.round(num).toString();
 }
-function renderHubUsage(data) {
-    if (!hubUsageList)
+function getRepoUsage(repoId) {
+    const usage = hubUsageIndex[repoId];
+    if (!usage)
+        return { label: "—", hasData: false };
+    const totals = usage.totals || {};
+    return {
+        label: formatTokensCompact(totals.total_tokens),
+        hasData: true,
+    };
+}
+function indexHubUsage(data) {
+    hubUsageIndex = {};
+    hubUsageUnmatched = data?.unmatched || null;
+    if (!data?.repos)
         return;
+    data.repos.forEach((repo) => {
+        if (repo?.id)
+            hubUsageIndex[repo.id] = repo;
+    });
+}
+function renderHubUsageMeta(data) {
     if (hubUsageMeta) {
         hubUsageMeta.textContent = data?.codex_home || "–";
     }
-    if (!data || !data.repos) {
-        hubUsageList.innerHTML =
-            '<span class="muted small">Usage unavailable</span>';
-        return;
-    }
-    if (!data.repos.length && (!data.unmatched || !data.unmatched.events)) {
-        hubUsageList.innerHTML = '<span class="muted small">No token events</span>';
-        return;
-    }
-    hubUsageList.innerHTML = "";
-    const entries = [...data.repos].sort((a, b) => (b.totals?.total_tokens || 0) - (a.totals?.total_tokens || 0));
-    entries.forEach((repo) => {
-        const div = document.createElement("div");
-        div.className = "hub-usage-chip";
-        const totals = repo.totals || {};
-        const cached = totals.cached_input_tokens || 0;
-        const cachePercent = totals.input_tokens
-            ? Math.round((cached / totals.input_tokens) * 100)
-            : 0;
-        div.innerHTML = `
-      <span class="hub-usage-chip-name">${escapeHtml(repo.id)}</span>
-      <span class="hub-usage-chip-total">${escapeHtml(formatTokensCompact(totals.total_tokens))}</span>
-      <span class="hub-usage-chip-meta">${escapeHtml(`${repo.events ?? 0}ev · ${cachePercent}%↻`)}</span>
-    `;
-        hubUsageList.appendChild(div);
-    });
-    if (data.unmatched && data.unmatched.events) {
-        const div = document.createElement("div");
-        div.className = "hub-usage-chip hub-usage-chip-unmatched";
-        const totals = data.unmatched.totals || {};
-        div.innerHTML = `
-      <span class="hub-usage-chip-name">other</span>
-      <span class="hub-usage-chip-total">${escapeHtml(formatTokensCompact(totals.total_tokens))}</span>
-      <span class="hub-usage-chip-meta">${escapeHtml(`${data.unmatched.events}ev`)}</span>
-    `;
-        hubUsageList.appendChild(div);
-    }
 }
 function scheduleHubUsageSummaryRetry() {
     clearHubUsageSummaryRetry();
@@ -234,30 +218,23 @@ function clearHubUsageSummaryRetry() {
 }
 function handleHubUsagePayload(data, { cachedUsage, allowRetry }) {
     const hasSummary = data && Array.isArray(data.repos);
+    const effective = hasSummary ? data : cachedUsage;
+    if (effective) {
+        indexHubUsage(effective);
+        renderHubUsageMeta(effective);
+        renderReposWithScroll(hubData.repos || []);
+    }
     if (data?.status === "loading") {
-        if (hasSummary) {
-            renderHubUsage(data);
-        }
-        else if (cachedUsage) {
-            renderHubUsage(cachedUsage);
-        }
-        else {
-            renderHubUsage(data);
-        }
         if (allowRetry)
             scheduleHubUsageSummaryRetry();
-        return hasSummary;
+        return Boolean(hasSummary);
     }
     if (hasSummary) {
-        renderHubUsage(data);
         clearHubUsageSummaryRetry();
         return true;
     }
-    if (cachedUsage) {
-        renderHubUsage(cachedUsage);
-    }
-    else {
-        renderHubUsage(null);
+    if (!effective && !data) {
+        renderReposWithScroll(hubData.repos || []);
     }
     return false;
 }
@@ -279,10 +256,7 @@ async function loadHubUsage({ silent = false, allowRetry = true } = {}) {
     catch (err) {
         const cachedUsage = loadSessionCache(HUB_USAGE_CACHE_KEY, HUB_CACHE_TTL_MS);
         if (cachedUsage) {
-            renderHubUsage(cachedUsage);
-        }
-        else {
-            renderHubUsage(null);
+            handleHubUsagePayload(cachedUsage, { cachedUsage, allowRetry: false });
         }
         if (!silent) {
             flash(err.message || "Failed to load usage", "error");
@@ -635,7 +609,7 @@ async function handleSystemUpdate(btnId, targetSelectId) {
     }
 }
 function initHubSettings() {
-    const settingsBtn = document.getElementById("hub-settings");
+    const settingsBtns = Array.from(document.querySelectorAll("#hub-settings, #pma-settings"));
     const modal = document.getElementById("hub-settings-modal");
     const closeBtn = document.getElementById("hub-settings-close");
     const updateBtn = document.getElementById("hub-update-btn");
@@ -648,14 +622,16 @@ function initHubSettings() {
             close();
         }
     };
-    if (settingsBtn && modal) {
-        settingsBtn.addEventListener("click", () => {
-            const triggerEl = document.activeElement;
-            hideModal();
-            closeModal = openModal(modal, {
-                initialFocus: closeBtn || updateBtn || modal,
-                returnFocusTo: triggerEl,
-                onRequestClose: hideModal,
+    if (modal && settingsBtns.length > 0) {
+        settingsBtns.forEach((settingsBtn) => {
+            settingsBtn.addEventListener("click", () => {
+                const triggerEl = document.activeElement;
+                hideModal();
+                closeModal = openModal(modal, {
+                    initialFocus: closeBtn || updateBtn || modal,
+                    returnFocusTo: triggerEl,
+                    onRequestClose: hideModal,
+                });
             });
         });
     }
@@ -828,6 +804,32 @@ function renderRepos(repos) {
         const infoLine = infoItems.length > 0
             ? `<span class="hub-repo-info-line">${escapeHtml(infoItems.join(" · "))}</span>`
             : "";
+        const usageInfo = getRepoUsage(repo.id);
+        const usageLine = `
+      <div class="hub-repo-usage-line${usageInfo.hasData ? "" : " muted"}">
+        <span class="pill pill-small hub-usage-pill">
+          ${escapeHtml(usageInfo.label)}
+        </span>
+      </div>`;
+        // Ticket flow progress line
+        let ticketFlowLine = "";
+        const tf = repo.ticket_flow;
+        if (tf && tf.total_count > 0) {
+            const percent = Math.round((tf.done_count / tf.total_count) * 100);
+            const isActive = tf.status === "running" || tf.status === "paused";
+            const statusSuffix = tf.status === "paused"
+                ? " · paused"
+                : tf.current_step
+                    ? ` · step ${tf.current_step}`
+                    : "";
+            ticketFlowLine = `
+        <div class="hub-repo-flow-line${isActive ? " active" : ""}">
+          <div class="hub-flow-bar">
+            <div class="hub-flow-fill" style="width:${percent}%"></div>
+          </div>
+          <span class="hub-flow-text">${tf.done_count}/${tf.total_count}${statusSuffix}</span>
+        </div>`;
+        }
         card.innerHTML = `
       <div class="hub-repo-row">
         <div class="hub-repo-left">
@@ -841,6 +843,8 @@ function renderRepos(repos) {
           <div class="hub-repo-subline">
             ${infoLine}
           </div>
+          ${usageLine}
+          ${ticketFlowLine}
         </div>
         <div class="hub-repo-right">
           ${actions || ""}
@@ -889,6 +893,18 @@ function renderRepos(repos) {
             .sort((a, b) => String(a.id).localeCompare(String(b.id)))
             .forEach((wt) => renderRepoCard(wt, { isWorktreeRow: true }));
     }
+    if (hubUsageUnmatched && hubUsageUnmatched.events) {
+        const note = document.createElement("div");
+        note.className = "hub-usage-unmatched-note muted small";
+        const total = formatTokensCompact(hubUsageUnmatched.totals?.total_tokens);
+        note.textContent = `Other: ${total} · ${hubUsageUnmatched.events}ev (unattributed)`;
+        repoListEl.appendChild(note);
+    }
+}
+function renderReposWithScroll(repos) {
+    preserveScroll(repoListEl, () => {
+        renderRepos(repos);
+    }, { restoreOnNextFrame: true });
 }
 async function refreshHub() {
     setButtonLoading(true);
@@ -898,9 +914,8 @@ async function refreshHub() {
         markHubRefreshed();
         saveSessionCache(HUB_CACHE_KEY, hubData);
         renderSummary(data.repos || []);
-        renderRepos(data.repos || []);
-        await loadHubInbox().catch(() => { });
-        await loadHubUsage().catch(() => { });
+        renderReposWithScroll(data.repos || []);
+        loadHubUsage({ silent: true }).catch(() => { });
     }
     catch (err) {
         flash(err.message || "Hub request failed", "error");
@@ -909,40 +924,6 @@ async function refreshHub() {
         setButtonLoading(false);
     }
 }
-async function loadHubInbox() {
-    if (!hubInboxList)
-        return;
-    hubInboxList.innerHTML = "Loading…";
-    try {
-        const payload = (await api("/hub/messages", { method: "GET" }));
-        const items = payload?.items || [];
-        if (!items.length) {
-            hubInboxList.innerHTML = '<div class="muted">No paused runs</div>';
-            return;
-        }
-        hubInboxList.innerHTML = items
-            .map((item) => {
-            const title = item.message?.title || item.message?.mode || "Message";
-            const excerpt = item.message?.body ? item.message.body.slice(0, 160) : "";
-            const repoLabel = item.repo_display_name || item.repo_id;
-            const href = item.open_url || `/repos/${item.repo_id}/?tab=messages&run_id=${item.run_id}`;
-            return `
-          <a class="hub-inbox-item" href="${escapeHtml(resolvePath(href))}">
-            <div class="hub-inbox-item-header">
-              <span class="hub-inbox-repo">${escapeHtml(repoLabel)}</span>
-              <span class="pill pill-small pill-warn">paused</span>
-            </div>
-            <div class="hub-inbox-title">${escapeHtml(title)}</div>
-            <div class="hub-inbox-excerpt muted small">${escapeHtml(excerpt)}</div>
-          </a>
-        `;
-        })
-            .join("");
-    }
-    catch (_err) {
-        hubInboxList.innerHTML = '';
-    }
-}
 async function triggerHubScan() {
     setButtonLoading(true);
     try {
@@ -1070,7 +1051,12 @@ async function handleRepoAction(repoId, action) {
             if (!ok)
                 return;
             await startHubJob("/hub/jobs/worktrees/cleanup", {
-                body: { worktree_repo_id: repoId },
+                body: {
+                    worktree_repo_id: repoId,
+                    archive: true,
+                    force_archive: false,
+                    archive_note: null,
+                },
                 startedMessage: "Worktree cleanup queued",
             });
             flash(`Removed worktree: ${repoId}`, "success");
@@ -1152,22 +1138,14 @@ async function handleRepoAction(repoId, action) {
 }
 function attachHubHandlers() {
     initHubSettings();
-    const scanBtn = document.getElementById("hub-scan");
-    const refreshBtn = document.getElementById("hub-refresh");
     const quickScanBtn = document.getElementById("hub-quick-scan");
     const newRepoBtn = document.getElementById("hub-new-repo");
     const createCancelBtn = document.getElementById("create-repo-cancel");
     const createSubmitBtn = document.getElementById("create-repo-submit");
     const createRepoId = document.getElementById("create-repo-id");
-    if (scanBtn) {
-        scanBtn.addEventListener("click", () => triggerHubScan());
-    }
     if (quickScanBtn) {
         quickScanBtn.addEventListener("click", () => triggerHubScan());
     }
-    if (refreshBtn) {
-        refreshBtn.addEventListener("click", () => refreshHub());
-    }
     if (hubUsageRefresh) {
         hubUsageRefresh.addEventListener("click", () => loadHubUsage());
     }
@@ -1245,7 +1223,7 @@ async function silentRefreshHub() {
         markHubRefreshed();
         saveSessionCache(HUB_CACHE_KEY, hubData);
         renderSummary(data.repos || []);
-        renderRepos(data.repos || []);
+        renderReposWithScroll(data.repos || []);
         await loadHubUsage({ silent: true, allowRetry: false });
     }
     catch (err) {
@@ -1267,15 +1245,20 @@ async function dynamicRefreshHub() {
     await silentRefreshHub();
 }
 async function loadHubVersion() {
-    if (!hubVersionEl)
-        return;
     try {
         const data = await api("/hub/version", { method: "GET" });
         const version = data.asset_version || "";
-        hubVersionEl.textContent = version ? `v${version}` : "v–";
+        const formatted = version ? `v${version}` : "v–";
+        if (hubVersionEl)
+            hubVersionEl.textContent = formatted;
+        if (pmaVersionEl)
+            pmaVersionEl.textContent = formatted;
     }
     catch (_err) {
-        hubVersionEl.textContent = "v–";
+        if (hubVersionEl)
+            hubVersionEl.textContent = "v–";
+        if (pmaVersionEl)
+            pmaVersionEl.textContent = "v–";
     }
 }
 async function checkUpdateStatus() {
@@ -1307,25 +1290,26 @@ export function initHub() {
         return;
     attachHubHandlers();
     initHubUsageChartControls();
-    hubInboxRefresh?.addEventListener("click", () => {
-        void loadHubInbox();
-    });
     const cachedHub = loadSessionCache(HUB_CACHE_KEY, HUB_CACHE_TTL_MS);
     if (cachedHub) {
         hubData = cachedHub;
         renderSummary(cachedHub.repos || []);
-        renderRepos(cachedHub.repos || []);
+        renderReposWithScroll(cachedHub.repos || []);
     }
     const cachedUsage = loadSessionCache(HUB_USAGE_CACHE_KEY, HUB_CACHE_TTL_MS);
     if (cachedUsage) {
-        renderHubUsage(cachedUsage);
+        indexHubUsage(cachedUsage);
+        renderHubUsageMeta(cachedUsage);
     }
     loadHubUsageSeries();
     refreshHub();
     loadHubVersion();
     checkUpdateStatus();
     registerAutoRefresh("hub-repos", {
-        callback: async () => { await dynamicRefreshHub(); },
+        callback: async (ctx) => {
+            void ctx;
+            await dynamicRefreshHub();
+        },
         tabId: null,
         interval: HUB_REFRESH_ACTIVE_MS,
         refreshOnActivation: true,
@@ -1334,5 +1318,4 @@ export function initHub() {
 }
 export const __hubTest = {
     renderRepos,
-    renderHubUsage,
 };