Revert "feat: Add conditional compilation for Knowledge command using… (#2520)

* Revert "feat: Add conditional compilation for Knowledge command using feature flag (#2513)"

This reverts commit 0e034b4.

* feat: enhance semantic search client with model validation

- Add model_validator.rs for input validation
- Update async_implementation.rs and hosted_model_client.rs with improvements
- Add new dependency in Cargo.toml
- Export model validator in lib.rs as message and push to the remote reenables_knowledge_tool

* Update semantic search client implementation

---------

Co-authored-by: Kenneth S. <[email protected]>

Author: kensave

Cargo.lock

@@ -14,7 +14,6 @@ workspace = true
 [features]
 default = []
 wayland = ["arboard/wayland-data-control"]
-knowledge = []
 
 [[bin]]
 name = "test_mcp_server"

crates/chat-cli/Cargo.toml

@@ -19,7 +19,6 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-#[cfg(feature = "knowledge")]
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::knowledge_store::KnowledgeStore;
@@ -70,19 +69,10 @@ impl KnowledgeSubcommand {
     }
 
     fn is_feature_enabled(os: &Os) -> bool {
-        // Feature is only available when compiled with the knowledge feature flag
-        #[cfg(feature = "knowledge")]
-        {
-            os.database
-                .settings
-                .get_bool(Setting::EnabledKnowledge)
-                .unwrap_or(false)
-        }
-        #[cfg(not(feature = "knowledge"))]
-        {
-            let _ = os; // Suppress unused variable warning
-            false
-        }
+        os.database
+            .settings
+            .get_bool(Setting::EnabledKnowledge)
+            .unwrap_or(false)
     }
 
     fn write_feature_disabled_message(session: &mut ChatSession) -> Result<(), std::io::Error> {

crates/chat-cli/src/cli/chat/cli/knowledge.rs

@@ -3,7 +3,6 @@ pub mod compact;
 pub mod context;
 pub mod editor;
 pub mod hooks;
-#[cfg(feature = "knowledge")]
 pub mod knowledge;
 pub mod mcp;
 pub mod model;
@@ -20,7 +19,6 @@ use compact::CompactArgs;
 use context::ContextSubcommand;
 use editor::EditorArgs;
 use hooks::HooksArgs;
-#[cfg(feature = "knowledge")]
 use knowledge::KnowledgeSubcommand;
 use mcp::McpArgs;
 use model::ModelArgs;
@@ -58,9 +56,9 @@ pub enum SlashCommand {
     /// Manage context files for the chat session
     #[command(subcommand)]
     Context(ContextSubcommand),
-    /// (Beta) Manage knowledge base for persistent context storage
-    #[cfg(feature = "knowledge")]
-    #[command(subcommand)]
+    /// (Beta) Manage knowledge base for persistent context storage. Requires "q settings
+    /// chat.enableKnowledge true"
+    #[command(subcommand, hide = true)]
     Knowledge(KnowledgeSubcommand),
     /// Open $EDITOR (defaults to vi) to compose a prompt
     #[command(name = "editor")]
@@ -119,7 +117,6 @@ impl SlashCommand {
                 })
             },
             Self::Context(args) => args.execute(os, session).await,
-            #[cfg(feature = "knowledge")]
             Self::Knowledge(subcommand) => subcommand.execute(os, session).await,
             Self::PromptEditor(args) => args.execute(session).await,
             Self::Compact(args) => args.execute(os, session).await,
@@ -159,7 +156,6 @@ impl SlashCommand {
             Self::Agent(_) => "agent",
             Self::Profile => "profile",
             Self::Context(_) => "context",
-            #[cfg(feature = "knowledge")]
             Self::Knowledge(_) => "knowledge",
             Self::PromptEditor(_) => "editor",
             Self::Compact(_) => "compact",
@@ -182,7 +178,6 @@ impl SlashCommand {
         match self {
             SlashCommand::Agent(sub) => Some(sub.name()),
             SlashCommand::Context(sub) => Some(sub.name()),
-            #[cfg(feature = "knowledge")]
             SlashCommand::Knowledge(sub) => Some(sub.name()),
             SlashCommand::Tools(arg) => arg.subcommand_name(),
             SlashCommand::Prompts(arg) => arg.subcommand_name(),

crates/chat-cli/src/cli/chat/cli/mod.rs

@@ -17,7 +17,6 @@ use crate::cli::agent::{
     Agent,
     PermissionEvalResult,
 };
-#[cfg(feature = "knowledge")]
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::knowledge_store::KnowledgeStore;
@@ -88,19 +87,10 @@ pub struct KnowledgeCancel {
 impl Knowledge {
     /// Checks if the knowledge feature is enabled in settings
     pub fn is_enabled(os: &Os) -> bool {
-        // Feature is only available when compiled with the knowledge feature flag
-        #[cfg(feature = "knowledge")]
-        {
-            os.database
-                .settings
-                .get_bool(Setting::EnabledKnowledge)
-                .unwrap_or(false)
-        }
-        #[cfg(not(feature = "knowledge"))]
-        {
-            let _ = os; // Suppress unused variable warning
-            false
-        }
+        os.database
+            .settings
+            .get_bool(Setting::EnabledKnowledge)
+            .unwrap_or(false)
     }
 
     pub async fn validate(&mut self, os: &Os) -> Result<()> {

crates/chat-cli/src/cli/chat/tools/knowledge.rs

@@ -159,7 +159,6 @@ impl KnowledgeStore {
     }
 
     /// Clear all contexts immediately (synchronous operation)
-    #[allow(dead_code)]
     pub async fn clear_immediate(&mut self) -> Result<String, String> {
         match self.client.clear_all_immediate().await {
             Ok(count) => Ok(format!("✅ Successfully cleared {} knowledge base entries", count)),

crates/chat-cli/src/util/knowledge_store.rs

@@ -36,6 +36,7 @@ anyhow = "1.0"
 reqwest = { workspace = true }
 zip = { version = "4.3.0", default-features = false, features = ["deflate", "time"] }
 tokio-stream = "0.1.17"
+sha2 = "0.10.9"
 
 # Candle dependencies - not used on Linux ARM
 [target.'cfg(not(all(target_os = "linux", target_arch = "aarch64")))'.dependencies]

crates/semantic-search-client/Cargo.toml

@@ -108,10 +108,7 @@ impl AsyncSemanticSearchClient {
                 use crate::embedding::ModelType;
 
                 let model_config = ModelType::default().get_config();
-                let (model_path, tokenizer_path) = model_config.get_local_paths();
-                if model_path.exists() && tokenizer_path.exists() {
-                    return Ok(());
-                }
+                let (model_path, _tokenizer_path) = model_config.get_local_paths();
 
                 // Create model directory if it doesn't exist
                 if let Some(parent) = model_path.parent() {
@@ -120,31 +117,25 @@ impl AsyncSemanticSearchClient {
                         .map_err(SemanticSearchError::IoError)?;
                 }
 
-                // Check if files already exist
-                let model_exists = tokio::fs::try_exists(&model_path).await.unwrap_or(false);
-                let tokenizer_exists = tokio::fs::try_exists(&tokenizer_path).await.unwrap_or(false);
-
-                if !model_exists || !tokenizer_exists {
-                    debug!("Downloading model files for {}...", model_config.name);
+                debug!("Reviewing model files for {}...", model_config.name);
 
-                    // Get the target directory (parent of model_path, which should be the model directory)
-                    let target_dir = model_path
-                        .parent()
-                        .ok_or_else(|| SemanticSearchError::EmbeddingError("Invalid model path".to_string()))?;
+                // Get the target directory (parent of model_path, which should be the model directory)
+                let target_dir = model_path
+                    .parent()
+                    .ok_or_else(|| SemanticSearchError::EmbeddingError("Invalid model path".to_string()))?;
 
-                    // Get the hosted models base URL from config
-                    let semantic_config = crate::config::get_config();
-                    let base_url = &semantic_config.hosted_models_base_url;
+                // Get the hosted models base URL from config
+                let semantic_config = crate::config::get_config();
+                let base_url = &semantic_config.hosted_models_base_url;
 
-                    // Create hosted model client and download with progress bar
-                    let client = HostedModelClient::new(base_url.clone());
-                    client
-                        .ensure_model(&model_config.name, target_dir)
-                        .await
-                        .map_err(|e| SemanticSearchError::EmbeddingError(format!("Failed to download model: {}", e)))?;
+                // Create hosted model client and download with progress bar
+                let client = HostedModelClient::new(base_url.clone());
+                client
+                    .ensure_model(&model_config, target_dir)
+                    .await
+                    .map_err(|e| SemanticSearchError::EmbeddingError(format!("Failed to download model: {}", e)))?;
 
-                    debug!("Model download completed for {}", model_config.name);
-                }
+                debug!("Model download completed for {}", model_config.name);
             },
             EmbeddingType::BM25 => {
                 // BM25 doesn't require model downloads