@economic/agents 2.2.2 → 2.2.4

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
@@ -46,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;
@@ -84,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.
@@ -237,16 +235,31 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env & AgentEnv, Agen
   onStart(): void;
   onClose(): Promise<void>;
   onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
+  createChat(): Promise<string>;
+  deleteChat(id: string): Promise<void>;
+  getChats(): Promise<Chat[]>;
+  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;
   /**
    * 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 migrationBinding?: {
+  protected getMigrationBinding(_env: Cloudflare.Env & AgentEnv): {
     binding: DurableObjectNamespace;
     db: D1Database;
-  };
+  } | undefined;
   /** In-flight migration, shared across concurrent connections to this DO. */
   private _migrationPromise?;
   /**
@@ -257,21 +270,9 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env & AgentEnv, Agen
    */
   private ensureMigrated;
   private runMigration;
-  createChat(): Promise<string>;
-  deleteChat(id: string): Promise<void>;
-  getChats(): Promise<Chat[]>;
-  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
@@ -56,9 +55,6 @@ async function registerAgent(db, input) {
 }
 //#endregion
 //#region src/server/agents/Agent.ts
-function getCurrentToolContext() {
-	return getCurrentAgent().agent._lastBody;
-}
 var Agent = class extends Think {
 	initialState = {
 		status: "connecting",
@@ -156,12 +152,6 @@ var Agent = class extends Think {
 		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();
@@ -244,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.
@@ -572,51 +559,6 @@ var Assistant = class extends Agent$1 {
 			subAgentName: this.agent.name
 		});
 	}
-	/**
-	* 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.migrationBinding) return;
-		this._migrationPromise ??= this.runMigration().finally(() => {
-			this._migrationPromise = void 0;
-		});
-		await this._migrationPromise;
-	}
-	async runMigration() {
-		if (!this.migrationBinding) return;
-		try {
-			const result = await migrateUserFromV1({
-				sql: this.sql.bind(this),
-				db: this.migrationBinding.db,
-				userId: this.name,
-				durableObjectBinding: this.migrationBinding.binding,
-				createFacet: async (chatId) => {
-					return await this.subAgent(this.agent, chatId);
-				}
-			});
-			if (result.migrated > 0 || result.failed > 0) console.info("[Assistant] v1 -> v2 migration complete", {
-				userId: this.name,
-				...result
-			});
-		} catch (error) {
-			console.error("[Assistant] v1 -> v2 migration failed", {
-				userId: this.name,
-				error
-			});
-		}
-	}
 	@callable() async createChat() {
 		const id = nanoid();
 		const now = Date.now();
@@ -665,6 +607,52 @@ var Assistant = class extends Agent$1 {
 			console.error("[Assistant] Failed to register in agent_registry", error);
 		}
 	}
+	/**
+	* 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).
+	*/
+	getMigrationBinding(_env) {}
+	/** 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.getMigrationBinding(this.env)) return;
+		this._migrationPromise ??= this.runMigration().finally(() => {
+			this._migrationPromise = void 0;
+		});
+		await this._migrationPromise;
+	}
+	async runMigration() {
+		const migrationBinding = this.getMigrationBinding(this.env);
+		if (!migrationBinding) return;
+		try {
+			const result = await migrateUserFromV1({
+				sql: this.sql.bind(this),
+				db: migrationBinding.db,
+				userId: this.name,
+				durableObjectBinding: migrationBinding.binding,
+				createFacet: async (chatId) => {
+					return await this.subAgent(this.agent, chatId);
+				}
+			});
+			if (result.migrated > 0 || result.failed > 0) console.info("[Assistant] v1 -> v2 migration complete", {
+				userId: this.name,
+				...result
+			});
+		} catch (error) {
+			console.error("[Assistant] v1 -> v2 migration failed", {
+				userId: this.name,
+				error
+			});
+		}
+	}
 };
 //#endregion
 //#region src/server/features/messages.ts
@@ -787,4 +775,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.2",
+  "version": "2.2.4",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "bin": {