@junejs/server 1.0.0-dev.19 → 1.0.0-dev.24

package/dist/adapter-DcZ-W1-7.d.ts

@@ -0,0 +1,62 @@
+import { JuneConfig } from "@junejs/core/config";
+//#region src/adapter.d.ts
+type AdapterCapabilities = {
+  runtime: "edge" | "node" | "serverless" | "native" | "static";
+  persistentConnections: boolean;
+  assets: "platform" | "server" | "none";
+  durableObjects?: boolean;
+};
+type AdapterEntry = {
+  imports: string[];
+  wrap(pipelineVar: string): string;
+};
+type ResourcePlan = {
+  db?: {
+    binding: string;
+    databaseName: string;
+  };
+  agent?: {
+    binding: string;
+    className: string;
+  };
+};
+type AdapterEmitContext = {
+  appRoot: string;
+  outDir: string;
+  hasAssets: boolean;
+  linkHeader: string | null;
+  config: JuneConfig;
+  plan: ResourcePlan;
+  defaultName: string;
+  publicFiles?: string[];
+};
+interface JuneAdapter {
+  readonly name: string;
+  readonly capabilities: AdapterCapabilities;
+  readonly conditions: string[];
+  readonly buildExternal?: string[];
+  validate?(ctx: {
+    plan: ResourcePlan;
+    config: JuneConfig;
+  }): void;
+  entry(opts: {
+    linkHeader: string | null;
+  }): AdapterEntry;
+  emit(ctx: AdapterEmitContext): Promise<void>;
+}
+declare function hasDurableBinding(text: string, file: string, binding: string, className: string): boolean;
+declare function workers(opts?: {
+  name?: string;
+  domain?: string;
+}): JuneAdapter;
+declare function vercel(opts?: {
+  runtime?: "node" | "edge";
+  regions?: string[];
+}): JuneAdapter;
+declare function deno(opts?: {
+  org?: string;
+  app?: string;
+}): JuneAdapter;
+declare function staticSite(): JuneAdapter;
+//#endregion
+export { ResourcePlan as a, staticSite as c, JuneAdapter as i, vercel as l, AdapterEmitContext as n, deno as o, AdapterEntry as r, hasDurableBinding as s, AdapterCapabilities as t, workers as u };

package/dist/adapter.d.ts

@@ -1,62 +1,2 @@
-import { JuneConfig } from "@junejs/core/config";
-//#region src/adapter.d.ts
-type AdapterCapabilities = {
-  runtime: "edge" | "node" | "serverless" | "native" | "static";
-  persistentConnections: boolean;
-  assets: "platform" | "server" | "none";
-  durableObjects?: boolean;
-};
-type AdapterEntry = {
-  imports: string[];
-  wrap(pipelineVar: string): string;
-};
-type ResourcePlan = {
-  db?: {
-    binding: string;
-    databaseName: string;
-  };
-  agent?: {
-    binding: string;
-    className: string;
-  };
-};
-type AdapterEmitContext = {
-  appRoot: string;
-  outDir: string;
-  hasAssets: boolean;
-  linkHeader: string | null;
-  config: JuneConfig;
-  plan: ResourcePlan;
-  defaultName: string;
-  publicFiles?: string[];
-};
-interface JuneAdapter {
-  readonly name: string;
-  readonly capabilities: AdapterCapabilities;
-  readonly conditions: string[];
-  readonly buildExternal?: string[];
-  validate?(ctx: {
-    plan: ResourcePlan;
-    config: JuneConfig;
-  }): void;
-  entry(opts: {
-    linkHeader: string | null;
-  }): AdapterEntry;
-  emit(ctx: AdapterEmitContext): Promise<void>;
-}
-declare function hasDurableBinding(text: string, file: string, binding: string, className: string): boolean;
-declare function workers(opts?: {
-  name?: string;
-  domain?: string;
-}): JuneAdapter;
-declare function vercel(opts?: {
-  runtime?: "node" | "edge";
-  regions?: string[];
-}): JuneAdapter;
-declare function deno(opts?: {
-  org?: string;
-  app?: string;
-}): JuneAdapter;
-declare function staticSite(): JuneAdapter;
-//#endregion
+import { a as ResourcePlan, c as staticSite, i as JuneAdapter, l as vercel, n as AdapterEmitContext, o as deno, r as AdapterEntry, s as hasDurableBinding, t as AdapterCapabilities, u as workers } from "./adapter-DcZ-W1-7.js";
 export { AdapterCapabilities, AdapterEmitContext, AdapterEntry, JuneAdapter, ResourcePlan, deno, hasDurableBinding, staticSite, vercel, workers };

package/dist/agent-durable.js

@@ -1,3 +1,4 @@
+import { observeTurnEvents } from "./turn-events.js";
 import { isolateLocal } from "./isolate-local.js";
 import { assertCoreRuntimeVersion } from "./core-version.js";
 import { DeliverUnsupportedError, actionToTool, channelDispatch, resolveChannel } from "@junejs/core/agent-config";
@@ -373,49 +374,6 @@ function sseTurnStream(session, turnId) {
 		}
 	});
 }
-function observeTurnEvents(session, turnId) {
-	const queue = [];
-	let terminal = false;
-	let notify;
-	const unsub = session.observe((e) => {
-		queue.push(e);
-		if (e.type === "turn.completed" || e.type === "turn.failed" || e.type === "turn.cancelled" || e.type === "input.requested") terminal = true;
-		notify?.();
-	}, { turnId });
-	return { [Symbol.asyncIterator]() {
-		return {
-			async next() {
-				for (;;) {
-					const e = queue.shift();
-					if (e) return {
-						value: e,
-						done: false
-					};
-					if (terminal) {
-						unsub();
-						return {
-							value: void 0,
-							done: true
-						};
-					}
-					await new Promise((resolve) => {
-						notify = resolve;
-					});
-					notify = void 0;
-				}
-			},
-			async return() {
-				unsub();
-				terminal = true;
-				queue.length = 0;
-				return {
-					value: void 0,
-					done: true
-				};
-			}
-		};
-	} };
-}
 async function sseTurnFinalText(res) {
 	const ct = res.headers.get("content-type") ?? "";
 	if (!res.body || !ct.includes("text/event-stream")) {

package/dist/agent-native.d.ts

@@ -1,32 +1,42 @@
 import { SyncSqlite } from "./sqlite-driver.js";
 import { AgentDefinition, ChannelContext } from "@junejs/core/agent-config";
-import { AgentSession, Model, Runtime, Tool } from "@junejs/core/agent-runtime";
+import { AgentSession, ChannelPolicy, Model, Runtime, Tool } from "@junejs/core/agent-runtime";
 //#region src/agent-native.d.ts
 type AgentDef = {
   model: Model;
   tools: Tool[];
   instructions?: string;
-  channelInstructions?: Record<string, string>;
+  channelInstructions?: Record<string, string | ChannelPolicy>;
+};
+declare function toAgentDef(agent: AgentDefinition, model: Model): AgentDef;
+type NativeRuntimeOptions = {
+  maxSessions?: number;
 };
 declare class NativeRuntime implements Runtime {
   private actors;
   private readonly agents;
   private readonly db;
-  constructor(agents: Record<string, AgentDef>, db: SyncSqlite);
+  private readonly maxSessions;
+  constructor(agents: Record<string, AgentDef>, db: SyncSqlite, opts?: NativeRuntimeOptions);
+  agentDef(name: string): AgentDef | undefined;
   session(agent: string, id: string): AgentSession;
+  get sessionCount(): number;
+  private evictIdle;
 }
-declare function createNativeRuntime(agents: Record<string, AgentDef>, path?: string): Promise<NativeRuntime>;
+declare function createNativeRuntime(agents: Record<string, AgentDef>, path?: string, opts?: NativeRuntimeOptions): Promise<NativeRuntime>;
 declare class MemoryRuntime implements Runtime {
   private actors;
   private stores;
   private readonly agents;
   constructor(agents: Record<string, AgentDef>);
+  agentDef(name: string): AgentDef | undefined;
   session(agent: string, id: string): AgentSession;
 }
 type AgentBackend = "native" | "memory" | "durable";
 declare function createAgentRuntime(agents: Record<string, AgentDef>, opts?: {
   backend?: AgentBackend;
   path?: string;
+  maxSessions?: number;
 }): Promise<Runtime>;
 declare function mountAgent(agent: AgentDefinition, runtime: Runtime, opts?: {
   chatPath?: string;
@@ -39,4 +49,4 @@ declare function mountAgent(agent: AgentDefinition, runtime: Runtime, opts?: {
   ctx: ChannelContext;
 };
 //#endregion
-export { AgentBackend, AgentDef, MemoryRuntime, NativeRuntime, createAgentRuntime, createNativeRuntime, mountAgent };
+export { AgentBackend, AgentDef, MemoryRuntime, NativeRuntime, NativeRuntimeOptions, createAgentRuntime, createNativeRuntime, mountAgent, toAgentDef };

package/dist/agent-native.js

@@ -1,11 +1,13 @@
+import { observeTurnEvents } from "./turn-events.js";
 import { assertCoreRuntimeVersion } from "./core-version.js";
 import { openLocalSqliteSync } from "./sqlite-driver.js";
-import { channelFetch } from "@junejs/core/agent-config";
+import { buildSystemPrompt, channelFetch } from "@junejs/core/agent-config";
 import { AgentSession, withSystem } from "@junejs/core/agent-runtime";
 //#region src/agent-native.ts
 function initSchema(db) {
 	db.exec(`CREATE TABLE IF NOT EXISTS agent_sessions (session_id TEXT PRIMARY KEY, status TEXT)`);
 	db.exec(`CREATE TABLE IF NOT EXISTS agent_messages (seq INTEGER PRIMARY KEY AUTOINCREMENT, session_id TEXT, body TEXT)`);
+	db.exec(`CREATE INDEX IF NOT EXISTS agent_messages_session ON agent_messages (session_id, seq)`);
 	db.exec(`CREATE TABLE IF NOT EXISTS agent_steps (session_id TEXT, id TEXT, output TEXT, PRIMARY KEY (session_id, id))`);
 }
 var SqliteSessionStore = class {
@@ -22,7 +24,7 @@ var SqliteSessionStore = class {
 		return this.db.query("SELECT body FROM agent_messages WHERE session_id = ? ORDER BY seq").all(this.sid).map((r) => JSON.parse(r.body));
 	}
 	hasOpeningMessage(turnId) {
-		return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
+		return this.db.query("SELECT 1 FROM agent_messages WHERE session_id = ? AND json_extract(body, '$.turnId') = ? AND json_extract(body, '$.role') IN ('user', 'trigger') LIMIT 1").get(this.sid, turnId) != null;
 	}
 	getStep(id) {
 		const r = this.db.query("SELECT output FROM agent_steps WHERE session_id = ? AND id = ?").get(this.sid, id);
@@ -83,32 +85,68 @@ var InProcEventSink = class {
 		this.subs.add(cb);
 		return () => this.subs.delete(cb);
 	}
+	get size() {
+		return this.subs.size;
+	}
 };
+function toAgentDef(agent, model) {
+	return {
+		model,
+		tools: agent.tools,
+		instructions: buildSystemPrompt(agent),
+		...agent.channelInstructions ? { channelInstructions: agent.channelInstructions } : {}
+	};
+}
 var NativeRuntime = class {
 	actors = /* @__PURE__ */ new Map();
 	agents;
 	db;
-	constructor(agents, db) {
+	maxSessions;
+	constructor(agents, db, opts = {}) {
 		assertCoreRuntimeVersion("NativeRuntime");
 		this.agents = agents;
 		this.db = db;
+		const max = opts.maxSessions ?? 1e3;
+		if (!(Number.isInteger(max) && max >= 1) && max !== Infinity) throw new RangeError(`NativeRuntime: maxSessions must be an integer >= 1 (or Infinity for no cap), got ${max}`);
+		this.maxSessions = max;
 		initSchema(db);
 	}
+	agentDef(name) {
+		return this.agents[name];
+	}
 	session(agent, id) {
 		const key = `${agent}:${id}`;
-		let a = this.actors.get(key);
-		if (!a) {
-			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 InProcEventSink(), model, def.tools, this, def.channelInstructions);
-			this.actors.set(key, a);
+		const hit = this.actors.get(key);
+		if (hit) {
+			this.actors.delete(key);
+			this.actors.set(key, hit);
+			return hit.session;
+		}
+		const def = this.agents[agent];
+		if (!def) throw new Error(`unknown agent: ${agent}`);
+		const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
+		const sink = new InProcEventSink();
+		const session = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), sink, model, def.tools, this, def.channelInstructions);
+		this.evictIdle();
+		this.actors.set(key, {
+			session,
+			sink
+		});
+		return session;
+	}
+	get sessionCount() {
+		return this.actors.size;
+	}
+	evictIdle() {
+		if (this.actors.size < this.maxSessions) return;
+		for (const [key, a] of this.actors) {
+			if (this.actors.size < this.maxSessions) break;
+			if (a.session.idle() && a.sink.size === 0) this.actors.delete(key);
 		}
-		return a;
 	}
 };
-async function createNativeRuntime(agents, path = ":memory:") {
-	return new NativeRuntime(agents, await openLocalSqliteSync(path));
+async function createNativeRuntime(agents, path = ":memory:", opts = {}) {
+	return new NativeRuntime(agents, await openLocalSqliteSync(path), opts);
 }
 var MemorySessionStore = class {
 	msgs = [];
@@ -165,6 +203,9 @@ var MemoryRuntime = class {
 		assertCoreRuntimeVersion("MemoryRuntime");
 		this.agents = agents;
 	}
+	agentDef(name) {
+		return this.agents[name];
+	}
 	session(agent, id) {
 		const key = `${agent}:${id}`;
 		let a = this.actors.get(key);
@@ -173,7 +214,8 @@ var MemoryRuntime = class {
 			if (!def) throw new Error(`unknown agent: ${agent}`);
 			const store = new MemorySessionStore();
 			this.stores.set(key, store);
-			a = new AgentSession(agent, id, store, new InProcEventSink(), def.model, def.tools, this);
+			const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
+			a = new AgentSession(agent, id, store, new InProcEventSink(), model, def.tools, this, def.channelInstructions);
 			this.actors.set(key, a);
 		}
 		return a;
@@ -182,12 +224,23 @@ var MemoryRuntime = class {
 async function createAgentRuntime(agents, opts = {}) {
 	const backend = opts.backend ?? "native";
 	if (backend === "memory") return new MemoryRuntime(agents);
-	if (backend === "native") return createNativeRuntime(agents, opts.path);
+	if (backend === "native") return createNativeRuntime(agents, opts.path, { maxSessions: opts.maxSessions });
 	throw new Error("backend 'durable' is the Cloudflare Durable Object target — construct AgentDurableObject in your worker, not via createAgentRuntime");
 }
+function warnOnDrift(agent, runtime) {
+	const def = runtime.agentDef?.(agent.name);
+	if (!def) return;
+	const names = (tools) => tools.map((t) => t.spec.name).sort();
+	const want = names(agent.tools), have = names(def.tools);
+	if (want.join("\0") !== have.join("\0")) {
+		const missing = want.filter((n) => !have.includes(n)), extra = have.filter((n) => !want.includes(n));
+		console.warn(`[june] mountAgent("${agent.name}"): the runtime's tools differ from the agent definition's` + (missing.length ? ` — missing from the runtime: ${missing.join(", ")}` : "") + (extra.length ? ` — only in the runtime: ${extra.join(", ")}` : "") + `. Build the runtime entry with toAgentDef(agent, model) so both come from one definition.`);
+	}
+}
 function mountAgent(agent, runtime, opts = {}) {
 	const chatPath = opts.chatPath ?? "/message";
 	const channelsOn = opts.channels ?? true;
+	warnOnDrift(agent, runtime);
 	const ctx = {
 		agent,
 		services: opts.services,
@@ -205,6 +258,22 @@ function mountAgent(agent, runtime, opts = {}) {
 			trigger: o?.trigger,
 			replace: o?.replace
 		}),
+		runStream: async function* (message, o) {
+			const session = runtime.session(agent.name, o?.session ?? "default");
+			const { turnId } = session.start({
+				turnId: o?.turnId,
+				userText: message,
+				event: o?.event,
+				trigger: o?.trigger,
+				replace: o?.replace
+			});
+			yield* observeTurnEvents(session, turnId);
+		},
+		resumeStream: async function* (o) {
+			const session = runtime.session(agent.name, o.session ?? "default");
+			const { turnId } = session.resume(o.turnId, o.inputId, o.input, { by: o.by });
+			yield* observeTurnEvents(session, turnId);
+		},
 		resetSession: (o) => runtime.session(agent.name, o?.session ?? "default").reset()
 	};
 	const channels = channelFetch(agent, ctx);
@@ -226,4 +295,4 @@ function mountAgent(agent, runtime, opts = {}) {
 	};
 }
 //#endregion
-export { MemoryRuntime, NativeRuntime, createAgentRuntime, createNativeRuntime, mountAgent };
+export { MemoryRuntime, NativeRuntime, createAgentRuntime, createNativeRuntime, mountAgent, toAgentDef };

package/dist/app.js

@@ -1,5 +1,5 @@
 import { discoverAgent } from "./agent-discover.js";
-import { createAgentRuntime, mountAgent } from "./agent-native.js";
+import { createAgentRuntime, mountAgent, toAgentDef } from "./agent-native.js";
 import { findMiddlewareFile, isResourceFile, listRoutes, matchRouteTree, resolveNotFound, routeFiles } from "./router.js";
 import { createPipeline } from "./pipeline.js";
 import { resolveBoundary } from "./segment.js";
@@ -13,7 +13,6 @@ import { existsSync, lstatSync, realpathSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
-import { buildSystemPrompt } from "@junejs/core/agent-config";
 import { routeFromModule } from "@junejs/core/route";
 import { resolveAgent, resolveClientRouter, resolveSpeculationRules } from "@junejs/core/config";
 import { runWithTrace } from "@junejs/core/instrumentation";
@@ -125,11 +124,7 @@ function createApp({ appDir: appDirInput, config = {} }) {
 			const def = await discoverAgent(agentDir);
 			const backend = agent.runtime.backend === "durable" ? "native" : agent.runtime.backend;
 			const model = anthropic({ model: def.model });
-			const mounted = mountAgent(def, await createAgentRuntime({ [def.name]: {
-				model,
-				tools: def.tools,
-				instructions: buildSystemPrompt(def)
-			} }, { backend }), {
+			const mounted = mountAgent(def, await createAgentRuntime({ [def.name]: toAgentDef(def, model) }, { backend }), {
 				chatPath: agent.runtime.chat.path,
 				channels: agent.runtime.channels
 			});

package/dist/build.d.ts

@@ -1,7 +1,7 @@
-import { JuneAdapter } from "./adapter.js";
-import { WorkerManifest } from "./worker.js";
-import { JuneConfig } from "@junejs/core/config";
-import { DocumentConfig } from "@junejs/core/document";
+import { n as scanAppRoutes, r as scanRoutes, t as RouteEntry } from "./route-scan-DMlwoESy.js";
+import { t as generateContent } from "./content-freeze-CyiW2fRK.js";
+import { i as workerName, n as normalizeBase, r as resolveDeployAdapter, t as freezeConfig } from "./config-freeze-DwI-Rmvq.js";
+import { n as buildManifest } from "./manifest-gcNWqWoI.js";
 //#region src/build.d.ts
 type BuildResult = {
   outFile: string;
@@ -10,31 +10,10 @@ type BuildResult = {
   contentCollections: string[];
   prerendered: string[];
 };
-type RouteEntry = {
-  path: string;
-  file: string;
-  dynamic: boolean;
-  resource?: boolean;
-  layouts: string[];
-  loading?: string;
-};
 declare const isBunSpecifier: (id: string) => boolean;
-declare function resolveDeployAdapter(deploy: JuneConfig["deploy"]): JuneAdapter;
-declare function scanRoutes(appDir: string, dir?: string, layouts?: string[], out?: RouteEntry[], loading?: string): Promise<RouteEntry[]>;
-declare function generateContent(appRoot: string): Promise<string[]>;
-declare function freezeConfig(appRoot: string): Promise<{
-  document: DocumentConfig;
-  agent: WorkerManifest["agent"];
-  i18n: WorkerManifest["i18n"];
-  earlyHints: string[];
-  buildExternal: string[];
-}>;
-declare function normalizeBase(base?: string): string;
-declare function workerName(raw: string): string;
-declare function buildManifest(appRoot: string): Promise<WorkerManifest>;
 declare function juneBuild(appRoot: string, options?: {
   outDir?: string;
   external?: string[];
 }): Promise<BuildResult>;
 //#endregion
-export { BuildResult, buildManifest, freezeConfig, generateContent, isBunSpecifier, juneBuild, normalizeBase, resolveDeployAdapter, scanRoutes, workerName };
+export { BuildResult, type RouteEntry, buildManifest, freezeConfig, generateContent, isBunSpecifier, juneBuild, normalizeBase, resolveDeployAdapter, scanAppRoutes, scanRoutes, workerName };