Add project local-file import and worktree inclusion - #4381
Conversation
michaelmwu
changed the title
b21d7e6 to
b28a0af
Compare
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
| Filename | Overview |
|---|---|
| packages/server/src/server/local-files/files.ts | Implements constrained inspection, revision-checked import, and worktree materialization for configured local files. |
| packages/server/src/server/worktree-session.ts | Integrates materialization with worktree setup, but deferred gated setup loses the missing-file acknowledgement. |
| packages/app/src/projects/local-files/form.ts | Implements the non-React import workflow, selection budgets, retries, and configuration-conflict recovery. |
| packages/app/src/projects/local-files/sheet.tsx | Provides the cross-platform import and review interface with compact-layout controls. |
| packages/protocol/src/project-local-files.ts | Defines bounded, schema-validated local-file RPC payloads and metadata. |
| packages/client/src/daemon-client.ts | Adds correlated local-file RPC methods and rejects content transfer over unprotected remote WebSockets. |
| packages/app/e2e/browser/project-local-files.spec.ts | Covers major user flows but includes an assertion shape prohibited by the repository test rules. |
Sequence Diagram
sequenceDiagram
participant UI as Project settings
participant Source as Source device/daemon
participant Target as Target daemon
participant Config as paseo.json
participant WT as Worktree setup
UI->>Source: Select or inspect files
Source-->>UI: Paths, sizes, revisions
UI->>Target: Inspect destinations
Target-->>UI: Missing/replacement status
UI->>Source: Read selected bytes
UI->>Target: Import with expected revision
Target-->>UI: Published file metadata
opt Include in future worktrees
UI->>Config: Merge worktree.localFiles
end
WT->>Config: Read configured paths
WT->>Target: Materialize files
WT->>WT: Run setup commands
Comments Outside Diff (1)
-
packages/server/src/server/worktree-session.ts, line 781-790 (link)Missing-file approval is lost
When a user approves creating an external-change worktree without missing local files, the automation gate defers setup. The later
workspace.setup.runpath does not preserveskipMissingLocalFiles, so materialization throws on the same missing file and the approved setup never runs. Preserve the original approval with the workspace or ask for approval again before deferred setup.
Reviews (1): Last reviewed commit: "Fix local files settings import after re..." | Re-trigger Greptile
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| expect(await page.evaluate(() => JSON.stringify(localStorage))).not.toContain( | ||
| "FIXTURE_ONLY=local-value", | ||
| ); |
There was a problem hiding this comment.
This assertion violates the repository directive that tests must not use JSON.stringify in assertions. Read and compare the relevant storage entries directly so the test clearly identifies which persistence boundary must exclude file contents. This repository requirement must be satisfied before merging.
Rule Used: # Code Review Pattern Reference: Slop, Tests, Feat... (source)
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b28a0af48e
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| } else if ( | ||
| url.protocol === "wss:" || | ||
| ["localhost", "127.0.0.1", "[::1]"].includes(url.hostname) | ||
| ) { |
There was a problem hiding this comment.
When the app connects through Electron's normal directSocket/directPipe transport or through remoteSsh, host-runtime.ts gives this client a paseo+desktop: URL. This condition recognizes only relay E2EE, WSS, and loopback WebSockets, so reads and imports throw secure_connection_required before the protected custom transport runs, making Local files unusable in those supported desktop connection modes. Recognize the protected desktop transport types as well.
AGENTS.md reference: AGENTS.md:L140-L140
Useful? React with 👍 / 👎.
| dependencies, | ||
| { | ||
| requestCwd: workspace.cwd, | ||
| requestCwd: sourceProjectRoot, |
There was a problem hiding this comment.
For a worktree whose cwd is below the Git root and whose project record points at that root, explicit setup after the automation gate uses the repository root here instead of the original source subdirectory. materializeLocalFiles consequently reads the root paseo.json and writes those paths relative to the nested workspace cwd, so an external change request can miss the subproject's configured files or copy root-level files into the wrong directory. Reconstruct the source cwd using the workspace's path relative to worktreeRoot before materializing files.
Useful? React with 👍 / 👎.
|
Closing this feature PR. Please discuss the workflow and shared need in Discussions, following CONTRIBUTING.md. |
2 participants
Remote worktrees can be missing
.envand other ignored configuration files that exist only on a laptop or another host. Add Project Settings → Local files to import those files into the selected daemon project's root and optionally include them in future worktrees.The device picker requires no local daemon or project. A host source is an explicitly chosen registered project; it need not be linked to the destination. The sheet keeps the destination host/root visible, previews metadata without values, preselects small new files, and leaves replacements unchecked. The inclusion choice and selected total stay visible beside the import action on compact screens.
Configured paths live in
paseo.jsonunderworktree.localFiles. New worktrees receive them before setup, including projects within repository subdirectories. Existing worktree files survive reruns. External change requests retain the existing automation gate. Creation shows missing configured files and requires an explicit choice before continuing without them.Imports enforce ignored/untracked regular-file destinations, contained paths, symlink rejection, revision checks, bounded payloads, and atomic publication with POSIX mode
0600. The client rejects remote plaintext transport for file contents. Successful file imports can recover from a configuration conflict without retransmitting bytes. Updates remain manual; directory transfer, background sync, and a vault are outside this change.Validation
50 focused tests passed, including real filesystem/daemon interactions and browser UI:
These ran through
npx vitest; server/form runs usedNODE_OPTIONS=--max-old-space-size=2048to bound the monorepo test process. The importer test includes a full 10 MiB transfer between two independent daemons over loopback TCP.The six browser flows cover device import, explicit replacement, stale-file rejection, configuration-only recovery, source-project selection, compact layout, and missing-file creation decisions. They also assert no browser runtime errors. The additional version-drift case removes the advertised capability and verifies the update-host message with no unsupported RPCs.
New RPCs are capability-gated by
projectLocalFiles; new fields are optional. Older clients receive their existing messages, and newer clients tell users to update hosts that lack the capability.Tested on Linux: real daemons plus Chromium at desktop and compact widths. Native iOS/Android pickers, Electron wrappers, Windows/macOS daemons, and a live relay connection still need device QA. The live daemon was not restarted or modified.
UI evidence