Skip to content

feat(sdk): Expose file watcher - #674

Merged
dmtrKovalenko merged 4 commits into
mainfrom
feat/subscribe-to-updates
Jul 16, 2026
Merged

dmtrKovalenko merged 4 commits into
mainfrom
feat/subscribe-to-updates

Conversation

@dmtrKovalenko

Copy link
Copy Markdown
Owner

No description provided.

@dmtrKovalenko
dmtrKovalenko force-pushed the feat/subscribe-to-updates branch from fcead68 to 8519440 Compare July 14, 2026 22:29
@dmtrKovalenko dmtrKovalenko changed the title jjjjfeat: Expose fff watcher feat(sdk){=: Expose file watcher Jul 14, 2026
@dmtrKovalenko dmtrKovalenko changed the title feat(sdk){=: Expose file watcher feat(sdk): Expose file watcher Jul 14, 2026
@dmtrKovalenko
dmtrKovalenko force-pushed the feat/subscribe-to-updates branch 11 times, most recently from 8359249 to 932c4f3 Compare July 16, 2026 16:57
@dmtrKovalenko
dmtrKovalenko force-pushed the feat/subscribe-to-updates branch from 932c4f3 to 145a795 Compare July 16, 2026 17:00
@dmtrKovalenko
dmtrKovalenko force-pushed the feat/subscribe-to-updates branch from 145a795 to 95891f8 Compare July 16, 2026 18:20
@dmtrKovalenko
dmtrKovalenko merged commit a9df55d into main Jul 16, 2026
52 checks passed
abhijit-s pushed a commit to abhijit-s/fff that referenced this pull request Jul 17, 2026
Brings in upstream 0.10.0 batch: SDK file-watcher exposure (dmtrKovalenko#674),
stable FffResult C accessors (dmtrKovalenko#681), pi-fff non-cwd + isomorphic
SDK fixes (dmtrKovalenko#622, dmtrKovalenko#669), picker_ui fuzzy-match highlight (dmtrKovalenko#673),
README FAQ (dmtrKovalenko#680), vimdoc regen (dmtrKovalenko#683).

Conflict resolution:
- All crate Cargo.toml + workspace: take ours (0.17.0). Upstream's
  0.10.0 is its own independent release line; the fork stays on 0.17.0.
  fff-mcp keeps its daemon-only deps (fff-ipc/dirs/libc).
- fff-core/src/lib.rs: keep BOTH the fork's content_staleness_recheck
  test module and upstream's new pub watch module (non-overlapping).
- install-mcp.sh: keep ours — the fork installs from HEAD/source and
  points at abhijit-s, so upstream's v0.10.0 release-pinning + SHAs
  do not apply.
- Cargo.lock: ours (no reconciliation needed on build).

Verified: build-daemon green; fff-search suite incl. upstream's new
watch:: tests + the fork's 4 content_staleness_recheck regressions;
daemon crate tests — all 0 failures.
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