bazaar-contrib-agent-command 0.3.0rc1__tar.gz

bazaar_contrib_agent_command-0.3.0rc1/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

bazaar_contrib_agent_command-0.3.0rc1/PKG-INFO

@@ -0,0 +1,50 @@
+Metadata-Version: 2.4
+Name: bazaar-contrib-agent-command
+Version: 0.3.0rc1
+Summary: Agent configuration and local conversation-review commands
+License-Expression: Apache-2.0
+License-File: LICENSE
+Requires-Dist: bazaar-core~=0.3.0rc1
+Requires-Dist: bazaar-contrib-agent~=0.3.0rc1
+Requires-Dist: bazaar-contrib-channel~=0.3.0rc1
+Requires-Dist: bazaar-contrib-harness~=0.3.0rc1
+Requires-Dist: bazaar-contrib-config~=0.3.0rc1
+Requires-Dist: bazaar-contrib-invoke~=0.3.0rc1
+Requires-Dist: bazaar-contrib-sidecar~=0.3.0rc1
+Requires-Dist: bazaar-contrib-collaboration~=0.3.0rc1
+Requires-Dist: bazaar-contrib-messages~=0.3.0rc1
+Requires-Dist: click>=8.1.0
+Requires-Dist: jinja2>=3.1.6
+Requires-Dist: pydantic>=2.12.0
+Requires-Python: >=3.15
+Project-URL: Repository, https://github.com/yuchanns/bazaar-compute-node
+Description-Content-Type: text/markdown
+
+# bazaar-contrib-agent-command
+
+Manage agents and approve or deny conversations.
+
+```sh
+bcn contrib add agent-command --enable
+```
+
+The corresponding entry in `config.toml`:
+
+```toml
+version = "5"
+
+[[contribs]]
+package = "bazaar-contrib-agent-command~=0.3.0rc1"
+[[contribs.enabled]]
+entry = "agent-command"
+```
+
+```sh
+bcn agent list
+bcn agent add --name Desk --channel CHANNEL_KIND --harness HARNESS_KIND
+bcn agent edit Desk --set agent.idle_timeout=300
+bcn agent remove Desk
+bcn agent review list AGENT_ID
+bcn agent review approve THREAD_ID
+bcn agent review deny THREAD_ID
+```

bazaar_contrib_agent_command-0.3.0rc1/README.md

@@ -0,0 +1,28 @@
+# bazaar-contrib-agent-command
+
+Manage agents and approve or deny conversations.
+
+```sh
+bcn contrib add agent-command --enable
+```
+
+The corresponding entry in `config.toml`:
+
+```toml
+version = "5"
+
+[[contribs]]
+package = "bazaar-contrib-agent-command~=0.3.0rc1"
+[[contribs.enabled]]
+entry = "agent-command"
+```
+
+```sh
+bcn agent list
+bcn agent add --name Desk --channel CHANNEL_KIND --harness HARNESS_KIND
+bcn agent edit Desk --set agent.idle_timeout=300
+bcn agent remove Desk
+bcn agent review list AGENT_ID
+bcn agent review approve THREAD_ID
+bcn agent review deny THREAD_ID
+```

bazaar_contrib_agent_command-0.3.0rc1/pyproject.toml

@@ -0,0 +1,51 @@
+[project]
+name = "bazaar-contrib-agent-command"
+version = "0.3.0rc1"
+description = "Agent configuration and local conversation-review commands"
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+requires-python = ">=3.15"
+dependencies = [
+    "bazaar-core~=0.3.0rc1",
+    "bazaar-contrib-agent~=0.3.0rc1",
+    "bazaar-contrib-channel~=0.3.0rc1",
+    "bazaar-contrib-harness~=0.3.0rc1",
+    "bazaar-contrib-config~=0.3.0rc1",
+    "bazaar-contrib-invoke~=0.3.0rc1",
+    "bazaar-contrib-sidecar~=0.3.0rc1",
+    "bazaar-contrib-collaboration~=0.3.0rc1",
+    "bazaar-contrib-messages~=0.3.0rc1",
+    "click>=8.1.0",
+    "jinja2>=3.1.6",
+    "pydantic>=2.12.0",
+]
+
+[project.entry-points."bazaar_compute_node.contribs"]
+agent-command = "bazaar_contrib_agent_command:commands"
+
+[project.entry-points."bazaar_compute_node.commands"]
+agent = "bazaar_contrib_agent_command:command_entry"
+
+[project.urls]
+Repository = "https://github.com/yuchanns/bazaar-compute-node"
+
+[build-system]
+requires = ["uv_build>=0.13.0,<0.14.0"]
+build-backend = "uv_build"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-p no:anyio"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+
+[tool.pyright]
+extends = "../../pyrightconfig.json"
+include = [
+    "src",
+    "tests",
+]
+
+[tool.ruff]
+extend = "../../pyproject.toml"

bazaar_contrib_agent_command-0.3.0rc1/pyproject.toml.orig

@@ -0,0 +1,48 @@
+[project]
+name = "bazaar-contrib-agent-command"
+version = "0.3.0rc1"
+description = "Agent configuration and local conversation-review commands"
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+requires-python = ">=3.15"
+dependencies = [
+    "bazaar-core~=0.3.0rc1",
+    "bazaar-contrib-agent~=0.3.0rc1",
+    "bazaar-contrib-channel~=0.3.0rc1",
+    "bazaar-contrib-harness~=0.3.0rc1",
+    "bazaar-contrib-config~=0.3.0rc1",
+    "bazaar-contrib-invoke~=0.3.0rc1",
+    "bazaar-contrib-sidecar~=0.3.0rc1",
+    "bazaar-contrib-collaboration~=0.3.0rc1",
+    "bazaar-contrib-messages~=0.3.0rc1",
+    "click>=8.1.0",
+    "jinja2>=3.1.6",
+    "pydantic>=2.12.0",
+]
+
+[project.entry-points."bazaar_compute_node.contribs"]
+agent-command = "bazaar_contrib_agent_command:commands"
+
+[project.entry-points."bazaar_compute_node.commands"]
+agent = "bazaar_contrib_agent_command:command_entry"
+
+[project.urls]
+Repository = "https://github.com/yuchanns/bazaar-compute-node"
+
+[build-system]
+requires = ["uv_build>=0.13.0,<0.14.0"]
+build-backend = "uv_build"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-p no:anyio"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+
+[tool.pyright]
+extends = "../../pyrightconfig.json"
+include = ["src", "tests"]
+
+[tool.ruff]
+extend = "../../pyproject.toml"

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/__init__.py

@@ -0,0 +1,80 @@
+"""Register independent Agent management commands through the public services."""
+
+from __future__ import annotations
+
+import asyncio
+from contextlib import asynccontextmanager
+from typing import Self
+
+from bazaar_contrib_channel import ChannelBuilderConfig
+from bazaar_contrib_config import CONFIGURATION
+from bazaar_contrib_harness import HarnessBuilderConfig
+from bazaar_contrib_invoke import COMMANDS, CommandEntry
+from bazaar_contrib_sidecar import CLIENT
+from bazaar_core import Composition, Context, Contrib, ServiceKey
+from pydantic import BaseModel, ConfigDict, PrivateAttr, ValidationInfo, model_validator
+
+from .management import AgentConfiguration, AgentManagement
+
+__all__ = [
+    "AGENT_CONFIGURATION",
+    "AgentConfiguration",
+    "AgentManagement",
+    "command_entry",
+    "commands",
+]
+
+
+class Config(BaseModel):
+    model_config = ConfigDict(extra="forbid", frozen=True)
+    _channels: tuple[str, ...] = PrivateAttr(default=())
+    _harnesses: tuple[str, ...] = PrivateAttr(default=())
+
+    @model_validator(mode="after")
+    def declarations(self, info: ValidationInfo) -> Self:
+        if isinstance(info.context, Composition):
+            channels: list[str] = []
+            harnesses: list[str] = []
+            for entry in info.context.entries:
+                model = entry.definition.config
+                if model is not None and issubclass(model, ChannelBuilderConfig):
+                    channels.append(model.kind)
+                elif model is not None and issubclass(model, HarnessBuilderConfig):
+                    harnesses.append(model.kind)
+            self._channels = tuple(channels)
+            self._harnesses = tuple(harnesses)
+        return self
+
+
+AGENT_CONFIGURATION = ServiceKey[AgentManagement]("agent.configuration")
+command_entry = CommandEntry(
+    contrib="agent-command",
+    help="Manage agents",
+)
+
+
+@asynccontextmanager
+async def lifespan(ctx: Context, config: Config):
+    from .cli import create_commands
+
+    client = ctx.accept(CLIENT)
+    timeout = client.timeout
+    client.timeout = None
+    try:
+        service = AgentManagement(
+            ctx.accept(CONFIGURATION), client, config._channels, config._harnesses
+        )
+        ctx.offer(AGENT_CONFIGURATION, service)
+        command = await asyncio.to_thread(create_commands, service, client)
+        with ctx.accept(COMMANDS).register(command):
+            yield
+    finally:
+        client.timeout = timeout
+
+
+commands = Contrib(
+    config=Config,
+    accepts=[CONFIGURATION, COMMANDS, CLIENT],
+    offers=[AGENT_CONFIGURATION],
+    lifespan=lifespan,
+)

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/cli.py

@@ -0,0 +1,341 @@
+"""Agent configuration and local admission-review commands."""
+
+from __future__ import annotations
+
+import asyncio
+import tomllib
+from collections.abc import Awaitable, Callable, Iterable
+from copy import deepcopy
+from typing import TYPE_CHECKING, Any, Literal
+
+import click
+from bazaar_contrib_sidecar import Client, Construct, Symbol
+from jinja2 import Environment, PackageLoader, StrictUndefined
+from pydantic import BaseModel, Field, TypeAdapter, ValidationError, model_validator
+
+if TYPE_CHECKING:
+    from .management import AgentManagement
+
+
+class Option(BaseModel):
+    scope: Literal["agent", "channel", "harness"]
+    path: str = Field(
+        pattern=r"^(?:[0-9]+\.)?[A-Za-z_][A-Za-z0-9_-]*(?:\.[A-Za-z_][A-Za-z0-9_-]*)*$"
+    )
+    value: Any
+
+    @model_validator(mode="before")
+    @classmethod
+    def parse(cls, value: Any) -> Any:
+        if not isinstance(value, str):
+            return value
+        try:
+            path, raw = value.split("=", 1)
+            scope, path = path.split(".", 1)
+        except ValueError as error:
+            raise ValueError("Use SCOPE.KEY=VALUE") from error
+        if scope == "agent" and path == "id":
+            raise ValueError("Agent IDs are generated and remain stable")
+        if scope != "agent" and path.split(".")[-1] == "kind":
+            raise ValueError(f"Use --{scope} to select a provider")
+        if scope == "harness" and path.split(".")[-1] == "env":
+            name, equals, source = raw.partition("=")
+            if not equals or not name or not source:
+                raise ValueError("Use harness.env=NAME=SOURCE_NAME")
+            parsed = {name: source}
+        else:
+            try:
+                parsed = tomllib.loads(f"value = {raw}")["value"]
+            except tomllib.TOMLDecodeError:
+                parsed = raw
+        return {"scope": scope, "path": path, "value": parsed}
+
+
+def parameters(
+    current: dict[str, Any],
+    *,
+    name: str | None,
+    channel: tuple[str, ...],
+    harness: tuple[str, ...],
+    options: tuple[str, ...],
+) -> dict[str, Any]:
+    try:
+        settings = TypeAdapter(tuple[Option, ...]).validate_python(options)
+    except ValidationError as error:
+        raise click.BadParameter(str(error), param_hint="--set") from error
+    values = deepcopy(current)
+    if name is not None:
+        values["name"] = name
+    for scope, selected in (("channel", channel), ("harness", harness)):
+        if selected:
+            existing = list(values.get(scope, ()))
+            providers = []
+            for kind in selected:
+                match = next(
+                    (
+                        index
+                        for index, item in enumerate(existing)
+                        if item["kind"] == kind
+                    ),
+                    None,
+                )
+                providers.append(
+                    existing.pop(match) if match is not None else {"kind": kind}
+                )
+            values[scope] = providers
+    seen = set()
+    for option in settings:
+        identity = option.scope, option.path
+        if identity in seen and option.path.split(".")[-1] != "env":
+            raise click.BadParameter(
+                f"duplicate --set option: {option.scope}.{option.path}"
+            )
+        seen.add(identity)
+        names = option.path.split(".")
+        target = values
+        if option.scope != "agent":
+            providers = values.get(option.scope, ())
+            position = int(names.pop(0)) if names[0].isdecimal() else 0
+            if position >= len(providers):
+                raise click.BadParameter(
+                    f"{option.scope} provider position {position} is not configured"
+                )
+            target = providers[position]
+        for key in names[:-1]:
+            target = target.setdefault(key, {})
+        key = names[-1]
+        if key == "env" and option.scope == "harness":
+            target.setdefault(key, {}).update(option.value)
+        else:
+            target[key] = option.value
+    return values
+
+
+def table(rows: Iterable[tuple[str, ...]], headers: tuple[str, ...]) -> str:
+    rows = list(rows)
+    widths = [max(map(len, column)) for column in zip(headers, *rows, strict=True)]
+    return "\n".join(
+        "  ".join(
+            value.ljust(width) for value, width in zip(row, widths, strict=True)
+        ).rstrip()
+        for row in (headers, tuple("-" * width for width in widths), *rows)
+    )
+
+
+def create_commands(service: AgentManagement, client: Client) -> click.Group:
+    templates = Environment(
+        loader=PackageLoader("bazaar_contrib_agent_command", "resources"),
+        undefined=StrictUndefined,
+        autoescape=False,
+        auto_reload=False,
+        trim_blocks=True,
+        lstrip_blocks=True,
+    )
+    templates.filters["table"] = table
+
+    async def execute(
+        operation: Awaitable[Any],
+        template: str,
+        *,
+        rows: Callable[[Any], Iterable[tuple[str, ...]]] | None = None,
+        err: bool = False,
+        **context: object,
+    ):
+        try:
+            result = await operation
+            output = await asyncio.to_thread(
+                lambda: templates.get_template(template).render(
+                    result=result, rows=rows(result) if rows else (), **context
+                )
+            )
+            await asyncio.to_thread(click.echo, output.rstrip("\n"), err=err)
+        except click.ClickException:
+            raise
+        except Exception as error:
+            raise click.ClickException(str(error)) from error
+
+    @click.group("agent", help="Manage agents")
+    def agent():
+        pass
+
+    @agent.command("list", help="List agents")
+    def list_agents():
+        return execute(
+            service.read(),
+            "agents.tpl",
+            rows=lambda result: (
+                (
+                    agent.id,
+                    agent.name,
+                    ", ".join(provider.kind for provider in agent.channel),
+                    ", ".join(provider.kind for provider in agent.harness),
+                )
+                for agent in result.agents
+            ),
+        )
+
+    @agent.command("add", help="Add an agent")
+    @click.option("--name", required=True, metavar="NAME", help="The name of the agent")
+    @click.option(
+        "--channel",
+        multiple=True,
+        required=True,
+        type=click.Choice(tuple(service.channels)),
+        help="The channel providers to use",
+    )
+    @click.option(
+        "--harness",
+        multiple=True,
+        required=True,
+        type=click.Choice(tuple(service.harnesses)),
+        help="The harness providers to use",
+    )
+    @click.option(
+        "--set",
+        "options",
+        multiple=True,
+        metavar="SCOPE.KEY=VALUE",
+        help="Override an agent, channel, or harness setting",
+    )
+    def add(name, channel, harness, options):
+        values = parameters(
+            {}, name=name, channel=channel, harness=harness, options=options
+        )
+        return execute(
+            service.add(values), "agent_changed.tpl", action="Added", err=True
+        )
+
+    @agent.command("edit", help="Update an agent")
+    @click.argument("selector", metavar="AGENT")
+    @click.option("--name", metavar="NAME", help="The name of the agent")
+    @click.option(
+        "--channel",
+        multiple=True,
+        type=click.Choice(tuple(service.channels)),
+        help="The channel providers to use, replacing the current list",
+    )
+    @click.option(
+        "--harness",
+        multiple=True,
+        type=click.Choice(tuple(service.harnesses)),
+        help="The harness providers to use, replacing the current list",
+    )
+    @click.option(
+        "--set",
+        "options",
+        multiple=True,
+        metavar="SCOPE.KEY=VALUE",
+        help="Override an agent, channel, or harness setting",
+    )
+    def edit(selector, name, channel, harness, options):
+        async def update():
+            snapshot = await service.read()
+            current = service.select(snapshot.agents, selector)
+            values = parameters(
+                current.model_dump(mode="python"),
+                name=name,
+                channel=channel,
+                harness=harness,
+                options=options,
+            )
+            return await service.edit(
+                selector, values, expected_revision=snapshot.revision
+            )
+
+        return execute(update(), "agent_changed.tpl", action="Updated", err=True)
+
+    @agent.command("remove", help="Remove an agent")
+    @click.argument("selector", metavar="AGENT")
+    def remove(selector):
+        return execute(
+            service.remove(selector), "agent_changed.tpl", action="Removed", err=True
+        )
+
+    @agent.group("review", help="Review conversations")
+    def review():
+        pass
+
+    async def contact_review(
+        agent_id: str | None, decision: str | None, thread_id: str | None = None
+    ):
+        collaboration = await client.context.call(
+            "accept", Symbol("bazaar_contrib_collaboration:COLLABORATION")
+        )
+        if decision is not None:
+            snapshot = await service.read()
+            messages = await client.context.call(
+                "accept", Symbol("bazaar_contrib_messages:MESSAGES")
+            )
+            thread = Construct("bazaar_contrib_messages:Thread", {"id": thread_id})
+            for agent in snapshot.agents:
+                storage = await messages.call(
+                    "storage",
+                    Construct("bazaar_contrib_messages:Agent", {"id": agent.id}),
+                )
+                if await storage.call("get_thread", thread) is not None:
+                    agent_id = agent.id
+                    break
+            else:
+                raise ValueError(f"conversation not found: {thread_id}")
+        owner = Construct("bazaar_contrib_messages:Agent", {"id": agent_id})
+        contacts = await collaboration.call("for_agent", owner)
+        if decision is None:
+            messages = await contacts.get("messages")
+            inbox = await messages.call(
+                "check_inbox",
+                owner,
+                pending_only=False,
+                limit=None,
+                review=Construct(
+                    "bazaar_contrib_messages.states:Review", {"value": "pending"}
+                ),
+            )
+            rows = []
+            for target in await inbox.get("targets"):
+                rows.append(
+                    {
+                        key: await target.get(key)
+                        for key in ("thread_id", "channel", "target", "review")
+                    }
+                )
+            return rows
+        session = await contacts.call(
+            "review_contact",
+            Construct("bazaar_contrib_messages:Thread", {"id": thread_id}),
+            Construct("bazaar_contrib_messages.states:Review", {"value": decision}),
+        )
+        return await session.get("review")
+
+    @review.command("list", help="List pending conversations")
+    @click.argument("agent_id")
+    def pending(agent_id):
+        return execute(
+            contact_review(agent_id, None),
+            "agent_reviews.tpl",
+            rows=lambda result: (
+                (target["thread_id"], target["channel"], target["target"])
+                for target in result
+            ),
+        )
+
+    @review.command("approve", help="Approve a conversation")
+    @click.argument("thread_id")
+    def approve(thread_id):
+        return execute(
+            contact_review(None, "approved", thread_id),
+            "agent_reviewed.tpl",
+            thread_id=thread_id,
+            err=True,
+        )
+
+    @review.command("deny", help="Deny a conversation")
+    @click.argument("thread_id")
+    def deny(thread_id):
+        return execute(
+            contact_review(None, "denied", thread_id),
+            "agent_reviewed.tpl",
+            thread_id=thread_id,
+            err=True,
+        )
+
+    return agent

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/management.py

@@ -0,0 +1,176 @@
+"""Manage Agent configuration through its public model and selected carrier."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+from copy import deepcopy
+from dataclasses import dataclass
+from typing import Any
+from uuid import uuid7
+
+from bazaar_contrib_agent import AgentConfig, Config
+from bazaar_contrib_config import (
+    ConfigConflict,
+    ConfigDocument,
+    Configuration,
+    ConfigurationApplication,
+    ConfigurationEnvironment,
+)
+from bazaar_contrib_sidecar import Client, Symbol
+
+
+@dataclass(frozen=True, slots=True)
+class AgentConfiguration:
+    agents: tuple[AgentConfig, ...]
+    revision: str | None
+
+
+class AgentManagement:
+    """Edit saved Agent entities without acquiring their running instances."""
+
+    def __init__(
+        self,
+        configuration: Configuration,
+        client: Client,
+        channels: tuple[str, ...],
+        harnesses: tuple[str, ...],
+    ):
+        self.configuration = configuration
+        self.client = client
+        self.channels = channels
+        self.harnesses = harnesses
+
+    async def _read(self) -> tuple[dict[str, Any], Config, str | None]:
+        candidate, snapshot = await self.configuration.read()
+        document = ConfigDocument.model_validate(candidate.payload)
+        entry = next(
+            (
+                entry
+                for package in document.contribs
+                if package.applies
+                for entry in package.enabled
+                if entry.entry == "agent"
+            ),
+            None,
+        )
+        if entry is None:
+            raise ValueError("The agent contrib is not enabled")
+        return (
+            deepcopy(candidate.payload),
+            Config.model_validate(entry.config),
+            snapshot.revision if snapshot is not None else None,
+        )
+
+    async def _save(
+        self, payload: dict[str, Any], config: Config, revision: str | None
+    ) -> None:
+        document = ConfigDocument.model_validate(payload)
+        for index, package in enumerate(document.contribs):
+            if not package.applies:
+                continue
+            for position, entry in enumerate(package.enabled):
+                if entry.entry == "agent":
+                    payload["contribs"][index]["enabled"][position]["config"] = (
+                        config.model_dump(mode="json", exclude_none=True)
+                    )
+        if self.configuration.start is not None:
+            try:
+                configuration = await self.client.context.call(
+                    "accept", Symbol("bazaar_contrib_config:CONFIGURATION")
+                )
+            except FileNotFoundError, ConnectionRefusedError:
+                await self.configuration.commit(payload, expected_revision=revision)
+                return
+            environment = await configuration.get("environment")
+            environment = (
+                ConfigurationEnvironment.model_validate(
+                    await environment.call("model_dump", mode="json")
+                )
+                if environment is not None
+                else None
+            )
+            if (
+                environment.model_dump(mode="json") if environment is not None else None
+            ) != (
+                self.configuration.environment.model_dump(mode="json")
+                if self.configuration.environment is not None
+                else None
+            ):
+                raise ValueError(
+                    "the sidecar belongs to another configuration; "
+                    "select its configuration or endpoint"
+                )
+            _, snapshot = await configuration.call("read")
+            if (
+                await snapshot.get("revision") if snapshot is not None else None
+            ) != revision:
+                raise ConfigConflict(
+                    "the sidecar configuration differs from the selected source"
+                )
+            snapshot = await configuration.call(
+                "commit", payload, expected_revision=revision
+            )
+            result = await configuration.call("apply", snapshot)
+            result = ConfigurationApplication.model_validate(
+                await result.call("model_dump", mode="json")
+            )
+        else:
+            snapshot = await self.configuration.commit(
+                payload, expected_revision=revision
+            )
+            result = await self.configuration.apply(snapshot)
+        if result.error is not None or not result.applied:
+            raise ValueError(
+                f"configuration saved but not applied: {result.error}"
+                if result.error
+                else "configuration saved but not applied"
+            )
+
+    async def read(self) -> AgentConfiguration:
+        _, config, revision = await self._read()
+        return AgentConfiguration(config.agents, revision)
+
+    @staticmethod
+    def select(agents: tuple[AgentConfig, ...], selector: str) -> AgentConfig:
+        matches = [agent for agent in agents if selector in (agent.id, agent.name)]
+        if not matches:
+            raise ValueError(f"Agent not found: {selector}")
+        if len(matches) > 1:
+            raise ValueError(f"Agent selector is ambiguous: {selector}")
+        return matches[0]
+
+    async def add(self, values: Mapping[str, object]) -> AgentConfig:
+        payload, config, revision = await self._read()
+        agent = AgentConfig.model_validate({**values, "id": str(uuid7())})
+        await self._save(payload, Config(agents=(*config.agents, agent)), revision)
+        return agent
+
+    async def edit(
+        self,
+        selector: str,
+        values: Mapping[str, object],
+        *,
+        expected_revision: str | None,
+    ) -> AgentConfig:
+        payload, config, _ = await self._read()
+        current = self.select(config.agents, selector)
+        agent = AgentConfig.model_validate(
+            {**current.model_dump(mode="python"), **values, "id": current.id}
+        )
+        config = Config(
+            agents=tuple(
+                agent if item.id == current.id else item for item in config.agents
+            )
+        )
+        await self._save(payload, config, expected_revision)
+        return agent
+
+    async def remove(self, selector: str) -> AgentConfig:
+        payload, config, revision = await self._read()
+        agent = self.select(config.agents, selector)
+        await self._save(
+            payload,
+            Config(agents=tuple(item for item in config.agents if item.id != agent.id)),
+            revision,
+        )
+        return agent

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/resources/agent_changed.tpl

@@ -0,0 +1,4 @@
+{{ action }} agent `{{ result.name }}` (`{{ result.id }}`)
+{% if action == 'Removed' %}
+Workspace and data preserved
+{% endif %}

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/resources/agent_reviewed.tpl

@@ -0,0 +1 @@
+{{ result | capitalize }} conversation `{{ thread_id }}`

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/resources/agent_reviews.tpl

@@ -0,0 +1,5 @@
+{% if result %}
+{{ rows | table(("Thread", "Channel", "Target")) }}
+{% else %}
+No pending conversations
+{% endif %}

bazaar_contrib_agent_command-0.3.0rc1/src/bazaar_contrib_agent_command/resources/agents.tpl

@@ -0,0 +1,5 @@
+{% if result.agents %}
+{{ rows | table(("ID", "Name", "Channels", "Harnesses")) }}
+{% else %}
+No agents
+{% endif %}