refactor: consolidate cli-config into global-config (#802)

Author: Hweinstock

src/cli/__tests__/global-config.test.ts

@@ -1,4 +1,9 @@
-import { getOrCreateInstallationId, readGlobalConfig, updateGlobalConfig } from '../global-config';
+import {
+  getOrCreateInstallationId,
+  readGlobalConfig,
+  readGlobalConfigSync,
+  updateGlobalConfig,
+} from '../../lib/schemas/io/global-config';
 import { createTempConfig } from './helpers/temp-config';
 import { readFile, writeFile } from 'fs/promises';
 import { afterAll, beforeEach, describe, expect, it } from 'vitest';
@@ -21,10 +26,29 @@ describe('global-config', () => {
     it('returns empty object when file is missing or invalid', async () => {
       expect(await readGlobalConfig(tmp.testDir + '/nonexistent.json')).toEqual({});
 
-      await writeFile(tmp.configFile, JSON.stringify({ telemetry: { enabled: 'false' } }));
+      await writeFile(tmp.configFile, 'not json');
       expect(await readGlobalConfig(tmp.configFile)).toEqual({});
     });
 
+    it('drops invalid fields while preserving valid ones', async () => {
+      await writeFile(
+        tmp.configFile,
+        JSON.stringify({
+          transactionSearchIndexPercentage: 'not-a-number',
+          uvIndex: 'https://valid.url',
+          telemetry: { enabled: 'yes', endpoint: 'https://example.com' },
+        })
+      );
+
+      const config = await readGlobalConfig(tmp.configFile);
+
+      expect(config).toEqual({
+        transactionSearchIndexPercentage: undefined,
+        uvIndex: 'https://valid.url',
+        telemetry: { enabled: undefined, endpoint: 'https://example.com' },
+      });
+    });
+
     it('preserves unknown fields via passthrough', async () => {
       const full = {
         installationId: 'abc-123',
@@ -39,6 +63,21 @@ describe('global-config', () => {
     });
   });
 
+  describe('readGlobalConfigSync', () => {
+    it('returns parsed config when file exists', async () => {
+      await writeFile(tmp.configFile, JSON.stringify({ telemetry: { enabled: false } }));
+
+      expect(readGlobalConfigSync(tmp.configFile)).toEqual({ telemetry: { enabled: false } });
+    });
+
+    it('returns empty object when file is missing or invalid', async () => {
+      expect(readGlobalConfigSync(tmp.testDir + '/nonexistent.json')).toEqual({});
+
+      await writeFile(tmp.configFile, 'not json');
+      expect(readGlobalConfigSync(tmp.configFile)).toEqual({});
+    });
+  });
+
   describe('updateGlobalConfig', () => {
     it('creates directory and writes config when none exists', async () => {
       const fresh = createTempConfig('gc-fresh');

src/cli/cli.ts

@@ -1,3 +1,4 @@
+import { getOrCreateInstallationId } from '../lib/schemas/io/global-config';
 import { registerAdd } from './commands/add';
 import { registerCreate } from './commands/create';
 import { registerDeploy } from './commands/deploy';
@@ -19,7 +20,6 @@ import { registerTraces } from './commands/traces';
 import { registerUpdate } from './commands/update';
 import { registerValidate } from './commands/validate';
 import { PACKAGE_VERSION } from './constants';
-import { getOrCreateInstallationId } from './global-config';
 import { ALL_PRIMITIVES } from './primitives';
 import { TelemetryClientAccessor } from './telemetry';
 import { App } from './tui/App';

src/cli/commands/telemetry/__tests__/telemetry.test.ts

@@ -1,5 +1,5 @@
+import { readGlobalConfig } from '../../../../lib/schemas/io/global-config';
 import { createTempConfig } from '../../../__tests__/helpers/temp-config';
-import { readGlobalConfig } from '../../../global-config';
 import { handleTelemetryDisable, handleTelemetryEnable, handleTelemetryStatus } from '../actions';
 import { chmod, mkdir, rm, writeFile } from 'fs/promises';
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

src/cli/commands/telemetry/actions.ts

@@ -1,4 +1,4 @@
-import { GLOBAL_CONFIG_DIR, GLOBAL_CONFIG_FILE, updateGlobalConfig } from '../../global-config.js';
+import { GLOBAL_CONFIG_DIR, GLOBAL_CONFIG_FILE, updateGlobalConfig } from '../../../lib/schemas/io/global-config.js';
 import { resolveTelemetryPreference } from '../../telemetry/config.js';
 
 export async function handleTelemetryDisable(

src/cli/operations/deploy/__tests__/post-deploy-observability.test.ts

@@ -1,23 +1,23 @@
 import { setupTransactionSearch } from '../post-deploy-observability.js';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-const { mockEnableTransactionSearch, mockReadCliConfig } = vi.hoisted(() => ({
+const { mockEnableTransactionSearch, mockReadGlobalConfigSync } = vi.hoisted(() => ({
   mockEnableTransactionSearch: vi.fn(),
-  mockReadCliConfig: vi.fn(),
+  mockReadGlobalConfigSync: vi.fn(),
 }));
 
 vi.mock('../../../aws/transaction-search', () => ({
   enableTransactionSearch: mockEnableTransactionSearch,
 }));
 
-vi.mock('../../../../lib/schemas/io/cli-config', () => ({
-  readCliConfig: mockReadCliConfig,
+vi.mock('../../../../lib/schemas/io/global-config', () => ({
+  readGlobalConfigSync: mockReadGlobalConfigSync,
 }));
 
 describe('setupTransactionSearch', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    mockReadCliConfig.mockReturnValue({});
+    mockReadGlobalConfigSync.mockReturnValue({});
     mockEnableTransactionSearch.mockResolvedValue({ success: true });
   });
 
@@ -33,7 +33,7 @@ describe('setupTransactionSearch', () => {
   });
 
   it('passes custom transactionSearchIndexPercentage from config', async () => {
-    mockReadCliConfig.mockReturnValue({ transactionSearchIndexPercentage: 25 });
+    mockReadGlobalConfigSync.mockReturnValue({ transactionSearchIndexPercentage: 25 });
 
     const result = await setupTransactionSearch({
       region: 'us-east-1',
@@ -57,7 +57,7 @@ describe('setupTransactionSearch', () => {
   });
 
   it('skips when disableTransactionSearch is true in config', async () => {
-    mockReadCliConfig.mockReturnValue({ disableTransactionSearch: true });
+    mockReadGlobalConfigSync.mockReturnValue({ disableTransactionSearch: true });
 
     const result = await setupTransactionSearch({
       region: 'us-east-1',

src/cli/operations/deploy/post-deploy-observability.ts

@@ -1,4 +1,4 @@
-import { readCliConfig } from '../../../lib/schemas/io/cli-config';
+import { readGlobalConfigSync } from '../../../lib/schemas/io/global-config';
 import { enableTransactionSearch } from '../../aws/transaction-search';
 
 export interface TransactionSearchSetupOptions {
@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
     return { success: true };
   }
 
-  const config = readCliConfig();
+  const config = readGlobalConfigSync();
   if (config.disableTransactionSearch) {
     return { success: true };
   }

src/cli/telemetry/client-accessor.ts

@@ -1,4 +1,4 @@
-import { GLOBAL_CONFIG_DIR, readGlobalConfig } from '../global-config.js';
+import { GLOBAL_CONFIG_DIR, readGlobalConfig } from '../../lib/schemas/io/global-config.js';
 import { TelemetryClient } from './client.js';
 import { resolveAuditFilePath, resolveResourceAttributes } from './config.js';
 import { FileSystemSink } from './sinks/filesystem-sink.js';

src/cli/telemetry/config.ts

@@ -1,5 +1,5 @@
+import { getOrCreateInstallationId, readGlobalConfig } from '../../lib/schemas/io/global-config.js';
 import { PACKAGE_VERSION } from '../constants.js';
-import { getOrCreateInstallationId, readGlobalConfig } from '../global-config.js';
 import { type ResourceAttributes, ResourceAttributesSchema } from './schemas/common-attributes.js';
 import { randomUUID } from 'crypto';
 import os from 'os';

src/lib/packaging/build-args.ts

@@ -1,11 +1,11 @@
-import { readCliConfig } from '../schemas/io/cli-config';
+import { readGlobalConfigSync } from '../schemas/io/global-config';
 
 /**
  * Return Docker --build-arg flags for UV index URLs configured in ~/.agentcore/config.json.
  * Returns an empty array when no custom indexes are configured.
  */
 export function getUvBuildArgs(): string[] {
-  const config = readCliConfig();
+  const config = readGlobalConfigSync();
   const args: string[] = [];
   if (config.uvDefaultIndex) args.push('--build-arg', `UV_DEFAULT_INDEX=${config.uvDefaultIndex}`);
   if (config.uvIndex) args.push('--build-arg', `UV_INDEX=${config.uvIndex}`);