anveesa 0.7.2 → 0.7.3

package/src/provider/command.rs

@@ -0,0 +1,310 @@
+use std::{
+    env,
+    ffi::OsString,
+    path::{Path, PathBuf},
+    process::Stdio,
+};
+
+use anyhow::{Context, Result, bail};
+use tokio::{io::AsyncWriteExt, process::Command, sync::mpsc::UnboundedSender};
+
+use crate::{
+    config::CommandProviderConfig,
+    provider::{ChatRole, PromptRequest, StreamEvent, TurnResult},
+};
+
+pub async fn ask(
+    config: &CommandProviderConfig,
+    request: PromptRequest,
+    events: &UnboundedSender<StreamEvent>,
+) -> Result<TurnResult> {
+    let command_prompt = command_prompt(config, &request);
+    let prompt_in_args = config.args.iter().any(|arg| arg.contains("{prompt}"));
+    let args = build_args(config, &command_prompt, &request);
+
+    let executable = resolve_command(&config.command)?;
+    let mut command = Command::new(&executable);
+    command
+        .args(args)
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+
+    for (key, value) in &config.env {
+        command.env(key, expand_arg(value, &command_prompt, &request));
+    }
+
+    if !prompt_in_args {
+        command.stdin(Stdio::piped());
+    }
+
+    let _ = events.send(StreamEvent::Status {
+        message: format!("Running command provider `{}`", config.command),
+    });
+
+    let mut child = command.spawn().with_context(|| {
+        format!(
+            "failed to spawn command provider '{}' at {}",
+            config.command,
+            executable.display()
+        )
+    })?;
+
+    if !prompt_in_args {
+        let mut stdin = child.stdin.take().context("failed to open command stdin")?;
+        stdin
+            .write_all(command_prompt.as_bytes())
+            .await
+            .context("failed to write prompt to command stdin")?;
+        drop(stdin);
+    }
+
+    let output = child
+        .wait_with_output()
+        .await
+        .context("failed to wait for command provider")?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        bail!(
+            "command provider '{}' exited with {}: {}",
+            config.command,
+            output.status,
+            stderr.trim()
+        );
+    }
+
+    let text = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    let _ = events.send(StreamEvent::Token(text.clone()));
+    Ok(TurnResult {
+        text,
+        usage: None,
+        model_used: None,
+    })
+}
+
+fn command_prompt(config: &CommandProviderConfig, request: &PromptRequest) -> String {
+    let system_is_native = request.system.is_some() && !config.system_args.is_empty();
+    if request.history.is_empty()
+        && request.workspace_context.is_none()
+        && (request.system.is_none() || system_is_native)
+    {
+        return request.prompt.clone();
+    }
+
+    let mut prompt = String::new();
+
+    if let (Some(system), false) = (&request.system, system_is_native) {
+        prompt.push_str("System:\n");
+        prompt.push_str(system);
+        prompt.push_str("\n\n");
+    }
+
+    if let Some(workspace_context) = &request.workspace_context {
+        prompt.push_str("System:\n");
+        prompt.push_str(workspace_context);
+        prompt.push_str("\n\n");
+    }
+
+    for message in &request.history {
+        match message.role {
+            ChatRole::User => prompt.push_str("User:\n"),
+            ChatRole::Assistant => prompt.push_str("Assistant:\n"),
+        }
+        prompt.push_str(&message.content);
+        prompt.push_str("\n\n");
+    }
+
+    prompt.push_str("User:\n");
+    prompt.push_str(&request.prompt);
+    prompt
+}
+
+fn build_args(
+    config: &CommandProviderConfig,
+    command_prompt: &str,
+    request: &PromptRequest,
+) -> Vec<String> {
+    let mut args = Vec::new();
+    let mut expanded_model_args = false;
+    let mut expanded_system_args = false;
+
+    for arg in &config.args {
+        match arg.as_str() {
+            "{model_args}" => {
+                expanded_model_args = true;
+                append_optional_args(
+                    &mut args,
+                    &config.model_args,
+                    request.model.is_some(),
+                    command_prompt,
+                    request,
+                );
+            }
+            "{system_args}" => {
+                expanded_system_args = true;
+                append_optional_args(
+                    &mut args,
+                    &config.system_args,
+                    request.system.is_some(),
+                    command_prompt,
+                    request,
+                );
+            }
+            _ => args.push(expand_arg(arg, command_prompt, request)),
+        }
+    }
+
+    if !expanded_model_args {
+        append_optional_args(
+            &mut args,
+            &config.model_args,
+            request.model.is_some(),
+            command_prompt,
+            request,
+        );
+    }
+
+    if !expanded_system_args {
+        append_optional_args(
+            &mut args,
+            &config.system_args,
+            request.system.is_some(),
+            command_prompt,
+            request,
+        );
+    }
+
+    args
+}
+
+fn append_optional_args(
+    args: &mut Vec<String>,
+    templates: &[String],
+    include: bool,
+    command_prompt: &str,
+    request: &PromptRequest,
+) {
+    if !include {
+        return;
+    }
+
+    args.extend(
+        templates
+            .iter()
+            .map(|arg| expand_arg(arg, command_prompt, request)),
+    );
+}
+
+fn expand_arg(value: &str, prompt: &str, request: &PromptRequest) -> String {
+    value
+        .replace("{prompt}", prompt)
+        .replace("{model}", request.model.as_deref().unwrap_or_default())
+        .replace("{system}", request.system.as_deref().unwrap_or_default())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::provider::ChatMessage;
+
+    fn config() -> CommandProviderConfig {
+        CommandProviderConfig {
+            command: "codex".into(),
+            default_model: None,
+            args: vec!["exec".into(), "{model_args}".into(), "{prompt}".into()],
+            model_args: vec!["--model".into(), "{model}".into()],
+            system_args: vec![],
+            env: Default::default(),
+        }
+    }
+
+    fn request(prompt: &str) -> PromptRequest {
+        PromptRequest {
+            prompt: prompt.into(),
+            model: None,
+            system: None,
+            workspace_context: None,
+            history: vec![],
+            images: vec![],
+            mcp: None,
+        }
+    }
+
+    #[test]
+    fn plain_prompt_when_no_context() {
+        let req = request("hello");
+        assert_eq!(command_prompt(&config(), &req), "hello");
+    }
+
+    #[test]
+    fn prepends_history_and_context() {
+        let mut req = request("now what?");
+        req.workspace_context = Some("cwd: /tmp".into());
+        req.history = vec![
+            ChatMessage::user("first".into()),
+            ChatMessage::assistant("answer".into()),
+        ];
+        let prompt = command_prompt(&config(), &req);
+        assert!(prompt.contains("System:\ncwd: /tmp"));
+        assert!(prompt.contains("User:\nfirst"));
+        assert!(prompt.contains("Assistant:\nanswer"));
+        assert!(prompt.trim_end().ends_with("User:\nnow what?"));
+    }
+
+    #[test]
+    fn omits_model_args_without_model() {
+        let args = build_args(&config(), "hi", &request("hi"));
+        assert_eq!(args, vec!["exec", "hi"]);
+    }
+
+    #[test]
+    fn expands_model_args_with_model() {
+        let mut req = request("hi");
+        req.model = Some("gpt-5.1-codex".into());
+        let args = build_args(&config(), "hi", &req);
+        assert_eq!(args, vec!["exec", "--model", "gpt-5.1-codex", "hi"]);
+    }
+}
+
+fn resolve_command(command: &str) -> Result<PathBuf> {
+    let command_path = Path::new(command);
+    if command_path.components().count() > 1 {
+        return Ok(command_path.to_path_buf());
+    }
+
+    let Some(current_name) = env::current_exe()
+        .ok()
+        .and_then(|path| path.file_name().map(OsString::from))
+    else {
+        return Ok(command_path.to_path_buf());
+    };
+
+    let command_name = OsString::from(command);
+    if current_name != command_name {
+        return Ok(command_path.to_path_buf());
+    }
+
+    let current_exe = env::current_exe()
+        .ok()
+        .and_then(|path| path.canonicalize().ok());
+
+    for dir in env::split_paths(&env::var_os("PATH").unwrap_or_default()) {
+        let candidate = dir.join(command);
+        if !candidate.is_file() {
+            continue;
+        }
+
+        let canonical_candidate = candidate.canonicalize().ok();
+        if current_exe.is_some() && canonical_candidate == current_exe {
+            continue;
+        }
+
+        return Ok(candidate);
+    }
+
+    bail!(
+        "command provider '{}' resolves to this Anveesa alias; set providers.{}.command to the real executable path",
+        command,
+        command
+    )
+}

package/src/provider/mod.rs

@@ -0,0 +1,210 @@
+mod command;
+pub mod openai_compatible;
+
+use anyhow::{Result, anyhow};
+use serde::{Deserialize, Serialize};
+use tokio::sync::{mpsc::UnboundedSender, oneshot};
+
+use crate::config::{AppConfig, ProviderConfig};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct ChatMessage {
+    pub role: ChatRole,
+    pub content: String,
+}
+
+impl ChatMessage {
+    pub fn user(content: String) -> Self {
+        Self {
+            role: ChatRole::User,
+            content,
+        }
+    }
+
+    pub fn assistant(content: String) -> Self {
+        Self {
+            role: ChatRole::Assistant,
+            content,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum ChatRole {
+    User,
+    Assistant,
+}
+
+/// A base64-encoded image attached to the current user turn.
+#[derive(Debug, Clone)]
+pub struct ImageAttachment {
+    pub mime: String, // e.g. "image/png"
+    pub data: String, // base64-encoded bytes
+}
+
+#[derive(Debug, Clone)]
+pub struct PromptRequest {
+    pub prompt: String,
+    pub model: Option<String>,
+    pub system: Option<String>,
+    pub workspace_context: Option<String>,
+    pub history: Vec<ChatMessage>,
+    /// Images attached to the current turn (clipboard paste or explicit attach).
+    pub images: Vec<ImageAttachment>,
+    /// Connected MCP servers (runtime only, not part of session history).
+    pub mcp: Option<std::sync::Arc<crate::mcp::McpManager>>,
+}
+
+/// How tool calls that modify the system (write/edit/run) should be handled.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ApprovalPolicy {
+    /// Never run write/run tools (and do not advertise them).
+    Deny,
+    /// Ask the user on the terminal before each write/run tool call.
+    Prompt,
+    /// Run write/run tools without asking.
+    Allow,
+}
+
+/// User decision for a write/run tool confirmation.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ApprovalDecision {
+    Deny,
+    AllowOnce,
+    AllowForTurn,
+}
+
+impl ApprovalPolicy {
+    /// Whether write/run tools should be advertised to the model at all.
+    pub fn allows_write_tools(self) -> bool {
+        !matches!(self, ApprovalPolicy::Deny)
+    }
+}
+
+/// Token accounting reported by a provider, when available.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct Usage {
+    pub prompt_tokens: u64,
+    pub completion_tokens: u64,
+    pub total_tokens: u64,
+    /// Tokens served from the prompt cache (Anthropic: cache_read_input_tokens; OpenAI: cached_tokens).
+    pub cache_read_tokens: u64,
+    /// Tokens written into the prompt cache this turn (Anthropic: cache_creation_input_tokens).
+    pub cache_write_tokens: u64,
+}
+
+/// What to show in the approval dialog before running a write/run tool.
+#[derive(Debug)]
+pub enum ToolConfirmPreview {
+    /// A file write or edit — diff lines already computed from the arguments.
+    FileOp {
+        verb: String,
+        path: String,
+        added: usize,
+        removed: usize,
+        diff: Vec<DiffLine>,
+        truncated: bool,
+    },
+    /// A directory that will be created.
+    CreateDir { path: String },
+    /// Any other write/run tool — show a plain-text description.
+    Generic { summary: String },
+}
+
+/// Events streamed from a provider back to the renderer, which owns the terminal.
+#[derive(Debug)]
+pub enum StreamEvent {
+    /// Durable progress/status message for long waits between model/tool phases.
+    Status { message: String },
+    /// A chunk of assistant text to display as it arrives.
+    Token(String),
+    /// A chunk of extended thinking text (Anthropic thinking blocks).
+    Thinking(String),
+    /// Final token accounting for the turn.
+    Usage(Usage),
+    /// A read-only tool is running. Used to make multi-round inspection visible.
+    ToolCall { summary: String },
+    /// A tool finished running. Used to show explicit success/failure after approval.
+    ToolResult {
+        summary: String,
+        ok: bool,
+        elapsed_ms: u128,
+        error: Option<String>,
+    },
+    /// A write/run tool needs the user's approval. The renderer shows the
+    /// preview, prompts for a decision, and sends it back through the reply channel.
+    Confirm {
+        preview: ToolConfirmPreview,
+        reply: oneshot::Sender<ApprovalDecision>,
+    },
+    /// A file was created or edited — show a diff-style summary.
+    FileOp {
+        verb: String,
+        path: String,
+        added: usize,
+        removed: usize,
+        preview: Vec<DiffLine>,
+        truncated: bool,
+    },
+    /// The model announced a multi-step plan.
+    PlanSet { tasks: Vec<String> },
+    /// The model marked one plan step as complete.
+    PlanTaskDone { index: usize },
+}
+
+#[derive(Debug)]
+pub enum DiffKind {
+    Add,
+    Remove,
+}
+
+#[derive(Debug)]
+pub struct DiffLine {
+    pub kind: DiffKind,
+    pub line_no: usize,
+    pub text: String,
+}
+
+/// What the provider produced for a single turn.
+#[derive(Debug, Clone, Default)]
+pub struct TurnResult {
+    pub text: String,
+    pub model_used: Option<String>,
+    pub usage: Option<Usage>,
+}
+
+pub async fn ask(
+    config: &AppConfig,
+    provider_name: &str,
+    mut request: PromptRequest,
+    policy: ApprovalPolicy,
+    events: &UnboundedSender<StreamEvent>,
+) -> Result<TurnResult> {
+    let provider = config
+        .providers
+        .get(provider_name)
+        .ok_or_else(|| unknown_provider_error(config, provider_name))?;
+
+    if request.model.is_none() {
+        request.model = provider.default_model().map(str::to_string);
+    }
+
+    match provider {
+        ProviderConfig::OpenAiCompatible(provider_config) => {
+            openai_compatible::ask(provider_name, provider_config, request, policy, events).await
+        }
+        ProviderConfig::Command(provider_config) => {
+            command::ask(provider_config, request, events).await
+        }
+    }
+}
+
+fn unknown_provider_error(config: &AppConfig, provider_name: &str) -> anyhow::Error {
+    let mut names = config.providers.keys().cloned().collect::<Vec<_>>();
+    names.sort();
+    anyhow!(
+        "unknown provider '{}'; available providers: {}",
+        provider_name,
+        names.join(", ")
+    )
+}