refactor: extract shared service test imports into service-test-setup.test-utils

src/services/agent-environment-credentials.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)
 

src/services/agent-environment-options.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';

src/services/agent-environment-proxy.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)
 

src/services/agent-environment-runtime.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)
 

src/services/agent-service.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';

src/services/agent-volumes.test.ts

@@ -1,7 +1,5 @@
-import { generateDockerCompose } from '../compose-generator';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import { logger } from '../logger';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';

src/services/api-proxy-service-config.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import { mockNetworkConfigWithProxy } from './api-proxy-service.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)

src/services/api-proxy-service-env-forwarding.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import { mockNetworkConfigWithProxy } from './api-proxy-service.test-utils';
 import * as fs from 'fs';
 import * as path from 'path';

src/services/api-proxy-service-key-isolation.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import { mockNetworkConfigWithProxy } from './api-proxy-service.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)

src/services/api-proxy-service-rate-limit.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, useTempWorkDir } from './service-test-setup.test-utils';
 import { mockNetworkConfigWithProxy } from './api-proxy-service.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)

src/services/cli-proxy-service.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)
 

src/services/doh-proxy-service.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)
 

src/services/service-test-setup.test-utils.ts

@@ -0,0 +1,15 @@
+/**
+ * Shared test setup for service unit tests.
+ *
+ * Re-exports the common imports used across all service test files, so each
+ * test file only needs a single import from this module for the shared pieces.
+ *
+ * Note: `jest.mock('execa', ...)` along with the `mockConfig` let-binding and
+ * `useTempWorkDir()` call must remain in each individual test file. Jest hoists
+ * jest.mock() calls to the top of each file before imports are resolved, so the
+ * factory closure cannot reference variables from an imported module.
+ */
+
+export { generateDockerCompose } from '../compose-generator';
+export type { WrapperConfig } from '../types';
+export { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';

src/services/squid-service.test.ts

@@ -1,6 +1,4 @@
-import { generateDockerCompose } from '../compose-generator';
-import { WrapperConfig } from '../types';
-import { baseConfig, mockNetworkConfig, useTempWorkDir } from '../test-helpers/docker-test-fixtures.test-utils';
+import { generateDockerCompose, WrapperConfig, baseConfig, mockNetworkConfig, useTempWorkDir } from './service-test-setup.test-utils';
 
 // Create mock functions (must remain per-file — jest.mock() is hoisted before imports)