fix(supervisor): resolve each item's own project dir, not the daemon's cwd

[getappz]

Closes #63.

resolve_project() (src/mcp_server.rs) resolves "the current project" from std::env::current_dir() -- fine for a CLI invocation, but the daemon calls it once through a single AgentflareMcp::default() built at startup from wherever it happened to be launched. That one cwd-bound project was baked into discovery, dispatch, and execution alike. Confirmed live: a daemon started from an unrelated repo's directory never dispatched a ready-for-work item in this project despite 12s discovery ticks for 50+ minutes.

Fix

• New project_dirs table (crates/agentflare-backend, migration 0010) -- folder→project reverse index, same shape as feat(bridge): daemon polls a registry of repos, not one env var #422's bridge_repos but unconditional (no GitHub-remote gate). resolve_project() upserts into it.
• AgentflareMcp::for_project_dir(repo_root) -- pins resolution to a given folder instead of process cwd.
• run_discovery_tick iterates every row in project_dirs, not one cwd-resolved project.
• dispatch_item includes the item's project folder path as a job arg; WorkItemExecutor/execute_work use it via for_project_dir when present, falling back to prior cwd-based behavior when absent (backward compatible with already-queued jobs or a human running agentflare work directly).
• New regression test: run_discovery_tick_dispatches_ready_items_from_every_registered_project_not_just_one.

Note on provenance: pushed manually. The dispatched agent (item #63) did this work correctly and verified it, but push_and_open_pr matched the branch task/63 against PR #189 -- an unrelated, already-merged PR from July that happened to share this branch name historically -- and treated it as "PR already exists" without checking it was actually open, so the real work was never pushed or opened as a PR. Rescued from the worktree; verified independently before pushing (build clean, cargo test --bin agentflare supervisor:: 12/12 passing).

Test plan

• cargo build --bin agentflare -- clean
• cargo test --bin agentflare supervisor:: -- 12 passed, 0 failed

Summary by CodeRabbit

• New Features

  • Added project directory registration and persistence.
  • Background discovery now supports multiple registered projects and routes work to each project’s folder.
  • Added project-scoped resolution for links and worktrees.

• Bug Fixes

  • Improved project path handling for daemon and direct CLI workflows.
  • Preserved compatibility with existing job formats and self-repair tasks.

[coderabbitai]

Warning

Review limit reached

You’ve reached a temporary PR review limit under our Fair Usage Limits Policy.

Your recent review volume is higher than typical usage, so adaptive limits are currently applied.

Next review available in: 59 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 4e6b9d00-c0d9-4cb3-b426-4133c8967712

📥 Commits

Reviewing files that changed from the base of the PR and between 25a098d and 4e2905d.

📒 Files selected for processing (2)

• src/cli/work.rs
• src/supervisor.rs

📝 Walkthrough

Walkthrough

The backend now persists project-to-folder mappings. MCP project resolution registers these mappings. Supervisor discovery scans all registered projects and passes each folder path to work jobs, which create project-specific MCP contexts.

Changes

Project directory dispatch

Layer / File(s)	Summary
Project directory registry crates/agentflare-backend/src/db.rs, crates/agentflare-backend/src/migrations/0010_project_dirs.sql, crates/agentflare-backend/src/lib.rs, crates/agentflare-backend/src/project_dir.rs	Adds the project_dirs table, persistence operations, public module export, and tests for round-tripping, updates, and multiple entries.
Project directory registration src/mcp_server.rs	Adds repository-root-scoped MCP construction and registers canonical project directories during existing and new project resolution.
Multi-project discovery src/supervisor.rs	Scans all registered project directories, preserves project-specific labels and paths, and dispatches ready items with their folder paths. Tests cover multiple registered projects.
Project-specific work context src/cli/work.rs, src/supervisor.rs	Extends queued job arguments with an optional repository path. Work execution uses that path when present and retains compatibility with legacy jobs and project-agnostic self-repair jobs.

Estimated code review effort: 4 (Complex) | ~45 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Supervisor
  participant ProjectDirs
  participant WorkQueue
  participant execute_work
  participant AgentflareMcp
  Supervisor->>ProjectDirs: list registered project directories
  ProjectDirs-->>Supervisor: project IDs and folder paths
  Supervisor->>WorkQueue: enqueue item, agent, and folder path
  WorkQueue->>execute_work: invoke job arguments
  execute_work->>AgentflareMcp: create context for repository root
  AgentflareMcp-->>execute_work: project-scoped work context

Loading

Possibly related PRs

• getappz/agentflare#162: Introduced backend database and MCP project-resolution infrastructure extended by this change.
• getappz/agentflare#376: Added supervisor auto-dispatch flow modified here for project-specific routing.
• getappz/agentflare#422: Added related registry and multi-repository discovery behavior.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and concisely describes the primary supervisor fix: resolving each item's project directory instead of using the daemon's current directory.
Description check	✅ Passed	The description explains the problem, solution, compatibility behavior, regression test, and test results, although the reviewer notes section and some template checks are omitted.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch task/63

---

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/mcp_server.rs`:
- Around line 996-1005: Add a context-aware repository-root helper that returns
the root established by for_project_dir, falling back to the process root when
no scoped root exists. Update both register_bridge_repo and register_project_dir
to use this helper instead of Self::repo_root(), and add a regression test
verifying distinct process and scoped roots refresh the scoped project’s
registry entries with the scoped root.

In `@src/supervisor.rs`:
- Around line 144-152: Update dispatch_item and its callers to scope
item_remove_label and item_add_label to the current ProjectBatch rather than
mcp.resolve_project(conn), ensuring queued items from other projects are mutated
successfully. Before comment_impl creates a comment, validate that the item
belongs to the batch project and reject cross-project comments.

🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: db315dfe-2962-4a95-9dec-e7ee427f3475

📥 Commits

Reviewing files that changed from the base of the PR and between 408ad35 and 25a098d.

📒 Files selected for processing (7)

• crates/agentflare-backend/src/db.rs
• crates/agentflare-backend/src/lib.rs
• crates/agentflare-backend/src/migrations/0010_project_dirs.sql
• crates/agentflare-backend/src/project_dir.rs
• src/cli/work.rs
• src/mcp_server.rs
• src/supervisor.rs

[coderabbitai]

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

command -v ctx_search || true
command -v ctx_callgraph || true
command -v ctx_compose || true
command -v ctx_read || true
command -v ctx_shell || true
agentflare memory context 2>/dev/null || agentflare memory search 2>/dev/null || true
printf '%s\n' '--- candidate files ---'
git ls-files 'src/mcp_server.rs' 'src/cli/work.rs' '*project_dir*' '*bridge*' '*test*' | head -200
printf '%s\n' '--- relevant symbols ---'
rg -n -C 8 'register_project_dir|register_bridge_repo|for_project_dir|worktree_repo_root_override|resolve_project|repo_root|project_dirs' src/mcp_server.rs src/cli/work.rs

Repository: getappz/agentflare

Length of output: 35424

---

🏁 Script executed:

printf '%s\n' '--- mcp_server implementation ---'
sed -n '520,660p' src/mcp_server.rs
sed -n '840,1010p' src/mcp_server.rs
printf '%s\n' '--- backend registry upserts ---'
sed -n '1,240p' crates/agentflare-backend/src/project_dir.rs
sed -n '1,240p' crates/agentflare-backend/src/bridge_repo.rs
printf '%s\n' '--- dispatch path ---'
rg -n -C 12 'dispatch_item|project_dirs|folder_path|WorkItemExecutor' src crates/agentflare-jobs
printf '%s\n' '--- existing mcp tests and constructors ---'
rg -n -C 10 'for_project_dir|register_project_dir|register_bridge_repo|project_dir::|bridge_repo::|resolve_project' src/mcp_server/tests src/mcp_server.rs src/cli/work.rs

Repository: getappz/agentflare

Length of output: 50374

---

🏁 Script executed:

printf '%s\n' '--- supervisor dispatch implementation ---'
rg -n -A 90 -B 10 '^fn dispatch_item|dispatch_item\(' src/supervisor.rs
printf '%s\n' '--- RepoId remote resolution ---'
rg -n -A 100 -B 15 'struct RepoId|impl RepoId|resolve_from_remote' src crates
printf '%s\n' '--- project-dir consumers ---'
rg -n -A 35 -B 15 'project_dir::list|project_dirs::list|folder_path.*PathBuf|PathBuf.*folder_path' src crates
printf '%s\n' '--- focused tests ---'
rg -n -A 80 -B 15 'project_dir|for_project_dir|folder_path|dispatch_item' src/mcp_server/tests src/supervisor.rs src/cli/work.rs

Repository: getappz/agentflare

Length of output: 50375

---

🏁 Script executed:

printf '%s\n' '--- exact dispatch argument construction ---'
sed -n '235,275p' src/supervisor.rs
printf '%s\n' '--- project directory discovery ---'
sed -n '64,110p' src/supervisor.rs
printf '%s\n' '--- focused test names ---'
rg -n '^\s*fn [a-zA-Z0-9_]*' src/mcp_server.rs src/mcp_server/tests src/cli/work.rs src/supervisor.rs | rg 'project|repo|dispatch|worktree|cwd|root'
printf '%s\n' '--- read-only source invariant verifier ---'
python3 - <<'PY'
from pathlib import Path
import re

mcp = Path("src/mcp_server.rs").read_text()
backend = Path("crates/agentflare-backend/src/project_dir.rs").read_text()
supervisor = Path("src/supervisor.rs").read_text()

def body(name, start_after=0):
    pat = re.compile(rf'fn\s+{name}\s*\([^{{]*\)\s*(?:->[^{{]+)?\s*\{{')
    match = pat.search(mcp, start_after)
    if not match:
        raise SystemExit(f"missing {name}")
    depth = 0
    for i in range(match.end(), len(mcp)):
        if mcp[i] == "{":
            depth += 1
        elif mcp[i] == "}":
            if depth == 0:
                return mcp[match.start():i+1]
            depth -= 1
    raise SystemExit(f"unterminated {name}")

for_project = body("for_project_dir")
bridge = body("register_bridge_repo")
project_dir = body("register_project_dir")
valid_link_branch = mcp[mcp.index("Ok(project) => {"):mcp.index("Err(agentflare_backend::Error::NotFound", mcp.index("Ok(project) => {"))]

checks = {
    "for_project_dir sets worktree override": "worktree_repo_root_override: Some(repo_root)" in for_project,
    "bridge registration reads process root": "let repo_root = Self::repo_root();" in bridge,
    "project-dir registration reads process root": "let repo_root = Self::repo_root();" in project_dir,
    "valid link refreshes bridge registry": "self.register_bridge_repo(conn, &project.id);" in valid_link_branch,
    "valid link refreshes project-dir registry": "self.register_project_dir(conn, &project.id);" in valid_link_branch,
    "project-dir upsert updates by project id": "ON CONFLICT(project_id) DO UPDATE" in backend,
    "discovery forwards registered folder": "Some(folder_path)" in supervisor and "enqueue_work_job(queue, item, agent, Some(folder_path))" in supervisor,
}
for label, ok in checks.items():
    print(f"{'PASS' if ok else 'FAIL'}: {label}")
if all(checks.values()):
    print("RESULT: the scoped override is not used by either registry refresh, and the project-dir row is later used for dispatch.")
else:
    raise SystemExit(1)
PY

Repository: getappz/agentflare

Length of output: 9269

---

Use the scoped repository root for both registry refreshes.

for_project_dir sets the target root, but register_bridge_repo and register_project_dir still call Self::repo_root(). A daemon worker can overwrite the target project's registry entries with the daemon's repository. Later dispatches can create worktrees in the wrong repository.

Add a context-aware root helper. Use it in both methods. Add a regression test with different process and scoped roots.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/mcp_server.rs` around lines 996 - 1005, Add a context-aware
repository-root helper that returns the root established by for_project_dir,
falling back to the process root when no scoped root exists. Update both
register_bridge_repo and register_project_dir to use this helper instead of
Self::repo_root(), and add a regression test verifying distinct process and
scoped roots refresh the scoped project’s registry entries with the scoped root.

[coderabbitai]

🗄️ Data Integrity & Integration | 🟠 Major | 🏗️ Heavy lift

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# The lean-ctx tools are unavailable in this review environment.
# Inspect project scoping in the item mutation handlers.
rg -n -C 8 -P 'fn item_(remove_label|add_label)|fn comment_impl|resolve_project\(' src/mcp_server.rs
rg -n -C 5 -P 'dispatch_item\(|item_remove_label|item_add_label|comment_impl' src/supervisor.rs

Repository: getappz/agentflare

Length of output: 12914

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

printf '%s\n' '== item mutation definitions and item lookup paths =='
rg -n -C 12 'item_remove_label|item_add_label|comment_impl|ItemRequest|CommentRequest|item::(get|update)|get_by_id|resolve_project' src

printf '%s\n' '== supervisor discovery and MCP construction =='
rg -n -C 12 'project_dirs|ProjectBatch|folder_path|AgentflareMcp|supervisor' src/supervisor.rs src

Repository: getappz/agentflare

Length of output: 50375

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

rg -n -C 15 'fn (item_remove_label|item_add_label|comment_impl)|item_remove_label|item_add_label|comment_impl' src
rg -n -C 15 'struct AgentflareMcp|impl AgentflareMcp|fn resolve_project|fn.*item' src

Repository: getappz/agentflare

Length of output: 50375

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

printf '%s\n' '== source files =='
git ls-files 'src/*' | sed -n '1,160p'

printf '%s\n' '== mutation symbols across tracked files =='
rg -n -C 10 'item_remove_label|item_add_label|comment_impl|remove_label|add_label' --glob '*.rs' .

Repository: getappz/agentflare

Length of output: 50374

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

python3 - <<'PY'
from pathlib import Path
for p in Path("src").rglob("*.rs"):
    text = p.read_text(errors="replace")
    terms = ("remove_label", "add_label", "comment_impl", "ItemRequest", "CommentRequest")
    if any(t in text for t in terms):
        print(f"== {p} ==")
        for i, line in enumerate(text.splitlines(), 1):
            if any(t in line for t in terms):
                lo, hi = max(1, i - 8), i + 12
                lines = text.splitlines()
                for n in range(lo, min(len(lines), hi) + 1):
                    print(f"{n}:{lines[n-1]}")
                print()
PY

Repository: getappz/agentflare

Length of output: 50375

---

🌐 Web query:

getappz/agentflare src/mcp_server.rs item_remove_label comment_impl

💡 Result:

In the getappz/agentflare repository, src/mcp_server.rs is a core file responsible for implementing the project's Model Context Protocol (MCP) server functionality [1][2][3]. The item_remove_label comment implementation (or reference) refers to logic within the agentflare MCP server's skill or tool management system [4]. Based on the codebase structure: 1. Context: src/mcp_server.rs handles the registration and exposure of agentflare's own internal skills (such as skill_search and skill_load) to various supported AI coding agents [4]. 2. Functionality: The project uses a skill-registry crate for managing these skills [4]. Logic regarding labels, items, or skill organization is often found within crates/skill-registry (e.g., src/search.rs or src/load.rs) rather than exclusively in mcp_server.rs [4]. 3. Technical Role: src/mcp_server.rs typically acts as the bridge that maps these registry operations to MCP-compatible tool calls [3][4]. If you are looking for specific code, note that mcp_server.rs underwent significant refactoring as part of the implementation of gateway aggregation and skill discovery [3][4]. Reviewing the crates/skill-registry module alongside src/mcp_server.rs will likely reveal the exact implementation of label removal or modification logic.

Citations:

• 1: https://github.com/getappz/agentflare/blob/master/CONTRIBUTING.md
• 2: https://docs.rs/agentflare-gateway-registry/latest/agentflare_gateway_registry/
• 3: af30773
• 4: aa0c134

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

printf '%s\n' '== item label handlers =='
sed -n '830,885p' src/mcp_server/item.rs

printf '%s\n' '== comment create and item resolution =='
rg -n -C 18 'pub.*comment_impl|resolve_item_id|action.as_str\(\)|"create"' src/mcp_server/comment.rs | sed -n '1,260p'

printf '%s\n' '== project-batch discovery and MCP construction =='
sed -n '40,175p' src/supervisor.rs
rg -n -C 10 'struct AgentflareMcp|backend_project_link_override|worktree_repo_root_override|for_test|default\(' src/mcp_server.rs src/mcp_server/*.rs src/dashboard/server.rs | sed -n '1,320p'

Repository: getappz/agentflare

Length of output: 31344

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

python3 - <<'PY'
from pathlib import Path

for name, ranges in {
    "src/mcp_server/item.rs": [(204, 216), (840, 884)],
    "src/mcp_server/comment.rs": [(1, 260)],
    "src/supervisor.rs": [(40, 175), (272, 306)],
    "src/mcp_server.rs": [(80, 180), (885, 940)],
}.items():
    p = Path(name)
    if not p.exists():
        continue
    lines = p.read_text(errors="replace").splitlines()
    print(f"== {name} ==")
    for lo, hi in ranges:
        for n in range(max(1, lo), min(len(lines), hi) + 1):
            print(f"{n}:{lines[n-1]}")
PY

Repository: getappz/agentflare

Length of output: 26933

---

Scope post-dispatch mutations to the batch project.

item_remove_label and item_add_label restrict item IDs to mcp.resolve_project(conn). For another ProjectBatch, both calls fail after enqueueing, and ready-for-work remains, causing redispatch on each tick. comment_impl bypasses resolve_item_id and can create comments across project boundaries. Use project-scoped mutation calls and validate the comment's project.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/supervisor.rs` around lines 144 - 152, Update dispatch_item and its
callers to scope item_remove_label and item_add_label to the current
ProjectBatch rather than mcp.resolve_project(conn), ensuring queued items from
other projects are mutated successfully. Before comment_impl creates a comment,
validate that the item belongs to the batch project and reject cross-project
comments.