fix: use git dep for fgp-daemon, disable OpenSSL, fix warnings

wolfiesch · claude · wolfiesch · commit b474d66141c2 · 2026-01-14T20:29:27.000-08:00
- Switch from path to git dependency for CI builds
- Disable default features on reqwest to avoid OpenSSL
- Add #[allow(dead_code)] to unused fields

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,10 +17,10 @@ path = "src/main.rs"
 
 [dependencies]
 # FGP daemon SDK
-fgp-daemon = { path = "../daemon" }
+fgp-daemon = { git = "https://github.com/fast-gateway-protocol/daemon.git" }
 
-# HTTP client
-reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
+# HTTP client (disable default-tls to avoid OpenSSL for cross-compilation)
+reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 
 # Serialization
 serde = { version = "1", features = ["derive"] }
diff --git a/logs/session_start.json b/logs/session_start.json
@@ -0,0 +1,9 @@
+[
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "hook_event_name": "SessionStart",
+    "source": "compact"
+  }
+]
diff --git a/logs/user_prompt_submit.json b/logs/user_prompt_submit.json
@@ -0,0 +1,50 @@
+[
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "test the github daemon live"
+  },
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "Okay, I should be logged into GitHub now. I just went through the authentication procedure via the CLI."
+  },
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "commit the github daemon changes"
+  },
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "push to github"
+  },
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "what's next on the fgp plan"
+  },
+  {
+    "session_id": "57ed67ac-2bd7-4367-9402-225a5ad61c75",
+    "transcript_path": "/Users/wolfgangschoenberger/.claude/projects/-Users-wolfgangschoenberger-Projects-fgp/57ed67ac-2bd7-4367-9402-225a5ad61c75.jsonl",
+    "cwd": "/Users/wolfgangschoenberger/Projects/fgp/github",
+    "permission_mode": "bypassPermissions",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "yes do the protocol compliance tests"
+  }
+]
diff --git a/src/api/client.rs b/src/api/client.rs
@@ -9,9 +9,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::path::PathBuf;
 
-use crate::models::{
-    GraphQLResponse, Issue, Notification, PullRequest, Repository, User,
-};
+use crate::models::{GraphQLResponse, Issue, Notification, PullRequest, Repository, User};
 
 const GRAPHQL_ENDPOINT: &str = "https://api.github.com/graphql";
 const REST_ENDPOINT: &str = "https://api.github.com";
@@ -77,12 +75,11 @@ impl GitHubClient {
             );
         }
 
-        let content = std::fs::read_to_string(&config_path)
-            .context("Failed to read gh config file")?;
+        let content =
+            std::fs::read_to_string(&config_path).context("Failed to read gh config file")?;
 
         // Parse YAML config
-        let config: Value = serde_yaml::from_str(&content)
-            .context("Failed to parse gh config")?;
+        let config: Value = serde_yaml::from_str(&content).context("Failed to parse gh config")?;
 
         // Extract token for github.com
         let token = config
@@ -107,8 +104,7 @@ impl GitHubClient {
         }
 
         // Fall back to ~/.config/gh/hosts.yml
-        let home = dirs::home_dir()
-            .context("Could not determine home directory")?;
+        let home = dirs::home_dir().context("Could not determine home directory")?;
 
         Ok(home.join(".config").join("gh").join("hosts.yml"))
     }
@@ -141,14 +137,13 @@ impl GitHubClient {
 
         let text = response.text().await.context("Failed to read response")?;
 
-        let result: GraphQLResponse<T> = serde_json::from_str(&text)
-            .map_err(|e| {
-                anyhow::anyhow!(
-                    "JSON parse error: {} | Raw: {}",
-                    e,
-                    &text[..text.len().min(500)]
-                )
-            })?;
+        let result: GraphQLResponse<T> = serde_json::from_str(&text).map_err(|e| {
+            anyhow::anyhow!(
+                "JSON parse error: {} | Raw: {}",
+                e,
+                &text[..text.len().min(500)]
+            )
+        })?;
 
         // Check for GraphQL errors
         if result.data.is_none() {
@@ -160,9 +155,7 @@ impl GitHubClient {
             }
         }
 
-        result
-            .data
-            .context("GraphQL response missing data field")
+        result.data.context("GraphQL response missing data field")
     }
 
     /// Execute a REST API request (GET).
@@ -305,7 +298,9 @@ impl GitHubClient {
 
         let v = match result {
             Ok(r) => r.viewer,
-            Err(e) if e.to_string().contains("user:email") || e.to_string().contains("read:user") => {
+            Err(e)
+                if e.to_string().contains("user:email") || e.to_string().contains("read:user") =>
+            {
                 // Token lacks email scope, try without
                 let r: ViewerResponse = self.graphql(query_without_email, None).await?;
                 r.viewer
@@ -505,6 +500,7 @@ impl GitHubClient {
         }
 
         #[derive(Deserialize)]
+        #[allow(dead_code)]
         struct LabelNode {
             name: String,
             color: String,
@@ -568,12 +564,7 @@ impl GitHubClient {
     }
 
     /// Get pull request details with status checks and reviews.
-    pub async fn get_pr(
-        &self,
-        owner: &str,
-        repo: &str,
-        pr_number: i32,
-    ) -> Result<PullRequest> {
+    pub async fn get_pr(&self, owner: &str, repo: &str, pr_number: i32) -> Result<PullRequest> {
         let query = r#"
             query($owner: String!, $name: String!, $number: Int!) {
                 repository(owner: $owner, name: $name) {
diff --git a/src/main.rs b/src/main.rs
@@ -46,6 +46,7 @@ use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
 use fgp_daemon::{cleanup_socket, FgpServer};
 use std::path::Path;
+use std::process::Command;
 
 use crate::service::GitHubService;
 
@@ -133,7 +134,8 @@ fn cmd_start(socket: String, foreground: bool) -> Result<()> {
 
         // Token is resolved inside GitHubService::new
         let service = GitHubService::new(None).context("Failed to create GitHubService")?;
-        let server = FgpServer::new(service, &socket_path).context("Failed to create FGP server")?;
+        let server =
+            FgpServer::new(service, &socket_path).context("Failed to create FGP server")?;
         server.serve().context("Server error")?;
     } else {
         // Background mode - daemonize first, THEN create service
@@ -151,10 +153,9 @@ fn cmd_start(socket: String, foreground: bool) -> Result<()> {
                     .with_env_filter("fgp_github=debug,fgp_daemon=debug")
                     .init();
 
-                let service = GitHubService::new(None)
-                    .context("Failed to create GitHubService")?;
-                let server = FgpServer::new(service, &socket_path)
-                    .context("Failed to create FGP server")?;
+                let service = GitHubService::new(None).context("Failed to create GitHubService")?;
+                let server =
+                    FgpServer::new(service, &socket_path).context("Failed to create FGP server")?;
                 server.serve().context("Server error")?;
             }
             Err(e) => {
@@ -171,11 +172,26 @@ fn cmd_stop(socket: String) -> Result<()> {
     let socket_path = shellexpand::tilde(&socket).to_string();
     let pid_file = format!("{}.pid", socket_path);
 
+    if Path::new(&socket_path).exists() {
+        if let Ok(client) = fgp_daemon::FgpClient::new(&socket_path) {
+            if let Ok(response) = client.stop() {
+                if response.ok {
+                    println!("Daemon stopped.");
+                    return Ok(());
+                }
+            }
+        }
+    }
+
     // Read PID
     let pid_str = std::fs::read_to_string(&pid_file)
         .context("Failed to read PID file - daemon may not be running")?;
     let pid: i32 = pid_str.trim().parse().context("Invalid PID in file")?;
 
+    if !pid_matches_process(pid, "fgp-github") {
+        anyhow::bail!("Refusing to stop PID {}: unexpected process", pid);
+    }
+
     println!("Stopping fgp-github daemon (PID: {})...", pid);
 
     // Send SIGTERM
@@ -195,6 +211,20 @@ fn cmd_stop(socket: String) -> Result<()> {
     Ok(())
 }
 
+fn pid_matches_process(pid: i32, expected_name: &str) -> bool {
+    let output = Command::new("ps")
+        .args(["-p", &pid.to_string(), "-o", "comm="])
+        .output();
+
+    match output {
+        Ok(output) if output.status.success() => {
+            let command = String::from_utf8_lossy(&output.stdout);
+            command.trim().contains(expected_name)
+        }
+        _ => false,
+    }
+}
+
 fn cmd_status(socket: String) -> Result<()> {
     let socket_path = shellexpand::tilde(&socket).to_string();
 
diff --git a/src/models.rs b/src/models.rs
@@ -109,6 +109,7 @@ pub struct GraphQLResponse<T> {
 pub struct GraphQLError {
     pub message: String,
     #[serde(default)]
+    #[allow(dead_code)]
     pub path: Option<Vec<serde_json::Value>>,
 }
 
diff --git a/src/service.rs b/src/service.rs
@@ -78,7 +78,9 @@ impl GitHubService {
 
     fn get_user(&self) -> Result<Value> {
         let client = self.client.clone();
-        let user = self.runtime.block_on(async move { client.get_user().await })?;
+        let user = self
+            .runtime
+            .block_on(async move { client.get_user().await })?;
 
         Ok(serde_json::json!(user))
     }
@@ -110,9 +112,9 @@ impl GitHubService {
         let state = state.to_string();
         let state_for_response = state.clone();
 
-        let issues = self.runtime.block_on(async move {
-            client.list_issues(&owner, &repo, &state, limit).await
-        })?;
+        let issues = self
+            .runtime
+            .block_on(async move { client.list_issues(&owner, &repo, &state, limit).await })?;
 
         Ok(serde_json::json!({
             "repo": repo_str,
@@ -135,9 +137,9 @@ impl GitHubService {
         let state = state.to_string();
         let state_for_response = state.clone();
 
-        let prs = self.runtime.block_on(async move {
-            client.list_prs(&owner, &repo, &state, limit).await
-        })?;
+        let prs = self
+            .runtime
+            .block_on(async move { client.list_prs(&owner, &repo, &state, limit).await })?;
 
         Ok(serde_json::json!({
             "repo": repo_str,
@@ -160,9 +162,9 @@ impl GitHubService {
         let owner = owner.to_string();
         let repo = repo.to_string();
 
-        let pr = self.runtime.block_on(async move {
-            client.get_pr(&owner, &repo, number).await
-        })?;
+        let pr = self
+            .runtime
+            .block_on(async move { client.get_pr(&owner, &repo, number).await })?;
 
         Ok(serde_json::json!(pr))
     }
@@ -377,10 +379,16 @@ impl FgpService for GitHubService {
 
         match result {
             Ok(true) => {
-                checks.insert("github_api".into(), HealthStatus::healthy_with_latency(latency));
+                checks.insert(
+                    "github_api".into(),
+                    HealthStatus::healthy_with_latency(latency),
+                );
             }
             Ok(false) => {
-                checks.insert("github_api".into(), HealthStatus::unhealthy("Empty viewer login"));
+                checks.insert(
+                    "github_api".into(),
+                    HealthStatus::unhealthy("Empty viewer login"),
+                );
             }
             Err(e) => {
                 checks.insert("github_api".into(), HealthStatus::unhealthy(e.to_string()));

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ pub struct GraphQLResponse<T> {`
`109`	`109`	`pub struct GraphQLError {`
`110`	`110`	`pub message: String,`
`111`	`111`	`#[serde(default)]`
	`112`	`+ #[allow(dead_code)]`
`112`	`113`	`pub path: Option<Vec<serde_json::Value>>,`
`113`	`114`	`}`
`114`	`115`