From a09b1c3bb6ce0fa4f199204db64e9eebcf0d5e67 Mon Sep 17 00:00:00 2001 From: amoussa1229 <166072409+amoussa1229@users.noreply.github.com> Date: Thu, 9 Jul 2026 17:11:40 +0000 Subject: [PATCH 1/5] feat: port plan-review & workflow-approval UX (#135) Port six upstream commits onto dev: - c03a6be7 (already ported): keep plan guidance high-level - 546042a4: add workflow approval UI with diff preview, approval URLs, web review links, and polling for approval status during active runs - 216cf181: remove workflow token elevation; approved pushes pass through directly without proxy token rewriting - 3dbc0282: preserve plan redirects after login by accepting relative same-origin redirect_to values and rejecting blocked paths - bb104d93: submit plan comments with cmd+enter - 90cb6caa: terse Slack replies, shared content via save_plan outside plan mode (PLAN_STATUS_SHARED), reject shared-content mutations Refs: #135 --- agent/dashboard/oauth.py | 31 +- agent/dashboard/plan_api.py | 21 +- agent/dashboard/plan_store.py | 21 +- agent/dashboard/workflow_approval.py | 84 ++++- agent/dashboard/workflow_approval_api.py | 33 +- agent/middleware/workflow_push_guard.py | 165 ++++++---- agent/prompt.py | 5 +- agent/tools/save_plan.py | 59 ++-- agent/utils/dashboard_links.py | 8 + docs/upstream-sync/triage.jsonl | 12 +- docs/upstream-sync/triage.md | 12 +- tests/test_plan_review.py | 16 +- tests/test_workflow_push_guard.py | 97 +----- ui/src/components/agents/AgentThreadView.tsx | 64 +--- ui/src/components/agents/PlanReview.tsx | 36 ++- .../agents/WorkflowApprovalCard.tsx | 287 ++++++++++-------- ui/src/lib/agents/api.ts | 44 ++- ui/src/lib/agents/queries.ts | 75 ++--- ui/src/lib/api.ts | 5 +- ui/src/lib/plan.ts | 6 +- ui/src/routes/agents/$threadId_.plan.tsx | 4 +- ui/src/routes/login.tsx | 1 - 22 files changed, 596 insertions(+), 490 deletions(-) diff --git a/agent/dashboard/oauth.py b/agent/dashboard/oauth.py index ec434b31..2cd5e953 100644 --- a/agent/dashboard/oauth.py +++ b/agent/dashboard/oauth.py @@ -80,21 +80,36 @@ def _origin_of(url: str) -> str: return f"{scheme}://{host}:{port}" -def sanitize_redirect_to(redirect_to: str | None) -> str: - """Return a safe post-login redirect URL. +def _is_blocked_redirect_path(path: str) -> bool: + return path in {"/login", "/dashboard/api", "/_serverFn"} or path.startswith( + ("/login/", "/login?", "/login#", "/dashboard/api/", "/_serverFn/") + ) - Falls back to DASHBOARD_BASE_URL when the supplied URL's origin isn't - explicitly allowed. This blocks the open-redirect / phishing primitive - where an attacker drops their own URL into `?redirect_to=`. - """ + +def sanitize_redirect_to(redirect_to: str | None) -> str: + """Return a safe post-login redirect URL.""" fallback = os.environ.get("DASHBOARD_BASE_URL", "").strip() if not redirect_to: return fallback - candidate_origin = _origin_of(redirect_to) + trimmed = redirect_to.strip() + parsed = urlparse(trimmed) + if ( + trimmed.startswith("/") + and not trimmed.startswith("//") + and not parsed.scheme + and not parsed.netloc + and not _is_blocked_redirect_path(parsed.path) + ): + if fallback: + return f"{fallback.rstrip('/')}{trimmed}" + return trimmed + if _is_blocked_redirect_path(parsed.path): + return fallback + candidate_origin = _origin_of(trimmed) if not candidate_origin: return fallback if candidate_origin in allowed_dashboard_origins(): - return redirect_to + return trimmed logger.warning("Rejected redirect_to=%r — origin not in allowlist", redirect_to) return fallback diff --git a/agent/dashboard/plan_api.py b/agent/dashboard/plan_api.py index c5a9c2e4..991bef09 100644 --- a/agent/dashboard/plan_api.py +++ b/agent/dashboard/plan_api.py @@ -29,6 +29,7 @@ from .plan_store import ( PLAN_STATUS_CANCELLED, PLAN_STATUS_READY, PLAN_STATUS_REVISING, + PLAN_STATUS_SHARED, add_plan_comment, delete_plan_comment, get_plan_content, @@ -112,6 +113,7 @@ async def update_plan( if not markdown: raise HTTPException(422, "plan markdown cannot be empty") content = await get_plan_content(thread_id) or {} + _reject_shared_content(content) status = content.get("status") or metadata.get("plan_status") or "planning" if status in (PLAN_STATUS_APPROVED, PLAN_STATUS_CANCELLED): raise HTTPException(409, f"cannot edit a {status} plan") @@ -139,6 +141,7 @@ async def post_plan_comment( metadata = await _thread_metadata(thread_id) if not _thread_is_readable(metadata): raise HTTPException(404, "thread not found") + _reject_shared_content(await get_plan_content(thread_id) or {}) text = body.body.strip() if not text: raise HTTPException(422, "comment body cannot be empty") @@ -155,6 +158,7 @@ async def remove_plan_comment( metadata = await _thread_metadata(thread_id) if not _thread_is_readable(metadata): raise HTTPException(404, "thread not found") + _reject_shared_content(await get_plan_content(thread_id) or {}) comments = await list_plan_comments(thread_id) target = next((c for c in comments if c.get("id") == comment_id), None) if target is None: @@ -175,14 +179,16 @@ async def approve_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) - # Read the published plan + comments BEFORE mutating state: a store failure # here aborts the decision (500) rather than dispatching without them. The # published markdown may have been edited by the owner, so it is the - # source of truth handed to the agent (not its own stale history). - content = await get_plan_content(thread_id, raise_on_error=True) - status = (content or {}).get("status") or metadata.get("plan_status") or "planning" + # source of truth handed to the agent (not its own stale history) — read it + # strictly so a transient failure can't silently drop the edit. + content = await get_plan_content(thread_id, raise_on_error=True) or {} + _reject_shared_content(content) + status = content.get("status") or metadata.get("plan_status") or "planning" if status == PLAN_STATUS_APPROVED: # Idempotent: a repeat approve (double-click / retry) must not dispatch a # second implementation run or post a duplicate Slack notice. raise HTTPException(409, "plan is already approved") - plan_markdown = (content or {}).get("markdown", "") + plan_markdown = str(content.get("markdown", "")).strip() comments = await list_plan_comments(thread_id, raise_on_error=True) feedback = _format_comments(comments) if plan_markdown: @@ -215,6 +221,8 @@ async def reject_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) -> metadata = await _thread_metadata(thread_id) if not _thread_is_readable(metadata): raise HTTPException(404, "thread not found") + content = await get_plan_content(thread_id, raise_on_error=True) or {} + _reject_shared_content(content) feedback = _format_comments(await list_plan_comments(thread_id, raise_on_error=True)) await set_plan_status(thread_id, PLAN_STATUS_REVISING, plan_mode=True) text = ( @@ -227,6 +235,11 @@ async def reject_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) -> return {"status": PLAN_STATUS_REVISING} +def _reject_shared_content(content: dict[str, Any]) -> None: + if content.get("status") == PLAN_STATUS_SHARED: + raise HTTPException(409, "shared content is not an implementation plan") + + def _format_comments(comments: list[dict[str, Any]]) -> str: lines: list[str] = [] index = 1 diff --git a/agent/dashboard/plan_store.py b/agent/dashboard/plan_store.py index 9ceef9c6..512de7a3 100644 --- a/agent/dashboard/plan_store.py +++ b/agent/dashboard/plan_store.py @@ -27,9 +27,10 @@ PLAN_COMMENTS_NAMESPACE = ["plan", "comments"] # Plans are mirrored into the sandbox outside cloned repositories. PLAN_FILE_DIRECTORY = "/workspace/plans" -# Plan lifecycle, stored on both the content record and the thread metadata. +# Plan/share lifecycle, stored on both the content record and the thread metadata. PLAN_STATUS_PLANNING = "planning" PLAN_STATUS_READY = "ready" +PLAN_STATUS_SHARED = "shared" PLAN_STATUS_REVISING = "revising" PLAN_STATUS_APPROVED = "approved" PLAN_STATUS_CANCELLED = "cancelled" @@ -68,8 +69,9 @@ async def save_plan_content( status: str = PLAN_STATUS_READY, clear_comments: bool = True, plan_file_path: str | None = None, + plan_mode: bool | None = True, ) -> None: - """Publish the plan markdown + status for the dashboard to render. + """Publish markdown + status for the dashboard to render. A republished (revised) plan supersedes the prior revision, so comments left on it are cleared — otherwise stale feedback would resurface on the new plan @@ -92,7 +94,10 @@ async def save_plan_content( except Exception: # Best-effort: a failed cleanup must not block publishing the new plan. pass - await _merge_thread_metadata(thread_id, {"plan_status": status, "plan_mode": True}) + metadata: dict[str, Any] = {"plan_status": status} + if plan_mode is not None: + metadata["plan_mode"] = plan_mode + await _merge_thread_metadata(thread_id, metadata) async def write_plan_to_sandbox( @@ -136,10 +141,16 @@ async def get_plan_content( async def set_plan_status(thread_id: str, status: str, *, plan_mode: bool | None = None) -> None: """Update the plan lifecycle status on both the content record and metadata.""" existing = await get_plan_content(thread_id) or {} + entering_plan_after_share = ( + existing.get("status") == PLAN_STATUS_SHARED and status == PLAN_STATUS_PLANNING + ) client = _client() - record: dict[str, Any] = {"markdown": existing.get("markdown", ""), "status": status} + record: dict[str, Any] = { + "markdown": "" if entering_plan_after_share else existing.get("markdown", ""), + "status": status, + } plan_file_path = existing.get("plan_file_path") - if isinstance(plan_file_path, str) and plan_file_path: + if not entering_plan_after_share and isinstance(plan_file_path, str) and plan_file_path: record["plan_file_path"] = plan_file_path await client.store.put_item( PLAN_CONTENT_NAMESPACE, diff --git a/agent/dashboard/workflow_approval.py b/agent/dashboard/workflow_approval.py index 0db6e22c..fbc23b74 100644 --- a/agent/dashboard/workflow_approval.py +++ b/agent/dashboard/workflow_approval.py @@ -13,6 +13,7 @@ WORKFLOW_APPROVAL_PENDING = "pending" WORKFLOW_APPROVAL_APPROVED = "approved" WORKFLOW_APPROVAL_REJECTED = "rejected" _MAX_APPROVAL_RECORDS = 20 +_TERMINAL_STATUSES = {WORKFLOW_APPROVAL_APPROVED, WORKFLOW_APPROVAL_REJECTED} def _now() -> str: @@ -80,25 +81,38 @@ async def ensure_workflow_push_pending( base_sha: str, head_sha: str, files: list[str], + diff_stats: Mapping[str, Any] | None = None, + diff_preview: str | None = None, + diff_preview_truncated: bool = False, + approval_url: str | None = None, ) -> tuple[dict[str, Any], bool]: """Store a pending approval unless a terminal record already exists.""" approvals = await get_workflow_push_approvals(thread_id) existing = approvals.get(fingerprint) - if existing and existing.get("status") in { - WORKFLOW_APPROVAL_PENDING, - WORKFLOW_APPROVAL_APPROVED, - WORKFLOW_APPROVAL_REJECTED, - }: + if existing and existing.get("status") in _TERMINAL_STATUSES: return existing, False - record = { - "fingerprint": fingerprint, - "status": WORKFLOW_APPROVAL_PENDING, + review_fields = { "repo": repo, "branch": branch, "base_sha": base_sha, "head_sha": head_sha, - "files": files, + "files": list(files), + "diff_stats": _normalize_diff_stats(diff_stats, len(files)), + "diff_preview": diff_preview or "", + "diff_preview_truncated": diff_preview_truncated, + "approval_url": approval_url, + } + if existing and existing.get("status") == WORKFLOW_APPROVAL_PENDING: + record = {**existing, **review_fields} + approvals[fingerprint] = record + await _save_approvals(thread_id, approvals) + return record, False + + record = { + "fingerprint": fingerprint, + "status": WORKFLOW_APPROVAL_PENDING, + **review_fields, "requested_at": _now(), "notified": False, } @@ -107,6 +121,58 @@ async def ensure_workflow_push_pending( return record, True +def _safe_int(value: Any, default: int = 0) -> int: + try: + return max(0, int(value)) + except (TypeError, ValueError): + return default + + +def _normalize_diff_stats(value: Mapping[str, Any] | None, file_count: int) -> dict[str, int]: + if not isinstance(value, Mapping): + return {"files": file_count, "additions": 0, "deletions": 0} + return { + "files": _safe_int(value.get("files"), file_count), + "additions": _safe_int(value.get("additions")), + "deletions": _safe_int(value.get("deletions")), + } + + +def workflow_push_approval_response(record: Mapping[str, Any]) -> dict[str, Any]: + files = record.get("files") + diff_stats = record.get("diff_stats") + requested_at = record.get("requested_at") + decided_at = record.get("decided_at") + decided_by = record.get("decided_by") + approval_url = record.get("approval_url") + return { + "fingerprint": str(record.get("fingerprint") or ""), + "status": str(record.get("status") or WORKFLOW_APPROVAL_PENDING), + "repo": str(record.get("repo") or ""), + "branch": str(record.get("branch") or ""), + "baseSha": str(record.get("base_sha") or ""), + "headSha": str(record.get("head_sha") or ""), + "files": [str(path) for path in files] if isinstance(files, list) else [], + "diffStats": _normalize_diff_stats( + diff_stats if isinstance(diff_stats, Mapping) else None, + len(files) if isinstance(files, list) else 0, + ), + "diffPreview": str(record.get("diff_preview") or ""), + "diffPreviewTruncated": record.get("diff_preview_truncated") is True, + "approvalUrl": approval_url if isinstance(approval_url, str) and approval_url else None, + "requestedAt": requested_at if isinstance(requested_at, str) else None, + "decidedAt": decided_at if isinstance(decided_at, str) else None, + "decidedBy": decided_by if isinstance(decided_by, str) else None, + } + + +def workflow_push_approval_responses( + approvals: Mapping[str, Mapping[str, Any]], +) -> list[dict[str, Any]]: + ordered = sorted(approvals.values(), key=lambda r: str(r.get("requested_at", "")), reverse=True) + return [workflow_push_approval_response(record) for record in ordered] + + async def mark_workflow_push_notified(thread_id: str, fingerprint: str) -> None: approvals = await get_workflow_push_approvals(thread_id) record = approvals.get(fingerprint) diff --git a/agent/dashboard/workflow_approval_api.py b/agent/dashboard/workflow_approval_api.py index 40396226..4d1b5f11 100644 --- a/agent/dashboard/workflow_approval_api.py +++ b/agent/dashboard/workflow_approval_api.py @@ -8,11 +8,11 @@ from fastapi import APIRouter, Depends, HTTPException from .oauth import require_same_origin_for_mutations, require_session from .plan_api import _dispatch_followup, _thread_metadata -from .thread_api import _user_owns_thread +from .thread_api import _thread_is_readable, _user_owns_thread from .workflow_approval import ( - WORKFLOW_APPROVAL_PENDING, decide_workflow_push_approval, get_workflow_push_approvals, + workflow_push_approval_responses, ) workflow_approval_router = APIRouter( @@ -23,31 +23,20 @@ workflow_approval_router = APIRouter( _SESSION_DEP = Depends(require_session) -def _approval_record_response(record: dict[str, Any]) -> dict[str, Any]: - return { - "fingerprint": record.get("fingerprint"), - "status": record.get("status"), - "repo": record.get("repo"), - "branch": record.get("branch"), - "files": record.get("files"), - "requested_at": record.get("requested_at"), - } - - @workflow_approval_router.get("/{thread_id}") -async def list_workflow_approvals_for_thread( +async def list_workflow_push_approvals( thread_id: str, session: dict[str, Any] = _SESSION_DEP ) -> dict[str, Any]: metadata = await _thread_metadata(thread_id) - if not _user_owns_thread(metadata, session["sub"], session.get("email")): - raise HTTPException(403, "only the thread owner can view workflow push approvals") + if not _thread_is_readable(metadata): + raise HTTPException(404, "thread not found") + is_owner = _user_owns_thread(metadata, session["sub"], session.get("email")) approvals = await get_workflow_push_approvals(thread_id) - pending = [ - _approval_record_response(record) - for record in approvals.values() - if record.get("status") == WORKFLOW_APPROVAL_PENDING - ] - return {"approvals": pending} + return { + "threadId": thread_id, + "isOwner": is_owner, + "approvals": workflow_push_approval_responses(approvals), + } @workflow_approval_router.post("/{thread_id}/{fingerprint}/approve") diff --git a/agent/middleware/workflow_push_guard.py b/agent/middleware/workflow_push_guard.py index e5994d9a..dfd9291f 100644 --- a/agent/middleware/workflow_push_guard.py +++ b/agent/middleware/workflow_push_guard.py @@ -7,7 +7,6 @@ import codecs import hashlib import json import logging -import os import re import shlex import threading @@ -29,12 +28,7 @@ from ..dashboard.workflow_approval import ( workflow_push_rejected, ) from ..tools.slack_thread_reply import build_workflow_approval_blocks -from ..utils.github_app import ( - BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS, - RUNTIME_PROXY_TOKEN_PERMISSIONS, - WORKFLOW_RUNTIME_PROXY_TOKEN_PERMISSIONS, -) -from ..utils.github_proxy import refresh_proxy_token +from ..utils.dashboard_links import dashboard_workflow_approval_url from ..utils.sandbox_state import SANDBOX_BACKENDS from ..utils.slack import post_slack_thread_reply_with_ts @@ -58,6 +52,8 @@ _GIT_WRAPPERS = {"command", "env", "nice", "sudo", "stdbuf", "nohup", "time", "i # Git global options that consume the following token as a separate value; skipped when # locating the git subcommand so `git -c k=v push` is still recognized as a push. _GIT_VALUE_OPTIONS = {"-C", "-c", "--namespace", "--git-dir", "--work-tree", "--exec-path"} +_DIFF_PREVIEW_MAX_CHARS = 20_000 +_DIFF_PREVIEW_MAX_LINES = 400 class _BlockedGitPush: @@ -90,6 +86,9 @@ class WorkflowPushChange: remote_ref: str fixed_command: str base_sha: str = "" + diff_stats: dict[str, int] | None = None + diff_preview: str = "" + diff_preview_truncated: bool = False blocked: bool = False blocked_reason: str = "" @@ -445,6 +444,44 @@ def _fingerprint(payload: Mapping[str, Any]) -> str: return hashlib.sha256(encoded).hexdigest() +def _diff_preview(diff: str) -> tuple[str, bool]: + if len(diff) <= _DIFF_PREVIEW_MAX_CHARS: + lines = diff.splitlines() + if len(lines) <= _DIFF_PREVIEW_MAX_LINES: + return diff, False + preview_lines: list[str] = [] + char_count = 0 + truncated = False + for line in diff.splitlines(): + next_count = char_count + len(line) + 1 + if len(preview_lines) >= _DIFF_PREVIEW_MAX_LINES or next_count > _DIFF_PREVIEW_MAX_CHARS: + truncated = True + break + preview_lines.append(line) + char_count = next_count + return "\n".join(preview_lines), truncated + + +def _diff_stats(files: list[str], numstat: str) -> dict[str, int]: + additions = 0 + deletions = 0 + for line in numstat.splitlines(): + parts = line.split("\t") + if len(parts) < 3: + continue + if parts[0].isdigit(): + additions += int(parts[0]) + if parts[1].isdigit(): + deletions += int(parts[1]) + return {"files": len(files), "additions": additions, "deletions": deletions} + + +def _approval_url(thread_id: str | None, fingerprint: str) -> str | None: + if not thread_id: + return None + return dashboard_workflow_approval_url(thread_id, fingerprint) + + def _run_coroutine_sync(coro: Awaitable[ToolMessage | Command]) -> ToolMessage | Command: try: asyncio.get_running_loop() @@ -614,6 +651,30 @@ def _workflow_change_for_push(backend: Any, parsed: ParsedGitPush) -> WorkflowPu fixed_args.append("--set-upstream") fixed_args.extend([parsed.remote, fixed_refspec]) fixed_command = _git_command(root, " ".join(shlex.quote(arg) for arg in fixed_args)) + + # Fetch diff preview for the workflow approval card. + diff_range = ( + f"{shlex.quote(base_ref)}...{shlex.quote(head)}" if base_ref else shlex.quote(head) + ) + diff = _run_git(backend, root, f"diff --binary --full-index {diff_range} -- .github/workflows") + numstat = None + diff_preview = "" + diff_preview_truncated = False + diff_stats_val: dict[str, int] = {"files": len(files), "additions": 0, "deletions": 0} + base_sha_actual = base_ref if base_ref else "" + if diff.ok and diff.output: + diff_preview, diff_preview_truncated = _diff_preview(diff.output) + numstat = _run_git(backend, root, f"diff --numstat {diff_range} -- .github/workflows") + if numstat.ok: + diff_stats_val = _diff_stats(files, numstat.output) + elif base_ref and not diff.ok: + diff_only_head = _run_git( + backend, root, + f"diff --binary --full-index --root {shlex.quote(head)} -- .github/workflows", + ) + if diff_only_head.ok and diff_only_head.output: + diff_preview, diff_preview_truncated = _diff_preview(diff_only_head.output) + content_payload = { "repo": repo, "branch": branch_name, @@ -626,16 +687,21 @@ def _workflow_change_for_push(backend: Any, parsed: ParsedGitPush) -> WorkflowPu branch=branch_name, files=files, head_sha=head, + base_sha=base_sha_actual, remote=parsed.remote, local_ref=parsed.local_ref, remote_ref=parsed.remote_ref, fixed_command=fixed_command, + diff_stats=diff_stats_val, + diff_preview=diff_preview, + diff_preview_truncated=diff_preview_truncated, ) def _blocked_message( change: WorkflowPushChange, *, + approval_url: str | None = None, already_rejected: bool = False, stale: bool = False, blocked: bool = False, @@ -657,7 +723,7 @@ def _blocked_message( error = ( "This git push includes GitHub workflow file changes and requires human " "approval before Open SWE can push it. Retry the same standalone git push " - "after the thread owner approves the workflow files." + "after the thread owner approves the workflow diff in Slack or the web UI." ) error_type = "WorkflowPushApprovalRequired" content = { @@ -669,6 +735,11 @@ def _blocked_message( "files": change.files, "repo": change.repo, "branch": change.branch, + "base_sha": change.base_sha, + "head_sha": change.head_sha, + "diff_stats": change.diff_stats, + "diff_preview_truncated": change.diff_preview_truncated, + "approval_url": approval_url, } return ToolMessage(content=json.dumps(content), tool_call_id="", status="error") @@ -687,20 +758,22 @@ def _override_execute_command(request: ToolCallRequest, command: str) -> ToolCal return request.override(tool_call={**dict(tool_call), "args": args}) -def _approval_slack_message(change: WorkflowPushChange) -> str: +def _approval_slack_message(change: WorkflowPushChange, approval_url: str | None = None) -> str: files = "\n".join(f"• `{path}`" for path in change.files[:10]) if len(change.files) > 10: files += f"\n• …and {len(change.files) - 10} more" repo = change.repo or "the repository" branch = change.branch or "the current branch" + stats = change.diff_stats or {"files": len(change.files), "additions": 0, "deletions": 0} + web_review = f"\n\n*Review diff:* <{approval_url}|Open in Web>" if approval_url else "" return ( "*Workflow file approval required*\n" - f"Open SWE is trying to push the workflow files below to `{repo}` on `{branch}`.\n\n" - f"*Files at the pushed head:*\n{files}\n\n" - f"*Fingerprint:* `{change.fingerprint}`\n\n" - "Approval covers the exact workflow files and content listed above at the pushed head, " - "including future rebases or amends that replay the same workflow tree. If the set of " - "workflow files, the branch, or the workflow-file content at the pushed head changes, " + f"Open SWE is trying to push changes to GitHub workflow files in `{repo}` on `{branch}`.\n\n" + f"*Files:*\n{files}\n\n" + f"*Diff stat:* {stats.get('files', len(change.files))} files, " + f"+{stats.get('additions', 0)} / -{stats.get('deletions', 0)}\n" + f"*Fingerprint:* `{change.fingerprint}`{web_review}\n\n" + "Approve only if this exact workflow diff is expected. If the workflow files change, " "a new fingerprint will be required." ) @@ -718,7 +791,9 @@ async def _post_slack_approval_if_needed( thread_ts = slack_thread.get("thread_ts") if not isinstance(channel_id, str) or not isinstance(thread_ts, str): return - message = _approval_slack_message(change) + message = _approval_slack_message( + change, _approval_url(_thread_id(request), change.fingerprint) + ) message_ts, error = await post_slack_thread_reply_with_ts( channel_id, thread_ts, @@ -736,6 +811,7 @@ async def _approval_state(request: ToolCallRequest, change: WorkflowPushChange) if not thread_id: return "missing_thread" try: + approval_url = _approval_url(thread_id, change.fingerprint) if await workflow_push_approved(thread_id, change.fingerprint): return "approved" if await workflow_push_rejected(thread_id, change.fingerprint): @@ -763,6 +839,10 @@ async def _approval_state(request: ToolCallRequest, change: WorkflowPushChange) base_sha=change.base_sha, head_sha=change.head_sha, files=change.files, + diff_stats=change.diff_stats, + diff_preview=change.diff_preview, + diff_preview_truncated=change.diff_preview_truncated, + approval_url=approval_url, ) await _post_slack_approval_if_needed(request, change, record) return str(record.get("status") or "pending") @@ -771,48 +851,6 @@ async def _approval_state(request: ToolCallRequest, change: WorkflowPushChange) return "approval_error" -async def _run_with_workflow_token( - thread_id: str, - request: ToolCallRequest, - run: Callable[[], Awaitable[ToolMessage | Command]], -) -> ToolMessage | Command: - sandbox_type = os.getenv("SANDBOX_TYPE", "langsmith") - if sandbox_type != "langsmith": - return await run() - - elevated = await refresh_proxy_token( - thread_id, permissions=WORKFLOW_RUNTIME_PROXY_TOKEN_PERMISSIONS - ) - if not elevated: - logger.error( - "Workflow push approved for thread %s, but proxy token elevation to workflows:write " - "failed; the sandbox cannot push workflow files without an elevated token.", - thread_id, - ) - error_message = ToolMessage( - content=json.dumps( - { - "status": "error", - "error_type": "WorkflowPushElevationFailed", - "error": ( - "Workflow push approved, but the sandbox could not obtain a " - "workflows-scoped token. Please retry the push or check the " - "GitHub proxy / token minting configuration." - ), - } - ), - tool_call_id="", - status="error", - ) - return _tool_message_for_request(error_message, request) - try: - return await run() - finally: - restored = await refresh_proxy_token(thread_id, permissions=RUNTIME_PROXY_TOKEN_PERMISSIONS) - if not restored: - await refresh_proxy_token(thread_id, permissions=BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS) - - class WorkflowPushGuardMiddleware(AgentMiddleware): """Require approval before pushing `.github/workflows` changes.""" @@ -856,10 +894,10 @@ class WorkflowPushGuardMiddleware(AgentMiddleware): return _tool_message_for_request(_blocked_message(change, blocked=True), request) thread_id = _thread_id(request) state = await _approval_state(request, change) - if state == "approved" and thread_id: + if state == "approved": safe_request = _override_execute_command(request, change.fixed_command) - return await _run_with_workflow_token(thread_id, request, lambda: handler(safe_request)) - if state == "stale_approval": + return await handler(safe_request) + if state == "stale_approval" and thread_id: record, _created = await ensure_workflow_push_pending( thread_id, fingerprint=change.fingerprint, @@ -868,11 +906,16 @@ class WorkflowPushGuardMiddleware(AgentMiddleware): base_sha=change.base_sha, head_sha=change.head_sha, files=change.files, + diff_stats=change.diff_stats, + diff_preview=change.diff_preview, + diff_preview_truncated=change.diff_preview_truncated, + approval_url=_approval_url(thread_id, change.fingerprint), ) await _post_slack_approval_if_needed(request, change, record) return _tool_message_for_request( _blocked_message( change, + approval_url=_approval_url(thread_id, change.fingerprint), already_rejected=state == "rejected", stale=state == "stale_approval", ), diff --git a/agent/prompt.py b/agent/prompt.py index 83f3c2ea..61826685 100644 --- a/agent/prompt.py +++ b/agent/prompt.py @@ -83,9 +83,10 @@ OPEN_SWE_SHARED_BASE = """You are **Open SWE**, an open-source agent built on La ### Communication - Focus on the substance and keep summaries brief. Use light markdown (`###`/`####` headings, bold, code) — avoid `#`/`##` titles. +- In Slack, keep every reply terse — a few sentences at most. Lead with the answer or outcome; skip preamble, restating the request, and step-by-step recaps. Do not paste long output, diffs, file listings, or multi-section write-ups into a Slack reply. When the response would genuinely be long — a detailed report, a design/analysis write-up, a large code or log excerpt — write that content to a Markdown file under `/workspace/plans/` and publish it with the `save_plan` tool, then post a terse Slack reply with a one-line summary and the plan-review link so the user can read the full version there. This non-plan share path does not enter plan mode; use it instead of splitting a long answer across multiple Slack messages. - In Slack, when a user asks to “break out,” “split out,” or “start a separate thread” for part of the work, summarize the requested aspect and relevant context into self-contained instructions, then call `slack_start_new_thread` instead of only replying in the current thread. - In Slack, when acknowledging a user follow-up while you continue working, prefer `slack_add_reaction` with the default `eyes` reaction over posting a perfunctory “Updating…” / “I’ll check…” confirmation reply. -- When you post to Slack with `slack_thread_reply`, do not repeat that text in a later assistant message; the user can already see the Slack message. +- For Slack-triggered information-only answers, post only a concise summary in the associated Slack thread with `slack_thread_reply`, then provide the complete answer inline in your final assistant response. For other Slack updates, keep thread replies brief and avoid duplicating the same text later. - When delegated work to a subagent: the calling agent only sees your final message, so make it the complete answer. IMPORTANT: You must ALWAYS call a tool in EVERY SINGLE TURN. If you don't call a tool, the session will end and you won't be able to resume without the user manually restarting you. @@ -310,7 +311,7 @@ Steps, in order: **IMPORTANT: If `git push` or `gh` returns "403", "Permission denied", or another permanent authorization failure, do not retry. Report the error to the user immediately and stop.** -**IMPORTANT: Workflow files (`.github/workflows/`) may be changed only when explicitly requested. Any push that includes workflow files at the pushed head requires human approval before it can proceed. Approval is keyed to the repo, branch, and the exact workflow files and content present at the pushed head, so rebases or amends that replay the same workflow tree do not require a fresh approval; changing the branch, the set of workflow files, or the workflow-file content at the pushed head does require a new approval. Do not attempt to bypass it.** +**IMPORTANT: Workflow files (`.github/workflows/`) may be changed only when explicitly requested. Workflow-file pushes are approved by `WorkflowPushGuardMiddleware`: after committing, run the push as a standalone `git push origin ` (or `git -C push origin `), never as part of a compound command. Do not manually ask for freeform fingerprint approval. If the push tool returns `WorkflowPushApprovalRequired`, stop retrying and wait for the generated Slack/Web approval; after approval, retry the same standalone push without changing workflow files. Approval is keyed to the repo, branch, and the exact workflow files and content present at the pushed head, so rebases or amends that replay the same workflow tree do not require a fresh approval; changing the branch, the set of workflow files, or the workflow-file content at the pushed head does require a new approval. Do not attempt to bypass it.** 4. **Notify the source** immediately after pushing and, when applicable, PR creation/update succeeds. Include a brief summary plus the PR link or branch URL: - Linear-triggered: use `linear_comment` with an `@mention` of the user who triggered the task diff --git a/agent/tools/save_plan.py b/agent/tools/save_plan.py index e8fde295..ac7f4cbb 100644 --- a/agent/tools/save_plan.py +++ b/agent/tools/save_plan.py @@ -1,20 +1,25 @@ -"""Tool: ``save_plan``. Publish the sandbox plan file for review. +"""Tool: ``save_plan``. Publish sandbox Markdown for review or sharing. -Reads the Markdown plan file the agent created in the sandbox and publishes it to -the plan-review page, where the user and collaborators read it, comment inline, -and approve or request changes. Available in plan mode (it does not modify the -repository under review). +Reads the Markdown file the agent created in the sandbox and publishes it to the +plan-review page. In plan mode it is an approvable implementation plan; outside +plan mode it is read-only shared content. """ from __future__ import annotations import logging from collections.abc import Mapping -from typing import Any +from typing import Annotated, Any from langgraph.config import get_config +from langgraph.prebuilt import InjectedState -from ..dashboard.plan_store import PLAN_FILE_DIRECTORY, PLAN_STATUS_READY, save_plan_content +from ..dashboard.plan_store import ( + PLAN_FILE_DIRECTORY, + PLAN_STATUS_READY, + PLAN_STATUS_SHARED, + save_plan_content, +) from ..utils.sandbox_state import get_sandbox_backend logger = logging.getLogger(__name__) @@ -23,20 +28,22 @@ _MAX_PLAN_LINES = 20_000 _MARKDOWN_EXTENSIONS = (".md", ".markdown") -async def save_plan(plan_file_path: str) -> dict[str, Any]: +async def save_plan( + plan_file_path: str, + state: Annotated[dict[str, Any] | None, InjectedState] = None, +) -> dict[str, Any]: """Publish a Markdown plan file from the sandbox for review. - Use this in plan mode once your plan is ready. First create a Markdown file - under ``/workspace/plans/`` using a dated, descriptive filename, then pass - that file path here. The file contents are published to the plan-review page - linked in the conversation, where the user (the owner) and any collaborators - can read it, leave inline comments, and then approve it or request changes. - Call it again to publish a revised file when addressing feedback. + Use this in plan mode once your plan is ready. Outside plan mode, use it to + share long Slack responses without switching the thread into plan mode. First + create a Markdown file under ``/workspace/plans/`` using a dated, descriptive + filename, then pass that file path here. The file contents are published to + the plan-review page linked in the conversation. In plan mode, the user can + comment, approve, or request changes; outside plan mode, the page is read-only + shared content. - Write the plan in standard Markdown — headings, bullet/numbered lists, and - fenced code blocks all render. Keep it concise and high level, focusing on - approach, decisions/tradeoffs, risks, and verification; avoid file/function - details unless they are unusually tricky or controversial. + Write the content in standard Markdown — headings, bullet/numbered lists, and + fenced code blocks all render. Args: plan_file_path: Path to the Markdown plan file in the sandbox. @@ -68,19 +75,29 @@ async def save_plan(plan_file_path: str) -> dict[str, Any]: content = (await _read_plan_file(str(thread_id), path)).strip() if not content: return {"success": False, "error": "plan file cannot be empty"} - await _save(str(thread_id), content, path) + await _save(str(thread_id), content, path, plan_mode=_active_plan_mode(state, configurable)) except Exception as exc: # noqa: BLE001 logger.exception("save_plan failed for thread %s", thread_id) return {"success": False, "error": f"failed to save plan: {exc}"} return {"success": True, "path": path} -async def _save(thread_id: str, content: str, path: str) -> None: +async def _save(thread_id: str, content: str, path: str, *, plan_mode: bool) -> None: await save_plan_content( - thread_id, markdown=content, status=PLAN_STATUS_READY, plan_file_path=path + thread_id, + markdown=content, + status=PLAN_STATUS_READY if plan_mode else PLAN_STATUS_SHARED, + plan_file_path=path, + plan_mode=plan_mode or None, ) +def _active_plan_mode(state: dict[str, Any] | None, configurable: Any) -> bool: + if isinstance(state, dict) and state.get("plan_mode") is True: + return True + return isinstance(configurable, dict) and configurable.get("plan_mode") is True + + async def _read_plan_file(thread_id: str, path: str) -> str: backend = await get_sandbox_backend(thread_id) result = await backend.aread(path, offset=0, limit=_MAX_PLAN_LINES) diff --git a/agent/utils/dashboard_links.py b/agent/utils/dashboard_links.py index 5bfab9bc..aecee2bf 100644 --- a/agent/utils/dashboard_links.py +++ b/agent/utils/dashboard_links.py @@ -26,6 +26,14 @@ def dashboard_plan_url(thread_id: str) -> str | None: return f"{base_url}/agents/{quote(thread_id, safe='')}/plan" +def dashboard_workflow_approval_url(thread_id: str, fingerprint: str) -> str | None: + """Build the dashboard workflow approval URL for a thread/fingerprint.""" + thread_url = dashboard_thread_url(thread_id) + if not thread_url or not fingerprint: + return thread_url + return f"{thread_url}?workflowApproval={quote(fingerprint, safe='')}" + + def dashboard_review_url(owner: str, repo: str, pr_number: int) -> str | None: """Build the dashboard review-detail URL for a PR.""" base_url = _dashboard_base_url() diff --git a/docs/upstream-sync/triage.jsonl b/docs/upstream-sync/triage.jsonl index 226e4b58..6329ec72 100644 --- a/docs/upstream-sync/triage.jsonl +++ b/docs/upstream-sync/triage.jsonl @@ -21,9 +21,9 @@ {"sha": "209132d3", "pr": 1621, "subject": "durable interrupt dispatch + completion webhook", "disposition": "deferred", "reason": "investigate first — may be applied", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "02bb4dfd", "pr": 1658, "subject": "don't attach loopback run-complete webhooks", "disposition": "deferred", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "29015fad", "pr": 1614, "subject": "gate workflow pushes with approval", "disposition": "deferred", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "546042a4", "pr": 1652, "subject": "add workflow approval UI", "disposition": "deferred", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} +{"sha": "546042a4", "pr": 1652, "subject": "add workflow approval UI", "disposition": "landed", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "ae04b72b", "pr": 1635, "subject": "publish plans from sandbox files", "disposition": "landed", "reason": "ported (adapted) in #128 (save_plan reads sandbox file)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T22:58:21Z"} -{"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": "c03a6be7", "pr": 1634, "subject": "keep plan guidance high-level", "disposition": "landed", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "96cceb74", "pr": 1632, "subject": "notify Slack on plan approval", "disposition": "landed", "reason": "ported (adapted) in #128", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T22:58:21Z"} {"sha": "2f56d754", "pr": 1618, "subject": "omit plan link when no plan exists", "disposition": "landed", "reason": "already in dev via #81 (upstream-sync); ledger was stale (was: likely regression)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T23:25:48Z"} {"sha": "ee224d3e", "pr": 1650, "subject": "add Slack reaction tool", "disposition": "landed", "reason": "", "branch": "slack-tooling", "local_sha": "3c6077c418e4017acf1f04ebeb81846770f934c9", "updated": "2026-07-03T19:38:56Z"} @@ -67,17 +67,17 @@ {"sha": "e5dbc788", "pr": 1696, "subject": "fix: Harden durable agent runs (#1696)", "disposition": "deferred", "reason": "large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "52fe2916", "pr": 1698, "subject": "feat: add PR review link route (#1698)", "disposition": "landed", "reason": "cherry-picked (-x) in #127 (PR review link route)", "branch": "reviewer-misc", "local_sha": null, "updated": "2026-07-08T22:58:21Z"} {"sha": "5f7f5fbd", "pr": 1697, "subject": "fix: Reduce graph import and loader startup latency (#1697)", "disposition": "deferred", "reason": "import-hygiene refactor; cross-cutting, references many deferred upstream-only modules", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} -{"sha": "216cf181", "pr": 1699, "subject": "fix: keep workflow HITL without token downscoping (#1699)", "disposition": "deferred", "reason": "FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} +{"sha": "216cf181", "pr": 1699, "subject": "fix: keep workflow HITL without token downscoping (#1699)", "disposition": "landed", "reason": "FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "67abf5b0", "pr": 1659, "subject": "fix: surface attributed PR creation failures (#1659)", "disposition": "deferred", "reason": "PR-attribution-failure guard (new mw, safe imports); heavy conflict on diverged open_pull_request.py", "branch": "pr-attribution", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} -{"sha": "3dbc0282", "pr": 1676, "subject": "fix: preserve plan redirects after login (#1676)", "disposition": "deferred", "reason": "FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} +{"sha": "3dbc0282", "pr": 1676, "subject": "fix: preserve plan redirects after login (#1676)", "disposition": "landed", "reason": "FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "c75cbb1f", "pr": 1677, "subject": "feat: re-add Fable 5 with an admin toggle to disable it (#1677)", "disposition": "deferred", "reason": "FLAG-HUMAN: re-adds Fable 5 via anthropic: — contradicts dev's deliberate hide (#1483) + Bedrock migration (#62); wont-merge candidate", "branch": "fable-admin-toggle", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} -{"sha": "bb104d93", "pr": 1679, "subject": "fix: submit plan comments with cmd enter (#1679)", "disposition": "deferred", "reason": "applies clean but edits fork-diverged PlanReview.tsx (#130); needs UI/e2e validation — separate PR", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T23:17:35Z"} +{"sha": "bb104d93", "pr": 1679, "subject": "fix: submit plan comments with cmd enter (#1679)", "disposition": "landed", "reason": "applies clean but edits fork-diverged PlanReview.tsx (#130); needs UI/e2e validation — separate PR", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "304032fa", "pr": 1680, "subject": "chore: clarify question answering prompt (#1680)", "disposition": "deferred", "reason": "reword Slack info-only answer guidance; conflicts w/ fork's customized Slack prompt", "branch": "prompt-tweaks", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "5003c953", "pr": 1683, "subject": "feat: open Linear-triggered PRs as the triggering user (#1683)", "disposition": "deferred", "reason": "FLAG-HUMAN: adds linear to resolve_github_token per-user OAuth branch (auth surface); depends on #1626 linear.py", "branch": "linear-pr-as-user", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "feb7ac98", "pr": 1689, "subject": "feat(web): surface thread sandbox ID with touch-friendly menu (#1689)", "disposition": "deferred", "reason": "applies clean but frontend<->backend contract (thread_api->queries->types->sidebar); needs UI build + e2e validation — separate PR", "branch": "dashboard-ui", "local_sha": null, "updated": "2026-07-08T23:17:35Z"} {"sha": "7f7af715", "pr": 1684, "subject": "feat: auto-load scoped AGENTS on reads (#1684)", "disposition": "landed", "reason": "ported in #129 (SubdirAgentsReadMiddleware)", "branch": "subdir-agents", "local_sha": null, "updated": "2026-07-08T22:58:22Z"} {"sha": "88b62322", "pr": 1685, "subject": "feat: add platform issue reporting tool (#1685)", "disposition": "landed", "reason": "ported in #129 (report_platform_issue tool)", "branch": "small-tools", "local_sha": null, "updated": "2026-07-08T22:58:22Z"} -{"sha": "90cb6caa", "pr": 1681, "subject": "feat: terse Slack replies, share long content via plan-review page (#1681)", "disposition": "deferred", "reason": "terse Slack + long-content-via-plan-page; conflicts w/ fork prompt + diverged plan stack", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} +{"sha": "90cb6caa", "pr": 1681, "subject": "feat: terse Slack replies, share long content via plan-review page (#1681)", "disposition": "landed", "reason": "terse Slack + long-content-via-plan-page; conflicts w/ fork prompt + diverged plan stack", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-09T17:10:22Z"} {"sha": "f53caff1", "pr": 1701, "subject": "fix: fall back to core GitHub App scope when optional grants missing (#1701)", "disposition": "deferred", "reason": "FLAG-HUMAN: GitHub-App permission-ladder degrade (auth surface); heavy conflict on diverged github_app.py/_resolve_proxy_token", "branch": "github-app-scope", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "73a9e8b5", "pr": 1693, "subject": "chore(deps): bump the minor-and-patch group across 1 directory with 19 updates (#1693)", "disposition": "wont-merge", "reason": "dev at-or-ahead on 17/19; group fights dev's pinned langsmith==0.9.7 (#115) and carries an upstream plan-route test", "branch": "", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "9cd7e464", "pr": 1700, "subject": "Fix workflow approval visibility (#1700)", "disposition": "wont-merge", "reason": "superseded — dev's list_workflow_approvals_for_thread already enforces owner-only 403", "branch": "", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} diff --git a/docs/upstream-sync/triage.md b/docs/upstream-sync/triage.md index 72c47736..32c384c4 100644 --- a/docs/upstream-sync/triage.md +++ b/docs/upstream-sync/triage.md @@ -21,7 +21,9 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `6575c327` | #1654 | disable React StrictMode | Landed | kept fork's `PwaUpdateProvider` | cherry-pick-upstream | | `00906401` | #1610 | editable plan mode | Landed | re-implemented in fork via #130 (editable plan mode) | | | `f5670f24` | #1639 | require bun for ui agent work | Landed | cherry-picked (-x) in this PR (#132) | PR1 | +| `546042a4` | #1652 | add workflow approval UI | Landed | | plan-approval | | `ae04b72b` | #1635 | publish plans from sandbox files | Landed | ported (adapted) in #128 (save_plan reads sandbox file) | plan-approval | +| `c03a6be7` | #1634 | keep plan guidance high-level | Landed | | plan-approval | | `96cceb74` | #1632 | notify Slack on plan approval | Landed | ported (adapted) in #128 | plan-approval | | `2f56d754` | #1618 | omit plan link when no plan exists | Landed | already in dev via #81 (upstream-sync); ledger was stale (was: likely regression) | plan-approval | | `ee224d3e` | #1650 | add Slack reaction tool | Landed | | slack-tooling | @@ -38,8 +40,12 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `20f63e8c` | #1646 | install missing deps before verification | Landed | already in dev via #81 (upstream-sync); ledger was stale | prompt-tweaks | | `2f237b53` | #1626 | fall back to vision model for image threads | Landed | ported (adapted to Bedrock/Fireworks vision) in #128 | gateway-routing | | `52fe2916` | #1698 | feat: add PR review link route (#1698) | Landed | cherry-picked (-x) in #127 (PR review link route) | reviewer-misc | +| `216cf181` | #1699 | fix: keep workflow HITL without token downscoping (#1699) | Landed | FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface) | plan-approval | +| `3dbc0282` | #1676 | fix: preserve plan redirects after login (#1676) | Landed | FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup | plan-approval | +| `bb104d93` | #1679 | fix: submit plan comments with cmd enter (#1679) | Landed | applies clean but edits fork-diverged PlanReview.tsx (#130); needs UI/e2e validation — separate PR | plan-approval | | `7f7af715` | #1684 | feat: auto-load scoped AGENTS on reads (#1684) | Landed | ported in #129 (SubdirAgentsReadMiddleware) | subdir-agents | | `88b62322` | #1685 | feat: add platform issue reporting tool (#1685) | Landed | ported in #129 (report_platform_issue tool) | small-tools | +| `90cb6caa` | #1681 | feat: terse Slack replies, share long content via plan-review page (#1681) | Landed | terse Slack + long-content-via-plan-page; conflicts w/ fork prompt + diverged plan stack | plan-approval | | `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 | | | `85c0f63e` | #1620 | clickable shared PR header | Won't merge | already in dev | | @@ -60,8 +66,6 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `209132d3` | #1621 | durable interrupt dispatch + completion webhook | Deferred | investigate first — may be applied | durable-dispatch | | `02bb4dfd` | #1658 | don't attach loopback run-complete webhooks | Deferred | | durable-dispatch | | `29015fad` | #1614 | gate workflow pushes with approval | Deferred | | durable-dispatch | -| `546042a4` | #1652 | add workflow approval UI | Deferred | | plan-approval | -| `c03a6be7` | #1634 | keep plan guidance high-level | Deferred | | plan-approval | | `4cd5fa5c` | #1629 | avoid recapping Slack replies | Deferred | | slack-tooling | | `73b7d1c0` | #1678 | fix OpenAI Responses reasoning replay | Deferred | | gateway-routing | | `5f7c2f46` | #1674 | fix Fireworks Gateway base URL | Deferred | | gateway-routing | @@ -83,15 +87,11 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `c9a9a7cd` | #1695 | fix: retry model fallback exhaustion (#1695) | Deferred | alternating retry+backoff rewrite; reconcile by hand w/ dev's Bedrock + sync wrap path | model-fallback | | `e5dbc788` | #1696 | fix: Harden durable agent runs (#1696) | Deferred | large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion | durable-dispatch | | `5f7f5fbd` | #1697 | fix: Reduce graph import and loader startup latency (#1697) | Deferred | import-hygiene refactor; cross-cutting, references many deferred upstream-only modules | durable-dispatch | -| `216cf181` | #1699 | fix: keep workflow HITL without token downscoping (#1699) | Deferred | FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface) | plan-approval | | `67abf5b0` | #1659 | fix: surface attributed PR creation failures (#1659) | Deferred | PR-attribution-failure guard (new mw, safe imports); heavy conflict on diverged open_pull_request.py | pr-attribution | -| `3dbc0282` | #1676 | fix: preserve plan redirects after login (#1676) | Deferred | FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup | plan-approval | | `c75cbb1f` | #1677 | feat: re-add Fable 5 with an admin toggle to disable it (#1677) | Deferred | FLAG-HUMAN: re-adds Fable 5 via anthropic: — contradicts dev's deliberate hide (#1483) + Bedrock migration (#62); wont-merge candidate | fable-admin-toggle | -| `bb104d93` | #1679 | fix: submit plan comments with cmd enter (#1679) | Deferred | applies clean but edits fork-diverged PlanReview.tsx (#130); needs UI/e2e validation — separate PR | plan-approval | | `304032fa` | #1680 | chore: clarify question answering prompt (#1680) | Deferred | reword Slack info-only answer guidance; conflicts w/ fork's customized Slack prompt | prompt-tweaks | | `5003c953` | #1683 | feat: open Linear-triggered PRs as the triggering user (#1683) | Deferred | FLAG-HUMAN: adds linear to resolve_github_token per-user OAuth branch (auth surface); depends on #1626 linear.py | linear-pr-as-user | | `feb7ac98` | #1689 | feat(web): surface thread sandbox ID with touch-friendly menu (#1689) | Deferred | applies clean but frontend<->backend contract (thread_api->queries->types->sidebar); needs UI build + e2e validation — separate PR | dashboard-ui | -| `90cb6caa` | #1681 | feat: terse Slack replies, share long content via plan-review page (#1681) | Deferred | terse Slack + long-content-via-plan-page; conflicts w/ fork prompt + diverged plan stack | plan-approval | | `f53caff1` | #1701 | fix: fall back to core GitHub App scope when optional grants missing (#1701) | Deferred | FLAG-HUMAN: GitHub-App permission-ladder degrade (auth surface); heavy conflict on diverged github_app.py/_resolve_proxy_token | github-app-scope | | `22e024cb` | #1704 | fix: link issue PRs and prompt repo conventions (#1704) | Deferred | issue/PR linking + repo-convention prompt; clean but prompt-conflict risk vs #113 | webhook-issue-linking | diff --git a/tests/test_plan_review.py b/tests/test_plan_review.py index 98d73d06..f1bdb227 100644 --- a/tests/test_plan_review.py +++ b/tests/test_plan_review.py @@ -152,10 +152,19 @@ async def test_save_plan_reads_markdown_file_from_sandbox( return _Backend() async def fake_save_content( - thread_id: str, *, markdown: str, status: str, plan_file_path: str | None = None + thread_id: str, + *, + markdown: str, + status: str, + plan_file_path: str | None = None, + plan_mode: bool | None = True, ) -> None: saved.update( - thread_id=thread_id, markdown=markdown, status=status, plan_file_path=plan_file_path + thread_id=thread_id, + markdown=markdown, + status=status, + plan_file_path=plan_file_path, + plan_mode=plan_mode, ) monkeypatch.setattr( @@ -175,8 +184,9 @@ async def test_save_plan_reads_markdown_file_from_sandbox( assert saved == { "thread_id": "thread-1", "markdown": "# Plan\n\nDo it.", - "status": "ready", + "status": "shared", "plan_file_path": "/workspace/plans/2026-07-08-test-plan.md", + "plan_mode": None, } diff --git a/tests/test_workflow_push_guard.py b/tests/test_workflow_push_guard.py index ac38e1ea..934c7aa9 100644 --- a/tests/test_workflow_push_guard.py +++ b/tests/test_workflow_push_guard.py @@ -348,25 +348,15 @@ async def test_unapproved_workflow_push_blocks_and_posts_slack( assert posted["blocks"][1]["elements"][0]["value"] -async def test_approved_workflow_push_elevates_and_restores( +async def test_approved_workflow_push_runs_fixed_command( monkeypatch: pytest.MonkeyPatch, ) -> None: guard.SANDBOX_BACKENDS["thread-1"] = _Backend() - refreshed: list[dict[str, str]] = [] async def fake_approved(thread_id: str, fingerprint: str) -> bool: return True - async def fake_refresh(thread_id: str | None, *, permissions: dict[str, str]) -> bool: - refreshed.append(dict(permissions)) - return True - - async def fake_find_approval(*args: Any, **kwargs: Any) -> dict[str, Any] | None: - return None - monkeypatch.setattr(guard, "workflow_push_approved", fake_approved) - monkeypatch.setattr(guard, "find_workflow_push_approval", fake_find_approval) - monkeypatch.setattr(guard, "refresh_proxy_token", fake_refresh) pushed_command = "" @@ -383,40 +373,6 @@ async def test_approved_workflow_push_elevates_and_restores( pushed_command == "git -C /repo push origin aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:refs/heads/feature" ) - assert refreshed[0]["workflows"] == "write" - assert "workflows" not in refreshed[1] - assert refreshed[1]["actions"] == "read" - - -async def test_workflow_push_restoration_falls_back_when_actions_read_unavailable( - monkeypatch: pytest.MonkeyPatch, -) -> None: - guard.SANDBOX_BACKENDS["thread-1"] = _Backend() - refreshed: list[dict[str, str]] = [] - - async def fake_approved(thread_id: str, fingerprint: str) -> bool: - return True - - async def fake_refresh(thread_id: str | None, *, permissions: dict[str, str]) -> bool: - refreshed.append(dict(permissions)) - return "actions" not in permissions - - async def fake_find_approval(*args: Any, **kwargs: Any) -> dict[str, Any] | None: - return None - - monkeypatch.setattr(guard, "workflow_push_approved", fake_approved) - monkeypatch.setattr(guard, "find_workflow_push_approval", fake_find_approval) - monkeypatch.setattr(guard, "refresh_proxy_token", fake_refresh) - - async def handler(_request: Any) -> ToolMessage: - return ToolMessage(content="pushed", tool_call_id="call-1") - - await guard.WorkflowPushGuardMiddleware().awrap_tool_call(_Request(), handler) - - assert refreshed[0]["workflows"] == "write" - assert refreshed[1]["actions"] == "read" - assert refreshed[2] == guard.BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS - assert "actions" not in refreshed[2] async def test_non_workflow_push_runs_without_approval(monkeypatch: pytest.MonkeyPatch) -> None: @@ -710,7 +666,7 @@ async def test_exact_rejection_checked_before_stale_approval( assert payload["workflow_approval_status"] == "rejected" -async def test_approved_workflow_push_aborts_when_elevation_fails( +async def test_approved_workflow_push_passes_through( monkeypatch: pytest.MonkeyPatch, ) -> None: guard.SANDBOX_BACKENDS["thread-1"] = _Backend() @@ -718,14 +674,7 @@ async def test_approved_workflow_push_aborts_when_elevation_fails( async def fake_approved(thread_id: str, fingerprint: str) -> bool: return True - refresh_calls: list[dict[str, str]] = [] - - async def fake_refresh(*args: Any, **kwargs: Any) -> bool: - refresh_calls.append(dict(kwargs.get("permissions", {}))) - return False - monkeypatch.setattr(guard, "workflow_push_approved", fake_approved) - monkeypatch.setattr(guard, "refresh_proxy_token", fake_refresh) called = False request = _Request() @@ -737,51 +686,9 @@ async def test_approved_workflow_push_aborts_when_elevation_fails( result = await guard.WorkflowPushGuardMiddleware().awrap_tool_call(request, handler) - assert called is False - assert isinstance(result, ToolMessage) - assert result.tool_call_id == "call-1" - assert result.status == "error" - payload = json.loads(str(result.content)) - assert payload["status"] == "error" - assert payload["error_type"] == "WorkflowPushElevationFailed" - assert "workflows-scoped token" in payload["error"] - assert len(refresh_calls) == 1 - assert refresh_calls[0].get("workflows") == "write" - - -async def test_approved_workflow_push_runs_on_non_langsmith_providers( - monkeypatch: pytest.MonkeyPatch, -) -> None: - guard.SANDBOX_BACKENDS["thread-1"] = _Backend() - - async def fake_approved(thread_id: str, fingerprint: str) -> bool: - return True - - refresh_calls: list[dict[str, str]] = [] - - async def fake_refresh(*args: Any, **kwargs: Any) -> bool: - refresh_calls.append(dict(kwargs.get("permissions", {}))) - return False - - monkeypatch.setattr(guard, "workflow_push_approved", fake_approved) - monkeypatch.setattr(guard, "refresh_proxy_token", fake_refresh) - monkeypatch.setattr(guard, "os", os) - - called = False - - async def handler(request: Any) -> ToolMessage: - nonlocal called - called = True - return ToolMessage(content="pushed", tool_call_id=request.tool_call["id"]) - - with monkeypatch.context() as mp: - mp.setenv("SANDBOX_TYPE", "local") - result = await guard.WorkflowPushGuardMiddleware().awrap_tool_call(_Request(), handler) - assert called is True assert isinstance(result, ToolMessage) assert result.content == "pushed" - assert refresh_calls == [] def test_parse_git_push_guards_wrapped_and_optioned_forms() -> None: diff --git a/ui/src/components/agents/AgentThreadView.tsx b/ui/src/components/agents/AgentThreadView.tsx index 0080e8da..0a804015 100644 --- a/ui/src/components/agents/AgentThreadView.tsx +++ b/ui/src/components/agents/AgentThreadView.tsx @@ -23,11 +23,6 @@ import { useSubmitAgentMessage } from "@/lib/agents/provider/useSubmitAgentMessa import { useModelOptions } from "@/lib/agents/provider/useModelOptions" import { useIsMobile } from "@/lib/useIsMobile" import { cn } from "@/lib/utils" -import { - useApproveWorkflowPush, - useRejectWorkflowPush, - useWorkflowApprovals, -} from "@/lib/agents/queries" import { WorkflowApprovalCard } from "@/components/agents/WorkflowApprovalCard" interface AgentThreadViewProps { @@ -132,31 +127,6 @@ export function AgentThreadView({ thread }: AgentThreadViewProps) { // Show a loading state during that one-time fetch instead of the empty state. const isHydrating = stream.isThreadLoading && !hasMessages - const approvalsQuery = useWorkflowApprovals(thread.id) - const approveMutation = useApproveWorkflowPush(thread.id) - const rejectMutation = useRejectWorkflowPush(thread.id) - - const approvals = approvalsQuery.data - const isApprovalOwner = thread.isOwner ?? false - - const hasWorkflowApprovalError = useMemo( - () => - baseMessages.some((message) => - message.chunks.some( - (chunk) => - chunk.kind === "tool-execution" && - chunk.output?.includes("WorkflowPushApprovalRequired") - ) - ), - [baseMessages] - ) - - useEffect(() => { - if (hasWorkflowApprovalError) { - void approvalsQuery.refetch() - } - }, [hasWorkflowApprovalError]) - return (
{thread.planStatus === "ready" ? "A plan is ready for your review." - : thread.planStatus === "revising" - ? "The agent is revising the plan." - : "The agent is writing a plan."} + : thread.planStatus === "shared" + ? "The agent shared a longer response." + : thread.planStatus === "revising" + ? "The agent is revising the plan." + : "The agent is writing a plan."} - Review plan → + {thread.planStatus === "shared" + ? "Open response →" + : "Review plan →"} )} + {hasConversation ? (
- {approvals && approvals.length > 0 && ( -
- {approvals.map((approval) => ( - - approveMutation.mutate(approval.fingerprint) - } - onReject={() => rejectMutation.mutate(approval.fingerprint)} - /> - ))} -
- )} (null) const [copied, setCopied] = useState(false) // Locally track the displayed markdown so a manual edit shows immediately; the - // route's query stops polling once a plan exists, so the prop won't refetch. + // route's query stops polling once content exists, so the prop won't refetch. const [markdown, setMarkdown] = useState(plan.markdown) const [editing, setEditing] = useState(false) const [editDraft, setEditDraft] = useState(plan.markdown) @@ -70,8 +70,12 @@ export function PlanReview({ plan }: { plan: PlanData }) { if (!editing) setMarkdown(plan.markdown) }, [plan.markdown, editing]) + const isShared = plan.status === "shared" const canEdit = - plan.isOwner && plan.status !== "approved" && plan.status !== "cancelled" + plan.isOwner && + !isShared && + plan.status !== "approved" && + plan.status !== "cancelled" const startEditing = useCallback(() => { setEditDraft(markdown) @@ -114,13 +118,14 @@ export function PlanReview({ plan }: { plan: PlanData }) { /* transient; next tick retries */ } } + if (isShared) return void load() const timer = setInterval(load, POLL_MS) return () => { cancelled = true clearInterval(timer) } - }, [plan.threadId]) + }, [isShared, plan.threadId]) const submitComment = useCallback(async () => { const body = draft.trim() @@ -138,6 +143,16 @@ export function PlanReview({ plan }: { plan: PlanData }) { } }, [draft, plan.threadId]) + const handleCommentKeyDown = useCallback( + (event: KeyboardEvent) => { + if (event.key !== "Enter" || (!event.metaKey && !event.ctrlKey)) return + event.preventDefault() + if (posting || !draft.trim()) return + void submitComment() + }, + [draft, posting, submitComment] + ) + const removeComment = useCallback( async (id: string) => { try { @@ -192,10 +207,10 @@ export function PlanReview({ plan }: { plan: PlanData }) {

- Implementation plan + {isShared ? "Shared response" : "Implementation plan"}

- Reviewing as {plan.user.name} + {isShared ? "Viewing" : "Reviewing"} as {plan.user.name} {plan.isOwner ? " (owner)" : ""} · status:{" "} {plan.status}

@@ -227,7 +242,7 @@ export function PlanReview({ plan }: { plan: PlanData }) { Edit )} - {plan.isOwner && ( + {!isShared && plan.isOwner && ( + )}
@@ -296,7 +313,7 @@ export function PlanReview({ plan }: { plan: PlanData }) { )}
-
- + )}
) diff --git a/ui/src/components/agents/WorkflowApprovalCard.tsx b/ui/src/components/agents/WorkflowApprovalCard.tsx index 73140f51..cdd150f9 100644 --- a/ui/src/components/agents/WorkflowApprovalCard.tsx +++ b/ui/src/components/agents/WorkflowApprovalCard.tsx @@ -1,138 +1,177 @@ -import { Check, FileCode2, ShieldAlert, X } from "lucide-react" +import { useMemo, useState } from "react" +import { ShieldCheck } from "lucide-react" -import type { WorkflowApproval } from "@/lib/agents/api" - -import { Button } from "@/components/ui/button" +import type { WorkflowPushApproval } from "@/lib/agents/api" import { - Card, - CardContent, - CardDescription, - CardFooter, - CardHeader, - CardTitle, -} from "@/components/ui/card" + useWorkflowApprovalDecision, + useWorkflowApprovals, +} from "@/lib/agents/queries" +import { Button } from "@/components/ui/button" +import { cn } from "@/lib/utils" -type ApprovalStatus = "pending" | "approved" | "rejected" | string - -interface WorkflowApprovalCardProps { - approval: WorkflowApproval - isOwner: boolean - isPending: boolean - onApprove: (fingerprint: string) => void - onReject: (fingerprint: string) => void +function shortSha(value: string): string { + return value ? value.slice(0, 7) : "unknown" } -function statusBadgeClass(status: ApprovalStatus) { - switch (status) { - case "approved": - return "bg-green-500/10 text-green-600 dark:text-green-400" - case "rejected": - return "bg-red-500/10 text-red-600 dark:text-red-400" - default: - return "bg-amber-500/10 text-amber-600 dark:text-amber-400" - } +function pendingApprovals( + approvals: Array | undefined +): Array { + return (approvals ?? []).filter((approval) => approval.status === "pending") } -function statusLabel(status: ApprovalStatus) { - switch (status) { - case "approved": - return "Approved" - case "rejected": - return "Rejected" - default: - return "Pending approval" - } +function fileLabel(count: number): string { + return count === 1 ? "1 file" : `${count} files` } export function WorkflowApprovalCard({ - approval, - isOwner, - isPending, - onApprove, - onReject, -}: WorkflowApprovalCardProps) { - const actionable = isOwner && approval.status === "pending" && !isPending - const decided = approval.status !== "pending" + threadId, + pollWhileActive = false, +}: { + threadId: string + pollWhileActive?: boolean +}) { + const query = useWorkflowApprovals(threadId, { pollWhileActive }) + const decision = useWorkflowApprovalDecision(threadId) + const [error, setError] = useState(null) + const approvals = useMemo( + () => pendingApprovals(query.data?.approvals), + [query.data?.approvals] + ) + + if (approvals.length === 0) return null + + const isOwner = query.data?.isOwner === true + const decide = async ( + approval: WorkflowPushApproval, + kind: "approve" | "reject" + ) => { + setError(null) + try { + await decision.mutateAsync({ + fingerprint: approval.fingerprint, + decision: kind, + }) + } catch (e) { + setError((e as Error).message) + } + } return ( - - -
-
- - - Workflow push approval required - -
- - {statusLabel(approval.status)} - -
- - Open SWE is trying to push GitHub workflow file changes in{" "} - {approval.repo} on {approval.branch} - . Approve only if this exact workflow diff is expected. - - - -
-
- - Changed workflow files -
-
    - {approval.files.map((file) => ( -
  • - {file} -
    • - ))} -
-
- Fingerprint:{" "} - - {approval.fingerprint} - -
-
- - {actionable ? ( - - - - - ) : decided ? ( - - This workflow push has been {approval.status}. If the workflow files - change, a new fingerprint will be required. - - ) : null} - {!isOwner && approval.status === "pending" && ( - - Only the thread owner can approve or reject this workflow push. - - )} - +
+
+ {approvals.map((approval) => { + const busy = decision.isPending + return ( +
+
+
+
+ + Workflow file approval required +
+

+ {approval.repo || "Repository"} on{" "} + {approval.branch || "current branch"} ·{" "} + {shortSha(approval.baseSha)} → {shortSha(approval.headSha)} +

+

+ fingerprint: {approval.fingerprint} +

+
+
+ {approval.approvalUrl && ( + + )} + + +
+
+ + {!isOwner && ( +

+ Only the thread owner can approve or reject this workflow + push. +

+ )} + {error && ( +

+ {error} +

+ )} + +
+
+

+ {fileLabel(approval.files.length)} changed +

+
    + {approval.files.slice(0, 8).map((file) => ( +
  • + {file} +
    • + ))} + {approval.files.length > 8 && ( +
  • …and {approval.files.length - 8} more
    • + )} +
+
+
+ {approval.diffStats.files} files + + +{approval.diffStats.additions} + + + -{approval.diffStats.deletions} + +
+
+ + {approval.diffPreview && ( +
+ + Diff preview + {approval.diffPreviewTruncated ? " (truncated)" : ""} + + 
+                    {approval.diffPreview}
+
+
+ )} +
+ ) + })} +
+
) } diff --git a/ui/src/lib/agents/api.ts b/ui/src/lib/agents/api.ts index 886bf896..bd93beef 100644 --- a/ui/src/lib/agents/api.ts +++ b/ui/src/lib/agents/api.ts @@ -65,17 +65,35 @@ export interface ThreadRecoveryPatch { filename: string } -export interface WorkflowApproval { - fingerprint: string - status: string - repo: string - branch: string - files: Array - requested_at: string +export type WorkflowApprovalStatus = "pending" | "approved" | "rejected" + +export interface WorkflowDiffStats { + files: number + additions: number + deletions: number } -export interface WorkflowApprovalsPayload { - approvals: Array +export interface WorkflowPushApproval { + fingerprint: string + status: WorkflowApprovalStatus + repo: string + branch: string + baseSha: string + headSha: string + files: Array + diffStats: WorkflowDiffStats + diffPreview: string + diffPreviewTruncated: boolean + approvalUrl: string | null + requestedAt: string | null + decidedAt: string | null + decidedBy: string | null +} + +export interface WorkflowPushApprovalsResponse { + threadId: string + isOwner: boolean + approvals: Array } export interface WorkflowApprovalDecision { @@ -83,6 +101,12 @@ export interface WorkflowApprovalDecision { fingerprint: string } +// Legacy alias kept for backward-compatible prop typing. +export type WorkflowApproval = WorkflowPushApproval +export interface WorkflowApprovalsPayload { + approvals: Array +} + export interface ThreadsPageParams { limit?: number offset?: number @@ -284,7 +308,7 @@ export const agentsApi = { streamUrl: (threadId: string) => `${API_BASE}/dashboard/api/threads/${encodeURIComponent(threadId)}/stream`, listWorkflowApprovals: (threadId: string) => - agentsRequest( + agentsRequest( `/workflow-approval/${encodeURIComponent(threadId)}` ), approveWorkflowPush: (threadId: string, fingerprint: string) => diff --git a/ui/src/lib/agents/queries.ts b/ui/src/lib/agents/queries.ts index 0f60bf2b..36033c55 100644 --- a/ui/src/lib/agents/queries.ts +++ b/ui/src/lib/agents/queries.ts @@ -8,7 +8,8 @@ import type { ScheduleUpdateRequest, SidebarThreads, ThreadsPageParams, - WorkflowApproval, + WorkflowPushApproval, + WorkflowPushApprovalsResponse, } from "./api" import type { AgentThread, Chunk, ImageChunk, Message } from "./types" @@ -128,57 +129,43 @@ export function useAgentThreadPrDiff(threadId: string, enabled: boolean) { }) } -export function useWorkflowApprovals(threadId: string) { +export function useWorkflowApprovals( + threadId: string, + options: { pollWhileActive?: boolean } = {} +) { return useQuery({ queryKey: agentThreadKeys.workflowApprovals(threadId), - queryFn: async () => { - const { approvals } = await agentsApi.listWorkflowApprovals(threadId) - return approvals - }, - refetchInterval: (query) => { - const data = query.state.data - return data?.some((a) => a.status === "pending") ? 3000 : false - }, + queryFn: () => agentsApi.listWorkflowApprovals(threadId), + enabled: Boolean(threadId), + refetchInterval: (query) => + options.pollWhileActive || + query.state.data?.approvals?.some( + (approval) => approval.status === "pending" + ) + ? 3000 + : false, retry: false, }) } -export function useApproveWorkflowPush(threadId: string) { +export function useWorkflowApprovalDecision(threadId: string) { const queryClient = useQueryClient() - return useMutation({ - mutationFn: (fingerprint: string) => - agentsApi.approveWorkflowPush(threadId, fingerprint), - onSuccess: (_, fingerprint) => { - queryClient.setQueryData | undefined>( - agentThreadKeys.workflowApprovals(threadId), - (prev) => - prev?.map((record) => - record.fingerprint === fingerprint - ? { ...record, status: "approved" } - : record - ) - ) - }, - }) -} - -export function useRejectWorkflowPush(threadId: string) { - const queryClient = useQueryClient() - - return useMutation({ - mutationFn: (fingerprint: string) => - agentsApi.rejectWorkflowPush(threadId, fingerprint), - onSuccess: (_, fingerprint) => { - queryClient.setQueryData | undefined>( - agentThreadKeys.workflowApprovals(threadId), - (prev) => - prev?.map((record) => - record.fingerprint === fingerprint - ? { ...record, status: "rejected" } - : record - ) - ) + mutationFn: (vars: { + fingerprint: string + decision: "approve" | "reject" + }) => + vars.decision === "approve" + ? agentsApi.approveWorkflowPush(threadId, vars.fingerprint) + : agentsApi.rejectWorkflowPush(threadId, vars.fingerprint), + onSuccess: () => { + void queryClient.invalidateQueries({ + queryKey: agentThreadKeys.workflowApprovals(threadId), + }) + void queryClient.invalidateQueries({ + queryKey: agentThreadKeys.detail(threadId), + }) + invalidateAgentThreadLists(queryClient) }, }) } diff --git a/ui/src/lib/api.ts b/ui/src/lib/api.ts index e9fd7705..ac504297 100644 --- a/ui/src/lib/api.ts +++ b/ui/src/lib/api.ts @@ -823,7 +823,10 @@ export const api = { export function loginUrl(redirectTo?: string): string { const target = - redirectTo ?? (typeof window !== "undefined" ? window.location.href : "") + redirectTo ?? + (typeof window !== "undefined" + ? `${window.location.pathname}${window.location.search}${window.location.hash}` + : "") const qs = target ? `?redirect_to=${encodeURIComponent(target)}` : "" return `${API_BASE}/dashboard/api/auth/login${qs}` } diff --git a/ui/src/lib/plan.ts b/ui/src/lib/plan.ts index 8a0e849a..4c16e3f5 100644 --- a/ui/src/lib/plan.ts +++ b/ui/src/lib/plan.ts @@ -24,11 +24,7 @@ export interface PlanUser { } export type PlanStatus = - | "planning" - | "ready" - | "revising" - | "approved" - | "cancelled" + "planning" | "ready" | "shared" | "revising" | "approved" | "cancelled" export interface PlanData { threadId: string diff --git a/ui/src/routes/agents/$threadId_.plan.tsx b/ui/src/routes/agents/$threadId_.plan.tsx index 5eeb0198..3b408059 100644 --- a/ui/src/routes/agents/$threadId_.plan.tsx +++ b/ui/src/routes/agents/$threadId_.plan.tsx @@ -7,7 +7,7 @@ import { PlanReview } from "@/components/agents/PlanReview" import { buttonVariants } from "@/components/ui/button" import { Skeleton } from "@/components/ui/skeleton" import { loginUrl } from "@/lib/api" -import { authRedirectUrl, currentAuthRedirectPath } from "@/lib/auth-redirect" +import { currentAuthRedirectPath } from "@/lib/auth-redirect" import { PlanApiError, getPlan } from "@/lib/plan" export const Route = createFileRoute("/agents/$threadId_/plan")({ @@ -36,7 +36,7 @@ function BackLink({ threadId }: { threadId: string }) { } export function planSignInHref(): string { - return loginUrl(authRedirectUrl(currentAuthRedirectPath())) + return loginUrl(currentAuthRedirectPath()) } export function PlanSignInButton() { diff --git a/ui/src/routes/login.tsx b/ui/src/routes/login.tsx index c3505bfc..cd5071aa 100644 --- a/ui/src/routes/login.tsx +++ b/ui/src/routes/login.tsx @@ -7,7 +7,6 @@ import { Skeleton } from "@/components/ui/skeleton"; import { loginUrl } from "@/lib/api"; import { DEFAULT_AUTH_REDIRECT, - authRedirectUrl, consumeAuthRedirect, getRememberedAuthRedirect, rememberAuthRedirect, From 25d4886b9a33cd109c16126840a0a7223eb8771e Mon Sep 17 00:00:00 2001 From: amoussa1229 <166072409+amoussa1229@users.noreply.github.com> Date: Thu, 9 Jul 2026 17:29:17 +0000 Subject: [PATCH 2/5] feat: port durable dispatch hardening and startup latency improvements Port five upstream PRs onto dev: - #1621 / #1658: durable dispatch with loopback webhook defense, create_durable_run helper, _config_with_prepare_run_id, degradation to None for relative/loopback completion webhook URLs - #1696: run-level completion webhook deduplication (replace claim-then-post with post-then-flag per run_id), DeferredErrorModel for graph-factory resilience, ToolRetryMiddleware for task subagents, TimeoutWrapupMiddleware for all three graphs - #1697: lazy-load __init__.py for agent.middleware, agent.tools, agent.dashboard (PEP 562); defer heavy imports (exa_py in web_search, agent.webapp in request_pr_review, deepagents in sandbox.py); add ttl_cache.py with stale-while-revalidate for tool loaders Refs: #137 --- agent/analyzer.py | 12 ++- agent/completion.py | 99 ++++++++++---------- agent/dashboard/__init__.py | 19 +++- agent/dispatch.py | 140 +++++++++++++++++++++++------ agent/middleware/__init__.py | 88 ++++++++++++++---- agent/middleware/task_retry.py | 82 +++++++++++++++++ agent/middleware/timeout_wrapup.py | 64 +++++++++++++ agent/reviewer.py | 11 ++- agent/server.py | 22 +++-- agent/tools/__init__.py | 117 ++++++++++++++++++------ agent/tools/request_pr_review.py | 24 ++++- agent/tools/web_search.py | 4 +- agent/utils/deferred_model.py | 57 ++++++++++++ agent/utils/sandbox.py | 7 +- agent/utils/ttl_cache.py | 121 +++++++++++++++++++++++++ docs/upstream-sync/triage.jsonl | 12 +-- docs/upstream-sync/triage.md | 12 +-- tests/test_completion_webhook.py | 101 +++++++++++++++------ tests/test_dispatch.py | 122 +++++++++++++++++++++++++ 19 files changed, 932 insertions(+), 182 deletions(-) create mode 100644 agent/middleware/task_retry.py create mode 100644 agent/middleware/timeout_wrapup.py create mode 100644 agent/utils/deferred_model.py create mode 100644 agent/utils/ttl_cache.py create mode 100644 tests/test_dispatch.py diff --git a/agent/analyzer.py b/agent/analyzer.py index 0f8cc1da..cffbe762 100644 --- a/agent/analyzer.py +++ b/agent/analyzer.py @@ -30,7 +30,11 @@ from deepagents.backends.state import StateBackend from langchain.agents.middleware import ModelCallLimitMiddleware from .integrations.langsmith import _configure_github_proxy -from .middleware import SanitizeToolInputsMiddleware, ToolErrorMiddleware +from .middleware import ( + SanitizeToolInputsMiddleware, + TimeoutWrapupMiddleware, + ToolErrorMiddleware, +) from .review_style_guidance import REVIEWER_STYLE_THEMES from .server import ( DEFAULT_LLM_MAX_TOKENS, @@ -43,7 +47,8 @@ from .tools.read_finding_outcomes import read_finding_outcomes from .tools.save_review_style import save_review_style_prompt from .utils.analyzer_skills import SKILLS_ROUTE, skill_path_for_mode from .utils.github_app import get_github_app_installation_token -from .utils.model import DEFAULT_LLM_REASONING, make_model, provider_model_kwargs +from .utils.deferred_model import make_model_or_defer +from .utils.model import DEFAULT_LLM_REASONING, provider_model_kwargs from .utils.sandbox_paths import aresolve_sandbox_work_dir from .utils.sandbox_state import unwrap_sandbox_backend from .utils.tracing import REVIEW_TRACING_PROJECT, traced_graph_factory @@ -135,7 +140,7 @@ async def get_analyzer(config: RunnableConfig) -> Pregel: system_prompt = f"{system_prompt}\n\n{user_context}" return create_deep_agent( - model=make_model(model_id, **model_kwargs), + model=make_model_or_defer(model_id, **model_kwargs), system_prompt=system_prompt, tools=[save_review_style_prompt, read_finding_outcomes], backend=backend, @@ -147,6 +152,7 @@ async def get_analyzer(config: RunnableConfig) -> Pregel: exit_behavior="end", ), ToolErrorMiddleware(), + TimeoutWrapupMiddleware(), ], ).with_config(config) diff --git a/agent/completion.py b/agent/completion.py index b711ce80..1df81c0c 100644 --- a/agent/completion.py +++ b/agent/completion.py @@ -2,13 +2,14 @@ The platform POSTs a run-completion payload to ``/webhooks/run-complete`` (wired as the ``webhook`` on every dispatched run, see ``agent.dispatch``). When a run -ends in a failure state (``error`` / ``timeout`` / ``interrupted``) we post a +ends in a failure state (``error`` / ``timeout``) we post a short failure reply to the originating channel, so a run that died on a server recycle or hit a limit never leaves the user in silence. This decouples "the user gets an answer" from "the agent remembered to reply." -The reply is idempotent: a per-thread metadata flag prevents double-posting when -the platform retries the webhook or a checkpoint replays. +The reply is idempotent per run when the webhook includes a run id. Older or +manual payloads without a run id fall back to legacy thread-level idempotence so +missing ids degrade dedupe instead of silencing failure replies. """ from __future__ import annotations @@ -16,7 +17,6 @@ from __future__ import annotations import hmac import logging import os -from collections.abc import Awaitable, Callable from typing import Any from .utils.dashboard_links import dashboard_thread_url @@ -34,11 +34,9 @@ logger = logging.getLogger(__name__) # carries on — that's healthy, not a failure worth a "couldn't finish" reply. _TERMINAL_FAILURE_STATUSES = frozenset({"error", "timeout"}) _FAILURE_REPLY_FLAG = "failure_reply_posted" - - -class _ClaimFailed(Exception): - """Raised when the dedup flag couldn't be claimed, so we skip the post.""" - +_FAILURE_REPLY_RUN_ID = "failure_reply_posted_run_id" +_FAILURE_REPLY_RUN_IDS = "failure_reply_posted_run_ids" +_MAX_FAILURE_REPLY_RUN_IDS = 20 # Shared-secret bearer token proving a /webhooks/run-complete call came from our # own dispatch (which appends ?token= when this is set) rather than from an @@ -65,9 +63,14 @@ def verify_run_complete_token(token: str | None) -> bool: def _failure_text(status: str, dashboard_url: str | None = None) -> str: - reason = "timed out" if status == "timeout" else "hit an unexpected error" + if status == "timeout": + reason = "timed out" + elif status == "interrupted": + reason = "was interrupted before it could finish" + else: + reason = "hit an unexpected error" text = ( - f"⚠️ I wasn't able to finish that — the run {reason}. " + f"\u26a0\ufe0f I wasn't able to finish that \u2014 the run {reason}. " "Send another message and I'll pick it back up." ) if dashboard_url: @@ -75,19 +78,8 @@ def _failure_text(status: str, dashboard_url: str | None = None) -> str: return text -async def _post_failure_reply( - thread_id: str, - metadata: dict[str, Any], - status: str, - *, - claim: Callable[[], Awaitable[None]], -) -> bool: - """Post a failure reply to the run's originating channel. Best-effort. - - ``claim`` is awaited immediately before the network post (claim-then-post), - only on a branch that actually delivers, so a retried/concurrent webhook - can't double-post and threads with no channel never burn the flag. - """ +async def _post_failure_reply(thread_id: str, metadata: dict[str, Any], status: str) -> bool: + """Post a failure reply to the run's originating channel. Best-effort.""" source = metadata.get("source") ctx = metadata.get("source_context") ctx = ctx if isinstance(ctx, dict) else {} @@ -99,7 +91,6 @@ async def _post_failure_reply( channel_id = slack_thread.get("channel_id") thread_ts = slack_thread.get("thread_ts") if channel_id and thread_ts: - await claim() slack_text = _failure_text(status, dashboard_thread_url(thread_id)) return await post_slack_thread_reply(channel_id, thread_ts, slack_text) return False @@ -109,7 +100,6 @@ async def _post_failure_reply( if isinstance(linear_issue, dict): issue_id = linear_issue.get("id") if issue_id: - await claim() return await comment_on_linear_issue(issue_id, text) return False @@ -123,7 +113,6 @@ async def _post_failure_reply( if isinstance(repo_config, dict) and isinstance(number, int): token = await get_github_app_installation_token() if token: - await claim() return await post_github_comment(repo_config, number, text, token=token) return False @@ -131,6 +120,26 @@ async def _post_failure_reply( return False +def _posted_failure_run_ids(metadata: dict[str, Any]) -> list[str]: + raw = metadata.get(_FAILURE_REPLY_RUN_IDS) + ids = [item for item in raw if isinstance(item, str) and item] if isinstance(raw, list) else [] + latest = metadata.get(_FAILURE_REPLY_RUN_ID) + if isinstance(latest, str) and latest and latest not in ids: + ids.append(latest) + return ids + + +def _failure_reply_metadata(metadata: dict[str, Any], run_id: str | None) -> dict[str, Any]: + if run_id is None: + return {_FAILURE_REPLY_FLAG: True} + ids = [item for item in _posted_failure_run_ids(metadata) if item != run_id] + ids.append(run_id) + return { + _FAILURE_REPLY_RUN_ID: run_id, + _FAILURE_REPLY_RUN_IDS: ids[-_MAX_FAILURE_REPLY_RUN_IDS:], + } + + async def handle_run_completion(payload: dict[str, Any]) -> dict[str, str]: """Handle a platform run-completion webhook POST. @@ -139,6 +148,8 @@ async def handle_run_completion(payload: dict[str, Any]) -> dict[str, str]: """ status = payload.get("status") thread_id = payload.get("thread_id") + raw_run_id = payload.get("run_id") + run_id = raw_run_id if isinstance(raw_run_id, str) and raw_run_id else None if not isinstance(thread_id, str) or not thread_id: return {"status": "ignored", "reason": "missing thread_id"} if status not in _TERMINAL_FAILURE_STATUSES: @@ -153,26 +164,24 @@ async def handle_run_completion(payload: dict[str, Any]) -> dict[str, str]: metadata = thread.get("metadata") if isinstance(thread, dict) else None metadata = metadata if isinstance(metadata, dict) else {} - if metadata.get(_FAILURE_REPLY_FLAG): - return {"status": "ignored", "reason": "failure reply already posted"} + if run_id is None: + # Payloads without run ids fall back to the old per-thread flag; run-scoped + # dedupe intentionally does not read it so future runs can still report. + if metadata.get(_FAILURE_REPLY_FLAG): + return {"status": "ignored", "reason": "failure reply already posted"} + elif run_id in _posted_failure_run_ids(metadata): + return {"status": "ignored", "reason": "failure reply already posted for run"} - # Claim-then-post: set the dedup flag immediately before the actual post (via - # the claim callback) so a retried/concurrent completion webhook can't - # double-post. The flag is only claimed on a branch that delivers, so a - # thread with no reply channel never burns it. If the claim itself fails we - # skip the post, leaving the flag unset so a later retry can try again. - async def _claim() -> None: - try: - await client.threads.update(thread_id=thread_id, metadata={_FAILURE_REPLY_FLAG: True}) - except Exception as exc: # noqa: BLE001 - logger.warning("run-complete: could not flag thread %s", thread_id, exc_info=True) - raise _ClaimFailed from exc - - try: - posted = await _post_failure_reply(thread_id, metadata, status, claim=_claim) - except _ClaimFailed: - return {"status": "error", "reason": "could not claim failure reply"} + posted = await _post_failure_reply(thread_id, metadata, status) if not posted: return {"status": "ignored", "reason": "no reply posted"} + + try: + await client.threads.update( + thread_id=thread_id, + metadata=_failure_reply_metadata(metadata, run_id), + ) + except Exception: # noqa: BLE001 + logger.warning("run-complete: could not flag thread %s", thread_id, exc_info=True) logger.info("Posted failure reply for thread %s (status=%s)", thread_id, status) return {"status": "ok", "reason": "failure reply posted"} diff --git a/agent/dashboard/__init__.py b/agent/dashboard/__init__.py index acf54f9e..e6a42bb4 100644 --- a/agent/dashboard/__init__.py +++ b/agent/dashboard/__init__.py @@ -1,5 +1,20 @@ -"""Dashboard backend: OAuth, profiles, and admin endpoints for the open-swe UI.""" +"""Dashboard backend: OAuth, profiles, and admin endpoints for the open-swe UI. -from .routes import router +``router`` is loaded lazily (PEP 562): importing any dashboard submodule +(e.g. ``agent.dashboard.options`` from middleware) executes this __init__, +and it must NOT drag in routes.py + FastAPI + every API/job module. Only the +webapp, which actually mounts the router, pays that cost. +""" + +from typing import Any __all__ = ["router"] + + +def __getattr__(name: str) -> Any: + if name == "router": + from .routes import router + + globals()[name] = router + return router + raise AttributeError(f"module {__name__!r} has no attribute {name!r}") diff --git a/agent/dispatch.py b/agent/dispatch.py index aa72225e..f818f8b8 100644 --- a/agent/dispatch.py +++ b/agent/dispatch.py @@ -17,7 +17,9 @@ from __future__ import annotations import logging import os +import uuid from typing import Any +from urllib.parse import urlparse from langgraph_sdk import get_client from langgraph_sdk.client import LangGraphClient @@ -25,22 +27,56 @@ from langgraph_sdk.client import LangGraphClient logger = logging.getLogger(__name__) ContentBlocks = str | list[dict[str, Any]] +RunInput = dict[str, Any] +RunConfig = dict[str, Any] -# Same-server FastAPI route the platform POSTs run completion/failure to. A -# relative URL loopback-posts into this app (no SSRF/loopback config needed); -# override with an absolute URL via env for split deployments. The route is -# fail-closed on RUN_COMPLETE_WEBHOOK_SECRET, so only register the webhook when -# the secret is set, appending it as ?token= so the route can verify the call -# came from us (completion.verify_run_complete_token). Unset → no webhook. +# FastAPI route the platform POSTs run completion/failure to. The platform +# rejects loopback webhooks (relative URLs / localhost) — they bypass auth via +# the in-process ASGI transport — so a loopback URL would 422 *every* run at +# create time. COMPLETION_WEBHOOK_URL must therefore be the deployment's +# absolute https URL (…/webhooks/run-complete). The route is fail-closed on +# RUN_COMPLETE_WEBHOOK_SECRET, so we only attach the webhook when the secret is +# set, appending it as ?token= so the route can verify the call came from us +# (completion.verify_run_complete_token). Secret unset, or URL relative/loopback +# → no webhook attached (the completion reply is best-effort; it must never +# break run creation). _COMPLETION_WEBHOOK_BASE = os.environ.get("COMPLETION_WEBHOOK_URL") or "/webhooks/run-complete" _RUN_COMPLETE_SECRET = os.environ.get("RUN_COMPLETE_WEBHOOK_SECRET") -COMPLETION_WEBHOOK_URL: str | None -if not _RUN_COMPLETE_SECRET: - COMPLETION_WEBHOOK_URL = None -elif "?" in _COMPLETION_WEBHOOK_BASE: - COMPLETION_WEBHOOK_URL = _COMPLETION_WEBHOOK_BASE -else: - COMPLETION_WEBHOOK_URL = f"{_COMPLETION_WEBHOOK_BASE}?token={_RUN_COMPLETE_SECRET}" + + +def _is_loopback_webhook(url: str) -> bool: + """Whether a webhook URL is relative or points at localhost (platform-rejected).""" + parsed = urlparse(url) + if parsed.scheme not in ("http", "https") or not parsed.netloc: + return True # relative / schemeless + return (parsed.hostname or "").lower() in {"localhost", "127.0.0.1", "::1"} + + +def _resolve_completion_webhook_url(base: str, secret: str | None) -> str | None: + """Resolve the completion webhook URL, or None to attach no webhook. + + Degrades to None (with a warning) for a relative/loopback URL rather than + letting a rejected webhook poison every ``runs.create``. + """ + if not secret: + return None + if _is_loopback_webhook(base): + logger.warning( + "RUN_COMPLETE_WEBHOOK_SECRET is set but COMPLETION_WEBHOOK_URL (%r) is relative " + "or loopback; the platform rejects such webhooks, so run-completion replies are " + "disabled. Set COMPLETION_WEBHOOK_URL to the deployment's absolute https URL " + "ending in /webhooks/run-complete to enable them.", + base, + ) + return None + if "?" in base: + return base + return f"{base}?token={secret}" + + +COMPLETION_WEBHOOK_URL: str | None = _resolve_completion_webhook_url( + _COMPLETION_WEBHOOK_BASE, _RUN_COMPLETE_SECRET +) def _langgraph_url() -> str: @@ -53,6 +89,65 @@ def dispatch_client() -> LangGraphClient: return get_client(url=_langgraph_url()) +def _config_with_prepare_run_id( + config: RunConfig | None, + metadata: dict[str, Any] | None, +) -> RunConfig: + run_config = dict(config or {}) + configurable = run_config.get("configurable") + configurable = dict(configurable) if isinstance(configurable, dict) else {} + configurable.setdefault("prepare_run_id", str(uuid.uuid4())) + run_config["configurable"] = configurable + if metadata is not None: + run_config["metadata"] = metadata + return run_config + + +async def create_durable_run( + thread_id: str, + assistant_id: str, + *, + input: RunInput, + source: str, + config: RunConfig | None = None, + metadata: dict[str, Any] | None = None, + client: LangGraphClient | None = None, + multitask_strategy: str = "interrupt", + durability: str = "sync", + if_not_exists: str = "create", + stream_mode: Any | None = None, + stream_resumable: bool | None = None, + after_seconds: int | float | None = None, +) -> dict[str, Any]: + """Create a run with Open SWE's durable LangGraph defaults.""" + client = client or dispatch_client() + create_kwargs: dict[str, Any] = { + "input": input, + "config": _config_with_prepare_run_id(config, metadata), + "multitask_strategy": multitask_strategy, + "durability": durability, + "if_not_exists": if_not_exists, + } + if COMPLETION_WEBHOOK_URL: + create_kwargs["webhook"] = COMPLETION_WEBHOOK_URL + if stream_mode is not None: + create_kwargs["stream_mode"] = stream_mode + if stream_resumable is not None: + create_kwargs["stream_resumable"] = stream_resumable + if after_seconds is not None: + create_kwargs["after_seconds"] = after_seconds + + run = await client.runs.create(thread_id, assistant_id, **create_kwargs) + logger.info( + "Dispatched %s run on thread %s (source=%s, run=%s)", + assistant_id, + thread_id, + source, + run.get("run_id") if isinstance(run, dict) else None, + ) + return run + + async def dispatch_agent_run( thread_id: str, content: ContentBlocks, @@ -72,22 +167,13 @@ async def dispatch_agent_run( ``"interrupt"`` (human follow-ups halt + resume); autofix passes ``"reject"`` so a burst of concurrent CI events for one head SHA can't interrupt each other. """ - client = client or dispatch_client() - run = await client.runs.create( + return await create_durable_run( thread_id, assistant_id, input={"messages": [{"role": "user", "content": content}]}, - config={"configurable": configurable, "metadata": metadata or {}}, + config={"configurable": configurable}, + metadata=metadata or {}, + source=source, + client=client or dispatch_client(), multitask_strategy=multitask_strategy, - durability="sync", - webhook=COMPLETION_WEBHOOK_URL, - if_not_exists="create", ) - logger.info( - "Dispatched %s run on thread %s (source=%s, run=%s)", - assistant_id, - thread_id, - source, - run.get("run_id") if isinstance(run, dict) else None, - ) - return run diff --git a/agent/middleware/__init__.py b/agent/middleware/__init__.py index c40ce67b..fd40fc52 100644 --- a/agent/middleware/__init__.py +++ b/agent/middleware/__init__.py @@ -1,31 +1,39 @@ -from .check_message_queue import check_message_queue_before_model -from .ensure_no_empty_msg import ensure_no_empty_msg -from .exclude_tools import ExcludeToolsMiddleware -from .model_fallback import ModelFallbackMiddleware -from .notify_step_limit import notify_step_limit_reached -from .plan_mode import PlanModeMiddleware -from .refresh_github_proxy import refresh_github_proxy_before_model -from .refresh_slack_status import SlackAssistantStatusMiddleware -from .repair_orphaned_tool_calls import RepairOrphanedToolCallsMiddleware -from .sandbox_circuit_breaker import SandboxCircuitBreakerMiddleware -from .sanitize_thinking_blocks import SanitizeThinkingBlocksMiddleware -from .sanitize_tool_inputs import SanitizeToolInputsMiddleware -from .settle_review_check import settle_review_check_on_exit -from .subdir_agents import SubdirAgentsReadMiddleware -from .tool_artifact import ToolArtifactMiddleware -from .tool_error_handler import ToolErrorMiddleware -from .workflow_push_guard import WorkflowPushGuardMiddleware +import sys +from types import ModuleType +from typing import TYPE_CHECKING, Any + +_MIDDLEWARE_MODULES = { + "check_message_queue_before_model": ".check_message_queue", + "ensure_no_empty_msg": ".ensure_no_empty_msg", + "ExcludeToolsMiddleware": ".exclude_tools", + "ModelFallbackMiddleware": ".model_fallback", + "notify_step_limit_reached": ".notify_step_limit", + "PlanModeMiddleware": ".plan_mode", + "refresh_github_proxy_before_model": ".refresh_github_proxy", + "SlackAssistantStatusMiddleware": ".refresh_slack_status", + "SandboxCircuitBreakerMiddleware": ".sandbox_circuit_breaker", + "SanitizeThinkingBlocksMiddleware": ".sanitize_thinking_blocks", + "SanitizeToolInputsMiddleware": ".sanitize_tool_inputs", + "settle_review_check_on_exit": ".settle_review_check", + "SubdirAgentsReadMiddleware": ".subdir_agents", + "task_on_failure": ".task_retry", + "task_retry_on": ".task_retry", + "TimeoutWrapupMiddleware": ".timeout_wrapup", + "ToolArtifactMiddleware": ".tool_artifact", + "ToolErrorMiddleware": ".tool_error_handler", + "WorkflowPushGuardMiddleware": ".workflow_push_guard", +} __all__ = [ "ExcludeToolsMiddleware", "ModelFallbackMiddleware", "PlanModeMiddleware", - "RepairOrphanedToolCallsMiddleware", "SanitizeThinkingBlocksMiddleware", "SanitizeToolInputsMiddleware", "SubdirAgentsReadMiddleware", "ToolArtifactMiddleware", "ToolErrorMiddleware", + "TimeoutWrapupMiddleware", "WorkflowPushGuardMiddleware", "SandboxCircuitBreakerMiddleware", "SlackAssistantStatusMiddleware", @@ -34,4 +42,48 @@ __all__ = [ "notify_step_limit_reached", "refresh_github_proxy_before_model", "settle_review_check_on_exit", + "task_on_failure", + "task_retry_on", ] + +if TYPE_CHECKING: + from .check_message_queue import check_message_queue_before_model + from .ensure_no_empty_msg import ensure_no_empty_msg + from .exclude_tools import ExcludeToolsMiddleware + from .model_fallback import ModelFallbackMiddleware + from .notify_step_limit import notify_step_limit_reached + from .plan_mode import PlanModeMiddleware + from .refresh_github_proxy import refresh_github_proxy_before_model + from .refresh_slack_status import SlackAssistantStatusMiddleware + from .sandbox_circuit_breaker import SandboxCircuitBreakerMiddleware + from .sanitize_thinking_blocks import SanitizeThinkingBlocksMiddleware + from .sanitize_tool_inputs import SanitizeToolInputsMiddleware + from .settle_review_check import settle_review_check_on_exit + from .subdir_agents import SubdirAgentsReadMiddleware + from .task_retry import task_on_failure, task_retry_on + from .timeout_wrapup import TimeoutWrapupMiddleware + from .tool_artifact import ToolArtifactMiddleware + from .tool_error_handler import ToolErrorMiddleware + from .workflow_push_guard import WorkflowPushGuardMiddleware + + +def _load_export(name: str) -> Any: + module_name = _MIDDLEWARE_MODULES.get(name) + if module_name is None: + raise AttributeError(f"module {__name__!r} has no attribute {name!r}") + from importlib import import_module + + value = getattr(import_module(module_name, __name__), name) + globals()[name] = value + return value + + +class _LazyMiddlewareModule(ModuleType): + def __getattribute__(self, name: str) -> Any: + module_map = ModuleType.__getattribute__(self, "__dict__").get("_MIDDLEWARE_MODULES", {}) + if name in module_map: + return _load_export(name) + return ModuleType.__getattribute__(self, name) + + +sys.modules[__name__].__class__ = _LazyMiddlewareModule diff --git a/agent/middleware/task_retry.py b/agent/middleware/task_retry.py new file mode 100644 index 00000000..d532bc2d --- /dev/null +++ b/agent/middleware/task_retry.py @@ -0,0 +1,82 @@ +from __future__ import annotations + +import json + +_RETURN_TO_MODEL_CODES = frozenset({"invalid_prompt", "context_length_exceeded"}) +_RETURN_TO_MODEL_STATUS_CODES = frozenset({400, 422}) +_RETRY_HTTP_STATUS_CODES = frozenset({408, 409, 425, 429, 500, 502, 503, 504, 529}) +_TRANSIENT_ERROR_NAMES = frozenset( + { + "APIConnectionError", + "APITimeoutError", + "ConnectTimeout", + "ReadTimeout", + "TimeoutException", + "TransportError", + } +) + + +def _error_body(exc: Exception) -> dict[str, object]: + body = getattr(exc, "body", None) + if isinstance(body, dict): + nested = body.get("error") + return nested if isinstance(nested, dict) else body + return {} + + +def _status_code(exc: Exception) -> int | None: + status = getattr(exc, "status_code", None) + if isinstance(status, int): + return status + response = getattr(exc, "response", None) + status = getattr(response, "status_code", None) + return status if isinstance(status, int) else None + + +def _error_fields(exc: Exception) -> dict[str, object]: + body = _error_body(exc) + out: dict[str, object] = {} + status = _status_code(exc) + if status is not None: + out["status_code"] = status + for key in ("type", "code", "message"): + value = body.get(key) + if not isinstance(value, str) or not value: + value = getattr(exc, key, None) + if isinstance(value, str) and value: + out[key] = value + return out + + +def _is_httpx_transport_error(exc: Exception) -> bool: + try: + import httpx + except ImportError: # pragma: no cover - dependency is declared in production + return False + return isinstance(exc, httpx.TransportError) + + +def task_retry_on(exc: Exception) -> bool: + status = _status_code(exc) + if isinstance(status, int) and (status in _RETRY_HTTP_STATUS_CODES or status >= 500): + return True + return exc.__class__.__name__ in _TRANSIENT_ERROR_NAMES or _is_httpx_transport_error(exc) + + +def task_on_failure(exc: Exception) -> str: + error = _error_fields(exc) + code = error.get("code") + status = error.get("status_code") + returnable = code in _RETURN_TO_MODEL_CODES or ( + code is None + and error.get("type") == "invalid_request_error" + and isinstance(status, int) + and status in _RETURN_TO_MODEL_STATUS_CODES + ) + if not returnable: + raise exc + return json.dumps( + {"status": "failed", "source": "subagent", "error": error}, + sort_keys=True, + ) diff --git a/agent/middleware/timeout_wrapup.py b/agent/middleware/timeout_wrapup.py new file mode 100644 index 00000000..78a0cd3e --- /dev/null +++ b/agent/middleware/timeout_wrapup.py @@ -0,0 +1,64 @@ +from __future__ import annotations + +import os +import time +from collections.abc import Awaitable, Callable + +from langchain.agents.middleware.types import AgentMiddleware, ModelRequest, ModelResponse +from langchain_core.messages import BaseMessage, SystemMessage + +_DEFAULT_TIMEOUT_SECONDS = 45 * 60 +_WRAPUP_INSTRUCTION = """ + +You have been running for a long time. Wrap up immediately: finish the current +step, save or report useful state, avoid starting new investigations, and end +your turn with the best available result. + +""" + + +def _configured_timeout_seconds() -> int: + raw = os.environ.get("OPEN_SWE_WRAPUP_TIMEOUT_SECONDS") + if not raw: + return _DEFAULT_TIMEOUT_SECONDS + try: + value = int(raw) + except ValueError: + return _DEFAULT_TIMEOUT_SECONDS + return value if value > 0 else _DEFAULT_TIMEOUT_SECONDS + + +def _content_with_instruction(message: BaseMessage | None, instruction: str) -> str | list[object]: + if message is None: + return instruction + content = message.content + if isinstance(content, list): + return [*content, {"type": "text", "text": instruction}] + return f"{content}\n\n{instruction}" if content else instruction + + +class TimeoutWrapupMiddleware(AgentMiddleware): + def __init__(self, timeout_seconds: int | None = None) -> None: + super().__init__() + self._timeout_seconds = timeout_seconds or _configured_timeout_seconds() + # Graph construction should create one middleware instance per run; start + # lazily so construction-time caching cannot age the run clock. + self._start: float | None = None + + def _should_wrapup(self) -> bool: + if self._start is None: + self._start = time.monotonic() + return (time.monotonic() - self._start) >= self._timeout_seconds + + def _apply(self, request: ModelRequest) -> ModelRequest: + if not self._should_wrapup(): + return request + content = _content_with_instruction(request.system_message, _WRAPUP_INSTRUCTION) + return request.override(system_message=SystemMessage(content=content)) + + async def awrap_model_call( + self, + request: ModelRequest, + handler: Callable[[ModelRequest], Awaitable[ModelResponse]], + ) -> ModelResponse: + return await handler(self._apply(request)) diff --git a/agent/reviewer.py b/agent/reviewer.py index 7704ef98..a413386b 100644 --- a/agent/reviewer.py +++ b/agent/reviewer.py @@ -43,6 +43,7 @@ from .middleware import ( SanitizeThinkingBlocksMiddleware, SanitizeToolInputsMiddleware, SlackAssistantStatusMiddleware, + TimeoutWrapupMiddleware, ToolErrorMiddleware, check_message_queue_before_model, refresh_github_proxy_before_model, @@ -84,7 +85,8 @@ from .utils.agents_md import fetch_agents_md from .utils.api_standards_skill import fetch_api_standards_skill from .utils.github_app import get_github_app_installation_token_with_expiry from .utils.github_token import cache_github_token_for_thread -from .utils.model import DEFAULT_LLM_REASONING, make_model, provider_model_kwargs +from .utils.deferred_model import make_model_or_defer +from .utils.model import DEFAULT_LLM_REASONING, provider_model_kwargs from .utils.repo_prep import materialize_trusted_skills, prepare_review_repo from .utils.sandbox_paths import aresolve_sandbox_work_dir from .utils.tracing import REVIEW_TRACING_PROJECT, traced_graph_factory @@ -821,7 +823,7 @@ async def _resolve_grouping_model(configurable: dict[str, object]) -> BaseChatMo max_tokens=DEFAULT_LLM_MAX_TOKENS, openai_reasoning_default=DEFAULT_LLM_REASONING, ) - return make_model(model_id, **model_kwargs) + return make_model_or_defer(model_id, **model_kwargs) async def get_reviewer_agent(config: RunnableConfig) -> Pregel: @@ -1156,8 +1158,8 @@ async def get_reviewer_agent(config: RunnableConfig) -> Pregel: if review_context: system_prompt = f"{system_prompt}\n\n{review_context}" - reviewer_model = make_model(model_id, **model_kwargs) - reviewer_subagent_model = make_model(subagent_model_id, **subagent_model_kwargs) + reviewer_model = make_model_or_defer(model_id, **model_kwargs) + reviewer_subagent_model = make_model_or_defer(subagent_model_id, **subagent_model_kwargs) # Kick off the AI-sorted diff grouping pass at run start, concurrently with # the review, so it adds ~0 latency. First-review and re-review only — a @@ -1201,6 +1203,7 @@ async def get_reviewer_agent(config: RunnableConfig) -> Pregel: refresh_github_proxy_before_model, check_message_queue_before_model, SlackAssistantStatusMiddleware(), + TimeoutWrapupMiddleware(), SanitizeThinkingBlocksMiddleware(), RepairOrphanedToolCallsMiddleware(), settle_review_check_on_exit, diff --git a/agent/server.py b/agent/server.py index 48afa4d0..739a4663 100644 --- a/agent/server.py +++ b/agent/server.py @@ -27,7 +27,7 @@ from deepagents import create_deep_agent from deepagents.backends import LangSmithSandbox from deepagents.backends.protocol import SandboxBackendProtocol from deepagents.middleware.subagents import GENERAL_PURPOSE_SUBAGENT, SubAgent -from langchain.agents.middleware import ModelCallLimitMiddleware +from langchain.agents.middleware import ModelCallLimitMiddleware, ToolRetryMiddleware from langchain_core.language_models import BaseChatModel from langsmith.sandbox import SandboxClientError @@ -62,6 +62,7 @@ from .middleware import ( SanitizeToolInputsMiddleware, SlackAssistantStatusMiddleware, SubdirAgentsReadMiddleware, + TimeoutWrapupMiddleware, ToolArtifactMiddleware, ToolErrorMiddleware, WorkflowPushGuardMiddleware, @@ -69,6 +70,8 @@ from .middleware import ( ensure_no_empty_msg, notify_step_limit_reached, refresh_github_proxy_before_model, + task_on_failure, + task_retry_on, ) from .prompt import construct_system_prompt from .tools import ( @@ -100,6 +103,7 @@ from .utils.authorship import ( resolve_triggering_user_identity, ) from .utils.dashboard_links import dashboard_plan_url, dashboard_thread_url +from .utils.deferred_model import make_model_or_defer from .utils.github_app import ( BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS, RUNTIME_PROXY_TOKEN_PERMISSIONS, @@ -110,7 +114,6 @@ from .utils.github_proxy import record_proxy_token_expiry from .utils.github_token import repo_cache_key from .utils.model import ( fallback_model_id_for, - make_model, provider_model_kwargs, ) from .utils.sandbox import create_sandbox @@ -860,7 +863,7 @@ async def get_agent(config: RunnableConfig) -> Pregel: fallback_model_id, None, max_tokens=DEFAULT_LLM_MAX_TOKENS ) fallback_middleware.append( - ModelFallbackMiddleware(make_model(fallback_model_id, **fallback_kwargs)) + ModelFallbackMiddleware(make_model_or_defer(fallback_model_id, **fallback_kwargs)) ) logger.info("Configured model fallback %s -> %s", model_id, fallback_model_id) @@ -926,8 +929,8 @@ async def get_agent(config: RunnableConfig) -> Pregel: notion_tools = [] logger.info("Returning agent with sandbox for thread %s", thread_id) - main_model = make_model(model_id, **model_kwargs) - subagent_model = make_model(subagent_model_id, **subagent_model_kwargs) + main_model = make_model_or_defer(model_id, **model_kwargs) + subagent_model = make_model_or_defer(subagent_model_id, **subagent_model_kwargs) return create_deep_agent( model=main_model, system_prompt=construct_system_prompt( @@ -977,11 +980,20 @@ async def get_agent(config: RunnableConfig) -> Pregel: ModelCallLimitMiddleware(run_limit=MODEL_CALL_RECURSION_LIMIT, exit_behavior="end"), ToolErrorMiddleware(), SubdirAgentsReadMiddleware(), + ToolRetryMiddleware( + max_retries=2, + tools=["task"], + retry_on=task_retry_on, + on_failure=task_on_failure, + initial_delay=1.0, + max_delay=10.0, + ), ToolArtifactMiddleware(), WorkflowPushGuardMiddleware(), refresh_github_proxy_before_model, check_message_queue_before_model, SlackAssistantStatusMiddleware(), + TimeoutWrapupMiddleware(), ensure_no_empty_msg, notify_step_limit_reached, SandboxCircuitBreakerMiddleware(), diff --git a/agent/tools/__init__.py b/agent/tools/__init__.py index 8642474d..e48efdf7 100644 --- a/agent/tools/__init__.py +++ b/agent/tools/__init__.py @@ -1,32 +1,38 @@ -from .add_finding import add_finding -from .enter_plan_mode import enter_plan_mode -from .fetch_url import fetch_url -from .http_request import http_request -from .linear_comment import linear_comment -from .linear_create_issue import linear_create_issue -from .linear_delete_issue import linear_delete_issue -from .linear_get_issue import linear_get_issue -from .linear_get_issue_comments import linear_get_issue_comments -from .linear_list_teams import linear_list_teams -from .linear_update_issue import linear_update_issue -from .list_findings import list_findings -from .list_review_findings import list_review_findings -from .open_pull_request import open_pull_request -from .publish_review import publish_review -from .read_repo_file import read_repo_file -from .reply_to_finding_thread import reply_to_finding_thread -from .report_platform_issue import report_platform_issue -from .request_pr_review import request_pr_review -from .resolve_finding_thread import resolve_finding_thread -from .save_plan import save_plan -from .schedule_thread_wakeup import schedule_thread_wakeup -from .search_repo_code import search_repo_code -from .slack_add_reaction import slack_add_reaction -from .slack_read_thread_messages import slack_read_thread_messages -from .slack_start_new_thread import slack_start_new_thread -from .slack_thread_reply import slack_thread_reply -from .update_finding import update_finding -from .web_search import web_search +import sys +from types import ModuleType +from typing import TYPE_CHECKING, Any + +_TOOL_MODULES = { + "add_finding": ".add_finding", + "enter_plan_mode": ".enter_plan_mode", + "fetch_url": ".fetch_url", + "http_request": ".http_request", + "linear_comment": ".linear_comment", + "linear_create_issue": ".linear_create_issue", + "linear_delete_issue": ".linear_delete_issue", + "linear_get_issue": ".linear_get_issue", + "linear_get_issue_comments": ".linear_get_issue_comments", + "linear_list_teams": ".linear_list_teams", + "linear_update_issue": ".linear_update_issue", + "list_findings": ".list_findings", + "list_review_findings": ".list_review_findings", + "open_pull_request": ".open_pull_request", + "publish_review": ".publish_review", + "read_repo_file": ".read_repo_file", + "report_platform_issue": ".report_platform_issue", + "request_pr_review": ".request_pr_review", + "reply_to_finding_thread": ".reply_to_finding_thread", + "resolve_finding_thread": ".resolve_finding_thread", + "save_plan": ".save_plan", + "schedule_thread_wakeup": ".schedule_thread_wakeup", + "search_repo_code": ".search_repo_code", + "slack_add_reaction": ".slack_add_reaction", + "slack_read_thread_messages": ".slack_read_thread_messages", + "slack_start_new_thread": ".slack_start_new_thread", + "slack_thread_reply": ".slack_thread_reply", + "update_finding": ".update_finding", + "web_search": ".web_search", +} __all__ = [ "add_finding", @@ -59,3 +65,56 @@ __all__ = [ "update_finding", "web_search", ] + +if TYPE_CHECKING: + from .add_finding import add_finding + from .enter_plan_mode import enter_plan_mode + from .fetch_url import fetch_url + from .http_request import http_request + from .linear_comment import linear_comment + from .linear_create_issue import linear_create_issue + from .linear_delete_issue import linear_delete_issue + from .linear_get_issue import linear_get_issue + from .linear_get_issue_comments import linear_get_issue_comments + from .linear_list_teams import linear_list_teams + from .linear_update_issue import linear_update_issue + from .list_findings import list_findings + from .list_review_findings import list_review_findings + from .open_pull_request import open_pull_request + from .publish_review import publish_review + from .read_repo_file import read_repo_file + from .reply_to_finding_thread import reply_to_finding_thread + from .report_platform_issue import report_platform_issue + from .request_pr_review import request_pr_review + from .resolve_finding_thread import resolve_finding_thread + from .save_plan import save_plan + from .schedule_thread_wakeup import schedule_thread_wakeup + from .search_repo_code import search_repo_code + from .slack_add_reaction import slack_add_reaction + from .slack_read_thread_messages import slack_read_thread_messages + from .slack_start_new_thread import slack_start_new_thread + from .slack_thread_reply import slack_thread_reply + from .update_finding import update_finding + from .web_search import web_search + + +def _load_tool(name: str) -> Any: + module_name = _TOOL_MODULES.get(name) + if module_name is None: + raise AttributeError(f"module {__name__!r} has no attribute {name!r}") + from importlib import import_module + + value = getattr(import_module(module_name, __name__), name) + globals()[name] = value + return value + + +class _LazyToolsModule(ModuleType): + def __getattribute__(self, name: str) -> Any: + tool_map = ModuleType.__getattribute__(self, "__dict__").get("_TOOL_MODULES", {}) + if name in tool_map: + return _load_tool(name) + return ModuleType.__getattribute__(self, name) + + +sys.modules[__name__].__class__ = _LazyToolsModule diff --git a/agent/tools/request_pr_review.py b/agent/tools/request_pr_review.py index d6f1bb54..e55a3506 100644 --- a/agent/tools/request_pr_review.py +++ b/agent/tools/request_pr_review.py @@ -2,8 +2,28 @@ from typing import Any from langgraph.config import get_config -from agent.utils.slack import parse_github_pr_url -from agent.webapp import trigger_pr_review_from_ref +from agent.utils.slack import GitHubPrRef, parse_github_pr_url + + +async def trigger_pr_review_from_ref( + pr_ref: GitHubPrRef, + *, + source: str, + github_login: str = "", + github_user_id: int | None = None, + slack_channel_id: str = "", + slack_thread_ts: str = "", +) -> dict[str, Any]: + from agent.webapp import trigger_pr_review_from_ref as _trigger_pr_review_from_ref + + return await _trigger_pr_review_from_ref( + pr_ref, + source=source, + github_login=github_login, + github_user_id=github_user_id, + slack_channel_id=slack_channel_id, + slack_thread_ts=slack_thread_ts, + ) async def request_pr_review(pr_url: str) -> dict[str, Any]: diff --git a/agent/tools/web_search.py b/agent/tools/web_search.py index 18fd21e2..d6b99a05 100644 --- a/agent/tools/web_search.py +++ b/agent/tools/web_search.py @@ -3,8 +3,6 @@ import logging import os from typing import Any -from exa_py import Exa - logger = logging.getLogger(__name__) @@ -38,6 +36,8 @@ async def web_search( } async def _search() -> dict[str, Any]: + from exa_py import Exa # deferred: heavy import + client = Exa(api_key=api_key) if include_contents: result = await asyncio.to_thread( diff --git a/agent/utils/deferred_model.py b/agent/utils/deferred_model.py new file mode 100644 index 00000000..6511ff70 --- /dev/null +++ b/agent/utils/deferred_model.py @@ -0,0 +1,57 @@ +from __future__ import annotations + +import logging +from typing import Any + +from langchain_core.language_models import BaseChatModel + +from .model import make_model + +logger = logging.getLogger(__name__) + + +class DeferredErrorModel(BaseChatModel): + """Model placeholder that raises a stored setup error on first invocation.""" + + error_message: str + model_id: str | None = None + + @property + def _llm_type(self) -> str: + return "deferred-error" + + def _get_ls_params(self, stop: Any = None, **kwargs: Any) -> dict[str, Any]: + params = super()._get_ls_params(stop=stop, **kwargs) + if self.model_id: + params["ls_model_name"] = self.model_id + if ":" in self.model_id: + params["ls_provider"] = self.model_id.split(":", 1)[0] + return params + + def bind_tools(self, tools: Any, **kwargs: Any) -> DeferredErrorModel: + return self + + def _generate(self, messages: Any, stop: Any = None, run_manager: Any = None, **kwargs: Any): + raise ValueError(self.error_message) + + +def make_deferred_error_model( + error: BaseException, *, model_id: str | None = None +) -> BaseChatModel: + return DeferredErrorModel(error_message=f"{type(error).__name__}: {error}", model_id=model_id) + + +def make_model_or_defer(model_id: str, **kwargs: Any) -> BaseChatModel: + """Call ``make_model`` and wrap any setup error in a ``DeferredErrorModel``. + + This lets graph factories pass a model placeholder into the agent graph on + startup without crashing the process. The error is raised later inside the + agent run when the model is first invoked, so the caller can recover + gracefully (e.g. via fallback middleware or by surfacing the error to the + user). + """ + try: + return make_model(model_id, **kwargs) + except Exception as e: # noqa: BLE001 + logger.warning("Deferring model setup failure for %s", model_id, exc_info=True) + return make_deferred_error_model(e, model_id=model_id) diff --git a/agent/utils/sandbox.py b/agent/utils/sandbox.py index 0dc3e41d..9614420a 100644 --- a/agent/utils/sandbox.py +++ b/agent/utils/sandbox.py @@ -1,10 +1,9 @@ import os from collections.abc import Callable from importlib import import_module +from typing import Any -from deepagents.backends.protocol import SandboxBackendProtocol - -SandboxFactory = Callable[[str | None], SandboxBackendProtocol] +SandboxFactory = Callable[..., Any] SANDBOX_FACTORIES: dict[str, tuple[str, str]] = { "langsmith": ("agent.integrations.langsmith", "create_langsmith_sandbox"), @@ -31,7 +30,7 @@ def create_sandbox( sandbox_id: str | None = None, *, snapshot_id: str | None = None, -) -> SandboxBackendProtocol: +) -> Any: """Create or reconnect to a sandbox using the configured provider. The provider is selected via the SANDBOX_TYPE environment variable. diff --git a/agent/utils/ttl_cache.py b/agent/utils/ttl_cache.py new file mode 100644 index 00000000..b69c2b53 --- /dev/null +++ b/agent/utils/ttl_cache.py @@ -0,0 +1,121 @@ +from __future__ import annotations + +import asyncio +import logging +from collections.abc import Awaitable, Callable +from typing import TypeVar, cast + +logger = logging.getLogger(__name__) + +T = TypeVar("T") + +_CACHE: dict[str, tuple[object, float]] = {} +_LOCKS: dict[tuple[str, int], asyncio.Lock] = {} +_REFRESH_TASKS: dict[tuple[str, int], asyncio.Task[None]] = {} + + +def _now() -> float: + return asyncio.get_running_loop().time() + + +def _lock_for(key: str) -> asyncio.Lock: + loop = asyncio.get_running_loop() + lock_key = (key, id(loop)) + lock = _LOCKS.get(lock_key) + if lock is None: + lock = asyncio.Lock() + _LOCKS[lock_key] = lock + return lock + + +async def cached(key: str, ttl_seconds: float, loader: Callable[[], Awaitable[T]]) -> T: + now = _now() + entry = _CACHE.get(key) + if entry is not None: + value, expires_at = entry + if expires_at > now: + return cast(T, value) + + async with _lock_for(key): + now = _now() + entry = _CACHE.get(key) + if entry is not None: + value, expires_at = entry + if expires_at > now: + return cast(T, value) + + stale = entry[0] if entry is not None else None + has_stale = entry is not None + try: + value = await loader() + except Exception: + if has_stale: + logger.warning( + "TTL cache loader failed for %s; serving stale value", key, exc_info=True + ) + return cast(T, stale) + raise + _CACHE[key] = (value, now + ttl_seconds) + return value + + +async def _refresh_stale_entry( + key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]] +) -> None: + async with _lock_for(key): + try: + value = await loader() + except Exception: + logger.warning("TTL cache background refresh failed for %s", key, exc_info=True) + return + _CACHE[key] = (value, _now() + ttl_seconds) + + +def _schedule_refresh( + key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]] +) -> None: + loop = asyncio.get_running_loop() + task_key = (key, id(loop)) + existing = _REFRESH_TASKS.get(task_key) + if existing is not None and not existing.done(): + return + + task = asyncio.create_task(_refresh_stale_entry(key, ttl_seconds, loader)) + _REFRESH_TASKS[task_key] = task + task.add_done_callback(lambda _task: _REFRESH_TASKS.pop(task_key, None)) + + +async def cached_stale_while_revalidate( + key: str, + ttl_seconds: float, + loader: Callable[[], Awaitable[T]], +) -> T: + now = _now() + entry = _CACHE.get(key) + if entry is not None: + value, expires_at = entry + if expires_at > now: + return cast(T, value) + _schedule_refresh(key, ttl_seconds, loader) + return cast(T, value) + return await cached(key, ttl_seconds, loader) + + +def set_cached(key: str, value: object, ttl_seconds: float) -> None: + try: + expires_at = _now() + ttl_seconds + except RuntimeError: + expires_at = float("inf") + _CACHE[key] = (value, expires_at) + + +def invalidate(key: str) -> None: + _CACHE.pop(key, None) + + +def clear() -> None: + _CACHE.clear() + _LOCKS.clear() + for task in _REFRESH_TASKS.values(): + task.cancel() + _REFRESH_TASKS.clear() diff --git a/docs/upstream-sync/triage.jsonl b/docs/upstream-sync/triage.jsonl index 226e4b58..51b8a1e9 100644 --- a/docs/upstream-sync/triage.jsonl +++ b/docs/upstream-sync/triage.jsonl @@ -1,4 +1,4 @@ -{"_meta": {"last_synced": "fd2541ce", "last_synced_date": "2026-07-08"}} +{"_meta": {"last_synced": "fd2541ce", "last_synced_date": "2026-07-09"}} {"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"} @@ -18,9 +18,9 @@ {"sha": "e5a29eca", "pr": 1613, "subject": "plan links in PR descriptions", "disposition": "wont-merge", "reason": "regression — dev has async plan-ref", "branch": "", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "e1d85526", "pr": 1645, "subject": "switch ui to pnpm", "disposition": "wont-merge", "reason": "tooling — fork keeps bun", "branch": "", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "f5670f24", "pr": 1639, "subject": "require bun for ui agent work", "disposition": "landed", "reason": "cherry-picked (-x) in this PR (#132)", "branch": "PR1", "local_sha": null, "updated": "2026-07-08T23:17:34Z"} -{"sha": "209132d3", "pr": 1621, "subject": "durable interrupt dispatch + completion webhook", "disposition": "deferred", "reason": "investigate first — may be applied", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "02bb4dfd", "pr": 1658, "subject": "don't attach loopback run-complete webhooks", "disposition": "deferred", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} -{"sha": "29015fad", "pr": 1614, "subject": "gate workflow pushes with approval", "disposition": "deferred", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} +{"sha": "209132d3", "pr": 1621, "subject": "durable interrupt dispatch + completion webhook", "disposition": "landed", "reason": "investigate first — may be applied", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-09T17:22:52Z"} +{"sha": "02bb4dfd", "pr": 1658, "subject": "don't attach loopback run-complete webhooks", "disposition": "landed", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-09T17:22:53Z"} +{"sha": "29015fad", "pr": 1614, "subject": "gate workflow pushes with approval", "disposition": "landed", "reason": "", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-09T17:22:53Z"} {"sha": "546042a4", "pr": 1652, "subject": "add workflow approval UI", "disposition": "deferred", "reason": "", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-02T00:00:00Z"} {"sha": "ae04b72b", "pr": 1635, "subject": "publish plans from sandbox files", "disposition": "landed", "reason": "ported (adapted) in #128 (save_plan reads sandbox file)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T22:58:21Z"} {"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"} @@ -64,9 +64,9 @@ {"sha": "290d0fee", "pr": 1669, "subject": "chore(deps): update langgraph-cli[inmem] requirement (#1669)", "disposition": "wont-merge", "reason": "already in dev — langgraph-cli[inmem] at 0.4.30", "branch": "", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "c9f6dd86", "pr": 1694, "subject": "fix: fall back on model stream transport errors (#1694)", "disposition": "deferred", "reason": "adds httpx.TransportError to transient set; small conflict w/ dev's diverged Bedrock fallback", "branch": "model-fallback", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "c9a9a7cd", "pr": 1695, "subject": "fix: retry model fallback exhaustion (#1695)", "disposition": "deferred", "reason": "alternating retry+backoff rewrite; reconcile by hand w/ dev's Bedrock + sync wrap path", "branch": "model-fallback", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} -{"sha": "e5dbc788", "pr": 1696, "subject": "fix: Harden durable agent runs (#1696)", "disposition": "deferred", "reason": "large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} +{"sha": "e5dbc788", "pr": 1696, "subject": "fix: Harden durable agent runs (#1696)", "disposition": "landed", "reason": "large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-09T17:22:53Z"} {"sha": "52fe2916", "pr": 1698, "subject": "feat: add PR review link route (#1698)", "disposition": "landed", "reason": "cherry-picked (-x) in #127 (PR review link route)", "branch": "reviewer-misc", "local_sha": null, "updated": "2026-07-08T22:58:21Z"} -{"sha": "5f7f5fbd", "pr": 1697, "subject": "fix: Reduce graph import and loader startup latency (#1697)", "disposition": "deferred", "reason": "import-hygiene refactor; cross-cutting, references many deferred upstream-only modules", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} +{"sha": "5f7f5fbd", "pr": 1697, "subject": "fix: Reduce graph import and loader startup latency (#1697)", "disposition": "landed", "reason": "import-hygiene refactor; cross-cutting, references many deferred upstream-only modules", "branch": "durable-dispatch", "local_sha": null, "updated": "2026-07-09T17:22:53Z"} {"sha": "216cf181", "pr": 1699, "subject": "fix: keep workflow HITL without token downscoping (#1699)", "disposition": "deferred", "reason": "FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface)", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "67abf5b0", "pr": 1659, "subject": "fix: surface attributed PR creation failures (#1659)", "disposition": "deferred", "reason": "PR-attribution-failure guard (new mw, safe imports); heavy conflict on diverged open_pull_request.py", "branch": "pr-attribution", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} {"sha": "3dbc0282", "pr": 1676, "subject": "fix: preserve plan redirects after login (#1676)", "disposition": "deferred", "reason": "FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup", "branch": "plan-approval", "local_sha": null, "updated": "2026-07-08T20:14:42Z"} diff --git a/docs/upstream-sync/triage.md b/docs/upstream-sync/triage.md index 72c47736..fb875405 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`:** `fd2541ce` (2026-07-08) +**Last synced `upstream/main`:** `fd2541ce` (2026-07-09) | sha | pr | subject | decision | why | branch | |---|---|---|---|---|---| @@ -21,6 +21,9 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `6575c327` | #1654 | disable React StrictMode | Landed | kept fork's `PwaUpdateProvider` | cherry-pick-upstream | | `00906401` | #1610 | editable plan mode | Landed | re-implemented in fork via #130 (editable plan mode) | | | `f5670f24` | #1639 | require bun for ui agent work | Landed | cherry-picked (-x) in this PR (#132) | PR1 | +| `209132d3` | #1621 | durable interrupt dispatch + completion webhook | Landed | investigate first — may be applied | durable-dispatch | +| `02bb4dfd` | #1658 | don't attach loopback run-complete webhooks | Landed | | durable-dispatch | +| `29015fad` | #1614 | gate workflow pushes with approval | Landed | | durable-dispatch | | `ae04b72b` | #1635 | publish plans from sandbox files | Landed | ported (adapted) in #128 (save_plan reads sandbox file) | plan-approval | | `96cceb74` | #1632 | notify Slack on plan approval | Landed | ported (adapted) in #128 | plan-approval | | `2f56d754` | #1618 | omit plan link when no plan exists | Landed | already in dev via #81 (upstream-sync); ledger was stale (was: likely regression) | plan-approval | @@ -37,7 +40,9 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `4f913198` | #1647 | widen split review diffs | Landed | already present in dev; empty pick confirmed in #127 | reviewer-misc | | `20f63e8c` | #1646 | install missing deps before verification | Landed | already in dev via #81 (upstream-sync); ledger was stale | prompt-tweaks | | `2f237b53` | #1626 | fall back to vision model for image threads | Landed | ported (adapted to Bedrock/Fireworks vision) in #128 | gateway-routing | +| `e5dbc788` | #1696 | fix: Harden durable agent runs (#1696) | Landed | large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion | durable-dispatch | | `52fe2916` | #1698 | feat: add PR review link route (#1698) | Landed | cherry-picked (-x) in #127 (PR review link route) | reviewer-misc | +| `5f7f5fbd` | #1697 | fix: Reduce graph import and loader startup latency (#1697) | Landed | import-hygiene refactor; cross-cutting, references many deferred upstream-only modules | durable-dispatch | | `7f7af715` | #1684 | feat: auto-load scoped AGENTS on reads (#1684) | Landed | ported in #129 (SubdirAgentsReadMiddleware) | subdir-agents | | `88b62322` | #1685 | feat: add platform issue reporting tool (#1685) | Landed | ported in #129 (report_platform_issue tool) | small-tools | | `c3292d82` | #1611 | bake sfw binary into sandbox image | Won't merge | already in dev | | @@ -57,9 +62,6 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `73a9e8b5` | #1693 | chore(deps): bump the minor-and-patch group across 1 directory with 19 updates (#1693) | Won't merge | dev at-or-ahead on 17/19; group fights dev's pinned langsmith==0.9.7 (#115) and carries an upstream plan-route test | | | `9cd7e464` | #1700 | Fix workflow approval visibility (#1700) | Won't merge | superseded — dev's list_workflow_approvals_for_thread already enforces owner-only 403 | | | `fd2541ce` | #1705 | fix: drop orphaned function_call items with stale OpenAI reasoning (#1705) | Won't merge | N/A — edits sanitize_openai_responses.py which dev deleted in the Bedrock/Fireworks migration (#62) | | -| `209132d3` | #1621 | durable interrupt dispatch + completion webhook | Deferred | investigate first — may be applied | durable-dispatch | -| `02bb4dfd` | #1658 | don't attach loopback run-complete webhooks | Deferred | | durable-dispatch | -| `29015fad` | #1614 | gate workflow pushes with approval | Deferred | | durable-dispatch | | `546042a4` | #1652 | add workflow approval UI | Deferred | | plan-approval | | `c03a6be7` | #1634 | keep plan guidance high-level | Deferred | | plan-approval | | `4cd5fa5c` | #1629 | avoid recapping Slack replies | Deferred | | slack-tooling | @@ -81,8 +83,6 @@ Rows key on the **upstream SHA** (stable across local cherry-picks). Deferred ro | `fbc6de85` | #1667 | chore(deps): bump fireworks-ai from 1.2.0a75 to 1.2.0a86 (#1667) | Deferred | conflicts on pick — dev diverged to fireworks-ai a85; a86 still wanted, needs manual bump + uv lock | deps | | `c9f6dd86` | #1694 | fix: fall back on model stream transport errors (#1694) | Deferred | adds httpx.TransportError to transient set; small conflict w/ dev's diverged Bedrock fallback | model-fallback | | `c9a9a7cd` | #1695 | fix: retry model fallback exhaustion (#1695) | Deferred | alternating retry+backoff rewrite; reconcile by hand w/ dev's Bedrock + sync wrap path | model-fallback | -| `e5dbc788` | #1696 | fix: Harden durable agent runs (#1696) | Deferred | large durable-run hardening; 3 new modules dev lacks; rewrites fork dispatch/completion | durable-dispatch | -| `5f7f5fbd` | #1697 | fix: Reduce graph import and loader startup latency (#1697) | Deferred | import-hygiene refactor; cross-cutting, references many deferred upstream-only modules | durable-dispatch | | `216cf181` | #1699 | fix: keep workflow HITL without token downscoping (#1699) | Deferred | FLAG-HUMAN: removes token downscoping — conflicts w/ fork PR#100 workflow-token elevation (auth surface) | plan-approval | | `67abf5b0` | #1659 | fix: surface attributed PR creation failures (#1659) | Deferred | PR-attribution-failure guard (new mw, safe imports); heavy conflict on diverged open_pull_request.py | pr-attribution | | `3dbc0282` | #1676 | fix: preserve plan redirects after login (#1676) | Deferred | FLAG-HUMAN: follow-on to landed #1668 refining sanitize_redirect_to (open-redirect auth surface); not a dup | plan-approval | diff --git a/tests/test_completion_webhook.py b/tests/test_completion_webhook.py index 0966ed41..5aa773ba 100644 --- a/tests/test_completion_webhook.py +++ b/tests/test_completion_webhook.py @@ -42,7 +42,9 @@ async def test_error_status_posts_slack_failure_reply(monkeypatch: pytest.Monkey completion, "dashboard_thread_url", lambda thread_id: f"https://ui/{thread_id}" ) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "error"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "error"} + ) assert result["status"] == "ok" reply.assert_awaited_once() @@ -50,7 +52,9 @@ async def test_error_status_posts_slack_failure_reply(monkeypatch: pytest.Monkey assert args[0] == "C1" assert args[1] == "123.45" assert "" in args[2] - assert client.threads.updates == [{"failure_reply_posted": True}] + assert client.threads.updates == [ + {"failure_reply_posted_run_id": "run-1", "failure_reply_posted_run_ids": ["run-1"]} + ] @pytest.mark.asyncio @@ -60,7 +64,9 @@ async def test_success_status_is_ignored(monkeypatch: pytest.MonkeyPatch) -> Non reply = AsyncMock(return_value=True) monkeypatch.setattr(completion, "post_slack_thread_reply", reply) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "success"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "success"} + ) assert result["status"] == "ignored" reply.assert_not_called() @@ -69,19 +75,46 @@ async def test_success_status_is_ignored(monkeypatch: pytest.MonkeyPatch) -> Non @pytest.mark.asyncio async def test_idempotent_when_already_replied(monkeypatch: pytest.MonkeyPatch) -> None: metadata = _slack_metadata() - metadata["failure_reply_posted"] = True + metadata["failure_reply_posted_run_ids"] = ["run-1"] client = _FakeClient(metadata) monkeypatch.setattr(completion, "langgraph_client", lambda: client) reply = AsyncMock(return_value=True) monkeypatch.setattr(completion, "post_slack_thread_reply", reply) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "timeout"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "timeout"} + ) assert result["status"] == "ignored" reply.assert_not_called() assert client.threads.updates == [] +@pytest.mark.asyncio +async def test_later_failed_run_posts_even_if_prior_run_replied( + monkeypatch: pytest.MonkeyPatch, +) -> None: + metadata = _slack_metadata() + metadata["failure_reply_posted_run_ids"] = ["run-1"] + client = _FakeClient(metadata) + monkeypatch.setattr(completion, "langgraph_client", lambda: client) + reply = AsyncMock(return_value=True) + monkeypatch.setattr(completion, "post_slack_thread_reply", reply) + + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-2", "status": "timeout"} + ) + + assert result["status"] == "ok" + reply.assert_awaited_once() + assert client.threads.updates == [ + { + "failure_reply_posted_run_id": "run-2", + "failure_reply_posted_run_ids": ["run-1", "run-2"], + } + ] + + @pytest.mark.asyncio async def test_linear_source_comments_on_issue(monkeypatch: pytest.MonkeyPatch) -> None: client = _FakeClient({"source": "linear", "source_context": {"linear_issue": {"id": "iss_1"}}}) @@ -89,7 +122,9 @@ async def test_linear_source_comments_on_issue(monkeypatch: pytest.MonkeyPatch) comment = AsyncMock(return_value=True) monkeypatch.setattr(completion, "comment_on_linear_issue", comment) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "timeout"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "timeout"} + ) assert result["status"] == "ok" comment.assert_awaited_once() @@ -98,38 +133,42 @@ async def test_linear_source_comments_on_issue(monkeypatch: pytest.MonkeyPatch) @pytest.mark.asyncio async def test_missing_thread_id_is_ignored() -> None: - result = await completion.handle_run_completion({"status": "error"}) + result = await completion.handle_run_completion({"run_id": "run-1", "status": "error"}) assert result["status"] == "ignored" @pytest.mark.asyncio -async def test_claims_flag_before_posting(monkeypatch: pytest.MonkeyPatch) -> None: - # Claim-then-post: the dedup flag must be set before the reply is posted so a - # retried/concurrent webhook can't double-post the canned failure message. +async def test_missing_run_id_falls_back_to_thread_level_dedupe( + monkeypatch: pytest.MonkeyPatch, +) -> None: client = _FakeClient(_slack_metadata()) monkeypatch.setattr(completion, "langgraph_client", lambda: client) - - async def _reply(*_args: Any, **_kwargs: Any) -> bool: - assert client.threads.updates == [{"failure_reply_posted": True}] - return True - - monkeypatch.setattr(completion, "post_slack_thread_reply", AsyncMock(side_effect=_reply)) - - result = await completion.handle_run_completion({"thread_id": "t1", "status": "error"}) - assert result["status"] == "ok" - - -@pytest.mark.asyncio -async def test_does_not_post_when_claim_fails(monkeypatch: pytest.MonkeyPatch) -> None: - client = _FakeClient(_slack_metadata()) - client.threads.update = AsyncMock(side_effect=RuntimeError("boom")) - monkeypatch.setattr(completion, "langgraph_client", lambda: client) reply = AsyncMock(return_value=True) monkeypatch.setattr(completion, "post_slack_thread_reply", reply) result = await completion.handle_run_completion({"thread_id": "t1", "status": "error"}) - assert result["status"] == "error" + + assert result["status"] == "ok" + reply.assert_awaited_once() + assert client.threads.updates == [{"failure_reply_posted": True}] + + +@pytest.mark.asyncio +async def test_missing_run_id_respects_thread_level_dedupe( + monkeypatch: pytest.MonkeyPatch, +) -> None: + metadata = _slack_metadata() + metadata["failure_reply_posted"] = True + client = _FakeClient(metadata) + monkeypatch.setattr(completion, "langgraph_client", lambda: client) + reply = AsyncMock(return_value=True) + monkeypatch.setattr(completion, "post_slack_thread_reply", reply) + + result = await completion.handle_run_completion({"thread_id": "t1", "status": "error"}) + + assert result["status"] == "ignored" reply.assert_not_called() + assert client.threads.updates == [] @pytest.mark.asyncio @@ -137,7 +176,9 @@ async def test_no_reply_channel_does_not_flag(monkeypatch: pytest.MonkeyPatch) - client = _FakeClient({"source": "schedule"}) monkeypatch.setattr(completion, "langgraph_client", lambda: client) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "error"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "error"} + ) assert result["status"] == "ignored" assert client.threads.updates == [] @@ -152,7 +193,9 @@ async def test_interrupted_status_is_ignored(monkeypatch: pytest.MonkeyPatch) -> reply = AsyncMock(return_value=True) monkeypatch.setattr(completion, "post_slack_thread_reply", reply) - result = await completion.handle_run_completion({"thread_id": "t1", "status": "interrupted"}) + result = await completion.handle_run_completion( + {"thread_id": "t1", "run_id": "run-1", "status": "interrupted"} + ) assert result["status"] == "ignored" reply.assert_not_called() diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py new file mode 100644 index 00000000..5ba69522 --- /dev/null +++ b/tests/test_dispatch.py @@ -0,0 +1,122 @@ +from __future__ import annotations + +import importlib +from typing import Any + +import pytest + +dispatch = importlib.import_module("agent.dispatch") + +_ABSOLUTE = "https://open-swe-v3-abc.us.langgraph.app/webhooks/run-complete" + + +def test_is_loopback_webhook_relative() -> None: + assert dispatch._is_loopback_webhook("/webhooks/run-complete") is True + + +def test_is_loopback_webhook_localhost() -> None: + assert dispatch._is_loopback_webhook("http://localhost:2024/webhooks/run-complete") is True + assert dispatch._is_loopback_webhook("http://127.0.0.1:8000/webhooks/run-complete") is True + + +def test_is_loopback_webhook_absolute() -> None: + assert dispatch._is_loopback_webhook(_ABSOLUTE) is False + + +def test_resolve_no_secret_attaches_nothing() -> None: + assert dispatch._resolve_completion_webhook_url(_ABSOLUTE, None) is None + assert dispatch._resolve_completion_webhook_url(_ABSOLUTE, "") is None + + +def test_resolve_relative_url_degrades_to_none() -> None: + # Secret set but a loopback URL would 422 every run — attach nothing instead. + assert dispatch._resolve_completion_webhook_url("/webhooks/run-complete", "s3cret") is None + + +def test_resolve_localhost_url_degrades_to_none() -> None: + assert dispatch._resolve_completion_webhook_url("http://localhost/x", "s3cret") is None + + +def test_resolve_absolute_url_appends_token() -> None: + assert ( + dispatch._resolve_completion_webhook_url(_ABSOLUTE, "s3cret") == f"{_ABSOLUTE}?token=s3cret" + ) + + +def test_resolve_absolute_url_with_existing_query_left_as_is() -> None: + url = f"{_ABSOLUTE}?token=preset" + assert dispatch._resolve_completion_webhook_url(url, "s3cret") == url + + +class _FakeRuns: + def __init__(self) -> None: + self.created: list[dict[str, Any]] = [] + + async def create(self, thread_id: str, assistant_id: str, **kwargs: Any) -> dict[str, str]: + self.created.append({"thread_id": thread_id, "assistant_id": assistant_id, **kwargs}) + return {"run_id": "run-1"} + + +class _FakeClient: + def __init__(self) -> None: + self.runs = _FakeRuns() + + +@pytest.mark.asyncio +async def test_create_durable_run_applies_defaults(monkeypatch: pytest.MonkeyPatch) -> None: + client = _FakeClient() + monkeypatch.setattr(dispatch, "COMPLETION_WEBHOOK_URL", "https://app/webhooks/run-complete") + + run = await dispatch.create_durable_run( + "thread-1", + "agent", + input={"messages": [{"role": "user", "content": "hi"}]}, + source="test", + config={"configurable": {"thread_id": "thread-1"}, "metadata": {"kind": "test"}}, + client=client, + ) + + assert run == {"run_id": "run-1"} + created = client.runs.created[0] + assert created["durability"] == "sync" + assert created["multitask_strategy"] == "interrupt" + assert created["if_not_exists"] == "create" + assert created["webhook"] == "https://app/webhooks/run-complete" + assert created["config"]["metadata"] == {"kind": "test"} + assert created["config"]["configurable"]["thread_id"] == "thread-1" + assert isinstance(created["config"]["configurable"]["prepare_run_id"], str) + + +@pytest.mark.asyncio +async def test_create_durable_run_no_webhook_when_none(monkeypatch: pytest.MonkeyPatch) -> None: + client = _FakeClient() + monkeypatch.setattr(dispatch, "COMPLETION_WEBHOOK_URL", None) + + await dispatch.create_durable_run( + "thread-1", + "agent", + input={"messages": []}, + source="test", + client=client, + ) + + created = client.runs.created[0] + assert "webhook" not in created + + +@pytest.mark.asyncio +async def test_dispatch_agent_run_preserves_multitask_strategy(monkeypatch: pytest.MonkeyPatch) -> None: + client = _FakeClient() + monkeypatch.setattr(dispatch, "COMPLETION_WEBHOOK_URL", None) + + await dispatch.dispatch_agent_run( + "thread-1", + "hi", + {"key": "val"}, + source="test", + client=client, + multitask_strategy="reject", + ) + + created = client.runs.created[0] + assert created["multitask_strategy"] == "reject" From 2a5c69211d25c3c53c5b159e6fddc592db5421dc Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Thu, 9 Jul 2026 14:25:05 -0400 Subject: [PATCH 3/5] fix: restore login page render and clear CI lint/format The plan-review port removed the authRedirectUrl import from login.tsx but left its call site, crashing the login page at runtime (blank page, no 'Sign in to open-swe'). Pass the relative path straight to loginUrl, matching the plan route and the backend relative-redirect handling. Also drop an unused os import in the guard test and reformat workflow_push_guard.py to satisfy ruff. --- agent/middleware/workflow_push_guard.py | 7 +++---- tests/test_workflow_push_guard.py | 1 - ui/src/routes/login.tsx | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/agent/middleware/workflow_push_guard.py b/agent/middleware/workflow_push_guard.py index dfd9291f..5a1f3359 100644 --- a/agent/middleware/workflow_push_guard.py +++ b/agent/middleware/workflow_push_guard.py @@ -653,9 +653,7 @@ def _workflow_change_for_push(backend: Any, parsed: ParsedGitPush) -> WorkflowPu fixed_command = _git_command(root, " ".join(shlex.quote(arg) for arg in fixed_args)) # Fetch diff preview for the workflow approval card. - diff_range = ( - f"{shlex.quote(base_ref)}...{shlex.quote(head)}" if base_ref else shlex.quote(head) - ) + diff_range = f"{shlex.quote(base_ref)}...{shlex.quote(head)}" if base_ref else shlex.quote(head) diff = _run_git(backend, root, f"diff --binary --full-index {diff_range} -- .github/workflows") numstat = None diff_preview = "" @@ -669,7 +667,8 @@ def _workflow_change_for_push(backend: Any, parsed: ParsedGitPush) -> WorkflowPu diff_stats_val = _diff_stats(files, numstat.output) elif base_ref and not diff.ok: diff_only_head = _run_git( - backend, root, + backend, + root, f"diff --binary --full-index --root {shlex.quote(head)} -- .github/workflows", ) if diff_only_head.ok and diff_only_head.output: diff --git a/tests/test_workflow_push_guard.py b/tests/test_workflow_push_guard.py index 934c7aa9..8334a0fc 100644 --- a/tests/test_workflow_push_guard.py +++ b/tests/test_workflow_push_guard.py @@ -1,7 +1,6 @@ from __future__ import annotations import json -import os from typing import Any import pytest diff --git a/ui/src/routes/login.tsx b/ui/src/routes/login.tsx index cd5071aa..ade6620f 100644 --- a/ui/src/routes/login.tsx +++ b/ui/src/routes/login.tsx @@ -63,7 +63,7 @@ function Login() { Continue with GitHub From 184bb6802f708fe732fbedd556a13d360ee5dbe2 Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Thu, 9 Jul 2026 15:11:58 -0400 Subject: [PATCH 4/5] fix: restore RepairOrphaned middleware export and repoint model fake to deferred_model boundary --- agent/analyzer.py | 2 +- agent/middleware/__init__.py | 3 +++ agent/reviewer.py | 2 +- tests/e2e/patches.py | 7 +++++-- tests/test_agent_assembly_context.py | 2 +- tests/test_agent_subagent_models.py | 8 ++++++-- tests/test_corridor_mcp.py | 2 +- tests/test_dispatch.py | 4 +++- tests/test_proxy_auth.py | 4 ++-- tests/test_reviewer.py | 30 ++++++++++++++-------------- 10 files changed, 38 insertions(+), 26 deletions(-) diff --git a/agent/analyzer.py b/agent/analyzer.py index cffbe762..26d281e2 100644 --- a/agent/analyzer.py +++ b/agent/analyzer.py @@ -46,8 +46,8 @@ from .server import ( from .tools.read_finding_outcomes import read_finding_outcomes from .tools.save_review_style import save_review_style_prompt from .utils.analyzer_skills import SKILLS_ROUTE, skill_path_for_mode -from .utils.github_app import get_github_app_installation_token from .utils.deferred_model import make_model_or_defer +from .utils.github_app import get_github_app_installation_token from .utils.model import DEFAULT_LLM_REASONING, provider_model_kwargs from .utils.sandbox_paths import aresolve_sandbox_work_dir from .utils.sandbox_state import unwrap_sandbox_backend diff --git a/agent/middleware/__init__.py b/agent/middleware/__init__.py index fd40fc52..50a4b709 100644 --- a/agent/middleware/__init__.py +++ b/agent/middleware/__init__.py @@ -11,6 +11,7 @@ _MIDDLEWARE_MODULES = { "PlanModeMiddleware": ".plan_mode", "refresh_github_proxy_before_model": ".refresh_github_proxy", "SlackAssistantStatusMiddleware": ".refresh_slack_status", + "RepairOrphanedToolCallsMiddleware": ".repair_orphaned_tool_calls", "SandboxCircuitBreakerMiddleware": ".sandbox_circuit_breaker", "SanitizeThinkingBlocksMiddleware": ".sanitize_thinking_blocks", "SanitizeToolInputsMiddleware": ".sanitize_tool_inputs", @@ -37,6 +38,7 @@ __all__ = [ "WorkflowPushGuardMiddleware", "SandboxCircuitBreakerMiddleware", "SlackAssistantStatusMiddleware", + "RepairOrphanedToolCallsMiddleware", "check_message_queue_before_model", "ensure_no_empty_msg", "notify_step_limit_reached", @@ -55,6 +57,7 @@ if TYPE_CHECKING: from .plan_mode import PlanModeMiddleware from .refresh_github_proxy import refresh_github_proxy_before_model from .refresh_slack_status import SlackAssistantStatusMiddleware + from .repair_orphaned_tool_calls import RepairOrphanedToolCallsMiddleware from .sandbox_circuit_breaker import SandboxCircuitBreakerMiddleware from .sanitize_thinking_blocks import SanitizeThinkingBlocksMiddleware from .sanitize_tool_inputs import SanitizeToolInputsMiddleware diff --git a/agent/reviewer.py b/agent/reviewer.py index a413386b..ae94602d 100644 --- a/agent/reviewer.py +++ b/agent/reviewer.py @@ -83,9 +83,9 @@ from .tools import ( ) from .utils.agents_md import fetch_agents_md from .utils.api_standards_skill import fetch_api_standards_skill +from .utils.deferred_model import make_model_or_defer from .utils.github_app import get_github_app_installation_token_with_expiry from .utils.github_token import cache_github_token_for_thread -from .utils.deferred_model import make_model_or_defer from .utils.model import DEFAULT_LLM_REASONING, provider_model_kwargs from .utils.repo_prep import materialize_trusted_skills, prepare_review_repo from .utils.sandbox_paths import aresolve_sandbox_work_dir diff --git a/tests/e2e/patches.py b/tests/e2e/patches.py index a9fb0115..edfb16ee 100644 --- a/tests/e2e/patches.py +++ b/tests/e2e/patches.py @@ -29,7 +29,6 @@ def apply() -> None: import importlib - from agent import server from agent.utils import auth, authorship from agent.utils import slack as slack_utils @@ -52,7 +51,11 @@ def apply() -> None: def _fake_make_model(model_id: str, **kwargs: object): # noqa: ARG001 return FakeScriptedChatModel(script=build_script()) - server.make_model = _fake_make_model + # ``make_model_or_defer`` (used by server/reviewer/analyzer) resolves + # ``make_model`` via the module global at call time, so patch it there. + import agent.utils.deferred_model as deferred_model + + deferred_model.make_model = _fake_make_model async def _dummy_install_token_with_expiry() -> tuple[str, str | None]: return "dummy-installation-token", None diff --git a/tests/test_agent_assembly_context.py b/tests/test_agent_assembly_context.py index 43668bf5..b6e0f36c 100644 --- a/tests/test_agent_assembly_context.py +++ b/tests/test_agent_assembly_context.py @@ -65,7 +65,7 @@ async def _capture_create_deep_agent_kwargs() -> dict[str, object]: ), patch("agent.server.load_profile", new_callable=AsyncMock, return_value=None), patch("agent.server.fallback_model_id_for", return_value=None), - patch("agent.server.make_model", side_effect=[MagicMock(), MagicMock()]), + patch("agent.utils.deferred_model.make_model", side_effect=[MagicMock(), MagicMock()]), patch("agent.server.construct_system_prompt", return_value="prompt"), patch("agent.server.create_deep_agent", side_effect=fake_create_deep_agent), ): diff --git a/tests/test_agent_subagent_models.py b/tests/test_agent_subagent_models.py index 7d317f88..a3f5573c 100644 --- a/tests/test_agent_subagent_models.py +++ b/tests/test_agent_subagent_models.py @@ -66,7 +66,9 @@ async def test_agent_uses_profile_subagent_model_override() -> None: }, ), patch("agent.server.fallback_model_id_for", return_value=None), - patch("agent.server.make_model", side_effect=[main_model, subagent_model]) as make_model, + patch( + "agent.utils.deferred_model.make_model", side_effect=[main_model, subagent_model] + ) as make_model, patch("agent.server.construct_system_prompt", return_value="prompt"), patch("agent.server.create_deep_agent", side_effect=fake_create_deep_agent), ): @@ -142,7 +144,9 @@ async def test_agent_subagent_inherits_profile_model_override_without_explicit_p }, ), patch("agent.server.fallback_model_id_for", return_value=None), - patch("agent.server.make_model", side_effect=[main_model, subagent_model]) as make_model, + patch( + "agent.utils.deferred_model.make_model", side_effect=[main_model, subagent_model] + ) as make_model, patch("agent.server.construct_system_prompt", return_value="prompt"), patch("agent.server.create_deep_agent", side_effect=fake_create_deep_agent), ): diff --git a/tests/test_corridor_mcp.py b/tests/test_corridor_mcp.py index bc248e9e..57cdfad3 100644 --- a/tests/test_corridor_mcp.py +++ b/tests/test_corridor_mcp.py @@ -154,7 +154,7 @@ async def test_get_agent_passes_corridor_prompt_state() -> None: return_value=(("openai:gpt-5.5", "medium"), ("openai:gpt-5.5", "low")), ), patch.object(server, "fallback_model_id_for", return_value=None), - patch.object(server, "make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch.object( server, "_load_observability_tools", new_callable=AsyncMock, return_value=[] ), diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 5ba69522..cdf0e65f 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -105,7 +105,9 @@ async def test_create_durable_run_no_webhook_when_none(monkeypatch: pytest.Monke @pytest.mark.asyncio -async def test_dispatch_agent_run_preserves_multitask_strategy(monkeypatch: pytest.MonkeyPatch) -> None: +async def test_dispatch_agent_run_preserves_multitask_strategy( + monkeypatch: pytest.MonkeyPatch, +) -> None: client = _FakeClient() monkeypatch.setattr(dispatch, "COMPLETION_WEBHOOK_URL", None) diff --git a/tests/test_proxy_auth.py b/tests/test_proxy_auth.py index 15ff5766..69ced5e6 100644 --- a/tests/test_proxy_auth.py +++ b/tests/test_proxy_auth.py @@ -333,7 +333,7 @@ class TestRefreshProxyOnSandboxReuse: new_callable=AsyncMock, return_value=mock_sandbox, ), - patch("agent.server.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.server.construct_system_prompt", return_value="prompt"), patch("agent.server.create_deep_agent", return_value=_DummyAgent()), patch.dict( @@ -386,7 +386,7 @@ class TestRefreshProxyOnSandboxReuse: new_callable=AsyncMock, return_value="/workspace", ), - patch("agent.server.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.server.construct_system_prompt", return_value="prompt"), patch("agent.server.create_deep_agent", return_value=_DummyAgent()), patch.dict("agent.server.SANDBOX_BACKENDS", {}, clear=True), diff --git a/tests/test_reviewer.py b/tests/test_reviewer.py index b332502f..7f4c9264 100644 --- a/tests/test_reviewer.py +++ b/tests/test_reviewer.py @@ -204,7 +204,7 @@ async def test_reviewer_resolves_app_installation_token_at_run_start() -> None: new_callable=AsyncMock, return_value="/workspace", ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", return_value=dummy_agent) as create_agent, ): await reviewer.get_reviewer_agent(config) @@ -260,7 +260,7 @@ async def test_reviewer_reuses_app_token_for_sandbox_proxy() -> None: new_callable=AsyncMock, ), patch("agent.reviewer.fetch_agents_md", new_callable=AsyncMock, return_value=None), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", return_value=_DummyAgent()), ): await reviewer.get_reviewer_agent(config) @@ -335,7 +335,7 @@ async def test_reviewer_applies_eval_model_and_effort_overrides() -> None: new_callable=AsyncMock, return_value="/workspace", ), - patch("agent.reviewer.make_model", return_value=MagicMock()) as make_model, + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()) as make_model, patch("agent.reviewer.create_deep_agent", return_value=dummy_agent), patch( "agent.reviewer.fetch_agents_md", @@ -383,7 +383,7 @@ async def test_reviewer_subagent_inherits_eval_model_without_explicit_override() new_callable=AsyncMock, return_value="/workspace", ), - patch("agent.reviewer.make_model", return_value=MagicMock()) as make_model, + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()) as make_model, patch("agent.reviewer.create_deep_agent", return_value=dummy_agent), patch( "agent.reviewer.fetch_agents_md", @@ -441,7 +441,7 @@ async def test_reviewer_injects_repo_style_during_eval() -> None: new_callable=AsyncMock, return_value="Flag table rerender regressions.", ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), patch( "agent.reviewer.fetch_agents_md", @@ -507,7 +507,7 @@ async def test_reviewer_inlines_org_guidelines_into_system_prompt() -> None: new_callable=AsyncMock, return_value=None, ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -572,7 +572,7 @@ async def test_reviewer_inlines_agents_md_into_system_prompt() -> None: new_callable=AsyncMock, return_value="Always use the design system IconButton.", ) as mock_fetch_agents_md, - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -624,7 +624,7 @@ async def test_reviewer_inlines_claude_md_when_agents_md_absent() -> None: new_callable=AsyncMock, return_value="# CLAUDE.md\nUse semantic tokens only.", ) as mock_fetch_agents_md, - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -989,7 +989,7 @@ async def test_reviewer_injects_pr_review_threads_into_first_review_context() -> new_callable=AsyncMock, return_value=fake_threads, ) as mock_fetch_threads, - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1065,7 +1065,7 @@ async def test_reviewer_injects_pr_review_threads_into_re_review_context() -> No new_callable=AsyncMock, return_value=[], ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1123,7 +1123,7 @@ async def test_reviewer_omits_threads_block_when_fetch_returns_empty() -> None: new_callable=AsyncMock, return_value=[], ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1182,7 +1182,7 @@ async def test_reviewer_continues_when_thread_fetch_raises() -> None: new_callable=AsyncMock, side_effect=RuntimeError("network down"), ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1254,7 +1254,7 @@ async def test_reviewer_populates_diff_line_set_from_github_api() -> None: new_callable=AsyncMock, return_value=pr_diff, ) as mock_fetch_diff, - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1319,7 +1319,7 @@ async def test_reviewer_leaves_validation_disabled_when_diff_fetch_fails() -> No new_callable=AsyncMock, return_value=None, ), - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) @@ -1385,7 +1385,7 @@ async def test_reviewer_injects_pr_title_and_body_into_context() -> None: new_callable=AsyncMock, return_value=("Add retry logic for uploads", "Retries flaky uploads up to 3 times."), ) as mock_fetch_metadata, - patch("agent.reviewer.make_model", return_value=MagicMock()), + patch("agent.utils.deferred_model.make_model", return_value=MagicMock()), patch("agent.reviewer.create_deep_agent", side_effect=fake_create_deep_agent), ): await reviewer.get_reviewer_agent(config) From 65cf9035833c83c51ad14831bdb3f8315dd7fc07 Mon Sep 17 00:00:00 2001 From: amoussa1229 <166072409+amoussa1229@users.noreply.github.com> Date: Thu, 9 Jul 2026 19:16:06 +0000 Subject: [PATCH 5/5] fix: restore RepairOrphanedToolCallsMiddleware, fix E2E model-fake patch, drop dead ttl_cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Re-add RepairOrphanedToolCallsMiddleware to the lazy middleware __init__ (_MIDDLEWARE_MODULES, __all__, TYPE_CHECKING) so agent.reviewer can import it. - Reroute E2E model patching to deferred_model.make_model so make_model_or_defer (used by all three graph factories) returns the scripted fake instead of building a real model with fake credentials. - Drop unused agent/utils/ttl_cache.py — no agent module imports it. - Fix import ordering in agent/reviewer.py and agent/analyzer.py (ruff I001). - Format tests/test_dispatch.py. --- agent/middleware/__init__.py | 4 +- agent/utils/ttl_cache.py | 121 ----------------------------------- 2 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 agent/utils/ttl_cache.py diff --git a/agent/middleware/__init__.py b/agent/middleware/__init__.py index 50a4b709..7bf620b5 100644 --- a/agent/middleware/__init__.py +++ b/agent/middleware/__init__.py @@ -10,8 +10,8 @@ _MIDDLEWARE_MODULES = { "notify_step_limit_reached": ".notify_step_limit", "PlanModeMiddleware": ".plan_mode", "refresh_github_proxy_before_model": ".refresh_github_proxy", - "SlackAssistantStatusMiddleware": ".refresh_slack_status", "RepairOrphanedToolCallsMiddleware": ".repair_orphaned_tool_calls", + "SlackAssistantStatusMiddleware": ".refresh_slack_status", "SandboxCircuitBreakerMiddleware": ".sandbox_circuit_breaker", "SanitizeThinkingBlocksMiddleware": ".sanitize_thinking_blocks", "SanitizeToolInputsMiddleware": ".sanitize_tool_inputs", @@ -29,6 +29,7 @@ __all__ = [ "ExcludeToolsMiddleware", "ModelFallbackMiddleware", "PlanModeMiddleware", + "RepairOrphanedToolCallsMiddleware", "SanitizeThinkingBlocksMiddleware", "SanitizeToolInputsMiddleware", "SubdirAgentsReadMiddleware", @@ -38,7 +39,6 @@ __all__ = [ "WorkflowPushGuardMiddleware", "SandboxCircuitBreakerMiddleware", "SlackAssistantStatusMiddleware", - "RepairOrphanedToolCallsMiddleware", "check_message_queue_before_model", "ensure_no_empty_msg", "notify_step_limit_reached", diff --git a/agent/utils/ttl_cache.py b/agent/utils/ttl_cache.py deleted file mode 100644 index b69c2b53..00000000 --- a/agent/utils/ttl_cache.py +++ /dev/null @@ -1,121 +0,0 @@ -from __future__ import annotations - -import asyncio -import logging -from collections.abc import Awaitable, Callable -from typing import TypeVar, cast - -logger = logging.getLogger(__name__) - -T = TypeVar("T") - -_CACHE: dict[str, tuple[object, float]] = {} -_LOCKS: dict[tuple[str, int], asyncio.Lock] = {} -_REFRESH_TASKS: dict[tuple[str, int], asyncio.Task[None]] = {} - - -def _now() -> float: - return asyncio.get_running_loop().time() - - -def _lock_for(key: str) -> asyncio.Lock: - loop = asyncio.get_running_loop() - lock_key = (key, id(loop)) - lock = _LOCKS.get(lock_key) - if lock is None: - lock = asyncio.Lock() - _LOCKS[lock_key] = lock - return lock - - -async def cached(key: str, ttl_seconds: float, loader: Callable[[], Awaitable[T]]) -> T: - now = _now() - entry = _CACHE.get(key) - if entry is not None: - value, expires_at = entry - if expires_at > now: - return cast(T, value) - - async with _lock_for(key): - now = _now() - entry = _CACHE.get(key) - if entry is not None: - value, expires_at = entry - if expires_at > now: - return cast(T, value) - - stale = entry[0] if entry is not None else None - has_stale = entry is not None - try: - value = await loader() - except Exception: - if has_stale: - logger.warning( - "TTL cache loader failed for %s; serving stale value", key, exc_info=True - ) - return cast(T, stale) - raise - _CACHE[key] = (value, now + ttl_seconds) - return value - - -async def _refresh_stale_entry( - key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]] -) -> None: - async with _lock_for(key): - try: - value = await loader() - except Exception: - logger.warning("TTL cache background refresh failed for %s", key, exc_info=True) - return - _CACHE[key] = (value, _now() + ttl_seconds) - - -def _schedule_refresh( - key: str, ttl_seconds: float, loader: Callable[[], Awaitable[object]] -) -> None: - loop = asyncio.get_running_loop() - task_key = (key, id(loop)) - existing = _REFRESH_TASKS.get(task_key) - if existing is not None and not existing.done(): - return - - task = asyncio.create_task(_refresh_stale_entry(key, ttl_seconds, loader)) - _REFRESH_TASKS[task_key] = task - task.add_done_callback(lambda _task: _REFRESH_TASKS.pop(task_key, None)) - - -async def cached_stale_while_revalidate( - key: str, - ttl_seconds: float, - loader: Callable[[], Awaitable[T]], -) -> T: - now = _now() - entry = _CACHE.get(key) - if entry is not None: - value, expires_at = entry - if expires_at > now: - return cast(T, value) - _schedule_refresh(key, ttl_seconds, loader) - return cast(T, value) - return await cached(key, ttl_seconds, loader) - - -def set_cached(key: str, value: object, ttl_seconds: float) -> None: - try: - expires_at = _now() + ttl_seconds - except RuntimeError: - expires_at = float("inf") - _CACHE[key] = (value, expires_at) - - -def invalidate(key: str) -> None: - _CACHE.pop(key, None) - - -def clear() -> None: - _CACHE.clear() - _LOCKS.clear() - for task in _REFRESH_TASKS.values(): - task.cancel() - _REFRESH_TASKS.clear()