Improve transcript ingestion and setup

cmd/captain/main.go

@@ -125,7 +125,7 @@ func main() {
 
 	whoamiCmd := clicky.AddNamedCommand("whoami", rootCmd, cli.WhoamiOptions{}, cli.RunWhoami)
 	whoamiCmd.Short = "List agent adapters, auth methods, and available models"
-	whoamiCmd.Long = "Show every AI agent adapter (API providers and CLI agents), how each is authenticated (Captain vault, API-key env var, or CLI login), whether its CLI binary is installed, and the models each provider exposes via a live API call. Pass --models=false to skip the network probes, or --backend to inspect a single adapter."
+	whoamiCmd.Long = "Show every AI agent adapter (API providers and CLI agents), how each is authenticated (Captain vault, API-key env var, or CLI login), whether its CLI binary is installed, and the models each provider exposes via a live API call. Disabled models are hidden by default; pass --disabled=true to include them. Pass --models=false to skip the network probes, or --backend to inspect a single adapter."
 
 	configureCmd := clicky.AddNamedCommandWithContext("configure", rootCmd, cli.ConfigureOptions{}, cli.RunConfigure)
 	configureCmd.Use = "configure [provider]"

go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/samber/lo v1.53.0
 	github.com/segmentio/encoding v0.5.4
 	github.com/sergi/go-diff v1.4.0
+	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
 	github.com/t14raptor/go-fast v0.1.0
@@ -60,7 +61,7 @@ require (
 	github.com/nukilabs/ftoa v1.0.0 // indirect
 	github.com/nukilabs/unicodeid v0.1.0 // indirect
 	github.com/pgplex/pgparser v0.2.0 // indirect
-	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/zclconf/go-cty v1.14.4 // indirect
 	github.com/zclconf/go-cty-yaml v1.1.0 // indirect
@@ -136,7 +137,7 @@ require (
 	github.com/charmbracelet/bubbletea v1.3.10 // indirect
 	github.com/charmbracelet/colorprofile v0.4.3 // indirect
 	github.com/charmbracelet/lipgloss v1.1.0 // indirect
-	github.com/charmbracelet/x/ansi v0.11.6 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
@@ -292,7 +293,6 @@ require (
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/samber/oops v1.21.0 // indirect
 	github.com/segmentio/asm v1.2.1 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.7 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.4 // indirect

migrations/02_merge_duplicate_sessions.sql

@@ -17,9 +17,9 @@
 -- duplicate groups no group had more than one member with messages, so this
 -- picks a winner rather than merging two transcripts; ties fall back to the
 -- oldest row and then to the id, so the choice is deterministic on re-run.
--- Prompt runs and child sessions pointing at a ghost are re-pointed, the ghosts
--- are deleted, and the winner then absorbs a ghost's provider label -- that label
--- exists nowhere else once the ghost is gone.
+-- Prompt runs, child sessions, and processes pointing at a ghost are re-pointed,
+-- the ghosts are deleted, and the winner then absorbs a ghost's provider label --
+-- that label exists nowhere else once the ghost is gone.
 --
 -- Every reference re-pointed below is one the ghost's ON DELETE CASCADE would
 -- otherwise destroy. The ghost's own transcript rows -- messages, turns, events,
@@ -101,6 +101,13 @@ BEGIN
   FROM captain_duplicate_session_map m
   WHERE w.id = m.winner AND w.root_session_id = m.loser;
 
+  -- A running process is the durable identity of the execution that created the
+  -- ghost. Its session foreign key also cascades, so preserve it on the row that
+  -- actually owns the transcript before removing the duplicate.
+  UPDATE captain_session_processes p SET session_id = m.winner
+  FROM captain_duplicate_session_map m
+  WHERE p.session_id = m.loser;
+
   DELETE FROM captain_sessions s
   USING captain_duplicate_session_map m
   WHERE s.id = m.loser;

migrations/20_prompt_runs_and_plans.pg.hcl

@@ -10,6 +10,10 @@ table "captain_prompt_runs" {
     null = false
     type = uuid
   }
+  column "turn_id" {
+    null = true
+    type = uuid
+  }
   column "root_session_id" {
     null = false
     type = uuid
@@ -87,6 +91,22 @@ table "captain_prompt_runs" {
     null = true
     type = jsonb
   }
+  column "approval_state" {
+    null = true
+    type = jsonb
+  }
+  column "provider_checkpoint_codec" {
+    null = true
+    type = text
+  }
+  column "provider_checkpoint_version" {
+    null = true
+    type = integer
+  }
+  column "provider_checkpoint" {
+    null = true
+    type = bytea
+  }
   column "error" {
     null = true
     type = text
@@ -130,6 +150,12 @@ table "captain_prompt_runs" {
     on_update   = NO_ACTION
     on_delete   = CASCADE
   }
+  foreign_key "captain_prompt_runs_turn_id_fkey" {
+    columns     = [column.turn_id]
+    ref_columns = [table.captain_turns.column.id]
+    on_update   = NO_ACTION
+    on_delete   = CASCADE
+  }
   foreign_key "captain_prompt_runs_root_session_id_fkey" {
     columns     = [column.root_session_id]
     ref_columns = [table.captain_sessions.column.id]
@@ -192,6 +218,9 @@ table "captain_prompt_runs" {
   index "captain_prompt_runs_state_idx" {
     columns = [column.state, column.phase, column.updated_at]
   }
+  index "captain_prompt_runs_turn_id_idx" {
+    columns = [column.turn_id]
+  }
 
   check "captain_prompt_runs_iteration_nonnegative" {
     expr = "current_iteration >= 0"
@@ -208,6 +237,9 @@ table "captain_prompt_runs" {
   check "captain_prompt_runs_time_order" {
     expr = "(started_at IS NULL OR started_at >= queued_at) AND (finished_at IS NULL OR (started_at IS NOT NULL AND finished_at >= started_at))"
   }
+  check "captain_prompt_runs_provider_checkpoint" {
+    expr = "(provider_checkpoint IS NULL AND provider_checkpoint_codec IS NULL AND provider_checkpoint_version IS NULL) OR (provider_checkpoint IS NOT NULL AND length(btrim(provider_checkpoint_codec)) > 0 AND provider_checkpoint_version > 0)"
+  }
 }
 
 table "captain_prompt_run_iterations" {