ommlds 0.0.0.dev451__py3-none-any.whl → 0.0.0.dev452__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -18,7 +18,7 @@
     "module": ".minichain.backends.impls.anthropic.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/anthropic/chat.py",
-    "line": 37,
+    "line": 39,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.anthropic.chat",
@@ -47,9 +47,9 @@
             "claude-opus-4-1-20250805": null,
             "claude-opus-4-1": "claude-opus-4-1-20250805",
             "claude-opus": "claude-opus-4-1",
-            "claude-sonnet-4-20250514": null,
-            "claude-sonnet-4": "claude-sonnet-4-20250514",
-            "claude-sonnet": "claude-sonnet-4",
+            "claude-sonnet-4-5-20250929": null,
+            "claude-sonnet-4-5": "claude-sonnet-4-5-20250929",
+            "claude-sonnet": "claude-sonnet-4-5",
             "claude-3-5-haiku-latest": null,
             "claude-haiku-3-5-latest": "claude-3-5-haiku-latest",
             "claude-haiku-3-5": "claude-haiku-3-5-latest",
@@ -96,7 +96,7 @@
     "module": ".minichain.backends.impls.google.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/google/chat.py",
-    "line": 34,
+    "line": 35,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.google.chat",
@@ -170,7 +170,7 @@
     "module": ".minichain.backends.impls.llamacpp.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/llamacpp/chat.py",
-    "line": 32,
+    "line": 33,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.llamacpp.chat",
@@ -260,7 +260,7 @@
     "module": ".minichain.backends.impls.openai.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/openai/chat.py",
-    "line": 34,
+    "line": 37,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.openai.chat",
@@ -402,7 +402,7 @@
     "module": ".minichain.backends.impls.tinygrad.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/tinygrad/chat.py",
-    "line": 161,
+    "line": 166,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -435,7 +435,7 @@
     "module": ".minichain.backends.impls.transformers.transformers",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/transformers/transformers.py",
-    "line": 41,
+    "line": 43,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.transformers.transformers",
@@ -452,7 +452,7 @@
     "module": ".minichain.backends.impls.transformers.transformers",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/transformers/transformers.py",
-    "line": 127,
+    "line": 131,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.transformers.transformers",
@@ -592,7 +592,7 @@
     "module": ".tools.git",
     "attr": null,
     "file": "ommlds/tools/git.py",
-    "line": 172,
+    "line": 188,
     "value": {
       "!omdev.tools.git.messages.GitMessageGeneratorManifest": {
         "module": "ommlds.tools.git",

ommlds/backends/anthropic/protocol/_marshal.py

@@ -17,7 +17,7 @@ def _install_standard_marshaling() -> None:
             msh.polymorphism_from_subclasses(
                 root_cls,
                 naming=msh.Naming.SNAKE,
-                strip_suffix='auto',
+                strip_suffix=msh.AutoStripSuffix,
             ),
             msh.FieldTypeTagging('type'),
         ))

ommlds/backends/openai/protocol/_common.py

@@ -0,0 +1,18 @@
+from omlish import lang
+from omlish import marshal as msh
+
+
+##
+
+
+def _set_class_marshal_options(cls):
+    msh.update_object_metadata(
+        cls,
+        field_defaults=msh.FieldMetadata(
+            options=msh.FieldOptions(
+                omit_if=lang.is_none,
+            ),
+        ),
+    )
+
+    return cls

ommlds/backends/openai/protocol/_marshal.py

@@ -20,7 +20,8 @@ def _install_standard_marshaling() -> None:
             msh.polymorphism_from_subclasses(
                 root_cls,
                 naming=msh.Naming.SNAKE,
-                strip_suffix='auto',
+                strip_suffix=msh.AutoStripSuffix,
             ),
             msh.FieldTypeTagging(tag_field),
+            unions='partial',
         ))

ommlds/backends/openai/protocol/chatcompletion/chunk.py

@@ -3,6 +3,7 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
 from ..completionusage import CompletionUsage
 from .tokenlogprob import ChatCompletionTokenLogprob
 
@@ -11,6 +12,7 @@ from .tokenlogprob import ChatCompletionTokenLogprob
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionChunkChoiceDelta(lang.Final):
     content: str | None = None
 
@@ -46,6 +48,7 @@ class ChatCompletionChunkChoiceDelta(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionChunkChoice(lang.Final):
     delta: ChatCompletionChunkChoiceDelta
 
@@ -70,6 +73,7 @@ class ChatCompletionChunkChoice(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionChunk(lang.Final):
     id: str
 

ommlds/backends/openai/protocol/chatcompletion/contentpart.py

@@ -3,6 +3,8 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
+
 
 ##
 
@@ -14,7 +16,8 @@ class ChatCompletionContentPart(lang.Abstract):
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class TextChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
     text: str
 
@@ -22,9 +25,10 @@ class TextChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class ImageUrlChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
-    @dc.dataclass(frozen=True, kw_only=True)
+    @dc.dataclass(frozen=True)
     class ImageUrl(lang.Final):
         url: str
         detail: ta.Literal[
@@ -39,7 +43,8 @@ class ImageUrlChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class FileChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
     @dc.dataclass(frozen=True, kw_only=True)
     class File(lang.Final):
@@ -53,9 +58,11 @@ class FileChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class InputAudioChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
-    @dc.dataclass(frozen=True, kw_only=True)
+    @dc.dataclass(frozen=True)
+    @_set_class_marshal_options
     class InputAudio(lang.Final):
         data: str
         format: ta.Literal[
@@ -69,6 +76,7 @@ class InputAudioChatCompletionContentPart(ChatCompletionContentPart, lang.Final)
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class RefusalChatCompletionContentPart(ChatCompletionContentPart, lang.Final):
     refusal: str

ommlds/backends/openai/protocol/chatcompletion/message.py

@@ -3,6 +3,7 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
 from .contentpart import ChatCompletionContentPart
 from .contentpart import RefusalChatCompletionContentPart
 from .contentpart import TextChatCompletionContentPart
@@ -19,6 +20,7 @@ class ChatCompletionMessage(lang.Abstract, lang.Sealed):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class DeveloperChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
     name: str | None = None
@@ -28,6 +30,7 @@ class DeveloperChatCompletionMessage(ChatCompletionMessage, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class SystemChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
     name: str | None = None
@@ -37,6 +40,7 @@ class SystemChatCompletionMessage(ChatCompletionMessage, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class UserChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[ChatCompletionContentPart]
     name: str | None = None
@@ -46,8 +50,10 @@ class UserChatCompletionMessage(ChatCompletionMessage, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class AssistantChatCompletionMessage(ChatCompletionMessage, lang.Final):
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class Audio(lang.Final):
         id: str
 
@@ -60,10 +66,12 @@ class AssistantChatCompletionMessage(ChatCompletionMessage, lang.Final):
     refusal: str | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class ToolCall(lang.Final):
         id: str
 
         @dc.dataclass(frozen=True, kw_only=True)
+        @_set_class_marshal_options
         class Function(lang.Final):
             arguments: str
             name: str
@@ -79,6 +87,7 @@ class AssistantChatCompletionMessage(ChatCompletionMessage, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ToolChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
     tool_call_id: str
@@ -88,6 +97,7 @@ class ToolChatCompletionMessage(ChatCompletionMessage, lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class FunctionChatCompletionMessage(ChatCompletionMessage, lang.Final):
     content: str | None
     name: str

ommlds/backends/openai/protocol/chatcompletion/request.py

@@ -4,6 +4,7 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
 from .contentpart import TextChatCompletionContentPart
 from .message import ChatCompletionMessage
 from .responseformat import ChatCompletionResponseFormat
@@ -13,6 +14,7 @@ from .responseformat import ChatCompletionResponseFormat
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionRequestWebSearchOptions(lang.Final):
     search_context_size: ta.Literal[
         'low',
@@ -21,8 +23,10 @@ class ChatCompletionRequestWebSearchOptions(lang.Final):
     ] | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class UserLocation(lang.Final):
         @dc.dataclass(frozen=True, kw_only=True)
+        @_set_class_marshal_options
         class Approximate(lang.Final):
             city: str | None = None
             country: str | None = None
@@ -30,7 +34,8 @@ class ChatCompletionRequestWebSearchOptions(lang.Final):
             timezone: str | None = None
 
         approximate: Approximate
-        type: ta.Literal['approximate'] | None = None
+
+        type: ta.Literal['approximate'] = dc.xfield('approximate', repr=False, kw_only=True)
 
     user_location: UserLocation | None = None
 
@@ -39,17 +44,21 @@ class ChatCompletionRequestWebSearchOptions(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionRequestPrediction(lang.Final):
     content: str | ta.Iterable[TextChatCompletionContentPart]
-    type: ta.Literal['content'] | None = None
+
+    type: ta.Literal['content'] = dc.xfield('content', repr=False, kw_only=True)
 
 
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class ChatCompletionRequestTool(lang.Final):
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class Function(lang.Final):
         name: str
         description: str | None = None
@@ -57,26 +66,31 @@ class ChatCompletionRequestTool(lang.Final):
         strict: bool | None = None
 
     function: Function
-    type: ta.Literal['function'] | None = None
+
+    type: ta.Literal['function'] = dc.xfield('function', repr=False, kw_only=True)
 
 
 #
 
 
-@dc.dataclass(frozen=True, kw_only=True)
+@dc.dataclass(frozen=True)
+@_set_class_marshal_options
 class ChatCompletionRequestNamedToolChoice(lang.Final):
-    @dc.dataclass(frozen=True, kw_only=True)
+    @dc.dataclass(frozen=True)
+    @_set_class_marshal_options
     class Function(lang.Final):
         name: str
 
     function: Function
-    type: ta.Literal['function'] | None = None
+
+    type: ta.Literal['function'] = dc.xfield('function', repr=False, kw_only=True)
 
 
 #
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionRequestAudio(lang.Final):
     format: ta.Literal[
         'wav',
@@ -94,6 +108,7 @@ class ChatCompletionRequestAudio(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionRequest(lang.Final):
     messages: ta.Iterable[ChatCompletionMessage]
 
@@ -143,7 +158,10 @@ class ChatCompletionRequest(lang.Final):
 
     store: bool | None = None
 
+    stream: bool | None = None
+
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class StreamOptions(lang.Final):
         include_usage: bool | None = None
 

ommlds/backends/openai/protocol/chatcompletion/response.py

@@ -3,6 +3,7 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
 from ..completionusage import CompletionUsage
 from .tokenlogprob import ChatCompletionTokenLogprob
 
@@ -11,16 +12,19 @@ from .tokenlogprob import ChatCompletionTokenLogprob
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionResponseMessage(lang.Final):
     content: str | None = None
     refusal: str | None = None
     role: ta.Literal['assistant'] = dc.xfield('assistant', repr=False)
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class Annotation(lang.Final):
         type: ta.Literal['url_citation'] = dc.xfield('url_citation', repr=False)
 
         @dc.dataclass(frozen=True, kw_only=True)
+        @_set_class_marshal_options
         class UrlCitation(lang.Final):
             end_index: int
             start_index: int
@@ -32,6 +36,7 @@ class ChatCompletionResponseMessage(lang.Final):
     annotations: ta.Sequence[Annotation] | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class Audio(lang.Final):
         id: str
         data: str
@@ -41,10 +46,12 @@ class ChatCompletionResponseMessage(lang.Final):
     audio: Audio | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class ToolCall(lang.Final):
         id: str
 
         @dc.dataclass(frozen=True, kw_only=True)
+        @_set_class_marshal_options
         class Function(lang.Final):
             arguments: str
             name: str
@@ -60,6 +67,7 @@ class ChatCompletionResponseMessage(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionResponseChoice(lang.Final):
     finish_reason: ta.Literal[
         'stop',
@@ -71,6 +79,7 @@ class ChatCompletionResponseChoice(lang.Final):
     index: int
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class Logprobs(lang.Final):
         content: ta.Sequence[ChatCompletionTokenLogprob] | None = None
         refusal: ta.Sequence[ChatCompletionTokenLogprob] | None = None
@@ -84,6 +93,7 @@ class ChatCompletionResponseChoice(lang.Final):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionResponse(lang.Final):
     id: str
 

ommlds/backends/openai/protocol/chatcompletion/responseformat.py

@@ -3,6 +3,8 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
+
 
 ##
 
@@ -15,6 +17,7 @@ class ChatCompletionResponseFormat(lang.Abstract, lang.Sealed):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class TextChatCompletionResponseFormat(ChatCompletionResponseFormat, lang.Final):
     pass
 
@@ -23,8 +26,10 @@ class TextChatCompletionResponseFormat(ChatCompletionResponseFormat, lang.Final)
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class JsonSchemaChatCompletionResponseFormat(ChatCompletionResponseFormat, lang.Final):
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class JsonSchema(lang.Final):
         name: str
         description: str | None = None
@@ -38,5 +43,6 @@ class JsonSchemaChatCompletionResponseFormat(ChatCompletionResponseFormat, lang.
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class JsonObjectChatCompletionResponseFormat(ChatCompletionResponseFormat, lang.Final):
     pass

ommlds/backends/openai/protocol/chatcompletion/tokenlogprob.py

@@ -3,17 +3,21 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .._common import _set_class_marshal_options
+
 
 ##
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class ChatCompletionTokenLogprob(lang.Final):
     token: str
     bytes: ta.Sequence[int] | None = None
     logprob: float
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class TopLogprob(lang.Final):
         token: str
         bytes: ta.Sequence[int] | None = None

ommlds/backends/openai/protocol/completionusage.py

@@ -1,17 +1,21 @@
 from omlish import dataclasses as dc
 from omlish import lang
 
+from ._common import _set_class_marshal_options
+
 
 ##
 
 
 @dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
 class CompletionUsage(lang.Final):
     completion_tokens: int
     prompt_tokens: int
     total_tokens: int
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class CompletionTokensDetails(lang.Final):
         accepted_prediction_tokens: int | None = None
         audio_tokens: int | None = None
@@ -21,6 +25,7 @@ class CompletionUsage(lang.Final):
     completion_tokens_details: CompletionTokensDetails | None = None
 
     @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
     class PromptTokensDetails(lang.Final):
         audio_tokens: int | None = None
         cached_tokens: int | None = None

ommlds/cli/sessions/chat/code.py

@@ -13,7 +13,7 @@ from .base import ChatOptions
 from .base import ChatSession
 from .printing import ChatSessionPrinter
 from .state import ChatStateManager
-from .tools import ToolExecRequestExecutor
+from .tools import ToolUseExecutor
 
 
 with lang.auto_proxy_import(globals()):
@@ -43,7 +43,7 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
             chat_options: ChatOptions | None = None,
             printer: ChatSessionPrinter,
             backend_catalog: mc.BackendCatalog,
-            tool_exec_request_executor: ToolExecRequestExecutor,
+            tool_exec_request_executor: ToolUseExecutor,
             tools_config: ToolsConfig | None = None,
     ) -> None:
         super().__init__(config)
@@ -102,23 +102,28 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
                         state.chat,
                         (self._chat_options or []),
                     ))
-                    resp_msg = check.single(response.v).m
 
-                    self._printer.print(resp_msg)
-                    state = self._state_manager.extend_chat([resp_msg])
+                    tool_resp_lst = []
+                    for resp_msg in check.single(response.v).ms:
+                        state = self._state_manager.extend_chat([resp_msg])
 
-                    if not (trs := resp_msg.tool_exec_requests):
-                        break
+                        if isinstance(resp_msg, mc.AiMessage):
+                            self._printer.print(resp_msg)
 
-                    tool_resp_lst = []
-                    for tr in trs:
-                        trm = await self._tool_exec_request_executor.execute_tool_request(
-                            tr,
-                            fs_tool_context,
-                            todo_tool_context,
-                        )
-
-                        self._printer.print(trm.c)
-                        tool_resp_lst.append(trm)
+                        elif isinstance(resp_msg, mc.ToolUseMessage):
+                            trm = await self._tool_exec_request_executor.execute_tool_use(
+                                resp_msg.tu,
+                                fs_tool_context,
+                                todo_tool_context,
+                            )
+
+                            self._printer.print(trm.tur.c)
+                            tool_resp_lst.append(trm)
+
+                        else:
+                            raise TypeError(resp_msg)
+
+                    if not tool_resp_lst:
+                        break
 
                     state = self._state_manager.extend_chat(tool_resp_lst)

ommlds/cli/sessions/chat/inject.py

@@ -14,9 +14,9 @@ from .state import ChatStateManager
 from .state import StateStorageChatStateManager
 from .tools import AskingToolExecutionConfirmation
 from .tools import NopToolExecutionConfirmation
-from .tools import ToolExecRequestExecutor
-from .tools import ToolExecRequestExecutorImpl
 from .tools import ToolExecutionConfirmation
+from .tools import ToolUseExecutor
+from .tools import ToolUseExecutorImpl
 
 
 ##
@@ -89,8 +89,8 @@ def bind_chat_session(cfg: ChatSession.Config) -> inj.Elements:
     #
 
     els.extend([
-        inj.bind(ToolExecRequestExecutorImpl, singleton=True),
-        inj.bind(ToolExecRequestExecutor, to_key=ToolExecRequestExecutorImpl),
+        inj.bind(ToolUseExecutorImpl, singleton=True),
+        inj.bind(ToolUseExecutor, to_key=ToolUseExecutorImpl),
     ])
 
     #

ommlds/cli/sessions/chat/interactive.py

@@ -1,5 +1,6 @@
 import dataclasses as dc
 
+from omlish import check
 from omlish import lang
 
 from .... import minichain as mc
@@ -63,7 +64,7 @@ class InteractiveChatSession(ChatSession['InteractiveChatSession.Config']):
 
                 response = await mdl.invoke(mc.ChatChoicesRequest([*state.chat, req_msg]))
 
-                resp_msg = response.v[0].m
+                resp_msg = check.isinstance(check.single(response.v[0].ms), mc.AiMessage)
 
                 self._printer.print(resp_msg)
 

ommlds/cli/sessions/chat/printing.py

@@ -44,8 +44,8 @@ class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
             elif isinstance(obj, mc.AiMessage):
                 if obj.c is not None:
                     self._print_str(check.isinstance(obj.c, str))
-            elif isinstance(obj, mc.ToolExecResultMessage):
-                self._print_str(check.isinstance(obj.c, str))
+            elif isinstance(obj, mc.ToolUseResultMessage):
+                self._print_str(check.isinstance(obj.tur.c, str))
             else:
                 raise TypeError(obj)