feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat: dataset management — full feature with tests - #1347

Merged
jariy17 merged 3 commits into
mainfrom
feature/dataset-management
May 22, 2026
Merged

feat: dataset management — full feature with tests#1347
jariy17 merged 3 commits into
mainfrom
feature/dataset-management

Conversation

@jariy17

Copy link
Copy Markdown
Contributor

Summary

Implements complete dataset management lifecycle for AgentCore CLI:

  • Schema & Primitives: DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types, name validation, kmsKeyArn support
  • CLI Commands: add dataset, remove dataset, dataset download, dataset publish-version, dataset remove-version
  • Operations: Incremental push engine (diff by exampleId, batched API calls with retry), post-deploy sync (hash-based change detection), dataset-driven evaluation (load scenarios, invoke agent, collect spans)
  • TUI: Add dataset wizard, dataset hub (download/publish/remove-version), dataset picker in batch eval flow
  • Bug Fixes: Deploy preflight now recognizes datasets as deployable resources; removed stale x-amz-expected-bucket-owner header workaround

Test plan

  • 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish, resolve, wait, post-deploy sync, session provider, preflight)
  • 17 integration tests (undeployed commands, validation edge cases, scaffolding verification, file preservation)
  • 19 E2E tests (full lifecycle, 1000-example large batch, dataset-driven eval with Builtin.Faithfulness)
  • All E2E tests verified in ap-southeast-2 against account 619071331382

Implements complete dataset management lifecycle for AgentCore:
Schema & Primitives:
- DatasetPrimitive (add/remove/preview) with PREDEFINED_V1 and SIMULATED_V1 schema types
- Dataset schema validation (name, schemaType, config.managed.location, kmsKeyArn)
- CDK AgentCoreDataset construct (AWS::BedrockAgentCore::Dataset)
CLI Commands:
- `agentcore add dataset` / `agentcore remove dataset`
- `agentcore dataset download` — pull from service to local file
- `agentcore dataset publish-version` — publish DRAFT as immutable version
- `agentcore dataset remove-version` — delete published version
Operations:
- Incremental push engine (diff by exampleId, batched API calls with retry)
- Post-deploy sync (hash-based change detection, automatic on deploy)
- Dataset-driven evaluation (load scenarios, invoke agent, collect spans)
- resolve-dataset, wait, status, pull utilities
TUI:
- Add dataset wizard (name → schema type → description → confirm)
- Dataset hub (download/publish/remove-version management)
- Dataset picker in batch eval flow with version selection
Bug Fixes:
- Deploy preflight now recognizes datasets as deployable resources
- Removed stale x-amz-expected-bucket-owner header workaround
Tests:
- 68 unit tests (DatasetPrimitive, AWS client, push engine, pull, publish,
resolve, wait, post-deploy sync, session provider, preflight)
- 17 integration tests (undeployed commands, validation, scaffolding)
- 19 E2E tests (lifecycle, large batch 1000 examples, eval integration)
@jariy17
jariy17 requested a review from a teamMay 21, 2026 16:43
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/commands/dataset/command.tsx Fixed
Comment threadsrc/cli/primitives/DatasetPrimitive.ts Fixed
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label May 21, 2026
- Replace non-existent `cliCommandRun` import with `runCliCommand`
- Replace non-existent `RemovalResult` type with `Result` from lib
- Fix error type mismatches (string vs Error object) across dataset
primitives, TUI flows, and batch evaluation
- Add `result.targetName` guard in status command to prevent undefined index
- Remove unused `DEFAULT_ENDPOINT_NAME` import in get-trace.ts
- Fix prettier formatting in invoke/action.ts and eval/run-eval.ts
- Update asset snapshots and test assertions to match Result<T,E> type
@github-actionsgithub-actionsBot removed the size/xl PR size: XL label May 21, 2026
@github-actionsgithub-actionsBot added the size/xl PR size: XL label May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Package Tarball

aws-agentcore-0.14.2.tgz

How to install

gh release download pr-1347-tarball --repo aws/agentcore-cli --pattern "*.tgz" --dir /tmp/pr-tarball
npm install -g /tmp/pr-tarball/aws-agentcore-0.14.2.tgz

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@github-actions

github-actionsBot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines44.57%9918 / 22249
🔵Statements43.82%10535 / 24040
🔵Functions41.17%1724 / 4187
🔵Branches40.89%6346 / 15516
Generated in workflow #3229 for commit a24b351 by the Vitest Coverage Report Action

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work overall — clean layering, good test coverage. A few inline notes; only the post-deploy hash one feels like it should block.

Comment threadsrc/cli/operations/deploy/post-deploy-datasets.ts Outdated
Comment threadsrc/cli/operations/eval/shared/span-collector.ts Outdated
Comment threadsrc/cli/operations/dataset/publish.ts Outdated
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/aws/agentcore-datasets.ts
Comment threadsrc/cli/primitives/DatasetPrimitive.ts
- Recompute content hash after pushDataset to avoid stale hash causing
redundant network calls on every deploy
- Replace Promise.all with Promise.allSettled in span-collector so one
failed session doesn't abort the entire eval run
- Move getDataset to static import in publish.ts (no cycle to dodge)
- Add AbortSignal.timeout(30s) to fetch in agentcore-datasets.ts so
hung connections don't block indefinitely
@github-actionsgithub-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels May 21, 2026
@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: the review run failed before completing. See the run for details.

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 21, 2026

@tejaskashtejaskash left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the four blocking/sub-blocking comments are addressed:

  • post-deploy-datasets.ts: now re-reads the file after pushDataset and hashes the post-push content ✓
  • span-collector.ts: switched to Promise.allSettled so one failure doesn't abort the rest ✓
  • publish.ts: dynamic getDataset import promoted to top-level ✓
  • agentcore-datasets.ts: fetch() now uses AbortSignal.timeout(30_000)

LGTM.

@agentcore-devx-automationagentcore-devx-automationBot added the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026
@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

Claude Security Review: no high-confidence findings. (run)

@agentcore-devx-automationagentcore-devx-automationBot removed the claude-security-reviewing Claude Code /security-review in progress label May 22, 2026

@padmak30padmak30 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the back navigation is broken.

  1. From run -> batch evals -> eval source (dataset & version) -> evaluators and navigating back with escape takes me back to run skipping the eval source step.
  2. Back-navigation in AddDatasetScreen loses previously typed name.
  3. DatasetFlow back-nav resets datasets to [], leaving the hub permanently stuck with "No items available" after pressing Esc from any sub-screen.

Comment threadsrc/schema/schemas/primitives/dataset.ts
@jariy17
jariy17 merged commit 6043caa into mainMay 22, 2026
39 of 42 checks passed
@jariy17
jariy17 deleted the feature/dataset-management branch May 22, 2026 12:56
jariy17 added a commit that referenced this pull request May 27, 2026
* fix(tui): back-navigation bugs in dataset and batch eval flows
Three back-navigation issues reported on PR #1347:
1. BatchEvalWizard Escape skips source-picker — onExit passed the
top-level exit handler instead of returning to the source-picker
state. Now returns to source-picker on first-step back-nav.
2. AddDatasetScreen loses typed name — initialValue always called
generateUniqueName() ignoring the stored name state. Now uses
the previously submitted name when available.
3. DatasetFlow back-nav resets datasets to [] — all four sub-screen
onExit/onCancel handlers hardcoded an empty array. Added
loadedDatasets state that persists across flow transitions.
* feat(dataset): add --kms-key-arn support to add dataset command and TUI
Wire kmsKeyArn through the full add-dataset flow:
- CLI: --kms-key-arn flag with ARN validation
- TUI: optional step after Description (Enter to skip)
- Primitive: writes kmsKeyArn to agentcore.json when provided
- CDK construct already passes KmsKeyArn to CloudFormation
The field is immutable after dataset creation (createOnly CFN property).
* test(dataset): add kmsKeyArn unit and integration tests
Cover the kmsKeyArn flow with:
- Unit: DatasetPrimitive.add() persists kmsKeyArn when provided, omits when absent
- Integ: CLI --kms-key-arn writes to agentcore.json, invalid ARN rejected, absent ARN omitted
---------
Co-authored-by: jariy17 <tjariy+jariy17@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xlPR size: XL

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jariy17@tejaskash@padmak30