Repository navigation
fix(workspace): qualify combined diffs by repository - #946
Open
rudycelekli wants to merge 1 commit into
Open
rudycelekli wants to merge 1 commit into
rudycelekli wants to merge 1 commit into
Conversation
3 tasks done
Yanami-2K
approved these changes
Nov 16, 2026
Yanami-2K
left a comment
Collaborator
There was a problem hiding this comment.
核对了 internal/httpapi/run_workspace.go 和 internal/runner/workspace.go 两处对称的改动:只有在取合并 diff(raw 为空)且仓库不在工作区根目录时,才用 --src-prefix / --dst-prefix 给路径加上仓库目录前缀;单文件请求和根工作区的输出保持不变。Go 测试用两个真实仓库验证了加前缀后的文件头,以及单文件 diff 仍是仓库相对路径且不会串仓库;前端测试验证了两个同名 README 各自对应自己仓库的 hunk。远程工作区要等 runner 升级后才生效,描述里已经写明。提醒:#947 也改了 internal/runner/workspace.go;本 PR 只跑了开源扫描,合入前请触发 platform CI。
5 of 11 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
The workspace status list names each file relative to the whole workspace. Combined diffs instead concatenated Git patches whose paths were relative to each repository. When two repositories changed the same file name, the chat panel could show the first repository’s patch for both rows.
The platform and runner pass Git the relevant workspace directory as the source and destination prefix in combined diffs. This lets each file in the status list find its own patch.
Scope
Compatibility
Combined diffs under nested workspaces now use workspace-root paths. Root workspace diffs and requests for one file keep their previous headers. Remote workspaces pick up the fix when the runner is updated.
Validation
git diff --checkpassed. The full platform and public browser suites were not run.Safety