From 3b7c1c99da5e581d5c5efcc6459ee9dc6e04bceb Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 Aug 2025 09:46:40 +0000
Subject: [PATCH 1/2] Initial plan


From 9114b439daca2be5b7ae1fafb9b8363a4e00100d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 Aug 2025 09:53:44 +0000
Subject: [PATCH 2/2] Add completion time and commit hash display to dev ps and
 mergeto commands

Co-authored-by: echosoar <14832743+echosoar@users.noreply.github.com>
---
 packages/dev/src/git.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/dev/src/git.ts b/packages/dev/src/git.ts
index c01cde9..ff2de55 100644
--- a/packages/dev/src/git.ts
+++ b/packages/dev/src/git.ts
@@ -318,7 +318,13 @@ export class GitPlugin extends BasePlugin {
     spin.start();
     await exec(`git push ${this.gitInfo.remoteName} ${this.gitInfo.currenBranch}`);
     spin.stop();
+    
+    // Get current commit info after push
+    await this.getCurrentGitInfo();
+    const completionTime = time();
     console.log('Push success');
+    console.log(`Completion time: ${completionTime}`);
+    console.log(`Commit hash: ${this.gitInfo.lastCommitId}`);
   }
 
   async handleStatusDo() {
@@ -647,6 +653,13 @@ export class GitPlugin extends BasePlugin {
 
       await exec(`git checkout ${currentBranch}`);
       console.log('4. Switch back to the original branch:', currentBranch);
+      
+      // Get current commit info after merge operation
+      await this.getCurrentGitInfo();
+      const completionTime = time();
+      console.log(`Merge operation completed`);
+      console.log(`Completion time: ${completionTime}`);
+      console.log(`Commit hash: ${this.gitInfo.lastCommitId}`);
     } catch (error) {
       console.error('Merge conflict detected. Please resolve the conflicts and commit the changes.');
     }