Skip to content

Fix SSH LocalCommand incompatibility with Fish shell #2749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Minoo7 wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Fix SSH LocalCommand incompatibility with Fish shell #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
96ca54e
Add sidebar CLI commands to cmuxd-remote (#2558)
yigitkonur Apr 3, 2026
a549e3f
Add V2 JSON-RPC sidebar.* methods for SSH relay compatibility
yigitkonur Apr 3, 2026
ba43f2c
Fix 3 review issues in V2 sidebar methods
yigitkonur Apr 3, 2026
4e9c2c4
Fix sidebar CLI commands: map positional args to named JSON-RPC params
yigitkonur Apr 3, 2026
6559057
fix: address all review feedback — crash guards, V2 error model, comp…
yigitkonur Apr 3, 2026
173f075
fix: positional cursor misalignment + opt-in greedy last arg
yigitkonur Apr 3, 2026
c43c1b4
Fix SSH LocalCommand incompatibility with Fish shell
Minoo7 Apr 9, 2026
9881d5f
Add workflow to auto-sync fork with upstream
Minoo7 Apr 9, 2026
0a833c3
Also wrap RemoteCommand scripts in /bin/sh -c for Fish compat
Minoo7 Apr 9, 2026
f6ba979
Clean stale SSH ControlMaster sockets before reconnection attempts
Minoo7 Apr 16, 2026
80572fc
docs: plan ssh workspace reuse
Minoo7 Apr 19, 2026
d6cbeac
feat: reuse existing ssh workspaces
Minoo7 Apr 19, 2026
60ee311
fix: only reuse connected SSH workspaces
Minoo7 Apr 19, 2026
27f4a2a
fix: scope SSH workspace reuse to current window
Minoo7 Apr 19, 2026
570c15e
fix: make ssh workspace attach explicit
Minoo7 Apr 20, 2026
1498e30
Merge remote-tracking branch 'yigitkonur/feat/sidebar-v2-ssh-relay' i…
louicelundgren-cpu May 1, 2026
4148ccd
feat(fish): add remote-relay support for git_branch via sidebar.* RPC
louicelundgren-cpu May 1, 2026
2f4e1d4
feat(cli): inline scrollback restore for cmux ssh remote panes
louicelundgren-cpu May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions .github/workflows/sync-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Sync upstream

on:
schedule:
# Daily at 06:00 UTC
- cron: "0 6 * * *"
workflow_dispatch:
Comment on lines +1 to +7

Copilot AI Apr 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new sync-upstream.yml workflow is not mentioned in the PR title/description and is unrelated to the stated goal of fixing SSH LocalCommand compatibility. Please either (mandatory) remove this workflow from the PR or (optional) update the PR description/title to include the motivation, scope, and operational impact of adding upstream-sync automation so reviewers can evaluate it appropriately.

Copilot uses AI. Check for mistakes.

permissions:
contents: write
issues: write

jobs:
sync:
runs-on: ubuntu-latest
Comment on lines +9 to +15

Copilot AI Apr 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workflow runs on a schedule with contents: write and performs a force-push plus pushes directly to main. That combination is high-risk: any mistake or unintended rebase/merge could rewrite history or update main without human review. Consider changing this to create/update a PR instead of pushing to main, removing the force-push, restricting triggers to workflow_dispatch (or gating with required approvals/environments), and scoping permissions to the minimum needed (e.g., avoid issues: write unless conflict-issue creation is required).

Copilot uses AI. Check for mistakes.
steps:
- uses: actions/checkout@v4
with:
ref: fix/ssh-fish-shell-compat
fetch-depth: 0
Comment on lines +17 to +20

Copilot AI Apr 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workflow is tightly coupled to a hard-coded branch name (ref: fix/ssh-fish-shell-compat) and uses git remote add ... || true, which can leave a stale/incorrect upstream URL if the remote already exists. Prefer deriving the ref from the workflow context (or documenting why it must be this branch), and make the upstream remote configuration idempotent (e.g., ensure the URL is set deterministically when the remote exists).

Copilot uses AI. Check for mistakes.

- name: Configure git
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch upstream
run: |
git remote add upstream https://github.com/manaflow-ai/cmux.git || true
git fetch upstream main
Comment on lines +27 to +30

Copilot AI Apr 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workflow is tightly coupled to a hard-coded branch name (ref: fix/ssh-fish-shell-compat) and uses git remote add ... || true, which can leave a stale/incorrect upstream URL if the remote already exists. Prefer deriving the ref from the workflow context (or documenting why it must be this branch), and make the upstream remote configuration idempotent (e.g., ensure the URL is set deterministically when the remote exists).

Copilot uses AI. Check for mistakes.
Comment on lines +29 to +30

@coderabbitai coderabbitai Bot Apr 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

git remote add ... || true masks real setup failures.

Line 29 suppresses all errors, including malformed URL/permission issues. Prefer explicit existence check and then add/update remote deterministically.

Suggested change 
       - name: Fetch upstream
         run: |
-          git remote add upstream https://github.com/manaflow-ai/cmux.git || true
+          if git remote get-url upstream >/dev/null 2>&1; then
+            git remote set-url upstream https://github.com/manaflow-ai/cmux.git
+          else
+            git remote add upstream https://github.com/manaflow-ai/cmux.git
+          fi
           git fetch upstream main
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
git remote add upstream https://github.com/manaflow-ai/cmux.git || true
git fetch upstream main
if git remote get-url upstream >/dev/null 2>&1; then
git remote set-url upstream https://github.com/manaflow-ai/cmux.git
else
git remote add upstream https://github.com/manaflow-ai/cmux.git
fi
git fetch upstream main
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/sync-upstream.yml around lines 29 - 30, Replace the
unconditional "git remote add upstream ... || true" with a deterministic
existence check and explicit add/update so real errors aren't masked: run a
check for the "upstream" remote (e.g., via "git remote get-url upstream" or
listing "git remote"), if it does not exist call "git remote add upstream
https://github.com/manaflow-ai/cmux.git", otherwise update it with "git remote
set-url upstream https://github.com/manaflow-ai/cmux.git"; remove the "|| true"
so failures surface and CI can fail on real setup errors.


- name: Rebase onto upstream/main
id: rebase
run: |
if git rebase upstream/main; then
echo "status=success" >> "$GITHUB_OUTPUT"
else
git rebase --abort
echo "status=conflict" >> "$GITHUB_OUTPUT"
fi

- name: Push rebased branch
if: steps.rebase.outputs.status == 'success'
run: git push --force-with-lease

- name: Update main from upstream

@cubic-dev-ai cubic-dev-ai Bot Apr 9, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: This step pushes directly to main from a scheduled workflow with no human review gate. A bad upstream merge or misconfiguration could silently rewrite the default branch. Replace this with a PR creation step (e.g., gh pr create) so changes to main go through normal review, or remove this block entirely since the workflow's stated purpose is syncing the fix branch.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At .github/workflows/sync-upstream.yml, line 46:

<comment>This step pushes directly to `main` from a scheduled workflow with no human review gate. A bad upstream merge or misconfiguration could silently rewrite the default branch. Replace this with a PR creation step (e.g., `gh pr create`) so changes to `main` go through normal review, or remove this block entirely since the workflow's stated purpose is syncing the fix branch.</comment>

<file context>
@@ -0,0 +1,61 @@
+        if: steps.rebase.outputs.status == 'success'
+        run: git push --force-with-lease
+
+      - name: Update main from upstream
+        if: steps.rebase.outputs.status == 'success'
+        run: |
</file context>
Fix with Cubic

if: steps.rebase.outputs.status == 'success'
run: |
git checkout main
git merge upstream/main --ff-only
git push
Comment on lines +42 to +51

Copilot AI Apr 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workflow runs on a schedule with contents: write and performs a force-push plus pushes directly to main. That combination is high-risk: any mistake or unintended rebase/merge could rewrite history or update main without human review. Consider changing this to create/update a PR instead of pushing to main, removing the force-push, restricting triggers to workflow_dispatch (or gating with required approvals/environments), and scoping permissions to the minimum needed (e.g., avoid issues: write unless conflict-issue creation is required).

Copilot uses AI. Check for mistakes.

Comment on lines +46 to +52

@coderabbitai coderabbitai Bot Apr 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Scope creep: this job mutates main, not just the fix branch.

This step goes beyond syncing fix/ssh-fish-shell-compat and can cause unexpected writes/failures on protected main (Line 49–Line 52). Keep this workflow scoped to the fix branch only.

Suggested change 
-      - name: Update main from upstream
-        if: steps.rebase.outputs.status == 'success'
-        run: |
-          git checkout main
-          git merge upstream/main --ff-only
-          git push
+      # Intentionally omitted: this workflow should only sync fix/ssh-fish-shell-compat
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Update main from upstream
if: steps.rebase.outputs.status == 'success'
run: |
git checkout main
git merge upstream/main --ff-only
git push
# Intentionally omitted: this workflow should only sync fix/ssh-fish-shell-compat
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/sync-upstream.yml around lines 46 - 52, The workflow step
named "Update main from upstream" mutates main directly; change it to update
only the target fix branch (e.g., fix/ssh-fish-shell-compat) by replacing the
hardcoded git checkout/merge/push sequence (git checkout main, git merge
upstream/main --ff-only, git push) with commands that checkout the
branch-to-update (use the branch variable like ${{ github.head_ref }} or a
dedicated input/ENV such as BRANCH_TO_UPDATE), merge upstream/main into that
branch (git merge upstream/main --ff-only) and push that branch only, ensuring
no direct writes to main or protected branches.

- name: Open issue on conflict
if: steps.rebase.outputs.status == 'conflict'
run: |
gh issue create \

@cubic-dev-ai cubic-dev-ai Bot Apr 9, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Conflict notification opens duplicate issues on repeated scheduled conflicts because issue creation is unconditional and not deduplicated.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At .github/workflows/sync-upstream.yml, line 56:

<comment>Conflict notification opens duplicate issues on repeated scheduled conflicts because issue creation is unconditional and not deduplicated.</comment>

<file context>
@@ -0,0 +1,61 @@
+      - name: Open issue on conflict
+        if: steps.rebase.outputs.status == 'conflict'
+        run: |
+          gh issue create \
+            --title "Upstream sync conflict on fix/ssh-fish-shell-compat" \
+            --body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
</file context>
Fix with Cubic

--title "Upstream sync conflict on fix/ssh-fish-shell-compat" \
--body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
--label "sync-conflict"
Comment on lines +53 to +59

@coderabbitai coderabbitai Bot Apr 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Conflict handling is not idempotent and will spam issues.

If conflicts persist for multiple days, this creates a new issue every run. Add a guard to reuse an existing open conflict issue.

Suggested change 
       - name: Open issue on conflict
         if: steps.rebase.outputs.status == 'conflict'
         run: |
-          gh issue create \
-            --title "Upstream sync conflict on fix/ssh-fish-shell-compat" \
-            --body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
-            --label "sync-conflict"
+          TITLE="Upstream sync conflict on fix/ssh-fish-shell-compat"
+          EXISTING="$(gh issue list --state open --search "$TITLE in:title" --json number --jq '.[0].number')"
+          if [ -z "$EXISTING" ]; then
+            gh issue create \
+              --title "$TITLE" \
+              --body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
+              --label "sync-conflict"
+          fi
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Open issue on conflict
if: steps.rebase.outputs.status == 'conflict'
run: |
gh issue create \
--title "Upstream sync conflict on fix/ssh-fish-shell-compat" \
--body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
--label "sync-conflict"
- name: Open issue on conflict
if: steps.rebase.outputs.status == 'conflict'
run: |
TITLE="Upstream sync conflict on fix/ssh-fish-shell-compat"
EXISTING="$(gh issue list --state open --search "$TITLE in:title" --json number --jq '.[0].number')"
if [ -z "$EXISTING" ]; then
gh issue create \
--title "$TITLE" \
--body "Auto-rebase of \`fix/ssh-fish-shell-compat\` onto \`upstream/main\` failed with conflicts. Manual resolution needed." \
--label "sync-conflict"
fi
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/sync-upstream.yml around lines 53 - 59, The "Open issue on
conflict" step currently always runs gh issue create, causing duplicate issues;
change it to first query open issues with the "sync-conflict" label and the same
title using gh issue list (or gh api) and, if an existing open issue is found,
reuse it by adding a comment or updating it (gh issue comment --issue <number>
or gh issue edit <number>), otherwise run gh issue create; implement this logic
in the step that checks steps.rebase.outputs.status == 'conflict' so the step
runs a small shell script that: calls gh issue list --label sync-conflict
--state open (or gh api) to find a matching title, extracts the issue number if
present, and branches to comment/update vs create accordingly.

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
210 changes: 203 additions & 7 deletions CLI/cmux.swift
View file
Open in desktop

Large diffs are not rendered by default.

Loading