a6275b4000
Three robustness/hardening fixes surfaced by /sh-security-review on the agent-team listener/coordinator surface. None alter AUTHZ-01 allowlist behavior or the first-answer-wins compare-and-set semantics. 1. Respawn close() leak (CWE-772). The watchdog _supervise_slack_listener respawned the inbound Slack listener without tearing down the dead one, leaking a Socket Mode WebSocket / SDK thread set per flap. Now the dead listener is closed before respawn (new _close_dead_listener, idempotent), AND _run_listener has a finally that always closes the listener so a crashed serve() releases its socket. SlackListener.close() is idempotent, so the belt-and-braces close stays a safe no-op. 2. Broadened exception guard in handle_event (CWE-248). The submit block only caught ValueError; the accept path (submit_answer -> _question_turn/_question_thread) can raise KeyError on a concurrently mutated row, and the CAS can raise sqlite3.Error. An uncaught exception would escape into the Bolt dispatch. Added a separate `except Exception` that logs at WARNING (not silent, not debug) and returns None. The existing ValueError-as-debug behavior is unchanged; authorization still runs first, so the trust boundary is not widened. 3. channel_ref partial-unique index (defense-in-depth). Added uq_pending_questions_open_channel_ref — a PARTIAL UNIQUE index on (channel_ref) WHERE channel_ref IS NOT NULL AND status='open' — so two OPEN rows can never share a non-null channel_ref (a thread_ts can never map to two open questions). Installed in init_db AND unconditionally in migrate (idempotent IF NOT EXISTS) so existing v1 DBs gain it. NULLs and closed rows are excluded; mirrored verbatim into schema.sql. Tests: +8 (was 960, now 968). New: schema partial-unique reject/null/closed/ migrate cases; handle_event KeyError + sqlite3.Error swallow cases; coordinator close-before-respawn + run_listener-closes-on-crash. Fixed the operator-cli test fixture to use a per-question channel_ref (it previously inserted multiple open rows sharing one ref, which the new index correctly rejects).
72 lines
3 KiB
SQL
72 lines
3 KiB
SQL
-- R720 agent-team durable SQLite schema (design §3.3.1, §6.7).
|
|
--
|
|
-- This file holds the raw DDL statements ONLY. The authoritative copies live
|
|
-- as string constants in agent_team/db/schema.py; this companion file mirrors
|
|
-- them verbatim for tooling / direct inspection. SQL DDL lives only in these
|
|
-- two places.
|
|
--
|
|
-- The LangGraph SqliteSaver checkpointer creates its OWN tables against this
|
|
-- same database file/connection; those are intentionally NOT declared here.
|
|
|
|
-- pending_questions: the durable human-interaction lifecycle ledger.
|
|
-- The LangGraph checkpoint holds graph state; this table holds the question
|
|
-- lifecycle (delivery, duplicate/late answers, expiry) and is what delivery,
|
|
-- the responder, and restart recovery read. Every race resolves via an atomic
|
|
-- compare-and-set against the `status` column under BEGIN IMMEDIATE.
|
|
CREATE TABLE IF NOT EXISTS pending_questions (
|
|
question_id TEXT PRIMARY KEY,
|
|
thread_id TEXT NOT NULL,
|
|
turn INTEGER NOT NULL,
|
|
status TEXT NOT NULL
|
|
CHECK (status IN ('open', 'answered', 'expired', 'superseded')),
|
|
transport TEXT NOT NULL,
|
|
channel_ref TEXT,
|
|
posted_at TEXT,
|
|
deadline_at TEXT,
|
|
answer_json TEXT,
|
|
answered_at TEXT,
|
|
answered_via TEXT
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS idx_pending_questions_thread
|
|
ON pending_questions (thread_id, turn);
|
|
|
|
CREATE INDEX IF NOT EXISTS idx_pending_questions_status
|
|
ON pending_questions (status);
|
|
|
|
-- Defense-in-depth: at most one OPEN question may carry a given non-null
|
|
-- channel_ref, so a thread reply's thread_ts can never map to two open rows
|
|
-- (a partial unique index; NULL channel_refs and closed rows are excluded).
|
|
CREATE UNIQUE INDEX IF NOT EXISTS uq_pending_questions_open_channel_ref
|
|
ON pending_questions (channel_ref)
|
|
WHERE channel_ref IS NOT NULL AND status = 'open';
|
|
|
|
-- budget_ledger: the persistent shared Claude budget ledger (§6.1, §6.6).
|
|
-- One row per accounted spend event; the shared daily cap and the
|
|
-- interactive-first reserve are computed by summing over a UTC day. Spend is
|
|
-- recorded across ALL R720 Claude work (pipeline + Plane-1 sweeps).
|
|
CREATE TABLE IF NOT EXISTS budget_ledger (
|
|
entry_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
thread_id TEXT,
|
|
stage TEXT,
|
|
model TEXT NOT NULL,
|
|
billing_mode TEXT NOT NULL,
|
|
input_tokens INTEGER NOT NULL DEFAULT 0,
|
|
output_tokens INTEGER NOT NULL DEFAULT 0,
|
|
usd_cost REAL NOT NULL DEFAULT 0.0,
|
|
recorded_at TEXT NOT NULL,
|
|
day_bucket TEXT NOT NULL
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS idx_budget_ledger_day
|
|
ON budget_ledger (day_bucket);
|
|
|
|
CREATE INDEX IF NOT EXISTS idx_budget_ledger_thread
|
|
ON budget_ledger (thread_id);
|
|
|
|
-- schema_meta: single-row table recording the applied schema version so
|
|
-- migrate() can detect and step forward.
|
|
CREATE TABLE IF NOT EXISTS schema_meta (
|
|
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
schema_version INTEGER NOT NULL
|
|
);
|