agnes-the-ai-analyst/tests/test_session_processor_usage.py
minasarustamyan c6c72b9c00
feat(flea): marketplace refactor — data model, attribution, UI unification (#342)
* feat(flea): phase-1 — title, tagline, synthetic_name columns + upload UX

Schema v49 adds three user-facing metadata columns to store_entities:

- title (NOT NULL) — humanized display name shown on marketplace
  surfaces in later phases. Acronym-aware humanizer in
  src/store_naming.py (27 entries: MCP, API, OAuth, S3, …) shared
  with the frontend via Jinja-injected dict so JS pre-fill and
  Python backfill produce identical output.
- tagline (NULL, ≤200 chars) — optional short description for card
  listings. Long-form `description` stays.
- synthetic_name (NOT NULL) — deterministic `<name>-by-<owner_username>`
  stored as a column for indexing and as the single source of truth
  for attribution lookups in later phases. Today's bundle bake still
  uses suffixed_name() at the same call sites.

Migration (_v48_to_v49_migrate, Python function — humanize has no
SQL equivalent) backfills existing rows: title from
humanize_name(strip_archive_suffix(name)), synthetic from the concat
formula; tagline stays NULL. Idempotent (ADD COLUMN IF NOT EXISTS +
SET NOT NULL no-op on re-run).

Upload form (store_upload.html step 2) reorders fields: Title
(pre-filled from server-side humanize, JS keeps it in sync until
the user edits manually) → Name + dark synthetic preview on one
row (matches marketplace_item_detail.html dark code styling, no
copy button — preview only) → Short description with character
counter → Description (unchanged). Edit form (store_edit.html)
mirrors the layout with pre-filled values from the entity row.

API:

- POST /api/store/entities/preview returns `title` (humanized
  fallback) for upload form pre-fill.
- POST + PUT /api/store/entities accept `title` and `tagline` form
  fields with 100/200-char validation; PUT recomputes
  synthetic_name when `name` changes (caller responsibility per
  repo contract).
- StoreEntityResponse exposes all three new fields.

Repository:

- create() takes title + tagline + synthetic_name as optional
  kwargs with derived defaults (humanize_name(name) / concat) so
  existing test fixtures don't need to thread them.
- update() supports partial updates on all three; tagline empty
  string clears via NULL sentinel.
- archive() recomputes synthetic_name on rename to the archived
  slug so the column stays consistent with name.

Tests:

- New test_schema_v48_to_v49_migration.py: fresh install,
  populated-row backfill (incl. archived row strip), idempotence,
  NOT NULL constraint verification.
- test_store_naming.py: 14 humanize parametrize cases + acronym
  dict invariants.
- test_store_api.py::TestStoreV49Metadata: preview humanize, POST
  with explicit + fallback title, 100/200-char rejects, PUT
  partial update + synthetic recompute on rename.
- Schema version assertion bumps (48 → 49) in test_db_schema_version,
  test_home_stats, test_schema_v42_migration, test_schema_v46_migration.

Phase 1 only — surface rendering on cards / detail pages and
Claude Code bundle propagation come in later phases.

* feat(flea): phase-2 — wire title/tagline/owner through marketplace cards + detail pages

Phase 1 (7f4cfcbb) populated the three new columns on store_entities;
phase 2 surfaces them across the web presentation layer so the kebab-
case slug + bare username no longer leak into user-facing copy.

API:

- `_flea_to_item` now takes `conn` (both callsites updated) and sets
  `display_name=entity.title`, `tagline=entity.tagline`, `owner=
  _resolve_owner_display(conn, owner_user_id, owner_username)` —
  matches the chain the curated path already uses (users.name →
  users.email → fallback). The card JS chain `it.display_name ||
  it.name` then renders the friendly form; `name` stays at the
  suffixed slug as the technical identifier JS uses for fallbacks.
- `flea_detail` adds `display_name` + `tagline` to PluginDetailResponse
  so the standalone skill/agent + plugin detail heroes pick them up
  through the existing `d.display_name` / `d.tagline` chains.
- `_flea_inner_parent_fields` swaps `parent_display_name` from
  `strip_archive_suffix(name)` to `entity.title or strip_archive_suffix(
  name)`. Drives parent-plugin label in four surfaces at once:
  breadcrumb 3rd segment, hero "part of <plugin>" meta-row,
  helper "This skill is part of <plugin>" panel, and the Details
  sidebar's "Parent plugin" row.

Templates — `marketplace_item_detail.html`:

- Pre-render: browser title, hero h1, and hero-window-label read
  `(entity.title if entity else None) or inner_name or item_name or
  plugin_name` so the SSR shell shows the friendly title before the
  JS fetch lands (no flash of kebab-case).
- Breadcrumb last segment for flea standalone drops the `d.manifest_name
  || heroTitle` fallback in favour of just `heroTitle` — manifest_name
  is the suffixed slug and users explicitly didn't want it in the path.
- Hero meta-row for flea standalone is now hidden. The prior "by
  <author> · N installed · <size>" line duplicated install count
  (hero telemetry chip below), owner + bundle size (Details sidebar).

Templates — `marketplace_plugin_detail.html`:

- Same SSR pre-render swap (title, h1, window-label, crumb-name).
- Hero tagline element starts hidden; JS shows it only when
  `d.tagline` is truthy. Pre-fix it fell back to `d.description`
  (long-form text), which read awkwardly under the h1 and pulled the
  hero too tall. Description still renders in the "What it does"
  panel below the hero.
- Initial "Loading…" placeholder removed so entities without a
  tagline don't flash that text mid-fetch.

Tests:

- New `TestFleaPhase2Presentation` class in test_marketplace_api.py
  (6 cases): card title + tagline + full-name owner, owner fallback
  chain when users.name is NULL, flea_detail exposes title + tagline,
  tagline null when omitted, inner skill parent_display_name uses
  entity.title (explicit + humanize-fallback variants).
- Updated `TestListItems.test_flea_lists_uploads` to assert both
  `display_name == "Alpha"` (humanized) and `name ==
  "alpha-by-alice"` (suffixed slug compat).
- Updated `TestWebPages.test_marketplace_flea_detail_page_renders`
  to look for the humanized title ("Page Skill") in the SSR shell
  instead of the kebab-case `page-skill`.

* feat(flea): phase-3 — read synthetic_name from DB, suffixed_name() only on write

Phase 1 added the column + backfill, repo write paths keep it in sync.
Phase 3 routes every READ callsite through `store_entities.synthetic_name`
directly instead of recomputing `<name>-by-<owner_username>` on the fly,
and switches the collision query off the inline string concat. The
`suffixed_name()` primitive now lives exclusively in write flows.

Read callsites updated (all read `entity["synthetic_name"]` directly,
no fallback — the column is NOT NULL and a missing value would be a
real bug worth surfacing as KeyError):

- app/api/marketplace.py:_flea_to_item — card MarketplaceItem.name.
- app/api/marketplace.py:flea_detail — PluginDetailResponse.manifest_name.
- app/api/store.py:_entity_to_response — StoreEntityResponse.invocation_name.
- app/api/store.py PUT bundle re-bake — `suffixed` passed to
  `_bake_plugin_tree`; entity is loaded pre-rename, so its
  synthetic_name is the OLD value `_bake_plugin_tree` expects.
- app/api/store.py PUT rename — `old_suffix` for `_rename_baked_tree`.
- app/api/my_stack.py — StoreInstallEntry.invocation_name.
- src/marketplace_filter.py — manifest_name in served plugin entry.

`suffixed_name` imports removed from marketplace.py, my_stack.py, and
marketplace_filter.py (no remaining callsites). store.py keeps the
import for its write paths:

- POST create (`suffixed = suffixed_name(final_name, username)` →
  passed to `_bake_plugin_tree` and `repo.create(synthetic_name=...)`).
- PUT rename collision check (`new_suffixed`).
- PUT rename `new_suffix` for `_rename_baked_tree` (proposed value).
- PUT rename `new_synthetic` for `repo.update(synthetic_name=...)`.
- Archive `old_suffix` + `new_suffix` for `_rename_baked_tree`
  (retro-compute pre-archive value after `repo.archive` already
  overwrote the DB row with the post-archive synthetic).

Collision SQL — `_suffixed_already_taken`:

  WHERE name || '-by-' || owner_username = ?   (before)
  WHERE synthetic_name = ?                     (after)

Same matches today (phase 1 backfill + NOT NULL invariant + write
paths in sync); indexable + single source of truth going forward.

Repository:

- UserStoreInstallsRepository.list_for_user explicit SELECT extended
  with `se.title`, `se.tagline`, `se.synthetic_name` so my_stack and
  marketplace_filter callers can read them off the joined row.

Tests:

- test_store_api.py::test_invocation_name_reads_from_synthetic_column —
  upload entity, manually override the column with a non-canonical
  value, verify GET response returns the override (proves read path
  consumes the column, not recomputes).
- test_marketplace_api.py::test_flea_card_and_detail_read_synthetic_name_from_db —
  same proof for `MarketplaceItem.name` (card) and
  `PluginDetailResponse.manifest_name` (detail).

* feat(flea): phase-4 — rename agnes-store-bundle → flea (synthetic plugin)

The synthetic plugin that wraps loose flea-market skills + agents into
one Claude Code plugin is renamed from `agnes-store-bundle` to `flea`.
Plugin-type flea uploads (their own standalone plugin entry) are
unaffected.

Constants:
- src/marketplace_filter.py:
  - BUNDLE_PLUGIN_NAME: "agnes-store-bundle" → "flea"  (Claude Code
    plugin manifest name + .claude-plugin/plugin.json name)
  - BUNDLE_PREFIXED_NAME: "store-bundle" → "flea"      (on-disk ZIP /
    git tree path, now plugins/flea/...)

Attribution layer (services/session_processors/usage_lib.py):
- FLEA_BUNDLE_PREFIX: "agnes-store-bundle" → "flea". The JSONL
  invocation identifier going forward is `flea:<skill-name>`.
- New `_LEGACY_FLEA_BUNDLE_PREFIXES = ("agnes-store-bundle",)`.
  `MarketplaceItemLookup.resolve()` + `_attribute_event()` accept BOTH
  the new and the legacy prefix so historic usage_events (~90-day
  retention) continue attributing to source='flea'. The tuple becomes
  a no-op once the rename has been live past the retention window —
  a follow-up commit can drop it then.
- USAGE_PROCESSOR_VERSION bumped 6 → 7 so the session-pipeline reprocess
  loop re-runs attribution with the new + legacy prefix branches.

User-facing copy:
- /api/store/bundle.zip Content-Disposition filename: agnes-store-bundle.zip → flea.zip
- `agnes admin store pull` default --out: agnes-store-bundle.zip → flea.zip
- Docstrings + JS comment + welcome template comment updated.

Tests:
- skill_flea.jsonl fixture identifier updated to flea:flea-skill.
- New skill_flea_legacy.jsonl with the legacy prefix for backward-compat
  coverage.
- New test `test_legacy_agnes_store_bundle_prefix_resolves` replays the
  legacy fixture and asserts source='flea' attribution still lands.
- All other test assertions / mocks substituted mechanically:
  test_session_processor_usage.py, test_usage_rollups.py,
  test_marketplace_filter_store.py, test_store_api.py,
  test_cli_refresh_marketplace.py.
- `_seed_flea_entity` (test_usage_rollups.py) + `_seed_attribution`
  (test_session_processor_usage.py) helpers now supply the NOT NULL
  `title` + `synthetic_name` columns from phase 1, since they INSERT
  directly bypassing the repo's create() fallback.

Client rollover note (CHANGELOG): `agnes refresh-marketplace` will
install the new `flea@agnes` plugin and the local marketplace clone's
`plugins/store-bundle/` source folder is removed via `git reset --hard`.
Whether Claude Code itself auto-prunes the orphan `agnes-store-bundle
@agnes` registry entry is undocumented — to verify empirically on the
dev VM. If the orphan entry lingers, a follow-up will add targeted
cleanup; until then users can manually run
`claude plugin uninstall agnes-store-bundle@agnes`.

Verified locally: 98 passed (session_processor_usage + usage_rollups +
marketplace_filter_store + cli_refresh_marketplace) + 228 passed/2
skipped (store_api + marketplace_api + admin_store_submissions +
store_entity_versions + store_repositories).

* fix(flea): phase-5 — attribution keyspace mismatch (closes #335)

Pre-fix every flea skill/agent invocation silently fell through to
`usage_events.source = 'builtin'`. Root cause: lookup tables in
`services/session_processors/usage_lib.py` keyed `_flea_entities` (and
the derived `_flea_plugins` set) by `store_entities.name` — the
un-suffixed display name. Claude Code writes invocations as
`flea:<synthetic_name>` (e.g. `flea:xlsx-by-c-marustamyan`), so
`dict.get(local)` always missed and the resolver fell through to
builtin. Result: marketplace cards, detail telemetry chips, admin
group-by-source all showed 0 flea invocations even when the raw
JSONL stream was correct.

Phase 1 added the `synthetic_name` column + backfill; phase 4 renamed
the bundle prefix to `flea`; phase 5 finally flips the lookup
keyspace to match what JSONL writes.

usage_lib.py:
- `MarketplaceItemLookup.__init__` preload: `SELECT synthetic_name,
  type FROM store_entities` (was `SELECT name, type`). `_flea_plugins`
  set derived from those keys, so it now carries synthetic_names
  too — matches what Claude Code writes when invoking a skill nested
  inside a flea plugin (`<synthetic>:<inner>`).
- `rebuild_rollups` preload: same SELECT change; also derives
  `flea_plugins` and threads it through `_aggregate_events` /
  `_rebuild_window`.
- `_attribute_event`: signature extended with `flea_plugins`; new
  branch `if prefix in flea_plugins: return ("flea", default_type,
  prefix, local)` for flea-plugin-nested skills/agents. This branch
  was added to `MarketplaceItemLookup.resolve()` in v6 (commit
  e076ebbe) but the rollup builder's helper was never updated to
  match, so nested skills inside flea plugins silently dropped out
  of the daily/window fact tables.
- `USAGE_PROCESSOR_VERSION`: 7 → 8. Forces the session-pipeline
  reprocess loop to re-attribute existing usage_events rows with
  the corrected lookup so rollup tables fill correctly on the next
  tick.

marketplace.py — 4 API stats lookup callsites switched from
`entity["name"]` to `entity["synthetic_name"]`:
- `_flea_to_item` (card stats lookup)
- `flea_detail` (`_build_telemetry` + `_load_inner_items_stats_by_parent`)
- `flea_skill_detail` (inner detail `parent_plugin` key)
- `flea_agent_detail` (inner detail `parent_plugin` key)

Tests:
- `skill_flea.jsonl` invocation: `flea:flea-skill` →
  `flea:flea-skill-by-alice` (mirrors what Claude Code writes after
  phase 1/4 — the suffixed synthetic_name).
- `test_flea_skill_attributed_with_empty_parent` assertion: rollup
  `name` column now carries the synthetic_name.

No legacy `agnes-store-bundle` prefix backward compat — clean cut per
user direction (dev phase, no production data worth preserving).

Verified locally: 53 passed targeted (session_processor_usage +
usage_rollups + marketplace_filter_store) + 215 passed/2 skipped
broader (store_api + marketplace_api + admin_store_submissions +
store_entity_versions).

* fix(flea): phase-6 — plugin-level rollup aggregation parity for flea

Flea plugin entity cards + detail pages showed 0 invocations even
though nested skills had correct rollup rows. Root cause: the
plugin-level aggregation pass in `_aggregate_events` was hardcoded
to `source='curated'` only:

    if source != "curated" or not parent:
        continue
    if group_by_day:
        pkey = (day, "curated", "plugin", "", parent)
    else:
        pkey = ("curated", "plugin", "", parent)

So flea plugin entities never got a synthetic
`(source='flea', type='plugin', parent_plugin='', name=<synth>)`
row aggregating nested invocations. `_load_invocation_stats('flea')`
filters `parent_plugin = ''` and returned no row for flea plugin
entity cards, so `stats.get(entity["synthetic_name"])` missed and
the API exposed 0/0.

Triggered by empirical observation on the dev VM —
`codex-second-opinion-by-c-marustamyan` plugin showed 0 calls in
the listing card while its three inner skills (codex-setup ×3,
codex-review ×1, codex-second-opinion ×1) had the expected child
rollup rows.

Fix:

- Extend the guard to `source in ("curated", "flea")`.
- Replace the hardcoded `"curated"` in the `pkey` tuple with the
  loop's `source` variable, so flea aggregation lands as `source=
  'flea'` and curated aggregation continues landing as
  `source='curated'`.

API path unchanged — `_load_invocation_stats('flea')` filters
`parent_plugin = ''` already picks up the new aggregated row
alongside standalone skill/agent rows. Rollup `name` field carries
the synthetic_name keyspace; no collision between standalone entity
synthetic and plugin entity synthetic (global suffix uniqueness
enforced by `_suffixed_already_taken`).

`USAGE_PROCESSOR_VERSION` bumped 8 → 9 to force a reprocess pass so
historic nested-invocation data fills the new plugin-level rows on
the next tick (instead of waiting for the next live invocation).

Tests:

- New `test_flea_plugin_row_aggregates_children` mirrors the existing
  `test_curated_plugin_row_aggregates_children`: seeds a flea plugin
  entity, three nested events (one user invoking two skills, a
  second user invoking one) → asserts the aggregated plugin row
  carries count=3, distinct_users=2 (union, not sum), plus the child
  rows survive alongside.

Verified locally: 43 passed (session_processor_usage + usage_rollups)
+ 82 passed/2 skipped broader (+ marketplace_filter_store +
marketplace_api).

* refactor(marketplace): phase-7 — unify Details sidebar across detail surfaces

Five marketplace detail surfaces (curated plugin, flea plugin, curated
inner skill/agent, flea inner skill/agent, flea standalone skill/agent)
had drifted on which Details rows they show and what order — the same
field landed in different positions, some fields duplicated hero info,
and the flea plugin Owner row leaked the kebab-case `owner_username`
slug instead of the user's real name. This commit aligns all five
surfaces on a single scan order driven by UX priority:

  identity → life-stage → telemetry → debug-tier

Concretely:

  1. Curator / Owner          (first scan signal — trust)
  2. Parent plugin            (inner skill/agent only)
  3. Released                 (top-level only — plugins + flea standalone)
  4. Last used                (recency)
  5. Active days              (engagement consistency)
  6. Version                  (flea standalone only — content hash)
  7. Bundle size              (debug-tier)

Dropped:

  - Slug field on plugin detail surfaces (`marketplace_id` for curated,
    `entity_id` for flea). Pure debug info, never user-relevant; URL
    already carries it.
  - Category + Installs on flea standalone skill/agent detail.
    Category is already shown as a hero badge; install count is in
    the hero telemetry chip — sidebar duplication added noise.

Owner display:

  - Flea plugin Owner row now reads `d.owner_display` (resolved through
    `users.name → users.email → owner_username` by `_resolve_owner_display`
    in `app/api/marketplace.py:1491`) instead of the raw `d.author_name`
    (which is `owner_username`, the kebab-case slug). API field already
    populated from phase 2; templates just consume it.
  - Curated Curator row continues to read `d.author_name` from
    marketplace-metadata.json; `owner_todo` placeholder behavior
    preserved.

Files:

  - app/web/templates/marketplace_plugin_detail.html — rewrote the
    Details render loop (lines 1364-1427 area). Slug row removed,
    rows reordered, Owner branch reads `d.owner_display`.
  - app/web/templates/marketplace_item_detail.html — both branches of
    the Details sidebar (inner skill/agent + flea standalone) re-laid
    around the same scan order. Telemetry helper unchanged, just
    repositioned. Category + Installs rows removed from the
    standalone branch.

No new tests — no existing test asserts the precise order of Details
rows or references the dropped fields in a sidebar context (grep
confirmed). API surface unchanged.

Verified locally: 84 passed / 2 skipped on `test_marketplace_api.py`
+ `test_store_api.py`.

* fix(flea): post-review hardening — N+1, v50 UNIQUE, docs, test cleanup

Addresses 5 critical findings from PR #342 code review:

1. N+1 query in `_flea_to_item` — owner-display resolution previously
   ran one `SELECT … FROM users WHERE id = ?` per item in the listing
   comprehension. Now batched via `_load_users_display` IN-query
   prefetch; 50 items drops 51 user queries to 2. Regression-guarded
   by `TestFleaOwnerDisplayBatched` (spies `_resolve_owner_display`
   and asserts it's not called inside the list path).

2. Misleading comment in `src/marketplace_filter.py` claimed the
   attribution layer accepts both `agnes-store-bundle` and `flea`
   prefixes — it doesn't (clean cut per CHANGELOG). Rewrote to match
   reality.

3. CHANGELOG `[Unreleased]` had two `### Changed` blocks. Merged into
   one (BREAKING bullet first).

4. New v49→v50 migration adds `UNIQUE INDEX
   idx_store_entities_synthetic_name`. v49 made `synthetic_name` the
   canonical attribution key but uniqueness was only app-enforced;
   v50 promotes the invariant to the DB layer. Migration pre-checks
   for existing duplicates and raises `RuntimeError` listing them
   rather than letting `CREATE UNIQUE INDEX` fail mid-way. v48→v49
   migration gained an `is_nullable='YES'` guard on its `SET NOT NULL`
   ALTERs so re-runs on a fully-migrated DB don't trip DuckDB's
   "cannot alter entry … entries depend on it" block (the new index
   counts as such an entry). Index is created by the migration only —
   keeping it out of `_SYSTEM_SCHEMA` preserves fresh-install ordering
   (CREATE TABLE → v49 ALTERs → v50 CREATE INDEX).

5. Deleted three redundant version-pinned schema asserts whose names
   lied about their bodies (`test_schema_version_is_42` asserting
   `== 49`, etc.). Canonical assert lives in
   `test_db_schema_version.py`, renamed to
   `test_schema_version_matches_constant`.

* fix(db): gate v34→v38 store_entities ALTER COLUMN steps on column state

CI on Linux failed `test_v17_to_v18_drops_*` after the v50 UNIQUE INDEX
landed. Root cause: those tests open a DB at the full target version,
seed fixtures, then reset `schema_version` to 17 and reopen — forcing
the ladder to re-run from 17 → current. With the v50 index now in place,
DuckDB blocks intermediate `ALTER COLUMN` steps on `store_entities`
("Cannot drop this column: an index depends on a column after it!" /
"Cannot alter entry because there are entries that depend on it"),
because `synthetic_name` (the indexed column) sits positionally after
the columns those steps touch.

Fix: convert the three SQL-list migrations that hit store_entities into
defensive Python functions:

- `_v34_to_v35_migrate` short-circuits when `synthetic_name` already
  exists (post-v49 shape — the visibility_status rebuild is moot and
  the DROP COLUMN would be blocked by the index).
- `_v35_to_v36_migrate` gates the `visibility_status SET NOT NULL` +
  `SET DEFAULT` on `is_nullable='YES'` so it's a true no-op when the
  column is already constrained.
- `_v37_to_v38_migrate` gates the `version_no SET NOT NULL` step the
  same way.

Forward-roll path (real installs that never reset schema_version) is
unchanged: the gates fire `YES` → ALTERs run. The fix only changes
behavior for the "DB is already at v50 shape but version row says 17"
scenario the tests construct.

---------

Co-authored-by: Minas Arustamyan <arustamyan.minas@gmail.com>
2026-05-19 02:32:41 +02:00

473 lines
18 KiB
Python

"""Tests for UsageProcessor — fixture-driven, covers extraction, attribution, errors,
idempotency, and empty-session handling."""
from __future__ import annotations
import json
from pathlib import Path
import duckdb
import pytest
FIXTURES_DIR = Path(__file__).parent / "fixtures" / "sessions" / "usage"
# ---------------------------------------------------------------------------
# Helpers
# ---------------------------------------------------------------------------
def _fresh_db(tmp_path, monkeypatch) -> duckdb.DuckDBPyConnection:
"""Fresh fully-migrated DuckDB in tmp_path (same idiom as test_session_pipeline.py)."""
monkeypatch.setenv("DATA_DIR", str(tmp_path))
import src.db as db_module
db_module._system_db_conn = None
db_module._system_db_path = None
return db_module.get_system_db()
def _seed_attribution(conn: duckdb.DuckDBPyConnection) -> None:
"""Seed marketplace_plugins + store_entities rows the fixtures reference.
After the v46 refactor, `MarketplaceItemLookup` resolves identifiers
by prefix-splitting on ``:`` and looking up the prefix in the live
`marketplace_plugins` (curated) and `store_entities` (flea) tables —
so we seed those instead of the removed attribution tables.
Fixtures use:
- curated plugin prefix `myplug` (for skills `myplug:my-skill`, agents
`myplug:my-agent`, slash commands `myplug:compound` — note slash
commands count as skills under the new rules, and `compound:debug`
uses `compound` as the plugin prefix).
- flea bundle prefix `flea` + entity name `flea-skill`.
"""
# Curated plugin — only `name` matters for the lookup; the rest is
# filler to satisfy NOT NULL constraints / referential expectations.
conn.execute(
"INSERT OR IGNORE INTO marketplace_registry (id, name, url) "
"VALUES ('mp', 'TestMarket', 'https://example.test/mp.git')"
)
conn.execute(
"INSERT OR IGNORE INTO marketplace_plugins (marketplace_id, name) "
"VALUES ('mp', 'myplug')"
)
# Second curated plugin used as the `compound:debug` slash-command prefix.
conn.execute(
"INSERT OR IGNORE INTO marketplace_plugins (marketplace_id, name) "
"VALUES ('mp', 'compound')"
)
# Flea entity — visibility_status='approved' is required (lookup filters
# on it). type='skill' so the resolver places the invocation under
# type='skill' in the rollup. v49 phase-1 added NOT NULL `title` +
# `synthetic_name`; mirror what the repo's create() fallback would write.
conn.execute(
"INSERT OR IGNORE INTO store_entities "
"(id, owner_user_id, owner_username, type, name, version, "
" visibility_status, title, synthetic_name) "
"VALUES ('entity-1', 'u1', 'alice', 'skill', 'flea-skill', '1.0', "
" 'approved', 'flea-skill', 'flea-skill-by-alice')"
)
def _process(fixture_name: str, conn: duckdb.DuckDBPyConnection) -> None:
"""Run UsageProcessor against a fixture file."""
from services.session_processors.usage import UsageProcessor
processor = UsageProcessor()
path = FIXTURES_DIR / fixture_name
result = processor.process_session(
session_path=path,
username="test-user",
session_key=fixture_name,
conn=conn,
)
return result
def _events(conn: duckdb.DuckDBPyConnection) -> list[dict]:
rows = conn.execute(
"SELECT * FROM usage_events ORDER BY occurred_at ASC"
).fetchall()
desc = [d[0] for d in conn.description]
return [dict(zip(desc, row)) for row in rows]
def _summary(conn: duckdb.DuckDBPyConnection, session_key: str) -> dict | None:
row = conn.execute(
"SELECT * FROM usage_session_summary WHERE session_file = ?",
[session_key],
).fetchone()
if row is None:
return None
desc = [d[0] for d in conn.description]
return dict(zip(desc, row))
# ---------------------------------------------------------------------------
# Tests
# ---------------------------------------------------------------------------
class TestSimpleBash:
def test_extracts_one_event(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("simple_bash.jsonl", conn)
evts = _events(conn)
assert len(evts) == 1
assert evts[0]["tool_name"] == "Bash"
assert evts[0]["event_type"] == "tool_use"
def test_builtin_source(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("simple_bash.jsonl", conn)
evts = _events(conn)
# Bash has no plugin prefix → MarketplaceItemLookup falls through
# to the builtin tuple ('builtin', '', None, None), and the
# UsageProcessor normalises the empty parent_plugin to NULL ref_id.
assert evts[0]["source"] == "builtin"
assert evts[0]["ref_id"] is None
def test_no_error_flag(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("simple_bash.jsonl", conn)
evts = _events(conn)
assert evts[0]["is_error"] is False
def test_summary_written(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("simple_bash.jsonl", conn)
s = _summary(conn, "simple_bash.jsonl")
assert s is not None
assert s["tool_calls"] == 1
assert s["tool_errors"] == 0
assert s["username"] == "test-user"
class TestMcpCall:
def test_mcp_event_type(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mcp_call.jsonl", conn)
evts = _events(conn)
assert len(evts) == 1
assert evts[0]["event_type"] == "mcp_call"
assert evts[0]["tool_name"] == "mcp__github__create_issue"
def test_mcp_builtin_source(self, tmp_path, monkeypatch):
"""MCP tools not in attribution tables fall back to builtin."""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mcp_call.jsonl", conn)
evts = _events(conn)
# mcp__github__create_issue is not in the attribution tables → builtin fallback
assert evts[0]["source"] == "builtin"
def test_summary_mcp_count(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mcp_call.jsonl", conn)
s = _summary(conn, "mcp_call.jsonl")
assert s["mcp_calls"] == 1
class TestCuratedSkill:
def test_curated_attribution(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("skill_curated.jsonl", conn)
# Fixture uses `myplug:my-skill` (plugin-prefixed). ref_id is the
# parent plugin name; the local skill name is preserved in
# `skill_name` for downstream rollup attribution.
row = conn.execute(
"SELECT source, ref_id FROM usage_events WHERE skill_name = 'myplug:my-skill'"
).fetchone()
assert row is not None
assert row[0] == "curated"
assert row[1] == "myplug"
def test_skill_invocations_count(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("skill_curated.jsonl", conn)
s = _summary(conn, "skill_curated.jsonl")
assert s["skill_invocations"] == 1
class TestFleaSkill:
def test_flea_attribution(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("skill_flea.jsonl", conn)
# Flea entity bundle prefix → ref_id is '' (no parent plugin),
# normalised to NULL by UsageProcessor. v49 phase-5: JSONL local
# part is the entity's synthetic_name (= `<name>-by-<owner>`).
row = conn.execute(
"SELECT source, ref_id FROM usage_events "
"WHERE skill_name = 'flea:flea-skill-by-alice'"
).fetchone()
assert row is not None
assert row[0] == "flea"
assert row[1] is None
class TestSlashCommand:
def test_slash_command_extracted(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("slash_command.jsonl", conn)
evts = _events(conn)
slash_evts = [e for e in evts if e["event_type"] == "slash_command"]
assert len(slash_evts) == 1
assert slash_evts[0]["command_name"] == "compound:debug"
def test_slash_command_attribution(self, tmp_path, monkeypatch):
"""`compound:debug` resolves to curated plugin `compound`.
Under v46 rules slash commands count as type='skill' in the rollup;
the lookup matches the `compound` prefix against marketplace_plugins.
"""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("slash_command.jsonl", conn)
row = conn.execute(
"SELECT source, ref_id FROM usage_events WHERE command_name = 'compound:debug'"
).fetchone()
assert row is not None
assert row[0] == "curated"
assert row[1] == "compound"
def test_slash_commands_in_summary(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("slash_command.jsonl", conn)
s = _summary(conn, "slash_command.jsonl")
assert s["slash_commands"] == 1
class TestSubagent:
def test_subagent_event_type(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("subagent.jsonl", conn)
evts = _events(conn)
assert len(evts) == 1
assert evts[0]["event_type"] == "subagent"
assert evts[0]["subagent_type"] == "myplug:my-agent"
def test_subagent_attributed(self, tmp_path, monkeypatch):
"""`myplug:my-agent` resolves to curated plugin `myplug`."""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("subagent.jsonl", conn)
evts = _events(conn)
assert evts[0]["source"] == "curated"
assert evts[0]["ref_id"] == "myplug"
def test_subagent_dispatches_in_summary(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("subagent.jsonl", conn)
s = _summary(conn, "subagent.jsonl")
assert s["subagent_dispatches"] == 1
class TestToolError:
def test_error_flagged_on_event(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("tool_error.jsonl", conn)
evts = _events(conn)
assert len(evts) == 1
assert evts[0]["tool_name"] == "Bash"
assert evts[0]["is_error"] is True
def test_tool_errors_in_summary(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("tool_error.jsonl", conn)
s = _summary(conn, "tool_error.jsonl")
assert s["tool_errors"] == 1
assert s["tool_calls"] == 1
class TestMixedSession:
def test_mixed_event_counts(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mixed.jsonl", conn)
evts = _events(conn)
types = [e["event_type"] for e in evts]
# one slash_command + one tool_use (Bash) + one tool_use (Skill) +
# one mcp_call + one subagent + one tool_use (Bash with error) = 6 events
assert "slash_command" in types
assert "tool_use" in types
assert "mcp_call" in types
assert "subagent" in types
def test_mixed_summary_counts(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mixed.jsonl", conn)
s = _summary(conn, "mixed.jsonl")
assert s is not None
assert s["mcp_calls"] == 1
assert s["subagent_dispatches"] == 1
assert s["skill_invocations"] == 1
assert s["slash_commands"] == 1
assert s["tool_errors"] == 1
def test_mixed_error_correlated(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mixed.jsonl", conn)
err_evts = conn.execute(
"SELECT tool_name FROM usage_events WHERE is_error = TRUE"
).fetchall()
assert len(err_evts) == 1
assert err_evts[0][0] == "Bash"
class TestEmptySession:
def test_zero_events_writes_summary(self, tmp_path, monkeypatch):
"""Empty session (only system/summary turns) yields 0 events but a summary row."""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
result = _process("empty.jsonl", conn)
evts = _events(conn)
assert len(evts) == 0
s = _summary(conn, "empty.jsonl")
assert s is not None
assert s["tool_calls"] == 0
def test_processor_result_zero_items(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
result = _process("empty.jsonl", conn)
assert result.items_count == 0
class TestIdempotency:
def test_reprocess_same_event_count(self, tmp_path, monkeypatch):
"""INSERT OR IGNORE: processing the same session twice yields same event count."""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("simple_bash.jsonl", conn)
count_1 = conn.execute("SELECT COUNT(*) FROM usage_events").fetchone()[0]
_process("simple_bash.jsonl", conn)
count_2 = conn.execute("SELECT COUNT(*) FROM usage_events").fetchone()[0]
assert count_1 == count_2 == 1
def test_reprocess_mixed_idempotent(self, tmp_path, monkeypatch):
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
_process("mixed.jsonl", conn)
n1 = conn.execute("SELECT COUNT(*) FROM usage_events").fetchone()[0]
_process("mixed.jsonl", conn)
n2 = conn.execute("SELECT COUNT(*) FROM usage_events").fetchone()[0]
assert n1 == n2
class TestMultiToolTurnDedup:
def test_two_tool_calls_in_same_turn_produce_two_events(self, tmp_path, monkeypatch):
"""Parallel Bash + Read in the same assistant turn must produce 2 distinct events.
Regression — earlier bug: same event_uuid + same tool_name collided in id hash,
so the second tool_use was silently dropped by INSERT OR IGNORE.
"""
conn = _fresh_db(tmp_path, monkeypatch)
_seed_attribution(conn)
jsonl_path = tmp_path / "multi_tool_turn.jsonl"
jsonl_path.write_text(
json.dumps({
"uuid": "turn-1",
"parentUuid": None,
"type": "assistant",
"sessionId": "sess-multi",
"timestamp": "2026-05-12T10:00:00Z",
"message": {
"role": "assistant",
"model": "claude-x",
"content": [
{"type": "tool_use", "id": "tu_a", "name": "Bash", "input": {"command": "ls"}},
{"type": "tool_use", "id": "tu_b", "name": "Bash", "input": {"command": "pwd"}},
],
},
}) + "\n"
)
from services.session_processors.usage import UsageProcessor
processor = UsageProcessor()
processor.process_session(
session_path=jsonl_path,
username="alice",
session_key="alice/multi_tool_turn.jsonl",
conn=conn,
)
n = conn.execute(
"SELECT COUNT(*) FROM usage_events WHERE session_id='sess-multi'"
).fetchone()[0]
assert n == 2, f"expected 2 events (one per tu_xxx), got {n}"
class TestCommandNameTagExtraction:
"""Slash invocations arrive as <command-name>/foo</command-name> embedded in
user message content (Claude Code's wire format). Unit-test iter_events
against synthetic turns so a future shape shift doesn't silently regress."""
@staticmethod
def _user_turn(content):
return {
"type": "user",
"uuid": "u1",
"parentUuid": None,
"sessionId": "sess-cn",
"timestamp": "2026-05-14T10:00:00.000Z",
"cwd": "/workspace",
"message": {"role": "user", "content": content},
}
def test_extracts_command_name_from_string_content(self):
from services.session_processors.usage_lib import iter_events
turn = self._user_turn(
"<command-name>/clear</command-name>\n<command-args></command-args>"
)
events = list(iter_events([turn]))
assert len(events) == 1
assert events[0].event_type == "slash_command"
assert events[0].command_name == "clear"
def test_extracts_command_name_from_text_block(self):
"""Defensive: same regex behavior when content arrives as a list-of-blocks
instead of a plain string, in case Claude Code's wire format shifts."""
from services.session_processors.usage_lib import iter_events
turn = self._user_turn(
[{"type": "text", "text": "<command-name>/plugin:name</command-name>"}]
)
events = list(iter_events([turn]))
assert len(events) == 1
assert events[0].command_name == "plugin:name"
def test_command_name_not_at_start_still_matches(self):
"""Real Claude Code prepends a <command-message> sibling before the
<command-name> tag — regex must search, not anchor at start."""
from services.session_processors.usage_lib import iter_events
turn = self._user_turn(
"<command-message>foo</command-message>\n"
"<command-name>/foo</command-name>\n"
"<command-args>some arg</command-args>"
)
events = list(iter_events([turn]))
assert len(events) == 1
assert events[0].command_name == "foo"
def test_plain_text_without_tag_does_not_match(self):
"""A user message that happens to contain '/foo' as prose, but no
<command-name> tag, must NOT yield a slash_command event — that's the
whole point of switching from the old `^\\s*/<name>` regex."""
from services.session_processors.usage_lib import iter_events
turn = self._user_turn("Hello world, see /not-a-command-just-prose for context.")
events = list(iter_events([turn]))
assert events == []