Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/cli/__tests__/global-config.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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',
Expand All@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cli.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand All@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/__tests__/telemetry.test.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/telemetry/actions.ts
Original file line numberDiff line numberDiff line change
@@ -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(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -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 });
});

Expand All@@ -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',
Expand All@@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/cli/operations/deploy/post-deploy-observability.ts
Original file line numberDiff line numberDiff line change
@@ -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 {
Expand DownExpand Up@@ -31,7 +31,7 @@ export async function setupTransactionSearch(
return { success: true };
}

const config = readCliConfig();
const config = readGlobalConfigSync();
if (config.disableTransactionSearch) {
return { success: true };
}
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/client-accessor.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/config.ts
Original file line numberDiff line numberDiff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/packaging/build-args.ts
Original file line numberDiff line numberDiff line change
@@ -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}`);
Expand Down
36 changes: 0 additions & 36 deletions src/lib/schemas/io/cli-config.ts

This file was deleted.

29 changes: 20 additions & 9 deletions src/cli/global-config.ts → src/lib/schemas/io/global-config.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { readFileSync } from 'fs';
import { mkdir, readFile, writeFile } from 'fs/promises';
import { randomUUID } from 'node:crypto';
import { homedir } from 'os';
Expand All@@ -9,18 +10,19 @@ export const GLOBAL_CONFIG_FILE = join(GLOBAL_CONFIG_DIR, 'config.json');

const GlobalConfigSchema = z
.object({
installationId: z.string().optional(),
uvDefaultIndex: z.string().optional(),
uvIndex: z.string().optional(),
disableTransactionSearch: z.boolean().optional(),
transactionSearchIndexPercentage: z.number().min(0).max(100).optional(),
installationId: z.string().optional().catch(undefined),
uvDefaultIndex: z.string().optional().catch(undefined),
uvIndex: z.string().optional().catch(undefined),
disableTransactionSearch: z.boolean().optional().catch(undefined),
transactionSearchIndexPercentage: z.number().int().min(0).max(100).optional().catch(undefined),
telemetry: z
.object({
enabled: z.boolean().optional(),
endpoint: z.string().optional(),
audit: z.boolean().optional(),
enabled: z.boolean().optional().catch(undefined),
endpoint: z.string().optional().catch(undefined),
audit: z.boolean().optional().catch(undefined),
})
.optional(),
.optional()
.catch(undefined),
})
.passthrough();

Expand All@@ -35,6 +37,15 @@ export async function readGlobalConfig(configFile = GLOBAL_CONFIG_FILE): Promise
}
}

export function readGlobalConfigSync(configFile = GLOBAL_CONFIG_FILE): GlobalConfig {
try {
const data = readFileSync(configFile, 'utf-8');
return GlobalConfigSchema.parse(JSON.parse(data));
} catch {
return {};
}
}

export async function updateGlobalConfig(
partial: GlobalConfig,
configDir = GLOBAL_CONFIG_DIR,
Expand Down
1 change: 0 additions & 1 deletion src/lib/schemas/io/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,3 @@ export {
type PathConfig,
} from './path-resolver';
export { ConfigIO, createConfigIO, getSchemaUrlForVersion } from './config-io';
export { readCliConfig, type CliConfig } from './cli-config';
Loading