fix: address PR #46101 review comments

- Fix duplicate kwargs bug: remove explicit skill_directories/tools from
  create_session() calls — already present in sdk_config via _session_config
- Bump version to 1.0.0b2 to match CHANGELOG
- Remove .foundry-agent.json (contained real session/conversation IDs)
- Close AsyncDefaultCredential in _load_conversation_history to prevent
  async transport/socket leak
- Restore attachment handling: _extract_input_with_attachments() extracts
  input_file and input_image items from RAPI requests and appends to prompt
- Observe cancellation_signal in event loop to stop early on client disconnect
- Drop [tracing] extra from test Dockerfile to match pyproject.toml deps

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jodeklotzms

sdk/agentserver/azure-ai-agentserver-githubcopilot/.foundry-agent.json

@@ -41,6 +41,57 @@
 
 logger = logging.getLogger("azure.ai.agentserver.githubcopilot")
 
+
+def _extract_input_with_attachments(request) -> str:
+    """Extract text from a RAPI request, including any file/image attachments.
+
+    ``get_input_text`` only returns the text portion of the request input.
+    This helper also checks for ``input_file`` and ``input_image`` items and
+    appends their content to the prompt so the Copilot SDK (which only accepts
+    a string prompt) can still reason about attachments.
+    """
+    text = get_input_text(request)
+
+    # Check for attachment items in the request input
+    input_items = getattr(request, "input", None)
+    if not isinstance(input_items, list):
+        return text
+
+    attachment_parts = []
+    for item in input_items:
+        item_type = None
+        if isinstance(item, dict):
+            item_type = item.get("type")
+        else:
+            item_type = getattr(item, "type", None)
+
+        if item_type == "input_file":
+            filename = (item.get("filename") if isinstance(item, dict) else getattr(item, "filename", None)) or "file"
+            file_data = (item.get("file_data") if isinstance(item, dict) else getattr(item, "file_data", None)) or ""
+            if file_data:
+                # base64 content — decode if possible, otherwise include raw
+                import base64
+                try:
+                    decoded = base64.b64decode(file_data).decode("utf-8", errors="replace")
+                    attachment_parts.append(f"\n[Attached file: {filename}]\n{decoded}")
+                except Exception:
+                    attachment_parts.append(f"\n[Attached file: {filename} (binary, {len(file_data)} chars base64)]")
+
+        elif item_type == "input_image":
+            image_url = (item.get("image_url") if isinstance(item, dict) else getattr(item, "image_url", None)) or ""
+            if isinstance(image_url, dict):
+                image_url = image_url.get("url", "")
+            elif hasattr(image_url, "url"):
+                image_url = image_url.url
+            if image_url:
+                attachment_parts.append(f"\n[Attached image: {image_url[:200]}]")
+
+    if attachment_parts:
+        logger.info("Extracted %d attachment(s) from request input", len(attachment_parts))
+        return text + "".join(attachment_parts)
+
+    return text
+
 _COGNITIVE_SERVICES_SCOPE = "https://cognitiveservices.azure.com/.default"
 
 
@@ -262,15 +313,16 @@ async def _get_or_create_session(self, conversation_id=None):
         client = await self._ensure_client()
         config = self._refresh_token_if_needed()
 
-        # Filter out internal flags (starting with _) before passing to SDK
+        # Filter out internal flags (starting with _) before passing to SDK.
+        # skill_directories and tools are already in _session_config when
+        # GitHubCopilotAdapter discovers them, so they flow through here
+        # automatically — no need to pass them as separate kwargs.
         sdk_config = {k: v for k, v in config.items() if not k.startswith("_")}
 
         session = await client.create_session(
             **sdk_config,
             on_permission_request=self._make_permission_handler(),
             streaming=True,
-            skill_directories=self._session_config.get("skill_directories"),
-            tools=self._session_config.get("tools"),
         )
 
         if conversation_id:
@@ -309,7 +361,7 @@ async def handle_create(request, context, cancellation_signal):
 
     async def _handle_create(self, request, context, cancellation_signal):
         """Handle POST /responses — bridge Copilot SDK events to RAPI stream."""
-        input_text = get_input_text(request)
+        input_text = _extract_input_with_attachments(request)
         conversation_id = getattr(context, "conversation_id", None)
         response_id = getattr(context, "response_id", None) or "unknown"
 
@@ -353,6 +405,11 @@ def on_event(event):
             usage = None
 
             while True:
+                # Check if the client disconnected
+                if cancellation_signal is not None and cancellation_signal.is_set():
+                    logger.info("Client disconnected — ending response early")
+                    break
+
                 try:
                     event = await asyncio.wait_for(queue.get(), timeout=idle_timeout)
                 except asyncio.TimeoutError:
@@ -610,44 +667,47 @@ async def _load_conversation_history(self, conversation_id: str) -> Optional[str
             from openai import AsyncOpenAI
 
             cred = AsyncDefaultCredential()
-            token_provider = get_bearer_token_provider(cred, "https://ai.azure.com/.default")
-            token = await token_provider()
-            openai_client = AsyncOpenAI(
-                base_url=f"{project_endpoint}/openai",
-                api_key=token,
-                default_query={"api-version": "2025-11-15-preview"},
-            )
-
-            items = []
-            async for item in openai_client.conversations.items.list(conversation_id):
-                items.append(item)
-            items.reverse()  # API returns reverse chronological
-
-            if not items:
-                return None
-
-            lines = []
-            for item in items:
-                role = getattr(item, "role", None)
-                content = getattr(item, "content", None)
-                if isinstance(content, str):
-                    text = content
-                elif isinstance(content, list):
-                    text_parts = []
-                    for part in content:
-                        if isinstance(part, dict):
-                            text_parts.append(part.get("text", ""))
-                        elif hasattr(part, "text"):
-                            text_parts.append(part.text)
-                    text = " ".join(p for p in text_parts if p)
-                else:
-                    continue
-                if not text:
-                    continue
-                label = "User" if role == "user" else "Assistant"
-                lines.append(f"{label}: {text}")
+            try:
+                token_provider = get_bearer_token_provider(cred, "https://ai.azure.com/.default")
+                token = await token_provider()
+                openai_client = AsyncOpenAI(
+                    base_url=f"{project_endpoint}/openai",
+                    api_key=token,
+                    default_query={"api-version": "2025-11-15-preview"},
+                )
 
-            return "\n".join(lines) if lines else None
+                items = []
+                async for item in openai_client.conversations.items.list(conversation_id):
+                    items.append(item)
+                items.reverse()  # API returns reverse chronological
+
+                if not items:
+                    return None
+
+                lines = []
+                for item in items:
+                    role = getattr(item, "role", None)
+                    content = getattr(item, "content", None)
+                    if isinstance(content, str):
+                        text = content
+                    elif isinstance(content, list):
+                        text_parts = []
+                        for part in content:
+                            if isinstance(part, dict):
+                                text_parts.append(part.get("text", ""))
+                            elif hasattr(part, "text"):
+                                text_parts.append(part.text)
+                        text = " ".join(p for p in text_parts if p)
+                    else:
+                        continue
+                    if not text:
+                        continue
+                    label = "User" if role == "user" else "Assistant"
+                    lines.append(f"{label}: {text}")
+
+                return "\n".join(lines) if lines else None
+            finally:
+                await cred.close()
         except Exception:
             logger.warning("Failed to load conversation history for %s", conversation_id, exc_info=True)
             return None
@@ -665,8 +725,6 @@ async def _get_or_create_session(self, conversation_id=None):
                     **sdk_config,
                     on_permission_request=self._make_permission_handler(),
                     streaming=True,
-                    skill_directories=self._session_config.get("skill_directories"),
-                    tools=self._session_config.get("tools"),
                 )
                 preamble = (
                     "The following is the prior conversation history. "

sdk/agentserver/azure-ai-agentserver-githubcopilot/azure/ai/agentserver/githubcopilot/_copilot_adapter.py

@@ -3,4 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # ---------------------------------------------------------
 
-VERSION = "1.0.0b1"
+VERSION = "1.0.0b2"

sdk/agentserver/azure-ai-agentserver-githubcopilot/azure/ai/agentserver/githubcopilot/_version.py

@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 # to avoid the feed interfering with github-copilot-sdk from PyPI).
 RUN pip install --no-cache-dir --no-input --pre \
     --extra-index-url https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/ \
-    "azure-ai-agentserver-core[tracing]>=2.0.0a1" \
+    "azure-ai-agentserver-core>=2.0.0a1" \
     "azure-ai-agentserver-responses>=1.0.0a1"
 
 # Copy the package source for local install (not on PyPI yet)