feat: simplify developer extension (#7466)
Co-authored-by: Alex Hancock <alexhancock@block.xyz>
This commit is contained in:
@@ -11,10 +11,9 @@ use std::path::PathBuf;
|
||||
|
||||
use clap::{Parser, Subcommand};
|
||||
use goose::agents::validate_extensions;
|
||||
use goose::config::paths::Paths;
|
||||
use goose_mcp::{
|
||||
mcp_server_runner::{serve, McpCommand},
|
||||
AutoVisualiserRouter, ComputerControllerServer, DeveloperServer, MemoryServer, TutorialServer,
|
||||
AutoVisualiserRouter, ComputerControllerServer, MemoryServer, TutorialServer,
|
||||
};
|
||||
|
||||
#[derive(Parser)]
|
||||
@@ -57,15 +56,6 @@ async fn main() -> anyhow::Result<()> {
|
||||
McpCommand::ComputerController => serve(ComputerControllerServer::new()).await?,
|
||||
McpCommand::Memory => serve(MemoryServer::new()).await?,
|
||||
McpCommand::Tutorial => serve(TutorialServer::new()).await?,
|
||||
McpCommand::Developer => {
|
||||
let bash_env = Paths::config_dir().join(".bash_env");
|
||||
serve(
|
||||
DeveloperServer::new()
|
||||
.extend_path_with_shell(true)
|
||||
.bash_env_file(Some(bash_env)),
|
||||
)
|
||||
.await?
|
||||
}
|
||||
}
|
||||
}
|
||||
Commands::ValidateExtensions { path } => {
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
use axum::http::StatusCode;
|
||||
use goose::builtin_extension::{register_builtin_extension, register_builtin_extensions};
|
||||
use goose::config::paths::Paths;
|
||||
use goose::builtin_extension::register_builtin_extensions;
|
||||
use goose::execution::manager::AgentManager;
|
||||
use goose::scheduler_trait::SchedulerTrait;
|
||||
use goose::session::SessionManager;
|
||||
use goose_mcp::DeveloperServer;
|
||||
use rmcp::ServiceExt;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
@@ -31,25 +28,9 @@ pub struct AppState {
|
||||
pub inference_runtime: Arc<InferenceRuntime>,
|
||||
}
|
||||
|
||||
fn spawn_developer(r: tokio::io::DuplexStream, w: tokio::io::DuplexStream) {
|
||||
let bash_env = Paths::config_dir().join(".bash_env");
|
||||
let server = DeveloperServer::new()
|
||||
.extend_path_with_shell(true)
|
||||
.bash_env_file(Some(bash_env));
|
||||
tokio::spawn(async move {
|
||||
match server.serve((r, w)).await {
|
||||
Ok(running) => {
|
||||
let _ = running.waiting().await;
|
||||
}
|
||||
Err(e) => tracing::error!(builtin = "developer", error = %e, "server error"),
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
pub async fn new() -> anyhow::Result<Arc<AppState>> {
|
||||
register_builtin_extensions(goose_mcp::BUILTIN_EXTENSIONS.clone());
|
||||
register_builtin_extension("developer", spawn_developer);
|
||||
|
||||
let agent_manager = AgentManager::instance().await?;
|
||||
let tunnel_manager = Arc::new(TunnelManager::new());
|
||||
|
||||
Reference in New Issue
Block a user