chore: remove forge_domain direct dependency on crates (#1084)

Author: tusharmath

Cargo.lock

@@ -24,3 +24,6 @@ pub use error::*;
 pub use services::*;
 pub use user::*;
 pub use walker::*;
+pub mod domain {
+    pub use forge_domain::*;
+}

crates/forge_app/src/lib.rs

@@ -12,7 +12,7 @@ pub async fn create_temp_file<S: FsCreateService>(
     content: &str,
 ) -> anyhow::Result<PathBuf> {
     let path = tempfile::Builder::new()
-        .keep(true)
+        .disable_cleanup(true)
         .prefix(prefix)
         .suffix(ext)
         .tempfile()?

crates/forge_app/src/truncation.rs

@@ -43,7 +43,7 @@ impl<S: SnapshotInfra> FileWriterInfra for ForgeFileWriteService<S> {
 
     async fn write_temp(&self, prefix: &str, ext: &str, content: &str) -> anyhow::Result<PathBuf> {
         let path = tempfile::Builder::new()
-            .keep(true)
+            .disable_cleanup(true)
             .prefix(prefix)
             .suffix(ext)
             .tempfile()?

crates/forge_infra/src/fs_write.rs

@@ -17,7 +17,7 @@ derive_setters.workspace = true
 reqwest-eventsource.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
-forge_domain.workspace = true
+forge_app.workspace = true
 anyhow.workspace = true
 thiserror.workspace = true
 derive_builder.workspace = true

crates/forge_provider/Cargo.toml

@@ -1,6 +1,8 @@
 use anyhow::Context as _;
 use derive_builder::Builder;
-use forge_domain::{ChatCompletionMessage, Context, Model, ModelId, ResultStream, Transformer};
+use forge_app::domain::{
+    ChatCompletionMessage, Context, Model, ModelId, ResultStream, Transformer,
+};
 use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::{Client, Url};
 use reqwest_eventsource::{Event, RequestBuilderExt};
@@ -190,7 +192,7 @@ impl Anthropic {
 
 #[cfg(test)]
 mod tests {
-    use forge_domain::{
+    use forge_app::domain::{
         Context, ContextMessage, ToolCallFull, ToolCallId, ToolChoice, ToolName, ToolOutput,
         ToolResult,
     };

crates/forge_provider/src/anthropic/provider.rs

@@ -1,5 +1,5 @@
 use derive_setters::Setters;
-use forge_domain::{ContextMessage, Image};
+use forge_app::domain::{ContextMessage, Image};
 use serde::{Deserialize, Serialize};
 
 use crate::error::Error;
@@ -38,15 +38,15 @@ pub struct Thinking {
     budget_tokens: u64,
 }
 
-impl TryFrom<forge_domain::Context> for Request {
+impl TryFrom<forge_app::domain::Context> for Request {
     type Error = anyhow::Error;
-    fn try_from(request: forge_domain::Context) -> std::result::Result<Self, Self::Error> {
+    fn try_from(request: forge_app::domain::Context) -> std::result::Result<Self, Self::Error> {
         // note: Anthropic only supports 1 system message in context, so from the
         // context we pick the first system message available.
         // ref: https://docs.anthropic.com/en/api/messages#body-system
         let system = request.messages.iter().find_map(|message| {
             if let ContextMessage::Text(chat_message) = message {
-                if chat_message.role == forge_domain::Role::System {
+                if chat_message.role == forge_app::domain::Role::System {
                     Some(chat_message.content.clone())
                 } else {
                     None
@@ -63,7 +63,7 @@ impl TryFrom<forge_domain::Context> for Request {
                 .filter(|message| {
                     // note: Anthropic does not support system messages in message field.
                     if let ContextMessage::Text(chat_message) = message {
-                        chat_message.role != forge_domain::Role::System
+                        chat_message.role != forge_app::domain::Role::System
                     } else {
                         true
                     }
@@ -143,9 +143,11 @@ impl TryFrom<ContextMessage> for Message {
                 }
 
                 match chat_message.role {
-                    forge_domain::Role::User => Message { role: Role::User, content },
-                    forge_domain::Role::Assistant => Message { role: Role::Assistant, content },
-                    forge_domain::Role::System => {
+                    forge_app::domain::Role::User => Message { role: Role::User, content },
+                    forge_app::domain::Role::Assistant => {
+                        Message { role: Role::Assistant, content }
+                    }
+                    forge_app::domain::Role::System => {
                         // note: Anthropic doesn't support system role messages and they're already
                         // filtered out. so this state is unreachable.
                         return Err(Error::UnsupportedRole("System".to_string()).into());
@@ -222,9 +224,9 @@ enum Content {
     },
 }
 
-impl TryFrom<forge_domain::ToolCallFull> for Content {
+impl TryFrom<forge_app::domain::ToolCallFull> for Content {
     type Error = anyhow::Error;
-    fn try_from(value: forge_domain::ToolCallFull) -> std::result::Result<Self, Self::Error> {
+    fn try_from(value: forge_app::domain::ToolCallFull) -> std::result::Result<Self, Self::Error> {
         let call_id = value.call_id.as_ref().ok_or(Error::ToolCallMissingId)?;
 
         Ok(Content::ToolUse {
@@ -236,9 +238,9 @@ impl TryFrom<forge_domain::ToolCallFull> for Content {
     }
 }
 
-impl TryFrom<forge_domain::ToolResult> for Content {
+impl TryFrom<forge_app::domain::ToolResult> for Content {
     type Error = anyhow::Error;
-    fn try_from(value: forge_domain::ToolResult) -> std::result::Result<Self, Self::Error> {
+    fn try_from(value: forge_app::domain::ToolResult) -> std::result::Result<Self, Self::Error> {
         let call_id = value.call_id.as_ref().ok_or(Error::ToolCallMissingId)?;
         Ok(Content::ToolResult {
             tool_use_id: call_id.as_str().to_string(),
@@ -287,17 +289,21 @@ pub enum ToolChoice {
 }
 
 // To understand the mappings refer: https://docs.anthropic.com/en/docs/build-with-claude/tool-use#controlling-claudes-output
-impl From<forge_domain::ToolChoice> for ToolChoice {
-    fn from(value: forge_domain::ToolChoice) -> Self {
+impl From<forge_app::domain::ToolChoice> for ToolChoice {
+    fn from(value: forge_app::domain::ToolChoice) -> Self {
         match value {
-            forge_domain::ToolChoice::Auto => ToolChoice::Auto { disable_parallel_tool_use: None },
-            forge_domain::ToolChoice::Call(tool_name) => {
+            forge_app::domain::ToolChoice::Auto => {
+                ToolChoice::Auto { disable_parallel_tool_use: None }
+            }
+            forge_app::domain::ToolChoice::Call(tool_name) => {
                 ToolChoice::Tool { name: tool_name.to_string(), disable_parallel_tool_use: None }
             }
-            forge_domain::ToolChoice::Required => {
+            forge_app::domain::ToolChoice::Required => {
                 ToolChoice::Any { disable_parallel_tool_use: None }
             }
-            forge_domain::ToolChoice::None => ToolChoice::Auto { disable_parallel_tool_use: None },
+            forge_app::domain::ToolChoice::None => {
+                ToolChoice::Auto { disable_parallel_tool_use: None }
+            }
         }
     }
 }
@@ -312,9 +318,11 @@ pub struct ToolDefinition {
     input_schema: serde_json::Value,
 }
 
-impl TryFrom<forge_domain::ToolDefinition> for ToolDefinition {
+impl TryFrom<forge_app::domain::ToolDefinition> for ToolDefinition {
     type Error = anyhow::Error;
-    fn try_from(value: forge_domain::ToolDefinition) -> std::result::Result<Self, Self::Error> {
+    fn try_from(
+        value: forge_app::domain::ToolDefinition,
+    ) -> std::result::Result<Self, Self::Error> {
         Ok(ToolDefinition {
             name: value.name.to_string(),
             description: Some(value.description),

crates/forge_provider/src/anthropic/request.rs

@@ -1,4 +1,4 @@
-use forge_domain::{
+use forge_app::domain::{
     ChatCompletionMessage, Content, ModelId, Reasoning, ReasoningPart, ToolCallId, ToolCallPart,
     ToolName,
 };
@@ -18,7 +18,7 @@ pub struct Model {
     display_name: String,
 }
 
-impl From<Model> for forge_domain::Model {
+impl From<Model> for forge_app::domain::Model {
     fn from(value: Model) -> Self {
         Self {
             id: ModelId::new(value.id),
@@ -53,9 +53,9 @@ pub struct Usage {
     pub cache_creation_input_tokens: Option<usize>,
 }
 
-impl From<Usage> for forge_domain::Usage {
+impl From<Usage> for forge_app::domain::Usage {
     fn from(usage: Usage) -> Self {
-        forge_domain::Usage {
+        forge_app::domain::Usage {
             prompt_tokens: usage.input_tokens.unwrap_or(0),
             completion_tokens: usage.output_tokens.unwrap_or(0),
             total_tokens: usage.input_tokens.unwrap_or(0) + usage.output_tokens.unwrap_or(0),
@@ -74,13 +74,13 @@ pub enum StopReason {
     ToolUse,
 }
 
-impl From<StopReason> for forge_domain::FinishReason {
+impl From<StopReason> for forge_app::domain::FinishReason {
     fn from(value: StopReason) -> Self {
         match value {
-            StopReason::EndTurn => forge_domain::FinishReason::Stop,
-            StopReason::MaxTokens => forge_domain::FinishReason::Length,
-            StopReason::StopSequence => forge_domain::FinishReason::Stop,
-            StopReason::ToolUse => forge_domain::FinishReason::ToolCalls,
+            StopReason::EndTurn => forge_app::domain::FinishReason::Stop,
+            StopReason::MaxTokens => forge_app::domain::FinishReason::Length,
+            StopReason::StopSequence => forge_app::domain::FinishReason::Stop,
+            StopReason::ToolUse => forge_app::domain::FinishReason::ToolCalls,
         }
     }
 }

crates/forge_provider/src/anthropic/response.rs

@@ -1,4 +1,4 @@
-use forge_domain::{Context, Transformer};
+use forge_app::domain::{Context, Transformer};
 
 pub struct ReasoningTransform;
 
@@ -19,7 +19,7 @@ impl Transformer for ReasoningTransform {
 
 #[cfg(test)]
 mod tests {
-    use forge_domain::{Context, ReasoningConfig, TopK, TopP, Transformer};
+    use forge_app::domain::{Context, ReasoningConfig, TopK, TopP, Transformer};
     use pretty_assertions::assert_eq;
 
     use super::*;

crates/forge_provider/src/anthropic/transforms/reasoning_transform.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use anyhow::{Context as _, Result};
-use forge_domain::{
+use forge_app::domain::{
     ChatCompletionMessage, Context, HttpConfig, Model, ModelId, Provider, ResultStream, RetryConfig,
 };
 use reqwest::redirect::Policy;
@@ -139,7 +139,7 @@ impl Client {
 
 #[cfg(test)]
 mod tests {
-    use forge_domain::Provider;
+    use forge_app::domain::Provider;
     use reqwest::Url;
 
     use super::*;