@economic/agents 2.2.1 → 2.2.3

package/README.md

@@ -92,6 +92,14 @@ export default {
   },
   "migrations": [{ "tag": "v1", "new_sqlite_classes": ["SupportAgent"] }],
   // see "Bindings"
+  "d1_databases": [
+    {
+      "binding": "AGENTS_DB",
+      "database_name": "agents",
+      "database_id": "agents",
+      "migrations_dir": "node_modules/@economic/agents/schema",
+    },
+  ],
   "r2_buckets": [{ "binding": "AGENTS_AUDIT_LOGS", "bucket_name": "agents-audit-logs" }],
   "analytics_engine_datasets": [{ "binding": "AGENTS_ANALYTICS", "dataset": "agents-analytics" }],
 }

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { n as JwtAuthConfig, t as routeAgentRequest } from "./route-agent-request-DmwIOBJS.mjs";
+import { Agent as Agent$1, Connection, ConnectionContext, SubAgentClass } from "agents";
 import { ChatResponseResult, Session, StepConfig, Think, ToolCallContext, ToolCallDecision, TurnConfig, TurnContext } from "@cloudflare/think";
 import { JSONValue, LanguageModel, Tool as Tool$1, UIMessage } from "ai";
-import { Agent as Agent$1, Connection, ConnectionContext, SubAgentClass } from "agents";
 //#region src/server/types.d.ts
 /**
  * The context object available throughout an agent's lifetime — passed via
@@ -13,10 +13,11 @@ type ToolContext<RequestContext extends Record<string, unknown> = Record<string,
   _userContext?: UserContext;
 };
 interface AgentEnv {
-  AGENT_DB: D1Database;
+  AGENTS_DB: D1Database;
   AGENTS_AUDIT_LOGS: R2Bucket;
   AGENTS_ANALYTICS: AnalyticsEngineDataset;
   SKILLS_BUCKET: R2Bucket;
+  LOCAL_AGENT_DB?: D1Database;
 }
 type SqlFn = InstanceType<typeof Agent$1>["sql"];
 type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized";
@@ -45,7 +46,6 @@ interface Skill<Context extends Record<string, unknown> = Record<string, unknown
 declare function skill<Context extends Record<string, unknown> = Record<string, unknown>>(definition: Skill<Context>): Skill<Context>;
 //#endregion
 //#region src/server/agents/Agent.d.ts
-declare function getCurrentToolContext(): any;
 declare abstract class Agent<RequestContext extends Record<string, unknown> = Record<string, unknown>, UserContext extends Record<string, unknown> = Record<string, unknown>> extends Think<Cloudflare.Env & AgentEnv, AgentConnectionState> {
   initialState: AgentConnectionState;
   protected clientIp?: string;
@@ -57,10 +57,10 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
   protected getParentAgent<T extends Agent$1>(): T | undefined;
   abstract getModel(ctx?: ToolContext<RequestContext, UserContext>): LanguageModel;
   abstract getSystemPrompt(ctx?: ToolContext<RequestContext, UserContext>): string;
-  configureSession(session: Session): Session;
   onStart(): Promise<void>;
   onClose(): Promise<void>;
   onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
+  configureSession(session: Session): Session;
   /**
    * Merges the client request `body` into `experimental_context` for tools
    * returned from {@link getTools} only (Think-internal tools are unchanged).
@@ -83,7 +83,6 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    * Returns the remote skills to be loaded from SKILLS_BUCKET.
    * @returns The remote skills to be loaded from SKILLS_BUCKET.
    */
-  protected getRemoteSkills(): string[];
   /**
    * Returns the skills to load for the agent.
    * @returns The skills to load for the agent.
@@ -116,6 +115,16 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    * @param jwtToken - A valid JWT token following authentication.
    */
   protected getUserContext?(jwtToken: string): Promise<UserContext>;
+  /**
+   * Self-registers this DO in the global `agent_registry`. Only top-level DOs
+   * are registered — facets are enumerable via their parent's own index, so
+   * registering them would explode the row count and duplicate that index.
+   *
+   * Best-effort and idempotent: called once per cold start from `onStart`, the
+   * insert no-ops on conflict. A failed write is simply retried on the next
+   * cold start, so registration is not allowed to block the connection.
+   */
+  protected registerInstance(): Promise<void>;
 }
 //#endregion
 //#region src/server/features/messages.d.ts
@@ -152,9 +161,7 @@ type MigrationDeps = {
   /** The `Assistant` DO's bound `sql` tag (used to register migrated chats). */sql: SqlFn; /** Shared D1 database holding v1 `conversations` and `message_ratings`. */
   db: D1Database; /** The user being migrated (the `Assistant` DO name). */
   userId: string; /** Resolves a v1 chat DO stub by its `userId:chatId` name. */
-  legacyNamespace: {
-    getByName(name: string): LegacyChatStub;
-  }; /** Creates (or resolves) a v2 chat facet for the given chat id and returns its stub. */
+  durableObjectBinding: DurableObjectNamespace; /** Creates (or resolves) a v2 chat facet for the given chat id and returns its stub. */
   createFacet: (chatId: string) => Promise<FacetStub>;
 };
 /**
@@ -221,22 +228,25 @@ type Chat = {
 declare const DELETE_CHAT_CALLBACK: "deleteChatCallback";
 //#endregion
 //#region src/server/agents/Assistant.d.ts
-declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnectionState> {
+declare abstract class Assistant extends Agent$1<Cloudflare.Env & AgentEnv, AgentConnectionState> {
   initialState: AgentConnectionState;
   protected abstract agent: SubAgentClass<ChatAgent>;
   protected abstract fastModel: LanguageModel;
+  onStart(): void;
+  onClose(): Promise<void>;
+  onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   /**
-   * Binding name of the legacy v1 chat Durable Object class, used to migrate a
+   * Binding of the legacy v1 chat Durable Object class, used to migrate a
    * user's v1 chats into facets the first time they connect. Set this on the
    * concrete subclass to enable lazy v1 -> v2 migration; leave undefined to
    * disable it (e.g. for greenfield deployments with no v1 data).
    */
-  protected legacyBinding?: keyof Cloudflare.Env;
+  protected migrationBinding?: {
+    binding: DurableObjectNamespace;
+    db: D1Database;
+  };
   /** In-flight migration, shared across concurrent connections to this DO. */
   private _migrationPromise?;
-  onStart(): void;
-  onClose(): Promise<void>;
-  onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   /**
    * Runs the lazy v1 -> v2 migration for this user. Concurrent connections to
    * this DO share a single in-flight run. Idempotency across runs/restarts is
@@ -251,6 +261,18 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnection
   recordChatTurn(durableObjectName: string, messages: UIMessage[]): Promise<void>;
   private [DELETE_CHAT_CALLBACK];
   private scheduleChatForAutoDeletion;
+  /**
+   * Self-registers this Assistant in the global `agent_registry`. An Assistant
+   * is a top-level DO keyed directly by user id, so the DO name *is* the actor.
+   *
+   * Runs pre-auth in onStart (the DO has already persisted state by this point,
+   * so it must be tracked regardless of whether auth later succeeds).
+   * Best-effort and idempotent: no-ops on conflict, retried on the next start.
+   */
+  private registerInstance;
 }
 //#endregion
+//#region src/server/index.d.ts
+declare function getCurrentToolContext(): any;
+//#endregion
 export { Agent, type AgentConnectionState, type AgentConnectionStatus, type AgentConnectionType, type AgentEnv, Assistant, ChatAgent, type FacetStub, type LegacyChatStub, type LegacyMessageFeedback, type MigrationDeps, type Skill, type Tool, type ToolContext, type ToolSet, getCurrentToolContext, migrateUserFromV1, routeAgentRequest, skill, tool };

package/dist/index.mjs

@@ -1,8 +1,7 @@
 import { i as verifyJwt, n as createAgentTracer, r as extractTokenFromConnectRequest, t as routeAgentRequest } from "./route-agent-request-DKDvDYnR.mjs";
+import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
 import { Think } from "@cloudflare/think";
 import { Output, convertToModelMessages, generateText, jsonSchema, pruneMessages, tool as tool$1 } from "ai";
-import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
-import { R2SkillProvider } from "agents/experimental/memory/session";
 import { nanoid } from "nanoid";
 import { createCompactFunction } from "agents/experimental/memory/utils";
 //#region src/server/util/tools.ts
@@ -42,10 +41,20 @@ var LocalSkillProvider = class {
 	}
 };
 //#endregion
-//#region src/server/agents/Agent.ts
-function getCurrentToolContext() {
-	return getCurrentAgent().agent._lastBody;
+//#region src/server/features/registry.ts
+/**
+* Registers a top-level DO in the global registry.
+*
+* Idempotent: keyed on `(agent_name, durable_object_name)`, so repeated calls
+* across cold starts no-op and `created_at` reflects the first registration.
+*/
+async function registerAgent(db, input) {
+	await db.prepare(`INSERT INTO agent_registry (agent_name, durable_object_name, actor_id, created_at)
+       VALUES (?, ?, ?, ?)
+       ON CONFLICT (agent_name, durable_object_name) DO NOTHING`).bind(input.agentName, input.durableObjectName, input.actorId, input.createdAt).run();
 }
+//#endregion
+//#region src/server/agents/Agent.ts
 var Agent = class extends Think {
 	initialState = {
 		status: "connecting",
@@ -66,26 +75,16 @@ var Agent = class extends Think {
 			if (parent) return this.env[parent.className]?.getByName(parent.name);
 		}
 	}
-	configureSession(session) {
-		let configuredSession = session.withContext("soul", { provider: { get: async () => {
-			return this.getSystemPrompt(this._requestContext !== void 0 ? this._buildToolContext() : void 0);
-		} } }).withContext("critical-rules", { provider: { get: async () => SECURITY_RULES_PROMPT } }).withContext("turn-protocol-rules", { provider: { get: async () => TURN_PROTOCOL_RULES_PROMPT } });
-		const remoteSkills = this.getRemoteSkills();
-		if (remoteSkills.length) if (this.env.SKILLS_BUCKET) configuredSession = configuredSession.withContext("skills", { provider: new R2SkillProvider(this.env.SKILLS_BUCKET, {
-			prefix: "skills/",
-			keys: remoteSkills
-		}) });
-		else console.error("[Agent] Connection rejected: Remote skills defined, but no SKILLS_BUCKET R2 binding found");
-		const localSkills = this.getSkills();
-		if (localSkills.length) configuredSession = configuredSession.withContext("local-skills", { provider: new LocalSkillProvider(localSkills) });
-		return configuredSession.withCachedPrompt();
-	}
 	async onStart() {
 		this.setState({
 			...this.initialState,
 			status: "connecting"
 		});
 		let hasCorrectBindings = true;
+		if (!this.env.AGENTS_DB) {
+			hasCorrectBindings = false;
+			console.warn("[Agent] Connection rejected: no AGENTS_DB bound. Agents database is required for registration.");
+		}
 		if (!this.env.AGENTS_AUDIT_LOGS) {
 			hasCorrectBindings = false;
 			console.error("[Agent] Connection rejected: no AGENTS_AUDIT_LOGS bound. Audit logs are required.");
@@ -98,6 +97,7 @@ var Agent = class extends Think {
 			});
 			throw new Error("Could not connect to agent, bindings not found");
 		}
+		this.registerInstance();
 	}
 	async onClose() {
 		this.setState({
@@ -148,6 +148,14 @@ var Agent = class extends Think {
 			status: "connected"
 		});
 	}
+	configureSession(session) {
+		let configuredSession = session.withContext("soul", { provider: { get: async () => {
+			return this.getSystemPrompt(this._requestContext !== void 0 ? this._buildToolContext() : void 0);
+		} } }).withContext("critical-rules", { provider: { get: async () => SECURITY_RULES_PROMPT } }).withContext("turn-protocol-rules", { provider: { get: async () => TURN_PROTOCOL_RULES_PROMPT } });
+		const localSkills = this.getSkills();
+		if (localSkills.length) configuredSession = configuredSession.withContext("local-skills", { provider: new LocalSkillProvider(localSkills) });
+		return configuredSession.withCachedPrompt();
+	}
 	/**
 	* Merges the client request `body` into `experimental_context` for tools
 	* returned from {@link getTools} only (Think-internal tools are unchanged).
@@ -226,9 +234,6 @@ var Agent = class extends Think {
 	* Returns the remote skills to be loaded from SKILLS_BUCKET.
 	* @returns The remote skills to be loaded from SKILLS_BUCKET.
 	*/
-	getRemoteSkills() {
-		return [];
-	}
 	/**
 	* Returns the skills to load for the agent.
 	* @returns The skills to load for the agent.
@@ -268,6 +273,28 @@ var Agent = class extends Think {
 	* Define getUserContext to set a user context.
 	*/
 	_userContext;
+	/**
+	* Self-registers this DO in the global `agent_registry`. Only top-level DOs
+	* are registered — facets are enumerable via their parent's own index, so
+	* registering them would explode the row count and duplicate that index.
+	*
+	* Best-effort and idempotent: called once per cold start from `onStart`, the
+	* insert no-ops on conflict. A failed write is simply retried on the next
+	* cold start, so registration is not allowed to block the connection.
+	*/
+	async registerInstance() {
+		if (this.parentPath.length > 0) return;
+		try {
+			await registerAgent(this.env.AGENTS_DB, {
+				agentName: this.constructor.name,
+				durableObjectName: this.name,
+				actorId: this.getActorIdFromDurableObjectName(),
+				createdAt: Date.now()
+			});
+		} catch (error) {
+			console.error("[Agent] Failed to register in agent_registry", error);
+		}
+	}
 };
 //#endregion
 //#region src/server/features/chats.ts
@@ -423,14 +450,14 @@ function toEpochMs(value) {
 * remain as a backstop until then.
 */
 async function migrateUserFromV1(deps) {
-	const { sql, db, userId, legacyNamespace, createFacet } = deps;
+	const { sql, db, userId, durableObjectBinding, createFacet } = deps;
 	const conversations = await listLegacyConversations(db, userId);
 	let migrated = 0;
 	let failed = 0;
 	for (const conversation of conversations) {
 		const legacyName = conversation.durable_object_name;
 		try {
-			const { messages } = await legacyNamespace.getByName(legacyName).exportForMigration();
+			const { messages } = await durableObjectBinding.getByName(legacyName).exportForMigration();
 			const feedback = await listLegacyFeedback(db, legacyName);
 			const newChatId = nanoid();
 			const facet = await createFacet(newChatId);
@@ -463,15 +490,6 @@ var Assistant = class extends Agent$1 {
 		status: "connecting",
 		type: "assistant"
 	};
-	/**
-	* Binding name of the legacy v1 chat Durable Object class, used to migrate a
-	* user's v1 chats into facets the first time they connect. Set this on the
-	* concrete subclass to enable lazy v1 -> v2 migration; leave undefined to
-	* disable it (e.g. for greenfield deployments with no v1 data).
-	*/
-	legacyBinding;
-	/** In-flight migration, shared across concurrent connections to this DO. */
-	_migrationPromise;
 	onStart() {
 		this.setState({
 			...this.initialState,
@@ -479,6 +497,19 @@ var Assistant = class extends Agent$1 {
 			subAgentName: this.agent.name
 		});
 		ensureChatsTableExists(this.sql.bind(this));
+		let hasCorrectBindings = true;
+		if (!this.env.AGENTS_DB) {
+			hasCorrectBindings = false;
+			console.warn("[Agent] Connection rejected: no AGENTS_DB bound. Agents database is required for registration.");
+		}
+		if (!hasCorrectBindings) {
+			this.setState({
+				...this.initialState,
+				status: "disconnected"
+			});
+			throw new Error("Could not connect to agent, bindings not found");
+		}
+		this.registerInstance();
 	}
 	async onClose() {
 		this.setState({
@@ -529,30 +560,35 @@ var Assistant = class extends Agent$1 {
 		});
 	}
 	/**
+	* Binding of the legacy v1 chat Durable Object class, used to migrate a
+	* user's v1 chats into facets the first time they connect. Set this on the
+	* concrete subclass to enable lazy v1 -> v2 migration; leave undefined to
+	* disable it (e.g. for greenfield deployments with no v1 data).
+	*/
+	migrationBinding;
+	/** In-flight migration, shared across concurrent connections to this DO. */
+	_migrationPromise;
+	/**
 	* Runs the lazy v1 -> v2 migration for this user. Concurrent connections to
 	* this DO share a single in-flight run. Idempotency across runs/restarts is
 	* handled by `migrateUserFromV1` deleting each chat's v1 `conversations` row,
 	* so an already-migrated chat is never re-enumerated.
 	*/
 	async ensureMigrated() {
-		if (!this.legacyBinding) return;
+		if (!this.migrationBinding) return;
 		this._migrationPromise ??= this.runMigration().finally(() => {
 			this._migrationPromise = void 0;
 		});
 		await this._migrationPromise;
 	}
 	async runMigration() {
-		const legacyNamespace = this.env[this.legacyBinding];
-		if (!legacyNamespace?.getByName) {
-			console.error("[Assistant] Migration skipped: legacy binding not found", { legacyBinding: this.legacyBinding });
-			return;
-		}
+		if (!this.migrationBinding) return;
 		try {
 			const result = await migrateUserFromV1({
 				sql: this.sql.bind(this),
-				db: this.env.AGENT_DB,
+				db: this.migrationBinding.db,
 				userId: this.name,
-				legacyNamespace,
+				durableObjectBinding: this.migrationBinding.binding,
 				createFacet: async (chatId) => {
 					return await this.subAgent(this.agent, chatId);
 				}
@@ -596,6 +632,26 @@ var Assistant = class extends Agent$1 {
 		await Promise.all(scheduleIds.map((scheduleId) => this.cancelSchedule(scheduleId)));
 		await this.schedule(new Date(Date.now() + retentionMs), DELETE_CHAT_CALLBACK, durableObjectName, { idempotent: true });
 	}
+	/**
+	* Self-registers this Assistant in the global `agent_registry`. An Assistant
+	* is a top-level DO keyed directly by user id, so the DO name *is* the actor.
+	*
+	* Runs pre-auth in onStart (the DO has already persisted state by this point,
+	* so it must be tracked regardless of whether auth later succeeds).
+	* Best-effort and idempotent: no-ops on conflict, retried on the next start.
+	*/
+	async registerInstance() {
+		try {
+			await registerAgent(this.env.AGENTS_DB, {
+				agentName: this.constructor.name,
+				durableObjectName: this.name,
+				actorId: this.name,
+				createdAt: Date.now()
+			});
+		} catch (error) {
+			console.error("[Assistant] Failed to register in agent_registry", error);
+		}
+	}
 };
 //#endregion
 //#region src/server/features/messages.ts
@@ -718,4 +774,9 @@ function skill(definition) {
 	return definition;
 }
 //#endregion
+//#region src/server/index.ts
+function getCurrentToolContext() {
+	return getCurrentAgent().agent._lastBody;
+}
+//#endregion
 export { Agent, Assistant, ChatAgent, getCurrentToolContext, migrateUserFromV1, routeAgentRequest, skill, tool };

package/dist/v1.d.mts

@@ -1,6 +1,6 @@
 import { n as JwtAuthConfig, t as routeAgentRequest } from "./route-agent-request-DmwIOBJS.mjs";
-import { LanguageModel, StreamTextOnFinishCallback, ToolSet, UIMessage, generateText, streamText } from "ai";
 import { Agent as Agent$1, Connection, ConnectionContext } from "agents";
+import { LanguageModel, StreamTextOnFinishCallback, ToolSet, UIMessage, generateText, streamText } from "ai";
 import { AIChatAgent, ChatResponseResult, OnChatMessageOptions } from "@cloudflare/ai-chat";
 
 //#region src/server/features/skills/index.d.ts

package/dist/v1.mjs

@@ -1,6 +1,6 @@
 import { i as verifyJwt, n as createAgentTracer, r as extractTokenFromConnectRequest, t as routeAgentRequest } from "./route-agent-request-DKDvDYnR.mjs";
-import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
+import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 import { AIChatAgent } from "@cloudflare/ai-chat";
 //#region src/server/features/skills/index.ts
 const TOOL_NAME_ACTIVATE_SKILL = "activate_skill";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "bin": {

package/schema/0001_v2_release.sql

@@ -0,0 +1,18 @@
+-- ─── Agents registry ────────────────────────────────────────────────────────────
+-- A directory of every top-level Durable Object in the system. DOs cannot be
+-- enumerated via the runtime, so each top-level DO self-registers here on
+-- creation (facets are omitted — they are enumerable via their parent's own
+-- index). Source of truth for "what exists" and "all DOs for a given user".
+-- Distinct from the audit/analytics event stream, which records "what happened".
+
+CREATE TABLE IF NOT EXISTS agent_registry (
+  agent_name            TEXT NOT NULL,
+  durable_object_name   TEXT NOT NULL,
+  actor_id              TEXT NOT NULL,
+  created_at            INTEGER NOT NULL,
+
+  PRIMARY KEY (agent_name, durable_object_name)
+);
+
+CREATE INDEX IF NOT EXISTS agent_registry_actor ON agent_registry(actor_id);
+CREATE INDEX IF NOT EXISTS agent_registry_class ON agent_registry(agent_name);

package/schema/agent/0001_initial.sql

@@ -1,12 +0,0 @@
--- ─── Audit logging ────────────────────────────────────────────────────────────
-
-CREATE TABLE IF NOT EXISTS audit_events (
-  id                  TEXT PRIMARY KEY,
-  durable_object_name TEXT NOT NULL,
-  message             TEXT NOT NULL,
-  payload             TEXT,
-  created_at          TEXT NOT NULL
-);
-
-CREATE INDEX IF NOT EXISTS audit_events_do   ON audit_events(durable_object_name);
-CREATE INDEX IF NOT EXISTS audit_events_ts   ON audit_events(created_at);