agentirc-cli 9.2.0__tar.gz → 9.3.0__tar.gz

agentirc_cli-9.3.0/.claude/skills/pr-review/scripts/pr-sonar.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# pr-sonar.sh — list every SonarCloud finding attached to a PR.
+#
+# Surfaces what the GitHub-side `poll` cannot: SonarCloud issues,
+# security hotspots, and the duplication breakdown. The
+# sonarqubecloud[bot] PR comment only links to the dashboard — actual
+# findings live behind the SonarCloud API.
+#
+# Usage: pr-sonar.sh [--repo OWNER/REPO] [--sonar-key KEY] PR_NUMBER
+#
+# Defaults:
+#   --repo        auto-detected via `gh repo view`
+#   --sonar-key   derived from repo as `<owner>_<name>`
+#
+# Anonymous SonarCloud access is sufficient for public projects.
+# Requires: gh, jq, curl, python3.
+
+set -euo pipefail
+
+REPO=""
+SONAR_KEY=""
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --repo) REPO="$2"; shift 2 ;;
+        --sonar-key) SONAR_KEY="$2"; shift 2 ;;
+        *) break ;;
+    esac
+done
+
+PR_NUMBER="${1:?Usage: pr-sonar.sh [--repo OWNER/REPO] [--sonar-key KEY] PR_NUMBER}"
+
+if [[ -z "$REPO" ]]; then
+    REPO=$(gh repo view --json nameWithOwner -q .nameWithOwner)
+fi
+if [[ -z "$SONAR_KEY" ]]; then
+    SONAR_KEY="${REPO%%/*}_${REPO##*/}"
+fi
+
+echo "════════════════ SONARCLOUD (project=$SONAR_KEY, PR=$PR_NUMBER) ════════════════"
+
+# ── Quality gate
+QG=$(curl -fsS "https://sonarcloud.io/api/qualitygates/project_status?projectKey=${SONAR_KEY}&pullRequest=${PR_NUMBER}" || echo '{}')
+QG_STATUS=$(echo "$QG" | jq -r '.projectStatus.status // "UNKNOWN"')
+echo "Quality Gate: $QG_STATUS"
+echo "$QG" | jq -r '.projectStatus.conditions[]? | select(.status != "OK") | "  ✗ \(.metricKey) = \(.actualValue) (threshold \(.comparator) \(.errorThreshold))"' || true
+
+# ── Issues (BUG / VULNERABILITY / CODE_SMELL)
+ISSUES=$(curl -fsS "https://sonarcloud.io/api/issues/search?componentKeys=${SONAR_KEY}&pullRequest=${PR_NUMBER}&statuses=OPEN,CONFIRMED&ps=500" || echo '{}')
+ISSUE_TOTAL=$(echo "$ISSUES" | jq -r '.total // 0')
+echo
+echo "── Issues ($ISSUE_TOTAL OPEN/CONFIRMED) ─────────────────────────────"
+if [[ "$ISSUE_TOTAL" != "0" ]]; then
+    echo "$ISSUES" | jq -r '
+        .issues[] |
+        "  [\(.rule)] \(.severity)  \(.component | sub("^[^:]+:"; ""))(:\(.line // "?"))\n     \(.message)"
+    '
+fi
+
+# ── Security hotspots
+HOTSPOTS=$(curl -fsS "https://sonarcloud.io/api/hotspots/search?projectKey=${SONAR_KEY}&pullRequest=${PR_NUMBER}&status=TO_REVIEW&ps=500" || echo '{}')
+HOTSPOT_TOTAL=$(echo "$HOTSPOTS" | jq -r '.paging.total // 0')
+echo
+echo "── Hotspots ($HOTSPOT_TOTAL TO_REVIEW) ──────────────────────────────"
+if [[ "$HOTSPOT_TOTAL" != "0" ]]; then
+    echo "$HOTSPOTS" | jq -r '
+        .hotspots[] |
+        "  [\(.ruleKey)] \(.vulnerabilityProbability)  \(.component | sub("^[^:]+:"; ""))(:\(.line // "?"))\n     \(.message)"
+    '
+fi
+
+# ── Duplication
+MEAS=$(curl -fsS "https://sonarcloud.io/api/measures/component?component=${SONAR_KEY}&pullRequest=${PR_NUMBER}&metricKeys=new_duplicated_lines_density,new_duplicated_lines,new_duplicated_blocks" || echo '{}')
+DUP_PCT=$(echo "$MEAS" | jq -r '.component.measures[]? | select(.metric == "new_duplicated_lines_density") | .periods[0].value // ""')
+DUP_LINES=$(echo "$MEAS" | jq -r '.component.measures[]? | select(.metric == "new_duplicated_lines") | .periods[0].value // ""')
+DUP_BLOCKS=$(echo "$MEAS" | jq -r '.component.measures[]? | select(.metric == "new_duplicated_blocks") | .periods[0].value // ""')
+echo
+echo "── Duplication on new code ──────────────────────────────────────────"
+echo "  density: ${DUP_PCT:-?}%   lines: ${DUP_LINES:-?}   blocks: ${DUP_BLOCKS:-?}"
+
+if [[ "${DUP_BLOCKS:-0}" != "0" && -n "${DUP_BLOCKS:-}" ]]; then
+    # Per-file duplication: list every file with duplicated_lines on new code.
+    # Sonar doesn't expose per-PR duplication-by-file directly; surface the
+    # files that appear in the issues + hotspots as a weak proxy.
+    DUP_FILES=$(echo "$ISSUES" | jq -r '[.issues[] | .component | sub("^[^:]+:"; "")] | unique | .[]')
+    if [[ -n "$DUP_FILES" ]]; then
+        echo "  files with findings (likely duplication source):"
+        echo "$DUP_FILES" | sed 's/^/    - /'
+    fi
+fi
+
+echo
+echo "Dashboard: https://sonarcloud.io/dashboard?id=${SONAR_KEY}&pullRequest=${PR_NUMBER}"

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/.claude/skills/pr-review/scripts/workflow.sh

@@ -3,7 +3,8 @@
 #
 # Subcommands:
 #   lint              run the portability lint on the current diff (staged + unstaged)
-#   poll <PR>         fetch and display review comments
+#   poll <PR>         fetch and display review comments + SonarCloud findings
+#   sonar <PR>        list every SonarCloud issue / hotspot / duplication on a PR
 #   reply <PR>        batch reply to review comments (JSONL on stdin), --resolve
 #   delta             dump CLAUDE.md head + culture.yaml for each sibling project
 #                     listed in skills.local.yaml (alignment-delta check)
@@ -53,6 +54,12 @@ case "$cmd" in
     poll)
         PR="${1:?Usage: workflow.sh poll <PR>}"
         bash "$SCRIPT_DIR/pr-comments.sh" "$PR"
+        echo
+        bash "$SCRIPT_DIR/pr-sonar.sh" "$PR"
+        ;;
+    sonar)
+        PR="${1:?Usage: workflow.sh sonar <PR>}"
+        bash "$SCRIPT_DIR/pr-sonar.sh" "$PR"
         ;;
     reply)
         PR="${1:?Usage: workflow.sh reply <PR>  (JSONL on stdin)}"

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/CHANGELOG.md

@@ -4,6 +4,92 @@ All notable changes to this project will be documented in this file.
 
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [9.3.0] - 2026-05-01
+
+### Added
+
+- Test suite migration (PR-B3): 36 server-core / telemetry tests
+  vendored from `culture@df50942` (~6,500 LOC). 315 tests run under
+  `pytest -n auto` in ~29 seconds.
+  - 21 server-core tests in `tests/` cover IRC lifecycle, channels,
+    rooms, threads, history, federation (S2S), events, mentions,
+    and the icon skill.
+  - 15 telemetry integration tests in `tests/telemetry/` cover audit
+    JSONL emission, OTLP span injection on dispatch, S2S relay
+    spans, metrics initialization, and trace-context propagation.
+  - Test helper modules `_fakes.py` and `_metrics_helpers.py` also
+    vendored verbatim under the same package.
+- `tests/conftest.py` — adapted from culture. Drops the
+  `_BOTS_DIR_*` patches and the `server_with_bot` /
+  `server_with_bots` fixtures (see Changed below). Keeps the
+  `IRCTestClient` raw-TCP helper and the IRCd lifecycle, telemetry,
+  and audit fixtures.
+- `.claude/skills/pr-review/scripts/pr-sonar.sh` — new script that
+  fetches every SonarCloud issue, security hotspot, and duplication
+  measure for a PR via the SonarCloud API. `workflow.sh poll` now
+  runs it after `pr-comments.sh`; `workflow.sh sonar <PR>` runs it
+  standalone. Closes the gap where the GitHub-side poll only saw
+  the SonarCloud bot's "Quality Gate failed" link without the
+  underlying findings. Re-vendor to `steward` after this PR merges.
+- Three `[tool.citation]` packages:
+  `culture-tests-conftest` (paraphrase),
+  `culture-tests-server-core` (mostly quote, paraphrase for
+  `test_events_basic.py`), and `culture-tests-telemetry` (mostly
+  quote, paraphrase for `test_tracing.py`).
+
+### Changed
+
+- `agentirc/server_link.py:_replay_event` — parameter renamed from
+  `_seq` (PR-B1's unused-arg compliance variant) back to `seq` to
+  match the upstream signature culture's tests assume; signature
+  carries `# noqa: ARG002 # NOSONAR S1172`. Hash refreshed.
+
+### Fixed (post-review)
+
+- `requires-python = ">=3.10"` → `">=3.11"`; classifiers updated
+  (drop 3.10, add 3.13). Resolves Copilot/Qodo "asyncio.timeout
+  not in 3.10" findings. The 3.10 floor was inherited from PR-B1/B2
+  and would have ImportError'd on the first test run.
+- 2 SonarCloud `python:S5332` security hotspots cleared via
+  `# NOSONAR S5332` annotations on `tests/telemetry/test_config.py`'s
+  localhost OTLP test fixtures (URLs never reach the wire).
+- New `tests/_helpers.py` (agentirc-native, not cited) extracts the
+  duplicated "boot two linked IRCds" pattern into `boot_linked_pair`
+  + `link_pair`. Refactored 9 sites that previously inlined ~22
+  lines of identical scaffolding: 5 in `test_federation.py`, 3 in
+  `test_link_reconnect.py`, plus the `linked_servers` conftest
+  fixture. Drops ~180 duplicated lines, addressing SonarCloud's
+  >3% duplication threshold while keeping the cited test bodies
+  readable. Re-snapshots from culture replay this extraction
+  mechanically.
+- 42 SonarCloud OPEN issues cleared via inline `# NOSONAR <rule>`
+  annotations: `python:S1172` (server_link `_replay_event`'s upstream
+  signature compat), `python:S2068` (3 test fixture passwords),
+  `python:S7483` (3 `IRCTestClient.recv*` / `_wait_for_span` timeout
+  params kept by upstream design — see `RECV_TIMEOUT_SECONDS`
+  module-level note), `python:S7494` (2 `dict(t.split("=") for t in
+  tags)` patterns vendored verbatim from culture), `python:S125`
+  (1 `# 311 RPL_WHOISUSER` documentation comment SonarCloud
+  misclassified as commented-out code), `python:S1481` × 21
+  (`server_a, server_b = linked_servers` tuple-unpack sites where
+  one or both vars are used by the federation fixture but unread in
+  the test body — same idiom across 3 files; underscore-prefix
+  rename would diverge from culture upstream and complicate
+  re-snapshots).
+
+### Deferred / out of scope
+
+- Three bot-fixtured telemetry tests
+  (`test_bot_event_dispatch_span.py`, `test_bot_run_span.py`,
+  `test_metrics_bots.py`) and `test_welcome_bot.py` stay in culture
+  — they depend on the real `BotManager` (forbidden by agentirc's
+  dependency boundary). Bucket C tests (cli/console/daemon/clients)
+  also remain in culture indefinitely.
+- `tests/telemetry/conftest.py` is not migrated; its only consumer
+  was the deferred bot-fixtured tests above.
+- Bootstrap docs (`docs/api-stability.md`, `docs/cli.md`,
+  `docs/deployment.md`) ship in PR-B4.
+
 ## [9.2.0] - 2026-05-01
 
 ### Added

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/CLAUDE.md

@@ -2,20 +2,21 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-## Current state: server-core + real CLI + protocol module landed (9.2.0)
+## Current state: bootstrap functionally complete (9.3.0); docs slice (PR-B4) remains
 
-This repo is the agentirc server-core extraction out of the sibling project [`culture`](https://github.com/OriNachum/culture). As of 9.2.0:
+This repo is the agentirc server-core extraction out of the sibling project [`culture`](https://github.com/OriNachum/culture). As of 9.3.0:
 
 - **Server-core** (`agentirc/{ircd,server_link,channel,events,skill,remote_client,…}.py`, `agentirc/skills/{rooms,threads,history,icon}.py`) — vendored from `culture@df50942` via the `cite-don't-copy` pattern (see `[tool.citation]` in `pyproject.toml`).
 - **Client transport** (`agentirc/client.py`) — vendored from `culture/agentirc/client.py` in PR-B2. The bootstrap spec originally said this would "stay in culture", but the dependency-boundary analysis after PR-B1 showed `client.py` only imports already-vendored support modules plus opentelemetry. Without it, `agentirc/ircd.py:580`'s runtime `from agentirc.client import Client` raised `ImportError` on the first TCP IRC connection.
 - **Public CLI** (`agentirc/cli.py`) — real verb dispatch extracted from `culture/cli/server.py`. Verbs: `serve` (foreground, no PID; for systemd `Type=simple` and containers), `start`/`stop`/`status` (lifecycle), `restart`, `link` (peer-spec validator), `logs` (cat / tail of `~/.culture/logs/server-<name>.log`), `version`.
 - **Public protocol** (`agentirc/protocol.py`) — verb name constants, numerics, IRCv3 tag names. Wire-format quirks (`ROOMETAEND`, `ROOMETASET` typos, `ERR_NOSUCHCHANNEL` semantic misuse, `STHREAD` verb collapse) preserved verbatim — they need coordinated cross-repo bumps to fix.
+- **Test suite** (PR-B3, 9.3.0) — 36 tests vendored from `culture@df50942` (~6.5kloc), 315 tests run under `pytest -n auto` in ~29s on default workers. Three telemetry tests (`test_bot_event_dispatch_span`, `test_bot_run_span`, `test_metrics_bots`) and `test_welcome_bot` stay in culture because they depend on the real `BotManager`. `tests/conftest.py` was adapted to drop bot-loader sandboxing and the `server_with_bot` / `server_with_bots` fixtures.
 - **Internal support** (`agentirc/_internal/`) — `aio`, `constants`, `protocol/`, `telemetry/`, `virtual_client`, `pidfile` (PR-B2), `cli_shared/` (PR-B2), `bots/` stubs.
 
 End-to-end verified: `agentirc start --port <p>` boots a real IRCd, TCP NICK/USER handshake returns `001 RPL_WELCOME`, `agentirc stop` shuts cleanly. `agentirc serve` is byte-indistinguishable from `culture server start` for the lifecycle contract culture's shim relies on.
 
 What is **not** done yet:
-- **Test suite migration** is PR-B3 — only remaining bootstrap slice.
+- **Bootstrap docs (PR-B4)** — `docs/api-stability.md`, `docs/cli.md`, `docs/deployment.md`. Pure prose; not gating on culture's cutover (the public API surface is already importable; PR-B4 just documents the contract).
 
 Read the bootstrap spec at `docs/superpowers/specs/2026-04-30-bootstrap-design.md` for the full plan; it is the operative source of truth and is intentionally self-contained. The culture-side counterpart spec is at `../culture/docs/superpowers/specs/2026-04-30-agentirc-extraction-design.md` — not normally needed, but explains *why* if a decision looks arbitrary.
 
@@ -44,6 +45,13 @@ There are three different names in play. Don't conflate them:
 
 When migrating tests, the rule is: pure server tests come here, transport tests **also** come here now that we own `client.py`, mixed tests stay in culture and get rewritten to drive `agentirc serve` as a subprocess fixture rather than importing `IRCd` directly. When unsure, **prefer copying the test here** — this repo owns the IRCd and the client transport.
 
+### Test layout (since 9.3.0)
+
+- `tests/conftest.py` — paraphrase of culture's conftest. Drops the `_BOTS_DIR_*` `unittest.mock.patch` calls (no-op against agentirc's bot stubs) and the `server_with_bot` / `server_with_bots` fixtures. Keeps `IRCTestClient`, the IRCd lifecycle fixtures (`server`, `linked_servers`, `make_client*`, `server_welcome_disabled`), telemetry fixtures (`tracing_exporter`, `metrics_reader`, `audit_dir`), and the `TEST_LINK_PASSWORD` constant.
+- `tests/test_*.py` — 21 server-core tests + the agentirc-native `test_cli.py`. Cover IRC lifecycle, channels, rooms, threads, history, federation, events, mentions, the icon skill.
+- `tests/telemetry/test_*.py` — 15 telemetry integration tests covering audit JSONL emission, OTLP span injection on dispatch, S2S relay spans, metrics initialization, trace-context propagation. Uses two private helper modules `_fakes.py` (FakeWriter etc.) and `_metrics_helpers.py`. No `tests/telemetry/conftest.py` (the upstream one was bot-coupled).
+- Tests left in culture: `test_bot_event_dispatch_span.py`, `test_bot_run_span.py`, `test_metrics_bots.py`, `test_welcome_bot.py` (bot-manager-coupled), plus the entire bucket-C surface (cli, console, daemon, clients, credentials).
+
 ## Public API contract (semver-tracked)
 
 Only three modules are public. Everything else is internal and may be refactored without a major bump.
@@ -82,7 +90,7 @@ Do not rename on-disk artifacts during the bootstrap. That is explicitly out of
 # Dev setup
 uv venv && uv pip install -e ".[dev]"
 
-# Tests (the spec mandates parallel; no tests yet — collected 0)
+# Tests (315 collected, ~29s on default workers)
 pytest -n auto
 
 # Run a single test
@@ -91,7 +99,7 @@ pytest tests/path/to/test_file.py::test_name -v
 # CLI smoke
 agentirc --help
 agentirc-cli --help          # alias of agentirc
-agentirc version             # prints "agentirc 9.2.0"
+agentirc version             # prints "agentirc 9.3.0"
 python -m agentirc version   # equivalent
 
 # Lifecycle (functional since 9.2.0)
@@ -146,7 +154,8 @@ Per-machine paths for these skills go in `.claude/skills.local.yaml` (gitignored
 
 The full list lives in §"Acceptance criteria" of the bootstrap spec. The non-obvious ones:
 
-- `pip install agentirc-cli==9.2.0` on a clean venv produces working `agentirc` *and* `agentirc-cli` binaries (both pointing at `agentirc.cli:main`). ✅ since 9.0.0.
+- `pip install agentirc-cli==9.3.0` on a clean venv produces working `agentirc` *and* `agentirc-cli` binaries (both pointing at `agentirc.cli:main`). ✅ since 9.0.0.
 - `agentirc serve` is byte-indistinguishable from `culture server start` (same socket, same logs, same systemd integration). ✅ since 9.2.0.
 - `agentirc.config.{ServerConfig, LinkConfig, TelemetryConfig}`, `agentirc.cli.{main, dispatch}`, `agentirc.protocol.*` all import from a clean Python session. ✅ since 9.2.0.
-- `docs/api-stability.md` names the three public modules. ⏳ pending.
+- `pytest -n auto` passes for the migrated suite (315 tests, ~29s). ✅ since 9.3.0.
+- `docs/api-stability.md` names the three public modules. ⏳ pending PR-B4.

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentirc-cli
-Version: 9.2.0
+Version: 9.3.0
 Summary: Agent-friendly IRCd: server core for AI agent meshes
 Project-URL: Homepage, https://github.com/OriNachum/agentirc
 Project-URL: Issues, https://github.com/OriNachum/agentirc/issues
@@ -32,11 +32,11 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Communications :: Chat :: Internet Relay Chat
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: opentelemetry-api>=1.22
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc>=1.22
 Requires-Dist: opentelemetry-sdk>=1.22

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/agentirc/server_link.py

@@ -968,7 +968,7 @@ class ServerLink:
             except ValueError:
                 pass
 
-    async def _replay_event(self, _seq: int, event: Event) -> None:
+    async def _replay_event(self, seq: int, event: Event) -> None:  # noqa: ARG002  # NOSONAR S1172 — kept for upstream test signature compat
         """Replay a single event to the peer as S2S wire format."""
         origin = self.server.config.name
         # Federated events arrive with event.type as either an EventType enum

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/docs/superpowers/specs/2026-04-30-bootstrap-design.md

@@ -172,8 +172,8 @@ Wire-format quirks (`ROOMETAEND`, `ROOMETASET` typos; `ERR_NOSUCHCHANNEL` semant
 > - **Shape A — package skeleton** ✅ (PR #2, `9.0.0`): Tasks 1, 6, and a stub form of 9.
 > - **Shape B-1 — server-core extraction** ✅ (PR #3, `9.1.0`): Tasks 2, 4, 9 (runtime deps), partial 10. See the "Cite-don't-copy" subsection below.
 > - **Shape B-2 — real CLI + `protocol.py` + `client.py`** ✅ (PR-B2, `9.2.0`): Tasks 5, 7, plus vendoring `culture.pidfile`, `culture.cli.shared` (subset), and `culture/agentirc/client.py`. The bootstrap spec previously said `client.py` "stays in culture"; that decision was reversed in PR-B2 because (a) `agentirc/ircd.py:580`'s runtime `from agentirc.client import Client` was a guaranteed `ImportError` without it, and (b) `client.py` only imports already-vendored support modules — no backend-SDK pull-through.
-> - **Shape B-3 — test suite migration** (next PR): Task 8.
-> - **Remaining**: 10 (pre-commit + CI), 11–12 (docs), 13–18 (test run, acceptance, tag, publish, report-back).
+> - **Shape B-3 — test suite migration** ✅ (PR-B3, `9.3.0`): Task 8 + Task 13. 36 tests vendored from `culture@df50942` (~6.5kloc), 315 tests run under `pytest -n auto` in ~29s. `tests/conftest.py` adapted (paraphrase) to drop bot-loader sandboxing and bot-fixture definitions. Three telemetry/test_bot_*.py files plus `test_welcome_bot.py` stay in culture (BotManager-coupled). Bucket-C tests stay in culture indefinitely.
+> - **Remaining**: 11–12 (docs — `api-stability.md`, `cli.md`, `deployment.md`, ship in PR-B4), 14 (acceptance criteria spot-check), 16–18 (tag, publish, report-back to culture).
 >
 > Task 3 (`Copy protocol/extensions/ wholesale`) is dropped: that path doesn't exist in culture. Re-add only if/when culture creates it.
 
@@ -219,6 +219,15 @@ Tests from culture are sorted into three buckets:
 
 When in doubt, prefer moving tests *here* over leaving them in culture: this repo owns the IRCd, the client transport, and IRCd-internal tests should run in this repo's CI.
 
+**Realised in PR-B3 (9.3.0):**
+
+- 21 root server-core tests + 15 telemetry tests = 36 files (~6.5kloc) vendored verbatim with mechanical import rewrites (`culture.agentirc.X` → `agentirc.X`, `culture.protocol.message` → `agentirc._internal.protocol.message`, `culture.telemetry.X` → `agentirc._internal.telemetry.X`, `culture.agentirc.client` → `agentirc.client`).
+- `tests/conftest.py` adapted as paraphrase: dropped the `_BOTS_DIR_*` `unittest.mock.patch` calls (no-op against agentirc's no-op `_internal/bots/` stubs) and the `server_with_bot` / `server_with_bots` fixtures (`culture.bots.*` is forbidden).
+- `tests/telemetry/test_tracing.py` paraphrase: one `unittest.mock.patch` target rewritten from `"culture.telemetry.tracing.OTLPSpanExporter"` to `"agentirc._internal.telemetry.tracing.OTLPSpanExporter"`. OTEL service-name strings (`"culture.agentirc"`) and OTEL attribute keys (`"culture.s2s.*"`, `"culture.federation.peer"`, `"culture.dev/traceparent"`) preserved verbatim — they are public observability identifiers downstream consumers grep for.
+- `tests/test_events_basic.py` paraphrase: `with patch("culture.bots.bot_manager.BOTS_DIR", …)` block removed (same dead-weight rationale as the conftest patches).
+- `agentirc/server_link.py:_replay_event` parameter renamed from `_seq` (PR-B1's unused-arg compliance variant) back to `seq` to match the upstream signature culture's tests assume; signature carries a `# noqa: ARG002` to keep the linter quiet.
+- **Stayed in culture:** `test_bot_event_dispatch_span.py`, `test_bot_run_span.py`, `test_metrics_bots.py` (need real `BotManager` for the bot-event path), `test_welcome_bot.py` (inspects `bot_manager.bots`), and the 57-file bucket-C surface (cli, console, daemon, clients, credentials, mesh_config). `tests/telemetry/conftest.py` not migrated — its only consumer was the deferred bot tests above.
+
 ## Acceptance criteria
 
 - `pip install agentirc-cli==9.0.0` from PyPI produces working `agentirc` and `agentirc-cli` binaries on a clean venv (both pointing at `agentirc.cli:main`).

{agentirc_cli-9.2.0 → agentirc_cli-9.3.0}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "agentirc-cli"
-version = "9.2.0"
+version = "9.3.0"
 description = "Agent-friendly IRCd: server core for AI agent meshes"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 authors = [
     { name = "Ori Nachum" },
 ]
@@ -19,9 +19,9 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Communications :: Chat :: Internet Relay Chat",
 ]
 dependencies = [
@@ -245,7 +245,7 @@ sha256 = "477760b85e4acf861a92aaf0ea73550c07267e3c33740a412a3075598bfb68aa"
 
 [tool.citation.packages.culture-agentirc-server-core.files."server_link.py"]
 status = "paraphrase"
-sha256 = "709a8a7d2f7836b9bf382f7fb4d5046a61f8eac06e27323d87835615314d6bbe"
+sha256 = "b7c59d64c61bab8ce93595b9a406c7a6d5107ab4361a42f8ccd7ad0f5f7004e7"
 
 [tool.citation.packages.culture-agentirc-server-core.files."channel.py"]
 status = "paraphrase"
@@ -302,3 +302,181 @@ sha256 = "574682bfc9f042e8c1a304db17cfb4b1e1034f384241b83aaaecfb64decb2271"
 [tool.citation.packages.culture-agentirc-server-core.files."skills/icon.py"]
 status = "paraphrase"
 sha256 = "5ef97657599a37476b96aa59968373aed8c82024027297f8300be9886dc18d4a"
+
+[tool.citation.packages.culture-tests-conftest]
+schema = 2
+source = "https://github.com/OriNachum/culture/blob/df50942/tests/conftest.py"
+version = "df50942"
+target = "tests/"
+cited = "2026-05-01"
+
+[tool.citation.packages.culture-tests-conftest.files."conftest.py"]
+status = "paraphrase"
+sha256 = "3ee6fd43e2833f28a75363503519d63a16fe6f89843471707bf684e544cac360"
+
+[tool.citation.packages.culture-tests-server-core]
+schema = 2
+source = "https://github.com/OriNachum/culture/tree/df50942/tests"
+version = "df50942"
+target = "tests/"
+cited = "2026-05-01"
+
+[tool.citation.packages.culture-tests-server-core.files."test_channel.py"]
+status = "quote"
+sha256 = "ad335460aa043e9a9e3cce3e70d3ffef4ed0f8ae98138c6b8ec26e16044b1820"
+
+[tool.citation.packages.culture-tests-server-core.files."test_connection.py"]
+status = "paraphrase"
+sha256 = "243205febd7cfdca5b129b1ce4e1952802aa68f6999e0dc807ce15ac068dc996"
+
+[tool.citation.packages.culture-tests-server-core.files."test_discovery.py"]
+status = "quote"
+sha256 = "50d0dcad3f30f8b01215264147690786013e1753fae01cd682e6a415601394c8"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_basic.py"]
+status = "paraphrase"
+sha256 = "bf1e9175a6167b24c13c0f9da2eff923e7e557a3cb99606d7829a14e63596187"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_catalog.py"]
+status = "quote"
+sha256 = "4e986c18b98c6bd05232c7197c81873554225e3e7492db1b99986ac3039fec37"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_federation.py"]
+status = "quote"
+sha256 = "f79cd2caf57c264243734bc3ce9cd1cd5543afc46ee28b0a1a6c94ae50efa86a"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_history.py"]
+status = "quote"
+sha256 = "2148d1fbb951d5cf7f43d18088a92c268416ef5481837c37ca27cce3367e21db"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_lifecycle.py"]
+status = "quote"
+sha256 = "b60dc1d4eed3c6c9d689ad2a9958eee8f095d1864fbe2a3bbd3dceea52a84728"
+
+[tool.citation.packages.culture-tests-server-core.files."test_events_reserved_nick.py"]
+status = "quote"
+sha256 = "f387befe4df163861ec4b597c0fd330745107b3e36ba5604b69d872329418f50"
+
+[tool.citation.packages.culture-tests-server-core.files."test_federation.py"]
+status = "paraphrase"
+sha256 = "1a1812cdbbf3adf026dc52c791ceb45b076b4eea7f0aa5f9f048a631628aee1f"
+
+[tool.citation.packages.culture-tests-server-core.files."test_history.py"]
+status = "quote"
+sha256 = "066e674c847a54ec62fccd5bbaf1c524883e47e3867f9889279d48603b83ce4d"
+
+[tool.citation.packages.culture-tests-server-core.files."test_link_reconnect.py"]
+status = "paraphrase"
+sha256 = "876330d0fa8db1dcabcc352c362e0b59c7b6a02bb689e61a8e1e464af3ecf058"
+
+[tool.citation.packages.culture-tests-server-core.files."test_mentions.py"]
+status = "quote"
+sha256 = "2a0ec31bbace495fbee41813c319a3965396faaab24974fede2e8931d835b51e"
+
+[tool.citation.packages.culture-tests-server-core.files."test_messaging.py"]
+status = "quote"
+sha256 = "0e6d500f721d5ee5eba0616caeb4822ffbd7bb6f7eb9287be2aa0fea7d7293c5"
+
+[tool.citation.packages.culture-tests-server-core.files."test_modes.py"]
+status = "quote"
+sha256 = "35cd36a0171b824d638c89e021283843739eac8afc3dd846ec7e01115e6fd0e6"
+
+[tool.citation.packages.culture-tests-server-core.files."test_room_persistence.py"]
+status = "quote"
+sha256 = "3c4e320dc459faccdf86ac67e5a33134fa5a14cc283fe1f6e79a8c09d281cd8c"
+
+[tool.citation.packages.culture-tests-server-core.files."test_rooms_federation.py"]
+status = "paraphrase"
+sha256 = "d59f7c9cc95944d1e237fff99ee795f6281dcdccfefb39f4719f43f322085148"
+
+[tool.citation.packages.culture-tests-server-core.files."test_rooms_integration.py"]
+status = "quote"
+sha256 = "9dcfb16639533c44bf3633c61b19f3cd75c549cea3cdac9b5624ecf7196ab3eb"
+
+[tool.citation.packages.culture-tests-server-core.files."test_server_icon_skill.py"]
+status = "quote"
+sha256 = "c39526445af4861cab4b238ba27b00cc598cd0cf0312cea7e6d558eac62f6bd5"
+
+[tool.citation.packages.culture-tests-server-core.files."test_skills.py"]
+status = "quote"
+sha256 = "55b4d18ec526282d87055409bcc6a497a8766d2cad28b67bd5d21df9af95149f"
+
+[tool.citation.packages.culture-tests-server-core.files."test_threads.py"]
+status = "quote"
+sha256 = "0e31f65beea7521536c599b51fac36122eb9b42d50918d8c0bcb1d04d7f763bc"
+
+
+[tool.citation.packages.culture-tests-telemetry]
+schema = 2
+source = "https://github.com/OriNachum/culture/tree/df50942/tests/telemetry"
+version = "df50942"
+target = "tests/telemetry/"
+cited = "2026-05-01"
+
+[tool.citation.packages.culture-tests-telemetry.files."_fakes.py"]
+status = "quote"
+sha256 = "8358c340572006317fddadde2a07da75075f1426a3ded4cf04e4aa0b7c0f8b08"
+
+[tool.citation.packages.culture-tests-telemetry.files."_metrics_helpers.py"]
+status = "quote"
+sha256 = "1f6a01ecaa8c3577ebdd58eedb7146532688e602a2e39f3a4f323f10b6aa6c4f"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_audit_emit.py"]
+status = "quote"
+sha256 = "7b2c618443d5a5ff899ee830453537fb17256c5156c4a7242eee8017d557a2ed"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_audit_lifecycle.py"]
+status = "quote"
+sha256 = "24e17aac1d31530ed77e69f59391c30f48c69427ded4a1b28330e04464e7f872"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_audit_module.py"]
+status = "quote"
+sha256 = "e88c118abdf7f7f5241919a780417466ecf4f43180ee6dbf5253c9c05dece081"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_audit_parse_error.py"]
+status = "quote"
+sha256 = "34cd91ef77811c5024f1534700b005605e706aaa7234bc22524aab85c272df3c"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_config.py"]
+status = "paraphrase"
+sha256 = "150f9cb11d5737f154f0f85f8e7e65135482ad86010ca2386215f9a462ad2474"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_dispatch_span.py"]
+status = "quote"
+sha256 = "a5116e92d1d88da18f2cd5d026b69c0efbcdf3845c3da4c5f3177dfa46ade7fb"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_emit_event_span.py"]
+status = "quote"
+sha256 = "5fb0cf247669717f1add5392d18d3a5639d35d3350982b521a40e3ad031bc7ab"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_metrics_init.py"]
+status = "quote"
+sha256 = "bfe2b1166032ec027a0ab06b3124d31a9b9deccb431d0550e14fb83f0a778f21"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_metrics_s2s.py"]
+status = "paraphrase"
+sha256 = "b07815fba360afda871fb2ed2996087b5778d912027751da264e188e87a7b41f"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_outbound_inject.py"]
+status = "quote"
+sha256 = "1b2a5132dc1b02cb19ca9aa3edc951c2d0431ff9a26e649175eef72faafb7168"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_parse_error.py"]
+status = "quote"
+sha256 = "5cfeffe6ccb3b18e1d78669086cc9e6e1ac473f8929eb1d1bcd15523851dd284"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_s2s_relay_span.py"]
+status = "paraphrase"
+sha256 = "a2802230c8742b4a94e27f4854b81803119a41a5ca245d92d67001c0e2356489"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_server_init.py"]
+status = "quote"
+sha256 = "16ad131fdb48a8ff0162227f68d0b50ac4f9dc783dbd0d8061112613efff72f5"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_server_link_inject.py"]
+status = "paraphrase"
+sha256 = "ce2de77e1002758976e7ac50bd61cbc8a551e128b285eb01e4a1cf23ce3aa148"
+
+[tool.citation.packages.culture-tests-telemetry.files."test_tracing.py"]
+status = "paraphrase"
+sha256 = "1847662286c1d15848ae3624f61c88f78f1f5d16ab30af3e77981c94e9e5c86d"

agentirc_cli-9.3.0/tests/_helpers.py

@@ -0,0 +1,96 @@
+"""Shared test helpers, agentirc-native (NOT vendored from culture).
+
+Extracted to address SonarCloud's >3% duplication threshold. The
+boot-linked-pair pattern repeats verbatim across the cited
+``test_federation.py`` (5 sites), ``test_link_reconnect.py`` (3
+sites), and the ``linked_servers`` conftest fixture; CPD flags it as
+~22 lines × 9 = ~200 lines of duplicated test scaffold.
+
+Why these tests can't share the existing ``linked_servers`` pytest
+fixture: each one needs to drive the boot/link/teardown lifecycle
+itself — duplicate-link rejection, slow-link teardown, mid-test
+peer kill, backfill replay — and the function-scoped fixture starts
+both servers + completes the handshake before the test body runs.
+
+Re-snapshotting from a future culture commit means re-running the
+same extraction: replace each ~22-line inline boot block with a
+single ``boot_linked_pair(tmp_path)`` call. Mechanical sed pattern.
+"""
+
+from __future__ import annotations
+
+import asyncio
+
+from agentirc.config import LinkConfig, ServerConfig, TelemetryConfig
+from agentirc.ircd import IRCd
+
+from tests.conftest import TEST_LINK_PASSWORD
+
+
+async def boot_linked_pair(
+    tmp_path,
+    *,
+    link_password: str = TEST_LINK_PASSWORD,
+    with_audit: bool = False,
+    webhook_port: int | None = None,
+) -> tuple[IRCd, IRCd]:
+    """Boot two IRCd instances pre-wired with link configs.
+
+    Returns ``(server_a, server_b)`` after both ``start()`` calls
+    have returned with OS-assigned ports populated. Does NOT drive
+    the S2S handshake — caller decides whether to call
+    :func:`link_pair` or invoke ``connect_to_peer`` manually.
+
+    ``with_audit=True`` plumbs ``TelemetryConfig(audit_dir=...)``
+    onto each side, isolating audit JSONL writes to ``tmp_path``.
+    ``webhook_port=0`` suppresses the webhook listener — the
+    ``linked_servers`` fixture sets this; the inline sites do not.
+    """
+    kwargs_a: dict = {"links": [
+        LinkConfig(name="beta", host="127.0.0.1", port=0, password=link_password)
+    ]}
+    kwargs_b: dict = {"links": [
+        LinkConfig(name="alpha", host="127.0.0.1", port=0, password=link_password)
+    ]}
+    if with_audit:
+        kwargs_a["telemetry"] = TelemetryConfig(audit_dir=str(tmp_path / "audit_alpha"))
+        kwargs_b["telemetry"] = TelemetryConfig(audit_dir=str(tmp_path / "audit_beta"))
+    if webhook_port is not None:
+        kwargs_a["webhook_port"] = webhook_port
+        kwargs_b["webhook_port"] = webhook_port
+
+    config_a = ServerConfig(name="alpha", host="127.0.0.1", port=0, **kwargs_a)
+    config_b = ServerConfig(name="beta", host="127.0.0.1", port=0, **kwargs_b)
+    server_a = IRCd(config_a)
+    server_b = IRCd(config_b)
+    await server_a.start()
+    await server_b.start()
+    # `_server` is set by `start()` — assert for type-checker / SonarCloud
+    # S2259, since the IRCd type carries `_server: asyncio.AbstractServer | None`.
+    assert server_a._server is not None
+    assert server_b._server is not None
+    server_a.config.port = server_a._server.sockets[0].getsockname()[1]
+    server_b.config.port = server_b._server.sockets[0].getsockname()[1]
+    return server_a, server_b
+
+
+async def link_pair(
+    server_a: IRCd,
+    server_b: IRCd,
+    *,
+    link_password: str = TEST_LINK_PASSWORD,
+) -> None:
+    """Drive the S2S handshake on a booted linked-pair.
+
+    Updates each side's ``LinkConfig`` with the actual OS-assigned
+    port (the ``links=[…port=0]`` placeholder gets resolved here),
+    calls ``connect_to_peer`` from A → B, and polls up to ~2.5s for
+    both sides to see the link before returning.
+    """
+    server_a.config.links[0].port = server_b.config.port
+    server_b.config.links[0].port = server_a.config.port
+    await server_a.connect_to_peer("127.0.0.1", server_b.config.port, link_password)
+    for _ in range(50):
+        if "beta" in server_a.links and "alpha" in server_b.links:
+            break
+        await asyncio.sleep(0.05)