Skip to content

fix(cloud): exclude volatile workflow files when applying sync patches#811

Merged
khaliqgant merged 3 commits intomainfrom
codex/cloud-sync-volatile-excludes
May 4, 2026
Merged

fix(cloud): exclude volatile workflow files when applying sync patches#811
khaliqgant merged 3 commits intomainfrom
codex/cloud-sync-volatile-excludes

Conversation

@khaliqgant
Copy link
Copy Markdown
Member

@khaliqgant khaliqgant commented May 4, 2026

Summary

  • cloud sync applied patches with bare git apply, which would overwrite/delete agent-managed bookkeeping files when the cloud-side patch happened to include them.
  • Add a CLOUD_SYNC_PATCH_EXCLUDES list and thread --exclude=… args into both git apply --stat and git apply so these paths are skipped on the local checkout:
    • .agent-bin/**
    • .relayfile.acl
    • .relayfile-mount-state.json
    • .relayfile-mount-state.json.tmp-*
    • .trajectories/**
    • .workflow-context/**
  • Export buildCloudSyncPatchExcludeArgs() and assert each pattern in cloud.test.ts.

Test plan

  • npx vitest run src/cli/commands/cloud.test.ts — 8/8 passing
  • Manual: run agent-relay cloud sync against a workflow that touches .trajectories/ and confirm the local copy is left untouched

Open in Devin Review

Multi-Repo Pushback Bot and others added 3 commits April 30, 2026 14:22
Adds path excludes to `git apply --stat` and `git apply` in `cloud sync` so
agent bookkeeping (`.agent-bin/`, `.relayfile.acl`, `.relayfile-mount-state.json[.tmp-*]`,
`.trajectories/`, `.workflow-context/`) doesn't get rewritten on the local checkout.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@khaliqgant khaliqgant requested a review from willwashburn as a code owner May 4, 2026 07:32
Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

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

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 1 additional finding.

Open in Devin Review

@khaliqgant khaliqgant merged commit 3a63b52 into main May 4, 2026
51 checks passed
@khaliqgant khaliqgant deleted the codex/cloud-sync-volatile-excludes branch May 4, 2026 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant