@junejs/server 0.1.1 → 0.1.2-dev.1

package/dist/agent-durable.d.ts

@@ -1,5 +1,5 @@
 import { Channel, ChannelFactory } from "@junejs/core/agent-config";
-import { Model, Msg, SessionStore, Tool } from "@junejs/core/agent-runtime";
+import { InboundEvent, Model, Msg, SessionStore, Tool } from "@junejs/core/agent-runtime";
 import { Resources } from "@junejs/core/resources";
 //#region src/agent-durable.d.ts
 type SqlStorageValue = ArrayBuffer | string | number | null;
@@ -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;
 };
@@ -54,6 +57,7 @@ declare class AgentDurableObject {
   turn(input: {
     turnId?: string;
     userText: string;
+    event?: InboundEvent;
   }): Promise<string>;
   transcript(): import("@junejs/core/agent-runtime").Turn[];
   fetch(req: Request): Promise<Response>;

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();
@@ -85,10 +93,11 @@ var AgentDurableObject = class {
 	async fetch(req) {
 		const url = new URL(req.url);
 		if (req.method === "POST" && url.pathname.endsWith("/turn")) {
-			const { userText, turnId } = await req.json();
+			const { userText, turnId, event } = await req.json();
 			return Response.json({ text: await this.turn({
 				userText,
-				turnId
+				turnId,
+				event
 			}) });
 		}
 		if (url.pathname.endsWith("/transcript")) return Response.json({ transcript: this.transcript() });
@@ -128,14 +137,30 @@ function durableChannelSurface(getNamespace, opts) {
 			if (!namespace) throw new Error("durableChannelSurface: no Durable Object namespace bound (env.AGENT)");
 			const { text } = await (await durableFetch(namespace, opts.agentName, o?.session ?? "default", new Request("https://do/turn", {
 				method: "POST",
-				body: JSON.stringify({
-					userText: message,
-					turnId: o?.turnId
-				})
+				body: serializeTurn(message, o)
 			}))).json();
 			return text;
 		}
 	});
 }
+function serializeTurn(userText, o) {
+	const payload = {
+		userText,
+		turnId: o?.turnId,
+		event: o?.event
+	};
+	try {
+		return JSON.stringify(payload);
+	} catch {
+		const event = o?.event ? {
+			...o.event,
+			raw: void 0
+		} : void 0;
+		return JSON.stringify({
+			...payload,
+			event
+		});
+	}
+}
 //#endregion
 export { AgentDurableObject, DoSessionStore, durableAgentSurface, durableChannelSurface, durableFetch };

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;
@@ -154,7 +154,8 @@ function mountAgent(agent, runtime, opts = {}) {
 		agent,
 		run: (message, o) => runtime.session(agent.name, o?.session ?? "default").turn({
 			turnId: o?.turnId,
-			userText: message
+			userText: message,
+			event: o?.event
 		})
 	};
 	const channels = channelFetch(agent, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.1.1",
+  "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,8 +125,8 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@junejs/core": ">=0.1.0",
-    "@junejs/db": ">=0.0.33",
+    "@junejs/core": ">=0.1.1-dev.3",
+    "@junejs/db": ">=0.0.34-dev.0",
     "@momiji-rs/sparkdown": "^0.0.4",
     "lightningcss": "^1.27.0",
     "oxc-parser": "^0.137.0",

package/src/agent-durable.ts

@@ -22,6 +22,7 @@ import {
   type Model,
   type Msg,
   type Runtime,
+  type InboundEvent,
   type SessionStore,
   type Tool,
 } from "@junejs/core/agent-runtime";
@@ -152,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;
 };
@@ -181,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
@@ -190,7 +212,7 @@ export class AgentDurableObject {
   // Juno's batch-loader registry) can't leak across turns on a long-lived DO.
   // ensureScope() lazily wires node:async_hooks (workerd via nodejs_compat), as the
   // pipeline does; without it runInScope is a pass-through and ambient reads throw.
-  async turn(input: { turnId?: string; userText: string }): Promise<string> {
+  async turn(input: { turnId?: string; userText: string; event?: InboundEvent }): Promise<string> {
     await ensureScope();
     return runInScope({ resources: this.resources, services: this.services }, () => this.session.turn(input));
   }
@@ -202,8 +224,8 @@ export class AgentDurableObject {
   async fetch(req: Request): Promise<Response> {
     const url = new URL(req.url);
     if (req.method === "POST" && url.pathname.endsWith("/turn")) {
-      const { userText, turnId } = (await req.json()) as { userText: string; turnId?: string };
-      return Response.json({ text: await this.turn({ userText, turnId }) });
+      const { userText, turnId, event } = (await req.json()) as { userText: string; turnId?: string; event?: InboundEvent };
+      return Response.json({ text: await this.turn({ userText, turnId, event }) });
     }
     if (url.pathname.endsWith("/transcript")) return Response.json({ transcript: this.transcript() });
     return new Response("agent DO — POST /turn or GET /transcript", { status: 404 });
@@ -293,7 +315,7 @@ export function durableChannelSurface(
         namespace,
         opts.agentName,
         o?.session ?? "default",
-        new Request("https://do/turn", { method: "POST", body: JSON.stringify({ userText: message, turnId: o?.turnId }) }),
+        new Request("https://do/turn", { method: "POST", body: serializeTurn(message, o) }),
       );
       const { text } = (await res.json()) as { text: string };
       return text;
@@ -301,3 +323,19 @@ export function durableChannelSurface(
   };
   return channelDispatch(resolved, ctx);
 }
+
+// Serialize a turn for the /turn RPC body. InboundEvent.raw is `unknown` — the
+// untouched platform payload — so a (third-party) channel could attach something
+// JSON.stringify chokes on (a circular object, a BigInt). raw isn't needed to route or
+// run the turn, so on a serialization failure we drop it rather than let an
+// unserializable payload take down turn forwarding entirely. (raw is optional on
+// InboundEvent precisely because it may not survive this boundary.)
+function serializeTurn(userText: string, o?: { turnId?: string; event?: InboundEvent }): string {
+  const payload = { userText, turnId: o?.turnId, event: o?.event };
+  try {
+    return JSON.stringify(payload);
+  } catch {
+    const event = o?.event ? { ...o.event, raw: undefined } : undefined;
+    return JSON.stringify({ ...payload, event });
+  }
+}

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;
@@ -207,7 +207,7 @@ export function mountAgent(
   const ctx: ChannelContext = {
     agent,
     run: (message, o) =>
-      runtime.session(agent.name, o?.session ?? "default").turn({ turnId: o?.turnId, userText: message }),
+      runtime.session(agent.name, o?.session ?? "default").turn({ turnId: o?.turnId, userText: message, event: o?.event }),
   };
   const channels = channelFetch(agent, ctx);
   const surface = async (req: Request): Promise<Response | null> => {