Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/smoke-codex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:

- name: Require daemon-capable bt
run: |
"$HOME/.local/bin/bt" daemon hook --help
"$HOME/.local/bin/bt" agents hook --help

- name: Install plugin from ${{ inputs.dist_repo }}
env:
Expand Down
4 changes: 2 additions & 2 deletions bt-daemon/tests/support/agents/claude.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{command_from_env, test_plugin, AgentOutput, ProcessOptions};
use super::{command_from_env, repository_root, AgentOutput, ProcessOptions};
use crate::support::agent_process::AgentTestWorld;
use std::ffi::OsString;
use std::path::PathBuf;
Expand Down Expand Up @@ -64,7 +64,7 @@ impl ClaudeAgent {

pub async fn run(&self, world: &AgentTestWorld, run: ClaudeRun) -> AgentOutput {
let session_id = Uuid::new_v4().to_string();
let plugin = test_plugin::claude_plugin(world);
let plugin = repository_root().join("src/plugins/claude/content/plugins/trace-claude-code");
let mut command = command_from_env("CLAUDE_BIN", "claude");
command
.args([
Expand Down
6 changes: 3 additions & 3 deletions bt-daemon/tests/support/agents/codex.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{command_from_env, configured_home, test_plugin, AgentOutput, ProcessOptions};
use super::{command_from_env, configured_home, repository_root, AgentOutput, ProcessOptions};
use crate::support::agent_process::AgentTestWorld;
use std::ffi::OsString;
use std::path::PathBuf;
Expand Down Expand Up @@ -56,7 +56,7 @@ impl CodexAgent {
let home = world.temp_path("codex-home");
std::fs::create_dir_all(&home).expect("create Codex home");

let marketplace = test_plugin::codex_marketplace(world);
let marketplace = repository_root().join("src/plugins/codex/content");
let mut add_marketplace = command_from_env("CODEX_BIN", "codex");
add_marketplace
.arg("plugin")
Expand All @@ -69,7 +69,7 @@ impl CodexAgent {

let mut add_plugin = command_from_env("CODEX_BIN", "codex");
add_plugin
.args(["plugin", "add", "trace-codex-test@braintrust-daemon-tests"])
.args(["plugin", "add", "trace-codex@braintrust-codex-plugins"])
.env("CODEX_HOME", &home);
world.configure(&mut add_plugin);
AgentOutput::from(world.output(&mut add_plugin).await).assert_success();
Expand Down
8 changes: 7 additions & 1 deletion bt-daemon/tests/support/agents/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
mod claude;
mod codex;
mod test_plugin;

#[allow(unused_imports)]
pub use claude::{ClaudeAgent, ClaudeRun};
Expand Down Expand Up @@ -82,6 +81,13 @@ fn command_from_env(name: &str, fallback: &str) -> Command {
Command::new(fallback)
}

fn repository_root() -> PathBuf {
std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
.parent()
.expect("repository root")
.to_path_buf()
}

fn configured_home(config_env: &str, directory: &str) -> Option<PathBuf> {
std::env::var_os(config_env).map(PathBuf::from).or_else(|| {
std::env::var_os("HOME")
Expand Down
95 changes: 0 additions & 95 deletions bt-daemon/tests/support/agents/test_plugin.rs

This file was deleted.

Loading