@atproto/api 0.13.3 → 0.13.4

package/dist/client/types/app/bsky/feed/getPostThread.d.ts

@@ -17,6 +17,7 @@ export interface OutputSchema {
         $type: string;
         [k: string]: unknown;
     };
+    threadgate?: AppBskyFeedDefs.ThreadgateView;
     [k: string]: unknown;
 }
 export interface CallOptions {

package/dist/client/types/app/bsky/feed/getPostThread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPostThread.d.ts","sourceRoot":"","sources":["../../../../../../src/client/types/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAKrD,OAAO,KAAK,eAAe,MAAM,QAAQ,CAAA;AAEzC,MAAM,WAAW,WAAW;IAC1B,yCAAyC;IACzC,GAAG,EAAE,MAAM,CAAA;IACX,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,EACF,eAAe,CAAC,cAAc,GAC9B,eAAe,CAAC,YAAY,GAC5B,eAAe,CAAC,WAAW,GAC3B;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC3C,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,UAAU,CAAA;IACnB,IAAI,EAAE,YAAY,CAAA;CACnB;AAED,qBAAa,aAAc,SAAQ,SAAS;gBAC9B,GAAG,EAAE,SAAS;CAG3B;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,OAMhC"}
+{"version":3,"file":"getPostThread.d.ts","sourceRoot":"","sources":["../../../../../../src/client/types/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAKrD,OAAO,KAAK,eAAe,MAAM,QAAQ,CAAA;AAEzC,MAAM,WAAW,WAAW;IAC1B,yCAAyC;IACzC,GAAG,EAAE,MAAM,CAAA;IACX,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,EACF,eAAe,CAAC,cAAc,GAC9B,eAAe,CAAC,YAAY,GAC5B,eAAe,CAAC,WAAW,GAC3B;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC3C,UAAU,CAAC,EAAE,eAAe,CAAC,cAAc,CAAA;IAC3C,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,UAAU,CAAA;IACnB,IAAI,EAAE,YAAY,CAAA;CACnB;AAED,qBAAa,aAAc,SAAQ,SAAS;gBAC9B,GAAG,EAAE,SAAS;CAG3B;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,OAMhC"}

package/dist/client/types/app/bsky/feed/getPostThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPostThread.js","sourceRoot":"","sources":["../../../../../../src/client/types/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,wCAAqD;AAsCrD,MAAa,aAAc,SAAQ,gBAAS;IAC1C,YAAY,GAAc;QACxB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;IACxE,CAAC;CACF;AAJD,sCAIC;AAED,SAAgB,UAAU,CAAC,CAAM;IAC/B,IAAI,CAAC,YAAY,gBAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,KAAK,KAAK,UAAU;YAAE,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAND,gCAMC"}
+{"version":3,"file":"getPostThread.js","sourceRoot":"","sources":["../../../../../../src/client/types/app/bsky/feed/getPostThread.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,wCAAqD;AAuCrD,MAAa,aAAc,SAAQ,gBAAS;IAC1C,YAAY,GAAc;QACxB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;IACxE,CAAC;CACF;AAJD,sCAIC;AAED,SAAgB,UAAU,CAAC,CAAM;IAC/B,IAAI,CAAC,YAAY,gBAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,KAAK,KAAK,UAAU;YAAE,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAND,gCAMC"}

package/dist/index.d.ts

@@ -16,8 +16,10 @@ export * from './mocker';
 export { LABELS, DEFAULT_LABEL_SETTINGS } from './moderation/const/labels';
 export { Agent } from './agent';
 export { AtpAgent, type AtpAgentOptions } from './atp-agent';
+export { CredentialSession } from './atp-agent';
 export { BskyAgent } from './bsky-agent';
+export { 
 /** @deprecated */
-export { AtpAgent as default } from './atp-agent';
+AtpAgent as default, } from './atp-agent';
 export declare const lexicons: Lexicons;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EACL,OAAO,EACP,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,GAChB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,kBAAkB;AAClB,OAAO,EAAE,QAAQ,IAAI,OAAO,EAAE,MAAM,aAAa,CAAA;AAIjD,eAAO,MAAM,QAAQ,UAAiC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EACL,OAAO,EACP,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,GAChB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO;AACL,kBAAkB;AAClB,QAAQ,IAAI,OAAO,GACpB,MAAM,aAAa,CAAA;AAIpB,eAAO,MAAM,QAAQ,UAAiC,CAAA"}

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lexicons = exports.default = exports.BskyAgent = exports.AtpAgent = exports.Agent = exports.DEFAULT_LABEL_SETTINGS = exports.LABELS = exports.parseLanguage = exports.jsonStringToLex = exports.jsonToLex = exports.stringifyLex = exports.lexToJson = exports.BlobRef = exports.AtUri = void 0;
+exports.lexicons = exports.default = exports.BskyAgent = exports.CredentialSession = exports.AtpAgent = exports.Agent = exports.DEFAULT_LABEL_SETTINGS = exports.LABELS = exports.parseLanguage = exports.jsonStringToLex = exports.jsonToLex = exports.stringifyLex = exports.lexToJson = exports.BlobRef = exports.AtUri = void 0;
 const lexicon_1 = require("@atproto/lexicon");
 const lexicons_1 = require("./client/lexicons");
 var syntax_1 = require("@atproto/syntax");
@@ -45,11 +45,13 @@ var agent_1 = require("./agent");
 Object.defineProperty(exports, "Agent", { enumerable: true, get: function () { return agent_1.Agent; } });
 var atp_agent_1 = require("./atp-agent");
 Object.defineProperty(exports, "AtpAgent", { enumerable: true, get: function () { return atp_agent_1.AtpAgent; } });
+var atp_agent_2 = require("./atp-agent");
+Object.defineProperty(exports, "CredentialSession", { enumerable: true, get: function () { return atp_agent_2.CredentialSession; } });
 var bsky_agent_1 = require("./bsky-agent");
 Object.defineProperty(exports, "BskyAgent", { enumerable: true, get: function () { return bsky_agent_1.BskyAgent; } });
+var atp_agent_3 = require("./atp-agent");
 /** @deprecated */
-var atp_agent_2 = require("./atp-agent");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return atp_agent_2.AtpAgent; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return atp_agent_3.AtpAgent; } });
 // Expose a copy to prevent alteration of the internal Lexicon instance used by
 // the AtpBaseClient class.
 exports.lexicons = new lexicon_1.Lexicons(lexicons_1.lexicons);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAC3C,gDAAgE;AAEhE,0CAAuC;AAA9B,+FAAA,KAAK,OAAA;AACd,4CAMyB;AALvB,kGAAA,OAAO,OAAA;AACP,oGAAA,SAAS,OAAA;AACT,uGAAA,YAAY,OAAA;AACZ,oGAAA,SAAS,OAAA;AACT,0GAAA,eAAe,OAAA;AAEjB,kDAAmD;AAA1C,2GAAA,aAAa,OAAA;AACtB,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,2CAAwB;AACxB,wDAAqC;AACrC,2DAAwC;AACxC,sDAAmC;AACnC,mDAAgC;AAChC,+CAA4B;AAC5B,qDAAkC;AAClC,2CAAwB;AACxB,oDAA0E;AAAjE,gGAAA,MAAM,OAAA;AAAE,gHAAA,sBAAsB,OAAA;AACvC,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AAEd,yCAA4D;AAAnD,qGAAA,QAAQ,OAAA;AACjB,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,kBAAkB;AAClB,yCAAiD;AAAxC,oGAAA,QAAQ,OAAW;AAE5B,+EAA+E;AAC/E,2BAA2B;AACd,QAAA,QAAQ,GAAG,IAAI,kBAAQ,CAAC,mBAAgB,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,8CAA2C;AAC3C,gDAAgE;AAEhE,0CAAuC;AAA9B,+FAAA,KAAK,OAAA;AACd,4CAMyB;AALvB,kGAAA,OAAO,OAAA;AACP,oGAAA,SAAS,OAAA;AACT,uGAAA,YAAY,OAAA;AACZ,oGAAA,SAAS,OAAA;AACT,0GAAA,eAAe,OAAA;AAEjB,kDAAmD;AAA1C,2GAAA,aAAa,OAAA;AACtB,0CAAuB;AACvB,0CAAuB;AACvB,yCAAsB;AACtB,2CAAwB;AACxB,wDAAqC;AACrC,2DAAwC;AACxC,sDAAmC;AACnC,mDAAgC;AAChC,+CAA4B;AAC5B,qDAAkC;AAClC,2CAAwB;AACxB,oDAA0E;AAAjE,gGAAA,MAAM,OAAA;AAAE,gHAAA,sBAAsB,OAAA;AACvC,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AAEd,yCAA4D;AAAnD,qGAAA,QAAQ,OAAA;AACjB,yCAA+C;AAAtC,8GAAA,iBAAiB,OAAA;AAC1B,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAElB,yCAGoB;AAFlB,kBAAkB;AAClB,oGAAA,QAAQ,OAAW;AAGrB,+EAA+E;AAC/E,2BAA2B;AACd,QAAA,QAAQ,GAAG,IAAI,kBAAQ,CAAC,mBAAgB,CAAC,CAAA"}

package/dist/session-manager.d.ts

@@ -0,0 +1,5 @@
+import { FetchHandlerObject } from '@atproto/xrpc';
+export interface SessionManager extends FetchHandlerObject {
+    readonly did?: string;
+}
+//# sourceMappingURL=session-manager.d.ts.map

package/dist/session-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CACtB"}

package/dist/session-manager.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=session-manager.js.map

package/dist/session-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -23,7 +23,7 @@
     "@atproto/common-web": "^0.3.0",
     "@atproto/lexicon": "^0.4.1",
     "@atproto/syntax": "^0.3.0",
-    "@atproto/xrpc": "^0.6.0"
+    "@atproto/xrpc": "^0.6.1"
   },
   "devDependencies": {
     "get-port": "^6.1.2",

package/src/agent.ts

@@ -1,19 +1,19 @@
 import { TID } from '@atproto/common-web'
 import { AtUri, ensureValidDid } from '@atproto/syntax'
-import {
-  buildFetchHandler,
-  FetchHandler,
-  FetchHandlerOptions,
-} from '@atproto/xrpc'
+import { buildFetchHandler, FetchHandler, XrpcClient } from '@atproto/xrpc'
 import AwaitLock from 'await-lock'
 import {
   AppBskyActorDefs,
   AppBskyActorProfile,
   AppBskyFeedPost,
   AppBskyLabelerDefs,
-  AtpBaseClient,
+  AppNS,
+  ChatNS,
   ComAtprotoRepoPutRecord,
+  ComNS,
+  ToolsNS,
 } from './client/index'
+import { schemas } from './client/lexicons'
 import { MutedWord } from './client/types/app/bsky/actor/defs'
 import { BSKY_LABELER_DID } from './const'
 import { interpretLabelValueDefinitions } from './moderation'
@@ -23,6 +23,7 @@ import {
   LabelPreference,
   ModerationPrefs,
 } from './moderation/types'
+import { SessionManager } from './session-manager'
 import {
   AtpAgentGlobalOpts,
   AtprotoServiceType,
@@ -68,14 +69,13 @@ export type { FetchHandler }
 /**
  * An {@link Agent} is an {@link AtpBaseClient} with the following
  * additional features:
- * - Abstract session management utilities
  * - AT Protocol labelers configuration utilities
  * - AT Protocol proxy configuration utilities
  * - Cloning utilities
  * - `app.bsky` syntactic sugar
  * - `com.atproto` syntactic sugar
  */
-export abstract class Agent extends AtpBaseClient {
+export class Agent extends XrpcClient {
   //#region Static configuration
 
   /**
@@ -94,8 +94,18 @@ export abstract class Agent extends AtpBaseClient {
 
   //#endregion
 
-  constructor(fetchHandlerOpts: FetchHandler | FetchHandlerOptions) {
-    const fetchHandler = buildFetchHandler(fetchHandlerOpts)
+  com = new ComNS(this)
+  app = new AppNS(this)
+  chat = new ChatNS(this)
+  tools = new ToolsNS(this)
+
+  /** @deprecated use `this` instead */
+  get xrpc(): XrpcClient {
+    return this
+  }
+
+  constructor(readonly sessionManager: SessionManager) {
+    const fetchHandler = buildFetchHandler(sessionManager)
 
     super((url, init) => {
       const headers = new Headers(init?.headers)
@@ -118,16 +128,20 @@ export abstract class Agent extends AtpBaseClient {
       )
 
       return fetchHandler(url, { ...init, headers })
-    })
+    }, schemas)
   }
 
   //#region Cloning utilities
 
-  abstract clone(): Agent
+  clone(): Agent {
+    return this.copyInto(new Agent(this.sessionManager))
+  }
 
   copyInto<T extends Agent>(inst: T): T {
     inst.configureLabelers(this.labelers)
     inst.configureProxy(this.proxy ?? null)
+    inst.clearHeaders()
+    for (const [key, value] of this.headers) inst.setHeader(key, value)
     return inst
   }
 
@@ -185,12 +199,19 @@ export abstract class Agent extends AtpBaseClient {
   /**
    * Get the authenticated user's DID, if any.
    */
-  abstract readonly did?: string
+  get did() {
+    return this.sessionManager.did
+  }
+
+  /** @deprecated Use {@link Agent.assertDid} instead */
+  get accountDid() {
+    return this.assertDid
+  }
 
   /**
    * Get the authenticated user's DID, or throw an error if not authenticated.
    */
-  public get accountDid(): string {
+  get assertDid(): string {
     this.assertAuthenticated()
     return this.did
   }

package/src/atp-agent.ts

@@ -4,16 +4,18 @@ import {
   Gettable,
   ResponseType,
   XRPCError,
-  combineHeaders,
+  XrpcClient,
   errorResponseBody,
 } from '@atproto/xrpc'
 import { Agent } from './agent'
 import {
-  AtpBaseClient,
   ComAtprotoServerCreateAccount,
   ComAtprotoServerCreateSession,
   ComAtprotoServerGetSession,
+  ComAtprotoServerNS,
 } from './client'
+import { schemas } from './client/lexicons'
+import { SessionManager } from './session-manager'
 import {
   AtpAgentLoginOpts,
   AtpPersistSessionHandler,
@@ -32,92 +34,44 @@ export type AtpAgentOptions = {
 }
 
 /**
- * An {@link AtpAgent} extends the {@link Agent} abstract class by
- * implementing password based session management.
+ * A wrapper around the {@link Agent} class that uses credential based session
+ * management. This class also exposes most of the session management methods
+ * directly.
+ *
+ * This class will be deprecated in the near future. Use {@link Agent} directly
+ * with a {@link CredentialSession} instead:
+ *
+ *  ```ts
+ *  const session = new CredentialSession({
+ *    service: new URL('https://example.com'),
+ *  })
+ *
+ *  const agent = new Agent(session)
+ *  ```
  */
 export class AtpAgent extends Agent {
-  public readonly headers: Map<string, Gettable<null | string>>
-  public readonly sessionManager: SessionManager
-
-  constructor(options: AtpAgentOptions | SessionManager) {
-    super(async (url: string, init?: RequestInit): Promise<Response> => {
-      // wait for any active session-refreshes to finish
-      await this.sessionManager.refreshSessionPromise
-
-      const initialHeaders = combineHeaders(init?.headers, this.headers)
-      const reqInit = { ...init, headers: initialHeaders }
-
-      const initialUri = new URL(url, this.dispatchUrl)
-      const initialReq = new Request(initialUri, reqInit)
-
-      const initialToken = this.session?.accessJwt
-      if (!initialToken || initialReq.headers.has('authorization')) {
-        return (0, this.sessionManager.fetch)(initialReq)
-      }
-
-      initialReq.headers.set('authorization', `Bearer ${initialToken}`)
-      const initialRes = await (0, this.sessionManager.fetch)(initialReq)
-
-      if (!this.session?.refreshJwt) {
-        return initialRes
-      }
-      const isExpiredToken = await isErrorResponse(
-        initialRes,
-        [400],
-        ['ExpiredToken'],
-      )
-
-      if (!isExpiredToken) {
-        return initialRes
+  readonly sessionManager: CredentialSession
+
+  constructor(options: AtpAgentOptions | CredentialSession) {
+    const sessionManager =
+      options instanceof CredentialSession
+        ? options
+        : new CredentialSession(
+            new URL(options.service),
+            options.fetch,
+            options.persistSession,
+          )
+
+    super(sessionManager)
+
+    // This assignment is already being done in the super constructor, but we
+    // need to do it here to make TypeScript happy.
+    this.sessionManager = sessionManager
+
+    if (!(options instanceof CredentialSession) && options.headers) {
+      for (const [key, value] of options.headers) {
+        this.setHeader(key, value)
       }
-
-      try {
-        await this.sessionManager.refreshSession()
-      } catch {
-        return initialRes
-      }
-
-      if (reqInit?.signal?.aborted) {
-        return initialRes
-      }
-
-      // The stream was already consumed. We cannot retry the request. A solution
-      // would be to tee() the input stream but that would bufferize the entire
-      // stream in memory which can lead to memory starvation. Instead, we will
-      // return the original response and let the calling code handle retries.
-      if (ReadableStream && reqInit.body instanceof ReadableStream) {
-        return initialRes
-      }
-
-      // Return initial "ExpiredToken" response if the session was not refreshed.
-      const updatedToken = this.session?.accessJwt
-      if (!updatedToken || updatedToken === initialToken) {
-        return initialRes
-      }
-
-      // Make sure the initial request is cancelled to avoid leaking resources
-      // (NodeJS 👀): https://undici.nodejs.org/#/?id=garbage-collection
-      await initialRes.body?.cancel()
-
-      // We need to re-compute the URI in case the PDS endpoint has changed
-      const updatedUri = new URL(url, this.dispatchUrl)
-      const updatedReq = new Request(updatedUri, reqInit)
-
-      updatedReq.headers.set('authorization', `Bearer ${updatedToken}`)
-
-      return await (0, this.sessionManager.fetch)(updatedReq)
-    })
-
-    if (options instanceof SessionManager) {
-      this.headers = new Map()
-      this.sessionManager = options
-    } else {
-      this.headers = new Map(options.headers)
-      this.sessionManager = new SessionManager(
-        new URL(options.service),
-        options.fetch,
-        options.persistSession,
-      )
     }
   }
 
@@ -125,36 +79,16 @@ export class AtpAgent extends Agent {
     return this.copyInto(new AtpAgent(this.sessionManager))
   }
 
-  copyInto<T extends Agent>(inst: T): T {
-    if (inst instanceof AtpAgent) {
-      for (const [key] of inst.headers) {
-        inst.unsetHeader(key)
-      }
-      for (const [key, value] of this.headers) {
-        inst.setHeader(key, value)
-      }
-    }
-    return super.copyInto(inst)
-  }
-
-  setHeader(key: string, value: Gettable<null | string>): void {
-    this.headers.set(key.toLowerCase(), value)
-  }
-
-  unsetHeader(key: string): void {
-    this.headers.delete(key.toLowerCase())
-  }
-
   get session() {
     return this.sessionManager.session
   }
 
   get hasSession() {
-    return !!this.session
+    return this.sessionManager.hasSession
   }
 
   get did() {
-    return this.session?.did
+    return this.sessionManager.did
   }
 
   get serviceUrl() {
@@ -166,7 +100,7 @@ export class AtpAgent extends Agent {
   }
 
   get dispatchUrl() {
-    return this.pdsUrl || this.serviceUrl
+    return this.sessionManager.dispatchUrl
   }
 
   /** @deprecated use {@link serviceUrl} instead */
@@ -186,7 +120,7 @@ export class AtpAgent extends Agent {
     )
   }
 
-  /** @deprecated This will be removed in OAuthAtpAgent */
+  /** @deprecated use {@link AtpAgent.serviceUrl} instead */
   getServiceUrl() {
     return this.serviceUrl
   }
@@ -216,23 +150,34 @@ export class AtpAgent extends Agent {
 }
 
 /**
- * Private class meant to be used by clones of {@link AtpAgent} so they can
- * share the same session across multiple instances (with different
- * proxying/labelers/headers options).
+ * Credentials (username / password) based session manager. Instances of this
+ * class will typically be used as the session manager for an {@link AtpAgent}.
+ * They can also be used with an {@link XrpcClient}, if you want to use you
+ * own Lexicons.
  */
-class SessionManager {
+export class CredentialSession implements SessionManager {
   public pdsUrl?: URL // The PDS URL, driven by the did doc
   public session?: AtpSessionData
   public refreshSessionPromise: Promise<void> | undefined
 
   /**
-   * Private {@link AtpBaseClient} used to perform session management API
+   * Private {@link ComAtprotoServerNS} used to perform session management API
    * calls on the service endpoint. Calls performed by this agent will not be
-   * authenticated using the user's session.
+   * authenticated using the user's session to allow proper manual configuration
+   * of the headers when performing session management operations.
    */
-  protected api = new AtpBaseClient((url, init) => {
-    return (0, this.fetch)(new URL(url, this.serviceUrl), init)
-  })
+  protected server = new ComAtprotoServerNS(
+    // Note that the use of the codegen "schemas" (to instantiate `this.api`),
+    // as well as the use of `ComAtprotoServerNS` will cause this class to
+    // reference (way) more code than it actually needs. It is not possible,
+    // with the current state of the codegen, to generate a client that only
+    // includes the methods that are actually used by this class. This is a
+    // known limitation that should be addressed in a future version of the
+    // codegen.
+    new XrpcClient((url, init) => {
+      return (0, this.fetch)(new URL(url, this.serviceUrl), init)
+    }, schemas),
+  )
 
   constructor(
     public readonly serviceUrl: URL,
@@ -240,6 +185,18 @@ class SessionManager {
     protected readonly persistSession?: AtpPersistSessionHandler,
   ) {}
 
+  get did() {
+    return this.session?.did
+  }
+
+  get dispatchUrl() {
+    return this.pdsUrl || this.serviceUrl
+  }
+
+  get hasSession() {
+    return !!this.session
+  }
+
   /**
    * Sets a WhatWG "fetch()" function to be used for making HTTP requests.
    */
@@ -247,6 +204,71 @@ class SessionManager {
     this.fetch = fetch
   }
 
+  async fetchHandler(url: string, init?: RequestInit): Promise<Response> {
+    // wait for any active session-refreshes to finish
+    await this.refreshSessionPromise
+
+    const initialUri = new URL(url, this.dispatchUrl)
+    const initialReq = new Request(initialUri, init)
+
+    const initialToken = this.session?.accessJwt
+    if (!initialToken || initialReq.headers.has('authorization')) {
+      return (0, this.fetch)(initialReq)
+    }
+
+    initialReq.headers.set('authorization', `Bearer ${initialToken}`)
+    const initialRes = await (0, this.fetch)(initialReq)
+
+    if (!this.session?.refreshJwt) {
+      return initialRes
+    }
+    const isExpiredToken = await isErrorResponse(
+      initialRes,
+      [400],
+      ['ExpiredToken'],
+    )
+
+    if (!isExpiredToken) {
+      return initialRes
+    }
+
+    try {
+      await this.refreshSession()
+    } catch {
+      return initialRes
+    }
+
+    if (init?.signal?.aborted) {
+      return initialRes
+    }
+
+    // The stream was already consumed. We cannot retry the request. A solution
+    // would be to tee() the input stream but that would bufferize the entire
+    // stream in memory which can lead to memory starvation. Instead, we will
+    // return the original response and let the calling code handle retries.
+    if (ReadableStream && init?.body instanceof ReadableStream) {
+      return initialRes
+    }
+
+    // Return initial "ExpiredToken" response if the session was not refreshed.
+    const updatedToken = this.session?.accessJwt
+    if (!updatedToken || updatedToken === initialToken) {
+      return initialRes
+    }
+
+    // Make sure the initial request is cancelled to avoid leaking resources
+    // (NodeJS 👀): https://undici.nodejs.org/#/?id=garbage-collection
+    await initialRes.body?.cancel()
+
+    // We need to re-compute the URI in case the PDS endpoint has changed
+    const updatedUri = new URL(url, this.dispatchUrl)
+    const updatedReq = new Request(updatedUri, init)
+
+    updatedReq.headers.set('authorization', `Bearer ${updatedToken}`)
+
+    return await (0, this.fetch)(updatedReq)
+  }
+
   /**
    * Create a new account and hydrate its session in this agent.
    */
@@ -255,7 +277,7 @@ class SessionManager {
     opts?: ComAtprotoServerCreateAccount.CallOptions,
   ): Promise<ComAtprotoServerCreateAccount.Response> {
     try {
-      const res = await this.api.com.atproto.server.createAccount(data, opts)
+      const res = await this.server.createAccount(data, opts)
       this.session = {
         accessJwt: res.data.accessJwt,
         refreshJwt: res.data.refreshJwt,
@@ -283,7 +305,7 @@ class SessionManager {
     opts: AtpAgentLoginOpts,
   ): Promise<ComAtprotoServerCreateSession.Response> {
     try {
-      const res = await this.api.com.atproto.server.createSession({
+      const res = await this.server.createSession({
         identifier: opts.identifier,
         password: opts.password,
         authFactorToken: opts.authFactorToken,
@@ -312,7 +334,7 @@ class SessionManager {
   async logout(): Promise<void> {
     if (this.session) {
       try {
-        await this.api.com.atproto.server.deleteSession(undefined, {
+        await this.server.deleteSession(undefined, {
           headers: {
             authorization: `Bearer ${this.session.accessJwt}`,
           },
@@ -335,7 +357,7 @@ class SessionManager {
     this.session = session
 
     try {
-      const res = await this.api.com.atproto.server
+      const res = await this.server
         .getSession(undefined, {
           headers: { authorization: `Bearer ${session.accessJwt}` },
         })
@@ -346,15 +368,14 @@ class SessionManager {
             session.refreshJwt
           ) {
             try {
-              const res = await this.api.com.atproto.server.refreshSession(
-                undefined,
-                { headers: { authorization: `Bearer ${session.refreshJwt}` } },
-              )
+              const res = await this.server.refreshSession(undefined, {
+                headers: { authorization: `Bearer ${session.refreshJwt}` },
+              })
 
               session.accessJwt = res.data.accessJwt
               session.refreshJwt = res.data.refreshJwt
 
-              return this.api.com.atproto.server.getSession(undefined, {
+              return this.server.getSession(undefined, {
                 headers: { authorization: `Bearer ${session.accessJwt}` },
               })
             } catch {
@@ -425,7 +446,7 @@ class SessionManager {
     }
 
     try {
-      const res = await this.api.com.atproto.server.refreshSession(undefined, {
+      const res = await this.server.refreshSession(undefined, {
         headers: { authorization: `Bearer ${this.session.refreshJwt}` },
       })
       // succeeded, update the session

package/src/client/lexicons.ts

@@ -6251,6 +6251,10 @@ export const schemaDict = {
                   'lex:app.bsky.feed.defs#blockedPost',
                 ],
               },
+              threadgate: {
+                type: 'ref',
+                ref: 'lex:app.bsky.feed.defs#threadgateView',
+              },
             },
           },
         },

package/src/client/types/app/bsky/feed/getPostThread.ts

@@ -25,6 +25,7 @@ export interface OutputSchema {
     | AppBskyFeedDefs.NotFoundPost
     | AppBskyFeedDefs.BlockedPost
     | { $type: string; [k: string]: unknown }
+  threadgate?: AppBskyFeedDefs.ThreadgateView
   [k: string]: unknown
 }
 

package/src/index.ts

@@ -25,10 +25,13 @@ export { LABELS, DEFAULT_LABEL_SETTINGS } from './moderation/const/labels'
 export { Agent } from './agent'
 
 export { AtpAgent, type AtpAgentOptions } from './atp-agent'
+export { CredentialSession } from './atp-agent'
 export { BskyAgent } from './bsky-agent'
 
-/** @deprecated */
-export { AtpAgent as default } from './atp-agent'
+export {
+  /** @deprecated */
+  AtpAgent as default,
+} from './atp-agent'
 
 // Expose a copy to prevent alteration of the internal Lexicon instance used by
 // the AtpBaseClient class.