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
6 changes: 4 additions & 2 deletions src/cli/commands/dev/command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
loadProjectConfig,
} from '../../operations/dev';
import { getGatewayEnvVars } from '../../operations/dev/gateway-env.js';
import { getMemoryEnvVars } from '../../operations/dev/memory-env.js';
import { FatalError } from '../../tui/components';
import { LayoutProvider } from '../../tui/context';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
Expand Down Expand Up @@ -292,8 +293,9 @@ export const registerDev = (program: Command) => {
const configRoot = findConfigRoot(workingDir);
const envVars = configRoot ? await readEnvFile(configRoot) : {};
const gatewayEnvVars = await getGatewayEnvVars();
// Gateway env vars go first, .env.local overrides take precedence
const mergedEnvVars = { ...gatewayEnvVars, ...envVars };
const memoryEnvVars = await getMemoryEnvVars();
// Deployed-state env vars go first, .env.local overrides take precedence
const mergedEnvVars = { ...gatewayEnvVars, ...memoryEnvVars, ...envVars };
const config = getDevConfig(workingDir, project, configRoot ?? undefined, agentName);

if (!config) {
Expand Down
84 changes: 84 additions & 0 deletions src/cli/operations/dev/__tests__/memory-env.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import { afterEach, describe, expect, it, vi } from 'vitest';

const { mockReadDeployedState } = vi.hoisted(() => ({
mockReadDeployedState: vi.fn(),
}));

vi.mock('../../../../lib/index.js', () => ({
ConfigIO: class {
readDeployedState = mockReadDeployedState;
},
}));

const { getMemoryEnvVars } = await import('../memory-env.js');

describe('getMemoryEnvVars', () => {
afterEach(() => {
vi.restoreAllMocks();
});

it('returns empty when no deployed state', async () => {
mockReadDeployedState.mockRejectedValue(new Error('not found'));
const result = await getMemoryEnvVars();
expect(result).toEqual({});
});

it('returns empty when no memories deployed', async () => {
mockReadDeployedState.mockResolvedValue({ targets: {} });
const result = await getMemoryEnvVars();
expect(result).toEqual({});
});

it('generates MEMORY_*_ID env vars for deployed memories', async () => {
mockReadDeployedState.mockResolvedValue({
targets: {
default: {
resources: {
memories: {
MyAgentMemory: { memoryId: 'mem-abc123', memoryArn: 'arn:aws:bedrock:us-east-1:123:memory/mem-abc123' },
},
},
},
},
});

const result = await getMemoryEnvVars();
expect(result).toEqual({
MEMORY_MYAGENTMEMORY_ID: 'mem-abc123',
});
});

it('handles multiple memories across targets', async () => {
mockReadDeployedState.mockResolvedValue({
targets: {
default: {
resources: {
memories: {
MyAgentMemory: { memoryId: 'mem-111', memoryArn: 'arn:1' },
'other-memory': { memoryId: 'mem-222', memoryArn: 'arn:2' },
},
},
},
},
});

const result = await getMemoryEnvVars();
expect(result).toEqual({
MEMORY_MYAGENTMEMORY_ID: 'mem-111',
MEMORY_OTHER_MEMORY_ID: 'mem-222',
});
});

it('skips memories without memoryId', async () => {
mockReadDeployedState.mockResolvedValue({
targets: {
default: {
resources: { memories: { broken: {} } },
},
},
});

const result = await getMemoryEnvVars();
expect(result).toEqual({});
});
});
25 changes: 25 additions & 0 deletions src/cli/operations/dev/memory-env.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ConfigIO } from '../../../lib/index.js';

export async function getMemoryEnvVars(): Promise<Record<string, string>> {
const configIO = new ConfigIO();
const envVars: Record<string, string> = {};

try {
const deployedState = await configIO.readDeployedState();

// Iterate all targets (not just 'default')
for (const target of Object.values(deployedState?.targets ?? {})) {
const memories = target?.resources?.memories ?? {};

for (const [name, memory] of Object.entries(memories)) {
if (!memory.memoryId) continue;
const sanitized = name.toUpperCase().replace(/-/g, '_');
envVars[`MEMORY_${sanitized}_ID`] = memory.memoryId;
}
}
} catch {
// No deployed state — skip memory env vars
}

return envVars;
}
16 changes: 13 additions & 3 deletions src/cli/tui/hooks/useDevServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
waitForPort,
} from '../../operations/dev';
import { getGatewayEnvVars } from '../../operations/dev/gateway-env.js';
import { getMemoryEnvVars } from '../../operations/dev/memory-env.js';
import { formatMcpToolList } from '../../operations/dev/utils';
import { spawn } from 'child_process';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
Expand Down Expand Up @@ -60,6 +61,7 @@ export function useDevServer(options: {
const [configRoot, setConfigRoot] = useState<string | undefined>(undefined);
const [envVars, setEnvVars] = useState<Record<string, string>>({});
const [configLoaded, setConfigLoaded] = useState(false);
const [hasUndeployedMemory, setHasUndeployedMemory] = useState(false);
const [targetPort] = useState(options.port);
const [actualPort, setActualPort] = useState(targetPort);
const actualPortRef = useRef(targetPort);
Expand Down Expand Up @@ -105,9 +107,17 @@ export function useDevServer(options: {
if (root) {
const vars = await readEnvFile(root);
const gatewayEnvVars = await getGatewayEnvVars();
// Gateway env vars go first, .env.local overrides take precedence
const mergedEnvVars = { ...gatewayEnvVars, ...vars };
const memoryEnvVars = await getMemoryEnvVars();
// Deployed-state env vars go first, .env.local overrides take precedence
const mergedEnvVars = { ...gatewayEnvVars, ...memoryEnvVars, ...vars };
setEnvVars(mergedEnvVars);

// Show warning only when some configured memories aren't deployed yet
const configuredMemories = cfg?.memories ?? [];
if (configuredMemories.length > 0) {
const deployedCount = Object.keys(memoryEnvVars).length;
setHasUndeployedMemory(deployedCount < configuredMemories.length);
}
}

setConfigLoaded(true);
Expand Down Expand Up @@ -529,7 +539,7 @@ export function useDevServer(options: {
restart,
stop,
logFilePath: loggerRef.current?.getRelativeLogPath(),
hasMemory: (project?.memories?.length ?? 0) > 0,
hasUndeployedMemory,
hasVpc: project?.runtimes.find(a => a.name === config?.agentName)?.networkMode === 'VPC',
protocol,
mcpTools,
Expand Down
7 changes: 4 additions & 3 deletions src/cli/tui/screens/dev/DevScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export function DevScreen(props: DevScreenProps) {
restart,
stop,
logFilePath,
hasMemory,
hasUndeployedMemory,
hasVpc,
protocol,
mcpTools,
Expand Down Expand Up @@ -527,9 +527,10 @@ export function DevScreen(props: DevScreenProps) {
</Box>
)}
{logFilePath && <LogLink filePath={logFilePath} />}
{protocol !== 'MCP' && hasMemory && (
{protocol !== 'MCP' && hasUndeployedMemory && (
<Text color="yellow">
AgentCore memory is not available when running locally. To test memory, deploy and use invoke.
AgentCore memory must be deployed before it can be used. To test memory, run `agentcore deploy` and restart
dev.
</Text>
)}
{hasVpc && (
Expand Down
Loading