@junejs/server 0.1.2-dev.9 → 0.1.2

package/src/agent-native.ts

@@ -10,8 +10,7 @@
 import {
   AgentSession,
   withSystem,
-  type EventSink,
-  type TurnEvent,
+  type Broadcaster,
   type Model,
   type Msg,
   type Runtime,
@@ -20,7 +19,6 @@ import {
 } from "@junejs/core/agent-runtime";
 import { channelFetch, type AgentDefinition, type ChannelContext } from "@junejs/core/agent-config";
 import { openLocalSqliteSync, type SyncSqlite } from "./sqlite-driver";
-import { assertCoreRuntimeVersion } from "./core-version";
 
 function initSchema(db: SyncSqlite) {
   db.exec(`CREATE TABLE IF NOT EXISTS agent_sessions (session_id TEXT PRIMARY KEY, status TEXT)`);
@@ -47,8 +45,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));
   }
-  hasOpeningMessage(turnId: string): boolean {
-    return this.messages().some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId);
+  hasUserTurn(turnId: string): boolean {
+    return this.messages().some((m) => m.role === "user" && 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;
@@ -57,9 +55,6 @@ 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";
   }
@@ -82,15 +77,15 @@ class SqliteSessionStore implements SessionStore {
   unwrap<H = unknown>(): H { return this.db as unknown as H; }
 }
 
-class InProcEventSink implements EventSink {
-  private subs = new Set<(e: TurnEvent) => void>();
-  emit(e: TurnEvent) { this.subs.forEach((cb) => { try { cb(e); } catch { /* a bad subscriber must not break emit */ } }); }
-  subscribe(cb: (e: TurnEvent) => void): () => void { this.subs.add(cb); return () => this.subs.delete(cb); }
+class InProcBroadcaster implements Broadcaster {
+  private subs = new Set<(t: string) => void>();
+  publish(turnId: string) { this.subs.forEach((cb) => { try { cb(turnId); } catch { /* a bad subscriber must not break publish */ } }); }
+  subscribe(cb: (t: string) => void): () => void { this.subs.add(cb); return () => this.subs.delete(cb); }
 }
 
 // `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; channelInstructions?: Record<string, string> };
+export type AgentDef = { model: Model; tools: Tool[]; instructions?: string };
 
 // The native Runtime: a registry of agent definitions over one SQLite handle,
 // handing out (and memoizing) an AgentSession actor per (agent, id).
@@ -100,7 +95,6 @@ export class NativeRuntime implements Runtime {
   private readonly db: SyncSqlite;
 
   constructor(agents: Record<string, AgentDef>, db: SyncSqlite) {
-    assertCoreRuntimeVersion("NativeRuntime"); // #94: fail power-on, not mid-turn
     this.agents = agents;
     this.db = db;
     initSchema(db);
@@ -113,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 InProcEventSink(), model, def.tools, this, def.channelInstructions);
+      a = new AgentSession(agent, id, new SqliteSessionStore(this.db, key), new InProcBroadcaster(), model, def.tools, this);
       this.actors.set(key, a);
     }
     return a;
@@ -141,10 +135,9 @@ class MemorySessionStore implements SessionStore {
   private status = "new";
   appendMessage(m: Msg) { this.msgs.push(m); }
   messages(): Msg[] { return this.msgs.slice(); }
-  hasOpeningMessage(turnId: string): boolean { return this.msgs.some((m) => (m.role === "user" || m.role === "trigger") && m.turnId === turnId); }
+  hasUserTurn(turnId: string): boolean { return this.msgs.some((m) => m.role === "user" && 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
@@ -156,7 +149,6 @@ export class MemoryRuntime implements Runtime {
   private stores = new Map<string, MemorySessionStore>();
   private readonly agents: Record<string, AgentDef>;
   constructor(agents: Record<string, AgentDef>) {
-    assertCoreRuntimeVersion("MemoryRuntime"); // #94: fail power-on, not mid-turn
     this.agents = agents;
   }
   session(agent: string, id: string): AgentSession {
@@ -167,7 +159,7 @@ export class MemoryRuntime implements Runtime {
       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);
+      a = new AgentSession(agent, id, store, new InProcBroadcaster(), def.model, def.tools, this);
       this.actors.set(key, a);
     }
     return a;
@@ -203,7 +195,7 @@ export async function createAgentRuntime(
 export function mountAgent(
   agent: AgentDefinition,
   runtime: Runtime,
-  opts: { chatPath?: string; channels?: boolean; services?: unknown } = {},
+  opts: { chatPath?: string; channels?: boolean } = {},
 ): {
   surface: (req: Request) => Promise<Response | null>;
   fetch: (req: Request) => Promise<Response | null>;
@@ -214,14 +206,8 @@ export function mountAgent(
   const channelsOn = opts.channels ?? true;
   const ctx: ChannelContext = {
     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, trigger: o?.trigger }),
-    // FIRE-AND-FORGET (#77): start() without awaiting the result. Native has no waitUntil
-    // ceiling (Node keeps floating promises alive), but the seam is the same so a channel
-    // written against ctx.runDetached behaves identically on both targets.
-    runDetached: async (message, o) =>
-      runtime.session(agent.name, o?.session ?? "default").start({ turnId: o?.turnId, userText: message, event: o?.event, trigger: o?.trigger }),
+      runtime.session(agent.name, o?.session ?? "default").turn({ turnId: o?.turnId, userText: message }),
   };
   const channels = channelFetch(agent, ctx);
   const surface = async (req: Request): Promise<Response | null> => {

package/src/worker.ts

@@ -274,8 +274,11 @@ export function withAssets(
       }
 
       // 2. Static assets (prerendered HTML/.md/.json, /client.js, hashed CSS)
-      //    served direct.
-      if (assets) {
+      //    served direct — for reads only. Assets never answer a write, and on
+      //    workerd handing the incoming request to ASSETS.fetch() consumes its
+      //    body: a POST that 404s here would reach the pipeline with a used stream
+      //    (POST /mcp → -32700 Parse error, an action's input gone).
+      if (assets && (request.method === "GET" || request.method === "HEAD")) {
         const a = await assets.fetch(request);
         if (a.status !== 404) {
           const ct = a.headers.get("content-type") ?? "";

package/dist/core-version.d.ts

@@ -1,5 +0,0 @@
-//#region src/core-version.d.ts
-declare function assertCoreRuntimeVersion(surface: string): void;
-declare function checkCoreRuntimeVersion(surface: string, actual: number | undefined, expected?: number): void;
-//#endregion
-export { assertCoreRuntimeVersion, checkCoreRuntimeVersion };

package/dist/core-version.js

@@ -1,12 +0,0 @@
-import * as coreRuntime from "@junejs/core/agent-runtime";
-//#region src/core-version.ts
-const EXPECTED_CORE_RUNTIME_API = 1;
-function assertCoreRuntimeVersion(surface) {
-	checkCoreRuntimeVersion(surface, coreRuntime.RUNTIME_API_VERSION);
-}
-function checkCoreRuntimeVersion(surface, actual, expected = EXPECTED_CORE_RUNTIME_API) {
-	if (actual === expected) return;
-	throw new Error(`${surface}: @junejs/server is built against @junejs/core runtime API v${expected}, but the @junejs/core it resolved provides ${actual === void 0 ? "no RUNTIME_API_VERSION (a pre-0.1.1-dev.16 core)" : `v${actual}`} — two copies of @junejs/core are likely installed (one nested under @junejs/server). Align the app's @junejs/core with @junejs/server's peer range, then reinstall/dedupe so one copy remains.`);
-}
-//#endregion
-export { assertCoreRuntimeVersion, checkCoreRuntimeVersion };

package/src/core-version.ts

@@ -1,34 +0,0 @@
-// core-version.ts — the #94 belt-and-braces: fail at POWER-ON when the @junejs/core
-// copy this server resolved is not the one it was built for.
-//
-// The primary fix is @junejs/core being a peerDependency (the app's single resolution
-// always wins), but a nested second copy can still appear (npm legacy peer handling,
-// a stale lockfile, a transitive pin). When it does, the failure without this check
-// is far from the cause and mid-turn ("sink.emit is not a function", first seen in
-// crisp-agent production); with it, construction throws with both versions named.
-//
-// Namespace import + optional read on purpose: a PRE-#94 core has no
-// RUNTIME_API_VERSION export, and a named import of a missing export would die at
-// module link time with an unhelpful SyntaxError — exactly the confusion this
-// module exists to remove.
-import * as coreRuntime from "@junejs/core/agent-runtime";
-
-// The contract number this server tree is built against. Bump in lockstep with
-// core's RUNTIME_API_VERSION whenever the server↔core runtime contract changes.
-const EXPECTED_CORE_RUNTIME_API = 1;
-
-export function assertCoreRuntimeVersion(surface: string): void {
-  checkCoreRuntimeVersion(surface, (coreRuntime as { RUNTIME_API_VERSION?: number }).RUNTIME_API_VERSION);
-}
-
-// The pure check, split out so the mismatch paths are unit-testable (the ambient
-// read above can only ever see the workspace's own — matching — core).
-export function checkCoreRuntimeVersion(surface: string, actual: number | undefined, expected: number = EXPECTED_CORE_RUNTIME_API): void {
-  if (actual === expected) return;
-  throw new Error(
-    `${surface}: @junejs/server is built against @junejs/core runtime API v${expected}, ` +
-      `but the @junejs/core it resolved provides ${actual === undefined ? "no RUNTIME_API_VERSION (a pre-0.1.1-dev.16 core)" : `v${actual}`} — ` +
-      `two copies of @junejs/core are likely installed (one nested under @junejs/server). ` +
-      `Align the app's @junejs/core with @junejs/server's peer range, then reinstall/dedupe so one copy remains.`,
-  );
-}