M7.1: extract nisse-core

What isn't the dev agent's moves to nisse-core, unchanged in behaviour,
with its tests: canonical, render, render_anthropic, llm, catalog, probe,
context, views, state, reconcile, worker, cancel, dump, transport, matrix,
execution, testing, vault, memory, oplog, envfile and gitea (whole).

- nisse_core.state.StateStore holds the tables every agent has; an
  agent's subclass adds its tables (version, migrations), roles and
  views. nisse_dev.state.StateStore adds the build VM blocks (v5).
- views.project takes what each role is shown, rather than a fixed table.
- Vault takes the agent's name (agent=), for provenance.
- A test that nisse_core never imports an agent.
- The loop, config, git, delegation, expert, tools and evals stay in
  nisse-dev until nisse-ops has a loop to share.

Docs: the Development Plan marks M7.1 done and notes that Phase 6 waits on
the agent host and Terraform; Architecture Part L names the package.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01J5Utyfzw7gF7UhjRDEtjTk

nisse-core/src/nisse_core/cancel.py

@@ -0,0 +1,40 @@
+"""The operator's kill switch, as the working loops see it (architecture L2).
+
+`stop` has to reach work that is already running, from a thread that is not
+running it. So it is a flag, set by whoever hears the command and checked by
+the loops at each tool boundary. Setting it touches nothing durable: the
+record of a stop is written by the worker when the stopped work returns.
+"""
+
+import threading
+
+from nisse_core.canonical import ToolCall, ToolResult
+from nisse_core.state import Transcript
+
+STOPPED_RESULT = "not run: the operator stopped the agent"
+
+
+class Cancel:
+    def __init__(self) -> None:
+        self._event = threading.Event()
+
+    def set(self) -> None:
+        self._event.set()
+
+    def clear(self) -> None:
+        self._event.clear()
+
+    @property
+    def requested(self) -> bool:
+        return self._event.is_set()
+
+
+def skip_calls(
+    transcript: Transcript, calls: list[ToolCall], reason: str = STOPPED_RESULT
+) -> None:
+    """Record calls left unrun. Every tool call needs a result for the
+    transcript to render again, and the result says what happened."""
+    for call in calls:
+        transcript.append(
+            ToolResult(call_id=call.call_id, result=reason, success=False)
+        )

nisse-core/src/nisse_core/canonical.py

@@ -0,0 +1,173 @@
+"""Canonical transcript schema (architecture L7).
+
+The durable record is this event log, never a provider-shaped ``messages``
+array; provider request bodies are rendered from it at call time. Canonical
+tool-call IDs are minted locally — provider IDs are mapped at the boundary and
+never used as a join key.
+
+Transcript appends are the conversation record itself, not state-machine
+mutations, so they are deliberately outside the L12 state-change taxonomy.
+"""
+
+import uuid
+from dataclasses import asdict, dataclass, fields
+from typing import Any
+
+
+@dataclass(frozen=True)
+class UserMessage:
+    text: str
+    source: str  # e.g. a Matrix event ID
+
+
+@dataclass(frozen=True)
+class AssistantText:
+    text: str
+    model: str
+
+
+@dataclass(frozen=True)
+class ToolCall:
+    call_id: str  # canonical, minted locally via mint_call_id()
+    tool: str
+    arguments: dict[str, Any]
+
+
+@dataclass(frozen=True)
+class ToolResult:
+    call_id: str
+    result: str
+    success: bool
+
+
+@dataclass(frozen=True)
+class PlanSubmitted:
+    plan: str
+    model: str
+
+
+@dataclass(frozen=True)
+class GateOpened:
+    gate: str
+    reason: str
+
+
+@dataclass(frozen=True)
+class DelegationStarted:
+    brief: str
+    role: str
+    model: str  # the alias asked for, e.g. "remote-architecture"
+    caps: dict[str, Any]  # turns / tokens / wall-clock limits
+    # What the alias resolved to at task start. An alias is free to change
+    # models between tasks, so eval history (L9) keyed on the alias alone
+    # would average results across whatever it happened to point at.
+    backing_model: str = ""
+
+
+@dataclass(frozen=True)
+class DelegationCompleted:
+    handback: str
+    artifacts: list[str]
+    tokens: int
+    duration_s: float
+    exit_status: str
+
+
+@dataclass(frozen=True)
+class Fact:
+    """Something the orchestrator knows that the models must too (L6, L7):
+    a plan approved, a milestone finished, a PR opened. Written by the
+    orchestrator; every role sees it, as a statement rather than a turn."""
+
+    text: str
+
+
+@dataclass(frozen=True)
+class ActionVerdict:
+    """What the fast path made of a tool call before it ran (P4, L4): a
+    record for the log, the operator and the classifier's evaluation set,
+    never shown to a model."""
+
+    call_id: str
+    tool: str
+    effect: str  # harmless | contained | unknown | dangerous | refused
+    rule: str
+    reason: str
+    decision: str  # ran | refused | asked | allowed | classified
+    # Who decided: the fast path's rules, or the classifier (L4), with the
+    # model it ran on and exactly what it was shown (the evaluation set, L9).
+    source: str = "fast_path"
+    model: str = ""
+    input: str = ""
+
+
+@dataclass(frozen=True)
+class Compaction:
+    summary: str
+    model: str
+    replaces: list[int]  # [first_id, last_id] inclusive range replaced
+
+
+CanonicalEvent = (
+    UserMessage
+    | AssistantText
+    | ToolCall
+    | ToolResult
+    | PlanSubmitted
+    | GateOpened
+    | DelegationStarted
+    | DelegationCompleted
+    | Fact
+    | ActionVerdict
+    | Compaction
+)
+
+EVENT_TYPES: dict[str, type] = {
+    "user_message": UserMessage,
+    "assistant_text": AssistantText,
+    "tool_call": ToolCall,
+    "tool_result": ToolResult,
+    "plan_submitted": PlanSubmitted,
+    "gate_opened": GateOpened,
+    "delegation_started": DelegationStarted,
+    "delegation_completed": DelegationCompleted,
+    "fact": Fact,
+    "action_verdict": ActionVerdict,
+    "compaction": Compaction,
+}
+
+_TYPE_NAMES = {cls: name for name, cls in EVENT_TYPES.items()}
+
+
+@dataclass(frozen=True)
+class StoredEvent:
+    id: int
+    ts: str
+    event: CanonicalEvent
+    # The work item it belongs to (None: agent-level, L6) and the role that
+    # produced it (L7). Rendering uses both.
+    work_item: str | None = None
+    actor: str = ""
+
+
+def mint_call_id() -> str:
+    return f"call-{uuid.uuid4().hex}"
+
+
+def event_type(event: CanonicalEvent) -> str:
+    return _TYPE_NAMES[type(event)]
+
+
+def to_payload(event: CanonicalEvent) -> dict[str, Any]:
+    return asdict(event)
+
+
+def from_payload(type_name: str, payload: dict[str, Any]) -> CanonicalEvent:
+    cls = EVENT_TYPES.get(type_name)
+    if cls is None:
+        raise ValueError(f"unknown canonical event type: {type_name!r}")
+    known = {f.name for f in fields(cls)}
+    unknown = payload.keys() - known
+    if unknown:
+        raise ValueError(f"unknown fields for {type_name}: {sorted(unknown)}")
+    return cls(**payload)

nisse-core/src/nisse_core/catalog.py

@@ -0,0 +1,227 @@
+"""Runtime model discovery (architecture L9).
+
+LiteLLM is the VM's single LLM destination, which makes it the authority on
+what any given model *is*. Asking it at startup keeps vendor knowledge in one
+place instead of duplicating it as name patterns in agent code -- and that
+stops being a tidiness argument the moment a role alias no longer names its
+vendor. An alias like ``remote-architecture`` is deliberately free to point at
+Anthropic today and something else tomorrow; nothing in the name can tell us
+which request shape the model behind it expects.
+
+Discovery is per key, not global: ``/model/info`` returns only the models the
+presented token is allowed to use. So the same check that catches a typo'd
+alias also catches a role pointed at a model this key cannot reach.
+"""
+
+from collections.abc import Mapping
+from dataclasses import dataclass
+from typing import Any
+
+import httpx
+
+from nisse_core.llm import LLMClient, LLMError
+
+# LiteLLM's provider name for models we have a vendor-native adapter for.
+ANTHROPIC_PROVIDER = "anthropic"
+
+
+class CatalogUnavailable(LLMError):
+    """The catalog could not be fetched: the proxy is down, unreachable, or
+    refused the token. An outage, not a mistake in the configuration."""
+
+
+class UnknownModel(LLMError):
+    """A model was named that this key's catalog does not contain: a typo, a
+    stale alias, or a key without access. Always a misconfiguration."""
+
+
+class UnknownLimits(LLMError):
+    """A model in use has no declared context window. LiteLLM knows the
+    limits of commercial models; for a local one they are whatever its server
+    allocates, and have to be declared in LiteLLM's ``model_info``. Guessing
+    is not safe: a server that silently truncates a prompt (Ollama does)
+    drops its start, which is where the system prompt and the plan are."""
+
+
+@dataclass(frozen=True)
+class ModelFacts:
+    alias: str  # what we ask for, e.g. "remote-architecture"
+    backing: str  # what LiteLLM calls, e.g. "anthropic/claude-opus-5"
+    provider: str  # "anthropic", "openai", "ollama", ...
+    supports_tools: bool | None  # None when LiteLLM does not say
+    # The whole context window, prompt plus response, as LiteLLM declares it
+    # (model_info.max_input_tokens); None when it does not say.
+    max_input_tokens: int | None = None
+    # The most one response may use (model_info.max_output_tokens).
+    max_output_tokens: int | None = None
+    # Whether its server enforces tool_choice (model_info.supports_tool_choice).
+    # Only a declared True counts: a model that says nothing is not asked.
+    supports_tool_choice: bool | None = None
+
+    @property
+    def native_anthropic(self) -> bool:
+        return self.provider == ANTHROPIC_PROVIDER
+
+    def answered(self, reported: str | None) -> bool:
+        """Whether a response reporting this model name came from this model.
+
+        A proxy fallback answers under another model's name. LiteLLM reports
+        the alias; a provider may report its own name for the backing model,
+        sometimes with a date suffix ("claude-haiku-4-5-20251001").
+        """
+        if not reported:
+            return True  # nothing reported, nothing contradicted
+        own_name = self.backing.partition("/")[2] or self.backing
+        return reported in (self.alias, self.backing) or reported.startswith(own_name)
+
+
+class ModelCatalog:
+    """What one LiteLLM key can see, as of the moment it was asked."""
+
+    def __init__(self, facts: Mapping[str, ModelFacts]) -> None:
+        self._facts = dict(facts)
+
+    @classmethod
+    def from_payload(cls, payload: Mapping[str, Any]) -> "ModelCatalog":
+        facts: dict[str, ModelFacts] = {}
+        for entry in payload.get("data") or []:
+            alias = entry.get("model_name")
+            if not alias:
+                continue
+            params = entry.get("litellm_params") or {}
+            info = entry.get("model_info") or {}
+            backing = str(params.get("model") or "")
+            # litellm_provider is the direct answer; the backing model's
+            # "vendor/model" prefix says the same thing and is present even
+            # when the provider field is not.
+            provider = info.get("litellm_provider") or backing.partition("/")[0]
+            facts[alias] = ModelFacts(
+                alias=alias,
+                backing=backing,
+                provider=str(provider),
+                supports_tools=info.get("supports_function_calling"),
+                max_input_tokens=_positive_int(info.get("max_input_tokens")),
+                max_output_tokens=_positive_int(info.get("max_output_tokens")),
+                supports_tool_choice=info.get("supports_tool_choice"),
+            )
+        return cls(facts)
+
+    @classmethod
+    def discover(
+        cls,
+        base_url: str,
+        token: str,
+        *,
+        timeout_s: float = 30.0,
+        transport: httpx.BaseTransport | None = None,
+    ) -> "ModelCatalog":
+        try:
+            with httpx.Client(
+                base_url=base_url.rstrip("/"),
+                headers={"Authorization": f"Bearer {token}"},
+                timeout=timeout_s,
+                transport=transport,
+            ) as http:
+                response = http.get("/model/info")
+        except httpx.HTTPError as exc:
+            raise CatalogUnavailable(
+                f"could not reach the LiteLLM proxy at {base_url} to discover "
+                f"models: {exc}"
+            ) from exc
+        if response.status_code != 200:
+            raise CatalogUnavailable(
+                f"the LiteLLM proxy refused a model listing with "
+                f"{response.status_code}: {response.text[:300]}"
+            )
+        return cls.from_payload(response.json())
+
+    def aliases(self) -> list[str]:
+        return sorted(self._facts)
+
+    def facts(self, alias: str) -> ModelFacts:
+        try:
+            return self._facts[alias]
+        except KeyError:
+            raise UnknownModel(
+                f"{alias!r} is not a model this LiteLLM key can see; "
+                f"available: {', '.join(self.aliases()) or '(none)'}"
+            ) from None
+
+    def validate(self, roles: Mapping[str, str]) -> None:
+        """Check a whole role mapping at once, before anything uses it.
+
+        Reported together rather than one per boot: an operator fixing a
+        config wants the whole list, not to rediscover the next typo on the
+        next start (the same reason ``AgentConfig`` reports every missing
+        setting at once).
+        """
+        unknown = {
+            role: alias for role, alias in roles.items() if alias not in self._facts
+        }
+        if unknown:
+            named = ", ".join(
+                f"{role}={alias!r}" for role, alias in sorted(unknown.items())
+            )
+            raise UnknownModel(
+                f"role(s) point at models this LiteLLM key cannot see: {named}; "
+                f"available: {', '.join(self.aliases()) or '(none)'}"
+            )
+
+    def require_limits(self, roles: Mapping[str, str]) -> None:
+        """Refuse a role mapping that uses a model with no declared context
+        window, naming every such model at once."""
+        missing = {
+            role: alias
+            for role, alias in roles.items()
+            if self.facts(alias).max_input_tokens is None
+        }
+        if missing:
+            named = ", ".join(
+                f"{role}={alias!r}" for role, alias in sorted(missing.items())
+            )
+            raise UnknownLimits(
+                f"no context window is declared for: {named}. Set "
+                "model_info.max_input_tokens (and max_output_tokens) for these "
+                "in LiteLLM; docs/Tuning-Guide.md says how to find the values"
+            )
+
+    def pinned(self, roles: Mapping[str, str]) -> dict[str, dict[str, Any]]:
+        """The resolved mapping to record at task start (L9).
+
+        Recording only the alias would let an alias that silently changes
+        models muddle the eval history behind it: "remote-architecture: 80%
+        good" averaged over however many models it pointed at is not a fact
+        about anything.
+        """
+        return {
+            role: {
+                "alias": alias,
+                "backing": self.facts(alias).backing,
+                "provider": self.facts(alias).provider,
+            }
+            for role, alias in roles.items()
+        }
+
+
+def _positive_int(value: Any) -> int | None:
+    if isinstance(value, bool) or not isinstance(value, int | float):
+        return None
+    return int(value) if value > 0 else None
+
+
+def select_client(
+    model: str,
+    normalized: LLMClient,
+    passthrough: LLMClient,
+    catalog: ModelCatalog,
+) -> LLMClient:
+    """Choose the route from what the model *is*, not from what it is called.
+
+    L9 spells out the rule: use the vendor-native adapter where one exists,
+    and otherwise provisionally accept LiteLLM's normalization for that
+    vendor -- validating it against the L9 eval set before trusting it with
+    delegations. There is deliberately no name-based fallback here: a second
+    heuristic could disagree with the proxy, and an unknown model raises
+    rather than quietly taking the normalized route.
+    """
+    return passthrough if catalog.facts(model).native_anthropic else normalized

nisse-core/src/nisse_core/context.py

@@ -0,0 +1,293 @@
+"""The context budget (architecture L6: token budgeting is a render-time concern).
+
+Every model call re-sends a transcript that only grows, and a model server
+does not always refuse one that no longer fits: Ollama silently drops the
+start of the prompt, which is where the system prompt and the plan are. So a
+request is made to fit the model's declared window *before* it is sent, and
+one that cannot be made to fit is never sent.
+
+The log itself is never changed. Fitting works on the events about to be
+rendered, in three steps, stopping at the first that fits:
+
+1. Tool results older than the most recent turns are cut to their first and
+   last lines, with a note saying how much was left out.
+2. The oldest events are dropped, keeping tool calls with their results, and
+   a note at the start says how many.
+3. If even the recent turns and the system prompt do not fit, the call
+   fails with ContextOverflow. The caller treats it like any failed call:
+   the executor stops and asks the operator.
+
+Token counts are estimated from characters, conservatively, and the estimate
+is corrected from the input-token counts the server reports back. The
+correction only ever makes the estimate larger: underestimating is the
+dangerous direction.
+"""
+
+import json
+from collections.abc import Callable, Sequence
+from dataclasses import dataclass, replace
+from typing import Any
+
+from nisse_core.canonical import (
+    AssistantText,
+    CanonicalEvent,
+    DelegationStarted,
+    PlanSubmitted,
+    StoredEvent,
+    ToolCall,
+    ToolResult,
+    UserMessage,
+)
+from nisse_core.llm import DEFAULT_MAX_OUTPUT_TOKENS, LLMError
+
+# English and code run at about four characters a token. Three is deliberately
+# pessimistic, before any correction from what the server reports.
+CHARS_PER_TOKEN = 3.0
+# Role markers and formatting each rendered message costs beyond its text.
+MESSAGE_OVERHEAD_TOKENS = 8
+# How much of an older tool result survives step 1.
+ELIDED_RESULT_CHARS = 600
+
+# Events the model produced. A turn starts where these start.
+_MODEL_SIDE = (AssistantText, ToolCall, PlanSubmitted, DelegationStarted)
+
+
+class ContextOverflow(LLMError):
+    """The request cannot be made to fit the model's context window."""
+
+
+def head_and_tail(text: str, limit: int) -> str:
+    """Keep the start and, mostly, the end of a long text.
+
+    The end matters more: test runners and compilers put their summary of
+    what failed last. The start keeps the exit code and the first lines.
+    """
+    if len(text) <= limit:
+        return text
+    head = limit // 4
+    tail = limit - head
+    dropped = len(text) - limit
+    return f"{text[:head]}\n[... {dropped} characters omitted ...]\n{text[-tail:]}"
+
+
+def _event_chars(event: CanonicalEvent) -> int:
+    match event:
+        case ToolCall(tool=tool, arguments=arguments):
+            return len(tool) + len(json.dumps(arguments))
+        case ToolResult(result=result):
+            return len(result)
+        case _:
+            text = getattr(event, "text", None) or getattr(event, "plan", None)
+            if text is None:
+                text = json.dumps(getattr(event, "__dict__", {}), default=str)
+            return len(str(text))
+
+
+def estimate_tokens(
+    events: Sequence[StoredEvent],
+    system: str | None,
+    tools: list[dict[str, Any]] | None,
+    factor: float = 1.0,
+) -> int:
+    chars = sum(_event_chars(e.event) for e in events)
+    chars += len(system or "") + len(json.dumps(tools or []))
+    raw = chars / CHARS_PER_TOKEN + MESSAGE_OVERHEAD_TOKENS * (len(events) + 1)
+    return int(raw * factor) + 1
+
+
+def _turn_starts(events: Sequence[StoredEvent]) -> list[int]:
+    starts = []
+    previous_model_side = False
+    for index, stored in enumerate(events):
+        model_side = isinstance(stored.event, _MODEL_SIDE)
+        if model_side and not previous_model_side:
+            starts.append(index)
+        previous_model_side = model_side
+    return starts
+
+
+def _consistent(events: list[StoredEvent]) -> list[StoredEvent]:
+    """Drop results whose call is gone: a provider rejects a tool result
+    with nothing to answer."""
+    calls = {e.event.call_id for e in events if isinstance(e.event, ToolCall)}
+    return [
+        e
+        for e in events
+        if not isinstance(e.event, ToolResult) or e.event.call_id in calls
+    ]
+
+
+@dataclass(frozen=True)
+class Budget:
+    window: int  # prompt plus response, in tokens
+    max_output: int  # the ceiling sent with the request
+    keep_recent_turns: int
+    safety_margin: float  # fraction of the window held back
+
+    @property
+    def for_prompt(self) -> int:
+        return int(self.window * (1 - self.safety_margin)) - self.max_output
+
+
+def fit(
+    events: Sequence[StoredEvent],
+    system: str | None,
+    tools: list[dict[str, Any]] | None,
+    budget: Budget,
+    factor: float = 1.0,
+) -> list[StoredEvent]:
+    """The events to render: all of them if they fit, otherwise the result of
+    the three steps in the module docstring."""
+    limit = budget.for_prompt
+
+    def fits(candidate: Sequence[StoredEvent]) -> bool:
+        return estimate_tokens(candidate, system, tools, factor) <= limit
+
+    kept = list(events)
+    if fits(kept):
+        return kept
+
+    starts = _turn_starts(kept)
+    recent_from = (
+        starts[-budget.keep_recent_turns]
+        if len(starts) >= budget.keep_recent_turns
+        else 0
+    )
+
+    # Step 1: cut older tool results down.
+    kept = [
+        replace(
+            stored,
+            event=replace(
+                stored.event,
+                result=head_and_tail(stored.event.result, ELIDED_RESULT_CHARS),
+            ),
+        )
+        if index < recent_from and isinstance(stored.event, ToolResult)
+        else stored
+        for index, stored in enumerate(kept)
+    ]
+    if fits(kept):
+        return kept
+
+    # Step 2: drop the oldest events, one turn at a time, never the recent
+    # ones. The note keeps the transcript starting with a user message, which
+    # some chat templates require.
+    cuts = sorted({s for s in starts if 0 < s < recent_from} | {recent_from} - {0})
+    for cut in cuts:
+        remaining = _consistent(kept[cut:])
+        note = StoredEvent(
+            id=0,
+            ts="",
+            event=UserMessage(
+                text=(
+                    f"[{cut} earlier events omitted to fit the context window; "
+                    "the log still has them]"
+                ),
+                source="context-budget",
+            ),
+        )
+        candidate = [note, *remaining]
+        if fits(candidate):
+            return candidate
+
+    # Step 3: nothing more can go.
+    needed = estimate_tokens(kept[recent_from:], system, tools, factor)
+    raise ContextOverflow(
+        f"the system prompt and the last {budget.keep_recent_turns} turns need "
+        f"about {needed} tokens, but only {limit} fit a {budget.window}-token "
+        "window after the output ceiling and safety margin"
+    )
+
+
+class BudgetedClient:
+    """An LLM client that fits every request to the model's window.
+
+    Wraps a real client (either route) and takes each model's limits from
+    ``limits_for``, which the agent fills from LiteLLM's model catalog.
+    """
+
+    def __init__(
+        self,
+        inner: Any,
+        limits_for: Callable[[str], tuple[int, int | None]],
+        *,
+        max_output_tokens: int = DEFAULT_MAX_OUTPUT_TOKENS,
+        keep_recent_turns: int = 6,
+        safety_margin: float = 0.1,
+        enforces_tool_choice: Callable[[str], bool] = lambda model: False,
+    ) -> None:
+        self._inner = inner
+        self._limits_for = limits_for
+        # Whether a model's server holds it to the offered tools when asked
+        # (LiteLLM's supports_tool_choice). Asking one that doesn't can be
+        # worse than not asking: qwen3-14b can't stop, and rambles until the
+        # output ceiling.
+        self._enforces_tool_choice = enforces_tool_choice
+        self._max_output_tokens = max_output_tokens
+        self._keep_recent_turns = keep_recent_turns
+        self._safety_margin = safety_margin
+        # Per model: how much the character estimate undercounted, as learned
+        # from reported usage. Starts at 1 and only grows.
+        self._factors: dict[str, float] = {}
+        self.trimmed_requests = 0
+
+    @property
+    def last_usage(self) -> dict[str, int]:
+        return getattr(self._inner, "last_usage", {}) or {}
+
+    @property
+    def last_model(self) -> str | None:
+        return getattr(self._inner, "last_model", None)
+
+    @property
+    def last_cost(self) -> float:
+        return float(getattr(self._inner, "last_cost", 0.0) or 0.0)
+
+    @property
+    def last_rate_limit_wait_s(self) -> float:
+        return float(getattr(self._inner, "last_rate_limit_wait_s", 0.0) or 0.0)
+
+    def budget_for(self, model: str) -> Budget:
+        window, model_max_output = self._limits_for(model)
+        ceiling = self._max_output_tokens
+        if model_max_output is not None:
+            ceiling = min(ceiling, model_max_output)
+        return Budget(
+            window=window,
+            max_output=ceiling,
+            keep_recent_turns=self._keep_recent_turns,
+            safety_margin=self._safety_margin,
+        )
+
+    def complete(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+    ) -> list[CanonicalEvent]:
+        budget = self.budget_for(model)
+        factor = self._factors.get(model, 1.0)
+        fitted = fit(events, system, tools, budget, factor)
+        # Counted so the benchmark can report how often a model's window was
+        # the constraint: any request that had to be cut down or shortened.
+        if fitted != list(events):
+            self.trimmed_requests += 1
+        produced = self._inner.complete(
+            fitted,
+            tools,
+            model,
+            system=system,
+            max_tokens=budget.max_output,
+            # Every caller that offers tools needs one called: the executor
+            # finishes with finish, the planner with submit_plan or
+            # ask_human, a delegation with hand_back.
+            require_tool_call=bool(tools) and self._enforces_tool_choice(model),
+        )
+        reported = int(self.last_usage.get("input", 0))
+        if reported > 0:
+            estimated = estimate_tokens(fitted, system, tools)
+            observed = reported / max(estimated, 1)
+            self._factors[model] = max(factor, observed)
+        return produced

nisse-core/src/nisse_core/dump.py

@@ -0,0 +1,112 @@
+"""A readable dump of a state store, for bring-up runs and debugging.
+
+    python -m nisse_core.dump STATE_DB [--full]
+
+Opens the store read-only (SQLite `mode=ro`), so it is safe to run against a
+live agent's database: it never migrates, writes or locks it. Prints the work
+items and which is active, pending intents, and the canonical log, one event
+per line with its work item and actor; long texts are shortened unless
+`--full` is given.
+"""
+
+import argparse
+import json
+import sqlite3
+import sys
+from pathlib import Path
+from typing import Any
+
+SHORT = 160  # characters of each text shown without --full
+
+
+def _connect(path: Path) -> sqlite3.Connection:
+    conn = sqlite3.connect(f"file:{path}?mode=ro", uri=True)
+    conn.row_factory = sqlite3.Row
+    return conn
+
+
+def _clip(text: str, full: bool) -> str:
+    text = text.replace("\n", " ⏎ ") if not full else text
+    if full or len(text) <= SHORT:
+        return text
+    return text[:SHORT] + f" … [{len(text) - SHORT} more]"
+
+
+def _event_line(kind: str, payload: dict[str, Any], full: bool) -> str:
+    match kind:
+        case "user_message":
+            return f"USER [{payload.get('source', '')}]: {_clip(payload['text'], full)}"
+        case "assistant_text":
+            return f"ASSISTANT ({payload.get('model', '')}): {_clip(payload['text'], full)}"
+        case "tool_call":
+            args = json.dumps(payload.get("arguments", {}), ensure_ascii=False)
+            return f"CALL {payload['tool']} {_clip(args, full)}"
+        case "tool_result":
+            mark = "ok" if payload.get("success") else "FAILED"
+            return f"  result ({mark}): {_clip(str(payload.get('result', '')), full)}"
+        case "plan_submitted":
+            plan = payload["plan"]
+            return f"PLAN ({payload.get('model', '')}, {len(plan)} chars): {_clip(plan, full)}"
+        case "fact":
+            return f"FACT: {_clip(payload['text'], full)}"
+        case "action_verdict":
+            return (
+                f"  VERDICT {payload.get('effect', '')} ({payload.get('rule', '')}), "
+                f"{payload.get('decision', '')}: {payload.get('reason', '')}"
+            )
+        case "gate_opened":
+            return f"GATE {payload.get('gate', '')}: {payload.get('reason', '')}"
+        case _:
+            return f"{kind.upper()}: {_clip(json.dumps(payload, ensure_ascii=False), full)}"
+
+
+def render(path: Path, *, full: bool = False) -> str:
+    conn = _connect(path)
+    lines: list[str] = []
+    agent = conn.execute("SELECT * FROM agent WHERE id = 1").fetchone()
+    active = agent["active_item"] if agent else None
+    lines.append(f"active work item: {active or '(none: idle)'}")
+    for item in conn.execute("SELECT * FROM work_items ORDER BY opened_at"):
+        loop = json.loads(item["data"]).get("loop") or {}
+        status = item["status"] + (f" ({item['outcome']})" if item["outcome"] else "")
+        waiting = (
+            f"  waits for: {loop['wait']}" if item["position"] == "WAITING" else ""
+        )
+        lines.append(
+            f"  {item['id']}  {status}  position: {item['position']}  "
+            f"scope: {item['scope']}  rev-{loop.get('rev', 0)}{waiting}"
+        )
+    pending = conn.execute(
+        "SELECT id, kind, payload, work_item FROM intent_log WHERE status = 'pending'"
+    ).fetchall()
+    for row in pending:
+        lines.append(
+            f"pending intent #{row['id']} {row['kind']} "
+            f"[{row['work_item'] or 'agent'}]: {row['payload']}"
+        )
+    lines.append("")
+    for row in conn.execute("SELECT * FROM canonical_events ORDER BY id"):
+        payload = json.loads(row["payload"])
+        time = row["ts"][11:19]
+        where = f"[{row['work_item'] or 'agent'}/{row['actor']}]"
+        lines.append(
+            f"#{row['id']} {time} {where} {_event_line(row['type'], payload, full)}"
+        )
+    conn.close()
+    return "\n".join(lines)
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
+    parser.add_argument("state_db", type=Path)
+    parser.add_argument("--full", action="store_true", help="don't shorten texts")
+    args = parser.parse_args(argv)
+    if not args.state_db.exists():
+        print(f"no state store at {args.state_db}", file=sys.stderr)
+        return 1
+    print(render(args.state_db, full=args.full))
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

nisse-core/src/nisse_core/envfile.py

@@ -0,0 +1,22 @@
+"""Minimal .env loader (architecture L12: secrets from env/.env, nothing hardcoded).
+
+Deliberately tiny: KEY=VALUE lines, comments and blanks ignored, existing
+environment variables never overridden (real env wins over the file).
+"""
+
+import os
+from collections.abc import MutableMapping
+from pathlib import Path
+
+
+def load_env_file(path: Path, env: MutableMapping[str, str] = os.environ) -> None:
+    if not path.exists():
+        return
+    for line in path.read_text().splitlines():
+        line = line.strip()
+        if not line or line.startswith("#") or "=" not in line:
+            continue
+        key, value = line.split("=", 1)
+        key = key.strip()
+        if key and key not in env:
+            env[key] = value.strip()

nisse-core/src/nisse_core/execution.py

@@ -0,0 +1,232 @@
+"""Running commands on a tool VM over SSH (architecture L13).
+
+``SSHHost.execute`` is the only way the agent runs anything: there is no
+local execution path, so the host the agent lives on never runs a command a
+model chose. The harness binds the host; a model never names one.
+
+How a command travels. The remote side runs ``bash -s`` and reads a small
+script from SSH's stdin: the secrets handed to this one call as ``export``
+lines, a ``cd``, then the command under ``timeout``. Nothing secret is ever on
+a command line (``ps`` and ``/proc/*/cmdline`` would show it); the values exist
+only in that shell and the command's environment. The command's own stdin is
+``/dev/null``, or a here-document carrying ``stdin``, so it can never read the
+rest of the script.
+
+Every value handed out is redacted from what comes back (L12): a test that
+prints its environment must not put a key into the transcript.
+
+The connection is reused across calls (OpenSSH's ControlMaster), so a tool
+call costs one round trip, not a handshake.
+"""
+
+import os
+import secrets as _random
+import shlex
+import subprocess
+import tempfile
+from collections.abc import Iterable, Mapping
+from dataclasses import dataclass
+from pathlib import Path
+
+# The remote command's exit code is passed back as is, except that 255 is
+# what ssh itself uses for "could not connect"; a command exiting 255 is
+# reported as 254 so the two can't be confused.
+SSH_FAILED = 255
+_TIMED_OUT = 124  # coreutils `timeout`
+_KILL_GRACE_S = 5
+# The local backstop, beyond the remote timeout, for a connection that hangs.
+_LOCAL_SLACK_S = 30
+
+REDACTED = "[redacted]"
+
+
+class HostUnavailable(RuntimeError):
+    """The host could not be reached: not something the command did."""
+
+
+class HostKeyChanged(HostUnavailable):
+    """The host answered with a different key than the one pinned: rebuilt,
+    or not the host it claims to be. Only the operator may trust the new
+    key (M4.1)."""
+
+
+@dataclass(frozen=True)
+class Result:
+    exit_code: int
+    stdout: str
+    stderr: str
+    timed_out: bool = False
+
+    @property
+    def ok(self) -> bool:
+        return self.exit_code == 0 and not self.timed_out
+
+
+def redact(text: str, values: Iterable[str]) -> str:
+    """Mask every non-trivial secret value in ``text``. Longest first, so a
+    value containing another is masked whole."""
+    for value in sorted((v for v in values if len(v) >= 4), key=len, reverse=True):
+        text = text.replace(value, REDACTED)
+    return text
+
+
+def _heredoc(body: str) -> tuple[str, str]:
+    """A here-document redirection whose delimiter can't occur in ``body``."""
+    while True:
+        tag = f"NISSE_EOF_{_random.token_hex(8)}"
+        if tag not in body:
+            return f"<<'{tag}'", f"\n{body}\n{tag}"
+
+
+def _script(
+    command: str,
+    cwd: str | None,
+    secrets: Mapping[str, str],
+    stdin: str | None,
+    timeout_s: int,
+) -> str:
+    lines = [f"export {name}={shlex.quote(value)}" for name, value in secrets.items()]
+    if cwd is not None:
+        lines.append(f"cd -- {shlex.quote(cwd)} || exit 125")
+    redirect, body = ("< /dev/null", "") if stdin is None else _heredoc(stdin)
+    # `timeout` runs the command in its own process group and signals the
+    # whole group, so a backgrounded grandchild doesn't outlive it.
+    lines.append(
+        f"timeout --kill-after={_KILL_GRACE_S} {timeout_s} "
+        f"bash -c {shlex.quote(command)} {redirect}{body}"
+    )
+    lines.append("rc=$?; [ $rc -eq 255 ] && rc=254; exit $rc")
+    return "\n".join(lines) + "\n"
+
+
+class SSHHost:
+    """One tool VM, reached as ``user@address`` with a private key."""
+
+    def __init__(
+        self,
+        address: str,
+        *,
+        key: Path,
+        state_dir: Path,
+        user: str = "root",
+        port: int = 22,
+    ) -> None:
+        self.address = address
+        self.user = user
+        self.port = port
+        self._key = Path(key)
+        state_dir = Path(state_dir)
+        state_dir.mkdir(parents=True, exist_ok=True)
+        self._known_hosts = state_dir / "known_hosts"
+        # A Unix socket's path is limited to about 100 bytes, so the shared
+        # connection's socket lives in a short private directory rather than
+        # beside the state, named by %C, ssh's hash of the connection.
+        sockets = Path(tempfile.gettempdir()) / f"nisse-ssh-{os.getuid()}"
+        sockets.mkdir(mode=0o700, exist_ok=True)
+        self._control = sockets / "%C"
+
+    def describe(self) -> str:
+        return f"{self.user}@{self.address}"
+
+    def _ssh(self) -> list[str]:
+        return [
+            "ssh",
+            "-i",
+            str(self._key),
+            "-p",
+            str(self.port),
+            "-o",
+            "BatchMode=yes",
+            "-o",
+            "IdentitiesOnly=yes",
+            "-o",
+            f"UserKnownHostsFile={self._known_hosts}",
+            "-o",
+            "StrictHostKeyChecking=accept-new",
+            "-o",
+            "ControlMaster=auto",
+            "-o",
+            f"ControlPath={self._control}",
+            "-o",
+            "ControlPersist=120",
+            "-o",
+            "ConnectTimeout=15",
+            "-o",
+            "ServerAliveInterval=15",
+            "-o",
+            "LogLevel=ERROR",
+            f"{self.user}@{self.address}",
+            "bash -s",
+        ]
+
+    def execute(
+        self,
+        command: str,
+        *,
+        cwd: str | None = None,
+        secrets: Mapping[str, str] | None = None,
+        stdin: str | None = None,
+        timeout_s: int = 120,
+    ) -> Result:
+        """Run ``command`` with bash in ``cwd``. ``secrets`` become environment
+        variables of this one command and are redacted from its output.
+        Raises HostUnavailable when the host can't be reached."""
+        handed_out = dict(secrets or {})
+        script = _script(command, cwd, handed_out, stdin, timeout_s)
+        try:
+            completed = subprocess.run(
+                self._ssh(),
+                input=script.encode(),
+                capture_output=True,
+                timeout=timeout_s + _KILL_GRACE_S + _LOCAL_SLACK_S,
+                check=False,
+            )
+        except subprocess.TimeoutExpired as exc:
+            raise HostUnavailable(
+                f"{self.describe()} stopped responding during a command"
+            ) from exc
+        except OSError as exc:
+            raise HostUnavailable(f"could not run ssh: {exc}") from exc
+        stdout = completed.stdout.decode(errors="replace")
+        stderr = completed.stderr.decode(errors="replace")
+        if completed.returncode == SSH_FAILED and (
+            "IDENTIFICATION HAS CHANGED" in stderr
+            or "Host key verification failed" in stderr
+        ):
+            raise HostKeyChanged(
+                f"{self.describe()}'s host key changed since it was pinned"
+            )
+        if completed.returncode == SSH_FAILED:
+            raise HostUnavailable(
+                f"could not reach {self.describe()}: "
+                + redact(stderr.strip() or "ssh failed", handed_out.values())
+            )
+        values = handed_out.values()
+        return Result(
+            exit_code=completed.returncode,
+            stdout=redact(stdout, values),
+            stderr=redact(stderr, values),
+            timed_out=completed.returncode in (_TIMED_OUT, 137),
+        )
+
+    def forget_host_key(self) -> None:
+        """Drop the pinned key, so the next connection pins the host's new
+        one. Only on the operator's word (M4.1)."""
+        self.close()
+        name = self.address if self.port == 22 else f"[{self.address}]:{self.port}"
+        subprocess.run(
+            ["ssh-keygen", "-R", name, "-f", str(self._known_hosts)],
+            capture_output=True,
+            timeout=10,
+            check=False,
+        )
+
+    def close(self) -> None:
+        """End the shared connection, if one is open."""
+        args = self._ssh()[:-2]  # without the destination and the command
+        subprocess.run(
+            [*args, "-O", "exit", f"{self.user}@{self.address}"],
+            capture_output=True,
+            timeout=10,
+            check=False,
+        )

nisse-core/src/nisse_core/gitea.py

@@ -0,0 +1,399 @@
+"""Gitea client (architecture D4, D5).
+
+Outbound: open PRs and post comments through a dedicated service account with
+a scoped token. Inbound is deliberately *polled* rather than webhook-driven,
+so the agent VM stays outbound-only (D7), and intake is structured JSON —
+never routed through a chat bridge.
+
+``find_pull_request`` is the external-truth query that makes opening a PR
+idempotent across a crash: boot reconciliation (L8) asks Gitea whether the
+effect already happened rather than repeating it.
+"""
+
+import base64
+from dataclasses import dataclass
+from typing import Any
+
+import httpx
+
+from nisse_core.reconcile import Reconciler
+from nisse_core.state import Intent
+
+PR_PAGE_SIZE = 50
+MAX_PR_PAGES = 40  # 2000 PRs; beyond that, say so rather than guess
+
+
+class GiteaError(RuntimeError):
+    pass
+
+
+@dataclass(frozen=True)
+class PullRequest:
+    number: int
+    state: str
+    head: str
+    url: str
+    merged: bool = False
+    head_sha: str = ""  # the commit the PR is at now
+    mergeable: bool | None = None  # None: Gitea didn't say
+
+
+@dataclass(frozen=True)
+class Approval:
+    """An approving review, and the commit it approved (L3: approvals bind
+    to exactly what was approved)."""
+
+    author: str
+    commit: str
+    stale: bool = False  # Gitea's mark: commits were pushed since
+
+
+@dataclass(frozen=True)
+class ReviewNote:
+    """Something a reviewer said in a review: its body, or a comment on a
+    line (#69). ``key`` is unique across both kinds."""
+
+    key: str
+    author: str
+    body: str
+    where: str  # "path:line" for a line comment, "" for a review body
+
+
+@dataclass(frozen=True)
+class Comment:
+    id: int
+    author: str
+    body: str
+    created_at: str
+
+
+@dataclass(frozen=True)
+class Issue:
+    number: int
+    title: str
+    body: str
+    author: str
+    labels: tuple[str, ...]
+
+
+class GiteaClient:
+    def __init__(
+        self,
+        base_url: str,
+        token: str,
+        *,
+        timeout_s: float = 30.0,
+        transport: httpx.BaseTransport | None = None,
+    ) -> None:
+        self._http = httpx.Client(
+            base_url=f"{base_url.rstrip('/')}/api/v1",
+            headers={"Authorization": f"token {token}"},
+            timeout=timeout_s,
+            transport=transport,
+        )
+
+    def _request(self, method: str, path: str, **kwargs: Any) -> Any:
+        try:
+            response = self._http.request(method, path, **kwargs)
+        except httpx.HTTPError as exc:
+            raise GiteaError(f"gitea request failed: {exc}") from exc
+        if response.status_code >= 400:
+            raise GiteaError(
+                f"gitea {method} {path} returned {response.status_code}: "
+                f"{response.text[:300]}"
+            )
+        return response.json() if response.content else None
+
+    def ssh_url(self, repo: str) -> str:
+        """The repository's SSH clone URL, which carries no credential."""
+        return str(self._request("GET", f"/repos/{repo}")["ssh_url"])
+
+    def clone_url(self, repo: str) -> str:
+        """The repository's HTTPS clone URL, which carries no credential."""
+        return str(self._request("GET", f"/repos/{repo}")["clone_url"])
+
+    def whoami(self) -> str:
+        return str(self._request("GET", "/user")["login"])
+
+    def open_pull_request(
+        self, repo: str, *, head: str, base: str, title: str, body: str
+    ) -> PullRequest:
+        data = self._request(
+            "POST",
+            f"/repos/{repo}/pulls",
+            json={"head": head, "base": base, "title": title, "body": body},
+        )
+        return _pull_request(data)
+
+    def pull_request(self, repo: str, index: int) -> PullRequest:
+        return _pull_request(self._request("GET", f"/repos/{repo}/pulls/{index}"))
+
+    def review_notes(self, repo: str, index: int) -> list[ReviewNote]:
+        """Review bodies and inline line comments on a PR (#69): the PR's
+        conversation comments come from list_comments."""
+        notes: list[ReviewNote] = []
+        for review in (
+            self._request("GET", f"/repos/{repo}/pulls/{index}/reviews") or []
+        ):
+            author = (review.get("user") or {}).get("login", "")
+            body = str(review.get("body") or "").strip()
+            if body:
+                notes.append(ReviewNote(f"review-{review['id']}", author, body, ""))
+            if not review.get("comments_count"):
+                continue
+            for comment in (
+                self._request(
+                    "GET",
+                    f"/repos/{repo}/pulls/{index}/reviews/{review['id']}/comments",
+                )
+                or []
+            ):
+                line = comment.get("line") or comment.get("position") or ""
+                notes.append(
+                    ReviewNote(
+                        key=f"line-{comment['id']}",
+                        author=(comment.get("user") or {}).get("login", author),
+                        body=str(comment.get("body") or ""),
+                        where=f"{comment.get('path', '')}:{line}",
+                    )
+                )
+        return notes
+
+    def find_pull_request(self, repo: str, head: str) -> PullRequest | None:
+        """External truth for L8: did the PR for this branch already get
+        opened? Includes closed PRs — a crash after opening must not be
+        answered with "no PR is open, so open another".
+
+        Pages to the end rather than sampling the first page: a "not found"
+        that only means "not in the newest 50" would licence a duplicate PR.
+        If the history is longer than this walk, raise instead of guessing —
+        the reconciler turns that into "unverifiable" and gates to the human.
+        """
+        for page in range(1, MAX_PR_PAGES + 1):
+            data = self._request(
+                "GET",
+                f"/repos/{repo}/pulls",
+                params={"state": "all", "limit": PR_PAGE_SIZE, "page": page},
+            )
+            items = data or []
+            for item in items:
+                if (item.get("head") or {}).get("ref") == head:
+                    return _pull_request(item)
+            if len(items) < PR_PAGE_SIZE:
+                return None  # reached the end: definitively absent
+        raise GiteaError(
+            f"searched {MAX_PR_PAGES * PR_PAGE_SIZE} pull requests in {repo} "
+            f"without reaching the end; cannot confirm whether {head!r} was "
+            "already opened"
+        )
+
+    def list_comments(
+        self, repo: str, index: int, since: str | None = None
+    ) -> list[Comment]:
+        params: dict[str, str] = {}
+        if since is not None:
+            params["since"] = since
+        data = self._request(
+            "GET", f"/repos/{repo}/issues/{index}/comments", params=params
+        )
+        return [
+            Comment(
+                id=item["id"],
+                author=(item.get("user") or {}).get("login", ""),
+                body=item.get("body", ""),
+                created_at=item.get("created_at", ""),
+            )
+            for item in data or []
+        ]
+
+    def post_comment(self, repo: str, index: int, body: str) -> Comment:
+        data = self._request(
+            "POST", f"/repos/{repo}/issues/{index}/comments", json={"body": body}
+        )
+        return Comment(
+            id=data["id"],
+            author=(data.get("user") or {}).get("login", ""),
+            body=data.get("body", ""),
+            created_at=data.get("created_at", ""),
+        )
+
+    def create_issue(self, repo: str, title: str, body: str) -> int:
+        data = self._request(
+            "POST", f"/repos/{repo}/issues", json={"title": title, "body": body}
+        )
+        return int(data["number"])
+
+    def close_pull_request(self, repo: str, index: int) -> None:
+        self._request("PATCH", f"/repos/{repo}/pulls/{index}", json={"state": "closed"})
+
+    def assigned_issues(self, repo: str, assignee: str) -> list[Issue]:
+        """Open issues (not PRs) assigned to ``assignee``: intake (D1)."""
+        data = self._request(
+            "GET",
+            f"/repos/{repo}/issues",
+            params={
+                "type": "issues",
+                "state": "open",
+                "assigned_by": assignee,
+                "limit": 50,
+            },
+        )
+        return [
+            Issue(
+                number=int(item["number"]),
+                title=str(item.get("title") or ""),
+                body=str(item.get("body") or ""),
+                author=str(item["user"]["login"]),
+                labels=tuple(str(label["name"]) for label in item.get("labels") or []),
+            )
+            for item in data or []
+            if not item.get("pull_request")
+        ]
+
+    def open_dependencies(self, repo: str, index: int) -> list[str]:
+        """The issues this one depends on that are still open, as
+        "owner/repo#N": what blocks it (L1)."""
+        data = self._request("GET", f"/repos/{repo}/issues/{index}/dependencies")
+        return [
+            f"{(item.get('repository') or {}).get('full_name', repo)}#{item['number']}"
+            for item in data or []
+            if item.get("state") == "open"
+        ]
+
+    def assigned_by(self, repo: str, index: int, assignee: str) -> str | None:
+        """Who last assigned the issue to ``assignee``, from its timeline;
+        None if the timeline doesn't say."""
+        events = self._request("GET", f"/repos/{repo}/issues/{index}/timeline") or []
+        who = None
+        for event in events:
+            if (
+                event.get("type") == "assignees"
+                and not event.get("removed_assignee")
+                and (event.get("assignee") or {}).get("login") == assignee
+            ):
+                who = (event.get("user") or {}).get("login")
+        return who
+
+    def assigned_at(self, repo: str, index: int, assignee: str) -> str | None:
+        """When the issue was last assigned to ``assignee`` (ISO 8601), from
+        its timeline, oldest first and paged to the end; None if the
+        timeline doesn't say."""
+        when = None
+        for page in range(1, MAX_PR_PAGES + 1):
+            events = (
+                self._request(
+                    "GET",
+                    f"/repos/{repo}/issues/{index}/timeline",
+                    params={"limit": PR_PAGE_SIZE, "page": page},
+                )
+                or []
+            )
+            for event in events:
+                if (
+                    event.get("type") == "assignees"
+                    and not event.get("removed_assignee")
+                    and (event.get("assignee") or {}).get("login") == assignee
+                ):
+                    when = event.get("created_at")
+            if len(events) < PR_PAGE_SIZE:
+                break
+        return when
+
+    def approvals(self, repo: str, index: int) -> list[Approval]:
+        """The PR's approving reviews that still stand: not dismissed."""
+        return [
+            Approval(
+                author=(review.get("user") or {}).get("login", ""),
+                commit=str(review.get("commit_id") or ""),
+                stale=bool(review.get("stale")),
+            )
+            for review in (
+                self._request("GET", f"/repos/{repo}/pulls/{index}/reviews") or []
+            )
+            if review.get("state") == "APPROVED" and not review.get("dismissed")
+        ]
+
+    def checks(self, repo: str, sha: str) -> str:
+        """A commit's combined check status: success, pending, failure or
+        error; "none" when no check reported on it at all."""
+        data = self._request("GET", f"/repos/{repo}/commits/{sha}/status") or {}
+        if not data.get("total_count") and not data.get("statuses"):
+            return "none"
+        return str(data.get("state") or "pending")
+
+    def branch_with_file(
+        self, repo: str, *, base: str, branch: str, path: str, text: str, message: str
+    ) -> None:
+        """A new branch off ``base`` with one file added, made through the
+        API: no clone, no workspace."""
+        self._request(
+            "POST",
+            f"/repos/{repo}/contents/{path}",
+            json={
+                "content": base64.b64encode(text.encode()).decode(),
+                "message": message,
+                "branch": base,
+                "new_branch": branch,
+            },
+        )
+
+    def delete_branch(self, repo: str, name: str) -> None:
+        self._request("DELETE", f"/repos/{repo}/branches/{name}")
+
+    def repository(self, repo: str) -> dict[str, Any]:
+        """The repository as this account sees it, permissions included."""
+        return dict(self._request("GET", f"/repos/{repo}"))
+
+    def branch(self, repo: str, name: str) -> dict[str, Any]:
+        """A branch as this account sees it: protected, user_can_push."""
+        return dict(self._request("GET", f"/repos/{repo}/branches/{name}"))
+
+    def merge_pull_request(self, repo: str, index: int) -> None:
+        self._request(
+            "POST", f"/repos/{repo}/pulls/{index}/merge", json={"Do": "merge"}
+        )
+
+    def assign_issue(self, repo: str, index: int, assignee: str) -> None:
+        self._request(
+            "PATCH", f"/repos/{repo}/issues/{index}", json={"assignees": [assignee]}
+        )
+
+    def close_issue(self, repo: str, index: int) -> None:
+        self._request(
+            "PATCH", f"/repos/{repo}/issues/{index}", json={"state": "closed"}
+        )
+
+    def close(self) -> None:
+        self._http.close()
+
+
+def _pull_request(data: dict[str, Any]) -> PullRequest:
+    return PullRequest(
+        number=data["number"],
+        state=data.get("state", ""),
+        head=(data.get("head") or {}).get("ref", ""),
+        url=data.get("html_url", ""),
+        merged=bool(data.get("merged")),
+        head_sha=(data.get("head") or {}).get("sha", ""),
+        mergeable=data.get("mergeable"),
+    )
+
+
+def pull_request_reconciler(client: GiteaClient, repo: str) -> Reconciler:
+    """Reconciler for an ``open_pr`` intent (L8 boot step 2).
+
+    An unreachable Gitea yields None — unverifiable, so the agent gates to
+    the human rather than risking a duplicate PR. That is the conservative
+    direction: a delayed decision costs nothing, a repeated side effect does.
+    """
+
+    def check(intent: Intent) -> bool | None:
+        branch = intent.payload.get("branch")
+        if not branch:
+            return None
+        try:
+            return client.find_pull_request(repo, branch) is not None
+        except GiteaError:
+            return None
+
+    return check

nisse-core/src/nisse_core/llm.py

@@ -0,0 +1,441 @@
+"""LLM access (architecture L9).
+
+One client interface, present from the first real LLM call. All traffic goes
+to the LiteLLM proxy — the VM's single LLM destination; the agent holds one
+LiteLLM token and no vendor credentials. The base URL and token come from the
+agent's config (nisse_dev.config), nothing hardcoded.
+
+Model identity is expressed as roles (L9), resolved to concrete model strings
+from config; the resolved mapping is pinned at task start so a mid-task
+config change cannot split a task across two planners.
+"""
+
+import json
+import time
+from dataclasses import dataclass
+from typing import Any, ClassVar, Protocol
+
+import httpx
+
+from nisse_core.canonical import (
+    AssistantText,
+    CanonicalEvent,
+    StoredEvent,
+    ToolCall,
+    mint_call_id,
+)
+from nisse_core.render import OpenAIChatRenderer
+from nisse_core.render_anthropic import AnthropicMessagesRenderer
+
+
+class LLMError(RuntimeError):
+    pass
+
+
+# A rate limit is a transient condition, not a bad request. Losing a
+# ten-turn delegation to one wastes far more tokens than waiting out the
+# window, so retry once before surfacing it (L9's caps still bound the
+# total).
+RATE_LIMIT_STATUS = 429
+RATE_LIMIT_RETRY_S = 20.0
+
+# The proxy, or what's behind it, briefly gone: a 502/503/504 or a dropped
+# connection. Outages delay, never fail (L5): waited out with backoff before
+# the work is stopped. Not a 500 (it may be the request) and not a timeout
+# (a hung model has had its request_timeout_s already).
+OUTAGE_STATUSES = frozenset({502, 503, 504})
+OUTAGE_BACKOFF_S = (5.0, 15.0, 45.0)
+
+# Generous by default. Output is billed by what is produced, not by the
+# ceiling, and a ceiling too low does not fail loudly — it truncates a tool
+# call mid-argument and hands back something that parses. Measured: Opus
+# writing an architecture plan routinely spends 3,000-4,000 output tokens and
+# was observed at 4,064 against a 4,096 limit.
+DEFAULT_MAX_OUTPUT_TOKENS = 16384
+
+# How long one request may take before it is abandoned (llm.request_timeout_s).
+# A safety net for a hung connection, not a budget: a dense local model
+# writing a whole module in one turn was measured taking over 120 s, and
+# timing it out failed work that was going well.
+DEFAULT_REQUEST_TIMEOUT_S = 600.0
+
+
+class UpstreamUnavailable(LLMError):
+    """The proxy or provider could not be reached, or refused for reasons
+    unrelated to what was asked: a network blip, a timeout, a 5xx, a rate
+    limit that did not clear, an exhausted budget.
+
+    Worth distinguishing because the *work* is not at fault. A delegation
+    stopped by one of these has a branch that may be perfectly good, so it is
+    preserved and resumed rather than discarded — unlike a delegate that made
+    a mess, which is cleaned up.
+    """
+
+
+class BudgetExhausted(UpstreamUnavailable):
+    """The proxy refused because a spend limit is gone.
+
+    Distinct from the rest of its family because it will not clear on its
+    own within the hour: an exhausted daily budget takes external models away
+    until it resets, so retrying wastes time and the operator needs telling.
+    L9 keeps the budget itself at the proxy; recognising its refusal is ours.
+    """
+
+
+def _looks_like_budget_refusal(text: str) -> bool:
+    # Pattern-matched rather than contracted: LiteLLM's wording is not a
+    # documented interface, so this errs toward missing one rather than
+    # misreporting an unrelated failure as a budget problem.
+    lowered = text.lower()
+    return "budget" in lowered and (
+        "exceed" in lowered or "exhaust" in lowered or "limit" in lowered
+    )
+
+
+class TruncatedResponse(LLMError):
+    """The model was cut off mid-answer.
+
+    Raised rather than returned, because the damage is silent: a truncated
+    tool call arrives with required arguments simply absent, and a truncated
+    write_file would write half a file and report success. A cut-off turn is
+    a failed turn, and every caller already retries or gates on LLMError.
+    """
+
+
+class LLMClient(Protocol):
+    def complete(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+    ) -> list[CanonicalEvent]: ...
+
+
+@dataclass(frozen=True)
+class RoleMap:
+    driver: str  # drives the loop (L2)
+    helper: str  # delegations (L9)
+    expert: str  # ask_expert (L9)
+    classifier: str = ""  # reads go-aheads now, actions later (L4); unset, expert's
+
+    ROLES: ClassVar[tuple[str, ...]] = ("driver", "helper", "expert", "classifier")
+    _FALLBACK: ClassVar[dict[str, str]] = {"classifier": "expert"}
+
+    def resolve(self, role: str) -> str:
+        if role not in self.ROLES:
+            raise LLMError(f"unknown role: {role!r}")
+        model = str(getattr(self, role))
+        if not model and role in self._FALLBACK:
+            return self.resolve(self._FALLBACK[role])
+        return model
+
+    def pinned(self) -> dict[str, str]:
+        """The full resolved mapping, to record at task start (L9)."""
+        return {role: self.resolve(role) for role in self.ROLES}
+
+    @classmethod
+    def from_pinned(cls, pinned: dict[str, str], default: "RoleMap") -> "RoleMap":
+        """A work item's pinned mapping; a role it predates comes from
+        ``default``."""
+        return cls(**{r: pinned.get(r) or default.resolve(r) for r in cls.ROLES})
+
+
+class LiteLLMClient:
+    def __init__(
+        self,
+        base_url: str,
+        token: str,
+        *,
+        timeout_s: float = DEFAULT_REQUEST_TIMEOUT_S,
+        transport: httpx.BaseTransport | None = None,
+        sleep: Any = time.sleep,
+        max_tokens: int | None = None,
+    ) -> None:
+        self._http = httpx.Client(
+            base_url=base_url.rstrip("/"),
+            headers={"Authorization": f"Bearer {token}"},
+            timeout=timeout_s,
+            transport=transport,
+        )
+        self._renderer = OpenAIChatRenderer()
+        self._sleep = sleep
+        self._max_tokens = max_tokens or DEFAULT_MAX_OUTPUT_TOKENS
+        # Set after each call so a caller can meter itself (L9 caps);
+        # a side channel rather than a return value, so the LLMClient
+        # protocol stays the same for every implementation.
+        self.last_usage: dict[str, int] = {}
+        self.last_model: str | None = None
+        self.last_cost: float = 0.0
+        # Set even when the call then fails: time spent waiting out a rate
+        # limit is the proxy's, not the model's (the benchmark subtracts it).
+        self.last_rate_limit_wait_s: float = 0.0
+
+    def complete(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+        *,
+        max_tokens: int | None = None,
+        require_tool_call: bool = False,
+    ) -> list[CanonicalEvent]:
+        body = self._renderer.render(events, tools, model, system=system)
+        if require_tool_call and tools:
+            # Only for models whose server enforces it; see BudgetedClient.
+            body["tool_choice"] = "required"
+        # A ceiling on this route too: without one a runaway turn is bounded
+        # only by the provider's default, and the same truncation check has
+        # nothing to check against. A caller that knows the model's limits
+        # (the context budget) passes a tighter one.
+        body["max_tokens"] = max_tokens or self._max_tokens
+        self.last_rate_limit_wait_s = 0.0  # not the last call's, if this one raises
+        response, self.last_rate_limit_wait_s = _post_with_rate_limit_retry(
+            self._http, "/chat/completions", body, self._sleep
+        )
+        if response.status_code != 200:
+            _raise_for_upstream(response)
+            raise LLMError(
+                f"LLM request returned {response.status_code}: {response.text[:500]}"
+            )
+        # LiteLLM prices every call; kept so a caller can meter spending.
+        self.last_cost = _response_cost(response)
+        return self._parse(response.json(), requested_model=model)
+
+    def _parse(
+        self, data: dict[str, Any], requested_model: str
+    ) -> list[CanonicalEvent]:
+        try:
+            choice = data["choices"][0]
+            message = choice["message"]
+        except (KeyError, IndexError) as exc:
+            raise LLMError(f"malformed completion response: {exc}") from exc
+        if choice.get("finish_reason") == "length":
+            raise TruncatedResponse(
+                f"{requested_model} hit its output limit mid-answer; raise "
+                "llm.max_output_tokens, or the model's max_output_tokens in LiteLLM"
+            )
+        produced_by = data.get("model") or requested_model
+        # What actually answered, which is not always what was asked for: a
+        # proxy fallback answers under another model's name.
+        self.last_model = produced_by
+        usage = data.get("usage") or {}
+        self.last_usage = {
+            "input": int(usage.get("prompt_tokens") or 0),
+            "output": int(usage.get("completion_tokens") or 0),
+        }
+        out: list[CanonicalEvent] = []
+        if message.get("content"):
+            out.append(AssistantText(text=message["content"], model=produced_by))
+        # Provider tool-call IDs are mapped at the boundary (L7): each call
+        # gets a locally-minted canonical ID; the provider's is dropped, since
+        # every future request is rendered wholly from the canonical log.
+        for call in message.get("tool_calls") or []:
+            raw = call["function"]["arguments"] or "{}"
+            # Weak models emit truncated or non-JSON argument strings; that is
+            # a bad model turn, not a client crash (L9).
+            try:
+                arguments = json.loads(raw)
+            except json.JSONDecodeError as exc:
+                raise LLMError(
+                    f"tool call {call['function']['name']!r} had non-JSON "
+                    f"arguments: {raw[:200]!r}"
+                ) from exc
+            if not isinstance(arguments, dict):
+                raise LLMError(
+                    f"tool call {call['function']['name']!r} arguments were "
+                    f"{type(arguments).__name__}, expected object"
+                )
+            out.append(
+                ToolCall(
+                    call_id=mint_call_id(),
+                    tool=call["function"]["name"],
+                    arguments=arguments,
+                )
+            )
+        return out
+
+    def close(self) -> None:
+        self._http.close()
+
+
+class AnthropicPassthroughClient:
+    """LiteLLM's Anthropic passthrough (L9). Same interface as LiteLLMClient,
+    so a caller chooses a route rather than a different kind of client.
+
+    Delegations take this path because fidelity matters there (L9);
+    ask_expert and fallbacks use the normalized route, where it does not.
+    """
+
+    def __init__(
+        self,
+        base_url: str,
+        token: str,
+        *,
+        timeout_s: float = DEFAULT_REQUEST_TIMEOUT_S,
+        max_tokens: int | None = None,
+        transport: httpx.BaseTransport | None = None,
+        sleep: Any = time.sleep,
+    ) -> None:
+        self._http = httpx.Client(
+            base_url=base_url.rstrip("/"),
+            headers={
+                "Authorization": f"Bearer {token}",
+                "x-api-key": token,
+                "anthropic-version": "2023-06-01",
+            },
+            timeout=timeout_s,
+            transport=transport,
+        )
+        self._renderer = AnthropicMessagesRenderer()
+        self._max_tokens = max_tokens or DEFAULT_MAX_OUTPUT_TOKENS
+        self._sleep = sleep
+        self.last_usage: dict[str, int] = {}
+        self.last_model: str | None = None
+        self.last_cost: float = 0.0
+        # Set even when the call then fails: time spent waiting out a rate
+        # limit is the proxy's, not the model's (the benchmark subtracts it).
+        self.last_rate_limit_wait_s: float = 0.0
+
+    def complete(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+        *,
+        max_tokens: int | None = None,
+        require_tool_call: bool = False,
+    ) -> list[CanonicalEvent]:
+        body = self._renderer.render(
+            events,
+            tools,
+            model,
+            system=system,
+            max_tokens=max_tokens or self._max_tokens,
+        )
+        if require_tool_call and tools:
+            body["tool_choice"] = {"type": "any"}  # Anthropic's name for it
+        self.last_rate_limit_wait_s = 0.0  # not the last call's, if this one raises
+        response, self.last_rate_limit_wait_s = _post_with_rate_limit_retry(
+            self._http, "/v1/messages", body, self._sleep
+        )
+        if response.status_code != 200:
+            _raise_for_upstream(response)
+            raise LLMError(
+                f"passthrough returned {response.status_code}: {response.text[:500]}"
+            )
+        # LiteLLM prices every call; kept so a caller can meter spending.
+        self.last_cost = _response_cost(response)
+        return self._parse(response.json(), requested_model=model)
+
+    def _parse(
+        self, data: dict[str, Any], requested_model: str
+    ) -> list[CanonicalEvent]:
+        if data.get("stop_reason") == "max_tokens":
+            raise TruncatedResponse(
+                f"{requested_model} hit its output limit mid-answer; raise "
+                "llm.max_output_tokens, or the model's max_output_tokens in LiteLLM"
+            )
+        content = data.get("content")
+        if not isinstance(content, list):
+            raise LLMError(f"malformed passthrough response: {str(data)[:300]}")
+        produced_by = data.get("model") or requested_model
+        # What actually answered, which is not always what was asked for: a
+        # proxy fallback answers under another model's name.
+        self.last_model = produced_by
+        usage = data.get("usage") or {}
+        self.last_usage = {
+            "input": int(usage.get("input_tokens") or 0),
+            "output": int(usage.get("output_tokens") or 0),
+        }
+        out: list[CanonicalEvent] = []
+        for block in content:
+            kind = block.get("type")
+            if kind == "text" and block.get("text"):
+                out.append(AssistantText(text=block["text"], model=produced_by))
+            elif kind == "tool_use":
+                # Provider ids are mapped at the boundary and never used as a
+                # join key (L7); the canonical log owns identity.
+                out.append(
+                    ToolCall(
+                        call_id=mint_call_id(),
+                        tool=block["name"],
+                        arguments=block.get("input") or {},
+                    )
+                )
+            # Vendor-opaque reasoning blocks (thinking, redacted_thinking) are
+            # deliberately dropped for now: L7 requires storing them tagged
+            # with the producing model and never replaying them outside the
+            # session that made them, and the canonical schema has no event
+            # for that yet. Nothing requests extended thinking, so none arrive.
+        return out
+
+    def close(self) -> None:
+        self._http.close()
+
+
+def _post_with_rate_limit_retry(
+    http: httpx.Client, path: str, body: dict[str, Any], sleep: Any
+) -> tuple[httpx.Response, float]:
+    """The response, and how long was spent waiting: out a rate limit (once)
+    or an outage (with backoff), not on the model."""
+    waited = 0.0
+    rate_limited = False
+    outages = iter(OUTAGE_BACKOFF_S)
+    while True:
+        try:
+            response = http.post(path, json=body)
+        except httpx.TimeoutException as exc:
+            raise UpstreamUnavailable(f"LLM request failed: {exc}") from exc
+        except httpx.HTTPError as exc:
+            # Could not reach the proxy at all: nothing about the request was
+            # wrong, so callers holding work in progress should keep it.
+            pause = next(outages, None)
+            if pause is None:
+                raise UpstreamUnavailable(f"LLM request failed: {exc}") from exc
+            sleep(pause)
+            waited += pause
+            continue
+        if response.status_code == RATE_LIMIT_STATUS and not rate_limited:
+            rate_limited = True
+            sleep(RATE_LIMIT_RETRY_S)
+            waited += RATE_LIMIT_RETRY_S
+            continue
+        if response.status_code in OUTAGE_STATUSES and not _looks_like_budget_refusal(
+            response.text
+        ):
+            pause = next(outages, None)
+            if pause is not None:
+                sleep(pause)
+                waited += pause
+                continue
+        return response, waited
+
+
+# Model families we have a native renderer adapter for. L9: delegations take
+# the vendor's passthrough route because a normalising middlebox is lossy
+# exactly where a long-running delegation lives.
+def _response_cost(response: httpx.Response) -> float:
+    try:
+        return float(response.headers.get("x-litellm-response-cost") or 0.0)
+    except ValueError:
+        return 0.0
+
+
+def _raise_for_upstream(response: httpx.Response) -> None:
+    """Classify a non-200 as upstream trouble where it plainly is.
+
+    A 4xx that is not a rate limit means the request itself was wrong, and
+    preserving work on the strength of one would hide a real bug — so the
+    benefit of the doubt stops at the server's own door.
+    """
+    if _looks_like_budget_refusal(response.text):
+        raise BudgetExhausted(
+            f"the proxy refused on budget grounds: {response.text[:300]}"
+        )
+    if response.status_code >= 500 or response.status_code == RATE_LIMIT_STATUS:
+        raise UpstreamUnavailable(
+            f"upstream returned {response.status_code}: {response.text[:300]}"
+        )

nisse-core/src/nisse_core/matrix.py

@@ -0,0 +1,291 @@
+"""MatrixTransport (architecture L5): Matrix as strictly a UI channel.
+
+Implements the Transport interface directly over the Matrix client-server HTTP
+API (token auth, /sync long-poll, /send) with the httpx client already in the
+dependency tree — no Matrix SDK. The surface used is four endpoints; an SDK
+earns its keep when E2E arrives, and bot rooms are created unencrypted until
+then, so encrypted rooms are not supported here.
+
+Inbound handling follows L5's intake posture: on homeserver errors the sync
+loop backs off (capped) and retries indefinitely — an outage delays reactions
+but never fails anything.
+
+Threads (L5): each work item's conversation is a Matrix thread. A message in a
+thread carries its root's event ID; a plain reply from a client without
+thread support is routed to the thread of the message it replies to, when
+that is known. The quoted lines such replies carry are not part of the text.
+"""
+
+import html
+import re
+import threading
+import uuid
+from collections import OrderedDict
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from urllib.parse import unquote
+
+import httpx
+
+from nisse_core.transport import InboundMessage
+
+# A mention pill at the start of an HTML body: the link holds the user ID,
+# the link text is what the plain body starts with.
+_LEADING_PILL = re.compile(
+    r'\s*<a href="https://matrix\.to/#/([^"?]+)[^"]*">(.*?)</a>', re.DOTALL
+)
+# A user ID typed at the start of a plain body, e.g. "@alice:example: ...".
+_LEADING_USER_ID = re.compile(r"\s*(@[^\s:]+:[^\s:]+)")
+# How many event-to-thread mappings to remember, for routing plain replies.
+_REMEMBERED_EVENTS = 2000
+
+
+class TransportError(RuntimeError):
+    pass
+
+
+@dataclass(frozen=True)
+class MatrixConfig:
+    homeserver: str
+    user_id: str
+    token: str = field(repr=False)  # never in a repr or a log line
+    room_id: str
+
+
+class MatrixTransport:
+    def __init__(
+        self,
+        config: MatrixConfig,
+        *,
+        poll_timeout_ms: int = 30000,
+        http_transport: httpx.BaseTransport | None = None,
+    ) -> None:
+        self._config = config
+        self._poll_timeout_ms = poll_timeout_ms
+        self._http = httpx.Client(
+            base_url=f"{config.homeserver}/_matrix/client/v3",
+            headers={"Authorization": f"Bearer {config.token}"},
+            timeout=(poll_timeout_ms / 1000) + 30,
+            transport=http_transport,
+        )
+        self._callback: Callable[[InboundMessage], None] | None = None
+        # The agent's display name in the room, learnt from its own member
+        # event; clients write it in front of messages addressed to it.
+        self._display_name: str | None = None
+        self._stop = threading.Event()
+        self._thread: threading.Thread | None = None
+        # event ID -> the root of the thread it is in (a root maps to
+        # itself), for routing replies from clients without thread support.
+        self._threads: OrderedDict[str, str] = OrderedDict()
+        self._threads_lock = threading.Lock()
+
+    def _remember(self, event_id: str, root: str) -> None:
+        with self._threads_lock:
+            self._threads[event_id] = root
+            self._threads.move_to_end(event_id)
+            while len(self._threads) > _REMEMBERED_EVENTS:
+                self._threads.popitem(last=False)
+
+    def _thread_of(self, event_id: str) -> str | None:
+        with self._threads_lock:
+            return self._threads.get(event_id)
+
+    # -- outbound ---------------------------------------------------------
+
+    def post(self, text: str, *, thread: str | None = None) -> str:
+        content: dict = {"msgtype": "m.text", "body": text}
+        if thread is not None:
+            content["m.relates_to"] = {
+                "rel_type": "m.thread",
+                "event_id": thread,
+                # For clients without threads: show it as a reply to the root.
+                "is_falling_back": True,
+                "m.in_reply_to": {"event_id": thread},
+            }
+        event_id = self._send(content)
+        # A top-level post may root a thread; one in a thread belongs to it.
+        self._remember(event_id, thread or event_id)
+        return event_id
+
+    def send_message(self, text: str) -> None:
+        self.post(text)
+
+    def send_approval_request(self, text: str) -> None:
+        self.post(text)
+
+    def ask_question(self, text: str) -> None:
+        self.post(text)
+
+    def _send(self, content: dict) -> str:
+        room = self._config.room_id
+        txn = uuid.uuid4().hex
+        try:
+            response = self._http.put(
+                f"/rooms/{room}/send/m.room.message/{txn}", json=content
+            )
+        except httpx.HTTPError as exc:
+            raise TransportError(f"matrix send failed: {exc}") from exc
+        if response.status_code != 200:
+            raise TransportError(
+                f"matrix send returned {response.status_code}: {response.text[:300]}"
+            )
+        return str(response.json().get("event_id", ""))
+
+    # -- inbound ----------------------------------------------------------
+
+    def on_message(self, callback: Callable[[InboundMessage], None]) -> None:
+        self._callback = callback
+
+    def start(self) -> None:
+        """Begin delivering new room messages to the registered callback.
+        History from before start() is never delivered (Matrix room history
+        must not become load-bearing context, L5)."""
+        if self._callback is None:
+            raise TransportError("no message handler registered; call on_message first")
+        self._stop.clear()
+        self._thread = threading.Thread(target=self._sync_loop, daemon=True)
+        self._thread.start()
+
+    def stop(self) -> None:
+        self._stop.set()
+        if self._thread is not None:
+            self._thread.join(timeout=(self._poll_timeout_ms / 1000) + 5)
+            self._thread = None
+
+    def _sync_loop(self) -> None:
+        since: str | None = None
+        backoff = 1.0
+        while not self._stop.is_set():
+            params: dict[str, str] = {}
+            if since is None:
+                params["timeout"] = "0"  # first sync: learn position, skip backlog
+            else:
+                params["timeout"] = str(self._poll_timeout_ms)
+                params["since"] = since
+            try:
+                response = self._http.get("/sync", params=params)
+                response.raise_for_status()
+            except httpx.HTTPError:
+                self._stop.wait(backoff)
+                backoff = min(backoff * 2, 60.0)
+                continue
+            backoff = 1.0
+            data = response.json()
+            self._learn_display_name(data)
+            if since is not None:
+                self._deliver(data)
+            since = data.get("next_batch", since)
+
+    def _room(self, sync_data: dict) -> dict:
+        return sync_data.get("rooms", {}).get("join", {}).get(self._config.room_id, {})
+
+    def _learn_display_name(self, sync_data: dict) -> None:
+        room = self._room(sync_data)
+        events = room.get("state", {}).get("events", []) + room.get("timeline", {}).get(
+            "events", []
+        )
+        for event in events:
+            if (
+                event.get("type") == "m.room.member"
+                and event.get("state_key") == self._config.user_id
+            ):
+                name = event.get("content", {}).get("displayname")
+                if name:
+                    self._display_name = name
+
+    def _deliver(self, sync_data: dict) -> None:
+        for event in self._room(sync_data).get("timeline", {}).get("events", []):
+            if event.get("type") != "m.room.message":
+                continue
+            sender = event.get("sender", "")
+            content = event.get("content", {})
+            event_id = str(event.get("event_id", ""))
+            thread = self._thread_for(content)
+            if event_id:
+                self._remember(event_id, thread or event_id)
+            if sender == self._config.user_id:
+                continue
+            body = content.get("body")
+            if not body:
+                continue
+            if "m.in_reply_to" in content.get("m.relates_to", {}):
+                # A rich reply quotes what it replies to; the quote isn't
+                # what the sender said.
+                body = _strip_reply_fallback(body)
+                content = {**content, "body": body}
+                if not body:
+                    continue
+            addressee, text = self._addressing(content)
+            if addressee is not None and addressee != self._config.user_id:
+                # Addressed to someone else: in a shared room, "Nisse Ops:
+                # approve" must not reach this agent as rejection feedback.
+                continue
+            assert self._callback is not None
+            self._callback(
+                InboundMessage(
+                    sender=sender,
+                    text=text,
+                    original=body if text != body else None,
+                    event_id=event_id,
+                    thread=thread,
+                )
+            )
+
+    def _thread_for(self, content: dict) -> str | None:
+        """The thread root a message belongs to, or None at top level."""
+        relates = content.get("m.relates_to") or {}
+        if relates.get("rel_type") == "m.thread" and relates.get("event_id"):
+            return str(relates["event_id"])
+        replied = (relates.get("m.in_reply_to") or {}).get("event_id")
+        if replied:
+            # A plain reply: in the thread of whatever it replies to, if known.
+            return self._thread_of(str(replied))
+        return None
+
+    def _addressing(self, content: dict) -> tuple[str | None, str]:
+        """Who a leading mention addresses, and the body without a leading
+        mention of this agent. Only the start of the message counts: a
+        mention later on ("approve, cc @alice") is part of the text. The
+        sender is never read from here; it comes from the event (L3)."""
+        body: str = content["body"]
+        own = self._config.user_id
+        if content.get("format") == "org.matrix.custom.html":
+            pill = _LEADING_PILL.match(content.get("formatted_body", ""))
+            if pill:
+                addressee = unquote(pill.group(1))
+                label = html.unescape(re.sub(r"<[^>]+>", "", pill.group(2)))
+                if addressee == own and label and body.startswith(label):
+                    return own, _after_prefix(body, len(label))
+                return addressee, body
+        if body.startswith(own):
+            return own, _after_prefix(body, len(own))
+        name = self._display_name
+        if name and body.startswith(name) and body[len(name) :].startswith(":"):
+            return own, _after_prefix(body, len(name))
+        typed = _LEADING_USER_ID.match(body)
+        if typed and body[typed.end() :].startswith(":"):
+            return typed.group(1), body
+        return None, body
+
+    def close(self) -> None:
+        self.stop()
+        self._http.close()
+
+
+def _strip_reply_fallback(body: str) -> str:
+    """The body of a rich reply without the quoted lines clients prepend
+    ("> <@alice:example> original text", then a blank line)."""
+    lines = body.split("\n")
+    if not lines or not lines[0].startswith("> "):
+        return body
+    index = 0
+    while index < len(lines) and lines[index].startswith(">"):
+        index += 1
+    if index < len(lines) and not lines[index].strip():
+        index += 1
+    return "\n".join(lines[index:]).strip()
+
+
+def _after_prefix(body: str, length: int) -> str:
+    """The body past a leading mention and the ':' clients put after it."""
+    return body[length:].lstrip().removeprefix(":").strip()

nisse-core/src/nisse_core/memory.py

@@ -0,0 +1,153 @@
+"""Agent memory (architecture L6.4; Development Plan M5.2).
+
+The agent's own notes in its vault folder: one note per fact, written and
+forgotten by the model without asking, and an index the harness keeps. The
+operator reads it in SilverBullet and corrects it through conversation.
+Memory is a cache, never authority: what it says is checked against the live
+system before anything depends on it.
+"""
+
+import hashlib
+import re
+from collections.abc import Mapping
+from dataclasses import dataclass
+
+import yaml
+
+from nisse_core.vault import Vault, VaultError, split_frontmatter
+
+INDEX = "index"  # the note the harness keeps; never the model's
+_NAME = re.compile(r"[a-z0-9][a-z0-9-]{0,63}")
+
+
+@dataclass(frozen=True)
+class Snapshot:
+    """The indexes as read, for the transcript (L6: with their provenance)."""
+
+    paths: tuple[str, ...]
+    text: str
+    sha: str
+
+
+class Memory:
+    """``folder``: the agent's read-write folder in the vault. General
+    notes live there; a project's under ``projects/<project>/`` (L6.3), each
+    folder with an index the harness keeps."""
+
+    def __init__(self, vault: Vault, folder: str) -> None:
+        self._vault = vault
+        self.folder = folder.strip("/")
+
+    def _where(self, project: str | None) -> str:
+        if project is None:
+            return self.folder
+        if not _NAME.fullmatch(project):
+            raise VaultError(f"{project!r}: not a project's name")
+        return f"{self.folder}/projects/{project}"
+
+    def _path(self, name: str, project: str | None) -> str:
+        if not _NAME.fullmatch(name) or name == INDEX:
+            raise VaultError(
+                f"{name!r}: a note's name is lowercase letters, digits and -, "
+                f"up to 64, and not {INDEX}"
+            )
+        return f"{self._where(project)}/{name}.md"
+
+    def remember(
+        self,
+        name: str,
+        description: str,
+        fact: str,
+        provenance: Mapping[str, str],
+        project: str | None = None,
+    ) -> bool:
+        """Write the note, or replace it; True if it existed. ``project``:
+        a note about that project, in its folder; None: a general one."""
+        description = " ".join(description.split())
+        if not description or not fact.strip():
+            raise VaultError("a note needs a one-line description and the fact")
+        path = self._path(name, project)
+        existed = path in self._vault.notes(self.folder)
+        front = yaml.safe_dump({"description": description}, allow_unicode=True)
+        text = f"---\n{front}---\n{fact.strip()}\n"
+        self._vault.write(path, text, provenance=provenance)
+        self._rebuild(project)
+        return existed
+
+    def forget(self, name: str, project: str | None = None) -> None:
+        self._vault.delete(self._path(name, project))
+        self._rebuild(project)
+
+    def _entries(self, where: str) -> list[tuple[str, str]]:
+        """The notes directly in ``where``: their pages and descriptions."""
+        entries = []
+        for path in self._vault.notes(self.folder):
+            page = path.removesuffix(".md")
+            if page.rsplit("/", 1)[0] != where or page.endswith(f"/{INDEX}"):
+                continue
+            try:
+                front, _ = split_frontmatter(self._vault.read(path))
+            except VaultError:
+                front = {}
+            entries.append((page, str(front.get("description", "")).strip()))
+        return entries
+
+    def _projects(self) -> list[str]:
+        prefix = f"{self.folder}/projects/"
+        return sorted(
+            {
+                p.removeprefix(prefix).split("/", 1)[0]
+                for p in self._vault.notes(self.folder)
+                if p.startswith(prefix) and not p.endswith(f"/{INDEX}.md")
+            }
+        )
+
+    def _rebuild(self, project: str | None = None) -> None:
+        """The changed folder's index, and the top one, which links each
+        project's. Links are pages from the vault's root, as SilverBullet
+        names them."""
+        if project is not None:
+            self._write_index(
+                self._where(project), f"# Memory: {project}", self._lines(project)
+            )
+        lines = self._lines(None)
+        projects = self._projects()
+        if projects:
+            lines += ["", "Projects:"] + [
+                f"- [[{self._where(p)}/{INDEX}]] — notes about {p}" for p in projects
+            ]
+        self._write_index(self.folder, "# Memory", lines)
+
+    def _lines(self, project: str | None) -> list[str]:
+        return [
+            f"- [[{page}]] — {about}"
+            for page, about in self._entries(self._where(project))
+        ]
+
+    def _write_index(self, where: str, title: str, lines: list[str]) -> None:
+        body = f"{title}\n\nOne note per fact; kept by the harness.\n\n" + (
+            "\n".join(lines) or "Nothing yet."
+        )
+        self._vault.write(
+            f"{where}/{INDEX}.md",
+            body + "\n",
+            provenance={"source": "the harness, after a change"},
+        )
+
+    def snapshot(self, project: str | None = None) -> Snapshot:
+        """The general index, and ``project``'s when it has notes, for the
+        transcript; the general one is made first if it's missing."""
+        paths = [f"{self.folder}/{INDEX}.md"]
+        if project is not None and project in self._projects():
+            paths.append(f"{self._where(project)}/{INDEX}.md")
+        bodies = []
+        for path in paths:
+            try:
+                text = self._vault.read(path)
+            except VaultError:
+                self._rebuild(None if path == paths[0] else project)
+                text = self._vault.read(path)
+            bodies.append(split_frontmatter(text)[1].strip())
+        joined = "\n\n".join(bodies)
+        sha = hashlib.sha256(joined.encode()).hexdigest()[:12]
+        return Snapshot(tuple(paths), joined, sha)

nisse-core/src/nisse_core/oplog.py

@@ -0,0 +1,33 @@
+"""Structured operational logging (architecture L12).
+
+One JSON object per line to stderr (journald captures it when running as a
+service). Every event carries the fixed envelope: ts, agent, event, task_id,
+cause. Logs are diagnostic, never load-bearing — nothing may read them back
+to derive state.
+"""
+
+import json
+import sys
+from datetime import UTC, datetime
+from typing import Any, TextIO
+
+
+class OpLog:
+    def __init__(self, agent: str, stream: TextIO | None = None) -> None:
+        self.agent = agent
+        # Correlation ID for the enclosing unit of work; the orchestrator sets
+        # it when a unit starts and clears it when the unit ends (L12).
+        self.task_id: str | None = None
+        self._stream = stream if stream is not None else sys.stderr
+
+    def emit(self, event: str, *, cause: str, **fields: Any) -> None:
+        record: dict[str, Any] = {
+            "ts": datetime.now(UTC).isoformat(),
+            "agent": self.agent,
+            "event": event,
+            "task_id": self.task_id,
+            "cause": cause,
+            **fields,
+        }
+        self._stream.write(json.dumps(record) + "\n")
+        self._stream.flush()

nisse-core/src/nisse_core/probe.py

@@ -0,0 +1,142 @@
+"""Check a model's declared context window against what its server does.
+
+LiteLLM's ``max_input_tokens`` for a local model is only a declaration; the
+real limit is whatever the model server allocates. This sends one prompt
+half again as long as the declared window and reads back what the server did
+with it:
+
+- **It refused.** Over-long prompts fail loudly, which is the safe behaviour.
+- **It cut the prompt.** The reported prompt size is where it cut, which is
+  the server's real window. Ollama does this, silently.
+- **It took the whole prompt.** The server allows more than is declared, so
+  the declaration is conservative.
+
+Every answer is checked for which model gave it. A proxy that falls back to
+another model on an error returns a normal-looking answer under that model's
+name, and once made this probe report a refusing server as roomy.
+
+Run it with ``scripts/probe_context.py``. It spends one small and one large
+request on the model, so it refuses windows above a ceiling unless told
+otherwise: commercial models' limits are already known to LiteLLM.
+"""
+
+from dataclasses import dataclass
+
+import httpx
+
+from nisse_core.catalog import ModelFacts
+
+# Of a probe's size, how much must come back for it to count as uncut. A
+# chat template adds a little, and a tokenizer counts a little differently.
+_UNCUT = 0.9
+# How close the server's cut must be to the declaration to count as a match.
+_MATCH = 0.02
+
+
+@dataclass(frozen=True)
+class ProbeResult:
+    verdict: str  # "matches", "declared_too_high", "declared_conservative", ...
+    message: str
+    server_window: int | None = None
+
+
+def interpret(
+    declared: int, sent: int, reported: int | None, error: str | None
+) -> ProbeResult:
+    """What one over-long probe says about the server's window.
+
+    ``sent`` is roughly how many tokens the probe held; ``reported`` is the
+    prompt size the server reported, if it answered; ``error`` its error
+    text, if it refused.
+    """
+    if error is not None:
+        return ProbeResult(
+            "refuses",
+            f"the server refused a ~{sent}-token prompt ({error[:200]}). Over-long "
+            "prompts fail loudly here, which is safe; the declared window of "
+            f"{declared} was not contradicted.",
+        )
+    assert reported is not None
+    if reported >= sent * _UNCUT:
+        return ProbeResult(
+            "declared_conservative",
+            f"the server took the whole ~{sent}-token prompt ({reported} reported), "
+            f"more than the declared {declared}. The declaration is safe; raise it "
+            "if you want the room.",
+            server_window=None,
+        )
+    if abs(reported - declared) <= declared * _MATCH:
+        return ProbeResult(
+            "matches",
+            f"the server cut the prompt at {reported} tokens, matching the declared "
+            f"{declared}.",
+            server_window=reported,
+        )
+    if reported < declared:
+        return ProbeResult(
+            "declared_too_high",
+            f"the server cut the prompt at {reported} tokens, but LiteLLM declares "
+            f"{declared}. Prompts between the two would be silently cut: set "
+            f"max_input_tokens to {reported}.",
+            server_window=reported,
+        )
+    return ProbeResult(
+        "declared_conservative",
+        f"the server cut the prompt at {reported} tokens, above the declared "
+        f"{declared}. The declaration is safe; it could be raised to {reported}.",
+        server_window=reported,
+    )
+
+
+def _prompt(words: int) -> str:
+    return " ".join(f"item{i}" for i in range(words)) + "\n\nReply with just: ok"
+
+
+class Fallback(Exception):
+    def __init__(self, answered_by: str) -> None:
+        self.answered_by = answered_by
+
+
+def _send(
+    http: httpx.Client, model: str, words: int, backing: str
+) -> tuple[int | None, str | None]:
+    response = http.post(
+        "/chat/completions",
+        json={
+            "model": model,
+            "messages": [{"role": "user", "content": _prompt(words)}],
+            "max_tokens": 5,
+        },
+    )
+    if response.status_code != 200:
+        return None, f"{response.status_code}: {response.text}"
+    data = response.json()
+    answered = str(data.get("model") or "")
+    facts = ModelFacts(alias=model, backing=backing, provider="", supports_tools=None)
+    if not facts.answered(answered):
+        raise Fallback(answered)
+    usage = data.get("usage") or {}
+    return int(usage.get("prompt_tokens") or 0), None
+
+
+def probe(
+    http: httpx.Client, model: str, declared: int, backing: str = ""
+) -> ProbeResult:
+    """Measure how many tokens a word of the probe costs on this model, then
+    send a prompt half again as long as the declared window."""
+    calibration_words = 200
+    try:
+        tokens, error = _send(http, model, calibration_words, backing)
+        if error is not None or not tokens:
+            return ProbeResult("failed", f"a short calibration request failed: {error}")
+        per_word = tokens / calibration_words
+        sent = int(declared * 1.5)
+        reported, error = _send(http, model, int(sent / per_word), backing)
+    except Fallback as fallback:
+        return ProbeResult(
+            "fallback",
+            f"{fallback.answered_by} answered instead of {model}: the proxy fell "
+            "back to another model, so nothing here describes this one. Remove "
+            "the fallback, or probe the server directly.",
+        )
+    return interpret(declared, sent, reported, error)

nisse-core/src/nisse_core/reconcile.py

@@ -0,0 +1,61 @@
+"""Boot-time reconciliation (architecture L8): turn an ambiguous crash into a safe,
+known state.
+
+Every pending intent found at startup is checked against external truth by a
+registered reconciler — an observable check (query Gitea, inspect the tree),
+never model self-assessment. Anything unverifiable gates to AWAIT_INPUT;
+the agent never blind-resumes.
+"""
+
+from collections.abc import Callable, Mapping
+from dataclasses import dataclass
+from typing import Literal
+
+from nisse_core.state import Intent, StateStore
+
+# Returns True if the intent's external effect verifiably happened (do not
+# repeat it), False if it verifiably never started (safe to discard), or
+# None if it cannot be verified.
+Reconciler = Callable[[Intent], bool | None]
+
+
+@dataclass(frozen=True)
+class BootReport:
+    action: Literal["resume", "await_input"]
+    notes: list[str]
+
+
+def reconcile_on_boot(
+    store: StateStore, reconcilers: Mapping[str, Reconciler]
+) -> BootReport:
+    notes: list[str] = []
+    unresolved = False
+    for intent in store.pending_intents():
+        label = f"intent {intent.id} ({intent.kind})"
+        reconciler = reconcilers.get(intent.kind)
+        if reconciler is None:
+            unresolved = True
+            notes.append(f"{label}: no reconciler registered")
+            continue
+        verdict = reconciler(intent)
+        if verdict is True:
+            store.commit_intent(
+                intent.id, cause="reconciliation verdict: effect verified"
+            )
+            notes.append(f"{label}: external effect verified, marked committed")
+        elif verdict is False:
+            store.abort_intent(
+                intent.id, cause="reconciliation verdict: never took effect"
+            )
+            notes.append(f"{label}: never took effect, marked aborted")
+        else:
+            unresolved = True
+            notes.append(f"{label}: unverifiable")
+    report = BootReport(
+        action="await_input" if unresolved else "resume",
+        notes=notes,
+    )
+    store.oplog.emit(
+        "boot.reconcile", cause="startup", action=report.action, verdicts=notes
+    )
+    return report

nisse-core/src/nisse_core/render.py

@@ -0,0 +1,158 @@
+"""L7 renderer: provider request bodies are built from the canonical log at
+call time, never stored provider-shaped.
+
+First adapter: the OpenAI-compatible chat format LiteLLM's normalized route
+speaks — the executor role's path (L9). The Anthropic passthrough adapter
+arrives with delegations (L9). Token budgeting and prompt-cache breakpoints
+are render-time concerns and are never stored (L7); neither exists yet in
+this skeleton.
+"""
+
+import json
+from typing import Any
+
+from nisse_core.canonical import (
+    AssistantText,
+    Compaction,
+    DelegationCompleted,
+    DelegationStarted,
+    Fact,
+    GateOpened,
+    PlanSubmitted,
+    StoredEvent,
+    ToolCall,
+    ToolResult,
+    UserMessage,
+)
+
+
+def effective_events(stored: list[StoredEvent]) -> list[StoredEvent]:
+    """Apply compactions: events whose ids fall in a compaction's replaced
+    range are dropped; the compaction event itself stays as their summary."""
+    replaced: list[tuple[int, int]] = [
+        (e.event.replaces[0], e.event.replaces[1])
+        for e in stored
+        if isinstance(e.event, Compaction)
+    ]
+
+    def is_replaced(event_id: int) -> bool:
+        return any(first <= event_id <= last for first, last in replaced)
+
+    return [
+        e for e in stored if isinstance(e.event, Compaction) or not is_replaced(e.id)
+    ]
+
+
+class OpenAIChatRenderer:
+    """Mappings for orchestrator-side events (gates, plans, delegations,
+    compaction summaries) are provisional; they get tuned when the executor
+    loop (step 5) and delegations (step 7) consume them for real."""
+
+    def render(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+    ) -> dict[str, Any]:
+        messages: list[dict[str, Any]] = []
+        if system is not None:
+            messages.append({"role": "system", "content": system})
+        kept = effective_events(events)
+        answered = {e.event.call_id for e in kept if isinstance(e.event, ToolResult)}
+        for stored in kept:
+            _append_merged(messages, self._message_for(stored.event))
+            # Providers reject a tool call with no result following it. One
+            # can legitimately be missing: a crash between the call and its
+            # result (L8), or a turn-ending gate tool. Render a placeholder so
+            # the transcript stays replayable rather than poisoned.
+            if isinstance(stored.event, ToolCall) and (
+                stored.event.call_id not in answered
+            ):
+                messages.append(
+                    {
+                        "role": "tool",
+                        "tool_call_id": stored.event.call_id,
+                        "content": "[no result recorded]",
+                    }
+                )
+        body: dict[str, Any] = {"model": model, "messages": messages}
+        if tools:
+            body["tools"] = tools
+        return body
+
+    def _message_for(self, event: object) -> dict[str, Any]:
+        match event:
+            case UserMessage(text=text):
+                return {"role": "user", "content": text}
+            case AssistantText(text=text):
+                return {"role": "assistant", "content": text}
+            case ToolCall(call_id=call_id, tool=tool, arguments=arguments):
+                return {
+                    "role": "assistant",
+                    "content": None,
+                    "tool_calls": [
+                        {
+                            "id": call_id,
+                            "type": "function",
+                            "function": {
+                                "name": tool,
+                                "arguments": json.dumps(arguments),
+                            },
+                        }
+                    ],
+                }
+            case ToolResult(call_id=call_id, result=result):
+                return {
+                    "role": "tool",
+                    "tool_call_id": call_id,
+                    "content": result,
+                }
+            case PlanSubmitted(plan=plan):
+                return {"role": "assistant", "content": plan}
+            case GateOpened(gate=gate, reason=reason):
+                return {"role": "user", "content": f"[gate {gate} opened: {reason}]"}
+            case DelegationStarted(brief=brief, model=model):
+                return {
+                    "role": "assistant",
+                    "content": f"[delegation started ({model}): {brief}]",
+                }
+            case DelegationCompleted(handback=handback):
+                return {
+                    "role": "assistant",
+                    "content": f"[delegation handback]\n{handback}",
+                }
+            case Fact(text=text):
+                return {"role": "user", "content": f"[orchestrator] {text}"}
+            case Compaction(summary=summary):
+                return {
+                    "role": "user",
+                    "content": f"[summary of earlier conversation]\n{summary}",
+                }
+            case _:
+                raise ValueError(f"unrenderable event: {event!r}")
+
+
+def _append_merged(messages: list[dict[str, Any]], message: dict[str, Any]) -> None:
+    """Append, folding into the previous message when both are the same user
+    or assistant role.
+
+    One model turn is often several events (some text, then one or more tool
+    calls), and the OpenAI format carries a turn as one assistant message
+    with a tool_calls list. Strict chat templates enforce that: Devstral's
+    (Mistral) rejected a turn rendered as a text message then a tool-call
+    message with a 500, failing runs whenever the model spoke before acting."""
+    previous = messages[-1] if messages else None
+    role = message["role"]
+    if (
+        previous is None
+        or previous["role"] != role
+        or role not in ("user", "assistant")
+    ):
+        messages.append(message)
+        return
+    texts = [t for t in (previous.get("content"), message.get("content")) if t]
+    previous["content"] = "\n\n".join(texts) if texts else None
+    calls = previous.get("tool_calls", []) + message.get("tool_calls", [])
+    if calls:
+        previous["tool_calls"] = calls

nisse-core/src/nisse_core/render_anthropic.py

@@ -0,0 +1,187 @@
+"""Anthropic Messages renderer (architecture L7, L9).
+
+The second adapter, and the reason L9 puts normalisation in the renderer
+rather than on the wire: the two vendors disagree *structurally*, not
+cosmetically.
+
+| | OpenAI-compatible | Anthropic Messages |
+|---|---|---|
+| system prompt | a message with role `system` | a top-level `system` field |
+| tool call | `tool_calls` array on the message | a `tool_use` content block |
+| tool result | a message with role `tool` | a `tool_result` block in a **user** message |
+| tool schema | `function.parameters` | `input_schema` |
+
+A middlebox that normalised between these would be lossy exactly where a
+long-running delegation lives, which is why delegations take the passthrough
+route and this renderer builds the vendor-native body.
+"""
+
+from typing import Any
+
+from nisse_core.canonical import (
+    AssistantText,
+    Compaction,
+    DelegationCompleted,
+    DelegationStarted,
+    Fact,
+    GateOpened,
+    PlanSubmitted,
+    StoredEvent,
+    ToolCall,
+    ToolResult,
+    UserMessage,
+)
+from nisse_core.render import effective_events
+
+DEFAULT_MAX_TOKENS = 4096
+NO_RESULT_PLACEHOLDER = "[no result recorded]"
+
+
+def to_anthropic_tools(tools: list[dict[str, Any]] | None) -> list[dict[str, Any]]:
+    """Convert the OpenAI-shaped manifests the tool modules already define,
+    so a tool is declared once and rendered per vendor."""
+    converted: list[dict[str, Any]] = []
+    for tool in tools or []:
+        fn = tool.get("function", tool)
+        converted.append(
+            {
+                "name": fn["name"],
+                "description": fn.get("description", ""),
+                "input_schema": fn.get(
+                    "parameters", {"type": "object", "properties": {}}
+                ),
+            }
+        )
+    return converted
+
+
+class AnthropicMessagesRenderer:
+    def render(
+        self,
+        events: list[StoredEvent],
+        tools: list[dict[str, Any]] | None,
+        model: str,
+        system: str | None = None,
+        *,
+        max_tokens: int = DEFAULT_MAX_TOKENS,
+    ) -> dict[str, Any]:
+        kept = effective_events(events)
+        answered = {e.event.call_id for e in kept if isinstance(e.event, ToolResult)}
+        blocks: list[tuple[str, dict[str, Any]]] = []
+        for stored in kept:
+            blocks.extend(self._blocks_for(stored.event))
+            # A dangling tool_use is rejected outright by this API — more
+            # strictly than the OpenAI shape — so a crash between a call and
+            # its result must not poison the transcript (L8).
+            if isinstance(stored.event, ToolCall) and (
+                stored.event.call_id not in answered
+            ):
+                blocks.append(
+                    (
+                        "user",
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": stored.event.call_id,
+                            "content": NO_RESULT_PLACEHOLDER,
+                        },
+                    )
+                )
+
+        body: dict[str, Any] = {
+            "model": model,
+            "max_tokens": max_tokens,
+            "messages": _coalesce(blocks),
+        }
+        if system is not None:
+            body["system"] = system
+        if tools:
+            body["tools"] = to_anthropic_tools(tools)
+        return body
+
+    def _blocks_for(self, event: object) -> list[tuple[str, dict[str, Any]]]:
+        match event:
+            case UserMessage(text=text):
+                return [("user", {"type": "text", "text": text})]
+            case AssistantText(text=text):
+                return [("assistant", {"type": "text", "text": text})]
+            case ToolCall(call_id=call_id, tool=tool, arguments=arguments):
+                return [
+                    (
+                        "assistant",
+                        {
+                            "type": "tool_use",
+                            "id": call_id,
+                            "name": tool,
+                            "input": arguments,
+                        },
+                    )
+                ]
+            case ToolResult(call_id=call_id, result=result):
+                return [
+                    (
+                        "user",
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": call_id,
+                            "content": result,
+                        },
+                    )
+                ]
+            case PlanSubmitted(plan=plan):
+                return [("assistant", {"type": "text", "text": plan})]
+            case GateOpened(gate=gate, reason=reason):
+                return [
+                    (
+                        "user",
+                        {"type": "text", "text": f"[gate {gate} opened: {reason}]"},
+                    )
+                ]
+            case DelegationStarted(brief=brief, model=model):
+                return [
+                    (
+                        "assistant",
+                        {
+                            "type": "text",
+                            "text": f"[delegation started ({model}): {brief}]",
+                        },
+                    )
+                ]
+            case DelegationCompleted(handback=handback):
+                return [
+                    (
+                        "assistant",
+                        {"type": "text", "text": f"[delegation handback]\n{handback}"},
+                    )
+                ]
+            case Fact(text=text):
+                return [("user", {"type": "text", "text": f"[orchestrator] {text}"})]
+            case Compaction(summary=summary):
+                return [
+                    (
+                        "user",
+                        {
+                            "type": "text",
+                            "text": f"[summary of earlier conversation]\n{summary}",
+                        },
+                    )
+                ]
+            case _:
+                raise ValueError(f"unrenderable event: {event!r}")
+
+
+def _coalesce(
+    blocks: list[tuple[str, dict[str, Any]]],
+) -> list[dict[str, Any]]:
+    """Merge adjacent blocks of the same role into one message.
+
+    The Messages API expects alternating roles, and a tool_result must sit in
+    the user message directly after the assistant's tool_use — which happens
+    naturally once same-role runs are merged.
+    """
+    messages: list[dict[str, Any]] = []
+    for role, block in blocks:
+        if messages and messages[-1]["role"] == role:
+            messages[-1]["content"].append(block)
+        else:
+            messages.append({"role": role, "content": [block]})
+    return messages

nisse-core/src/nisse_core/state.py

@@ -0,0 +1,576 @@
+"""Durable state store (architecture L8).
+
+SQLite in WAL mode with ``synchronous=FULL``: every commit is fsynced, so a
+power cut mid-write can never produce torn state. Every state transition and
+intent-log write is a single immediately-committed statement — in-memory state
+that hasn't hit disk is assumed lost.
+
+The intent log records a unit of work *before* it starts, so a restart knows
+what was in flight (see ``nisse_core.reconcile`` for how pending intents are
+resolved against external truth on boot).
+"""
+
+import json
+import sqlite3
+from collections.abc import Callable, Mapping
+from dataclasses import dataclass
+from datetime import UTC, datetime
+from pathlib import Path
+from typing import Any, Self
+
+from nisse_core.canonical import (
+    CanonicalEvent,
+    StoredEvent,
+    UserMessage,
+    event_type,
+    from_payload,
+    to_payload,
+)
+from nisse_core.oplog import OpLog
+from nisse_core.views import project
+
+# The tables every agent has. An agent's own tables come on top: a subclass
+# names them, the version they bring, and the migrations to it.
+CURRENT_SCHEMA_VERSION = 4
+
+# Stores older than this predate work items (Development Plan M1.1). There was
+# no production data to carry over, so there is no migration from them: start
+# a fresh store (scripts/bringup.sh start sets the old one aside).
+OLDEST_SUPPORTED_VERSION = 4
+
+Migration = Callable[[sqlite3.Connection], None]
+
+# Who produced an event (L7): the operator, the orchestrator's own code, or a
+# model role (L9). An agent adds its own roles.
+ACTORS = frozenset(
+    {"operator", "orchestrator", "driver", "helper", "expert", "classifier"}
+)
+
+
+class StateSchemaError(RuntimeError):
+    pass
+
+
+@dataclass(frozen=True)
+class WorkItem:
+    id: str
+    scope: str | None
+    title: str
+    status: str  # open | closed
+    outcome: str | None  # completed | abandoned, once closed
+    position: str  # where the loop is for this item
+    data: dict[str, Any]
+    opened_at: str
+    updated_at: str
+    closed_at: str | None
+
+
+@dataclass(frozen=True)
+class Intent:
+    id: int
+    kind: str
+    payload: dict[str, Any]
+    status: str
+    created_at: str
+    resolved_at: str | None
+    work_item: str | None = None
+
+
+_SCHEMA = [
+    "CREATE TABLE meta (key TEXT PRIMARY KEY, value TEXT NOT NULL)",
+    """
+    CREATE TABLE work_items (
+        id TEXT PRIMARY KEY,
+        scope TEXT,
+        title TEXT NOT NULL,
+        status TEXT NOT NULL CHECK (status IN ('open', 'closed')),
+        outcome TEXT,
+        position TEXT NOT NULL,
+        data TEXT NOT NULL DEFAULT '{}',
+        opened_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL,
+        closed_at TEXT
+    )
+    """,
+    """
+    CREATE TABLE agent (
+        id INTEGER PRIMARY KEY CHECK (id = 1),
+        active_item TEXT REFERENCES work_items(id),
+        idle_from_event INTEGER NOT NULL DEFAULT 0,
+        updated_at TEXT NOT NULL
+    )
+    """,
+    """
+    CREATE TABLE intent_log (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        kind TEXT NOT NULL,
+        payload TEXT NOT NULL,
+        status TEXT NOT NULL DEFAULT 'pending',
+        created_at TEXT NOT NULL,
+        resolved_at TEXT,
+        work_item TEXT
+    )
+    """,
+    """
+    CREATE TABLE canonical_events (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        ts TEXT NOT NULL,
+        type TEXT NOT NULL,
+        payload TEXT NOT NULL,
+        work_item TEXT,
+        actor TEXT NOT NULL
+    )
+    """,
+    "CREATE INDEX canonical_events_by_item ON canonical_events (work_item, id)",
+    """
+    CREATE TABLE eval_outcomes (
+        event_id INTEGER PRIMARY KEY,
+        verdict TEXT NOT NULL,
+        note TEXT NOT NULL DEFAULT '',
+        marked_at TEXT NOT NULL
+    )
+    """,
+]
+
+
+def utc_now() -> str:
+    return datetime.now(UTC).isoformat()
+
+
+class StateStore:
+    """The store every agent shares. An agent's subclass adds its own tables
+    (``SCHEMA``, with the version they bring and ``MIGRATIONS`` to it), its
+    model roles (``ACTORS``) and what each role is shown of the others
+    (``SHOWN``, see ``views``)."""
+
+    AGENT = "nisse"  # what the operational log names
+    SCHEMA_VERSION = CURRENT_SCHEMA_VERSION
+    SCHEMA: tuple[str, ...] = ()
+    # Maps version N to the migration that takes the schema from N to N+1.
+    MIGRATIONS: Mapping[int, Migration] = {}
+    ACTORS: frozenset[str] = ACTORS
+    SHOWN: Mapping[str, Mapping[str, str]] = {}
+
+    def __init__(
+        self,
+        path: str | Path,
+        *,
+        schema_version: int | None = None,
+        migrations: Mapping[int, Migration] | None = None,
+        oplog: OpLog | None = None,
+    ) -> None:
+        # Log emission is owned by the store (L12): the same code path that
+        # performs a durable write emits its log line, right after commit.
+        self.oplog = oplog if oplog is not None else OpLog(self.AGENT)
+        self._conn = sqlite3.connect(path, isolation_level=None)
+        self._conn.row_factory = sqlite3.Row
+        self._conn.execute("PRAGMA journal_mode=WAL")
+        self._conn.execute("PRAGMA synchronous=FULL")
+        self._conn.execute("PRAGMA busy_timeout=5000")
+        self._target_version = (
+            self.SCHEMA_VERSION if schema_version is None else schema_version
+        )
+        self.closed = False
+        self._init_or_migrate(self.MIGRATIONS if migrations is None else migrations)
+
+    def _init_or_migrate(self, migrations: Mapping[int, Migration]) -> None:
+        fresh = (
+            self._conn.execute(
+                "SELECT name FROM sqlite_master WHERE type='table' AND name='meta'"
+            ).fetchone()
+            is None
+        )
+        if fresh:
+            self._in_transaction(self._create_schema)
+            return
+        stored = self.schema_version
+        if stored < OLDEST_SUPPORTED_VERSION <= self._target_version:
+            raise StateSchemaError(
+                f"state store schema version {stored} predates work items "
+                f"(version {OLDEST_SUPPORTED_VERSION}); start a fresh store "
+                "(scripts/bringup.sh start sets the old one aside)"
+            )
+        if stored > self._target_version:
+            raise StateSchemaError(
+                f"state schema version {stored} is newer than this code "
+                f"supports ({self._target_version}); refusing to open"
+            )
+        for version in range(stored, self._target_version):
+            migrate = migrations.get(version)
+            if migrate is None:
+                raise StateSchemaError(
+                    f"no migration registered from schema version {version}"
+                )
+            self._in_transaction(lambda m=migrate, v=version: self._apply(m, v))
+            self.oplog.emit(
+                "schema.migrate",
+                cause="startup",
+                from_version=version,
+                to_version=version + 1,
+            )
+
+    def _create_schema(self) -> None:
+        for statement in (*_SCHEMA, *self.SCHEMA):
+            self._conn.execute(statement)
+        self._conn.execute(
+            "INSERT INTO meta (key, value) VALUES ('schema_version', ?)",
+            (str(self._target_version),),
+        )
+
+    def _apply(self, migrate: Migration, from_version: int) -> None:
+        migrate(self._conn)
+        self._conn.execute(
+            "UPDATE meta SET value = ? WHERE key = 'schema_version'",
+            (str(from_version + 1),),
+        )
+
+    def _in_transaction(self, work: Callable[[], None]) -> None:
+        self._conn.execute("BEGIN IMMEDIATE")
+        try:
+            work()
+        except BaseException:
+            self._conn.execute("ROLLBACK")
+            raise
+        self._conn.execute("COMMIT")
+
+    @property
+    def schema_version(self) -> int:
+        row = self._conn.execute(
+            "SELECT value FROM meta WHERE key = 'schema_version'"
+        ).fetchone()
+        return int(row["value"])
+
+    # --- work items (L1) ---------------------------------------------------
+
+    def _ensure_agent_row(self) -> None:
+        self._conn.execute(
+            "INSERT INTO agent (id, active_item, updated_at) VALUES (1, NULL, ?) "
+            "ON CONFLICT(id) DO NOTHING",
+            (utc_now(),),
+        )
+
+    @staticmethod
+    def _item(row: sqlite3.Row) -> WorkItem:
+        return WorkItem(
+            id=row["id"],
+            scope=row["scope"],
+            title=row["title"],
+            status=row["status"],
+            outcome=row["outcome"],
+            position=row["position"],
+            data=json.loads(row["data"]),
+            opened_at=row["opened_at"],
+            updated_at=row["updated_at"],
+            closed_at=row["closed_at"],
+        )
+
+    def work_item(self, item_id: str) -> WorkItem | None:
+        row = self._conn.execute(
+            "SELECT * FROM work_items WHERE id = ?", (item_id,)
+        ).fetchone()
+        return None if row is None else self._item(row)
+
+    def work_items(self, status: str | None = None) -> list[WorkItem]:
+        query = "SELECT * FROM work_items"
+        args: tuple[Any, ...] = ()
+        if status is not None:
+            query += " WHERE status = ?"
+            args = (status,)
+        rows = self._conn.execute(query + " ORDER BY opened_at", args).fetchall()
+        return [self._item(row) for row in rows]
+
+    def active_item(self) -> WorkItem | None:
+        row = self._conn.execute(
+            "SELECT w.* FROM agent a JOIN work_items w ON w.id = a.active_item "
+            "WHERE a.id = 1"
+        ).fetchone()
+        return None if row is None else self._item(row)
+
+    def open_work_item(
+        self,
+        item_id: str,
+        *,
+        title: str,
+        scope: str | None = None,
+        position: str,
+        data: dict[str, Any] | None = None,
+        cause: str,
+    ) -> WorkItem:
+        now = utc_now()
+        self._conn.execute(
+            "INSERT INTO work_items (id, scope, title, status, position, data, "
+            "opened_at, updated_at) VALUES (?, ?, ?, 'open', ?, ?, ?, ?)",
+            (item_id, scope, title, position, json.dumps(data or {}), now, now),
+        )
+        self.oplog.emit("work_item.open", cause=cause, work_item=item_id, scope=scope)
+        item = self.work_item(item_id)
+        assert item is not None
+        return item
+
+    def set_active(self, item_id: str | None, *, cause: str) -> None:
+        """Point the agent at a work item, or at none (idle). Going idle
+        records where in the log idleness began, so messages sent while idle
+        can be carried into the next work item (carry_idle_messages)."""
+        self._ensure_agent_row()
+        previous = self._conn.execute(
+            "SELECT active_item FROM agent WHERE id = 1"
+        ).fetchone()["active_item"]
+        if item_id is None:
+            last = self._conn.execute(
+                "SELECT COALESCE(MAX(id), 0) AS last FROM canonical_events"
+            ).fetchone()["last"]
+            self._conn.execute(
+                "UPDATE agent SET active_item = NULL, idle_from_event = ?, "
+                "updated_at = ? WHERE id = 1",
+                (last, utc_now()),
+            )
+        else:
+            self._conn.execute(
+                "UPDATE agent SET active_item = ?, updated_at = ? WHERE id = 1",
+                (item_id, utc_now()),
+            )
+        if previous != item_id:
+            self.oplog.emit(
+                "work_item.switch",
+                cause=cause,
+                **{"from": previous, "to": item_id},
+            )
+
+    def update_work_item(
+        self,
+        item_id: str,
+        *,
+        position: str,
+        data: dict[str, Any],
+        cause: str,
+    ) -> None:
+        """Record a work item's new position and data; the full data is
+        passed every time (no partial updates)."""
+        previous = self.work_item(item_id)
+        if previous is None:
+            raise KeyError(f"no work item {item_id!r}")
+        self._conn.execute(
+            "UPDATE work_items SET position = ?, data = ?, updated_at = ? WHERE id = ?",
+            (position, json.dumps(data), utc_now(), item_id),
+        )
+        self.oplog.emit(
+            "state.transition",
+            cause=cause,
+            **{"from": previous.position, "to": position, "project": previous.scope},
+        )
+
+    def close_work_item(self, item_id: str, *, outcome: str, cause: str) -> None:
+        now = utc_now()
+        row = self._conn.execute(
+            "UPDATE work_items SET status = 'closed', outcome = ?, closed_at = ?, "
+            "updated_at = ? WHERE id = ? AND status = 'open' RETURNING id",
+            (outcome, now, now, item_id),
+        ).fetchone()
+        if row is None:
+            raise KeyError(f"no open work item {item_id!r}")
+        self.oplog.emit(
+            "work_item.close", cause=cause, work_item=item_id, outcome=outcome
+        )
+
+    def carry_idle_messages(self, item_id: str) -> int:
+        """Copy what the operator said while the agent was idle into a work
+        item that has just opened (D1: messages sent before `use` are kept
+        for it). Copied as new events, with the original's ID in the source,
+        never by reassigning the originals: the log is never edited (L7)."""
+        self._ensure_agent_row()
+        since = self._conn.execute(
+            "SELECT idle_from_event FROM agent WHERE id = 1"
+        ).fetchone()["idle_from_event"]
+        rows = self._conn.execute(
+            "SELECT * FROM canonical_events WHERE work_item IS NULL "
+            "AND actor = 'operator' AND type = 'user_message' AND id > ? ORDER BY id",
+            (since,),
+        ).fetchall()
+        log = self.transcript(item_id, "operator")
+        for row in rows:
+            payload = json.loads(row["payload"])
+            log.append(
+                UserMessage(
+                    text=payload["text"],
+                    source=f"{payload.get('source', '')} (sent while idle, #{row['id']})",
+                )
+            )
+        return len(rows)
+
+    # --- intents (L8) ------------------------------------------------------
+
+    def begin_intent(
+        self,
+        kind: str,
+        payload: dict[str, Any],
+        *,
+        cause: str,
+        work_item: str | None = None,
+    ) -> int:
+        """Durably record that a unit of work is about to start, owned by
+        the work item it belongs to (L1)."""
+        cursor = self._conn.execute(
+            "INSERT INTO intent_log (kind, payload, created_at, work_item) "
+            "VALUES (?, ?, ?, ?)",
+            (kind, json.dumps(payload), utc_now(), work_item),
+        )
+        assert cursor.lastrowid is not None
+        self.oplog.emit(
+            "intent.begin", cause=cause, intent_id=cursor.lastrowid, kind=kind
+        )
+        return cursor.lastrowid
+
+    def commit_intent(self, intent_id: int, *, cause: str) -> None:
+        self._resolve_intent(intent_id, "committed", "intent.commit", cause)
+
+    def abort_intent(self, intent_id: int, *, cause: str) -> None:
+        self._resolve_intent(intent_id, "aborted", "intent.abort", cause)
+
+    def _resolve_intent(
+        self, intent_id: int, status: str, event: str, cause: str
+    ) -> None:
+        row = self._conn.execute(
+            "UPDATE intent_log SET status = ?, resolved_at = ? "
+            "WHERE id = ? AND status = 'pending' RETURNING kind",
+            (status, utc_now(), intent_id),
+        ).fetchone()
+        if row is None:
+            raise KeyError(f"no pending intent with id {intent_id}")
+        self.oplog.emit(event, cause=cause, intent_id=intent_id, kind=row["kind"])
+
+    def pending_intents(self) -> list[Intent]:
+        rows = self._conn.execute(
+            "SELECT * FROM intent_log WHERE status = 'pending' ORDER BY id"
+        ).fetchall()
+        return [
+            Intent(
+                id=row["id"],
+                kind=row["kind"],
+                payload=json.loads(row["payload"]),
+                status=row["status"],
+                created_at=row["created_at"],
+                resolved_at=row["resolved_at"],
+                work_item=row["work_item"],
+            )
+            for row in rows
+        ]
+
+    # --- the canonical log (L7) -------------------------------------------
+
+    def transcript(self, work_item: str | None, actor: str) -> "Transcript":
+        """The log as one role sees it for one work item: what it reads is
+        that item's events only, and what it writes carries the item and the
+        actor. None is the agent-level scope (L6)."""
+        if actor not in self.ACTORS:
+            raise ValueError(f"unknown actor {actor!r}")
+        return Transcript(self, work_item, actor)
+
+    def all_events(self, after: int = 0) -> list[StoredEvent]:
+        """Every event across work items, for the few readers whose job
+        spans them (evaluation capture, dumps). Model calls never use this."""
+        rows = self._conn.execute(
+            "SELECT * FROM canonical_events WHERE id > ? ORDER BY id", (after,)
+        ).fetchall()
+        return [_stored(row) for row in rows]
+
+    def _append(self, event: CanonicalEvent, work_item: str | None, actor: str) -> int:
+        cursor = self._conn.execute(
+            "INSERT INTO canonical_events (ts, type, payload, work_item, actor) "
+            "VALUES (?, ?, ?, ?, ?)",
+            (
+                utc_now(),
+                event_type(event),
+                json.dumps(to_payload(event)),
+                work_item,
+                actor,
+            ),
+        )
+        assert cursor.lastrowid is not None
+        return cursor.lastrowid
+
+    def _read(self, work_item: str | None, after: int) -> list[StoredEvent]:
+        rows = self._conn.execute(
+            "SELECT * FROM canonical_events WHERE work_item IS ? AND id > ? "
+            "ORDER BY id",
+            (work_item, after),
+        ).fetchall()
+        return [_stored(row) for row in rows]
+
+    def mark_outcome(self, event_id: int, verdict: str, note: str = "") -> None:
+        """Record whether a delegation or consult was good (L9).
+
+        Kept out of the canonical log on purpose: the log is an append-only
+        record of what happened, and a verdict is a later judgement about it
+        that may be revised.
+        """
+        self._conn.execute(
+            "INSERT INTO eval_outcomes (event_id, verdict, note, marked_at) "
+            "VALUES (?, ?, ?, ?) ON CONFLICT(event_id) DO UPDATE SET "
+            "verdict = excluded.verdict, note = excluded.note, "
+            "marked_at = excluded.marked_at",
+            (event_id, verdict, note, utc_now()),
+        )
+
+    def outcomes(self) -> dict[int, tuple[str, str]]:
+        rows = self._conn.execute(
+            "SELECT event_id, verdict, note FROM eval_outcomes"
+        ).fetchall()
+        return {r["event_id"]: (r["verdict"], r["note"]) for r in rows}
+
+    def close(self) -> None:
+        self._conn.close()
+        self.closed = True
+
+    def __enter__(self) -> Self:
+        return self
+
+    def __exit__(self, *exc_info: object) -> None:
+        self.close()
+
+
+def _stored(row: sqlite3.Row) -> StoredEvent:
+    return StoredEvent(
+        id=row["id"],
+        ts=row["ts"],
+        event=from_payload(row["type"], json.loads(row["payload"])),
+        work_item=row["work_item"],
+        actor=row["actor"],
+    )
+
+
+class Transcript:
+    """One work item's log, as one actor reads and writes it (L6, L7).
+
+    Handed to each component per call by the orchestrator, which knows the
+    active work item, so a component can neither read another item's events
+    nor write without attribution.
+    """
+
+    def __init__(self, store: StateStore, work_item: str | None, actor: str) -> None:
+        self._store = store
+        self.work_item = work_item
+        self.actor = actor
+
+    def append(self, event: CanonicalEvent) -> int:
+        """Committed and fsynced before return, like every durable write."""
+        return self._store._append(event, self.work_item, self.actor)
+
+    def read(self, after: int = 0) -> list[StoredEvent]:
+        """The log as recorded: every role's events, for the record."""
+        return self._store._read(self.work_item, after)
+
+    def view(self, after: int = 0) -> list[StoredEvent]:
+        """The log as this actor is shown it: what a model's context is
+        built from (L6). See ``views``."""
+        return project(self.read(after), self.actor, self._store.SHOWN)
+
+    def as_actor(self, actor: str) -> "Transcript":
+        """The same work item, written by another role: e.g. the executor
+        handing a sub-task to the helper."""
+        return self._store.transcript(self.work_item, actor)
+
+    def begin_intent(self, kind: str, payload: dict[str, Any], *, cause: str) -> int:
+        """An intent owned by this transcript's work item."""
+        return self._store.begin_intent(
+            kind, payload, cause=cause, work_item=self.work_item
+        )

nisse-core/src/nisse_core/testing.py

@@ -0,0 +1,101 @@
+"""Test support: a throwaway sshd standing in for a tool VM (L13).
+
+Runs the system's sshd as the current user, on a free local port, with a
+host key and client key made for the occasion. Tests then reach "the build
+VM" over real SSH, so the code path under test is the production path.
+"""
+
+import getpass
+import os
+import socket
+import subprocess
+import time
+from collections.abc import Iterator
+from contextlib import contextmanager
+from pathlib import Path
+
+from nisse_core.execution import SSHHost
+
+SSHD = "/usr/sbin/sshd"
+
+
+def _free_port() -> int:
+    with socket.socket() as sock:
+        sock.bind(("127.0.0.1", 0))
+        return int(sock.getsockname()[1])
+
+
+def _keygen(path: Path) -> None:
+    subprocess.run(
+        ["ssh-keygen", "-q", "-t", "ed25519", "-N", "", "-f", str(path)], check=True
+    )
+
+
+@contextmanager
+def local_sshd(root: Path) -> Iterator[SSHHost]:
+    """An SSHHost for a private sshd on 127.0.0.1, torn down afterwards."""
+    root.mkdir(parents=True, exist_ok=True)
+    host_key, client_key = root / "host_key", root / "client_key"
+    _keygen(host_key)
+    _keygen(client_key)
+    authorized = root / "authorized_keys"
+    authorized.write_text(client_key.with_suffix(".pub").read_text())
+    authorized.chmod(0o600)
+    port = _free_port()
+    config = root / "sshd_config"
+    config.write_text(
+        "\n".join(
+            [
+                f"Port {port}",
+                "ListenAddress 127.0.0.1",
+                f"HostKey {host_key}",
+                f"AuthorizedKeysFile {authorized}",
+                f"PidFile {root / 'sshd.pid'}",
+                "PasswordAuthentication no",
+                "KbdInteractiveAuthentication no",
+                "PubkeyAuthentication yes",
+                "PermitRootLogin prohibit-password",
+                "StrictModes no",
+                "UsePAM no",
+                "MaxSessions 50",
+                "MaxStartups 50",
+                # Stands in for a provisioned build VM: sessions see the test
+                # runner's PATH, so its Python and tools are "installed".
+                f"SetEnv PATH={os.environ.get('PATH', '/usr/bin:/bin')}",
+                "",
+            ]
+        )
+    )
+    process = subprocess.Popen(
+        [SSHD, "-D", "-e", "-f", str(config)],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.PIPE,
+    )
+    user = getpass.getuser()
+    host = SSHHost(
+        "127.0.0.1", key=client_key, state_dir=root / "client", user=user, port=port
+    )
+    try:
+        deadline = time.monotonic() + 10
+        while True:
+            if process.poll() is not None:
+                raise RuntimeError(
+                    "sshd exited: " + (process.stderr.read() or b"").decode()
+                    if process.stderr
+                    else "sshd exited"
+                )
+            try:
+                with socket.create_connection(("127.0.0.1", port), timeout=0.5):
+                    break
+            except OSError:
+                if time.monotonic() > deadline:
+                    raise RuntimeError("sshd did not start") from None
+                time.sleep(0.05)
+        yield host
+    finally:
+        host.close()
+        process.terminate()
+        try:
+            process.wait(timeout=5)
+        except subprocess.TimeoutExpired:
+            process.kill()

nisse-core/src/nisse_core/transport.py

@@ -0,0 +1,100 @@
+"""Transport interface (architecture L5): all human-to-agent conversation.
+
+The orchestrator depends only on this interface; no platform SDK is imported
+anywhere outside a concrete implementation. MatrixTransport arrives as its own
+class + config with no orchestrator changes.
+"""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Protocol
+
+
+@dataclass(frozen=True)
+class InboundMessage:
+    sender: str
+    # What commands are matched against: a leading mention of the agent,
+    # which only says who the message is for, is already removed.
+    text: str
+    # The message as sent, when that differs from text; the record keeps it.
+    original: str | None = None
+    # The platform's ID for this message, and the root of the thread it was
+    # sent in (None at top level). A work item's conversation is a thread
+    # (L5), so this is how a reply finds its item.
+    event_id: str = ""
+    thread: str | None = None
+
+
+@dataclass(frozen=True)
+class OutboundMessage:
+    kind: str  # "message" | "approval_request" | "question"
+    text: str
+    thread: str | None = None
+    event_id: str = ""
+
+
+class Transport(Protocol):
+    def post(self, text: str, *, thread: str | None = None) -> str:
+        """Send a message, in a thread when one is given; returns its ID,
+        which can root a new thread."""
+        ...
+
+    def send_message(self, text: str) -> None: ...
+
+    def send_approval_request(self, text: str) -> None: ...
+
+    def ask_question(self, text: str) -> None: ...
+
+    def on_message(self, callback: Callable[[InboundMessage], None]) -> None: ...
+
+
+class InMemoryTransport:
+    """Records outbound traffic and lets tests inject inbound messages."""
+
+    def __init__(self) -> None:
+        self.outbound: list[OutboundMessage] = []
+        self._callback: Callable[[InboundMessage], None] | None = None
+        self._next_id = 0
+
+    def _id(self) -> str:
+        self._next_id += 1
+        return f"$event{self._next_id}"
+
+    def post(self, text: str, *, thread: str | None = None) -> str:
+        event_id = self._id()
+        self.outbound.append(OutboundMessage("message", text, thread, event_id))
+        return event_id
+
+    def send_message(self, text: str) -> None:
+        self.outbound.append(OutboundMessage("message", text, None, self._id()))
+
+    def send_approval_request(self, text: str) -> None:
+        self.outbound.append(
+            OutboundMessage("approval_request", text, None, self._id())
+        )
+
+    def ask_question(self, text: str) -> None:
+        self.outbound.append(OutboundMessage("question", text, None, self._id()))
+
+    def on_message(self, callback: Callable[[InboundMessage], None]) -> None:
+        self._callback = callback
+
+    def start(self) -> None:
+        """Nothing to connect to: the transport's lifecycle, for the agent."""
+
+    def close(self) -> None:
+        """Nothing to disconnect from."""
+
+    def receive(
+        self,
+        sender: str,
+        text: str,
+        original: str | None = None,
+        *,
+        thread: str | None = None,
+    ) -> str:
+        """Deliver a message as if the operator sent it; returns its ID."""
+        assert self._callback is not None, "no message handler registered"
+        event_id = self._id()
+        self._callback(InboundMessage(sender, text, original, event_id, thread))
+        return event_id

nisse-core/src/nisse_core/vault.py

@@ -0,0 +1,262 @@
+"""The knowledge vault (architecture L10; Development Plan M5.1).
+
+A folder of Markdown notes on the agent host, in the plain format SilverBullet
+reads (frontmatter, ``[[links]]``, ``#tags``), so the operator browses it there.
+
+- **Only configured folders exist** for the agent, each read-write or
+  read-only; every folder has one writer. Paths are checked in code before
+  anything is touched: relative, inside an allowed folder (symlinks
+  included), Markdown, and never the editor's own files. Per-agent mounts
+  enforce the same at the OS level once the agent runs in a container (M6.1).
+- **Writes are atomic** (write a temporary file beside the note, sync it,
+  rename it into place), so a crash, SilverBullet or anyone reading the
+  folder never sees half a note, and they **record provenance** in the
+  note's frontmatter.
+- **Failures are results, never raised into the loop:** a failed read or
+  write never blocks work.
+- **Notes are data, never instructions** (L10, L11): the tools label what
+  they return with its path.
+"""
+
+import fnmatch
+import os
+import tempfile
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from datetime import UTC, datetime
+from pathlib import Path, PurePosixPath
+from typing import Any
+
+import yaml
+
+READ_WRITE = "rw"
+READ_ONLY = "ro"
+ACCESS = (READ_WRITE, READ_ONLY)
+# The editor's and tools' own files: hidden ones (SilverBullet's and
+# Obsidian's settings, .git, a write's temporary file) and SilverBullet's plugs.
+DEFAULT_IGNORE = (".*", "_plug")
+NOTE_SUFFIX = ".md"
+MAX_NOTE_CHARS = 20_000  # what one read returns; the rest is said to be cut
+MAX_LISTED = 200
+MAX_FOUND = 20
+LINES_PER_NOTE = 3
+
+
+class VaultError(Exception):
+    """What a vault operation couldn't do, in words for the model."""
+
+
+@dataclass(frozen=True)
+class Found:
+    path: str
+    lines: tuple[str, ...]  # the matching lines, first few
+    hits: int
+
+
+class Vault:
+    """``folders``: vault-relative folder -> "rw" or "ro". Nothing outside
+    them is visible."""
+
+    def __init__(
+        self,
+        root: Path,
+        folders: Mapping[str, str],
+        *,
+        agent: str,  # whose writes these are, for provenance
+        ignore: Sequence[str] = DEFAULT_IGNORE,
+        clock: Any = None,
+    ) -> None:
+        self.root = Path(root)
+        self._folders = {_clean(f): a for f, a in folders.items()}
+        self._ignore = tuple(ignore)
+        self._agent = agent
+        self._clock = clock or (lambda: datetime.now(UTC))
+        for folder, access in self._folders.items():
+            if access == READ_WRITE:
+                (self.root / folder).mkdir(parents=True, exist_ok=True)
+
+    def folders(self) -> dict[str, str]:
+        return dict(self._folders)
+
+    # -- paths -----------------------------------------------------------------
+
+    def _folder_of(self, path: PurePosixPath) -> str | None:
+        for folder in self._folders:
+            if path == PurePosixPath(folder) or PurePosixPath(folder) in path.parents:
+                return folder
+        return None
+
+    def _hidden(self, path: PurePosixPath) -> bool:
+        return any(
+            fnmatch.fnmatchcase(part, pattern)
+            for part in path.parts
+            for pattern in self._ignore
+        )
+
+    def _resolve(self, path: str, *, note: bool) -> tuple[PurePosixPath, Path, str]:
+        """The checked path, where it is on disk, and its folder's access."""
+        rel = _relative(path)
+        folder = self._folder_of(rel)
+        if folder is None:
+            raise VaultError(
+                f"{path}: not in a folder you can see; they are "
+                + ", ".join(sorted(self._folders))
+            )
+        if self._hidden(rel):
+            raise VaultError(f"{path}: the editor's own files aren't notes")
+        if note and rel.suffix != NOTE_SUFFIX:
+            raise VaultError(f"{path}: notes are Markdown files ending in .md")
+        real = (self.root / rel).resolve()
+        top = (self.root / folder).resolve()
+        if real != top and top not in real.parents:
+            raise VaultError(f"{path}: leads outside its folder")
+        return rel, real, self._folders[folder]
+
+    # -- reading ---------------------------------------------------------------
+
+    def read(self, path: str) -> str:
+        _, real, _ = self._resolve(path, note=True)
+        try:
+            text = real.read_text(encoding="utf-8")
+        except FileNotFoundError:
+            raise VaultError(f"{path}: no such note") from None
+        except (OSError, UnicodeDecodeError) as exc:
+            raise VaultError(f"{path}: couldn't read it ({exc})") from None
+        if len(text) > MAX_NOTE_CHARS:
+            cut = len(text) - MAX_NOTE_CHARS
+            text = f"{text[:MAX_NOTE_CHARS]}\n\n[{cut} more characters not shown]"
+        return text
+
+    def notes(self, folder: str = "") -> list[str]:
+        """Notes under ``folder`` (every visible folder when empty)."""
+        tops = (
+            [self._resolve(folder, note=False)[0]]
+            if folder.strip("/ ")
+            else [PurePosixPath(f) for f in sorted(self._folders)]
+        )
+        return sorted(p for top in tops for p in self._notes_under(top))
+
+    def _notes_under(self, top: PurePosixPath) -> list[str]:
+        base = (self.root / top).resolve()
+        if not base.is_dir():
+            return []
+        found = []
+        for dirpath, dirnames, filenames in os.walk(base):
+            here = PurePosixPath(Path(dirpath).relative_to(self.root.resolve()))
+            dirnames[:] = sorted(d for d in dirnames if not self._hidden(here / d))
+            for name in sorted(filenames):
+                rel = here / name
+                if rel.suffix != NOTE_SUFFIX or self._hidden(rel):
+                    continue
+                real = (self.root / rel).resolve()
+                if real == base or base in real.parents:  # no links out
+                    found.append(str(rel))
+        return found
+
+    def search(self, text: str) -> list[Found]:
+        """Notes whose path or text contains ``text``, ignoring case; most
+        matches first."""
+        needle = text.strip().lower()
+        if not needle:
+            raise VaultError("search for some text")
+        found = []
+        for path in self.notes():
+            try:
+                _, real, _ = self._resolve(path, note=True)
+                body = real.read_text(encoding="utf-8")
+            except (VaultError, OSError, UnicodeDecodeError):
+                continue  # a failed read never blocks the rest
+            lines = [ln.strip() for ln in body.splitlines() if needle in ln.lower()]
+            hits = len(lines) + (needle in path.lower())
+            if hits:
+                found.append(Found(path, tuple(lines[:LINES_PER_NOTE]), hits))
+        found.sort(key=lambda f: (-f.hits, f.path))
+        return found[:MAX_FOUND]
+
+    # -- writing ---------------------------------------------------------------
+
+    def delete(self, path: str) -> None:
+        """Remove a note in a read-write folder (one writer: its own)."""
+        _, real, access = self._resolve(path, note=True)
+        if access != READ_WRITE:
+            raise VaultError(f"{path}: that folder is read-only for you")
+        try:
+            real.unlink()
+        except FileNotFoundError:
+            raise VaultError(f"{path}: no such note") from None
+        except OSError as exc:
+            raise VaultError(f"{path}: couldn't remove it ({exc})") from None
+
+    def write(self, path: str, text: str, *, provenance: Mapping[str, str]) -> None:
+        """Write a note in a read-write folder, atomically, with where it
+        came from merged into its frontmatter; the rest of its frontmatter
+        is kept."""
+        _, real, access = self._resolve(path, note=True)
+        if access != READ_WRITE:
+            raise VaultError(f"{path}: that folder is read-only for you")
+        front, body = split_frontmatter(text)
+        front["provenance"] = {
+            "by": self._agent,
+            **dict(provenance),
+            "written": self._clock().isoformat(timespec="seconds"),
+        }
+        content = (
+            "---\n"
+            + yaml.safe_dump(front, sort_keys=False, allow_unicode=True)
+            + "---\n"
+            + body
+        )
+        try:
+            real.parent.mkdir(parents=True, exist_ok=True)
+            _replace(real, content)
+        except OSError as exc:
+            raise VaultError(f"{path}: couldn't write it ({exc})") from None
+
+
+def split_frontmatter(text: str) -> tuple[dict[str, Any], str]:
+    """A note's frontmatter (a YAML mapping between --- lines at the top)
+    and the rest. Raises VaultError for frontmatter that isn't a mapping."""
+    if not text.startswith("---\n"):
+        return {}, text
+    end = text.find("\n---\n", 4)
+    if end == -1:
+        return {}, text
+    try:
+        front = yaml.safe_load(text[4:end]) or {}
+    except yaml.YAMLError as exc:
+        raise VaultError(f"its frontmatter isn't valid YAML ({exc})") from None
+    if not isinstance(front, dict):
+        raise VaultError("its frontmatter must be a mapping")
+    return front, text[end + 5 :]
+
+
+def _relative(path: str) -> PurePosixPath:
+    rel = PurePosixPath(path.strip())
+    if not path.strip() or rel.is_absolute() or ".." in rel.parts or "\\" in path:
+        raise VaultError(f"{path!r}: give a path inside the vault, like notes/x.md")
+    return rel
+
+
+def _clean(folder: str) -> str:
+    return str(_relative(folder.strip("/")))
+
+
+def _replace(target: Path, content: str) -> None:
+    """Write-then-rename in the note's own directory (L10): readers see the
+    old note or the new one, never part of either. The temporary file is
+    hidden, so it is never listed, and removed if anything fails."""
+    fd, temp = tempfile.mkstemp(dir=target.parent, prefix=f".{target.name}.")
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as handle:
+            handle.write(content)
+            handle.flush()
+            os.fsync(handle.fileno())
+        os.replace(temp, target)
+    except BaseException:
+        Path(temp).unlink(missing_ok=True)
+        raise
+    directory = os.open(target.parent, os.O_RDONLY)
+    try:
+        os.fsync(directory)  # the rename itself survives a crash
+    finally:
+        os.close(directory)

nisse-core/src/nisse_core/views.py

@@ -0,0 +1,168 @@
+"""Per-role views of a work item's transcript (architecture L6; Development
+Plan M1.2).
+
+The log records every role's events in one work item. A model must not read
+another role's turns as its own: in the second live run the planner, shown
+the executor's tool calls as assistant turns, took that work for its own
+(#78). So what a role is shown is projected here, before rendering:
+
+- its own events, unchanged;
+- what the operator said, as a user message labelled with where it came from;
+- the orchestrator's facts and gates, as labelled statements;
+- another model role's work only where it needs it, and only as a labelled
+  report or narration, never as a turn.
+
+The projection keeps each event's id, so cursors (``after``) and compaction
+ranges still line up with the log. Everything not the viewer's own becomes a
+``UserMessage``: from where the viewer sits, it is all input.
+"""
+
+from collections.abc import Mapping
+from dataclasses import replace
+
+from nisse_core.canonical import (
+    ActionVerdict,
+    AssistantText,
+    DelegationCompleted,
+    DelegationStarted,
+    Fact,
+    GateOpened,
+    PlanSubmitted,
+    StoredEvent,
+    ToolCall,
+    ToolResult,
+    UserMessage,
+)
+
+# How much of another role's tool result a narration line keeps.
+NARRATION_RESULT_CHARS = 300
+
+
+def operator_label(source: str) -> str:
+    """Where an operator message came from, for its label."""
+    origin, _, idle = source.partition(" (sent while idle")
+    if origin.startswith("transport:"):
+        channel = "Matrix"
+    elif origin.startswith("gitea:pr:"):
+        number = origin.split(":")[2]
+        channel = f"comment on PR #{number}"
+    elif origin.startswith("gitea:issue-body:"):
+        channel = f"issue #{origin.split(':')[2]}"
+    elif origin.startswith("gitea:issue:"):
+        number = origin.split(":")[2]
+        channel = f"comment on plan issue #{number}"
+    elif origin.startswith("gitea:"):
+        channel = "Gitea comment"
+    else:
+        channel = origin or "unknown"
+    if idle:
+        channel += ", sent while idle"
+    return f"operator, {channel}"
+
+
+def _said(stored: StoredEvent, label: str, text: str) -> StoredEvent:
+    return replace(
+        stored,
+        event=UserMessage(text=f"[{label}] {text}", source=f"view:{stored.actor}"),
+    )
+
+
+def _narration(call: ToolCall, result: ToolResult | None) -> str:
+    target = call.arguments.get("path") or call.arguments.get("command")
+    step = f"{call.tool}({str(target)[:80]})" if target else call.tool
+    if result is None:
+        return f"{step} → no result recorded"
+    outcome = "ok" if result.success else "failed"
+    text = result.result.strip()
+    if len(text) > NARRATION_RESULT_CHARS:
+        text = text[:NARRATION_RESULT_CHARS] + " …"
+    return f"{step} → {outcome}: {text}" if text else f"{step} → {outcome}"
+
+
+def project(
+    events: list[StoredEvent],
+    viewer: str,
+    shown_by_viewer: Mapping[str, Mapping[str, str]],
+) -> list[StoredEvent]:
+    """The events as ``viewer`` should be shown them, in log order.
+    ``shown_by_viewer``: for each viewer, the roles whose work it is shown,
+    and how: "report" keeps only the handback, "narrate" keeps a line per
+    step. Anything not listed is not shown."""
+    # Verdicts are records about calls, never part of any role's context.
+    events = [e for e in events if not isinstance(e.event, ActionVerdict)]
+    shown = shown_by_viewer.get(viewer)
+    if shown is None:
+        # A role with no view defined (the expert is stateless, the
+        # classifier sees only an action) reads the log as it is, with
+        # results kept after their calls.
+        return _results_follow_calls(list(events))
+    results = {
+        e.event.call_id: e.event for e in events if isinstance(e.event, ToolResult)
+    }
+    out: list[StoredEvent] = []
+    for stored in events:
+        event, actor = stored.event, stored.actor
+        if isinstance(event, PlanSubmitted):
+            # A record for a helper's scope and the dump, not a turn: the
+            # driver's own call already carries what was agreed.
+            if viewer == "helper":
+                out.append(_said(stored, "approved plan", event.plan))
+            continue
+        if isinstance(event, DelegationStarted):
+            # The harness handing a task over: to the helper given it, a
+            # message from the harness, never its own turn (a request must
+            # end on the user's side; models refuse assistant prefill).
+            if actor == viewer:
+                out.append(_said(stored, "orchestrator", f"your task: {event.brief}"))
+            continue
+        if actor == viewer:
+            out.append(stored)
+        elif actor == "operator" and isinstance(event, UserMessage):
+            out.append(_said(stored, operator_label(event.source), event.text))
+        elif isinstance(event, Fact):
+            out.append(_said(stored, "orchestrator", event.text))
+        elif isinstance(event, GateOpened):
+            out.append(
+                _said(stored, "orchestrator", f"gate {event.gate}: {event.reason}")
+            )
+        elif shown.get(actor) == "report" and isinstance(event, DelegationCompleted):
+            out.append(
+                _said(
+                    stored,
+                    f"{actor} report, {event.exit_status}",
+                    event.handback,
+                )
+            )
+        elif shown.get(actor) == "narrate":
+            if isinstance(event, ToolCall):
+                line = _narration(event, results.get(event.call_id))
+                out.append(_said(stored, actor, line))
+            elif isinstance(event, AssistantText) and event.text.strip():
+                out.append(_said(stored, actor, event.text.strip()))
+    return _results_follow_calls(out)
+
+
+def _results_follow_calls(events: list[StoredEvent]) -> list[StoredEvent]:
+    """Keep each tool result right after its call, as both API formats
+    require: anything recorded while a call was in flight (a fact the
+    harness wrote while handling it, say) moves to just after the results.
+    A call with no result yet keeps its place; the renderer answers it."""
+    out: list[StoredEvent] = []
+    pending: set[str] = set()
+    held: list[StoredEvent] = []
+    for stored in events:
+        event = stored.event
+        if isinstance(event, ToolCall):
+            pending.add(event.call_id)
+            out.append(stored)
+        elif isinstance(event, ToolResult) and event.call_id in pending:
+            pending.discard(event.call_id)
+            out.append(stored)
+            if not pending:
+                out.extend(held)
+                held = []
+        elif pending:
+            held.append(stored)
+        else:
+            out.append(stored)
+    return out + held

nisse-core/src/nisse_core/worker.py

@@ -0,0 +1,138 @@
+"""The one thread that runs orchestrator work and owns the state store.
+
+Planning turns, milestones and review responses can each run for minutes.
+Running them on the thread that delivered the message blocked that thread for
+as long: the Matrix sync loop read nothing new until the work finished, so an
+operator's `stop` (L2) would only have arrived after the work it was meant to
+stop. Every handler now runs here instead, and transports only hand work over.
+
+Owning the store is the other half. SQLite connections are bound to the thread
+that opened them, and the store keeps that check on: it is opened on this
+thread, used only from it, and any future code that touches it from elsewhere
+fails loudly instead of racing.
+
+Jobs run one at a time, in order, so state changes never interleave — the
+guarantee the orchestrator's lock used to give.
+"""
+
+import sys
+import threading
+import traceback
+from collections import deque
+from collections.abc import Callable
+from concurrent.futures import Future
+from queue import Queue
+from typing import Protocol, TypeVar
+
+T = TypeVar("T")
+
+
+class Worker(Protocol):
+    @property
+    def busy(self) -> bool: ...
+
+    def submit(self, job: Callable[[], object]) -> None: ...
+
+    def call(self, job: Callable[[], T], timeout: float | None = None) -> T: ...
+
+
+class InlineWorker:
+    """Runs jobs on the caller's thread, for tests and single-threaded use.
+
+    A job submitted from inside a running job waits until that one finishes,
+    exactly as it would queue behind it on the real worker. Without that, a
+    test that says `stop` from inside a fake milestone would run the stop
+    handling in the middle of the milestone, which production never does.
+    """
+
+    def __init__(self) -> None:
+        self._pending: deque[Callable[[], object]] = deque()
+        self._running = False
+
+    @property
+    def busy(self) -> bool:
+        return self._running
+
+    def submit(self, job: Callable[[], object]) -> None:
+        self._pending.append(job)
+        if self._running:
+            return
+        self._running = True
+        try:
+            while self._pending:
+                self._pending.popleft()()
+        finally:
+            self._running = False
+
+    def call(self, job: Callable[[], T], timeout: float | None = None) -> T:
+        if self._running:
+            return job()  # already on the worker, as a nested call would be
+        box: list[T] = []
+        self.submit(lambda: box.append(job()))
+        return box[0]
+
+
+_STOP = object()
+
+
+def _report(exc: BaseException) -> None:
+    traceback.print_exception(exc, file=sys.stderr)
+
+
+class SerialWorker:
+    def __init__(
+        self,
+        *,
+        on_error: Callable[[BaseException], None] = _report,
+        name: str = "nisse-worker",
+    ) -> None:
+        self._queue: Queue[object] = Queue()
+        self._on_error = on_error
+        self._busy = False
+        self._thread = threading.Thread(target=self._run, name=name, daemon=True)
+
+    @property
+    def busy(self) -> bool:
+        return self._busy
+
+    def start(self) -> None:
+        self._thread.start()
+
+    def submit(self, job: Callable[[], object]) -> None:
+        self._queue.put((job, None))
+
+    def call(self, job: Callable[[], T], timeout: float | None = None) -> T:
+        """Run a job here and wait for its result. Raises TimeoutError if it
+        has not finished in time; the job itself still runs."""
+        if threading.current_thread() is self._thread:
+            return job()
+        future: Future[T] = Future()
+        self._queue.put((job, future))
+        return future.result(timeout)
+
+    def stop(self, timeout: float | None = None) -> None:
+        self._queue.put(_STOP)
+        self._thread.join(timeout)
+
+    def _run(self) -> None:
+        while True:
+            item = self._queue.get()
+            if item is _STOP:
+                return
+            job, future = item  # type: ignore[misc]
+            self._busy = True
+            try:
+                result = job()
+            except Exception as exc:  # noqa: BLE001 -- see below
+                # One failed job must not take the agent's only worker with
+                # it. A caller that waits gets the exception; otherwise it is
+                # reported and the next job runs.
+                if future is not None:
+                    future.set_exception(exc)
+                else:
+                    self._on_error(exc)
+            else:
+                if future is not None:
+                    future.set_result(result)
+            finally:
+                self._busy = False