Skip to content

sync-preview: merge main into preview (conflicts)#1242

Merged
jesseturner21 merged 6 commits into
previewfrom
sync-preview/merge-main-20260513-230210
May 14, 2026
Merged

sync-preview: merge main into preview (conflicts)#1242
jesseturner21 merged 6 commits into
previewfrom
sync-preview/merge-main-20260513-230210

Conversation

@agentcore-devx-automation

Copy link
Copy Markdown
Contributor

The automated sync could not cleanly merge main into preview.

This PR contains conflict markers. To resolve:

  1. Check out this branch locally:
    gh pr checkout <this-pr-number>
  2. Search for conflict markers and resolve them:
    grep -rn '<<<<<<< HEAD' .
  3. Keep preview-specific values (package version, preview tests, etc.) — accept main's changes for everything else.
  4. Commit and push, then merge this PR.

cc @Hweinstock

Opened automatically by the sync-preview workflow.

* feat: instrument telemetry for dev command

Add telemetry recording to the dev command across all execution paths:
- Invoke: wrapped with withCommandRunTelemetry, emits on success/failure
- Exec: wrapped with withCommandRunTelemetry for container exec
- Server modes (--logs, --no-browser, browser): emit on SIGINT/exit

Schema changes:
- Expand Action enum to include 'exec'
- Add UiMode enum ('browser' | 'terminal')
- Add 'agui' to Protocol enum
- Add ui_mode field to DevAttrs

Refactored invoke helpers to throw instead of process.exit(1) so
telemetry wrapper can record failures before exit.

Attributes emitted: action, ui_mode, has_stream, protocol, invoke_count

* refactor: use typed errors in dev command helpers + emit browser telemetry eagerly

Error classification:
- ConnectionError for connection-refused (new class in lib/errors/types.ts)
- ValidationError for invalid user input (missing --tool, bad JSON, unknown command)
- ResourceNotFoundError for missing container runtime

Browser mode telemetry:
- Emit telemetry eagerly via TelemetryClientAccessor before the blocking
  runBrowserMode call (which never returns). Do not copy this pattern —
  prefer withCommandRunTelemetry for commands that return.
@agentcore-devx-automation agentcore-devx-automation Bot requested a review from a team May 13, 2026 23:02
@Hweinstock Hweinstock force-pushed the sync-preview/merge-main-20260513-230210 branch from 2ead886 to d43ea9c Compare May 14, 2026 16:22
@Hweinstock Hweinstock force-pushed the sync-preview/merge-main-20260513-230210 branch from 044f5b3 to 3a4b747 Compare May 14, 2026 17:15
@github-actions

github-actions Bot commented May 14, 2026

Copy link
Copy Markdown
Contributor

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 43.54% 10042 / 23063
🔵 Statements 42.8% 10670 / 24928
🔵 Functions 40.39% 1696 / 4199
🔵 Branches 40.29% 6510 / 16156
Generated in workflow #2982 for commit fbb4b5b by the Vitest Coverage Report Action

@Hweinstock Hweinstock force-pushed the sync-preview/merge-main-20260513-230210 branch from 056afb9 to fbb4b5b Compare May 14, 2026 18:40
Comment thread package.json
Comment thread src/cli/tui/components/__tests__/SecretInput.test.tsx

@jesseturner21 jesseturner21 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

@jesseturner21 jesseturner21 merged commit 47bfe48 into preview May 14, 2026
17 checks passed
@jesseturner21 jesseturner21 deleted the sync-preview/merge-main-20260513-230210 branch May 14, 2026 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants