mirror of
https://github.com/openclaw/openclaw.git
synced 2026-10-31 12:37:59 +00:00
13c8407ff4
Repeating prepare_pr for a conversation's bound PR now integrates the PR's newer remote head into the same managed workspace instead of refusing it, preserving the guest's edits, untracked files and Git history. Conflicts return conflictPaths with the accepted headCommit; the guest resolves them and repeats with conflictsResolved and expectedHeadCommit. The accepted head stays pinned through interruption or conflicts, a further remote advance is reported through headChanged, and the PR's author, write eligibility and head are rechecked after the fetch. Files with both staged and unstaged changes are refused before a new head is admitted, and remote history without common ancestry is refused without being pinned. A resumed or retried refresh accepts only index entries still at their pre-refresh mode and object, which the workspace records as ORIG_HEAD, so completion never replaces a version the guest staged in the meantime. |
||
|---|---|---|
| .. | ||
| acp-core | ||
| agent-core | ||
| ai | ||
| gateway-client | ||
| gateway-protocol | ||
| llm-core | ||
| markdown-core | ||
| media-core | ||
| media-generation-core | ||
| media-understanding-common | ||
| memory-host-sdk | ||
| mermaid-renderer | ||
| model-catalog-core | ||
| net-policy | ||
| normalization-core | ||
| plugin-package-contract | ||
| plugin-sdk | ||
| retry | ||
| sdk | ||
| session-url-contract | ||
| terminal-core | ||
| tool-call-repair | ||
| workboard-contract | ||
| worker-runtime | ||
| tsconfig.json | ||