npm - @synoikia/core - Versions diffs - 0.5.2 → 0.7.0 - Mend

@synoikia/core 0.5.2 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (182) hide show

package/dist/app.d.ts +10 -8
package/dist/app.js +14 -4
package/dist/app.js.map +1 -1
package/dist/approvals/grants.d.ts +34 -0
package/dist/approvals/grants.js +79 -0
package/dist/approvals/grants.js.map +1 -0
package/dist/approvals/links.d.ts +2 -5
package/dist/approvals/links.js +2 -5
package/dist/approvals/links.js.map +1 -1
package/dist/approvals/service.d.ts +24 -16
package/dist/approvals/service.js +24 -6
package/dist/approvals/service.js.map +1 -1
package/dist/audit-query.d.ts +1 -5
package/dist/audit-query.js +1 -5
package/dist/audit-query.js.map +1 -1
package/dist/auth/mcp-auth.d.ts +11 -17
package/dist/auth/mcp-auth.js +14 -13
package/dist/auth/mcp-auth.js.map +1 -1
package/dist/auth/mcp-tokens.d.ts +4 -4
package/dist/auth/mcp-tokens.js +11 -4
package/dist/auth/mcp-tokens.js.map +1 -1
package/dist/auth/oauth.d.ts +7 -18
package/dist/auth/oauth.js +18 -18
package/dist/auth/oauth.js.map +1 -1
package/dist/auth/oidc.d.ts +1 -4
package/dist/auth/oidc.js +3 -9
package/dist/auth/oidc.js.map +1 -1
package/dist/auth/sessions.d.ts +9 -4
package/dist/auth/sessions.js +18 -2
package/dist/auth/sessions.js.map +1 -1
package/dist/auth/throttle.d.ts +2 -8
package/dist/auth/throttle.js +2 -8
package/dist/auth/throttle.js.map +1 -1
package/dist/auth/totp.d.ts +1 -4
package/dist/auth/totp.js +1 -4
package/dist/auth/totp.js.map +1 -1
package/dist/auth/users.d.ts +1 -4
package/dist/auth/users.js +3 -8
package/dist/auth/users.js.map +1 -1
package/dist/catalog/groups.d.ts +6 -18
package/dist/catalog/groups.js +7 -23
package/dist/catalog/groups.js.map +1 -1
package/dist/catalog/registry.d.ts +1 -4
package/dist/catalog/registry.js +1 -4
package/dist/catalog/registry.js.map +1 -1
package/dist/catalog/rules.d.ts +6 -18
package/dist/catalog/rules.js +3 -9
package/dist/catalog/rules.js.map +1 -1
package/dist/catalog/sync.d.ts +2 -17
package/dist/catalog/sync.js +5 -20
package/dist/catalog/sync.js.map +1 -1
package/dist/cli.js +2 -9
package/dist/cli.js.map +1 -1
package/dist/config/env.js +3 -8
package/dist/config/env.js.map +1 -1
package/dist/crypto/index.js +1 -4
package/dist/crypto/index.js.map +1 -1
package/dist/crypto/rotate.d.ts +2 -5
package/dist/crypto/rotate.js.map +1 -1
package/dist/db/index.d.ts +1 -4
package/dist/db/index.js +1 -4
package/dist/db/index.js.map +1 -1
package/dist/db/schema.d.ts +44 -0
package/dist/db/schema.js +7 -9
package/dist/db/schema.js.map +1 -1
package/dist/events.d.ts +1 -4
package/dist/events.js.map +1 -1
package/dist/gate/access.d.ts +3 -20
package/dist/gate/access.js +3 -20
package/dist/gate/access.js.map +1 -1
package/dist/gate/attestation.d.ts +2 -6
package/dist/gate/attestation.js +2 -6
package/dist/gate/attestation.js.map +1 -1
package/dist/gate/match.d.ts +5 -13
package/dist/gate/match.js +5 -21
package/dist/gate/match.js.map +1 -1
package/dist/gate/pipeline.d.ts +30 -23
package/dist/gate/pipeline.js +68 -11
package/dist/gate/pipeline.js.map +1 -1
package/dist/gate/preapproval.d.ts +3 -10
package/dist/gate/preapproval.js +2 -5
package/dist/gate/preapproval.js.map +1 -1
package/dist/gate/rate-limit.d.ts +4 -14
package/dist/gate/rate-limit.js +4 -14
package/dist/gate/rate-limit.js.map +1 -1
package/dist/gate/redact.d.ts +10 -26
package/dist/gate/redact.js +12 -26
package/dist/gate/redact.js.map +1 -1
package/dist/http/admin/auth.d.ts +2 -8
package/dist/http/admin/auth.js +20 -5
package/dist/http/admin/auth.js.map +1 -1
package/dist/http/admin/instances.js +19 -1
package/dist/http/admin/instances.js.map +1 -1
package/dist/http/admin/system.js +2 -0
package/dist/http/admin/system.js.map +1 -1
package/dist/http/common.d.ts +2 -5
package/dist/http/common.js +2 -5
package/dist/http/common.js.map +1 -1
package/dist/http/mcp/approval-card.d.ts +6 -0
package/dist/http/mcp/approval-card.js +160 -0
package/dist/http/mcp/approval-card.js.map +1 -0
package/dist/http/mcp/approval-routes.d.ts +2 -6
package/dist/http/mcp/approval-routes.js +33 -8
package/dist/http/mcp/approval-routes.js.map +1 -1
package/dist/http/mcp/endpoint.d.ts +4 -16
package/dist/http/mcp/endpoint.js +108 -28
package/dist/http/mcp/endpoint.js.map +1 -1
package/dist/http/mcp/oauth-routes.d.ts +3 -10
package/dist/http/mcp/oauth-routes.js +15 -9
package/dist/http/mcp/oauth-routes.js.map +1 -1
package/dist/http/mcp/pages.d.ts +8 -1
package/dist/http/mcp/pages.js +21 -2
package/dist/http/mcp/pages.js.map +1 -1
package/dist/http/mcp-app.d.ts +1 -4
package/dist/http/mcp-app.js +1 -4
package/dist/http/mcp-app.js.map +1 -1
package/dist/instances/connection.d.ts +5 -14
package/dist/instances/connection.js +6 -18
package/dist/instances/connection.js.map +1 -1
package/dist/instances/manager.d.ts +10 -18
package/dist/instances/manager.js +33 -19
package/dist/instances/manager.js.map +1 -1
package/dist/instances/settings.d.ts +2 -0
package/dist/instances/settings.js +4 -5
package/dist/instances/settings.js.map +1 -1
package/dist/lenient.d.ts +3 -9
package/dist/lenient.js +3 -9
package/dist/lenient.js.map +1 -1
package/dist/lock.d.ts +4 -10
package/dist/lock.js +5 -15
package/dist/lock.js.map +1 -1
package/dist/log.d.ts +2 -5
package/dist/log.js +2 -5
package/dist/log.js.map +1 -1
package/dist/maintenance.js +2 -5
package/dist/maintenance.js.map +1 -1
package/dist/notify/service.d.ts +2 -5
package/dist/notify/service.js +2 -5
package/dist/notify/service.js.map +1 -1
package/dist/plugins/default-repo.d.ts +1 -4
package/dist/plugins/default-repo.js +1 -4
package/dist/plugins/default-repo.js.map +1 -1
package/dist/plugins/discovery.d.ts +2 -5
package/dist/plugins/discovery.js +2 -5
package/dist/plugins/discovery.js.map +1 -1
package/dist/plugins/minisign.d.ts +2 -6
package/dist/plugins/minisign.js.map +1 -1
package/dist/plugins/process.d.ts +1 -4
package/dist/plugins/process.js +1 -4
package/dist/plugins/process.js.map +1 -1
package/dist/plugins/repos.d.ts +4 -16
package/dist/plugins/repos.js +7 -25
package/dist/plugins/repos.js.map +1 -1
package/dist/plugins/supervisor.d.ts +3 -9
package/dist/plugins/supervisor.js +5 -5
package/dist/plugins/supervisor.js.map +1 -1
package/dist/runtime/executions.d.ts +68 -0
package/dist/runtime/executions.js +158 -0
package/dist/runtime/executions.js.map +1 -0
package/dist/runtime/index.d.ts +7 -10
package/dist/runtime/index.js +116 -31
package/dist/runtime/index.js.map +1 -1
package/dist/sandbox/index.d.ts +3 -10
package/dist/sandbox/index.js +2 -3
package/dist/sandbox/index.js.map +1 -1
package/dist/settings.d.ts +3 -4
package/dist/settings.js +9 -4
package/dist/settings.js.map +1 -1
package/dist/testing/contract.d.ts +2 -7
package/dist/testing/contract.js.map +1 -1
package/dist/testing/fake-http.d.ts +1 -5
package/dist/testing/fake-http.js.map +1 -1
package/dist/testing/index.d.ts +14 -12
package/dist/testing/index.js +21 -6
package/dist/testing/index.js.map +1 -1
package/dist/testing/repository.d.ts +2 -7
package/dist/testing/repository.js +3 -12
package/dist/testing/repository.js.map +1 -1
package/drizzle/0012_sensitive_result.sql +7 -0
package/drizzle/meta/0012_snapshot.json +2368 -0
package/drizzle/meta/_journal.json +7 -0
package/package.json +2 -2

package/dist/http/mcp/approval-card.js ADDED Viewed

@@ -0,0 +1,160 @@
+/** The approval card (design §5.7): an MCP Apps view that hosts render for `execute` and `resume` results.
+ * It shows state and opens the approval page; it never decides. Static, no external origins. */
+export const APPROVAL_CARD_URI = 'ui://synoikia/approval';
+export const MCP_APP_MIME = 'text/html;profile=mcp-app';
+export const MCP_APPS_EXTENSION = 'io.modelcontextprotocol/ui';
+export const APPROVAL_CARD_HTML = `<!doctype html>
+<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<style>
+:root { color-scheme: light; --bg:#eee4d3; --line:#d9c9ab; --ink:#241b12; --muted:#5c5044; --brand:#b5502f; --brand-strong:#8f3d22;
+  --on-brand:#fff; --ok:#3f6b45; --ok-bg:#dfe9dc; --warn:#8a6514; --warn-bg:#f3e6c4; --no:#9a2f2f; --no-bg:#f0dcda;
+  --sans:"IBM Plex Sans", system-ui, -apple-system, sans-serif; --mono:"IBM Plex Mono", ui-monospace, monospace; }
+:root[data-theme="dark"] { color-scheme: dark; --bg:#1d1914; --line:#3a3026; --ink:#f2e9db; --muted:#b8ab98; --brand:#d97250;
+  --brand-strong:#e88a63; --on-brand:#14110e; --ok:#8fbf8f; --ok-bg:#1f2a1f; --warn:#e0b860; --warn-bg:#2c2414; --no:#e8685f; --no-bg:#2e1c1b; }
+* { box-sizing: border-box; }
+html, body { margin: 0; background: transparent; color: var(--ink); font: 14px/1.45 var(--sans); }
+.card { border: 1px solid var(--line); border-radius: 12px; background: var(--bg); overflow: hidden; }
+.hd { padding: 8px 12px; border-bottom: 1px solid var(--line); font-size: 11px; font-weight: 600; letter-spacing: .06em;
+  text-transform: uppercase; color: var(--muted); }
+.bd { padding: 12px; display: grid; gap: 8px; }
+.t { font-weight: 600; font-size: 15px; overflow-wrap: anywhere; }
+.op { font: 12px/1.4 var(--mono); color: var(--muted); overflow-wrap: anywhere; }
+.ft { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; justify-content: space-between; }
+.pill { font-size: 12px; font-weight: 600; padding: 3px 9px; border-radius: 999px; }
+.pending { background: var(--warn-bg); color: var(--warn); } .ok { background: var(--ok-bg); color: var(--ok); }
+.no { background: var(--no-bg); color: var(--no); }
+button { font: 600 13px/1.2 var(--sans); padding: 7px 14px; border-radius: 8px; border: 1px solid var(--brand); cursor: pointer;
+  background: var(--brand); color: var(--on-brand); }
+button:hover { background: var(--brand-strong); }
+button.quiet { background: transparent; color: var(--no); border-color: var(--line); padding: 4px 10px; font-size: 12px; }
+.grant { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; padding: 8px 12px; border: 1px solid var(--line);
+  border-radius: 10px; background: var(--ok-bg); color: var(--ok); font-size: 12.5px; }
+.grant button { margin-left: auto; }
+.note { font-size: 12px; color: var(--muted); }
+[hidden] { display: none !important; }
+</style></head>
+<body>
+<div id="root" hidden></div>
+<script>
+(() => {
+  const root = document.getElementById('root');
+  let nextId = 1;
+  const waiting = new Map();
+  const send = (msg) => window.parent.postMessage(Object.assign({ jsonrpc: '2.0' }, msg), '*');
+  const request = (method, params) =>
+    new Promise((resolve, reject) => {
+      const id = nextId++;
+      waiting.set(id, { resolve, reject });
+      send({ id, method, params });
+    });
+  const notify = (method, params) => send({ method, params: params || {} });
+  const resize = () => notify('ui/notifications/size-changed', { height: root.hidden ? 0 : document.body.scrollHeight });
+  const esc = (s) => String(s == null ? '' : s).replace(/[&<>"']/g, (c) => '&#' + c.charCodeAt(0) + ';');
+  const payloadOf = (res) => {
+    if (res && res.structuredContent) return res.structuredContent;
+    const text = res && Array.isArray(res.content) ? res.content.find((c) => c.type === 'text') : null;
+    try { return text ? JSON.parse(text.text) : null; } catch { return null; }
+  };
+  const timeLeft = (iso) => {
+    const ms = new Date(iso).getTime() - Date.now();
+    if (!(ms > 0)) return 'expired';
+    const m = Math.floor(ms / 60000), s = Math.floor((ms % 60000) / 1000);
+    return 'expires in ' + m + ':' + String(s).padStart(2, '0');
+  };
+  let state = null;
+  let poll = null;
+  let told = false;
+  function render() {
+    if (!state || (!state.approval && !state.grant)) { root.hidden = true; resize(); return; }
+    root.hidden = false;
+    let html = '';
+    if (state.approval) {
+      const a = state.approval;
+      const st = state.status || 'pending';
+      const pill = st === 'pending'
+        ? '<span class="pill pending" id="left">● ' + esc(timeLeft(a.expiresAt)) + '</span>'
+        : st === 'approved' || (st === 'done' && state.decision === 'approved')
+          ? '<span class="pill ok">✓ Approved</span>'
+          : st === 'running' ? '<span class="pill ok">Running</span>'
+          : '<span class="pill no">✕ ' + esc(st === 'done' ? (state.decision || 'finished').replace('_', ' ') : st.replace('_', ' ')) + '</span>';
+      html += '<div class="card"><div class="hd">Synoikia · approval needed</div><div class="bd">' +
+        '<div class="t">' + esc(a.summary) + '</div><div class="op">' + esc(a.operationKey) + '</div>' +
+        '<div class="ft">' + pill + (st === 'pending' ? '<button id="open" type="button">Review and approve ↗</button>' : '') + '</div>' +
+        (st === 'pending' ? '<div class="note">Approve or deny on the Synoikia page. This chat continues by itself after you decide.</div>' : '') +
+        '</div></div>';
+    }
+    if (state.grant) {
+      html += '<div class="grant" style="margin-top:' + (state.approval ? '8px' : '0') + '">✓ Session approval active until ' +
+        esc(new Date(state.grant.expiresAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })) +
+        ' <button class="quiet" id="revoke" type="button">Revoke</button></div>';
+    }
+    root.innerHTML = html;
+    const open = document.getElementById('open');
+    if (open) open.onclick = () => request('ui/open-link', { url: state.approval.url }).catch(() => {});
+    const revoke = document.getElementById('revoke');
+    if (revoke) revoke.onclick = () =>
+      request('tools/call', { name: 'session_grant_revoke', arguments: { grantId: state.grant.id } })
+        .then(() => { state.grant = null; render(); }).catch(() => {});
+    resize();
+  }
+  async function tell(text) {
+    if (told) return;
+    told = true;
+    try { await request('ui/message', { role: 'user', content: [{ type: 'text', text }] }); }
+    catch {
+      try { await request('ui/message', { role: 'user', content: { type: 'text', text } }); }
+      catch { const n = document.createElement('div'); n.className = 'note'; n.textContent = 'Say "continue" in the chat to get the result.'; root.appendChild(n); resize(); }
+    }
+  }
+  async function check() {
+    if (!state || !state.executionId || !state.approval) return;
+    let s;
+    try { s = payloadOf(await request('tools/call', { name: 'approval_status', arguments: { executionId: state.executionId } })); }
+    catch { return; }
+    if (!s || !s.state) return;
+    if (s.state === 'pending') { const left = document.getElementById('left'); if (left) left.textContent = '● ' + timeLeft(state.approval.expiresAt); return; }
+    state.status = s.state; state.decision = s.decision || s.state;
+    clearInterval(poll); poll = null;
+    render();
+    const approved = s.state === 'approved' || s.state === 'running' || (s.state === 'done' && s.decision === 'approved');
+    tell(approved ? 'Approved, continue.' : 'The approval was ' + String(state.decision).replace('_', ' ') + '. Continue.');
+  }
+  function onResult(res) {
+    const p = payloadOf(res) || {};
+    state = { executionId: p.executionId, approval: p.status === 'awaiting_approval' ? p.approval : null, grant: p.sessionGrant || null, status: 'pending' };
+    told = false;
+    render();
+    if (poll) clearInterval(poll);
+    if (state.approval) poll = setInterval(check, 2000);
+  }
+  window.addEventListener('message', (ev) => {
+    if (ev.source !== window.parent) return;
+    const m = ev.data;
+    if (!m || m.jsonrpc !== '2.0') return;
+    if (m.id != null && waiting.has(m.id) && !m.method) {
+      const w = waiting.get(m.id); waiting.delete(m.id);
+      if (m.error) w.reject(m.error); else w.resolve(m.result);
+      return;
+    }
+    if (m.method === 'ui/notifications/tool-result') onResult(m.params);
+    if (m.method === 'ui/notifications/host-context-changed' && m.params && m.params.theme)
+      document.documentElement.dataset.theme = m.params.theme;
+  });
+  request('ui/initialize', { appInfo: { name: 'synoikia-approval', version: '1' }, appCapabilities: {}, protocolVersion: '2026-01-26' })
+    .then((r) => {
+      const theme = r && r.hostContext && r.hostContext.theme;
+      document.documentElement.dataset.theme = theme || (matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
+      notify('ui/notifications/initialized');
+    })
+    .catch(() => {});
+})();
+</script>
+</body></html>`;
+//# sourceMappingURL=approval-card.js.map

package/dist/http/mcp/approval-card.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"approval-card.js","sourceRoot":"","sources":["../../../src/http/mcp/approval-card.ts"],"names":[],"mappings":"AAAA;gGACgG;AAEhG,MAAM,CAAC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAC1D,MAAM,CAAC,MAAM,YAAY,GAAG,2BAA2B,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAyJnB,CAAC"}

package/dist/http/mcp/approval-routes.d.ts CHANGED Viewed

@@ -1,9 +1,5 @@
 import type { Hono } from 'hono';
 import type { AppContext } from '../../app.js';
-/**
- * The approval page (design §5.3). The MCP client is asked to open it (URL-mode elicitation); the
- * link only opens this page. Deciding needs a signed-in user with TOTP enrolled, a TOTP proof in this
- * session (a fresh one for locked operations) and a CSRF-protected POST, so neither the client that
- * holds the link nor a prefetch can decide anything.
- */
+/** The approval page (design §5.3): deciding needs a signed-in user with a TOTP proof in this browser
+ * (fresh for locked ops) and a CSRF-protected POST, so neither the link holder nor a prefetch decides. */
 export declare function registerApprovalRoutes(app: Hono, ctx: AppContext): void;

package/dist/http/mcp/approval-routes.js CHANGED Viewed

@@ -6,12 +6,21 @@ import { checkUiCsrf, recordTotpProof, renderLogin, sinceTotpProof, uiCsrf, uiSe
 import { approvalPage, errorPage } from './pages.js';
 /** A locked operation needs a TOTP code proved this recently (design §5.3). */
 const LOCKED_TOTP_MAX_AGE_MS = 5 * 60_000;
-/**
- * The approval page (design §5.3). The MCP client is asked to open it (URL-mode elicitation); the
- * link only opens this page. Deciding needs a signed-in user with TOTP enrolled, a TOTP proof in this
- * session (a fresh one for locked operations) and a CSRF-protected POST, so neither the client that
- * holds the link nor a prefetch can decide anything.
- */
+/** "Approve for this session" lengths (design §5.8), capped by the endpoint's `sessionGrantMaxHours`. */
+function grantOptions(now, maxHours) {
+    if (maxHours <= 0)
+        return [];
+    const opts = [1, 4]
+        .filter((h) => h <= maxHours)
+        .map((h) => ({ value: String(h), label: `${h} h`, until: new Date(now.getTime() + h * 3_600_000) }));
+    const midnight = new Date(now);
+    midnight.setHours(24, 0, 0, 0);
+    if (midnight.getTime() - now.getTime() <= maxHours * 3_600_000)
+        opts.push({ value: 'midnight', label: 'until midnight', until: midnight });
+    return opts;
+}
+/** The approval page (design §5.3): deciding needs a signed-in user with a TOTP proof in this browser
+ * (fresh for locked ops) and a CSRF-protected POST, so neither the link holder nor a prefetch decides. */
 export function registerApprovalRoutes(app, ctx) {
     const gone = (c) => errorPage(c, 'Link expired', 'This approval request has expired or was already decided.', 404);
     const load = (c, token) => {
@@ -30,6 +39,10 @@ export function registerApprovalRoutes(app, ctx) {
             .get();
         return row ? { link, ...row } : null;
     };
+    /** Locked and typed-confirmation operations never get a session grant. */
+    const grantsFor = (data) => data.op.locked || data.approval.confirmLiteral
+        ? []
+        : grantOptions(ctx.now(), ctx.instances.settingsOf(data.instance).sessionGrantMaxHours);
     /** Every approval needs a TOTP proof in this session (OIDC sign-ins have none); locked ops a fresh one. */
     const needsTotp = (session, data) => {
         const since = sinceTotpProof(ctx, session);
@@ -51,6 +64,8 @@ export function registerApprovalRoutes(app, ctx) {
         expiresAt: data.approval.expiresAt,
         confirmLiteral: data.approval.confirmLiteral,
         needsTotp: needsTotp(session, data),
+        grantOptions: grantsFor(data).map(({ value, label }) => ({ value, label })),
+        client: data.approval.clientId,
         status: data.approval.status,
         error,
     }, error ? 400 : 200);
@@ -79,9 +94,15 @@ export function registerApprovalRoutes(app, ctx) {
             return noTotp(c);
         if (!checkUiCsrf(c, body.csrf))
             return render(c, token, data, session, 'The form expired; try again.');
-        const approve = body.decision === 'approve';
+        const approve = body.decision === 'approve' || body.decision === 'approve_session';
         if (!approve && body.decision !== 'deny')
             return render(c, token, data, session, 'Choose approve or deny.');
+        let sessionGrantUntil;
+        if (body.decision === 'approve_session') {
+            sessionGrantUntil = grantsFor(data).find((o) => o.value === body.grant)?.until;
+            if (!sessionGrantUntil)
+                return render(c, token, data, session, 'Choose a session length.');
+        }
         if (approve && needsTotp(session, data)) {
             const user = session.user;
             if (ctx.throttle.lockedFor(user.username, 'mcp') > 0)
@@ -104,6 +125,7 @@ export function registerApprovalRoutes(app, ctx) {
                 approve,
                 confirm: typeof body.confirm === 'string' ? body.confirm : undefined,
                 decidedBy: session.user.username,
+                sessionGrantUntil,
             });
         }
         catch (err) {
@@ -111,7 +133,10 @@ export function registerApprovalRoutes(app, ctx) {
                 return render(c, token, data, session, err.message);
             throw err;
         }
-        return errorPage(c, approve ? 'Approved' : 'Denied', `${data.op.key} on /${data.instance.slug} was ${approve ? 'approved' : 'denied'}. You can close this page.`, 200);
+        const granted = sessionGrantUntil
+            ? ` Ask operations of this client on /${data.instance.slug} run without asking until ${sessionGrantUntil.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}.`
+            : '';
+        return errorPage(c, approve ? 'Approved' : 'Denied', `${data.op.key} on /${data.instance.slug} was ${approve ? 'approved' : 'denied'}.${granted} You can close this page; your chat continues by itself.`, 200);
     });
 }
 //# sourceMappingURL=approval-routes.js.map

package/dist/http/mcp/approval-routes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"approval-routes.js","sourceRoot":"","sources":["../../../src/http/mcp/approval-routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjH,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAErD,+EAA+E;AAC/E,MAAM,sBAAsB,GAAG,CAAC,GAAG,MAAM,CAAC;AAE1C~~;;;;;GAKG~~;~~AACH~~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~~QAC5C~~,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM;YAAE,OAAO,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,yBAAyB,CAAC,CAAC;~~QAE5G~~,IAAI,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAC1B,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC;gBAClD,OAAO,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,qCAAqC,CAAC,CAAC;YAChF,2EAA2E;YAC3E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAChE,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC;oBACzC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE;wBAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,EAAE,EAAE,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC;wBACvC,OAAO,EAAE,KAAK;qBACf,CAAC,CAAC;gBACL,OAAO,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,8CAA8C,CAAC,CAAC;YACzF,CAAC;YACD,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC3C,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC;YACH,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACrC,OAAO;gBACP,OAAO,EAAE,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gBACpE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;~~aACjC~~,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,YAAY;gBAAE,OAAO,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACrF,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,OAAO,SAAS,CACd,CAAC,EACD,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAC/B,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,QAAQ,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,~~4BAA4B~~,~~EAC3G~~,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"approval-routes.js","sourceRoot":"","sources":["../../../src/http/mcp/approval-routes.ts"],"names":[],"mappings":"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"}

package/dist/http/mcp/endpoint.d.ts CHANGED Viewed

@@ -4,17 +4,9 @@ import type { Config } from '../../config/env.js';
 import type { OAuthService } from '../../auth/oauth.js';
 /** Open MCP sessions per authenticated principal; a new one past the cap closes that principal's oldest. */
 export declare const MAX_SESSIONS_PER_PRINCIPAL = 16;
-/**
- * DNS-rebinding defence (MCP transport spec): a browser page can make its own domain resolve to this
- * server, but it can't change the Host it sends, nor the Origin. Host must be a name this server was
- * configured for (PUBLIC_MCP_URL, MCP_ALLOWED_HOSTS) or something that can't be rebound (localhost, an
- * IP literal); an Origin, when present, must be one of those too.
- */
+/** DNS-rebinding defence: Host (and Origin, when sent) must be a configured name, localhost or an IP. */
 export declare function hostAllowed(config: Config, hostHeader: string | undefined): boolean;
-/**
- * One refusal line per key (level, client IP, status) per minute, so a flood of refused requests
- * can't flood the log. The next line after a window reports how many were dropped.
- */
+/** At most one refusal log line per key per minute; the next one reports how many were dropped. */
 export declare class LogThrottle {
     private readonly windows;
     /** The number of lines dropped since the last one for this key, or null to drop this one too. */
@@ -34,12 +26,8 @@ export declare class McpEndpoints {
     private buildServer;
     /** The request carries a bearer or OAuth access token that is live somewhere on this server. */
     private holdsLiveCredential;
-    /**
-     * Why a request was refused, on the server log only (the client gets the generic answer). Requests
-     * that presented a token-shaped credential are `warn`: someone is trying to connect and failing.
-     * Bare probes (scanners, a client's first unauthenticated step of OAuth discovery) are `debug`. The
-     * reason is a quoted field, never part of the message: it can carry client-controlled text.
-     */
+    /** Logs why a request was refused (the client gets the generic answer): `warn` for token-shaped
+     * credentials, `debug` for bare probes; the reason is a quoted field, never the message. */
     private refused;
     /** A 4xx/5xx from the MCP transport itself (bad JSON-RPC, wrong Accept header, …), with its message. */
     private logTransportError;

package/dist/http/mcp/endpoint.js CHANGED Viewed

@@ -3,15 +3,14 @@ import { isIP } from 'node:net';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
 import { z } from 'zod';
-import { authenticateMcp, effectiveAuthMode, publicMcpBase } from '../../auth/mcp-auth.js';
+import { authenticateMcp, effectiveAuthMode, principalLive, publicMcpBase } from '../../auth/mcp-auth.js';
 import { TOKEN_PREFIX } from '../../auth/mcp-tokens.js';
 import { ACCESS_PREFIX } from '../../auth/oauth.js';
-import { executeCode, searchCode } from '../../runtime/index.js';
+import { executeCode, resumeExecution, searchCode } from '../../runtime/index.js';
 import { clientIp } from '../common.js';
-/**
- * `/{slug}` Streamable HTTP endpoints (design §2.2): one McpServer + transport per MCP session,
- * bound to its instance and authenticated principal, exposing exactly `search` and `execute`.
- */
+import { APPROVAL_CARD_HTML, APPROVAL_CARD_URI, MCP_APP_MIME, MCP_APPS_EXTENSION } from './approval-card.js';
+/** `/{slug}` Streamable HTTP endpoints (design §2.2): one McpServer per session, bound to its instance
+ * and principal, exposing `search`, `execute` and `resume`, plus the approval card's app-only tools. */
 const SESSION_IDLE_MS = 30 * 60_000;
 /** Open MCP sessions per authenticated principal; a new one past the cap closes that principal's oldest. */
 export const MAX_SESSIONS_PER_PRINCIPAL = 16;
@@ -21,7 +20,30 @@ const jsonRpcError = (code, message) => ({
     id: null,
     error: { code, message },
 });
-function toolText(result) {
+function toolText(result, extras) {
+    const sessionGrant = extras?.grant && { id: extras.grant.id, expiresAt: extras.grant.expiresAt.toISOString() };
+    if (!result.ok && 'status' in result) {
+        // Parked (design §5.6): not an error; the agent shows the link and calls resume.
+        const body = {
+            status: result.status,
+            executionId: result.executionId,
+            ...(result.approval
+                ? {
+                    approval: {
+                        url: `${extras?.publicBase ?? ''}${result.approval.path}`,
+                        operationKey: result.approval.operationKey,
+                        summary: result.approval.summary,
+                        expiresAt: result.approval.expiresAt.toISOString(),
+                    },
+                }
+                : {}),
+            next: result.status === 'awaiting_approval'
+                ? 'Show approval.url to the user. After they approve or deny it, call resume with this executionId.'
+                : 'Call resume with this executionId.',
+            ...(sessionGrant ? { sessionGrant } : {}),
+        };
+        return { structuredContent: body, content: [{ type: 'text', text: JSON.stringify(body, null, 2) }] };
+    }
     if (!result.ok) {
         return {
             isError: true,
@@ -42,7 +64,16 @@ function toolText(result) {
         ...(result.truncated ? { truncated: true } : {}),
         ...(result.logs.length ? { logs: result.logs } : {}),
     };
-    return { content: [{ type: 'text', text: JSON.stringify(body, null, 2) }] };
+    return {
+        ...(sessionGrant ? { structuredContent: { sessionGrant } } : {}),
+        content: [{ type: 'text', text: JSON.stringify(body, null, 2) }],
+    };
+}
+function describeResume(manifest) {
+    return [
+        `Continue an execute call on ${manifest.name} that is waiting for approval, and get its result.`,
+        'Pass the `executionId` from the `awaiting_approval` result. It waits up to 45 seconds; if the human has not decided yet, it returns `awaiting_approval` again with the same link. If the script reaches another approval, it returns the new link.',
+    ].join('\n');
 }
 function describeSearch(manifest) {
     const ops = manifest.labels.operations.toLowerCase();
@@ -68,16 +99,12 @@ function describeExecute(manifest) {
     const fns = manifest.binding.functions.map((f) => `${ns}.${f}(…)`).join(', ');
     return [
         `Run code against ${manifest.name}. \`code\` is the body of an async JavaScript function; \`await\` ${fns} and return a JSON-serializable result.`,
-        'Reads run immediately. Writes either run straight away or pause until a human approves them on an approval page the client is asked to open (see `approval` in catalog entries); denials and other refusals throw an Error with `err.code` (e.g. OPERATION_DISABLED, PERMISSION_DENIED, UPSTREAM_ERROR) that your code can catch.',
+        'Reads run immediately. Writes either run straight away or wait until a human approves them on an approval page (see `approval` in catalog entries); denials and other refusals throw an Error with `err.code` (e.g. OPERATION_DISABLED, PERMISSION_DENIED, UPSTREAM_ERROR) that your code can catch.',
+        'If the result has `status: "awaiting_approval"`, the run is paused on the server: show `approval.url` to the user, and after they decide, call `resume` with its `executionId` (do not run the code again). Each write runs once.',
         'Calls run one at a time. There is no network, filesystem or timer access. Secrets in results are redacted.',
     ].join('\n');
 }
-/**
- * DNS-rebinding defence (MCP transport spec): a browser page can make its own domain resolve to this
- * server, but it can't change the Host it sends, nor the Origin. Host must be a name this server was
- * configured for (PUBLIC_MCP_URL, MCP_ALLOWED_HOSTS) or something that can't be rebound (localhost, an
- * IP literal); an Origin, when present, must be one of those too.
- */
+/** DNS-rebinding defence: Host (and Origin, when sent) must be a configured name, localhost or an IP. */
 export function hostAllowed(config, hostHeader) {
     if (!hostHeader)
         return false;
@@ -113,10 +140,7 @@ function presentsCredential(c) {
 }
 const THROTTLE_WINDOW_MS = 60_000;
 const THROTTLE_MAX_KEYS = 1000;
-/**
- * One refusal line per key (level, client IP, status) per minute, so a flood of refused requests
- * can't flood the log. The next line after a window reports how many were dropped.
- */
+/** At most one refusal log line per key per minute; the next one reports how many were dropped. */
 export class LogThrottle {
     windows = new Map();
     /** The number of lines dropped since the last one for this key, or null to drop this one too. */
@@ -175,7 +199,8 @@ export class McpEndpoints {
         const rt = () => this.ctx.instances.runtime(instanceId);
         const manifest = rt().manifest;
         const server = new McpServer({ name: `synoikia/${rt().slug}`, version: SERVER_VERSION }, {
-            instructions: `${manifest.name} via Synoikia. Use search to discover operations, then execute to call them.`,
+            instructions: `${manifest.name} via Synoikia. Use search to discover operations, then execute to call them. When execute returns awaiting_approval, show the link and call resume after the user decides.`,
+            capabilities: { extensions: { [MCP_APPS_EXTENSION]: {} } },
         });
         // Approval prompts (design §5.3): URL mode sends the human to our approval page; form mode is only
         // used where the endpoint opted in. `elicitation: {}` from older clients means form support.
@@ -209,6 +234,12 @@ export class McpEndpoints {
             mcpSessionId: sessionId,
             principal: { ceiling: identity.access },
             prompts: prompts(),
+            parkable: true,
+            stillAuthorized: () => principalLive(this.ctx, identity.principal, instanceId),
+        });
+        const extras = () => ({
+            publicBase,
+            grant: this.ctx.grants.active(instanceId, identity.principal),
         });
         const run = async (fn, code, sessionId, request) => {
             try {
@@ -223,8 +254,12 @@ export class McpEndpoints {
             }
             // A cancelled request or a closed session ends the run: nothing it queued may run afterwards.
             const signal = AbortSignal.any([request, closed]);
-            return toolText(await fn(this.ctx.gateDeps(), rt(), caller(sessionId), code, signal));
+            const result = await fn(this.ctx.gateDeps(), rt(), caller(sessionId), code, signal);
+            return toolText(result, extras());
         };
+        const ui = { ui: { resourceUri: APPROVAL_CARD_URI } };
+        const appOnly = { ui: { resourceUri: APPROVAL_CARD_URI, visibility: ['app'] } };
+        const executionId = z.string().uuid().describe('The executionId from an awaiting_approval result.');
         const input = {
             code: z
                 .string()
@@ -244,7 +279,52 @@ export class McpEndpoints {
             inputSchema: input,
             // Hints for clients that confirm tool calls themselves; the gate never relies on them.
             annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
+            _meta: ui,
         }, ({ code }, extra) => run(executeCode, code, extra.sessionId, extra.signal));
+        server.registerTool('resume', {
+            title: `Resume on ${manifest.name}`,
+            description: describeResume(manifest),
+            inputSchema: { executionId },
+            annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
+            _meta: ui,
+        }, async ({ executionId: id }, extra) => {
+            const signal = AbortSignal.any([extra.signal, closed]);
+            return toolText(await resumeExecution(this.ctx.gateDeps(), rt(), caller(extra.sessionId), id, signal), extras());
+        });
+        // App-only (design §5.7): the approval card polls state and can end a grant; neither can approve.
+        server.registerTool('approval_status', {
+            title: 'Approval status',
+            description: 'State of a parked execution, for the approval card.',
+            inputSchema: { executionId },
+            annotations: { readOnlyHint: true, openWorldHint: false },
+            _meta: appOnly,
+        }, ({ executionId: id }) => {
+            const status = this.ctx.executions.status(id, identity.principal, instanceId);
+            const body = status ?? { state: 'not_found' };
+            return { structuredContent: { ...body }, content: [{ type: 'text', text: JSON.stringify(body) }] };
+        });
+        server.registerTool('session_grant_revoke', {
+            title: 'Revoke session approval',
+            description: 'Ends the session approval of this client on this endpoint, for the approval card.',
+            inputSchema: { grantId: z.string().uuid() },
+            annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: false },
+            _meta: appOnly,
+        }, ({ grantId }) => {
+            const grant = this.ctx.grants.get(grantId);
+            const mine = grant && grant.instanceId === instanceId && grant.principal === identity.principal;
+            const revoked = !!mine && this.ctx.grants.revoke(grantId, { actorKind: 'mcp_client', actorId: identity.label });
+            return { content: [{ type: 'text', text: JSON.stringify({ revoked }) }] };
+        });
+        server.registerResource('approval-card', APPROVAL_CARD_URI, { title: 'Synoikia approval card', mimeType: MCP_APP_MIME }, () => ({
+            contents: [
+                {
+                    uri: APPROVAL_CARD_URI,
+                    mimeType: MCP_APP_MIME,
+                    text: APPROVAL_CARD_HTML,
+                    _meta: { ui: { csp: { connectDomains: [], resourceDomains: [] }, prefersBorder: false } },
+                },
+            ],
+        }));
         return server;
     }
     /** The request carries a bearer or OAuth access token that is live somewhere on this server. */
@@ -254,12 +334,8 @@ export class McpEndpoints {
             return false;
         return !!this.ctx.tokens.verify(token) || !!this.oauth.verifyAccess(token, '');
     }
-    /**
-     * Why a request was refused, on the server log only (the client gets the generic answer). Requests
-     * that presented a token-shaped credential are `warn`: someone is trying to connect and failing.
-     * Bare probes (scanners, a client's first unauthenticated step of OAuth discovery) are `debug`. The
-     * reason is a quoted field, never part of the message: it can carry client-controlled text.
-     */
+    /** Logs why a request was refused (the client gets the generic answer): `warn` for token-shaped
+     * credentials, `debug` for bare probes; the reason is a quoted field, never the message. */
     refused(c, slug, status, reason, fields = {}) {
         const ip = clientIp(c, this.ctx.config.TRUST_PROXY);
         const level = presentsCredential(c) ? 'warn' : 'debug';
@@ -395,7 +471,11 @@ export class McpEndpoints {
             await server.close().catch(() => undefined);
         }
         else {
-            this.ctx.log.info('MCP session opened', { slug, client, ua: c.req.header('user-agent') });
+            // Which approval path this client gets (design §5.3): elicitation modes and the MCP Apps card.
+            const caps = server.server.getClientCapabilities();
+            const elicitation = caps?.elicitation ? (caps.elicitation.url ? 'url' : 'form') : 'none';
+            const apps = !!caps?.extensions?.[MCP_APPS_EXTENSION];
+            this.ctx.log.info('MCP session opened', { slug, client, ua: c.req.header('user-agent'), elicitation, apps });
         }
         return response;
     }