diff --git a/src/__tests__/claude-provider-abort-signal.test.ts b/src/__tests__/claude-provider-abort-signal.test.ts
index 16fcb73..b3f4a8a 100644
--- a/src/__tests__/claude-provider-abort-signal.test.ts
+++ b/src/__tests__/claude-provider-abort-signal.test.ts
@@ -9,7 +9,7 @@ const {
   mockResolveAnthropicApiKey: vi.fn(),
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
+vi.mock('../infra/claude/client.js', () => ({
   callClaude: mockCallClaude,
   callClaudeCustom: vi.fn(),
   callClaudeAgent: vi.fn(),
diff --git a/src/__tests__/it-notification-sound.test.ts b/src/__tests__/it-notification-sound.test.ts
index ce54a0f..5f4d4a0 100644
--- a/src/__tests__/it-notification-sound.test.ts
+++ b/src/__tests__/it-notification-sound.test.ts
@@ -104,8 +104,7 @@ vi.mock('../core/piece/index.js', () => ({
   PieceEngine: MockPieceEngine,
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
-  detectRuleIndex: vi.fn(),
+vi.mock('../infra/claude/query-manager.js', () => ({
   interruptAllQueries: mockInterruptAllQueries,
 }));
 
diff --git a/src/__tests__/it-sigint-interrupt.test.ts b/src/__tests__/it-sigint-interrupt.test.ts
index 28abafe..e15226b 100644
--- a/src/__tests__/it-sigint-interrupt.test.ts
+++ b/src/__tests__/it-sigint-interrupt.test.ts
@@ -74,8 +74,8 @@ vi.mock('../core/piece/index.js', () => ({
   PieceEngine: MockPieceEngine,
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
-  detectRuleIndex: vi.fn(),
+vi.mock('../infra/claude/query-manager.js', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
   interruptAllQueries: mockInterruptAllQueries,
 }));
 
diff --git a/src/__tests__/pieceExecution-debug-prompts.test.ts b/src/__tests__/pieceExecution-debug-prompts.test.ts
index 75aa4e5..5fb8402 100644
--- a/src/__tests__/pieceExecution-debug-prompts.test.ts
+++ b/src/__tests__/pieceExecution-debug-prompts.test.ts
@@ -77,8 +77,7 @@ vi.mock('../core/piece/index.js', () => ({
   PieceEngine: MockPieceEngine,
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
-  detectRuleIndex: vi.fn(),
+vi.mock('../infra/claude/query-manager.js', () => ({
   interruptAllQueries: vi.fn(),
 }));
 
diff --git a/src/__tests__/pieceExecution-session-loading.test.ts b/src/__tests__/pieceExecution-session-loading.test.ts
index 92ff51e..e6402da 100644
--- a/src/__tests__/pieceExecution-session-loading.test.ts
+++ b/src/__tests__/pieceExecution-session-loading.test.ts
@@ -46,8 +46,7 @@ vi.mock('../core/piece/index.js', () => ({
   PieceEngine: MockPieceEngine,
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
-  detectRuleIndex: vi.fn(),
+vi.mock('../infra/claude/query-manager.js', () => ({
   interruptAllQueries: vi.fn(),
 }));
 
diff --git a/src/__tests__/runAllTasks-concurrency.test.ts b/src/__tests__/runAllTasks-concurrency.test.ts
index 9bab686..5e0b1ce 100644
--- a/src/__tests__/runAllTasks-concurrency.test.ts
+++ b/src/__tests__/runAllTasks-concurrency.test.ts
@@ -115,9 +115,8 @@ vi.mock('../infra/github/index.js', () => ({
   pushBranch: vi.fn(),
 }));
 
-vi.mock('../infra/claude/index.js', () => ({
+vi.mock('../infra/claude/query-manager.js', () => ({
   interruptAllQueries: vi.fn(),
-  detectRuleIndex: vi.fn(),
 }));
 
 vi.mock('../agents/ai-judge.js', () => ({