@workerdeck/server 2.11.0 → 2.13.0

package/build/index.d.mts

@@ -1,5 +1,5 @@
 import { IncomingMessage, Server, ServerResponse } from "node:http";
-import { AttachmentInput, BridgeAnswer, BrowserBridgeExecutor, ClaudeAuthProbe, CostLedgerState, EngineAdapter, EngineSessionOptions, HostToolDefinition, LanguageModel, McpConnection, ParkedExecution, Runner, RunnerSnapshot, SessionRunnerConfig, ToolExecutionCall, ToolExecutionResult, ToolExecutor, ToolSet } from "@workerdeck/core";
+import { AttachmentInput, BridgeAnswer, BrowserBridgeExecutor, ClaudeAuthProbe, CostLedgerState, EngineAdapter, EngineSessionOptions, HostToolDefinition, LanguageModel, McpConnection, ParkedExecution, Runner, RunnerSnapshot, SessionInstructions, SessionRunnerConfig, ToolExecutionCall, ToolExecutionResult, ToolExecutor, ToolSet } from "@workerdeck/core";
 import { JobQueue, QueueAdapter } from "@workerdeck/queue";
 import { ByModel, CreateSessionRequest, JobEvent, MessageAttachment, ModelRate, ProfileEngine, ProfileInfo, ProfileSpend, ProfileUsage, ProviderConfig, SdkSessionSummary, ServerFrame, SessionCapability, SessionInfo, SessionNotification, SessionWebhookConfig } from "@workerdeck/protocol";
 //#region src/services/bridge.d.ts
@@ -323,7 +323,7 @@ type ProviderRunnerOptions = {
   tools?: Record<string, HostToolDefinition>;
   mcp?: McpConnection;
   mcpTools?: ToolSet;
-  instructions?: string;
+  instructions?: SessionInstructions;
   executionLimits?: {
     timeoutMs?: number;
     memoryLimitBytes?: number;

package/build/index.mjs

@@ -1,8 +1,8 @@
 import { createServer } from "node:http";
 import { WebSocketServer } from "ws";
-import { BrowserBridgeExecutor, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, SessionRunner, attachmentKind, checkClaudeAuth, createEngineSession, getEngineAdapter, installPeerDirectory, normalizeMediaType, peerDirectoryHandle, peerSummary, recentLines } from "@workerdeck/core";
+import { BrowserBridgeExecutor, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, SessionRunner, attachmentKind, checkClaudeAuth, createEngineSession, getEngineAdapter, installPeerDirectory, isSlashCommand, normalizeMediaType, peerDirectoryHandle, peerSummary, recentLines } from "@workerdeck/core";
 import { JobQueue } from "@workerdeck/queue";
-import { ENGINE_CAPABILITIES, PROTOCOL_VERSION, SHELL_COMMAND_MAX, costOfByModel, imagePartRef, isJobRun, mergeByModel, sessionState, setPricingOverrides, subscriptionComparison, supportsPermissionMode } from "@workerdeck/protocol";
+import { ENGINE_CAPABILITIES, PEER_MENTION_MAX, PROTOCOL_VERSION, SHELL_COMMAND_MAX, costOfByModel, imagePartRef, isJobRun, mergeByModel, peerMentionKey, peerMentionSlug, pickCreateSessionRequest, scanPeerMentions, sessionState, setPricingOverrides, subscriptionComparison, supportsPermissionMode } from "@workerdeck/protocol";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, constants, createReadStream, existsSync, fstatSync, ftruncateSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { constants as constants$1, homedir } from "node:os";
@@ -751,34 +751,89 @@ async function handleHostFiles(ctx, req, res, pathname) {
 	}
 	json(res, 404, { error: "not found" });
 }
-//#endregion
-//#region src/routes/create-vet.ts
-function vetCreateRequest(ctx, req, auth) {
+const HOST_ONLY_KEYS = new Set(Object.keys({
+	epoch: true,
+	queryFn: true,
+	env: true,
+	pathToClaudeCodeExecutable: true,
+	extraOptions: true,
+	instructions: true,
+	defaultApprovalTimeoutMs: true,
+	backfillHistory: true,
+	historyFn: true,
+	sessionInfoFn: true,
+	peers: true,
+	connectFn: true,
+	codexHome: true,
+	codexPathOverride: true,
+	languageModel: true,
+	tools: true,
+	maxSteps: true,
+	executor: true,
+	executableTools: true,
+	vfs: true,
+	executionLimits: true,
+	executionBackend: true,
+	toolTitles: true,
+	shouldApprove: true,
+	resolveModel: true,
+	reportMcpServers: true,
+	onClose: true,
+	restore: true
+}));
+function vetCreateRequest(ctx, body, auth) {
+	if (typeof body !== "object" || body === null || Array.isArray(body)) return {
+		ok: false,
+		status: 400,
+		error: "request body must be a JSON object"
+	};
+	const hostOnly = Object.keys(body).filter((key) => HOST_ONLY_KEYS.has(key));
+	if (hostOnly.length > 0) return {
+		ok: false,
+		status: 400,
+		error: `host-only runner config is not accepted on a session request: ${hostOnly.join(", ")} (set it from the gateway's buildRunnerConfig hook)`
+	};
+	const req = pickCreateSessionRequest(body);
 	const { availability, factory } = ctx;
 	const refusedScope = factory.applyScope(req, auth);
-	if (refusedScope) return refusedScope;
+	if (refusedScope) return {
+		ok: false,
+		...refusedScope
+	};
 	const refused = factory.applyBypassPolicy(req);
 	if (refused) return {
+		ok: false,
 		status: 403,
 		error: refused
 	};
 	const resolved = factory.resolveProfile(req.profile, auth.allowedProfiles);
 	if (!resolved.ok) return {
+		ok: false,
 		status: resolved.status,
 		error: resolved.error
 	};
 	const unavailable = availability.checkAvailable(resolved.profile);
-	if (unavailable) return unavailable;
+	if (unavailable) return {
+		ok: false,
+		...unavailable
+	};
 	const refusedCwd = factory.checkCwd(req, resolved.profile);
-	if (refusedCwd) return refusedCwd;
+	if (refusedCwd) return {
+		ok: false,
+		...refusedCwd
+	};
 	const badRequest = factory.checkPermissionMode(req.permissionMode, resolved.profile) ?? factory.checkEngineGrants(req, resolved.profile);
 	if (badRequest) return {
+		ok: false,
 		status: 400,
 		error: badRequest
 	};
 	factory.stripInertFields(req, resolved.profile);
 	req.profile = resolved.profile?.name;
-	return null;
+	return {
+		ok: true,
+		request: req
+	};
 }
 //#endregion
 //#region src/routes/jobs.ts
@@ -808,21 +863,28 @@ async function handleJobs(ctx, req, res, pathname, auth) {
 		}
 		if (req.method === "POST") {
 			const body = await readJsonBody(req, ctx.maxBodyBytes);
-			if (!body.session || typeof body.session !== "object") {
+			if (!body?.session || typeof body.session !== "object") {
 				json(res, 400, { error: "session is required" });
 				return;
 			}
-			if (!body.session.prompt || typeof body.session.prompt !== "string") {
+			const prompt = body.session.prompt;
+			if (!prompt || typeof prompt !== "string") {
 				json(res, 400, { error: "session.prompt is required" });
 				return;
 			}
-			const refusal = vetCreateRequest(ctx, body.session, auth);
-			if (refusal) {
-				json(res, refusal.status, { error: refusal.error });
+			const vetted = vetCreateRequest(ctx, body.session, auth);
+			if (!vetted.ok) {
+				json(res, vetted.status, { error: vetted.error });
 				return;
 			}
 			try {
-				json(res, 201, { job: await queue.submit(body) });
+				json(res, 201, { job: await queue.submit({
+					...body,
+					session: {
+						...vetted.request,
+						prompt
+					}
+				}) });
 			} catch (error) {
 				json(res, 400, { error: error instanceof Error ? error.message : "invalid job" });
 			}
@@ -1028,7 +1090,8 @@ const EPHEMERAL_CONFIG_KEYS = [
 	"historyFn",
 	"extraOptions",
 	"env",
-	"peers"
+	"peers",
+	"instructions"
 ];
 function toDurableRecord(record) {
 	const config = { ...record.config };
@@ -1517,13 +1580,12 @@ async function handleSessions(ctx, req, res, route, auth) {
 			return;
 		}
 		if (req.method === "POST") {
-			const body = await readJsonBody(req, ctx.maxBodyBytes);
-			const refusal = vetCreateRequest(ctx, body, auth);
-			if (refusal) {
-				json(res, refusal.status, { error: refusal.error });
+			const vetted = vetCreateRequest(ctx, await readJsonBody(req, ctx.maxBodyBytes), auth);
+			if (!vetted.ok) {
+				json(res, vetted.status, { error: vetted.error });
 				return;
 			}
-			const runner = await factory.createRunner(factory.buildRunnerConfig(body));
+			const runner = await factory.createRunner(factory.buildRunnerConfig(vetted.request));
 			factory.watchAuthSource(runner);
 			json(res, 201, { session: projects.withProject(runner.info()) });
 			return;
@@ -1611,7 +1673,15 @@ async function handleSessions(ctx, req, res, route, auth) {
 			json(res, 409, { error: "session is parked (it has no pending permission requests)" });
 			return;
 		}
-		if (!runner.resolvePermission(route.permissionId, body)) {
+		const decision = body.behavior === "allow" ? {
+			behavior: "allow",
+			updatedInput: body.updatedInput
+		} : {
+			behavior: "deny",
+			message: body.message,
+			interrupt: body.interrupt
+		};
+		if (!runner.resolvePermission(route.permissionId, decision)) {
 			json(res, 404, { error: "permission request not found (already resolved or expired)" });
 			return;
 		}
@@ -1854,13 +1924,15 @@ async function handleCommand(ctx, frame, runner, access) {
 	const { attachmentStore, bridge } = ctx;
 	switch (frame.type) {
 		case "user_message": {
+			const mentions = ctx.peers && !isSlashCommand(frame.text) ? await ctx.peers.mentions(runner.id, frame.text).catch(() => []) : [];
+			const options = mentions.length > 0 ? { mentions } : void 0;
 			if (!frame.attachmentIds?.length) {
-				runner.sendMessage(frame.text);
+				runner.sendMessage(frame.text, void 0, options);
 				return;
 			}
 			const resolved = attachmentStore.resolve(runner.id, frame.attachmentIds);
 			if (!resolved.ok) throw new Error(`unknown attachment(s): ${resolved.missing.join(", ")}`);
-			runner.sendMessage(frame.text, resolved.attachments);
+			runner.sendMessage(frame.text, resolved.attachments, options);
 			return;
 		}
 		case "permission_decision":
@@ -2740,7 +2812,6 @@ var ProfileService = class {
 			if (!hasEngineRunnerFactory) return `profile '${p.name}' uses engine 'provider' but no \`createEngineRunner\` was provided to build one`;
 		} else if (p.engine === "codex") {
 			if (p.codexHome && !existsSync(p.codexHome)) return `profile '${p.name}' codexHome does not exist: ${p.codexHome}`;
-			if (p.session?.instructions) return `profile '${p.name}' declares session.instructions, which the codex engine cannot deliver - put instructions in the target repo’s AGENTS.md instead`;
 		} else if (!p.configDir || !existsSync(p.configDir)) return `profile '${p.name}' configDir does not exist: ${p.configDir}`;
 		if (disableBypassPermissions && p.defaults?.permissionMode === "bypassPermissions") return `profile '${p.name}' defaults to bypassPermissions but disableBypassPermissions is set`;
 		const fallbackMode = p.defaults?.permissionMode;
@@ -3164,6 +3235,44 @@ function createPeerService(deps) {
 			queued: before === "running" || before === "awaiting_approval"
 		};
 	};
+	const mentions = async (from, text) => {
+		const tokens = scanPeerMentions(text);
+		if (tokens.length === 0) return [];
+		const rows = await list(from);
+		const byKey = /* @__PURE__ */ new Map();
+		const add = (key, row) => {
+			const held = byKey.get(key);
+			if (held) held.push(row);
+			else byKey.set(key, [row]);
+		};
+		for (const row of rows) {
+			add(peerMentionKey(peerMentionSlug(row.title, row.id)), row);
+			add(peerMentionKey(row.id), row);
+		}
+		const resolved = [];
+		const seen = /* @__PURE__ */ new Set();
+		for (const token of tokens) {
+			const key = peerMentionKey(token.body);
+			const exact = byKey.get(key);
+			const matches = exact ?? (key.length >= 4 ? rows.filter((row) => row.id.startsWith(key)) : []);
+			const target = matches[0];
+			if (!target || matches.length > 1 && !exact) continue;
+			if (seen.has(target.id)) continue;
+			seen.add(target.id);
+			const others = matches.slice(1, 4).map((row) => row.id);
+			resolved.push({
+				typed: token.body,
+				id: target.id,
+				name: target.title,
+				engine: target.engine,
+				status: target.status,
+				cwd: target.cwd,
+				...others.length ? { ambiguousWith: others } : {}
+			});
+			if (resolved.length >= PEER_MENTION_MAX) break;
+		}
+		return resolved;
+	};
 	const watch = (runner) => runner.subscribe((event) => {
 		if (event.type === "user_message" && !event.origin && !event.synthetic && event.parentToolUseId == null && !event.replay) inbound.delete(runner.id);
 	}, runner.info().lastSeq);
@@ -3171,6 +3280,7 @@ function createPeerService(deps) {
 		list,
 		peek,
 		send,
+		mentions,
 		watch
 	};
 }
@@ -3362,6 +3472,8 @@ function createSessionFactory(deps) {
 		const name = config.profile;
 		const profile = name !== void 0 ? profiles.get(name) : void 0;
 		if (name !== void 0 && !profile) throw new Error(`unknown profile: ${name}`);
+		const capabilities = profile?.capabilities ?? adapterFor(profile?.engine).capabilities;
+		if (config.instructions !== void 0 && capabilities.systemInstructions === false) throw new Error(`the ${engineOf(profile)} engine cannot deliver system instructions`);
 		const runner = profile && isProviderProfile(profile) ? await deps.createEngineRunner({
 			config,
 			profile,
@@ -3664,6 +3776,7 @@ function createWorkerServer(options = {}) {
 		factory,
 		registry,
 		parking,
+		peers,
 		bridge,
 		projects,
 		queue,