automagik-forge 0.1.13 → 0.1.14

package/backend/src/executors/ccr.rs

@@ -1,91 +0,0 @@
-use async_trait::async_trait;
-use command_group::AsyncGroupChild;
-use uuid::Uuid;
-
-use crate::{
-    executor::{Executor, ExecutorError, NormalizedConversation},
-    executors::ClaudeExecutor,
-};
-
-/// An executor that uses Claude Code Router (CCR) to process tasks
-/// This is a thin wrapper around ClaudeExecutor that uses Claude Code Router instead of Claude CLI
-pub struct CCRExecutor(ClaudeExecutor);
-
-impl Default for CCRExecutor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CCRExecutor {
-    pub fn new() -> Self {
-        Self(ClaudeExecutor::with_command(
-            "claude-code-router".to_string(),
-            "npx -y @musistudio/claude-code-router code -p --dangerously-skip-permissions --verbose --output-format=stream-json".to_string(),
-        ))
-    }
-}
-
-#[async_trait]
-impl Executor for CCRExecutor {
-    async fn spawn(
-        &self,
-        pool: &sqlx::SqlitePool,
-        task_id: Uuid,
-        worktree_path: &str,
-    ) -> Result<AsyncGroupChild, ExecutorError> {
-        self.0.spawn(pool, task_id, worktree_path).await
-    }
-
-    async fn spawn_followup(
-        &self,
-        pool: &sqlx::SqlitePool,
-        task_id: Uuid,
-        session_id: &str,
-        prompt: &str,
-        worktree_path: &str,
-    ) -> Result<AsyncGroupChild, ExecutorError> {
-        self.0
-            .spawn_followup(pool, task_id, session_id, prompt, worktree_path)
-            .await
-    }
-
-    fn normalize_logs(
-        &self,
-        logs: &str,
-        worktree_path: &str,
-    ) -> Result<NormalizedConversation, String> {
-        let filtered_logs = filter_ccr_service_messages(logs);
-        let mut result = self.0.normalize_logs(&filtered_logs, worktree_path)?;
-        result.executor_type = "claude-code-router".to_string();
-        Ok(result)
-    }
-}
-
-/// Filter out CCR service messages that appear in stdout but shouldn't be shown to users
-/// These are informational messages from the CCR wrapper itself
-fn filter_ccr_service_messages(logs: &str) -> String {
-    logs.lines()
-        .filter(|line| {
-            let trimmed = line.trim();
-
-            // Filter out known CCR service messages
-            if trimmed.eq("Service not running, starting service...")
-                || trimmed.eq("claude code router service has been successfully stopped.")
-            {
-                return false;
-            }
-
-            // Filter out system init JSON that contains misleading model information
-            // CCR delegates to different models, so the init model info is incorrect
-            if trimmed.starts_with(r#"{"type":"system","subtype":"init""#)
-                && trimmed.contains(r#""model":"#)
-            {
-                return false;
-            }
-
-            true
-        })
-        .collect::<Vec<&str>>()
-        .join("\n")
-}

package/backend/src/executors/charm_opencode.rs

@@ -1,113 +0,0 @@
-use async_trait::async_trait;
-use command_group::{AsyncCommandGroup, AsyncGroupChild};
-use uuid::Uuid;
-
-use crate::{
-    executor::{Executor, ExecutorError},
-    models::task::Task,
-    utils::shell::get_shell_command,
-};
-
-/// An executor that uses OpenCode to process tasks
-pub struct CharmOpencodeExecutor;
-
-#[async_trait]
-impl Executor for CharmOpencodeExecutor {
-    async fn spawn(
-        &self,
-        pool: &sqlx::SqlitePool,
-        task_id: Uuid,
-        worktree_path: &str,
-    ) -> Result<AsyncGroupChild, ExecutorError> {
-        // Get the task to fetch its description
-        let task = Task::find_by_id(pool, task_id)
-            .await?
-            .ok_or(ExecutorError::TaskNotFound)?;
-
-        use std::process::Stdio;
-
-        use tokio::process::Command;
-
-        let prompt = if let Some(task_description) = task.description {
-            format!(
-                r#"project_id: {}
-            
-Task title: {}
-Task description: {}"#,
-                task.project_id, task.title, task_description
-            )
-        } else {
-            format!(
-                r#"project_id: {}
-            
-Task title: {}"#,
-                task.project_id, task.title
-            )
-        };
-
-        // Use shell command for cross-platform compatibility
-        let (shell_cmd, shell_arg) = get_shell_command();
-        let opencode_command = format!(
-            "opencode -p \"{}\" --output-format=json",
-            prompt.replace('"', "\\\"")
-        );
-
-        let mut command = Command::new(shell_cmd);
-        command
-            .kill_on_drop(true)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .current_dir(worktree_path)
-            .arg(shell_arg)
-            .arg(opencode_command);
-
-        let child = command
-            .group_spawn() // Create new process group so we can kill entire tree
-            .map_err(|e| {
-                crate::executor::SpawnContext::from_command(&command, "CharmOpenCode")
-                    .with_task(task_id, Some(task.title.clone()))
-                    .with_context("CharmOpenCode CLI execution for new task")
-                    .spawn_error(e)
-            })?;
-
-        Ok(child)
-    }
-
-    async fn spawn_followup(
-        &self,
-        _pool: &sqlx::SqlitePool,
-        _task_id: Uuid,
-        _session_id: &str,
-        prompt: &str,
-        worktree_path: &str,
-    ) -> Result<AsyncGroupChild, ExecutorError> {
-        use std::process::Stdio;
-
-        use tokio::process::Command;
-
-        // CharmOpencode doesn't support session-based followup, so we ignore session_id
-        // and just run with the new prompt
-        let (shell_cmd, shell_arg) = get_shell_command();
-        let opencode_command = format!(
-            "opencode -p \"{}\" --output-format=json",
-            prompt.replace('"', "\\\"")
-        );
-
-        let mut command = Command::new(shell_cmd);
-        command
-            .kill_on_drop(true)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .current_dir(worktree_path)
-            .arg(shell_arg)
-            .arg(&opencode_command);
-
-        let child = command.group_spawn().map_err(|e| {
-            crate::executor::SpawnContext::from_command(&command, "CharmOpenCode")
-                .with_context("CharmOpenCode CLI followup execution")
-                .spawn_error(e)
-        })?;
-
-        Ok(child)
-    }
-}