Skip to content
Open
No due date
Last updated Mar 6, 2026
0% complete

Last updated: 2026-03-06 13:35 UTC

Merge Meeting — ambient-code/platform

Date: 2026-03-06
Open PRs: 51 | Clean (no blockers): 2 | In Merge Queue: 2

At a Glance

Only 2 PRs are ready to merge (#758, #759 - both documentation). All 10 PRs initially identified as clean failed review comment evaluation with Critical/Major issues requiring fixes before merge. Notable: 10 PRs merged cleanly in test sequence before #807 conflicted on public-api files. 17 fork PRs require manual review (no automated agent coverage).


Clean PRs (2)

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
8 #758 — docs: Add React state stability patterns and theme creation guidelines app/ambient-code 2 files (+355/-0) 2026-03-05 merged Jira hygiene: No Jira reference found
9 #759 — docs: Ambient ERD and RBAC Software Factory proposal markturansky 2 files (+509/-0) 2026-03-04 merged 🍴 Fork (markturansky) — no agent review

PRs With Blockers

1. #830 — fix(manifests): add OpenShift TLS serving cert annotation to api-server Service

Author: markturansky | Size: 1 files (+1/-0) | Updated: 2026-03-06 | Branch: fix/api-server-tls-cert

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Major: OpenShift-specific TLS annotation placed in base/ instead of overlays/production/, violating Kustomize overlay-separation pattern
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk FAIL Line overlap with #815 on components/manifests/base/ambient-api-server-service.yml

Merge order matters: overlaps with #815


2. #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 (+12/-2) | Updated: 2026-02-19 | Branch: ambient/session-1771811827

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Author disputes bot review correctness — implementation doesn't fix actual bug
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

3. #662 — Claude/fix UI performance

Author: jeremyeder | Size: 1 files (+1/-1) | Updated: 2026-02-20 | Branch: fix-ui-performance

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Critical: Status check guard logic change not semantically equivalent — can trigger duplicate connects during 'connecting' state
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


4. #825 — feat(frontend): add context window usage tracking

Author: jeremyeder | Size: 3 files (+94/-2) | Updated: 2026-03-05 | Branch: feat/context-window-tracking

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Major: Incorrect context limit for Claude Opus 4 (maps to 1M tokens, actual is 200K) — displays 83K/1M instead of 83K/200K
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk warn Same file as #819, no line overlap

5. #819 — perf(frontend): message windowing + stable keys in MessagesTab

Author: Gkrumbach07 | Size: 4 files (+146/-70) | Updated: 2026-03-05 | Branch: fix/message-windowing

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Critical: Type error (HierarchicalToolMessage missing from MessagesTabProps.streamMessages type); Major: raw button instead of Shadcn Button component
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk warn Same file as #825, no line overlap

6. #661 — Claude/daily sdk update action

Author: jeremyeder | Size: 1 files (+43/-0) | Updated: 2026-02-20 | Branch: daily-sdk-update

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Critical: uv lock regenerates full lock file without --upgrade-package flag, silently updating unintended deps; Missing set -o pipefail on PyPI fetch; SHA/tag comment needs verification
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


7. #755 — [Amber] Fix: feat(public-api): add /v1/sessions/:id/runs endpoint for AG-UI prompt delivery

Author: app/github-actions | Size: 2 files (+99/-1) | Updated: 2026-03-03 | Branch: ambient/session-1772337530

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 pass

10. #805 — feat(RHOAIENG-50753): add LDAP user and group autocomplete for workspace sharing

Author: mprpic | Size: 3 files (+148/-0) | Updated: 2026-03-04 | Branch: ldap-autocomplete

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Blocker: TLS verification disabled in production (LDAP_SKIP_TLS_VERIFY: true) — security vulnerability
Jira hygiene pass
Staleness pass
Diff overlap risk FAIL Line overlap with #815 on components/manifests/overlays/production/kustomization.yaml

Merge order matters: overlaps with #815


11. #807 — feat(public-api): complete session API surface for mcp-acp integration

Author: adalton | Size: 3 files (+177/-1) | Updated: 2026-03-04 | Branch: sessions-api

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Major: Log injection vulnerability via unsanitized sessionName — security standards violation requiring pre-merge fix
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

Merge test: CONFLICT on components/public-api/handlers/integration_test.go, components/public-api/handlers/sessions.go, components/public-api/main.go


12. #829 — fix(frontend): show friendly message for binary files instead of garbled text

Author: jeremyeder | Size: 2 files (+23/-8) | Updated: 2026-03-06 | Branch: fix/binary-file-display

Blocker Status Detail
CI pass
Merge conflicts pass
Review comments FAIL Major: SVG incorrectly marked as binary format — correctness bug explicitly marked "must fix before merge"
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

Merge test: not attempted (stopped after conflict on #807)


13. #812 — fix: allow bot actors in amber auto-review workflow

Author: Gkrumbach07 | Size: 1 files (+6/-1) | Updated: 2026-03-04 | Branch: fix/bot-amber-review

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

14. #791 — [Amber] Fix: [Amber] docs/internal/adr/README.md table is out of date

Author: app/github-actions | Size: 1 files (+1/-0) | Updated: 2026-03-03 | Branch: ambient/session-1772337457

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

15. #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: amber-review, check-label, and 6 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

16. #775 — ci(deps): bump actions/setup-node from 4 to 6

Author: app/dependabot | Size: 1 files (+2/-2) | Updated: 2026-03-03 | Branch: dependabot/github_actions/actions/setup-node-6

Blocker Status Detail
CI FAIL Failing: amber-review, check-label, and 6 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

17. #773 — ci(deps): bump actions/setup-python from 5 to 6

Author: app/dependabot | Size: 1 files (+2/-2) | Updated: 2026-03-03 | Branch: dependabot/github_actions/actions/setup-python-6

Blocker Status Detail
CI FAIL Failing: amber-review, check-label, and 6 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

18. #774 — ci(deps): bump actions/cache from 4 to 5

Author: app/dependabot | Size: 1 files (+1/-1) | Updated: 2026-03-03 | Branch: dependabot/github_actions/actions/cache-5

Blocker Status Detail
CI FAIL Failing: amber-review, check-label, and 6 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

19. #821 — fix: remove hardcoded UID 999 to support OpenShift SCCs

Author: jeremyeder | Size: 3 files (+2/-5) | Updated: 2026-03-05 | Branch: fix/openshift-uid

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

20. #771 — RHOAIENG-51372: document preprod self-hosted runner in workflows README

Author: ktdreyer | Size: 2 files (+22/-1) | Updated: 2026-03-02 | Branch: runner-docs

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments pass
Jira hygiene pass
Staleness pass
Diff overlap risk pass

21. #744 — feat(ci): add workflow_dispatch to Amber auto review

Author: jeremyeder | Size: 1 files (+24/-0) | Updated: 2026-02-28 | Branch: feat/amber-workflow-dispatch

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: Script injection risk in Resolve PR number step — pr_number interpolated without escaping; Major: missing error handling and parseInt NaN guards
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


22. #525 — [Amber] Fix: [Amber] Fix: Feature: Prompt Refine Button

Author: app/github-actions | Size: 8 files (+119/-38) | Updated: 2026-01-31 | Branch: ambient/session-1770706878

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

23. #813 — build(deps): bump the npm_and_yarn group across 3 directories with 3 updates

Author: app/dependabot | Size: 3 files (+9/-9) | Updated: 2026-03-04 | Branch: dependabot/npm_and_yarn/npm_and_yarn-c0fc8f9eec

Blocker Status Detail
CI FAIL Failing: amber-review, check-label, and 6 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

24. #777 — ci(deps): bump actions/upload-artifact from 4 to 7

Author: app/dependabot | Size: 1 files (+1/-1) | 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 pass

25. #793 — RHOAIENG-50709: add ADR for CI/CD on firewalled clusters

Author: ktdreyer | Size: 1 files (+167/-0) | Updated: 2026-03-03 | Branch: firewall-ci

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene pass
Staleness pass
Diff overlap risk pass

26. #806 — build(deps): bump authlib from 1.6.6 to 1.6.7 in /components/runners/ambient-runner in the uv group across 1 directory

Author: app/dependabot | Size: 1 files (+2/-2) | Updated: 2026-03-04 | Branch: dependabot/uv/components/runners/ambient-runner/uv-e7b1ec02d4

Blocker Status Detail
CI FAIL Failing: amber-review, check-label, and 4 more
Merge conflicts pass
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

27. #780 — [Amber] Fix: Workflow startup greeting should render client-side, not round-trip through Claude

Author: app/github-actions | Size: 2 files (+39/-23) | Updated: 2026-03-03 | Branch: ambient/session-1772337389

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts CONFLICTING Has merge conflicts
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

28. #664 — feat: add kind-local overlay and kind-up-local target

Author: jeremyeder | Size: 5 files (+119/-1) | Updated: 2026-02-20 | Branch: feat/kind-local

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: ambient-api-server still pulls from Quay in kind-local; Major: Docker save portability & unsafe JSON patches
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


29. #604 — feat(operator): externalize session container resource limits to Conf…

Author: jeremyeder | Size: 6 files (+167/-10) | Updated: 2026-02-14 | Branch: feat/session-resources

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: resource.MustParse panic risk violates production safety; kind LimitRange mismatch will crash pods
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


30. #517 — docs(constitution): update to v3.0.0, streamline and align with spec-kit template

Author: jeremyeder | Size: 3 files (+165/-231) | Updated: 2026-01-31 | Branch: docs/constitution-v3

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

31. #618 — fix: state-sync arm64 compatibility across CI and local dev

Author: jeremyeder | Size: 4 files (+48/-16) | Updated: 2026-02-17 | Branch: fix/state-sync-arm64

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: Double %w requires Go 1.20+ verification; Major: no tests for parallel errgroup paths; transient error handling broken
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


32. #811 — feat: add Gemini model discovery to model-discovery script

Author: maskarb | Size: 1 files (+71/-3) | Updated: 2026-03-04 | Branch: feat/gemini-discovery

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

33. #717 — Add workflow picker to create session modal

Author: jeremyeder | Size: 6 files (+194/-21) | Updated: 2026-02-25 | Branch: feat/workflow-picker

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: aria-selected invalid on button elements (accessibility violation); activeWorkflow type duplicated instead of using WorkflowSelection
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

34. #656 — perf(operator): parallelize secret reads, remove monitorPod goroutine…

Author: syntaxsdev | Size: 5 files (+74/-80) | Updated: 2026-02-19 | Branch: perf/parallel-secrets

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: Double %w Go version issue; transient API errors silently fail sessions; extensive context.TODO() undermines refactor
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (syntaxsdev) — no agent review


35. #820 — feat(skill): add port-forward manager to dev-cluster skill

Author: jeremyeder | Size: 1 files (+98/-17) | Updated: 2026-03-05 | Branch: feat/port-forward-skill

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts CONFLICTING Has merge conflicts
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


36. #810 — docs: V2 architecture docs, ADR-0007, local dev guide, code generation workflow

Author: markturansky | Size: 14 files (+1265/-17) | Updated: 2026-03-05 | Branch: docs/v2-architecture

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts CONFLICTING Has merge conflicts
Review comments pass
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

37. #697 — feat: add session labels with editor and filtering

Author: jeremyeder | Size: 10 files (+389/-20) | Updated: 2026-02-24 | Branch: feat/session-labels

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: PatchSession skips label validation; Major: dead code (EditSessionLabelsDialog, SessionLabelFilter), unreliable hasChanged comparison
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


38. #815 — feat: add ambient-control-plane with Kubernetes reconcilers and gRPC watch

Author: markturansky | Size: 26 files (+2052/-14) | Updated: 2026-03-05 | Branch: feat/control-plane

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: createDefaultRunnerSecrets creates Secret without OwnerReference (resource leak); WatchEvent.Object uses any type violating standards; Major: Makefile IMAGE_TAG regression, K8s informer backoff issues
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk FAIL Line overlaps with #804 on 14 files, #805 on 1 file, #830 on 1 file

Multiple PRs depend on this — must merge first or rebase others


39. #663 — fix: update oauth-proxy image to resolve ImagePullBackOff

Author: jeremyeder | Size: 1 files (+1/-1) | Updated: 2026-02-20 | Branch: fix/oauth-proxy-image

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Blocker: PR description contradicts actual code (oauth-proxy mismatch); Critical: Grafana 11→12 upgrade without migration validation; OTel Collector 52 minor versions jump
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (jeremyeder) — no agent review


40. #649 — Add session environment variables reference for session pods

Author: syntaxsdev | Size: 1 files (+62/-0) | Updated: 2026-02-19 | Branch: docs/session-env-vars

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts CONFLICTING Has merge conflicts
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (syntaxsdev) — no agent review


41. #725 — feat: add human-in-the-loop support with AskUserQuestion

Author: Gkrumbach07 | Size: 7 files (+375/-23) | Updated: 2026-02-26 | Branch: feat/ask-user-question

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL Critical: debounce race condition causing stale timestamps; Major: incomplete agentStatus reset, duplicated code
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk pass

🍴 Fork (Gkrumbach07) — no agent review


42. #804 — feat(cli): add SDK-based session watch implementation

Author: markturansky | Size: 13 files (+582/-9) | Updated: 2026-03-04 | Branch: feat/session-watch

Blocker Status Detail
CI FAIL Failing: amber-review
Merge conflicts pass
Review comments FAIL CHANGES_REQUESTED from github-actions not dismissed
Jira hygiene warn No Jira reference found
Staleness pass
Diff overlap risk FAIL Line overlaps with #815 on 14 files

Blocked by #815 — must resolve that first



Summary

  • Ready now: 2 PRs with zero blockers
  • In Merge Queue: 2 PRs
  • One blocker away: 26 PRs
  • Needs work: 5 PRs (2+ blockers)
  • Recommend closing: 0 PRs
  • Fork PRs: 17 (marked with 🍴 in tables — no automated agent review, require manual review)

List view