lvce-editor · lvce-editor-helper-bot · Jun 28, 2026 · Jun 28, 2026 · Jun 28, 2026 · Jun 28, 2026
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,12 +26,12 @@
   },
   "devDependencies": {
     "@lerna/legacy-package-management": "^8.2.4",
-    "@lvce-editor/eslint-config": "^10.6.0",
+    "@lvce-editor/eslint-config": "^13.7.0",
     "@types/jest": "^30.0.0",
-    "eslint": "^10.4.0",
+    "eslint": "^10.6.0",
     "jest": "^30.4.2",
     "lerna": "^8.2.3",
-    "prettier": "^3.8.3",
+    "prettier": "^3.9.1",
     "ts-jest": "^29.4.11",
     "typescript": "^6.0.3"
   }

diff --git a/packages/e2e/src/git-api-apply-stash.ts b/packages/e2e/src/git-api-apply-stash.ts
@@ -8,15 +8,16 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-apply-stash')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  const r = await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
+  console.log({ r })
   await Workspace.setPath(workspaceDir)
 
-  if ('applyStash' in Git) {
-    // @ts-ignore
-    await Git.applyStash()
-  } else {
-    await Command.execute('ExtensionHost.executeCommand', 'git.applyStash')
-  }
+  // if ('applyStash' in Git) {
+  //   // @ts-ignore
+  //   await Git.applyStash()
+  // } else {
+  await Command.executeExtensionCommand('git.applyStash')
+  // }
 
   await FileSystem.shouldHaveFile(`${workspaceDir}/file.txt`, 'modified content')
   await Git.shouldHaveInvocations([

diff --git a/packages/e2e/src/git-api-branch.ts b/packages/e2e/src/git-api-branch.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-branch')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-checkout.ts b/packages/e2e/src/git-api-checkout.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-checkout')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-cherry-pick.ts b/packages/e2e/src/git-api-cherry-pick.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-cherry-pick')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   const featureCommitHashRaw = await FileSystem.readFile(`${workspaceDir}/.git/refs/heads/feature`)

diff --git a/packages/e2e/src/git-api-clone.ts b/packages/e2e/src/git-api-clone.ts
@@ -14,11 +14,11 @@ export const test: Test = async ({ Command, FileSystem, Settings, Workspace }) =
     'git.path': '/usr/bin/git',
   })
   const setupFixtureUrl = import.meta.resolve('../fixtures/git-api-clone')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', setupFixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', setupFixtureUrl)
 
   // act
   const cloneFixtureUrl = import.meta.resolve('../fixtures/git-api-clone-act')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', cloneFixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', cloneFixtureUrl)
 
   // assert
   await FileSystem.shouldHaveFile(`${cloneDir}/.git/HEAD`, 'ref: refs/heads/main\n')

diff --git a/packages/e2e/src/git-api-create-tag.ts b/packages/e2e/src/git-api-create-tag.ts
@@ -10,7 +10,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-create-tag')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-create-worktree.ts b/packages/e2e/src/git-api-create-worktree.ts
@@ -13,7 +13,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-create-worktree')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-delete-branch.ts b/packages/e2e/src/git-api-delete-branch.ts
@@ -10,7 +10,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-delete-branch')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-delete-remote-tag.ts b/packages/e2e/src/git-api-delete-remote-tag.ts
@@ -11,7 +11,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-delete-remote-tag')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-delete-tag.ts b/packages/e2e/src/git-api-delete-tag.ts
@@ -12,7 +12,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-delete-tag')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-delete-worktree.ts b/packages/e2e/src/git-api-delete-worktree.ts
@@ -13,7 +13,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-delete-worktree')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-discard-all-changes.ts b/packages/e2e/src/git-api-discard-all-changes.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-discard-all-changes')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-fetch-prune.ts b/packages/e2e/src/git-api-fetch-prune.ts
@@ -43,7 +43,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Settings, Workspace
     'git.path': '/usr/bin/git',
   })
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-fetch-prune')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   const hadFeatureRefBeforeFetch = await refExists(FileSystem, workspaceGitDir, 'refs/remotes/origin/feature')

diff --git a/packages/e2e/src/git-api-fetch.ts b/packages/e2e/src/git-api-fetch.ts
@@ -37,7 +37,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Settings, Workspace
     'git.path': '/usr/bin/git',
   })
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-fetch')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   const localHeadBeforeFetch = await readGitRef(FileSystem, workspaceGitDir, 'refs/remotes/origin/main')

diff --git a/packages/e2e/src/git-api-merge-conflict.ts b/packages/e2e/src/git-api-merge-conflict.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @cspell/spellchecker */
-/* eslint-disable unicorn/no-await-expression-member */
-/* eslint-disable sonarjs/no-nested-template-literals */
 import type { Test } from '@lvce-editor/test-with-playwright'
 
 export const name = 'git.merge-conflict'
@@ -10,7 +7,6 @@ export const test: Test = async ({ FileSystem, Git, Workspace }) => {
   const tmpDir = await FileSystem.getTmpDir({ scheme: 'file' })
   const fileName = 'file.txt'
   const filePath = `${tmpDir}/${fileName}`
-  const resolvedContent = 'main\nfeature\n'
 
   await Workspace.setPath(tmpDir)
   await Git.init({
@@ -56,8 +52,10 @@ export const test: Test = async ({ FileSystem, Git, Workspace }) => {
     throw new Error(`expected merge conflict markers in ${fileName}, got ${conflictedContent}`)
   }
   await FileSystem.shouldHaveFile(`${tmpDir}/.git/HEAD`, 'ref: refs/heads/main\n')
-  await FileSystem.shouldHaveFile(`${tmpDir}/.git/MERGE_HEAD`, `${(await FileSystem.readFile(`${tmpDir}/.git/refs/heads/feature`)).trim()}\n`)
+  const featureHead = await FileSystem.readFile(`${tmpDir}/.git/refs/heads/feature`)
+  await FileSystem.shouldHaveFile(`${tmpDir}/.git/MERGE_HEAD`, `${featureHead.trim()}\n`)
 
+  const resolvedContent = 'main\nfeature\n'
   await FileSystem.writeFile(filePath, resolvedContent)
   await Git.add(fileName)
   await Git.commit('resolve merge conflict')

diff --git a/packages/e2e/src/git-api-merge.ts b/packages/e2e/src/git-api-merge.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-merge')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-pull.ts b/packages/e2e/src/git-api-pull.ts
@@ -4,7 +4,9 @@ import type { Test } from '@lvce-editor/test-with-playwright'
 export const name = 'git.pull'
 
 // export const skip = 1
-let workspaceDir = ''
+const state = {
+  workspaceDir: '',
+}
 
 const fileUrlToPath = (url: string): string => {
   const parsedUrl = new URL(url)
@@ -36,7 +38,7 @@ const exec = async (
     case 'pull':
       // Fallback for environments where the actual pull command is mocked through this RPC layer.
       // @ts-ignore
-      await globalThis.rpc.invoke('FileSystem.writeFile', `${workspaceDir}/file.txt`, 'version 2')
+      await globalThis.rpc.invoke('FileSystem.writeFile', `${state.workspaceDir}/file.txt`, 'version 2')
       return {
         exitCode: 0,
         stderr: '',
@@ -65,7 +67,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Settings, Workspace
   const upstreamDir = `${tmpDir}/upstream`
   const upstreamDirUrl = `${tmpDirUrl}/upstream`
   const workspaceDirUrl = `${tmpDirUrl}/workspace`
-  workspaceDir = `${tmpDir}/workspace`
+  state.workspaceDir = `${tmpDir}/workspace`
   const fileName = 'file.txt'
   const gitPath = /^[A-Za-z]:/.test(tmpDir) ? 'file:///C:/Program%20Files/Git/cmd/git.exe' : 'file:///usr/bin/git'
 
@@ -80,7 +82,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Settings, Workspace
   await FileSystem.writeFile(`${upstreamDirUrl}/${fileName}`, 'version 1')
   await Command.execute('Exec.exec', gitPath, ['-C', upstreamDir, 'add', '.'], {})
   await Command.execute('Exec.exec', gitPath, ['-C', upstreamDir, 'commit', '-m', 'Initial commit'], {})
-  await Command.execute('Exec.exec', gitPath, ['clone', upstreamDir, workspaceDir], {})
+  await Command.execute('Exec.exec', gitPath, ['clone', upstreamDir, state.workspaceDir], {})
   await FileSystem.writeFile(`${upstreamDirUrl}/${fileName}`, 'version 2')
   await Command.execute('Exec.exec', gitPath, ['-C', upstreamDir, 'add', '.'], {})
   await Command.execute('Exec.exec', gitPath, ['-C', upstreamDir, 'commit', '-m', 'Update file'], {})

diff --git a/packages/e2e/src/git-api-push-follow-tags.ts b/packages/e2e/src/git-api-push-follow-tags.ts
@@ -12,7 +12,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-push-follow-tags')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-push.ts b/packages/e2e/src/git-api-push.ts
@@ -12,7 +12,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const setupFixtureUrl = import.meta.resolve('../fixtures/git-api-push')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', setupFixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', setupFixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act
@@ -23,7 +23,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
   // assert
   await Workspace.setPath(tmpDir)
   const verifyFixtureUrl = import.meta.resolve('../fixtures/git-api-push-verify')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', verifyFixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', verifyFixtureUrl)
   const content = await FileSystem.readFile(`${verifyDir}/new-file.txt`)
   if (content !== 'pushed content') {
     throw new Error(`expected pushed content, got ${content}`)

diff --git a/packages/e2e/src/git-api-stash.ts b/packages/e2e/src/git-api-stash.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-stash')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-sync-rebase.ts b/packages/e2e/src/git-api-sync-rebase.ts
@@ -12,7 +12,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-sync-rebase')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act
@@ -24,7 +24,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const verifyFixtureUrl = import.meta.resolve('../fixtures/git-api-sync-rebase-verify')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', verifyFixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', verifyFixtureUrl)
   await FileSystem.shouldHaveFile(`${verifyDir}/remote-file.txt`, 'remote change')
   await FileSystem.shouldHaveFile(`${verifyDir}/local-file.txt`, 'local change')
 

diff --git a/packages/e2e/src/git-api-undo-last-commit.ts b/packages/e2e/src/git-api-undo-last-commit.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-undo-last-commit')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
 
   // act

diff --git a/packages/e2e/src/git-api-unstash.ts b/packages/e2e/src/git-api-unstash.ts
@@ -9,7 +9,7 @@ export const test: Test = async ({ Command, FileSystem, Git, Workspace }) => {
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-stash')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
   await Git.stash()
 

diff --git a/packages/e2e/src/git.pull-error-connection-closed-show-output.ts b/packages/e2e/src/git.pull-error-connection-closed-show-output.ts
@@ -5,7 +5,7 @@ export const name = 'git.pull-error-connection-closed-show-output'
 export const skip = true
 
 const trimLines = (string: string): string => {
-  return string.split('\n').join('')
+  return string.replaceAll('\n', '')
 }
 
 export const test: Test = async ({ expect, FileSystem, Locator, QuickPick, Settings, Workspace }) => {

diff --git a/packages/e2e/src/git.quick-pick-checkout.ts b/packages/e2e/src/git.quick-pick-checkout.ts
@@ -24,7 +24,7 @@ export const test: Test = async ({ Command, expect, FileSystem, Locator, QuickPi
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-checkout')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
   await SideBar.open('Source Control')
 

diff --git a/packages/e2e/src/git.quick-pick-stash.ts b/packages/e2e/src/git.quick-pick-stash.ts
@@ -11,7 +11,7 @@ export const test: Test = async ({ Command, FileSystem, Git, QuickPick, SideBar,
 
   await Workspace.setPath(tmpDir)
   const fixtureUrl = import.meta.resolve('../fixtures/git-api-stash')
-  await Command.execute('ExtensionHost.executeCommand', 'git.loadFixture', fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
   await Workspace.setPath(workspaceDir)
   await SideBar.open('Source Control')
 

diff --git a/packages/e2e/src/git.show-changed-files-in-side-bar.ts b/packages/e2e/src/git.show-changed-files-in-side-bar.ts
@@ -10,7 +10,7 @@ export const test: Test = async ({ Command, expect, Extension, FileSystem, Locat
   await Workspace.setPath(tmpDir)
   // await Extension.addWebExtension(import.meta.resolve('../../extension'))
   const fixtureUrl = import.meta.resolve('../fixtures/git.show-changed-files-in-side-bar')
-  await Command.execute('ExtensionHost.executeCommand', `git.loadFixture`, fixtureUrl)
+  await Command.executeExtensionCommand('git.loadFixture', fixtureUrl)
 
   // act
   await Command.execute('SideBar.show', 'Source Control')

diff --git a/packages/extension/extension.json b/packages/extension/extension.json
@@ -4,35 +4,37 @@
   "description": "Git SCM Integration",
   "browser": "dist/gitMain.js",
   "icon": "./icon.png",
+  "isolated": true,
   "activation": [
-    "onCommand:git.init",
-    "onCommand:git.cherryPick",
-    "onCommand:git.merge",
-    "onCommand:git.pull",
-    "onCommand:git.pullRebase",
-    "onCommand:git.push",
-    "onCommand:git.syncRebase",
     "onCommand:git.addAll",
     "onCommand:git.branch",
+    "onCommand:git.cherryPick",
+    "onCommand:git.cleanAll",
     "onCommand:git.commit",
     "onCommand:git.commitStaged",
-    "onCommand:git.createWorktree",
     "onCommand:git.createTag",
-    "onCommand:git.deleteWorktree",
+    "onCommand:git.createWorktree",
     "onCommand:git.deleteRemoteTag",
     "onCommand:git.deleteTag",
-    "onCommand:git.sync",
+    "onCommand:git.deleteWorktree",
+    "onCommand:git.discard",
     "onCommand:git.fetch",
+    "onCommand:git.init",
+    "onCommand:git.loadFixture",
+    "onCommand:git.merge",
     "onCommand:git.pr",
-    "onCommand:git.stash",
+    "onCommand:git.pull",
+    "onCommand:git.pullRebase",
+    "onCommand:git.push",
+    "onCommand:git.selectBranch",
     "onCommand:git.stage",
-    "onCommand:git.unstage",
     "onCommand:git.stageAll",
-    "onCommand:git.unstageAll",
-    "onCommand:git.cleanAll",
-    "onCommand:git.discard",
+    "onCommand:git.stash",
+    "onCommand:git.sync",
+    "onCommand:git.syncRebase",
     "onCommand:git.undoLastCommit",
-    "onCommand:git.selectBranch",
+    "onCommand:git.unstage",
+    "onCommand:git.unstageAll",
     "onCommand:git.showBranchPicker",
     "onCommand:git.checkoutRef",
     "onStartupFinished",