diff --git a/src/agent.ts b/src/agent.ts
index 0164bcf..384fd2c 100644
--- a/src/agent.ts
+++ b/src/agent.ts
@@ -57,13 +57,12 @@ export class WorkflowAgent {
       customTools.push(createStructuredOutputTool({ schema: options.schema, capture }) as unknown as ToolDefinition);
     }
 
+    const agentDir = getAgentDir();
     const { session } = await createAgentSession({
       cwd: this.cwd,
-      agentDir: getAgentDir(),
-      sessionManager: SessionManager.inMemory(),
-      settingsManager: SettingsManager.inMemory({
-        compaction: { enabled: false },
-      }),
+      agentDir,
+      sessionManager: SessionManager.inMemory(this.cwd),
+      settingsManager: SettingsManager.create(this.cwd, agentDir),
       customTools,
       ...this.sessionOptions,
     });
diff --git a/src/workflow-tool.ts b/src/workflow-tool.ts
index 890ba7a..087c269 100644
--- a/src/workflow-tool.ts
+++ b/src/workflow-tool.ts
@@ -88,6 +88,10 @@ export function createWorkflowTool(options: WorkflowToolOptions = {}): ToolDefin
           args: params.args,
           signal,
           concurrency: options.concurrency,
+          session: {
+            modelRegistry: ctx.modelRegistry,
+            model: ctx.model,
+          },
           onLog(message) {
             snapshot.logs.push(message);
             update();