@junejs/server 0.1.2-dev.3 → 0.1.2-dev.4

package/dist/agent-durable.d.ts

@@ -1,5 +1,5 @@
 import { Channel, ChannelFactory } from "@junejs/core/agent-config";
-import { InboundEvent, Model, Msg, SessionStore, Tool, TurnEvent } from "@junejs/core/agent-runtime";
+import { InboundEvent, Model, Msg, ProactiveTrigger, SessionStore, Tool, TurnEvent } from "@junejs/core/agent-runtime";
 import { Resources } from "@junejs/core/resources";
 //#region src/agent-durable.d.ts
 type SqlStorageValue = ArrayBuffer | string | number | null;
@@ -30,9 +30,10 @@ declare class DoSessionStore implements SessionStore {
   private get sql();
   appendMessage(m: Msg): void;
   messages(): Msg[];
-  hasUserTurn(turnId: string): boolean;
+  hasOpeningMessage(turnId: string): boolean;
   getStep(id: string): unknown | undefined;
   putStep(id: string, output: unknown): void;
+  delStep(id: string): void;
   getStatus(): string;
   setStatus(s: string): void;
   tx<T>(fn: () => T): T;
@@ -58,6 +59,7 @@ declare class AgentDurableObject {
     turnId?: string;
     userText: string;
     event?: InboundEvent;
+    trigger?: ProactiveTrigger;
   }): Promise<string>;
   transcript(): import("@junejs/core/agent-runtime").Turn[];
   fetch(req: Request): Promise<Response>;

package/dist/agent-durable.js

@@ -1,5 +1,5 @@
 import { channelDispatch, resolveChannel } from "@junejs/core/agent-config";
-import { AgentSession, withSystem } from "@junejs/core/agent-runtime";
+import { AgentSession, ResumeAuthorizationError, withSystem } from "@junejs/core/agent-runtime";
 import { ensureScope, runInScope } from "@junejs/db";
 //#region src/agent-durable.ts
 var DoSessionStore = class {
@@ -20,8 +20,8 @@ var DoSessionStore = class {
 	messages() {
 		return this.sql.exec("SELECT body FROM agent_messages ORDER BY seq").toArray().map((r) => JSON.parse(r.body));
 	}
-	hasUserTurn(turnId) {
-		return this.messages().some((m) => m.role === "user" && m.turnId === turnId);
+	hasOpeningMessage(turnId) {
+		return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
 	}
 	getStep(id) {
 		const rows = this.sql.exec("SELECT output FROM agent_steps WHERE id = ?", id).toArray();
@@ -30,6 +30,9 @@ var DoSessionStore = class {
 	putStep(id, output) {
 		this.sql.exec("INSERT INTO agent_steps (id, output) VALUES (?, ?)", id, JSON.stringify(output));
 	}
+	delStep(id) {
+		this.sql.exec("DELETE FROM agent_steps WHERE id = ?", id);
+	}
 	getStatus() {
 		const rows = this.sql.exec("SELECT v FROM agent_meta WHERE k = 'status'").toArray();
 		return rows.length ? rows[0].v : "new";
@@ -93,20 +96,40 @@ var AgentDurableObject = class {
 	async fetch(req) {
 		const url = new URL(req.url);
 		if (req.method === "POST" && url.pathname.endsWith("/turn")) {
-			const { userText, turnId, event } = await req.json();
+			const { userText, turnId, event, trigger } = await req.json();
 			await ensureScope();
-			const started = runInScope({
-				resources: this.resources,
-				services: this.services
-			}, () => this.session.start({
-				userText,
-				turnId,
-				event
-			}));
+			let started;
+			try {
+				started = runInScope({
+					resources: this.resources,
+					services: this.services
+				}, () => this.session.start({
+					userText,
+					turnId,
+					event,
+					trigger
+				}));
+			} catch (err) {
+				return Response.json({ error: err instanceof Error ? err.message : String(err) }, { status: 409 });
+			}
 			return new Response(sseTurnStream(this.session, started.turnId), { headers: SSE_HEADERS });
 		}
+		if (req.method === "POST" && url.pathname.endsWith("/resume")) {
+			const { turnId, inputId, input, by } = await req.json();
+			await ensureScope();
+			try {
+				runInScope({
+					resources: this.resources,
+					services: this.services
+				}, () => this.session.resume(turnId, inputId, input, { by }));
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				return Response.json({ error: message }, { status: err instanceof ResumeAuthorizationError ? 403 : 409 });
+			}
+			return new Response(sseTurnStream(this.session, turnId), { headers: SSE_HEADERS });
+		}
 		if (url.pathname.endsWith("/transcript")) return Response.json({ transcript: this.transcript() });
-		return new Response("agent DO — POST /turn or GET /transcript", { status: 404 });
+		return new Response("agent DO — POST /turn, POST /resume, or GET /transcript", { status: 404 });
 	}
 };
 const SSE_HEADERS = {
@@ -132,7 +155,7 @@ function sseTurnStream(session, turnId) {
 			}, 2e4);
 			unsub = session.observe((e) => {
 				controller.enqueue(enc.encode(`data: ${JSON.stringify(e)}\n\n`));
-				if (e.type === "turn.completed" || e.type === "turn.failed") {
+				if (e.type === "turn.completed" || e.type === "turn.failed" || e.type === "input.requested") {
 					stop();
 					controller.close();
 				}
@@ -235,14 +258,35 @@ function durableChannelSurface(getNamespace, opts) {
 				method: "POST",
 				body: serializeTurn(message, o)
 			})));
+		},
+		resumeStream: async function* (o) {
+			const namespace = getNamespace();
+			if (!namespace) throw new Error("durableChannelSurface: no Durable Object namespace bound (env.AGENT)");
+			yield* sseTurnEvents(await durableFetch(namespace, opts.agentName, o.session ?? "default", new Request("https://do/resume", {
+				method: "POST",
+				body: serializeResume(o)
+			})));
 		}
 	});
 }
+function serializeResume(o) {
+	try {
+		return JSON.stringify({
+			turnId: o.turnId,
+			inputId: o.inputId,
+			input: o.input,
+			by: o.by
+		});
+	} catch (err) {
+		throw new Error(`resumeStream: input is not JSON-serializable (${err.message}) — a resume answer must round-trip to the DO`);
+	}
+}
 function serializeTurn(userText, o) {
 	const payload = {
 		userText,
 		turnId: o?.turnId,
-		event: o?.event
+		event: o?.event,
+		trigger: o?.trigger
 	};
 	try {
 		return JSON.stringify(payload);

package/dist/agent-native.js

@@ -20,8 +20,8 @@ var SqliteSessionStore = class {
 	messages() {
 		return this.db.query("SELECT body FROM agent_messages WHERE session_id = ? ORDER BY seq").all(this.sid).map((r) => JSON.parse(r.body));
 	}
-	hasUserTurn(turnId) {
-		return this.messages().some((m) => m.role === "user" && m.turnId === turnId);
+	hasOpeningMessage(turnId) {
+		return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
 	}
 	getStep(id) {
 		const r = this.db.query("SELECT output FROM agent_steps WHERE session_id = ? AND id = ?").get(this.sid, id);
@@ -30,6 +30,9 @@ var SqliteSessionStore = class {
 	putStep(id, output) {
 		this.db.query("INSERT INTO agent_steps (session_id, id, output) VALUES (?, ?, ?)").run(this.sid, id, JSON.stringify(output));
 	}
+	delStep(id) {
+		this.db.query("DELETE FROM agent_steps WHERE session_id = ? AND id = ?").run(this.sid, id);
+	}
 	getStatus() {
 		return this.db.query("SELECT status FROM agent_sessions WHERE session_id = ?").get(this.sid)?.status ?? "new";
 	}
@@ -100,8 +103,8 @@ var MemorySessionStore = class {
 	messages() {
 		return this.msgs.slice();
 	}
-	hasUserTurn(turnId) {
-		return this.msgs.some((m) => m.role === "user" && m.turnId === turnId);
+	hasOpeningMessage(turnId) {
+		return this.msgs.some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
 	}
 	getStep(id) {
 		return this.steps.has(id) ? this.steps.get(id) : void 0;
@@ -109,6 +112,9 @@ var MemorySessionStore = class {
 	putStep(id, output) {
 		this.steps.set(id, output);
 	}
+	delStep(id) {
+		this.steps.delete(id);
+	}
 	getStatus() {
 		return this.status;
 	}
@@ -156,7 +162,8 @@ function mountAgent(agent, runtime, opts = {}) {
 		run: (message, o) => runtime.session(agent.name, o?.session ?? "default").turn({
 			turnId: o?.turnId,
 			userText: message,
-			event: o?.event
+			event: o?.event,
+			trigger: o?.trigger
 		})
 	};
 	const channels = channelFetch(agent, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.1.2-dev.3",
+  "version": "0.1.2-dev.4",
   "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.5",
+    "@junejs/core": ">=0.1.1-dev.8",
     "@junejs/db": ">=0.0.34-dev.0",
     "@momiji-rs/sparkdown": "^0.0.4",
     "lightningcss": "^1.27.0",

package/src/agent-durable.ts

@@ -17,6 +17,7 @@
 
 import {
   AgentSession,
+  ResumeAuthorizationError,
   withSystem,
   type EventSink,
   type TurnEvent,
@@ -25,6 +26,7 @@ import {
   type Runtime,
   type InboundEvent,
   type SessionStore,
+  type ProactiveTrigger,
   type Tool,
 } from "@junejs/core/agent-runtime";
 import type { Resources } from "@junejs/core/resources";
@@ -95,8 +97,8 @@ export class DoSessionStore implements SessionStore {
   messages(): Msg[] {
     return this.sql.exec<{ body: string }>("SELECT body FROM agent_messages ORDER BY seq").toArray().map((r) => JSON.parse(r.body));
   }
-  hasUserTurn(turnId: string): boolean {
-    return this.messages().some((m) => m.role === "user" && m.turnId === turnId);
+  hasOpeningMessage(turnId: string): boolean {
+    return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
   }
   getStep(id: string): unknown | undefined {
     const rows = this.sql.exec<{ output: string }>("SELECT output FROM agent_steps WHERE id = ?", id).toArray();
@@ -105,6 +107,9 @@ export class DoSessionStore implements SessionStore {
   putStep(id: string, output: unknown) {
     this.sql.exec("INSERT INTO agent_steps (id, output) VALUES (?, ?)", id, JSON.stringify(output));
   }
+  delStep(id: string) {
+    this.sql.exec("DELETE FROM agent_steps WHERE id = ?", id);
+  }
   getStatus(): string {
     const rows = this.sql.exec<{ v: string }>("SELECT v FROM agent_meta WHERE k = 'status'").toArray();
     return rows.length ? rows[0]!.v : "new";
@@ -213,7 +218,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; event?: InboundEvent }): Promise<string> {
+  async turn(input: { turnId?: string; userText: string; event?: InboundEvent; trigger?: ProactiveTrigger }): Promise<string> {
     await ensureScope();
     return runInScope({ resources: this.resources, services: this.services }, () => this.session.turn(input));
   }
@@ -226,16 +231,38 @@ 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, event } = (await req.json()) as { userText: string; turnId?: string; event?: InboundEvent };
+      const { userText, turnId, event, trigger } = (await req.json()) as { userText: string; turnId?: string; event?: InboundEvent; trigger?: ProactiveTrigger };
       await ensureScope();
       // start() schedules the turn on the chain WITHIN the scope, so it runs with ambient
       // db/services (ALS propagates to the .then continuation registered here); subscribing
       // happens synchronously right after, before any event can emit.
-      const started = runInScope({ resources: this.resources, services: this.services }, () => this.session.start({ userText, turnId, event }));
+      let started: { turnId: string };
+      try {
+        started = runInScope({ resources: this.resources, services: this.services }, () => this.session.start({ userText, turnId, event, trigger }));
+      } catch (err) {
+        // e.g. the session is suspended awaiting input — a client-resolvable conflict, not a crash
+        return Response.json({ error: err instanceof Error ? err.message : String(err) }, { status: 409 });
+      }
       return new Response(sseTurnStream(this.session, started.turnId), { headers: SSE_HEADERS });
     }
+    // Provide the input a suspended turn is waiting on and stream its continuation as SSE.
+    // NOTE: this default surface passes `by` straight from the body — the engine treats it as a
+    // VERIFIED identity, so the app must authenticate it upstream (e.g. take the user id from a
+    // signature-checked Slack interaction payload), never expose this endpoint raw to clients.
+    if (req.method === "POST" && url.pathname.endsWith("/resume")) {
+      const { turnId, inputId, input, by } = (await req.json()) as { turnId: string; inputId: string; input: unknown; by?: string };
+      await ensureScope();
+      try {
+        runInScope({ resources: this.resources, services: this.services }, () => this.session.resume(turnId, inputId, input, { by }));
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        // 403: the resumer may not answer; 409: not suspended / wrong turn / wrong input id
+        return Response.json({ error: message }, { status: err instanceof ResumeAuthorizationError ? 403 : 409 });
+      }
+      return new Response(sseTurnStream(this.session, turnId), { headers: SSE_HEADERS });
+    }
     if (url.pathname.endsWith("/transcript")) return Response.json({ transcript: this.transcript() });
-    return new Response("agent DO — POST /turn or GET /transcript", { status: 404 });
+    return new Response("agent DO — POST /turn, POST /resume, or GET /transcript", { status: 404 });
   }
 }
 
@@ -263,7 +290,9 @@ function sseTurnStream(session: AgentSession, turnId: string): ReadableStream<Ui
       }, 20_000);
       unsub = session.observe((e) => {
         controller.enqueue(enc.encode(`data: ${JSON.stringify(e)}\n\n`));
-        if (e.type === "turn.completed" || e.type === "turn.failed") { stop(); controller.close(); }
+        // terminal for the STREAM: completed, failed, OR suspended (input.requested → the turn
+        // parked; the stream ends and a later /resume opens a fresh continuation stream).
+        if (e.type === "turn.completed" || e.type === "turn.failed" || e.type === "input.requested") { stop(); controller.close(); }
       }, { turnId });
     },
     cancel() { stop(); },
@@ -433,6 +462,18 @@ export function durableChannelSurface(
       );
       yield* sseTurnEvents(res);
     },
+    // Resume a parked turn on its session's DO and stream the continuation.
+    resumeStream: async function* (o) {
+      const namespace = getNamespace();
+      if (!namespace) throw new Error("durableChannelSurface: no Durable Object namespace bound (env.AGENT)");
+      const res = await durableFetch(
+        namespace,
+        opts.agentName,
+        o.session ?? "default",
+        new Request("https://do/resume", { method: "POST", body: serializeResume(o) }),
+      );
+      yield* sseTurnEvents(res);
+    },
   };
   return channelDispatch(resolved, ctx);
 }
@@ -443,8 +484,22 @@ export function durableChannelSurface(
 // 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 };
+// Serialize a /resume RPC body. `input` is `unknown` — the human's answer — so a
+// (third-party) host could hand us something JSON.stringify chokes on (BigInt, circular).
+// Unlike serializeTurn's `raw`, `input` is essential: silently dropping it would resume the
+// turn with the wrong answer. So fail loudly with a clear message rather than corrupt the resume.
+function serializeResume(o: { turnId: string; inputId: string; input: unknown; by?: string }): string {
+  try {
+    return JSON.stringify({ turnId: o.turnId, inputId: o.inputId, input: o.input, by: o.by });
+  } catch (err) {
+    throw new Error(`resumeStream: input is not JSON-serializable (${(err as Error).message}) — a resume answer must round-trip to the DO`);
+  }
+}
+
+// `trigger` is ProactiveTrigger — plain strings by construction — so only event.raw can make
+// the stringify throw; the fallback that strips it stays sufficient.
+function serializeTurn(userText: string, o?: { turnId?: string; event?: InboundEvent; trigger?: ProactiveTrigger }): string {
+  const payload = { userText, turnId: o?.turnId, event: o?.event, trigger: o?.trigger };
   try {
     return JSON.stringify(payload);
   } catch {

package/src/agent-native.ts

@@ -46,8 +46,8 @@ class SqliteSessionStore implements SessionStore {
     return (this.db.query("SELECT body FROM agent_messages WHERE session_id = ? ORDER BY seq").all(this.sid) as { body: string }[])
       .map((r) => JSON.parse(r.body));
   }
-  hasUserTurn(turnId: string): boolean {
-    return this.messages().some((m) => m.role === "user" && m.turnId === turnId);
+  hasOpeningMessage(turnId: string): boolean {
+    return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
   }
   getStep(id: string): unknown | undefined {
     const r = this.db.query("SELECT output FROM agent_steps WHERE session_id = ? AND id = ?").get(this.sid, id) as { output: string } | undefined;
@@ -56,6 +56,9 @@ class SqliteSessionStore implements SessionStore {
   putStep(id: string, output: unknown) {
     this.db.query("INSERT INTO agent_steps (session_id, id, output) VALUES (?, ?, ?)").run(this.sid, id, JSON.stringify(output));
   }
+  delStep(id: string) {
+    this.db.query("DELETE FROM agent_steps WHERE session_id = ? AND id = ?").run(this.sid, id);
+  }
   getStatus(): string {
     return (this.db.query("SELECT status FROM agent_sessions WHERE session_id = ?").get(this.sid) as { status: string } | undefined)?.status ?? "new";
   }
@@ -136,9 +139,10 @@ class MemorySessionStore implements SessionStore {
   private status = "new";
   appendMessage(m: Msg) { this.msgs.push(m); }
   messages(): Msg[] { return this.msgs.slice(); }
-  hasUserTurn(turnId: string): boolean { return this.msgs.some((m) => m.role === "user" && m.turnId === turnId); }
+  hasOpeningMessage(turnId: string): boolean { return this.msgs.some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId); }
   getStep(id: string): unknown | undefined { return this.steps.has(id) ? this.steps.get(id) : undefined; }
   putStep(id: string, output: unknown) { this.steps.set(id, output); }
+  delStep(id: string) { this.steps.delete(id); }
   getStatus(): string { return this.status; }
   setStatus(s: string) { this.status = s; }
   tx<T>(fn: () => T): T { return fn(); } // no rollback: an in-memory store is not a durability tier
@@ -209,7 +213,7 @@ export function mountAgent(
     agent,
     services: opts.services, // same DI bag reachable from channel hooks (parity with durableChannelSurface)
     run: (message, o) =>
-      runtime.session(agent.name, o?.session ?? "default").turn({ turnId: o?.turnId, userText: message, event: o?.event }),
+      runtime.session(agent.name, o?.session ?? "default").turn({ turnId: o?.turnId, userText: message, event: o?.event, trigger: o?.trigger }),
   };
   const channels = channelFetch(agent, ctx);
   const surface = async (req: Request): Promise<Response | null> => {