@ashx-j/lunr-dev 0.2.16-dev.9.1 → 0.2.19-dev.10.1

package/dist/builtin-extensions/pi-web-access/index.js

@@ -210,20 +210,6 @@ function resolveProvider(requested, available, options) {
     }
     return provider;
 }
-const pendingFetches = new Map();
-let sessionActive = false;
-let sessionGeneration = 0;
-let sessionAbort = new AbortController();
-function assertActiveRequest(generation, signal) {
-    signal?.throwIfAborted();
-    if (generation !== sessionGeneration)
-        throw new Error("Web request cancelled: session changed");
-}
-let widgetVisible = false;
-let widgetUnsubscribe = null;
-const pendingCurates = new Map();
-const activeCurators = new Map();
-const glimpseWins = new Map();
 const MAX_INLINE_CONTENT = 30000; // Content returned directly to agent
 function stripThumbnails(results) {
     return results.map(({ thumbnail, frames, ...rest }) => rest);
@@ -265,52 +251,6 @@ function formatFullResults(queryData) {
     }
     return output;
 }
-function abortPendingFetches() {
-    for (const controller of pendingFetches.values()) {
-        controller.abort();
-    }
-    pendingFetches.clear();
-}
-function closeCurator(callId) {
-    if (callId !== undefined) {
-        const win = glimpseWins.get(callId);
-        glimpseWins.delete(callId);
-        try {
-            win?.close();
-        }
-        catch { }
-        pendingCurates.get(callId)?.cancel("stale");
-        pendingCurates.delete(callId);
-        const curator = activeCurators.get(callId);
-        activeCurators.delete(callId);
-        try {
-            curator?.close();
-        }
-        catch { }
-        return;
-    }
-    for (const win of glimpseWins.values()) {
-        try {
-            win.close();
-        }
-        catch { }
-    }
-    glimpseWins.clear();
-    for (const pc of pendingCurates.values()) {
-        try {
-            pc.cancel("stale");
-        }
-        catch { }
-    }
-    pendingCurates.clear();
-    for (const curator of activeCurators.values()) {
-        try {
-            curator.close();
-        }
-        catch { }
-    }
-    activeCurators.clear();
-}
 async function openInBrowser(pi, url) {
     const plat = platform();
     const result = plat === "darwin"
@@ -395,27 +335,6 @@ function extractDomain(url) {
         return url;
     }
 }
-function updateWidget(ctx) {
-    const theme = ctx.ui.theme;
-    const entries = activityMonitor.getEntries();
-    const lines = [];
-    lines.push(theme.fg("accent", "─── Web Search Activity " + "─".repeat(36)));
-    if (entries.length === 0) {
-        lines.push(theme.fg("muted", "  No activity yet"));
-    }
-    else {
-        for (const e of entries) {
-            lines.push("  " + formatEntryLine(e, theme));
-        }
-    }
-    lines.push(theme.fg("accent", "─".repeat(60)));
-    const rateInfo = activityMonitor.getRateLimitInfo();
-    const resetMs = rateInfo.oldestTimestamp ? Math.max(0, rateInfo.oldestTimestamp + rateInfo.windowMs - Date.now()) : 0;
-    const resetSec = Math.ceil(resetMs / 1000);
-    lines.push(theme.fg("muted", `Rate: ${rateInfo.used}/${rateInfo.max}`) +
-        (resetMs > 0 ? theme.fg("dim", ` (resets in ${resetSec}s)`) : ""));
-    ctx.ui.setWidget("web-activity", new Text(lines.join("\n"), 0, 0));
-}
 function formatEntryLine(entry, theme) {
     const typeStr = entry.type === "api" ? "API" : "GET";
     const target = entry.type === "api"
@@ -444,31 +363,113 @@ function formatEntryLine(entry, theme) {
     }
     return `${typeStr.padEnd(4)} ${target.padEnd(32)} ${statusStr.padStart(5)} ${duration.padStart(5)} ${indicator}`;
 }
-function handleSessionChange(ctx) {
-    sessionGeneration++;
-    sessionAbort.abort();
-    sessionAbort = new AbortController();
-    abortPendingFetches();
-    closeCurator();
-    runSessionCleanups();
-    sessionActive = true;
-    restoreFromSession(ctx);
-    // Unsubscribe before clear() to avoid callback with stale ctx
-    widgetUnsubscribe?.();
-    widgetUnsubscribe = null;
-    activityMonitor.clear();
-    if (widgetVisible) {
-        // Re-subscribe with new ctx
-        widgetUnsubscribe = activityMonitor.onUpdate(() => updateWidget(ctx));
-        updateWidget(ctx);
-    }
-}
 export default function (pi) {
     const initConfig = loadConfigForExtensionInit();
     const curateKey = initConfig.shortcuts?.curate || DEFAULT_SHORTCUTS.curate;
     const activityKey = initConfig.shortcuts?.activity || DEFAULT_SHORTCUTS.activity;
+    const pendingFetches = new Map();
+    const pendingCurates = new Map();
+    const activeCurators = new Map();
+    const glimpseWins = new Map();
+    let sessionActive = false;
+    let widgetVisible = false;
+    let widgetUnsubscribe = null;
+    let sessionGeneration = 0;
+    let sessionAbort = new AbortController();
+    function abortPendingFetches() {
+        for (const controller of pendingFetches.values())
+            controller.abort();
+        pendingFetches.clear();
+    }
+    function closeCurator(callId) {
+        if (callId !== undefined) {
+            const win = glimpseWins.get(callId);
+            glimpseWins.delete(callId);
+            try {
+                win?.close();
+            }
+            catch { }
+            pendingCurates.get(callId)?.cancel("stale");
+            pendingCurates.delete(callId);
+            const curator = activeCurators.get(callId);
+            activeCurators.delete(callId);
+            try {
+                curator?.close();
+            }
+            catch { }
+            return;
+        }
+        for (const win of glimpseWins.values()) {
+            try {
+                win.close();
+            }
+            catch { }
+        }
+        glimpseWins.clear();
+        for (const pending of pendingCurates.values()) {
+            try {
+                pending.cancel("stale");
+            }
+            catch { }
+        }
+        pendingCurates.clear();
+        for (const curator of activeCurators.values()) {
+            try {
+                curator.close();
+            }
+            catch { }
+        }
+        activeCurators.clear();
+    }
+    function updateWidget(ctx) {
+        const theme = ctx.ui.theme;
+        const entries = activityMonitor.getEntries();
+        const lines = [];
+        lines.push(theme.fg("accent", "─── Web Search Activity " + "─".repeat(36)));
+        if (entries.length === 0) {
+            lines.push(theme.fg("muted", "  No activity yet"));
+        }
+        else {
+            for (const entry of entries)
+                lines.push("  " + formatEntryLine(entry, theme));
+        }
+        lines.push(theme.fg("accent", "─".repeat(60)));
+        const rateInfo = activityMonitor.getRateLimitInfo();
+        const resetMs = rateInfo.oldestTimestamp
+            ? Math.max(0, rateInfo.oldestTimestamp + rateInfo.windowMs - Date.now())
+            : 0;
+        const resetSec = Math.ceil(resetMs / 1000);
+        lines.push(theme.fg("muted", `Rate: ${rateInfo.used}/${rateInfo.max}`) +
+            (resetMs > 0 ? theme.fg("dim", ` (resets in ${resetSec}s)`) : ""));
+        ctx.ui.setWidget("web-activity", new Text(lines.join("\n"), 0, 0));
+    }
+    function handleSessionChange(ctx) {
+        abortPendingFetches();
+        closeCurator();
+        runSessionCleanups();
+        sessionActive = true;
+        restoreFromSession(ctx);
+        widgetUnsubscribe?.();
+        widgetUnsubscribe = null;
+        activityMonitor.clear();
+        if (widgetVisible) {
+            widgetUnsubscribe = activityMonitor.onUpdate(() => updateWidget(ctx));
+            updateWidget(ctx);
+        }
+    }
     /** Populated on first summary/curator use so sync curator submit/cancel can build fallbacks. */
     let warmSummaryReview = null;
+    function assertActiveRequest(generation, signal) {
+        signal?.throwIfAborted();
+        if (generation !== sessionGeneration)
+            throw new Error("Web request cancelled: session changed");
+    }
+    function startSession(ctx) {
+        sessionGeneration++;
+        sessionAbort.abort();
+        sessionAbort = new AbortController();
+        handleSessionChange(ctx);
+    }
     async function ensureSummaryReview() {
         if (!warmSummaryReview)
             warmSummaryReview = await loadSummaryReview();
@@ -1123,8 +1124,8 @@ export default function (pi) {
             }
         },
     });
-    pi.on("session_start", async (_event, ctx) => handleSessionChange(ctx));
-    pi.on("session_tree", async (_event, ctx) => handleSessionChange(ctx));
+    pi.on("session_start", async (_event, ctx) => startSession(ctx));
+    pi.on("session_tree", async (_event, ctx) => startSession(ctx));
     pi.on("session_shutdown", () => {
         sessionGeneration++;
         sessionAbort.abort();