Skip to content

fix(editors): accept root paths and Windows servers in Zed remote links - #11044

Merged
maria-rcks merged 4 commits into
pingdotgg:mainfrom
maria-rcks:fix/zed-remote-windows-paths-8938
Sep 11, 2026
Merged

fix(editors): accept root paths and Windows servers in Zed remote links#11044
maria-rcks merged 4 commits into
pingdotgg:mainfrom
maria-rcks:fix/zed-remote-windows-paths-8938

Conversation

@maria-rcks

@maria-rcks maria-rcks commented Sep 10, 2026

Copy link
Copy Markdown
Collaborator

Follow-up to #11022. Two link shapes Zed accepts were still rejected or malformed.

The desktop allowlist required at least one path segment after the host, so zed://ssh/<host>/ (the remote root) was refused. The regex now accepts an empty path.

For Windows servers the builder fed the vscode-remote form /C:/Users/x into the Zed branch. Zed's remote server resolves rooted paths on the system drive and rejects that form; the issue reporter verified end to end that /Users/x is what works. buildRemoteOpenUrl now drops the drive letter for Zed only. Other drives are untested, as the issue notes.

Verified with worktree-local vp: ElectronShell.test.ts 11 tests and remoteOpen.test.ts 13 tests pass, contracts typecheck clean. Both cases were added to the existing test files. Real Zed launch over SSH from the picker is unverified in this session.

Refs #8938

Done by Claude Fable 5.1 in Claude Code.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • Zed SSH deep links now support URLs without a project path.
    • Zed remote paths on Windows now correctly handle the supported drive-letter format, while preserving valid rooted paths.
  • Tests

    • Expanded coverage for Zed SSH links with and without project paths.
    • Added validation for Windows remote path conversion, including removal of the supported drive-letter segment and preservation of rooted paths.

maria-rcks and others added 2 commits September 10, 2026 05:31
zed://ssh/host/ is a valid link to the remote root.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Zed's remote server resolves rooted paths on the system drive, so
/C:/Users/x must be sent as /Users/x (verified in pingdotgg#8938).

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:S 10-29 changed lines (additions + deletions). labels Sep 10, 2026
Comment thread packages/contracts/src/editor.ts Outdated
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@macroscopeapp

macroscopeapp Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at ba916a7

Macroscope's review found this PR approvable — This is a focused compatibility fix that corrects Zed remote links for root paths and Windows drive-rooted paths without changing other editor URL formats or safety restrictions. The new behavior is covered by targeted tests and does not alter product defaults or static-analysis settings.

You can add or adjust custom eligibility rules. Learn more.

@coderabbitai

coderabbitai Bot commented Sep 10, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 6504d1e6-fc48-484c-b137-ca03bf9d71f0

📥 Commits

Reviewing files that changed from the base of the PR and between 82a2514 and ba916a7.

📒 Files selected for processing (2)
  • apps/web/src/remoteOpen.test.ts
  • packages/contracts/src/editor.ts

Included review availability: Your plan provides up to 10 included reviews per hour; 5 remain after this review.


📝 Walkthrough

Walkthrough

Zed SSH deep links now remove the Windows drive-letter segment, preserve empty paths, and accept root paths in the desktop shell. Tests cover Windows path conversion and project and root SSH links.

Changes

Zed SSH link handling

Layer / File(s) Summary
Zed URL generation and coverage
packages/contracts/src/editor.ts, apps/web/src/remoteOpen.test.ts
Zed URL generation removes a leading Windows drive-letter segment and returns zed://ssh/<host> for an empty path. Tests cover Windows paths, and the editor description is updated.
Desktop SSH path recognition
apps/desktop/src/electron/ElectronShell.ts, apps/desktop/src/electron/ElectronShell.test.ts
The desktop shell accepts Zed SSH paths with no content after the host. Tests cover project and root SSH links.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: juliusmarminge

Merge Risk: 🟡 Moderate · up to ba916

Windows Zed paths are normalized as intended, but opening a remote root may still fail because generated host-only links are not accepted by the desktop handler. Align the generated root-link format with desktop recognition before merge.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly summarizes the main changes: support for root paths and Windows servers in Zed remote links.
Description check ✅ Passed The description explains what changed, why it changed, test results, limitations, and related issues. It omits the template checklist, but the required change rationale and validation details are pres…
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 4…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

A POSIX directory literally named /C:/project must not be rewritten.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@maria-rcks
maria-rcks merged commit 20ef250 into pingdotgg:main Sep 11, 2026
24 checks passed
aorwall added a commit to aorwall/t3code that referenced this pull request Sep 11, 2026
Merges `upstream/main` at `02297e3db` into the fork, 35 commits from
base
`0f602b337`. Merge commit, not a rebase. Tracker entry:
`docs/fork/upstream-merge-log.md`, 2026-09-11.

`170` files landed against `166` in the upstream range; fork delta `756`
files.
The gap is six named files and reconciles:
`ThreadStatusIndicators.test.tsx` and
`sandboxControl.placement.test.tsx` landed as fork-test fixes amended
into the
merge, the three fork documents landed with it, and
`PreviewLocalServerCard.tsx` was re-deleted per the inventory's
deliberate-deletion list. `duplicate-adds.mjs` and
`resolution-check.mjs` are
clean — nothing landed as one side whole.

## What upstream shipped, and where it stands on Moatless

### Usable as-is

These run on the fork's backend with no further work.

- **A compact right-panel surface menu** (pingdotgg#11111) — the add-surface
launcher
goes from a card grid to keyboard-shortcut rows. This is where the
fork's
sandbox status badge lives, so the badge was re-stated on upstream's row
  rather than replayed; see the conflict notes below.
- **Multiple-linked-PR badges, simplified** (pingdotgg#11104, pingdotgg#11180, pingdotgg#11101) — a
thread
with several links now shows the total linked count coloured by
aggregate
status, instead of naming a primary and counting the extras. This is
**live on
  Moatless**: the backend serves `thread.pullRequests` and reports
`threadPullRequests`, so the badge resolves. It is also a behaviour
change a
user will see, and it is what broke the fork's own badge test — the only
thing
  that caught it.
- **Settled threads recede in the sidebar** (pingdotgg#11101) — a settled row
dims until
  hover or focus. Rides the settlement state Moatless already serves.
- **Environments in the command palette** (pingdotgg#10722) — searching now
returns
  environments beside threads and projects, with a subtitle.
- **A blue/orange diff palette** (pingdotgg#10671) — client-side theme only.
- **Question answers folded into tool activity** (pingdotgg#11014) — the chat
timeline
renders an answer to an agent's async question inside the tool call that
asked
  it, rather than as a separate turn. The client half
(`client-runtime/src/work-log/userInput.ts`,
`shared/src/toolActivity.ts`,
`MessagesTimeline.tsx`) works off data Moatless already sends. The
server half
  is in the third bucket.
- **Unpriced model activity is flagged** (pingdotgg#11021) — usage rows with
tokens and
no price read as unpriced instead of `$0.00`. Shared merge logic over
the
  `server.getUsageSummary` the backend serves.
- **Return to picture-in-picture when the right panel closes** (pingdotgg#11102)
and
**aligned floating-preview corners** (pingdotgg#10915) — both land in the hosted
preview surface and both were taken; the fork's framed-runtime condition
in
`ThreadPreviewMiniPlayer.tsx` still covers the case upstream's `framed`
check
  does not.
- **Collapse a tool call by clicking its expanded label** (pingdotgg#11017),
**provider
update text fitting inside sidebar notices** (pingdotgg#11034), **no seams in the
topbar scroll fade** (pingdotgg#10914), **centered PR unavailable states**
(pingdotgg#11110), **no
  sidebar PR link icon** (pingdotgg#11179).
- **Mobile** (pingdotgg#11128, pingdotgg#11127, pingdotgg#11114, pingdotgg#11115, pingdotgg#11118 / pingdotgg#11079 / reverted
in
pingdotgg#11098, pingdotgg#11113) — shared markdown renderer rename, composer transition
and
final-frame fixes, tablet close controls for files and terminal, and
playback
  preserved across fullscreen transitions.

### Unsupported in Moatless / needs implementation

- **The device hub** — the whole of pingdotgg#10677, pingdotgg#10854, pingdotgg#10855 and pingdotgg#10856:
iOS
simulators and Android emulators a person and an agent can share. Server
side
is `apps/server/src/device/` (`LocalDeviceHost.ts` drives the machine
the
  server runs on, `SshDeviceHost.ts` drives another over SSH,
`DeviceHubProxy.ts` fronts the video and accessibility streams) plus an
MCP
  toolkit at `apps/server/src/mcp/toolkits/device/` that gives the agent
  tap/type/screenshot. Client side is a `device` right-panel surface
  (`apps/web/src/components/device/`) and a Device hosts settings page.

Eight methods plus one stream, all newly declaring
`UnsupportedMethodError` in
  `packages/contracts/src/rpc.ts`: `device.configure`, `device.list`,
  `device.testHost`, `device.open`, `device.close`, `device.shutdown`,
`device.detail`, `device.action`, and the `subscribeDeviceState` push
stream.

  **Nothing gates the surface on a capability.** `ChatView.tsx` passes
`deviceAvailable={activeThreadRef !== null}`, so the launcher offers a
Device
row on every thread. `subscribeDeviceState` never resolves on Moatless,
so the
state stays empty, `onboardingCompleted` is false, and clicking the row
opens
`DeviceSetup` rather than the panel — whose first step, "Enable the
device
hub", calls `device.configure` and shows the refusal. A dead end a
person can
walk into. One additive `FEATURES.deviceHub` read on the two
`deviceAvailable`
props would drop the row instead; **this merge did not add it**, and it
is
recorded as the open work in `docs/fork/gaps.md` under _The device hub_.

Implementing it on the backend is a real question rather than a stub:
the hub
needs Xcode or the Android SDK on whatever host it drives, and its
stream is a
  second connection beside the RPC one.
- **Label and reviewer updates without redundant reloads** (pingdotgg#11117) —
optimistic
  cache writes in `client-runtime/src/state/pullRequests.ts` over
`pullRequests.update`. Rides the `pullRequests.*` group, which Moatless
does
not serve and which the `pullRequests` capability already keeps off, so
it
  changes nothing here until that group lands.
- **Emphasised primary PR actions** (pingdotgg#11105) and **save a PR body with
  Cmd/Ctrl+Enter** (pingdotgg#10660) — same surface, same condition.
- **Zed remote links accepting root paths and Windows servers** (pingdotgg#11044)
— builds
an SSH open target the Electron shell hands to a local editor. That path
needs
  a desktop shell, so it does not reach this fork's browser client;
`shell.openInEditor` remains unsupported. Not a fork target, listed for
  completeness.
- **Marketing** (pingdotgg#11146, pingdotgg#11145) — `apps/marketing` is upstream's own
site;
  inherited and inert here.

### Backend behavior to consider reproducing in Moatless

Server-side fixes upstream made to its own runtime. Moatless implements
the same
contract, so each is worth checking against its own implementation.

- **Claude launch args override the derived permission mode** (pingdotgg#11026,
`apps/server/src/provider/Layers/ClaudeAdapter.ts`). Upstream derives a
permission mode from the thread's settings and then appends the agent's
launch
args; an explicit `--permission-mode` in those args used to be
overridden by
the derived one instead of winning. If Moatless derives a permission
mode the
same way, a user who set the flag explicitly is being ignored in the
same
  place. Cheapest of the three to check.
- **Project identity resolved before legacy PR relinks** (pingdotgg#11045,
`apps/server/src/orchestration/Layers/OrchestrationEngine.ts`). A legacy
pull-request link is relinked to its thread on load; upstream now
resolves the
project's repository identity first, so a relink cannot bind a link to
the
  wrong project when two projects share a branch name. The fork fills
`thread.pullRequests` from a Task's GitHub bindings, so it has the same
ordering question: the binding has to know which project it belongs to
before
  it is attached.
- **Question answers in the published activity payload** (pingdotgg#11014,
`apps/server/src/orchestration/ActivityPayloadProjection.ts`). The
projection
now folds `projectQuestionToolInput` into the activity payload for both
`mcp_tool_call` and plain tool items, which is what lets a client render
the
  answer inside the tool call. Moatless does not report
`agentActivityPublishing`, so nothing reads this today — but if it ever
  publishes activity, this is the shape to publish.

## Conflicts and how they were resolved

11 conflicted files, resolved on the verdicts `preflight.mjs` printed.

Additive on both sides, both kept: `MessagesTimeline.tsx` (imports),
`client-runtime/src/rpc/client.ts` (the fork's four subscription tags
against
upstream's `subscribeDeviceState`), `rightPanelStore.ts` (the fork's
`sandbox`
kind against upstream's `device`), `rpc.ts` and `RpcAuthorization.ts`
(the
fork's thread-server / sandbox / subtasks methods and scopes against
upstream's
eight `device.*` ones), and `ChatView.tsx` (both right-panel arms, both
`onAdd*`
props at the inline and sheet call sites, and upstream's extended
`closePreviewPanel` under the fork's proactive preview-open effect).

`PreviewEmptyState.tsx` and `ThreadPreviewMiniPlayer.tsx` took
upstream's
`DiscoveryList` and `rounded-[inherit]` with the fork's sandbox-read
error line
and framed `hasPreviewSurface` condition re-stated on top.
`PreviewLocalServerCard.tsx` was a modify/delete conflict and was
re-deleted.
`pnpm-lock.yaml` auto-merged this time, so `--theirs` had nothing to do;
it was
reset to `upstream/main` and the fork edges re-derived with `vp i`.

Two findings worth reading:

**A `converged` delta can lose the line it was anchored to.** pingdotgg#11111
rebuilt the
add-surface menu from cards into rows, and the fork's sandbox badge in
`RightPanelTabs.tsx` (7 conflicts, the hard one) had no literal home
left. It
was re-stated on upstream's row — between the label and the `Kbd`,
additively,
no prop threaded and no upstream JSX re-indented — rather than replayed.
The
fork's placement test caught the other half: upstream's rows stopped
rendering
the action `description` at all, in its own Device action too, so the
test was
asserting on markup nobody emits. It now asserts the rendered label.

**A silent auto-merge changed behaviour with no marker, no type error
and no
resolution-check hit.** pingdotgg#11104 and pingdotgg#11180 changed what the multi-PR
badge counts
and hoisted `state` onto both badge shapes with a new `draft` colour.
Only the
fork's `ThreadStatusIndicators.test.tsx` failed, on `+1` against `+2`.
Fixture
gained the now-required `state`; the expectation was updated to
upstream's
semantics.

## Inventory and gaps

- New `pathPolicy` rows for the paths this merge decided without a
cached
  verdict: `right-panel-surfaces`, `client-runtime-rpc-client`,
`thread-status-indicators`, `fork-sandbox-components`.
`inventory-check.mjs`
  is clean.
- New gaps entry: _The device hub_, under **Methods the backend does not
dispatch**. It names the nine union entries holding it open, the missing
  `FEATURES.deviceHub` gate, and what closing it costs.
- Owned-concern sweep: 11 keyword hits, all false positives. Ten are
device-hub
files matching the `client-identity` concern on `host`/`proxy` — that
concern
  is about device *pairing* identity, not simulators — and the eleventh,
  `McpProviderSession.test.ts`, matched on `session`. No concern entry.

## Verification

`verify.mjs`: `duplicate-adds`, `tripwires`, `resolution-check`,
`unsupported-methods`, `fmt:check`, `lint` and `typecheck` pass.

`test` is red on **one** package, and it is not this merge:
`@t3tools/desktop`'s `scripts/browser-secret-native.test.mjs > bundled
libsecret
helper` cannot find `libsecret-1` in this sandbox's pkg-config path. A
missing
system package, not a code defect — 1 file failed of 102, and the
standing entry
is in `docs/fork/gaps.md` under _The desktop suite needs libsecret_.

One thing to know about reading that log: four packages did not finish
under
`vp run -r test` and were each re-run alone — mobile `157` files, `t3`
`315`,
web `389`, relay `30`, all passing. The truncated parallel pass reported
a
failure that does not exist, `shikiReviewHighlighter.test.ts >
initializes
source and snippet highlighting without a warmup`, which passes in the
alone run
and which neither side of this merge touches. The retry lines at the end
of the
log are the result; the parallel output above them is not.

Not reported green. The fork has no CI on pull requests
(`docs/fork/gaps.md`, _Nothing checks a pull request_), so this is the
whole of
the evidence.

---
Moatless task:
https://moatless.soaplabstest.com/tasks/211b4f8f-7de2-46c8-9ded-330d0cda4add
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Sep 11, 2026
## What's Changed
* fix(pr): update labels and reviewers without redundant reloads by @maria-rcks in pingdotgg/t3code#11117
* fix(chat): fold question answers into tool activity by @maria-rcks in pingdotgg/t3code#11014
* fix(usage): flag unpriced model activity instead of showing $0.00 by @maria-rcks in pingdotgg/t3code#11021
* fix(server): let Claude launch args override the derived permission mode by @maria-rcks in pingdotgg/t3code#11026
* fix(editors): accept root paths and Windows servers in Zed remote links by @maria-rcks in pingdotgg/t3code#11044
* fix(web): center pull request unavailable states by @maria-rcks in pingdotgg/t3code#11110
* fix(web): remove sidebar pull request link icon by @maria-rcks in pingdotgg/t3code#11179
* fix(ui): color linked pr counts by aggregate status by @maria-rcks in pingdotgg/t3code#11180
* fix(preview): render website favicons for browser tool activity by @maria-rcks in pingdotgg/t3code#11032
* fix(web): simplify pull request summary sections by @maria-rcks in pingdotgg/t3code#10612
* fix(web): preserve drafts when compacting context by @maria-rcks in pingdotgg/t3code#11103
* fix(server): queue messages during context compaction by @maria-rcks in pingdotgg/t3code#11107
* perf(web): format minimap previews only when opened by @juliusmarminge in pingdotgg/t3code#11181
* perf(web): reuse completed Markdown prefixes while streaming by @juliusmarminge in pingdotgg/t3code#11193
* perf(web): resume syntax highlighting from completed lines by @juliusmarminge in pingdotgg/t3code#11196
* perf(web): preserve completed code-line DOM while streaming by @juliusmarminge in pingdotgg/t3code#11198
* perf(web): huge-thread switch no longer blanks the chat pane by @juliusmarminge in pingdotgg/t3code#11169


**Full Changelog**: pingdotgg/t3code@v0.0.41-nightly.20260911.1520...v0.0.41-nightly.20260911.1533

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.41-nightly.20260911.1533
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant