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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
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
76 changes: 67 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}

steps:
- uses: actions/checkout@v6
Expand All@@ -39,14 +40,7 @@ jobs:
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:integ
- name: Upload coverage artifact
if: matrix.node-version == '20.x'
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/
- name: Pack tarball
if: matrix.node-version == '20.x'
run: npm pack
Expand All@@ -66,8 +60,72 @@ jobs:
name: tarball
path: '*.tgz'

unit-test:
runs-on: ubuntu-latest
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
node-version:
${{ github.event_name == 'pull_request' && fromJSON('["20.x"]') || fromJSON('["20.x", "22.x", "24.x"]') }}
shard: [1/3, 2/3, 3/3]

steps:
- uses: actions/checkout@v6
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Configure git for tests
run: |
git config --global user.email "bedrock-agentcore-npm+ci@amazon.com"
git config --global user.name "CI"
- name: Install uv
uses: astral-sh/setup-uv@v7
- run: npm ci
- run: npm run build --if-present
- name: Run unit tests (shard ${{ matrix.shard }})
run: npx vitest run --project unit --shard=${{ matrix.shard }} --reporter=blob --reporter=verbose
- name: Upload blob report
if: always()
uses: actions/upload-artifact@v7
with:
name: blob-${{ matrix.node-version }}-${{ strategy.job-index }}
path: .vitest-reports
retention-days: 1
if-no-files-found: error
include-hidden-files: true

merge-reports:
needs: unit-test
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: 20.x
cache: 'npm'
- run: npm ci
- name: Download blob reports (Node 20)
uses: actions/download-artifact@v8
with:
pattern: blob-20.x-*
merge-multiple: true
path: .vitest-reports/
- name: Merge reports
run: npx vitest --mergeReports=.vitest-reports/ --project unit --coverage
- name: Upload coverage artifact
uses: actions/upload-artifact@v7
with:
name: coverage-report
path: coverage/

coverage:
needs: build
needs: merge-reports
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
permissions:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -21,6 +21,8 @@ vi.mock('../../../../lib/index.js', () => ({
* but this test ensures that contract holds if the registration pattern changes.
*/
describe('remove subcommand priority', () => {
afterEach(() => vi.restoreAllMocks());

it('named subcommands are matched before the catch-all', async () => {
const { Command } = await import('@commander-js/extra-typings');
const { registerRemove } = await import('../command.js');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { CodeZipDevServer } from '../codezip-dev-server';
import type { DevConfig } from '../config';
import type { DevServerCallbacks, DevServerOptions } from '../dev-server';
import { EventEmitter } from 'events';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockSpawn = vi.fn();
vi.mock('child_process', () => ({
Expand DownExpand Up@@ -35,6 +35,8 @@ describe('CodeZipDevServer spawn config', () => {
mockSpawn.mockReturnValue(createMockChildProcess());
});

afterEach(() => vi.restoreAllMocks());

it('HTTP: uses uvicorn with --reload', async () => {
const config: DevConfig = {
agentName: 'HttpAgent',
Expand Down
10 changes: 5 additions & 5 deletions src/cli/operations/eval/__tests__/logs-eval.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,10 @@ describe('handleLogsEval', () => {
);
});

afterEach(() => vi.clearAllMocks());
afterEach(() => {
vi.clearAllMocks();
vi.restoreAllMocks();
});

it('returns error when agent resolution fails', async () => {
mockLoadDeployedProjectConfig.mockResolvedValue({});
Expand DownExpand Up@@ -156,7 +159,7 @@ describe('handleLogsEval', () => {
mockStreamLogs.mockReturnValue(emptyGenerator());

// eslint-disable-next-line @typescript-eslint/no-empty-function
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
vi.spyOn(console, 'error').mockImplementation(() => {});

const result = await handleLogsEval({});

Expand All@@ -168,8 +171,6 @@ describe('handleLogsEval', () => {
})
);
expect(mockSearchLogs).not.toHaveBeenCalled();

consoleSpy.mockRestore();
});

it('skips ResourceNotFoundException during search', async () => {
Expand DownExpand Up@@ -282,6 +283,5 @@ describe('handleLogsEval', () => {
await handleLogsEval({ since: '1h' });

expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('IAM role does not exist'));
consoleSpy.mockRestore();
});
});
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { Credential } from '../../../../schema/index.js';
import { AgentPrimitive } from '../../../primitives/AgentPrimitive.js';
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';

// Mock registry to break circular dependency: AgentPrimitive → AddFlow → hooks → registry → AgentPrimitive
vi.mock('../../../primitives/registry', () => ({
Expand All@@ -12,6 +12,8 @@ const getAgentScopedCredentials = (...args: Parameters<typeof AgentPrimitive.get
AgentPrimitive.getAgentScopedCredentials(...args);

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

const projectName = 'MyProject';

const makeCredential = (name: string): Credential => ({ name, authorizerType: 'ApiKeyCredentialProvider' });
Expand Down
12 changes: 10 additions & 2 deletions src/tui-harness/__tests__/proof-of-concept.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,14 @@ import { afterEach, describe, expect, it } from 'vitest';

const { Terminal } = xtermHeadless;

let ptyAvailable = true;
try {
const p = pty.spawn('/bin/echo', ['test'], { cols: 80, rows: 24 });
p.kill();
} catch {
ptyAvailable = false;
}

// ---------------------------------------------------------------------------
// Test A: xterm standalone
// ---------------------------------------------------------------------------
Expand All@@ -77,7 +85,7 @@ describe('xterm standalone', () => {
// ---------------------------------------------------------------------------
// Test B: PTY + xterm wiring
// ---------------------------------------------------------------------------
describe('PTY + xterm wiring', () => {
describe.skipIf(!ptyAvailable)('PTY + xterm wiring', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand DownExpand Up@@ -119,7 +127,7 @@ describe('PTY + xterm wiring', () => {
// ---------------------------------------------------------------------------
// Test C: DSR/CPR handler
// ---------------------------------------------------------------------------
describe('DSR/CPR handler', () => {
describe.skipIf(!ptyAvailable)('DSR/CPR handler', () => {
let terminal: InstanceType<typeof Terminal>;
let ptyProcess: ReturnType<typeof pty.spawn> | undefined;

Expand Down
9 changes: 8 additions & 1 deletion vitest.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,13 +33,20 @@ export default defineConfig({
},
plugins: [textLoaderPlugin],
test: {
deps: {
optimizer: {
ssr: {
include: ['@aws-sdk/*', '@smithy/*', 'zod', 'commander'],
},
},
},
projects: [
{
extends: true,
test: {
name: 'unit',
include: ['src/**/*.test.ts', 'src/**/*.test.tsx'],
exclude: ['src/assets/cdk/test/*.test.ts'],
exclude: ['src/assets/cdk/test/*.test.ts', 'src/tui-harness/**'],
},
},
{
Expand Down
Loading