Repository navigation
Commit 9e8f8a3
feat: read the engine's unfulfilled-keys report instead of diffing declared vs delivered (#1308)
* feat: read the engine's unfulfilled-keys report instead of diffing declared vs delivered
The MCP catalog now keeps the `_meta` of a server's last tools/list page per client, exposed as
`MCP.listMeta(name)`. On attach, the gaps come from the engine's `ai.altimate/unfulfilled` report,
grouped by reason in the toast and headless line with the engine's detail (e.g. `spawn docker ENOENT`);
`no-bridge` entries stay out of the missing set as before. The attached outcome carries the full
report. `MIN_ENGINE_VERSION` moves to 0.7.2, the first engine that emits it; an engine that sends
none claims no gaps rather than inventing them.
Closes #1307
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* test: end-to-end through the MCP service against a real engine
Env-guarded (`ALTIMATE_ENGINE_E2E_ROOT`), skipped otherwise: spawns a built engine over stdio the way
the overlay does, against a fake Altimate API and a real second MCP server, and reads the
`ai.altimate/unfulfilled` report through `MCP.listMeta` into the attach toast text. The engine is a
node shebang script, so the test spawns node rather than the bun test runner.
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* chore: wrap the catalog _meta hunks in altimate_change markers
Marker Guard flagged the changed lines in the upstream-shared catalog; the single-line marker
comments did not count as a wrapped block.
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix: accept numeric integration ids in the engine report
Custom (tenant-created) integrations carry numeric ids; the parser treated the whole report as
malformed over that one field and the attach announced no gaps at all. Take the id as a string.
Found by the engine-to-CLI run against a local backend with a custom MCP integration.
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix(workspace): commit the tools and their report together, and say what a gap is with its own detail
Answers the multi-model review of the unfulfilled report, client half.
- the tools of a listing and its _meta are committed in one statement (State.meta beside State.defs) and read through one accessor, MCP.snapshot(name): a refresh that is pending or that failed leaves the last good pair standing, and the overlay can no longer pair one listing's tools with another's report
- the catalog commits _meta when a listing completes — the last page that carries one wins, a listing with none clears it — instead of clearing at the start
- served counts compare the declared keys in the catalog's sanitised key space, so the headline cannot undercount a served tool whose raw key the MCP layer renamed
- the missing line groups by reason AND integration, so one integration's error is never printed as another's
- spawn-failed reads 'server could not be started or reached', which is what the engine records under it
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix(workspace): a listing carries its own _meta, and the headline never counts a reported key
Answers the Codex round on the report fixes:
- McpCatalog.defsWithMeta returns the listing and its _meta as one value, and every commit of a listing stores that pair — not a per-client value another refresh may have overwritten while this one was awaiting
- served counts exclude keys the engine reports unfulfilled, so two raw keys that sanitise to one catalog name cannot both count as served
- parseUnfulfilled rejects an entry whose detail is present but not a string, failing closed like the other fields
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix(workspace): the headline counts catalog entries, not declarations
Two raw keys that sanitise to one catalog name are one callable tool however many the engine lists; served and extension counts are the number of distinct sanitised entries that are present and unreported.
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix(workspace): a catalog entry is counted once across the ordinary and extension groups
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* chore(workspace): wrap the two remaining hunks in altimate_change markers
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* chore(workspace): markers around the listing hunks the guard still saw as bare
Co-Authored-By: Claude Fable 5.1 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GHBUvb843k1R7UAGi8Ya9b
* fix(workspace): require engine 0.7.3 for the unfulfilled-keys report
Datamate 0.7.2 was released without the `ai.altimate/unfulfilled`
report, which now ships in 0.7.3. `MIN_ENGINE_VERSION` moves to 0.7.3
so a 0.7.2 engine no longer clears the floor and announces no gaps.
The tests that pin the floor and the overlay harness's default engine
version follow.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(workspace): mask the engine's error text and match the notice to what is callable
- Mask each gap's `detail` when the report is parsed (control characters
collapsed, then `Telemetry.maskString`, the same treatment as subprocess
stderr), so the attach toast and the attach log both carry the masked text.
- Warn when fewer declared tools are callable than were declared, even with an
empty report (two raw keys that sanitise to one catalog entry). With no
report nothing is claimed, so that case stays `info`.
- Re-announce when a gap's integration or error text changes under the same
reason, so the toast never keeps stale remediation.
- Log a warning when a report is present but malformed and is dropped.
- The real-engine e2e test removes its temporary HOME.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* test(mcp): list through a scripted client so leaked SDK mocks cannot empty it
`bun test` runs the suite in one process and `mock.module` is process-wide.
`mcp.test.ts` mocks `@modelcontextprotocol/sdk/client/index.js` with a client
whose `listTools` returns no tools, so when it ran first the catalog `_meta`
tests listed nothing. They now drive `McpCatalog` through a scripted client
(the only method the catalog calls is `listTools`). The SDK's own `_meta`
passthrough stays covered by the real-engine e2e test.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(workspace): log a malformed engine report before deduplicating the announcement
A malformed report can share its announcement signature with an earlier empty
or absent one, so the warning placed after the dedupe never fired for that
transition. The session record now remembers whether the last report was
malformed; the warning is checked before the dedupe and logged once per
transition into that state, without a second toast.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(workspace): announce every changed verdict, and commit only the latest tool refresh
From the review bots on the ready PR:
- The attach signature carries whether a report arrived and the served
declared count, so "no report" → "empty report" (a severity change) and an
equal-total swap of which declared tools are served are both announced.
- Only consecutive attached turns carry the malformed-report flag, so the next
malformed report after a refusal is logged as a new transition.
- A `tools/list_changed` refresh that a later one overtook drops its listing,
so an out-of-order completion never writes older tools and report over newer.
- The overlay test fixture defaults to no report; the tests about the report
pass one explicitly.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): keep an older successful refresh when a newer one fails
Refreshes commit unless a newer one already has, so an out-of-order completion
never overwrites newer tools, and a failed newer refresh no longer discards an
older one that succeeded.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(workspace): announce a swap of which declared tool is served at an equal count
The attach verdict was keyed on the served count, so replacing one callable
declared tool with another at the same total left the notice unannounced.
Key it on the callable catalog entries themselves.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): drop a connect that a newer add, connect, disconnect or remove superseded
createAndStore committed its result on resume without checking whether the
server had changed while it connected, so a remove brought the server back and
an older config overwrote a newer one. Each call now takes a per-server
generation; a connect that resumes behind a newer one closes its own client
instead of committing.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): take the server's token before the first suspension, and re-check it after each
connect and disconnect took theirs after the config lookup, so a remove that
landed during the lookup could be undone. Mutations that followed a client
close could delete a newer call's state. A superseded connect still persisted
enabled: true, undoing a newer disconnect on disk. Every add, connect,
disconnect, remove and OAuth completion now takes its token first, writes only
while it is current, and connect persists only while it is.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* chore(mcp): mark the changed createAndStore signature
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* chore(mcp): keep disconnect's upstream lines in place around the token
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): order lifecycle calls when they start, before the state lookup
Two calls queued on the first state lookup could resume in either order and
number themselves accordingly. Each call now takes a sequence number before
anything suspends, and a later number always wins.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): re-check the call's token inside the queued enabled-flag write
A disconnect's write could wait in the queue while a later add connected the
server, then write enabled: false over it. The write now asks whether its call
is still the latest, when it starts and again right before it touches the file.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* test(release-validation): assert the enabled-flag writes with their current check
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): check a call's token before its first write, in add and remove
A stale add wrote the runtime config, and a stale remove closed the newer
client, before either found it had been superseded.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): `authenticate()` takes a token, so a remove during its listing wins
The already-authorized path listed tools and committed the client with no
check, so a server removed meanwhile came back connected. It now claims a
token first, like `finishAuth`, and closes its client if a newer call owns
the server.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): `authenticate()` clears only its own OAuth state
A token check around the clear could not stop an older call, waiting on the
auth file lock, from deleting a newer flow's state. `clearOAuthState` now
takes the expected state and compares it inside the lock.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): keep `createAndStore`'s state lookup inside its marker block
The previous change shifted the diff, so Marker Guard read the upstream
lookup as unmarked. The race test now also asserts that a superseded
`authenticate()` returns `disabled`.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): a superseded auth call reports the newer call's status
`authenticate()` returned `failed` when its listing failed after a remove,
and a superseded `finishAuth()` returned its own `connected`. Both now
report the status of the call that won.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): finish an OAuth flow as the call that began it
`finishAuth` claimed a new token, so a late callback could reconnect a
server removed or disconnected after the flow began. Each pending flow
now records its lifecycle token and transport. The browser path clears
only its own state, and remove and `removeAuth` drop pending flows.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix(mcp): `disconnect` drops a pending OAuth transport, like `remove`
A transport a connect left behind has no recorded flow, so finishing it
after a disconnect was a new call that reconnected the disabled server.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix: only a flow begun by `startAuth` or `authenticate` can be finished
- A `startAuth` superseded during setup publishes no flow and clears its own OAuth state.
- `finishAuth` refuses a transport a connect left behind.
- `removeAuth` removes credentials and pending flows only while its claim holds.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
* fix: a superseded sign-in start never overwrites a newer flow's OAuth state
`beginAuth` stores its state only while it still owns the server, checked inside the auth file lock (`McpAuth.updateOAuthState(name, state, current)`), and stops before connecting when a later call has claimed the server.
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_0172qrhMa5TQgETASi5hxMqD
---------
Co-authored-by: ralphstodomingo <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>1 parent 3ab191c commit 9e8f8a3
19 files changed
Lines changed: 2021 additions & 104 deletions
File tree
- packages/opencode
- src
- altimate/workspace
- mcp
- test
- altimate/workspace
- mcp
- fixtures
- release-validation
- session
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| 49 | + | |
| 50 | + | |
48 | 51 | | |
49 | 52 | | |
50 | 53 | | |
| |||
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
| 61 | + | |
58 | 62 | | |
59 | 63 | | |
60 | 64 | | |
| |||
301 | 305 | | |
302 | 306 | | |
303 | 307 | | |
304 | | - | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
305 | 316 | | |
306 | 317 | | |
307 | 318 | | |
| |||
315 | 326 | | |
316 | 327 | | |
317 | 328 | | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
318 | 332 | | |
319 | 333 | | |
320 | 334 | | |
| |||
338 | 352 | | |
339 | 353 | | |
340 | 354 | | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
341 | 358 | | |
342 | 359 | | |
343 | 360 | | |
| |||
656 | 673 | | |
657 | 674 | | |
658 | 675 | | |
659 | | - | |
660 | | - | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
661 | 686 | | |
662 | 687 | | |
663 | 688 | | |
664 | | - | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
665 | 714 | | |
666 | 715 | | |
667 | 716 | | |
668 | | - | |
| 717 | + | |
669 | 718 | | |
670 | 719 | | |
671 | 720 | | |
672 | | - | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
673 | 724 | | |
674 | 725 | | |
675 | 726 | | |
| |||
678 | 729 | | |
679 | 730 | | |
680 | 731 | | |
681 | | - | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
682 | 755 | | |
683 | 756 | | |
684 | 757 | | |
685 | 758 | | |
686 | 759 | | |
687 | 760 | | |
688 | | - | |
| 761 | + | |
689 | 762 | | |
690 | 763 | | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
691 | 767 | | |
692 | 768 | | |
693 | | - | |
694 | | - | |
695 | | - | |
696 | | - | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
697 | 777 | | |
698 | 778 | | |
699 | 779 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
53 | 55 | | |
54 | 56 | | |
55 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | | - | |
18 | | - | |
19 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
20 | 24 | | |
21 | 25 | | |
22 | 26 | | |
| |||
33 | 37 | | |
34 | 38 | | |
35 | 39 | | |
| 40 | + | |
36 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
37 | 45 | | |
38 | 46 | | |
39 | 47 | | |
| |||
225 | 233 | | |
226 | 234 | | |
227 | 235 | | |
228 | | - | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
229 | 316 | | |
230 | | - | |
231 | | - | |
232 | | - | |
| 317 | + | |
| 318 | + | |
| 319 | + | |