@@ -18,7 +18,7 @@ impl<'a> Drop for FileCleanup<'a> {
1818#[ test]
1919#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
2020fn test_save_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
21- println ! ( "\n 🔍 Testing /save command... | Description: Tests the <code> /save </code> command to export conversation state to a file and verify successful file creation with conversation data" ) ;
21+ println ! ( "\n 🔍 Testing /chat command... | Description: Tests the <code> /chat </code> command to export conversation state to a file and verify successful file creation with conversation data" ) ;
2222
2323 let save_path = "/tmp/qcli_test_save.json" ;
2424 let _cleanup = FileCleanup { path : save_path } ;
@@ -31,7 +31,7 @@ fn test_save_command() -> Result<(), Box<dyn std::error::Error>> {
3131 let _tools_response = chat. execute_command_with_timeout ( "/tools" , Some ( 2000 ) ) ?;
3232
3333 // Execute /save command
34- let response = chat. execute_command_with_timeout ( & format ! ( "/save {}" , save_path) , Some ( 2000 ) ) ?;
34+ let response = chat. execute_command_with_timeout ( & format ! ( "/chat save {}" , save_path) , Some ( 2000 ) ) ?;
3535
3636 println ! ( "📝 Save response: {} bytes" , response. len( ) ) ;
3737 println ! ( "📝 FULL OUTPUT:" ) ;
@@ -57,26 +57,27 @@ fn test_save_command() -> Result<(), Box<dyn std::error::Error>> {
5757#[ test]
5858#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
5959fn test_save_command_argument_validation ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
60- println ! ( "\n 🔍 Testing /save command argument validation... | Description: Tests the <code> /save </code> command without required arguments to verify proper error handling and usage display" ) ;
60+ println ! ( "\n 🔍 Testing /chat command argument validation... | Description: Tests the <code> /chat </code> command without required arguments to verify proper error handling and usage display" ) ;
6161
6262 let session = q_chat_helper:: get_chat_session ( ) ;
6363 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
6464
65- let response = chat. execute_command_with_timeout ( "/save " , Some ( 2000 ) ) ?;
65+ let response = chat. execute_command_with_timeout ( "/chat " , Some ( 2000 ) ) ?;
6666
6767 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
6868 println ! ( "📝 FULL OUTPUT:" ) ;
6969 println ! ( "{}" , response) ;
7070 println ! ( "📝 END OUTPUT" ) ;
7171
7272 // Verify save error message
73- assert ! ( response. contains( "error " ) , "Missing save error message " ) ;
73+ assert ! ( response. contains( "resume " ) , "Expected 'resume' in response " ) ;
7474
75- assert ! ( response. contains( "Usage " ) , "Missing Usage section " ) ;
76- assert ! ( response. contains( "/save " ) , "Missing /save command in usage " ) ;
75+ assert ! ( response. contains( "save " ) , "Expected 'save' in response " ) ;
76+ assert ! ( response. contains( "load " ) , "Expected 'load' in response. " ) ;
7777
78- assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
79- assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
78+ assert ! ( response. contains( "save-via-script" ) , "Expected 'save-via-script' in response." ) ;
79+ assert ! ( response. contains( "load-via-script" ) , "Expected 'load-via-script' in response." ) ;
80+ assert ! ( response. contains( "help" ) , "Expected 'help' in response." ) ;
8081
8182 println ! ( "✅ All help content verified!" ) ;
8283
@@ -89,28 +90,27 @@ fn test_save_command_argument_validation() -> Result<(), Box<dyn std::error::Err
8990#[ test]
9091#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
9192fn test_save_help_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
92- println ! ( "\n 🔍 Testing /save --help command... | Description: Tests the <code> /save --help</code> command to display comprehensive help information for save functionality" ) ;
93+ println ! ( "\n 🔍 Testing /chat --help command... | Description: Tests the <code> /chat --help</code> command to display comprehensive help information for save functionality" ) ;
9394
9495 let session = q_chat_helper:: get_chat_session ( ) ;
9596 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
9697
97- let response = chat. execute_command_with_timeout ( "/save --help" , Some ( 2000 ) ) ?;
98+ let response = chat. execute_command_with_timeout ( "/chat --help" , Some ( 2000 ) ) ?;
9899
99100 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
100101 println ! ( "📝 FULL OUTPUT:" ) ;
101102 println ! ( "{}" , response) ;
102103 println ! ( "📝 END OUTPUT" ) ;
103104
104105 // Verify save command help content
105- assert ! ( response. contains( "Save " ) , "Missing save command description " ) ;
106+ // assert!(response.contains("resume "), "Expected 'resume' in response ");
106107
107- assert ! ( response. contains( "Usage" ) , "Missing Usage section" ) ;
108- assert ! ( response. contains( "/save" ) , "Missing /save command in usage" ) ;
109-
110- assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
111- assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
108+ assert ! ( response. contains( "save" ) , "Expected 'save' in response" ) ;
109+ assert ! ( response. contains( "load" ) , "Expected 'load' in response." ) ;
112110
113- assert ! ( response. contains( "Options" ) , "Missing Options section" ) ;
111+ assert ! ( response. contains( "save-via-script" ) , "Expected 'save-via-script' in response." ) ;
112+ assert ! ( response. contains( "load-via-script" ) , "Expected 'load-via-script' in response." ) ;
113+ assert ! ( response. contains( "help" ) , "Expected 'help' in response." ) ;
114114
115115 println ! ( "✅ All help content verified!" ) ;
116116
@@ -123,28 +123,27 @@ fn test_save_help_command() -> Result<(), Box<dyn std::error::Error>> {
123123#[ test]
124124#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
125125fn test_save_h_flag_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
126- println ! ( "\n 🔍 Testing /save -h command... | Description: Tests the <code> /save -h</code> command (short form) to display save help information" ) ;
126+ println ! ( "\n 🔍 Testing /chat -h command... | Description: Tests the <code> /chat -h</code> command (short form) to display chat help information" ) ;
127127
128128 let session = q_chat_helper:: get_chat_session ( ) ;
129129 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
130130
131- let response = chat. execute_command_with_timeout ( "/save -h" , Some ( 2000 ) ) ?;
131+ let response = chat. execute_command_with_timeout ( "/chat -h" , Some ( 2000 ) ) ?;
132132
133133 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
134134 println ! ( "📝 FULL OUTPUT:" ) ;
135135 println ! ( "{}" , response) ;
136136 println ! ( "📝 END OUTPUT" ) ;
137137
138138 // Verify save command help content
139- assert ! ( response. contains( "Save " ) , "Missing save command description " ) ;
139+ assert ! ( response. contains( "resume " ) , "Expected 'resume' in response " ) ;
140140
141- assert ! ( response. contains( "Usage " ) , "Missing Usage section " ) ;
142- assert ! ( response. contains( "/save " ) , "Missing /save command in usage " ) ;
141+ assert ! ( response. contains( "save " ) , "Expected 'save' in response " ) ;
142+ assert ! ( response. contains( "load " ) , "Expected 'load' in response. " ) ;
143143
144- assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
145- assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
146-
147- assert ! ( response. contains( "Options" ) , "Missing Options section" ) ;
144+ assert ! ( response. contains( "save-via-script" ) , "Expected 'save-via-script' in response." ) ;
145+ assert ! ( response. contains( "load-via-script" ) , "Expected 'load-via-script' in response." ) ;
146+ assert ! ( response. contains( "help" ) , "Expected 'help' in response." ) ;
148147
149148 println ! ( "✅ All help content verified!" ) ;
150149
@@ -157,7 +156,7 @@ fn test_save_h_flag_command() -> Result<(), Box<dyn std::error::Error>> {
157156#[ test]
158157#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
159158fn test_save_force_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
160- println ! ( "\n 🔍 Testing /save --force command... | Description: Tests the <code> /save --force</code> command to overwrite existing files and verify force save functionality" ) ;
159+ println ! ( "\n 🔍 Testing /chat --force command... | Description: Tests the <code> /chat --force</code> command to overwrite existing files and verify force save functionality" ) ;
161160
162161 let save_path = "/tmp/qcli_test_save.json" ;
163162 let _cleanup = FileCleanup { path : save_path } ;
@@ -170,7 +169,7 @@ fn test_save_force_command() -> Result<(), Box<dyn std::error::Error>> {
170169 let _tools_response = chat. execute_command_with_timeout ( "/tools" , Some ( 2000 ) ) ?;
171170
172171 // Execute /save command first
173- let response = chat. execute_command_with_timeout ( & format ! ( "/save {}" , save_path) , Some ( 2000 ) ) ?;
172+ let response = chat. execute_command_with_timeout ( & format ! ( "/chat save {}" , save_path) , Some ( 2000 ) ) ?;
174173 println ! ( "📝 FULL OUTPUT:" ) ;
175174 println ! ( "{}" , response) ;
176175 println ! ( "📝 END OUTPUT" ) ;
@@ -180,7 +179,7 @@ fn test_save_force_command() -> Result<(), Box<dyn std::error::Error>> {
180179 let _prompt_response = chat. execute_command ( "/context show" ) ?;
181180
182181 // Execute /save --force command to overwrite with new content
183- let force_response = chat. execute_command ( & format ! ( "/save --force {}" , save_path) ) ?;
182+ let force_response = chat. execute_command ( & format ! ( "/chat save --force {}" , save_path) ) ?;
184183
185184 println ! ( "📝 Save force response: {} bytes" , force_response. len( ) ) ;
186185 println ! ( "📝 FULL OUTPUT:" ) ;
@@ -207,7 +206,7 @@ fn test_save_force_command() -> Result<(), Box<dyn std::error::Error>> {
207206#[ test]
208207#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
209208fn test_save_f_flag_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
210- println ! ( "\n 🔍 Testing /save -f command... | Description: Tests the <code> /save -f</code> command (short form) to force overwrite existing files" ) ;
209+ println ! ( "\n 🔍 Testing /chat -f command... | Description: Tests the <code> /chat -f</code> command (short form) to force overwrite existing files" ) ;
211210
212211 let save_path = "/tmp/qcli_test_save.json" ;
213212 let _cleanup = FileCleanup { path : save_path } ;
@@ -220,7 +219,7 @@ fn test_save_f_flag_command() -> Result<(), Box<dyn std::error::Error>> {
220219 let _tools_response = chat. execute_command_with_timeout ( "/tools" , Some ( 2000 ) ) ?;
221220
222221 // Execute /save command first
223- let response = chat. execute_command_with_timeout ( & format ! ( "/save {}" , save_path) , Some ( 2000 ) ) ?;
222+ let response = chat. execute_command_with_timeout ( & format ! ( "/chat save {}" , save_path) , Some ( 2000 ) ) ?;
224223 println ! ( "📝 FULL OUTPUT:" ) ;
225224 println ! ( "{}" , response) ;
226225 println ! ( "📝 END OUTPUT" ) ;
@@ -230,7 +229,7 @@ fn test_save_f_flag_command() -> Result<(), Box<dyn std::error::Error>> {
230229 let _prompt_response = chat. execute_command_with_timeout ( "/context show" , Some ( 2000 ) ) ?;
231230
232231 // Execute /save -f command to overwrite with new content
233- let force_response = chat. execute_command_with_timeout ( & format ! ( "/save -f {}" , save_path) , Some ( 2000 ) ) ?;
232+ let force_response = chat. execute_command_with_timeout ( & format ! ( "/chat save -f {}" , save_path) , Some ( 2000 ) ) ?;
234233
235234 println ! ( "📝 Save force response: {} bytes" , force_response. len( ) ) ;
236235 println ! ( "📝 FULL OUTPUT:" ) ;
@@ -258,23 +257,23 @@ fn test_save_f_flag_command() -> Result<(), Box<dyn std::error::Error>> {
258257#[ test]
259258#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
260259fn test_load_help_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
261- println ! ( "\n 🔍 Testing /load --help command... | Description: Tests the <code> /load --help</code> command to display comprehensive help information for load functionality" ) ;
260+ println ! ( "\n 🔍 Testing /chat load --help command... | Description: Tests the <code> /chat load --help</code> command to display comprehensive help information for load functionality" ) ;
262261
263262 let session = q_chat_helper:: get_chat_session ( ) ;
264263 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
265264
266- let response = chat. execute_command_with_timeout ( "/load --help" , Some ( 2000 ) ) ?;
265+ let response = chat. execute_command_with_timeout ( "/chat load --help" , Some ( 2000 ) ) ?;
267266
268267 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
269268 println ! ( "📝 FULL OUTPUT:" ) ;
270269 println ! ( "{}" , response) ;
271270 println ! ( "📝 END OUTPUT" ) ;
272271
273272 // Verify load command help content
274- assert ! ( response. contains( "Load" ) , "Missing load command description" ) ;
273+ // assert!(response.contains("Load"), "Missing load command description");
275274
276275 assert ! ( response. contains( "Usage" ) , "Missing Usage section" ) ;
277- assert ! ( response. contains( "/load" ) , "Missing /load command in usage" ) ;
276+ // assert!(response.contains("/load"), "Missing /load command in usage");
278277
279278 assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
280279 assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
@@ -292,12 +291,12 @@ fn test_load_help_command() -> Result<(), Box<dyn std::error::Error>> {
292291#[ test]
293292#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
294293fn test_load_h_flag_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
295- println ! ( "\n 🔍 Testing /load -h command... | Description: Tests the <code> /load -h</code> command (short form) to display load help information" ) ;
294+ println ! ( "\n 🔍 Testing /chat load -h command... | Description: Tests the <code> /chat load -h</code> command (short form) to display load help information" ) ;
296295
297296 let session = q_chat_helper:: get_chat_session ( ) ;
298297 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
299298
300- let response = chat. execute_command_with_timeout ( "/load -h" , Some ( 2000 ) ) ?;
299+ let response = chat. execute_command_with_timeout ( "/chat load -h" , Some ( 2000 ) ) ?;
301300
302301 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
303302 println ! ( "📝 FULL OUTPUT:" ) ;
@@ -308,7 +307,7 @@ fn test_load_h_flag_command() -> Result<(), Box<dyn std::error::Error>> {
308307 assert ! ( response. contains( "Load" ) , "Missing load command description" ) ;
309308
310309 assert ! ( response. contains( "Usage" ) , "Missing Usage section" ) ;
311- assert ! ( response. contains( "/load" ) , "Missing /load command in usage" ) ;
310+ // assert!(response.contains("/load"), "Missing /load command in usage");
312311
313312 assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
314313 assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
@@ -326,7 +325,7 @@ fn test_load_h_flag_command() -> Result<(), Box<dyn std::error::Error>> {
326325#[ test]
327326#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
328327fn test_load_command ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
329- println ! ( "\n 🔍 Testing /load command... | Description: Tests the <code> /load</code> command to import conversation state from a saved file and verify successful restoration" ) ;
328+ println ! ( "\n 🔍 Testing /chat load command... | Description: Tests the <code> /chat load</code> command to import conversation state from a saved file and verify successful restoration" ) ;
330329
331330 let save_path = "/tmp/qcli_test_load.json" ;
332331 let _cleanup = FileCleanup { path : save_path } ;
@@ -339,7 +338,7 @@ fn test_load_command() -> Result<(), Box<dyn std::error::Error>> {
339338 let _tools_response = chat. execute_command_with_timeout ( "/tools" , Some ( 2000 ) ) ?;
340339
341340 // Execute /save command to create a file to load
342- let save_response = chat. execute_command_with_timeout ( & format ! ( "/save {}" , save_path) , Some ( 2000 ) ) ?;
341+ let save_response = chat. execute_command_with_timeout ( & format ! ( "/chat save {}" , save_path) , Some ( 2000 ) ) ?;
343342
344343 println ! ( "📝 Save response: {} bytes" , save_response. len( ) ) ;
345344 println ! ( "📝 SAVE OUTPUT:" ) ;
@@ -353,7 +352,7 @@ fn test_load_command() -> Result<(), Box<dyn std::error::Error>> {
353352 assert ! ( std:: path:: Path :: new( save_path) . exists( ) , "Save file was not created" ) ;
354353
355354 // Execute /load command to load the saved conversation
356- let load_response = chat. execute_command_with_timeout ( & format ! ( "/load {}" , save_path) , Some ( 2000 ) ) ?;
355+ let load_response = chat. execute_command_with_timeout ( & format ! ( "/chat load {}" , save_path) , Some ( 2000 ) ) ?;
357356
358357 println ! ( "📝 Load response: {} bytes" , load_response. len( ) ) ;
359358 println ! ( "📝 LOAD OUTPUT:" ) ;
@@ -374,12 +373,12 @@ fn test_load_command() -> Result<(), Box<dyn std::error::Error>> {
374373#[ test]
375374#[ cfg( all( feature = "save_load" , feature = "sanity" ) ) ]
376375fn test_load_command_argument_validation ( ) -> Result < ( ) , Box < dyn std:: error:: Error > > {
377- println ! ( "\n 🔍 Testing /load command argument validation... | Description: Tests the <code>/load</code> command without required arguments to verify proper error handling and usage display" ) ;
376+ println ! ( "\n 🔍 Testing /chat load command argument validation... | Description: Tests the <code>/chat load</code> command without required arguments to verify proper error handling and usage display" ) ;
378377
379378 let session = q_chat_helper:: get_chat_session ( ) ;
380379 let mut chat = session. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) ) ;
381380
382- let response = chat. execute_command_with_timeout ( "/load" , Some ( 2000 ) ) ?;
381+ let response = chat. execute_command_with_timeout ( "/chat load" , Some ( 2000 ) ) ?;
383382
384383 println ! ( "📝 Help response: {} bytes" , response. len( ) ) ;
385384 println ! ( "📝 FULL OUTPUT:" ) ;
@@ -390,7 +389,7 @@ fn test_load_command_argument_validation() -> Result<(), Box<dyn std::error::Err
390389 assert ! ( response. contains( "error" ) , "Missing load error message" ) ;
391390
392391 assert ! ( response. contains( "Usage" ) , "Missing Usage section" ) ;
393- assert ! ( response. contains( "/load" ) , "Missing /load command in usage" ) ;
392+ // assert!(response.contains("/load"), "Missing /load command in usage");
394393
395394 assert ! ( response. contains( "Arguments" ) , "Missing Arguments section" ) ;
396395 assert ! ( response. contains( "<PATH>" ) , "Missing PATH argument" ) ;
0 commit comments