Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

show project names in session list

Raine Virta56b9e5d9c135
diff --git a/src/lib.rs b/src/lib.rs
index 4295089..802d68a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,6 +4,7 @@ pub mod config;
pub mod logging;
pub mod monitor;
pub mod paths;
+pub mod project;
pub mod provider;
pub mod providers;
pub mod registry;
diff --git a/src/monitor.rs b/src/monitor.rs
index a54a931..5065ea7 100644
--- a/src/monitor.rs
+++ b/src/monitor.rs
@@ -53,6 +53,10 @@ pub enum MonitorEvent {
session_seq: Option<u64>,
endpoint: EndpointKind,
},
+ ProjectResolved {
+ request_id: String,
+ project: String,
+ },
ProviderSelected {
request_id: String,
provider: String,
@@ -107,6 +111,7 @@ pub struct ActiveRequest {
pub request_id: String,
pub session_id: Option<String>,
pub session_seq: Option<u64>,
+ pub project: Option<String>,
pub provider: Option<String>,
pub model: Option<String>,
pub effort: Option<String>,
@@ -148,6 +153,7 @@ pub struct CompletedRequest {
pub request_id: String,
pub session_id: Option<String>,
pub session_seq: Option<u64>,
+ pub project: Option<String>,
pub provider: Option<String>,
pub model: Option<String>,
pub effort: Option<String>,
@@ -215,6 +221,7 @@ pub struct MonitorState {
#[derive(Debug, Clone)]
pub struct SessionSummary {
pub session_id: Option<String>,
+ pub project: Option<String>,
pub active_count: usize,
pub request_count: usize,
pub failure_count: usize,
@@ -310,6 +317,13 @@ impl MonitorHandle {
});
}
+ pub fn project_resolved(&self, request_id: impl Into<String>, project: impl Into<String>) {
+ self.publish(MonitorEvent::ProjectResolved {
+ request_id: request_id.into(),
+ project: project.into(),
+ });
+ }
+
pub fn provider_selected(
&self,
request_id: impl Into<String>,
@@ -432,6 +446,7 @@ impl MonitorStore {
request_id,
session_id,
session_seq,
+ project: None,
provider: None,
model: None,
effort: None,
@@ -453,6 +468,14 @@ impl MonitorStore {
},
);
}
+ MonitorEvent::ProjectResolved {
+ request_id,
+ project,
+ } => {
+ if let Some(active) = self.active.get_mut(&request_id) {
+ active.project = Some(project);
+ }
+ }
MonitorEvent::ProviderSelected {
request_id,
provider,
@@ -641,6 +664,7 @@ impl MonitorStore {
request_id: request_id.to_string(),
session_id: None,
session_seq: None,
+ project: None,
provider: None,
model: None,
effort: None,
@@ -670,6 +694,7 @@ impl MonitorStore {
request_id: active.request_id,
session_id: active.session_id,
session_seq: active.session_seq,
+ project: active.project,
provider: active.provider,
model: active.model,
effort: active.effort,
@@ -720,6 +745,7 @@ fn session_summaries(
.entry(request.session_id.clone())
.or_insert_with(|| SessionSummary {
session_id: request.session_id.clone(),
+ project: request.project.clone(),
active_count: 0,
request_count: 0,
failure_count: 0,
@@ -737,6 +763,7 @@ fn session_summaries(
if request.status == RequestStatus::Failed {
entry.failure_count += 1;
}
+ entry.project = request.project.clone().or(entry.project.clone());
entry.provider = request.provider.clone().or(entry.provider.clone());
entry.model = request.model.clone().or(entry.model.clone());
entry.effort = request.effort.clone().or(entry.effort.clone());
@@ -767,6 +794,7 @@ fn session_summaries(
.entry(request.session_id.clone())
.or_insert_with(|| SessionSummary {
session_id: request.session_id.clone(),
+ project: request.project.clone(),
active_count: 0,
request_count: 0,
failure_count: 0,
@@ -782,6 +810,7 @@ fn session_summaries(
});
entry.active_count += 1;
entry.request_count += 1;
+ entry.project = request.project.clone().or(entry.project.clone());
entry.provider = request.provider.clone().or(entry.provider.clone());
entry.model = request.model.clone().or(entry.model.clone());
entry.effort = request.effort.clone().or(entry.effort.clone());
@@ -1077,6 +1106,7 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
request_id: request_id.to_string(),
session_id: Some(session_id.to_string()),
session_seq: None,
+ project: None,
provider: Some("codex".to_string()),
model: Some("gpt-5.6-sol".to_string()),
effort: None,
@@ -1218,6 +1248,7 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
Some(1),
EndpointKind::Messages,
);
+ monitor.project_resolved("r1", "example");
monitor.provider_selected("r1", "codex", "gpt-5.5", None);
monitor.request_completed("r1", 200, Some(10), Some(20));
monitor.request_started(
@@ -1230,6 +1261,7 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
let state = monitor.snapshot();
assert_eq!(state.sessions.len(), 1);
assert_eq!(state.sessions[0].label(), "s1");
+ assert_eq!(state.sessions[0].project.as_deref(), Some("example"));
assert_eq!(state.sessions[0].request_count, 2);
assert_eq!(state.sessions[0].active_count, 1);
assert_eq!(state.sessions[0].effort.as_deref(), Some("xhigh"));
diff --git a/src/project.rs b/src/project.rs
new file mode 100644
index 0000000..187662e
--- /dev/null
+++ b/src/project.rs
@@ -0,0 +1,137 @@
+use std::path::{Path, PathBuf};
+
+use serde_json::Value;
+
+const WORKING_DIRECTORY_PREFIXES: [&str; 3] = [
+ "Primary working directory:",
+ "Working directory:",
+ "Current working directory:",
+];
+
+pub fn name_from_system(system: Option<&Value>) -> Option<String> {
+ system_text(system)
+ .lines()
+ .find_map(working_directory_from_line)
+ .and_then(name_from_working_directory)
+}
+
+fn system_text(system: Option<&Value>) -> String {
+ match system {
+ Some(Value::String(text)) => text.clone(),
+ Some(Value::Array(blocks)) => blocks
+ .iter()
+ .filter_map(|block| block.get("text").and_then(Value::as_str))
+ .collect::<Vec<_>>()
+ .join("\n"),
+ _ => String::new(),
+ }
+}
+
+fn working_directory_from_line(line: &str) -> Option<&str> {
+ let line = line.trim().strip_prefix("- ").unwrap_or(line.trim());
+ WORKING_DIRECTORY_PREFIXES.iter().find_map(|prefix| {
+ line.strip_prefix(prefix)
+ .map(str::trim)
+ .filter(|path| !path.is_empty())
+ })
+}
+
+fn name_from_working_directory(path: &str) -> Option<String> {
+ let working_directory = Path::new(path);
+ let repository_root = working_directory
+ .ancestors()
+ .find(|ancestor| ancestor.join(".git").exists());
+
+ repository_root
+ .and_then(repository_name)
+ .or_else(|| path_name(working_directory))
+}
+
+fn repository_name(root: &Path) -> Option<String> {
+ let git_marker = root.join(".git");
+ if git_marker.is_dir() {
+ return path_name(root);
+ }
+
+ let contents = std::fs::read_to_string(git_marker).ok()?;
+ let git_dir = contents.trim().strip_prefix("gitdir:")?.trim();
+ let git_dir = if Path::new(git_dir).is_absolute() {
+ PathBuf::from(git_dir)
+ } else {
+ root.join(git_dir)
+ };
+ git_dir
+ .ancestors()
+ .find(|ancestor| ancestor.file_name().is_some_and(|name| name == ".git"))
+ .and_then(Path::parent)
+ .and_then(path_name)
+ .or_else(|| path_name(root))
+}
+
+fn path_name(path: &Path) -> Option<String> {
+ path.file_name()
+ .and_then(|name| name.to_str())
+ .filter(|name| !name.is_empty())
+ .map(str::to_string)
+}
+
+#[cfg(test)]
+mod tests {
+ use std::fs;
+
+ use serde_json::json;
+ use tempfile::tempdir;
+
+ use super::*;
+
+ #[test]
+ fn reads_primary_working_directory_from_system_blocks() {
+ let root = tempdir().unwrap();
+ fs::create_dir(root.path().join(".git")).unwrap();
+ let system = json!([
+ {"type": "text", "text": "instructions"},
+ {"type": "text", "text": format!(
+ "# Environment\n - Primary working directory: {}\n - Platform: linux",
+ root.path().display()
+ )}
+ ]);
+
+ assert_eq!(
+ name_from_system(Some(&system)).as_deref(),
+ root.path().file_name().and_then(|name| name.to_str())
+ );
+ }
+
+ #[test]
+ fn reads_legacy_working_directory_from_string_system_prompt() {
+ let system = json!("<env>\nWorking directory: /home/user/example\n</env>");
+
+ assert_eq!(name_from_system(Some(&system)).as_deref(), Some("example"));
+ }
+
+ #[test]
+ fn resolves_linked_worktree_to_main_repository_name() {
+ let temp = tempdir().unwrap();
+ let main = temp.path().join("project");
+ let worktree = temp.path().join("worktrees").join("feature");
+ let git_dir = main.join(".git").join("worktrees").join("feature");
+ fs::create_dir_all(&git_dir).unwrap();
+ fs::create_dir_all(&worktree).unwrap();
+ fs::write(
+ worktree.join(".git"),
+ format!("gitdir: {}\n", git_dir.display()),
+ )
+ .unwrap();
+
+ assert_eq!(
+ name_from_working_directory(worktree.to_str().unwrap()).as_deref(),
+ Some("project")
+ );
+ }
+
+ #[test]
+ fn returns_none_without_working_directory_metadata() {
+ assert_eq!(name_from_system(Some(&json!("instructions"))), None);
+ assert_eq!(name_from_system(None), None);
+ }
+}
diff --git a/src/server.rs b/src/server.rs
index 7d7e86c..e90e908 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -2,6 +2,7 @@ use crate::{
anthropic::json_error,
logging::{Logger, REDACT_KEYS, create_logger},
monitor::{EndpointKind, MonitorHandle},
+ project,
provider::RequestContext,
registry::{Registry, normalize_incoming_model},
session::{self, SessionState},
@@ -247,6 +248,12 @@ async fn dispatch_request(
}
};
+ if let Some(project) = project::name_from_system(body.extra.get("system"))
+ && let Some(monitor) = state.monitor.as_ref()
+ {
+ monitor.project_resolved(&req_id, project);
+ }
+
let model = match body.model.as_deref() {
Some(model) => model,
None => {
diff --git a/src/tui.rs b/src/tui.rs
index 29adb81..19d9384 100644
--- a/src/tui.rs
+++ b/src/tui.rs
@@ -39,9 +39,10 @@ const BLUE: Color = Color::Rgb(120, 170, 230);
const DIM: Color = Color::Rgb(100, 104, 114);
const RECENT_MODEL_WIDTH: u16 = 36;
-const SESSION_TABLE_HEADERS: [(&str, Alignment); 12] = [
+const SESSION_TABLE_HEADERS: [(&str, Alignment); 13] = [
("", Alignment::Left),
("ID", Alignment::Left),
+ ("Project", Alignment::Left),
("Active", Alignment::Right),
("Reqs", Alignment::Right),
("Fail", Alignment::Right),
@@ -625,6 +626,7 @@ fn render_sessions(
let widths = [
Constraint::Length(1),
Constraint::Length(8),
+ Constraint::Length(18),
Constraint::Length(6),
Constraint::Length(5),
Constraint::Length(5),
@@ -636,7 +638,7 @@ fn render_sessions(
Constraint::Length(12),
Constraint::Length(10),
];
- let model_width = table_column_width(area, &widths, 6);
+ let model_width = table_column_width(area, &widths, 7);
let rows = sessions.iter().enumerate().map(|(index, session)| {
let marker = if focused && index == selected {
">"
@@ -646,6 +648,7 @@ fn render_sessions(
Row::new(vec![
Cell::from(Span::styled(marker, Style::default().fg(TEAL))),
text_cell(display_session_id(session.session_id.as_deref())),
+ text_cell(session.project.as_deref().unwrap_or("-")),
number_cell(session.active_count.to_string()),
number_cell(session.request_count.to_string()),
number_cell(session.failure_count.to_string()),
@@ -863,6 +866,7 @@ fn render_session_detail(
let lines = if let Some(session) = state.sessions.get(selected) {
vec![
detail_line("session", session.label(), WHITE),
+ detail_line("project", session.project.as_deref().unwrap_or("-"), TEAL),
detail_line("active requests", session.active_count.to_string(), YELLOW),
detail_line(
"total requests",
@@ -1251,8 +1255,8 @@ mod tests {
assert_eq!(
table_header_labels(&SESSION_TABLE_HEADERS),
[
- "", "ID", "Active", "Reqs", "Fail", "Provider", "Model", "Effort", "In", "Out",
- "Rate", "Status",
+ "", "ID", "Project", "Active", "Reqs", "Fail", "Provider", "Model", "Effort", "In",
+ "Out", "Rate", "Status",
]
);
assert_eq!(
@@ -1406,6 +1410,7 @@ mod tests {
Some(1),
EndpointKind::Messages,
);
+ monitor.project_resolved("request-1", "example-project");
monitor.provider_selected(
"request-1",
"codex",
@@ -1419,6 +1424,8 @@ mod tests {
});
let sessions_text = buffer_text(&sessions);
assert!(sessions_text.contains("Provider"));
+ assert!(sessions_text.contains("Project"));
+ assert!(sessions_text.contains("example-project"));
assert!(sessions_text.contains("sess-1"));
assert!(!sessions_text.contains("No sessions"));
diff --git a/tests/server.rs b/tests/server.rs
index 157af6a..ba7f334 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -267,7 +267,7 @@ async fn monitor_records_successful_request_events() {
.uri("/v1/messages/count_tokens")
.header("content-type", "application/json")
.body(body_string(
- r#"{"model":"gpt-5.4","messages":[{"role":"user","content":"hello"}],"output_config":{"effort":"high"}}"#,
+ r##"{"model":"gpt-5.4","messages":[{"role":"user","content":"hello"}],"system":"# Environment\n - Primary working directory: /projects/example","output_config":{"effort":"high"}}"##,
))
.unwrap(),
)
@@ -287,6 +287,8 @@ async fn monitor_records_successful_request_events() {
assert_eq!(state.recent.len(), 1);
assert_eq!(state.recent[0].status, RequestStatus::Completed);
assert_eq!(state.recent[0].http_status, Some(200));
+ assert_eq!(state.recent[0].project.as_deref(), Some("example"));
+ assert_eq!(state.sessions[0].project.as_deref(), Some("example"));
assert_eq!(state.recent[0].provider.as_deref(), Some("codex"));
assert_eq!(state.recent[0].model.as_deref(), Some("gpt-5.4"));
assert_eq!(state.recent[0].effort.as_deref(), Some("high"));