@workerdeck/core 2.12.0 → 2.13.0

package/build/index.d.mts

@@ -253,6 +253,16 @@ type SubscribeOptions = {
   imageRefs?: boolean;
 };
 //#endregion
+//#region src/lib/instructions.d.ts
+type InstructionsContext = {
+  sessionId: string;
+  cwd?: string;
+  profile?: string;
+};
+type SessionInstructions = string | ((context: InstructionsContext) => string);
+declare function resolveInstructions(instructions: SessionInstructions | undefined, context: InstructionsContext): string | undefined;
+declare function composeInstructions(...parts: Array<SessionInstructions | undefined>): SessionInstructions | undefined;
+//#endregion
 //#region src/engines/claude/runner.d.ts
 type QueryFn = (params: {
   prompt: AsyncIterable<SDKUserMessage>;
@@ -270,6 +280,7 @@ type SessionRunnerConfig = CreateSessionRequest & {
   env?: Record<string, string | undefined>;
   pathToClaudeCodeExecutable?: string;
   extraOptions?: Partial<Options>;
+  instructions?: SessionInstructions;
   defaultApprovalTimeoutMs?: number | null;
   backfillHistory?: boolean;
   historyFn?: HistoryFn;
@@ -324,7 +335,7 @@ type AiSdkRunnerConfig = Omit<CreateSessionRequest, 'cwd'> & {
   cwd?: string;
   languageModel: LanguageModel$1;
   tools?: ToolSet$1;
-  instructions?: string;
+  instructions?: SessionInstructions;
   maxSteps?: number;
   executor?: ToolExecutor;
   executableTools?: string[];
@@ -631,7 +642,7 @@ type EngineSessionOptions = {
   mcp?: McpConnection;
   mcpTools?: ToolSet$1;
   tools?: Record<string, HostToolDefinition>;
-  instructions?: string;
+  instructions?: SessionInstructions;
   executionLimits?: {
     timeoutMs?: number;
     memoryLimitBytes?: number;
@@ -905,6 +916,8 @@ type CodexRunnerConfig = CreateSessionRequest & {
   connectFn: AppServerConnectFn;
   env?: Record<string, string | undefined>;
   codexHome?: string;
+  codexPathOverride?: string;
+  instructions?: SessionInstructions;
   defaultApprovalTimeoutMs?: number | null;
   backfillHistory?: boolean;
   peers?: PeerDirectory;
@@ -964,5 +977,5 @@ declare class JsonRpcStdioConnection {
 //#region src/engines/provider/adapter.d.ts
 declare const providerAdapter: EngineAdapter;
 //#endregion
-export { AiSdkRunner, type AiSdkRunnerConfig, type AiSdkSessionState, type AppServerConnectFn, type AppServerConnectOptions, type AppServerConnection, type AppServerHistoryTurn, type AppServerItem, type AppServerThreadListResponse, type AppServerThreadSummary, type AppServerTokenUsage, type AppServerTurn, type AppServerUserInput, type AttachmentInput, type AttachmentKind, type BridgeAnswer, BrowserBridgeExecutor, type BrowserBridgeExecutorOptions, CLAUDE_CATALOG, CODEX_CATALOG, type ClaudeAuthProbe, type ClaudeAuthStatus, CodexRunner, type CodexRunnerConfig, type CostFigures, CostLedger, type CostLedgerState, type DeferredDispatch, DeferredExecutor, type DeferredExecutorOptions, type EngineAdapter, type EngineAvailability, type EngineRunnerRequest, type EngineSessionOptions, type HistoryFn, type HostFetch, type HostToolDefinition, InputQueue, JsonRpcError, JsonRpcStdioConnection, type LanguageModel, type LocalCommandResult, type McpConnection, type ModelCatalog, PEER_MCP_SERVER, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, PEER_TOOL_NAMES, type ParkedExecution, type PeerDirectory, type PeerMention, type PeerPeek, type PeerSendOptions, type PeerSendResult, type PeerSessionSummary, type PeerToolName, type PeerToolSpec, type PendingEntry, type PendingKind, type PendingOutcome, PendingRequestRegistry, type PendingToolCall, type PermissionDecision, type QueryFn, QuickJsExecutor, type QuickJsExecutorOptions, type RegisterOptions, type Runner, type RunnerSnapshot, SUPPORTED_ATTACHMENT_TYPES, type SendMessageOptions, type SessionEventListener, SessionRunner, type SessionRunnerConfig, type SettledBy, type Tool, type ToolCallOutput, type ToolContext, type ToolContextOptions, type ToolDefinition, type ToolExecutionCall, type ToolExecutionDispatch, type ToolExecutionResult, type ToolExecutor, type ToolSet, type ToolTrust, type WebFetchDigest, type WebFetchFn, type WebFetchOptions, type WebFetchResult, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, installPeerDirectory, installedPeerDirectory, isHostAllowed, isPrivateAddress, isSlashCommand, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, peerDirectoryHandle, peerMentionsEnvelope, peerMessageEnvelope, peerSummary, peerToolSpecs, providerAdapter, recentLines, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, runPeerTool, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools, withPeerContext };
+export { AiSdkRunner, type AiSdkRunnerConfig, type AiSdkSessionState, type AppServerConnectFn, type AppServerConnectOptions, type AppServerConnection, type AppServerHistoryTurn, type AppServerItem, type AppServerThreadListResponse, type AppServerThreadSummary, type AppServerTokenUsage, type AppServerTurn, type AppServerUserInput, type AttachmentInput, type AttachmentKind, type BridgeAnswer, BrowserBridgeExecutor, type BrowserBridgeExecutorOptions, CLAUDE_CATALOG, CODEX_CATALOG, type ClaudeAuthProbe, type ClaudeAuthStatus, CodexRunner, type CodexRunnerConfig, type CostFigures, CostLedger, type CostLedgerState, type DeferredDispatch, DeferredExecutor, type DeferredExecutorOptions, type EngineAdapter, type EngineAvailability, type EngineRunnerRequest, type EngineSessionOptions, type HistoryFn, type HostFetch, type HostToolDefinition, InputQueue, type InstructionsContext, JsonRpcError, JsonRpcStdioConnection, type LanguageModel, type LocalCommandResult, type McpConnection, type ModelCatalog, PEER_MCP_SERVER, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, PEER_TOOL_NAMES, type ParkedExecution, type PeerDirectory, type PeerMention, type PeerPeek, type PeerSendOptions, type PeerSendResult, type PeerSessionSummary, type PeerToolName, type PeerToolSpec, type PendingEntry, type PendingKind, type PendingOutcome, PendingRequestRegistry, type PendingToolCall, type PermissionDecision, type QueryFn, QuickJsExecutor, type QuickJsExecutorOptions, type RegisterOptions, type Runner, type RunnerSnapshot, SUPPORTED_ATTACHMENT_TYPES, type SendMessageOptions, type SessionEventListener, type SessionInstructions, SessionRunner, type SessionRunnerConfig, type SettledBy, type Tool, type ToolCallOutput, type ToolContext, type ToolContextOptions, type ToolDefinition, type ToolExecutionCall, type ToolExecutionDispatch, type ToolExecutionResult, type ToolExecutor, type ToolSet, type ToolTrust, type WebFetchDigest, type WebFetchFn, type WebFetchOptions, type WebFetchResult, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, composeInstructions, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, installPeerDirectory, installedPeerDirectory, isHostAllowed, isPrivateAddress, isSlashCommand, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, peerDirectoryHandle, peerMentionsEnvelope, peerMessageEnvelope, peerSummary, peerToolSpecs, providerAdapter, recentLines, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, resolveInstructions, runPeerTool, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools, withPeerContext };
 //# sourceMappingURL=index.d.mts.map

package/build/index.mjs

@@ -971,6 +971,19 @@ function withTitle(config, title) {
 	};
 }
 //#endregion
+//#region src/lib/instructions.ts
+function resolveInstructions(instructions, context) {
+	if (instructions === void 0) return;
+	const text = (typeof instructions === "function" ? instructions(context) : instructions).trim();
+	return text === "" ? void 0 : text;
+}
+function composeInstructions(...parts) {
+	const present = parts.filter((part) => part !== void 0 && part !== "");
+	if (present.length <= 1) return present[0];
+	if (present.every((part) => typeof part === "string")) return present.join("\n\n");
+	return (context) => present.map((part) => resolveInstructions(part, context)).filter((text) => text !== void 0).join("\n\n");
+}
+//#endregion
 //#region src/lib/peers.ts
 const PEER_MCP_SERVER = "workerdeck";
 const PEER_MESSAGE_MAX_CHARS = 16e3;
@@ -1343,6 +1356,7 @@ var SessionRunner = class {
 	createdAt;
 	#config;
 	#cwd;
+	#instructions;
 	#log = new EventLog();
 	#subscribers = new SubscriberSet();
 	#tasks = new TaskChecklist();
@@ -1379,6 +1393,12 @@ var SessionRunner = class {
 		this.#permissionMode = config.permissionMode;
 		this.id = id;
 		this.createdAt = Date.now();
+		this.#instructions = resolveInstructions(config.instructions, {
+			sessionId: id,
+			cwd: config.cwd,
+			profile: config.profile
+		});
+		if (this.#instructions !== void 0 && config.extraOptions?.systemPrompt !== void 0) throw new Error("instructions and extraOptions.systemPrompt both set - the host must pick one");
 	}
 	get status() {
 		return this.#status;
@@ -1661,7 +1681,12 @@ var SessionRunner = class {
 			env: c.env,
 			pathToClaudeCodeExecutable: c.pathToClaudeCodeExecutable,
 			...c.permissionMode === "bypassPermissions" || c.allowDangerouslySkipPermissions ? { allowDangerouslySkipPermissions: true } : {},
-			...c.extraOptions
+			...c.extraOptions,
+			...this.#instructions === void 0 ? {} : { systemPrompt: {
+				type: "preset",
+				preset: "claude_code",
+				append: this.#instructions
+			} }
 		};
 	}
 	#mcpServersOption() {
@@ -2046,6 +2071,7 @@ var AiSdkRunner = class {
 	id;
 	createdAt;
 	#config;
+	#instructions;
 	#model;
 	#log = new EventLog();
 	#subscribers = new SubscriberSet();
@@ -2075,6 +2101,11 @@ var AiSdkRunner = class {
 		this.#modelAlias = config.model;
 		this.id = config.restore?.id ?? id;
 		this.createdAt = config.restore?.createdAt ?? Date.now();
+		this.#instructions = resolveInstructions(config.instructions, {
+			sessionId: this.id,
+			cwd: config.cwd,
+			profile: config.profile
+		});
 		if (config.restore) this.#restore(config.restore);
 	}
 	#restore(snapshot) {
@@ -2646,7 +2677,7 @@ var AiSdkRunner = class {
 		const agent = new ToolLoopAgent({
 			model: this.#model,
 			tools: this.#config.tools ?? {},
-			instructions: this.#config.instructions,
+			instructions: this.#instructions,
 			stopWhen: isStepCount(this.#config.maxSteps ?? 20)
 		});
 		const abort = new AbortController();
@@ -3718,7 +3749,7 @@ function createEngineSession(options) {
 	runner = new AiSdkRunner({
 		...options.config,
 		languageModel: options.resolveModel(options.profile, options.config),
-		instructions: options.profile?.session?.instructions ?? options.instructions ?? options.config.instructions,
+		instructions: composeInstructions(options.profile?.session?.instructions, options.instructions, options.config.instructions),
 		tools: context.tools,
 		vfs,
 		executor,
@@ -3954,9 +3985,12 @@ const claudeAdapter = {
 		};
 		return { available: "unknown" };
 	},
-	createRunner({ config, restore, id }) {
+	createRunner({ config, profile, restore, id }) {
 		if (restore) throw new Error("the Claude engine cannot rebuild a parked session");
-		return new SessionRunner(config, id);
+		return new SessionRunner({
+			...config,
+			instructions: composeInstructions(profile?.session?.instructions, config.instructions)
+		}, id);
 	},
 	async listSessions({ dir, limit, offset }) {
 		return (await listSessions({
@@ -4771,6 +4805,7 @@ var CodexRunner = class {
 	createdAt;
 	#config;
 	#cwd;
+	#instructions;
 	#log = new EventLog();
 	#subscribers = new SubscriberSet();
 	#status = "starting";
@@ -4827,6 +4862,11 @@ var CodexRunner = class {
 		this.#threadMaterialized = config.resume !== void 0;
 		this.id = id;
 		this.createdAt = Date.now();
+		this.#instructions = resolveInstructions(config.instructions, {
+			sessionId: id,
+			cwd: config.cwd,
+			profile: config.profile
+		});
 	}
 	#childEnv() {
 		return codexChildEnv(this.#config.env ?? process.env, this.#config.codexHome);
@@ -5252,6 +5292,7 @@ var CodexRunner = class {
 				approvalsReviewer: APPROVALS_REVIEWER_BY_MODE[this.#permissionMode]
 			};
 			if (this.#model) options.model = this.#model;
+			if (this.#instructions !== void 0) options.developerInstructions = this.#instructions;
 			if (this.#config.peers) options.dynamicTools = peerToolSpecs().map((spec) => ({
 				type: "function",
 				...spec
@@ -6391,6 +6432,7 @@ const codexAdapter = {
 		return new CodexRunner({
 			...config,
 			codexHome: profile?.codexHome,
+			instructions: composeInstructions(profile?.session?.instructions, config.instructions),
 			connectFn: (options) => connectAppServer({
 				executable,
 				...options
@@ -6443,6 +6485,6 @@ function getEngineAdapter(engine) {
 	return ADAPTERS[engine ?? "claude"];
 }
 //#endregion
-export { AiSdkRunner, BrowserBridgeExecutor, CLAUDE_CATALOG, CODEX_CATALOG, CodexRunner, CostLedger, DeferredExecutor, InputQueue, JsonRpcError, JsonRpcStdioConnection, PEER_MCP_SERVER, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, PEER_TOOL_NAMES, PendingRequestRegistry, QuickJsExecutor, SUPPORTED_ATTACHMENT_TYPES, SessionRunner, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, installPeerDirectory, installedPeerDirectory, isHostAllowed, isPrivateAddress, isSlashCommand, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, peerDirectoryHandle, peerMentionsEnvelope, peerMessageEnvelope, peerSummary, peerToolSpecs, providerAdapter, recentLines, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, runPeerTool, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools, withPeerContext };
+export { AiSdkRunner, BrowserBridgeExecutor, CLAUDE_CATALOG, CODEX_CATALOG, CodexRunner, CostLedger, DeferredExecutor, InputQueue, JsonRpcError, JsonRpcStdioConnection, PEER_MCP_SERVER, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, PEER_TOOL_NAMES, PendingRequestRegistry, QuickJsExecutor, SUPPORTED_ATTACHMENT_TYPES, SessionRunner, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, composeInstructions, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, installPeerDirectory, installedPeerDirectory, isHostAllowed, isPrivateAddress, isSlashCommand, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, peerDirectoryHandle, peerMentionsEnvelope, peerMessageEnvelope, peerSummary, peerToolSpecs, providerAdapter, recentLines, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, resolveInstructions, runPeerTool, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools, withPeerContext };
 
 //# sourceMappingURL=index.mjs.map