Skip to content

Fix daemon worktree sync and automation loop#173

Merged
ScriptedAlchemy merged 6 commits into
masterfrom
codex/daemon-incremental-sync
Jul 1, 2026
Merged

Fix daemon worktree sync and automation loop#173
ScriptedAlchemy merged 6 commits into
masterfrom
codex/daemon-incremental-sync

Conversation

@ScriptedAlchemy

@ScriptedAlchemy ScriptedAlchemy commented Jul 1, 2026

Copy link
Copy Markdown
Owner

Summary

  • route git worktree add hook events to the newly created worktree root before adding branch tracking
  • remove the Codex native scheduled automation implementation
  • make codex --automation install enable TraceDecay's daemon-owned self-improvement scheduler loop instead

Tests

  • cargo test install_codex_automation_enables_tracedecay_daemon_loop_noninteractively
  • cargo test test_cursor_shell_sync_plan_routes_worktree_add_to_worktree_branch_add
  • cargo test plans_worktree_add_against_new_worktree_root
  • cargo fmt
  • git diff --check

@changeset-bot

changeset-bot Bot commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: da76f3f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

chatgpt-codex-connector[bot]
chatgpt-codex-connector Bot reviewed Jul 1, 2026
View reviewed changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2cb19079ff

ℹ️ 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".

Comment thread src/mcp/hook_events.rs Outdated
@ScriptedAlchemy ScriptedAlchemy force-pushed the codex/daemon-incremental-sync branch from 2cb1907 to 27e950c Compare July 1, 2026 20:42
@ScriptedAlchemy ScriptedAlchemy force-pushed the codex/daemon-incremental-sync branch from 27e950c to 3bd3147 Compare July 1, 2026 20:44
ScriptedAlchemy added 4 commits July 1, 2026 22:07
fix: auto-apply session reflection facts
fcc447f
fix: compile Windows worktree sync and resolve worktree adds via git -C
4333239 
The Windows-only daemon fallback was missing a match arm for the new
WorktreeBranchAdd plan variant, breaking compilation on non-unix targets.
Worktree roots are now resolved by a single shared helper that honors
`git -C`/`--work-tree` overrides and canonicalizes through symlinks, and
`git worktree add` parsing is consolidated into one classifier instead of
two parallel parsers.
fix: keep codex automation install safe by default
78c570f 
`install --agent codex --automation` no longer writes permissive
require_dashboard_approval/auto_apply_memory_ops values; both stay unset so
AutomationConfig defaults apply and re-runs never weaken settings a user
chose. Unattended memory-op apply is now an explicit `--auto-apply` opt-in
with a printed warning. The installer also removes the legacy Codex-native
scheduled automation shipped in v0.0.10-v0.0.20 (which would otherwise run
alongside the daemon loop), warns when no daemon service is running to
execute the loop, announces implicit project init, and reuses the canonical
load->merge->validate->save automation-config pipeline instead of
duplicating it.
fix: satisfy clippy lazy-evaluation lint in session reflector report
da76f3f
@ScriptedAlchemy ScriptedAlchemy force-pushed the codex/daemon-incremental-sync branch from bd823a7 to da76f3f Compare July 1, 2026 22:44
@ScriptedAlchemy

ScriptedAlchemy commented Jul 1, 2026

Copy link
Copy Markdown
Owner Author

Addressed on the branch: worktree-add paths are now resolved honoring git -C <dir> (see plans_worktree_add_resolving_path_against_git_dash_c_dir in src/mcp/hook_events.rs), so git -C .. worktree add ../wt feature routes branch tracking to the correct root.

@ScriptedAlchemy ScriptedAlchemy merged commit 7d88597 into master Jul 1, 2026
18 checks passed
@ScriptedAlchemy ScriptedAlchemy mentioned this pull request Jul 1, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@ScriptedAlchemy