secrez 2.1.7 → 2.1.9

package/.env

@@ -0,0 +1,9 @@
+SECREZ_TEST_REPO_URL="git@github.com:secrez/test-repo.git"
+SECREZ_TEST_SSH_KEY="-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACB8/5MMxGmWhwKsCKzu2bC2WhWdV6BiS/c2IVMJZ10NxQAAAKBOc1L6TnNS
++gAAAAtzc2gtZWQyNTUxOQAAACB8/5MMxGmWhwKsCKzu2bC2WhWdV6BiS/c2IVMJZ10NxQ
+AAAEB8z+vtbfcUQyatLMOea+l7Ku4xbFbgB1Fyzymvo0T4Vnz/kwzEaZaHAqwIrO7ZsLZa
+FZ1XoGJL9zYhUwlnXQ3FAAAAF3NlY3Jlei10ZXN0QGV4YW1wbGUuY29tAQIDBAUG
+-----END OPENSSH PRIVATE KEY-----"
+PUBLIC_TEST_KEY="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHz/kwzEaZaHAqwIrO7ZsLZaFZ1XoGJL9zYhUwlnXQ3F secrez-test@example.com"

package/README.md

@@ -152,6 +152,7 @@ Available commands:
   edit      Edits a file containing a secret.
   export    Export encrypted data to the OS in the current local folder
   find      Find a secret.
+  git       Checks if there is a repo and if there are conflict risks.
   help      This help.
   import    Import files from the OS into the current folder
   lcat      Similar to a standard cat in the external fs.
@@ -369,6 +370,16 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**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
+- add git conflict detection middleware to prevent conflicts during data-changing operations
+
 **2.1.7**
 
 - add option `--no-export` to `export --crypto-env` to display the encrypted content in the console instead of writing it to a file
@@ -865,60 +876,7 @@ Thank you for any contributions! 😉
 ## Test coverage
 
 ```
-  1 passing (549ms)
-
---------------------|---------|----------|---------|---------|--------------------------------------
-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
---------------------|---------|----------|---------|---------|--------------------------------------
+
 ```
 
 ## Copyright

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@2.1.7 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.9 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
 
 
@@ -29,10 +29,10 @@
   #Cat
     ✓ should return the help
     ✓ should show the content of a file
-    ✓ should show either one or all the versions of a file (1013ms)
+    ✓ should show either one or all the versions of a file (1019ms)
     ✓ 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 (1017ms)
+    ✓ should show the content of a Yaml file (1028ms)
 
   #Cd
     ✓ should return the help
@@ -51,254 +51,6 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (402ms)
-    ✓ should copy a string to the clipboard (266ms)
-    ✓ should copy a card to the clipboard (960ms)
-    ✓ should return an error if the file does not exist or is a folder (48ms)
-    ✓ should throw if copying to clipboard a binary files
-
-  #Ds
-    ✓ should return the help
-    ✓ should list all datasets
-    ✓ should create a new dataset
-    ✓ should rename a dataset
-    ✓ should delete a dataset
-
-  #Export
-    ✓ should return the help
-    1) 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 (1205ms)
-    ✓ 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 (922ms)
-    ✓ 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
-    ✓ should throw error when no private_key fields exist and keystore option is used
-    ✓ should display encrypted content in console when using crypto-env with no-export
-
-  #Find
-    ✓ should return the help
-    ✓ should show find a string in the tree (1022ms)
-    ✓ should find no result without parameters
-    ✓ should skip binary files from search
-
-  #Help
-    ✓ should return the help
-    ✓ #execAsync and format
-    ✓ should throw if wrong command
-    ✓ -- to complete coverage
-
-  #Import
-    ✓ should return the help
-    ✓ should import a file in the current folder
-    ✓ should import an encrypted file
-    ✓ should import an encrypted file encrypted for myself
-    ✓ should import an encrypted binary file and export it again verifying it is fine
-    ✓ should import files recursively
-    ✓ should read a folder and import the only text file
-    ✓ should read a folder and import text and binary files
-    ✓ should simulate the import of two files
-    ✓ should move the imported file
-    ✓ should import a backup from another software spanning the data among folders and files
-    ✓ should import a backup from another software but saving the tags as tags
-    ✓ should import a backup from another software using tags to prefix the paths
-    ✓ should import using tags to prefix the paths, ignoring the tags
-    ✓ should import from a LastPass-like csv setting the path from "grouping" and "name"
-    ✓ should import from a json
-    ✓ should throw importing a malformed backup
-    ✓ should throw importing a CSV indicating wrong fields to generate the path
-
-  #Lcat
-    ✓ should return the help
-    ✓ cat a file
-    ✓ return en error if trying to cat a binary file
-
-  #Lcd
-    ✓ should return the help
-    ✓ change to a folder
-    ✓ return en error if changing to a file
-
-  #Lls
-    ✓ should return the help
-    ✓ should list a folder
-    ✓ return en error if lls-ing a not existing path
-    ✓ return a message if no files are found
-
-  #Lpwd
-    ✓ should return the help
-    ✓ change to a folder
-
-  #Ls
-    ✓ should return the help
-    ✓ should return all the datasets
-    ✓ should list folders and files
-    ✓ should list folders and files using wildcards
-
-  #Mkdir
-    ✓ should return the help
-    ✓ should create a folder
-    ✓ should create a nested folder
-    ✓ should throw if trying to create a child of a file
-    ✓ should throw if wrong parameters
-
-  #Mv
-    ✓ should return the help
-    ✓ should rename a file (1010ms)
-    ✓ should move a file to another folder
-    ✓ should move many files to another folder
-    ✓ should move a file to another subfolder
-    ✓ should move and rename file to another folder
-    ✓ should move file to another folder using wildcards
-    ✓ 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 (1014ms)
-    ✓ should move the results of a find
-
-  #Paste
-    ✓ should return the help
-    ✓ should paste the clipboard content to a new file (61ms)
-    ✓ should paste the clipboard content to an existent file (86ms)
-    ✓ should paste a single field to a yml card
-
-  #Pwd
-    ✓ should return the help
-    ✓ should show the working folder
-
-  #Quit
-    ✓ should show the content of an external file via bash
-
-  #Rm
-    ✓ should return the help
-    ✓ 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 (1009ms)
-
-  #Shell
-    ✓ should return the help
-    ✓ should show the content of an external file via shell
-
-  #Show
-    ✓ should return the help
-    ✓ should show the field password of a card
-
-  #Tag
-    ✓ should return the help
-    ✓ should tag a file
-    ✓ should remove a tag
-    ✓ should list all the tags
-    ✓ should show the file tagged as
-    ✓ should show very long file tagged as
-
-  #Totp
-    ✓ should return the help
-    ✓ should totp a file to the clipboard (394ms)
-    ✓ should read a totp secret from an image and add the totp field to the card (44ms)
-    ✓ 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 (242ms)
-
-  #Touch
-    ✓ should return the help
-    ✓ should create a file
-    ✓ should create a file with content
-    ✓ should duplicate a file
-    ✓ should throw if trying to duplicate a non existing file
-    ✓ should throw if trying to duplicate a folder
-    ✓ should throw if trying to create a child of a file
-    ✓ should throw if wrong parameters
-    ✓ should create a file and generate a wallet
-New file "/folder2/file1" created.
-    ✓ should generate 5 prefixed wallet (65ms)
-New file "/folder2/file1" created.
-    ✓ should generate a wallet with mnemonic and 2 keys
-
-  #Use
-    ✓ should return the help
-    ✓ should use a new dataset, creating it if does not exist
-
-  #Ver
-    ✓ should show the current version
-
-  #Whoami
-    ✓ should return the help
-    ✓ should see who am I
-
-
-  155 passing (14s)
-  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)
-
-
-
---------------------|---------|----------|---------|---------|--------------------------------------
-File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
---------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   81.06 |    67.92 |   81.15 |   80.95 |                                      
- src                |   57.84 |    53.62 |   52.63 |   58.41 |                                      
-  Command.js        |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119                   
-  PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
-  cliConfig.js      |     100 |      100 |     100 |     100 |                                      
- src/commands       |   83.81 |    69.51 |   90.64 |    83.7 |                                      
-  Alias.js          |   90.54 |    77.35 |     100 |   90.41 | 101,112,139,169,173,180,190          
-  Bash.js           |      75 |        0 |   66.66 |      75 | 18-19                                
-  Cat.js            |    98.9 |    88.88 |     100 |    98.9 | 152                                  
-  Cd.js             |   96.42 |    86.66 |     100 |   96.42 | 44                                   
-  Conf.js           |    9.09 |        0 |      20 |    9.09 | 98-500                               
-  Contacts.js       |   87.17 |    74.32 |     100 |   87.06 | ...5-141,145,165,172,184,237,250,260 
-  Copy.js           |    91.2 |    71.92 |     100 |   91.11 | 115,166,183,205-210,225-226,253      
-  Ds.js             |   92.53 |    82.05 |     100 |   92.42 | 99,108-113,125                       
-  Edit.js           |   13.58 |        0 |      40 |   13.58 | 88-214                               
-  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                  
-  Help.js           |     100 |       80 |     100 |     100 | 29                                   
-  Import.js         |    93.2 |    85.48 |     100 |   93.13 | ...5,365,367,387,393,441,456-463,490 
-  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                  
-  Mkdir.js          |     100 |    66.66 |     100 |     100 | 38-44                                
-  Mv.js             |   88.04 |    73.21 |     100 |   87.77 | 93-99,133,155,165-172                
-  Paste.js          |   87.23 |       75 |     100 |   87.23 | 72,78,81,89,113,129                  
-  Pwd.js            |    92.3 |      100 |     100 |    92.3 | 33                                   
-  Quit.js           |      90 |       50 |     100 |      90 | 27                                   
-  Rm.js             |      94 |    80.95 |     100 |   93.87 | 63,126,134                           
-  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 
-  Ssh.js            |      25 |        0 |      40 |      25 | 72-120                               
-  Tag.js            |   98.03 |     92.3 |     100 |   98.01 | 122,171                              
-  Totp.js           |   93.75 |    72.72 |     100 |   93.75 | 189-190,230,240,282-287              
-  Touch.js          |      96 |    81.48 |     100 |   95.91 | 164,231                              
-  Use.js            |   96.77 |    89.47 |     100 |   96.77 | 68                                   
-  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 |                                      
-  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                               
-  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 
---------------------|---------|----------|---------|---------|--------------------------------------
+    ✓ should copy a file to the clipboard (406ms)
+    ✓ should copy a string to the clipboard (261ms)
  ELIFECYCLE  Test failed. See above for more details.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secrez",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "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.5",
+    "@secrez/fs": "~1.0.6",
     "@secrez/utils": "~1.0.4",
     "case": "^1.6.3",
     "chalk": "^3.0.0",
@@ -33,6 +33,7 @@
     "chai": "^4.5.0",
     "chalk": "^3.0.0",
     "cross-env": "^7.0.3",
+    "dotenv": "^17.2.2",
     "mocha": "^7.2.0",
     "nyc": "^15.1.0",
     "test-console": "^1.1.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);
@@ -131,6 +139,41 @@ class Command extends PreCommand {
       }
     }
   }
+
+  /**
+   * Check for git conflicts before performing data-changing operations
+   * Returns true if the operation should proceed, false if it should be cancelled
+   */
+  async checkGitConflictsBeforeOperation() {
+    try {
+      const conflictCheck = await this.internalFs.checkGitSyncStatus();
+
+      if (conflictCheck.hasRisk) {
+        // Show the warning message
+        this.Logger.yellow(conflictCheck.message);
+
+        // Ask user if they want to continue
+        const shouldContinue = await this.useInput({
+          type: "confirm",
+          message: "Do you want to continue anyway?",
+          default: false,
+        });
+
+        if (!shouldContinue) {
+          this.Logger.grey("Operation cancelled.");
+          return false;
+        }
+      }
+
+      return true;
+    } catch (e) {
+      // If git check fails, log a warning but continue
+      this.Logger.yellow(
+        "Warning: Could not check git status. Proceeding anyway."
+      );
+      return true;
+    }
+  }
 }
 
 module.exports = Command;

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,44 @@ 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/Alias.js

@@ -200,6 +200,21 @@ class Alias extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before creating/modifying/deleting aliases
+      if (
+        options.commandLine ||
+        options.previousCommand ||
+        options.rename ||
+        options.delete
+      ) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let result = await this.alias(options);
       if (!Array.isArray(result)) {
         result = [result];

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/Conf.js

@@ -486,6 +486,15 @@ class Conf extends require("../Command") {
       //   options.list = true
       // }
       this.validate(options);
+
+      // Check for git conflicts before changing password or iterations
+      if (options.newPassword || options.newIterationsNumber) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          return;
+        }
+      }
+
       // if (options.fido2 && options.recoveryCode) {
       //   throw new Error('Conflicting params. Launch "conf -h" for examples.')
       // }

package/src/commands/Contacts.js

@@ -260,6 +260,16 @@ class Contacts extends require("../Command") {
         options.list = true;
       }
       this.validate(options);
+
+      // Check for git conflicts before adding/updating/deleting contacts
+      if (options.add || options.update || options.delete || options.rename) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let result = await this.contacts(options);
       if (!Array.isArray(result)) {
         result = [result];

package/src/commands/Ds.js

@@ -139,6 +139,16 @@ class Ds extends require("../Command") {
         options.list = true;
       }
       this.validate(options);
+
+      // Check for git conflicts before creating/renaming/deleting datasets
+      if (options.create || options.rename || options.delete) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let result = await this.ds(options);
       if (result) {
         if (options.list) {

package/src/commands/Edit.js

@@ -184,6 +184,14 @@ class Edit extends require("../Command") {
       this.validate(options, {
         path: true,
       });
+
+      if (!options.help) {
+        // Check for git conflicts before editing files (edit always changes something)
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          return;
+        }
+      }
       currentEditor = process.env.EDITOR;
       if (options.internal) {
         process.env.EDITOR = this.getTinyCliEditorBinPath();

package/src/commands/Git.js

@@ -0,0 +1,67 @@
+const chalk = require("chalk");
+const { yamlStringify } = require("@secrez/utils");
+
+class Git extends require("../Command") {
+  setHelpAndCompletion() {
+    this.cliConfig.completion.git = {
+      _func: this.selfCompletion(this),
+      _self: this,
+    };
+    this.cliConfig.completion.help.git = true;
+    this.optionDefinitions = [
+      {
+        name: "help",
+        alias: "h",
+        type: Boolean,
+      },
+      {
+        name: "status",
+        alias: "s",
+        type: Boolean,
+      },
+    ];
+  }
+
+  help() {
+    return {
+      description: ["Check a git repository status."],
+      examples: [["git -s", "Check the git repository status"]],
+    };
+  }
+
+  async git(options = {}) {
+    const isGit = await this.internalFs.gitConflictChecker.isGitRepository();
+    if (isGit) {
+      if (options.status) {
+        let status = await this.internalFs.gitConflictChecker.getGitStatus();
+        let warning =
+          await this.internalFs.gitConflictChecker.getWarningMessage(status);
+        if (warning) {
+          return chalk.yellow(warning);
+        } else return "No remote changes found.";
+      }
+    } else {
+      return "Not a git repository";
+    }
+  }
+
+  async exec(options = {}) {
+    if (options.help) {
+      return this.showHelp();
+    }
+    try {
+      // if the user didn't pass any option, we default to options.status
+      if (!Object.keys(options).length) {
+        options.status = true;
+      }
+      this.validate(options);
+      let result = await this.git(options);
+      this.Logger.reset(result);
+    } catch (e) {
+      this.Logger.red(e.message);
+    }
+    await this.prompt.run();
+  }
+}
+
+module.exports = Git;

package/src/commands/Import.js

@@ -449,6 +449,16 @@ class Import extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before importing files (skip if help or simulate)
+      if (!options.help && !options.simulate) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       if (options.expand) {
         await this.expand(options);
       } else {

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/Mkdir.js

@@ -48,6 +48,16 @@ class Mkdir extends require("../Command") {
     try {
       this.validate(options);
       this.checkPath(options);
+
+      // Check for git conflicts before creating directories
+      if (!options.help) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let data = await this.internalFs.getTreeIndexAndPath(options.path);
       let sanitizedPath = Entry.sanitizePath(data.path);
       if (sanitizedPath !== data.path) {

package/src/commands/Mv.js

@@ -147,6 +147,16 @@ class Mv extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before moving/renaming files
+      if (!options.help) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       if (options.find) {
         options.newPath = options.destination;
         options.path = options.find;

package/src/commands/Paste.js

@@ -122,6 +122,16 @@ class Paste extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before pasting content
+      if (!options.help) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let name = await this.paste(options);
       this.Logger.grey("Pasted the clipboard to:");
       this.Logger.reset(name);

package/src/commands/Rm.js

@@ -117,6 +117,16 @@ class Rm extends require("../Command") {
     } else {
       try {
         this.validate(options);
+
+        // Check for git conflicts before removing files
+        if (!options.help) {
+          const shouldProceed = await this.checkGitConflictsBeforeOperation();
+          if (!shouldProceed) {
+            await this.prompt.run();
+            return;
+          }
+        }
+
         let deleted = await this.rm(options);
         if (deleted.length === 0) {
           this.Logger.grey("No files have been deleted.");

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/Tag.js

@@ -196,6 +196,16 @@ class Tag extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before adding/removing tags
+      if (options.add || options.remove) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let result = await this.tag(options);
       if (options.list) {
         if (options.global) {

package/src/commands/Totp.js

@@ -293,6 +293,21 @@ class Totp extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before setting TOTP secrets
+      if (options.set || options.fromClipboard || options.fromImage) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
+      // 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/commands/Touch.js

@@ -179,6 +179,15 @@ class Touch extends require("../Command") {
     try {
       this.validate(options);
       this.checkPath(options);
+
+      // Check for git conflicts before creating/modifying files
+      if (!options.help) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
       /* istanbul ignore if  */
       if (!options.generateWallet) {
         if (options.notVisibleContent) {

package/src/commands/Use.js

@@ -75,6 +75,16 @@ class Use extends require("../Command") {
     }
     try {
       this.validate(options);
+
+      // Check for git conflicts before creating new datasets
+      if (options.create) {
+        const shouldProceed = await this.checkGitConflictsBeforeOperation();
+        if (!shouldProceed) {
+          await this.prompt.run();
+          return;
+        }
+      }
+
       let result = await this.use(options);
       if (result) {
         this.Logger.reset(result);

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) {}