agent-framework-lib 0.6.3.post2__tar.gz → 0.6.3.post4__tar.gz

{agent_framework_lib-0.6.3.post2/agent_framework_lib.egg-info → agent_framework_lib-0.6.3.post4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-framework-lib
-Version: 0.6.3.post2
+Version: 0.6.3.post4
 Summary: A comprehensive Python framework for building and serving conversational AI agents with FastAPI
 Author-email: Sebastian Pavel <sebastian@cinco.ai>, Elliott Girard <elliott.girard@icloud.com>
 Maintainer-email: Sebastian Pavel <sebastian@cinco.ai>
@@ -373,13 +373,13 @@ ANTHROPIC_API_KEY=sk-ant-your-anthropic-key
 GEMINI_API_KEY=your-gemini-key
 
 # Model Configuration
-DEFAULT_MODEL=gpt-5-mini
+DEFAULT_MODEL=gpt-5.4-mini
 
 # Multi-Model Routing (Auto Mode)
 DEFAULT_MODEL_MODE=auto                    # "auto" or specific model name
-AUTO_CLASSIFIER_MODEL=gpt-5-nano           # Model for complexity classification
-PREFERRED_LIGHT_MODELS=gpt-5-nano,claude-haiku-4-5-20251001
-PREFERRED_STANDARD_MODELS=gpt-5-mini
+AUTO_CLASSIFIER_MODEL=gpt-5.4-nano           # Model for complexity classification
+PREFERRED_LIGHT_MODELS=gpt-5.4-nano,claude-haiku-4-5-20251001
+PREFERRED_STANDARD_MODELS=gpt-5.4-mini
 PREFERRED_ADVANCED_MODELS=gpt-5.2,claude-opus-4-6
 
 # Session Storage (optional)
@@ -446,8 +446,8 @@ When `DEFAULT_MODEL_MODE=auto`, the system analyzes each query and routes it to
 
 | Tier | Icon | Use Case | Example Models |
 |------|------|----------|----------------|
-| **Light** | 💨 | Simple queries, greetings, basic info | gpt-5-nano, claude-haiku-4-5 |
-| **Standard** | ⚖️ | Typical questions, explanations | gpt-5-mini, claude-sonnet-4-6 |
+| **Light** | 💨 | Simple queries, greetings, basic info | gpt-5.4-nano, claude-haiku-4-5 |
+| **Standard** | ⚖️ | Typical questions, explanations | gpt-5.4-mini, claude-sonnet-4-6 |
 | **Advanced** | 🧠 | Complex analysis, creative tasks | gpt-5.2, claude-opus-4-6 |
 
 **Benefits:**
@@ -469,11 +469,11 @@ Users can also select a specific model from the UI dropdown:
 DEFAULT_MODEL_MODE=auto
 
 # Model used for complexity classification (should be fast and cheap)
-AUTO_CLASSIFIER_MODEL=gpt-5-nano
+AUTO_CLASSIFIER_MODEL=gpt-5.4-nano
 
 # Preferred models per tier (comma-separated, in order of preference)
-PREFERRED_LIGHT_MODELS=gpt-5-nano,claude-haiku-4-5-20251001,gemini-2.5-flash-lite
-PREFERRED_STANDARD_MODELS=gpt-5-mini,gemini-2.5-flash
+PREFERRED_LIGHT_MODELS=gpt-5.4-nano,claude-haiku-4-5-20251001,gemini-2.5-flash-lite
+PREFERRED_STANDARD_MODELS=gpt-5.4-mini,gemini-2.5-flash
 PREFERRED_ADVANCED_MODELS=gpt-5.2,claude-opus-4-6,gemini-2.5-pro
 ```
 
@@ -486,12 +486,12 @@ curl http://localhost:8000/api/models
 # Response
 {
   "models_by_tier": {
-    "light": [{"id": "gpt-5-nano", "provider": "openai", "available": true}, ...],
+    "light": [{"id": "gpt-5.4-nano", "provider": "openai", "available": true}, ...],
     "standard": [...],
     "advanced": [...]
   },
   "default_mode": "auto",
-  "classifier_model": "gpt-5-nano"
+  "classifier_model": "gpt-5.4-nano"
 }
 ```
 
@@ -520,7 +520,7 @@ class MyAgent(LlamaIndexAgent):
         )
         # Default model config (can be overridden per session)
         self.default_temperature = 0.7
-        self.default_model = "gpt-5-mini"
+        self.default_model = "gpt-5.4-mini"
 ```
 
 **Runtime Configuration:**

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/README.md

@@ -227,13 +227,13 @@ ANTHROPIC_API_KEY=sk-ant-your-anthropic-key
 GEMINI_API_KEY=your-gemini-key
 
 # Model Configuration
-DEFAULT_MODEL=gpt-5-mini
+DEFAULT_MODEL=gpt-5.4-mini
 
 # Multi-Model Routing (Auto Mode)
 DEFAULT_MODEL_MODE=auto                    # "auto" or specific model name
-AUTO_CLASSIFIER_MODEL=gpt-5-nano           # Model for complexity classification
-PREFERRED_LIGHT_MODELS=gpt-5-nano,claude-haiku-4-5-20251001
-PREFERRED_STANDARD_MODELS=gpt-5-mini
+AUTO_CLASSIFIER_MODEL=gpt-5.4-nano           # Model for complexity classification
+PREFERRED_LIGHT_MODELS=gpt-5.4-nano,claude-haiku-4-5-20251001
+PREFERRED_STANDARD_MODELS=gpt-5.4-mini
 PREFERRED_ADVANCED_MODELS=gpt-5.2,claude-opus-4-6
 
 # Session Storage (optional)
@@ -300,8 +300,8 @@ When `DEFAULT_MODEL_MODE=auto`, the system analyzes each query and routes it to
 
 | Tier | Icon | Use Case | Example Models |
 |------|------|----------|----------------|
-| **Light** | 💨 | Simple queries, greetings, basic info | gpt-5-nano, claude-haiku-4-5 |
-| **Standard** | ⚖️ | Typical questions, explanations | gpt-5-mini, claude-sonnet-4-6 |
+| **Light** | 💨 | Simple queries, greetings, basic info | gpt-5.4-nano, claude-haiku-4-5 |
+| **Standard** | ⚖️ | Typical questions, explanations | gpt-5.4-mini, claude-sonnet-4-6 |
 | **Advanced** | 🧠 | Complex analysis, creative tasks | gpt-5.2, claude-opus-4-6 |
 
 **Benefits:**
@@ -323,11 +323,11 @@ Users can also select a specific model from the UI dropdown:
 DEFAULT_MODEL_MODE=auto
 
 # Model used for complexity classification (should be fast and cheap)
-AUTO_CLASSIFIER_MODEL=gpt-5-nano
+AUTO_CLASSIFIER_MODEL=gpt-5.4-nano
 
 # Preferred models per tier (comma-separated, in order of preference)
-PREFERRED_LIGHT_MODELS=gpt-5-nano,claude-haiku-4-5-20251001,gemini-2.5-flash-lite
-PREFERRED_STANDARD_MODELS=gpt-5-mini,gemini-2.5-flash
+PREFERRED_LIGHT_MODELS=gpt-5.4-nano,claude-haiku-4-5-20251001,gemini-2.5-flash-lite
+PREFERRED_STANDARD_MODELS=gpt-5.4-mini,gemini-2.5-flash
 PREFERRED_ADVANCED_MODELS=gpt-5.2,claude-opus-4-6,gemini-2.5-pro
 ```
 
@@ -340,12 +340,12 @@ curl http://localhost:8000/api/models
 # Response
 {
   "models_by_tier": {
-    "light": [{"id": "gpt-5-nano", "provider": "openai", "available": true}, ...],
+    "light": [{"id": "gpt-5.4-nano", "provider": "openai", "available": true}, ...],
     "standard": [...],
     "advanced": [...]
   },
   "default_mode": "auto",
-  "classifier_model": "gpt-5-nano"
+  "classifier_model": "gpt-5.4-nano"
 }
 ```
 
@@ -374,7 +374,7 @@ class MyAgent(LlamaIndexAgent):
         )
         # Default model config (can be overridden per session)
         self.default_temperature = 0.7
-        self.default_model = "gpt-5-mini"
+        self.default_model = "gpt-5.4-mini"
 ```
 
 **Runtime Configuration:**

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/__init__.py

@@ -88,7 +88,7 @@ def _auto_setup_dependencies() -> None:
 # Track if auto-setup has been done
 _AUTO_SETUP_DONE = False
 
-__version__ = "0.6.3"
+__version__ = "0.6.3post3"
 __author__ = "Cinco AI Team"
 __license__ = "MIT"
 __email__ = "sebastian@cinco.ai"
@@ -345,6 +345,11 @@ def create_basic_agent_server(
     
     logger.info(f"[create_basic_agent_server] Starting server for {agent_class.__name__} on {host}:{port}")
     logger.info(f"[create_basic_agent_server] Reload: {reload}")
+
+    # Ensure AGENT_HOST and AGENT_PORT are in the environment so that
+    # subprocesses (e.g. skill scripts via ShellTool) can reach this server.
+    os.environ["AGENT_HOST"] = host
+    os.environ["AGENT_PORT"] = str(port)
     
     # When reload=True, uvicorn requires an import string, not the app object directly
     if reload:

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/core/model_config.py

@@ -14,7 +14,7 @@ This module provides:
 Environment Variables:
 - OPENAI_API_KEY: OpenAI API key
 - GEMINI_API_KEY: Google Gemini API key
-- DEFAULT_MODEL: Default model to use (default: "gpt-5-mini")
+- DEFAULT_MODEL: Default model to use (default: "gpt-5.4-mini")
 - OPENAI_MODELS: Comma-separated list of OpenAI model names
 - GEMINI_MODELS: Comma-separated list of Gemini model names
 - FALLBACK_PROVIDER: Provider to use when model provider is unknown
@@ -27,7 +27,7 @@ Example:
     from agent_framework.model_config import model_config
     
     # Get provider for a model
-    provider = model_config.get_provider("gpt-5-mini")
+    provider = model_config.get_provider("gpt-5.4-mini")
     
     # Get API key for a provider
     api_key = model_config.get_api_key(provider)
@@ -383,7 +383,7 @@ class ModelConfigManager:
         Get a flat list of all models with provider info and availability status.
         
         Returns a list of dictionaries, each containing:
-        - id: The model identifier (e.g., "gpt-5-minio-mini")
+        - id: The model identifier (e.g., "gpt-5.4-minio-mini")
         - provider: The provider name (e.g., "openai")
         - available: Boolean indicating if the model's API key is configured
         
@@ -394,7 +394,7 @@ class ModelConfigManager:
             ```python
             models = model_config.get_all_available_models()
             # [
-            #     {"id": "gpt-5-minio", "provider": "openai", "available": True},
+            #     {"id": "gpt-5.4-minio", "provider": "openai", "available": True},
             #     {"id": "claude-3-opus", "provider": "anthropic", "available": False},
             #     ...
             # ]
@@ -500,7 +500,7 @@ class ModelConfigManager:
             ```python
             model_config.register_agent_config("my-agent", {
                 "system_prompt": "You are a helpful assistant.",
-                "model_name": "gpt-5-minio",
+                "model_name": "gpt-5.4-minio",
                 "model_config": {"temperature": 0.7, "max_tokens": 50000}
             })
             ```

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/core/scratchpad_compressor.py

@@ -29,6 +29,11 @@ logger = logging.getLogger(__name__)
 
 TRUNCATION_MARKER = "\n\n[... contenu tronqué ...]\n\n"
 
+# OpenAI enforces a 10 485 760 character limit per message content.
+# We use a conservative 8M limit to leave headroom for JSON serialization
+# overhead, tool_call metadata, and other wrapper text added by the SDK.
+MAX_MESSAGE_CONTENT_CHARS = 8_000_000
+
 
 class ScratchpadCompressor:
     """Compresse le scratchpad de la boucle d'outils pour respecter le budget."""
@@ -106,22 +111,100 @@ class ScratchpadCompressor:
         # Pas de paire trouvée, tout est considéré comme dernière paire
         return [], list(scratchpad)
 
+    @staticmethod
+    def _flatten_message_content(message: ChatMessage) -> str:
+        """Aplatit tous les blocks d'un message en une seule chaîne de texte.
+
+        LlamaIndex stocke le contenu des messages dans des blocks typés
+        (TextBlock, ToolCallBlock, ToolResultBlock, etc.). La propriété
+        .content ne retourne que le texte des TextBlock. Cette méthode
+        sérialise TOUS les blocks pour que la troncature opère sur le
+        contenu réel envoyé à l'API.
+
+        Args:
+            message: ChatMessage à aplatir.
+
+        Returns:
+            Texte complet incluant tous les blocks.
+        """
+        if not hasattr(message, "blocks") or not message.blocks:
+            return message.content or ""
+
+        parts: list[str] = []
+        for block in message.blocks:
+            block_type = type(block).__name__
+            if hasattr(block, "text"):
+                parts.append(block.text or "")
+            elif hasattr(block, "tool_kwargs"):
+                tool_name = getattr(block, "tool_name", "") or ""
+                kwargs = getattr(block, "tool_kwargs", None)
+                if kwargs:
+                    import json as _json
+                    try:
+                        kwargs_str = _json.dumps(kwargs) if isinstance(kwargs, dict) else str(kwargs)
+                    except (TypeError, ValueError):
+                        kwargs_str = str(kwargs)
+                    parts.append(f"[tool_call: {tool_name}({kwargs_str})]")
+                else:
+                    parts.append(f"[tool_call: {tool_name}()]")
+            elif hasattr(block, "tool_output"):
+                output = str(getattr(block, "tool_output", "") or "")
+                parts.append(output)
+            elif block_type == "ImageBlock":
+                parts.append("[image]")
+            else:
+                try:
+                    block_str = str(block)
+                    if len(block_str) > 10:
+                        parts.append(block_str)
+                except Exception:
+                    parts.append("[block non sérialisable]")
+
+        return "\n".join(parts)
+
     def _truncate_single_result(
         self, message: ChatMessage, target_tokens: int
     ) -> ChatMessage:
         """Tronque le contenu d'un tool_result en gardant début + marqueur + fin.
 
+        Aplatit d'abord tous les blocks en texte brut pour que la troncature
+        opère sur le contenu réel (pas seulement .content/TextBlock).
+
+        Applique deux niveaux de troncature :
+        1. Par tokens (budget du context window)
+        2. Par caractères bruts (limite API OpenAI de 10M chars par message)
+
         Args:
             message: Message tool_result à tronquer.
             target_tokens: Nombre cible de tokens pour le message tronqué.
 
         Returns:
-            Nouveau ChatMessage avec le contenu tronqué.
+            Nouveau ChatMessage avec le contenu tronqué (blocks nettoyés).
         """
-        content = message.content or ""
+        content = self._flatten_message_content(message)
+
+        # Garde-fou caractères bruts : tronquer d'abord si on dépasse la
+        # limite API (10M chars) pour éviter un 400 même si le budget
+        # tokens semble OK.
+        content = self._enforce_char_limit(content)
+
         current_tokens = self._token_counter.count_tokens(content).count
 
+        # Nettoyer additional_kwargs pour ne pas conserver les blocks originaux
+        # qui seraient re-sérialisés par LlamaIndex en plus du content tronqué.
+        clean_kwargs = {
+            k: v
+            for k, v in (message.additional_kwargs or {}).items()
+            if k not in ("tool_calls",)
+        }
+
         if current_tokens <= target_tokens or target_tokens <= 0:
+            if content != (message.content or ""):
+                return ChatMessage(
+                    role=message.role,
+                    content=content,
+                    additional_kwargs=clean_kwargs,
+                )
             return message
 
         # Réserver des tokens pour le marqueur de troncature
@@ -142,6 +225,12 @@ class ScratchpadCompressor:
         end_chars = max(0, int(end_tokens * chars_per_token))
 
         if begin_chars + end_chars >= len(content):
+            if content != (message.content or ""):
+                return ChatMessage(
+                    role=message.role,
+                    content=content,
+                    additional_kwargs=clean_kwargs,
+                )
             return message
 
         begin_part = content[:begin_chars]
@@ -151,9 +240,40 @@ class ScratchpadCompressor:
         return ChatMessage(
             role=message.role,
             content=truncated_content,
-            additional_kwargs=message.additional_kwargs,
+            additional_kwargs=clean_kwargs,
         )
 
+    @staticmethod
+    def _enforce_char_limit(content: str, limit: int = MAX_MESSAGE_CONTENT_CHARS) -> str:
+        """Tronque le contenu si sa longueur dépasse la limite en caractères.
+
+        Garde 60% du début et 40% de la fin pour préserver le contexte.
+
+        Args:
+            content: Texte brut du message.
+            limit: Limite en caractères (défaut : MAX_MESSAGE_CONTENT_CHARS).
+
+        Returns:
+            Contenu tronqué si nécessaire, sinon inchangé.
+        """
+        if len(content) <= limit:
+            return content
+
+        marker_len = len(TRUNCATION_MARKER)
+        available = max(0, limit - marker_len)
+        begin_chars = int(available * 0.6)
+        end_chars = available - begin_chars
+
+        logger.warning(
+            "Message content exceeds char limit (%d > %d), truncating",
+            len(content),
+            limit,
+        )
+
+        begin_part = content[:begin_chars]
+        end_part = content[-end_chars:] if end_chars > 0 else ""
+        return begin_part + TRUNCATION_MARKER + end_part
+
     async def compress(
         self,
         scratchpad: list[ChatMessage],
@@ -316,7 +436,7 @@ class ScratchpadCompressor:
         result = list(old_entries)
         while result and total > target_tokens:
             removed = result.pop(0)
-            total -= self._token_counter.count_tokens(removed.content or "").count
+            total -= self._count_tokens([removed])
         return result
 
     def _truncate_last_pair(
@@ -326,6 +446,9 @@ class ScratchpadCompressor:
     ) -> list[ChatMessage]:
         """Tronque le tool_result dans la dernière paire pour respecter le budget.
 
+        Utilise _count_tokens (blocks-aware) pour compter les tokens du
+        message ASSISTANT, pas seulement .content.
+
         Args:
             last_pair: Dernière paire de messages (tool_call + tool_result).
             available_tokens: Tokens disponibles pour toute la paire.
@@ -341,7 +464,7 @@ class ScratchpadCompressor:
                 remaining = max(0, available_tokens - tokens_used)
                 result.append(self._truncate_single_result(msg, remaining))
             else:
-                tokens_used += self._token_counter.count_tokens(msg.content or "").count
+                tokens_used += self._count_tokens([msg])
                 result.append(msg)
 
         return result

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/core/step_display_config.py

@@ -279,6 +279,16 @@ DEFAULT_TOOL_DISPLAY: dict[str, StepDisplayInfo] = {
         category="file",
     ),
     # ==========================================================================
+    # Shell & Script Execution Tools
+    # ==========================================================================
+    "shell_exec": StepDisplayInfo(
+        id="shell_exec",
+        friendly_name="🐚 Exécution du script",
+        description="Exécution d'un script ou d'une commande shell",
+        icon="🐚",
+        category="shell",
+    ),
+    # ==========================================================================
     # Code Execution Tools
     # ==========================================================================
     "execute_code": StepDisplayInfo(

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/implementations/budget_aware_agent.py

@@ -20,6 +20,7 @@ from llama_index.core.workflow import Context
 
 from agent_framework.core.knowledge_state import ToolCallSignature
 from agent_framework.core.loop_detector import LoopDetector
+from agent_framework.core.scratchpad_compressor import MAX_MESSAGE_CONTENT_CHARS
 
 if TYPE_CHECKING:
     from agent_framework.core.context_budget import ContextBudgetManager
@@ -176,14 +177,66 @@ class BudgetAwareFunctionAgent(FunctionAgent):
                     "Compressing scratchpad: usage %.1f%% >= 80%% threshold",
                     usage_percent,
                 )
-                compressed_scratchpad = await self._scratchpad_compressor.compress(
-                    scratchpad=scratchpad,
-                    llm_input=llm_input,
-                    context_window=context_window,
-                    sacred_zone_tokens=sacred_zone_tokens,
-                    model_name=getattr(self.llm, "model", None),
-                )
-                await ctx.store.set(self.scratchpad_key, compressed_scratchpad)
+
+                # Boucle de compression : re-vérifier après chaque passe
+                # car la première compression peut ne pas suffire (ex: blocks
+                # non aplatis, écart de tokenisation).
+                max_compression_passes = 3
+                for compression_pass in range(max_compression_passes):
+                    compressed_scratchpad = await self._scratchpad_compressor.compress(
+                        scratchpad=scratchpad,
+                        llm_input=llm_input,
+                        context_window=context_window,
+                        sacred_zone_tokens=sacred_zone_tokens,
+                        model_name=getattr(self.llm, "model", None),
+                    )
+                    await ctx.store.set(self.scratchpad_key, compressed_scratchpad)
+
+                    # Recalculer le total après compression
+                    new_scratchpad_tokens = self._count_total_tokens([], compressed_scratchpad)
+                    new_total = sacred_zone_tokens + llm_input_tokens + new_scratchpad_tokens
+                    new_usage = new_total / context_window * 100 if context_window > 0 else 0.0
+
+                    logger.info(
+                        "Post-compression pass %d: %d/%d tokens (%.1f%%), scratchpad=%d",
+                        compression_pass + 1,
+                        new_total,
+                        context_window,
+                        new_usage,
+                        new_scratchpad_tokens,
+                    )
+
+                    if new_usage < 80:
+                        break
+
+                    # Préparer la prochaine passe avec le scratchpad compressé
+                    scratchpad = compressed_scratchpad
+
+                    if compression_pass == max_compression_passes - 1:
+                        logger.error(
+                            "Scratchpad still at %.1f%% after %d compression passes",
+                            new_usage,
+                            max_compression_passes,
+                        )
+
+        # Garde-fou caractères bruts : même après compression en tokens,
+        # un message peut dépasser la limite API (10M chars). On tronque
+        # chaque message du scratchpad qui dépasse avant l'appel LLM.
+        if self._scratchpad_compressor:
+            scratchpad = await ctx.store.get(self.scratchpad_key, default=[])
+            patched = False
+            for i, msg in enumerate(scratchpad):
+                content = msg.content or ""
+                if len(content) > MAX_MESSAGE_CONTENT_CHARS:
+                    from agent_framework.core.scratchpad_compressor import ScratchpadCompressor
+                    scratchpad[i] = ChatMessage(
+                        role=msg.role,
+                        content=ScratchpadCompressor._enforce_char_limit(content),
+                        additional_kwargs=msg.additional_kwargs,
+                    )
+                    patched = True
+            if patched:
+                await ctx.store.set(self.scratchpad_key, scratchpad)
 
         return await super().take_step(ctx, llm_input, tools, memory)
 

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/monitoring/llm_metrics.py

@@ -47,7 +47,7 @@ class LLMMetrics(BaseModel):
             thinking_tokens=50,
             output_tokens=200,
             start_time=datetime.now(timezone.utc),
-            model_name="gpt-5-mini",
+            model_name="gpt-5.4-mini",
             session_id="session-123"
         )
         print(f"Total tokens: {metrics.total_tokens}")

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/monitoring/llm_metrics_collector.py

@@ -66,7 +66,7 @@ class LLMMetricsCollector:
         ```python
         # Fallback usage when auto-instrumentation is unavailable
         collector = LLMMetricsCollector(
-            model_name="gpt-5-mini",
+            model_name="gpt-5.4-mini",
             session_id="session-123",
             enabled=True
         )

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/monitoring/otel_instrumentor.py

@@ -77,7 +77,7 @@ def get_tracer() -> Any:
         tracer = get_tracer()
         if tracer:
             with tracer.start_as_current_span("llm.chat") as span:
-                span.set_attribute("model", "gpt-5")
+                span.set_attribute("model", "gpt-5.4")
         ```
     """
     global _tracer
@@ -106,7 +106,7 @@ def get_meter() -> Any:
         meter = get_meter()
         if meter:
             counter = meter.create_counter("llm.tokens.total")
-            counter.add(100, {"model": "gpt-5"})
+            counter.add(100, {"model": "gpt-5.4"})
         ```
     """
     global _meter
@@ -147,7 +147,7 @@ class OTELInstrumentor:
 
         with instrumentor.trace_llm_call(
             operation_name="llm.chat",
-            model_name="gpt-5-mini",
+            model_name="gpt-5.4-mini",
             session_id="session-123"
         ) as span:
             # Perform LLM call

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/monitoring/token_counter.py

@@ -56,7 +56,7 @@ class TokenCounter:
 
     Example:
         ```python
-        counter = TokenCounter(model_name="gpt-5-mini")
+        counter = TokenCounter(model_name="gpt-5.4-mini")
         result = counter.count_tokens("Hello, world!")
         print(f"Tokens: {result.count}, Encoding: {result.encoding_name}")
         ```
@@ -215,7 +215,7 @@ class TokenCounter:
 
         Example:
             ```python
-            counter = TokenCounter(model_name="gpt-5-mini")
+            counter = TokenCounter(model_name="gpt-5.4-mini")
             result = counter.count_tokens("Hello, world!")
             print(f"Token count: {result.count}")
             ```
@@ -245,7 +245,7 @@ class TokenCounter:
 
         Example:
             ```python
-            counter = TokenCounter(model_name="gpt-5-mini")
+            counter = TokenCounter(model_name="gpt-5.4-mini")
             messages = [
                 {"role": "system", "content": "You are a helpful assistant."},
                 {"role": "user", "content": "Hello!"}

{agent_framework_lib-0.6.3.post2 → agent_framework_lib-0.6.3.post4}/agent_framework/skills/agent_mixin.py

@@ -127,13 +127,16 @@ class SkillsMixin:
         self._skill_registry.unload(name)
         logger.info(f"Unloaded skill '{name}' for agent '{getattr(self, 'agent_id', 'unknown')}'")
 
-    def register_builtin_skills(self, source: str = "python") -> None:
+    def register_builtin_skills(self, source: str = "markdown") -> None:
         """Register all built-in skills with this agent.
 
+        After registering builtins, also loads any custom skills found in
+        the ``CUSTOM_SKILLS_DIR`` environment variable (default ``./custom_skills``).
+
         Args:
             source: Loading strategy passed to ``get_all_builtin_skills``.
-                Use ``"python"`` (default) for Python factory functions or
-                ``"markdown"`` to load from SKILL.md files.
+                Use ``"markdown"`` (default) to load from SKILL.md files or
+                ``"python"`` for legacy Python factory functions.
                 Skills already registered are skipped.
         """
         from .builtin import get_all_builtin_skills
@@ -158,6 +161,62 @@ class SkillsMixin:
                 f"for agent '{getattr(self, 'agent_id', 'unknown')}'"
             )
 
+        self._register_custom_skills()
+
+    def _register_custom_skills(self) -> None:
+        """Load custom skills from CUSTOM_SKILLS_DIR into this agent's registry.
+
+        Each subdirectory containing a SKILL.md is loaded, has native tools
+        attached, and is registered with ``source="custom"``.  Failures are
+        logged as warnings without blocking the remaining skills.
+        """
+        import os
+        import shutil
+
+        from .markdown_loader import MarkdownSkillLoader
+        from ..tools.shell_tool import ShellTool
+        from ..tools.web_fetch_tool import WebFetchTool
+
+        custom_dir = Path(os.getenv("CUSTOM_SKILLS_DIR", "./custom_skills"))
+        if not custom_dir.is_dir():
+            return
+
+        loader = MarkdownSkillLoader()
+        count = 0
+
+        for child in sorted(custom_dir.iterdir()):
+            if not child.is_dir():
+                continue
+            skill_md = child / "SKILL.md"
+            if not skill_md.exists():
+                continue
+            try:
+                skill = loader.load_from_file(skill_md)
+                if self._skill_registry.get(skill.metadata.name) is not None:
+                    continue
+                existing_types = {type(t) for t in skill.tools}
+                if ShellTool not in existing_types:
+                    skill.tools.append(ShellTool(default_timeout=60))
+                if WebFetchTool not in existing_types:
+                    skill.tools.append(WebFetchTool())
+                for binary in skill.metadata.requires_bins:
+                    if shutil.which(binary) is None:
+                        logger.warning(
+                            "Custom skill '%s' requires binary '%s' not found in PATH",
+                            skill.metadata.name,
+                            binary,
+                        )
+                self._skill_registry.register(skill, source="custom")
+                count += 1
+            except Exception as exc:
+                logger.warning("Failed to load custom skill from %s: %s", child, exc)
+
+        if count > 0:
+            logger.info(
+                f"Registered {count} custom skill(s) "
+                f"for agent '{getattr(self, 'agent_id', 'unknown')}'"
+            )
+
     def get_skill_tools(self) -> list[Callable[..., str]]:
         """
         Get skill management tools for the agent.