Files
Willie 7a9b37e852 fix(mcp): explain Pi project overrides in import and sync conflicts (#371)
* fix(mcp): explain Pi project overrides in import and sync conflicts

Since Pi 1.0.1, /mcp in Pi writes a .pi/mcp.json entry with only
enabled, exposure or toolExposure to override the global server of that
name. Skillshare treated it as a broken server: import reported
"requires exactly one of command or url", and a project server with the
same name hit a conflict that told the user to import it, which import
always refused, so the user was left without a way forward in the CLI.

Import now names the entry as a Pi project override with nothing to
import. Sync reports the conflict as an override to replace or remove
with /mcp in Pi, and the dashboard offers only Replace for it. Sync
behavior is unchanged; detection matches Pi's own isOverride (no
command, url or type).

* fix(mcp): limit Pi override detection to project imports

Codex review on #371: importing Pi's global ~/.pi/agent/mcp.json, or a
pasted snippet, also reported a connection-less entry such as
{"enabled": false} as a project override and pointed to /mcp in a
project. Pi gives that shape override meaning only in a project's
.pi/mcp.json; elsewhere it is an invalid server. importNative now takes
the scope, so global and pasted imports keep the usual "requires exactly
one of command or url" problem.

* fix(mcp): classify a synced entry turned into a Pi override

Codex review on #371: when an entry this config synced to .pi/mcp.json
was later changed into a connection-less Pi override, the ledger still
marked it managed, so the generic "Agent configuration changed; import
it" conflict won and the dashboard offered an Import that project import
now refuses. The override case now comes first and covers a managed
entry whose content changed as well as an unmanaged one, so both offer
only Replace.

* fix(mcp): classify Pi overrides before every import-offering conflict

Codex review on #371: the prune conflict ("Pi setting changed since
sync; import it") still came before the override case, so a synced
server whose cleared Pi field Pi had replaced with an override again
offered an Import that project import refuses. Rather than chase each
earlier case, the override case now opens the switch. An entry owned by
another live config keeps its own message, since only that config can
release it.

* fix(mcp): treat a removed owner's entry like any other Pi override

Codex review on #371: an entry whose ledger owner was a removed config,
later turned into a connection-less Pi override, still got the orphaned
conflict, which offers an Import that project import refuses. Skillshare
never writes a connection-less Pi entry, so the override case now covers
every such entry except one a live config owns, which only that config
can release. It still skips an entry recorded at its current hash, which
is what Replace leaves, so Replace settles the conflict; a test now
covers that.
2026-10-04 03:18:14 +08:00
..