docs(prd): add pipelock yaml contract

.codex/skills/quality-eval/SKILL.md

@@ -1,76 +0,0 @@
----
-name: quality-eval
-description: Use when the user asks to objectively evaluate, score, rate, audit, or quality-gate code, codebases, files, pull requests, or snippets using a strict 5-dimension engineering rubric with scores and refactoring steps.
-metadata:
-  short-description: Score code quality with a strict rubric
----
-
-# Quality Eval
-
-## Role
-
-Act as a Staff Software Engineer and automated quality gate. Evaluate code objectively against the rubric below, surface hidden anti-patterns, and provide a mathematical grade with atomic refactoring steps.
-
-## Evaluation Rules
-
-- Evaluate only against the five rubric dimensions.
-- Be candid. Do not inflate scores for politeness.
-- Avoid generic advice. Every recommendation must name a specific code location, behavior, or pattern and include a concrete improvement direction.
-- Inspect the code before scoring. For codebases, read enough representative files, tests, and architecture boundaries to justify the scope.
-- When exact line numbers are available, cite them.
-- Do not reveal private chain-of-thought. In the required `Chain of Thought Analysis` section, provide a concise, step-by-step audit rationale with observable findings and score justifications.
-
-## Rubric
-
-Score each dimension from 1 to 5 using these anchors:
-
-| Dimension | Score 1 (Fail) | Score 3 (Pass) | Score 5 (Exemplary) |
-| :--- | :--- | :--- | :--- |
-| **Architecture** | Spaghettified; tight coupling; violated separation of concerns. | Modular but relies on leaky abstractions or mixed domains. | Strict domain isolation; follows SOLID; clear dependency inversion. |
-| **Readability** | Cryptic naming; deep nesting (>3 levels); widespread DRY violations. | Idiomatic but features over-complex functions or sparse documentation. | Self-documenting; expressive naming; high cohesion; flat structure. |
-| **Resilience** | Swallows errors blindly; lacks contextual logging; fragile to bad input. | Basic try/catch blocks present but lacks granular, typed error handling. | Explicit error boundaries; contextual logging; structured failure modes. |
-| **Testability** | Hardcoded dependencies make mocking or isolated testing impossible. | Pure functions are testable, but side-effect heavy logic lacks test hooks. | Decoupled IO; deterministic execution; structured for unit and integration tests. |
-| **SecOps** | Hardcoded secrets; O(n^2) bottlenecks; zero input sanitization. | Safe from obvious flaws but lacks deep defensive optimization. | Validated inputs; optimized algorithmic complexity; zero security debt. |
-
-## Scoring Method
-
-1. Determine the evaluated scope and primary language.
-2. Identify concrete evidence for each dimension.
-3. Assign integer dimension scores from 1 to 5.
-4. Compute `composite_score` as the arithmetic mean of the five dimension scores, rounded to one decimal place.
-5. Include code snippets only when they make a refactoring step more actionable.
-
-## Required Output
-
-Structure every response into exactly these three Markdown sections:
-
-### 1. Chain of Thought Analysis
-
-Provide a concise step-by-step audit rationale. Name specific files, functions, patterns, anti-patterns, and rubric anchors. Keep it evidence-based and do not include hidden private reasoning.
-
-### 2. Normalized Score Report
-
-```json
-{
-  "evaluation_metadata": {
-    "target_scope": "string",
-    "primary_language": "string"
-  },
-  "metrics": {
-    "architecture_and_modularity": 0,
-    "readability_and_maintainability": 0,
-    "error_handling_and_resilience": 0,
-    "testability_and_mocking": 0,
-    "security_and_performance": 0
-  },
-  "composite_score": 0.0
-}
-```
-
-### 3. Atomic Refactoring Playbook
-
-* **High Priority (To lift Score 1/2 to 3):**
-  - [ ] Actionable, specific refactoring step with file/line/context reference.
-* **Medium Priority (To lift Score 3 to 4/5):**
-  - [ ] Optimization or architectural pattern implementation step.
-

.codex/skills/quality-eval/agents/openai.yaml

@@ -1,3 +0,0 @@
-display_name: Quality Eval
-short_description: Scores code quality with a strict five-dimension rubric and refactoring playbook.
-default_prompt: Evaluate this code objectively using the quality-eval rubric and return the three-section score report.

Dockerfile.codex

@@ -9,7 +9,7 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends git ca-certificates openssh-client socat curl dnsutils python3 python3-pip python3-venv \
   && rm -rf /var/lib/apt/lists/*
 
-RUN npm install -g --no-fund --no-audit @openai/codex@0.136.0 \
+RUN npm install -g --no-fund --no-audit @openai/codex@0.134.0 \
   && npm cache clean --force
 
 USER node

README.md

@@ -157,8 +157,14 @@ and MCP endpoints resolve without an agent-side change.
   upstream has *now* (fail-closed if unreachable). The agent's
   `~/.gitconfig` rewrites the real URL to the gate via `insteadOf`,
   so push, fetch, clone, and pull all route through. The agent
-  never sees the upstream credential. Brought up only when
-  `bottle.git` has entries. Design in `docs/prds/0008-git-gate.md`.
+  never sees the upstream credential. If the upstream's hostname
+  isn't resolvable from the gate container (e.g. a Tailscale-only
+  host whose public DNS points elsewhere), pin its IP via
+  `ExtraHosts: { "<hostname>": "<ip>" }` on the `bottle.git` entry —
+  the gate's `/etc/hosts` gets the override while the agent's
+  `insteadOf` rewrite still keys off the original hostname. Brought
+  up only when `bottle.git` has entries. Design in
+  `docs/prds/0008-git-gate.md`.
 - **cred-proxy image** — per-bottle sidecar (`python:3.13-alpine`
   base, stdlib-only) that holds API tokens declared in
   `bottle.cred_proxy.routes`. Each route names a `path`,

bot-bottle.demo.json

@@ -4,15 +4,14 @@
       "env": {
         "FAKE_TOKEN": "ghp_aB3cD4eF5gH6iJ7kL8mN9oP0qR1sT2uV3wX4yZ"
       },
-      "git-gate": {
-        "repos": {
-          "foo": {
-            "url": "ssh://git@upstream.invalid/path.git",
-            "identity": "~/.cache/bot-bottle-demo/fake-key",
-            "host_key": "ssh-ed25519 AAAAEXAMPLE"
-          }
+      "git": [
+        {
+          "Name": "foo",
+          "Upstream": "ssh://git@upstream.invalid/path.git",
+          "IdentityFile": "~/.cache/bot-bottle-demo/fake-key",
+          "KnownHostKey": "ssh-ed25519 AAAAEXAMPLE"
         }
-      }
+      ]
     }
   },
 

bot_bottle/agent_provider.py

@@ -7,7 +7,6 @@ command, default image, and prompt/auth behavior.
 
 from __future__ import annotations
 
-import json
 import os
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -137,11 +136,9 @@ def agent_provision_plan(
     auth_token: str = "",
     forward_host_credentials: bool = False,
     host_env: dict[str, str] | None = None,
-    trusted_project_path: str = "",
 ) -> AgentProvisionPlan:
     runtime = runtime_for(template)
     resolved_guest_env = dict(guest_env or {})
-    trusted_path = trusted_project_path or guest_home
     env_vars: dict[str, str] = {}
     provisioned_env: dict[str, str] = {}
     dirs: list[AgentProvisionDir] = []
@@ -159,9 +156,8 @@ def agent_provision_plan(
         dirs.append(AgentProvisionDir(auth_dir))
         config_path = f"{auth_dir}/config.toml"
         config_file = state_dir / "codex-config.toml"
-        toml_path = trusted_path.replace("\\", "\\\\").replace('"', '\\"')
         config_file.write_text(
-            f'[projects."{toml_path}"]\n'
+            f'[projects."{guest_home}"]\n'
             'trust_level = "trusted"\n'
         )
         config_file.chmod(0o600)
@@ -206,19 +202,6 @@ def agent_provision_plan(
     if template == PROVIDER_CLAUDE:
         env_vars["CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC"] = "1"
         env_vars["DISABLE_ERROR_REPORTING"] = "1"
-        claude_config = state_dir / "claude.json"
-        claude_projects = {
-            guest_home: {"hasTrustDialogAccepted": True},
-        }
-        claude_projects[trusted_path] = {"hasTrustDialogAccepted": True}
-        claude_config.write_text(json.dumps({
-            "hasCompletedOnboarding": True,
-            "theme": "dark",
-            "bypassPermissionsModeAccepted": True,
-            "projects": claude_projects,
-        }, indent=2) + "\n")
-        claude_config.chmod(0o600)
-        files.append(AgentProvisionFile(claude_config, f"{guest_home}/.claude.json"))
         egress_routes.append(EgressRoute(
             host="api.anthropic.com",
             auth_scheme="Bearer" if auth_token else "",

bot_bottle/backend/__init__.py

@@ -32,22 +32,15 @@ manifest does not carry a backend field; the host picks.
 from __future__ import annotations
 
 import os
-import sys
 from abc import ABC, abstractmethod
 from contextlib import AbstractContextManager
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Generic, Sequence, TypeVar
 
-from ..agent_provider import AgentProvisionPlan
-from ..egress import EgressPlan
-from ..git_gate import GitGatePlan
-from ..log import die, info
+from ..log import die
 from ..manifest import GitEntry, Manifest
-from ..supervise import SupervisePlan
 from ..util import expand_tilde
-from ..workspace import WorkspacePlan
-from .print_util import print_multi, visible_agent_env_names
 from .util import host_skill_dir
 
 
@@ -72,57 +65,15 @@ class BottleSpec:
 @dataclass(frozen=True)
 class BottlePlan(ABC):
     """Base output of a backend's prepare step. Concrete subclasses
-    (e.g. DockerBottlePlan) add backend-specific resolved fields."""
+    (e.g. DockerBottlePlan) add backend-specific resolved fields and
+    implement `print`."""
 
     spec: BottleSpec
     stage_dir: Path
-    git_gate_plan: GitGatePlan
-    egress_plan: EgressPlan
-    supervise_plan: SupervisePlan | None
-    agent_provision: AgentProvisionPlan
-    workspace_plan: WorkspacePlan
 
+    @abstractmethod
     def print(self, *, remote_control: bool) -> None:
         """Render the y/N preflight summary to stderr."""
-        del remote_control
-        spec = self.spec
-        manifest = spec.manifest
-        agent = manifest.agents[spec.agent_name]
-        bottle = manifest.bottle_for(spec.agent_name)
-
-        env_names = visible_agent_env_names(
-            sorted(
-                set(bottle.env.keys())
-                | set(self.agent_provision.guest_env.keys())
-            ),
-            hidden_env_names=self.agent_provision.hidden_env_names,
-        )
-
-        print(file=sys.stderr)
-        info(f"agent           : {spec.agent_name}")
-        info(f"provider        : {self.agent_provision.template}")
-        print_multi("env             ", env_names)
-        print_multi("skills          ", list(agent.skills))
-        info(f"bottle          : {agent.bottle}")
-
-        identity = manifest.git_identity_summary(spec.agent_name)
-        if identity:
-            info(f"  git identity  : {identity}")
-
-        git_lines = [
-            f"{u.name} → {u.upstream_host}:{u.upstream_port}"
-            for u in self.git_gate_plan.upstreams
-        ]
-        if git_lines:
-            print_multi("  git gate      ", git_lines)
-
-        if self.egress_plan.routes:
-            egress_lines = []
-            for r in self.egress_plan.routes:
-                auth = f" [auth:{r.auth_scheme}]" if r.auth_scheme else ""
-                egress_lines.append(f"{r.host}{auth}")
-            print_multi("  egress        ", egress_lines)
-        print(file=sys.stderr)
 
 
 @dataclass(frozen=True)
@@ -322,7 +273,7 @@ class BottleBackend(ABC, Generic[PlanT, CleanupT]):
         decide whether to add provider-specific prompt args to the agent's
         argv.
 
-        Default orchestration: ca → prompt → skills → workspace → git →
+        Default orchestration: ca → prompt → skills → git →
         supervise. CA install runs first so the agent's trust store
         is rebuilt before anything inside the agent makes a TLS call.
         Subclasses typically don't override this; they implement the
@@ -337,7 +288,6 @@ class BottleBackend(ABC, Generic[PlanT, CleanupT]):
         prompt_path = self.provision_prompt(plan, target)
         self.provision_provider_auth(plan, target)
         self.provision_skills(plan, target)
-        self.provision_workspace(plan, target)
         self.provision_git(plan, target)
         self.provision_supervise(plan, target)
         return prompt_path
@@ -368,11 +318,6 @@ class BottleBackend(ABC, Generic[PlanT, CleanupT]):
         """Copy the agent's named skills from the host into the
         running bottle. No-op when the agent has no skills."""
 
-    def provision_workspace(self, plan: PlanT, target: str) -> None:
-        """Copy the operator workspace into the running bottle when
-        the backend cannot bake it into the agent image. Default is
-        no-op for backends like Docker that handle this before launch."""
-
     @abstractmethod
     def provision_git(self, plan: PlanT, target: str) -> None:
         """Copy the host's cwd `.git` directory into the running
@@ -474,20 +419,14 @@ def enumerate_active_agents() -> list[ActiveAgent]:
     """All currently-running agents, across every available
     backend. Used by CLI `list active` and the dashboard's agents
     pane so neither has to know which backends exist. Skips
-    backends whose `is_available()` reports False.
-
-    Sorted by `(started_at, slug)` so the list is stable across
-    dashboard refresh ticks — agents don't shift position while
-    the operator navigates with arrow keys. ISO 8601 timestamps
-    sort lexicographically in chronological order; `slug` is the
-    deterministic tiebreaker. Agents with missing metadata
-    (`started_at == ""`) sort first."""
+    backends whose `is_available()` reports False. Ordered by
+    backend name, then by whatever each backend's
+    `enumerate_active` returns."""
     out: list[ActiveAgent] = []
     for name in known_backend_names():
         if not has_backend(name):
             continue
         out.extend(_BACKENDS[name].enumerate_active())
-    out.sort(key=lambda a: (a.started_at, a.slug))
     return out
 
 

bot_bottle/backend/docker/bottle_plan.py

@@ -2,25 +2,30 @@
 
 Carries the Docker-specific resolved fields produced by
 DockerBottleBackend.prepare. The launch step consumes it without
-further resolution; preflight rendering is inherited from BottlePlan.
+further resolution; show_plan-style rendering is the `print` method.
 """
 
 from __future__ import annotations
 
+import sys
 from dataclasses import dataclass, field
 from pathlib import Path
 
-from ...agent_provider import PromptMode
+from ...agent_provider import AgentProvisionPlan, PromptMode
+from ...egress import EgressPlan
+from ...git_gate import GitGatePlan
+from ...log import info
 from ...pipelock import PipelockProxyPlan
+from ...supervise import SupervisePlan
 from .. import BottlePlan
+from ..print_util import print_multi, visible_agent_env_names
 
 
 @dataclass(frozen=True)
 class DockerBottlePlan(BottlePlan):
     """Docker-specific resolved fields produced by
-    DockerBottleBackend.prepare. Inherits `spec`, `stage_dir`,
-    `git_gate_plan`, `egress_plan`, `supervise_plan`, and
-    `agent_provision` from BottlePlan."""
+    DockerBottleBackend.prepare. Inherits `spec` and `stage_dir` from
+    BottlePlan."""
 
     slug: str
     container_name: str
@@ -41,7 +46,13 @@ class DockerBottlePlan(BottlePlan):
     forwarded_env: dict[str, str] = field(repr=False)
     prompt_file: Path
     proxy_plan: PipelockProxyPlan
+    git_gate_plan: GitGatePlan
+    egress_plan: EgressPlan
+    # None when bottle.supervise is False. PRD 0013 supervise sidecar
+    # is opt-in via the manifest's bottle.supervise field.
+    supervise_plan: SupervisePlan | None
     use_runsc: bool
+    agent_provision: AgentProvisionPlan
 
     @property
     def agent_command(self) -> str:
@@ -54,3 +65,55 @@ class DockerBottlePlan(BottlePlan):
     @property
     def agent_provider_template(self) -> str:
         return self.agent_provision.template
+
+    def print(self, *, remote_control: bool) -> None:
+        """Render the y/N preflight summary to stderr — compact form
+        intended to fit on screen without scrolling. The full
+        structured shape (image, container, runtime, etc.) lives on
+        this dataclass for tooling that wants to introspect it."""
+        del remote_control  # not surfaced in the compact summary
+        spec = self.spec
+        manifest = spec.manifest
+        agent = manifest.agents[spec.agent_name]
+        bottle = manifest.bottle_for(spec.agent_name)
+        # The agent sees the union of literal env names (rendered into
+        # --env-file) and forwarded env names (`-e NAME` with the
+        # value arriving via subprocess env). The forwarded set holds
+        # the OAuth token (CLAUDE_CODE_OAUTH_TOKEN) and any host-env
+        # interpolations from the manifest; egress holds
+        # upstream tokens in its own environ, so no token forwarding
+        # from the agent to the proxy is needed.
+        env_names = visible_agent_env_names(
+            sorted(
+                set(bottle.env.keys())
+                | set(self.forwarded_env.keys())
+                | set(self.agent_provision.guest_env.keys())
+            ),
+            hidden_env_names=self.agent_provision.hidden_env_names,
+        )
+
+        print(file=sys.stderr)
+        info(f"agent           : {spec.agent_name}")
+        info(f"provider        : {self.agent_provider_template}")
+        print_multi("env             ", env_names)
+        print_multi("skills          ", list(agent.skills))
+        info(f"bottle          : {agent.bottle}")
+
+        identity = manifest.git_identity_summary(spec.agent_name)
+        if identity:
+            info(f"  git identity  : {identity}")
+
+        git_lines = [
+            f"{u.upstream_host}:{u.upstream_port}"
+            for u in self.git_gate_plan.upstreams
+        ]
+        if git_lines:
+            print_multi("  git gate      ", git_lines)
+
+        if self.egress_plan.routes:
+            egress_lines = []
+            for r in self.egress_plan.routes:
+                auth = f" [auth:{r.auth_scheme}]" if r.auth_scheme else ""
+                egress_lines.append(f"{r.host}{auth}")
+            print_multi("  egress        ", egress_lines)
+        print(file=sys.stderr)

bot_bottle/backend/docker/bottle_state.py

@@ -105,10 +105,6 @@ class BottleMetadata:
     # written before chunk 3 (resume / inspect should fall back to
     # deriving from identity in that case).
     compose_project: str = ""
-    # PRD 0040: backend name ("docker" or "smolmachines"). Empty string
-    # for state dirs written before PRD 0040; callers default to "docker"
-    # for backward compatibility.
-    backend: str = ""
 
 
 def metadata_path(identity: str) -> Path:
@@ -142,7 +138,6 @@ def read_metadata(identity: str) -> BottleMetadata | None:
         copy_cwd=bool(raw.get("copy_cwd", False)),
         started_at=str(raw.get("started_at", "")),
         compose_project=str(raw.get("compose_project", "")),
-        backend=str(raw.get("backend", "")),
     )
 
 

bot_bottle/backend/docker/compose.py

@@ -49,7 +49,7 @@ from ...egress import (
     EGRESS_HOSTNAME,
     EGRESS_ROUTES_IN_CONTAINER,
 )
-from ...git_gate import GIT_GATE_HOSTNAME
+from ...git_gate import GIT_GATE_HOSTNAME, git_gate_aggregate_extra_hosts
 from ...log import die, warn
 from ...pipelock import PIPELOCK_HOSTNAME
 from ...supervise import (
@@ -198,6 +198,7 @@ def _sidecar_bundle_service(plan: DockerBottlePlan) -> dict[str, Any]:
             env.append(token_env)
 
     # --- git-gate ----------------------------------------------------
+    extra_hosts: list[str] = []
     gp = plan.git_gate_plan
     if gp.upstreams:
         volumes += [
@@ -216,6 +217,8 @@ def _sidecar_bundle_service(plan: DockerBottlePlan) -> dict[str, Any]:
                     u.known_hosts_file,
                     f"{GIT_GATE_CREDS_DIR_IN_CONTAINER}/{u.name}-known_hosts",
                 ))
+        extra_map = git_gate_aggregate_extra_hosts(gp.upstreams)
+        extra_hosts = [f"{host}:{ip}" for host, ip in sorted(extra_map.items())]
 
     # --- supervise ---------------------------------------------------
     sp = plan.supervise_plan
@@ -258,6 +261,8 @@ def _sidecar_bundle_service(plan: DockerBottlePlan) -> dict[str, Any]:
         "environment": env,
         "volumes": volumes,
     }
+    if extra_hosts:
+        service["extra_hosts"] = extra_hosts
     return service
 
 

bot_bottle/backend/docker/launch.py

@@ -43,7 +43,7 @@ from pathlib import Path
 from typing import Callable, Generator
 
 from ...egress import egress_resolve_token_values
-from ...log import info, warn
+from ...log import info
 from . import network as network_mod
 from . import util as docker_mod
 from .bottle import DockerBottle
@@ -87,11 +87,10 @@ def launch(
     def teardown() -> None:
         try:
             stack.close()
-        except BaseException as exc:
-            warn(
-                f"teardown failed for container {plan.container_name}"
-                f" (compose-down): {exc!r}"
-            )
+        except BaseException:
+            # Teardown must not raise; swallow so the caller's
+            # __exit__ path can still propagate the original error.
+            pass
 
     try:
         # Step 1: agent image build. Sidecar images get built lazily by
@@ -102,7 +101,7 @@ def launch(
         )
         if plan.derived_image:
             docker_mod.build_image_with_cwd(
-                plan.derived_image, plan.image, plan.workspace_plan
+                plan.derived_image, plan.image, plan.spec.user_cwd
             )
 
         # Networks: compose-managed. The names are derived

bot_bottle/backend/docker/prepare.py

@@ -22,7 +22,6 @@ from ...git_gate import GitGate
 from ...log import die
 from ...pipelock import PipelockProxy
 from ...supervise import Supervise
-from ...workspace import workspace_plan as resolve_workspace_plan
 from .. import BottleSpec
 from . import util as docker_mod
 from .bottle_plan import DockerBottlePlan
@@ -63,8 +62,6 @@ def resolve_plan(
     bottle = manifest.bottle_for(spec.agent_name)
     provider = bottle.agent_provider
     provider_runtime = runtime_for(provider.template)
-    guest_home = os.environ.get("BOT_BOTTLE_CONTAINER_HOME", "/home/node")
-    workspace_plan = resolve_workspace_plan(spec, guest_home=guest_home)
 
     # PRD 0016 follow-up: identity, not bare slug. A fresh `start`
     # mints a random-suffixed identity (so parallel runs of the same
@@ -82,7 +79,6 @@ def resolve_plan(
         copy_cwd=spec.copy_cwd,
         started_at=datetime.now(timezone.utc).isoformat(),
         compose_project=f"bot-bottle-{slug}",
-        backend="docker",
     ))
     # Clear any leftover preserve marker from a prior capability-block
     # so this fresh launch can be cleaned up at session-end unless
@@ -180,11 +176,10 @@ def resolve_plan(
         template=provider.template,
         dockerfile=dockerfile_path,
         state_dir=agent_dir,
-        guest_home=guest_home,
+        guest_home=os.environ.get("BOT_BOTTLE_CONTAINER_HOME", "/home/node"),
         forward_host_credentials=provider.forward_host_credentials,
         auth_token=provider.auth_token,
         host_env=dict(os.environ),
-        trusted_project_path=workspace_plan.workdir,
     )
     guest_env = dict(agent_provision.guest_env)
     for key, val in agent_provision.env_vars.items():
@@ -249,7 +244,6 @@ def resolve_plan(
         supervise_plan=supervise_plan,
         use_runsc=use_runsc,
         agent_provision=agent_provision,
-        workspace_plan=workspace_plan,
     )
 
 

bot_bottle/backend/docker/provision/git.py

@@ -3,7 +3,7 @@
 Three concerns, all about git in the agent:
 
   1. If --cwd was passed AND the host cwd has a .git, copy that .git
-     into the planned guest workspace so the agent operates on the
+     into /home/node/workspace/.git so the agent operates on the
      user's repo.
   2. If the bottle declares `git` entries (PRD 0008), write a
      ~/.gitconfig with insteadOf rules so every git operation
@@ -20,6 +20,7 @@ from __future__ import annotations
 
 import os
 import subprocess
+from pathlib import Path
 
 from ....git_gate import GIT_GATE_HOSTNAME, git_gate_render_gitconfig
 from ....log import info
@@ -39,22 +40,19 @@ def _provision_cwd_git(plan: DockerBottlePlan, target: str) -> None:
     """If --cwd was set and the host cwd has a .git directory, copy
     it into /home/node/workspace/.git and fix ownership. No-op
     otherwise."""
-    workspace = plan.workspace_plan
-    if not (workspace.enabled and workspace.copy_git and workspace.has_host_git_dir):
+    if not (plan.spec.copy_cwd and Path(plan.spec.user_cwd, ".git").is_dir()):
         return
     container = target
-    guest_workspace_git = f"{workspace.guest_path}/.git"
-    host_git = str(workspace.host_path / ".git")
-    info(f"copying {host_git} -> {container}:{guest_workspace_git}")
+    info(f"copying {plan.spec.user_cwd}/.git -> {container}:/home/node/workspace/.git")
     subprocess.run(
-        ["docker", "cp", host_git, f"{container}:{guest_workspace_git}"],
+        ["docker", "cp", f"{plan.spec.user_cwd}/.git", f"{container}:/home/node/workspace/.git"],
         stdout=subprocess.DEVNULL,
         check=True,
     )
     subprocess.run(
         [
             "docker", "exec", "-u", "0", container,
-            "chown", "-R", workspace.owner, guest_workspace_git,
+            "chown", "-R", "node:node", "/home/node/workspace/.git",
         ],
         stdout=subprocess.DEVNULL,
         check=True,

bot_bottle/backend/docker/util.py

@@ -7,11 +7,9 @@ from __future__ import annotations
 import re
 import shutil
 import subprocess
-import tempfile
 from typing import Iterable, Iterator
 
 from ...log import die, info
-from ...workspace import WorkspacePlan
 
 
 # Cap on the suffix the container-name conflict logic will try before
@@ -118,39 +116,35 @@ def build_image(ref: str, context: str, *, dockerfile: str = "") -> None:
     subprocess.run(args, check=True)
 
 
-def build_image_with_cwd(
-    derived: str,
-    base: str,
-    workspace: WorkspacePlan,
-) -> None:
-    """Build a thin derived image that copies the workspace into
-    the plan's guest path and sets the plan's workdir."""
+_TRUST_DIALOG_NODE_SCRIPT = (
+    'const fs=require("fs"),p=process.env.HOME+"/.claude.json",'
+    'c=JSON.parse(fs.readFileSync(p,"utf8"));'
+    'c.projects=c.projects||{};'
+    'c.projects[process.env.HOME+"/workspace"]={hasTrustDialogAccepted:true};'
+    'fs.writeFileSync(p,JSON.stringify(c,null,2));'
+)
+
+
+def build_image_with_cwd(derived: str, base: str, cwd: str) -> None:
+    """Build a thin derived image that copies <cwd> into
+    /home/node/workspace and adds a trust-dialog entry for it."""
     import os
 
-    cwd = str(workspace.host_path)
     if not os.path.isdir(cwd):
         die(f"cwd not found at {cwd}")
-    info(f"building image {derived} from {base} with {cwd} -> {workspace.guest_path}")
-    with tempfile.TemporaryDirectory(prefix="bot-bottle-cwd.") as tmp:
-        context_dir = os.path.join(tmp, "context")
-        staged_workspace = os.path.join(context_dir, "workspace")
-        shutil.copytree(
-            cwd,
-            staged_workspace,
-            symlinks=True,
-            ignore=shutil.ignore_patterns(".git"),
-        )
-        dockerfile = (
-            f"FROM {base}\n"
-            f"COPY --chown=node:node workspace/. {workspace.guest_path}\n"
-            f"WORKDIR {workspace.workdir}\n"
-        )
-        subprocess.run(
-            ["docker", "build", "-t", derived, "-f", "-", context_dir],
-            input=dockerfile,
-            text=True,
-            check=True,
-        )
+    info(f"building image {derived} from {base} with {cwd} -> /home/node/workspace")
+    dockerfile = (
+        f"FROM {base}\n"
+        f"COPY --chown=node:node . /home/node/workspace\n"
+        f"RUN node -e '{_TRUST_DIALOG_NODE_SCRIPT}'\n"
+        f"WORKDIR /home/node/workspace\n"
+    )
+    subprocess.run(
+        ["docker", "build", "-t", derived, "-f", "-", cwd],
+        input=dockerfile,
+        text=True,
+        check=True,
+    )
 
 
 def image_id(ref: str) -> str:

bot_bottle/backend/smolmachines/backend.py

@@ -22,7 +22,6 @@ from .provision import prompt as _prompt
 from .provision import provider_auth as _provider_auth
 from .provision import skills as _skills
 from .provision import supervise as _supervise
-from .provision import workspace as _workspace
 
 
 class SmolmachinesBottleBackend(
@@ -73,11 +72,6 @@ class SmolmachinesBottleBackend(
     ) -> None:
         _skills.provision_skills(plan, target)
 
-    def provision_workspace(
-        self, plan: SmolmachinesBottlePlan, target: str
-    ) -> None:
-        _workspace.provision_workspace(plan, target)
-
     def provision_git(
         self, plan: SmolmachinesBottlePlan, target: str
     ) -> None:

bot_bottle/backend/smolmachines/bottle_plan.py

@@ -8,20 +8,25 @@ in chunk 4."""
 
 from __future__ import annotations
 
+import sys
 from dataclasses import dataclass
 from pathlib import Path
 
-from ...agent_provider import PromptMode
+from ...agent_provider import AgentProvisionPlan, PromptMode
+from ...egress import EgressPlan
+from ...git_gate import GitGatePlan
+from ...log import info
 from ...pipelock import PipelockProxyPlan
+from ...supervise import SupervisePlan
 from .. import BottlePlan
+from ..print_util import print_multi, visible_agent_env_names
 
 
 @dataclass(frozen=True)
 class SmolmachinesBottlePlan(BottlePlan):
     """Resolved fields the launch step needs to bring up the bottle.
 
-    Inherits `spec`, `stage_dir`, `git_gate_plan`, `egress_plan`,
-    `supervise_plan`, and `agent_provision` from BottlePlan."""
+    Inherits `spec` and `stage_dir` from BottlePlan."""
 
     slug: str
     # Per-bottle docker subnet for the sidecar bundle container.
@@ -72,6 +77,12 @@ class SmolmachinesBottlePlan(BottlePlan):
     # per-bottle bridge with a pinned IP. The unused fields stay
     # at their dataclass defaults.
     proxy_plan: PipelockProxyPlan
+    git_gate_plan: GitGatePlan
+    egress_plan: EgressPlan
+    # None when bottle.supervise is False, matching the docker
+    # backend's convention.
+    supervise_plan: SupervisePlan | None
+    agent_provision: AgentProvisionPlan
     # Agent-side endpoints. On Docker Desktop the docker bridge
     # IPs aren't reachable from the smolvm guest (TSI uses macOS
     # networking; docker container IPs live in the daemon's VM),
@@ -99,3 +110,42 @@ class SmolmachinesBottlePlan(BottlePlan):
     @property
     def agent_dockerfile_path(self) -> str:
         return self.agent_provision.dockerfile
+
+    def print(self, *, remote_control: bool) -> None:
+        """Compact y/N preflight. Same shape as the Docker
+        backend's so operators see one format across backends."""
+        del remote_control  # not surfaced in the compact summary
+        spec = self.spec
+        manifest = spec.manifest
+        agent = manifest.agents[spec.agent_name]
+        bottle = manifest.bottle_for(spec.agent_name)
+
+        env_names = visible_agent_env_names(
+            sorted(
+                set(bottle.env.keys())
+                | set(self.agent_provision.guest_env.keys())
+            ),
+            hidden_env_names=self.agent_provision.hidden_env_names,
+        )
+        upstreams = [
+            f"{g.Name} → {g.Upstream}" for g in bottle.git
+        ]
+        # Use the resolved egress_plan (lowercase `host` on the
+        # plan-level EgressRoute) rather than `bottle.egress.routes`,
+        # which is the manifest's capitalized-attr form.
+        routes = [r.host for r in self.egress_plan.routes]
+
+        print(file=sys.stderr)
+        info(f"agent           : {spec.agent_name}")
+        info(f"provider        : {self.agent_provider_template}")
+        print_multi("env             ", env_names)
+        print_multi("skills          ", list(agent.skills))
+        info(f"bottle          : {agent.bottle}")
+        identity = manifest.git_identity_summary(spec.agent_name)
+        if identity:
+            info(f"  git identity  : {identity}")
+        if upstreams:
+            print_multi("  git gate      ", upstreams)
+        if routes:
+            print_multi("  egress        ", routes)
+        print(file=sys.stderr)

bot_bottle/backend/smolmachines/launch.py

@@ -349,6 +349,7 @@ def _bundle_launch_spec(
             env.append(token_env)
 
     # --- git-gate ---------------------------------------------
+    extra_hosts: list[str] = []
     gp = plan.git_gate_plan
     if gp.upstreams:
         daemons += ["git-gate", "git-http"]

bot_bottle/backend/smolmachines/prepare.py

@@ -28,11 +28,9 @@ from ...backend.docker.bottle_state import (
     write_metadata,
 )
 from ...egress import Egress
-from ...env import resolve_env
 from ...git_gate import GitGate
 from ...pipelock import PipelockProxy
 from ...supervise import Supervise
-from ...workspace import workspace_plan as resolve_workspace_plan
 from .bottle_plan import SmolmachinesBottlePlan
 from .util import smolmachines_bundle_subnet, smolmachines_preflight
 
@@ -61,8 +59,6 @@ def resolve_plan(
     bottle = manifest.bottle_for(spec.agent_name)
     provider = bottle.agent_provider
     provider_runtime = runtime_for(provider.template)
-    guest_home = os.environ.get("BOT_BOTTLE_GUEST_HOME", "/home/node")
-    workspace_plan = resolve_workspace_plan(spec, guest_home=guest_home)
 
     slug = spec.identity or bottle_identity(spec.agent_name)
 
@@ -74,24 +70,25 @@ def resolve_plan(
         cwd=spec.user_cwd if spec.copy_cwd else "",
         copy_cwd=spec.copy_cwd,
         started_at=datetime.now(timezone.utc).isoformat(),
+        # No compose project for smolmachines bottles; chunk 4
+        # will give dashboard discovery a backend-specific path.
         compose_project="",
-        backend="smolmachines",
     ))
 
     subnet, gateway, bundle_ip = smolmachines_bundle_subnet(slug)
 
-    # Agent's env: resolve through resolve_env() so ?prompt entries
-    # are prompted and ${HOST_VAR} entries are interpolated — matching
-    # the Docker backend's contract. Forwarded (secret/interpolated)
-    # values still reach the guest as -e K=V smolvm flags because
-    # smolvm 0.8.0 has no env-file or stdin injection path; this is
-    # the known argv-exposure gap documented in PRD 0038.
-    # HTTPS_PROXY / GIT_GATE_URL / MCP_SUPERVISE_URL are populated
-    # in launch.py after bundle bringup.
-    resolved = resolve_env(manifest, spec.agent_name)
+    # Agent's env: the prepare-time view doesn't yet know the
+    # host loopback ports the bundle's daemons get published on
+    # (those come from docker AFTER `docker run` returns), so
+    # HTTPS_PROXY / GIT_GATE_URL / MCP_SUPERVISE_URL are
+    # populated in launch.py and stamped onto guest_env there.
+    # What we set here is the part that doesn't depend on
+    # bundle bringup — bottle.env literals, the empty-NO_PROXY
+    # safe default, and the TLS trust env trio
+    # (NODE_EXTRA_CA_CERTS / SSL_CERT_FILE / REQUESTS_CA_BUNDLE)
+    # pointing at Debian's update-ca-certificates output bundle.
     guest_env: dict[str, str] = {
-        **resolved.literals,
-        **resolved.forwarded,
+        **bottle.env,
         "NO_PROXY":    "localhost,127.0.0.1",
         "NODE_EXTRA_CA_CERTS": "/etc/ssl/certs/ca-certificates.crt",
         "SSL_CERT_FILE":       "/etc/ssl/certs/ca-certificates.crt",
@@ -133,12 +130,11 @@ def resolve_plan(
         template=provider.template,
         dockerfile=agent_dockerfile_path,
         state_dir=agent_dir,
-        guest_home=guest_home,
+        guest_home=os.environ.get("BOT_BOTTLE_GUEST_HOME", "/home/node"),
         guest_env=guest_env,
         forward_host_credentials=provider.forward_host_credentials,
         auth_token=provider.auth_token,
         host_env=dict(os.environ),
-        trusted_project_path=workspace_plan.workdir,
     )
     merged_guest_env = dict(agent_provision.guest_env)
     for key, val in agent_provision.env_vars.items():
@@ -185,7 +181,6 @@ def resolve_plan(
         egress_plan=egress_plan,
         supervise_plan=supervise_plan,
         agent_provision=agent_provision,
-        workspace_plan=workspace_plan,
     )
 
 

bot_bottle/backend/smolmachines/provision/git.py

@@ -4,7 +4,7 @@
 Three concerns, all about git in the agent:
 
   1. If --cwd was passed AND the host cwd has a .git, copy that
-     .git into the planned guest workspace so the agent operates on
+     .git into /home/node/workspace/.git so the agent operates on
      the user's repo.
   2. If the bottle declares `git` entries (PRD 0008), write a
      ~/.gitconfig with insteadOf rules so every git operation
@@ -58,22 +58,20 @@ def _provision_cwd_git(plan: SmolmachinesBottlePlan, target: str) -> None:
     """If --cwd was set and the host cwd has a .git directory, copy
     it into <guest_home>/workspace/.git and fix ownership. No-op
     otherwise."""
-    workspace = plan.workspace_plan
-    if not (workspace.enabled and workspace.copy_git and workspace.has_host_git_dir):
+    if not (plan.spec.copy_cwd and Path(plan.spec.user_cwd, ".git").is_dir()):
         return
-    guest_workspace_git = f"{workspace.guest_path}/.git"
-    host_git = str(workspace.host_path / ".git")
-    info(f"copying {host_git} -> {target}:{guest_workspace_git}")
+    guest_workspace_git = f"{_guest_home()}/workspace/.git"
+    info(f"copying {plan.spec.user_cwd}/.git -> {target}:{guest_workspace_git}")
     # mkdir -p the workspace dir so `machine cp` lands the .git
     # directly there even on first-time bottles.
-    _smolvm.machine_exec(target, ["mkdir", "-p", workspace.guest_path])
+    _smolvm.machine_exec(target, ["mkdir", "-p", f"{_guest_home()}/workspace"])
     _smolvm.machine_cp(
-        host_git, f"{target}:{guest_workspace_git}",
+        f"{plan.spec.user_cwd}/.git", f"{target}:{guest_workspace_git}",
     )
     # `machine cp` lands files as root; the agent runs as node so
     # the workspace tree must be chowned over.
     _smolvm.machine_exec(
-        target, ["chown", "-R", workspace.owner, guest_workspace_git],
+        target, ["chown", "-R", "node:node", guest_workspace_git],
     )
 
 

bot_bottle/backend/smolmachines/provision/workspace.py

@@ -1,36 +0,0 @@
-"""Copy the operator workspace into a smolmachines guest."""
-
-from __future__ import annotations
-
-import shlex
-
-from ....log import info
-from .. import smolvm as _smolvm
-from ..bottle_plan import SmolmachinesBottlePlan
-
-
-def provision_workspace(plan: SmolmachinesBottlePlan, target: str) -> None:
-    """Copy host cwd contents to the planned guest workspace."""
-    workspace = plan.workspace_plan
-    if not (workspace.enabled and workspace.copy_contents):
-        return
-
-    guest_parent = workspace.guest_path.rsplit("/", 1)[0] or "/"
-    guest_path_q = shlex.quote(workspace.guest_path)
-    guest_parent_q = shlex.quote(guest_parent)
-    owner_q = shlex.quote(workspace.owner)
-    mode_q = shlex.quote(workspace.mode)
-    info(f"copying {workspace.host_path} -> {target}:{workspace.guest_path}")
-    _smolvm.machine_exec(
-        target,
-        ["sh", "-c", f"rm -rf {guest_path_q} && mkdir -p {guest_parent_q}"],
-    )
-    _smolvm.machine_cp(str(workspace.host_path), f"{target}:{workspace.guest_path}")
-    _smolvm.machine_exec(
-        target,
-        [
-            "sh", "-c",
-            f"chown -R {owner_q} {guest_path_q} && "
-            f"chmod {mode_q} {guest_path_q}",
-        ],
-    )

bot_bottle/cli/dashboard.py

@@ -175,13 +175,6 @@ def approve(
             qp.proposal.bottle_slug, file_to_apply,
         )
     elif qp.proposal.tool == TOOL_CAPABILITY_BLOCK:
-        _meta = read_metadata(qp.proposal.bottle_slug)
-        if _meta is not None and not _meta.compose_project:
-            raise CapabilityApplyError(
-                "capability-block remediation is not supported for smolmachines "
-                "bottles. Reject this proposal or handle the capability change "
-                "manually, then restart the bottle."
-            )
         diff_before, diff_after = apply_capability_change(
             qp.proposal.bottle_slug, file_to_apply,
         )
@@ -647,19 +640,23 @@ def _bottle_for_slug(
 ) -> tuple["object", str]:
     """Return `(bottle_handle, prompt_path_hint)` for a re-attach.
     If the slug is in `bottles` (dashboard-owned), return the stored
-    handle directly. Otherwise synthesize a bottle from the persisted
-    metadata. The backend field in metadata (PRD 0040) selects Docker
-    or smolmachines; unknown or missing metadata defaults to Docker.
+    handle directly. Otherwise synthesize a `DockerBottle` from the
+    container name `bot-bottle-<slug>`. For synthesized bottles
+    the prompt-file path comes from the manifest's agent if we can
+    resolve it via metadata.json + the loaded manifest; otherwise
+    the re-attach runs without `--append-system-prompt-file`.
 
     Returns the empty string for prompt_path_hint when we omit the
     flag — the caller passes None to DockerBottle in that case."""
     from ..backend.docker.bottle import DockerBottle
     from ..backend.docker.bottle_state import read_metadata
-    from ..backend.smolmachines.bottle import SmolmachinesBottle
     if slug in bottles:
         _cm, bottle, _identity = bottles[slug]
         return bottle, ""
-    instance_name = f"bot-bottle-{slug}"
+    # The container hosting the agent's agent process is named
+    # `bot-bottle-<slug>` — set by the compose renderer
+    # (no service suffix on the agent service, by design).
+    container_name = f"bot-bottle-{slug}"
     prompt_path: str | None = None
     metadata = read_metadata(slug)
     if metadata is not None and manifest is not None:
@@ -669,18 +666,11 @@ def _bottle_for_slug(
                 "BOT_BOTTLE_CONTAINER_HOME", "/home/node",
             )
             prompt_path = f"{container_home}/.bot-bottle-prompt.txt"
-    backend = metadata.backend if metadata is not None else ""
-    if backend == "smolmachines":
-        synth: object = SmolmachinesBottle(
-            instance_name,
-            prompt_path=prompt_path,
-        )
-    else:
-        synth = DockerBottle(
-            container=instance_name,
-            teardown=lambda: None,
-            prompt_path_in_container=prompt_path,
-        )
+    synth = DockerBottle(
+        container=container_name,
+        teardown=lambda: None,
+        prompt_path_in_container=prompt_path,
+    )
     return synth, (prompt_path or "")
 
 

bot_bottle/cli/resume.py

@@ -52,10 +52,8 @@ def cmd_resume(argv: list[str]) -> int:
         user_cwd=metadata.cwd or USER_CWD,
         identity=metadata.identity,
     )
-    backend_name = metadata.backend or None
     return _launch_bottle(
         spec,
         dry_run=args.dry_run,
         remote_control=args.remote_control,
-        backend_name=backend_name,
     )

bot_bottle/codex_auth.py

@@ -122,14 +122,6 @@ def _dummy_exp(now: datetime | None, exp_ts: int | None) -> int:
     return int(check_now.timestamp()) + 3600
 
 
-def _dummy_timestamp(now: datetime | None = None) -> str:
-    check_now = now or datetime.now(timezone.utc)
-    if check_now.tzinfo is None:
-        check_now = check_now.replace(tzinfo=timezone.utc)
-    check_now = check_now.astimezone(timezone.utc)
-    return check_now.isoformat(timespec="milliseconds").replace("+00:00", "Z")
-
-
 def _dummy_jwt(now: datetime | None = None, *, exp_ts: int | None = None) -> str:
     return _encode_dummy_jwt({
         "exp": _dummy_exp(now, exp_ts),
@@ -195,10 +187,8 @@ def _redact_claims(value: object) -> object:
                 out[key] = inner if isinstance(inner, list) else []
             elif isinstance(inner, bool):
                 out[key] = inner
-            elif isinstance(inner, dict):
-                out[key] = {}
-            elif isinstance(inner, list):
-                out[key] = []
+            elif isinstance(inner, (dict, list)):
+                out[key] = _redact_claims(inner)
             else:
                 out[key] = "bot-bottle-placeholder"
         return out
@@ -247,53 +237,28 @@ def _redact_auth_claim(value: object) -> dict:
 def _redact_codex_auth(
     value: object, *, now: datetime | None = None, exp_ts: int | None = None,
 ) -> object:
-    auth = value if isinstance(value, dict) else {}
-    out: dict[str, object] = {}
-    for key, inner in auth.items():
-        lower = key.lower()
-        if lower == "auth_mode" and isinstance(inner, str) and inner:
-            out[key] = inner
-        elif lower == "openai_api_key":
-            out[key] = None
-        elif lower == "last_refresh":
-            # Codex parses this as a timestamp on startup. Keep the
-            # schema valid without copying host-side session metadata.
-            out[key] = _dummy_timestamp(now)
-        elif lower == "tokens":
-            out[key] = _redact_token_block(inner, now=now, exp_ts=exp_ts)
-        else:
-            out[key] = _redact_unknown_auth_value(inner)
-    return out
-
-
-def _redact_token_block(
-    value: object, *, now: datetime | None = None, exp_ts: int | None = None,
-) -> dict[str, object]:
-    tokens = value if isinstance(value, dict) else {}
-    out: dict[str, object] = {}
-    for key, inner in tokens.items():
-        lower = key.lower()
-        if lower in {"access_token", "id_token"}:
-            out[key] = _dummy_jwt_from_host(inner, now=now, exp_ts=exp_ts)
-        elif lower == "account_id" and isinstance(inner, str) and inner:
-            # Current Codex uses this non-secret selected account id
-            # while egress owns the real bearer token.
-            out[key] = inner
-        else:
-            out[key] = _redact_unknown_auth_value(inner)
-    return out
-
-
-def _redact_unknown_auth_value(value: object) -> object:
-    if isinstance(value, bool):
-        return value
     if isinstance(value, dict):
-        return {}
+        out: dict[str, object] = {}
+        for key, inner in value.items():
+            lower = key.lower()
+            if lower == "openai_api_key":
+                out[key] = None
+            elif lower == "tokens":
+                out[key] = _redact_codex_auth(inner, now=now, exp_ts=exp_ts)
+            elif lower in {"access_token", "id_token"}:
+                out[key] = _dummy_jwt_from_host(inner, now=now, exp_ts=exp_ts)
+            elif "token" in lower or "secret" in lower or lower.endswith("_key"):
+                out[key] = "bot-bottle-placeholder"
+            elif lower == "account_id" and isinstance(inner, str) and inner:
+                out[key] = inner
+            elif lower in {"account_id", "user_id", "email"}:
+                out[key] = "bot-bottle-placeholder"
+            else:
+                out[key] = _redact_codex_auth(inner, now=now, exp_ts=exp_ts)
+        return out
     if isinstance(value, list):
-        return []
-    if value is None:
-        return None
-    return "bot-bottle-placeholder"
+        return [_redact_codex_auth(v, now=now, exp_ts=exp_ts) for v in value]
+    return value
 
 
 def _jwt_exp(token: str) -> datetime | None:

bot_bottle/git_gate.py

@@ -29,11 +29,12 @@ backend-specific and lives on concrete subclasses (see
 
 from __future__ import annotations
 
-import shlex
 from abc import ABC, abstractmethod
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from pathlib import Path
+from typing import Mapping
 
+from .log import die
 from .manifest import Bottle, GitEntry
 
 
@@ -46,6 +47,10 @@ GIT_GATE_HOSTNAME = "git-gate"
 GIT_GATE_DAEMON_TIMEOUT_SECS = 15
 
 
+def _empty_str_map() -> dict[str, str]:
+    return {}
+
+
 @dataclass(frozen=True)
 class GitGateUpstream:
     """One bare repo on the gate. `name` drives the bare-repo path
@@ -59,7 +64,10 @@ class GitGateUpstream:
     KnownHostKey string from the manifest; the gate's start step
     materialises it into a known_hosts file if non-empty.
 
-    the gate credential paths inside the running sidecar."""
+    `extra_hosts` is a `{hostname: ip}` map the backend injects into
+    the gate container's `/etc/hosts` via `--add-host` so the gate
+    can resolve upstream hostnames that aren't reachable via the
+    container's default DNS (e.g. Tailscale-only hosts)."""
 
     name: str
     upstream_url: str
@@ -68,6 +76,7 @@ class GitGateUpstream:
     identity_file: str
     known_host_key: str
     known_hosts_file: Path = Path()
+    extra_hosts: Mapping[str, str] = field(default_factory=_empty_str_map)
 
 
 @dataclass(frozen=True)
@@ -104,11 +113,38 @@ def git_gate_upstreams_for_bottle(bottle: Bottle) -> tuple[GitGateUpstream, ...]
             upstream_port=e.UpstreamPort,
             identity_file=e.IdentityFile,
             known_host_key=e.KnownHostKey,
+            extra_hosts=dict(e.ExtraHosts),
         )
         for e in bottle.git
     )
 
 
+def git_gate_aggregate_extra_hosts(
+    upstreams: tuple[GitGateUpstream, ...],
+) -> dict[str, str]:
+    """Merge every upstream's `extra_hosts` into a single
+    `{hostname: ip}` map for `--add-host` on the gate container. Two
+    entries naming the same hostname with different IPs is a manifest
+    bug — the gate has one /etc/hosts — so die loudly with the
+    conflicting names rather than silently picking one."""
+    merged: dict[str, str] = {}
+    source: dict[str, str] = {}
+    for u in upstreams:
+        for host, ip in u.extra_hosts.items():
+            existing = merged.get(host)
+            if existing is None:
+                merged[host] = ip
+                source[host] = u.name
+            elif existing != ip:
+                die(
+                    f"git-gate ExtraHosts conflict: '{host}' maps to "
+                    f"'{existing}' in upstream '{source[host]}' and to "
+                    f"'{ip}' in upstream '{u.name}'. The gate has one "
+                    f"/etc/hosts; pick one IP."
+                )
+    return merged
+
+
 def git_gate_render_gitconfig(
     entries: tuple[GitEntry, ...], gate_host: str, *, scheme: str = "git",
 ) -> str:
@@ -208,7 +244,10 @@ def git_gate_render_entrypoint(upstreams: tuple[GitGateUpstream, ...]) -> str:
         "mkdir -p /git",
     ]
     for u in upstreams:
-        lines.append(f"init_repo {shlex.quote(u.name)} {shlex.quote(u.upstream_url)}")
+        # Single-quote args so URL/path content (containing : and /)
+        # passes through ash unmangled. Names came through the manifest
+        # validator so they don't contain a single quote.
+        lines.append(f"init_repo '{u.name}' '{u.upstream_url}'")
     lines.extend([
         "",
         "exec git daemon \\",
@@ -404,6 +443,7 @@ class GitGate(ABC):
                     identity_file=u.identity_file,
                     known_host_key=u.known_host_key,
                     known_hosts_file=known_hosts_file,
+                    extra_hosts=dict(u.extra_hosts),
                 )
             )
         return GitGatePlan(

bot_bottle/git_http_backend.py

@@ -19,9 +19,6 @@ from urllib.parse import urlsplit
 
 DEFAULT_PORT = 9420
 
-# Body-size cap matching supervise_server.py's 1 MiB limit.
-MAX_BODY_BYTES = 1 * 1024 * 1024
-
 
 class GitHttpHandler(BaseHTTPRequestHandler):
     server_version = "bot-bottle-git-http/1"
@@ -42,25 +39,13 @@ class GitHttpHandler(BaseHTTPRequestHandler):
             hook_path = os.environ.get(
                 "GIT_GATE_ACCESS_HOOK", "/etc/git-gate/access-hook",
             )
-            peer = self.client_address[0]
             hook = subprocess.run(
-                [hook_path, "upload-pack", str(repo_dir), peer, peer],
+                [hook_path, "upload-pack",
+                 str(repo_dir), self.client_address[0], self.client_address[0]],
                 capture_output=True,
                 check=False,
             )
             if hook.returncode != 0:
-                detail = (hook.stderr or hook.stdout).decode(
-                    "utf-8", errors="replace",
-                ).rstrip()
-                if detail:
-                    for line in detail.splitlines():
-                        self.log_message("access-hook denied %s: %s",
-                                         parsed.path, line)
-                else:
-                    self.log_message(
-                        "access-hook denied %s: exit=%d (no output)",
-                        parsed.path, hook.returncode,
-                    )
                 self.send_response(403)
                 self.send_header("Content-Type", "text/plain; charset=utf-8")
                 self.end_headers()
@@ -91,18 +76,7 @@ class GitHttpHandler(BaseHTTPRequestHandler):
             value = self.headers.get(header)
             if value:
                 env[variable] = value
-        raw_length = self.headers.get("content-length", "0") or "0"
-        try:
-            length = int(raw_length)
-        except ValueError:
-            self.send_error(400, "Bad Content-Length")
-            return
-        if length < 0:
-            self.send_error(400, "Negative Content-Length")
-            return
-        if length > MAX_BODY_BYTES:
-            self.send_error(413, "Request body too large")
-            return
+        length = int(self.headers.get("content-length", "0") or "0")
         body = self.rfile.read(length) if length else b""
         proc = subprocess.run(
             ["git", "http-backend"],

bot_bottle/manifest.py

@@ -14,9 +14,9 @@ the system prompt, for bottles the body is human documentation
 Bottle schema (frontmatter):
   extends:      <bottle-name>                   # optional (PRD 0025)
   env:          { <NAME>: <env-entry>, ... }
-  git-gate:                                     # optional (PRD 0047)
+  git:
     user:       { name: <str>, email: <str> }   # optional
-    repos:      { <name>: <git-gate-entry>, ... }  # optional
+    remotes:    { <host>: <git-entry>, ... }    # optional
   egress: { routes: [ <egress-route>, ... ] }
     # route keys: host, path_allowlist, auth, role, pipelock
     # pipelock: { tls_passthrough: <bool>, ssrf_ip_allowlist: [<cidr>, ...] }
@@ -25,8 +25,6 @@ Bottle schema (frontmatter):
 Agent schema (frontmatter):
   bottle:        <bottle-name>          # required
   skills:        [ <skill-name>, ... ]   # optional
-  git-gate:
-    user:        { name: <str>, email: <str> }  # optional; overlays bottle
   # Claude Code subagent passthrough fields — accepted, ignored:
   name, description, model, color, memory
 
@@ -45,48 +43,541 @@ on-disk files.
 
 from __future__ import annotations
 
+import ipaddress
 import os
 from dataclasses import dataclass, field, replace
 from pathlib import Path
-from typing import Mapping
+from typing import Mapping, cast
 
-from .manifest_util import ManifestError, as_json_object
-from .manifest_agent import Agent, AgentProvider
-from .manifest_egress import (
-    EGRESS_AUTH_SCHEMES,
-    EgressConfig,
-    EgressRoute,
-    PipelockRoutePolicy,
-    validate_egress_routes,
-)
-from .manifest_git import GitEntry, GitUser, parse_git_gate_config
-from .manifest_schema import BOTTLE_KEYS
+from .agent_provider import PROVIDER_TEMPLATES
+from .log import warn
+from .manifest_schema import AGENT_MODEL_KEYS, BOTTLE_KEYS
 
-# Re-export everything that callers currently import from this module.
-__all__ = [
-    "ManifestError",
-    "GitEntry",
-    "GitUser",
-    "AgentProvider",
-    "EGRESS_AUTH_SCHEMES",
-    "PipelockRoutePolicy",
-    "EgressRoute",
-    "EgressConfig",
-    "Agent",
-    "Bottle",
-    "Manifest",
-]
+
+class ManifestError(Exception):
+    """A manifest file (or the manifest tree) is invalid."""
 
 
 def _empty_str_dict() -> dict[str, str]:
     return {}
 
 
-def _section_dict(value: object, label: str) -> dict[str, object]:
-    """Like as_json_object but treats absent/null as an empty section."""
-    if value is None:
-        return {}
-    return as_json_object(value, label)
+@dataclass(frozen=True)
+class GitEntry:
+    """One upstream the per-agent git-gate (PRD 0008) is allowed to
+    talk to. `Upstream` is the real remote URL the agent would push to
+    if there were no gate; the gate hosts a bare repo at /git/<Name>.git
+    and `IdentityFile` is the SSH key the gate uses to push that repo
+    upstream after gitleaks passes. The agent itself never holds the
+    upstream credential.
+
+    `ExtraHosts` is an optional `{hostname: ip}` map injected into the
+    gate container's `/etc/hosts` via `--add-host`. Use it when the
+    Upstream's hostname isn't resolvable from the gate (e.g. a
+    Tailscale-only host whose public DNS A record points elsewhere):
+    the agent's `insteadOf` rewrite still matches the original
+    hostname, but the gate routes to the right IP.
+
+    The Upstream URL is parsed once at construction and the pieces are
+    stashed in the `Upstream*` fields so the git-gate render step
+    doesn't have to re-parse."""
+
+    Name: str
+    Upstream: str
+    IdentityFile: str
+    KnownHostKey: str = ""
+    ExtraHosts: Mapping[str, str] = field(default_factory=_empty_str_dict)
+    RemoteKey: str = ""
+    UpstreamUser: str = ""
+    UpstreamHost: str = ""
+    UpstreamPort: str = ""
+    UpstreamPath: str = ""
+
+    @classmethod
+    def from_dict(cls, bottle_name: str, idx: int, raw: object) -> "GitEntry":
+        d = _as_json_object(raw, f"bottle '{bottle_name}' git[{idx}]")
+        return cls._from_object(bottle_name, d, f"git[{idx}]", None)
+
+    @classmethod
+    def from_remote_dict(
+        cls, bottle_name: str, host_key: str, raw: object
+    ) -> "GitEntry":
+        if not host_key:
+            raise ManifestError(f"bottle '{bottle_name}' git.remotes has an empty host key")
+        d = _as_json_object(raw, f"bottle '{bottle_name}' git.remotes[{host_key!r}]")
+        return cls._from_object(
+            bottle_name, d, f"git.remotes[{host_key!r}]", host_key,
+        )
+
+    @classmethod
+    def _from_object(
+        cls,
+        bottle_name: str,
+        d: dict[str, object],
+        label: str,
+        host_key: str | None,
+    ) -> "GitEntry":
+        name = d.get("Name")
+        if not isinstance(name, str) or not name:
+            raise ManifestError(
+                f"bottle '{bottle_name}' {label} missing required string "
+                f"field 'Name'"
+            )
+        upstream = d.get("Upstream")
+        if not isinstance(upstream, str) or not upstream:
+            raise ManifestError(
+                f"bottle '{bottle_name}' {label} '{name}' missing required string field "
+                f"'Upstream'"
+            )
+        ident = d.get("IdentityFile")
+        if not isinstance(ident, str) or not ident:
+            raise ManifestError(
+                f"bottle '{bottle_name}' {label} '{name}' missing required string field "
+                f"'IdentityFile'"
+            )
+        khk = _opt_str(
+            d.get("KnownHostKey"),
+            f"bottle '{bottle_name}' {label} '{name}' KnownHostKey",
+        )
+        extra_hosts = _opt_extra_hosts(
+            d.get("ExtraHosts"),
+            f"bottle '{bottle_name}' {label} '{name}' ExtraHosts",
+        )
+        user, host, port, path = _parse_git_upstream(
+            upstream, f"bottle '{bottle_name}' {label} '{name}' Upstream"
+        )
+        if (
+            host_key is not None
+            and host_key != host
+            and not _is_ip_literal(host)
+        ):
+            raise ManifestError(
+                f"bottle '{bottle_name}' git.remotes key {host_key!r} "
+                f"does not match Upstream host {host!r}"
+            )
+        return cls(
+            Name=name,
+            Upstream=upstream,
+            IdentityFile=ident,
+            KnownHostKey=khk,
+            ExtraHosts=extra_hosts,
+            RemoteKey=host_key or host,
+            UpstreamUser=user,
+            UpstreamHost=host,
+            UpstreamPort=port,
+            UpstreamPath=path,
+        )
+
+
+# Auth schemes for the egress route's optional `auth` block.
+# Same values cred-proxy accepts today; `token` sidesteps the Gitea
+# token-not-Bearer quirk (go-gitea/gitea#16734).
+EGRESS_AUTH_SCHEMES = ("Bearer", "token")
+
+
+@dataclass(frozen=True)
+class AgentProvider:
+    """Provider/template for the agent process inside a bottle.
+
+    `template` selects a built-in launch/runtime contract. `dockerfile`
+    optionally points at a custom agent-image Dockerfile while leaving
+    bot-bottle's sidecar infrastructure intact.
+
+    `auth_token` names the host env var that holds the provider's OAuth
+    token (Claude only). The provisioner injects a provider-owned egress
+    route for api.anthropic.com that re-injects this token as the Bearer
+    header, and sets a placeholder CLAUDE_CODE_OAUTH_TOKEN in the agent
+    so the Claude Code CLI starts.
+
+    `forward_host_credentials` forwards the host Codex auth token into
+    the egress sidecar (Codex only).
+    """
+
+    template: str = "claude"
+    dockerfile: str = ""
+    auth_token: str = ""
+    forward_host_credentials: bool = False
+
+    @classmethod
+    def from_dict(cls, bottle_name: str, raw: object) -> "AgentProvider":
+        d = _as_json_object(raw, f"bottle '{bottle_name}' agent_provider")
+        for k in d:
+            if k not in {"template", "dockerfile", "auth_token", "forward_host_credentials"}:
+                raise ManifestError(
+                    f"bottle '{bottle_name}' agent_provider has unknown key {k!r}; "
+                    f"allowed: template, dockerfile, auth_token, forward_host_credentials"
+                )
+        template = d.get("template", "claude")
+        if not isinstance(template, str) or not template:
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.template must be a "
+                f"non-empty string"
+            )
+        if template not in PROVIDER_TEMPLATES:
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.template {template!r} "
+                f"is not one of {', '.join(sorted(PROVIDER_TEMPLATES))}"
+            )
+        dockerfile = d.get("dockerfile", "")
+        if not isinstance(dockerfile, str):
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.dockerfile must be a "
+                f"string (was {type(dockerfile).__name__})"
+            )
+        auth_token = d.get("auth_token", "")
+        if not isinstance(auth_token, str):
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.auth_token must be a "
+                f"string (was {type(auth_token).__name__})"
+            )
+        if auth_token and template != "claude":
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.auth_token is only "
+                f"supported for template 'claude'"
+            )
+        forward_host_credentials = d.get("forward_host_credentials", False)
+        if not isinstance(forward_host_credentials, bool):
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.forward_host_credentials "
+                f"must be a boolean (was {type(forward_host_credentials).__name__})"
+            )
+        if forward_host_credentials and template != "codex":
+            raise ManifestError(
+                f"bottle '{bottle_name}' agent_provider.forward_host_credentials "
+                "is currently only supported for template 'codex'"
+            )
+        return cls(
+            template=template,
+            dockerfile=dockerfile,
+            auth_token=auth_token,
+            forward_host_credentials=forward_host_credentials,
+        )
+
+
+@dataclass(frozen=True)
+class GitUser:
+    """Per-bottle `git config --global user.name` / `user.email`
+    pair (issue #86). The agent's commits inside the bottle are
+    attributed to this identity rather than the agent image's
+    image-baked default (no user, or whatever the image dropped
+    in). Either or both fields can be set independently.
+
+    `from_dict` is forgiving on shape (a single missing field is
+    fine — we just skip that config line at provisioning) but
+    strict on types (string-or-die)."""
+
+    name: str = ""
+    email: str = ""
+
+    @classmethod
+    def from_dict(cls, bottle_name: str, raw: object) -> "GitUser":
+        d = _as_json_object(raw, f"bottle '{bottle_name}' git.user")
+        for k in d.keys():
+            if k not in {"name", "email"}:
+                raise ManifestError(
+                    f"bottle '{bottle_name}' git.user has unknown key {k!r}; "
+                    f"allowed: name, email"
+                )
+        name = d.get("name", "")
+        email = d.get("email", "")
+        if not isinstance(name, str):
+            raise ManifestError(
+                f"bottle '{bottle_name}' git.user.name must be a string "
+                f"(was {type(name).__name__})"
+            )
+        if not isinstance(email, str):
+            raise ManifestError(
+                f"bottle '{bottle_name}' git.user.email must be a string "
+                f"(was {type(email).__name__})"
+            )
+        if not name and not email:
+            raise ManifestError(
+                f"bottle '{bottle_name}' git.user is set but neither "
+                f"name nor email is non-empty; remove the block or "
+                f"fill at least one field."
+            )
+        return cls(name=name, email=email)
+
+    def is_empty(self) -> bool:
+        return not self.name and not self.email
+
+
+def _parse_git_config(
+    bottle_name: str,
+    raw: object,
+) -> tuple[tuple[GitEntry, ...], GitUser]:
+    d = _as_json_object(raw, f"bottle '{bottle_name}' git")
+    for k in d.keys():
+        if k not in {"user", "remotes"}:
+            raise ManifestError(
+                f"bottle '{bottle_name}' git has unknown key {k!r}; "
+                f"allowed: user, remotes"
+            )
+
+    git_user = (
+        GitUser.from_dict(bottle_name, d["user"])
+        if "user" in d
+        else GitUser()
+    )
+
+    git: tuple[GitEntry, ...] = ()
+    remotes_raw = d.get("remotes")
+    if remotes_raw is not None:
+        remotes = _as_json_object(remotes_raw, f"bottle '{bottle_name}' git.remotes")
+        git = tuple(
+            GitEntry.from_remote_dict(bottle_name, host, entry)
+            for host, entry in remotes.items()
+        )
+        _validate_unique_git_names(bottle_name, git)
+
+    return git, git_user
+
+
+@dataclass(frozen=True)
+class PipelockRoutePolicy:
+    """Per-route pipelock policy overrides.
+
+    `TlsPassthrough` adds the route host to pipelock's
+    `tls_interception.passthrough_domains`, so pipelock still enforces
+    the hostname allowlist but does not MITM/decrypt request bodies or
+    headers for that host.
+
+    `SsrfIpAllowlist` adds explicit IPs/CIDRs to pipelock's SSRF
+    allowlist for private/internal destinations behind this route.
+    """
+
+    TlsPassthrough: bool = False
+    SsrfIpAllowlist: tuple[str, ...] = ()
+
+    @classmethod
+    def from_dict(
+        cls, bottle_name: str, idx: int, raw: object,
+    ) -> "PipelockRoutePolicy":
+        label = f"bottle '{bottle_name}' egress.routes[{idx}] pipelock"
+        d = _as_json_object(raw, label)
+        for k in d:
+            if k not in ("tls_passthrough", "ssrf_ip_allowlist"):
+                raise ManifestError(
+                    f"{label} has unknown key {k!r}; "
+                    f"only 'tls_passthrough' and 'ssrf_ip_allowlist' "
+                    f"are accepted"
+                )
+        tls_passthrough_raw = d.get("tls_passthrough", False)
+        if not isinstance(tls_passthrough_raw, bool):
+            raise ManifestError(
+                f"{label}.tls_passthrough must be a boolean "
+                f"(was {type(tls_passthrough_raw).__name__})"
+            )
+        ssrf_raw = d.get("ssrf_ip_allowlist", [])
+        if not isinstance(ssrf_raw, list):
+            raise ManifestError(
+                f"{label}.ssrf_ip_allowlist must be an array "
+                f"(was {type(ssrf_raw).__name__})"
+            )
+        ssrf_ip_allowlist: list[str] = []
+        for j, item in enumerate(ssrf_raw):
+            if not isinstance(item, str) or not item:
+                raise ManifestError(
+                    f"{label}.ssrf_ip_allowlist[{j}] must be a non-empty "
+                    f"string (was {type(item).__name__})"
+                )
+            try:
+                ipaddress.ip_network(item, strict=False)
+            except ValueError as e:
+                raise ManifestError(
+                    f"{label}.ssrf_ip_allowlist[{j}] must be an IP address "
+                    f"or CIDR (was {item!r}): {e}"
+                )
+            ssrf_ip_allowlist.append(item)
+        return cls(
+            TlsPassthrough=tls_passthrough_raw,
+            SsrfIpAllowlist=tuple(ssrf_ip_allowlist),
+        )
+
+
+@dataclass(frozen=True)
+class EgressRoute:
+    """One route on the per-bottle egress sidecar (PRD 0017).
+
+    `Host` matches the request's hostname (case-insensitive). The
+    optional `PathAllowlist` constrains the URL path to a set of
+    prefixes; empty tuple means no path-level filtering. The optional
+    `AuthScheme` / `TokenRef` pair drives credential injection:
+    when set, the proxy strips any inbound Authorization and injects
+    `<AuthScheme> <value-of-host-env-named-by-TokenRef>`. When the
+    manifest's `auth` block is omitted both fields are empty strings —
+    no Authorization is written, no token forwarded.
+
+    `Role` is reserved for future use; all role strings are currently
+    rejected by the validator.
+
+    Validation rules (enforced in `from_dict`):
+      - `host` required, non-empty.
+      - `path_allowlist` optional, list of absolute path prefixes.
+      - `auth` optional. If present, MUST carry both `scheme` and
+        `token_ref` as non-empty strings; an empty `auth: {}` is an
+        error rather than a synonym for "no auth" (omit `auth` for
+        that case).
+      - `role` optional, reserved — any non-empty value is rejected.
+    """
+
+    Host: str
+    PathAllowlist: tuple[str, ...] = ()
+    AuthScheme: str = ""
+    TokenRef: str = ""
+    Role: tuple[str, ...] = ()
+    Pipelock: PipelockRoutePolicy = field(default_factory=PipelockRoutePolicy)
+
+    @classmethod
+    def from_dict(cls, bottle_name: str, idx: int, raw: object) -> "EgressRoute":
+        label = f"bottle '{bottle_name}' egress.routes[{idx}]"
+        d = _as_json_object(raw, label)
+        host = d.get("host")
+        if not isinstance(host, str) or not host:
+            raise ManifestError(f"{label} missing required string field 'host'")
+
+        path_allow_raw = d.get("path_allowlist")
+        prefixes: tuple[str, ...] = ()
+        if path_allow_raw is not None:
+            if not isinstance(path_allow_raw, list):
+                raise ManifestError(
+                    f"{label} path_allowlist must be an array "
+                    f"(was {type(path_allow_raw).__name__})"
+                )
+            path_list = cast(list[object], path_allow_raw)
+            collected: list[str] = []
+            for j, p in enumerate(path_list):
+                if not isinstance(p, str):
+                    raise ManifestError(
+                        f"{label} path_allowlist[{j}] must be a string "
+                        f"(was {type(p).__name__})"
+                    )
+                if not p.startswith("/"):
+                    raise ManifestError(
+                        f"{label} path_allowlist[{j}] {p!r} must be an "
+                        f"absolute path prefix starting with '/'"
+                    )
+                collected.append(p)
+            prefixes = tuple(collected)
+
+        auth_scheme = ""
+        token_ref = ""
+        if "auth" in d:
+            auth_raw = d.get("auth")
+            auth_d = _as_json_object(auth_raw, f"{label} auth")
+            if not auth_d:
+                raise ManifestError(
+                    f"{label} auth is empty ({{}}); omit the 'auth' key "
+                    f"entirely if this route is unauthenticated. Otherwise "
+                    f"both 'scheme' and 'token_ref' are required."
+                )
+            auth_scheme_raw = auth_d.get("scheme")
+            if not isinstance(auth_scheme_raw, str) or not auth_scheme_raw:
+                raise ManifestError(
+                    f"{label} auth.scheme is required when 'auth' is set "
+                    f"(non-empty string)"
+                )
+            if auth_scheme_raw not in EGRESS_AUTH_SCHEMES:
+                raise ManifestError(
+                    f"{label} auth.scheme {auth_scheme_raw!r} is not one of "
+                    f"{', '.join(EGRESS_AUTH_SCHEMES)}"
+                )
+            token_ref_raw = auth_d.get("token_ref")
+            if not isinstance(token_ref_raw, str) or not token_ref_raw:
+                raise ManifestError(
+                    f"{label} auth.token_ref is required when 'auth' is set "
+                    f"(name of the host env var holding the token value)"
+                )
+            for k in auth_d:
+                if k not in ("scheme", "token_ref"):
+                    raise ManifestError(
+                        f"{label} auth has unknown key {k!r}; "
+                        f"only 'scheme' and 'token_ref' are accepted"
+                    )
+            auth_scheme = auth_scheme_raw
+            token_ref = token_ref_raw
+
+        role_raw = d.get("role")
+        roles: tuple[str, ...] = ()
+        if role_raw is None:
+            roles = ()
+        elif isinstance(role_raw, str):
+            roles = (role_raw,)
+        elif isinstance(role_raw, list):
+            role_list = cast(list[object], role_raw)
+            collected_roles: list[str] = []
+            for r in role_list:
+                if not isinstance(r, str):
+                    raise ManifestError(f"{label} role items must be strings (got {type(r).__name__})")
+                collected_roles.append(r)
+            roles = tuple(collected_roles)
+        else:
+            raise ManifestError(
+                f"{label} role must be a string or a list of strings "
+                f"(was {type(role_raw).__name__})"
+            )
+        if roles:
+            raise ManifestError(
+                f"{label} role {roles[0]!r} is not accepted; "
+                f"the 'role' field is reserved for future use"
+            )
+
+        pipelock = (
+            PipelockRoutePolicy.from_dict(bottle_name, idx, d["pipelock"])
+            if "pipelock" in d
+            else PipelockRoutePolicy()
+        )
+
+        for k in d:
+            if k not in ("host", "path_allowlist", "auth", "role", "pipelock"):
+                raise ManifestError(
+                    f"{label} has unknown key {k!r}; accepted keys are "
+                    f"'host', 'path_allowlist', 'auth', 'role', 'pipelock'"
+                )
+
+        return cls(
+            Host=host,
+            PathAllowlist=prefixes,
+            AuthScheme=auth_scheme,
+            TokenRef=token_ref,
+            Role=roles,
+            Pipelock=pipelock,
+        )
+
+
+@dataclass(frozen=True)
+class EgressConfig:
+    """Per-bottle egress configuration. Today this is just the
+    route table; the nesting under `egress:` leaves room for
+    per-bottle proxy settings (port override, log level, etc.) in
+    follow-ups."""
+
+    routes: tuple[EgressRoute, ...] = ()
+
+    @classmethod
+    def from_dict(cls, bottle_name: str, raw: object) -> "EgressConfig":
+        d = _as_json_object(raw, f"bottle '{bottle_name}' egress")
+        routes_raw = d.get("routes")
+        routes: tuple[EgressRoute, ...] = ()
+        if routes_raw is not None:
+            if not isinstance(routes_raw, list):
+                raise ManifestError(
+                    f"bottle '{bottle_name}' egress.routes must be an array "
+                    f"(was {type(routes_raw).__name__})"
+                )
+            routes_list = cast(list[object], routes_raw)
+            routes = tuple(
+                EgressRoute.from_dict(bottle_name, i, entry)
+                for i, entry in enumerate(routes_list)
+            )
+            _validate_egress_routes(bottle_name, routes)
+        for k in d:
+            if k != "routes":
+                raise ManifestError(
+                    f"bottle '{bottle_name}' egress has unknown key {k!r}; "
+                    f"only 'routes' is accepted"
+                )
+        return cls(routes=routes)
 
 
 @dataclass(frozen=True)
@@ -95,9 +586,10 @@ class Bottle:
     agent_provider: AgentProvider = field(default_factory=AgentProvider)
     git: tuple[GitEntry, ...] = ()
     # Per-bottle git identity (issue #86). Empty default — bottles
-    # that don't set `git-gate.user:` in the manifest skip the
-    # `git config --global` step entirely. A bottle can declare a user
-    # identity without any git-gate.repos upstreams, and vice versa.
+    # that don't set `git.user:` in the manifest skip the
+    # `git config --global` step entirely. Set independently of
+    # the `git.remotes:` upstream map above: a bottle can declare a user
+    # identity without any git-gate upstreams, and vice versa.
     git_user: GitUser = field(default_factory=GitUser)
     egress: EgressConfig = field(default_factory=EgressConfig)
     # Opt-in per-bottle stuck-recovery sidecar (PRD 0013). When true,
@@ -111,7 +603,7 @@ class Bottle:
 
     @classmethod
     def from_dict(cls, name: str, raw: object) -> "Bottle":
-        d = as_json_object(raw, f"bottle '{name}'")
+        d = _as_json_object(raw, f"bottle '{name}'")
 
         if "runtime" in d:
             raise ManifestError(
@@ -124,22 +616,16 @@ class Bottle:
         if "ssh" in d:
             raise ManifestError(
                 f"bottle '{name}' has an 'ssh' field, which has been removed "
-                f"(PRD 0009). Declare upstreams under 'git-gate.repos' with "
-                f"url + identity + host_key; the git-gate sidecar (PRD 0008) "
-                f"holds the credential and gitleaks-scans pushes."
-            )
-
-        if "git" in d:
-            raise ManifestError(
-                f"bottle '{name}' uses 'git' which has been replaced by "
-                f"'git-gate' (PRD 0047). Move git.user → git-gate.user "
-                f"and git.remotes → git-gate.repos (fields: url, identity, host_key)."
+                f"(PRD 0009). Move each entry to 'git': declare the upstream "
+                f"as a git remote with Name + Upstream URL + IdentityFile, "
+                f"and the per-bottle git-gate (PRD 0008) will hold the "
+                f"credential and gitleaks-scan pushes."
             )
 
         if "git_user" in d:
             raise ManifestError(
                 f"bottle '{name}' has a 'git_user' field, which has been "
-                f"removed. Move it under 'git-gate.user'."
+                f"removed. Move it under 'git.user'."
             )
 
         unknown = set(d.keys()) - BOTTLE_KEYS
@@ -153,7 +639,7 @@ class Bottle:
         env: dict[str, str] = {}
         env_raw = d.get("env")
         if env_raw is not None:
-            env_dict = as_json_object(env_raw, f"bottle '{name}' env")
+            env_dict = _as_json_object(env_raw, f"bottle '{name}' env")
             for var, value in env_dict.items():
                 if not isinstance(value, str):
                     raise ManifestError(
@@ -164,9 +650,9 @@ class Bottle:
 
         git: tuple[GitEntry, ...] = ()
         git_user = GitUser()
-        git_raw = d.get("git-gate")
+        git_raw = d.get("git")
         if git_raw is not None:
-            git, git_user = parse_git_gate_config(name, git_raw)
+            git, git_user = _parse_git_config(name, git_raw)
 
         agent_provider = (
             AgentProvider.from_dict(name, d["agent_provider"])
@@ -193,6 +679,83 @@ class Bottle:
         )
 
 
+@dataclass(frozen=True)
+class Agent:
+    bottle: str
+    skills: tuple[str, ...] = ()
+    prompt: str = ""
+    # Per-agent git identity (issue #94). Overlays the referenced
+    # bottle's git.user per-field at `Manifest.bottle_for`. Only the
+    # `user` block is allowed at the agent level; `git.remotes` stays
+    # bottle-only because it carries credentials and host trust.
+    git_user: GitUser = GitUser()
+
+    @classmethod
+    def from_dict(cls, name: str, raw: object, bottle_names: set[str]) -> "Agent":
+        d = _as_json_object(raw, f"agent '{name}'")
+        unknown = set(d.keys()) - AGENT_MODEL_KEYS
+        if unknown:
+            allowed = ", ".join(sorted(AGENT_MODEL_KEYS))
+            raise ManifestError(
+                f"agent '{name}' has unknown key(s) {sorted(unknown)}; "
+                f"allowed keys are {allowed}."
+            )
+
+        bottle = d.get("bottle")
+        if not isinstance(bottle, str) or not bottle:
+            raise ManifestError(f"agent '{name}' must declare a 'bottle' field naming a defined bottle")
+        if bottle not in bottle_names:
+            available = ", ".join(sorted(bottle_names)) or "(none defined)"
+            raise ManifestError(
+                f"agent '{name}' references bottle '{bottle}', which is not defined. "
+                f"Available: {available}"
+            )
+
+        skills: tuple[str, ...] = ()
+        skills_raw = d.get("skills")
+        if skills_raw is not None:
+            if not isinstance(skills_raw, list):
+                raise ManifestError(f"agent '{name}' skills must be an array (was {type(skills_raw).__name__})")
+            collected: list[str] = []
+            skills_list = cast(list[object], skills_raw)
+            for i, skill in enumerate(skills_list):
+                if not isinstance(skill, str):
+                    raise ManifestError(
+                        f"agent '{name}' skills[{i}] must be a string "
+                        f"(was {type(skill).__name__})"
+                    )
+                collected.append(skill)
+            skills = tuple(collected)
+
+        prompt_raw = d.get("prompt")
+        if prompt_raw is None:
+            prompt = ""
+        elif isinstance(prompt_raw, str):
+            prompt = prompt_raw
+        else:
+            raise ManifestError(f"agent '{name}' prompt must be a string (was {type(prompt_raw).__name__})")
+
+        # git: agents may declare only `git.user` (name/email). Any
+        # other git key — notably `remotes` — is rejected: remotes
+        # carry credentials and host trust and stay bottle-only.
+        git_user = GitUser()
+        git_raw = d.get("git")
+        if git_raw is not None:
+            gd = _as_json_object(git_raw, f"agent '{name}' git")
+            for k in gd.keys():
+                if k != "user":
+                    raise ManifestError(
+                        f"agent '{name}' git.{k} is not allowed at the "
+                        f"agent level; only git.user (name/email) may be "
+                        f"set on an agent. git.remotes is bottle-only "
+                        f"(it carries credentials and host trust)."
+                    )
+            if "user" in gd:
+                git_user = GitUser.from_dict(name, gd["user"])
+
+        return cls(bottle=bottle, skills=skills, prompt=prompt, git_user=git_user)
+
+
 @dataclass(frozen=True)
 class Manifest:
     bottles: Mapping[str, Bottle]
@@ -277,7 +840,6 @@ class Manifest:
                 files = sorted(stale_bottles.glob("*.md"))
                 if files:
                     names = ", ".join(p.name for p in files)
-                    from .log import warn
                     warn(
                         f"ignoring bottle file(s) under "
                         f"{stale_bottles}: {names}. Bottles can only "
@@ -295,7 +857,7 @@ class Manifest:
     @classmethod
     def from_json_obj(cls, obj: object) -> "Manifest":
         """Validate and build a Manifest from a raw JSON-like dict."""
-        d = as_json_object(obj, "manifest")
+        d = _as_json_object(obj, "manifest")
         raw_bottles_obj = _section_dict(d.get("bottles"), "manifest 'bottles'")
         raw_agents = _section_dict(d.get("agents"), "manifest 'agents'")
 
@@ -304,7 +866,7 @@ class Manifest:
         # consistently with the md-loader path.
         raw_bottles: dict[str, dict[str, object]] = {}
         for n, b in raw_bottles_obj.items():
-            raw_bottles[n] = as_json_object(b, f"bottle '{n}'")
+            raw_bottles[n] = _as_json_object(b, f"bottle '{n}'")
         from .manifest_extends import resolve_bottles
 
         bottles = resolve_bottles(raw_bottles)
@@ -384,3 +946,124 @@ class Manifest:
         if merged.email:
             parts.append(f"email={merged.email} ({'agent' if over.email else 'bottle'})")
         return ", ".join(parts)
+
+
+def _as_json_object(value: object, label: str) -> dict[str, object]:
+    """Assert that `value` is a JSON object (str-keyed dict) and return
+    a view typed as `dict[str, object]` so downstream `.get(...)` calls
+    have a typed surface."""
+    if not isinstance(value, dict):
+        raise ManifestError(f"{label} must be a JSON object (was {type(value).__name__})")
+    items = cast(dict[object, object], value)
+    out: dict[str, object] = {}
+    for k, v in items.items():
+        if not isinstance(k, str):
+            raise ManifestError(f"{label} keys must be strings (found {type(k).__name__})")
+        out[k] = v
+    return out
+
+
+def _section_dict(value: object, label: str) -> dict[str, object]:
+    """Like _as_json_object but treats absent/null as an empty section."""
+    if value is None:
+        return {}
+    return _as_json_object(value, label)
+
+
+def _opt_str(value: object, label: str) -> str:
+    if value is None:
+        return ""
+    if not isinstance(value, str):
+        raise ManifestError(f"{label} must be a string (was {type(value).__name__})")
+    return value
+
+
+def _opt_extra_hosts(value: object, label: str) -> dict[str, str]:
+    """Validate a `{hostname: ip}` object and return a plain dict. None
+    yields an empty dict so callers can treat ExtraHosts as always
+    present. IP format is not checked here; docker validates at
+    `--add-host` time."""
+    if value is None:
+        return {}
+    obj = _as_json_object(value, label)
+    out: dict[str, str] = {}
+    for host, ip in obj.items():
+        if not host:
+            raise ManifestError(f"{label} contains an empty hostname key")
+        if not isinstance(ip, str):
+            raise ManifestError(f"{label}['{host}'] must be a string (was {type(ip).__name__})")
+        if not ip:
+            raise ManifestError(f"{label}['{host}'] must be a non-empty string")
+        out[host] = ip
+    return out
+
+
+def _parse_git_upstream(url: str, label: str) -> tuple[str, str, str, str]:
+    """Parse `ssh://user@host[:port]/path` into (user, host, port, path).
+    Dies if `url` doesn't match the ssh:// shape v1 supports. Default
+    port is 22 (matches OpenSSH)."""
+    if not url.startswith("ssh://"):
+        raise ManifestError(f"{label} must be an ssh:// URL (was {url!r})")
+    rest = url[len("ssh://"):]
+    if "@" not in rest:
+        raise ManifestError(f"{label} must include a user (e.g. ssh://git@host/path.git); was {url!r}")
+    user, _, hostpart = rest.partition("@")
+    if not user:
+        raise ManifestError(f"{label} user is empty in {url!r}")
+    if "/" not in hostpart:
+        raise ManifestError(f"{label} must include a path (e.g. ssh://git@host/path.git); was {url!r}")
+    hostport, _, path = hostpart.partition("/")
+    if not path:
+        raise ManifestError(f"{label} path is empty in {url!r}")
+    if ":" in hostport:
+        host, _, port = hostport.partition(":")
+        if not port.isdigit():
+            raise ManifestError(f"{label} port must be numeric in {url!r}")
+    else:
+        host = hostport
+        port = "22"
+    if not host:
+        raise ManifestError(f"{label} host is empty in {url!r}")
+    return (user, host, port, path)
+
+
+def _is_ip_literal(value: str) -> bool:
+    try:
+        ipaddress.ip_address(value)
+    except ValueError:
+        return False
+    return True
+
+
+def _validate_egress_routes(
+    bottle_name: str,
+    routes: tuple[EgressRoute, ...],
+) -> None:
+    """Cross-validation for `bottle.egress.routes`: hosts must be unique.
+
+    The proxy matches by exact-host (v1); duplicate hosts leave the
+    route choice ambiguous so we reject them up front.
+
+    No cross-validation against `bottle.git` is performed. git-gate
+    (SSH push/fetch) and egress (HTTPS) broker different protocols;
+    declaring both for the same host is a legitimate dev setup."""
+    seen_hosts: dict[str, None] = {}
+    for r in routes:
+        key = r.Host.lower()
+        if key in seen_hosts:
+            raise ManifestError(
+                f"bottle '{bottle_name}' egress.routes has duplicate host "
+                f"{r.Host!r}; each host must be unique on the proxy."
+            )
+        seen_hosts[key] = None
+
+
+def _validate_unique_git_names(bottle_name: str, git: tuple[GitEntry, ...]) -> None:
+    seen: dict[str, None] = {}
+    for g in git:
+        if g.Name in seen:
+            raise ManifestError(
+                f"bottle '{bottle_name}' git entries have duplicate Name '{g.Name}'; "
+                f"each entry maps to a distinct bare repo on the gate."
+            )
+        seen[g.Name] = None

bot_bottle/manifest_agent.py

@@ -1,166 +0,0 @@
-"""Agent configuration manifest dataclasses."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import cast
-
-from .agent_provider import PROVIDER_TEMPLATES
-from .manifest_util import ManifestError, as_json_object
-from .manifest_git import GitUser
-from .manifest_schema import AGENT_MODEL_KEYS
-
-
-@dataclass(frozen=True)
-class AgentProvider:
-    """Provider/template for the agent process inside a bottle.
-
-    `template` selects a built-in launch/runtime contract. `dockerfile`
-    optionally points at a custom agent-image Dockerfile while leaving
-    bot-bottle's sidecar infrastructure intact.
-
-    `auth_token` names the host env var that holds the provider's OAuth
-    token (Claude only). The provisioner injects a provider-owned egress
-    route for api.anthropic.com that re-injects this token as the Bearer
-    header, and sets a placeholder CLAUDE_CODE_OAUTH_TOKEN in the agent
-    so the Claude Code CLI starts.
-
-    `forward_host_credentials` forwards the host Codex auth token into
-    the egress sidecar (Codex only).
-    """
-
-    template: str = "claude"
-    dockerfile: str = ""
-    auth_token: str = ""
-    forward_host_credentials: bool = False
-
-    @classmethod
-    def from_dict(cls, bottle_name: str, raw: object) -> "AgentProvider":
-        d = as_json_object(raw, f"bottle '{bottle_name}' agent_provider")
-        for k in d:
-            if k not in {"template", "dockerfile", "auth_token", "forward_host_credentials"}:
-                raise ManifestError(
-                    f"bottle '{bottle_name}' agent_provider has unknown key {k!r}; "
-                    f"allowed: template, dockerfile, auth_token, forward_host_credentials"
-                )
-        template = d.get("template", "claude")
-        if not isinstance(template, str) or not template:
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.template must be a "
-                f"non-empty string"
-            )
-        if template not in PROVIDER_TEMPLATES:
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.template {template!r} "
-                f"is not one of {', '.join(sorted(PROVIDER_TEMPLATES))}"
-            )
-        dockerfile = d.get("dockerfile", "")
-        if not isinstance(dockerfile, str):
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.dockerfile must be a "
-                f"string (was {type(dockerfile).__name__})"
-            )
-        auth_token = d.get("auth_token", "")
-        if not isinstance(auth_token, str):
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.auth_token must be a "
-                f"string (was {type(auth_token).__name__})"
-            )
-        if auth_token and template != "claude":
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.auth_token is only "
-                f"supported for template 'claude'"
-            )
-        forward_host_credentials = d.get("forward_host_credentials", False)
-        if not isinstance(forward_host_credentials, bool):
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.forward_host_credentials "
-                f"must be a boolean (was {type(forward_host_credentials).__name__})"
-            )
-        if forward_host_credentials and template != "codex":
-            raise ManifestError(
-                f"bottle '{bottle_name}' agent_provider.forward_host_credentials "
-                "is currently only supported for template 'codex'"
-            )
-        return cls(
-            template=template,
-            dockerfile=dockerfile,
-            auth_token=auth_token,
-            forward_host_credentials=forward_host_credentials,
-        )
-
-
-@dataclass(frozen=True)
-class Agent:
-    bottle: str
-    skills: tuple[str, ...] = ()
-    prompt: str = ""
-    # Per-agent git identity (issue #94). Overlays the referenced
-    # bottle's git-gate.user per-field at `Manifest.bottle_for`. Only
-    # `user` is allowed at the agent level; `repos` stays bottle-only
-    # because it carries credentials and host trust.
-    git_user: GitUser = GitUser()
-
-    @classmethod
-    def from_dict(cls, name: str, raw: object, bottle_names: set[str]) -> "Agent":
-        d = as_json_object(raw, f"agent '{name}'")
-        unknown = set(d.keys()) - AGENT_MODEL_KEYS
-        if unknown:
-            allowed = ", ".join(sorted(AGENT_MODEL_KEYS))
-            raise ManifestError(
-                f"agent '{name}' has unknown key(s) {sorted(unknown)}; "
-                f"allowed keys are {allowed}."
-            )
-
-        bottle = d.get("bottle")
-        if not isinstance(bottle, str) or not bottle:
-            raise ManifestError(f"agent '{name}' must declare a 'bottle' field naming a defined bottle")
-        if bottle not in bottle_names:
-            available = ", ".join(sorted(bottle_names)) or "(none defined)"
-            raise ManifestError(
-                f"agent '{name}' references bottle '{bottle}', which is not defined. "
-                f"Available: {available}"
-            )
-
-        skills: tuple[str, ...] = ()
-        skills_raw = d.get("skills")
-        if skills_raw is not None:
-            if not isinstance(skills_raw, list):
-                raise ManifestError(f"agent '{name}' skills must be an array (was {type(skills_raw).__name__})")
-            collected: list[str] = []
-            skills_list = cast(list[object], skills_raw)
-            for i, skill in enumerate(skills_list):
-                if not isinstance(skill, str):
-                    raise ManifestError(
-                        f"agent '{name}' skills[{i}] must be a string "
-                        f"(was {type(skill).__name__})"
-                    )
-                collected.append(skill)
-            skills = tuple(collected)
-
-        prompt_raw = d.get("prompt")
-        if prompt_raw is None:
-            prompt = ""
-        elif isinstance(prompt_raw, str):
-            prompt = prompt_raw
-        else:
-            raise ManifestError(f"agent '{name}' prompt must be a string (was {type(prompt_raw).__name__})")
-
-        # git-gate: agents may declare only `git-gate.user` (name/email).
-        # `git-gate.repos` is bottle-only — it carries credentials and host trust.
-        git_user = GitUser()
-        git_raw = d.get("git-gate")
-        if git_raw is not None:
-            gd = as_json_object(git_raw, f"agent '{name}' git-gate")
-            for k in gd.keys():
-                if k != "user":
-                    raise ManifestError(
-                        f"agent '{name}' git-gate.{k} is not allowed at the "
-                        f"agent level; only git-gate.user (name/email) may be "
-                        f"set on an agent. git-gate.repos is bottle-only "
-                        f"(it carries credentials and host trust)."
-                    )
-            if "user" in gd:
-                git_user = GitUser.from_dict(name, gd["user"])
-
-        return cls(bottle=bottle, skills=skills, prompt=prompt, git_user=git_user)

bot_bottle/manifest_egress.py

@@ -1,286 +0,0 @@
-"""Egress routing manifest dataclasses and helpers."""
-
-from __future__ import annotations
-
-import ipaddress
-from dataclasses import dataclass, field
-from typing import cast
-
-from .manifest_util import ManifestError, as_json_object
-
-
-# Auth schemes for the egress route's optional `auth` block.
-# Same values cred-proxy accepts today; `token` sidesteps the Gitea
-# token-not-Bearer quirk (go-gitea/gitea#16734).
-EGRESS_AUTH_SCHEMES = ("Bearer", "token")
-
-
-def validate_egress_routes(
-    bottle_name: str,
-    routes: tuple[EgressRoute, ...],
-) -> None:
-    """Cross-validation for `bottle.egress.routes`: hosts must be unique.
-
-    The proxy matches by exact-host (v1); duplicate hosts leave the
-    route choice ambiguous so we reject them up front.
-
-    No cross-validation against `bottle.git-gate.repos` is performed.
-    git-gate (SSH push/fetch) and egress (HTTPS) broker different
-    protocols; declaring both for the same host is a legitimate dev
-    setup."""
-    seen_hosts: dict[str, None] = {}
-    for r in routes:
-        key = r.Host.lower()
-        if key in seen_hosts:
-            raise ManifestError(
-                f"bottle '{bottle_name}' egress.routes has duplicate host "
-                f"{r.Host!r}; each host must be unique on the proxy."
-            )
-        seen_hosts[key] = None
-
-
-@dataclass(frozen=True)
-class PipelockRoutePolicy:
-    """Per-route pipelock policy overrides.
-
-    `TlsPassthrough` adds the route host to pipelock's
-    `tls_interception.passthrough_domains`, so pipelock still enforces
-    the hostname allowlist but does not MITM/decrypt request bodies or
-    headers for that host.
-
-    `SsrfIpAllowlist` adds explicit IPs/CIDRs to pipelock's SSRF
-    allowlist for private/internal destinations behind this route.
-    """
-
-    TlsPassthrough: bool = False
-    SsrfIpAllowlist: tuple[str, ...] = ()
-
-    @classmethod
-    def from_dict(
-        cls, bottle_name: str, idx: int, raw: object,
-    ) -> "PipelockRoutePolicy":
-        label = f"bottle '{bottle_name}' egress.routes[{idx}] pipelock"
-        d = as_json_object(raw, label)
-        for k in d:
-            if k not in ("tls_passthrough", "ssrf_ip_allowlist"):
-                raise ManifestError(
-                    f"{label} has unknown key {k!r}; "
-                    f"only 'tls_passthrough' and 'ssrf_ip_allowlist' "
-                    f"are accepted"
-                )
-        tls_passthrough_raw = d.get("tls_passthrough", False)
-        if not isinstance(tls_passthrough_raw, bool):
-            raise ManifestError(
-                f"{label}.tls_passthrough must be a boolean "
-                f"(was {type(tls_passthrough_raw).__name__})"
-            )
-        ssrf_raw = d.get("ssrf_ip_allowlist", [])
-        if not isinstance(ssrf_raw, list):
-            raise ManifestError(
-                f"{label}.ssrf_ip_allowlist must be an array "
-                f"(was {type(ssrf_raw).__name__})"
-            )
-        ssrf_ip_allowlist: list[str] = []
-        for j, item in enumerate(ssrf_raw):
-            if not isinstance(item, str) or not item:
-                raise ManifestError(
-                    f"{label}.ssrf_ip_allowlist[{j}] must be a non-empty "
-                    f"string (was {type(item).__name__})"
-                )
-            try:
-                ipaddress.ip_network(item, strict=False)
-            except ValueError as e:
-                raise ManifestError(
-                    f"{label}.ssrf_ip_allowlist[{j}] must be an IP address "
-                    f"or CIDR (was {item!r}): {e}"
-                )
-            ssrf_ip_allowlist.append(item)
-        return cls(
-            TlsPassthrough=tls_passthrough_raw,
-            SsrfIpAllowlist=tuple(ssrf_ip_allowlist),
-        )
-
-
-@dataclass(frozen=True)
-class EgressRoute:
-    """One route on the per-bottle egress sidecar (PRD 0017).
-
-    `Host` matches the request's hostname (case-insensitive). The
-    optional `PathAllowlist` constrains the URL path to a set of
-    prefixes; empty tuple means no path-level filtering. The optional
-    `AuthScheme` / `TokenRef` pair drives credential injection:
-    when set, the proxy strips any inbound Authorization and injects
-    `<AuthScheme> <value-of-host-env-named-by-TokenRef>`. When the
-    manifest's `auth` block is omitted both fields are empty strings —
-    no Authorization is written, no token forwarded.
-
-    `Role` is reserved for future use; all role strings are currently
-    rejected by the validator.
-
-    Validation rules (enforced in `from_dict`):
-      - `host` required, non-empty.
-      - `path_allowlist` optional, list of absolute path prefixes.
-      - `auth` optional. If present, MUST carry both `scheme` and
-        `token_ref` as non-empty strings; an empty `auth: {}` is an
-        error rather than a synonym for "no auth" (omit `auth` for
-        that case).
-      - `role` optional, reserved — any non-empty value is rejected.
-    """
-
-    Host: str
-    PathAllowlist: tuple[str, ...] = ()
-    AuthScheme: str = ""
-    TokenRef: str = ""
-    Role: tuple[str, ...] = ()
-    Pipelock: PipelockRoutePolicy = field(default_factory=PipelockRoutePolicy)
-
-    @classmethod
-    def from_dict(cls, bottle_name: str, idx: int, raw: object) -> "EgressRoute":
-        label = f"bottle '{bottle_name}' egress.routes[{idx}]"
-        d = as_json_object(raw, label)
-        host = d.get("host")
-        if not isinstance(host, str) or not host:
-            raise ManifestError(f"{label} missing required string field 'host'")
-
-        path_allow_raw = d.get("path_allowlist")
-        prefixes: tuple[str, ...] = ()
-        if path_allow_raw is not None:
-            if not isinstance(path_allow_raw, list):
-                raise ManifestError(
-                    f"{label} path_allowlist must be an array "
-                    f"(was {type(path_allow_raw).__name__})"
-                )
-            path_list = cast(list[object], path_allow_raw)
-            collected: list[str] = []
-            for j, p in enumerate(path_list):
-                if not isinstance(p, str):
-                    raise ManifestError(
-                        f"{label} path_allowlist[{j}] must be a string "
-                        f"(was {type(p).__name__})"
-                    )
-                if not p.startswith("/"):
-                    raise ManifestError(
-                        f"{label} path_allowlist[{j}] {p!r} must be an "
-                        f"absolute path prefix starting with '/'"
-                    )
-                collected.append(p)
-            prefixes = tuple(collected)
-
-        auth_scheme = ""
-        token_ref = ""
-        if "auth" in d:
-            auth_raw = d.get("auth")
-            auth_d = as_json_object(auth_raw, f"{label} auth")
-            if not auth_d:
-                raise ManifestError(
-                    f"{label} auth is empty ({{}}); omit the 'auth' key "
-                    f"entirely if this route is unauthenticated. Otherwise "
-                    f"both 'scheme' and 'token_ref' are required."
-                )
-            auth_scheme_raw = auth_d.get("scheme")
-            if not isinstance(auth_scheme_raw, str) or not auth_scheme_raw:
-                raise ManifestError(
-                    f"{label} auth.scheme is required when 'auth' is set "
-                    f"(non-empty string)"
-                )
-            if auth_scheme_raw not in EGRESS_AUTH_SCHEMES:
-                raise ManifestError(
-                    f"{label} auth.scheme {auth_scheme_raw!r} is not one of "
-                    f"{', '.join(EGRESS_AUTH_SCHEMES)}"
-                )
-            token_ref_raw = auth_d.get("token_ref")
-            if not isinstance(token_ref_raw, str) or not token_ref_raw:
-                raise ManifestError(
-                    f"{label} auth.token_ref is required when 'auth' is set "
-                    f"(name of the host env var holding the token value)"
-                )
-            for k in auth_d:
-                if k not in ("scheme", "token_ref"):
-                    raise ManifestError(
-                        f"{label} auth has unknown key {k!r}; "
-                        f"only 'scheme' and 'token_ref' are accepted"
-                    )
-            auth_scheme = auth_scheme_raw
-            token_ref = token_ref_raw
-
-        role_raw = d.get("role")
-        roles: tuple[str, ...] = ()
-        if role_raw is None:
-            roles = ()
-        elif isinstance(role_raw, str):
-            roles = (role_raw,)
-        elif isinstance(role_raw, list):
-            role_list = cast(list[object], role_raw)
-            collected_roles: list[str] = []
-            for r in role_list:
-                if not isinstance(r, str):
-                    raise ManifestError(f"{label} role items must be strings (got {type(r).__name__})")
-                collected_roles.append(r)
-            roles = tuple(collected_roles)
-        else:
-            raise ManifestError(
-                f"{label} role must be a string or a list of strings "
-                f"(was {type(role_raw).__name__})"
-            )
-        if roles:
-            raise ManifestError(
-                f"{label} role {roles[0]!r} is not accepted; "
-                f"the 'role' field is reserved for future use"
-            )
-
-        pipelock = (
-            PipelockRoutePolicy.from_dict(bottle_name, idx, d["pipelock"])
-            if "pipelock" in d
-            else PipelockRoutePolicy()
-        )
-
-        for k in d:
-            if k not in ("host", "path_allowlist", "auth", "role", "pipelock"):
-                raise ManifestError(
-                    f"{label} has unknown key {k!r}; accepted keys are "
-                    f"'host', 'path_allowlist', 'auth', 'role', 'pipelock'"
-                )
-
-        return cls(
-            Host=host,
-            PathAllowlist=prefixes,
-            AuthScheme=auth_scheme,
-            TokenRef=token_ref,
-            Role=roles,
-            Pipelock=pipelock,
-        )
-
-
-@dataclass(frozen=True)
-class EgressConfig:
-    """Per-bottle egress configuration. Today this is just the
-    route table; the nesting under `egress:` leaves room for
-    per-bottle proxy settings (port override, log level, etc.) in
-    follow-ups."""
-
-    routes: tuple[EgressRoute, ...] = ()
-
-    @classmethod
-    def from_dict(cls, bottle_name: str, raw: object) -> "EgressConfig":
-        d = as_json_object(raw, f"bottle '{bottle_name}' egress")
-        routes_raw = d.get("routes")
-        routes: tuple[EgressRoute, ...] = ()
-        if routes_raw is not None:
-            if not isinstance(routes_raw, list):
-                raise ManifestError(
-                    f"bottle '{bottle_name}' egress.routes must be an array "
-                    f"(was {type(routes_raw).__name__})"
-                )
-            routes_list = cast(list[object], routes_raw)
-            routes = tuple(
-                EgressRoute.from_dict(bottle_name, i, entry)
-                for i, entry in enumerate(routes_list)
-            )
-            validate_egress_routes(bottle_name, routes)
-        for k in d:
-            if k != "routes":
-                raise ManifestError(
-                    f"bottle '{bottle_name}' egress has unknown key {k!r}; "
-                    f"only 'routes' is accepted"
-                )
-        return cls(routes=routes)

bot_bottle/manifest_extends.py

@@ -71,8 +71,7 @@ def _merge_bottles(
     name: str,
 ) -> Bottle:
     """Apply PRD 0025 merge rules."""
-    from .manifest import Bottle, GitUser
-    from .manifest_egress import validate_egress_routes
+    from .manifest import Bottle, GitUser, _validate_egress_routes
 
     # Parse the child's declared fields into a Bottle (with the
     # usual defaults for anything missing). Validation runs the same
@@ -82,19 +81,19 @@ def _merge_bottles(
     # env: dict merge, child wins on collision.
     merged_env = {**parent.env, **child.env}
 
-    # git-gate.user: per-field overlay. Each non-empty field on child
+    # git.user: per-field overlay. Each non-empty field on child
     # wins; empties fall through to parent. The default GitUser()
-    # is two empty strings, so a child that omits git-gate.user
+    # is two empty strings, so a child that omits git.user
     # inherits the parent's user verbatim.
     merged_git_user = GitUser(
         name=child.git_user.name or parent.git_user.name,
         email=child.git_user.email or parent.git_user.email,
     )
 
-    # git-gate.repos: missing means inherit; an explicit empty object
+    # git.remotes: missing means inherit; an explicit empty object
     # clears; otherwise parent and child merge by UpstreamHost with
     # child entries replacing duplicate hosts.
-    if _child_declares_git_gate_repos(child_raw):
+    if _child_declares_git_remotes(child_raw):
         merged_git = _merge_git_remotes(parent.git, child.git) if child.git else ()
     else:
         merged_git = parent.git
@@ -110,7 +109,7 @@ def _merge_bottles(
     merged_supervise = (
         child.supervise if "supervise" in child_raw else parent.supervise
     )
-    validate_egress_routes(name, merged_egress.routes)
+    _validate_egress_routes(name, merged_egress.routes)
 
     return Bottle(
         env=merged_env,
@@ -122,14 +121,14 @@ def _merge_bottles(
     )
 
 
-def _child_declares_git_gate_repos(child_raw: dict[str, object]) -> bool:
-    from .manifest_util import as_json_object
+def _child_declares_git_remotes(child_raw: dict[str, object]) -> bool:
+    from .manifest import _as_json_object
 
-    git_raw = child_raw.get("git-gate")
+    git_raw = child_raw.get("git")
     if git_raw is None:
         return False
-    git_obj = as_json_object(git_raw, "child git-gate")
-    return "repos" in git_obj
+    git_obj = _as_json_object(git_raw, "child git")
+    return "remotes" in git_obj
 
 
 def _merge_git_remotes(

bot_bottle/manifest_git.py

@@ -1,222 +0,0 @@
-"""Git-related manifest dataclasses and helpers."""
-
-from __future__ import annotations
-
-import re
-from dataclasses import dataclass
-
-from .manifest_util import ManifestError, as_json_object
-
-# Shell-safe characters for git-gate repo names. Names are embedded in
-# the generated entrypoint shell script (shlex.quote is the primary
-# defence; this regex is belt-and-suspenders and documents intent).
-_GIT_NAME_RE = re.compile(r"^[A-Za-z0-9._-]+$")
-
-
-def _opt_str(value: object, label: str) -> str:
-    if value is None:
-        return ""
-    if not isinstance(value, str):
-        raise ManifestError(f"{label} must be a string (was {type(value).__name__})")
-    return value
-
-
-def parse_git_upstream(url: str, label: str) -> tuple[str, str, str, str]:
-    """Parse `ssh://user@host[:port]/path` into (user, host, port, path).
-    Dies if `url` doesn't match the ssh:// shape v1 supports. Default
-    port is 22 (matches OpenSSH)."""
-    if not url.startswith("ssh://"):
-        raise ManifestError(f"{label} must be an ssh:// URL (was {url!r})")
-    rest = url[len("ssh://"):]
-    if "@" not in rest:
-        raise ManifestError(f"{label} must include a user (e.g. ssh://git@host/path.git); was {url!r}")
-    user, _, hostpart = rest.partition("@")
-    if not user:
-        raise ManifestError(f"{label} user is empty in {url!r}")
-    if "/" not in hostpart:
-        raise ManifestError(f"{label} must include a path (e.g. ssh://git@host/path.git); was {url!r}")
-    hostport, _, path = hostpart.partition("/")
-    if not path:
-        raise ManifestError(f"{label} path is empty in {url!r}")
-    if ":" in hostport:
-        host, _, port = hostport.partition(":")
-        if not port.isdigit():
-            raise ManifestError(f"{label} port must be numeric in {url!r}")
-    else:
-        host = hostport
-        port = "22"
-    if not host:
-        raise ManifestError(f"{label} host is empty in {url!r}")
-    return (user, host, port, path)
-
-
-def validate_unique_git_names(bottle_name: str, git: tuple[GitEntry, ...]) -> None:
-    seen: dict[str, None] = {}
-    for g in git:
-        if g.Name in seen:
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.repos has duplicate name '{g.Name}'; "
-                f"each entry maps to a distinct bare repo on the gate."
-            )
-        seen[g.Name] = None
-
-
-@dataclass(frozen=True)
-class GitEntry:
-    """One upstream the per-agent git-gate (PRD 0008) is allowed to
-    talk to. `Upstream` is the real remote URL the agent would push to
-    if there were no gate; the gate hosts a bare repo at /git/<Name>.git
-    and `IdentityFile` is the SSH key the gate uses to push that repo
-    upstream after gitleaks passes. The agent itself never holds the
-    upstream credential.
-
-    The Upstream URL is parsed once at construction and the pieces are
-    stashed in the `Upstream*` fields so the git-gate render step
-    doesn't have to re-parse.
-
-    Manifest source: `git-gate.repos.<Name>` (PRD 0047). The YAML keys
-    are `url`, `identity`, and `host_key`; the internal field names are
-    stable across that rename."""
-
-    Name: str
-    Upstream: str
-    IdentityFile: str
-    KnownHostKey: str = ""
-    RemoteKey: str = ""
-    UpstreamUser: str = ""
-    UpstreamHost: str = ""
-    UpstreamPort: str = ""
-    UpstreamPath: str = ""
-
-    @classmethod
-    def from_repos_entry(
-        cls, bottle_name: str, repo_name: str, raw: object
-    ) -> "GitEntry":
-        """Parse one entry from `git-gate.repos.<repo_name>`.
-
-        YAML keys: `url` (required), `identity` (required),
-        `host_key` (optional). The repo_name becomes `Name`."""
-        if not repo_name:
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.repos has an empty key"
-            )
-        if not _GIT_NAME_RE.match(repo_name):
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.repos name {repo_name!r} is invalid; "
-                f"allowed characters: A-Z a-z 0-9 . _ -"
-            )
-        label = f"git-gate.repos[{repo_name!r}]"
-        d = as_json_object(raw, f"bottle '{bottle_name}' {label}")
-        for k in d:
-            if k not in {"url", "identity", "host_key"}:
-                raise ManifestError(
-                    f"bottle '{bottle_name}' {label} has unknown key {k!r}; "
-                    f"allowed: url, identity, host_key"
-                )
-        upstream = d.get("url")
-        if not isinstance(upstream, str) or not upstream:
-            raise ManifestError(
-                f"bottle '{bottle_name}' {label} missing required string field 'url'"
-            )
-        ident = d.get("identity")
-        if not isinstance(ident, str) or not ident:
-            raise ManifestError(
-                f"bottle '{bottle_name}' {label} missing required string field 'identity'"
-            )
-        khk = _opt_str(
-            d.get("host_key"),
-            f"bottle '{bottle_name}' {label} host_key",
-        )
-        user, host, port, path = parse_git_upstream(
-            upstream, f"bottle '{bottle_name}' {label} url"
-        )
-        return cls(
-            Name=repo_name,
-            Upstream=upstream,
-            IdentityFile=ident,
-            KnownHostKey=khk,
-            RemoteKey=host,
-            UpstreamUser=user,
-            UpstreamHost=host,
-            UpstreamPort=port,
-            UpstreamPath=path,
-        )
-
-
-@dataclass(frozen=True)
-class GitUser:
-    """Per-bottle `git config --global user.name` / `user.email`
-    pair (issue #86). The agent's commits inside the bottle are
-    attributed to this identity rather than the agent image's
-    image-baked default (no user, or whatever the image dropped
-    in). Either or both fields can be set independently.
-
-    `from_dict` is forgiving on shape (a single missing field is
-    fine — we just skip that config line at provisioning) but
-    strict on types (string-or-die)."""
-
-    name: str = ""
-    email: str = ""
-
-    @classmethod
-    def from_dict(cls, bottle_name: str, raw: object) -> "GitUser":
-        d = as_json_object(raw, f"bottle '{bottle_name}' git-gate.user")
-        for k in d.keys():
-            if k not in {"name", "email"}:
-                raise ManifestError(
-                    f"bottle '{bottle_name}' git-gate.user has unknown key {k!r}; "
-                    f"allowed: name, email"
-                )
-        name = d.get("name", "")
-        email = d.get("email", "")
-        if not isinstance(name, str):
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.user.name must be a string "
-                f"(was {type(name).__name__})"
-            )
-        if not isinstance(email, str):
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.user.email must be a string "
-                f"(was {type(email).__name__})"
-            )
-        if not name and not email:
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate.user is set but neither "
-                f"name nor email is non-empty; remove the block or "
-                f"fill at least one field."
-            )
-        return cls(name=name, email=email)
-
-    def is_empty(self) -> bool:
-        return not self.name and not self.email
-
-
-def parse_git_gate_config(
-    bottle_name: str,
-    raw: object,
-) -> tuple[tuple[GitEntry, ...], GitUser]:
-    d = as_json_object(raw, f"bottle '{bottle_name}' git-gate")
-    for k in d.keys():
-        if k not in {"user", "repos"}:
-            raise ManifestError(
-                f"bottle '{bottle_name}' git-gate has unknown key {k!r}; "
-                f"allowed: user, repos"
-            )
-
-    git_user = (
-        GitUser.from_dict(bottle_name, d["user"])
-        if "user" in d
-        else GitUser()
-    )
-
-    git: tuple[GitEntry, ...] = ()
-    repos_raw = d.get("repos")
-    if repos_raw is not None:
-        repos = as_json_object(repos_raw, f"bottle '{bottle_name}' git-gate.repos")
-        git = tuple(
-            GitEntry.from_repos_entry(bottle_name, name, entry)
-            for name, entry in repos.items()
-        )
-        validate_unique_git_names(bottle_name, git)
-
-    return git, git_user

bot_bottle/manifest_loader.py

@@ -93,13 +93,13 @@ def load_agents_from_dir(
         validate_agent_frontmatter_keys(path, fm.keys())
         # Build the dict Agent.from_dict expects. The body becomes
         # prompt; Claude Code passthrough fields stay in fm and get
-        # ignored by Agent.from_dict (reads bottle/skills/git-gate/prompt).
+        # ignored by Agent.from_dict (which reads bottle/skills/git/prompt).
         agent_dict: dict[str, object] = {
             "bottle": fm.get("bottle"),
             "skills": fm.get("skills", []),
             "prompt": body.strip(),
         }
-        if "git-gate" in fm:
-            agent_dict["git-gate"] = fm["git-gate"]
+        if "git" in fm:
+            agent_dict["git"] = fm["git"]
         out[name] = Agent.from_dict(name, agent_dict, bottle_names)
     return out

bot_bottle/manifest_schema.py

@@ -16,10 +16,10 @@ _FILENAME_RX = re.compile(r"^[a-z][a-z0-9-]*$")
 # sets dies with a "did you mean" pointer: typos should not silently
 # ghost into an empty config.
 BOTTLE_KEYS = frozenset(
-    {"env", "extends", "agent_provider", "git-gate", "egress", "supervise"}
+    {"env", "extends", "agent_provider", "git", "egress", "supervise"}
 )
 AGENT_KEYS_REQUIRED = frozenset({"bottle"})
-AGENT_KEYS_OPTIONAL = frozenset({"skills", "git-gate"})
+AGENT_KEYS_OPTIONAL = frozenset({"skills", "git"})
 
 # Claude Code subagent fields bot-bottle ignores at launch but does
 # not reject. This lets the same file double as
@@ -58,7 +58,7 @@ def _validate_frontmatter_keys(
     keys: object,
     allowed_keys: frozenset[str],
 ) -> None:
-    from .manifest_util import ManifestError
+    from .manifest import ManifestError
 
     key_set = set(keys)
     unknown = key_set - allowed_keys

bot_bottle/manifest_util.py

@@ -1,24 +0,0 @@
-"""Shared manifest primitives used by all manifest sub-modules."""
-
-from __future__ import annotations
-
-from typing import cast
-
-
-class ManifestError(Exception):
-    """A manifest file (or the manifest tree) is invalid."""
-
-
-def as_json_object(value: object, label: str) -> dict[str, object]:
-    """Assert that `value` is a JSON object (str-keyed dict) and return
-    a view typed as `dict[str, object]` so downstream `.get(...)` calls
-    have a typed surface."""
-    if not isinstance(value, dict):
-        raise ManifestError(f"{label} must be a JSON object (was {type(value).__name__})")
-    items = cast(dict[object, object], value)
-    out: dict[str, object] = {}
-    for k, v in items.items():
-        if not isinstance(k, str):
-            raise ManifestError(f"{label} keys must be strings (found {type(k).__name__})")
-        out[k] = v
-    return out

bot_bottle/pipelock.py

@@ -19,6 +19,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from pathlib import Path
+from typing import cast
 
 from .egress import EGRESS_HOSTNAME, EgressRoute, egress_routes_for_bottle
 from .supervise import SUPERVISE_HOSTNAME
@@ -222,180 +223,6 @@ def pipelock_build_config(
     return cfg
 
 
-_PIPELOCK_TOP_LEVEL_KEYS = {
-    "version",
-    "mode",
-    "enforce",
-    "api_allowlist",
-    "seed_phrase_detection",
-    "forward_proxy",
-    "dlp",
-    "request_body_scanning",
-    "tls_interception",
-    "ssrf",
-}
-
-
-def _pipelock_render_error(section: str, key: str, expected: str) -> ValueError:
-    return ValueError(
-        f"pipelock_render_yaml: {section}.{key} must be {expected}"
-    )
-
-
-def _reject_unknown_keys(
-    section: str,
-    obj: dict[str, object],
-    allowed: set[str],
-) -> None:
-    for key in sorted(set(obj) - allowed):
-        raise ValueError(f"pipelock_render_yaml: {section}.{key} is unsupported")
-
-
-def _required_dict(
-    obj: dict[str, object],
-    section: str,
-    key: str,
-) -> dict[str, object]:
-    value = obj.get(key)
-    if not isinstance(value, dict):
-        raise _pipelock_render_error(section, key, "a mapping")
-    return value
-
-
-def _required_bool(obj: dict[str, object], section: str, key: str) -> bool:
-    value = obj.get(key)
-    if not isinstance(value, bool):
-        raise _pipelock_render_error(section, key, "a boolean")
-    return value
-
-
-def _required_int(obj: dict[str, object], section: str, key: str) -> int:
-    value = obj.get(key)
-    if isinstance(value, bool) or not isinstance(value, int):
-        raise _pipelock_render_error(section, key, "an integer")
-    return value
-
-
-def _required_str(obj: dict[str, object], section: str, key: str) -> str:
-    value = obj.get(key)
-    if not isinstance(value, str):
-        raise _pipelock_render_error(section, key, "a string")
-    return value
-
-
-def _required_str_list(
-    obj: dict[str, object],
-    section: str,
-    key: str,
-) -> list[str]:
-    value = obj.get(key)
-    if not isinstance(value, list) or not all(isinstance(v, str) for v in value):
-        raise _pipelock_render_error(section, key, "a list of strings")
-    return value
-
-
-def _optional_str_list(
-    obj: dict[str, object],
-    section: str,
-    key: str,
-) -> list[str]:
-    if key not in obj:
-        return []
-    return _required_str_list(obj, section, key)
-
-
-def _optional_bool(
-    obj: dict[str, object],
-    section: str,
-    key: str,
-) -> bool | None:
-    if key not in obj:
-        return None
-    return _required_bool(obj, section, key)
-
-
-def _optional_str(
-    obj: dict[str, object],
-    section: str,
-    key: str,
-) -> str | None:
-    if key not in obj:
-        return None
-    return _required_str(obj, section, key)
-
-
-def _validate_pipelock_render_config(cfg: dict[str, object]) -> dict[str, object]:
-    _reject_unknown_keys("config", cfg, _PIPELOCK_TOP_LEVEL_KEYS)
-    normalized: dict[str, object] = {
-        "version": _required_int(cfg, "config", "version"),
-        "mode": _required_str(cfg, "config", "mode"),
-        "enforce": _required_bool(cfg, "config", "enforce"),
-        "api_allowlist": _required_str_list(cfg, "config", "api_allowlist"),
-    }
-
-    if "seed_phrase_detection" in cfg:
-        spd = _required_dict(cfg, "config", "seed_phrase_detection")
-        _reject_unknown_keys("seed_phrase_detection", spd, {"enabled"})
-        normalized["seed_phrase_detection"] = {
-            "enabled": _required_bool(spd, "seed_phrase_detection", "enabled"),
-        }
-
-    fp = _required_dict(cfg, "config", "forward_proxy")
-    _reject_unknown_keys("forward_proxy", fp, {"enabled"})
-    normalized["forward_proxy"] = {
-        "enabled": _required_bool(fp, "forward_proxy", "enabled"),
-    }
-
-    dlp = _required_dict(cfg, "config", "dlp")
-    _reject_unknown_keys("dlp", dlp, {"include_defaults", "scan_env"})
-    normalized["dlp"] = {
-        "include_defaults": _required_bool(dlp, "dlp", "include_defaults"),
-        "scan_env": _required_bool(dlp, "dlp", "scan_env"),
-    }
-
-    rbs = _required_dict(cfg, "config", "request_body_scanning")
-    _reject_unknown_keys(
-        "request_body_scanning",
-        rbs,
-        {"action", "scan_headers", "header_mode"},
-    )
-    normalized_rbs: dict[str, object] = {
-        "action": _required_str(rbs, "request_body_scanning", "action"),
-    }
-    scan_headers = _optional_bool(rbs, "request_body_scanning", "scan_headers")
-    if scan_headers is not None:
-        normalized_rbs["scan_headers"] = scan_headers
-    header_mode = _optional_str(rbs, "request_body_scanning", "header_mode")
-    if header_mode is not None:
-        normalized_rbs["header_mode"] = header_mode
-    normalized["request_body_scanning"] = normalized_rbs
-
-    if "tls_interception" in cfg:
-        tls = _required_dict(cfg, "config", "tls_interception")
-        _reject_unknown_keys(
-            "tls_interception",
-            tls,
-            {"enabled", "ca_cert", "ca_key", "passthrough_domains"},
-        )
-        normalized["tls_interception"] = {
-            "enabled": _required_bool(tls, "tls_interception", "enabled"),
-            "ca_cert": _required_str(tls, "tls_interception", "ca_cert"),
-            "ca_key": _required_str(tls, "tls_interception", "ca_key"),
-            "passthrough_domains": _optional_str_list(
-                tls, "tls_interception", "passthrough_domains",
-            ),
-        }
-
-    if "ssrf" in cfg:
-        ssrf = _required_dict(cfg, "config", "ssrf")
-        _reject_unknown_keys("ssrf", ssrf, {"ip_allowlist"})
-        normalized["ssrf"] = {
-            "ip_allowlist": _required_str_list(ssrf, "ssrf", "ip_allowlist"),
-        }
-
-    return normalized
-
-
 def pipelock_render_yaml(cfg: dict[str, object]) -> str:
     """Render a pipelock config dict (as produced by
     `pipelock_build_config`) as YAML. Hand-rolled so we don't take a
@@ -403,38 +230,31 @@ def pipelock_render_yaml(cfg: dict[str, object]) -> str:
     def _bool(b: object) -> str:
         return "true" if b else "false"
 
-    cfg = _validate_pipelock_render_config(cfg)
     lines: list[str] = []
     lines.append(f"version: {cfg['version']}")
     lines.append(f"mode: {cfg['mode']}")
     lines.append(f"enforce: {_bool(cfg['enforce'])}")
     lines.append("")
     lines.append("api_allowlist:")
-    api_allowlist = cfg["api_allowlist"]
-    assert isinstance(api_allowlist, list)
-    for h in api_allowlist:
+    for h in cast(list[str], cfg["api_allowlist"]):
         lines.append(f'  - "{h}"')
     lines.append("")
     if "seed_phrase_detection" in cfg:
         lines.append("seed_phrase_detection:")
-        spd = cfg["seed_phrase_detection"]
-        assert isinstance(spd, dict)
+        spd = cast(dict[str, object], cfg["seed_phrase_detection"])
         lines.append(f"  enabled: {_bool(spd['enabled'])}")
         lines.append("")
     lines.append("forward_proxy:")
-    fp = cfg["forward_proxy"]
-    assert isinstance(fp, dict)
+    fp = cast(dict[str, object], cfg["forward_proxy"])
     lines.append(f"  enabled: {_bool(fp['enabled'])}")
     lines.append("")
     lines.append("dlp:")
-    dlp = cfg["dlp"]
-    assert isinstance(dlp, dict)
+    dlp = cast(dict[str, object], cfg["dlp"])
     lines.append(f"  include_defaults: {_bool(dlp['include_defaults'])}")
     lines.append(f"  scan_env: {_bool(dlp['scan_env'])}")
     lines.append("")
     lines.append("request_body_scanning:")
-    rbs = cfg["request_body_scanning"]
-    assert isinstance(rbs, dict)
+    rbs = cast(dict[str, object], cfg["request_body_scanning"])
     lines.append(f'  action: "{rbs["action"]}"')
     if "scan_headers" in rbs:
         lines.append(f"  scan_headers: {_bool(rbs['scan_headers'])}")
@@ -443,13 +263,11 @@ def pipelock_render_yaml(cfg: dict[str, object]) -> str:
     if "tls_interception" in cfg:
         lines.append("")
         lines.append("tls_interception:")
-        tls = cfg["tls_interception"]
-        assert isinstance(tls, dict)
+        tls = cast(dict[str, object], cfg["tls_interception"])
         lines.append(f"  enabled: {_bool(tls['enabled'])}")
         lines.append(f'  ca_cert: "{tls["ca_cert"]}"')
         lines.append(f'  ca_key: "{tls["ca_key"]}"')
-        passthrough = tls["passthrough_domains"]
-        assert isinstance(passthrough, list)
+        passthrough = cast(list[str], tls.get("passthrough_domains", []))
         if passthrough:
             lines.append("  passthrough_domains:")
             for d in passthrough:
@@ -457,12 +275,9 @@ def pipelock_render_yaml(cfg: dict[str, object]) -> str:
     if "ssrf" in cfg:
         lines.append("")
         lines.append("ssrf:")
-        ssrf = cfg["ssrf"]
-        assert isinstance(ssrf, dict)
+        ssrf = cast(dict[str, object], cfg["ssrf"])
         lines.append("  ip_allowlist:")
-        ip_allowlist = ssrf["ip_allowlist"]
-        assert isinstance(ip_allowlist, list)
-        for ip in ip_allowlist:
+        for ip in cast(list[str], ssrf["ip_allowlist"]):
             lines.append(f'    - "{ip}"')
     return "\n".join(lines) + "\n"
 

bot_bottle/sidecar_init.py

@@ -245,12 +245,7 @@ class _Supervisor:
                             except ProcessLookupError:
                                 pass
 
-        done = all(p.poll() is not None for _, p in self.procs)
-        if done:
-            for _, p in self.procs:
-                if p.stdout is not None:
-                    p.stdout.close()
-        return done
+        return all(p.poll() is not None for _, p in self.procs)
 
     def exit_code(self) -> int:
         """Positive child failures win; otherwise report success.
@@ -340,8 +335,6 @@ class _Supervisor:
                     except ProcessLookupError:
                         pass
                     p.wait()
-            if p.stdout is not None:
-                p.stdout.close()
             self._logged_dead.discard(daemon_name)
             new_proc = _spawn(spec)
             self.procs[idx] = (spec, new_proc)

bot_bottle/supervise_server.py

@@ -35,7 +35,6 @@ import json
 import os
 import socketserver
 import sys
-import time
 import typing
 import urllib.error
 import urllib.parse
@@ -64,10 +63,6 @@ ERR_METHOD_NOT_FOUND = -32601
 ERR_INVALID_PARAMS = -32602
 ERR_INTERNAL = -32603
 
-DEFAULT_RESPONSE_TIMEOUT_SECONDS = 30.0
-MIN_RESPONSE_POLL_INTERVAL_SECONDS = 0.05
-EGRESS_LIST_TIMEOUT_SECONDS = 5.0
-
 
 @dataclass(frozen=True)
 class JsonRpcRequest:
@@ -417,7 +412,6 @@ def _validate_and_bundle_egress_route(
 class ServerConfig:
     bottle_slug: str
     queue_dir: Path
-    response_timeout_seconds: float = DEFAULT_RESPONSE_TIMEOUT_SECONDS
 
 
 def handle_initialize(_params: dict[str, object]) -> dict[str, object]:
@@ -448,7 +442,7 @@ def handle_list_egress_routes(
     })
     opener = urllib.request.build_opener(proxy_handler)
     try:
-        with opener.open(_sv.EGRESS_INTROSPECT_URL, timeout=EGRESS_LIST_TIMEOUT_SECONDS) as resp:
+        with opener.open(_sv.EGRESS_INTROSPECT_URL, timeout=5) as resp:
             body = resp.read().decode("utf-8")
     except (urllib.error.URLError, OSError) as e:
         return {
@@ -526,20 +520,7 @@ def handle_tools_call(
         f"for bottle {config.bottle_slug}; waiting for operator...\n"
     )
     sys.stderr.flush()
-    deadline = time.monotonic() + config.response_timeout_seconds
-    try:
-        response = _sv.wait_for_response(
-            config.queue_dir,
-            proposal.id,
-            poll_interval=MIN_RESPONSE_POLL_INTERVAL_SECONDS,
-            deadline=deadline,
-        )
-    except TimeoutError:
-        text = format_pending_response_text(config.response_timeout_seconds)
-        return {
-            "content": [{"type": "text", "text": text}],
-            "isError": False,
-        }
+    response = _sv.wait_for_response(config.queue_dir, proposal.id)
     _sv.archive_proposal(config.queue_dir, proposal.id)
 
     text = format_response_text(response)
@@ -561,16 +542,6 @@ def format_response_text(response: "_sv.Response") -> str:
     return "\n".join(lines)
 
 
-def format_pending_response_text(timeout_seconds: float) -> str:
-    return "\n".join([
-        "status: pending",
-        (
-            "notes: operator response timed out after "
-            f"{timeout_seconds:g}s; proposal remains queued"
-        ),
-    ])
-
-
 # --- HTTP transport --------------------------------------------------------
 
 
@@ -683,15 +654,10 @@ def serve(
     queue_dir: Path,
     port: int = _sv.SUPERVISE_PORT,
     bind: str = "0.0.0.0",
-    response_timeout_seconds: float = DEFAULT_RESPONSE_TIMEOUT_SECONDS,
 ) -> typing.NoReturn:
     queue_dir.mkdir(parents=True, exist_ok=True)
     server = MCPServer((bind, port), MCPHandler)
-    server.config = ServerConfig(
-        bottle_slug=bottle_slug,
-        queue_dir=queue_dir,
-        response_timeout_seconds=response_timeout_seconds,
-    )
+    server.config = ServerConfig(bottle_slug=bottle_slug, queue_dir=queue_dir)
     sys.stderr.write(
         f"supervise listening on {bind}:{port}; "
         f"slug={bottle_slug!r}; queue={queue_dir}; "
@@ -716,37 +682,9 @@ def main(argv: list[str]) -> int:
     queue_dir = Path(os.environ.get("SUPERVISE_QUEUE_DIR", _sv.QUEUE_DIR_IN_CONTAINER))
     port = int(os.environ.get("SUPERVISE_PORT", str(_sv.SUPERVISE_PORT)))
     bind = os.environ.get("SUPERVISE_BIND", "0.0.0.0")
-    try:
-        response_timeout_seconds = _response_timeout_from_env(os.environ)
-    except ValueError as e:
-        sys.stderr.write(f"supervise: {e}\n")
-        return 2
-    serve(
-        bottle_slug=bottle_slug,
-        queue_dir=queue_dir,
-        port=port,
-        bind=bind,
-        response_timeout_seconds=response_timeout_seconds,
-    )
+    serve(bottle_slug=bottle_slug, queue_dir=queue_dir, port=port, bind=bind)
     return 0  # serve() does not return
 
 
-def _response_timeout_from_env(env: typing.Mapping[str, str]) -> float:
-    raw = env.get("SUPERVISE_RESPONSE_TIMEOUT_SECONDS", "").strip()
-    if not raw:
-        return DEFAULT_RESPONSE_TIMEOUT_SECONDS
-    try:
-        value = float(raw)
-    except ValueError as e:
-        raise ValueError(
-            "SUPERVISE_RESPONSE_TIMEOUT_SECONDS must be a positive number"
-        ) from e
-    if value <= 0:
-        raise ValueError(
-            "SUPERVISE_RESPONSE_TIMEOUT_SECONDS must be a positive number"
-        )
-    return value
-
-
 if __name__ == "__main__":
     raise SystemExit(main(sys.argv))

bot_bottle/util.py

@@ -5,18 +5,9 @@ level deeper, under their backend package."""
 
 from __future__ import annotations
 
-import ipaddress
 import os
 
 
-def is_ip_literal(value: str) -> bool:
-    try:
-        ipaddress.ip_address(value)
-    except ValueError:
-        return False
-    return True
-
-
 def expand_tilde(path: str) -> str:
     """Expand a leading '~' to $HOME. Leaves paths without a leading
     tilde unchanged. Falls back to the empty string if $HOME is unset

bot_bottle/workspace.py

@@ -1,52 +0,0 @@
-"""Backend-neutral plan for porting the operator workspace."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Protocol
-
-
-WORKSPACE_DIRNAME = "workspace"
-DEFAULT_WORKSPACE_OWNER = "node:node"
-DEFAULT_WORKSPACE_MODE = "755"
-
-
-class WorkspaceSpec(Protocol):
-    copy_cwd: bool
-    user_cwd: str
-
-
-@dataclass(frozen=True)
-class WorkspacePlan:
-    """Resolved workspace contract shared by all bottle backends."""
-
-    enabled: bool
-    host_path: Path
-    guest_home: str
-    guest_path: str
-    workdir: str
-    owner: str = DEFAULT_WORKSPACE_OWNER
-    mode: str = DEFAULT_WORKSPACE_MODE
-    copy_contents: bool = True
-    copy_git: bool = True
-    has_host_git_dir: bool = False
-
-
-def workspace_plan(spec: WorkspaceSpec, *, guest_home: str) -> WorkspacePlan:
-    """Resolve the in-bottle workspace path from CLI intent."""
-    host_path = Path(spec.user_cwd).expanduser()
-    if spec.copy_cwd:
-        guest_path = f"{guest_home.rstrip('/')}/{WORKSPACE_DIRNAME}"
-        workdir = guest_path
-    else:
-        guest_path = guest_home
-        workdir = guest_home
-    return WorkspacePlan(
-        enabled=spec.copy_cwd,
-        host_path=host_path,
-        guest_home=guest_home,
-        guest_path=guest_path,
-        workdir=workdir,
-        has_host_git_dir=(host_path / ".git").is_dir(),
-    )

docs/prds/0008-git-gate.md

@@ -83,7 +83,12 @@ for a declared upstream:
 - **Manifest field.** `bottle.git` — a list of git remotes the
   bottle is allowed to talk to, each with the credential the gate
   uses to push upstream. The agent gets no parallel `bottle.ssh`
-  entry for those upstreams.
+  entry for those upstreams. Each entry may also carry an
+  `ExtraHosts: { hostname: ip }` map, surfaced to the gate as
+  `--add-host` so the gate can resolve upstreams whose public DNS
+  doesn't point at the reachable IP (e.g. Tailscale-only hosts).
+  The agent-side `insteadOf` rewrite keys off the original hostname,
+  so the manifest's `Upstream` URL stays human-readable.
 - **Agent-side URL rewrite.** Provisioner emits `~/.gitconfig`
   with `[url "<gate-url>"] insteadOf = <real-url>` so every git
   operation against the declared upstream (push, fetch, clone,

docs/prds/0009-remove-ssh-gate.md

@@ -88,7 +88,8 @@ the unused path.
 - **Pipelock interaction.** Drop the SSH-derived branch from
   pipelock's `ssrf.ip_allowlist` build. With no `bottle.ssh`
   there is no per-upstream IP carve-out to render; git-gate
-  has its own egress network.
+  has its own egress network and pulls in upstream resolution
+  via `ExtraHosts` plus DNS.
 - **Tests.** Delete the ssh-gate unit + integration suites,
   the ssh fixtures in `tests/fixtures.py`, and the
   shadow-route assertions in `test_manifest_git.py`. Adjust

docs/prds/0011-per-file-md-manifest.md

@@ -274,6 +274,8 @@ git:
       Name: bot-bottle
       Upstream: ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git
       IdentityFile: ~/.ssh/gitea-delos-2.pem
+      ExtraHosts:
+        gitea.dideric.is: 100.78.141.42
       KnownHostKey: ssh-rsa AAAAB3...
 egress:
   allowlist:

docs/prds/0025-bottle-extends.md

@@ -161,7 +161,8 @@ expectation. (Same model as shell `export` precedence.)
 `git.remotes` is also keyed, so it follows dict-style inheritance:
 children can override one host without restating every remote. The
 remote entry is replaced as a whole on host collision because
-`Upstream`, `IdentityFile`, and `KnownHostKey` are tightly coupled.
+`Upstream`, `IdentityFile`, `KnownHostKey`, and `ExtraHosts` are
+tightly coupled.
 
 The `git.user` dataclass-overlay (each non-empty field wins
 individually) is so a parent can declare `git.user.name` and a

docs/prds/0035-supervise-wait-bounds.md

@@ -1,99 +0,0 @@
-# PRD 0035: Supervise Wait Bounds
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #128
-
-## Summary
-
-Bound the supervise sidecar's request-thread waits so an agent tool call cannot
-hold an HTTP worker forever while waiting for operator action. Preserve the MCP
-tool surface, but make timeout behavior explicit, observable, and tested.
-
-## Problem
-
-`bot_bottle/supervise_server.py` handles MCP over a threaded stdlib HTTP
-server. Tool calls validate a proposal, write it to the supervise queue, and
-then wait for the operator response file. Today that wait can last forever.
-Each outstanding tool call consumes one server thread until the operator acts.
-
-The route-listing helper also performs a live HTTP request to egress inside the
-request thread. It has a short timeout today, but the behavior is not described
-as part of a broader request-thread budget.
-
-This is operationally risky in multi-agent or repeated-call scenarios: a stuck
-or ignored proposal can accumulate blocked threads, and callers do not get a
-clear "still pending" answer they can reason about.
-
-## Goals / Success Criteria
-
-- Add a bounded wait for operator responses to supervise tool calls.
-- Return a clear JSON-RPC tool result when the proposal remains pending after
-  the timeout; do not treat pending operator action as an internal server error.
-- Keep the queued proposal on disk after timeout so the operator can still act.
-- Make the wait duration configurable by environment with a conservative
-  default.
-- Preserve current success and rejection result shapes for completed operator
-  responses.
-- Keep `list-egress-routes` bounded and document its timeout behavior.
-- Add focused tests for approved responses, timed-out pending responses, and
-  route-list timeout/error handling.
-
-## Non-goals
-
-- No asynchronous framework or new runtime dependency.
-- No replacement of the stdlib threaded HTTP server.
-- No change to the host-side supervise queue format.
-- No cancellation protocol between the agent and operator UI.
-- No dashboard or TUI changes.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/supervise_server.py` request handling.
-- Any small helper in `bot_bottle/supervise.py` needed to support a bounded
-  wait cleanly.
-- Unit tests around tool-call response waiting and route-list behavior.
-
-Out of scope:
-
-- Reworking proposal persistence.
-- Changing egress apply or pipelock apply flows.
-- Adding background workers to complete HTTP requests after the client returns.
-
-## Design
-
-Introduce a supervise response wait budget,
-`SUPERVISE_RESPONSE_TIMEOUT_SECONDS`, with a 30 second default. The existing
-poll loop should stop after that budget and return a normal tool result such as
-`{"status": "pending", "notes": "operator response timed out; proposal remains queued"}`.
-The exact field names should fit the existing response schema so agents can
-handle success, rejection, and pending with one result parser.
-
-The proposal file must remain in the queue when the HTTP call times out. The
-operator can still approve or reject it later, but that later response will not
-resume the original HTTP request.
-
-Route-listing should continue to use a short HTTP timeout to egress. Errors
-should be returned as tool results or JSON-RPC errors consistently with the
-existing server behavior; the implementation should avoid an unbounded socket
-wait in the request thread.
-
-## Testing Strategy
-
-- Unit-test a tool call whose response appears before the timeout.
-- Unit-test a tool call whose response never appears and assert the request
-  returns a pending result while the proposal remains queued.
-- Unit-test invalid timeout env values fall back or fail clearly.
-- Unit-test `list-egress-routes` timeout/error behavior with a fake URL opener.
-
-Run:
-
-- `python3 -m unittest tests.unit.test_supervise_server`
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0036-codex-auth-redaction-policy.md

@@ -1,111 +0,0 @@
-# PRD 0036: Codex Auth Redaction Policy
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #129
-
-## Summary
-
-Make Codex host-auth redaction explicit and fixture-driven so dummy
-`auth.json` generation cannot accidentally preserve future sensitive fields.
-Keep forwarding only the short-lived host access token through egress, while the
-guest receives a non-secret auth file whose schema remains useful to Codex.
-
-## Problem
-
-`bot_bottle/codex_auth.py` reads the host Codex auth file, extracts the access
-token for egress, and writes a dummy guest `auth.json`. The code redacts JWT
-claims and auth JSON fields with a mix of schema-specific handling and generic
-placeholder behavior.
-
-That is safer than copying raw auth, but it is still coverage-sensitive. If
-Codex adds a new field that carries a token, session identifier, refresh secret,
-or account metadata and the field name does not match current heuristics, the
-dummy auth file could preserve more information than intended. Because this is
-credential-adjacent code, the desired behavior should be allowlist-oriented and
-backed by explicit fixtures.
-
-## Goals / Success Criteria
-
-- Define a durable redaction policy for Codex `auth.json`:
-  - host access token is read for egress only.
-  - guest dummy auth contains no bearer, refresh, session, or secret values.
-  - selected non-secret fields may be preserved only when needed by Codex.
-- Prefer explicit per-field preservation over broad heuristic pass-through.
-- Add representative fixture tests for current Codex auth shapes.
-- Add regression tests for unknown nested fields, sensitive-looking field names,
-  lists, dictionaries, and JWT custom claims.
-- Preserve dummy token expiration alignment with the host access token.
-- Keep existing errors for missing, invalid, non-device, or expired auth.
-
-## Non-goals
-
-- No change to the egress credential-forwarding contract.
-- No attempt to refresh Codex tokens inside the bottle.
-- No copying of refresh tokens or raw host auth into the guest.
-- No dependency on a Codex SDK or external schema package.
-- No user-facing CLI changes.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/codex_auth.py` redaction helpers.
-- Unit tests in `tests/unit/test_codex_auth.py`.
-- Small documentation comments that distinguish preserved non-secret fields from
-  redacted credential material.
-
-Out of scope:
-
-- Provider provisioning outside Codex auth file generation.
-- Egress route construction for Codex.
-- Runtime calls to Codex/OpenAI services.
-
-## Design
-
-Treat the dummy guest `auth.json` as a deliberately synthesized compatibility
-file, not as a redacted copy of the host file. The implementation may continue
-to start from the host object for convenience, but preserved fields should be
-controlled by explicit allowlists at known schema locations.
-
-At the top level, preserve only `auth_mode`, replace `OPENAI_API_KEY` /
-`openai_api_key` with `null`, and synthesize the `tokens` block. Unknown scalar
-top-level fields become placeholders, unknown lists become empty lists, and
-unknown dictionaries become empty objects.
-
-In token blocks, replace `access_token` and `id_token` with dummy JWTs, preserve
-the selected non-secret `account_id`, and redact every other token-block field
-with the same placeholder / empty container policy. Refresh, session, and future
-token values are never copied to the guest.
-
-In JWT payloads, preserve only claims that are known to be non-secret and
-required for Codex behavior. Unknown scalar claims become placeholders, unknown
-lists become empty lists, and unknown objects become empty objects.
-
-For the OpenAI auth claim, preserve only currently necessary non-secret values
-such as plan type, selected account id, and boolean localhost state. Everything
-else is placeholder, empty object, or empty list according to the policy.
-
-Tests should use fixture auth objects that include both current expected fields
-and intentionally hostile future-looking fields such as `session_context`,
-`bearer`, `refreshSecret`, nested `token_value`, and opaque arrays. The dummy
-output must not contain the original secret strings.
-
-## Testing Strategy
-
-- Existing `tests/unit/test_codex_auth.py` should continue to pass.
-- Add tests that assert original access/refresh/session strings do not appear in
-  `codex_dummy_auth_json`.
-- Add tests for nested JWT and auth-claim redaction behavior.
-- Add tests that the dummy access/id token `exp` still matches the host access
-  token expiry.
-
-Run:
-
-- `python3 -m unittest tests.unit.test_codex_auth`
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0037-pipelock-yaml-render-contract.md

@@ -1,6 +1,6 @@
 # PRD 0037: Pipelock YAML Render Contract
 
-- **Status:** Active
+- **Status:** Draft
 - **Author:** didericis-codex
 - **Created:** 2026-06-02
 - **Issue:** #130
@@ -73,15 +73,6 @@ rendering a section, validate that required keys exist with the expected
 primitive/list/dict types. Missing or unsupported shapes should raise a clear
 `ValueError` naming the section and key.
 
-The supported top-level shape is `version`, `mode`, `enforce`,
-`api_allowlist`, `seed_phrase_detection`, `forward_proxy`, `dlp`,
-`request_body_scanning`, `tls_interception`, and `ssrf`. Required sections are
-validated before rendering; optional sections keep the current omission
-behavior. `request_body_scanning.scan_headers`,
-`request_body_scanning.header_mode`, and
-`tls_interception.passthrough_domains` remain optional for compatibility with
-parsed running configs that only contain the older rendered subset.
-
 Tests should cover both normal output and failure cases. Because the project is
 stdlib-only, semantic tests can use a small purpose-built parser for the exact
 rendered shape or compare rendered lines to values from the structured config
@@ -110,4 +101,6 @@ Run:
 
 ## Open Questions
 
-None.
+- Should malformed config errors be `ValueError`, matching current
+  `pipelock_build_config` validation, or a new internal exception type? Prefer
+  `ValueError` unless a caller needs to distinguish serializer errors.

docs/prds/0038-smolmachines-env-contract.md

@@ -1,102 +0,0 @@
-# PRD 0038: smolmachines Env Contract and Secret-Safe Injection
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #135
-
-## Summary
-
-Make smolmachines env handling match Docker's contract: resolve manifest env
-entries through `resolve_env()`, keep secret and interpolated values out of
-host argv, and document or enforce an explicit env contract for the backend.
-
-## Problem
-
-`bot_bottle/backend/smolmachines/prepare.py` builds the guest env from
-`bottle.env` directly, bypassing `resolve_env()`. Entries like `?prompt` and
-`${HOST_VAR}` can reach the guest literally rather than being prompted or
-resolved. In contrast, Docker resolves env through `resolve_env()` before
-writing a mode-600 env file.
-
-`smolmachines/smolvm.py` renders env as `-e KEY=VALUE` on `smolvm machine
-create` argv, and `SmolmachinesBottle.agent_argv` / `exec` prepend
-`env KEY=VALUE …` onto the `smolvm machine exec` argv. Any literal or resolved
-secret value is therefore visible in the host process table.
-
-The two backends have no shared env contract document. Divergence will silently
-widen as new manifest env features are added.
-
-## Goals / Success Criteria
-
-- Manifest env entries are resolved through `resolve_env()` before being
-  injected into the smolmachines guest, matching Docker behaviour.
-- No manifest env value (literal or resolved) appears on host argv during
-  machine creation or exec.
-- Define and document an explicit smolmachines env contract covering literals,
-  `?prompt` secrets, and `${HOST_VAR}` interpolations.
-- Unit tests cover: literal passthrough, prompted-secret resolution,
-  host-var interpolation, and the no-argv-leak invariant.
-
-## Non-goals
-
-- No changes to the Docker env path.
-- No changes to manifest schema or `resolve_env()` itself.
-- No changes to smolmachines networking or mount handling.
-- No new runtime dependencies.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/backend/smolmachines/prepare.py` env resolution.
-- `bot_bottle/backend/smolmachines/smolvm.py` machine-create argv.
-- `bot_bottle/backend/smolmachines/bottle.py` `agent_argv` / `exec` env
-  injection.
-- `bot_bottle/env.py` if helper changes are needed to support the smolmachines
-  path.
-- Unit tests in `tests/unit/` covering the above.
-
-Out of scope:
-
-- Integration tests that start a live smolmachines VM.
-- Docker backend changes.
-- Dashboard or CLI changes.
-
-## Design
-
-Run smolmachines env through `resolve_env()` at prepare time, exactly as Docker
-does. After resolution, inject env into the guest through a mechanism that does
-not expose values on host argv — for example by writing a mode-600 env file
-into the machine's state directory and loading it at exec time, or by passing
-env through `smolvm`'s stdin if the tool supports it.
-
-If `smolvm` provides no stdin or env-file injection path, document this as a
-known limitation and at minimum move env values behind a per-invocation
-tmpfile rather than inline argv.
-
-The env contract for smolmachines should mirror Docker's:
-
-- Literals: passed as-is after resolution.
-- `?prompt` entries: prompted at prepare time; resolved value injected, never
-  on argv.
-- `${HOST_VAR}` entries: interpolated from the operator's env at prepare time;
-  resolved value injected, never on argv.
-
-## Testing Strategy
-
-- Unit tests for `prepare.py` asserting `resolve_env()` is called and that
-  resolution results are used rather than raw `bottle.env` values.
-- Unit tests for `smolvm.py` machine-create argv asserting no env value appears
-  inline.
-- Unit tests for `bottle.py` exec path asserting the same argv invariant.
-
-Run:
-
-- `python3 -m unittest tests.unit.test_smolmachines_prepare`
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-- Does `smolvm machine create` support an env-file flag or stdin injection that
-  avoids `-e KEY=VALUE` argv?

docs/prds/0039-smolmachines-capability-remediation.md

@@ -1,87 +0,0 @@
-# PRD 0039: smolmachines Capability-Block Remediation
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #136
-
-## Summary
-
-Make capability-block remediation backend-aware. Today the dashboard approval
-path calls Docker-only teardown and apply code regardless of which backend
-created the bottle. Either implement smolmachines remediation or add a clean
-disable/unsupported path so operators never get a partial Docker teardown
-against a smolmachines slug.
-
-## Problem
-
-`bot_bottle/cli/dashboard.py` dispatches every capability-block approval to
-`bot_bottle/backend/docker/capability_apply.py`. That code snapshots with
-`docker cp`, pushes via `docker exec`, rewrites a Dockerfile override, and
-removes Docker containers and networks. It does not stop or delete a smolvm
-machine.
-
-smolmachines bottles still receive the capability-block supervise tool through
-`backend/smolmachines/provision/supervise.py`, so agents can queue a
-remediation the host cannot correctly apply. A partial Docker teardown against
-a smolmachines slug corrupts neither backend cleanly.
-
-## Goals / Success Criteria
-
-- Capability-block approval is routed to backend-specific code.
-- For the smolmachines backend, either:
-  a. A real remediation implementation that stops the VM, applies the
-     capability change, and restarts correctly; or
-  b. A clean unsupported response that tells the operator the action cannot
-     be taken and leaves the bottle in a consistent state.
-- If option (b): smolmachines agents do not receive the capability-block tool,
-  so the operator is never prompted for an action that will fail.
-- Unit tests cover the dispatch logic and the smolmachines path.
-
-## Non-goals
-
-- No changes to the Docker capability-apply path.
-- No changes to other supervise tools (cred-block, pipelock-block).
-- No changes to manifest or egress configuration.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/cli/dashboard.py` approval dispatch.
-- `bot_bottle/backend/smolmachines/provision/supervise.py` tool registration.
-- New or updated backend-specific capability apply/disable module for
-  smolmachines.
-- Unit tests for dispatch routing and smolmachines path.
-
-Out of scope:
-
-- Changes to `backend/docker/capability_apply.py` internals.
-- Integration tests that exercise a live smolmachines VM remediation.
-
-## Design
-
-Introduce a backend-aware dispatch at the approval call site. Each backend
-exposes a capability remediation entry point; the dashboard calls the one that
-matches the bottle's backend. If the backend does not support remediation,
-the entry point returns a structured error that the dashboard surfaces as an
-operator message without attempting any teardown.
-
-If option (b) is chosen initially, suppress capability-block registration in
-`smolmachines/provision/supervise.py` so agents never see the tool.
-
-## Testing Strategy
-
-- Unit test that approval dispatch selects the smolmachines path for a
-  smolmachines bottle and the Docker path for a Docker bottle.
-- Unit test for the smolmachines path (unsupported response or real apply).
-- Regression test that Docker approval still calls `capability_apply.py`.
-
-Run:
-
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-- Is a real smolmachines capability-apply implementation in scope for this PRD,
-  or should it be deferred to a follow-on after PRD 0040 lands?

docs/prds/0040-backend-aware-resume-and-dashboard.md

@@ -1,87 +0,0 @@
-# PRD 0040: Backend-Aware Resume and Dashboard Reattach
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #137
-
-## Summary
-
-Persist the backend name in `BottleMetadata` and thread it through `resume` and
-dashboard reattach so both flows construct the correct backend bottle without
-relying on env overrides or defaulting to Docker.
-
-## Problem
-
-`BottleMetadata` records identity, agent, cwd, started_at, and compose project,
-but not the backend name. Without it:
-
-- `cli/resume.py` cannot select the right backend from a preserved state dir
-  alone; operators must remember to set `BOT_BOTTLE_BACKEND=smolmachines`
-  separately.
-- `cli/dashboard.py` `_bottle_for_slug` constructs a `DockerBottle` for any
-  externally discovered slug, so reattaching to a live smolmachines agent
-  from the dashboard sends Docker commands to a smolvm machine.
-
-## Goals / Success Criteria
-
-- `BottleMetadata` includes the backend name, written at bottle creation time
-  for both Docker and smolmachines.
-- `cli resume` reads the persisted backend name and constructs the correct
-  bottle type without requiring an env override.
-- Dashboard reattach (`_bottle_for_slug`) reads the persisted backend name and
-  constructs the correct bottle type.
-- Existing Docker bottles without a persisted backend name fall back to Docker
-  (backward-compatible default).
-- Unit tests cover write, read, backward-compatible fallback, and both
-  resume/reattach code paths.
-
-## Non-goals
-
-- No changes to manifest or egress configuration.
-- No new CLI flags (backend selection at resume time should be automatic).
-- No smolmachines capability-apply implementation (see PRD 0039).
-
-## Scope
-
-In scope:
-
-- `bot_bottle/backend/docker/bottle_state.py` `BottleMetadata` schema and
-  write path.
-- `bot_bottle/backend/docker/bottle.py` and
-  `bot_bottle/backend/smolmachines/bottle.py` metadata write at creation.
-- `bot_bottle/cli/resume.py` backend selection from metadata.
-- `bot_bottle/cli/dashboard.py` `_bottle_for_slug` backend selection.
-- Unit tests covering the above.
-
-Out of scope:
-
-- Migration tooling for existing state dirs.
-- Integration tests that exercise full resume across process restarts.
-
-## Design
-
-Add a `backend` field to `BottleMetadata` with a default of `"docker"` for
-backward compatibility. Both `DockerBottle` and `SmolmachinesBottle` write
-their backend name into metadata at creation time.
-
-`resume` reads the metadata before constructing the bottle object and selects
-the appropriate backend class. `_bottle_for_slug` does the same. A helper
-function in the metadata module can encapsulate the backend-name-to-class
-mapping so the logic is not duplicated.
-
-## Testing Strategy
-
-- Unit tests for `BottleMetadata` serialisation with and without the backend
-  field.
-- Unit tests for the backward-compatible default.
-- Unit tests for `resume` selecting smolmachines vs Docker from metadata.
-- Unit tests for `_bottle_for_slug` selecting smolmachines vs Docker.
-
-Run:
-
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0041-git-http-request-bounds.md

@@ -1,60 +0,0 @@
-# PRD 0041: Git HTTP Request Bounds
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #138
-
-## Summary
-
-Add Content-Length validation and a body-size cap to `git_http_backend.py` so malformed or oversized smart-HTTP requests fail cleanly rather than crashing the handler or exhausting memory.
-
-## Problem
-
-`bot_bottle/git_http_backend.py` calls `int(self.headers.get("Content-Length", 0))` without catching `ValueError`. A request with a non-numeric Content-Length raises an unhandled exception in the request handler.
-
-The handler reads the full declared length into memory before passing the body to `git http-backend` with no upper bound. A local or compromised client can force arbitrarily high memory use. For comparison, `supervise_server.py` caps request bodies at 1 MiB.
-
-## Goals / Success Criteria
-
-- A missing or non-numeric Content-Length returns HTTP 400.
-- A negative Content-Length returns HTTP 400.
-- A body larger than the cap (1 MiB, matching `supervise_server.py`) returns HTTP 413.
-- Valid Git smart-HTTP pushes and fetches continue to work.
-- Unit tests cover: missing length, non-numeric length, negative length, over-cap length, and a valid push/fetch passthrough.
-
-## Non-goals
-
-- No changes to git-gate authentication or route logic.
-- No changes to `supervise_server.py`.
-- No streaming / chunked-transfer-encoding support.
-- No TLS changes.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/git_http_backend.py` request parsing and body reading.
-- Unit tests in `tests/unit/test_git_http_backend.py`.
-
-Out of scope:
-
-- Integration tests that drive a real Git client through the handler.
-
-## Design
-
-Wrap the Content-Length parse in a try/except and return 400 on `ValueError`. Add an explicit check for negative values. After parsing, compare the declared length against a module-level `MAX_BODY_BYTES` constant (default 1 MiB) and return 413 if exceeded. Read exactly `min(content_length, MAX_BODY_BYTES)` bytes.
-
-## Testing Strategy
-
-- Unit tests using `unittest.mock` to drive the handler with crafted headers.
-- Test cases: no Content-Length header, `Content-Length: abc`, `Content-Length: -1`, `Content-Length: 2097152` (over cap), and a normal small POST body.
-
-Run:
-
-- `python3 -m unittest tests.unit.test_git_http_backend`
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0042-smolmachines-parity-tests.md

@@ -1,85 +0,0 @@
-# PRD 0042: smolmachines Cross-Backend Parity Tests
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #139
-
-## Summary
-
-Add tests that prove secrets, forwarded env, resume, and remediation behave
-equivalently across Docker and smolmachines backends. The fixes in PRDs
-0038–0040 are unverifiable without this coverage.
-
-## Problem
-
-The existing unit suite is broad but backend-specific. There are no tests that
-run the same scenario against both Docker and smolmachines and assert the
-outcomes match. A regression in one backend goes undetected until a live run,
-and PRDs 0038–0040 can each pass their own unit tests while the backends still
-diverge at the integration boundary.
-
-## Goals / Success Criteria
-
-- A parity test suite that covers at least:
-  - Secret env injection: `?prompt` and `${HOST_VAR}` entries produce the same
-    guest env on both backends.
-  - Forwarded env: literal manifest env values reach the guest on both backends.
-  - Resume: a preserved bottle state dir round-trips correctly on both backends
-    (relies on PRD 0040 metadata).
-  - Remediation: capability-block approval routes to the correct backend handler
-    (relies on PRD 0039 dispatch).
-- Each scenario is parameterised so a failure names the backend that regressed.
-- Tests run without a live VM or Docker daemon (mock or stub backends).
-
-## Non-goals
-
-- No end-to-end agent execution tests.
-- No performance or load tests.
-- No changes to production code (test-only PRD).
-
-## Scope
-
-In scope:
-
-- New test file(s) under `tests/unit/` for parity scenarios.
-- Stub or mock implementations of smolmachines and Docker backends as needed.
-
-Out of scope:
-
-- Changes to `bot_bottle/` production code.
-- CI infrastructure changes beyond adding the new test file to the discover
-  invocation.
-
-## Dependencies
-
-- PRD 0038 should land before the env parity tests are finalised.
-- PRDs 0039 and 0040 should land before the remediation and resume scenarios
-  are finalised; stubs can be written speculatively beforehand.
-
-## Design
-
-Parameterise each scenario over a list of backend factory functions. Each
-factory returns a bottle instance wired to a stub subprocess layer. The test
-body is backend-agnostic: it calls the same public API, captures the same
-observable output, and asserts equality.
-
-For env scenarios, capture the argv or env-file content passed to the guest
-and compare against resolved manifest values. For resume, write metadata with
-one backend class and read it back to verify correct selection. For remediation,
-assert dispatch selects the per-backend handler.
-
-## Testing Strategy
-
-Run as part of the standard unit discover:
-
-- `python3 -m unittest discover -s tests/unit`
-
-Or directly:
-
-- `python3 -m unittest tests.unit.test_backend_parity`
-
-## Open Questions
-
-- Should parity tests live under `tests/unit/` (mock-based) or
-  `tests/integration/` (live infra)? Mock-based is preferred to keep CI simple.

docs/prds/0043-sidecar-pipe-lifecycle.md

@@ -1,74 +0,0 @@
-# PRD 0043: Sidecar Pipe Lifecycle Cleanup
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #140
-
-## Summary
-
-Close the unclosed child stdout pipe file descriptors that `sidecar_init.py`
-leaks during restart and shutdown paths, eliminating `ResourceWarning` noise
-and tightening the process lifecycle.
-
-## Problem
-
-Unit tests for `sidecar_init.py` pass, but restart and shutdown cases emit
-`ResourceWarning: unclosed file <_io.BufferedReader …>` for child stdout pipes,
-originating around lines 141 and 273. The warnings indicate the restart path
-leaks pipe file descriptors: a pipe opened for a stopped or replaced child is
-not explicitly closed before the next child is spawned or before the supervisor
-exits.
-
-## Goals / Success Criteria
-
-- `python3 -m unittest tests.unit.test_sidecar_init` produces no
-  `ResourceWarning` output.
-- Pipe file descriptors for stopped or replaced child processes are explicitly
-  closed in the restart path.
-- Pipe file descriptors for all children are explicitly closed in the shutdown
-  path.
-- No change to the external signal or exit-code contract from PRD 0034.
-
-## Non-goals
-
-- No changes to restart or shutdown policy (coalescing, ordering, timeout).
-- No changes to egress, pipelock, git-gate, or supervise daemon argv.
-- No new runtime dependencies.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/sidecar_init.py` pipe open/close lifecycle in `_Supervisor`.
-- Unit tests in `tests/unit/test_sidecar_init.py` asserting no leaked pipes.
-
-Out of scope:
-
-- Changing how pumping threads read from pipes.
-- Integration tests that start a live sidecar container.
-
-## Design
-
-Audit every code path in `_Supervisor` where a child process is stopped,
-replaced, or reaches end-of-life, and ensure the corresponding stdout pipe is
-explicitly closed before spawning a replacement or exiting the supervisor loop.
-
-Where a pumping thread holds a reference to the pipe, coordinate closure so the
-thread sees EOF and exits cleanly rather than blocking indefinitely.
-
-## Testing Strategy
-
-- Enable `ResourceWarning` as an error in test setUp:
-  `warnings.simplefilter("error", ResourceWarning)`.
-- Run existing restart and shutdown test cases under this stricter setting.
-- Add tests for restart-then-shutdown if not already covered.
-
-Run:
-
-- `python3 -m unittest tests.unit.test_sidecar_init`
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0044-print-parity-across-backends.md

@@ -1,119 +0,0 @@
-# PRD 0044: Print Parity Across Backends
-
-- **Status:** Active
-- **Author:** didericis-claude
-- **Created:** 2026-06-02
-- **Issue:** #96
-
-## Summary
-
-Hoist `git_gate_plan`, `egress_plan`, `agent_provision`, and `supervise_plan`
-from the concrete `BottlePlan` subclasses up to `BottlePlan`, and implement
-`print` concretely there. This eliminates the two per-backend output divergences
-and ensures any future backend gets correct preflight rendering for free.
-
-## Problem
-
-`BottlePlan.print` is `@abstractmethod`, so each backend provides its own
-implementation. The two current implementations have drifted:
-
-| Field | Docker | smolmachines |
-|---|---|---|
-| git gate lines | `upstream_host:upstream_port` from resolved `git_gate_plan.upstreams` | `Name → Upstream` from manifest `bottle.git` |
-| egress lines | `host [auth:scheme]` | `host` only (auth dropped) |
-
-The smolmachines docstring says "same shape as the Docker backend's so operators
-see one format across backends" — that intent is real but nothing enforces it.
-
-The env_names divergence previously noted in this issue was resolved by PRD 0038
-(smolmachines env contract): `resolved.forwarded` is now merged into
-`agent_provision.guest_env` at prepare time on both backends, so displayed env
-names are equivalent.
-
-## Goals / Success Criteria
-
-- `BottlePlan` carries `git_gate_plan`, `egress_plan`, `agent_provision`, and
-  `supervise_plan` as concrete fields; subclasses no longer declare them
-  independently.
-- `BottlePlan.print` is a concrete method; subclasses have no `print`
-  implementation of their own.
-- Both backends render git gate lines as `name → upstream_host:upstream_port`
-  (using `git_gate_plan.upstreams`), not the manifest-level URL.
-- Both backends render egress lines as `host [auth:scheme]` (dropping the
-  annotation only when `auth_scheme` is empty).
-- Unit tests assert the unified output for both backends from a single shared
-  test helper.
-
-## Non-goals
-
-- No changes to the Docker or smolmachines launch, prepare, or cleanup paths.
-- No changes to how env values are resolved or injected (that is PRD 0038).
-- No changes to the manifest schema or `GitEntry`.
-- No new CLI flags or dashboard changes.
-
-## Scope
-
-In scope:
-
-- `bot_bottle/backend/__init__.py` — add `git_gate_plan`, `egress_plan`,
-  `agent_provision`, and `supervise_plan` fields to `BottlePlan`; replace
-  `@abstractmethod print` with a concrete implementation.
-- `bot_bottle/backend/docker/bottle_plan.py` — remove the four hoisted fields
-  and the `print` method.
-- `bot_bottle/backend/smolmachines/bottle_plan.py` — remove the four hoisted
-  fields and the `print` method.
-- `tests/unit/` — add or update tests asserting unified preflight output; a
-  shared helper can build a minimal plan fixture for each backend and assert
-  the same lines appear.
-
-Out of scope:
-
-- Changes to `bot_bottle/backend/print_util.py` beyond what the new `print`
-  implementation requires.
-- Changes to `BottleCleanupPlan.print` or any other print method.
-- Integration tests that launch a real bottle.
-
-## Design
-
-Move the four fields that both concrete subclasses already declare —
-`git_gate_plan: GitGatePlan`, `egress_plan: EgressPlan`,
-`agent_provision: AgentProvisionPlan`, `supervise_plan: SupervisePlan | None`
-— up to `BottlePlan`. Both backends' `prepare` paths already produce these with
-the same types, so no prepare-time changes are needed.
-
-Replace the `@abstractmethod` `print` with a concrete implementation on
-`BottlePlan` that:
-
-1. Builds `env_names` from `bottle.env.keys() | agent_provision.guest_env.keys()`
-   filtered through `agent_provision.hidden_env_names`.
-2. Builds git gate lines from `git_gate_plan.upstreams` as
-   `f"{u.name} → {u.upstream_host}:{u.upstream_port}"`.
-3. Builds egress lines from `egress_plan.routes` as
-   `f"{r.host} [auth:{r.auth_scheme}]"` when `r.auth_scheme` is non-empty,
-   else `r.host`.
-4. Renders the standard two-column preflight block (leading blank line, agent,
-   provider, env, skills, bottle, git identity, git gate, egress, trailing blank
-   line).
-
-Docker's `forwarded_env` keys are already merged into `agent_provision.guest_env`
-via the `agent_provision_plan` builder, so no special handling is needed for
-env_names.
-
-## Testing Strategy
-
-- Add a shared fixture builder (e.g. `make_plan(backend)`) in a new or existing
-  unit test module that constructs a minimal `DockerBottlePlan` and
-  `SmolmachinesBottlePlan` from the same spec and plan fields.
-- Assert that `plan.print(remote_control=False)` produces identical git gate and
-  egress lines for both backends given the same `git_gate_plan` and
-  `egress_plan`.
-- Test the `auth_scheme` annotation: present when non-empty, absent otherwise.
-- Test git gate rendering: `name → host:port` format.
-
-Run:
-
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0045-workspace-porting-plan.md

@@ -1,167 +0,0 @@
-# PRD 0045: Workspace Porting Plan
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #116
-
-## Summary
-
-Add a backend-neutral `WorkspacePlan` that describes how the operator's current
-workspace is represented inside a bottle. Docker and smolmachines should both
-use this plan for workspace path, working directory, content copy, `.git` copy,
-ownership, and provider trust configuration instead of rediscovering
-`/home/node/workspace` in separate launch and provisioning code paths.
-
-## Problem
-
-The current `--cwd` behavior is spread across backend-specific code:
-
-- Docker builds a derived image that copies the host cwd to
-  `/home/node/workspace`, sets that as `WORKDIR`, and patches Claude trust in
-  the generated Dockerfile.
-- Docker git provisioning separately copies `.git` into
-  `/home/node/workspace/.git`.
-- smolmachines git provisioning reconstructs `<guest_home>/workspace/.git`, but
-  does not copy the full working tree.
-- Codex provider setup trusts `guest_home`, not the copied workspace path.
-
-These details create backend drift and make provider-specific workspace fixes
-easy to hard-code in the wrong layer.
-
-## Goals / Success Criteria
-
-- `BottleSpec` remains the CLI intent shape (`copy_cwd`, `user_cwd`), while a
-  resolved `WorkspacePlan` carries the backend-neutral guest workspace contract.
-- `BottlePlan` exposes `workspace_plan` so shared and backend-specific
-  provisioning paths consume one resolved object.
-- The default in-bottle workspace path remains `/home/node/workspace` when
-  `--cwd` is enabled.
-- Docker uses `WorkspacePlan` when building the derived cwd image and when
-  provisioning cwd `.git` state.
-- smolmachines copies the host cwd contents into the same logical workspace
-  path and uses `WorkspacePlan` when provisioning cwd `.git` state.
-- Provider trust configuration is written for the workspace path when `--cwd`
-  is enabled, and for the guest home when `--cwd` is disabled.
-- Unit tests cover plan resolution, provider trust path selection, Docker
-  derived image rendering, and both backends' `.git` copy targets.
-
-## Non-goals
-
-- No new user-facing flags for custom workspace paths.
-- No manifest schema changes.
-- No redesign of git-gate or `bottle.git` entries.
-- No switch from Docker image-copy to bind-mount.
-- No unrelated provider auth changes.
-
-## Scope
-
-In scope:
-
-- Add a small workspace planning module.
-- Add `workspace_plan` to `BottlePlan` and populate it in Docker and
-  smolmachines prepare paths.
-- Thread the trusted project path into provider provisioning.
-- Replace hard-coded `/home/node/workspace` cwd copy and `.git` copy sites with
-  `WorkspacePlan` values.
-- Copy full host cwd contents for smolmachines `--cwd` parity.
-- Update focused unit tests.
-
-Out of scope:
-
-- Integration tests that launch real Docker containers or smolmachines VMs.
-- Path customization in the bottle manifest or CLI.
-- Runtime synchronization after bottle launch; this remains a launch-time copy.
-
-## Design
-
-Add `bot_bottle/workspace.py`:
-
-```python
-@dataclass(frozen=True)
-class WorkspacePlan:
-    enabled: bool
-    host_path: Path
-    guest_home: str
-    guest_path: str
-    workdir: str
-    owner: str = "node:node"
-    mode: str = "755"
-    copy_contents: bool = True
-    copy_git: bool = True
-    has_host_git_dir: bool = False
-```
-
-`workspace_plan(spec, guest_home)` resolves:
-
-- `enabled` from `spec.copy_cwd`.
-- `host_path` from `spec.user_cwd`.
-- `guest_path` as `<guest_home>/workspace` when enabled, else `guest_home`.
-- `workdir` as `guest_path` when enabled, else `guest_home`.
-- `has_host_git_dir` from `<host_path>/.git`.
-
-Backends resolve this in `prepare` using their existing guest-home knobs:
-
-- Docker: `BOT_BOTTLE_CONTAINER_HOME`, default `/home/node`.
-- smolmachines: `BOT_BOTTLE_GUEST_HOME`, default `/home/node`.
-
-`BottlePlan` carries the result so launch, git provisioning, and provider
-provisioning stop consulting `spec.copy_cwd` and hard-coded paths directly.
-
-### Docker
-
-Keep the current derived-image transport. Change
-`build_image_with_cwd(derived, base, cwd)` to accept a `WorkspacePlan` or
-explicit guest path/workdir fields, then render:
-
-- `COPY --chown=node:node . <workspace_plan.guest_path>`
-- `WORKDIR <workspace_plan.workdir>`
-
-Claude trust should move out of the generated cwd Dockerfile and into provider
-provisioning so Docker and smolmachines share the same provider trust behavior.
-
-### smolmachines
-
-Copy host cwd contents into `workspace_plan.guest_path` during provisioning or
-VM initialization, then chown the resulting workspace to `node:node`. Continue
-to copy `.git` through the existing smolvm transport, but target
-`<workspace_plan.guest_path>/.git`.
-
-This intentionally closes the current parity gap where smolmachines receives
-repo metadata without the working tree.
-
-### Provider Trust
-
-Extend provider planning with a `trusted_project_path` argument. Callers pass
-`workspace_plan.workdir`.
-
-Codex writes:
-
-```toml
-[projects."<trusted_project_path>"]
-trust_level = "trusted"
-```
-
-Claude writes or updates `.claude.json` so `projects` includes
-`trusted_project_path` with `hasTrustDialogAccepted: true`. This provisioning
-belongs in `AgentProvisionPlan` so both backends apply it through their existing
-provider file-copy primitives.
-
-## Testing Strategy
-
-- Unit-test `workspace_plan()` for enabled and disabled cwd, guest-home
-  overrides, and `.git` detection.
-- Unit-test Docker cwd image rendering to prove it uses the plan's guest path
-  and workdir.
-- Unit-test provider planning for Codex and Claude trusted project paths.
-- Unit-test Docker and smolmachines git provisioning targets using mocked copy
-  and exec primitives.
-- Unit-test smolmachines workspace content copy target and ownership command.
-
-Run:
-
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0046-remove-git-remote-host-overrides.md

@@ -1,64 +0,0 @@
-# PRD 0046: Remove Git Remote Host Overrides
-
-- **Status:** Active
-- **Author:** didericis-codex
-- **Created:** 2026-06-02
-- **Issue:** #152
-
-## Summary
-
-Remove git remote host override plumbing from bottle manifests and git-gate
-startup. Git remote declarations should describe upstream repositories and the
-git-gate credential material needed to mirror them; they should not also
-configure hosts-file behavior for sidecars.
-
-## Problem
-
-The git remote model currently has a hosts override path that can make a git
-upstream resolve differently inside the git-gate sidecar. That is surprising
-because the same hostname may also be used for HTTP/API traffic that should keep
-using the normal egress DNS and policy path.
-
-Keeping host resolution in the git remote model makes repository routing,
-sidecar hosts files, and egress behavior feel coupled even when the operator
-only meant to configure git-gate.
-
-## Goals / Success Criteria
-
-- Git remote manifest parsing no longer stores host override data.
-- Git-gate upstream plans no longer carry host override data.
-- Docker compose rendering no longer emits sidecar `extra_hosts` entries from
-  git remote declarations.
-- Smolmachines bundle launch planning has no unused host override path for
-  git-gate.
-- Focused unit tests cover the absence of sidecar `extra_hosts` for git
-  upstreams.
-- Current user-facing documentation no longer advertises git remote host
-  overrides.
-
-## Non-goals
-
-- No replacement hosts-file override feature.
-- No SSH client config provisioning.
-- No change to git-gate's SSH credential or known-host handling.
-- No change to egress DNS, HTTP auth, or pipelock routing semantics.
-
-## Design
-
-Remove the host override field from the internal `GitEntry` and
-`GitGateUpstream` models. Remove the git-gate aggregation helper and the Docker
-compose code that converted those values into sidecar `extra_hosts`.
-
-The manifest parser does not need a migration-specific error path. After this
-change, the old hosts override key has no internal model field and no runtime
-effect.
-
-## Testing Strategy
-
-Run:
-
-- `python3 -m unittest discover -s tests/unit`
-
-## Open Questions
-
-None.

docs/prds/0047-git-gate-manifest-redesign.md

@@ -1,170 +0,0 @@
-# PRD 0047: Git-gate Manifest Redesign
-
-- **Status:** Active
-- **Author:** didericis
-- **Created:** 2026-06-03
-- **Issue:** #160
-
-## Summary
-
-Replace the `git` top-level key in bottle and agent manifests with `git-gate`,
-consolidating git-identity configuration (`user`) and git-gate sidecar
-configuration (`repos`) under a single section. Within `repos`, field names
-move to lowercase snake_case and the local repo name is promoted to the YAML
-key. The change removes the ambiguity in the current `git` block: its fields
-are not generic git or SSH config — they are specifically the credential,
-host-trust, and identity material that is managed in relation to git-gate.
-
-## Problem
-
-The current bottle manifest uses a `git` top-level key that mixes two concerns:
-
-- `git.user` — `git config --global user.name / user.email` identity, which
-  the provisioner injects into the agent's shell.
-- `git.remotes` — upstream URL, identity file, and host key material that the
-  git-gate sidecar consumes; the agent never sees these values.
-
-That grouping suggests the `remotes` entries behave like an SSH config or a
-generic `.gitconfig` remote declaration. They do not. The gate reads the
-credential material to push upstream after gitleaks passes; the agent's
-`.gitconfig` receives only the `insteadOf` rewrite that redirects traffic
-through the gate. Nothing in the current key name or field names signals this.
-
-Splitting `git.user` into a separate section from `git.remotes` also doesn't
-help: both concepts exist because of git-gate, and keeping them under a single
-`git-gate` key makes their relationship and purpose explicit.
-
-The field names inside each remote entry also use PascalCase (`Name`,
-`Upstream`, `IdentityFile`, `KnownHostKey`), inconsistent with every other
-manifest section, which uses snake_case.
-
-The current `git.remotes` dict is keyed by upstream host, which works for
-simple remotes but forces a separate `Name` field to give the gate's bare repo
-a local label. The host key and `Name` field are often redundant or confusing
-(e.g., IP-literal upstreams where the key carries no semantic meaning).
-
-## Goals / Success Criteria
-
-- `git-gate` is accepted as a top-level bottle and agent key; `git` is removed
-  from both allowed-key sets.
-- `git-gate.repos` is a named map where each key is the local repo name
-  exposed by the gate (bottle-only; rejected at the agent level).
-- Each entry in `git-gate.repos` accepts exactly: `url` (required), `identity`
-  (required), `host_key` (optional).
-- `git-gate.user` replaces `git.user` on both bottles and agents, with the
-  same `name` / `email` fields and overlay semantics.
-- The manifest parser rejects `git.remotes` and `git.user` with errors that
-  point to the new keys.
-- `GitEntry` internal fields are updated to match the new names; all callers
-  (provisioner, git-gate render, plan, tests) compile and pass.
-- Existing unit tests in `tests/unit/test_manifest_git.py` and
-  `tests/unit/test_manifest_git_user.py` are rewritten to use the new YAML
-  shape; all other manifest unit tests remain green.
-- The demo manifest (`bot-bottle.demo.json`) and any examples using the old
-  shape are updated.
-
-## Non-goals
-
-- No change to `git.user` / `git-gate.user` semantics or field names (`name`,
-  `email`).
-- No change to git-gate runtime behavior (mirroring, gitleaks, access-hook
-  refresh).
-- No change to the `insteadOf` rewrite the provisioner emits.
-- No migration shim: the old `git.*` shape is rejected immediately with clear
-  error messages pointing to the new keys.
-- No change to how agent-level user config overlays the bottle-level value.
-
-## Design
-
-### New manifest shape
-
-**Before** (bottle frontmatter):
-
-```yaml
-git:
-  user:
-    name: implementer-bot
-    email: eric+implementer@dideric.is
-  remotes:
-    gitea.dideric.is:
-      Name: bot-bottle
-      Upstream: ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git
-      IdentityFile: ~/.ssh/gitea-delos-2.pem
-      KnownHostKey: "ssh-rsa AAAA..."
-```
-
-**After**:
-
-```yaml
-git-gate:
-  user:
-    name: implementer-bot
-    email: eric+implementer@dideric.is
-  repos:
-    bot-bottle:
-      url: ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git
-      identity: ~/.ssh/gitea-delos-2.pem
-      host_key: "ssh-rsa AAAA..."
-```
-
-`git-gate` is the single optional top-level key for all git configuration.
-Bottles that previously used only `git.user` now use only `git-gate.user`;
-those that used only `git.remotes` now use only `git-gate.repos`.
-
-### Key-name-as-repo-name
-
-The YAML key in `git-gate.repos` becomes the local repo name (previously
-`Name`). The upstream host is no longer the primary key; the provisioner and
-gate derive it from the `url` field during parse. IP-literal upstreams work
-without an artificial host-as-key constraint.
-
-### Field renames
-
-| Old field | New field |
-|-----------|-----------|
-| `Name` (from dict key) | YAML key in `repos` |
-| `Upstream` | `url` |
-| `IdentityFile` | `identity` |
-| `KnownHostKey` | `host_key` |
-
-### Parser changes
-
-- `manifest_schema.py`: replace `"git"` with `"git-gate"` in `BOTTLE_KEYS`
-  and `AGENT_KEYS_OPTIONAL`.
-- `manifest.py`: replace `_parse_git_config` with `_parse_git_gate_config`
-  that validates both `user` and `repos` subkeys. Update `Bottle.from_dict`
-  and `Agent.from_dict` to call it for the `"git-gate"` key.
-- `Agent.from_dict` continues to reject `repos` at the agent level with a
-  clear error.
-- Remove `from_remote_dict` and update `GitEntry._from_object` to accept the
-  new field names. Internal dataclass field names (`UpstreamUser`, etc.) are
-  unchanged — they are internal plumbing, not user-facing.
-- Any existing `"git"` key raises a targeted error:
-
-  ```
-  bottle 'dev' uses 'git' which has been replaced by 'git-gate' (PRD 0047).
-  Move git.user → git-gate.user and git.remotes → git-gate.repos.
-  ```
-
-## Testing Strategy
-
-Run:
-
-```
-python3 -m unittest discover -s tests/unit
-```
-
-Test files to update:
-
-- `tests/unit/test_manifest_git.py` — rewrite fixtures and assertions to use
-  `git-gate.repos` / lowercase fields. Cover: minimal entry, optional
-  `host_key`, missing `url`, missing `identity`, unknown key, IP-literal
-  upstreams, duplicate name rejection, old `git.remotes` and bare `git` key
-  both rejected.
-- `tests/unit/test_manifest_git_user.py` and
-  `tests/unit/test_manifest_agent_git_user.py` — update fixtures to use
-  `git-gate.user` at both bottle and agent level.
-
-## Open Questions
-
-None.

examples/agents/implementer.md

@@ -5,7 +5,7 @@ model: opus
 bottle: dev
 skills:
   - init-prd
-git-gate:
+git:
   user:
     name: implementer-bot
     email: eric+implementer@dideric.is

tests/fixtures.py

@@ -38,21 +38,23 @@ def fixture_with_egress_dict() -> dict[str, Any]:
 
 
 def fixture_with_git_dict() -> dict[str, Any]:
-    """Bottle declares git-gate upstreams. JSON shape."""
+    """Bottle declares a git-gate upstream. JSON shape."""
     return {
         "bottles": {
             "dev": {
-                "git-gate": {
-                    "repos": {
-                        "bot-bottle": {
-                            "url": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
-                            "identity": "/dev/null",
-                            "host_key": "ssh-ed25519 AAAA...",
+                "git": {
+                    "remotes": {
+                        "gitea.dideric.is": {
+                            "Name": "bot-bottle",
+                            "Upstream": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
+                            "IdentityFile": "/dev/null",
+                            "KnownHostKey": "ssh-ed25519 AAAA...",
                         },
-                        "foo": {
-                            "url": "ssh://git@github.com/didericis/foo.git",
-                            "identity": "/dev/null",
-                            "host_key": "ssh-ed25519 BBBB...",
+                        "github.com": {
+                            "Name": "foo",
+                            "Upstream": "ssh://git@github.com/didericis/foo.git",
+                            "IdentityFile": "/dev/null",
+                            "KnownHostKey": "ssh-ed25519 BBBB...",
                         },
                     },
                 }

tests/unit/test_agent_provider.py

@@ -31,7 +31,6 @@ class TestAgentProviderRuntime(unittest.TestCase):
                 dockerfile="/tmp/Dockerfile.codex",
                 state_dir=Path(tmp),
             )
-            config = Path(tmp, "codex-config.toml").read_text()
         self.assertEqual("codex", plan.template)
         self.assertEqual("codex", plan.command)
         self.assertEqual("read_prompt_file", plan.prompt_mode)
@@ -46,18 +45,6 @@ class TestAgentProviderRuntime(unittest.TestCase):
             ("/home/node/.codex/config.toml",),
             tuple(f.guest_path for f in plan.files),
         )
-        self.assertIn('[projects."/home/node"]', config)
-
-    def test_codex_trusts_requested_project_path(self):
-        with tempfile.TemporaryDirectory(prefix="bb-provider.") as tmp:
-            agent_provision_plan(
-                template="codex",
-                dockerfile="",
-                state_dir=Path(tmp),
-                trusted_project_path="/home/node/workspace",
-            )
-            config = Path(tmp, "codex-config.toml").read_text()
-        self.assertIn('[projects."/home/node/workspace"]', config)
 
     def test_codex_forward_host_credentials_adds_auth_and_verify(self):
         with tempfile.TemporaryDirectory(prefix="bb-provider.") as tmp:
@@ -92,7 +79,6 @@ class TestAgentProviderRuntime(unittest.TestCase):
                 state_dir=Path(tmp),
                 auth_token="BOT_BOTTLE_CLAUDE_OAUTH_TOKEN",
             )
-            claude_config = json.loads(Path(tmp, "claude.json").read_text())
         self.assertEqual(1, len(plan.egress_routes))
         route = plan.egress_routes[0]
         self.assertEqual("api.anthropic.com", route.host)
@@ -103,20 +89,6 @@ class TestAgentProviderRuntime(unittest.TestCase):
         self.assertEqual("1", plan.env_vars["CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC"])
         self.assertEqual("1", plan.env_vars["DISABLE_ERROR_REPORTING"])
         self.assertEqual(frozenset({"CLAUDE_CODE_OAUTH_TOKEN"}), plan.hidden_env_names)
-        self.assertIn("/home/node", claude_config["projects"])
-        self.assertIn("/home/node/.claude.json", {f.guest_path for f in plan.files})
-
-    def test_claude_trusts_requested_project_path(self):
-        with tempfile.TemporaryDirectory(prefix="bb-provider.") as tmp:
-            agent_provision_plan(
-                template="claude",
-                dockerfile="",
-                state_dir=Path(tmp),
-                trusted_project_path="/home/node/workspace",
-            )
-            config = json.loads(Path(tmp, "claude.json").read_text())
-        self.assertIn("/home/node", config["projects"])
-        self.assertIn("/home/node/workspace", config["projects"])
 
     def test_codex_forward_host_credentials_populates_egress_routes(self):
         with tempfile.TemporaryDirectory(prefix="bb-provider.") as tmp:

tests/unit/test_backend_parity.py

@@ -1,240 +0,0 @@
-"""Cross-backend parity tests (PRD 0042).
-
-Verifies that Docker and smolmachines bottles expose the same
-observable contracts for env injection, agent argv, and exec. Tests
-use mock subprocess layers so no live VM or Docker daemon is needed.
-
-The scenarios here document what must hold across both backends. As
-PRDs 0038–0040 land these tests provide regression coverage for the
-contracts they establish.
-"""
-
-from __future__ import annotations
-
-import subprocess
-import unittest
-from typing import Callable
-from unittest.mock import MagicMock, call, patch
-
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-def _docker_bottle(guest_env: dict[str, str]) -> "object":
-    from bot_bottle.backend.docker.bottle import DockerBottle
-    return DockerBottle(
-        container="bot-bottle-test",
-        teardown=lambda: None,
-        prompt_path_in_container=None,
-        agent_command="claude",
-    )
-
-
-def _smolmachines_bottle(guest_env: dict[str, str]) -> "object":
-    from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-    return SmolmachinesBottle(
-        "bot-bottle-test",
-        guest_env=guest_env,
-        agent_command="claude",
-    )
-
-
-# One entry per backend: (label, factory).
-_BACKENDS: list[tuple[str, Callable[[dict[str, str]], object]]] = [
-    ("docker", _docker_bottle),
-    ("smolmachines", _smolmachines_bottle),
-]
-
-
-# ---------------------------------------------------------------------------
-# agent_argv contracts
-# ---------------------------------------------------------------------------
-
-class TestAgentArgvParity(unittest.TestCase):
-    """Both backends surface a non-empty agent_argv that includes the
-    agent command and can be used as a subprocess command list."""
-
-    def test_agent_argv_is_list_of_strings(self):
-        for label, factory in _BACKENDS:
-            with self.subTest(backend=label):
-                bottle = factory({"MY_VAR": "val"})
-                argv = bottle.agent_argv([], tty=False)  # type: ignore[union-attr]
-                self.assertIsInstance(argv, list, f"{label}: argv is not a list")
-                for item in argv:
-                    self.assertIsInstance(
-                        item, str,
-                        f"{label}: argv item {item!r} is not a str",
-                    )
-
-    def test_agent_command_present_in_argv(self):
-        for label, factory in _BACKENDS:
-            with self.subTest(backend=label):
-                bottle = factory({})
-                argv = bottle.agent_argv([], tty=False)  # type: ignore[union-attr]
-                joined = " ".join(argv)
-                self.assertIn(
-                    "claude", joined,
-                    f"{label}: 'claude' not found in agent_argv",
-                )
-
-    def test_extra_flags_propagate(self):
-        extra = ["--no-update-check", "--output-format", "stream-json"]
-        for label, factory in _BACKENDS:
-            with self.subTest(backend=label):
-                bottle = factory({})
-                argv = bottle.agent_argv(extra, tty=False)  # type: ignore[union-attr]
-                for flag in extra:
-                    self.assertIn(
-                        flag, argv,
-                        f"{label}: flag {flag!r} not in agent_argv",
-                    )
-
-
-class TestSmolmachinesEnvInArgv(unittest.TestCase):
-    """smolmachines bottle includes guest_env values in exec argv."""
-
-    def test_guest_env_in_exec_argv(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        bottle = SmolmachinesBottle(
-            "bot-bottle-test",
-            guest_env={"TOKEN": "abc123", "PROXY": "http://proxy:8888"},
-        )
-        argv = bottle.agent_argv([], tty=False)
-        joined = " ".join(argv)
-        self.assertIn("TOKEN=abc123", joined)
-        self.assertIn("PROXY=http://proxy:8888", joined)
-
-
-# ---------------------------------------------------------------------------
-# exec() user-switching contract
-# ---------------------------------------------------------------------------
-
-class TestExecUserSwitching(unittest.TestCase):
-    """Both backends exec as 'node' by default and accept user='root'."""
-
-    def test_docker_exec_uses_node_user_by_default(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        bottle = DockerBottle(
-            container="bot-bottle-test",
-            teardown=lambda: None,
-            prompt_path_in_container=None,
-        )
-        with patch("bot_bottle.backend.docker.bottle.subprocess.run") as run:
-            run.return_value = subprocess.CompletedProcess(
-                [], 0, stdout="", stderr="",
-            )
-            bottle.exec("echo hi")
-        call_args = run.call_args[0][0]
-        self.assertIn("node", call_args,
-                      "docker exec should use 'node' user by default")
-
-    def test_smolmachines_exec_uses_node_user_by_default(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        bottle = SmolmachinesBottle("bot-bottle-test", guest_env={})
-        with patch("bot_bottle.backend.smolmachines.bottle.subprocess.run") as run:
-            run.return_value = subprocess.CompletedProcess(
-                [], 0, stdout="", stderr="",
-            )
-            bottle.exec("echo hi")
-        call_args = run.call_args[0][0]
-        self.assertIn("node", call_args,
-                      "smolvm exec should use 'node' user by default")
-
-    def test_docker_exec_respects_root_user(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        bottle = DockerBottle(
-            container="bot-bottle-test",
-            teardown=lambda: None,
-            prompt_path_in_container=None,
-        )
-        with patch("bot_bottle.backend.docker.bottle.subprocess.run") as run:
-            run.return_value = subprocess.CompletedProcess(
-                [], 0, stdout="", stderr="",
-            )
-            bottle.exec("id", user="root")
-        call_args = run.call_args[0][0]
-        self.assertIn("root", call_args)
-
-    def test_smolmachines_exec_respects_root_user(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        bottle = SmolmachinesBottle("bot-bottle-test", guest_env={})
-        with patch("bot_bottle.backend.smolmachines.bottle.subprocess.run") as run:
-            run.return_value = subprocess.CompletedProcess(
-                [], 0, stdout="", stderr="",
-            )
-            bottle.exec("id", user="root")
-        call_args = run.call_args[0][0]
-        self.assertIn("root", call_args)
-
-
-# ---------------------------------------------------------------------------
-# ExecResult shape parity
-# ---------------------------------------------------------------------------
-
-class TestExecResultParity(unittest.TestCase):
-    """Both backends return ExecResult with returncode, stdout, stderr."""
-
-    def _stub_run(self, argv, **kwargs):
-        return subprocess.CompletedProcess(
-            argv, 0, stdout="out\n", stderr="err\n",
-        )
-
-    def test_docker_exec_result_shape(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        from bot_bottle.backend import ExecResult
-        bottle = DockerBottle(
-            container="bot-bottle-test",
-            teardown=lambda: None,
-            prompt_path_in_container=None,
-        )
-        with patch("bot_bottle.backend.docker.bottle.subprocess.run",
-                   side_effect=self._stub_run):
-            result = bottle.exec("echo hi")
-        self.assertIsInstance(result, ExecResult)
-        self.assertEqual(0, result.returncode)
-        self.assertIsInstance(result.stdout, str)
-        self.assertIsInstance(result.stderr, str)
-
-    def test_smolmachines_exec_result_shape(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        from bot_bottle.backend import ExecResult
-        bottle = SmolmachinesBottle("bot-bottle-test", guest_env={})
-        with patch("bot_bottle.backend.smolmachines.bottle.subprocess.run",
-                   side_effect=self._stub_run):
-            result = bottle.exec("echo hi")
-        self.assertIsInstance(result, ExecResult)
-        self.assertEqual(0, result.returncode)
-        self.assertIsInstance(result.stdout, str)
-        self.assertIsInstance(result.stderr, str)
-
-
-# ---------------------------------------------------------------------------
-# close() is a no-op / idempotent (ABC contract)
-# ---------------------------------------------------------------------------
-
-class TestCloseParity(unittest.TestCase):
-    def test_docker_close_is_idempotent(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        teardown_count = [0]
-        def count_teardown():
-            teardown_count[0] += 1
-        bottle = DockerBottle(
-            container="bot-bottle-test",
-            teardown=count_teardown,
-            prompt_path_in_container=None,
-        )
-        bottle.close()
-        bottle.close()
-        # DockerBottle.close calls teardown — once per call is fine;
-        # what matters is it doesn't raise.
-
-    def test_smolmachines_close_is_noop(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        bottle = SmolmachinesBottle("bot-bottle-test", guest_env={})
-        bottle.close()
-        bottle.close()
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_backend_selection.py

@@ -81,46 +81,6 @@ class TestEnumerateActiveAgents(unittest.TestCase):
         ):
             self.assertEqual([a, b], enumerate_active_agents())
 
-    def test_sorts_by_started_at_then_slug_across_backends(self):
-        newer = ActiveAgent(
-            backend_name="docker", slug="docker-new", agent_name="impl",
-            started_at="2026-06-02T12:00:00Z", services=(),
-        )
-        tie_b = ActiveAgent(
-            backend_name="docker", slug="b-slug", agent_name="review",
-            started_at="2026-06-02T11:00:00Z", services=(),
-        )
-        missing_metadata = ActiveAgent(
-            backend_name="smolmachines", slug="missing-metadata",
-            agent_name="?", started_at="", services=(),
-        )
-        tie_a = ActiveAgent(
-            backend_name="smolmachines", slug="a-slug", agent_name="research",
-            started_at="2026-06-02T11:00:00Z", services=(),
-        )
-
-        class _FakeBackend:
-            def __init__(self, items):
-                self._items = items
-
-            def is_available(self):
-                return True
-
-            def enumerate_active(self):
-                return self._items
-
-        with patch.object(
-            backend_mod, "_BACKENDS",
-            {
-                "docker": _FakeBackend([newer, tie_b]),
-                "smolmachines": _FakeBackend([missing_metadata, tie_a]),
-            },
-        ):
-            self.assertEqual(
-                [missing_metadata, tie_a, tie_b, newer],
-                enumerate_active_agents(),
-            )
-
     def test_empty_when_no_backends_have_active(self):
         class _FakeBackend:
             def is_available(self):

tests/unit/test_bottle_state.py

@@ -216,112 +216,5 @@ class TestBottleMetadata(_FakeHomeMixin, unittest.TestCase):
         self.assertEqual("t2", loaded.started_at)
 
 
-class TestBottleMetadataBackend(_FakeHomeMixin, unittest.TestCase):
-    """PRD 0040: backend field is persisted and read back."""
-
-    def setUp(self):
-        self._setup_fake_home()
-
-    def tearDown(self):
-        self._teardown_fake_home()
-
-    def test_backend_field_roundtrips_docker(self):
-        meta = BottleMetadata(
-            identity="dev-b1",
-            agent_name="dev",
-            cwd="",
-            copy_cwd=False,
-            started_at="2026-06-02T00:00:00+00:00",
-            compose_project="bot-bottle-dev-b1",
-            backend="docker",
-        )
-        write_metadata(meta)
-        loaded = read_metadata("dev-b1")
-        self.assertIsNotNone(loaded)
-        assert loaded is not None
-        self.assertEqual("docker", loaded.backend)
-
-    def test_backend_field_roundtrips_smolmachines(self):
-        meta = BottleMetadata(
-            identity="dev-b2",
-            agent_name="dev",
-            cwd="",
-            copy_cwd=False,
-            started_at="2026-06-02T00:00:00+00:00",
-            compose_project="",
-            backend="smolmachines",
-        )
-        write_metadata(meta)
-        loaded = read_metadata("dev-b2")
-        self.assertIsNotNone(loaded)
-        assert loaded is not None
-        self.assertEqual("smolmachines", loaded.backend)
-
-    def test_missing_backend_field_defaults_to_empty(self):
-        # Old state dirs written before PRD 0040 have no backend key.
-        import json
-        from bot_bottle.backend.docker import bottle_state as bs
-        path = bs.metadata_path("dev-b3")
-        path.parent.mkdir(parents=True, exist_ok=True)
-        path.write_text(json.dumps({
-            "identity": "dev-b3",
-            "agent_name": "dev",
-            "cwd": "",
-            "copy_cwd": False,
-            "started_at": "2026-06-02T00:00:00+00:00",
-            "compose_project": "bot-bottle-dev-b3",
-        }))
-        loaded = read_metadata("dev-b3")
-        self.assertIsNotNone(loaded)
-        assert loaded is not None
-        self.assertEqual("", loaded.backend)
-
-
-class TestBottleForSlugBackend(_FakeHomeMixin, unittest.TestCase):
-    """PRD 0040: _bottle_for_slug constructs the right bottle type."""
-
-    def setUp(self):
-        self._setup_fake_home()
-
-    def tearDown(self):
-        self._teardown_fake_home()
-
-    def test_docker_metadata_returns_docker_bottle(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        from bot_bottle.cli.dashboard import _bottle_for_slug
-        write_metadata(BottleMetadata(
-            identity="dev-d1",
-            agent_name="dev",
-            cwd="",
-            copy_cwd=False,
-            started_at="2026-06-02T00:00:00+00:00",
-            compose_project="bot-bottle-dev-d1",
-            backend="docker",
-        ))
-        bottle, _ = _bottle_for_slug("dev-d1", {}, None)
-        self.assertIsInstance(bottle, DockerBottle)
-
-    def test_smolmachines_metadata_returns_smolmachines_bottle(self):
-        from bot_bottle.backend.smolmachines.bottle import SmolmachinesBottle
-        from bot_bottle.cli.dashboard import _bottle_for_slug
-        write_metadata(BottleMetadata(
-            identity="dev-s1",
-            agent_name="dev",
-            cwd="",
-            copy_cwd=False,
-            started_at="2026-06-02T00:00:00+00:00",
-            compose_project="",
-            backend="smolmachines",
-        ))
-        bottle, _ = _bottle_for_slug("dev-s1", {}, None)
-        self.assertIsInstance(bottle, SmolmachinesBottle)
-
-    def test_no_metadata_defaults_to_docker_bottle(self):
-        from bot_bottle.backend.docker.bottle import DockerBottle
-        from bot_bottle.cli.dashboard import _bottle_for_slug
-        bottle, _ = _bottle_for_slug("unknown-slug", {}, None)
-        self.assertIsInstance(bottle, DockerBottle)
-
-
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_codex_auth.py

@@ -18,14 +18,10 @@ from bot_bottle.log import Die
 
 
 def _jwt(exp: int) -> str:
-    return _jwt_with_payload({"exp": exp})
-
-
-def _jwt_with_payload(payload: dict) -> str:
     def enc(obj: dict) -> str:
         raw = json.dumps(obj, separators=(",", ":")).encode()
         return base64.urlsafe_b64encode(raw).decode().rstrip("=")
-    return f"{enc({'alg': 'none'})}.{enc(payload)}.sig"
+    return f"{enc({'alg': 'none'})}.{enc({'exp': exp})}.sig"
 
 
 def _jwt_payload(token: str) -> dict:
@@ -157,27 +153,17 @@ class TestCodexHostAccessToken(unittest.TestCase):
             host_exp, _jwt_payload(dummy["tokens"]["id_token"])["exp"],
         )
 
-    def test_dummy_auth_replaces_last_refresh_with_valid_timestamp(self):
-        self._write({
-            "auth_mode": "chatgpt",
-            "last_refresh": "host-refresh-metadata",
-            "tokens": {
-                "access_token": _jwt(2000000000),
-                "refresh_token": "hidden",
-            },
-        })
-        dummy = json.loads(codex_dummy_auth_json(
-            {"CODEX_HOME": str(self.home)},
-            now=datetime(2026, 1, 1, 2, 3, 4, 5000, tzinfo=timezone.utc),
-        ))
-        self.assertEqual("2026-01-01T02:03:04.005Z", dummy["last_refresh"])
-        self.assertNotEqual("host-refresh-metadata", dummy["last_refresh"])
-
     def test_dummy_auth_keeps_required_account_claim_shape(self):
+        def jwt(payload: dict) -> str:
+            def enc(obj: dict) -> str:
+                raw = json.dumps(obj, separators=(",", ":")).encode()
+                return base64.urlsafe_b64encode(raw).decode().rstrip("=")
+            return f"{enc({'alg': 'none'})}.{enc(payload)}.sig"
+
         self._write({
             "auth_mode": "chatgpt",
             "tokens": {
-                "access_token": _jwt_with_payload({
+                "access_token": jwt({
                     "exp": 2000000000,
                     "https://api.openai.com/auth": {
                         "chatgpt_plan_type": "plus",
@@ -191,7 +177,7 @@ class TestCodexHostAccessToken(unittest.TestCase):
                         "email_verified": True,
                     },
                 }),
-                "id_token": _jwt_with_payload({
+                "id_token": jwt({
                     "exp": 2000000000,
                     "email": "real@example.invalid",
                     "email_verified": True,
@@ -216,82 +202,6 @@ class TestCodexHostAccessToken(unittest.TestCase):
         self.assertEqual("bot-bottle@example.invalid", profile["email"])
         self.assertTrue(profile["email_verified"])
 
-    def test_dummy_auth_redacts_unknown_future_auth_fields(self):
-        secrets = [
-            "top-session-secret",
-            "top-nested-secret",
-            "refresh-secret",
-            "session-token-secret",
-            "jwt-custom-secret",
-            "jwt-nested-secret",
-            "jwt-list-secret",
-            "id-token-secret",
-            "auth-claim-secret",
-            "auth-claim-nested-secret",
-            "top-list-secret",
-            "token-nested-secret",
-            "token-list-secret",
-            "last-refresh-secret",
-        ]
-        self._write({
-            "auth_mode": "chatgpt",
-            "session_context": "top-session-secret",
-            "last_refresh": "last-refresh-secret",
-            "future_nested": {"value": "top-nested-secret"},
-            "future_list": ["top-list-secret"],
-            "tokens": {
-                "access_token": _jwt_with_payload({
-                    "exp": 2000000000,
-                    "custom_session": "jwt-custom-secret",
-                    "future_nested": {"value": "jwt-nested-secret"},
-                    "future_list": ["jwt-list-secret"],
-                    "https://api.openai.com/auth": {
-                        "chatgpt_plan_type": "plus",
-                        "chatgpt_account_id": "acct-real",
-                        "session_context": "auth-claim-secret",
-                        "nested": {"value": "auth-claim-nested-secret"},
-                    },
-                }),
-                "id_token": _jwt_with_payload({
-                    "exp": 2000000000,
-                    "opaque": "id-token-secret",
-                }),
-                "refresh_token": "refresh-secret",
-                "session_token": "session-token-secret",
-                "future_object": {"value": "token-nested-secret"},
-                "future_list": ["token-list-secret"],
-                "account_id": "acct-host",
-            },
-        })
-
-        dummy_json = codex_dummy_auth_json(
-            {"CODEX_HOME": str(self.home)},
-            now=datetime(2026, 1, 1, tzinfo=timezone.utc),
-        )
-        for secret in secrets:
-            self.assertNotIn(secret, dummy_json)
-
-        dummy = json.loads(dummy_json)
-        self.assertEqual("bot-bottle-placeholder", dummy["session_context"])
-        self.assertEqual("2026-01-01T00:00:00.000Z", dummy["last_refresh"])
-        self.assertEqual({}, dummy["future_nested"])
-        self.assertEqual([], dummy["future_list"])
-        self.assertEqual("bot-bottle-placeholder", dummy["tokens"]["refresh_token"])
-        self.assertEqual("bot-bottle-placeholder", dummy["tokens"]["session_token"])
-        self.assertEqual({}, dummy["tokens"]["future_object"])
-        self.assertEqual([], dummy["tokens"]["future_list"])
-
-        access_payload = _jwt_payload(dummy["tokens"]["access_token"])
-        self.assertEqual(
-            "bot-bottle-placeholder",
-            access_payload["custom_session"],
-        )
-        self.assertEqual({}, access_payload["future_nested"])
-        self.assertEqual([], access_payload["future_list"])
-        auth = access_payload["https://api.openai.com/auth"]
-        self.assertEqual("bot-bottle-placeholder", auth["session_context"])
-        self.assertEqual({}, auth["nested"])
-
 
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_compose.py

@@ -33,7 +33,6 @@ from bot_bottle.git_gate import GitGatePlan, GitGateUpstream
 from bot_bottle.manifest import Manifest
 from bot_bottle.pipelock import PipelockProxyPlan
 from bot_bottle.supervise import SupervisePlan
-from bot_bottle.workspace import workspace_plan
 
 
 SLUG = "demo-abc12"
@@ -49,10 +48,11 @@ def _manifest(*, supervise: bool, with_git: bool, with_egress: bool) -> Manifest
     if supervise:
         bottle["supervise"] = True
     if with_git:
-        bottle["git-gate"] = {"repos": {
-            "upstream": {
-                "url": "ssh://git@example.com:22/x/y.git",
-                "identity": "/etc/hostname",  # any existing file
+        bottle["git"] = {"remotes": {
+            "example.com": {
+                "Name": "upstream",
+                "Upstream": "ssh://git@example.com:22/x/y.git",
+                "IdentityFile": "/etc/hostname",  # any existing file
             },
         }}
     if with_egress:
@@ -150,6 +150,7 @@ def _plan(
             identity_file="/etc/hostname",
             known_host_key="",
             known_hosts_file=STATE / "git-gate" / "upstream-known_hosts",
+            extra_hosts={"example.com": "10.0.0.1"},
         ),)
     routes: tuple[EgressRoute, ...] = ()
     if with_egress:
@@ -162,9 +163,8 @@ def _plan(
             roles=(),
         ),)
 
-    spec = _spec(supervise=supervise, with_git=with_git, with_egress=with_egress)
     return DockerBottlePlan(
-        spec=spec,
+        spec=_spec(supervise=supervise, with_git=with_git, with_egress=with_egress),
         stage_dir=STAGE,
         slug=SLUG,
         container_name=f"bot-bottle-{SLUG}",
@@ -189,7 +189,6 @@ def _plan(
             dockerfile="",
             guest_env={},
         ),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
     )
 
 
@@ -438,8 +437,12 @@ class TestSidecarBundleShape(unittest.TestCase):
         self.assertTrue(any("supervise/queue" in t or t.startswith("/run/supervise")
                             for t in targets))
 
-    def test_extra_hosts_omitted_for_git_upstreams(self):
+    def test_extra_hosts_emitted_for_git_upstreams(self):
         sc = self._render(with_git=True)["services"]["sidecars"]
+        self.assertIn("example.com:10.0.0.1", sc.get("extra_hosts", []))
+
+    def test_extra_hosts_omitted_when_no_git(self):
+        sc = self._render()["services"]["sidecars"]
         self.assertNotIn("extra_hosts", sc)
 
     def test_agent_depends_on_bundle_only(self):

tests/unit/test_dashboard.py

@@ -577,54 +577,5 @@ class TestEditInEditor(unittest.TestCase):
                 os.environ["EDITOR"] = original_editor
 
 
-class TestCapabilityBlockSmolmachinesGuard(_FakeHomeMixin, unittest.TestCase):
-    """approve() must refuse capability-block for smolmachines bottles and
-    pass it through for Docker bottles (PRD 0039)."""
-
-    def setUp(self):
-        self._setup_fake_home()
-        self._original_apply_capability = dashboard.apply_capability_change
-        dashboard.apply_capability_change = lambda slug, content: ("", content)
-
-    def tearDown(self):
-        dashboard.apply_capability_change = self._original_apply_capability
-        self._teardown_fake_home()
-
-    def _enqueue_capability(self, slug: str = "dev") -> "dashboard.QueuedProposal":
-        p = _proposal(slug=slug, tool=TOOL_CAPABILITY_BLOCK)
-        qdir = supervise.queue_dir_for_slug(slug)
-        qdir.mkdir(parents=True, exist_ok=True)
-        supervise.write_proposal(qdir, p)
-        return dashboard.QueuedProposal(proposal=p, queue_dir=qdir)
-
-    def _write_metadata(self, slug: str, compose_project: str) -> None:
-        from bot_bottle.backend.docker.bottle_state import BottleMetadata, write_metadata
-        write_metadata(BottleMetadata(
-            identity=slug,
-            agent_name="myagent",
-            cwd="",
-            copy_cwd=False,
-            started_at="2026-06-02T00:00:00+00:00",
-            compose_project=compose_project,
-        ))
-
-    def test_smolmachines_bottle_raises_capability_apply_error(self):
-        self._write_metadata("dev", compose_project="")
-        qp = self._enqueue_capability("dev")
-        with self.assertRaises(CapabilityApplyError) as ctx:
-            dashboard.approve(qp)
-        self.assertIn("smolmachines", str(ctx.exception))
-
-    def test_docker_bottle_calls_apply_capability_change(self):
-        self._write_metadata("dev", compose_project="bot-bottle-dev")
-        qp = self._enqueue_capability("dev")
-        dashboard.approve(qp)  # must not raise
-
-    def test_no_metadata_falls_through_to_docker_path(self):
-        # No metadata at all → assume Docker (backward-compatible).
-        qp = self._enqueue_capability("dev")
-        dashboard.approve(qp)  # must not raise
-
-
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_docker_launch_teardown.py

@@ -1,145 +0,0 @@
-"""Unit: Docker launch teardown warning on ExitStack failure (issue #156).
-
-When a callback registered in the ExitStack raises during teardown,
-the teardown function must emit a WARNING-level message that includes
-the container name and operation type, rather than silently discarding
-the exception.
-"""
-
-from __future__ import annotations
-
-import contextlib
-import io
-import tempfile
-import unittest
-from pathlib import Path
-from unittest import mock
-
-from bot_bottle.agent_provider import AgentProvisionPlan
-from bot_bottle.backend import BottleSpec
-from bot_bottle.backend.docker import launch as launch_mod
-from bot_bottle.backend.docker.bottle_plan import DockerBottlePlan
-from bot_bottle.egress import EgressPlan
-from bot_bottle.git_gate import GitGatePlan
-from bot_bottle.manifest import Manifest
-from bot_bottle.pipelock import PipelockProxyPlan
-from bot_bottle.workspace import workspace_plan
-
-
-def _manifest() -> Manifest:
-    return Manifest.from_json_obj({
-        "bottles": {"dev": {}},
-        "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
-    })
-
-
-def _plan(tmp: str) -> DockerBottlePlan:
-    stage = Path(tmp)
-    manifest = _manifest()
-    spec = BottleSpec(
-        manifest=manifest,
-        agent_name="demo",
-        copy_cwd=False,
-        user_cwd=tmp,
-        identity="test-teardown-00001",
-    )
-    return DockerBottlePlan(
-        spec=spec,
-        stage_dir=stage,
-        git_gate_plan=GitGatePlan(
-            slug="test-teardown-00001",
-            entrypoint_script=stage / "entrypoint.sh",
-            hook_script=stage / "hook.sh",
-            access_hook_script=stage / "access-hook.sh",
-            upstreams=(),
-        ),
-        egress_plan=EgressPlan(
-            slug="test-teardown-00001",
-            routes_path=stage / "egress.yaml",
-            routes=(),
-            token_env_map={},
-        ),
-        supervise_plan=None,
-        agent_provision=AgentProvisionPlan(
-            template="claude",
-            command="claude",
-            prompt_mode="append_file",
-            image="",
-            dockerfile="",
-            guest_env={},
-        ),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
-        slug="test-teardown-00001",
-        container_name="bot-bottle-test-teardown-abc",
-        container_name_pinned=False,
-        image="bot-bottle-claude:latest",
-        derived_image="",
-        runtime_image="bot-bottle-claude:latest",
-        dockerfile_path="",
-        env_file=stage / "env",
-        forwarded_env={},
-        prompt_file=stage / "prompt.txt",
-        proxy_plan=PipelockProxyPlan(
-            yaml_path=stage / "pipelock.yaml",
-            slug="test-teardown-00001",
-        ),
-        use_runsc=False,
-    )
-
-
-class TestTeardownWarning(unittest.TestCase):
-    def setUp(self) -> None:
-        self._tmp = tempfile.mkdtemp(prefix="docker-launch-teardown-test.")
-
-    def tearDown(self) -> None:
-        import shutil
-        shutil.rmtree(self._tmp, ignore_errors=True)
-
-    def test_teardown_failure_emits_warning_with_container_and_operation(self):
-        plan = _plan(self._tmp)
-        buf = io.StringIO()
-
-        with mock.patch.object(launch_mod.docker_mod, "build_image"), \
-             mock.patch.object(
-                 launch_mod, "pipelock_tls_init",
-                 return_value=(Path("/ca.crt"), Path("/ca.key")),
-             ), \
-             mock.patch.object(
-                 launch_mod, "egress_tls_init",
-                 return_value=(Path("/egress_ca"), Path("/egress_cert")),
-             ), \
-             mock.patch.object(
-                 launch_mod.network_mod, "network_name_for_slug",
-                 return_value="bb-internal-test",
-             ), \
-             mock.patch.object(
-                 launch_mod.network_mod, "network_egress_name_for_slug",
-                 return_value="bb-egress-test",
-             ), \
-             mock.patch.object(
-                 launch_mod, "bottle_plan_to_compose",
-                 return_value={"services": {"agent": {}}},
-             ), \
-             mock.patch.object(
-                 launch_mod, "write_compose_file",
-                 return_value=Path("/tmp/compose.yml"),
-             ), \
-             mock.patch.object(launch_mod, "compose_up"), \
-             mock.patch.object(launch_mod, "compose_dump_logs"), \
-             mock.patch.object(
-                 launch_mod, "compose_down",
-                 side_effect=RuntimeError("network remove failed"),
-             ), \
-             contextlib.redirect_stderr(buf):
-            provision = mock.Mock(return_value=None)
-            with launch_mod.launch(plan, provision=provision):
-                pass
-
-        output = buf.getvalue()
-        self.assertIn("bot-bottle: warning:", output)
-        self.assertIn("bot-bottle-test-teardown-abc", output)
-        self.assertIn("compose-down", output)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_docker_provision_git_user.py

@@ -21,23 +21,20 @@ from bot_bottle.egress import EgressPlan
 from bot_bottle.git_gate import GitGatePlan
 from bot_bottle.manifest import Manifest
 from bot_bottle.pipelock import PipelockProxyPlan
-from bot_bottle.workspace import workspace_plan
 
 
 def _plan(*, git_user: dict | None = None,
-          copy_cwd: bool = False,
-          user_cwd: str = "/tmp/x",
           stage_dir: Path | None = None) -> DockerBottlePlan:
     bottle_json: dict = {}
     if git_user is not None:
-        bottle_json["git-gate"] = {"user": git_user}
+        bottle_json["git"] = {"user": git_user}
     manifest = Manifest.from_json_obj({
         "bottles": {"dev": bottle_json},
         "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
     })
     spec = BottleSpec(
         manifest=manifest, agent_name="demo",
-        copy_cwd=copy_cwd, user_cwd=user_cwd,
+        copy_cwd=False, user_cwd="/tmp/x",
     )
     return DockerBottlePlan(
         spec=spec,
@@ -78,7 +75,6 @@ def _plan(*, git_user: dict | None = None,
             dockerfile="",
             guest_env={},
         ),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
     )
 
 
@@ -110,28 +106,6 @@ class TestProvisionGitUser(unittest.TestCase):
             )
         self.assertEqual([], _git_config_calls(run))
 
-    def test_copies_cwd_git_to_workspace_plan_path(self):
-        cwd = self.stage / "cwd"
-        (cwd / ".git").mkdir(parents=True)
-        plan = _plan(copy_cwd=True, user_cwd=str(cwd), stage_dir=self.stage)
-        with patch.object(_git.subprocess, "run") as run:
-            _git._provision_cwd_git(plan, "bot-bottle-demo-abc12")
-
-        self.assertEqual(
-            [
-                "docker", "cp", f"{cwd}/.git",
-                "bot-bottle-demo-abc12:/home/node/workspace/.git",
-            ],
-            run.call_args_list[0].args[0],
-        )
-        self.assertEqual(
-            [
-                "docker", "exec", "-u", "0", "bot-bottle-demo-abc12",
-                "chown", "-R", "node:node", "/home/node/workspace/.git",
-            ],
-            run.call_args_list[1].args[0],
-        )
-
     def test_sets_name_and_email(self):
         plan = _plan(
             git_user={"name": "Eric Bauerfeld", "email": "eric@dideric.is"},

tests/unit/test_docker_provision_provider_auth.py

@@ -18,7 +18,6 @@ from bot_bottle.egress import EgressPlan
 from bot_bottle.git_gate import GitGatePlan
 from bot_bottle.manifest import Manifest
 from bot_bottle.pipelock import PipelockProxyPlan
-from bot_bottle.workspace import workspace_plan
 
 
 def _plan(
@@ -30,14 +29,13 @@ def _plan(
         "bottles": {"dev": {"agent_provider": {"template": "codex"}}},
         "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
     })
-    spec = BottleSpec(
-        manifest=manifest,
-        agent_name="demo",
-        copy_cwd=False,
-        user_cwd="/tmp/x",
-    )
     return DockerBottlePlan(
-        spec=spec,
+        spec=BottleSpec(
+            manifest=manifest,
+            agent_name="demo",
+            copy_cwd=False,
+            user_cwd="/tmp/x",
+        ),
         stage_dir=Path("/tmp/stage"),
         slug="demo-abc12",
         container_name="bot-bottle-demo-abc12",
@@ -71,7 +69,6 @@ def _plan(
         agent_provision=_agent_provision(
             agent_provider_template, codex_auth_file=codex_auth_file,
         ),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
     )
 
 

tests/unit/test_docker_util_image.py

@@ -8,13 +8,10 @@ integration smoke."""
 from __future__ import annotations
 
 import subprocess
-import tempfile
 import unittest
-from pathlib import Path
 from unittest.mock import patch
 
 from bot_bottle.backend.docker import util as docker_mod
-from bot_bottle.workspace import WorkspacePlan
 
 
 def _ok(stdout: str = "", stderr: str = "") -> subprocess.CompletedProcess:
@@ -70,60 +67,5 @@ class TestSave(unittest.TestCase):
         )
 
 
-class TestBuildImageWithCwd(unittest.TestCase):
-    def test_uses_workspace_plan_paths(self):
-        with tempfile.TemporaryDirectory(prefix="bb-docker-cwd.") as tmp:
-            workspace = WorkspacePlan(
-                enabled=True,
-                host_path=Path(tmp),
-                guest_home="/guest/home",
-                guest_path="/guest/home/workspace",
-                workdir="/guest/home/workspace",
-            )
-            with patch.object(docker_mod.subprocess, "run") as run:
-                docker_mod.build_image_with_cwd("derived:tag", "base:tag", workspace)
-
-        argv = run.call_args.args[0]
-        dockerfile = run.call_args.kwargs["input"]
-        self.assertEqual(["docker", "build", "-t", "derived:tag", "-f", "-"], argv[:6])
-        self.assertTrue(argv[6].endswith("/context"))
-        self.assertIn("FROM base:tag\n", dockerfile)
-        self.assertIn(
-            "COPY --chown=node:node workspace/. /guest/home/workspace\n",
-            dockerfile,
-        )
-        self.assertIn("WORKDIR /guest/home/workspace\n", dockerfile)
-
-    def test_staged_context_includes_hidden_files_but_not_git_dir(self):
-        with tempfile.TemporaryDirectory(prefix="bb-docker-cwd.") as tmp:
-            root = Path(tmp)
-            (root / ".gitignore").write_text("*.pyc\n")
-            (root / ".dockerignore").write_text(".gitignore\n")
-            (root / ".env.example").write_text("SAFE=1\n")
-            (root / ".git").mkdir()
-            (root / ".git" / "config").write_text("[core]\n")
-            workspace = WorkspacePlan(
-                enabled=True,
-                host_path=root,
-                guest_home="/guest/home",
-                guest_path="/guest/home/workspace",
-                workdir="/guest/home/workspace",
-            )
-
-            def inspect_context(*args, **kwargs):
-                context = Path(args[0][-1])
-                staged = context / "workspace"
-                self.assertTrue((staged / ".gitignore").is_file())
-                self.assertTrue((staged / ".dockerignore").is_file())
-                self.assertTrue((staged / ".env.example").is_file())
-                self.assertFalse((staged / ".git").exists())
-                return _ok()
-
-            with patch.object(
-                docker_mod.subprocess, "run", side_effect=inspect_context,
-            ):
-                docker_mod.build_image_with_cwd("derived:tag", "base:tag", workspace)
-
-
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_git_gate.py

@@ -9,12 +9,14 @@ from bot_bottle.git_gate import (
     GitGate,
     GitGatePlan,
     GitGateUpstream,
+    git_gate_aggregate_extra_hosts,
     git_gate_known_hosts_line,
     git_gate_render_access_hook,
     git_gate_render_entrypoint,
     git_gate_render_hook,
     git_gate_upstreams_for_bottle,
 )
+from bot_bottle.log import Die
 from bot_bottle.manifest import Manifest
 from tests.fixtures import fixture_minimal, fixture_with_git
 
@@ -44,6 +46,86 @@ class TestUpstreamsForBottle(unittest.TestCase):
         self.assertEqual((), git_gate_upstreams_for_bottle(bottle))
 
 
+class TestExtraHostsPlumbing(unittest.TestCase):
+    def test_upstream_carries_extra_hosts_from_manifest(self):
+        m = Manifest.from_json_obj({
+            "bottles": {
+                "dev": {
+                    "git": {"remotes": {
+                        "gitea.dideric.is": {
+                            "Name": "bot-bottle",
+                            "Upstream": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
+                            "IdentityFile": "/dev/null",
+                            "ExtraHosts": {"gitea.dideric.is": "100.78.141.42"},
+                        },
+                    }},
+                },
+            },
+            "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
+        })
+        ups = git_gate_upstreams_for_bottle(m.bottles["dev"])
+        self.assertEqual(
+            {"gitea.dideric.is": "100.78.141.42"}, dict(ups[0].extra_hosts)
+        )
+
+    def test_aggregator_merges_distinct_hostnames(self):
+        ups = (
+            GitGateUpstream(
+                name="a", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"a.example": "10.0.0.1"},
+            ),
+            GitGateUpstream(
+                name="b", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"b.example": "10.0.0.2"},
+            ),
+        )
+        self.assertEqual(
+            {"a.example": "10.0.0.1", "b.example": "10.0.0.2"},
+            git_gate_aggregate_extra_hosts(ups),
+        )
+
+    def test_aggregator_allows_same_host_same_ip(self):
+        # Two entries listing the same host:ip is harmless duplication,
+        # not a conflict. The gate's /etc/hosts ends up with one line.
+        ups = (
+            GitGateUpstream(
+                name="a", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"gitea.dideric.is": "100.78.141.42"},
+            ),
+            GitGateUpstream(
+                name="b", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"gitea.dideric.is": "100.78.141.42"},
+            ),
+        )
+        self.assertEqual(
+            {"gitea.dideric.is": "100.78.141.42"},
+            git_gate_aggregate_extra_hosts(ups),
+        )
+
+    def test_aggregator_rejects_conflicting_ips(self):
+        ups = (
+            GitGateUpstream(
+                name="a", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"gitea.dideric.is": "100.78.141.42"},
+            ),
+            GitGateUpstream(
+                name="b", upstream_url="", upstream_host="", upstream_port="",
+                identity_file="", known_host_key="",
+                extra_hosts={"gitea.dideric.is": "10.0.0.99"},
+            ),
+        )
+        with self.assertRaises(Die):
+            git_gate_aggregate_extra_hosts(ups)
+
+    def test_aggregator_empty_is_empty(self):
+        self.assertEqual({}, git_gate_aggregate_extra_hosts(()))
+
+
 class TestKnownHostsLine(unittest.TestCase):
     def test_default_port_unbracketed(self):
         line = git_gate_known_hosts_line("github.com", "22", "ssh-ed25519 AAAA")
@@ -76,18 +158,14 @@ class TestEntrypointRender(unittest.TestCase):
         )
         script = git_gate_render_entrypoint(ups)
         self.assertIn("#!/bin/sh", script)
-        # shlex.quote leaves safe strings unquoted; verify via token parse.
-        import shlex as _shlex
-        lines_with_init = [l for l in script.splitlines() if l.startswith("init_repo ")]
-        self.assertEqual(2, len(lines_with_init))
-        self.assertEqual(
-            ["init_repo", "bot-bottle",
-             "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git"],
-            _shlex.split(lines_with_init[0]),
+        self.assertIn(
+            "init_repo 'bot-bottle' "
+            "'ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git'",
+            script,
         )
-        self.assertEqual(
-            ["init_repo", "foo", "ssh://git@github.com/didericis/foo.git"],
-            _shlex.split(lines_with_init[1]),
+        self.assertIn(
+            "init_repo 'foo' 'ssh://git@github.com/didericis/foo.git'",
+            script,
         )
         # Daemon line is what keeps PID 1 alive.
         self.assertIn("exec git daemon", script)
@@ -112,41 +190,6 @@ class TestEntrypointRender(unittest.TestCase):
         self.assertNotIn("init_repo '", script)
         self.assertIn("exec git daemon", script)
 
-    def test_single_quote_in_upstream_url_is_escaped(self):
-        ups = (GitGateUpstream(
-            name="myrepo",
-            upstream_url="ssh://git@host/path'with'quotes.git",
-            upstream_host="host",
-            upstream_port="22",
-            identity_file="/key",
-            known_host_key="",
-        ),)
-        script = git_gate_render_entrypoint(ups)
-        self.assertNotIn(
-            "init_repo 'myrepo' 'ssh://git@host/path'with'quotes.git'",
-            script,
-        )
-        self.assertIn("init_repo", script)
-        self.assertIn("path", script)
-
-    def test_space_and_semicolon_in_upstream_url_are_escaped(self):
-        import shlex as _shlex
-        raw_url = "ssh://git@host/path with spaces;evil.git"
-        ups = (GitGateUpstream(
-            name="myrepo",
-            upstream_url=raw_url,
-            upstream_host="host",
-            upstream_port="22",
-            identity_file="/key",
-            known_host_key="",
-        ),)
-        script = git_gate_render_entrypoint(ups)
-        line = next(l for l in script.splitlines() if l.startswith("init_repo "))
-        tokens = _shlex.split(line)
-        self.assertEqual(3, len(tokens))
-        self.assertEqual("myrepo", tokens[1])
-        self.assertEqual(raw_url, tokens[2])
-
 
 class TestHookRender(unittest.TestCase):
     def test_pre_receive_hook_has_two_phases(self):
@@ -259,10 +302,11 @@ class TestPrepare(unittest.TestCase):
 
     def test_prepare_skips_known_hosts_file_when_key_missing(self):
         manifest = Manifest.from_json_obj({
-            "bottles": {"dev": {"git-gate": {"repos": {
-                "foo": {
-                    "url": "ssh://git@github.com/didericis/foo.git",
-                    "identity": "/dev/null",
+            "bottles": {"dev": {"git": {"remotes": {
+                "github.com": {
+                    "Name": "foo",
+                    "Upstream": "ssh://git@github.com/didericis/foo.git",
+                    "IdentityFile": "/dev/null",
                 },
             }}}},
             "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},

tests/unit/test_git_http_backend.py

@@ -150,97 +150,6 @@ class TestGitHttpBackend(unittest.TestCase):
             )
             self.assertEqual("git/test", env["HTTP_USER_AGENT"])
 
-    def test_access_hook_denial_is_logged_to_stdout(self):
-        """When the access-hook exits non-zero we still return 403 to the
-        client, but the hook's stderr must also appear on the handler's
-        stdout so docker logs surface *why* — otherwise the agent sees
-        the message and the operator just sees `403 -`."""
-        from http.server import ThreadingHTTPServer
-        import io
-        import sys
-
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            (root / "repo.git").mkdir()
-            old_root = os.environ.get("GIT_PROJECT_ROOT")
-            os.environ["GIT_PROJECT_ROOT"] = str(root)
-            self.addCleanup(self._restore_env, old_root)
-
-            server = ThreadingHTTPServer(("127.0.0.1", 0), GitHttpHandler)
-            thread = threading.Thread(target=server.serve_forever, daemon=True)
-            thread.start()
-            self.addCleanup(server.shutdown)
-            self.addCleanup(server.server_close)
-
-            denial = b"git-gate: upstream fetch failed; refusing to serve stale data\n"
-            with mock.patch(
-                "bot_bottle.git_http_backend.subprocess.run",
-                return_value=subprocess.CompletedProcess(
-                    ["hook"], 1, b"", denial,
-                ),
-            ):
-                buf = io.StringIO()
-                with mock.patch.object(sys, "stdout", buf):
-                    req = urllib.request.Request(
-                        f"http://127.0.0.1:{server.server_port}"
-                        "/repo.git/info/refs?service=git-upload-pack",
-                        method="GET",
-                    )
-                    try:
-                        urllib.request.urlopen(req, timeout=5)
-                        self.fail("expected HTTPError 403")
-                    except urllib.error.HTTPError as e:
-                        self.assertEqual(403, e.code)
-                        self.assertIn(b"upstream fetch failed", e.read())
-
-                logged = buf.getvalue()
-                self.assertIn("access-hook denied", logged)
-                self.assertIn("upstream fetch failed", logged)
-
-    def test_access_hook_denial_without_output_logs_exit_code(self):
-        """If the hook exits non-zero but produces no stderr/stdout, the
-        log line should still say *something* — the exit code — instead
-        of silently emitting an empty line."""
-        from http.server import ThreadingHTTPServer
-        import io
-        import sys
-
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            (root / "repo.git").mkdir()
-            old_root = os.environ.get("GIT_PROJECT_ROOT")
-            os.environ["GIT_PROJECT_ROOT"] = str(root)
-            self.addCleanup(self._restore_env, old_root)
-
-            server = ThreadingHTTPServer(("127.0.0.1", 0), GitHttpHandler)
-            thread = threading.Thread(target=server.serve_forever, daemon=True)
-            thread.start()
-            self.addCleanup(server.shutdown)
-            self.addCleanup(server.server_close)
-
-            with mock.patch(
-                "bot_bottle.git_http_backend.subprocess.run",
-                return_value=subprocess.CompletedProcess(
-                    ["hook"], 2, b"", b"",
-                ),
-            ):
-                buf = io.StringIO()
-                with mock.patch.object(sys, "stdout", buf):
-                    req = urllib.request.Request(
-                        f"http://127.0.0.1:{server.server_port}"
-                        "/repo.git/info/refs?service=git-upload-pack",
-                        method="GET",
-                    )
-                    try:
-                        urllib.request.urlopen(req, timeout=5)
-                        self.fail("expected HTTPError 403")
-                    except urllib.error.HTTPError as e:
-                        self.assertEqual(403, e.code)
-
-                logged = buf.getvalue()
-                self.assertIn("access-hook denied", logged)
-                self.assertIn("exit=2", logged)
-
     @staticmethod
     def _restore_env(value: str | None) -> None:
         if value is None:
@@ -256,77 +165,5 @@ class TestGitHttpBackend(unittest.TestCase):
             os.environ["GIT_GATE_ACCESS_HOOK"] = value
 
 
-class TestContentLengthBounds(unittest.TestCase):
-    """PRD 0041: malformed or oversized Content-Length is rejected before
-    git http-backend is invoked."""
-
-    def setUp(self):
-        from http.server import ThreadingHTTPServer
-        import tempfile, os
-        self._tmp = tempfile.mkdtemp()
-        os.environ["GIT_PROJECT_ROOT"] = self._tmp
-        self._server = ThreadingHTTPServer(("127.0.0.1", 0), GitHttpHandler)
-        self._thread = threading.Thread(
-            target=self._server.serve_forever, daemon=True,
-        )
-        self._thread.start()
-        self._port = self._server.server_port
-
-    def tearDown(self):
-        self._server.shutdown()
-        self._server.server_close()
-        os.environ.pop("GIT_PROJECT_ROOT", None)
-        import shutil
-        shutil.rmtree(self._tmp, ignore_errors=True)
-
-    def _post(self, path: str, *, content_length_header: str,
-              body: bytes = b"x") -> int:
-        req = urllib.request.Request(
-            f"http://127.0.0.1:{self._port}{path}",
-            data=body,
-            method="POST",
-        )
-        req.add_header("Content-Length", content_length_header)
-        req.add_header("Content-Type", "application/x-git-receive-pack-request")
-        try:
-            with urllib.request.urlopen(req, timeout=3) as resp:
-                return resp.status
-        except urllib.error.HTTPError as e:
-            return e.code
-
-    def test_non_numeric_content_length_returns_400(self):
-        status = self._post("/repo.git/git-receive-pack",
-                            content_length_header="abc")
-        self.assertEqual(400, status)
-
-    def test_negative_content_length_returns_400(self):
-        status = self._post("/repo.git/git-receive-pack",
-                            content_length_header="-1")
-        self.assertEqual(400, status)
-
-    def test_oversized_content_length_returns_413(self):
-        # Declare 2 MiB — over the 1 MiB cap.
-        status = self._post("/repo.git/git-receive-pack",
-                            content_length_header=str(2 * 1024 * 1024))
-        self.assertEqual(413, status)
-
-    def test_valid_small_body_passes_through(self):
-        # With a valid Content-Length the handler proceeds into
-        # git http-backend; that will fail (no real git repo) but the
-        # status won't be 400 or 413.
-        with mock.patch("bot_bottle.git_http_backend.subprocess.run") as run:
-            run.return_value = mock.Mock(
-                returncode=0,
-                stdout=(
-                    b"Status: 200 OK\r\n"
-                    b"Content-Type: application/x-git-receive-pack-result\r\n"
-                    b"\r\n"
-                ),
-            )
-            status = self._post("/repo.git/git-receive-pack",
-                                content_length_header="1", body=b"x")
-        self.assertNotIn(status, (400, 413))
-
-
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_manifest_agent_git_user.py

@@ -1,14 +1,14 @@
-"""Unit: agent-level git-gate.user overlay + provenance (PRD 0027, PRD 0047).
+"""Unit: agent-level git.user overlay + provenance (PRD 0027, issue #94).
 
-An agent file may declare `git-gate.user` (name/email). At
+An agent file may declare `git.user` (name/email). At
 `Manifest.bottle_for()` it overlays the referenced bottle's
-`git-gate.user` per-field, agent-wins-on-non-empty. `git-gate.repos` is
+`git.user` per-field, agent-wins-on-non-empty. `git.remotes` is
 rejected on agents. `Manifest.git_identity_summary()` reports the
 effective identity with per-field `(agent)`/`(bottle)` provenance.
 
 The `from_json_obj` path drives `Agent.from_dict` + `bottle_for`;
 a temp-dir case locks the md loader (the `_AGENT_KEYS` allow + the
-`git-gate` threading into `agent_dict`)."""
+`git` threading into `agent_dict`)."""
 
 from __future__ import annotations
 
@@ -34,10 +34,10 @@ def _error_message(callable_, *args, **kwargs) -> str:
 def _manifest(*, bottle_user=None, agent_git=None) -> Manifest:
     bottle: dict = {}
     if bottle_user is not None:
-        bottle = {"git-gate": {"user": bottle_user}}
+        bottle = {"git": {"user": bottle_user}}
     agent: dict = {"skills": [], "prompt": "", "bottle": "dev"}
     if agent_git is not None:
-        agent["git-gate"] = agent_git
+        agent["git"] = agent_git
     return Manifest.from_json_obj({
         "bottles": {"dev": bottle},
         "agents": {"impl": agent},
@@ -71,6 +71,7 @@ class TestAgentGitUserOverlay(unittest.TestCase):
 
     def test_agent_identity_with_bottle_declaring_none(self):
         m = _manifest(agent_git={"user": {"name": "a", "email": "a@b"}})
+        # The underlying bottle declares no identity; the merged one does.
         self.assertTrue(m.bottles["dev"].git_user.is_empty())
         self.assertFalse(m.bottle_for("impl").git_user.is_empty())
 
@@ -81,10 +82,14 @@ class TestAgentGitUserOverlay(unittest.TestCase):
         self.assertEqual("b@c", u.email)
 
     def test_bottle_for_returns_same_instance_when_no_overlay(self):
+        # No agent git.user → no replace(); the cached Bottle is
+        # returned as-is (identity check guards against churn).
         m = _manifest(bottle_user={"name": "B"})
         self.assertIs(m.bottles["dev"], m.bottle_for("impl"))
 
     def test_bottle_for_returns_same_instance_when_overlay_is_noop(self):
+        # Agent restates exactly what the bottle already has → merged
+        # == bottle.git_user → same instance, no replace().
         m = _manifest(
             bottle_user={"name": "B", "email": "b@c"},
             agent_git={"user": {"name": "B", "email": "b@c"}},
@@ -96,11 +101,11 @@ class TestAgentGitUserOverlay(unittest.TestCase):
             "bottles": {"dev": {
                 "env": {"FOO": "bar"},
                 "supervise": True,
-                "git-gate": {"user": {"name": "B"}},
+                "git": {"user": {"name": "B"}},
             }},
             "agents": {"impl": {
                 "bottle": "dev", "skills": [], "prompt": "",
-                "git-gate": {"user": {"name": "a"}},
+                "git": {"user": {"name": "a"}},
             }},
         })
         b = m.bottle_for("impl")
@@ -110,11 +115,11 @@ class TestAgentGitUserOverlay(unittest.TestCase):
 
 
 class TestAgentGitUserRejections(unittest.TestCase):
-    def test_agent_repos_dies_bottle_only(self):
+    def test_agent_remotes_dies_bottle_only(self):
         msg = _error_message(_manifest, agent_git={
-            "repos": {"r": {"url": "ssh://git@x/y.git", "identity": "/dev/null"}},
+            "remotes": {"h": {"Name": "r", "Upstream": "ssh://x/y.git"}},
         })
-        self.assertIn("git-gate.repos", msg)
+        self.assertIn("git.remotes", msg)
         self.assertIn("bottle-only", msg)
 
     def test_agent_unknown_git_subkey_dies(self):
@@ -122,6 +127,7 @@ class TestAgentGitUserRejections(unittest.TestCase):
         self.assertIn("not allowed at the agent level", msg)
 
     def test_agent_git_user_both_empty_dies(self):
+        # Reuses GitUser.from_dict validation.
         msg = _error_message(_manifest, agent_git={"user": {"name": "", "email": ""}})
         self.assertIn("neither name nor email", msg)
 
@@ -158,7 +164,7 @@ class TestGitIdentitySummary(unittest.TestCase):
 
 _BOTTLE_DEV = """
     ---
-    git-gate:
+    git:
       user:
         name: bottle-name
         email: bottle@example.com
@@ -170,7 +176,7 @@ _BOTTLE_DEV = """
 _AGENT_WITH_GIT = """
     ---
     bottle: dev
-    git-gate:
+    git:
       user:
         name: agent-name
     ---
@@ -178,14 +184,14 @@ _AGENT_WITH_GIT = """
     impl agent.
 """
 
-_AGENT_WITH_REPOS = """
+_AGENT_WITH_REMOTES = """
     ---
     bottle: dev
-    git-gate:
-      repos:
-        r:
-          url: ssh://git@x/y.git
-          identity: /dev/null
+    git:
+      remotes:
+        h:
+          Name: r
+          Upstream: ssh://x/y.git
     ---
 
     bad agent.
@@ -193,9 +199,9 @@ _AGENT_WITH_REPOS = """
 
 
 class TestAgentGitUserMdLoader(unittest.TestCase):
-    """Locks the md path: `git-gate` is an accepted agent key and threads
-    into the parsed Agent (not rejected as an unknown frontmatter key),
-    and agent `git-gate.repos` dies through the same loader."""
+    """Locks the md path: `git` is an accepted agent key and threads
+    into the parsed Agent (not rejected as an unknown frontmatter
+    key), and agent `git.remotes` dies through the same loader."""
 
     def setUp(self) -> None:
         self.home = Path(tempfile.mkdtemp(prefix="cb-home-"))
@@ -219,18 +225,18 @@ class TestAgentGitUserMdLoader(unittest.TestCase):
         self._write("agents/impl.md", _AGENT_WITH_GIT)
         m = Manifest.resolve(str(self.home))
         u = m.bottle_for("impl").git_user
-        self.assertEqual("agent-name", u.name)
-        self.assertEqual("bottle@example.com", u.email)
+        self.assertEqual("agent-name", u.name)        # agent wins
+        self.assertEqual("bottle@example.com", u.email)  # bottle falls through
         self.assertEqual(
             "name=agent-name (agent), email=bottle@example.com (bottle)",
             m.git_identity_summary("impl"),
         )
 
-    def test_md_agent_repos_dies(self):
+    def test_md_agent_remotes_dies(self):
         self._write("bottles/dev.md", _BOTTLE_DEV)
-        self._write("agents/impl.md", _AGENT_WITH_REPOS)
+        self._write("agents/impl.md", _AGENT_WITH_REMOTES)
         msg = _error_message(Manifest.resolve, str(self.home))
-        self.assertIn("git-gate.repos", msg)
+        self.assertIn("git.remotes", msg)
         self.assertIn("bottle-only", msg)
 
 

tests/unit/test_manifest_extends.py

@@ -113,30 +113,42 @@ class TestExtendsEnvMerge(unittest.TestCase):
 
 
 class TestExtendsGitMerge(unittest.TestCase):
-    """git-gate.user overlays by field; git-gate.repos merges by upstream
+    """git.user overlays by field; git.remotes merges by upstream
     host, with child entries replacing duplicate hosts."""
 
-    _GIT_ENTRY_A = {"url": "ssh://git@host-a/a.git", "identity": "/dev/null"}
-    _GIT_ENTRY_B = {"url": "ssh://git@host-b/b.git", "identity": "/dev/null"}
+    _GIT_ENTRY_A = {
+        "Name": "a",
+        "Upstream": "ssh://git@host-a/a.git",
+        "IdentityFile": "/dev/null",
+    }
+    _GIT_ENTRY_B = {
+        "Name": "b",
+        "Upstream": "ssh://git@host-b/b.git",
+        "IdentityFile": "/dev/null",
+    }
 
-    def test_child_git_repos_merge_with_parent(self):
+    def test_child_git_remotes_merge_with_parent(self):
         m = _build(
-            base={"git-gate": {"repos": {"a": self._GIT_ENTRY_A}}},
+            base={"git": {"remotes": {"host-a": self._GIT_ENTRY_A}}},
             child={
                 "extends": "base",
-                "git-gate": {"repos": {"b": self._GIT_ENTRY_B}},
+                "git": {"remotes": {"host-b": self._GIT_ENTRY_B}},
             },
         )
         names = [e.Name for e in m.bottles["child"].git]
         self.assertEqual(["a", "b"], names)
 
-    def test_child_git_repo_replaces_same_host(self):
-        replacement = {"url": "ssh://git@host-a/replacement.git", "identity": "/dev/null"}
+    def test_child_git_remote_replaces_same_host(self):
+        replacement = {
+            "Name": "a2",
+            "Upstream": "ssh://git@host-a/replacement.git",
+            "IdentityFile": "/dev/null",
+        }
         m = _build(
-            base={"git-gate": {"repos": {"a": self._GIT_ENTRY_A}}},
+            base={"git": {"remotes": {"host-a": self._GIT_ENTRY_A}}},
             child={
                 "extends": "base",
-                "git-gate": {"repos": {"a2": replacement}},
+                "git": {"remotes": {"host-a": replacement}},
             },
         )
         entries = m.bottles["child"].git
@@ -144,30 +156,30 @@ class TestExtendsGitMerge(unittest.TestCase):
         self.assertEqual("a2", entries[0].Name)
         self.assertEqual("replacement.git", entries[0].UpstreamPath)
 
-    def test_child_omits_git_gate_inherits_full_list(self):
+    def test_child_omits_git_inherits_full_list(self):
         m = _build(
-            base={"git-gate": {"repos": {
-                "a": self._GIT_ENTRY_A,
-                "b": self._GIT_ENTRY_B,
+            base={"git": {"remotes": {
+                "host-a": self._GIT_ENTRY_A,
+                "host-b": self._GIT_ENTRY_B,
             }}},
             child={"extends": "base"},
         )
         names = [e.Name for e in m.bottles["child"].git]
         self.assertEqual(["a", "b"], names)
 
-    def test_child_explicit_empty_repos_clears_parent(self):
-        # `git-gate.repos: {}` is the documented way to say "drop
-        # the parent's repos" rather than "inherit them".
+    def test_child_explicit_empty_git_clears_parent(self):
+        # `git.remotes: {}` is the documented way to say "drop
+        # the parent's remotes" rather than "inherit them".
         m = _build(
-            base={"git-gate": {"repos": {"a": self._GIT_ENTRY_A}}},
-            child={"extends": "base", "git-gate": {"repos": {}}},
+            base={"git": {"remotes": {"host-a": self._GIT_ENTRY_A}}},
+            child={"extends": "base", "git": {"remotes": {}}},
         )
         self.assertEqual((), m.bottles["child"].git)
 
-    def test_child_git_user_inherits_parent_repos(self):
+    def test_child_git_user_inherits_parent_remotes(self):
         m = _build(
-            base={"git-gate": {"repos": {"a": self._GIT_ENTRY_A}}},
-            child={"extends": "base", "git-gate": {"user": {"name": "Child"}}},
+            base={"git": {"remotes": {"host-a": self._GIT_ENTRY_A}}},
+            child={"extends": "base", "git": {"user": {"name": "Child"}}},
         )
         self.assertEqual(["a"], [e.Name for e in m.bottles["child"].git])
         self.assertEqual("Child", m.bottles["child"].git_user.name)
@@ -197,12 +209,12 @@ class TestExtendsListsFullReplace(unittest.TestCase):
 
 
 class TestExtendsGitUserOverlay(unittest.TestCase):
-    """git-gate.user: per-field overlay. Each non-empty field on child
+    """git.user: per-field overlay. Each non-empty field on child
     wins; empties fall through to parent."""
 
     def test_parent_full_child_omits(self):
         m = _build(
-            base={"git-gate": {"user": {"name": "Parent", "email": "p@x"}}},
+            base={"git": {"user": {"name": "Parent", "email": "p@x"}}},
             child={"extends": "base"},
         )
         u = m.bottles["child"].git_user
@@ -211,10 +223,10 @@ class TestExtendsGitUserOverlay(unittest.TestCase):
 
     def test_child_overrides_both(self):
         m = _build(
-            base={"git-gate": {"user": {"name": "Parent", "email": "p@x"}}},
+            base={"git": {"user": {"name": "Parent", "email": "p@x"}}},
             child={
                 "extends": "base",
-                "git-gate": {"user": {"name": "Child", "email": "c@x"}},
+                "git": {"user": {"name": "Child", "email": "c@x"}},
             },
         )
         u = m.bottles["child"].git_user
@@ -222,9 +234,11 @@ class TestExtendsGitUserOverlay(unittest.TestCase):
         self.assertEqual("c@x", u.email)
 
     def test_child_adds_email_inherits_name(self):
+        # Parent sets only name; child sets only email. Both end
+        # up populated on the child.
         m = _build(
-            base={"git-gate": {"user": {"name": "Parent"}}},
-            child={"extends": "base", "git-gate": {"user": {"email": "c@x"}}},
+            base={"git": {"user": {"name": "Parent"}}},
+            child={"extends": "base", "git": {"user": {"email": "c@x"}}},
         )
         u = m.bottles["child"].git_user
         self.assertEqual("Parent", u.name)
@@ -232,10 +246,11 @@ class TestExtendsGitUserOverlay(unittest.TestCase):
 
     def test_child_overrides_only_email(self):
         m = _build(
-            base={"git-gate": {"user": {"name": "Parent", "email": "p@x"}}},
-            child={"extends": "base", "git-gate": {"user": {"email": "c@x"}}},
+            base={"git": {"user": {"name": "Parent", "email": "p@x"}}},
+            child={"extends": "base", "git": {"user": {"email": "c@x"}}},
         )
         u = m.bottles["child"].git_user
+        # Child overrides email; name inherited from parent.
         self.assertEqual("Parent", u.name)
         self.assertEqual("c@x", u.email)
 

tests/unit/test_manifest_git.py

@@ -1,25 +1,39 @@
-"""Unit: git-gate.repos manifest parsing + validation (PRD 0047)."""
+"""Unit: Bottle.git manifest parsing + validation (PRD 0008)."""
 
 import unittest
 
 from bot_bottle.manifest import ManifestError, Manifest
 
 
-def _manifest(repos: dict) -> dict:
+def _manifest(git_entries):
     return {
-        "bottles": {"dev": {"git-gate": {"repos": repos}}},
+        "bottles": {"dev": {"git": {"remotes": {
+            _host_for(entry): entry for entry in git_entries
+        }}}},
         "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
     }
 
 
+def _host_for(entry):
+    upstream = entry.get("Upstream", "")
+    if "@a.example" in upstream:
+        return "a.example"
+    if "@b.example" in upstream:
+        return "b.example"
+    if "@github.com" in upstream:
+        return "github.com"
+    if "@gitea.dideric.is" in upstream:
+        return "gitea.dideric.is"
+    return "example.com"
+
+
 class TestGitEntryParsing(unittest.TestCase):
     def test_parses_minimal_entry(self):
-        m = Manifest.from_json_obj(_manifest({
-            "bot-bottle": {
-                "url": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
-                "identity": "/dev/null",
-            },
-        }))
+        m = Manifest.from_json_obj(_manifest([{
+            "Name": "bot-bottle",
+            "Upstream": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
+            "IdentityFile": "/dev/null",
+        }]))
         entries = m.bottles["dev"].git
         self.assertEqual(1, len(entries))
         e = entries[0]
@@ -30,145 +44,185 @@ class TestGitEntryParsing(unittest.TestCase):
         self.assertEqual("didericis/bot-bottle.git", e.UpstreamPath)
 
     def test_default_port_is_22(self):
-        m = Manifest.from_json_obj(_manifest({
-            "foo": {
-                "url": "ssh://git@github.com/didericis/foo.git",
-                "identity": "/dev/null",
-            },
-        }))
+        m = Manifest.from_json_obj(_manifest([{
+            "Name": "foo",
+            "Upstream": "ssh://git@github.com/didericis/foo.git",
+            "IdentityFile": "/dev/null",
+        }]))
         e = m.bottles["dev"].git[0]
         self.assertEqual("22", e.UpstreamPort)
         self.assertEqual("github.com", e.UpstreamHost)
 
-    def test_host_key_optional(self):
-        m = Manifest.from_json_obj(_manifest({
-            "foo": {
-                "url": "ssh://git@github.com/foo.git",
-                "identity": "/dev/null",
-            },
-        }))
+    def test_known_host_key_optional(self):
+        m = Manifest.from_json_obj(_manifest([{
+            "Name": "foo",
+            "Upstream": "ssh://git@github.com/foo.git",
+            "IdentityFile": "/dev/null",
+        }]))
         self.assertEqual("", m.bottles["dev"].git[0].KnownHostKey)
 
-    def test_host_key_stored(self):
-        m = Manifest.from_json_obj(_manifest({
-            "foo": {
-                "url": "ssh://git@github.com/foo.git",
-                "identity": "/dev/null",
-                "host_key": "ssh-ed25519 AAAA",
-            },
-        }))
-        self.assertEqual("ssh-ed25519 AAAA", m.bottles["dev"].git[0].KnownHostKey)
-
-    def test_repo_name_becomes_Name(self):
-        m = Manifest.from_json_obj(_manifest({
-            "my-repo": {
-                "url": "ssh://git@github.com/foo.git",
-                "identity": "/dev/null",
-            },
-        }))
-        self.assertEqual("my-repo", m.bottles["dev"].git[0].Name)
-
-    def test_missing_url_dies(self):
+    def test_missing_name_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {"identity": "/dev/null"},
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Upstream": "ssh://git@github.com/foo.git",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_missing_identity_dies(self):
+    def test_missing_upstream_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {"url": "ssh://git@github.com/foo.git"},
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_unknown_key_in_entry_dies(self):
+    def test_missing_identity_file_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "ssh://git@github.com/foo.git",
-                    "identity": "/dev/null",
-                    "IdentityFile": "/dev/null",  # old PascalCase key
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com/foo.git",
+            }]))
 
-    def test_non_ssh_url_dies(self):
+    def test_non_ssh_upstream_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "https://github.com/didericis/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "https://github.com/didericis/foo.git",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_scp_style_url_dies(self):
+    def test_scp_style_upstream_dies(self):
+        # SCP-style "git@host:path" is intentionally not supported in
+        # v1 — ssh:// only.
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "git@github.com:didericis/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "git@github.com:didericis/foo.git",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_url_without_user_dies(self):
+    def test_upstream_without_user_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "ssh://github.com/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://github.com/foo.git",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_url_without_path_dies(self):
+    def test_upstream_without_path_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "ssh://git@github.com",
-                    "identity": "/dev/null",
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com",
+                "IdentityFile": "/dev/null",
+            }]))
 
     def test_non_numeric_port_dies(self):
         with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo": {
-                    "url": "ssh://git@github.com:notaport/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com:notaport/foo.git",
+                "IdentityFile": "/dev/null",
+            }]))
 
-    def test_ip_literal_upstream(self):
-        m = Manifest.from_json_obj(_manifest({
-            "bot-bottle": {
-                "url": "ssh://git@100.78.141.42:30009/didericis/bot-bottle.git",
-                "identity": "/dev/null",
-            },
-        }))
-        e = m.bottles["dev"].git[0]
-        self.assertEqual("100.78.141.42", e.UpstreamHost)
-        self.assertEqual("30009", e.UpstreamPort)
-        self.assertEqual("bot-bottle", e.Name)
+
+class TestGitEntryExtraHosts(unittest.TestCase):
+    def test_extra_hosts_defaults_to_empty(self):
+        m = Manifest.from_json_obj(_manifest([{
+            "Name": "foo",
+            "Upstream": "ssh://git@github.com/foo.git",
+            "IdentityFile": "/dev/null",
+        }]))
+        self.assertEqual({}, dict(m.bottles["dev"].git[0].ExtraHosts))
+
+    def test_extra_hosts_parses_host_to_ip_map(self):
+        m = Manifest.from_json_obj(_manifest([{
+            "Name": "bot-bottle",
+            "Upstream": "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
+            "IdentityFile": "/dev/null",
+            "ExtraHosts": {"gitea.dideric.is": "100.78.141.42"},
+        }]))
+        eh = dict(m.bottles["dev"].git[0].ExtraHosts)
+        self.assertEqual({"gitea.dideric.is": "100.78.141.42"}, eh)
+
+    def test_extra_hosts_must_be_object(self):
+        with self.assertRaises(ManifestError):
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com/foo.git",
+                "IdentityFile": "/dev/null",
+                "ExtraHosts": ["gitea.dideric.is", "100.78.141.42"],
+            }]))
+
+    def test_extra_hosts_ip_must_be_string(self):
+        with self.assertRaises(ManifestError):
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com/foo.git",
+                "IdentityFile": "/dev/null",
+                "ExtraHosts": {"gitea.dideric.is": 100},
+            }]))
+
+    def test_extra_hosts_empty_ip_dies(self):
+        with self.assertRaises(ManifestError):
+            Manifest.from_json_obj(_manifest([{
+                "Name": "foo",
+                "Upstream": "ssh://git@github.com/foo.git",
+                "IdentityFile": "/dev/null",
+                "ExtraHosts": {"gitea.dideric.is": ""},
+            }]))
 
 
 class TestGitEntryCrossValidation(unittest.TestCase):
-    def test_two_repos_different_hosts_both_parsed(self):
-        # Repo names come from dict keys; two distinct keys always produce
-        # two distinct entries (uniqueness is guaranteed at the YAML/dict level).
+    def test_duplicate_name_dies(self):
+        with self.assertRaises(ManifestError):
+            Manifest.from_json_obj({
+                "bottles": {"dev": {"git": {"remotes": {
+                    "a.example": {
+                        "Name": "foo",
+                        "Upstream": "ssh://git@a.example/x.git",
+                        "IdentityFile": "/dev/null",
+                    },
+                    "b.example": {
+                        "Name": "foo",
+                        "Upstream": "ssh://git@b.example/y.git",
+                        "IdentityFile": "/dev/null",
+                    },
+                }}}},
+                "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
+            })
+
+    def test_remote_key_must_match_upstream_host(self):
+        with self.assertRaises(ManifestError):
+            Manifest.from_json_obj({
+                "bottles": {"dev": {"git": {"remotes": {
+                    "wrong.example": {
+                        "Name": "foo",
+                        "Upstream": "ssh://git@github.com/foo.git",
+                        "IdentityFile": "/dev/null",
+                    },
+                }}}},
+                "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
+            })
+
+    def test_remote_key_can_name_logical_host_for_ip_upstream(self):
         m = Manifest.from_json_obj({
-            "bottles": {"dev": {"git-gate": {"repos": {
-                "foo": {
-                    "url": "ssh://git@a.example/x.git",
-                    "identity": "/dev/null",
-                },
-                "bar": {
-                    "url": "ssh://git@b.example/y.git",
-                    "identity": "/dev/null",
+            "bottles": {"dev": {"git": {"remotes": {
+                "gitea.dideric.is": {
+                    "Name": "bot-bottle",
+                    "Upstream": "ssh://git@100.78.141.42:30009/didericis/bot-bottle.git",
+                    "IdentityFile": "/dev/null",
                 },
             }}}},
             "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
         })
-        names = {e.Name for e in m.bottles["dev"].git}
-        self.assertEqual({"foo", "bar"}, names)
+        e = m.bottles["dev"].git[0]
+        self.assertEqual("gitea.dideric.is", e.RemoteKey)
+        self.assertEqual("100.78.141.42", e.UpstreamHost)
+        self.assertEqual("30009", e.UpstreamPort)
 
     def test_legacy_ssh_field_dies_with_hint(self):
+        # PRD 0009: bottle.ssh is removed; manifests carrying it must
+        # fail loudly with a hint pointing at bottle.git.
         with self.assertRaises(ManifestError):
             Manifest.from_json_obj({
                 "bottles": {
@@ -185,82 +239,25 @@ class TestGitEntryCrossValidation(unittest.TestCase):
                 "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
             })
 
-    def test_name_with_single_quote_dies(self):
-        with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "o'reilly": {
-                    "url": "ssh://git@github.com/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
 
-    def test_name_with_space_dies(self):
-        with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "my repo": {
-                    "url": "ssh://git@github.com/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
-
-    def test_name_with_semicolon_dies(self):
-        with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo;bar": {
-                    "url": "ssh://git@github.com/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
-
-    def test_name_with_dollar_dies(self):
-        with self.assertRaises(ManifestError):
-            Manifest.from_json_obj(_manifest({
-                "foo$bar": {
-                    "url": "ssh://git@github.com/foo.git",
-                    "identity": "/dev/null",
-                },
-            }))
-
-    def test_valid_name_with_dots_and_hyphens_accepted(self):
-        m = Manifest.from_json_obj(_manifest({
-            "my.repo-name_1": {
-                "url": "ssh://git@github.com/foo.git",
-                "identity": "/dev/null",
-            },
-        }))
-        self.assertEqual("my.repo-name_1", m.bottles["dev"].git[0].Name)
-
-    def test_legacy_git_key_dies_with_hint(self):
-        msg = ""
-        try:
-            Manifest.from_json_obj({
-                "bottles": {"dev": {"git": {"remotes": {}}}},
-                "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
-            })
-        except ManifestError as e:
-            msg = str(e)
-        self.assertIn("git-gate", msg)
-        self.assertIn("PRD 0047", msg)
-
-
-class TestEmptyGitGateField(unittest.TestCase):
-    def test_no_git_gate_field_yields_empty_tuple(self):
+class TestEmptyGitField(unittest.TestCase):
+    def test_no_git_field_yields_empty_tuple(self):
         m = Manifest.from_json_obj({
             "bottles": {"dev": {}},
             "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
         })
         self.assertEqual((), m.bottles["dev"].git)
 
-    def test_git_gate_object_type_required(self):
+    def test_git_object_type_required(self):
         with self.assertRaises(ManifestError):
             Manifest.from_json_obj({
-                "bottles": {"dev": {"git-gate": "not-a-dict"}},
+                "bottles": {"dev": {"git": "not-a-list"}},
                 "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
             })
 
-    def test_empty_repos_yields_empty_tuple(self):
+    def test_empty_remotes_yields_empty_tuple(self):
         m = Manifest.from_json_obj({
-            "bottles": {"dev": {"git-gate": {"repos": {}}}},
+            "bottles": {"dev": {"git": {"remotes": {}}}},
             "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
         })
         self.assertEqual((), m.bottles["dev"].git)

tests/unit/test_manifest_git_user.py

@@ -1,4 +1,4 @@
-"""Unit: Bottle git-gate.user manifest parsing + validation (issue #86, PRD 0047)."""
+"""Unit: Bottle git.user manifest parsing + validation (issue #86)."""
 
 import unittest
 
@@ -16,7 +16,7 @@ def _error_message(callable_, *args, **kwargs) -> str:
 
 def _manifest(git_user):
     return {
-        "bottles": {"dev": {"git-gate": {"user": git_user}}},
+        "bottles": {"dev": {"git": {"user": git_user}}},
         "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
     }
 
@@ -75,13 +75,13 @@ class TestGitUserParsing(unittest.TestCase):
         msg = _error_message(
             Manifest.from_json_obj, _manifest({"name": 42}),
         )
-        self.assertIn("git-gate.user.name must be a string", msg)
+        self.assertIn("git.user.name must be a string", msg)
 
     def test_non_string_email_dies(self):
         msg = _error_message(
             Manifest.from_json_obj, _manifest({"email": ["x@y.z"]}),
         )
-        self.assertIn("git-gate.user.email must be a string", msg)
+        self.assertIn("git.user.email must be a string", msg)
 
     def test_legacy_top_level_git_user_dies(self):
         msg = _error_message(
@@ -92,7 +92,7 @@ class TestGitUserParsing(unittest.TestCase):
             },
         )
         self.assertIn("git_user", msg)
-        self.assertIn("git-gate.user", msg)
+        self.assertIn("git.user", msg)
 
 
 class TestGitUserDirect(unittest.TestCase):

tests/unit/test_pipelock_yaml.py

@@ -19,7 +19,6 @@ from bot_bottle.pipelock import (
     pipelock_build_config,
     pipelock_render_yaml,
 )
-from bot_bottle.yaml_subset import parse_yaml_subset
 from tests.fixtures import fixture_minimal
 
 
@@ -159,51 +158,6 @@ class TestRenderAndWrite(unittest.TestCase):
         import shutil
         shutil.rmtree(self.out_dir, ignore_errors=True)
 
-    def assert_render_semantics_match(self, cfg: dict[str, object]) -> None:
-        parsed = parse_yaml_subset(pipelock_render_yaml(cfg))
-        self.assertEqual(cfg["version"], parsed["version"])
-        self.assertEqual(cfg["mode"], parsed["mode"])
-        self.assertEqual(cfg["enforce"], parsed["enforce"])
-        parsed_allowlist = parsed["api_allowlist"]
-        if cfg["api_allowlist"] == [] and parsed_allowlist is None:
-            parsed_allowlist = []
-        self.assertEqual(cfg["api_allowlist"], parsed_allowlist)
-        self.assertEqual(cfg["forward_proxy"], parsed["forward_proxy"])
-        self.assertEqual(cfg["dlp"], parsed["dlp"])
-        self.assertEqual(
-            cfg["request_body_scanning"],
-            parsed["request_body_scanning"],
-        )
-        if "seed_phrase_detection" in cfg:
-            self.assertEqual(
-                cfg["seed_phrase_detection"],
-                parsed["seed_phrase_detection"],
-            )
-        else:
-            self.assertNotIn("seed_phrase_detection", parsed)
-
-        if "tls_interception" in cfg:
-            expected_tls = cast(dict[str, object], cfg["tls_interception"])
-            actual_tls = cast(dict[str, object], parsed["tls_interception"])
-            self.assertEqual(expected_tls["enabled"], actual_tls["enabled"])
-            self.assertEqual(expected_tls["ca_cert"], actual_tls["ca_cert"])
-            self.assertEqual(expected_tls["ca_key"], actual_tls["ca_key"])
-            expected_passthrough = expected_tls["passthrough_domains"]
-            if expected_passthrough:
-                self.assertEqual(
-                    expected_passthrough,
-                    actual_tls["passthrough_domains"],
-                )
-            else:
-                self.assertNotIn("passthrough_domains", actual_tls)
-        else:
-            self.assertNotIn("tls_interception", parsed)
-
-        if "ssrf" in cfg:
-            self.assertEqual(cfg["ssrf"], parsed["ssrf"])
-        else:
-            self.assertNotIn("ssrf", parsed)
-
     def test_render_emits_required_top_level_keys(self):
         """One render-level smoke check: the serialized YAML is plausibly
         the shape pipelock expects. We don't grep every key here — that's
@@ -221,67 +175,6 @@ class TestRenderAndWrite(unittest.TestCase):
         self.assertNotIn("trusted_domains:", text)
         self.assertNotIn("ssrf:", text)
 
-    def test_render_semantics_match_minimal_config(self):
-        cfg = pipelock_build_config(fixture_minimal().bottles["dev"])
-        self.assert_render_semantics_match(cfg)
-
-    def test_render_semantics_match_tls_with_empty_passthrough(self):
-        cfg = pipelock_build_config(
-            fixture_minimal().bottles["dev"],
-            ca_cert_path="/etc/pipelock-ca.pem",
-            ca_key_path="/etc/pipelock-ca-key.pem",
-        )
-        self.assert_render_semantics_match(cfg)
-
-    def test_render_semantics_match_all_optional_sections(self):
-        bottle = Manifest.from_json_obj({
-            "bottles": {"dev": {"egress": {"routes": [
-                {"host": "api.openai.com",
-                 "pipelock": {"tls_passthrough": True}},
-                {"host": "gitea.dideric.is",
-                 "pipelock": {"ssrf_ip_allowlist": ["100.78.141.42/32"]}},
-            ]}}},
-            "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
-        }).bottles["dev"]
-        cfg = pipelock_build_config(
-            bottle,
-            ca_cert_path="/etc/pipelock-ca.pem",
-            ca_key_path="/etc/pipelock-ca-key.pem",
-            ssrf_ip_allowlist=("172.20.0.0/16",),
-        )
-        self.assert_render_semantics_match(cfg)
-
-    def test_render_rejects_missing_required_key(self):
-        cfg = pipelock_build_config(fixture_minimal().bottles["dev"])
-        del cfg["mode"]
-        with self.assertRaisesRegex(ValueError, r"config\.mode"):
-            pipelock_render_yaml(cfg)
-
-    def test_render_rejects_wrong_section_type(self):
-        cfg = pipelock_build_config(fixture_minimal().bottles["dev"])
-        cfg["dlp"] = []
-        with self.assertRaisesRegex(ValueError, r"config\.dlp.*mapping"):
-            pipelock_render_yaml(cfg)
-
-    def test_render_rejects_wrong_list_item_type(self):
-        cfg = pipelock_build_config(
-            fixture_minimal().bottles["dev"],
-            ca_cert_path="/etc/pipelock-ca.pem",
-            ca_key_path="/etc/pipelock-ca-key.pem",
-        )
-        tls = cast(dict[str, object], cfg["tls_interception"])
-        tls["passthrough_domains"] = ["api.openai.com", 3]
-        with self.assertRaisesRegex(
-            ValueError, r"tls_interception\.passthrough_domains",
-        ):
-            pipelock_render_yaml(cfg)
-
-    def test_render_rejects_unsupported_top_level_section(self):
-        cfg = pipelock_build_config(fixture_minimal().bottles["dev"])
-        cfg["trusted_domains"] = []
-        with self.assertRaisesRegex(ValueError, r"config\.trusted_domains"):
-            pipelock_render_yaml(cfg)
-
     def test_prepare_writes_file_at_mode_600(self):
         plan = PipelockProxy().prepare(
             fixture_minimal().bottles["dev"], "demo", self.out_dir

tests/unit/test_plan_print_parity.py

@@ -1,248 +0,0 @@
-"""Unit: BottlePlan.print parity across Docker and smolmachines (PRD 0044).
-
-Both backends inherit a single concrete print() from BottlePlan. These
-tests verify that identical git_gate_plan and egress_plan inputs produce
-identical preflight output regardless of backend-specific fields.
-"""
-
-from __future__ import annotations
-
-import io
-import sys
-import tempfile
-import unittest
-from pathlib import Path
-
-from bot_bottle.agent_provider import AgentProvisionPlan
-from bot_bottle.backend import BottleSpec
-from bot_bottle.backend.docker.bottle_plan import DockerBottlePlan
-from bot_bottle.backend.smolmachines.bottle_plan import SmolmachinesBottlePlan
-from bot_bottle.egress import EgressPlan, EgressRoute
-from bot_bottle.git_gate import GitGatePlan, GitGateUpstream
-from bot_bottle.manifest import Manifest
-from bot_bottle.pipelock import PipelockProxyPlan
-from bot_bottle.workspace import workspace_plan
-
-
-def _manifest() -> Manifest:
-    return Manifest.from_json_obj({
-        "bottles": {"dev": {}},
-        "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
-    })
-
-
-def _spec(manifest: Manifest, tmp: str) -> BottleSpec:
-    return BottleSpec(
-        manifest=manifest,
-        agent_name="demo",
-        copy_cwd=False,
-        user_cwd=tmp,
-        identity="test-00001",
-    )
-
-
-def _git_gate_plan(tmp: str) -> GitGatePlan:
-    stage = Path(tmp)
-    return GitGatePlan(
-        slug="test-00001",
-        entrypoint_script=stage / "entrypoint.sh",
-        hook_script=stage / "hook.sh",
-        access_hook_script=stage / "access-hook.sh",
-        upstreams=(
-            GitGateUpstream(
-                name="myrepo",
-                upstream_url="ssh://git@gitea.example.com:30009/org/myrepo.git",
-                upstream_host="gitea.example.com",
-                upstream_port="30009",
-                identity_file="/dev/null",
-                known_host_key="ssh-ed25519 AAAA...",
-            ),
-        ),
-    )
-
-
-def _egress_plan(tmp: str) -> EgressPlan:
-    return EgressPlan(
-        slug="test-00001",
-        routes_path=Path(tmp) / "egress.yaml",
-        routes=(
-            EgressRoute(
-                host="api.example.com",
-                path_allowlist=("/v1/",),
-                auth_scheme="bearer",
-                token_env="EGRESS_TOKEN_0",
-                token_ref="TOKEN",
-            ),
-            EgressRoute(
-                host="static.example.com",
-                path_allowlist=("/",),
-            ),
-        ),
-        token_env_map={"EGRESS_TOKEN_0": "TOKEN"},
-    )
-
-
-def _agent_provision() -> AgentProvisionPlan:
-    return AgentProvisionPlan(
-        template="claude",
-        command="claude",
-        prompt_mode="append_file",
-        image="",
-        dockerfile="",
-        guest_env={"HTTPS_PROXY": "http://127.0.0.1:9999"},
-    )
-
-
-def _proxy_plan(tmp: str) -> PipelockProxyPlan:
-    return PipelockProxyPlan(
-        yaml_path=Path(tmp) / "pipelock.yaml",
-        slug="test-00001",
-    )
-
-
-def _docker_plan(spec: BottleSpec, tmp: str) -> DockerBottlePlan:
-    stage = Path(tmp)
-    return DockerBottlePlan(
-        spec=spec,
-        stage_dir=stage,
-        git_gate_plan=_git_gate_plan(tmp),
-        egress_plan=_egress_plan(tmp),
-        supervise_plan=None,
-        agent_provision=_agent_provision(),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
-        slug="test-00001",
-        container_name="bot-bottle-test-00001",
-        container_name_pinned=False,
-        image="bot-bottle-claude:latest",
-        derived_image="",
-        runtime_image="bot-bottle-claude:latest",
-        dockerfile_path="",
-        env_file=stage / "env",
-        forwarded_env={},
-        prompt_file=stage / "prompt.txt",
-        proxy_plan=_proxy_plan(tmp),
-        use_runsc=False,
-    )
-
-
-def _smolmachines_plan(spec: BottleSpec, tmp: str) -> SmolmachinesBottlePlan:
-    stage = Path(tmp)
-    return SmolmachinesBottlePlan(
-        spec=spec,
-        stage_dir=stage,
-        git_gate_plan=_git_gate_plan(tmp),
-        egress_plan=_egress_plan(tmp),
-        supervise_plan=None,
-        agent_provision=_agent_provision(),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
-        slug="test-00001",
-        bundle_subnet="10.99.0.0/24",
-        bundle_gateway="10.99.0.1",
-        bundle_ip="10.99.0.2",
-        machine_name="bot-bottle-test-00001",
-        agent_image_ref="bot-bottle-claude:latest",
-        guest_env={"HTTPS_PROXY": "http://127.0.0.1:9999"},
-        prompt_file=stage / "prompt.txt",
-        proxy_plan=_proxy_plan(tmp),
-    )
-
-
-def _capture_print(plan: DockerBottlePlan | SmolmachinesBottlePlan) -> list[str]:
-    buf = io.StringIO()
-    orig = sys.stderr
-    sys.stderr = buf
-    try:
-        plan.print(remote_control=False)
-    finally:
-        sys.stderr = orig
-    return buf.getvalue().splitlines()
-
-
-class TestGitGatePrintParity(unittest.TestCase):
-    """Both backends render git gate entries as 'name → host:port'."""
-
-    def setUp(self) -> None:
-        self._tmp = tempfile.mkdtemp(prefix="plan-print-parity-")
-        manifest = _manifest()
-        spec = _spec(manifest, self._tmp)
-        self._docker_lines = _capture_print(_docker_plan(spec, self._tmp))
-        self._smol_lines = _capture_print(_smolmachines_plan(spec, self._tmp))
-
-    def _git_gate_lines(self, lines: list[str]) -> list[str]:
-        return [ln for ln in lines if "git gate" in ln]
-
-    def test_docker_renders_name_arrow_host_port(self) -> None:
-        git_lines = self._git_gate_lines(self._docker_lines)
-        self.assertEqual(1, len(git_lines))
-        self.assertIn("myrepo → gitea.example.com:30009", git_lines[0])
-
-    def test_smolmachines_renders_name_arrow_host_port(self) -> None:
-        git_lines = self._git_gate_lines(self._smol_lines)
-        self.assertEqual(1, len(git_lines))
-        self.assertIn("myrepo → gitea.example.com:30009", git_lines[0])
-
-    def test_git_gate_lines_match_across_backends(self) -> None:
-        self.assertEqual(
-            self._git_gate_lines(self._docker_lines),
-            self._git_gate_lines(self._smol_lines),
-        )
-
-
-class TestEgressPrintParity(unittest.TestCase):
-    """Both backends render egress with auth annotation where present."""
-
-    def setUp(self) -> None:
-        self._tmp = tempfile.mkdtemp(prefix="plan-print-parity-")
-        manifest = _manifest()
-        spec = _spec(manifest, self._tmp)
-        self._docker_lines = _capture_print(_docker_plan(spec, self._tmp))
-        self._smol_lines = _capture_print(_smolmachines_plan(spec, self._tmp))
-
-    def _egress_section(self, lines: list[str]) -> list[str]:
-        """Return lines from the egress label through the last route entry.
-
-        print_multi renders the first route on the label line and
-        aligns additional routes as indented continuation lines
-        (no repeated label). Collect the label line plus every
-        non-blank, non-labelled line that follows before the next
-        top-level section begins."""
-        result: list[str] = []
-        collecting = False
-        indent_prefix = None
-        for ln in lines:
-            stripped = ln.lstrip()
-            if "egress" in stripped and ":" in stripped:
-                collecting = True
-                # Determine the continuation indent from this line's prefix.
-                idx = ln.index("egress")
-                indent_prefix = ln[:idx]
-                result.append(ln)
-            elif collecting:
-                if ln.startswith(indent_prefix) and "egress" not in ln and ":" not in ln.lstrip()[:20]:
-                    result.append(ln)
-                else:
-                    break
-        return result
-
-    def test_docker_includes_auth_annotation(self) -> None:
-        combined = "\n".join(self._egress_section(self._docker_lines))
-        self.assertIn("api.example.com [auth:bearer]", combined)
-
-    def test_smolmachines_includes_auth_annotation(self) -> None:
-        combined = "\n".join(self._egress_section(self._smol_lines))
-        self.assertIn("api.example.com [auth:bearer]", combined)
-
-    def test_unauthenticated_route_has_no_annotation(self) -> None:
-        full = "\n".join(self._docker_lines)
-        self.assertIn("static.example.com", full)
-        self.assertNotIn("static.example.com [auth:", full)
-
-    def test_egress_lines_match_across_backends(self) -> None:
-        self.assertEqual(
-            self._egress_section(self._docker_lines),
-            self._egress_section(self._smol_lines),
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_provision_git.py

@@ -69,14 +69,13 @@ class TestGitGateGitconfigRender(unittest.TestCase):
             '[url "http://127.0.0.16:57001/bot-bottle.git"]', out,
         )
 
-    def test_ip_upstream_emits_single_insteadof(self):
-        # In the new format the dict key is the repo name, not a host
-        # alias, so there is only one insteadOf rule — for the IP URL.
+    def test_ip_upstream_also_rewrites_logical_remote_key(self):
         m = Manifest.from_json_obj({
-            "bottles": {"dev": {"git-gate": {"repos": {
-                "bot-bottle": {
-                    "url": "ssh://git@100.78.141.42:30009/didericis/bot-bottle.git",
-                    "identity": "/dev/null",
+            "bottles": {"dev": {"git": {"remotes": {
+                "gitea.dideric.is": {
+                    "Name": "bot-bottle",
+                    "Upstream": "ssh://git@100.78.141.42:30009/didericis/bot-bottle.git",
+                    "IdentityFile": "/dev/null",
                 },
             }}}},
             "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
@@ -87,7 +86,11 @@ class TestGitGateGitconfigRender(unittest.TestCase):
             "ssh://git@100.78.141.42:30009/didericis/bot-bottle.git",
             out,
         )
-        self.assertNotIn("gitea.dideric.is", out)
+        self.assertIn(
+            "\tinsteadOf = "
+            "ssh://git@gitea.dideric.is:30009/didericis/bot-bottle.git",
+            out,
+        )
 
 
 if __name__ == "__main__":

tests/unit/test_sidecar_init.py

@@ -14,7 +14,6 @@ import subprocess
 import sys
 import time
 import unittest
-import warnings
 from pathlib import Path
 from unittest.mock import patch
 
@@ -136,10 +135,6 @@ class TestSupervisor(unittest.TestCase):
     We don't go through `main()` because main installs signal
     handlers process-wide, which collides with the test runner."""
 
-    def setUp(self):
-        warnings.simplefilter("error", ResourceWarning)
-        self.addCleanup(warnings.resetwarnings)
-
     def _drive(self, sup: _Supervisor, max_wait_s: float = 6.0) -> int:
         deadline = time.monotonic() + max_wait_s
         while not sup.tick():

tests/unit/test_smolmachines_prepare.py

@@ -1,133 +0,0 @@
-"""Unit: smolmachines prepare.py env resolution (PRD 0038)."""
-
-from __future__ import annotations
-
-import os
-import tempfile
-import unittest
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-from bot_bottle.agent_provider import AgentProvisionPlan
-from bot_bottle.env import ResolvedEnv
-
-
-class TestSmolmachinesResolveEnv(unittest.TestCase):
-    """resolve_plan() must call resolve_env() and build guest_env
-    from the resolved values rather than from raw bottle.env."""
-
-    def _run_resolve_plan(
-        self,
-        resolved: ResolvedEnv,
-        *,
-        extra_host_env: dict[str, str] | None = None,
-    ) -> dict[str, str]:
-        from bot_bottle.backend import BottleSpec
-        from bot_bottle.manifest import Manifest
-
-        with tempfile.TemporaryDirectory() as tmp:
-            stage = Path(tmp) / "stage"
-            stage.mkdir()
-
-            # Minimal manifest with one env literal so the spec is valid.
-            manifest = Manifest.from_json_obj({
-                "agents": {"myagent": {"bottle": "mybottle"}},
-                "bottles": {"mybottle": {"env": {"PLAIN": "literal-value"}}},
-            })
-            spec = BottleSpec(
-                manifest=manifest,
-                agent_name="myagent",
-                copy_cwd=False,
-                user_cwd=tmp,
-                identity="test-slug-00001",
-            )
-
-            from bot_bottle import supervise as _sup
-            orig_root = _sup.bot_bottle_root
-            _sup.bot_bottle_root = lambda: Path(tmp) / ".bot-bottle"  # type: ignore[assignment]
-
-            host_env = {**os.environ, **(extra_host_env or {})}
-
-            try:
-                with (
-                    patch("bot_bottle.backend.smolmachines.prepare.resolve_env",
-                          return_value=resolved) as mock_resolve,
-                    patch("bot_bottle.backend.smolmachines.prepare.smolmachines_preflight"),
-                    patch("bot_bottle.backend.smolmachines.prepare.smolmachines_bundle_subnet",
-                          return_value=("10.99.0.0/24", "10.99.0.1", "10.99.0.2")),
-                    patch("bot_bottle.backend.smolmachines.prepare.GitGate") as mock_gg,
-                    patch("bot_bottle.backend.smolmachines.prepare.PipelockProxy") as mock_pl,
-                    patch("bot_bottle.backend.smolmachines.prepare.Egress") as mock_eg,
-                    patch("bot_bottle.backend.smolmachines.prepare.Supervise"),
-                    patch("bot_bottle.backend.smolmachines.prepare.agent_provision_plan") as mock_app,
-                    patch("bot_bottle.backend.smolmachines.prepare.runtime_for"),
-                ):
-                    mock_gg.return_value.prepare.return_value = MagicMock()
-                    mock_pl.return_value.prepare.return_value = MagicMock()
-                    mock_eg.return_value.prepare.return_value = MagicMock()
-                    def _make_provision(**kwargs):
-                        return AgentProvisionPlan(
-                            template="claude",
-                            command="claude",
-                            prompt_mode="append_file",
-                            dockerfile="",
-                            image="bot-bottle-claude:latest",
-                            guest_env=dict(kwargs.get("guest_env") or {}),
-                        )
-                    mock_app.side_effect = lambda **kw: _make_provision(**kw)
-
-                    from bot_bottle.backend.smolmachines.prepare import resolve_plan
-                    plan = resolve_plan(spec, stage_dir=stage)
-
-                mock_resolve.assert_called_once_with(manifest, "myagent")
-                return dict(plan.guest_env)
-            finally:
-                _sup.bot_bottle_root = orig_root  # type: ignore[assignment]
-
-    def test_literal_env_reaches_guest_env(self):
-        resolved = ResolvedEnv(
-            literals={"PLAIN": "hello"},
-            forwarded={},
-        )
-        guest_env = self._run_resolve_plan(resolved)
-        self.assertEqual("hello", guest_env["PLAIN"])
-
-    def test_forwarded_env_reaches_guest_env(self):
-        # Secrets / interpolated values land in forwarded; they must
-        # still reach the guest (argv exposure is the known gap).
-        resolved = ResolvedEnv(
-            literals={},
-            forwarded={"SECRET": "s3cr3t", "INTERP": "resolved-val"},
-        )
-        guest_env = self._run_resolve_plan(resolved)
-        self.assertEqual("s3cr3t", guest_env["SECRET"])
-        self.assertEqual("resolved-val", guest_env["INTERP"])
-
-    def test_raw_manifest_sentinel_not_in_guest_env(self):
-        # Before the fix, ?prompt and ${HOST} would appear verbatim.
-        # After the fix, resolve_env() is called so the caller sees
-        # the mocked resolved values (no raw sentinel survives).
-        resolved = ResolvedEnv(
-            literals={},
-            forwarded={"MY_SECRET": "actual-value"},
-        )
-        guest_env = self._run_resolve_plan(resolved)
-        for v in guest_env.values():
-            self.assertFalse(
-                v.startswith("?"),
-                f"raw secret sentinel survived in guest_env: {v!r}",
-            )
-            self.assertFalse(
-                v.startswith("${"),
-                f"raw interpolation sentinel survived in guest_env: {v!r}",
-            )
-
-    def test_tls_trust_env_always_present(self):
-        resolved = ResolvedEnv(literals={}, forwarded={})
-        guest_env = self._run_resolve_plan(resolved)
-        for key in ("NODE_EXTRA_CA_CERTS", "SSL_CERT_FILE", "REQUESTS_CA_BUNDLE"):
-            self.assertIn(key, guest_env, f"{key} missing from guest_env")
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_smolmachines_provision.py

@@ -30,7 +30,6 @@ from bot_bottle.backend.smolmachines.provision import (
     provider_auth as _provider_auth,
     skills as _skills,
     supervise as _supervise,
-    workspace as _workspace,
 )
 from bot_bottle.backend.smolmachines.launch import _bundle_launch_spec
 from bot_bottle.backend.smolmachines.smolvm import SmolvmRunResult
@@ -39,9 +38,13 @@ from bot_bottle.git_gate import GitGatePlan, GitGateUpstream
 from bot_bottle.manifest import GitEntry, Manifest
 from bot_bottle.pipelock import PipelockProxyPlan
 from bot_bottle.supervise import SupervisePlan
-from bot_bottle.workspace import workspace_plan
 
 
+def _remote_host(g: GitEntry) -> str:
+    if g.UpstreamHost:
+        return g.UpstreamHost
+    return g.Upstream.split("@", 1)[1].split("/", 1)[0].split(":", 1)[0]
+
 
 def _plan(
     *,
@@ -64,19 +67,20 @@ def _plan(
     guest_env: dict[str, str] | None = None,
 ) -> SmolmachinesBottlePlan:
     bottle_json: dict = {}
-    git_gate_json: dict = {}
+    git_json: dict = {}
     if git:
-        git_gate_json["repos"] = {
-            g.Name: {
-                "url": g.Upstream,
-                "identity": g.IdentityFile,
+        git_json["remotes"] = {
+            _remote_host(g): {
+                "Name": g.Name,
+                "Upstream": g.Upstream,
+                "IdentityFile": g.IdentityFile,
             }
             for g in git
         }
     if git_user is not None:
-        git_gate_json["user"] = git_user
-    if git_gate_json:
-        bottle_json["git-gate"] = git_gate_json
+        git_json["user"] = git_user
+    if git_json:
+        bottle_json["git"] = git_json
     if supervise:
         bottle_json["supervise"] = True
     manifest = Manifest.from_json_obj({
@@ -140,7 +144,6 @@ def _plan(
             codex_auth_file=codex_auth_file,
             guest_env=dict(guest_env or {}),
         ),
-        workspace_plan=workspace_plan(spec, guest_home="/home/node"),
     )
 
 
@@ -843,55 +846,6 @@ class TestProvisionGitUser(unittest.TestCase):
         self.assertEqual(["user.email", "bot@example.com"], calls[0][0][7:])
 
 
-class TestProvisionWorkspace(unittest.TestCase):
-    def setUp(self):
-        self._tmp = tempfile.TemporaryDirectory(prefix="cb-prov-workspace.")
-        self.stage = Path(self._tmp.name)
-
-    def tearDown(self):
-        self._tmp.cleanup()
-
-    def test_noop_when_copy_cwd_false(self):
-        plan = _plan(copy_cwd=False, stage_dir=self.stage)
-        with patch(
-            "bot_bottle.backend.smolmachines.provision.workspace._smolvm.machine_cp"
-        ) as cp, patch(
-            "bot_bottle.backend.smolmachines.provision.workspace._smolvm.machine_exec"
-        ) as ex:
-            _workspace.provision_workspace(plan, "bot-bottle-demo-abc12")
-        cp.assert_not_called()
-        ex.assert_not_called()
-
-    def test_copies_workspace_to_plan_path_and_chowns(self):
-        cwd = self.stage / "cwd"
-        cwd.mkdir()
-        plan = _plan(copy_cwd=True, user_cwd=str(cwd), stage_dir=self.stage)
-        with patch(
-            "bot_bottle.backend.smolmachines.provision.workspace._smolvm.machine_cp"
-        ) as cp, patch(
-            "bot_bottle.backend.smolmachines.provision.workspace._smolvm.machine_exec"
-        ) as ex:
-            _workspace.provision_workspace(plan, "bot-bottle-demo-abc12")
-
-        cp.assert_called_once_with(
-            str(cwd),
-            "bot-bottle-demo-abc12:/home/node/workspace",
-        )
-        argvs = [c.args[1] for c in ex.call_args_list]
-        self.assertIn(
-            ["sh", "-c", "rm -rf /home/node/workspace && mkdir -p /home/node"],
-            argvs,
-        )
-        self.assertIn(
-            [
-                "sh", "-c",
-                "chown -R node:node /home/node/workspace && "
-                "chmod 755 /home/node/workspace",
-            ],
-            argvs,
-        )
-
-
 class TestProvisionSupervise(unittest.TestCase):
     def test_noop_when_supervise_not_enabled(self):
         with patch(

tests/unit/test_supervise_server.py

@@ -8,7 +8,6 @@ import threading
 import time
 import unittest
 from pathlib import Path
-from unittest.mock import patch
 
 
 # The server module loads `supervise` via same-directory import inside
@@ -30,10 +29,8 @@ from bot_bottle.supervise_server import (
     ServerConfig,
     TOOL_DEFINITIONS,
     _RpcError,
-    _response_timeout_from_env,
     format_response_text,
     handle_initialize,
-    handle_list_egress_routes,
     handle_tools_call,
     handle_tools_list,
     jsonrpc_error,
@@ -303,70 +300,6 @@ class TestHandleToolsCall(unittest.TestCase):
         processed = list((self.queue_dir / "processed").glob("*.json"))
         self.assertEqual(2, len(processed))
 
-    def test_pending_response_times_out_without_archive(self):
-        config = ServerConfig(
-            bottle_slug="dev",
-            queue_dir=self.queue_dir,
-            response_timeout_seconds=0.05,
-        )
-        result = handle_tools_call(
-            {
-                "name": _sv.TOOL_EGRESS_BLOCK,
-                "arguments": {
-                    "host": "example.com",
-                    "justification": "need a route",
-                },
-            },
-            config,
-        )
-
-        self.assertFalse(result["isError"])  # type: ignore[index]
-        text = result["content"][0]["text"]  # type: ignore[index]
-        self.assertIn("status: pending", text)
-        self.assertIn("proposal remains queued", text)
-        self.assertEqual(1, len(_sv.list_pending_proposals(self.queue_dir)))
-        self.assertFalse((self.queue_dir / "processed").exists())
-
-
-class TestHandleListEgressRoutes(unittest.TestCase):
-    def test_url_error_returns_tool_error(self):
-        class _Opener:
-            def open(self, *args, **kwargs):  # noqa: ANN001, ANN002, ANN003
-                raise OSError("egress unavailable")
-
-        with patch.object(supervise_server.urllib.request, "build_opener", return_value=_Opener()):
-            result = handle_list_egress_routes(
-                {},
-                ServerConfig(bottle_slug="dev", queue_dir=Path("/unused")),
-            )
-
-        self.assertTrue(result["isError"])  # type: ignore[index]
-        text = result["content"][0]["text"]  # type: ignore[index]
-        self.assertIn("could not reach", text)
-        self.assertIn("egress unavailable", text)
-
-
-class TestResponseTimeoutEnv(unittest.TestCase):
-    def test_unset_uses_default(self):
-        self.assertEqual(
-            supervise_server.DEFAULT_RESPONSE_TIMEOUT_SECONDS,
-            _response_timeout_from_env({}),
-        )
-
-    def test_positive_float_accepted(self):
-        self.assertEqual(
-            12.5,
-            _response_timeout_from_env({"SUPERVISE_RESPONSE_TIMEOUT_SECONDS": "12.5"}),
-        )
-
-    def test_invalid_value_rejected(self):
-        with self.assertRaises(ValueError):
-            _response_timeout_from_env({"SUPERVISE_RESPONSE_TIMEOUT_SECONDS": "soon"})
-
-    def test_nonpositive_value_rejected(self):
-        with self.assertRaises(ValueError):
-            _response_timeout_from_env({"SUPERVISE_RESPONSE_TIMEOUT_SECONDS": "0"})
-
 
 # --- Response text formatting ---------------------------------------------
 

tests/unit/test_workspace.py

@@ -1,58 +0,0 @@
-"""Unit: backend-neutral workspace planning."""
-
-from __future__ import annotations
-
-import tempfile
-import unittest
-from pathlib import Path
-
-from bot_bottle.backend import BottleSpec
-from bot_bottle.manifest import Manifest
-from bot_bottle.workspace import workspace_plan
-
-
-def _spec(*, copy_cwd: bool, user_cwd: str) -> BottleSpec:
-    manifest = Manifest.from_json_obj({
-        "bottles": {"dev": {}},
-        "agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
-    })
-    return BottleSpec(
-        manifest=manifest,
-        agent_name="demo",
-        copy_cwd=copy_cwd,
-        user_cwd=user_cwd,
-    )
-
-
-class TestWorkspacePlan(unittest.TestCase):
-    def test_disabled_uses_guest_home_as_workdir(self):
-        plan = workspace_plan(
-            _spec(copy_cwd=False, user_cwd="/tmp/project"),
-            guest_home="/home/node",
-        )
-        self.assertFalse(plan.enabled)
-        self.assertEqual("/home/node", plan.guest_path)
-        self.assertEqual("/home/node", plan.workdir)
-
-    def test_enabled_uses_workspace_under_guest_home(self):
-        plan = workspace_plan(
-            _spec(copy_cwd=True, user_cwd="/tmp/project"),
-            guest_home="/guest/home",
-        )
-        self.assertTrue(plan.enabled)
-        self.assertEqual(Path("/tmp/project"), plan.host_path)
-        self.assertEqual("/guest/home/workspace", plan.guest_path)
-        self.assertEqual("/guest/home/workspace", plan.workdir)
-
-    def test_detects_host_git_dir(self):
-        with tempfile.TemporaryDirectory(prefix="bb-workspace.") as tmp:
-            Path(tmp, ".git").mkdir()
-            plan = workspace_plan(
-                _spec(copy_cwd=True, user_cwd=tmp),
-                guest_home="/home/node",
-            )
-        self.assertTrue(plan.has_host_git_dir)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_yaml_subset.py

@@ -160,13 +160,13 @@ class TestBlockList(unittest.TestCase):
         out = _y("""
             entries:
               - name: foo
-                metadata:
+                ExtraHosts:
                   host.example: 10.0.0.1
               - name: bar
         """)
         self.assertEqual(
             {"entries": [
-                {"name": "foo", "metadata": {"host.example": "10.0.0.1"}},
+                {"name": "foo", "ExtraHosts": {"host.example": "10.0.0.1"}},
                 {"name": "bar"},
             ]},
             out,
@@ -270,7 +270,8 @@ class TestRealisticBottleFile(unittest.TestCase):
                   Name: bot-bottle
                   Upstream: ssh://git@gitea.dideric.is:30009/x/y.git
                   IdentityFile: ~/.ssh/gitea.pem
-                  KnownHostKey: ssh-ed25519 AAAA...
+                  ExtraHosts:
+                    gitea.dideric.is: 100.78.141.42
         """)
         # Spot-check the deep parts; the structure is large.
         self.assertEqual(2, len(out["egress"]["routes"]))
@@ -283,8 +284,8 @@ class TestRealisticBottleFile(unittest.TestCase):
             out["egress"]["routes"][0]["auth"]["scheme"],
         )
         self.assertEqual(
-            "ssh-ed25519 AAAA...",
-            out["git"]["remotes"]["gitea.dideric.is"]["KnownHostKey"],
+            "100.78.141.42",
+            out["git"]["remotes"]["gitea.dideric.is"]["ExtraHosts"]["gitea.dideric.is"],
         )