List view
**Last updated:** 2026-03-03 18:01 UTC # Merge Meeting — ambient-code/platform **Date:** 2026-03-03 **Open PRs:** 35 | **Clean (no blockers):** 6 | **In Merge Queue:** 6 ### At a Glance 6 PRs ready to merge. (smallest: #782, #780, #758, #747). 1 PR conflicted during merge test. 25 fork PRs require manual review (no automated agent review). 29 PRs have blockers. --- ## Clean PRs (6) > Listed in recommended merge order. Merge test results show whether each PR actually merges cleanly against the PRs above it. | # | PR | Author | Size | Updated | Merge Test | Notes | |---|---|---|---|---|---|---| | 1 | [#782](https://github.com/ambient-code/platform/pull/782) — RHOAIENG-51600: Document where to find Vertex AI service account key | ktdreyer | 1 files (+4/-0) | 2026-03-03 | merged | — | | 2 | [#780](https://github.com/ambient-code/platform/pull/780) — [Amber] Fix: Workflow startup greeting should render client-side, not round-trip through Claude | app/github-actions | 7 files (+59/-85) | 2026-03-03 | not attempted | Jira hygiene, Line overlap with #778 on components/frontend/src/app/projects/[name]/sessions/[sessionName]/components/welcome-experience.tsx, components/frontend/src/app/projects/[name]/sessions/[sessionName]/hooks/use-workflow-management.ts | | 3 | [#758](https://github.com/ambient-code/platform/pull/758) — docs: Add React state stability patterns and theme creation guidelines | app/ambient-code | 2 files (+355/-0) | 2026-03-02 | merged | Jira hygiene | | 4 | [#747](https://github.com/ambient-code/platform/pull/747) — feat(cli): add SDK-based session watch implementation | markturansky | 6 files (+322/-9) | 2026-03-03 | merged | Jira hygiene, 🍴 Fork (markturansky) — no agent review | | 5 | [#759](https://github.com/ambient-code/platform/pull/759) — docs: Ambient ERD and RBAC Software Factory proposal | markturansky | 2 files (+509/-0) | 2026-03-02 | merged | Jira hygiene, 🍴 Fork (markturansky) — no agent review | | 6 | [#778](https://github.com/ambient-code/platform/pull/778) — feat(frontend): replace custom components with shadcn/ui equivalents | jeremyeder | 73 files (+4084/-1796) | 2026-03-03 | not attempted | Jira hygiene, 🍴 Fork (jeremyeder) — no agent review, Line overlap with #772, #777, #780 on .github/workflows/claude-live-test.yml, .github/workflows/e2e.yml | ### Resolution Strategy **PR #746 conflicted** on: - `components/ambient-cli/go.mod` - `components/ambient-cli/go.sum` - `components/ambient-sdk/go-sdk/client/session_watch.go` - `components/ambient-sdk/go-sdk/types/session_watch.go` - **Owner:** markturansky - **Action needed:** Rebase #746 on top of the previous PRs in the merge order - **Blocked PRs:** #780, #778 (not attempted due to earlier conflict) Once #746 is rebased and the conflict is resolved, retry the merge test for the downstream PRs. --- ## PRs With Blockers ### 1. [#621](https://github.com/ambient-code/platform/pull/621) — [Amber] Fix: [Amber Refactor] "make kind-up" bails w/o kind, instead of offering to do the next thing **Author:** app/github-actions | **Size:** 1 files (+34/-4) | **Updated:** 2026-03-03 | **Branch:** `amber/issue-620-amber-refactor-make-kind-up-bails-w-o-kind-instead` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Author states bot review is incorrect; implementation doesn't fix actual bug | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | --- ### 2. [#662](https://github.com/ambient-code/platform/pull/662) — Claude/fix UI performance **Author:** jeremyeder | **Size:** 2 files (+95/-43) | **Updated:** 2026-03-03 | **Branch:** `claude/fix-ui-performance-wNNnP` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Critical: status check regression — can call connect() twice during 'connecting' phase | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 3. [#661](https://github.com/ambient-code/platform/pull/661) — Claude/daily sdk update action **Author:** jeremyeder | **Size:** 1 files (+212/-0) | **Updated:** 2026-03-03 | **Branch:** `claude/daily-sdk-update-action-tuNV9` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Critical: uv lock updates all dependencies, not just target; missing pipefail | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 4. [#755](https://github.com/ambient-code/platform/pull/755) — [Amber] Fix: feat(public-api): add /v1/sessions/:id/runs endpoint for AG-UI prompt delivery **Author:** app/github-actions | **Size:** 5 files (+245/-5) | **Updated:** 2026-03-01 | **Branch:** `amber/issue-753-feat-public-api-add-v1-sessions-id-runs-endpoint-f` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Blocker: SSE stream buffered with ReadAll() instead of proxied — endpoint hangs | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | --- ### 5. [#740](https://github.com/ambient-code/platform/pull/740) — feat: add /session-config skill for generating session-config repos **Author:** jeremyeder | **Size:** 2 files (+638/-0) | **Updated:** 2026-03-02 | **Branch:** `feat/session-config-skill` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Critical: stale PR description and unconfirmed schema fields cause broken config generation | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 6. [#717](https://github.com/ambient-code/platform/pull/717) — Add workflow picker to create session modal **Author:** jeremyeder | **Size:** 8 files (+462/-213) | **Updated:** 2026-03-03 | **Branch:** `ambient/session-1772125887` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Critical: aria-selected ARIA violation; activeWorkflow type duplication defeats centralization | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | --- ### 7. [#746](https://github.com/ambient-code/platform/pull/746) — refactor: SDK changes to support new API **Author:** markturansky | **Size:** 78 files (+3051/-148) | **Updated:** 2026-03-02 | **Branch:** `feat/ambient-sdk` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | Multiple blockers: git conflict in go.sum, module path mismatch, incomplete implementations, context cancel bug | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (markturansky) — no automated agent review --- ### 8. [#776](https://github.com/ambient-code/platform/pull/776) — ci(deps): bump actions/download-artifact from 4 to 8 **Author:** app/dependabot | **Size:** 1 files (+1/-1) | **Updated:** 2026-03-03 | **Branch:** `dependabot-github_actions-actions-download-artifact-8` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: check-label, check-label, Claude Live Testing (+2 more) | | Merge conflicts | pass | — | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | warn | Shares files but no line overlap | --- ### 9. [#775](https://github.com/ambient-code/platform/pull/775) — ci(deps): bump actions/setup-node from 4 to 6 **Author:** app/dependabot | **Size:** 1 files (+1/-1) | **Updated:** 2026-03-03 | **Branch:** `dependabot-github_actions-actions-setup-node-6` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: amber-review | | Merge conflicts | pass | — | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | pass | — | --- ### 10. [#773](https://github.com/ambient-code/platform/pull/773) — ci(deps): bump actions/setup-python from 5 to 6 **Author:** app/dependabot | **Size:** 1 files (+1/-1) | **Updated:** 2026-03-03 | **Branch:** `dependabot-github_actions-actions-setup-python-6` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: amber-review | | Merge conflicts | pass | — | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | warn | Shares files but no line overlap | --- ### 11. [#774](https://github.com/ambient-code/platform/pull/774) — ci(deps): bump actions/cache from 4 to 5 **Author:** app/dependabot | **Size:** 1 files (+2/-2) | **Updated:** 2026-03-03 | **Branch:** `dependabot-github_actions-actions-cache-5` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: amber-review | | Merge conflicts | pass | — | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | pass | — | --- ### 12. [#744](https://github.com/ambient-code/platform/pull/744) — feat(ci): add workflow_dispatch to Amber auto review **Author:** jeremyeder | **Size:** 1 files (+32/-5) | **Updated:** 2026-03-01 | **Branch:** `feat/amber-review-dispatch` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Script injection in workflow_dispatch input (Critical); missing error handling (Major); parseInt NaN guard missing (Major) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 13. [#777](https://github.com/ambient-code/platform/pull/777) — ci(deps): bump actions/upload-artifact from 4 to 7 **Author:** app/dependabot | **Size:** 4 files (+7/-7) | **Updated:** 2026-03-03 | **Branch:** `dependabot-github_actions-actions-upload-artifact-7` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: amber-review | | Merge conflicts | pass | — | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | FAIL | Line overlap with #778 on .github/workflows/claude-live-test.yml, .github/workflows/e2e.yml | > Merge order matters: overlaps with #778 --- ### 14. [#525](https://github.com/ambient-code/platform/pull/525) — [Amber] Fix: [Amber] Fix: Feature: Prompt Refine Button **Author:** app/github-actions | **Size:** 1 files (+46/-1) | **Updated:** 2026-02-18 | **Branch:** `amber/issue-479-amber-fix-feature-prompt-refine-button` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | --- ### 15. [#645](https://github.com/ambient-code/platform/pull/645) — RHOAIENG-51548: fix: replace dev-* Makefile targets with local-* **Author:** mprpic | **Size:** 8 files (+61/-65) | **Updated:** 2026-03-03 | **Branch:** `fix/claude-md-stale-makefile-targets` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | pass | — | | Jira hygiene | pass | — | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (mprpic) — no automated agent review --- ### 16. [#612](https://github.com/ambient-code/platform/pull/612) — feat: dynamic model support via MODELS_JSON ConfigMap **Author:** jeremyeder | **Size:** 13 files (+82/-7) | **Updated:** 2026-02-15 | **Branch:** `feature/dynamic-model-support` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Untyped JSON parsing (Critical); reactive default model loading broken (Critical) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 17. [#664](https://github.com/ambient-code/platform/pull/664) — feat: add kind-local overlay and kind-up-local target **Author:** jeremyeder | **Size:** 6 files (+154/-7) | **Updated:** 2026-03-01 | **Branch:** `feature/kind-local-dev` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Critical: ambient-api-server not handled in local overlay — 'no Quay' promise is broken | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 18. [#604](https://github.com/ambient-code/platform/pull/604) — feat(operator): externalize session container resource limits to Conf… **Author:** jeremyeder | **Size:** 6 files (+154/-8) | **Updated:** 2026-02-15 | **Branch:** `feature/externalize-session-resource-limits` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | resource.MustParse panic risk (Major); kind overlay memory limits below LimitRange minimum (Major) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 19. [#618](https://github.com/ambient-code/platform/pull/618) — fix: state-sync arm64 compatibility across CI and local dev **Author:** jeremyeder | **Size:** 5 files (+91/-224) | **Updated:** 2026-02-15 | **Branch:** `bugfix/state-sync-arm64-compat` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | pass | — | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 20. [#656](https://github.com/ambient-code/platform/pull/656) — perf(operator): parallelize secret reads, remove monitorPod goroutine… **Author:** syntaxsdev | **Size:** 9 files (+376/-492) | **Updated:** 2026-02-19 | **Branch:** `feat/operator-enhancements` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Double %w requires Go 1.20+ verification (Critical); new errgroup paths have no unit tests (Major) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (syntaxsdev) — no automated agent review --- ### 21. [#725](https://github.com/ambient-code/platform/pull/725) — feat: add human-in-the-loop support with AskUserQuestion **Author:** Gkrumbach07 | **Size:** 28 files (+1004/-42) | **Updated:** 2026-02-27 | **Branch:** `worktree-human-in-the-loop` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: build-and-push (frontend, ./components/frontend, quay.io/ambient_code/vteam_frontend, ./component..., build-and-push (backend, ./components/backend, quay.io/ambient_code/vteam_backend, ./components/b..., build-and-push (operator, ./components/operator, quay.io/ambient_code/vteam_operator, ./component... (+1 more) | | Merge conflicts | pass | — | | Review comments | FAIL | Debounce timestamp stored before goroutine succeeds (Critical); agentStatus not cleared on ResetToPending (Major) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (Gkrumbach07) — no automated agent review --- ### 22. [#697](https://github.com/ambient-code/platform/pull/697) — feat: add session labels with editor and filtering **Author:** jeremyeder | **Size:** 15 files (+1700/-185) | **Updated:** 2026-02-27 | **Branch:** `feat/session-labels` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | PatchSession lacks label validation, returns 500 instead of 400 (Critical) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 23. [#772](https://github.com/ambient-code/platform/pull/772) — feat: add automated model discovery with feature-flag-gated availability **Author:** maskarb | **Size:** 30 files (+2559/-436) | **Updated:** 2026-03-03 | **Branch:** `001-model-discovery` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | pass | — | | Review comments | FAIL | 2 inline threads on .github/workflows/model-discovery.yml | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | FAIL | Line overlap with #778 on components/frontend/src/components/create-session-dialog.tsx, components/frontend/src/components/workspace-sections/feature-flags-section.tsx | > Merge order matters: overlaps with #778 --- ### 24. [#639](https://github.com/ambient-code/platform/pull/639) — Feat/Add Ambient control plane **Author:** markturansky | **Size:** 42 files (+6427/-47) | **Updated:** 2026-03-03 | **Branch:** `feat/ambient-control-plane` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: Unit Tests, CLI Build and Tests, summary | | Merge conflicts | pass | — | | Review comments | FAIL | Blocker: dispatchLoop must start before initialSync (causes deadlock on >256 resources) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (markturansky) — no automated agent review --- ### 25. [#640](https://github.com/ambient-code/platform/pull/640) — WIP: Feat/Frontend to consume new v2 API **Author:** markturansky | **Size:** 91 files (+14912/-1376) | **Updated:** 2026-03-03 | **Branch:** `feat/frontend_to_api` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: Unit Tests, test-local-dev-simulation, CLI Build and Tests (+1 more) | | Merge conflicts | pass | — | | Review comments | FAIL | Blocker: hardcoded 'no-auth' token fallback bypasses proper authentication | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (markturansky) — no automated agent review --- ### 26. [#663](https://github.com/ambient-code/platform/pull/663) — fix: update oauth-proxy image to resolve ImagePullBackOff **Author:** jeremyeder | **Size:** 10 files (+23/-15) | **Updated:** 2026-02-27 | **Branch:** `fix/update-oauth-proxy-image` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: test-local-dev-simulation, build-and-push (claude-code-runner, ./components/runners, quay.io/ambient_code/vteam_claude_runne... | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Critical: OTel Collector config incompatible with v0.146.0 (logging exporter removed) | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (jeremyeder) — no automated agent review --- ### 27. [#649](https://github.com/ambient-code/platform/pull/649) — Add session environment variables reference for session pods **Author:** syntaxsdev | **Size:** 3 files (+344/-0) | **Updated:** 2026-02-27 | **Branch:** `docs/session-env` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | 1 inline threads on docs/reference/session-environment-variables.md | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (syntaxsdev) — no automated agent review --- ### 28. [#505](https://github.com/ambient-code/platform/pull/505) — update deployment docs for minio bucket creation **Author:** sallyom | **Size:** 3 files (+611/-15) | **Updated:** 2026-02-27 | **Branch:** `update-minio-deployment-docs` | Blocker | Status | Detail | |---------|--------|--------| | CI | FAIL | Failing: End-to-End Tests | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | Blocker: hardcoded relative path in deploy.sh fails when run from different directories | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | > 🍴 Fork (sallyom) — no automated agent review --- ### 29. [#517](https://github.com/ambient-code/platform/pull/517) — docs(constitution): update to v2.0.0 with spec-kit alignment **Author:** jeremyeder | **Size:** 2 files (+1668/-239) | **Updated:** 2026-02-18 | **Branch:** `docs/constitution-v2-speckit-alignment` | Blocker | Status | Detail | |---------|--------|--------| | CI | pass | — | | Merge conflicts | FAIL | Has merge conflicts | | Review comments | FAIL | 11 inline threads on .specify/memory/constitution_update_v2.md, .specify/memory/constitution.md | | Jira hygiene | warn | No Jira reference found | | Staleness | pass | — | | Diff overlap risk | — | — | --- ## Summary - **Ready now:** 6 PRs with zero blockers - **In Merge Queue:** 6 PRs - **One blocker away:** 18 PRs - **Needs work:** 4 PRs - **Recommend closing:** 0 PRs - **Fork PRs:** 25 (marked with 🍴 in tables — no automated agent review, require manual review)
No due date•0/6 issues closed