From 378331a01cfa4d20cd017ca5a4dab488392635da Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 28 May 2026 15:50:22 +0000
Subject: [PATCH 1/3] Initial plan


From 586a36873a25bd0b69cc146bfc1ecb01b49301ed Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 28 May 2026 16:00:08 +0000
Subject: [PATCH 2/3] test: import docker-manager tests from source modules

---
 src/docker-manager-cleanup.test.ts   | 3 ++-
 src/docker-manager-lifecycle.test.ts | 4 +++-
 src/docker-manager-utils.test.ts     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/docker-manager-cleanup.test.ts b/src/docker-manager-cleanup.test.ts
index 160c097e3..ff0b1bbf8 100644
--- a/src/docker-manager-cleanup.test.ts
+++ b/src/docker-manager-cleanup.test.ts
@@ -1,4 +1,5 @@
-import { writeConfigs, cleanup, collectDiagnosticLogs, preserveIptablesAudit } from './docker-manager';
+import { writeConfigs } from './config-writer';
+import { cleanup, collectDiagnosticLogs, preserveIptablesAudit } from './container-cleanup';
 import { WrapperConfig } from './types';
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/src/docker-manager-lifecycle.test.ts b/src/docker-manager-lifecycle.test.ts
index e68eff0eb..f20cadc00 100644
--- a/src/docker-manager-lifecycle.test.ts
+++ b/src/docker-manager-lifecycle.test.ts
@@ -1,4 +1,6 @@
-import { startContainers, runAgentCommand, fastKillAgentContainer, setAwfDockerHost, stopContainers, getLocalDockerEnv } from './docker-manager';
+import { startContainers, runAgentCommand, fastKillAgentContainer } from './container-lifecycle';
+import { setAwfDockerHost, getLocalDockerEnv } from './docker-host';
+import { stopContainers } from './container-cleanup';
 import { containerLifecycleTestHelpers } from './container-lifecycle';
 import { AGENT_CONTAINER_NAME } from './constants';
 import { logger } from './logger';
diff --git a/src/docker-manager-utils.test.ts b/src/docker-manager-utils.test.ts
index 2b36bd3d7..d9180c5a7 100644
--- a/src/docker-manager-utils.test.ts
+++ b/src/docker-manager-utils.test.ts
@@ -18,7 +18,7 @@ import {
   parseGitHubEnvFile,
   readEnvFile,
 } from './github-env';
-import { parseDifcProxyHost } from './docker-manager';
+import { parseDifcProxyHost } from './host-env';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';

From 3eabb62a158fa66dbf43a00ac0514a0557db6e96 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 28 May 2026 16:17:09 +0000
Subject: [PATCH 3/3] test: consolidate duplicate imports in docker-manager
 tests

---
 src/docker-manager-lifecycle.test.ts | 8 ++++++--
 src/docker-manager-utils.test.ts     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/docker-manager-lifecycle.test.ts b/src/docker-manager-lifecycle.test.ts
index f20cadc00..dd9424cef 100644
--- a/src/docker-manager-lifecycle.test.ts
+++ b/src/docker-manager-lifecycle.test.ts
@@ -1,7 +1,11 @@
-import { startContainers, runAgentCommand, fastKillAgentContainer } from './container-lifecycle';
+import {
+  startContainers,
+  runAgentCommand,
+  fastKillAgentContainer,
+  containerLifecycleTestHelpers,
+} from './container-lifecycle';
 import { setAwfDockerHost, getLocalDockerEnv } from './docker-host';
 import { stopContainers } from './container-cleanup';
-import { containerLifecycleTestHelpers } from './container-lifecycle';
 import { AGENT_CONTAINER_NAME } from './constants';
 import { logger } from './logger';
 import * as fs from 'fs';
diff --git a/src/docker-manager-utils.test.ts b/src/docker-manager-utils.test.ts
index d9180c5a7..64355f5a4 100644
--- a/src/docker-manager-utils.test.ts
+++ b/src/docker-manager-utils.test.ts
@@ -4,6 +4,7 @@ import {
   getSafeHostGid,
   getRealUserHome,
   stripScheme,
+  parseDifcProxyHost,
 } from './host-env';
 import {
   validateIdNotInSystemRange,
@@ -18,7 +19,6 @@ import {
   parseGitHubEnvFile,
   readEnvFile,
 } from './github-env';
-import { parseDifcProxyHost } from './host-env';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';