Merge pull request #52 from gitcoder89431/core-header

Core header

Author: gitcoder89431

crates/agentic-core/src/orchestrator.rs

@@ -28,29 +28,22 @@ You MUST generate EXACTLY 3 proposals about this query: "{query}"
 }
 "#;
 
-const REVISE_PROMPT: &str = r#"You are an expert prompt engineer. A user wants to revise a prompt proposal.
-
-Original Proposal: "{proposal}"
-User's Revision: "{revision}"
-
-Your task is to integrate the user's revision into the original proposal to create a new, single, improved prompt.
-The new prompt should be self-contained and ready to use.
-
-Format your response as a JSON object with a single key "proposal" which is a string.
-Example:
-{
-  "proposal": "This is the new, revised prompt."
+#[derive(Deserialize, Debug)]
+struct ProposalObject {
+    context: String,
+    question: String,
 }
-"#;
 
 #[derive(Deserialize, Debug)]
-struct ProposalsResponse {
-    proposals: Vec<String>,
+#[serde(untagged)]
+enum ProposalItem {
+    StringFormat(String),
+    ObjectFormat(ProposalObject),
 }
 
 #[derive(Deserialize, Debug)]
-struct ReviseResponse {
-    proposal: String,
+struct ProposalsResponse {
+    proposals: Vec<ProposalItem>,
 }
 
 pub async fn generate_proposals(
@@ -72,7 +65,19 @@ pub async fn generate_proposals(
     if let Some(json_start) = response_str.find("{") {
         let json_str = &response_str[json_start..];
         match serde_json::from_str::<ProposalsResponse>(json_str) {
-            Ok(response) => Ok(response.proposals),
+            Ok(response) => {
+                let proposals = response
+                    .proposals
+                    .into_iter()
+                    .map(|item| match item {
+                        ProposalItem::StringFormat(s) => s,
+                        ProposalItem::ObjectFormat(obj) => {
+                            format!("{} - {}", obj.context, obj.question)
+                        }
+                    })
+                    .collect();
+                Ok(proposals)
+            }
             Err(e) => {
                 // Debug: Write the JSON we tried to parse
                 std::fs::write("/tmp/debug_json.txt", json_str).ok();
@@ -90,26 +95,3 @@ pub async fn generate_proposals(
         ))
     }
 }
-
-pub async fn revise_proposal(
-    proposal: &str,
-    revision: &str,
-    endpoint: &str,
-    model: &str,
-) -> Result<String, anyhow::Error> {
-    let prompt = REVISE_PROMPT
-        .replace("{proposal}", proposal)
-        .replace("{revision}", revision);
-    let response_str = call_local_model(endpoint, model, &prompt).await?;
-
-    // Attempt to find the start of the JSON object
-    if let Some(json_start) = response_str.find("{") {
-        let json_str = &response_str[json_start..];
-        match serde_json::from_str::<ReviseResponse>(json_str) {
-            Ok(response) => Ok(response.proposal),
-            Err(e) => Err(anyhow::anyhow!("Failed to parse revision JSON: {}", e)),
-        }
-    } else {
-        Err(anyhow::anyhow!("No JSON object found in model response"))
-    }
-}