@junejs/server 0.1.2-dev.0 → 0.1.2-dev.1

package/dist/agent-durable.d.ts

@@ -43,6 +43,9 @@ type DoAgentDef = {
   model: Model;
   tools: Tool[];
   instructions?: string;
+  channelInstructions?: Record<string, string>;
+  channels?: (Channel | ChannelFactory)[];
+  env?: unknown;
   resources?: Resources;
   services?: unknown;
 };

package/dist/agent-durable.js

@@ -70,7 +70,15 @@ var AgentDurableObject = class {
 		const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
 		this.resources = def.resources ?? {};
 		this.services = def.services;
-		this.session = new AgentSession(def.name ?? "agent", "self", store, new InProcBroadcaster(), model, def.tools, crossDoUnsupported);
+		const channelTools = (def.channels ?? []).flatMap((c) => resolveChannel(c, def.env).tools?.() ?? []);
+		const tools = [...def.tools];
+		const seen = new Set(tools.map((t) => t.spec.name));
+		for (const t of channelTools) {
+			if (seen.has(t.spec.name)) throw new Error(`AgentDurableObject(${def.name ?? "agent"}): duplicate tool name "${t.spec.name}" from a channel — rename so dispatch is unambiguous.`);
+			seen.add(t.spec.name);
+			tools.push(t);
+		}
+		this.session = new AgentSession(def.name ?? "agent", "self", store, new InProcBroadcaster(), model, tools, crossDoUnsupported, def.channelInstructions);
 	}
 	async turn(input) {
 		await ensureScope();

package/dist/agent-native.d.ts

@@ -6,6 +6,7 @@ type AgentDef = {
   model: Model;
   tools: Tool[];
   instructions?: string;
+  channelInstructions?: Record<string, string>;
 };
 declare class NativeRuntime implements Runtime {
   private actors;

package/dist/agent-native.js

@@ -81,7 +81,7 @@ var NativeRuntime = class {
 			const def = this.agents[agent];
 			if (!def) throw new Error(`unknown agent: ${agent}`);
 			const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
-			a = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), new InProcBroadcaster(), model, def.tools, this);
+			a = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), new InProcBroadcaster(), model, def.tools, this, def.channelInstructions);
 			this.actors.set(key, a);
 		}
 		return a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.1.2-dev.0",
+  "version": "0.1.2-dev.1",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -125,7 +125,7 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@junejs/core": ">=0.1.1-dev.0",
+    "@junejs/core": ">=0.1.1-dev.3",
     "@junejs/db": ">=0.0.34-dev.0",
     "@momiji-rs/sparkdown": "^0.0.4",
     "lightningcss": "^1.27.0",

package/src/agent-durable.ts

@@ -153,6 +153,16 @@ export type DoAgentDef = {
   model: Model;
   tools: Tool[];
   instructions?: string;
+  // Per-channel-source system overlays (see AgentDefinition.channelInstructions) — the
+  // shared agent branches by real inbound source, no userText marker.
+  channelInstructions?: Record<string, string>;
+  // Channels whose CAPABILITY tools should be available to this session's turns. Their
+  // tools are built HERE, in the DO isolate, from `env` — because a channel's tool `run`
+  // is a closure (over the bot token, etc.) that can't cross the worker→DO RPC. This is
+  // the edge equivalent of defineAgent merging channel.tools() on native: pass the same
+  // channel factories you mount on the worker, plus this DO's env.
+  channels?: (Channel | ChannelFactory)[];
+  env?: unknown;
   resources?: Resources;
   services?: unknown;
 };
@@ -182,7 +192,18 @@ export class AgentDurableObject {
     const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
     this.resources = def.resources ?? {};
     this.services = def.services;
-    this.session = new AgentSession(def.name ?? "agent", "self", store, new InProcBroadcaster(), model, def.tools, crossDoUnsupported);
+    // Merge the mounted channels' capability tools (built here from this DO's env, since a
+    // tool's `run` closure can't cross the RPC). The cross-channel source gate on each tool
+    // keeps a Slack tool inert during a Crisp turn, so merging all of them is safe.
+    const channelTools = (def.channels ?? []).flatMap((c) => resolveChannel(c, def.env).tools?.() ?? []);
+    const tools: Tool[] = [...def.tools];
+    const seen = new Set(tools.map((t) => t.spec.name));
+    for (const t of channelTools) {
+      if (seen.has(t.spec.name)) throw new Error(`AgentDurableObject(${def.name ?? "agent"}): duplicate tool name "${t.spec.name}" from a channel — rename so dispatch is unambiguous.`);
+      seen.add(t.spec.name);
+      tools.push(t);
+    }
+    this.session = new AgentSession(def.name ?? "agent", "self", store, new InProcBroadcaster(), model, tools, crossDoUnsupported, def.channelInstructions);
   }
   // Run the whole turn inside a request scope seeded from this DO's env, so ambient
   // `db`/`kv`/`blob` and `currentServices()` resolve inside a tool exactly as in a

package/src/agent-native.ts

@@ -85,7 +85,7 @@ class InProcBroadcaster implements Broadcaster {
 
 // `instructions` (the agent's system prompt) is injected into the model per turn
 // by the runtime (withSystem) — single-sourced on the def, not baked into `model`.
-export type AgentDef = { model: Model; tools: Tool[]; instructions?: string };
+export type AgentDef = { model: Model; tools: Tool[]; instructions?: string; channelInstructions?: Record<string, string> };
 
 // The native Runtime: a registry of agent definitions over one SQLite handle,
 // handing out (and memoizing) an AgentSession actor per (agent, id).
@@ -107,7 +107,7 @@ export class NativeRuntime implements Runtime {
       const def = this.agents[agent];
       if (!def) throw new Error(`unknown agent: ${agent}`);
       const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
-      a = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), new InProcBroadcaster(), model, def.tools, this);
+      a = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), new InProcBroadcaster(), model, def.tools, this, def.channelInstructions);
       this.actors.set(key, a);
     }
     return a;