Jinjing 527c692b71 Improve git pull on remote (#8524) ...

* Fall back to a merge when a divergent pull has no reconciliation strateg

- Git 2.27+ refuses `git pull` on divergent branches unless pull.rebase or
  pull.ff is configured. Retry with `--no-rebase` (Git's historical default)
  so pulls succeed out of the box on fresh hosts.
- Skip the fallback whenever the caller already specified a reconciliation
  strategy (e.g. --ff-only, --rebase) so explicit policies still fail as
  expected on divergence.
- Applied identically in the local git pull path and the relay/SSH git
  handler so both surfaces behave the same way.

* Refactor divergent-pull merge fallback into shared helper

Extracts the retry-as-merge logic (duplicated between local git and
relay SSH pull paths) into `runPullWithDivergenceFallback` in
git-remote-error.ts, so both callers share one implementation and
test coverage.

2026-07-13 12:42:55 -07:00

..

agent-exec-handler-test-harness.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

agent-exec-handler-windows.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

agent-exec-handler.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

agent-exec-handler.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

agent-hook-integration.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

agent-hook-server.test.ts

fix(grok): clipboard, native chat, hooks, sessions, ConPTY KKP (#7944)

2026-07-10 13:16:55 -07:00

agent-hook-server.ts

fix(grok): clipboard, native chat, hooks, sessions, ConPTY KKP (#7944)

2026-07-10 13:16:55 -07:00

client-request-aborts.ts

fix: abort relay requests on dispatcher dispose

2026-05-29 02:00:53 -07:00

context.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

context.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

dispatcher.test.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

dispatcher.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

external-automations-handler-log-path.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

external-automations-handler.test.ts

fix: bound relay hermes run count cache (#4278)

2026-05-31 10:48:16 -07:00

external-automations-handler.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

fs-handler-file-read.ts

perf(ssh): bound relay bulk-stream backlog so PTY echo is not head-of-line blocked (#7601)

2026-07-06 17:10:04 -07:00

fs-handler-git-fallback.ts

fix(quick-open): keep primary results when the git ignored pass fails (#8049)

2026-07-10 17:22:47 -07:00

fs-handler-git-search.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

fs-handler-install-rg.test.ts

Fix paste ownership, input bounds, and IPC validation

2026-06-19 17:14:55 -07:00

fs-handler-install-rg.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

fs-handler-list-files-cancel.test.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-handler-list-files-ignored.test.ts

fix(quick-open): keep primary results when the git ignored pass fails (#8049)

2026-07-10 17:22:47 -07:00

fs-handler-list-files.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-handler-readdir-fallback.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-handler-rg-availability.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

fs-handler-stream.test.ts

perf(ssh): bound relay bulk-stream backlog so PTY echo is not head-of-line blocked (#7601)

2026-07-06 17:10:04 -07:00

fs-handler-terminal-artifact.ts

Open terminal file links on mobile (#7134)

2026-07-02 18:17:47 -07:00

fs-handler-utils.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

fs-handler.test.ts

Fix ssh watcher isolation (#8463)

2026-07-12 21:34:59 -07:00

fs-handler.ts

Fix ssh watcher isolation (#8463)

2026-07-12 21:34:59 -07:00

fs-list-files-cancel.integration.test.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-list-files-scan-coordinator.test.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-list-files-scan-coordinator.ts

fix(ssh): make fs.listFiles cancellable and single-flight per relay client (#7769)

2026-07-08 12:01:06 -07:00

fs-stream-pty-echo-backpressure.integration.test.ts

perf(ssh): bound relay bulk-stream backlog so PTY echo is not head-of-line blocked (#7601)

2026-07-06 17:10:04 -07:00

fs-stream-registry.ts

perf(ssh): bound relay bulk-stream backlog so PTY echo is not head-of-line blocked (#7601)

2026-07-06 17:10:04 -07:00

git-buffer-overflow.ts

Limit large git diff payloads in main process before IPC transfer (#5469)

2026-06-15 22:13:46 -07:00

git-diff-result.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

git-exec-validator.test.ts

Make remote hosts first class: concurrent multi-host workbench (#5071)

2026-06-13 18:53:01 -07:00

git-exec-validator.ts

Make remote hosts first class: concurrent multi-host workbench (#5071)

2026-06-13 18:53:01 -07:00

git-handler-blob-readers.test.ts

Limit large git diff payloads in main process before IPC transfer (#5469)

2026-06-15 22:13:46 -07:00

git-handler-branch-cleanup.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-branch-cleanup.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-check-ignore.test.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

git-handler-check-ignore.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

git-handler-commit-diff-ops.ts

Fix paste ownership, input bounds, and IPC validation

2026-06-19 17:14:55 -07:00

git-handler-local-base-ref-refresh.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-ops.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

git-handler-pull-reconciliation.test.ts

Improve git pull on remote (#8524)

2026-07-13 12:42:55 -07:00

git-handler-push-target.test.ts

Push existing fork review branches without republishing (#5531)

2026-06-16 18:10:01 -07:00

git-handler-push-target.ts

Push existing fork review branches without republishing (#5531)

2026-06-16 18:10:01 -07:00

git-handler-staging.test.ts

fix(relay): treat staging paths as literals (#8358)

2026-07-12 21:04:13 -07:00

git-handler-status-ops.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

git-handler-status-ops.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

git-handler-submodule-cache-invalidation.test.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

git-handler-submodule-ops.test.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

git-handler-submodule-ops.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

git-handler-test-setup.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

git-handler-utils.test.ts

Make Windows workspace deletion reliable and respect Git locks (#7963)

2026-07-10 17:52:50 -07:00

git-handler-utils.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-clean.test.ts

fix: preserve newline worktree paths

2026-05-31 01:50:16 -07:00

git-handler-worktree-git-capabilities.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-list.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-ops.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-ops.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-paths.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler-worktree-remove.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-handler.test.ts

fix(relay): treat staging paths as literals (#8358)

2026-07-12 21:04:13 -07:00

git-handler.ts

Improve git pull on remote (#8524)

2026-07-13 12:42:55 -07:00

git-response-pty-echo-backpressure.integration.test.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

git-response-stream-ownership.test.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

git-response-stream.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

git-status-output-parser.test.ts

Support submodule diffs and upstream-base compares in Source Control (#6350)

2026-06-28 23:43:33 -07:00

git-status-output-parser.ts

Support submodule diffs and upstream-base compares in Source Control (#6350)

2026-06-28 23:43:33 -07:00

git-status-upstream-negative-cache.test.ts

Reduce CPU from source-control git polling on Windows (#6736)

2026-06-29 15:25:13 -07:00

git-status-upstream-negative-cache.ts

Reduce CPU from source-control git polling on Windows (#6736)

2026-06-29 15:25:13 -07:00

git-working-file-read.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

git-working-file-read.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

integration.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

plugin-overlay-env.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

plugin-overlay-env.ts

Add OMP as first-class TUI agent

2026-05-25 18:35:48 -07:00

plugin-overlay.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

plugin-overlay.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

plugin-source-limit.test.ts

Support agent status hooks over SSH (#1865)

2026-05-14 16:06:23 -07:00

plugin-source-limit.ts

Support agent status hooks over SSH (#1865)

2026-05-14 16:06:23 -07:00

port-scan-handler.test.ts

Fix paste ownership, input bounds, and IPC validation

2026-06-19 17:14:55 -07:00

port-scan-handler.ts

lint(unicorn): enable prefer-number-properties, prefer-array-find, prefer-array-index-of (#7516)

2026-07-05 23:56:37 -07:00

preflight-handler.test.ts

fix(preflight): resolve WSL/SSH agent paths past shell aliases (#7867)

2026-07-09 17:08:35 -07:00

preflight-handler.ts

fix(preflight): resolve WSL/SSH agent paths past shell aliases (#7867)

2026-07-09 17:08:35 -07:00

protocol-handshake.test.ts

fix(ssh): enable TCP_NODELAY on ssh2 client to eliminate per-keystroke typing lag (#1660) (#1679)

2026-05-11 14:28:59 -07:00

protocol.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

pty-handler.test.ts

Fix windows build failure (#8504)

2026-07-13 00:34:04 -07:00

pty-handler.ts

Fix windows build failure (#8504)

2026-07-13 00:34:04 -07:00

pty-shell-launch.test.ts

fix: strip trailing whitespace from PROMPT_COMMAND in bash wrapper (#6897)

2026-07-03 17:16:29 -07:00

pty-shell-launch.ts

fix(pty): deliver multiline agent-launch prompts via bracketed paste (#7487)

2026-07-05 21:49:04 -07:00

pty-shell-utils.test.ts

Improve remote connection terminal error msg and session restore recovery (#7661)

2026-07-06 21:41:23 -07:00

pty-shell-utils.ts

Improve remote connection terminal error msg and session restore recovery (#7661)

2026-07-06 21:41:23 -07:00

relay-command-env.test.ts

Fix automatic branch rename for non-English git locales (#8012)

2026-07-10 01:03:16 -07:00

relay-command-env.ts

Fix automatic branch rename for non-English git locales (#8012)

2026-07-10 01:03:16 -07:00

relay-diagnostic-log.test.ts

fix(ssh): stop false "Remote connection dropped" after sleep/App Nap pauses (#7828)

2026-07-08 13:06:39 -07:00

relay-diagnostic-log.ts

fix(ssh): stop false "Remote connection dropped" after sleep/App Nap pauses (#7828)

2026-07-08 13:06:39 -07:00

relay-filesystem-watch-registry.test.ts

fix(ssh): bound healthy relay watcher processes (#8556)

2026-07-13 05:32:31 -07:00

relay-filesystem-watch-registry.ts

Fix ssh watcher isolation (#8463)

2026-07-12 21:34:59 -07:00

relay-handshake-roundtrip.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

relay-handshake.ts

fix(ssh): stop false "Remote connection dropped" after sleep/App Nap pauses (#7828)

2026-07-08 13:06:39 -07:00

relay-test-socket-path.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

relay-watcher-process-pool.ts

fix(ssh): bound healthy relay watcher processes (#8556)

2026-07-13 05:32:31 -07:00

relay.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

remote-cli-env.test.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

remote-cli-env.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

remote-cli-stdin.test.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

remote-cli-stdin.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

remote-cli-timeout.test.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

remote-cli-timeout.ts

fix(ssh): bridge the full Orca CLI over the SSH relay instead of a hardcoded command switch (#7771)

2026-07-08 13:59:42 -07:00

rotating-log-writer.test.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

rotating-log-writer.ts

fix(remote): harden terminal, relay, and SSH reliability (#8141)

2026-07-10 12:56:17 -07:00

subprocess-test-utils.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

subprocess.test.ts

Fix ssh watcher isolation (#8463)

2026-07-12 21:34:59 -07:00

windows-port-scan.test.ts

fix: support windows ssh hosts (#5004)

2026-06-09 01:17:34 -07:00

windows-port-scan.ts

lint(unicorn): enable prefer-number-properties, prefer-array-find, prefer-array-index-of (#7516)

2026-07-05 23:56:37 -07:00

workspace-session-handler.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

workspace-session-handler.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

workspace-space-scan.ts

Add Space manager V2 safeguards

2026-05-14 23:30:22 -07:00

wsl-agent-hook-relay.test.ts

Agent status over WSL: guest-resident hook relay + WSL-side hook installers (STA-1515) (#7903)

2026-07-10 00:19:45 -07:00

wsl-agent-hook-relay.ts

Agent status over WSL: guest-resident hook relay + WSL-side hook installers (STA-1515) (#7903)

2026-07-10 00:19:45 -07:00

wsl-hook-fs-bridge.test.ts

Agent status over WSL: guest-resident hook relay + WSL-side hook installers (STA-1515) (#7903)

2026-07-10 00:19:45 -07:00

wsl-hook-fs-bridge.ts

Agent status over WSL: guest-resident hook relay + WSL-side hook installers (STA-1515) (#7903)

2026-07-10 00:19:45 -07:00