Merge branch 'main' into grok-4-usecase-Image-inputs

Author: priyansh4320

.github/workflows/claude-code-review.yml

@@ -7,12 +7,6 @@ on:
       - opened
       - synchronize
       - ready_for_review
-    # Optional: Only run on specific file changes
-    # paths:
-    #   - "src/**/*.ts"
-    #   - "src/**/*.tsx"
-    #   - "src/**/*.js"
-    #   - "src/**/*.jsx"
   # For PRs from forked repositories (secure path with secrets)
   pull_request_target:
     types:
@@ -21,14 +15,12 @@ on:
       - ready_for_review
 
 jobs:
-  claude-review:
-    # Skip draft PRs and prevent duplicate runs
+  # Job for same-repo PRs (can use OIDC if needed)
+  claude-review-same-repo:
     if: |
-      github.event.pull_request.draft == false &&
-      (
-        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
-        (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository)
-      )
+      github.event_name == 'pull_request' &&
+      github.event.pull_request.head.repo.full_name == github.repository &&
+      github.event.pull_request.draft == false
 
     runs-on: ubuntu-latest
     permissions:
@@ -47,12 +39,65 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          if [ "${{ github.event_name }}" = "pull_request_target" ]; then
-            echo "⚠️  Forked PR detected - running in secure mode"
-            echo "PR from: ${{ github.event.pull_request.head.repo.full_name }}"
-            echo "Base repo: ${{ github.repository }}"
-          fi
+          echo "Checking out PR #${{ github.event.pull_request.number }}"
+          gh pr checkout ${{ github.event.pull_request.number }}
+          echo "✅ PR branch checked out successfully"
+
+      - name: Run Claude Code Review
+        id: claude-review
+        uses: anthropics/claude-code-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          prompt: |
+            REPO: ${{ github.repository }}
+            PR NUMBER: ${{ github.event.pull_request.number }}
+
+            Please review this pull request and provide feedback on:
+            - Code quality and best practices
+            - Potential bugs or issues
+            - Performance considerations
+            - Security concerns
+            - Test coverage
+
+            # Steps to run a Review:
+              1) Check if previous review is already done by Claude. If so, perform a re-reivew with the latest changes referring previous review.
+              2) If no previous review is found, perform a new review with the latest changes.
+
+            Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
+
+            Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
 
+          claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
+
+  # Job for forked PRs (no OIDC, token-based only)
+  claude-review-forked:
+    if: |
+      github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository &&
+      github.event.pull_request.draft == false
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: read
+      # Explicitly disable id-token to avoid OIDC flow
+
+    steps:
+      - name: Checkout repository (no credentials persisted)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Checkout PR branch (forked PR)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "⚠️  Forked PR detected - running in secure mode"
+          echo "PR from: ${{ github.event.pull_request.head.repo.full_name }}"
+          echo "Base repo: ${{ github.repository }}"
           echo "Checking out PR #${{ github.event.pull_request.number }}"
           gh pr checkout ${{ github.event.pull_request.number }}
           echo "✅ PR branch checked out successfully"
@@ -61,6 +106,7 @@ jobs:
         id: claude-review
         uses: anthropics/claude-code-action@v1
         with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           prompt: |
             REPO: ${{ github.repository }}
@@ -73,10 +119,12 @@ jobs:
             - Security concerns
             - Test coverage
 
+            # Steps to run a Review:
+              1) Check if previous review is already done by Claude. If so, perform a re-reivew with the latest changes referring previous review.
+              2) If no previous review is found, perform a new review with the latest changes.
+
             Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
 
             Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
 
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://docs.claude.com/en/docs/claude-code/cli-reference for available options
           claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'

autogen/agentchat/group/safeguards/events.py

@@ -5,13 +5,34 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any
+from typing import Any, Literal
 from uuid import UUID
 
 from termcolor import colored
 
 from ....events.base_event import BaseEvent, wrap_event
 
+# Type for termcolor colors
+TermColor = Literal[
+    "black",
+    "grey",
+    "red",
+    "green",
+    "yellow",
+    "blue",
+    "magenta",
+    "cyan",
+    "light_grey",
+    "dark_grey",
+    "light_red",
+    "light_green",
+    "light_yellow",
+    "light_blue",
+    "light_magenta",
+    "light_cyan",
+    "white",
+]
+
 
 @wrap_event
 class SafeguardEvent(BaseEvent):
@@ -52,7 +73,7 @@ def print(self, f: Callable[..., Any] | None = None) -> None:
         f = f or print
 
         # Choose color based on event type
-        color = "green"
+        color: TermColor = "green"
         if self.event_type == "load":
             color = "green"
         elif self.event_type == "check":

autogen/interop/pydantic_ai/pydantic_ai.py

@@ -63,7 +63,7 @@ def inject_params(
 
         @wraps(f)
         def wrapper(*args: Any, **kwargs: Any) -> Any:
-            current_retry = 0 if ctx_typed is None else ctx_typed.retries.get(tool_typed.name, 0)
+            current_retry = 0 if ctx_typed is None else ctx_typed.retries.get(tool_typed.name, 0)  # type: ignore[attr-defined]
 
             if current_retry >= max_retries:
                 raise ValueError(f"{tool_typed.name} failed after {max_retries} retries")
@@ -73,12 +73,12 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
                     kwargs.pop("ctx", None)
                     ctx_typed.retry = current_retry
                     result = f(**kwargs, ctx=ctx_typed)  # type: ignore[call-arg]
-                    ctx_typed.retries[tool_typed.name] = 0
+                    ctx_typed.retries[tool_typed.name] = 0  # type: ignore[attr-defined]
                 else:
                     result = f(**kwargs)  # type: ignore[call-arg]
             except Exception as e:
                 if ctx_typed is not None:
-                    ctx_typed.retries[tool_typed.name] = ctx_typed.retries.get(tool_typed.name, 0) + 1
+                    ctx_typed.retries[tool_typed.name] = ctx_typed.retries.get(tool_typed.name, 0) + 1  # type: ignore[attr-defined]
                 raise e
 
             return result
@@ -145,6 +145,10 @@ def convert_tool(cls, tool: Any, deps: Any = None, **kwargs: Any) -> Tool:
             else None
         )
 
+        # Initialize retries dict for tracking retry counts per tool
+        if ctx is not None:
+            ctx.retries = {}  # type: ignore[attr-defined]
+
         func = PydanticAIInteroperability.inject_params(
             ctx=ctx,
             tool=pydantic_ai_tool,
@@ -154,7 +158,7 @@ def convert_tool(cls, tool: Any, deps: Any = None, **kwargs: Any) -> Tool:
             name=pydantic_ai_tool.name,
             description=pydantic_ai_tool.description,
             func_or_tool=func,
-            parameters_json_schema=pydantic_ai_tool.function_schema.json_schema,
+            parameters_json_schema=pydantic_ai_tool.function_schema.json_schema,  # type: ignore[attr-defined]
         )
 
     @classmethod

autogen/llm_config/client.py

@@ -32,7 +32,7 @@ class ModelClient(Protocol):
     class ModelClientResponseProtocol(Protocol):
         class Choice(Protocol):
             class Message(Protocol):
-                content: str | dict[str, Any] | list[dict[str, Any]]
+                content: str | dict[str, Any] | list[dict[str, Any]] | None
 
             message: Message
 

autogen/oai/anthropic.py

@@ -150,6 +150,8 @@ def create_client(self):
 
 @require_optional_import("anthropic", "anthropic")
 class AnthropicClient:
+    RESPONSE_USAGE_KEYS: list[str] = ["prompt_tokens", "completion_tokens", "total_tokens", "cost", "model"]
+
     def __init__(self, **kwargs: Unpack[AnthropicEntryDict]):
         """Initialize the Anthropic API client.
 

autogen/oai/bedrock.py

@@ -97,6 +97,8 @@ def create_client(self):
 class BedrockClient:
     """Client for Amazon's Bedrock Converse API."""
 
+    RESPONSE_USAGE_KEYS: list[str] = ["prompt_tokens", "completion_tokens", "total_tokens", "cost", "model"]
+
     _retries = 5
 
     def __init__(self, **kwargs: Unpack[BedrockEntryDict]):

autogen/oai/cerebras.py

@@ -75,6 +75,8 @@ def create_client(self):
 class CerebrasClient:
     """Client for Cerebras's API."""
 
+    RESPONSE_USAGE_KEYS: list[str] = ["prompt_tokens", "completion_tokens", "total_tokens", "cost", "model"]
+
     def __init__(self, api_key=None, **kwargs: Unpack[CerebrasEntryDict]):
         """Requires api_key or environment variable to be set