secrez 2.1.8 → 2.1.10

package/README.md

@@ -370,6 +370,17 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**2.1.10**
+
+- add external git change detection to block operations when repository state changes outside of Secrez (e.g., `git pull` in another terminal)
+- fix critical cache bug in git conflict detection that prevented external changes from being detected within 30 seconds
+- improve git conflict detection tests with comprehensive coverage for both git and non-git repositories
+
+**2.1.9**
+
+- add `<` parameter to reuse the last used path in commands (e.g., `totp <` will use the last path from previous command)
+- fix deprecation warning in `execSync` by properly escaping command arguments
+
 **2.1.8**
 
 - add `git` command to check repository status and detect remote changes
@@ -871,60 +882,67 @@ Thank you for any contributions! 😉
 ## Test coverage
 
 ```
-  1 passing (549ms)
+  162 passing (2m)
+  2 pending
 
 --------------------|---------|----------|---------|---------|--------------------------------------
-File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
+File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   18.98 |     5.52 |   20.28 |   19.04 |
- src                |   30.39 |    14.49 |   21.05 |   30.69 |
-  Command.js        |    32.2 |    21.27 |   30.76 |   32.75 | 22-35,40-97,102,108,119,122-130
-  PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97
-  cliConfig.js      |     100 |      100 |     100 |     100 |
- src/commands       |   18.27 |     4.93 |   22.16 |   18.35 |
-  Alias.js          |     8.1 |        0 |      25 |    8.21 | 62-213
-  Bash.js           |    62.5 |        0 |   33.33 |    62.5 | 11-19
-  Cat.js            |   29.67 |    17.46 |   42.85 |   29.67 | 61-93,98,110,117-142,150-169,178-220
-  Cd.js             |   17.85 |        0 |      25 |   17.85 | 28-73
-  Conf.js           |    7.79 |        0 |      10 |    7.79 | 67-500
-  Contacts.js       |    5.98 |        0 |    7.69 |    6.03 | 53-274
-  Copy.js           |   10.98 |        0 |    12.5 |   11.11 | 71-268
-  Ds.js             |    5.97 |        0 |   16.66 |    6.06 | 39-160
-  Edit.js           |   12.34 |        0 |      20 |   12.34 | 61-214
-  Export.js         |      50 |    26.92 |      50 |      50 | ...8,209,219-295,301,307-308,316-323
-  Find.js           |    7.69 |        0 |    8.33 |    7.89 | 63-211
-  Help.js           |   33.33 |        0 |      50 |   33.33 | 26-43
-  Import.js         |    6.31 |        0 |    9.09 |    6.37 | 87-496
-  Lcat.js           |      30 |        0 |      25 |      30 | 35-65
-  Lcd.js            |   17.39 |        0 |      25 |   17.39 | 30-72
-  Lls.js            |    40.9 |     9.09 |      50 |    40.9 | 49,68,74-99
-  Lpwd.js           |   38.46 |        0 |      50 |   38.46 | 15,29-38
-  Ls.js             |    5.79 |        0 |      10 |    6.15 | 46-183
-  Mkdir.js          |   22.72 |        0 |      25 |   22.72 | 27-61
-  Mv.js             |    6.52 |        0 |   16.66 |    6.66 | 46-240
-  Paste.js          |   14.89 |        0 |      25 |   14.89 | 40-131
-  Pwd.js            |   30.76 |        0 |      25 |   30.76 | 15-35
-  Quit.js           |      50 |        0 |   33.33 |      50 | 19-40
-  Rm.js             |      16 |        0 |   16.66 |   16.32 | 36-137
-  Shell.js          |   29.41 |        0 |      25 |   29.41 | 25-57
-  Show.js           |      16 |        0 |   14.28 |   16.32 | 45-145
-  Ssh.js            |   22.22 |        0 |      20 |   22.22 | 49-120
-  Tag.js            |    8.82 |        0 |    9.09 |    8.91 | 66-236
-  Totp.js           |   14.58 |        0 |    9.09 |   14.58 | 76-312
-  Touch.js          |      76 |    51.85 |      75 |   75.51 | 75,140,152-158,164,168,177,231-234
-  Use.js            |    12.9 |        0 |      25 |    12.9 | 30-85
-  Ver.js            |      50 |        0 |   33.33 |      50 | 17-28
-  Whoami.js         |   27.77 |        0 |      20 |   27.77 | 20-50
-  index.js          |    87.5 |       50 |     100 |   86.95 | 15,22,31
- src/prompts        |     100 |      100 |   33.33 |     100 |
-  MainPromptMock.js |     100 |      100 |   33.33 |     100 |
- src/utils          |   14.97 |     5.46 |   10.41 |   14.75 |
-  AliasManager.js   |    5.88 |        0 |       0 |    5.88 | 3-48
-  ContactManager.js |    6.66 |        0 |       0 |    6.66 | 3-44
-  Fido2Client.js    |    9.61 |        0 |       0 |    9.61 | 8-108
-  HelpProto.js      |     4.2 |        0 |   16.66 |    4.27 | 11-200
-  Logger.js         |   56.81 |    43.75 |   21.05 |   55.81 | ...16-29,37-57,65-69,74,84,88,93,105
+All files           |   80.07 |    67.69 |   80.91 |   79.96 |                                      
+ src                |   57.62 |    53.75 |      55 |   58.11 |                                      
+  Command.js        |   74.66 |    74.13 |   78.57 |   75.67 | ...5-62,73,80,93,127,164-172,179-182 
+  PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
+  cliConfig.js      |     100 |      100 |     100 |     100 |                                      
+ src/commands       |   83.06 |    69.43 |   90.82 |   82.94 |                                      
+  Alias.js          |    88.6 |    78.68 |     100 |   88.46 | 101,112,139,169,173,180,190,213-214  
+  Bash.js           |      75 |        0 |   66.66 |      75 | 18-19                                
+  Cat.js            |   98.91 |    88.88 |     100 |   98.91 | 152                                  
+  Cd.js             |   96.42 |    86.66 |     100 |   96.42 | 44                                   
+  Conf.js           |    8.64 |        0 |      20 |    8.64 | 98-509                               
+  Contacts.js       |   86.06 |     75.6 |     100 |   85.95 | ...5,165,172,184,237,250,260,268-269 
+  Copy.js           |    91.2 |    71.92 |     100 |   91.11 | 115,166,183,205-210,225-226,253      
+  Ds.js             |   90.27 |     82.6 |     100 |   90.14 | 99,108-113,125,147-148               
+  Edit.js           |   12.94 |        0 |      40 |   12.94 | 88-222                               
+  Export.js         |   90.17 |    76.92 |     100 |   90.17 | ...3-198,209,227-231,236,248,257,260 
+  Find.js           |   93.58 |    86.66 |     100 |   93.42 | 101,164,200-203,209                  
+  Git.js            |   96.15 |       75 |     100 |   96.15 | 61                                   
+  Help.js           |     100 |       80 |     100 |     100 | 29                                   
+  Import.js         |   92.41 |    85.38 |     100 |   92.34 | ...7,387,393,441,457-458,466-473,500 
+  Lcat.js           |     100 |    85.71 |     100 |     100 | 54                                   
+  Lcd.js            |   95.65 |    81.81 |     100 |   95.65 | 50                                   
+  Lls.js            |   95.45 |    72.72 |     100 |   95.45 | 97                                   
+  Lpwd.js           |    92.3 |      100 |     100 |    92.3 | 36                                   
+  Ls.js             |   91.54 |    76.31 |     100 |   91.04 | 103,114-116,130,185                  
+  Mkdir.js          |   92.59 |       60 |     100 |   92.59 | 56-57                                
+  Mv.js             |   86.59 |    71.66 |     100 |   86.31 | 93-99,133,155-156,165,175-182        
+  Paste.js          |   84.61 |    70.83 |     100 |   84.61 | 72,78,81,89,113,130-131,139          
+  Pwd.js            |    92.3 |      100 |     100 |    92.3 | 33                                   
+  Quit.js           |      90 |       50 |     100 |      90 | 27                                   
+  Rm.js             |    90.9 |       76 |     100 |   90.74 | 63,125-126,136,144                   
+  Shell.js          |   88.23 |       60 |     100 |   88.23 | 38,55                                
+  Show.js           |   72.54 |    45.45 |   57.14 |      74 | ...8,100,106-114,117,123-126,132,145 
+  Ssh.js            |      25 |        0 |      40 |      25 | 72-120                               
+  Tag.js            |   96.26 |    91.37 |     100 |   96.22 | 122,171,204-205                      
+  Totp.js           |   92.23 |       75 |     100 |   92.23 | 189-190,230,240,282-287,301-302      
+  Touch.js          |   96.36 |    80.64 |     100 |   96.29 | 164,240                              
+  Use.js            |   91.66 |    86.95 |     100 |   91.66 | 68,83-84                             
+  Ver.js            |      90 |    66.66 |     100 |      90 | 25                                   
+  Whoami.js         |   83.33 |       60 |      80 |   83.33 | 27,35,48                             
+  index.js          |    87.5 |       50 |     100 |   86.95 | 15,22,31                             
+ src/prompts        |      75 |    33.33 |      50 |      75 |                                      
+  MainPromptMock.js |      75 |    33.33 |      50 |      75 | 29-35,44                             
+ src/utils          |   67.61 |     62.5 |   54.16 |   67.21 |                                      
+  AliasManager.js   |     100 |    91.66 |     100 |     100 | 47                                   
+  ContactManager.js |   73.33 |       60 |   85.71 |   73.33 | 12,34-36                             
+  Fido2Client.js    |    9.61 |        0 |       0 |    9.61 | 8-108                                
+  HelpProto.js      |   89.07 |     82.6 |     100 |   88.88 | 49,135-137,153-154,171-176,195       
+  Logger.js         |   63.63 |    56.25 |   36.84 |   62.79 | ...25,37-49,57,65-69,74,84,88,93,105 
 --------------------|---------|----------|---------|---------|--------------------------------------
+
+> secrez@2.1.10 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65
+
+
 ```
 
 ## Copyright

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@2.1.8 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.10 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
 > cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit
 
 
@@ -15,10 +15,6 @@
     #validate
       ✓ should validate the options
 
-  #Fido2Client
-    #configuration
-      ✓ should verify that all the scripts exist
-
   #Alias
     ✓ should return the help
     ✓ create aliases and lists them
@@ -29,10 +25,10 @@
   #Cat
     ✓ should return the help
     ✓ should show the content of a file
-    ✓ should show either one or all the versions of a file (1014ms)
+    ✓ should show either one or all the versions of a file (1028ms)
     ✓ should throw if entry is not a file or file does not exist
     ✓ should throw if trying to cat a binary file
-    ✓ should show the content of a Yaml file (1029ms)
+    ✓ should show the content of a Yaml file (1021ms)
 
   #Cd
     ✓ should return the help
@@ -51,10 +47,10 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (413ms)
-    ✓ should copy a string to the clipboard (258ms)
-    ✓ should copy a card to the clipboard (1001ms)
-    ✓ should return an error if the file does not exist or is a folder (50ms)
+    ✓ should copy a file to the clipboard (415ms)
+    ✓ should copy a string to the clipboard (268ms)
+    ✓ should copy a card to the clipboard (1021ms)
+    ✓ should return an error if the file does not exist or is a folder (125ms)
     ✓ should throw if copying to clipboard a binary files
 
   #Ds
@@ -66,13 +62,13 @@
 
   #Export
     ✓ should return the help
-    1) should export a file to the current local folder
+    ✓ should export a file to the current local folder
     ✓ should export a file encrypted only for the user itself
     ✓ should export a binary file to the current local folder
     ✓ should export an encrypted file to the current local folder
-    ✓ should export a file and delete it after 1 second (1204ms)
+    ✓ should export a file and delete it after 1 second (1203ms)
     ✓ should return an error if the file does not exist or is a folder
-    ✓ should export a keystore json file if a private_key exists in the entry (711ms)
+    ✓ should export a keystore json file if a private_key exists in the entry (763ms)
     ✓ should export a cryptoenv file if a private_key exists in the entry
     ✓ should export a cryptoenv file with entire content when no private_key fields exist and user confirms
     ✓ should throw error when no private_key fields exist and user declines
@@ -81,16 +77,19 @@
 
   #Find
     ✓ should return the help
-    ✓ should show find a string in the tree (1033ms)
+    ✓ should show find a string in the tree (1021ms)
     ✓ should find no result without parameters
     ✓ should skip binary files from search
 
   #Git
     ✓ should return the help
-    ✓ should show git status when --status is used (3396ms)
-    ✓ should show git status by default (3521ms)
-    ✓ should handle conflict risk scenario (5238ms)
+    ✓ should show git status when --status is used (3518ms)
+    ✓ should show git status by default (3580ms)
+    ✓ should handle conflict risk scenario (5428ms)
     ✓ should handle non-git repository
+    ✓ should allow normal operations in non-git repository
+Bye bye :o)
+    ✓ should detect external git changes and block operations (16546ms)
 
   #Help
     ✓ should return the help
@@ -162,14 +161,14 @@
     ✓ should move file to another dataset using wildcards
     ✓ should move file managing duplicates
     ✓ should throw if parameters are missed or wrong
-    ✓ should move files from and to other datasets (1025ms)
+    ✓ should move files from and to other datasets (1047ms)
     ✓ should move the results of a find
 
   #Paste
     ✓ should return the help
     ✓ should paste the clipboard content to a new file (50ms)
-    ✓ should paste the clipboard content to an existent file (70ms)
-    ✓ should paste a single field to a yml card
+    ✓ should paste the clipboard content to an existent file (94ms)
+    ✓ should paste a single field to a yml card (71ms)
 
   #Pwd
     ✓ should return the help
@@ -183,7 +182,7 @@
     ✓ should delete a file with one version
     ✓ should delete many files usign wildcards
     ✓ should return errors if wrong parameters
-    ✓ should delete some versions of a file (1010ms)
+    ✓ should delete some versions of a file (1007ms)
 
   #Shell
     ✓ should return the help
@@ -203,13 +202,13 @@
 
   #Totp
     ✓ should return the help
-    ✓ should totp a file to the clipboard (407ms)
+    ✓ should totp a file to the clipboard (409ms)
     ✓ should read a totp secret from an image and add the totp field to the card (39ms)
     ✓ should read a totp secret from an image and return the secret
     ✓ should throw if bad image
     ✓ should throw if missing parameters
     ✓ should throw if the yaml is malformed
-    ✓ should read a totp secret from the clipboard (435ms)
+    ✓ should read a totp secret from the clipboard (186ms)
 
   #Touch
     ✓ should return the help
@@ -222,7 +221,7 @@
     ✓ should throw if wrong parameters
     ✓ should create a file and generate a wallet
 New file "/folder2/file1" created.
-    ✓ should generate 5 prefixed wallet (66ms)
+    ✓ should generate 5 prefixed wallet (65ms)
 New file "/folder2/file1" created.
     ✓ should generate a wallet with mnemonic and 2 keys
 
@@ -237,37 +236,26 @@ New file "/folder2/file1" created.
     ✓ should return the help
     ✓ should see who am I
 
-
-  160 passing (31s)
-  1 pending
-  1 failing
-
-  1) #Export
-       should export a file to the current local folder:
-
-      AssertionError: expected 'file.2' to equal 'file'
-      + expected - actual
-
-      -file.2
-      +file
-      
-      at assertConsole (/Users/francescosullo/Projects/Secrez/secrez/packages/test-helpers/src/index.js:121:16)
-      at Context.<anonymous> (test/commands/Export.test.js:94:5)
+  #Fido2Client
+    #configuration
+      - should verify that all the scripts exist
 
 
+  162 passing (2m)
+  2 pending
 
 --------------------|---------|----------|---------|---------|--------------------------------------
 File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   80.15 |    67.58 |   81.49 |   80.04 |                                      
- src                |   55.75 |    52.05 |      55 |   56.25 |                                      
-  Command.js        |   72.85 |     74.5 |   78.57 |   73.91 | 32,55-62,73,80,119,145-156,163-166   
+All files           |   80.07 |    67.69 |   80.91 |   79.96 |                                      
+ src                |   57.62 |    53.75 |      55 |   58.11 |                                      
+  Command.js        |   74.66 |    74.13 |   78.57 |   75.67 | ...5-62,73,80,93,127,164-172,179-182 
   PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
   cliConfig.js      |     100 |      100 |     100 |     100 |                                      
- src/commands       |   82.85 |    69.14 |   90.82 |   82.73 |                                      
+ src/commands       |   83.06 |    69.43 |   90.82 |   82.94 |                                      
   Alias.js          |    88.6 |    78.68 |     100 |   88.46 | 101,112,139,169,173,180,190,213-214  
   Bash.js           |      75 |        0 |   66.66 |      75 | 18-19                                
-  Cat.js            |    98.9 |    88.88 |     100 |    98.9 | 152                                  
+  Cat.js            |   98.91 |    88.88 |     100 |   98.91 | 152                                  
   Cd.js             |   96.42 |    86.66 |     100 |   96.42 | 44                                   
   Conf.js           |    8.64 |        0 |      20 |    8.64 | 98-509                               
   Contacts.js       |   86.06 |     75.6 |     100 |   85.95 | ...5,165,172,184,237,250,260,268-269 
@@ -276,14 +264,14 @@ All files           |   80.15 |    67.58 |   81.49 |   80.04 |
   Edit.js           |   12.94 |        0 |      40 |   12.94 | 88-222                               
   Export.js         |   90.17 |    76.92 |     100 |   90.17 | ...3-198,209,227-231,236,248,257,260 
   Find.js           |   93.58 |    86.66 |     100 |   93.42 | 101,164,200-203,209                  
-  Git.js            |    92.3 |    66.66 |     100 |    92.3 | 40,61                                
+  Git.js            |   96.15 |       75 |     100 |   96.15 | 61                                   
   Help.js           |     100 |       80 |     100 |     100 | 29                                   
   Import.js         |   92.41 |    85.38 |     100 |   92.34 | ...7,387,393,441,457-458,466-473,500 
   Lcat.js           |     100 |    85.71 |     100 |     100 | 54                                   
   Lcd.js            |   95.65 |    81.81 |     100 |   95.65 | 50                                   
   Lls.js            |   95.45 |    72.72 |     100 |   95.45 | 97                                   
   Lpwd.js           |    92.3 |      100 |     100 |    92.3 | 36                                   
-  Ls.js             |    91.3 |       75 |     100 |   90.76 | 103,114-116,130,181                  
+  Ls.js             |   91.54 |    76.31 |     100 |   91.04 | 103,114-116,130,185                  
   Mkdir.js          |   92.59 |       60 |     100 |   92.59 | 56-57                                
   Mv.js             |   86.59 |    71.66 |     100 |   86.31 | 93-99,133,155-156,165,175-182        
   Paste.js          |   84.61 |    70.83 |     100 |   84.61 | 72,78,81,89,113,130-131,139          
@@ -291,22 +279,25 @@ All files           |   80.15 |    67.58 |   81.49 |   80.04 |
   Quit.js           |      90 |       50 |     100 |      90 | 27                                   
   Rm.js             |    90.9 |       76 |     100 |   90.74 | 63,125-126,136,144                   
   Shell.js          |   88.23 |       60 |     100 |   88.23 | 38,55                                
-  Show.js           |      72 |    45.45 |   57.14 |   73.46 | ...8,100,106-114,117,123-126,132,143 
+  Show.js           |   72.54 |    45.45 |   57.14 |      74 | ...8,100,106-114,117,123-126,132,145 
   Ssh.js            |      25 |        0 |      40 |      25 | 72-120                               
   Tag.js            |   96.26 |    91.37 |     100 |   96.22 | 122,171,204-205                      
-  Totp.js           |   92.07 |    74.19 |     100 |   92.07 | 189-190,230,240,282-287,301-302      
-  Touch.js          |   92.72 |    77.41 |     100 |   92.59 | 164,187-188,240                      
+  Totp.js           |   92.23 |       75 |     100 |   92.23 | 189-190,230,240,282-287,301-302      
+  Touch.js          |   96.36 |    80.64 |     100 |   96.29 | 164,240                              
   Use.js            |   91.66 |    86.95 |     100 |   91.66 | 68,83-84                             
   Ver.js            |      90 |    66.66 |     100 |      90 | 25                                   
   Whoami.js         |   83.33 |       60 |      80 |   83.33 | 27,35,48                             
   index.js          |    87.5 |       50 |     100 |   86.95 | 15,22,31                             
- src/prompts        |     100 |      100 |      50 |     100 |                                      
-  MainPromptMock.js |     100 |      100 |      50 |     100 |                                      
- src/utils          |   68.82 |     62.5 |   56.25 |   68.44 |                                      
+ src/prompts        |      75 |    33.33 |      50 |      75 |                                      
+  MainPromptMock.js |      75 |    33.33 |      50 |      75 | 29-35,44                             
+ src/utils          |   67.61 |     62.5 |   54.16 |   67.21 |                                      
   AliasManager.js   |     100 |    91.66 |     100 |     100 | 47                                   
   ContactManager.js |   73.33 |       60 |   85.71 |   73.33 | 12,34-36                             
-  Fido2Client.js    |   15.38 |        0 |   11.11 |   15.38 | 14-108                               
+  Fido2Client.js    |    9.61 |        0 |       0 |    9.61 | 8-108                                
   HelpProto.js      |   89.07 |     82.6 |     100 |   88.88 | 49,135-137,153-154,171-176,195       
   Logger.js         |   63.63 |    56.25 |   36.84 |   62.79 | ...25,37-49,57,65-69,74,84,88,93,105 
 --------------------|---------|----------|---------|---------|--------------------------------------
- ELIFECYCLE  Test failed. See above for more details.
+
+> secrez@2.1.10 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secrez",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "license": "MIT",
   "nyc": {
     "include": "src",
@@ -10,7 +10,7 @@
     "@secrez/core": "~1.0.5",
     "@secrez/crypto": "~1.0.4",
     "@secrez/eth": "~0.0.4",
-    "@secrez/fs": "~1.0.6",
+    "@secrez/fs": "~1.0.7",
     "@secrez/utils": "~1.0.4",
     "case": "^1.6.3",
     "chalk": "^3.0.0",

package/src/Command.js

@@ -84,6 +84,14 @@ class Command extends PreCommand {
               ][1] || undefined,
           ];
         }
+        // Handle < syntax for last path
+        if (
+          self.prompt.cache &&
+          self.prompt.cache.lastPath &&
+          options.path === "<"
+        ) {
+          return [options.path + self.prompt.cache.lastPath[0]];
+        }
         return await self.prompt[
           extraOptions.external ? "externalFs" : "internalFs"
         ].getFileList(options, true);
@@ -144,7 +152,15 @@ class Command extends PreCommand {
         // Show the warning message
         this.Logger.yellow(conflictCheck.message);
 
-        // Ask user if they want to continue
+        // If bypass is not allowed (e.g., external changes detected), block the operation
+        if (!conflictCheck.allowBypass) {
+          this.Logger.grey(
+            "Operation blocked for data integrity. Please quit and re-enter Secrez."
+          );
+          return false;
+        }
+
+        // Otherwise, ask user if they want to continue
         const shouldContinue = await this.useInput({
           type: "confirm",
           message: "Do you want to continue anyway?",

package/src/Welcome.js

@@ -3,7 +3,7 @@ const inquirer = require("inquirer");
 const fs = require("fs-extra");
 const Crypto = require("@secrez/crypto");
 const Logger = require("./utils/Logger");
-const Fido2Client = require("./utils/Fido2Client");
+// const Fido2Client = require("./utils/Fido2Client"); // FIDO2 support removed
 
 class Welcome {
   async start(secrez, options) {
@@ -37,7 +37,7 @@ Thanks.`);
     if (await fs.pathExists(this.secrez.config.keysPath)) {
       let errorCode = await this.login();
       if (errorCode === 1) {
-        await this.sharedLogin();
+        await this.handleDeprecatedFido2();
       }
     } else {
       Logger.grey("Please signup to create your local account");
@@ -111,6 +111,8 @@ Thanks.`);
     }
   }
 
+  // sharedLogin() method removed - FIDO2 support deprecated
+  /*
   async sharedLogin() {
     let fido2Client = new Fido2Client(this.secrez);
     let authenticator;
@@ -198,6 +200,7 @@ Thanks.`);
       }
     }
   }
+  */
 
   async signup() {
     for (;;) {
@@ -245,6 +248,52 @@ Thanks.`);
       }
     }
   }
+
+  async handleDeprecatedFido2() {
+    Logger.yellow(
+      "FIDO2 second factor authentication is no longer supported in this version."
+    );
+    Logger.grey("Removing deprecated FIDO2 configuration...");
+
+    try {
+      const conf = await this.secrez.readConf();
+      const data = conf.data;
+
+      if (data.keys) {
+        // Remove all FIDO2 keys from the configuration
+        delete data.keys;
+
+        // Save the cleaned configuration
+        await this.secrez.saveConf(conf);
+
+        Logger.green("FIDO2 configuration has been removed successfully.");
+        Logger.grey("You can now login with your master password only.");
+
+        // Try to login again with the cleaned configuration
+        let errorCode = await this.login();
+        if (errorCode === 1) {
+          Logger.red(
+            "Login still failed. Please check your password or create a new account."
+          );
+          // eslint-disable-next-line no-process-exit
+          process.exit(1);
+        }
+      } else {
+        Logger.red(
+          "No FIDO2 keys found, but login still requires second factor. This may indicate a corrupted configuration."
+        );
+        // eslint-disable-next-line no-process-exit
+        process.exit(1);
+      }
+    } catch (e) {
+      Logger.red(`Failed to clean FIDO2 configuration: ${e.message}`);
+      Logger.grey(
+        "You may need to manually remove the keys.json file and create a new account."
+      );
+      // eslint-disable-next-line no-process-exit
+      process.exit(1);
+    }
+  }
 }
 
 module.exports = new Welcome();

package/src/commands/Cat.js

@@ -187,6 +187,8 @@ class Cat extends require("../Command") {
       this.validate(options, {
         path: true,
       });
+      // Track the last path used
+      this.prompt.setLastPath(options.path);
       let fn = path.basename(options.path);
       let data = await this.cat(options);
       let extra = options.all || options.metadata || options.versions;

package/src/commands/Ls.js

@@ -163,6 +163,10 @@ class Ls extends require("../Command") {
     }
     try {
       this.validate(options);
+      // Track the last path used if a path was specified
+      if (options.path) {
+        this.prompt.setLastPath(options.path);
+      }
       let list = await this.ls(options);
       list = list.filter((e) => !/^\./.test(e) || options.all).sort();
       if (list.length) {

package/src/commands/Show.js

@@ -135,6 +135,8 @@ class Show extends require("../Command") {
       this.validate(options, {
         path: true,
       });
+      // Track the last path used
+      this.prompt.setLastPath(options.path);
       const content = await this.show(options);
       if (content) {
         this.Logger.reset(content);

package/src/commands/Totp.js

@@ -303,6 +303,11 @@ class Totp extends require("../Command") {
         }
       }
 
+      // Track the last path used if a path was specified
+      if (options.path) {
+        this.prompt.setLastPath(options.path);
+      }
+
       let token = await this.totp(options);
       if (options.fromImage || options.fromClipboard) {
         this.Logger.grey(token);

package/src/prompts/CommandPrompt.js

@@ -243,6 +243,10 @@ class CommandPrompt {
     if (/ (#|£)\d+(\w+:|)\/[\w/]+/.test(line)) {
       line = line.replace(/ (#|£)\d+((\w+:|)\/[\w/]+)/, " $2");
     }
+    // Handle < syntax for last path
+    if (/ </.test(line)) {
+      line = line.replace(/</, "");
+    }
     return line;
   }
 

package/src/prompts/MainPrompt.js

@@ -75,6 +75,14 @@ class MainPrompt extends require("./CommandPrompt") {
     }
   }
 
+  setLastPath(path) {
+    this.setCache("lastPath", 0, path);
+  }
+
+  getLastPath() {
+    return this.getCache("lastPath", 0);
+  }
+
   prePromptMessage(options = {}) {
     this.resetTimeout();
     return chalk.reset(

package/src/prompts/MainPromptMock.js

@@ -18,9 +18,31 @@ class MainPromptMock {
     this.cache = {};
   }
 
-  setCache() {}
+  setCache(name, index, content) {
+    if (!this.cache[name]) {
+      this.cache[name] = {};
+    }
+    this.cache[name][index] = content;
+  }
+
+  getCache(name, index) {
+    if (!this.cache[name]) {
+      return null;
+    }
+    if (typeof index !== "undefined") {
+      return this.cache[name][index];
+    } else {
+      return this.cache[name];
+    }
+  }
 
-  getCache() {}
+  setLastPath(path) {
+    this.setCache("lastPath", 0, path);
+  }
+
+  getLastPath() {
+    return this.getCache("lastPath", 0);
+  }
 
   async run(options) {}