Skip to content

feat: add collapsible subagent groups and parent family cost totals #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lj64212585 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: add collapsible subagent groups and parent family cost totals #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c4db81
Terminal feat: nest subagent sessions under parent threads
lj64212585 Aug 21, 2026
cefcbc4
merge: integrate upstream session updates
lj64212585 Aug 21, 2026
6011787
feat(sessions): show parent family total cost
lj64212585 Aug 22, 2026
55cdd70
Merge remote-tracking branch 'upstream/main' into feat/nest-subagent
lj64212585 Aug 24, 2026
fca98e3
chore: merge upstream main
lj64212585 Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 76 additions & 7 deletions src-tauri/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pub fn open_database(database_path: &Path) -> Result<Connection, String> {
rows_json TEXT NOT NULL,
prompt_title TEXT,
quota_usage_json TEXT,
agent_metadata_json TEXT,
quota_parser_version INTEGER NOT NULL DEFAULT 0,
updated_at TEXT NOT NULL
);
Expand All @@ -67,6 +68,12 @@ pub fn open_database(database_path: &Path) -> Result<Connection, String> {
"prompt_title",
"ALTER TABLE session_file_rollups ADD COLUMN prompt_title TEXT",
)?;
ensure_column(
&db,
"session_file_rollups",
"agent_metadata_json",
"ALTER TABLE session_file_rollups ADD COLUMN agent_metadata_json TEXT",
)?;
ensure_column(
&db,
"session_file_rollups",
Expand All @@ -76,6 +83,16 @@ pub fn open_database(database_path: &Path) -> Result<Connection, String> {
Ok(db)
}

#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct SessionAgentMetadata {
pub thread_id: Option<String>,
pub parent_thread_id: Option<String>,
pub agent_path: Option<String>,
pub agent_nickname: Option<String>,
pub agent_role: Option<String>,
}

#[derive(Debug, Clone)]
pub struct SessionFileRollup {
pub path: String,
Expand All @@ -84,6 +101,7 @@ pub struct SessionFileRollup {
pub rows: Vec<DailyUsageRow>,
pub prompt_title: Option<String>,
pub quota_usage: Option<SessionQuotaRollup>,
pub agent_metadata: Option<SessionAgentMetadata>,
}

#[derive(Debug, Clone, Serialize, Deserialize, Default)]
Expand Down Expand Up @@ -249,7 +267,7 @@ pub fn query_session_file_rollup(
) -> Result<Option<SessionFileRollup>, String> {
let result = db.query_row(
r#"
SELECT rows_json, prompt_title, quota_usage_json
SELECT rows_json, prompt_title, quota_usage_json, agent_metadata_json
FROM session_file_rollups
WHERE path = ? AND modified_at_ms = ? AND size_bytes = ? AND quota_parser_version = ?
"#,
Expand All @@ -259,23 +277,28 @@ pub fn query_session_file_rollup(
row.get::<_, String>(0)?,
row.get::<_, Option<String>>(1)?,
row.get::<_, Option<String>>(2)?,
row.get::<_, Option<String>>(3)?,
))
},
);

match result {
Ok((rows_json, prompt_title, quota_usage_json)) => {
Ok((rows_json, prompt_title, quota_usage_json, agent_metadata_json)) => {
let rows = serde_json::from_str(&rows_json).map_err(|error| error.to_string())?;
let quota_usage = quota_usage_json
.map(|json| serde_json::from_str(&json).map_err(|error| error.to_string()))
.transpose()?;
let agent_metadata = agent_metadata_json
.map(|json| serde_json::from_str(&json).map_err(|error| error.to_string()))
.transpose()?;
Ok(Some(SessionFileRollup {
path: path.to_string(),
modified_at_ms,
size_bytes,
rows,
prompt_title,
quota_usage,
agent_metadata,
}))
}
Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
Expand Down Expand Up @@ -356,15 +379,17 @@ pub fn upsert_session_file_rollups(
rows_json,
prompt_title,
quota_usage_json,
agent_metadata_json,
quota_parser_version,
updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(path) DO UPDATE SET
modified_at_ms = excluded.modified_at_ms,
size_bytes = excluded.size_bytes,
rows_json = excluded.rows_json,
prompt_title = excluded.prompt_title,
quota_usage_json = excluded.quota_usage_json,
agent_metadata_json = excluded.agent_metadata_json,
quota_parser_version = excluded.quota_parser_version,
updated_at = excluded.updated_at
"#,
Expand All @@ -380,6 +405,12 @@ pub fn upsert_session_file_rollups(
.map(serde_json::to_string)
.transpose()
.map_err(|error| error.to_string())?;
let agent_metadata_json = rollup
.agent_metadata
.as_ref()
.map(serde_json::to_string)
.transpose()
.map_err(|error| error.to_string())?;
statement
.execute(params![
rollup.path,
Expand All @@ -388,6 +419,7 @@ pub fn upsert_session_file_rollups(
rows_json,
rollup.prompt_title,
quota_usage_json,
agent_metadata_json,
QUOTA_PARSER_VERSION,
updated_at
])
Expand Down Expand Up @@ -502,7 +534,8 @@ pub fn query_session_details(db: &Connection) -> Result<Vec<SessionDetailRow>, S
size_bytes,
rows_json,
prompt_title,
quota_usage_json
quota_usage_json,
agent_metadata_json
FROM session_file_rollups
ORDER BY modified_at_ms DESC
"#,
Expand All @@ -519,6 +552,10 @@ pub fn query_session_details(db: &Connection) -> Result<Vec<SessionDetailRow>, S
let quota_usage = row
.get::<_, Option<String>>(5)?
.and_then(|json| serde_json::from_str::<SessionQuotaRollup>(&json).ok());
let agent_metadata = row
.get::<_, Option<String>>(6)?
.and_then(|json| serde_json::from_str::<SessionAgentMetadata>(&json).ok())
.unwrap_or_default();

let daily_rows =
serde_json::from_str::<Vec<DailyUsageRow>>(&rows_json).unwrap_or_default();
Expand Down Expand Up @@ -573,12 +610,14 @@ pub fn query_session_details(db: &Connection) -> Result<Vec<SessionDetailRow>, S
path,
session_id,
thread_name: prompt_title.filter(|title| !title.is_empty()),
thread_id: agent_metadata.thread_id,
parent_thread_id: agent_metadata.parent_thread_id,
agent_session_id: None,
parent_session_id: None,
agent_depth: 0,
agent_path: None,
agent_nickname: None,
agent_role: None,
agent_path: agent_metadata.agent_path,
agent_nickname: agent_metadata.agent_nickname,
agent_role: agent_metadata.agent_role,
modified_at_ms,
size_bytes,
input_tokens,
Expand Down Expand Up @@ -671,6 +710,16 @@ mod tests {
.iter()
.any(|column| column == "quota_usage_json");
assert!(has_quota_usage_json);
let has_agent_metadata_json = db
.prepare("PRAGMA table_info(session_file_rollups)")
.unwrap()
.query_map([], |row| row.get::<_, String>(1))
.unwrap()
.collect::<Result<Vec<_>, _>>()
.unwrap()
.iter()
.any(|column| column == "agent_metadata_json");
assert!(has_agent_metadata_json);
let has_quota_parser_version = db
.prepare("PRAGMA table_info(session_file_rollups)")
.unwrap()
Expand Down Expand Up @@ -723,6 +772,13 @@ mod tests {
rows: vec![],
prompt_title: Some("First real request".to_string()),
quota_usage: None,
agent_metadata: Some(SessionAgentMetadata {
thread_id: Some("child-thread".to_string()),
parent_thread_id: Some("parent-thread".to_string()),
agent_path: Some("/root/inspect_sidebar".to_string()),
agent_nickname: Some("Ada".to_string()),
agent_role: Some("explorer".to_string()),
}),
},
SessionFileRollup {
path: "/tmp/untitled.jsonl".to_string(),
Expand All @@ -731,6 +787,7 @@ mod tests {
rows: vec![],
prompt_title: Some(String::new()),
quota_usage: None,
agent_metadata: None,
},
],
"2026-07-16T00:00:00.000Z",
Expand All @@ -743,6 +800,17 @@ mod tests {
sessions[0].thread_name.as_deref(),
Some("First real request")
);
assert_eq!(sessions[0].thread_id.as_deref(), Some("child-thread"));
assert_eq!(
sessions[0].parent_thread_id.as_deref(),
Some("parent-thread")
);
assert_eq!(
sessions[0].agent_path.as_deref(),
Some("/root/inspect_sidebar")
);
assert_eq!(sessions[0].agent_nickname.as_deref(), Some("Ada"));
assert_eq!(sessions[0].agent_role.as_deref(), Some("explorer"));
assert_eq!(sessions[1].thread_name, None);
let _ = std::fs::remove_file(path);
}
Expand Down Expand Up @@ -788,6 +856,7 @@ mod tests {
rows: vec![daily_row("2026-07-01", 1), daily_row("2026-07-02", 2)],
prompt_title: None,
quota_usage: None,
agent_metadata: None,
}],
"2026-07-02T00:00:00.000Z",
)
Expand Down
Loading