From 75fc9d207060a7394c72135fa876057dc268b979 Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Fri, 3 Jul 2026 15:51:31 -0400 Subject: [PATCH] chore(upstream-sync): reconcile triage ledger for landed Slack-tooling cherry-picks --- docs/upstream-sync/triage.jsonl | 8 ++++---- docs/upstream-sync/triage.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/upstream-sync/triage.jsonl b/docs/upstream-sync/triage.jsonl index 79ea4071..2bc55cb4 100644 --- a/docs/upstream-sync/triage.jsonl +++ b/docs/upstream-sync/triage.jsonl @@ -26,12 +26,12 @@ {"sha": "c03a6be7", "pr": 1634, "subject": "keep plan guidance high-level", "disposition": "deferred", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "96cceb74", "pr": 1632, "subject": "notify Slack on plan approval", "disposition": "deferred", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "2f56d754", "pr": 1618, "subject": "omit plan link when no plan exists", "disposition": "deferred", "reason": "likely regression", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "ee224d3e", "pr": 1650, "subject": "add Slack reaction tool", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "747ce4bb", "pr": 1638, "subject": "add Slack breakout thread tool", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "27d90ef1", "pr": 1633, "subject": "include Slack channel context in prompts", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} +{"sha": "ee224d3e", "pr": 1650, "subject": "add Slack reaction tool", "disposition": "landed", "reason": "", "branch": "slack-tooling", "local_sha": "3c6077c418e4017acf1f04ebeb81846770f934c9", "updated": "2026-07-03T19:38:56Z"} +{"sha": "747ce4bb", "pr": 1638, "subject": "add Slack breakout thread tool", "disposition": "landed", "reason": "", "branch": "slack-tooling", "local_sha": "b2b49ed9446600879c12c436d602c21d534be9ca", "updated": "2026-07-03T19:37:13Z"} +{"sha": "27d90ef1", "pr": 1633, "subject": "include Slack channel context in prompts", "disposition": "landed", "reason": "", "branch": "slack-tooling", "local_sha": "3a941a693c5110730815d35f156cd2c954ca9897", "updated": "2026-07-03T18:56:43Z"} {"sha": "4cd5fa5c", "pr": 1629, "subject": "avoid recapping Slack replies", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "92dbf6f9", "pr": 1630, "subject": "update Slack trace reply on web handoff", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "bb36448b", "pr": 1627, "subject": "surface Slack thread errors", "disposition": "deferred", "reason": "", "branch": "slack-tooling", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} +{"sha": "bb36448b", "pr": 1627, "subject": "surface Slack thread errors", "disposition": "landed", "reason": "", "branch": "slack-tooling", "local_sha": "e8b6fb70508861e5742d31aaa722e79f4a9a320a", "updated": "2026-07-03T19:50:30Z"} {"sha": "73b7d1c0", "pr": 1678, "subject": "fix OpenAI Responses reasoning replay", "disposition": "deferred", "reason": "", "branch": "gateway-routing", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "5f7c2f46", "pr": 1674, "subject": "fix Fireworks Gateway base URL", "disposition": "deferred", "reason": "", "branch": "gateway-routing", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "702ef908", "pr": 1673, "subject": "dedicated LangSmith gateway API key", "disposition": "deferred", "reason": "", "branch": "gateway-routing", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} diff --git a/docs/upstream-sync/triage.md b/docs/upstream-sync/triage.md index 8c353489..e1a93241 100644 --- a/docs/upstream-sync/triage.md +++ b/docs/upstream-sync/triage.md @@ -19,6 +19,10 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `f32e492a` | #1637 | return to thread after plan approval | Landed | | cherry-pick-upstream | | `7ee3e057` | #1636 | make plan view mobile friendly | Landed | | cherry-pick-upstream | | `6575c327` | #1654 | disable React StrictMode | Landed | kept fork's `PwaUpdateProvider` | cherry-pick-upstream | +| `ee224d3e` | #1650 | add Slack reaction tool | Landed | | slack-tooling | +| `747ce4bb` | #1638 | add Slack breakout thread tool | Landed | | slack-tooling | +| `27d90ef1` | #1633 | include Slack channel context in prompts | Landed | | slack-tooling | +| `bb36448b` | #1627 | surface Slack thread errors | Landed | | slack-tooling | | `289f5e3a` | #1651 | add Sonnet 5 to model picker | Landed | already in dev; added Bedrock family fallback fix (c16fb915) | gateway-routing | | `c3292d82` | #1611 | bake sfw binary into sandbox image | Won't merge | already in dev | | | `48bf712b` | #1609 | show message timestamps | Won't merge | already in dev | | @@ -38,12 +42,8 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `c03a6be7` | #1634 | keep plan guidance high-level | Deferred | | plan-approval | | `96cceb74` | #1632 | notify Slack on plan approval | Deferred | | plan-approval | | `2f56d754` | #1618 | omit plan link when no plan exists | Deferred | likely regression | plan-approval | -| `ee224d3e` | #1650 | add Slack reaction tool | Deferred | | slack-tooling | -| `747ce4bb` | #1638 | add Slack breakout thread tool | Deferred | | slack-tooling | -| `27d90ef1` | #1633 | include Slack channel context in prompts | Deferred | | slack-tooling | | `4cd5fa5c` | #1629 | avoid recapping Slack replies | Deferred | | slack-tooling | | `92dbf6f9` | #1630 | update Slack trace reply on web handoff | Deferred | | slack-tooling | -| `bb36448b` | #1627 | surface Slack thread errors | Deferred | | slack-tooling | | `73b7d1c0` | #1678 | fix OpenAI Responses reasoning replay | Deferred | | gateway-routing | | `5f7c2f46` | #1674 | fix Fireworks Gateway base URL | Deferred | | gateway-routing | | `702ef908` | #1673 | dedicated LangSmith gateway API key | Deferred | | gateway-routing |