diff --git a/docs/upstream-sync/triage.jsonl b/docs/upstream-sync/triage.jsonl index 181bbb56..995564fe 100644 --- a/docs/upstream-sync/triage.jsonl +++ b/docs/upstream-sync/triage.jsonl @@ -1,4 +1,4 @@ -{"_meta": {"last_synced": "3ea29d3f", "last_synced_date": "2026-07-20"}} +{"_meta": {"last_synced": "1443fc4b", "last_synced_date": "2026-07-21"}} {"sha": "0b76afdc", "pr": 1653, "subject": "reviews block agenda, sticky headers, diff scroll", "disposition": "landed", "reason": "", "branch": "cherry-pick-upstream", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "7530653b", "pr": 1655, "subject": "ResizeObserver settle for review scroll-to", "disposition": "landed", "reason": "", "branch": "cherry-pick-upstream", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "23bd4a63", "pr": 1660, "subject": "top padding to sticky review block header", "disposition": "landed", "reason": "", "branch": "cherry-pick-upstream", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} @@ -130,3 +130,16 @@ {"sha": "f0897479", "pr": 1778, "subject": "feat: surface context window usage in agents UI (#1778)", "disposition": "deferred", "reason": "Near-clean: context-window indicator UI is all new files (zero drift); options.py hunk must be re-keyed to the fork's Bedrock/Fireworks model map (fork model IDs differ from upstream's) — add context_window per fork entry rather than taking upstream values.", "branch": "context-usage-ui", "local_sha": null, "updated": "2026-07-17T22:33:46Z"} {"sha": "31263f83", "pr": 1785, "subject": "Fix: Fix Stored XSS in ReplyCard.tsx (#1785)", "disposition": "landed", "reason": "SECURITY priority, near-clean: diff is urlencode() hardening of the GitHub OAuth authorize URL in dashboard routes.py auth_login (upstream bot title says ReplyCard.tsx — mismatch, trust the diff). Fork auth_login has the identical f-string URL; hunk applies clean. Port promptly.", "branch": "feature/upstream-clean-batch-security-linear", "local_sha": null, "updated": "2026-07-20T19:46:00Z"} {"sha": "3ea29d3f", "pr": 1789, "subject": "Fix: Fix Improper privilege management in server.py (#1789)", "disposition": "landed", "reason": "SECURITY priority, near-clean: adds empty-signature reject to verify_github_signature (utils/github_comments.py) + verify_linear_signature (webhooks/common.py) (title says server.py — mismatch, trust the diff). Both fork functions match at the hunk sites; fork-only verify_jira_secret already guards empty token. Real value: None signature currently raises TypeError in compare_digest. Port BOTH hunks together.", "branch": "feature/upstream-clean-batch-security-linear", "local_sha": null, "updated": "2026-07-20T19:46:00Z"} +{"sha": "2e8ff4b7", "pr": 1782, "subject": "chore: clarify shared response image guidance (#1782)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "4ea2441a", "pr": 1791, "subject": "fix: match embedded review description background (#1791)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "589dfd83", "pr": 1787, "subject": "fix: Harden Stagehand browser URL handling (#1787)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "9bbd65d3", "pr": 1781, "subject": "fix: derive model context windows from LangChain profiles (#1781)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "df743658", "pr": 1774, "subject": "feat: add repository skill support to the coding agent (#1774)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "75fb8b48", "pr": 1786, "subject": "Fix PR creation guard shell bypasses (#1786)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "32e81f29", "pr": 1788, "subject": "Fix: Fix Insecure Direct Object Reference in slack_start_new_thread.py (#1788)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "ab85b372", "pr": 1764, "subject": "fix: add exc_info to swallowed exception in push re-review webhook (#1764)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "7312851d", "pr": 1777, "subject": "feat: add explicit plan approval tool (#1777)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "e51abe14", "pr": 1754, "subject": "fix: skip oversized images before model calls (#1754)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "0ed560a5", "pr": 1779, "subject": "fix: settle review checks after run failures (#1779)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "5b5e6076", "pr": 1790, "subject": "chore: Add open wiki docs (#1790)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} +{"sha": "1443fc4b", "pr": 1792, "subject": "fix: Update openwiki gh action (#1792)", "disposition": "untriaged", "reason": "", "branch": "", "local_sha": null, "updated": "2026-07-21T12:46:59Z"} diff --git a/docs/upstream-sync/triage.md b/docs/upstream-sync/triage.md index 8904a119..755609ad 100644 --- a/docs/upstream-sync/triage.md +++ b/docs/upstream-sync/triage.md @@ -6,7 +6,7 @@ Commits on `upstream/main` (langchain-ai/open-swe) not yet in `dev`, and the dec Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred rows are provisional — re-inspect before picking. See the fork-maintenance runbook in `CLAUDE.md`. -**Last synced `upstream/main`:** `3ea29d3f` (2026-07-20) +**Last synced `upstream/main`:** `1443fc4b` (2026-07-21) | sha | pr | subject | decision | why | branch | |---|---|---|---|---|---| @@ -141,5 +141,18 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `81d544bc` | #1765 | feat: Expose more specific AGENTS.md context to Open SWE reviewer (#1765) | Deferred | Near-clean: agents_md.py helper + tests are zero-drift; reviewer.py hunk is small (~39 lines) but lands in the fork's heavily-diverged reviewer — hand-apply the scoped_agents_md wiring onto the fork's fetch_agents_md call sites (reviewer.py ~L404/445/1031). | reviewer-context | | `8c8e58bc` | #1776 | feat: connect automations to Slack channels (#1776) | Deferred | Moderate reconcile: Slack-channel wiring for automations. Fork helpers exist (post_slack_top_level_message_with_ts, generate_thread_id_from_slack_thread, slack_id_for_login); completion.py (+233 drift) and schedules.py (+167) need hand-merge; UI automations feature present. Keep backend+UI+tests as one vertical. | automations-slack | | `f0897479` | #1778 | feat: surface context window usage in agents UI (#1778) | Deferred | Near-clean: context-window indicator UI is all new files (zero drift); options.py hunk must be re-keyed to the fork's Bedrock/Fireworks model map (fork model IDs differ from upstream's) — add context_window per fork entry rather than taking upstream values. | context-usage-ui | +| `2e8ff4b7` | #1782 | chore: clarify shared response image guidance (#1782) | Untriaged | | | +| `4ea2441a` | #1791 | fix: match embedded review description background (#1791) | Untriaged | | | +| `589dfd83` | #1787 | fix: Harden Stagehand browser URL handling (#1787) | Untriaged | | | +| `9bbd65d3` | #1781 | fix: derive model context windows from LangChain profiles (#1781) | Untriaged | | | +| `df743658` | #1774 | feat: add repository skill support to the coding agent (#1774) | Untriaged | | | +| `75fb8b48` | #1786 | Fix PR creation guard shell bypasses (#1786) | Untriaged | | | +| `32e81f29` | #1788 | Fix: Fix Insecure Direct Object Reference in slack_start_new_thread.py (#1788) | Untriaged | | | +| `ab85b372` | #1764 | fix: add exc_info to swallowed exception in push re-review webhook (#1764) | Untriaged | | | +| `7312851d` | #1777 | feat: add explicit plan approval tool (#1777) | Untriaged | | | +| `e51abe14` | #1754 | fix: skip oversized images before model calls (#1754) | Untriaged | | | +| `0ed560a5` | #1779 | fix: settle review checks after run failures (#1779) | Untriaged | | | +| `5b5e6076` | #1790 | chore: Add open wiki docs (#1790) | Untriaged | | | +| `1443fc4b` | #1792 | fix: Update openwiki gh action (#1792) | Untriaged | | | _Maintenance: after a `git sync`, add new `dev..upstream/main` SHAs as **Untriaged** (edit `triage.jsonl`) and bump "Last synced". A successful `git cherry-pick -x` auto-moves the row to **Landed** via the `post-commit` journal + `make triage-reconcile`._