@adonis-agora/agent 0.94.0 → 0.95.0

package/dist/src/poppy/store.js

@@ -112,7 +112,7 @@ export const POPPY_TABLES = {
  * `CREATE TABLE IF NOT EXISTS` DDL for the Poppy tables — the agent tables' portable dialect
  * (quoted identifiers, epoch-ms `BIGINT`, `TEXT` JSON; `forDialect` adapts it to MySQL). An event's
  * primary key is its position, so two appends racing for one position cannot both win; a message's
- * is its (owner, id), the idempotency lock of §7.3.
+ * is its (owner, id), the idempotency lock of §8.3.
  */
 export function poppyTableStatements() {
     const t = POPPY_TABLES;

package/dist/src/poppy-client/api.d.ts

@@ -1,6 +1,6 @@
 import type { CompanyClient } from './company.js';
 import type { PoppyApiEntry } from './types.js';
-/** API types this client understands (section 6). Others are skipped. */
+/** API types this client understands (section 7). Others are skipped. */
 export declare const KNOWN_API_TYPES: string[];
 export declare function listApis(company: CompanyClient): PoppyApiEntry[];
 export declare function pickApi(company: CompanyClient, type: 'openapi' | 'mcp', index?: number | undefined): PoppyApiEntry;
@@ -14,13 +14,14 @@ export interface OpenApiDoc {
     }>>;
     [k: string]: unknown;
 }
-/** Loads an OpenAPI description. Tried without a token first; with DPoP if that's refused. */
+/** Loads an OpenAPI description. Tried as a public document first; through the Session if that's refused. */
 export declare function loadOpenApi(company: CompanyClient, api: PoppyApiEntry): Promise<OpenApiDoc>;
 /** The API's base URL: `servers[0].url` resolved against the description's URL. */
 export declare function apiBaseUrl(doc: OpenApiDoc, api: PoppyApiEntry): string;
 /**
- * Calls an endpoint of a listed OpenAPI API with a DPoP Session Token (section 6). Refuses
- * absolute URLs outside the API's own origin, so tokens never go to a third party.
+ * Calls an endpoint of a listed OpenAPI API (section 7), through the Session and, when signed in,
+ * with an access token. Refuses absolute URLs outside the API's own origin, so nothing goes to a
+ * third party.
  */
 export declare function callOpenApi(company: CompanyClient, input: {
     method: string;

package/dist/src/poppy-client/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/poppy-client/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,yEAAyE;AACzE,eAAO,MAAM,eAAe,UAAqB,CAAC;AAElD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,EAAE,CAIhE;AAED,wBAAgB,OAAO,CACrB,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,SAAS,GAAG,KAAK,EACvB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GACzB,aAAa,CAOf;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CACZ,MAAM,EACN,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CACnF,CAAC;IACF,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,8FAA8F;AAC9F,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAWjG;AAED,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CAGtE;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE;IACL,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,GACA,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAiC9D"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/poppy-client/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,yEAAyE;AACzE,eAAO,MAAM,eAAe,UAAqB,CAAC;AAElD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,EAAE,CAIhE;AAED,wBAAgB,OAAO,CACrB,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,SAAS,GAAG,KAAK,EACvB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GACzB,aAAa,CAOf;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CACZ,MAAM,EACN,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CACnF,CAAC;IACF,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,6GAA6G;AAC7G,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAWjG;AAED,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CAGtE;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE;IACL,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,GACA,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAqC9D"}

package/dist/src/poppy-client/api.js

@@ -2,7 +2,7 @@ import { throwForResponse } from './company.js';
 import { PoppyError } from './errors.js';
 import { readJson } from './http.js';
 import { requireSecureUrl } from './util.js';
-/** API types this client understands (section 6). Others are skipped. */
+/** API types this client understands (section 7). Others are skipped. */
 export const KNOWN_API_TYPES = ['openapi', 'mcp'];
 export function listApis(company) {
     return (company.document.apis ?? []).filter((a) => a && KNOWN_API_TYPES.includes(a.type) && typeof a.url === 'string');
@@ -17,7 +17,7 @@ export function pickApi(company, type, index) {
     requireSecureUrl(api.url, `${type} url`, company.security);
     return api;
 }
-/** Loads an OpenAPI description. Tried without a token first; with DPoP if that's refused. */
+/** Loads an OpenAPI description. Tried as a public document first; through the Session if that's refused. */
 export async function loadOpenApi(company, api) {
     const res = await company.http.request(api.url, { headers: { accept: 'application/json' } });
     if (res.ok)
@@ -25,7 +25,7 @@ export async function loadOpenApi(company, api) {
     if (res.status === 401 || res.status === 403) {
         const { body } = await company.json(api.url, {
             headers: { accept: 'application/json' },
-            resource: api.resource,
+            service: api.url,
         });
         return body ?? {};
     }
@@ -37,8 +37,9 @@ export function apiBaseUrl(doc, api) {
     return new URL(server ?? '/', api.url).toString().replace(/\/+$/, '');
 }
 /**
- * Calls an endpoint of a listed OpenAPI API with a DPoP Session Token (section 6). Refuses
- * absolute URLs outside the API's own origin, so tokens never go to a third party.
+ * Calls an endpoint of a listed OpenAPI API (section 7), through the Session and, when signed in,
+ * with an access token. Refuses absolute URLs outside the API's own origin, so nothing goes to a
+ * third party.
  */
 export async function callOpenApi(company, input) {
     const api = pickApi(company, 'openapi', input.apiIndex);
@@ -49,7 +50,7 @@ export async function callOpenApi(company, input) {
         : new URL(base + (input.path.startsWith('/') ? input.path : `/${input.path}`));
     const allowed = new Set([new URL(base).origin, new URL(api.url).origin]);
     if (!allowed.has(url.origin)) {
-        throw new PoppyError('foreign_origin', `${url.origin} is not this API's origin; refusing to send the token`);
+        throw new PoppyError('foreign_origin', `${url.origin} is not this API's origin; refusing to send credentials`);
     }
     requireSecureUrl(url.toString(), 'API URL', company.security);
     const headers = { accept: 'application/json' };
@@ -59,11 +60,15 @@ export async function callOpenApi(company, input) {
         method: input.method.toUpperCase(),
         headers,
         body: input.body === undefined ? undefined : JSON.stringify(input.body),
-        resource: api.resource,
+        service: base,
         scope: input.scope,
     });
-    if (res.status === 401 || res.status === 403) {
-        if (res.headers.get('www-authenticate'))
+    if ((res.status === 401 || res.status === 403) && res.headers.get('www-authenticate')) {
+        await throwForResponse(res);
+    }
+    if (res.status === 400) {
+        const refused = await readJson(res.clone());
+        if (refused?.error === 'invalid_session')
             await throwForResponse(res);
     }
     const text = await res.text();

package/dist/src/poppy-client/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/poppy-client/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/poppy-client/api.ts"],"names":[],"mappings":"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"}

package/dist/src/poppy-client/browser.d.ts

@@ -1,24 +1,18 @@
 import type { CompanyClient } from './company.js';
+/** Where the Personal Agent's browser joins a Session (section 6), or an error without one. */
+export declare function browserSessionEndpoint(company: CompanyClient): string;
 /**
- * Builds the browser assertion of section 5 for the current Session, after checking that
- * `return_to` is an HTTPS URL on `organization.domain` or a subdomain of it.
+ * Step 2: reads the one-time code from the HTML of the page the agent's OWN browser loaded in step
+ * 1 (section 6). Pass it nothing else: a code from anywhere else may come from someone else's
+ * browser, which would then join the User's Session (10.6). Keep the code out of model context.
  */
-export declare function createBrowserAssertion(company: CompanyClient, returnTo: string): Promise<{
-    endpoint: string;
-    assertion: string;
-    sessionId: string;
-}>;
-/** A page whose form POSTs the assertion as a top-level navigation. Never in the URL (5). */
-export declare function autoSubmitFormHtml(endpoint: string, assertion: string): string;
+export declare function browserJoinCode(html: string): string;
 /**
- * Serves the auto-submitting page once, on 127.0.0.1 at an unguessable path, so a local
- * browser can load it. The page is gone after the first load (the assertion lives 60s anyway).
+ * Step 2: authorizes the code with the Session header and, if signed in, the access token, which
+ * never reaches the browser. The agent's browser then submits the form (step 3); after a failure,
+ * start again at step 1.
  */
-export declare function serveOneShotPage(html: string, opts?: {
-    timeoutMs?: number | undefined;
-}): Promise<{
-    url: string;
-    served: Promise<void>;
-    close: () => void;
-}>;
+export declare function authorizeBrowserJoin(company: CompanyClient, code: string, opts?: {
+    signedOut?: boolean | undefined;
+}): Promise<void>;
 //# sourceMappingURL=browser.d.ts.map

package/dist/src/poppy-client/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../src/poppy-client/browser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlD;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA8BrE;AAMD,6FAA6F;AAC7F,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAU9E;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAO,GAC5C,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAkCpE"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../src/poppy-client/browser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKlD,+FAA+F;AAC/F,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CASrE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQpD;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GAC7C,OAAO,CAAC,IAAI,CAAC,CAWf"}

package/dist/src/poppy-client/browser.js

@@ -1,83 +1,43 @@
-import { createServer } from 'node:http';
+import { throwForResponse } from './company.js';
 import { PoppyError } from './errors.js';
-import { normalizeDomain, randomId, requireSecureUrl } from './util.js';
-/**
- * Builds the browser assertion of section 5 for the current Session, after checking that
- * `return_to` is an HTTPS URL on `organization.domain` or a subdomain of it.
- */
-export async function createBrowserAssertion(company, returnTo) {
-    const ep = company.document.web?.browser_session_endpoint;
-    if (!ep) {
+import { requireSecureUrl } from './util.js';
+/** Where the Personal Agent's browser joins a Session (section 6), or an error without one. */
+export function browserSessionEndpoint(company) {
+    const endpoint = company.document.web?.browser_session_endpoint;
+    if (!endpoint) {
         throw new PoppyError('no_browser_session_endpoint', 'Company has no web.browser_session_endpoint: browse as an ordinary signed-out visitor');
     }
-    const endpoint = requireSecureUrl(ep, 'web.browser_session_endpoint', company.security).toString();
-    const target = requireSecureUrl(returnTo, 'return_to', company.security);
-    const org = normalizeDomain(company.document.organization.domain.replace(/:\d+$/, ''));
-    const host = target.hostname.toLowerCase();
-    if (normalizeDomain(host) !== org && !host.endsWith(`.${org}`)) {
-        throw new PoppyError('invalid_return_to', `return_to must be on ${org} or a subdomain (section 5)`);
-    }
-    const { sessionId } = await company.token();
-    const assertion = await company.agent.identity.browserAssertion({
-        userId: company.userId,
-        endpoint,
-        sessionId,
-        returnTo: target.toString(),
-    });
-    return { endpoint, assertion, sessionId };
-}
-function escapeHtml(s) {
-    return s.replace(/[&<>"']/g, (c) => `&#${c.charCodeAt(0)};`);
+    return requireSecureUrl(endpoint, 'web.browser_session_endpoint', company.security).toString();
 }
-/** A page whose form POSTs the assertion as a top-level navigation. Never in the URL (5). */
-export function autoSubmitFormHtml(endpoint, assertion) {
-    return `<!doctype html>
-<html><head><meta charset="utf-8"><meta name="referrer" content="no-referrer"><title>Joining session…</title></head>
-<body>
-<form method="post" action="${escapeHtml(endpoint)}" enctype="application/x-www-form-urlencoded">
-<input type="hidden" name="assertion" value="${escapeHtml(assertion)}">
-<noscript><button type="submit">Continue</button></noscript>
-</form>
-<script>document.forms[0].submit()</script>
-</body></html>`;
+/**
+ * Step 2: reads the one-time code from the HTML of the page the agent's OWN browser loaded in step
+ * 1 (section 6). Pass it nothing else: a code from anywhere else may come from someone else's
+ * browser, which would then join the User's Session (10.6). Keep the code out of model context.
+ */
+export function browserJoinCode(html) {
+    for (const tag of html.match(/<input\b[^>]*>/gi) ?? []) {
+        if (!/\bname\s*=\s*["']?code["']?(?:\s|\/|>)/i.test(tag))
+            continue;
+        const value = /\bvalue\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(tag);
+        const code = value?.[1] ?? value?.[2] ?? value?.[3];
+        if (code)
+            return code;
+    }
+    throw new PoppyError('invalid_browser_page', 'the browser-session page has no code field');
 }
 /**
- * Serves the auto-submitting page once, on 127.0.0.1 at an unguessable path, so a local
- * browser can load it. The page is gone after the first load (the assertion lives 60s anyway).
+ * Step 2: authorizes the code with the Session header and, if signed in, the access token, which
+ * never reaches the browser. The agent's browser then submits the form (step 3); after a failure,
+ * start again at step 1.
  */
-export async function serveOneShotPage(html, opts = {}) {
-    const path = `/${randomId('', 16)}`;
-    let resolveServed;
-    const served = new Promise((r) => {
-        resolveServed = r;
-    });
-    let used = false;
-    const server = createServer((req, res) => {
-        if (req.url !== path || used) {
-            res.writeHead(404).end();
-            return;
-        }
-        used = true;
-        res.writeHead(200, {
-            'content-type': 'text/html; charset=utf-8',
-            'cache-control': 'no-store',
-            'referrer-policy': 'no-referrer',
-        });
-        res.end(html);
-        resolveServed();
-        setTimeout(() => server.close(), 1000).unref();
+export async function authorizeBrowserJoin(company, code, opts = {}) {
+    const res = await company.fetch(`${browserSessionEndpoint(company).replace(/\/+$/, '')}/authorize`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ code }),
+        ...(opts.signedOut ? { signedOut: true } : {}),
     });
-    await new Promise((r) => server.listen(0, '127.0.0.1', r));
-    const timer = setTimeout(() => server.close(), opts.timeoutMs ?? 60_000);
-    timer.unref();
-    const { port } = server.address();
-    return {
-        url: `http://127.0.0.1:${port}${path}`,
-        served,
-        close: () => {
-            clearTimeout(timer);
-            server.close();
-        },
-    };
+    if (res.status !== 204)
+        await throwForResponse(res);
 }
 //# sourceMappingURL=browser.js.map

package/dist/src/poppy-client/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/poppy-client/browser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/poppy-client/browser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,+FAA+F;AAC/F,MAAM,UAAU,sBAAsB,CAAC,OAAsB;IAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,wBAAwB,CAAC;IAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,UAAU,CAClB,6BAA6B,EAC7B,uFAAuF,CACxF,CAAC;IACJ,CAAC;IACD,OAAO,gBAAgB,CAAC,QAAQ,EAAE,8BAA8B,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AACjG,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;QACvD,IAAI,CAAC,yCAAyC,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,SAAS;QACnE,MAAM,KAAK,GAAG,kDAAkD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3E,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;IACxB,CAAC;IACD,MAAM,IAAI,UAAU,CAAC,sBAAsB,EAAE,4CAA4C,CAAC,CAAC;AAC7F,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAsB,EACtB,IAAY,EACZ,IAAI,GAAwC,EAAE;IAE9C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,CAC7B,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,EAClE;QACE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/C,CACF,CAAC;IACF,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;QAAE,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}

package/dist/src/poppy-client/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../src/poppy-client/cli/main.ts"],"names":[],"mappings":"AAuHA,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAgE5D"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../src/poppy-client/cli/main.ts"],"names":[],"mappings":"AAuHA,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA6D5D"}

package/dist/src/poppy-client/cli/main.js

@@ -1,6 +1,7 @@
+import { readFile } from 'node:fs/promises';
 import { parseArgs } from 'node:util';
 import { callOpenApi, listApis, loadOpenApi } from '../api.js';
-import { autoSubmitFormHtml, createBrowserAssertion, serveOneShotPage } from '../browser.js';
+import { authorizeBrowserJoin, browserJoinCode, browserSessionEndpoint } from '../browser.js';
 import { PoppyAgent } from '../company.js';
 import { ConversationClient, newMessageId, poppyProtocol } from '../conversations.js';
 import { discover } from '../discovery.js';
@@ -11,13 +12,13 @@ import { generateEs256Key } from '../keys.js';
 import { ask, DEFAULT_MODEL } from '../llm.js';
 import { connectMcp } from '../mcp.js';
 import { openInBrowser } from '../open_url.js';
-import { completeDirectSignIn, deviceSignIn, eligibleSignInTypes, mediatedSignIn, startDirectSignIn, submitMediatedCode, } from '../signin.js';
+import { completeDirectSignIn, deviceSignIn, eligibleSignInTypes, mediatedExtension, mediatedSignIn, offeredSignInTypes, startDirectSignIn, submitMediatedCode, } from '../signin.js';
 import { StateStore } from '../store.js';
 import { isLoopbackHost, requireSecureUrl } from '../util.js';
 import { Prompter } from './prompt.js';
 const HELP = `poppy-agent — reference Personal Agent for the Personal Agent Protocol (Poppy)
 
-  EXPERIMENTAL. Implements spec Draft 0.1 (https://personalagentprotocol.org/docs/spec).
+  EXPERIMENTAL. Implements spec Draft 0.3 (https://personalagentprotocol.org/docs/spec).
   The spec is still in development; this client tracks it and WILL change, possibly in
   breaking ways, as the spec evolves.
 
@@ -34,7 +35,7 @@ Sessions & sign-in (4)
   session <domain> [--new] [--scope <s>] [--resource <url>]
   signin <domain> [--method direct|device|mediated] [--scope "<scopes>"] [--no-open]
   status [domain]
-  disconnect <domain>                   revoke the Account Token (RFC 7009)
+  disconnect <domain>                   revoke the refresh token (RFC 7009)
 APIs (6)
   apis <domain>                         list APIs (and OpenAPI operations)
   api <domain> <METHOD> <path> [--data <json>] [--api <n>] [--scope <s>]
@@ -43,7 +44,7 @@ APIs (6)
 Conversations (7)
   chat <domain> [--conversation <id>] [--as agent|human] [--no-stream]
 Web browsing (5)
-  open <domain> <return_to> [--print]   form-POST a poppy-browser+jwt assertion
+  open <domain> [--page <file>]         authorize a browser join: code from that browser's page
 LLM mode
   ask <domain> "<task>" [--model <id>] [--max-steps <n>] [--yes]
                                         needs OPENROUTER_API_KEY (default model ${DEFAULT_MODEL})
@@ -51,7 +52,6 @@ LLM mode
 Global options
   --state <file>      state file (default $POPPY_AGENT_STATE or ~/.config/poppy-agent/state.json), mode 0600
   --profile <name>    local user to act for (default "default"); each gets its own User IDs
-  --client-assertion-aud token_endpoint|issuer   aud of private_key_jwt (default token_endpoint)
   --insecure-dev      NON-SPEC: allow http:// URLs (client_id, discovery, endpoints). Local testing only.
                       Also: POPPY_AGENT_INSECURE_DEV=1
 `;
@@ -72,14 +72,12 @@ function loadIdentity(ctx) {
     return new AgentIdentity(id, { insecureDev: ctx.insecureDev });
 }
 function makeAgent(ctx) {
-    const aud = ctx.values['client-assertion-aud'];
     return new PoppyAgent({
         store: ctx.store,
         identity: loadIdentity(ctx),
         profile: ctx.profile,
         insecureDev: ctx.insecureDev,
         log: (l) => err(dim(`· ${l}`)),
-        tokenClient: { clientAssertionAudience: aud === 'issuer' ? 'issuer' : 'token_endpoint' },
     });
 }
 async function company(ctx, domain) {
@@ -116,11 +114,10 @@ export async function runCli(argv) {
             conversation: { type: 'string' },
             as: { type: 'string' },
             'no-stream': { type: 'boolean' },
-            print: { type: 'boolean' },
+            page: { type: 'string' },
             model: { type: 'string' },
             'max-steps': { type: 'string' },
             yes: { type: 'boolean' },
-            'client-assertion-aud': { type: 'string' },
         },
     });
     const [command, ...args] = positionals;
@@ -145,9 +142,6 @@ export async function runCli(argv) {
         if (e instanceof ResourceAuthError && e.code === 'insufficient_scope') {
             err(`error: insufficient_scope — the Company needs "${e.scope ?? '?'}". Run: poppy-agent signin <domain> --scope "${e.scope ?? ''}"`);
         }
-        else if (e instanceof ResourceAuthError && e.code === 'sign_in_required') {
-            err('error: sign_in_required — run: poppy-agent signin <domain>');
-        }
         else {
             err(`error: ${e.message}`);
         }
@@ -183,12 +177,12 @@ async function dispatch(ctx, command, args) {
             const t = await c.token({ scope: str(v.scope), resource: str(v.resource) });
             out(JSON.stringify({
                 user_id: c.userId,
-                session_id: t.sessionId,
-                signed_in: t.signedIn,
-                scope: t.scope,
-                token_type: t.tokenType,
-                expires_at: new Date(t.expiresAt).toISOString(),
-                account_token: c.accountToken
+                session_id: c.sessionId,
+                signed_in: t !== null,
+                scope: t?.scope ?? '',
+                token_type: t?.tokenType ?? null,
+                expires_at: t ? new Date(t.expiresAt).toISOString() : null,
+                refresh_token: c.accountToken
                     ? { scope: c.accountToken.scope, via: c.accountToken.via }
                     : null,
             }, null, 2));
@@ -205,14 +199,14 @@ async function dispatch(ctx, command, args) {
             const c = await company(ctx, args[0]);
             const revoked = await c.signOut();
             out(revoked
-                ? 'Account Token revoked; Sessions continue signed out.'
-                : 'No Account Token for this Company.');
+                ? 'Refresh token revoked; Sessions continue signed out.'
+                : 'No refresh token for this Company.');
             return 0;
         }
         case 'apis': {
             const c = await company(ctx, args[0]);
             for (const a of listApis(c)) {
-                out(`${bold(`[${a.type}]`)} ${a.url}${a.resource ? ` (resource ${a.resource})` : ''} — ${a.description ?? ''}`);
+                out(`${bold(`[${a.type}]`)} ${a.url} — ${a.description ?? ''}`);
                 if (a.type === 'openapi') {
                     try {
                         const doc = await loadOpenApi(c, a);
@@ -252,7 +246,7 @@ async function dispatch(ctx, command, args) {
         case 'chat':
             return cmdChat(ctx, args[0]);
         case 'open':
-            return cmdOpen(ctx, args[0], args[1]);
+            return cmdOpen(ctx, args[0]);
         case 'ask':
             return cmdAsk(ctx, args[0], args.slice(1).join(' '));
         default:
@@ -320,14 +314,12 @@ async function cmdServeIdentity(ctx) {
 }
 /* --------------------------------------------------------------------------- sign-in */
 function defaultScope(c, method) {
-    const offered = c.document.auth?.[method]?.scopes ?? [];
-    const broad = offered.filter((s) => s === 'poppy:read' || s === 'poppy:write');
-    return (broad.length ? broad : offered).join(' ');
+    if (method === 'mediated')
+        return (mediatedExtension(c)?.scopes ?? []).join(' ');
+    return (c.metadata.scopes_supported ?? Object.keys(c.document.auth?.scopes ?? {})).join(' ');
 }
 async function signIn(ctx, c, method, scope) {
-    const eligible = scope
-        ? eligibleSignInTypes(c, scope)
-        : ['direct', 'device', 'mediated'].filter((t) => c.document.auth?.[t]);
+    const eligible = scope ? eligibleSignInTypes(c, scope) : offeredSignInTypes(c);
     const chosen = method ?? eligible[0];
     if (!chosen) {
         err(scope
@@ -343,7 +335,7 @@ async function signIn(ctx, c, method, scope) {
     else if (chosen === 'device') {
         result = await deviceSignIn(c, wanted, {
             display: (i) => {
-                out(`Open ${bold(i.verificationUriComplete ?? i.verificationUri)} and enter the code ${bold(i.userCode)}`);
+                out(`${bold(i.organization.name)} (${i.organization.domain}): open ${bold(i.verificationUriComplete ?? i.verificationUri)} and enter the code ${bold(i.userCode)}`);
                 out(dim(`(expires in ${i.expiresIn}s; waiting…)`));
             },
             onPoll: (s, n) => s === 'slow_down' && err(dim(`slow_down: polling every ${n}s`)),
@@ -352,7 +344,7 @@ async function signIn(ctx, c, method, scope) {
     else
         result = await mediatedFlow(ctx, c, wanted);
     if (result) {
-        out(`Signed in. Granted scope: "${result.grantedScope}" (session ${result.sessionId})`);
+        out(`Signed in. Granted scope: "${result.grantedScope}" `);
         if (result.missingScopes.length)
             out(`Note: the User did not grant ${result.missingScopes.join(', ')}`);
     }
@@ -411,7 +403,7 @@ async function directFlow(ctx, c, scope) {
     }
 }
 async function mediatedFlow(ctx, c, scope) {
-    const mediated = c.document.auth.mediated;
+    const mediated = mediatedExtension(c);
     const credentials = {};
     for (const f of mediated.fields) {
         credentials[f.name] = f.secret
@@ -422,7 +414,7 @@ async function mediatedFlow(ctx, c, scope) {
     for (const k of Object.keys(credentials))
         credentials[k] = '';
     while (outcome.status === 'code_required') {
-        const code = await ctx.prompter.ask(`One-time code${outcome.sentTo ? ` (${outcome.sentTo})` : ''}${outcome.expiresAt ? `, before ${outcome.expiresAt}` : ''}: `);
+        const code = await ctx.prompter.ask(`One-time code${outcome.sentTo ? ` (${outcome.sentTo})` : ''}${outcome.expiresIn ? `, within ${outcome.expiresIn}s` : ''}: `);
         outcome = await submitMediatedCode(c, scope, outcome.signInId, code.trim());
     }
     if (outcome.status === 'complete')
@@ -436,12 +428,12 @@ async function cmdStatus(ctx, domain) {
     const id = ctx.store.data.identity;
     out(`identity: ${id ? `${id.baseUrl}/agent.json` : '(none: run init)'}   profile: ${ctx.profile}`);
     for (const s of Object.values(companies)) {
-        if (domain && !s.domains.includes(domain.toLowerCase().replace(/^www\./, '')))
+        if (domain && !s.domains.includes(domain.toLowerCase()))
             continue;
-        const t = s.tokens.dpop;
+        const t = s.tokens.default;
         out(`${bold(s.issuer)}  (${s.domains.join(', ')})`);
-        out(`  user_id ${s.userId}   session ${s.sessionId ?? '-'}   ${t ? `signed_in=${t.signedIn} scope="${t.scope}" expires ${new Date(t.expiresAt).toISOString()}` : ''}`);
-        out(`  account token: ${s.accountToken ? `yes (scope "${s.accountToken.scope}", via ${s.accountToken.via})` : 'no'}`);
+        out(`  user_id ${s.userId}   session ${s.sessionId ?? '-'}   ${s.accountToken ? 'signed in' : 'signed out'}${t ? ` scope="${t.scope}" expires ${new Date(t.expiresAt).toISOString()}` : ''}`);
+        out(`  refresh token: ${s.accountToken ? `yes (scope "${s.accountToken.scope}", via ${s.accountToken.via})` : 'no'}`);
         const convs = Object.entries(s.conversations).filter(([, c]) => !c.closed);
         if (convs.length)
             out(`  open conversations: ${convs.map(([k]) => k).join(', ')}`);
@@ -474,19 +466,19 @@ async function cmdMcp(ctx, args) {
     }
 }
 /* --------------------------------------------------------------------------- open */
-async function cmdOpen(ctx, domain, returnTo) {
-    if (!domain || !returnTo)
-        throw new PoppyError('usage', 'open <domain> <return_to>');
+async function cmdOpen(ctx, domain) {
+    if (!domain)
+        throw new PoppyError('usage', 'open <domain> [--page <file>]');
     const c = await company(ctx, domain);
-    const { endpoint, assertion } = await createBrowserAssertion(c, returnTo);
-    const page = await serveOneShotPage(autoSubmitFormHtml(endpoint, assertion));
-    err(dim("Spec 5: browser assertions MUST be posted only from a browser the Personal Agent controls, never from the User's own browser. Use a dedicated/automation browser profile."));
-    out(`Load this page (once, within 60s) in the agent-controlled browser:\n  ${page.url}`);
-    out(dim(`It form-POSTs the assertion to ${endpoint}, which sets the Session cookie and 303s to return_to.`));
-    if (!ctx.values.print)
-        openInBrowser(page.url);
-    await Promise.race([page.served, new Promise((r) => setTimeout(r, 60_000))]);
-    page.close();
+    const endpoint = browserSessionEndpoint(c);
+    err(dim("Section 6: join only a browser this agent controls, never the User's own, and take the code only from the page it loaded."));
+    out(`In the agent-controlled browser, load:\n  ${endpoint}`);
+    const page = str(ctx.values.page);
+    const code = page
+        ? browserJoinCode(await readFile(page, 'utf8'))
+        : (await ctx.prompter.askSecret('Code from that page (the form field `code`): ')).trim();
+    await authorizeBrowserJoin(c, code);
+    out('Authorized. Now submit the form in that browser, within its 60 seconds.');
     return 0;
 }
 /* --------------------------------------------------------------------------- ask */
@@ -565,7 +557,7 @@ async function cmdChat(ctx, domain) {
                 provisional.delete(m.id);
                 if (m.role === 'user')
                     return; // our own message, echoed back
-                let line = `${tag}${bold(`company[${m.sender}]`)}: ${m.text ?? ''}`;
+                let line = `${tag}${bold(`company[${m.author?.name ?? m.author?.type}]`)}: ${m.text ?? ''}`;
                 if (m.data)
                     line += `\n${dim(JSON.stringify(m.data, null, 2))}`;
                 print(line);
@@ -658,7 +650,7 @@ async function cmdChat(ctx, domain) {
             continue;
         try {
             if (!line.startsWith('/')) {
-                await send({ sender: directId ? 'human' : sender, text: line });
+                await send({ author: { type: directId ? 'human' : sender }, text: line });
                 continue;
             }
             const [cmd, ...rest] = line.split(' ');
@@ -672,7 +664,7 @@ async function cmdChat(ctx, domain) {
                 out(dim(`now sending as ${sender}`));
             }
             else if (cmd === '/data') {
-                await send({ sender: directId ? 'human' : sender, data: JSON.parse(restText) });
+                await send({ author: { type: directId ? 'human' : sender }, data: JSON.parse(restText) });
             }
             else if (cmd === '/context') {
                 const context = {};
@@ -682,7 +674,7 @@ async function cmdChat(ctx, domain) {
                         continue;
                     context[k] = val === 'true' ? true : val === 'false' ? false : val;
                 }
-                await send({ sender: 'agent', context });
+                await send({ author: { type: 'agent' }, context });
             }
             else if (cmd === '/status') {
                 if (!mainId)
@@ -709,7 +701,7 @@ async function cmdChat(ctx, domain) {
                 const r = await signIn(ctx, c, m, m ? scope : [method, ...scopeParts].filter(Boolean).join(' ') || scope);
                 if (r) {
                     pendingAuth = undefined;
-                    out(dim('Continue the conversation; the new Session Token is used from now on.'));
+                    out(dim('Continue the conversation; the new access token is used from now on.'));
                 }
             }
             else if (cmd === '/direct') {
@@ -718,7 +710,7 @@ async function cmdChat(ctx, domain) {
                 else {
                     const message = {
                         id: newMessageId(),
-                        sender: 'human',
+                        author: { type: 'human' },
                         text: restText || 'Hi, I am here.',
                         context: { user_available: true },
                     };
@@ -735,7 +727,7 @@ async function cmdChat(ctx, domain) {
                 else {
                     await conv.send(mainId, {
                         id: newMessageId(),
-                        sender: 'agent',
+                        author: { type: 'agent' },
                         text: pendingUserRequest
                             ? 'The user declined to talk directly right now.'
                             : 'The user is not available.',