@adonis-agora/agent 0.93.0 → 0.95.0

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

@@ -3,7 +3,7 @@ import { DpopKey } from './dpop.js';
 import { PoppyHttp, type PoppyRequestInit } from './http.js';
 import type { AgentIdentity } from './identity.js';
 import type { AccountTokenRecord, CompanyState, StateStore, TokenRecord } from './store.js';
-import { type NarrowingParams, TokenClient, type TokenClientOptions } from './token_client.js';
+import { type NarrowingParams, TokenClient } from './token_client.js';
 import type { AuthServerMetadata, PoppyDocument, TokenResponse } from './types.js';
 import { type FetchLike, type SecurityOptions } from './util.js';
 export interface PoppyAgentOptions extends SecurityOptions {
@@ -13,7 +13,6 @@ export interface PoppyAgentOptions extends SecurityOptions {
     profile?: string | undefined;
     fetch?: FetchLike | undefined;
     log?: ((line: string) => void) | undefined;
-    tokenClient?: TokenClientOptions | undefined;
     maxRetryAfterSeconds?: number | undefined;
 }
 /** Entry point: one agent identity, one local state file, one local user. */
@@ -26,62 +25,78 @@ export declare class PoppyAgent {
     get identity(): AgentIdentity;
     get store(): StateStore;
     log(line: string): void;
-    /** Discovers a Company and loads (or creates) this user's state there. */
+    /** Discovers a Company and loads (or creates) this user's state there, by its identifier. */
     company(domain: string): Promise<CompanyClient>;
 }
+interface TokenOptions extends NarrowingParams {
+    /** No DPoP proof: MCP servers take Bearer tokens (section 7). */
+    bearer?: boolean | undefined;
+    forceRenew?: boolean | undefined;
+}
 export interface SignInResult {
     grantedScope: string;
-    /** Requested scopes the User didn't grant (4.4: "checks scope before continuing"). */
+    /** Requested scopes the User didn't grant (4.7: "checks scope before continuing"). */
     missingScopes: string[];
-    sessionId: string;
 }
-/** One User at one Company: Sessions, Account Token, and authenticated requests. */
+export type CompanyFetchInit = Omit<PoppyRequestInit, 'dpop' | 'accessToken' | 'scheme' | 'session'> & NarrowingParams & {
+    /** The service's URL, whose protected resource metadata says if it needs its own tokens (4.5). */
+    service?: string | undefined;
+    bearer?: boolean | undefined;
+    /** Only the Session header, even with a refresh token. */
+    signedOut?: boolean | undefined;
+};
+/** One User at one Company: the Session, the refresh token, and requests to its endpoints. */
 export declare class CompanyClient {
+    #private;
     readonly agent: PoppyAgent;
     readonly discovered: Discovered;
     readonly state: CompanyState;
-    readonly tokens: TokenClient;
     readonly dpop: DpopKey;
     constructor(agent: PoppyAgent, discovered: Discovered, state: CompanyState);
+    /** The Company's OAuth calls. A Company without an issuer offers no sign-in (3.2). */
+    get tokens(): TokenClient;
     get document(): PoppyDocument;
     get metadata(): AuthServerMetadata;
+    /** The Company's identifier (3.2): its issuer, or its HTTPS domain without one. */
     get issuer(): string;
     get userId(): string;
     get http(): PoppyHttp;
     get security(): SecurityOptions;
     get accountToken(): AccountTokenRecord | undefined;
+    /** The current Session's `sid`, chosen here at random (5.2). */
+    get sessionId(): string;
     save(): Promise<void>;
-    /** Forget the current Session; the next request starts a new one. */
+    /** Stops using the current `sid`; the next request starts a new Session (5.5). */
     newSession(): Promise<void>;
+    /** Sends a proof with token requests when the issuer's metadata lists ES256 (4.5). */
+    tokenDpop(): DpopKey | undefined;
+    /** A `Poppy-Session` JWT good for this one request (5.2). */
+    sessionJwt(method: string, url: string, accessToken?: string | undefined): Promise<string>;
     /**
-     * A valid Session Token. Starts a Session if there is none (signed in if an Account Token
-     * exists, 4.8), renews it when it is close to expiry, and handles `invalid_session`,
-     * `account_mismatch` and a revoked Account Token (`invalid_grant`) as 4.2/4.8/4.9 describe.
+     * An access token, refreshed when close to expiry, or `null` when signed out. A refresh answered
+     * with `invalid_grant` means the sign-in is gone: the Session continues signed out (5.5).
      */
-    token(opts?: {
-        bearer?: boolean | undefined;
-        forceRenew?: boolean | undefined;
-    } & NarrowingParams): Promise<TokenRecord>;
-    private issue;
-    private record;
-    /** Stores the result of any sign-in type (4.4): Account Token + signed-in Session Token. */
+    token(opts?: TokenOptions): Promise<TokenRecord | null>;
+    /** Stores the result of any sign-in type (4.7): the refresh token and the access token. */
     applySignIn(resp: TokenResponse, via: AccountTokenRecord['via'], requestedScope: string): Promise<SignInResult>;
-    /** Sign out (4.9): revoke the Account Token. Sessions carry on signed out. */
+    /** Sign out (5.5): revoke the refresh token. Sessions carry on signed out. */
     signOut(): Promise<boolean>;
-    /** A Bearer Session Token for one MCP server (4.3 "Bearer tokens"). */
-    bearerFor(resource: string, forceRenew?: boolean): Promise<string>;
     /**
-     * An API or conversation request with `Authorization: DPoP` + a proof (4.3). Retries once
-     * with a renewed token on `invalid_token`, and once with the Account Token on
-     * `sign_in_required` when the current token is signed out but an Account Token exists.
+     * A request to one of the Company's APIs or endpoints: the Session header and, when signed in, an
+     * access token (5.2, 4.5). `invalid_session` starts a new Session once (section 7), and
+     * `invalid_token` refreshes once, falling back to signed out when the sign-in is gone (5.5).
      */
-    fetch(url: string, init?: Omit<PoppyRequestInit, 'dpop' | 'accessToken' | 'scheme'> & NarrowingParams): Promise<Response>;
-    /** `fetch` + JSON, mapping failures to typed errors (section 6, 7.13). */
-    json<T>(url: string, init?: Omit<PoppyRequestInit, 'dpop' | 'accessToken' | 'scheme'> & NarrowingParams): Promise<{
+    fetch(url: string, init?: CompanyFetchInit): Promise<Response>;
+    /** `fetch` + JSON, mapping failures to typed errors (section 7, 8.13). */
+    json<T>(url: string, init?: CompanyFetchInit): Promise<{
         status: number;
         body: T;
     }>;
 }
-/** Maps a failed resource response to a typed error. */
+/**
+ * Maps a failed resource response to a typed error. A challenge without an error code means the
+ * request needs the account: it's handled as `insufficient_scope` (section 7).
+ */
 export declare function throwForResponse(res: Response): Promise<never>;
+export {};
 //# sourceMappingURL=company.d.ts.map

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

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