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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
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
21 changes: 13 additions & 8 deletions docs/commands.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -1385,21 +1385,26 @@ agentcore dataset remove-version 2 --name MyDataset

### fetch access

Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.
Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.

```bash
agentcore fetch access
agentcore fetch access --name MyGateway --type gateway --json
agentcore fetch access --name MyAgent --type agent --target staging
agentcore fetch access --name MyHarness --type harness --json
```

| Flag | Description |
| ------------------------ | --------------------------------------------- |
| `--name <name>` | Gateway or agent name |
| `--type <type>` | Resource type: `gateway` (default) or `agent` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |
| Flag | Description |
| ------------------------ | --------------------------------------------------------- |
| `--name <name>` | Gateway, agent, or harness name |
| `--type <type>` | Resource type: `gateway` (default), `agent`, or `harness` |
| `--target <name>` | Deployment target |
| `--identity-name <name>` | Identity credential name for token fetch |
| `--json` | JSON output |

For an `agent` or `harness` configured with a `CUSTOM_JWT` authorizer, this mints an OAuth bearer token via the
resource's managed OAuth credential (override the credential with `--identity-name`). A resource using `AWS_IAM` auth
has no token to fetch — use AWS SigV4 signing to invoke it.

### package

Expand Down
79 changes: 79 additions & 0 deletions src/cli/commands/fetch/__tests__/fetch-access.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,16 @@ import { Command } from '@commander-js/extra-typings';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

const mockFetchGatewayToken = vi.fn();
const mockFetchRuntimeToken = vi.fn();
const mockFetchHarnessToken = vi.fn();
const mockListGateways = vi.fn();
const mockRequireProject = vi.fn();
const mockRender = vi.fn();

vi.mock('../../../operations/fetch-access', () => ({
fetchGatewayToken: (...args: unknown[]) => mockFetchGatewayToken(...args),
fetchRuntimeToken: (...args: unknown[]) => mockFetchRuntimeToken(...args),
fetchHarnessToken: (...args: unknown[]) => mockFetchHarnessToken(...args),
listGateways: (...args: unknown[]) => mockListGateways(...args),
}));

Expand DownExpand Up@@ -193,4 +197,79 @@ describe('registerFetch', () => {
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
});

describe('--type harness', () => {
const harnessTokenResult = { token: 'harness-token', expiresIn: 3600 };

it('outputs a CUSTOM_JWT token for a harness when --json flag is used', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], {
from: 'user',
});

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: undefined,
identityName: undefined,
});
expect(mockFetchGatewayToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(true);
expect(output.authType).toBe('CUSTOM_JWT');
expect(output.token).toBe('harness-token');
expect(output.expiresIn).toBe(3600);
});

it('forwards --identity-name and --target to fetchHarnessToken', async () => {
mockFetchHarnessToken.mockResolvedValue(harnessTokenResult);

await program.parseAsync(
[
'fetch',
'access',
'--type',
'harness',
'--name',
'MyHarness',
'--identity-name',
'my-custom-cred',
'--target',
'prod',
'--json',
],
{ from: 'user' }
);

expect(mockFetchHarnessToken).toHaveBeenCalledWith('MyHarness', {
deployTarget: 'prod',
identityName: 'my-custom-cred',
});
});

it('errors with a harness-specific message when --name is missing and --json flag is used', async () => {
await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockFetchHarnessToken).not.toHaveBeenCalled();
expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe('Missing required option: --name <harness>');
});

it('outputs JSON error when fetchHarnessToken throws (e.g. non-CUSTOM_JWT harness)', async () => {
mockFetchHarnessToken.mockRejectedValue(new Error("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT."));

await expect(
program.parseAsync(['fetch', 'access', '--type', 'harness', '--name', 'MyHarness', '--json'], { from: 'user' })
).rejects.toThrow('process.exit');

expect(mockLog).toHaveBeenCalledTimes(1);
const output = JSON.parse(mockLog.mock.calls[0][0]);
expect(output.success).toBe(false);
expect(output.error).toBe("Harness 'MyHarness' uses AWS_IAM auth, not CUSTOM_JWT.");
});
});
});
26 changes: 23 additions & 3 deletions src/cli/commands/fetch/action.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { fetchGatewayToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import { fetchGatewayToken, fetchHarnessToken, fetchRuntimeToken, listGateways } from '../../operations/fetch-access';
import type { OAuthTokenResult, TokenFetchResult } from '../../operations/fetch-access';
import type { FetchAccessOptions } from './types';

Expand All@@ -16,6 +16,10 @@ export async function handleFetchAccess(options: FetchAccessOptions): Promise<Fe
return handleFetchAgentAccess(options);
}

if (resourceType === 'harness') {
return handleFetchHarnessAccess(options);
}

return handleFetchGatewayAccess(options);
}

Expand All@@ -40,13 +44,29 @@ async function handleFetchGatewayAccess(options: FetchAccessOptions): Promise<Fe
}

async function handleFetchAgentAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'agent', fetchRuntimeToken);
}

async function handleFetchHarnessAccess(options: FetchAccessOptions): Promise<FetchAccessResult> {
return fetchTokenAccess(options, 'harness', fetchHarnessToken);
}

/**
* Shared flow for the CUSTOM_JWT token-bearing resources (agent runtime, harness): both
* resolve an OAuth token by name and surface it in the same result shape (no invoke URL).
*/
async function fetchTokenAccess(
options: FetchAccessOptions,
label: 'agent' | 'harness',
fetchToken: (name: string, opts: { deployTarget?: string; identityName?: string }) => Promise<OAuthTokenResult>
): Promise<FetchAccessResult> {
if (!options.name) {
return { success: false, error: 'Missing required option: --name <agent>' };
return { success: false, error: `Missing required option: --name <${label}>` };
}

let tokenResult: OAuthTokenResult;
try {
tokenResult = await fetchRuntimeToken(options.name, {
tokenResult = await fetchToken(options.name, {
deployTarget: options.target,
identityName: options.identityName,
Comment thread
tejaskash marked this conversation as resolved.
});
Expand Down
25 changes: 21 additions & 4 deletions src/cli/commands/fetch/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { COMMAND_DESCRIPTIONS } from '../../constants';
import { getErrorMessage } from '../../errors';
import { withCommandRunTelemetry } from '../../telemetry/cli-command-run.js';
import { ResourceType, standardize } from '../../telemetry/schemas/common-shapes.js';
import { requireProject } from '../../tui/guards';
import { handleFetchAccess } from './action';
import type { FetchAccessResult } from './action';
Expand All@@ -12,9 +14,9 @@ export const registerFetch = (program: Command) => {

fetchCmd
.command('access')
.description('Fetch access info (URL, token, auth guidance) for a deployed gatewayor agent.')
.option('--name <resource>', 'Gatewayor agent name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default)or agent [non-interactive]', 'gateway')
.description('Fetch access info (URL, token, auth guidance) for a deployed gateway, agent, or harness.')
.option('--name <resource>', 'Gateway, agent, or harness name [non-interactive]')
.option('--type <type>', 'Resource type: gateway (default), agent, or harness [non-interactive]', 'gateway')
.option('--target <target>', 'Deployment target [non-interactive]')
.option('--identity-name <name>', 'Identity credential name for token fetch [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand All@@ -24,7 +26,22 @@ export const registerFetch = (program: Command) => {

let result: FetchAccessResult;
try {
result = await handleFetchAccess(options);
// Record cli.command_run for fetch.access. handleFetchAccess runs exactly once inside
// the telemetry wrapper; its string-error shape is adapted to the Result {success,
// error: Error} the telemetry layer expects (used only for exit_reason/error_name),
// while the original result is captured via closure to drive output below.
let captured: FetchAccessResult;
await withCommandRunTelemetry(
'fetch.access',
{ resource_type: standardize(ResourceType, options.type ?? 'gateway') },
async () => {
captured = await handleFetchAccess(options);
return captured.success
? { success: true as const }
: { success: false as const, error: new Error(captured.error) };
}
);
result = captured!;
} catch (error) {
if (options.json) {
console.log(JSON.stringify({ success: false, error: getErrorMessage(error) }));
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/fetch/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface FetchAccessOptions {
name?: string;
Expand Down
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/fetch-harness-token.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ export async function canFetchHarnessToken(
*/
export async function fetchHarnessToken(
harnessName: string,
options: { configIO?: ConfigIO; deployTarget?: string } = {}
options: { configIO?: ConfigIO; deployTarget?: string; identityName?: string } = {}
): Promise<OAuthTokenResult> {
const configIO = options.configIO ?? new ConfigIO();

Expand DownExpand Up@@ -79,5 +79,6 @@ export async function fetchHarnessToken(
deployedState,
targetName,
credentials: projectSpec.credentials,
credentialName: options.identityName,
});
}
3 changes: 2 additions & 1 deletion src/cli/operations/fetch-access/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,5 @@ export { fetchOAuthToken } from './oauth-token';
export type { OAuthTokenResult } from './oauth-token';
export { listAgents } from './list-agents';
export { listGateways } from './list-gateways';
export type { TokenFetchResult, GatewayInfo, AgentInfo, ResourceInfo } from './types';
export { listHarnesses } from './list-harnesses';
export type { TokenFetchResult, GatewayInfo, AgentInfo, HarnessInfo, ResourceInfo } from './types';
41 changes: 41 additions & 0 deletions src/cli/operations/fetch-access/list-harnesses.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
import { ConfigIO } from '../../../lib';
import type { HarnessInfo } from './types';

/**
* List deployed harnesses with their inbound authorizer type. A harness is included only when
* it is registered in the project AND present in deployed-state (mirrors listAgents/listGateways).
* The authorizerType lives in each harness.json, so the per-harness spec is read to surface it.
*/
export async function listHarnesses(
options: { configIO?: ConfigIO; deployTarget?: string } = {}
): Promise<HarnessInfo[]> {
const configIO = options.configIO ?? new ConfigIO();

const deployedState = await configIO.readDeployedState();
const projectSpec = await configIO.readProjectSpec();

const targetNames = Object.keys(deployedState.targets);
if (targetNames.length === 0) return [];

const targetName = options.deployTarget ?? targetNames[0]!;
const target = deployedState.targets[targetName];
if (!target) return [];

const deployedHarnesses = target.resources?.harnesses ?? {};

const harnesses: HarnessInfo[] = [];

for (const harness of projectSpec.harnesses) {
const deployed = deployedHarnesses[harness.name];
if (!deployed?.harnessArn) continue;

// Read the spec for its authorizerType. A read failure (corrupt/missing harness.json,
// post-upgrade schema mismatch) for a deployed harness is a real config problem — let it
// propagate so the caller surfaces it, rather than masking it as AWS_IAM and silently
// steering a CUSTOM_JWT harness to the "use SigV4" path with no token.
const spec = await configIO.readHarnessSpec(harness.name);
harnesses.push({ name: harness.name, authType: spec.authorizerType ?? 'AWS_IAM' });
}

return harnesses;
}
7 changes: 6 additions & 1 deletion src/cli/operations/fetch-access/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { GatewayAuthorizerType, RuntimeAuthorizerType } from '../../../schema';

export type FetchResourceType = 'gateway' | 'agent';
export type FetchResourceType = 'gateway' | 'agent' | 'harness';

export interface TokenFetchResult {
url: string;
Expand All@@ -20,6 +20,11 @@ export interface AgentInfo {
authType: RuntimeAuthorizerType;
}

export interface HarnessInfo {
name: string;
authType: RuntimeAuthorizerType;
}

export interface ResourceInfo {
name: string;
resourceType: FetchResourceType;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/telemetry/schemas/common-shapes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ export const OutboundAuthType = z.enum(['oauth', 'api-key', 'none']);
export const PolicyEngineMode = z.enum(['log_only', 'enforce']);
export const AgentProtocol = z.enum(['http', 'mcp', 'a2a', 'agui']);
export const RefType = z.enum(['arn', 'name']);
export const ResourceType = z.enum(['gateway', 'agent']);
export const ResourceType = z.enum(['gateway', 'agent', 'harness']);
export const JobType = z.enum(['recommendation', 'batch-evaluation', 'ab-test', 'insights']);
export const RecommendationKind = z.enum(['system-prompt', 'tool-description']);
export const RecommendationInputSource = z.enum(['config-bundle', 'inline', 'file']);
Expand Down
4 changes: 3 additions & 1 deletion src/cli/tui/screens/fetch-access/FetchAccessScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,9 @@ function authColor(authType: string): string {
}

function resourceLabel(resourceType: string): string {
return resourceType === 'agent' ? 'Agent' : 'Gateway';
if (resourceType === 'agent') return 'Agent';
if (resourceType === 'harness') return 'Harness';
return 'Gateway';
}

export function FetchAccessScreen({ isInteractive: _isInteractive, onExit }: FetchAccessScreenProps) {
Expand Down
Loading
Loading