Unify Forge session runtime and tool registry

crates/pulsing-cli/src/session/mod.rs

@@ -14,7 +14,7 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use anyhow::{Context, Result};
-use pulsing_forge::{run_agent_turn, run_oneshot, AgentConfig, InteractiveConfig};
+use pulsing_forge::{run_oneshot, AgentConfig, InteractiveConfig, LocalForgeClient, SessionId};
 
 use commands::{parse_line, InputAction};
 use mode::SessionMode;
@@ -103,11 +103,13 @@ struct SessionState {
 
 fn run_loop(state: &mut SessionState) -> Result<()> {
     let rt = config::tokio_runtime()?;
+    let forge = LocalForgeClient::default();
+    let forge_session = rt.block_on(forge.create_session(agent_config(&state.agent)))?;
     render::print_session_header(&state.mode, &state.agent);
 
     while let Some(line) = input::read_line(PROMPT)? {
         let action = parse_line(&line);
-        match dispatch(&rt, state, action)? {
+        match dispatch(&rt, &forge, &forge_session, state, action)? {
             LoopControl::Continue => {}
             LoopControl::Break => break,
         }
@@ -122,6 +124,8 @@ enum LoopControl {
 
 fn dispatch(
     rt: &tokio::runtime::Runtime,
+    forge: &LocalForgeClient,
+    forge_session: &SessionId,
     state: &mut SessionState,
     action: InputAction,
 ) -> Result<LoopControl> {
@@ -208,8 +212,7 @@ fn dispatch(
             }
         },
         InputAction::AgentTask { prompt } => {
-            let forge_cfg = agent_config(&state.agent);
-            match rt.block_on(run_agent_turn(&forge_cfg, &prompt)) {
+            match rt.block_on(forge.run_turn(forge_session.clone(), &prompt)) {
                 Ok(reply) => println!("\n{reply}\n"),
                 Err(err) => eprintln!("error: {err:#}\n"),
             }

crates/pulsing-forge/Cargo.toml

@@ -18,12 +18,14 @@ path = "src/bin/pulsing-forge-repl.rs"
 [dependencies]
 anyhow = { workspace = true }
 base64 = "0.22"
+chrono = { workspace = true, features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
 comfy-table = "7"
 futures = { workspace = true }
 futures-util = { workspace = true }
 glob = "0.3"
 image = { version = "0.25", default-features = false, features = ["jpeg", "png", "gif", "webp"] }
+libc = "0.2"
 portable-pty = "0.9"
 reedline = "0.39"
 regex = "1"
@@ -36,12 +38,13 @@ sha1 = "0.10"
 streaming-iterator = "0.1"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["process", "io-util", "time", "rt-multi-thread", "macros", "sync"] }
+tokio-util = { workspace = true }
 toml = "0.8"
 tracing = { workspace = true }
 tree-sitter = "0.25"
 tree-sitter-bash = "0.25"
 url = "2"
-uuid = { workspace = true, features = ["v4"] }
+uuid = { workspace = true, features = ["v4", "serde"] }
 rmcp = { version = "1.7.0", default-features = false, features = [
     "auth",
     "base64",

crates/pulsing-forge/src/agent/events.rs

@@ -13,7 +13,11 @@ pub enum AgentEvent {
         ok: bool,
         summary: String,
     },
+    ToolCancelled {
+        name: String,
+    },
     Error(String),
+    Cancelled,
     Done {
         text: String,
     },

crates/pulsing-forge/src/agent/interactive.rs

@@ -5,7 +5,8 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 
-use super::r#loop::{AgentConfig, default_model_for_provider, default_provider, run_agent_turn};
+use super::r#loop::{AgentConfig, default_model_for_provider, default_provider};
+use crate::session::LocalForgeClient;
 
 #[derive(Clone, PartialEq)]
 pub struct InteractiveConfig {
@@ -41,6 +42,8 @@ pub async fn run_interactive(cfg: InteractiveConfig) -> Result<()> {
     if agent_cfg.provider == "demo" {
         eprintln!("(demo LLM — set ANTHROPIC_API_KEY or OPENAI_API_KEY for live models)");
     }
+    let client = LocalForgeClient::default();
+    let session_id = client.create_session(agent_cfg).await?;
 
     loop {
         print!("› ");
@@ -57,7 +60,7 @@ pub async fn run_interactive(cfg: InteractiveConfig) -> Result<()> {
         if prompt == "exit" || prompt == "quit" {
             break;
         }
-        match run_agent_turn(&agent_cfg, prompt).await {
+        match client.run_turn(session_id.clone(), prompt).await {
             Ok(reply) => {
                 println!("\n{reply}\n");
             }
@@ -76,5 +79,7 @@ pub async fn run_oneshot(cfg: InteractiveConfig, prompt: &str) -> Result<String>
         model: cfg.model,
         ..AgentConfig::default()
     };
-    run_agent_turn(&agent_cfg, prompt).await
+    let client = LocalForgeClient::default();
+    let session_id = client.create_session(agent_cfg).await?;
+    Ok(client.run_turn(session_id, prompt).await?)
 }