secrez 2.1.6 → 2.1.8

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,15 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**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
+
 **2.1.6**
 
 - export and encrypt, with option `--crypto-env`, the entire content of an item
@@ -861,7 +871,60 @@ 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.6 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.8 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 (1012ms)
+    ✓ should show either one or all the versions of a file (1014ms)
     ✓ 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 (1018ms)
+    ✓ should show the content of a Yaml file (1029ms)
 
   #Cd
     ✓ should return the help
@@ -51,9 +51,9 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (416ms)
-    ✓ should copy a string to the clipboard (321ms)
-    ✓ should copy a card to the clipboard (943ms)
+    ✓ 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 throw if copying to clipboard a binary files
 
@@ -72,11 +72,12 @@
     ✓ should export an encrypted file to the current local folder
     ✓ should export a file and delete it after 1 second (1204ms)
     ✓ 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 (753ms)
+    ✓ should export a keystore json file if a private_key exists in the entry (711ms)
     ✓ 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
@@ -84,6 +85,13 @@
     ✓ 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 handle non-git repository
+
   #Help
     ✓ should return the help
     ✓ #execAsync and format
@@ -145,7 +153,7 @@
 
   #Mv
     ✓ should return the help
-    ✓ should rename a file (1011ms)
+    ✓ should rename a file (1014ms)
     ✓ should move a file to another folder
     ✓ should move many files to another folder
     ✓ should move a file to another subfolder
@@ -154,14 +162,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 (1018ms)
+    ✓ should move files from and to other datasets (1025ms)
     ✓ should move the results of a find
 
   #Paste
     ✓ should return the help
-    ✓ should paste the clipboard content to a new file (46ms)
-    ✓ should paste the clipboard content to an existent file (79ms)
-    ✓ should paste a single field to a yml card (38ms)
+    ✓ 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
 
   #Pwd
     ✓ should return the help
@@ -195,13 +203,13 @@
 
   #Totp
     ✓ should return the help
-    ✓ should totp a file to the clipboard (395ms)
-    ✓ should read a totp secret from an image and add the totp field to the card (46ms)
+    ✓ should totp a file to the clipboard (407ms)
+    ✓ 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 (269ms)
+    ✓ should read a totp secret from the clipboard (435ms)
 
   #Touch
     ✓ should return the help
@@ -214,7 +222,7 @@
     ✓ should throw if wrong parameters
     ✓ should create a file and generate a wallet
 New file "/folder2/file1" created.
-    ✓ should generate 5 prefixed wallet (65ms)
+    ✓ should generate 5 prefixed wallet (66ms)
 New file "/folder2/file1" created.
     ✓ should generate a wallet with mnemonic and 2 keys
 
@@ -230,7 +238,7 @@ New file "/folder2/file1" created.
     ✓ should see who am I
 
 
-  154 passing (16s)
+  160 passing (31s)
   1 pending
   1 failing
 
@@ -251,43 +259,44 @@ New file "/folder2/file1" created.
 --------------------|---------|----------|---------|---------|--------------------------------------
 File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   81.01 |    67.81 |   81.15 |   80.91 |                                      
- 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                   
+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   
   PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
   cliConfig.js      |     100 |      100 |     100 |     100 |                                      
- src/commands       |   83.77 |    69.39 |   90.64 |   83.66 |                                      
-  Alias.js          |   90.54 |    77.35 |     100 |   90.41 | 101,112,139,169,173,180,190          
+ src/commands       |   82.85 |    69.14 |   90.82 |   82.73 |                                      
+  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                                  
   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 
+  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             |   92.53 |    82.05 |     100 |   92.42 | 99,108-113,125                       
-  Edit.js           |   13.58 |        0 |      40 |   13.58 | 88-214                               
-  Export.js         |   89.71 |    75.67 |     100 |   89.71 | ...5-190,201,213-217,222,234,243,246 
+  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            |    92.3 |    66.66 |     100 |    92.3 | 40,61                                
   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 
+  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                  
-  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                  
+  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             |      94 |    80.95 |     100 |   93.87 | 63,126,134                           
+  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 
   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                                   
+  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                      
+  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                             

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secrez",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "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

@@ -131,6 +131,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/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/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/Export.js

@@ -71,6 +71,10 @@ class Export extends require("../Command") {
         alias: "C",
         type: Boolean,
       },
+      {
+        name: "no-export",
+        type: Boolean,
+      },
     ];
   }
 
@@ -115,6 +119,10 @@ class Export extends require("../Command") {
           "export my-wallet.yml --crypto-env",
           "it works like with keystore files, but it will export to file with .crypto.env extension ready to be used with @secrez/cryptoenv. Notice that the option -k has priority over -C.",
         ],
+        [
+          "export my-wallet.yml --crypto-env --no-export",
+          "encrypts the private key but displays it in console instead of exporting to file.",
+        ],
       ],
     };
   }
@@ -202,6 +210,12 @@ class Export extends require("../Command") {
         }
         if (options.cryptoEnv) {
           content = await Crypto.encrypt(privateKey, Crypto.SHA3(pwd));
+          if (options.noExport) {
+            // Display encrypted content in console instead of exporting
+            this.Logger.grey("Encrypted content:");
+            this.Logger.reset(content);
+            return null; // Return null to indicate no file was created
+          }
           name = name.replace(/\.[^.]+$/, ".crypto.env");
         } else {
           content = await encryptPrivateKeyAsKeystoreJson(privateKey, pwd);
@@ -289,8 +303,10 @@ class Export extends require("../Command") {
     try {
       this.validate(options);
       let name = await this.export(options);
-      this.Logger.grey("Exported file:");
-      this.Logger.reset(name);
+      if (name) {
+        this.Logger.grey("Exported file:");
+        this.Logger.reset(name);
+      }
       if (
         options.encrypt &&
         !options.password &&

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/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/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,16 @@ 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;
+        }
+      }
+
       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);