Fix /context to use original ContextSubcommand

- /context now shows only original context functionality (pinned files)
- /resource shows both indexed and pinned resources (unified view)
- Updated main SlashCommand enum in mod.rs (not unified_slash_command.rs)
- Fixed deprecation message for /knowledge to point to /resource

Author: kennvene-aws

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

@@ -18,6 +18,7 @@ pub mod usage;
 use clap::Parser;
 use clear::ClearArgs;
 use compact::CompactArgs;
+use context::ContextSubcommand;
 use editor::EditorArgs;
 use hooks::HooksArgs;
 use knowledge::KnowledgeSubcommand;
@@ -26,8 +27,8 @@ use model::ModelArgs;
 use persist::PersistSubcommand;
 use profile::AgentSubcommand;
 use prompts::PromptsArgs;
+use resource::ResourceSubcommand;
 use tools::ToolsArgs;
-use unified_context::UnifiedContextSubcommand;
 
 use crate::cli::chat::cli::subscribe::SubscribeArgs;
 use crate::cli::chat::cli::usage::UsageArgs;
@@ -55,9 +56,12 @@ pub enum SlashCommand {
     Agent(AgentSubcommand),
     #[command(hide = true)]
     Profile,
-    /// Manage context files and knowledge base for the chat session
+    /// Manage context files for the chat session (original functionality)
     #[command(subcommand)]
-    Context(UnifiedContextSubcommand),
+    Context(ContextSubcommand),
+    /// Manage resources (pinned and indexed)
+    #[command(subcommand)]
+    Resource(ResourceSubcommand),
     /// (Deprecated) Use /context instead. Manage knowledge base for persistent context storage.
     #[command(subcommand, hide = true)]
     Knowledge(KnowledgeSubcommand),
@@ -118,6 +122,7 @@ impl SlashCommand {
                 })
             },
             Self::Context(args) => args.execute(os, session).await,
+            Self::Resource(subcommand) => subcommand.execute(os, session).await,
             Self::Knowledge(subcommand) => {
                 use crossterm::{
                     execute,
@@ -128,7 +133,7 @@ impl SlashCommand {
                     style::SetForegroundColor(style::Color::Yellow),
                     style::Print("The /knowledge command is deprecated. Use"),
                     style::SetForegroundColor(style::Color::Cyan),
-                    style::Print(" /context --knowledge "),
+                    style::Print(" /resource --type indexed "),
                     style::SetForegroundColor(style::Color::Yellow),
                     style::Print("instead.\n"),
                     style::ResetColor,
@@ -174,6 +179,7 @@ impl SlashCommand {
             Self::Agent(_) => "agent",
             Self::Profile => "profile",
             Self::Context(_) => "context",
+            Self::Resource(_) => "resource",
             Self::Knowledge(_) => "knowledge",
             Self::PromptEditor(_) => "editor",
             Self::Compact(_) => "compact",
@@ -195,7 +201,7 @@ impl SlashCommand {
     pub fn subcommand_name(&self) -> Option<&'static str> {
         match self {
             SlashCommand::Agent(sub) => Some(sub.name()),
-            SlashCommand::Context(sub) => Some(sub.name()),
+            SlashCommand::Resource(sub) => Some(sub.name()),
             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/resource.rs

@@ -4,7 +4,7 @@ use eyre::Result;
 use crate::cli::chat::{ChatError, ChatSession, ChatState};
 use crate::os::Os;
 
-use super::context::ContextSubcommand as OriginalContextSubcommand;
+use super::context::ContextSubcommand;
 use super::knowledge::KnowledgeSubcommand;
 
 #[derive(Clone, Debug, PartialEq, Eq, ValueEnum)]
@@ -57,9 +57,9 @@ impl ResourceSubcommand {
             Self::Show { expand, r#type } => {
                 match r#type {
                     Some(StorageType::Indexed) => KnowledgeSubcommand::Show.execute(os, session).await,
-                    Some(StorageType::Pinned) => OriginalContextSubcommand::Show { expand }.execute(os, session).await,
+                    Some(StorageType::Pinned) => ContextSubcommand::Show { expand }.execute(os, session).await,
                     None => {
-                        OriginalContextSubcommand::Show { expand }.execute(os, session).await?;
+                        ContextSubcommand::Show { expand }.execute(os, session).await?;
                         KnowledgeSubcommand::Show.execute(os, session).await
                     }
                 }
@@ -75,12 +75,12 @@ impl ResourceSubcommand {
                         }.execute(os, session).await
                     },
                     StorageType::Pinned => {
-                        OriginalContextSubcommand::Add { paths, force }.execute(os, session).await
+                        ContextSubcommand::Add { paths, force }.execute(os, session).await
                     },
                 }
             },
             Self::Remove { paths } => {
-                let _ = OriginalContextSubcommand::Remove { paths: paths.clone() }.execute(os, session).await;
+                let _ = ContextSubcommand::Remove { paths: paths.clone() }.execute(os, session).await;
                 // Remove first path from knowledge (knowledge only supports single path)
                 if let Some(first_path) = paths.first() {
                     KnowledgeSubcommand::Remove { path: first_path.clone() }.execute(os, session).await
@@ -91,9 +91,9 @@ impl ResourceSubcommand {
             Self::Clear { r#type } => {
                 match r#type {
                     Some(StorageType::Indexed) => KnowledgeSubcommand::Clear.execute(os, session).await,
-                    Some(StorageType::Pinned) => OriginalContextSubcommand::Clear.execute(os, session).await,
+                    Some(StorageType::Pinned) => ContextSubcommand::Clear.execute(os, session).await,
                     None => {
-                        OriginalContextSubcommand::Clear.execute(os, session).await?;
+                        ContextSubcommand::Clear.execute(os, session).await?;
                         KnowledgeSubcommand::Clear.execute(os, session).await
                     }
                 }

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

@@ -10,7 +10,7 @@ use crate::os::Os;
 use super::agent::AgentSubcommand;
 use super::clear::ClearArgs;
 use super::compact::CompactArgs;
-use super::context::ContextSubcommand as OriginalContextSubcommand;
+use super::context::ContextSubcommand;
 use super::editor::EditorArgs;
 use super::hooks::HooksArgs;
 use super::issue;
@@ -42,9 +42,9 @@ pub enum UnifiedSlashCommand {
     Agent(AgentSubcommand),
     #[command(hide = true)]
     Profile,
-    /// Manage context files and knowledge base (unified interface)
+    /// Manage context files (original functionality)
     #[command(subcommand)]
-    Context(UnifiedContextSubcommand),
+    Context(ContextSubcommand),
     /// Manage resources (pinned and indexed)
     #[command(subcommand)]
     Resource(ResourceSubcommand),
@@ -103,7 +103,7 @@ impl UnifiedSlashCommand {
                 })
             },
             Self::Context(subcommand) => {
-                // Use the new unified context system
+                // Use original context system
                 subcommand.execute(os, session).await
             },
             Self::Resource(subcommand) => {