chore: merge main into preview manually due to workflow changes. - #1063

Closed
Hweinstock wants to merge 3 commits into
previewfrom
merge-into-preview
Closed

chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom
merge-into-preview

Conversation

@Hweinstock

@HweinstockHweinstock commented Apr 30, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Merge into main is failing since workflow files were adjusted:

Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.

Related Issue

Closes #

Documentation PR

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update
  • Other (please describe): branch hygiene

Testing

How have you tested the change?

  • I ran npm run test:unit and npm run test:integ
  • I ran npm run typecheck
  • I ran npm run lint
  • If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

  • I have read the CONTRIBUTING document
  • I have added any necessary tests that prove my fix is effective or my feature works
  • I have updated the documentation accordingly
  • I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  • My changes generate no new warnings
  • Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

avi-alpertand others added 3 commits April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot added the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 30, 2026
@github-actions

github-actionsBot commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action

@agentcore-cli-automation

agentcore-cli-automation commented Apr 30, 2026

Copy link
Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.

A couple of things I checked that are fine but worth noting:

  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.

LGTM to merge.

@github-actionsgithub-actionsBot removed the agentcore-harness-reviewing AgentCore Harness review in progress label Apr 30, 2026
@jesseturner21
jesseturner21 deleted the merge-into-preview branch July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

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

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

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

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

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

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

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

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert

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

Skip to content
chore: merge main into preview manually due to workflow changes.  - #1063
Closed
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Closed
chore: merge main into preview manually due to workflow changes. #1063
Hweinstock wants to merge 3 commits into
previewfrom 
merge-into-preview
Conversation
@Hweinstock
@HweinstockHweinstock
commented
Apr 30, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
Merge into main is failing since workflow files were adjusted:
Run git fetch origin main
From https://github.com/aws/agentcore-cli
* branch main -> FETCH_HEAD
ℹ️ Merging main into preview...
Auto-merging .github/workflows/e2e-tests-full.yml
Auto-merging package-lock.json
Auto-merging package.json
Merge made by the 'ort' strategy.
.github/workflows/e2e-tests-full.yml | 5 +++--
browser-tests/tests/traces.test.ts | 30 ++++++++++++++++++++------
docs/TESTING.md | 18 ++++++++++++++++
e2e-tests/fixtures/import/cleanup_resources.py | 10 ++++++---
e2e-tests/fixtures/import/common.py | 6 +++++-
e2e-tests/import-gateway.test.ts | 4 +++-
e2e-tests/import-resources.test.ts | 4 +++-
package-lock.json | 8 +++----
package.json | 2 +-
9 files changed, 67 insertions(+), 20 deletions(-)
remote: error: GH013: Repository rule violations found for refs/heads/preview. remote: Review all repository rules at https://github.com/aws/agentcore-cli/rules?ref=refs%2Fheads%2Fpreview remote: remote: - refusing to allow a GitHub App to create or update workflow `.github/workflows/e2e-tests-full.yml` without `workflows` permission remote: remote: - Changes must be made through a pull request. remote: To https://github.com/aws/agentcore-cli
! [remote rejected] preview -> preview (push declined due to repository rule violations)
error: failed to push some refs to 'https://github.com/aws/agentcore-cli'
Error: Process completed with exit code 1.

This PR merges the commits from main into preview.
Related Issue
Closes #
Documentation PR
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
  •  Other (please describe): branch hygiene
Testing
How have you tested the change?
  •  I ran npm run test:unit and npm run test:integ
  •  I ran npm run typecheck
  •  I ran npm run lint
  •  If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots
Checklist
  •  I have read the CONTRIBUTING document
  •  I have added any necessary tests that prove my fix is effective or my feature works
  •  I have updated the documentation accordingly
  •  I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  •  My changes generate no new warnings
  •  Any dependent changes have been merged and published
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the

terms of your choice.
avi-alpertand others
added 3 commits
April 30, 2026 11:09
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
278783a
@Hweinstock
ci: cut full e2e time in half via vitest sharding (#1016)
4daca83
* ci: shard e2e full suite across 6 runners
- Add 6-way vitest sharding to the cdk-source matrix (2 → 12 parallel runners)
- Isolate import test resources per run via RESOURCE_SUFFIX to prevent concurrent conflicts
* fix: import RESOURCE_SUFFIX in cleanup_resources.py
@avi-alpert
feat: update @aws/agent-inspector to 0.3.0
90f17b4
@github-actionsgithub-actionsBot
added
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@github-actions
github-actionsBot
commented
Apr 30, 2026

Copy link


Copy Markdown

Contributor
Coverage Report
StatusCategoryPercentageCovered / Total
🔵Lines43.44%8718 / 20067
🔵Statements42.79%9230 / 21569
🔵Functions41.07%1477 / 3596
🔵Branches40.66%5683 / 13976
Generated in workflow #2210 for commit 90f17b4 by the Vitest Coverage Report Action
@agentcore-cli-automation
agentcore-cli-automation
commented
Apr 30, 2026

Copy link


Copy Markdown

Reviewed this manual sync PR. The three upstream commits from main (vitest e2e sharding #1016, agent-inspector 0.3.0 bump, and its merge commit) look fine, and I verified locally that auto-merging into preview cleanly preserves preview-specific workflow customizations (e.g., branches: [main, preview] and ref: ${{ github.sha }} in e2e-tests-full.yml) while applying the new shard matrix and sharded vitest run invocation on top.
A couple of things I checked that are fine but worth noting:
  • Sharding + resource isolation: 6 shards × 2 cdk-source values = 12 concurrent e2e jobs. The import tests' new RESOURCE_SUFFIX (from ci: cut full e2e time in half via vitest sharding #1016) correctly disambiguates the shared bugbash-resources.json and the S3 code prefix per run, and the framework tests all derive unique agentNames via Date.now() in e2e-helper.ts, so cross-shard collisions shouldn't be a concern.
  • aws-secretsmanager-get-secrets@v2 vs @v3: preview is pinned to v2 while main bumped to v3 (ci: bump the github-actions group across 1 directory with 2 updates #649). The merge preserves preview's v2 — this is pre-existing state on preview, not something this PR changes, but flagging in case it was unintentional drift.
LGTM to merge.
@github-actionsgithub-actionsBot
removed
the 
agentcore-harness-reviewing
AgentCore Harness review in progress
label
Apr 30, 2026
@jesseturner21
jesseturner21
deleted the

merge-into-preview

branch
July 13, 2026 13:36
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Hweinstock@agentcore-cli-automation@avi-alpert