@jaguilar87/gaia 5.0.7 → 5.0.9

package/bin/cli/brief.py

@@ -431,10 +431,23 @@ def _cmd_list(args) -> int:
 
 def _cmd_close(args) -> int:
     from gaia.briefs import close_brief
+    from gaia.briefs.store import verify_brief
     workspace = _resolve_workspace(getattr(args, "workspace", None))
     name = args.name
     if close_brief(workspace, name):
         print(f"Closed brief '{name}'")
+        # AC-3 advisory: run invariant checker and surface any inconsistencies
+        # as non-blocking stderr warnings (mirrors D11 pattern in plan CLI).
+        # Close always succeeds (exit 0); warnings never gate the operation.
+        try:
+            result = verify_brief(workspace, name)
+            for issue in result.get("inconsistencies", []):
+                print(
+                    f"Warning: [{issue['kind']}] {issue['detail']}",
+                    file=sys.stderr,
+                )
+        except Exception:
+            pass  # advisory failure must never abort the close
         return 0
     return _err(f"brief '{name}' not found in workspace '{workspace}'")
 

package/bin/cli/doctor.py

@@ -185,7 +185,7 @@ def _package_root() -> Path:
 # in lock-step with the INSERT it adds to bootstrap_database.sh. If a user
 # upgrades the CLI past a schema bump but does not re-run `gaia install`,
 # `check_schema_version` raises a warning telling them how to repair.
-EXPECTED_SCHEMA_VERSION = 18
+EXPECTED_SCHEMA_VERSION = 20
 
 # Locations the doctor reads outside the workspace.
 _INSTALL_ERROR_MARKER = Path("~/.gaia/last-install-error.json").expanduser()

package/dist/gaia-ops/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gaia-ops",
-  "version": "5.0.7",
+  "version": "5.0.9",
   "description": "Full DevOps orchestration for Claude Code. Eight specialized agents handle the complete development lifecycle \u2014 analysis, planning, execution, and deployment. Gaia-Ops scans your codebase to understand it and injects the right context into each sub-agent. Every command is classified by risk: read-only runs freely, state changes pause for your approval, and irreversible operations are permanently blocked.",
   "author": {
     "name": "jaguilar87",

package/dist/gaia-ops/hooks/adapters/claude_code.py

@@ -603,13 +603,18 @@ class ClaudeCodeAdapter(HookAdapter):
                 exit_code=2,
             )
 
-        # Save state for post-hook
+        # Save state for post-hook. When the command was allowed by consuming a
+        # T3 approval grant, carry that approval_id forward so PostToolUse can
+        # append an EXECUTED/FAILED event to the approval_events chain (the grant
+        # is consumed here at PreToolUse and flips to CONSUMED, so PostToolUse
+        # cannot re-discover it via check_approval_grant).
         effective_command = result.modified_input.get("command", command) if result.modified_input else command
         state = create_pre_hook_state(
             tool_name=tool_name,
             command=effective_command,
             tier=str(result.tier),
             allowed=True,
+            consumed_approval_id=result.consumed_approval_id,
         )
         save_hook_state(state)
 
@@ -1003,6 +1008,26 @@ class ClaudeCodeAdapter(HookAdapter):
                             "T3 grant confirmed (will be consumed at SubagentStop): %s", command[:80],
                         )
 
+            # Close the audit-log cycle for an APPROVED T3 command that just ran.
+            # PreToolUse stashed the consumed grant's approval_id in HookState
+            # when it matched (and consumed) the grant; append EXECUTED on a clean
+            # exit, FAILED otherwise. This continues the approval_events hash chain
+            # via the canonical store.record_event() helper -- the only authorized
+            # writer for the chain (it routes through chain.insert_event(), which
+            # links prev_hash -> this_hash before INSERT).
+            if tool_name == "Bash":
+                consumed_approval_id = (
+                    pre_state.metadata.get("consumed_approval_id") if pre_state else None
+                )
+                if consumed_approval_id:
+                    self._record_t3_outcome_event(
+                        consumed_approval_id,
+                        command=parameters.get("command", ""),
+                        success=success,
+                        exit_code=tool_result_data.exit_code,
+                        session_id=hook_data.get("session_id", ""),
+                    )
+
             events = detect_critical_event(tool_name, parameters, output, success)
             if events:
                 writer = SessionContextWriter()
@@ -1031,6 +1056,53 @@ class ClaudeCodeAdapter(HookAdapter):
 
         return HookResponse(output={}, exit_code=0)
 
+    def _record_t3_outcome_event(
+        self,
+        approval_id: str,
+        *,
+        command: str,
+        success: bool,
+        exit_code: int,
+        session_id: str = "",
+    ) -> None:
+        """Append an EXECUTED or FAILED event for an approved T3 command.
+
+        Closes the audit-log cycle: once a command runs under a consumed grant,
+        the approval_events chain records whether it succeeded (EXECUTED) or
+        failed (FAILED). Writes through gaia.approvals.store.record_event(), the
+        canonical chain writer -- never a raw INSERT -- so prev_hash -> this_hash
+        linkage is preserved and validate_chain() stays intact end to end.
+
+        Best-effort and non-fatal: the approval store lives in gaia.db and may be
+        unavailable in some hook contexts; any failure is logged and swallowed so
+        a chain-write hiccup never breaks tool execution.
+        """
+        event_type = "EXECUTED" if success else "FAILED"
+        try:
+            from gaia.approvals import store as _approval_store
+
+            payload = {
+                "command": command,
+                "exit_code": exit_code,
+                "outcome": "success" if success else "failure",
+            }
+            _approval_store.record_event(
+                approval_id,
+                event_type,
+                session_id=session_id or None,
+                payload_json=json.dumps(payload, sort_keys=True, separators=(",", ":")),
+                metadata_json=json.dumps({"source": "post_tool_use"}),
+            )
+            logger.info(
+                "Recorded %s event for approval_id=%s (exit=%d)",
+                event_type, approval_id[:16], exit_code,
+            )
+        except Exception as exc:
+            logger.warning(
+                "Failed to record %s event for approval_id=%s (non-fatal): %s",
+                event_type, approval_id[:16], exc,
+            )
+
     # ------------------------------------------------------------------ #
     # _handle_ask_user_question_result: grant activation from user answer
     # ------------------------------------------------------------------ #
@@ -1045,19 +1117,15 @@ class ClaudeCodeAdapter(HookAdapter):
           2. Load the specific pending file by prefix (any session).
           3. Activate the grant under the CURRENT session.
 
-        Falls back to session-wide activation when no nonce is present in
-        the answer (backward compatibility with older approval labels).
+        DB-only since the grant-lifecycle FS retirement: REQUESTED writes go
+        to the DB, so the approved pending is resolved by nonce prefix straight
+        from the DB via ``activate_db_pending_by_prefix()``.
 
         Never blocks (no exceptions raised to caller).
         """
         from modules.security.approval_grants import (
-            activate_cross_session_pending,
             activate_db_pending_by_prefix,
-            activate_grants_for_session,
-            activate_pending_approval,
             extract_nonce_from_label,
-            get_pending_approvals_for_session,
-            load_pending_by_nonce_prefix,
         )
 
         session_id = hook_data.get("session_id", "") or os.environ.get("CLAUDE_SESSION_ID", "")
@@ -1091,93 +1159,31 @@ class ClaudeCodeAdapter(HookAdapter):
                 logger.info("AskUserQuestion: no session_id available, skipping grant activation")
                 return
 
-            # Try nonce-targeted activation first: extract nonce from answer labels
+            # Nonce-targeted activation: extract the nonce from answer labels.
             nonce_prefix = None
             for v in answers.values():
                 nonce_prefix = extract_nonce_from_label(str(v))
                 if nonce_prefix:
                     break
 
-            if nonce_prefix:
-                # Nonce-targeted: load this specific pending regardless of session
-                pending_data = load_pending_by_nonce_prefix(nonce_prefix)
-                if pending_data:
-                    pending_session = pending_data.get("session_id", "")
-                    full_nonce = pending_data.get("nonce", "")
-
-                    if pending_session == session_id:
-                        # Same session -- use standard activation
-                        result = activate_pending_approval(
-                            nonce=full_nonce,
-                            session_id=session_id,
-                        )
-                    else:
-                        # Cross session -- activate under current session
-                        result = activate_cross_session_pending(
-                            pending_data,
-                            session_id=session_id,
-                        )
-
-                    if result.success:
-                        logger.info(
-                            "AskUserQuestion nonce-targeted activation: prefix=%s, "
-                            "pending_session=%s, current_session=%s, status=%s",
-                            nonce_prefix, pending_session[:12], session_id[:12],
-                            getattr(result.status, "value", str(result.status)),
-                        )
-                        return
-                    else:
-                        logger.warning(
-                            "AskUserQuestion nonce-targeted activation failed: "
-                            "prefix=%s, status=%s, reason=%s",
-                            nonce_prefix,
-                            getattr(result.status, "value", str(result.status)),
-                            result.reason,
-                        )
-                else:
-                    # Filesystem pending not found -- try DB lookup (M2 bridge).
-                    # Since M2, REQUESTED writes go to DB only; no pending-{nonce}.json
-                    # is written to the filesystem any more.
-                    logger.info(
-                        "AskUserQuestion: nonce prefix %s found in label but no "
-                        "matching pending file -- trying DB lookup (M2 bridge)",
-                        nonce_prefix,
-                    )
-                    result = activate_db_pending_by_prefix(
-                        nonce_prefix, current_session_id=session_id,
-                    )
-                    if result.success:
-                        logger.info(
-                            "AskUserQuestion DB-bridge activation: prefix=%s status=%s",
-                            nonce_prefix,
-                            getattr(result.status, "value", str(result.status)),
-                        )
-                        return
-                    else:
-                        logger.warning(
-                            "AskUserQuestion DB-bridge activation failed: "
-                            "prefix=%s status=%s reason=%s -- falling back to session-wide",
-                            nonce_prefix,
-                            getattr(result.status, "value", str(result.status)),
-                            result.reason,
-                        )
-                    # Fall through to session-wide activation below
-                    nonce_prefix = None
-
             if not nonce_prefix:
-                # No nonce in label (or all targeted paths failed) -- fall back to
-                # session-wide activation for backward compatibility
-                pending = get_pending_approvals_for_session(session_id)
-                if not pending:
-                    logger.info("AskUserQuestion: no pending grants for session %s", session_id)
-                    return
-
-                results = activate_grants_for_session(session_id)
-                activated = sum(1 for r in results if r.success)
                 logger.info(
-                    "AskUserQuestion session-wide activation: %d/%d pending grants for session %s",
-                    activated, len(results), session_id,
+                    "AskUserQuestion: no nonce prefix in answer labels -- "
+                    "nothing to activate for session %s", session_id[:12],
                 )
+                return
+
+            # Resolve the approved pending straight from the DB.
+            result = activate_db_pending_by_prefix(
+                nonce_prefix, current_session_id=session_id,
+            )
+            logger.info(
+                "AskUserQuestion DB activation: prefix=%s success=%s status=%s reason=%s",
+                nonce_prefix,
+                result.success,
+                getattr(result.status, "value", str(result.status)),
+                result.reason,
+            )
 
         except Exception as e:
             logger.error("Error in _handle_ask_user_question_result: %s", e, exc_info=True)

package/dist/gaia-ops/hooks/modules/agents/handoff_persister.py

@@ -170,19 +170,30 @@ def _intake_command_set_pending(
     }
 
     try:
-        from gaia.approvals.store import insert_requested
+        from gaia.approvals.store import derive_command_set_id, insert_requested
     except ImportError:
         import pathlib as _pl
         import sys as _sys
 
         _repo_root = _pl.Path(__file__).resolve().parent.parent.parent.parent
         _sys.path.insert(0, str(_repo_root))
-        from gaia.approvals.store import insert_requested
+        from gaia.approvals.store import derive_command_set_id, insert_requested
+
+    # Derive the PUBLIC approval_id deterministically from the post-filter
+    # mutative command strings. Because the id is content-derived (not uuid4),
+    # the orchestrator reproduces the SAME id from the command_set it reads in
+    # the contract via `gaia approvals derive-id` -- no DB search, no
+    # cross-session miss. The list passed here is the SAME list the CLI helper
+    # derives over (post-mutative-filter), so both sides agree.
+    derived_id = derive_command_set_id(
+        [it["command"] for it in command_set_items]
+    )
 
     approval_id = insert_requested(
         sealed_payload,
         agent_id=agent_id,
         session_id=session_id or None,
+        approval_id=derived_id,
     )
     logger.info(
         "INTAKE: plan-first COMMAND_SET pending created approval_id=%s items=%d",

package/dist/gaia-ops/hooks/modules/context/context_injector.py

@@ -450,17 +450,33 @@ def build_project_context(
         if critical_summary:
             context_string += critical_summary
 
-        # Inject recent operational events (non-blocking)
+        # Inject recent operational events (non-blocking).
+        # Brief 54 / Task 2.2: read from the harness_events DB table via
+        # gaia.store.reader.cross_surface_query instead of the legacy
+        # events.jsonl reader. The reader returns rows shaped as
+        # {surface, timestamp, type, agent, summary, raw} -- NOT the old
+        # {ts, type, agent, result} JSONL shape -- so the formatting loop
+        # below is remapped to those keys (audit Risk 4: without the remap
+        # the "Recent Events" block silently goes blank).
         try:
-            from ..events.event_writer import read_events
-            recent = read_events(hours=24, limit=20)
+            import sys as _sys
+            from pathlib import Path as _Path
+            try:
+                from gaia.store import reader as _reader
+            except ImportError:
+                _repo_root = _Path(__file__).resolve().parents[3]
+                _sys.path.insert(0, str(_repo_root))
+                from gaia.store import reader as _reader
+            recent = _reader.cross_surface_query(
+                surface="harness_events", since="24h", last=20,
+            )
             if recent:
                 lines = ["\n# Recent Events (last 24h)"]
                 for evt in recent:
-                    ts_short = evt.get("ts", "")[:16]
-                    etype = evt.get("type", "")
-                    agent_name = evt.get("agent", "")
-                    result_str = evt.get("result", "")
+                    ts_short = (evt.get("timestamp") or "")[:16]
+                    etype = evt.get("type") or ""
+                    agent_name = evt.get("agent") or ""
+                    result_str = evt.get("summary") or ""
                     label = f"{agent_name}: " if agent_name else ""
                     lines.append(f"- [{ts_short}] {etype}: {label}{result_str}")
                 context_string += "\n".join(lines) + "\n"

package/dist/gaia-ops/hooks/modules/events/event_writer.py

@@ -1,16 +1,27 @@
-"""Event writer and reader for the GAIA Event Context system.
+"""Event writer for the GAIA Event Context system.
+
+As of Brief 54 / Task 2.2 the event pipeline writes to the ``harness_events``
+table in the Gaia SQLite substrate (``~/.gaia/gaia.db``) instead of the legacy
+``events.jsonl`` file. This is an ATOMIC cutover: ``write_event`` no longer
+touches ``events.jsonl`` in any code path -- there is NO dual-write.
 
 Provides:
-    - EventWriter: append-only JSONL writer with file locking
-    - read_events(): read events from last N hours with optional filtering
-    - cleanup_old_events(): remove events older than N days
+    - EventWriter: non-blocking, silent-on-failure DB event writer
+    - read_events(): legacy JSONL reader (read-only; retained until Task 2.3
+      removes events.jsonl entirely -- no longer the canonical read path)
     - Event type constants
+
+The DB write delegates to ``gaia.store.writer.write_harness_event``, which
+resolves the DB path the same way every other gaia DB writer does (via
+``gaia.paths.db_path()`` -> ``GAIA_DATA_DIR`` / ``gaia.db``, falling back to
+``~/.gaia/gaia.db``). The hook subprocess imports the ``gaia`` package via the
+repo-root fallback already established by handoff_persister.
 """
 
-import fcntl
 import json
 import logging
 import os
+import sys
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Any, Dict, List, Optional
@@ -32,17 +43,36 @@ HEARTBEAT = "heartbeat"
 USER_NOTE = "user.note"
 
 
+def _import_store_writer():
+    """Import gaia.store.writer, falling back to the repo layout.
+
+    Mirrors the import contract used by
+    hooks/modules/agents/handoff_persister.py: prefer a sibling ``gaia``
+    package if installed; otherwise add the repo root (two levels above
+    ``hooks/``) to ``sys.path`` and import from there.
+    """
+    try:
+        from gaia.store import writer as _writer
+    except ImportError:
+        _repo_root = Path(__file__).resolve().parents[3]
+        sys.path.insert(0, str(_repo_root))
+        from gaia.store import writer as _writer
+    return _writer
+
+
 class EventWriter:
-    """Append-only JSONL event writer with file locking.
+    """Non-blocking DB event writer.
 
-    All writes are wrapped in try/except -- events are non-critical and
-    must never block the hook pipeline.
+    All writes are wrapped in try/except -- events are non-critical and must
+    never block the hook pipeline. The ``events_dir`` argument is retained for
+    backward compatibility (legacy JSONL reads still resolve it) but is no
+    longer used for writes, which target the ``harness_events`` DB table.
     """
 
     def __init__(self, events_dir: Optional[Path] = None):
+        # Retained for compatibility with the legacy reader; not used for
+        # writes. Resolved lazily-safe (never raises here).
         self.events_dir = events_dir or get_events_dir()
-        self.events_file = self.events_dir / "events.jsonl"
-        self.lock_file = self.events_dir / "events.jsonl.lock"
 
     def write_event(
         self,
@@ -53,10 +83,10 @@ class EventWriter:
         severity: str = "info",
         meta: Optional[Dict[str, Any]] = None,
     ) -> None:
-        """Append a single event to the JSONL log.
+        """Append a single event to the ``harness_events`` DB table.
 
-        Thread-safe via exclusive file lock.  Fails silently on any error
-        to avoid disrupting the hook pipeline.
+        Fails silently on any error to avoid disrupting the hook pipeline --
+        same contract as the historical file writer.
 
         Args:
             event_type: Dotted event category (e.g. "agent.dispatch").
@@ -64,30 +94,21 @@ class EventWriter:
             agent: Agent involved, or empty string for non-agent events.
             result: Outcome summary string.
             severity: info | warning | error.
-            meta: Optional type-specific structured data.
+            meta: Optional type-specific structured data (stored as JSON in
+                the ``payload`` column).
         """
         try:
-            self.events_dir.mkdir(parents=True, exist_ok=True)
-
-            record: Dict[str, Any] = {
-                "ts": datetime.now(timezone.utc).isoformat(),
-                "type": event_type,
-                "source": source,
-                "agent": agent,
-                "result": result,
-                "severity": severity,
-            }
-            if meta:
-                record["meta"] = meta
-
-            with open(self.lock_file, "w") as lf:
-                fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
-                try:
-                    with open(self.events_file, "a") as f:
-                        f.write(json.dumps(record, separators=(",", ":")) + "\n")
-                finally:
-                    fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
-
+            writer = _import_store_writer()
+            workspace = os.environ.get("GAIA_WORKSPACE") or None
+            writer.write_harness_event(
+                event_type=event_type,
+                source=source,
+                agent=agent,
+                result=result,
+                severity=severity,
+                meta=meta,
+                workspace=workspace,
+            )
         except Exception as exc:
             logger.debug("Event write failed (non-fatal): %s", exc)
 
@@ -98,7 +119,13 @@ def read_events(
     limit: int = 50,
     events_dir: Optional[Path] = None,
 ) -> List[Dict[str, Any]]:
-    """Read recent events from the JSONL log.
+    """Read recent events from the legacy JSONL log.
+
+    NOTE: As of Task 2.2 this is no longer the canonical read path -- new
+    events are written to the ``harness_events`` DB table. This reader is
+    retained read-only until Task 2.3 removes ``events.jsonl`` entirely, so
+    historical pre-cutover events remain consultable. New callers should use
+    ``gaia.store.reader.cross_surface_query(surface="harness_events")``.
 
     Args:
         hours: How far back to look (default 24h).
@@ -148,63 +175,3 @@ def read_events(
     except Exception as exc:
         logger.debug("Event read failed (non-fatal): %s", exc)
         return []
-
-
-def cleanup_old_events(
-    days: int = 7,
-    events_dir: Optional[Path] = None,
-) -> int:
-    """Remove events older than *days* from the JSONL log.
-
-    Uses file locking to avoid conflicts with concurrent writers.
-    Retains lines that cannot be parsed (conservative).
-
-    Args:
-        days: Retention window in days (default 7).
-        events_dir: Override events directory (for testing).
-
-    Returns:
-        Number of events removed.
-    """
-    try:
-        edir = events_dir or get_events_dir()
-        events_file = edir / "events.jsonl"
-        lock_file = edir / "events.jsonl.lock"
-
-        if not events_file.exists():
-            return 0
-
-        retention_days = int(os.environ.get("GAIA_EVENT_RETENTION_DAYS", str(days)))
-        cutoff = datetime.now(timezone.utc) - timedelta(days=retention_days)
-        kept: List[str] = []
-        removed = 0
-
-        with open(lock_file, "w") as lf:
-            fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
-            try:
-                with open(events_file, "r") as f:
-                    for line in f:
-                        line = line.strip()
-                        if not line:
-                            continue
-                        try:
-                            evt = json.loads(line)
-                            ts = datetime.fromisoformat(evt["ts"])
-                            if ts < cutoff:
-                                removed += 1
-                                continue
-                        except (json.JSONDecodeError, KeyError, ValueError):
-                            pass  # Keep unparseable lines
-                        kept.append(line)
-
-                with open(events_file, "w") as f:
-                    for line in kept:
-                        f.write(line + "\n")
-            finally:
-                fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
-
-        return removed
-
-    except Exception as exc:
-        logger.debug("Event cleanup failed (non-fatal): %s", exc)
-        return 0

package/dist/gaia-ops/hooks/modules/security/__init__.py

@@ -45,7 +45,6 @@ from .approval_scopes import (
 from .approval_grants import (
     check_approval_grant,
     cleanup_expired_grants,
-    get_latest_pending_approval,
     last_check_found_expired,
     ApprovalGrant,
 )
@@ -93,7 +92,6 @@ __all__ = [
     # Approval Grants
     "check_approval_grant",
     "cleanup_expired_grants",
-    "get_latest_pending_approval",
     "last_check_found_expired",
     "ApprovalGrant",
     # Shell unwrapper