agent-bios 0.2.0 → 0.3.0

package/scripts/codex-run.sh

@@ -167,6 +167,25 @@ if [ "${#extra_c[@]}" -gt 0 ]; then
   for kv in "${extra_c[@]}"; do args+=(-c "$kv"); done
 fi
 
+# Dispatch audit: verifier diversity is only as real as the pinned backing
+# model — an unpinned dispatch inherits config defaults and can silently
+# collapse two "different" reviewers onto one backend. The audit line goes to
+# the log file only; stdout/stderr stay reserved for the codex channels.
+sandbox_label="$sandbox"
+if [ "$bypass_sandbox" -eq 1 ]; then sandbox_label="bypass"; fi
+cmodel=""
+if [ "${#extra_c[@]}" -gt 0 ]; then
+  for kv in "${extra_c[@]}"; do
+    case "$kv" in model=*) cmodel="${kv#model=}" ;; esac
+  done
+fi
+dispatch_note="dispatch profile=$profile model=${model:-INHERITED_DEFAULT}${cmodel:+ c-model-override=$cmodel} effort=${effort:-config-default} sandbox=$sandbox_label"
+if [ -z "$model" ] && [ -z "$cmodel" ]; then
+  echo "codex-run: WARNING: no --model pin; the backing model inherits the active config default" >&2
+fi
+mkdir -p "$real_home/log" 2>/dev/null || true
+printf '%s %s\n' "$(date +%Y-%m-%dT%H:%M:%S%z)" "$dispatch_note" >> "$real_home/log/codex-run-dispatch.log" 2>/dev/null || true
+
 # stdin, stdout, and stderr already match this adapter's channel contract.
 set +e
 CODEX_HOME="$run_home" codex "${args[@]}"

package/scripts/install.sh

@@ -126,6 +126,152 @@ migrate_state() {
   mv "$LEGACY_STATE_DIR" "$STATE_DIR" && info "migrated state  $LEGACY_STATE_DIR -> $STATE_DIR"
 }
 
+# ---- codex live-config additions -----------------------------------------
+# The live ~/.codex/config.toml is user/runtime-owned; agent-bios never
+# deploys or overwrites it. codex/config-additions.toml declares the only
+# content agent-bios manages there — one marked [agents.*] block plus a tagged
+# features.multi_agent line — and this helper merges (install), checks
+# (verify), or removes (uninstall) exactly that content, backed up and
+# tomllib-validated before any write. Modes: merge | check | remove.
+codex_config_additions() {
+  AB_MODE="$1" AB_CODEX_DIR="$CODEX_DIR" AB_FRAGMENT="$REPO/codex/config-additions.toml" \
+  AB_BACKUP="${BACKUP_DIR:-}" AB_DRY="$DRY_RUN" python3 - <<'PY'
+import os, pathlib, sys, tomllib
+
+mode = os.environ["AB_MODE"]
+codex_dir = pathlib.Path(os.environ["AB_CODEX_DIR"])
+fragment_path = pathlib.Path(os.environ["AB_FRAGMENT"])
+backup_root = os.environ.get("AB_BACKUP", "")
+dry = os.environ.get("AB_DRY") == "1"
+target = codex_dir / "config.toml"
+BEGIN = "# >>> agent-bios additions >>>"
+END = "# <<< agent-bios additions <<<"
+TAG = "# agent-bios"
+
+def info(msg): print(f"  {msg}")
+def fail(msg): print(msg); sys.exit(1)
+
+frag_text = fragment_path.read_text().replace("${CODEX_HOME}", str(codex_dir))
+want_agents = tomllib.loads(frag_text)["agents"]
+live_text = target.read_text() if target.is_file() else ""
+try:
+    live = tomllib.loads(live_text) if live_text else {}
+except Exception as exc:
+    fail(f"live codex config does not parse; not touching it: {target} ({exc})")
+
+def state_ok():
+    if live.get("features", {}).get("multi_agent") is not True:
+        return False
+    return all(
+        live.get("agents", {}).get(name, {}).get(key) == spec[key]
+        for name, spec in want_agents.items()
+        for key in ("description", "config_file")
+    )
+
+if mode == "check":
+    problems = []
+    if live.get("features", {}).get("multi_agent") is not True:
+        problems.append("features.multi_agent is not true")
+    for name, spec in want_agents.items():
+        if live.get("agents", {}).get(name, {}).get("config_file") != spec["config_file"]:
+            problems.append(f"agents.{name}.config_file drifted or missing")
+        elif not pathlib.Path(spec["config_file"]).is_file():
+            problems.append(f"agents.{name} template missing: {spec['config_file']}")
+    if problems:
+        fail(f"codex config additions: {'; '.join(problems)} ({target})")
+    info("codex config additions OK")
+    sys.exit(0)
+
+def strip_managed(text):
+    out, skipping = [], False
+    for line in text.splitlines(keepends=True):
+        s = line.strip()
+        if s == BEGIN: skipping = True; continue
+        if s == END: skipping = False; continue
+        if skipping or s.endswith(TAG): continue
+        out.append(line)
+    return "".join(out)
+
+if mode == "remove":
+    if not target.is_file():
+        sys.exit(0)
+    stripped = strip_managed(live_text)
+    if stripped == live_text:
+        info(f"no agent-bios additions in {target}")
+        sys.exit(0)
+    try:
+        tomllib.loads(stripped)
+    except Exception as exc:
+        fail(f"refusing removal; result would not parse: {exc}")
+    if dry:
+        info(f"[dry-run] remove agent-bios additions from {target}")
+        sys.exit(0)
+    backup = target.with_name(target.name + ".bak-agent-bios-uninstall")
+    backup.write_text(live_text)
+    target.write_text(stripped)
+    info(f"removed additions  {target} (backup: {backup.name})")
+    sys.exit(0)
+
+# mode == merge
+if state_ok():
+    info(f"unchanged  {target} (additions present)")
+    sys.exit(0)
+
+# A drifted [agents.<tier>] outside our markers would become a duplicate
+# table if we appended ours; that conflict needs the user, not a clobber.
+base = strip_managed(live_text)
+base_data = tomllib.loads(base) if base.strip() else {}
+clash = [name for name in want_agents if name in base_data.get("agents", {})]
+if clash:
+    fail(
+        f"unmanaged [agents.{'/'.join(clash)}] with drifted content in {target}; "
+        "align or remove them, then rerun install"
+    )
+
+block_lines = [BEGIN]
+if "features" not in base_data:
+    block_lines += ["[features]", f"multi_agent = true  {TAG}"]
+for name, spec in want_agents.items():
+    block_lines += [
+        f"[agents.{name}]",
+        f'description = "{spec["description"]}"',
+        f'config_file = "{spec["config_file"]}"',
+    ]
+block_lines.append(END)
+block = "\n".join(block_lines) + "\n"
+
+new_text = base
+if "features" in base_data:
+    if base_data["features"].get("multi_agent") is None:
+        lines = new_text.splitlines(keepends=True)
+        for i, line in enumerate(lines):
+            if line.strip() == "[features]":
+                lines.insert(i + 1, f"multi_agent = true  {TAG}\n")
+                break
+        new_text = "".join(lines)
+    elif base_data["features"].get("multi_agent") is not True:
+        info(f"note: features.multi_agent explicitly set in {target}; leaving it")
+if new_text and not new_text.endswith("\n"):
+    new_text += "\n"
+new_text += ("\n" if new_text else "") + block
+
+try:
+    tomllib.loads(new_text)
+except Exception as exc:
+    fail(f"merge result would not parse; live config untouched ({exc})")
+if dry:
+    info(f"[dry-run] merge agent-bios additions into {target}")
+    sys.exit(0)
+if live_text and backup_root:
+    bpath = pathlib.Path(backup_root + str(target))
+    bpath.parent.mkdir(parents=True, exist_ok=True)
+    bpath.write_text(live_text)
+target.parent.mkdir(parents=True, exist_ok=True)
+target.write_text(new_text)
+info(f"merged additions  {target}")
+PY
+}
+
 # ---- optional dependencies -----------------------------------------------
 # Capabilities are optional: a missing one only degrades the review routes that
 # need it. config/agent-launch.toml is the single source for both the command
@@ -255,9 +401,12 @@ cmd_install() {
   log "Deploying agent-bios from $REPO"
   deploy_file "$REPO/claude/CLAUDE.md" "$CLAUDE_DIR/CLAUDE.md"
   deploy_glob "$REPO/claude/guides" "*.md" "$CLAUDE_DIR/guides"
+  deploy_glob "$REPO/claude/agents" "*.md" "$CLAUDE_DIR/agents"
+  deploy_glob "$REPO/claude/hooks" "*.py" "$CLAUDE_DIR/hooks" "+x"
   deploy_file "$REPO/codex/AGENTS.md" "$CODEX_DIR/AGENTS.md"
   deploy_glob "$REPO/codex/guides" "*.md" "$CODEX_DIR/guides"
   deploy_glob "$REPO/codex/agents" "*.toml" "$CODEX_DIR/agents"
+  codex_config_additions merge || exit 1
   deploy_file "$REPO/scripts/codex-run.sh"  "$CODEX_DIR/bin/codex-run"  "+x"
   deploy_file "$REPO/scripts/codex-helm.sh" "$CODEX_DIR/bin/codex-helm" "+x"
   migrate_user_presets || exit 1   # must precede the deploy below, which overwrites profiles.toml
@@ -275,12 +424,19 @@ cmd_install() {
       || log "warning: venv provisioning failed (numbered-prompt fallback applies)"
   fi
   add_zsh_hook
+  if python3 "$REPO/scripts/session-learning/learning-state.py" project --repo "$REPO" >/dev/null 2>&1; then
+    info "learning-status projected"
+  else
+    log "note: learning-status projection unavailable (versions.json/ledger missing?)"
+  fi
   log ""
   log "Verifying deployment..."
   if cmd_verify; then
     log ""
     log "Done. Open a new shell (or: source \"$ZSHRC\") to activate the zero-arg launcher."
-    [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ] && log "Replaced files were backed up under $BACKUP_DIR"
+    # An untouched backup dir means nothing was replaced; that healthy state
+    # must not become a nonzero exit under set -e.
+    { [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ] && log "Replaced files were backed up under $BACKUP_DIR"; } || true
   else
     log "VERIFY FAILED after install — see messages above"
     exit 1
@@ -298,6 +454,8 @@ cmd_verify() {
   verify_match "$REPO/config/agent-launch.toml" "$LAUNCH_DIR/profiles.toml"   || fail=1
   verify_match "$REPO/shell/agent-launch.zsh"  "$LAUNCH_DIR/shell.zsh"        || fail=1
   for gp in "$REPO"/claude/guides/*.md; do verify_present "$CLAUDE_DIR/guides/$(basename "$gp")" || fail=1; done
+  for gp in "$REPO"/claude/agents/*.md; do verify_present "$CLAUDE_DIR/agents/$(basename "$gp")" || fail=1; done
+  for gp in "$REPO"/claude/hooks/*.py;  do verify_present "$CLAUDE_DIR/hooks/$(basename "$gp")"  || fail=1; done
   for gp in "$REPO"/codex/guides/*.md;  do verify_present "$CODEX_DIR/guides/$(basename "$gp")"  || fail=1; done
   python3 - "$CODEX_DIR/agents" <<'PY' && info "agent TOMLs OK" || fail=1
 import sys, pathlib, tomllib
@@ -308,6 +466,7 @@ assert not missing, f"missing agent TOMLs in {root}: {sorted(missing)}"
 for p in sorted(root.glob("*.toml")):
     tomllib.loads(p.read_text())
 PY
+  codex_config_additions check || fail=1
   if command -v codex >/dev/null 2>&1 && [ -x "$CODEX_DIR/bin/codex-helm" ]; then
     if "$CODEX_DIR/bin/codex-helm" --dry-run --mode review "probe" >/dev/null 2>&1; then
       info "codex-helm dry-run OK"
@@ -340,6 +499,7 @@ PY
 
 cmd_uninstall() {
   migrate_state
+  codex_config_additions remove || log "warning: could not remove codex config additions"
   if [ -f "$MANIFEST" ]; then
     local f
     while IFS= read -r f; do
@@ -357,7 +517,7 @@ cmd_uninstall() {
     done
   fi
   local d
-  for d in "$CLAUDE_DIR/guides" "$CODEX_DIR/guides" "$CODEX_DIR/agents" "$CODEX_DIR/bin" "$LAUNCH_DIR"; do
+  for d in "$CLAUDE_DIR/guides" "$CLAUDE_DIR/agents" "$CODEX_DIR/guides" "$CODEX_DIR/agents" "$CODEX_DIR/bin" "$LAUNCH_DIR"; do
     [ -d "$d" ] && rmdir "$d" 2>/dev/null && info "removed empty  $d" || true
   done
   remove_zsh_hook