secrez 2.1.13 → 2.1.15

package/README.md

@@ -368,6 +368,15 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**2.1.15**
+
+- add `find -R` to look for recent entries only. With `-l` to set a limit (default 10)
+
+**2.1.14**
+
+- reverse changes done in version 2.1.12
+- add a push option to Git that checks if there are changes in the repo and, if so, pushes them remotely, updating the system
+
 **2.1.12**
 
 - enforce the usage of pnpm during global install. When that is not possible, for example with yarn, it blocks the execution asking the user to uninstall and install it again properly
@@ -892,60 +901,60 @@ Thank you for any contributions! 😉
 ## Test coverage
 
 ```
-  162 passing (2m)
-
---------------------|---------|----------|---------|---------|--------------------------------------
-File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
---------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   81.62 |    68.94 |   83.57 |   81.53 |                                      
- 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.01 |    69.34 |   90.82 |   82.89 |                                      
-  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 | 47-216                               
-  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            |    92.3 |    66.66 |     100 |    92.3 | 40,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          |   83.07 |    78.43 |   66.66 |   82.81 |                                      
-  AliasManager.js   |     100 |    91.66 |     100 |     100 | 47                                   
-  ContactManager.js |   73.33 |       60 |   85.71 |   73.33 | 12,34-36                             
-  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 
---------------------|---------|----------|---------|---------|--------------------------------------
+  1 passing (15s)
+
+--------------------|---------|----------|---------|---------|----------------------------------
+File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
+--------------------|---------|----------|---------|---------|----------------------------------
+All files           |   14.72 |     2.34 |   17.88 |   14.78 |
+ src                |   25.42 |     6.25 |      15 |   25.64 |
+  Command.js        |      24 |     8.62 |   21.42 |   24.32 | 22-35,40-110,116,127,130-182
+  PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97
+  cliConfig.js      |     100 |      100 |     100 |     100 |
+ src/commands       |   13.44 |      1.7 |   19.32 |   13.52 |
+  Alias.js          |    7.59 |        0 |      25 |    7.69 | 62-228
+  Bash.js           |    62.5 |        0 |   33.33 |    62.5 | 11-19
+  Cat.js            |   11.95 |        0 |   14.28 |   11.95 | 61-222
+  Cd.js             |   17.85 |        0 |      25 |   17.85 | 28-73
+  Conf.js           |     7.4 |        0 |      10 |     7.4 | 34-216
+  Contacts.js       |    5.73 |        0 |    7.69 |    5.78 | 53-284
+  Copy.js           |   10.98 |        0 |    12.5 |   11.11 | 71-268
+  Ds.js             |    5.55 |        0 |   16.66 |    5.63 | 39-170
+  Edit.js           |   11.76 |        0 |      20 |   11.76 | 61-222
+  Export.js         |    9.82 |        0 |   16.66 |    9.82 | 82-325
+  Find.js           |    7.69 |        0 |    8.33 |    7.89 | 63-211
+  Git.js            |   48.88 |    35.71 |      75 |   48.88 | 31,49-54,61,70-97,103,108,114
+  Help.js           |   33.33 |        0 |      50 |   33.33 | 26-43
+  Import.js         |    6.16 |        0 |    9.09 |    6.22 | 87-506
+  Lcat.js           |      30 |        0 |      25 |      30 | 35-65
+  Lcd.js            |   17.39 |        0 |      25 |   17.39 | 30-72
+  Lls.js            |   22.72 |        0 |      25 |   22.72 | 49-99
+  Lpwd.js           |   30.76 |        0 |      25 |   30.76 | 15-38
+  Ls.js             |    5.63 |        0 |      10 |    5.97 | 46-187
+  Mkdir.js          |   18.51 |        0 |      25 |   18.51 | 27-71
+  Mv.js             |    6.18 |        0 |   16.66 |    6.31 | 46-250
+  Paste.js          |   13.46 |        0 |      25 |   13.46 | 40-141
+  Pwd.js            |   30.76 |        0 |      25 |   30.76 | 15-35
+  Quit.js           |      50 |        0 |   33.33 |      50 | 19-40
+  Rm.js             |   14.54 |        0 |   16.66 |   14.81 | 36-147
+  Shell.js          |   29.41 |        0 |      25 |   29.41 | 25-57
+  Show.js           |   15.68 |        0 |   14.28 |      16 | 45-147
+  Ssh.js            |   22.22 |        0 |      20 |   22.22 | 49-120
+  Tag.js            |    8.41 |        0 |    9.09 |    8.49 | 66-246
+  Totp.js           |   13.59 |        0 |    9.09 |   13.59 | 76-327
+  Touch.js          |   14.54 |        0 |      25 |   14.81 | 75-245
+  Use.js            |   11.11 |        0 |      25 |   11.11 | 30-95
+  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        |   58.33 |        0 |      25 |   58.33 |
+  MainPromptMock.js |   58.33 |        0 |      25 |   58.33 | 22-44
+ src/utils          |   15.89 |     6.86 |   10.25 |   15.62 |
+  AliasManager.js   |    5.88 |        0 |       0 |    5.88 | 3-48
+  ContactManager.js |    6.66 |        0 |       0 |    6.66 | 3-44
+  HelpProto.js      |     4.2 |        0 |   16.66 |    4.27 | 11-200
+  Logger.js         |   54.54 |    43.75 |   15.78 |   53.48 | 8,12,16-57,65-69,74,84,88,93,105
+--------------------|---------|----------|---------|---------|----------------------------------
 ```
 
 ## Copyright

package/bin/secrez.js

@@ -9,50 +9,49 @@ const pkg = require("../package");
 
 const MainPrompt = require("../src/prompts/MainPrompt");
 const Logger = require("../src/utils/Logger");
-
 // Check if the package was installed with pnpm (skip check in development)
-const installPath = __dirname;
-if (process.env.NODE_ENV !== "dev" && installPath.indexOf("pnpm") === -1) {
-  console.error(chalk.red.bold("\n⚠️  Installation Error\n"));
-  console.error(
-    chalk.yellow(
-      "Secrez must be installed globally using pnpm.\n" +
-        "It appears this package was installed with a different package manager.\n"
-    )
-  );
-  console.error(chalk.white("\nPlease follow these steps:\n"));
-  console.error(
-    chalk.cyan(
-      "1. Uninstall secrez using the package manager you previously used:\n" +
-        "   - If you used npm:  " +
-        chalk.bold("npm uninstall -g secrez") +
-        "\n" +
-        "   - If you used yarn: " +
-        chalk.bold("yarn global remove secrez") +
-        "\n"
-    )
-  );
-  console.error(
-    chalk.cyan(
-      "2. Install pnpm globally if you haven't already:\n" +
-        "   " +
-        chalk.bold("npm install -g pnpm") +
-        "\n"
-    )
-  );
-  console.error(
-    chalk.cyan("3. Setup pnpm:\n" + "   " + chalk.bold("pnpm setup") + "\n")
-  );
-  console.error(
-    chalk.cyan(
-      "4. Install secrez globally using pnpm:\n" +
-        "   " +
-        chalk.bold("pnpm install -g secrez") +
-        "\n"
-    )
-  );
-  process.exit(1);
-}
+// const installPath = __dirname;
+// if (process.env.NODE_ENV !== "dev" && installPath.indexOf("pnpm") === -1) {
+//   console.error(chalk.red.bold("\n⚠️  Installation Error\n"));
+//   console.error(
+//     chalk.yellow(
+//       "Secrez must be installed globally using pnpm.\n" +
+//         "It appears this package was installed with a different package manager.\n"
+//     )
+//   );
+//   console.error(chalk.white("\nPlease follow these steps:\n"));
+//   console.error(
+//     chalk.cyan(
+//       "1. Uninstall secrez using the package manager you previously used:\n" +
+//         "   - If you used npm:  " +
+//         chalk.bold("npm uninstall -g secrez") +
+//         "\n" +
+//         "   - If you used yarn: " +
+//         chalk.bold("yarn global remove secrez") +
+//         "\n"
+//     )
+//   );
+//   console.error(
+//     chalk.cyan(
+//       "2. Install pnpm globally if you haven't already:\n" +
+//         "   " +
+//         chalk.bold("npm install -g pnpm") +
+//         "\n"
+//     )
+//   );
+//   console.error(
+//     chalk.cyan("3. Setup pnpm:\n" + "   " + chalk.bold("pnpm setup") + "\n")
+//   );
+//   console.error(
+//     chalk.cyan(
+//       "4. Install secrez globally using pnpm:\n" +
+//         "   " +
+//         chalk.bold("pnpm install -g secrez") +
+//         "\n"
+//     )
+//   );
+//   process.exit(1);
+// }
 
 const optionDefinitions = [
   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secrez",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "license": "MIT",
   "nyc": {
     "include": "src",

package/src/commands/Find.js

@@ -1,5 +1,7 @@
 const chalk = require("chalk");
 const { Node } = require("@secrez/fs");
+const { config } = require("@secrez/core");
+const Crypto = require("@secrez/crypto");
 
 class Find extends require("../Command") {
   setHelpAndCompletion() {
@@ -56,6 +58,18 @@ class Find extends require("../Command") {
         type: Boolean,
         hint: "If global, search also in trash",
       },
+      {
+        name: "recent",
+        alias: "R",
+        type: Boolean,
+        hint: "Search for recent changes",
+      },
+      {
+        name: "limit",
+        alias: "l",
+        type: Number,
+        hint: "Limit the number of results (default: 10 when recent is enabled)",
+      },
     ];
   }
 
@@ -83,11 +97,69 @@ class Find extends require("../Command") {
           "Search scanning all the versions in all the datasets",
         ],
         ["find archive:allet", "Search allet in the archive dataset"],
+        ["find -R", "Show the 10 most recent changes"],
+        ["find -R -l 20", "Show the 20 most recent changes"],
       ],
     };
   }
 
   async find(options) {
+    // Handle recent mode
+    if (options.recent) {
+      // Set default limit if not specified by user
+      if (options.limit === undefined) {
+        options.limit = 10;
+      }
+      // In recent mode, ignore keywords completely - just show the N most recent entries
+      options.name = undefined;
+      options.keywords = undefined;
+
+      if (options.global) {
+        let datasetInfo = await this.internalFs.getDatasetsInfo();
+        let allResults = [];
+        for (let dataset of datasetInfo) {
+          if (options.global && !options.trashToo && dataset.index === 1) {
+            continue;
+          }
+          await this.internalFs.mountTree(dataset.index);
+          options.tree = this.internalFs.trees[dataset.index];
+          options.dataset = dataset.name;
+          // Collect raw results (with ts property) for sorting across datasets
+          let rawResults = await this._findRecentRaw(options);
+          allResults = allResults.concat(rawResults);
+        }
+        // Sort all results together by timestamp and limit
+        allResults.sort((a, b) => {
+          return Node.sortEntry(a.ts, b.ts);
+        });
+        if (allResults.length > options.limit) {
+          allResults = allResults.slice(0, options.limit);
+        }
+        // Format results
+        return allResults.map((e) => {
+          let result = [
+            Node.hashVersion(e.ts),
+            e.path + (e.isDir ? "/" : ""),
+            e.name,
+            undefined,
+          ];
+          // Store timestamp for date formatting in recent mode
+          result.ts = e.ts;
+          if (e.dataset) {
+            result[1] = e.dataset + ":" + result[1];
+          }
+          return result;
+        });
+      } else {
+        let data = await this.internalFs.getTreeIndexAndPath(".");
+        // Don't set dataset for non-global search (matches regular find behavior)
+        // Dataset prefix is only shown when searching globally
+        options.tree = data.tree;
+        return await this._findRecent(options);
+      }
+    }
+
+    // Regular find mode
     if (!options.name && options.keywords) {
       options.name = options.keywords;
     }
@@ -133,20 +205,155 @@ class Find extends require("../Command") {
     });
   }
 
+  async _findRecent(options) {
+    let rawResults = await this._findRecentRaw(options);
+
+    // Sort by timestamp (most recent first) and limit
+    rawResults.sort((a, b) => {
+      return Node.sortEntry(a.ts, b.ts);
+    });
+
+    // Limit results
+    if (rawResults.length > options.limit) {
+      rawResults = rawResults.slice(0, options.limit);
+    }
+
+    // Format results to match regular find output
+    return rawResults.map((e) => {
+      let result = [
+        Node.hashVersion(e.ts),
+        e.path + (e.isDir ? "/" : ""),
+        e.name,
+        undefined,
+      ];
+      // Store timestamp for date formatting in recent mode
+      result.ts = e.ts;
+      // Only add dataset prefix if dataset is set (which happens in global mode)
+      if (options.dataset) {
+        result[1] = options.dataset + ":" + result[1];
+      }
+      return result;
+    });
+  }
+
+  async _findRecentRaw(options) {
+    let start = options.tree[options.root ? "root" : "workingNode"];
+    let results = [];
+
+    // Recursively collect all entries with their timestamps (no keyword filtering in recent mode)
+    await this._collectRecentEntries(start, results, options, null);
+
+    // Add dataset info to results for global mode
+    if (options.dataset) {
+      results = results.map((e) => {
+        e.dataset = options.dataset;
+        return e;
+      });
+    }
+
+    return results;
+  }
+
+  async _collectRecentEntries(node, results, options, re) {
+    // Skip root node
+    if (Node.isRoot(node)) {
+      // Process children
+      if (node.children) {
+        for (let id in node.children) {
+          await this._collectRecentEntries(
+            node.children[id],
+            results,
+            options,
+            re
+          );
+        }
+      }
+      return;
+    }
+
+    // Process current node if it has versions
+    if (node.versions && node.lastTs) {
+      let name = node.getName();
+      let path = node.getPath();
+      let isDir = Node.isDir(node);
+
+      // Filter by keywords if provided
+      if (re) {
+        if (re.test(name)) {
+          results.push({
+            ts: node.lastTs,
+            name: name,
+            path: path,
+            isDir: isDir,
+          });
+        } else if (
+          options.content &&
+          Node.isFile(node) &&
+          node.type === config.types.TEXT &&
+          options.tree
+        ) {
+          // Check content if content option is enabled
+          try {
+            let { content } = await options.tree.getEntryDetails(
+              node,
+              node.lastTs
+            );
+            if (re.test(content || "")) {
+              results.push({
+                ts: node.lastTs,
+                name: name,
+                path: path,
+                isDir: isDir,
+              });
+            }
+          } catch (e) {
+            // Ignore errors when reading content
+          }
+        }
+      } else {
+        // No keyword filter, include all entries
+        results.push({
+          ts: node.lastTs,
+          name: name,
+          path: path,
+          isDir: isDir,
+        });
+      }
+    }
+
+    // Process children
+    if (node.children) {
+      for (let id in node.children) {
+        await this._collectRecentEntries(
+          node.children[id],
+          results,
+          options,
+          re
+        );
+      }
+    }
+  }
+
   formatResult(result, re) {
-    if (re.test(result)) {
+    if (re && re.test(result)) {
       return result.replace(re, (a) => chalk.bold(a));
     } else {
       return result;
     }
   }
 
+  formatDate(ts) {
+    let dateArray = Crypto.fromTsToDate(ts);
+    let date = dateArray[0].split("Z")[0].split("T")[0]; // Get YYYY-MM-DD format
+    return chalk.cyan(date);
+  }
+
   formatIndex(len, i) {
     return " ".repeat(len.toString().length - i.toString().length) + i;
   }
 
   formatList(list, options) {
-    let re = Node.getFindRe(options);
+    let re = options.name ? Node.getFindRe(options) : null;
     let i = 0;
     const setCache = (i, e) => {
       this.prompt.setCache("findResult", i, e);
@@ -159,7 +366,7 @@ class Find extends require("../Command") {
         let l = p.length;
         let c = p[l - 1] ? p[l - 1] : p[l - 2];
         if (e[2] && e[2] !== c) {
-          e[2] = this.formatResult(e[2], re, options.name);
+          e[2] = re ? this.formatResult(e[2], re, options.name) : e[2];
         } else {
           e[2] = undefined;
         }
@@ -169,13 +376,29 @@ class Find extends require("../Command") {
           "  ",
           chalk.yellow(e[0]),
           "  ",
-          this.formatResult(e[1], re, options.name),
+          re ? this.formatResult(e[1], re, options.name) : e[1],
           "  ",
           e[2],
         ].join("");
       } else {
         setCache(i, e);
-        return [k, "  ", this.formatResult(e[1], re, options.name)].join("");
+        // In recent mode, show date before the path
+        if (options.recent && e.ts) {
+          let dateStr = this.formatDate(e.ts);
+          return [
+            k,
+            "  ",
+            dateStr,
+            "  ",
+            re ? this.formatResult(e[1], re, options.name) : e[1],
+          ].join("");
+        } else {
+          return [
+            k,
+            "  ",
+            re ? this.formatResult(e[1], re, options.name) : e[1],
+          ].join("");
+        }
       }
     });
   }
@@ -186,8 +409,8 @@ class Find extends require("../Command") {
     }
     try {
       this.validate(options);
-      options.name = options.keywords;
-      if (options.name) {
+      // In recent mode, keywords are ignored - just show recent entries
+      if (options.recent) {
         try {
           this.lastResult = await this.find(options);
           let list = this.formatList(this.lastResult, options);
@@ -203,7 +426,26 @@ class Find extends require("../Command") {
           this.Logger.red(e.message);
         }
       } else {
-        this.Logger.grey("Missing parameters");
+        // Regular find mode requires keywords
+        options.name = options.keywords;
+        if (options.name) {
+          try {
+            this.lastResult = await this.find(options);
+            let list = this.formatList(this.lastResult, options);
+            if (list && list.length) {
+              this.Logger.grey(
+                `${list.length} result${list.length > 1 ? "s" : ""} found:`
+              );
+              for (let l of list) this.Logger.reset(l);
+            } else {
+              this.Logger.grey("No results.");
+            }
+          } catch (e) {
+            this.Logger.red(e.message);
+          }
+        } else {
+          this.Logger.grey("Missing parameters");
+        }
       }
     } catch (e) {
       this.Logger.red(e.message);

package/src/commands/Git.js

@@ -1,5 +1,5 @@
 const chalk = require("chalk");
-const { yamlStringify } = require("@secrez/utils");
+const { yamlStringify, execAsync } = require("@secrez/utils");
 
 class Git extends require("../Command") {
   setHelpAndCompletion() {
@@ -19,13 +19,26 @@ class Git extends require("../Command") {
         alias: "s",
         type: Boolean,
       },
+      {
+        name: "push",
+        alias: "p",
+        type: Boolean,
+      },
     ];
   }
 
   help() {
     return {
-      description: ["Check a git repository status."],
-      examples: [["git -s", "Check the git repository status"]],
+      description: [
+        "Check a git repository status or push current changes and update the fingerprint.",
+      ],
+      examples: [
+        ["git -s", "Check the git repository status"],
+        [
+          "git -p",
+          "Stage, commit (if needed), push changes, and update the fingerprint",
+        ],
+      ],
     };
   }
 
@@ -40,6 +53,46 @@ class Git extends require("../Command") {
           return chalk.yellow(warning);
         } else return "No remote changes found.";
       }
+      if (options.push) {
+        const containerPath = this.secrez.config.container;
+        // Get current status to know what to do
+        const status = await this.internalFs.gitConflictChecker.getGitStatus();
+        if (status && status.error) {
+          return chalk.red(`Git status error: ${status.error}`);
+        }
+
+        // No changes and not ahead: nothing to push
+        if ((status?.uncommitted || 0) === 0 && (status?.ahead || 0) === 0) {
+          return "No changes in the repository";
+        }
+
+        // If there are uncommitted changes, stage and commit
+        if (status && status.uncommitted > 0) {
+          const addRes = await execAsync("git", containerPath, ["add", "-A"]);
+          if (addRes && addRes.error) {
+            return chalk.red(`git add failed: ${addRes.error}`);
+          }
+          const commitRes = await execAsync("git", containerPath, [
+            "commit",
+            "-m",
+            "Secrez: save changes",
+          ]);
+          if (commitRes && commitRes.error) {
+            return chalk.red(`git commit failed: ${commitRes.error}`);
+          }
+        }
+
+        // Try to push (even if there were no new commits but local might be ahead)
+        const pushRes = await execAsync("git", containerPath, ["push"]);
+        if (pushRes && pushRes.error) {
+          return chalk.red(`git push failed: ${pushRes.error}`);
+        }
+
+        // Update the initial fingerprint so Secrez won't block further operations in this session
+        await this.internalFs.gitConflictChecker.captureInitialState();
+
+        return "Pushed successfully. Fingerprint updated.";
+      }
     } else {
       return "Not a git repository";
     }