@keystrokehq/keystroke 1.0.5 → 1.0.6

package/dist/agent.d.cts

@@ -1,5 +1,5 @@
 import { l as ThinkingLevel, u as getModel } from "./index-BByNfhJU.cjs";
-import { A as forceToolChoice, B as runAgentPrompt, C as SubagentToolMetadata, D as defineSubagentTool, E as defineAgent, F as prompt, G as AgentModelId, H as snapshot, I as resolveAgentAssets, J as ThinkingLevelSchema, K as AgentModelIdSchema, L as resolveAgentId, M as messages, N as normalizeAgentDefinition, O as defineTool, P as prepareAgentSession, R as resolveAgentTools, S as SubagentToolInherit, T as createAgent, U as AgentCreateInput, V as runLlm, W as AgentCreateInputSchema, X as resolveAgentModel, Y as parseAgentCreateInput, Z as resolveThinkingLevel, _ as SessionAgentMismatchError, a as AgentDefinitionInput, b as SubagentTool, c as BuildAgentRuntimeContext, d as PromptInput, f as PromptResponse, g as SandboxedAgentRuntime, h as SUBAGENT_TOOL, i as AgentDefinition, j as getSubagentToolMetadata, k as errorMessage, l as DefineSubagentToolInput, m as RunAgentPromptOptions, n as AgentAssetInput, o as AgentRuntime, p as ResolvedAgentAssets, q as DEFAULT_THINKING_LEVEL, r as AgentConfig, s as AgentSnapshot, t as Agent, u as ForcedToolChoice, v as SessionLifecycle, w as buildAgentRuntime, x as SubagentToolDetails, y as SessionLifecycleContext, z as resolveAgentWorkspaceRoot } from "./index-8P2xANh8.cjs";
+import { A as forceToolChoice, B as runAgentPrompt, C as SubagentToolMetadata, D as defineSubagentTool, E as defineAgent, F as prompt, G as AgentModelId, H as snapshot, I as resolveAgentAssets, J as ThinkingLevelSchema, K as AgentModelIdSchema, L as resolveAgentId, M as messages, N as normalizeAgentDefinition, O as defineTool, P as prepareAgentSession, R as resolveAgentTools, S as SubagentToolInherit, T as createAgent, U as AgentCreateInput, V as runLlm, W as AgentCreateInputSchema, X as resolveAgentModel, Y as parseAgentCreateInput, Z as resolveThinkingLevel, _ as SessionAgentMismatchError, a as AgentDefinitionInput, b as SubagentTool, c as BuildAgentRuntimeContext, d as PromptInput, f as PromptResponse, g as SandboxedAgentRuntime, h as SUBAGENT_TOOL, i as AgentDefinition, j as getSubagentToolMetadata, k as errorMessage, l as DefineSubagentToolInput, m as RunAgentPromptOptions, n as AgentAssetInput, o as AgentRuntime, p as ResolvedAgentAssets, q as DEFAULT_THINKING_LEVEL, r as AgentConfig, s as AgentSnapshot, t as Agent, u as ForcedToolChoice, v as SessionLifecycle, w as buildAgentRuntime, x as SubagentToolDetails, y as SessionLifecycleContext, z as resolveAgentWorkspaceRoot } from "./index-Dd0B13U7.cjs";
 import { a as McpDefinition, c as McpServerOptions, d as McpTransport, f as connectMcpDefinition, g as isMcp, h as defineMcp, i as McpConnection, l as McpStdioOptions, m as connectMcpStdio, n as McpAuthOptions, o as McpDefinitionInput, p as connectMcpServer, r as McpCallToolOptions, s as McpHttpTransport, t as ToolCredentialResolver, u as McpStdioTransport } from "./index-nUAXCgEe.cjs";
-import { M as loadAssetManifest } from "./index-hw0FZ4e3.cjs";
+import { z as loadAssetManifest } from "./index-DstR-eGs.cjs";
 export { type Agent, type AgentAssetInput, type AgentConfig, type AgentCreateInput, AgentCreateInputSchema, type AgentDefinition, type AgentDefinitionInput, type AgentModelId, AgentModelIdSchema, type AgentRuntime, type AgentSnapshot, type BuildAgentRuntimeContext, DEFAULT_THINKING_LEVEL, type DefineSubagentToolInput, type ForcedToolChoice, type McpAuthOptions, type McpCallToolOptions, type McpConnection, type McpDefinition, type McpDefinitionInput, type McpHttpTransport, type McpServerOptions, type McpStdioOptions, type McpStdioTransport, type McpTransport, type PromptInput, type PromptResponse, type ResolvedAgentAssets, type RunAgentPromptOptions, SUBAGENT_TOOL, type SandboxedAgentRuntime, SessionAgentMismatchError, type SessionLifecycle, type SessionLifecycleContext, type SubagentTool, type SubagentToolDetails, type SubagentToolInherit, type SubagentToolMetadata, type ThinkingLevel, ThinkingLevelSchema, type ToolCredentialResolver, buildAgentRuntime, connectMcpDefinition, connectMcpServer, connectMcpStdio, createAgent, defineAgent, defineMcp, defineSubagentTool, defineTool, errorMessage, forceToolChoice, getModel, getSubagentToolMetadata, isMcp, loadAssetManifest, messages, normalizeAgentDefinition, parseAgentCreateInput, prepareAgentSession, prompt, resolveAgentAssets, resolveAgentId, resolveAgentModel, resolveAgentTools, resolveAgentWorkspaceRoot, resolveThinkingLevel, runAgentPrompt, runLlm, snapshot };

package/dist/agent.d.mts

@@ -1,5 +1,5 @@
 import { l as ThinkingLevel, u as getModel } from "./index-ClGiGBy7.mjs";
-import { A as forceToolChoice, B as runAgentPrompt, C as SubagentToolMetadata, D as defineSubagentTool, E as defineAgent, F as prompt, G as AgentModelId, H as snapshot, I as resolveAgentAssets, J as ThinkingLevelSchema, K as AgentModelIdSchema, L as resolveAgentId, M as messages, N as normalizeAgentDefinition, O as defineTool, P as prepareAgentSession, R as resolveAgentTools, S as SubagentToolInherit, T as createAgent, U as AgentCreateInput, V as runLlm, W as AgentCreateInputSchema, X as resolveAgentModel, Y as parseAgentCreateInput, Z as resolveThinkingLevel, _ as SessionAgentMismatchError, a as AgentDefinitionInput, b as SubagentTool, c as BuildAgentRuntimeContext, d as PromptInput, f as PromptResponse, g as SandboxedAgentRuntime, h as SUBAGENT_TOOL, i as AgentDefinition, j as getSubagentToolMetadata, k as errorMessage, l as DefineSubagentToolInput, m as RunAgentPromptOptions, n as AgentAssetInput, o as AgentRuntime, p as ResolvedAgentAssets, q as DEFAULT_THINKING_LEVEL, r as AgentConfig, s as AgentSnapshot, t as Agent, u as ForcedToolChoice, v as SessionLifecycle, w as buildAgentRuntime, x as SubagentToolDetails, y as SessionLifecycleContext, z as resolveAgentWorkspaceRoot } from "./index-CnbEp2h3.mjs";
+import { A as forceToolChoice, B as runAgentPrompt, C as SubagentToolMetadata, D as defineSubagentTool, E as defineAgent, F as prompt, G as AgentModelId, H as snapshot, I as resolveAgentAssets, J as ThinkingLevelSchema, K as AgentModelIdSchema, L as resolveAgentId, M as messages, N as normalizeAgentDefinition, O as defineTool, P as prepareAgentSession, R as resolveAgentTools, S as SubagentToolInherit, T as createAgent, U as AgentCreateInput, V as runLlm, W as AgentCreateInputSchema, X as resolveAgentModel, Y as parseAgentCreateInput, Z as resolveThinkingLevel, _ as SessionAgentMismatchError, a as AgentDefinitionInput, b as SubagentTool, c as BuildAgentRuntimeContext, d as PromptInput, f as PromptResponse, g as SandboxedAgentRuntime, h as SUBAGENT_TOOL, i as AgentDefinition, j as getSubagentToolMetadata, k as errorMessage, l as DefineSubagentToolInput, m as RunAgentPromptOptions, n as AgentAssetInput, o as AgentRuntime, p as ResolvedAgentAssets, q as DEFAULT_THINKING_LEVEL, r as AgentConfig, s as AgentSnapshot, t as Agent, u as ForcedToolChoice, v as SessionLifecycle, w as buildAgentRuntime, x as SubagentToolDetails, y as SessionLifecycleContext, z as resolveAgentWorkspaceRoot } from "./index-IhPXtbNf.mjs";
 import { a as McpDefinition, c as McpServerOptions, d as McpTransport, f as connectMcpDefinition, g as isMcp, h as defineMcp, i as McpConnection, l as McpStdioOptions, m as connectMcpStdio, n as McpAuthOptions, o as McpDefinitionInput, p as connectMcpServer, r as McpCallToolOptions, s as McpHttpTransport, t as ToolCredentialResolver, u as McpStdioTransport } from "./index-8_UEbXaF.mjs";
-import { M as loadAssetManifest } from "./index-D2z4tjak.mjs";
+import { z as loadAssetManifest } from "./index-B3iWqXUd.mjs";
 export { type Agent, type AgentAssetInput, type AgentConfig, type AgentCreateInput, AgentCreateInputSchema, type AgentDefinition, type AgentDefinitionInput, type AgentModelId, AgentModelIdSchema, type AgentRuntime, type AgentSnapshot, type BuildAgentRuntimeContext, DEFAULT_THINKING_LEVEL, type DefineSubagentToolInput, type ForcedToolChoice, type McpAuthOptions, type McpCallToolOptions, type McpConnection, type McpDefinition, type McpDefinitionInput, type McpHttpTransport, type McpServerOptions, type McpStdioOptions, type McpStdioTransport, type McpTransport, type PromptInput, type PromptResponse, type ResolvedAgentAssets, type RunAgentPromptOptions, SUBAGENT_TOOL, type SandboxedAgentRuntime, SessionAgentMismatchError, type SessionLifecycle, type SessionLifecycleContext, type SubagentTool, type SubagentToolDetails, type SubagentToolInherit, type SubagentToolMetadata, type ThinkingLevel, ThinkingLevelSchema, type ToolCredentialResolver, buildAgentRuntime, connectMcpDefinition, connectMcpServer, connectMcpStdio, createAgent, defineAgent, defineMcp, defineSubagentTool, defineTool, errorMessage, forceToolChoice, getModel, getSubagentToolMetadata, isMcp, loadAssetManifest, messages, normalizeAgentDefinition, parseAgentCreateInput, prepareAgentSession, prompt, resolveAgentAssets, resolveAgentId, resolveAgentModel, resolveAgentTools, resolveAgentWorkspaceRoot, resolveThinkingLevel, runAgentPrompt, runLlm, snapshot };

package/dist/agent.mjs

@@ -1,7 +1,7 @@
 import { i as __require, r as __exportAll, t as __commonJSMin } from "./chunk-D0VCBZRD.mjs";
 import { E as toolParameters, c as getWorkflowRunHandle, d as isWithinActionExecution, l as isAction, m as resolveActionTool, s as getRunSignal } from "./dist-6ug9ozqR.mjs";
 import { A as touchSession, C as createSession, D as listMessageEvents, E as getSession, M as getTraceContext, O as recordLlmUsageFromAssistantMessage, P as withSpan, S as appendEvent, T as getProjectScopeId, a as resolveActionCredentials, b as MESSAGE_EVENT_TYPE, c as connectMcpServer, d as isMcp, i as isCredentialError, j as captureConsole, k as resolveRunSourceFromTraceContext, l as connectMcpStdio, n as captureCredentialToolErrors, o as resolveMcpTools, r as createCredentialResolver, s as connectMcpDefinition, t as buildCredentialRunContext, u as defineMcp, w as getAgentByRoute, x as addAgentSessionDuration } from "./dist-BgFLp5DL.mjs";
-import { $t as IsConstructor$2, An as IsLessEqualThan$1, At as IsLiteralString, Bn as IsSymbol$1, Bt as Unreachable, Cn as IsDeepEqual$1, Ct as IsNumber$2, Dn as IsGreaterThan$1, Dt as IsLiteralBigInt, En as IsGreaterEqualThan$1, Et as IsLiteral, Fn as IsNull$1, Ft as IsBoolean$2, Gn as Symbols, Gt as IsUnion, Hn as IsUnsafePropertyKey, Ht as IsEnum$1, In as IsNumber$1, It as IsBigInt$2, J as loadAssetManifest, Jt as _Object_, Kn as guard_exports, Kt as Union, Ln as IsObject$1, Lt as IsCodec, Mn as IsMaxLength$2, Mt as IsIterator$2, Nn as IsMinLength$2, Nt as IsInteger$2, On as IsInteger$1, Ot as IsLiteralBoolean, Pn as IsMultipleOf$1, Pt as Boolean$1, Qt as IsFunction$2, Rn as IsObjectNotArray$1, Rt as Hash, Sn as IsConstructor$1, St as IsSymbol$2, Tn as IsFunction$1, Tt as IsNull$2, Un as IsValueLike, Ut as IsCyclic, Vn as IsUndefined$1, Vt as IsIntersect, Wn as Keys$1, Wt as Unknown, Xt as IsRef$1, Y as materializeSandbox, Yt as IsNever, Zt as Ref$1, _n as IsArray$1, _t as IsTuple, a as defaultWorkspacesRoot, an as Optional, at as ensureWorkspaceDir, bn as IsBoolean$1, bt as IsString$2, cn as Get$3, ct as Instantiate, dn as IsTypeArray, dt as IsTemplateLiteral, en as IsAsyncIterator$2, et as resolveSandboxDefinition, fn as Entries$2, ft as IsVoid, gn as HasPropertyKey$1, gt as RecordValue, hn as EveryAll, ht as RecordPattern, i as createSandbox, in as IsOptional, jn as IsLessThan$1, jt as Literal, kn as IsIterator$1, kt as IsLiteralNumber, l as materializeSkills, ln as IsMap, lt as Options, mn as Every$1, mt as IsRecord, n as createInvokeToolBridge, nn as Base, o as defineSkill, on as IsPromise, ot as resolveSandboxRoot, pn as EntriesRegExp, pt as IsUndefined$2, q as getBoundAppRoot, qt as IsObject$2, rn as IsBase, sn as IsSchema$1, st as Evaluate$1, tn as IsArray$2, un as IsSet, ut as Compare, vn as IsAsyncIterator$1, vt as EnumToUnion, wn as IsEqual$1, wt as Number$1, xn as IsClassInstance, xt as String$1, yn as IsBigInt$1, yt as TemplateLiteralDecode, zn as IsString$1, zt as hash_exports } from "./dist-n5qeJqNu.mjs";
+import { $t as _Object_, An as IsFunction$1, At as IsNull$2, Bn as IsNull$1, Bt as IsBoolean$2, Cn as IsAsyncIterator$1, Ct as EnumToUnion, Dn as IsConstructor$1, Dt as IsSymbol$2, En as IsClassInstance, Et as String$1, Fn as IsLessEqualThan$1, Ft as IsLiteralString, Gn as IsSymbol$1, Gt as Unreachable, Hn as IsObject$1, Ht as IsCodec, In as IsLessThan$1, It as Literal, J as getBoundAppRoot, Jn as IsValueLike, Jt as IsCyclic, Kn as IsUndefined$1, Kt as IsIntersect, Ln as IsMaxLength$2, Lt as IsIterator$2, Mn as IsGreaterThan$1, Mt as IsLiteralBigInt, Nn as IsInteger$1, Nt as IsLiteralBoolean, On as IsDeepEqual$1, Ot as IsNumber$2, Pn as IsIterator$1, Pt as IsLiteralNumber, Qt as IsObject$2, Rn as IsMinLength$2, Rt as IsInteger$2, Sn as IsArray$1, St as IsTuple, Tn as IsBoolean$1, Tt as IsString$2, Un as IsObjectNotArray$1, Ut as Hash, Vn as IsNumber$1, Vt as IsBigInt$2, Wn as IsString$1, Wt as hash_exports, X as materializeSandbox, Xn as Symbols, Xt as IsUnion, Y as loadAssetManifest, Yn as Keys$1, Yt as Unknown, Zn as guard_exports, Zt as Union, _n as Entries$2, _t as IsVoid, a as defaultWorkspacesRoot, an as IsAsyncIterator$2, bn as EveryAll, bt as RecordPattern, cn as IsBase, ct as ensureWorkspaceDir, dn as IsPromise, dt as resolveSessionRoot, en as IsNever, fn as IsSchema$1, ft as Evaluate$1, gn as IsTypeArray, gt as IsTemplateLiteral, hn as IsSet, ht as Compare, i as createSandbox, in as IsConstructor$2, jn as IsGreaterEqualThan$1, jt as IsLiteral, kn as IsEqual$1, kt as Number$1, l as materializeSkills, ln as IsOptional, lt as resolveAgentRoot, mn as IsMap, mt as Options, n as createInvokeToolBridge, nn as Ref$1, o as defineSkill, on as IsArray$2, p as sandboxSystemPromptInjection, pn as Get$3, pt as Instantiate, qn as IsUnsafePropertyKey, qt as IsEnum$1, rn as IsFunction$2, sn as Base, tn as IsRef$1, tt as resolveSandboxDefinition, un as Optional, vn as EntriesRegExp, vt as IsUndefined$2, wn as IsBigInt$1, wt as TemplateLiteralDecode, xn as HasPropertyKey$1, xt as RecordValue, yn as Every$1, yt as IsRecord, zn as IsMultipleOf$1, zt as Boolean$1 } from "./dist-CRsUBf24.mjs";
 import "./env-api-keys-24ayFQZr.mjs";
 import { i as getModel, t as AssistantMessageEventStream } from "./event-stream-C7YBbzsc.mjs";
 import "./json-parse-C01lczI5.mjs";
@@ -14088,43 +14088,56 @@ async function runDirectAgentPrompt(agent, agentSlug, promptInput, runPrompt) {
 	return runAgentPrompt(agent, await resolveAgentId(agentSlug, promptInput.agentId), promptInput, runPrompt);
 }
 /**
-* Resolve the host directory backing `/workspace` for an agent prompt.
+* Resolve host directories backing `/workspace/agent` and `/workspace/session`.
 *
 * Precedence:
-* 1. Explicit `workspaceRoot` override — skips sandbox materialization.
-* 2. Agent `sandbox` definition — materialize to `{workspacesRoot}/{sessionId}/`.
-* 3. Default session dir — `{workspacesRoot}/{sessionId}/`.
+* 1. Explicit `agentRoot` / `sessionRoot` overrides — skips sandbox materialization.
+* 2. Agent `sandbox` definition — materialize files to `{workspacesRoot}/agents/{agentId}/`.
+* 3. Default agent + session dirs under `{workspacesRoot}/agents/` and `{workspacesRoot}/sessions/`.
 *
-* Agent skills always materialize into the resolved workspace when configured.
+* Agent skills always materialize into the agent root when configured.
 */
-async function resolveAgentWorkspaceRoot(sessionId, options) {
-	if (options.workspaceRoot) {
+async function resolveAgentWorkspaceRoot(agentId, sessionId, options) {
+	const workspacesRoot = options.workspacesRoot ?? defaultWorkspacesRoot();
+	const agentRoot = options.agentRoot ?? options.workspaceRoot ?? resolveAgentRoot(workspacesRoot, agentId);
+	const sessionRoot = options.sessionRoot ?? resolveSessionRoot(workspacesRoot, sessionId);
+	if (options.agentRoot || options.workspaceRoot) {
 		if (options.skills?.length) await materializeSkills({
-			workspaceRoot: options.workspaceRoot,
+			workspaceRoot: agentRoot,
 			skills: options.skills
 		});
-		return options.workspaceRoot;
+		await ensureWorkspaceDir(sessionRoot);
+		return {
+			agentRoot,
+			sessionRoot
+		};
 	}
-	const workspacesRoot = options.workspacesRoot ?? defaultWorkspacesRoot();
 	if (options.sandbox) {
-		const instance = await materializeSandbox({
+		await materializeSandbox({
 			workspacesRoot,
-			sessionId,
+			agentId,
 			definition: options.sandbox
 		});
 		if (options.skills?.length) await materializeSkills({
-			workspaceRoot: instance.root,
+			workspaceRoot: agentRoot,
 			skills: options.skills
 		});
-		return instance.root;
+		await ensureWorkspaceDir(sessionRoot);
+		return {
+			agentRoot,
+			sessionRoot
+		};
 	}
-	const root = resolveSandboxRoot(workspacesRoot, sessionId);
-	await ensureWorkspaceDir(root);
+	await ensureWorkspaceDir(agentRoot);
+	await ensureWorkspaceDir(sessionRoot);
 	if (options.skills?.length) await materializeSkills({
-		workspaceRoot: root,
+		workspaceRoot: agentRoot,
 		skills: options.skills
 	});
-	return root;
+	return {
+		agentRoot,
+		sessionRoot
+	};
 }
 async function resolveAgentTools(tools, resolver) {
 	const prepared = [];
@@ -14165,8 +14178,10 @@ async function resolveMemoryFactory(memoryOption, defMemory, injectedFactory) {
 }
 /** Sandbox tools + host tools → pi agent from a {@link AgentDefinition}. */
 async function buildAgentRuntime(def, ctx, runPrompt = {}) {
-	const workspaceRoot = await resolveAgentWorkspaceRoot(ctx.sessionId, {
+	const { agentRoot, sessionRoot } = await resolveAgentWorkspaceRoot(ctx.agentId, ctx.sessionId, {
 		workspacesRoot: runPrompt.workspacesRoot,
+		agentRoot: runPrompt.agentRoot,
+		sessionRoot: runPrompt.sessionRoot,
 		workspaceRoot: runPrompt.workspaceRoot,
 		sandbox: def.sandbox,
 		skills: def.skills
@@ -14196,7 +14211,8 @@ async function buildAgentRuntime(def, ctx, runPrompt = {}) {
 	const handle = await createSandbox({
 		agentId: ctx.agentId,
 		sessionId: ctx.sessionId,
-		workspaceRoot,
+		agentRoot,
+		sessionRoot,
 		workspacesRoot: runPrompt.workspacesRoot,
 		mode,
 		provider: runPrompt.runtimeProvider,
@@ -14206,6 +14222,10 @@ async function buildAgentRuntime(def, ctx, runPrompt = {}) {
 	});
 	const tools = [...handle.tools, ...hostTools];
 	let systemPrompt = def.systemPrompt;
+	systemPrompt = `${sandboxSystemPromptInjection({
+		hasUserFiles: (def.sandbox?.files?.length ?? 0) > 0,
+		hasSkills: Boolean(def.skills?.length)
+	})}\n\n${systemPrompt}`;
 	if (memory) systemPrompt = `${memory.systemPromptInjection()}\n\n${systemPrompt}`;
 	const thinkingLevel = resolveThinkingLevel(runPrompt.thinkingLevel ?? def.thinkingLevel);
 	return {
@@ -14219,7 +14239,8 @@ async function buildAgentRuntime(def, ctx, runPrompt = {}) {
 		sandbox: handle.runtime,
 		tools,
 		mcpConnections: resolved.mcpConnections,
-		workspaceRoot,
+		agentRoot,
+		sessionRoot,
 		agentId: ctx.agentId,
 		sessionId: ctx.sessionId,
 		memory,