@junejs/server 1.0.0-dev.17 → 1.0.0-dev.20

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-compile.d.ts

@@ -5,6 +5,10 @@ type AgentDirScan = {
   name: string;
   hasConfig: boolean;
   instructions: string | null;
+  surfaceVariants: {
+    source: string;
+    raw: string;
+  }[];
   tools: string[];
   skills: {
     name: string;

package/dist/agent-compile.js

@@ -15,6 +15,10 @@ function scanAgentDir(dir) {
 		name: basename(dir),
 		hasConfig: existsSync(join(dir, "agent.ts")),
 		instructions: existsSync(instructionsFile) ? readFileSync(instructionsFile, "utf8") : null,
+		surfaceVariants: readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile()).map((e) => e.name.match(/^instructions\.([a-z0-9_-]+)\.md$/)).filter((m) => m !== null).sort((a, b) => a[1].localeCompare(b[1])).map((m) => ({
+			source: m[1],
+			raw: readFileSync(join(dir, m[0]), "utf8")
+		})),
 		tools: list(join(dir, "tools"), ".ts").map((f) => `./tools/${f}`),
 		skills: list(join(dir, "skills"), ".md").map((f) => ({
 			name: basename(f, ".md"),
@@ -27,7 +31,7 @@ function scanAgentDir(dir) {
 		})),
 		connections: list(join(dir, "connections"), ".ts").map((f) => `./connections/${f}`)
 	};
-	return !scan.hasConfig && scan.instructions === null && !scan.tools.length && !scan.skills.length && !scan.channels.length && !scan.channelOverlays.length && !scan.connections.length ? null : scan;
+	return !scan.hasConfig && scan.instructions === null && !scan.tools.length && !scan.skills.length && !scan.channels.length && !scan.surfaceVariants.length && !scan.channelOverlays.length && !scan.connections.length ? null : scan;
 }
 function identFor(prefix, spec, taken) {
 	const stem = basename(spec).replace(/\.ts$/, "").replace(/[^A-Za-z0-9]/g, "_");
@@ -68,7 +72,7 @@ function emitAgentModule(scan, opts) {
 		""
 	];
 	if (!scan.hasConfig) lines.push(`const config = { name: ${JSON.stringify(scan.name)} };`, "");
-	lines.push("export const agentModule: AgentModule = {", "  config,", `  instructions: ${JSON.stringify(scan.instructions ?? "")},`, `  tools: [${toolIds.join(", ")}],`, scan.skills.length ? `  skills: [\n${scan.skills.map((s) => `    parseSkill(${JSON.stringify(s.name)}, ${JSON.stringify(s.raw)}),`).join("\n")}\n  ],` : "  skills: [],", channelIds.length ? `  channels: { ${channelIds.map((c) => `${JSON.stringify(c.key)}: ${c.id}`).join(", ")} },` : "  channels: {},", scan.channelOverlays.length ? `  channelInstructions: {\n${scan.channelOverlays.map((o) => `    ${JSON.stringify(o.source)}: ${JSON.stringify(o.raw)},`).join("\n")}\n  },` : "  channelInstructions: {},", `  connections: [${connectionIds.join(", ")}],`, "};", "export default agentModule;", "");
+	lines.push("export const agentModule: AgentModule = {", "  config,", `  instructions: ${JSON.stringify(scan.instructions ?? "")},`, scan.surfaceVariants.length ? `  surfaceInstructions: {\n${scan.surfaceVariants.map((v) => `    ${JSON.stringify(v.source)}: ${JSON.stringify(v.raw)},`).join("\n")}\n  },` : "  surfaceInstructions: {},", `  tools: [${toolIds.join(", ")}],`, scan.skills.length ? `  skills: [\n${scan.skills.map((s) => `    parseSkill(${JSON.stringify(s.name)}, ${JSON.stringify(s.raw)}),`).join("\n")}\n  ],` : "  skills: [],", channelIds.length ? `  channels: { ${channelIds.map((c) => `${JSON.stringify(c.key)}: ${c.id}`).join(", ")} },` : "  channels: {},", scan.channelOverlays.length ? `  channelInstructions: {\n${scan.channelOverlays.map((o) => `    ${JSON.stringify(o.source)}: ${JSON.stringify(o.raw)},`).join("\n")}\n  },` : "  channelInstructions: {},", `  connections: [${connectionIds.join(", ")}],`, "};", "export default agentModule;", "");
 	return lines.join("\n");
 }
 function findAgentDir(root, dirName = "agent") {
@@ -118,6 +122,8 @@ function sniffTsExtensions(dir) {
 function generateAgentModule(dir, opts) {
 	const scan = scanAgentDir(dir);
 	if (!scan) return null;
+	for (const o of scan.channelOverlays) console.warn(`[june] deprecated: channels/${o.source}.md — move it to instructions.${o.source}.md at the agent root (per-surface behavior is agent-level; see junebuild/june#149).`);
+	for (const e of readdirSync(dir, { withFileTypes: true })) if (e.isFile() && /^instructions\..+\.md$/.test(e.name) && !/^instructions\.[a-z0-9_-]+\.md$/.test(e.name)) console.warn(`[june] ${e.name}: unrecognized instructions variant — only single-segment sources (instructions.<source>.md) are parsed today; locale variants are a planned follow-up (junebuild/june#149). This file is ignored.`);
 	const code = emitAgentModule(scan, { tsExtensions: opts?.tsExtensions ?? sniffTsExtensions(dir) });
 	const file = join(dir, AGENT_MODULE_FILE);
 	const stale = (existsSync(file) ? readFileSync(file, "utf8") : null) !== code;

package/dist/agent-discover.js

@@ -13,6 +13,13 @@ async function discoverAgentModule(dir) {
 	const config = existsSync(configFile) ? (await import(pathToFileURL(configFile).href)).default : { name: basename(dir) };
 	const instructionsFile = join(dir, "instructions.md");
 	const instructions = existsSync(instructionsFile) ? await readFile(instructionsFile, "utf8") : "";
+	const surfaceInstructions = {};
+	if (existsSync(dir)) for (const e of await readdir(dir, { withFileTypes: true })) {
+		if (!e.isFile() || !/^instructions\..+\.md$/.test(e.name)) continue;
+		const m = e.name.match(/^instructions\.([a-z0-9_-]+)\.md$/);
+		if (m) surfaceInstructions[m[1]] = await readFile(join(dir, e.name), "utf8");
+		else console.warn(`[june] ${e.name}: unrecognized instructions variant — only single-segment sources (instructions.<source>.md) are parsed today; locale variants are a planned follow-up (junebuild/june#149). This file is ignored.`);
+	}
 	const tools = [];
 	for (const f of await scan(join(dir, "tools"), ".ts")) {
 		const mod = await import(pathToFileURL(f).href);
@@ -26,7 +33,11 @@ async function discoverAgentModule(dir) {
 		if (mod.default) channels[basename(f, ".ts")] = mod.default;
 	}
 	const channelInstructions = {};
-	for (const f of await scan(join(dir, "channels"), ".md")) channelInstructions[basename(f, ".md")] = await readFile(f, "utf8");
+	for (const f of await scan(join(dir, "channels"), ".md")) {
+		const source = basename(f, ".md");
+		console.warn(`[june] deprecated: channels/${source}.md — move it to instructions.${source}.md at the agent root (per-surface behavior is agent-level; see junebuild/june#149).`);
+		channelInstructions[source] = await readFile(f, "utf8");
+	}
 	const connections = [];
 	for (const f of await scan(join(dir, "connections"), ".ts")) {
 		const mod = await import(pathToFileURL(f).href);
@@ -35,6 +46,7 @@ async function discoverAgentModule(dir) {
 	return {
 		config,
 		instructions,
+		surfaceInstructions,
 		tools,
 		skills,
 		channels,

package/dist/agent-durable.d.ts

@@ -1,5 +1,6 @@
 import { Channel, ChannelFactory } from "@junejs/core/agent-config";
-import { InboundEvent, Model, Msg, ProactiveTrigger, SessionStore, Tool, TurnError, TurnEvent, TurnFailurePhase } from "@junejs/core/agent-runtime";
+import { ChannelPolicy, InboundEvent, Model, Msg, ProactiveTrigger, SessionStore, Tool, TurnError, TurnEvent, TurnFailurePhase } from "@junejs/core/agent-runtime";
+import { Connection } from "@junejs/core/connections";
 import { Resources } from "@junejs/core/resources";
 //#region src/agent-durable.d.ts
 type SqlStorageValue = ArrayBuffer | string | number | null;
@@ -47,10 +48,11 @@ type DoAgentDef = {
   model: Model;
   tools: Tool[];
   instructions?: string;
-  channelInstructions?: Record<string, string>;
+  channelInstructions?: Record<string, string | ChannelPolicy>;
   channels?: (Channel | ChannelFactory)[];
   env?: unknown;
   resources?: Resources | ((env: unknown) => Promise<Resources> | Resources);
+  connections?: Connection[];
   services?: unknown;
   onTurnError?: (failure: {
     turnId: string;
@@ -71,9 +73,13 @@ declare class AgentDurableObject {
   private readonly channelInstructions?;
   private readonly resourcesInput;
   private resourcesOpened;
+  private readonly connectionsInput;
+  private connectionsOpened;
   private readonly doEnv;
   private readonly services;
   private resolveResources;
+  private resolveConnections;
+  private ready;
   constructor(state: DurableObjectState, def: DoAgentDef);
   private resolveSession;
   turn(input: {

package/dist/agent-durable.js

@@ -1,7 +1,8 @@
 import { isolateLocal } from "./isolate-local.js";
 import { assertCoreRuntimeVersion } from "./core-version.js";
-import { DeliverUnsupportedError, channelDispatch, resolveChannel } from "@junejs/core/agent-config";
+import { DeliverUnsupportedError, actionToTool, channelDispatch, resolveChannel } from "@junejs/core/agent-config";
 import { AgentSession, ResumeAuthorizationError, withSystem } from "@junejs/core/agent-runtime";
+import { connectAll } from "@junejs/core/connections";
 import { ensureScope, runInScope } from "@junejs/db";
 //#region src/agent-durable.ts
 var DoSessionStore = class {
@@ -101,16 +102,37 @@ var AgentDurableObject = class {
 	channelInstructions;
 	resourcesInput;
 	resourcesOpened;
+	connectionsInput;
+	connectionsOpened;
 	doEnv;
 	services;
 	resolveResources() {
 		return this.resourcesOpened ??= Promise.resolve(typeof this.resourcesInput === "function" ? this.resourcesInput(this.doEnv) : this.resourcesInput ?? {});
 	}
+	resolveConnections() {
+		return this.connectionsOpened ??= (async () => {
+			if (!this.connectionsInput?.length) return;
+			const { actions, report } = await connectAll(this.connectionsInput);
+			for (const r of report) if (r.error) console.error(`[june] agent "${this.name}": connection "${r.name}" (${r.url}) failed: ${r.error}`);
+			const seen = new Set(this.tools.map((t) => t.spec.name));
+			for (const a of actions) {
+				const tool = actionToTool(a);
+				if (seen.has(tool.spec.name)) throw new Error(`AgentDurableObject(${this.name}): duplicate tool name "${tool.spec.name}" from a connection — rename so dispatch is unambiguous.`);
+				seen.add(tool.spec.name);
+				this.tools.push(tool);
+			}
+		})();
+	}
+	async ready() {
+		const [resources] = await Promise.all([this.resolveResources(), this.resolveConnections()]);
+		return resources;
+	}
 	constructor(state, def) {
 		assertCoreRuntimeVersion(`AgentDurableObject(${def.name ?? "agent"})`);
 		const store = new DoSessionStore(state.storage);
 		const model = def.instructions ? withSystem(def.model, def.instructions) : def.model;
 		this.resourcesInput = def.resources;
+		this.connectionsInput = def.connections;
 		this.doEnv = def.env;
 		this.services = def.services;
 		const name = def.name ?? "agent";
@@ -151,6 +173,10 @@ var AgentDurableObject = class {
 		this.tools = tools;
 		this.channels = channels;
 		this.channelInstructions = def.channelInstructions;
+		if (def.channelInstructions) {
+			const names = new Set(channels.map((c) => c.name));
+			for (const source of Object.keys(def.channelInstructions)) if (!names.has(source)) console.warn(`[june] agent "${name}": surface policy "${source}" matches no channel wired into this DO (${[...names].join(", ") || "none"}) — it will never fire.`);
+		}
 	}
 	resolveSession(key) {
 		if (key !== void 0) assertSessionKey(key);
@@ -168,7 +194,7 @@ var AgentDurableObject = class {
 	}
 	async turn(input) {
 		await ensureScope();
-		const resources = await this.resolveResources();
+		const resources = await this.ready();
 		const session = this.resolveSession(input.session);
 		return runInScope({
 			resources,
@@ -177,7 +203,7 @@ var AgentDurableObject = class {
 	}
 	async start(input) {
 		await ensureScope();
-		const resources = await this.resolveResources();
+		const resources = await this.ready();
 		const session = this.resolveSession(input.session);
 		return runInScope({
 			resources,
@@ -206,7 +232,7 @@ var AgentDurableObject = class {
 				deliverChannel = this.channels.find((c) => c.name === event.source);
 				if (!deliverChannel?.deliver) return Response.json({ error: `agent "${this.name}": no deliver()-capable channel named "${event.source}" is wired into this DO (DoAgentDef.channels) — the turn was NOT started` }, { status: 501 });
 			}
-			const resources = await this.resolveResources();
+			const resources = await this.ready();
 			let session;
 			let started;
 			try {
@@ -259,7 +285,7 @@ var AgentDurableObject = class {
 				resumeChannel = this.channels.find((c) => c.name === source);
 				if (!resumeChannel?.deliverResume) return Response.json({ error: `agent "${this.name}": no deliverResume()-capable channel named "${source}" is wired into this DO (DoAgentDef.channels) — the answer was NOT applied` }, { status: 501 });
 			}
-			const resources = await this.resolveResources();
+			const resources = await this.ready();
 			let session;
 			try {
 				session = this.resolveSession(key);

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 };