refactor(test): separate directory initialization from configuration in TestRig

- Refactor TestRig.setup to handle only directory creation by default.
- Add TestRig.configure to apply settings and fake responses.
- Update hook integration tests to use the new setup/configure pattern,
  avoiding brittle double setup calls.

integration-tests/hooks-agent-flow.test.ts

@@ -163,12 +163,7 @@ describe('Hooks Agent Flow', () => {
     });
 
     it('should process clearContext in AfterAgent hook output', async () => {
-      await rig.setup('should process clearContext in AfterAgent hook output', {
+      await rig.setup('should process clearContext in AfterAgent hook output');
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.after-agent.responses',
-        ),
-      });
 
       // BeforeModel hook to track message counts across LLM calls
       const messageCountFile = join(
@@ -207,7 +202,11 @@ describe('Hooks Agent Flow', () => {
       ).replace(/\\/g, '/');
       writeFileSync(afterAgentScriptPath, afterAgentScript);
 
-      await rig.setup('should process clearContext in AfterAgent hook output', {
+      await rig.configure({
+        fakeResponsesPath: join(
+          import.meta.dirname,
+          'hooks-system.after-agent.responses',
+        ),
         settings: {
           hooksConfig: {
             enabled: true,
@@ -282,9 +281,7 @@ describe('Hooks Agent Flow', () => {
       ).replace(/\\/g, '/');
       writeFileSync(afterAgentScriptPath, afterAgentScript);
 
-      await rig.setup(
+      await rig.configure({
-        'should fire BeforeAgent and AfterAgent exactly once per turn despite tool calls',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-agent-flow-multistep.responses',
@@ -318,8 +315,7 @@ describe('Hooks Agent Flow', () => {
             ],
           },
         },
-        },
+      });
-      );
 
       await rig.run({ args: 'Do a multi-step task' });
 

integration-tests/hooks-system.test.ts

@@ -31,9 +31,7 @@ describe('Hooks System Integration', () => {
         "console.log(JSON.stringify({decision: 'block', reason: 'File writing blocked by security policy'}))",
       );
 
-      rig.setup(
+      rig.configure({
-        'should block tool execution when hook returns block decision',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.block-tool.responses',
@@ -58,8 +56,7 @@ describe('Hooks System Integration', () => {
             ],
           },
         },
-        },
+      });
-      );
 
       const result = await rig.run({
         args: 'Create a file called test.txt with content "Hello World"',
@@ -93,9 +90,7 @@ describe('Hooks System Integration', () => {
         "process.stderr.write('File writing blocked by security policy'); process.exit(2)",
       );
 
-      rig.setup(
+      rig.configure({
-        'should block tool execution and use stderr as reason when hook exits with code 2',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.block-tool.responses',
@@ -120,8 +115,7 @@ describe('Hooks System Integration', () => {
             ],
           },
         },
-        },
+      });
-      );
 
       const result = await rig.run({
         args: 'Create a file called test.txt with content "Hello World"',
@@ -158,9 +152,7 @@ describe('Hooks System Integration', () => {
         "console.log(JSON.stringify({decision: 'allow', reason: 'File writing approved'}))",
       );
 
-      rig.setup(
+      rig.configure({
-        'should allow tool execution when hook returns allow decision',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.allow-tool.responses',
@@ -184,8 +176,7 @@ describe('Hooks System Integration', () => {
             ],
           },
         },
-        },
+      });
-      );
 
       await rig.run({
         args: 'Create a file called approved.txt with content "Approved content"',
@@ -214,7 +205,7 @@ describe('Hooks System Integration', () => {
         "console.log(JSON.stringify({hookSpecificOutput: {hookEventName: 'AfterTool', additionalContext: 'Security scan: File content appears safe'}}))",
       );
       const command = `node "${scriptPath}"`;
-      rig.setup('should add additional context from AfterTool hooks', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.after-tool-context.responses',
@@ -634,7 +625,7 @@ console.log(JSON.stringify({
       );
       const hookCommand = `node "${scriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup('should handle notification hooks for tool permissions', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.notification.responses',
@@ -742,7 +733,7 @@ console.log(JSON.stringify({
       const hook1Command = `node "${script1Path.replace(/\\/g, '/')}"`;
       const hook2Command = `node "${script2Path.replace(/\\/g, '/')}"`;
 
-      rig.setup('should execute hooks sequentially when configured', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.sequential-execution.responses',
@@ -876,9 +867,7 @@ try {
         "console.log('Pollution'); console.log(JSON.stringify({decision: 'deny', reason: 'Should be ignored'}))",
       );
 
-      rig.setup(
+      rig.configure({
-        'should treat mixed stdout (text + JSON) as system message and allow execution when exit code is 0',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.allow-tool.responses',
@@ -904,8 +893,7 @@ try {
             ],
           },
         },
-        },
+      });
-      );
 
       const result = await rig.run({
         args: 'Create a file called approved.txt with content "Approved content"',
@@ -945,7 +933,7 @@ try {
       const afterToolCommand = `node "${afterToolScript.replace(/\\/g, '/')}"`;
       const beforeAgentCommand = `node "${beforeAgentScript.replace(/\\/g, '/')}"`;
 
-      rig.setup('should handle hooks for all major event types', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.multiple-events.responses',
@@ -1062,7 +1050,7 @@ try {
       const failingCommand = `node "${failingScript.replace(/\\/g, '/')}"`;
       const workingCommand = `node "${workingScript.replace(/\\/g, '/')}"`;
 
-      rig.setup('should handle hook failures gracefully', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.error-handling.responses',
@@ -1120,7 +1108,7 @@ try {
       );
       const hookCommand = `node "${scriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup('should generate telemetry events for hook executions', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.telemetry.responses',
@@ -1167,7 +1155,7 @@ try {
       );
       const sessionStartCommand = `node "${scriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup('should fire SessionStart hook on app startup', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-startup.responses',
@@ -1405,9 +1393,7 @@ console.log(JSON.stringify({
       const sessionEndCommand = `node "${endScriptPath.replace(/\\/g, '/')}"`;
       const sessionStartCommand = `node "${startScriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup(
+      rig.configure({
-        'should fire SessionEnd and SessionStart hooks on /clear command',
-        {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-clear.responses',
@@ -1443,8 +1429,7 @@ console.log(JSON.stringify({
             ],
           },
         },
-        },
+      });
-      );
 
       const run = await rig.runInteractive();
 
@@ -1585,7 +1570,7 @@ console.log(JSON.stringify({
       );
       const preCompressCommand = `node "${scriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup('should fire PreCompress hook on automatic compression', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.compress-auto.responses',
@@ -1659,7 +1644,7 @@ console.log(JSON.stringify({
       );
       const sessionEndCommand = `node "${scriptPath.replace(/\\/g, '/')}"`;
 
-      rig.setup('should fire SessionEnd hook on graceful exit', {
+      rig.configure({
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-startup.responses',

packages/test-utils/src/test-rig.ts

@@ -361,6 +361,20 @@ export class TestRig {
     this.homeDir = join(testFileDir, sanitizedName + '-home');
     mkdirSync(this.testDir, { recursive: true });
     mkdirSync(this.homeDir, { recursive: true });
+
+    if (options.settings || options.fakeResponsesPath) {
+      this.configure(options);
+    }
+  }
+
+  configure(options: {
+    settings?: Record<string, unknown>;
+    fakeResponsesPath?: string;
+  }) {
+    if (!this.testDir || !this.homeDir) {
+      throw new Error('TestRig must be setup before calling configure');
+    }
+
     if (options.fakeResponsesPath) {
       this.fakeResponsesPath = join(this.testDir, 'fake-responses.json');
       this.originalFakeResponsesPath = options.fakeResponsesPath;