fix(terminal): commit Sogou Shift latin in the Electron TUI

config/patches/xterm-src/@xterm__xterm@6.1.0-beta.303.src.patch

@@ -88,7 +88,7 @@ index 497afcf535f3eaca00889525a77e15eb633ccd96..96d499b34605f860608382114c3fbdc0
 
  export interface IBrowser {
 diff --git a/src/browser/input/CompositionHelper.ts b/src/browser/input/CompositionHelper.ts
-index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee3acfddfa 100644
+index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..b2d99074a17a2197fc50091a1a2f760c27ece99f 100644
 --- a/src/browser/input/CompositionHelper.ts
 +++ b/src/browser/input/CompositionHelper.ts
 @@ -1,10 +1,15 @@
@@ -413,7 +413,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
    }
 
    /**
-@@ -113,7 +313,19 @@ export class CompositionHelper {
+@@ -113,14 +313,32 @@ export class CompositionHelper {
     * @returns Whether the Terminal should continue processing the keydown event.
     */
    public keydown(ev: KeyboardEvent): boolean {
@@ -434,21 +434,42 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
        if (ev.keyCode === 20 || ev.keyCode === 229) {
          // 20 is CapsLock, 229 is Enter
          // Continue composing if the keyCode is the "composition character"
-@@ -128,6 +340,10 @@ export class CompositionHelper {
++        if (this._isImeModeToggleShift(ev)) {
++          this._imeKeydownAwaitingCommit = true;
++        }
+         return false;
+       }
+       if (ev.keyCode === 16 || ev.keyCode === 17 || ev.keyCode === 18) {
+         // Continue composing if the keyCode is a modifier key
++        if (this._isImeModeToggleShift(ev)) {
++          this._imeKeydownAwaitingCommit = true;
++        }
+         return false;
+       }
+       // Finish composition immediately. This is mainly here for the case where enter is
+@@ -128,6 +346,10 @@ export class CompositionHelper {
        this._finalizeComposition(false);
      }
 
 +    // Nothing is forwarded for a keydown the IME consumed, so it is left owing its commit; any
 +    // other keydown either forwards its own text or produces none, and clears the debt.
-+    this._imeKeydownAwaitingCommit = ev.keyCode === 229;
++    this._imeKeydownAwaitingCommit = ev.keyCode === 229 || this._isImeModeToggleShift(ev);
 +
      if (ev.keyCode === 229) {
        // If the "composition character" is used but gets to this point it means a non-composition
        // character (eg. numbers and punctuation) was pressed when the IME was active.
-@@ -138,6 +354,74 @@ export class CompositionHelper {
-     return true;
-   }
+@@ -135,6 +357,79 @@ export class CompositionHelper {
+       return false;
+     }
 
++    if (this._isImeModeToggleShift(ev)) {
++      // Consume idle/trailing Shift so kitty cannot encode it; the custom handler
++      // must still deliver the keydown or Sogou's delayed insertText is dropped.
++      return false;
++    }
++    return true;
++  }
++
 +  /**
 +   * Defers keypress text while a composition finalizer is pending so all input is emitted once
 +   * after reconciliation with the final textarea candidate.
@@ -514,13 +535,10 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 +      this._textareaChangeTimer = undefined;
 +    }
 +    this._coreService.triggerDataEvent(text, true);
-+    return true;
-+  }
-+
-   /**
-    * Finalizes the composition, resuming regular input actions. This is called when a composition
-    * is ending.
-@@ -146,23 +430,52 @@ export class CompositionHelper {
+     return true;
+   }
+
+@@ -146,23 +441,52 @@ export class CompositionHelper {
     *   compositionend event is triggered, such as enter, so that the composition is sent before
     *   the command is executed.
     */
@@ -584,7 +602,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 
        // Since composition* events happen before the changes take place in the textarea on most
        // browsers, use a setTimeout with 0ms time to allow the native compositionend event to
-@@ -172,37 +485,315 @@ export class CompositionHelper {
+@@ -172,37 +496,339 @@ export class CompositionHelper {
        // - The last compositionupdate event's data property does not always accurately describe
        //   the character, a counter example being Korean where an ending consonsant can move to
        //   the following character if the following input is a vowel.
@@ -613,17 +631,39 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 -          }
 -          if (input.length > 0) {
 -            this._coreService.triggerDataEvent(input, true);
--          }
 +      pending.finalizerTimer = this._defer(() => {
 +        pending.finalizerTimer = undefined;
 +        if (this._compositionTransactionId === pending.transactionId) {
 +          this._isAwaitingCompositionEnd = false;
 +        }
 +        if (this._pendingComposition === pending) {
++          if (this._shouldWaitForHeldImeCommit(pending)) {
++            return;
+           }
 +          this._sendPendingComposition(pending, true);
-+        }
+         }
+-      }, 0);
 +      });
-+    }
+     }
+   }
+
++  /** Physical Shift used by Windows IMEs (Sogou) to commit pinyin as Latin. */
++  private _isImeModeToggleShift(ev: KeyboardEvent): boolean {
++    return ev.keyCode === 16 || (typeof ev.code === 'string' && ev.code.startsWith('Shift'));
++  }
++
++  /**
++   * Windows/Sogou Shift-to-English ends the composition with empty data while the Process key
++   * is still down, then delivers the latin commit as a later insertText. Flushing the empty
++   * textarea on this tick would drop that commit.
++   */
++  private _shouldWaitForHeldImeCommit(pending: IPendingComposition): boolean {
++    return (
++      pending.expectsPostCompositionInput &&
++      this._imeKeydownAwaitingCommit &&
++      pending.inputData.length === 0 &&
++      this._getPendingTextareaInput(pending, true).length === 0
++    );
 +  }
 +
 +  private _sendPendingComposition(
@@ -765,6 +805,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 +    this._pendingComposition = undefined;
 +    this._isAwaitingCompositionEnd = false;
 +    this._isComposing = false;
++    this._imeKeydownAwaitingCommit = false;
 +    this._compositionView.classList.remove('active');
 +    this._resetCompositionView();
 +    this._textarea.value =
@@ -813,18 +854,17 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 +          id: pending.transactionId,
 +          data: input,
 +          dataPendingReconciliation: true
-         }
--      }, 0);
++        }
 +      }
 +    ));
 +  }
 +
 +  private _dispatchCompositionSessionEvent(event: CustomEvent): void {
 +    if (typeof this._textarea.dispatchEvent === 'function') {
 +      this._textarea.dispatchEvent(event);
-     }
-   }
- 
++    }
++  }
++
 +  private _dispatchCompositionTransactionSettled(): void {
 +    this._dispatchCompositionSessionEvent(new CustomEvent(
 +      'xterm-composition-transaction-settled',
@@ -883,7 +923,8 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
 +      if (
 +        this._isComposing &&
 +        this._compositionTransactionId === transactionId &&
-+        this._composedRegionLength() === 0
++        this._composedRegionLength() === 0 &&
++        !this._imeKeydownAwaitingCommit
 +      ) {
 +        this._cancelComposition();
 +      }
@@ -927,7 +968,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
    /**
     * Apply any changes made to the textarea after the current event chain is allowed to complete.
     * This should be called when not currently composing but a keydown event with the "composition
-@@ -222,6 +813,9 @@ export class CompositionHelper {
+@@ -222,6 +848,9 @@ export class CompositionHelper {
 
          const diff = newValue.replace(oldValue, '');
 
@@ -937,7 +978,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
          this._dataAlreadySent = diff;
 
          if (newValue.length > oldValue.length) {
-@@ -236,6 +830,105 @@ export class CompositionHelper {
+@@ -236,6 +865,105 @@ export class CompositionHelper {
      }, 0);
    }
 
@@ -1043,7 +1084,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
    /**
     * Positions the composition view on top of the cursor and the textarea just below it (so the
     * IME helper dialog is positioned correctly).
-@@ -243,10 +936,23 @@ export class CompositionHelper {
+@@ -243,10 +971,23 @@ export class CompositionHelper {
     *   necessary as the IME events across browsers are not consistently triggered.
     */
    public updateCompositionElements(dontRecurse?: boolean): void {
@@ -1068,7 +1109,7 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..4d62369d0005f465318ec93e221fd3ee
      if (this._bufferService.buffer.isCursorInViewport) {
        const cursorX = Math.min(this._bufferService.buffer.x, this._bufferService.cols - 1);
 
-@@ -254,31 +960,156 @@ export class CompositionHelper {
+@@ -254,31 +995,156 @@ export class CompositionHelper {
        const cursorTop = this._bufferService.buffer.y * this._renderService.dimensions.css.cell.height;
        const cursorLeft = cursorX * this._renderService.dimensions.css.cell.width;
 

config/scripts/regenerate-xterm-patches.mjs

@@ -21,10 +21,13 @@ import {
   CHECKOUT_DIFF_FLAGS,
   PNPM_DIFF_FLAGS,
   assertSourceDerivationsAgree,
+  commonParent,
   escapeRegExp,
   formatCheckFailure,
+  posixRelative,
   normalizePnpmDiff,
-  pnpmDiffEnvironment
+  pnpmDiffEnvironment,
+  withoutGitRepositoryLocation
 } from './xterm-patch-text.mjs'
 
 const DEFAULT_REPO_ROOT = path.resolve(import.meta.dirname, '..', '..')
@@ -166,12 +169,16 @@ const WINDOWS_SHIM_COMMANDS = new Set(['npm', 'npx', 'pnpm', 'yarn'])
 
 function run(command, args, options = {}) {
   const shim = process.platform === 'win32' && WINDOWS_SHIM_COMMANDS.has(command)
+  const { env: providedEnv, ...rest } = options
+  const env =
+    command === 'git' ? withoutGitRepositoryLocation(providedEnv ?? process.env) : providedEnv
   return execFileSync(shim ? `${command}.cmd` : command, args, {
     encoding: 'utf8',
     maxBuffer: 256 * 1024 * 1024,
     stdio: ['ignore', 'pipe', 'inherit'],
     shell: shim,
-    ...options
+    ...rest,
+    ...(env ? { env } : {})
   })
 }
 
@@ -228,6 +235,14 @@ function ensureUpstreamCheckout(manifest, workDir) {
   }
   run('git', ['checkout', '--quiet', '--detach', commit], { cwd: root })
   run('git', ['reset', '--quiet', '--hard', commit], { cwd: root })
+  // Why: upstream's `* text=auto` smudges CRLF on Windows. A later
+  // `checkout --force` leaves those files in place because Git still
+  // considers them clean, so drop the index and reset after disabling text.
+  const localAttributes = path.join(root, '.git', 'info', 'attributes')
+  mkdirSync(path.dirname(localAttributes), { recursive: true })
+  writeFileSync(localAttributes, '* -text\n')
+  run('git', ['rm', '-r', '--quiet', '--cached', '.'], { cwd: root })
+  run('git', ['reset', '--quiet', '--hard', commit], { cwd: root })
   return root
 }
 
@@ -277,7 +292,7 @@ function assertPristineSourceMatches(pristineDir, upstreamRoot, packageEntry) {
   const sourceRoot = path.join(pristineDir, 'src')
   const drifted = listFilesRelative(sourceRoot)
     .map((relative) => path.join('src', relative))
-    .filter((relative) => relative !== stampFile)
+    .filter((relative) => !stampFile || toPosix(relative) !== toPosix(stampFile))
     .filter(
       (relative) =>
         !sameBytes(
@@ -356,9 +371,13 @@ function overlayBuildOutput(pristineDir, upstreamRoot, packageEntry, destination
 }
 
 function diffFolders(folderA, folderB) {
+  const cwd = commonParent(folderA, folderB)
+  const relA = posixRelative(cwd, folderA)
+  const relB = posixRelative(cwd, folderB)
   let stdout
   try {
-    stdout = execFileSync('git', [...PNPM_DIFF_FLAGS, folderA, folderB], {
+    stdout = execFileSync('git', [...PNPM_DIFF_FLAGS, relA, relB], {
+      cwd,
       encoding: 'utf8',
       maxBuffer: 512 * 1024 * 1024,
       env: pnpmDiffEnvironment(),
@@ -371,7 +390,7 @@ function diffFolders(folderA, folderB) {
     }
     stdout = error.stdout
   }
-  return normalizePnpmDiff(stdout, folderA, folderB)
+  return normalizePnpmDiff(stdout, relA, relB)
 }
 
 /** The source of truth for the hand-written half: what the checkout itself holds. */

config/scripts/regenerate-xterm-patches.test.mjs

@@ -20,10 +20,12 @@ import {
   CHECKOUT_DIFF_FLAGS,
   PNPM_DIFF_FLAGS,
   assertSourceDerivationsAgree,
+  commonParent,
   firstDifferenceIndex,
   formatCheckFailure,
   normalizePnpmDiff,
   pnpmDiffEnvironment,
+  posixRelative,
   selectPatchEntries,
   sourceHunks,
   splitPatchEntries
@@ -66,9 +68,13 @@ async function writeTree(root, files) {
 
 /** The three exported diff pieces, composed the way the generator composes them. */
 function diffFolders(folderA, folderB) {
+  const cwd = commonParent(folderA, folderB)
+  const relA = posixRelative(cwd, folderA)
+  const relB = posixRelative(cwd, folderB)
   let stdout
   try {
-    stdout = execFileSync('git', [...PNPM_DIFF_FLAGS, folderA, folderB], {
+    stdout = execFileSync('git', [...PNPM_DIFF_FLAGS, relA, relB], {
+      cwd,
       encoding: 'utf8',
       env: pnpmDiffEnvironment(),
       stdio: ['ignore', 'pipe', 'pipe']
@@ -79,7 +85,7 @@ function diffFolders(folderA, folderB) {
     }
     stdout = error.stdout
   }
-  return normalizePnpmDiff(stdout, folderA, folderB)
+  return normalizePnpmDiff(stdout, relA, relB)
 }
 
 const PRISTINE = {
@@ -128,6 +134,25 @@ describe('pnpm diff format', () => {
     })
   })
 
+  it('strips Git repository-location variables so cwd-targeted git cannot rewrite the caller', () => {
+    const environment = pnpmDiffEnvironment({
+      PATH: '/usr/bin',
+      GIT_DIR: '/other/repo/.git',
+      GIT_WORK_TREE: '/other/repo',
+      GIT_INDEX_FILE: '/tmp/index'
+    })
+    expect(environment.GIT_DIR).toBeUndefined()
+    expect(environment.GIT_WORK_TREE).toBeUndefined()
+    expect(environment.GIT_INDEX_FILE).toBeUndefined()
+    expect(environment.GIT_CONFIG_NOSYSTEM).toBe('1')
+  })
+
+  it('returns the filesystem root when it is the only shared directory', () => {
+    expect(commonParent('/left', '/right', path.posix)).toBe('/')
+    expect(commonParent('C:\\left', 'C:\\right', path.win32)).toBe('C:\\')
+    expect(commonParent('/tmp/a', '/tmp/b', path.posix)).toBe('/tmp')
+  })
+
   it('strips both scratch folder prefixes from headers and index lines', async () => {
     const root = await createDirectory()
     const folderA = path.join(root, 'pristine')
@@ -216,7 +241,11 @@ describe('round-trip stability', () => {
     await writeTree(replay, PRISTINE)
     const patchFile = path.join(root, 'round-trip.patch')
     await writeFile(patchFile, patch)
-    execFileSync('git', ['apply', '-p1', '--whitespace=nowarn', patchFile], { cwd: replay })
+    execFileSync(
+      'git',
+      ['-c', 'core.autocrlf=false', 'apply', '-p1', '--whitespace=nowarn', patchFile],
+      { cwd: replay }
+    )
 
     expect(await readFile(path.join(replay, 'lib/widget.js'), 'utf8')).toBe(
       PATCHED['lib/widget.js']
@@ -235,7 +264,11 @@ describe('round-trip stability', () => {
 
     const replay = path.join(root, 'replay')
     await writeTree(replay, PRISTINE)
-    execFileSync('git', ['apply', '-p1', '--whitespace=nowarn', patchFile], { cwd: replay })
+    execFileSync(
+      'git',
+      ['-c', 'core.autocrlf=false', 'apply', '-p1', '--whitespace=nowarn', patchFile],
+      { cwd: replay }
+    )
 
     expect(await readFile(path.join(replay, 'src/Widget.ts'), 'utf8')).toBe(
       PATCHED['src/Widget.ts']