From 5cd9c2d2de4d84c4a0025fbf15e2e6dd204c919b Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sat, 11 Apr 2026 23:12:24 +0100
Subject: [PATCH] fix(cycles): bypass context engine and config barrels

---
 src/agents/model-fallback.run-embedded.e2e.test.ts          | 4 +++-
 src/agents/pi-embedded-runner.e2e.test.ts                   | 4 +++-
 ....run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts | 4 +++-
 .../pi-embedded-runner/run.overflow-compaction.harness.ts   | 4 +++-
 src/agents/pi-embedded-runner/run.ts                        | 6 ++----
 src/infra/outbound/message.config.runtime.ts                | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/agents/model-fallback.run-embedded.e2e.test.ts b/src/agents/model-fallback.run-embedded.e2e.test.ts
index 054895527b2..25e575984fd 100644
--- a/src/agents/model-fallback.run-embedded.e2e.test.ts
+++ b/src/agents/model-fallback.run-embedded.e2e.test.ts
@@ -57,8 +57,10 @@ const installRunEmbeddedMocks = () => {
   vi.doMock("../plugins/hook-runner-global.js", () => ({
     getGlobalHookRunner: vi.fn(() => undefined),
   }));
-  vi.doMock("../context-engine/index.js", () => ({
+  vi.doMock("../context-engine/init.js", () => ({
     ensureContextEnginesInitialized: vi.fn(),
+  }));
+  vi.doMock("../context-engine/registry.js", () => ({
     resolveContextEngine: vi.fn(async () => ({
       dispose: async () => undefined,
     })),
diff --git a/src/agents/pi-embedded-runner.e2e.test.ts b/src/agents/pi-embedded-runner.e2e.test.ts
index caf23ecdf18..6fbb00ccac7 100644
--- a/src/agents/pi-embedded-runner.e2e.test.ts
+++ b/src/agents/pi-embedded-runner.e2e.test.ts
@@ -89,8 +89,10 @@ const installRunEmbeddedMocks = () => {
     initializeGlobalHookRunner: vi.fn(),
     resetGlobalHookRunner: vi.fn(),
   }));
-  vi.doMock("../context-engine/index.js", () => ({
+  vi.doMock("../context-engine/init.js", () => ({
     ensureContextEnginesInitialized: vi.fn(),
+  }));
+  vi.doMock("../context-engine/registry.js", () => ({
     resolveContextEngine: vi.fn(async () => ({
       dispose: async () => undefined,
     })),
diff --git a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
index 9e5e14acb98..631ea392167 100644
--- a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
+++ b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
@@ -25,8 +25,10 @@ const installRunEmbeddedMocks = () => {
   vi.doMock("../plugins/hook-runner-global.js", () => ({
     getGlobalHookRunner: vi.fn(() => undefined),
   }));
-  vi.doMock("../context-engine/index.js", () => ({
+  vi.doMock("../context-engine/init.js", () => ({
     ensureContextEnginesInitialized: vi.fn(),
+  }));
+  vi.doMock("../context-engine/registry.js", () => ({
     resolveContextEngine: vi.fn(async () => ({
       dispose: async () => undefined,
     })),
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.harness.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.harness.ts
index e0099644b70..24879721183 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.harness.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.harness.ts
@@ -327,8 +327,10 @@ export async function loadRunOverflowCompactionHarness(): Promise<{
     getGlobalHookRunner: vi.fn(() => mockedGlobalHookRunner),
   }));
 
-  vi.doMock("../../context-engine/index.js", () => ({
+  vi.doMock("../../context-engine/init.js", () => ({
     ensureContextEnginesInitialized: vi.fn(),
+  }));
+  vi.doMock("../../context-engine/registry.js", () => ({
     resolveContextEngine: vi.fn(async () => mockedContextEngine),
   }));
 
diff --git a/src/agents/pi-embedded-runner/run.ts b/src/agents/pi-embedded-runner/run.ts
index 7e4eb3967ec..492db8882ee 100644
--- a/src/agents/pi-embedded-runner/run.ts
+++ b/src/agents/pi-embedded-runner/run.ts
@@ -1,10 +1,8 @@
 import { randomBytes } from "node:crypto";
 import fs from "node:fs/promises";
 import type { ThinkLevel } from "../../auto-reply/thinking.js";
-import {
-  ensureContextEnginesInitialized,
-  resolveContextEngine,
-} from "../../context-engine/index.js";
+import { ensureContextEnginesInitialized } from "../../context-engine/init.js";
+import { resolveContextEngine } from "../../context-engine/registry.js";
 import { emitAgentPlanEvent } from "../../infra/agent-events.js";
 import { sleepWithAbort } from "../../infra/backoff.js";
 import { formatErrorMessage } from "../../infra/errors.js";
diff --git a/src/infra/outbound/message.config.runtime.ts b/src/infra/outbound/message.config.runtime.ts
index a0416d4568d..08f2114655e 100644
--- a/src/infra/outbound/message.config.runtime.ts
+++ b/src/infra/outbound/message.config.runtime.ts
@@ -1 +1 @@
-export { loadConfig } from "../../config/config.js";
+export { loadConfig } from "../../config/io.js";