@withbuddi/buddi 0.1.0-pre.26 → 0.1.0-pre.28

package/node_modules/@buddi/gateway/dist/web/server.js

@@ -42,13 +42,15 @@
  * page on another origin gets no preflight and no permission.
  */
 import { agentMuteRoute, focusRoute, listNotificationsRoute, markSeenRoute, notificationSettingsRoute, presenceRoute, testChannelRoute } from './notifications.js';
-import { catalogSkillLookup, discardProposalFromWeb, keepProposalFromWeb, readProposals, registryChangeLookup } from './proposals.js';
+import { catalogSkillLookup, discardProposalFromWeb, keepAllProposalsFromWeb, keepProposalFromWeb, readProposals, registryChangeLookup } from './proposals.js';
 import { latestDigest, readDigestSchedule, setDigestSchedule } from '../agents/learning-digest.js';
 import { readAgentSkills, removeLearnedSkillFromWeb } from '../agents/learned-skills.js';
 import { bindMcpRequests, requestThroughMcp } from '../mcp/requests.js';
 import { randomUUID, createHmac } from 'node:crypto';
 import { StringDecoder } from 'node:string_decoder';
 import { continueBrowserTask } from '../surfaces/browser-continuation.js';
+import { carryOverDeps } from '../surfaces/carry-over.js';
+import { deleteCarryOver } from '../surfaces/browser-handoff.js';
 import { ProviderSettingsError } from '../providers.js';
 import { ProviderAccountError } from '../provider-accounts.js';
 import { listBrowserProfiles, listInstalledApps } from './apps.js';
@@ -62,7 +64,7 @@ import { PAGE_ROUTE, sendPageFile, actOnPage, listPageDescriptors, runPageQuery,
 import { listSecrets, secretUses, secretsAct } from './secrets.js';
 import { sayRoute, transcribeRoute } from './speech.js';
 import { createServer } from 'node:http';
-import { getAction, inRecovery, listPendingActions, isJobState, parseAgentFile, setSentinelEnabled, snoozeFinding } from '@buddi/core';
+import { getAction, idleRolloverMs, inRecovery, listPendingActions, isJobState, parseAgentFile, setSentinelEnabled, snoozeFinding } from '@buddi/core';
 import { connectionsOf } from '@buddi/tool-mcp';
 import { CONNECTIONS_CALLBACK_PATH, connectionsRoute } from './connections.js';
 import { browserHost } from '../browser-host.js';
@@ -84,7 +86,8 @@ import { ATTACHMENTS_UNAVAILABLE, CHAT_CONVERSATIONS_LIMIT, CHAT_UNAVAILABLE, WE
 import { readAgentAttention, streamAttention } from './attention.js';
 import { PreviewApp, PreviewTickets, parsePreviewApiPath } from './preview.js';
 import { allowedOrigins, isLoopback, webAssetsDir, webUrl } from './config.js';
-import { TAILSCALE_SETTING_KEY, daemonWhois, plausibleLogin, proxiedThroughTailscale, sameLogin, tailscaleIdentity, tailscaleSelf, toTailscaleSetting, } from './tailscale.js';
+import { TAILSCALE_SETTING_KEY, daemonWhois, isLoginRefusal, plausibleLogin, proxiedThroughTailscale, sameLogin, tailscaleIdentity, tailscaleRefusalReason, tailscaleSelf, toTailscaleSetting, } from './tailscale.js';
+import { retryHref, sendSignedOut, wantsSignedOutPage } from './signed-out.js';
 import { extensionEndpoint } from './extension.js';
 import { REMOTE_HAND_SOCKET_PATH, RemoteHandEndpoint } from './remote-hand.js';
 import { csrfCookieName, CSRF_HEADER, sessionCookieName, requestPort, BodyTooLargeError, first, cookieHeader, parseCookies, parseUrl, readJsonBody, remoteKey, requestOrigin, requestScope, sendEmpty, sendJson, sendText, } from './http.js';
@@ -92,7 +95,7 @@ import { boundedLimit, readAgents, readApprovals, readConversation, readConversa
 import { RateLimiter, SessionStore, } from './sessions.js';
 import { supervisorCall } from './service.js';
 import { backupJobRoute, createBackupRoute, discardUpload, listBackups, passphraseRoute, receiveUpload, restoreRoute, scheduleRoute, verifyBackupRoute, } from './backups.js';
-import { acceptAgentRoute, approveRoute, listPlugins, pluginJobRoute, receivePluginUpload, rejectRoute, stageRoute, toggleRoute, uninstallRoute, updateRoute, uploadRoute, } from './plugins.js';
+import { acceptAgentRoute, approveRoute, listPlugins, pluginJobRoute, receivePluginUpload, rejectRoute, openedRoute, stageRoute, toggleRoute, uninstallRoute, updateRoute, uploadRoute, } from './plugins.js';
 import { marketAssetRoute, marketRoute } from './market.js';
 import { pluginFoldersRoute } from './folders.js';
 import { tipsRoute } from '../tips/route.js';
@@ -190,7 +193,6 @@ export const PREVIEW_PORT_ATTEMPTS = 10;
 export const PREVIEW_LINK_LIMIT = 10;
 export const PREVIEW_LINK_WINDOW_MS = 60_000;
 export function createWebApp(deps) {
-    const sessions = new SessionStore(deps.sessionTtlMs ?? {});
     const limiter = new RateLimiter();
     /*
      * Pairing has a budget of its own, and it is spent per session rather than
@@ -203,6 +205,11 @@ export function createWebApp(deps) {
     const pairLimiter = new RateLimiter(5, 5 * 60_000);
     const assetsDir = deps.assetsDir ?? webAssetsDir();
     const log = deps.log ?? ((line) => console.error(line));
+    /*
+     * Sessions are kept in the database (`core.dashboard_sessions`, hashed ids
+     * only), so a restart or an upgrade no longer signs the owner out.
+     */
+    const sessions = new SessionStore(deps.sessionTtlMs ?? {}, undefined, { db: deps.pool, log });
     const extension = deps.extension ?? extensionEndpoint(deps.env ?? process.env, log);
     /*
      * The remote hand, on the same upgrade listener as the extension socket.
@@ -222,13 +229,13 @@ export function createWebApp(deps) {
             if (origin === undefined || !allowed().has(origin))
                 return null;
             const scope = requestScope(req);
-            const session = sessions.get(parseCookies(req.headers.cookie)[sessionCookieName(cookiePort(req))], scope, now);
+            const session = await sessions.resolve(parseCookies(req.headers.cookie)[sessionCookieName(cookiePort(req))], scope, now);
             if (!session)
                 return null;
             if (session.via === 'tailscale') {
                 const confirmed = await identityOf(req, now);
                 if (!confirmed || !sameLogin(confirmed.login, session.tailscaleLogin)) {
-                    sessions.destroy(session.id);
+                    await sessions.destroy(session.id).catch(() => { });
                     return null;
                 }
             }
@@ -276,7 +283,15 @@ export function createWebApp(deps) {
     };
     const chat = deps.chat
         ? new WebChat({
-            onConversationRollover: (agentId, previousConversationId, conversationId, reason) => continueBrowserTask(deps.pool, deps.browser ?? browserHost(deps.env ?? process.env), { ownerId: deps.ctx.ownerId, agentId, previousConversationId, conversationId }, reason),
+            // The fresh conversation opens with a note the agent's own model wrote
+            // from the old one, plus any plugin's lines (surfaces/carry-over.ts).
+            onConversationRollover: (agentId, previousConversationId, conversationId, reason) => continueBrowserTask(deps.pool, deps.browser ?? browserHost(deps.env ?? process.env), { ownerId: deps.ctx.ownerId, agentId, previousConversationId, conversationId }, reason, carryOverDeps({
+                catalog: deps.catalog,
+                providerFor: (agent) => deps.chat.providerFor(agent),
+                registry: deps.registry,
+                ctx: deps.ctx,
+                log,
+            })),
             pool: deps.pool,
             catalog: deps.catalog,
             registry: deps.registry,
@@ -371,12 +386,13 @@ export function createWebApp(deps) {
      * the daemon. Used to mint a session and, on every later request, to confirm
      * the one the browser is holding.
      */
-    const identityOf = (req, now) => tailscaleIdentity(req, {
+    const identityOf = (req, now, onRefusal) => tailscaleIdentity(req, {
         setting: readTailscaleSetting,
         whois,
         mayAskDaemon: () => !limiter.blocked(remoteKey(req), now),
         log,
         now: () => now,
+        onRefusal,
     });
     /**
      * The pair a browser holds: the HttpOnly session and the readable CSRF value
@@ -499,7 +515,26 @@ export function createWebApp(deps) {
         }
         const cookies = parseCookies(req.headers.cookie);
         const presentedSession = cookies[sessionCookieName(cookiePort(req))];
-        let session = sessions.get(presentedSession, scope, now);
+        let session = await sessions.resolve(presentedSession, scope, now);
+        /*
+         * Why Tailscale gave this request no identity, when it was asked. Only
+         * "this login is not the one allowed" changes what the signed-out page
+         * says; every other reason is the ordinary "you're signed out".
+         */
+        let refusal;
+        const noteRefusal = (reason) => { refusal = reason; };
+        /*
+         * The answer to a refused request: the signed-out page for a person
+         * opening a page, the empty 401 for everything else (docs/web.md).
+         */
+        const refuse = () => {
+            if (!wantsSignedOutPage(req, method, url.pathname))
+                return sendEmpty(res, 401);
+            return sendSignedOut(res, {
+                retry: retryHref(url.pathname, url.search),
+                ...(isLoginRefusal(refusal) ? { tailscaleRefusal: tailscaleRefusalReason(refusal) } : {}),
+            });
+        };
         /*
          * A Tailscale session is re-confirmed on every single request.
          *
@@ -513,15 +548,16 @@ export function createWebApp(deps) {
          * can only do if it is still the person the owner allowed.
          */
         if (session?.via === 'tailscale') {
-            const confirmed = await identityOf(req, now);
+            const confirmed = await identityOf(req, now, noteRefusal);
             if (!confirmed || !sameLogin(confirmed.login, session.tailscaleLogin)) {
-                sessions.destroy(session.id);
+                const revoked = session.id;
                 // A hand this session was holding does not outlive the session.
-                hand.revoke((lease) => lease === session.id);
+                hand.revoke((lease) => lease === revoked);
+                await sessions.destroy(revoked);
                 if (limiter.blocked(key, now))
                     return sendEmpty(res, 429);
                 limiter.failCredential(key, presentedSession ?? '', now);
-                return sendEmpty(res, 401);
+                return refuse();
             }
         }
         /*
@@ -533,7 +569,9 @@ export function createWebApp(deps) {
          * every request; the cookie is a detail of how CSRF works, not a login.
          */
         if (!session && openAccess && scope === 'local') {
-            session = sessions.create(scope, now);
+            // Not stored: the next request mints another for free, so there is
+            // nothing to keep across a restart and no row per cookie-less poll.
+            session = sessions.create(scope, now, undefined, { persist: false });
             res.setHeader('Set-Cookie', sessionCookies(req, session));
         }
         /*
@@ -548,7 +586,7 @@ export function createWebApp(deps) {
          * below, which is what it would have got before this existed.
          */
         if (!session) {
-            const identity = await identityOf(req, now);
+            const identity = await identityOf(req, now, noteRefusal);
             if (identity) {
                 limiter.reset(key);
                 session = sessions.create('remote', now, {
@@ -571,11 +609,11 @@ export function createWebApp(deps) {
             // and tunnel traffic shares 127.0.0.1, so a forgotten tab must not be
             // able to lock the owner out of every way in.
             if (!presentedSession)
-                return sendEmpty(res, 401);
+                return refuse();
             if (limiter.blocked(key, now))
                 return sendEmpty(res, 429);
             limiter.failCredential(key, presentedSession, now);
-            return sendEmpty(res, 401);
+            return refuse();
         }
         /*
          * Slide the browser's copy, not just the server's.
@@ -963,14 +1001,17 @@ export function createWebApp(deps) {
                     });
                 }
                 case '/api/overview':
-                    return sendJson(res, 200, await readOverview({
-                        pool: deps.pool,
-                        registry: deps.registry,
-                        catalog: deps.catalog,
-                        ctx: deps.ctx,
-                        timezone: deps.timezone,
-                        now,
-                    }));
+                    return sendJson(res, 200, {
+                        ...(await readOverview({
+                            pool: deps.pool,
+                            registry: deps.registry,
+                            catalog: deps.catalog,
+                            ctx: deps.ctx,
+                            timezone: deps.timezone,
+                            now,
+                        })),
+                        running: chat?.runningCount ?? 0,
+                    });
                 case '/api/events':
                     return sendJson(res, 200, await readEvents(deps.pool, {
                         kind: q.get('kind') ?? undefined,
@@ -1393,7 +1434,7 @@ export function createWebApp(deps) {
             }
             const transcript = /^\/api\/chat\/conversations\/([^/]+)$/.exec(path);
             if (transcript) {
-                const found = await readChatTranscript(deps.pool, decodeURIComponent(transcript[1]));
+                const found = await readChatTranscript(deps.pool, decodeURIComponent(transcript[1]), deps.now(), (agentId) => idleRolloverMs(deps.catalog.get(agentId)?.idleRollover));
                 if (!found)
                     return sendJson(res, 404, { error: 'no such conversation' });
                 return sendJson(res, 200, found);
@@ -1528,6 +1569,16 @@ export function createWebApp(deps) {
             if (groupGone) {
                 return (await archiveGroup(deps.pool, groupGone[1], deps.now())) ? sendEmpty(res, 204) : sendEmpty(res, 404);
             }
+            /*
+             * The owner read the note a rollover carried into this conversation and
+             * does not want it. It leaves the page and every later turn's context.
+             */
+            const carryGone = /^\/api\/chat\/conversations\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/carry-over$/i.exec(path);
+            if (carryGone) {
+                // Idempotent: a note already gone is the state the owner asked for.
+                await deleteCarryOver(deps.pool, carryGone[1]);
+                return sendEmpty(res, 204);
+            }
             // The agent's uploaded picture goes; its icon is drawn again.
             const avatarGone = /^\/api\/agents\/([^/]+)\/avatar$/.exec(path);
             if (avatarGone) {
@@ -1602,7 +1653,7 @@ export function createWebApp(deps) {
                  * in a browser on the far side of the tailnet.
                  */
                 const forgotten = new Set();
-                sessions.forget((s) => { const drop = s.via === 'tailscale'; if (drop)
+                await sessions.forget((s) => { const drop = s.via === 'tailscale'; if (drop && s.id)
                     forgotten.add(s.id); return drop; });
                 // Including whichever of them had a hand on the owner's browser.
                 hand.revoke((lease) => forgotten.has(lease), 'Tailscale access changed. Sign in again.');
@@ -2031,9 +2082,11 @@ export function createWebApp(deps) {
          */
         if (path === '/api/plugins/stage')
             return reply(res, stageRoute(pluginDeps(), body));
-        const stagedApprove = /^\/api\/plugins\/staged\/([A-Za-z0-9._-]{1,128})\/(approve|reject)$/.exec(path);
+        const stagedApprove = /^\/api\/plugins\/staged\/([A-Za-z0-9._-]{1,128})\/(approve|reject|opened)$/.exec(path);
         if (stagedApprove) {
             const id = stagedApprove[1];
+            if (stagedApprove[2] === 'opened')
+                return reply(res, openedRoute(pluginDeps(), id));
             return reply(res, stagedApprove[2] === 'approve'
                 ? await approveRoute(pluginDeps(), id, body)
                 : rejectRoute(pluginDeps(), id));
@@ -2648,6 +2701,11 @@ export function createWebApp(deps) {
             }
             return sendJson(res, 200, { schedule: await readDigestSchedule(deps.pool, deps.now(), deps.timezone) });
         }
+        /* Keep all: one owner action over a group of open rule cards (see proposals.ts). */
+        if (path === '/api/proposals/keep-all') {
+            const ids = Array.isArray(body.ids) ? body.ids.map((id) => String(id)) : [];
+            return finish(res, await keepAllProposalsFromWeb(writeDeps, ids));
+        }
         /*
          * Keeping or discarding what an agent proposed. The same gate as every
          * other write; what keeping does is the kind's own apply (see proposals.ts).