Repository navigation
Add adapters/ with Claude Code, Cursor, and NAT reference implementations - #22
bar-capsule wants to merge 8 commits into
Conversation
98470b4 to
8e65380
Compare
rocklambros
left a comment
There was a problem hiding this comment.
@bar-capsule I went deep on this branch before writing anything. Checked it out, ran the three suites, read each adapter against the v0.1.0 schemas. The config-only pattern is the right call, and the per-adapter docs are honest about what's deferred. I want to flag a gap before "reference implementation" sticks, because people copy reference adapters line for line, and a few of these would ride along into their deployments. Marking this request-changes so the wire-format and fail-open items get a look before merge, not as a veto on the direction.
I checked all of this against the open issues first (#10 through #19). Those are spec-level: capability resolution, HMAC key management, the conformance program. Nothing below is a dupe. This is adapter-implementation ground. Three of mine have a protocol-level twin and I'll point those out.
The one that matters most: the adapters don't emit the v0.1.0 wire format. In claude-code/acs_adapter.py the request puts acs_version, request_id, timestamp, and metadata at the top level, but request-envelope.json wants them inside params and sets additionalProperties: false. A schema-validating Guardian rejects every request. timestamp goes out as epoch millis (int(time.time() * 1000)) where the schema asks for an ISO-8601 string. The payload uses tool / name / arguments where the hook schema wants the payload wrapper with arguments as {value, provenance}. Same shape in the cursor and nat adapters. The tests stay green because example_guardian.py reads params.get("tool") too, so both sides agree with each other and disagree with the spec. Nothing validates an emitted envelope against acs_schema.json. One test that does would have caught all of it, and it's the highest-leverage thing you can add here.
The deny path fails open on anything it doesn't recognize. In translate_response, an unknown or empty decision returns {}, which Claude Code and Cursor both read as "proceed." ACS_DEFAULT_DENY only kicks in on an exception (Guardian unreachable), not on a Guardian that answers with a verdict the map doesn't know. So a v0.2 disposition, a typo, even a trailing space surviving .lower(), all proceed. NAT already does the right thing and blocks under default_deny. The other two should match it. One line each.
No signing at all (this one's adjacent to #11, not the same). The adapters don't HMAC the envelope, and the example Guardian neither verifies a signature nor checks for replays. The READMEs call this "deferred to transport," but conformance.md:28 lists the baseline signature as a Core MUST, and :67 says transport doesn't satisfy it. #11 is about key distribution and rotation once you're signing. This is the step before: the reference ships with no signing, so every copy starts from an unauthenticated channel. The default http://127.0.0.1:8787/acs in the config keeps that invisible until someone repoints the URL at another host.
Delegation walks around the gate. SubagentStart isn't in HOOK_MAP, Claude Code can't block on it anyway, and example_guardian.py allows Task by default. A subagent spawn isn't evaluated before it acts. That's the adapter-level version of #16, and it lands on the exact confused-deputy path the subagent hooks were promoted to cover. At minimum I'd surface it in mapping.md's "not mapped" list instead of leaving it silent.
On the tests: "40 tests, all passing" is true on your machine, not in CI. NAT's 12 tests skip when nvidia-nat-core isn't installed (I got Ran 12 tests in 0.000s, OK (skipped=12)), Cursor's live test is a skip placeholder, and no workflow runs the adapter tests at all (only sync_version.yml). Skips read as passes, so a regression that lets a denied call through lands green. There's no requirements.txt under adapters/, and the NAT install is unpinned (pip install nvidia-nat-core, no ==). The NAT deny test also catches ACSGuardianDenied and returns without asserting the call was actually aborted, so it passes as long as something raised. This cluster worries me second-most, because green tests on a security control are worse than no tests. Pin the dep, run the unit tests in CI, and have the deny tests assert a real side effect didn't happen (the file wasn't written, the counter stayed at 0).
Smaller stuff, and I'm less sure these are worth blocking on:
example_guardian.py's regex missesrm -fr /,rm --recursive --force /,rm -rf ~, andfind / -delete. It's labeled illustrative so I won't die on this hill, but it's the only thing a newcomer can run on day one, so I'd make it harder to fool or louder about being a toy.- A PostToolUse deny can't undo a side effect that already ran (Claude Code's own hook docs say PostToolUse can't block the action). Cursor's
beforeReadFilereturns{}, so a denied file read still happens. The pre-hooks are the only real gate, and the docs should say so plainly. - NAT's
_build_requestisn't inside the try/except, so a non-serializable kwarg throws beforedefault_denycan catch it. Andpost_invokeignores a result-side deny. mapping.mdand the code disagree on the deny shape for non-PreToolUse hooks. The doc says{"continue": false, "stopReason": ...}, the code emits{"decision": "block", "reason": ...}. One is wrong against Claude Code's contract.
None of this changes my read on the direction. I like where this is going, and the cross-adapter table in the README is genuinely useful. I'd hold the "reference implementation" label until the envelope matches the schema and the deny paths fail closed, since those are the parts people copy without reading the footnotes. Happy to send a PR with the schema-validation test, or pair on the envelope fix if that's faster.
Tracking: I cross-linked the delegation gap onto #16 and the no-signing gap onto #11 so the protocol-level and adapter-level views sit together. The rest of the findings here are adapter-specific with no matching issue.
(cc @afogel since the envelope and signing points touch conformance.md.)
|
Merge-order note: this should land after #21, and after the change-request items above are addressed.
No git conflict with #20 or #21 (this only touches |
Rock's PR GenAI-Security-Project#22 review caught that the three reference adapters and the example Guardian shared a wire format that diverged from specification/v0.1.0/request-envelope.json: acs_version / request_id / timestamp / metadata at the envelope's top level instead of inside params, timestamp as epoch milliseconds instead of ISO-8601 string, tool payload missing the required payload wrapper, arguments not wrapped per tool-call-request.json. Tests passed because the adapter and the example Guardian agreed with each other; the canonical spec was outside the test loop. This commit: - Restructures every adapter's envelope to nest the AcsParams fields inside params, ISO-8601 timestamps, metadata.{agent_id, session_id} populated, payload wrapped per the relevant hook schema, arguments wrapped as {value: ...} per tool-call-request.json:26-37. - Updates example_guardian.py to read from params.payload, gate the Task subagent tool by default, and expand the destructive-Bash regex set (rm -fr, --recursive --force, ~, --no-preserve-root, find / -delete / -exec rm, chmod 777 on system paths). - Fixes the fail-open-on-unknown-disposition bug in claude-code and cursor translate_response; NAT pre_invoke and post_invoke now default-deny on unknown verdicts. - NAT post_invoke now honors a Guardian deny verdict by clearing context.output and setting acs_post_invoke_redacted, matching Specification §6.4's output-redaction gate. - NAT _build_request is now inside the try/except in both pre_invoke and post_invoke so build errors apply the same fail posture as transport errors. - Adds tests/test_envelope_schema.py to each adapter. These validate every adapter-emitted envelope and per-hook payload against the canonical v0.1.0 JSON schemas loaded from $ACS_SPEC_DIR. They are hard-FAIL if the schemas are missing — not skipped — because spec validation is non-negotiable. - Adds .github/workflows/adapter_tests.yml to run the schema + round- trip + live tests per adapter on every push and PR, with the spec schemas pulled from upstream Agent-Control-Standard/ACS:main. - Pins nvidia-nat-core==1.7.0 (adapters/nat/requirements.txt) and jsonschema>=4.20,<5 (adapters/requirements-test.txt). - Updates each adapter's README conformance table to be MUST-honest against docs/spec/conformance.md: handshake, baseline HMAC-SHA256 integrity, replay nonce, system/ping, wrapped MCP are now marked ✗ not implemented, with citations. The previous "deferred to transport layer" claim for baseline integrity was inconsistent with conformance.md:28 and :67. Test counts (all pass, zero hidden skips): claude-code: 17 schema + 13 round-trip cursor: 36 schema + 13 round-trip nat: 6 schema + 7 round-trip + 5 live (NAT 1.7.0) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
The original adapter_tests.yml had three bugs that made it non-functional and reproduced the exact failure mode PR GenAI-Security-Project#22 review flagged: tests "passing" via skips that operators read as green. Fixes: - Python 3.13 → 3.12. NAT 1.7.0 has no 3.13 wheel; the install step would fail silently in skip mode on any NAT-dependent test. - Drop `example-guardian` from the matrix — no tests/ directory there; the matrix entry crashed on `unittest discover tests`. - Add the cross-adapter conformance suite (`adapters/test_acs_core_ conformance.py`) as its own job. That 48-test file was previously not run by CI at all. Skip handling, per Rock's "skips read as passes" point: - NAT job: NAT is installed (pinned `nvidia-nat-core==1.7.0` + matching `nvidia-nat-langchain`), so ANY skipped test means the test gating is buggy. Hard fail. - Conformance job: zero skips allowed — every ACS-Core MUST runs. - Other adapters: surface skips as warnings (Claude Code's live tests legitimately skip when the `claude` CLI isn't installed in CI; Cursor has a manual-procedure placeholder). Both intentional. Now exercises ~190 tests on every push to adapters/ or specification/, with the load-bearing security tests pinned and required. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
Thanks @rocklambros for the thorough review! every item addressed. Wire format vs request-envelope.json - Every emitted envelope is schema-validated against canonical request-envelope.json from $ACS_SPEC_DIR (not against fixtures, not against the example Guardian's shape). params wrapper, ISO-8601 timestamps, payload + {value, provenance} arg wrapping - all to spec. Deny fails open on unknown - _fail(cause=…) taxonomy across all three adapters covering transport, adapter exception, signature failure, and 7 JSON-RPC error codes via shared guardian_error_cause(). Unknown disposition + ACS_DEFAULT_DENY=1 → block; otherwise an ACS_AUDIT fail_open_bypass event with the cause label. Signing - HMAC-SHA256 across all three adapters via adapters/_common/. Every envelope signed; every response verified. SIGNATURE_INVALID / REPLAY_DETECTED / TIMESTAMP_OUT_OF_WINDOW each map to a distinct audit cause. Subagent delegation - example_guardian gates Task by default (subagent_gated); opt-in via ACS_ALLOW_SUBAGENT=1. Each adapter's mapping.md lists where delegation hooks aren't honorable by the framework. Tests on tests - Deny tests now assert the real side effect didn't happen, the way you described — counter checks plus, for NAT, a canary-file pattern (if rm -rf runs despite the deny, the canary file vanishes regardless of what the counter says). A real Vertex/Gemini react_agent run surfaced silent-bypass bugs the synthetic tests would have shipped; all have regression tests. CI workflow - Pinned nvidia-nat-core==1.7.0 + nvidia-nat-langchain==1.7.0, Python 3.12, runs the per-adapter + conformance suites on every push to adapters/ or specification/, hard-fails on any skipped NAT or conformance test. Smaller items: rm regex hardened (-rfv, -fr, --recursive --force, --no-preserve-root). READMEs say plainly that pre-hooks are the gate; post-hooks redact via output=None + audit. NAT _build_request moved inside try; post_invoke result-side deny propagates. mapping.md and code now agree on deny shape. Would appreciate re-review when you have a window. |
…w Wrapped MCP claim Two findings from Rock's review of PR GenAI-Security-Project#22: P1.1 — Conformance CI fails for the right reason now. Without rfc3339-validator installed, jsonschema's date-time format checker silently no-ops and test_timestamp_is_iso8601 false-passes (invalid "yesterday" passes validation; assertion sees an empty error list; CI shows green on a real wire-format bug). Pin rfc3339-validator in adapters/requirements-test.txt + add a fail-fast setUpClass guard that rejects any future degradation: if the date-time checker accepts "not-a-date", the whole conformance class refuses to run with a pointed error message. P2.2 — Wrapped MCP claim narrowed. conformance.md:26 lists protocols/MCP/* as part of the Core baseline. Our Core10_WrappedMcp suite verifies the WIRE-FORMAT shape (envelope validates, Guardian returns a structured response, no crash) but not full MCP request wrapping; the reference Guardian routes incoming MCP through the standard toolCallRequest path with the tool name reflecting the MCP method. The module docstring and the top-level adapters/README now say plainly that a green run = "ACS-Core baseline minus full Wrapped MCP", not "the whole baseline". v0.2 deferral marked explicitly. Deployments needing full wrapping must extend the Guardian. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
… to malformed base64
Reviewer caught that base64.b64decode() in verify_signature() ran
without exception handling. A malformed signature value
("not-base64", padding garbage, truncated input) raised
binascii.Error up to the Guardian's request handler, which only
catches GuardianError. Result: a bad signature tore down the
request path on the wire (uncaught exception, 500-class response)
instead of returning the spec's SIGNATURE_INVALID (-32004). Same
risk on the adapter side for malformed signed responses. Security
control was a DoS vector.
verify_signature() now catches binascii.Error / ValueError /
TypeError around the b64decode and returns False — the existing
caller chain (Guardian's check_signature, adapter's response
verification) then emits -32004 with cause=signature_invalid_*
and the audit event fires correctly.
Regression test: Item15_VerifySignatureRobustToMalformedBase64
exercises 7 forms of unparseable input (garbage, padding-only,
mid-string padding, oversized, empty); every one must return
False, none may raise.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…ation-only on every adapter
Reviewer caught that ACS-Core §hooks.md describes agentResponse as
decision-eligible (ALLOW / DENY / MODIFY), but every adapter
silently drops denies on the hook that produces it. Claude Code
maps Notification → agentResponse and returns {} on deny; Cursor
afterAgentResponse does the same; NAT lifecycle hooks are
fire-and-forget through the IntermediateStepManager subscription.
The framework constraint is real and not fixable in this PR:
- Claude Code's Notification fires AFTER assistant message
delivery — no veto path.
- Cursor's afterAgentResponse fires AFTER the message — same.
- NAT's IntermediateStepManager is a notification stream;
subscriber callbacks cannot abort an event after it fires.
This commit makes the docs honest about that. Each adapter's
mapping.md now marks the relevant hook explicitly as
"observation-only" with an explanation of which framework
boundary blocks pre-delivery enforcement. The per-adapter
README conformance tables narrow the dispositions claim to
"ALLOW / DENY / MODIFY on pre-execution hooks" with a pointer to
mapping.md for lifecycle / post-execution observation-only
posture.
Also includes a hunk missed from the previous Wrapped MCP commit:
adapters/README.md's top-level claim now says "ACS-Core baseline
minus full Wrapped MCP" to match what the conformance suite
actually verifies.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…claim on post_invoke redaction Reviewer caught that the Post-tool-deny-redaction row still said post_invoke sets acs_post_invoke_redacted=True, contradicting the code in adapters/nat/acs_adapter.py:294 / :717 — InvocationContext is a strict Pydantic model and that extra attribute would crash. The real redaction signal is context.output = None plus the ACS_AUDIT post_invoke_redacted event. README now says so. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
I ran this rather than just reading it, and the first thing I hit is that the CI job can't fail. Everything else I found is downstream of that in one way or another, so I'll start there. This is a long comment because it's a 14,515-line PR that turns a docs repo into a code repo. The work is real and the threat model in The CI gate reports success when the tests failBoth test steps pipe into python -m unittest test_acs_core_conformance -v 2>&1 | tee out.log # line 39
python -m unittest discover -v tests 2>&1 | tee out.log # line 83GitHub's implicit shell for I checked rather than assuming: The header comment says the workflow "addresses the 'skips read as passes' failure mode," and the skip grep at lines 41 and 91 does work. So right now the job catches "a test didn't run" and misses "a test ran and failed," which I'd argue is worse than no workflow, because the badge certifies something false.
The conformance suite can't run from a fresh clone
Running the documented command from Two things make this worse than a broken default. The documented remedy in
The Claude Code adapter drops subagent events entirelyI said something wrong about this earlier and want to correct it. HOOK_MAP: dict[str, str] = {
"SessionStart": ..., "SessionEnd": ..., "UserPromptSubmit": ...,
"PreToolUse": ..., "PostToolUse": ..., "Notification": ..., "Stop": ...,
}
if hook_name not in HOOK_MAP:
return 0Feeding it a Cursor has the mirror-image problem. NAT's And even if all three emitted,
|
…d honest scoping (PR GenAI-Security-Project#22 review) Squashed response to the full PR GenAI-Security-Project#22 review. Ships the three reference adapters (Claude Code, Cursor, NAT) as ACS v0.1.0 EMISSION conformance: the adapters, driven through their real production entry points, emit schema-valid, signed Core traffic and honor the decisions the suite tests — validated against the canonical schemas by an independent oracle. It is deliberately NOT a full ACS-Core deployment-conformance claim (that spans Guardian + framework wiring + production config and is tracked as milestone GenAI-Security-Project#33). Enforcement correctness - Guardian REFUSALS (SIGNATURE_INVALID, REPLAY_DETECTED, TIMESTAMP_OUT_ OF_WINDOW, malformed/oversized envelope) fail CLOSED regardless of posture — each is attacker-reachable, so routing them through the §6.4 fail-open posture was a bypass primitive. HTTP-layer refusals (413/400) and oversized envelopes are caught before the wire. - Error responses are signed (schema + Guardian + adapters); an unsigned spoofable error under fail-open is an allow. - Handshakes are signed (only system/ping is signature-exempt, §13); forward-compat accepts matching-major versions; malformed ClientHello and non-object/batch JSON-RPC return -32600 instead of crashing. - Claude Task spawns emit steps/subagentStart (confused-deputy gate); Cursor default installer + example wire it fail-closed on BOTH ACS_DEFAULT_DENY=1 and failClosed:true; the Guardian gate is deny-by-default; no fabricated subagent lineage. - ServerHello on_decision_failure is honored (most-restrictive-wins); handshake failures negative-cached; secret-file-unreadable and unsigned-mode are loud, not silent; rfc8785 is a hard dependency. Emission conformance suite - CaptureGuardian oracle validates the exact bytes each production adapter sends (real subprocess for Claude/Cursor; real middleware pre/post_invoke + lifecycle observer for NAT) against the canonical schemas, with an INDEPENDENT HKDF+HMAC+JCS signature verifier (not acs_common) pinned by a frozen known-answer vector, and proven non-vacuous by negative self-tests. - Per-event: each Core method emitted once, envelope+payload valid, UUID/RFC3339/metadata/{value}-wrapper invariants. Per-session: handshake-once, unique request_ids, request_id_ref correlation, advertised==emitted (both directions). Truthful gating - One authoritative runner with platform selection (claude|cursor|nat), pass/skip/fail reported separately, exact (suite,test,reason) skip allowlist, fails on any UNEXPECTED skip. CI: shell:bash/pipefail (failing suites can't read green), DCO check, pinned deps + SHA-pinned actions, NAT installed so its tests run. - Example configs are under test (the file people copy), not just wire.py output. De-duplication - Emission is the sole schema-validation owner; the double-validating build_request() schema tests were removed after moving every mapped native event into the emission matrix (coverage verified preserved). Suite reflects distinct assertions, not overlapping layers. Docs - Claim scoped to emission conformance throughout; hard-coded test counts removed; Wrapped-MCP kept as shape-only with its Core status flagged as a pending spec-owner decision. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Bar Kaduri <bar@capsule.security>
There was a problem hiding this comment.
Five findings from running the branch , with four of the five are one mistake in different places.
- A Guardian DENY with a trailing space executes the tool call. §6.4:158 says an arrived decision must be honored regardless of posture, and §6.3:146 already rules that an unusable one is a DENY.
- Failing closed on
StopandSubagentStopemits{"decision":"block"}, which Claude Code reads as "do not stop, continue".subagent-stop.json:5marks both hooks not decision-eligible. settings.json.examplepasses all four settings through a per-hook"env"object that Claude Code does not implement, so a copied config runs unsigned, fail-open, with no audit sink. The test guarding that file asserts the same discarded field.- Without
rfc8785the adapter exits 1 with empty stdout, which Claude Code treats as non-blocking, so the tool runs with no audit event and no regard forACS_DEFAULT_DENY. - The cached ServerHello is read without verifying its signature, so the observed agent flips its own fail posture by editing one word in a predictable path, or by touching an empty
.failedmarker.
The tests have a similar blind spot. The suite covers a Guardian that says nothing, thoroughly, across all three adapters. It does not cover a Guardian that says something unusable, or a framework that ignores what the config tried to say. §6.4:156 and §6.4:158 draw exactly that line, and the suggested expectations put it under test.
Two notes on scope, neither one a code comment.
§6.4:156 lists "malformed response" among the transport failures, which is where treating an unreadable decision as a decision failure finds cover. Line 158 then says an arrived decision must be honored regardless of posture. Those rub against each other for the case in finding 1. A clarifying sentence in §6.4 would turn that comment from an argument into a bug report, and settle the same question for whoever writes a fourth adapter. It fits with #32 rather than this PR.
This branch also carries three normative schema edits: subagent-stop.json drops final_chain_hash from required, response-envelope.json adds a signature to the error object, and otel-mapping.json moves an attribute to optional. The reasoning behind each looks sound. The PR description still says the change set touches no normative spec text. They want their own PR and a spec-owner decision, especially with #21, #31 and #32 open on adjacent ground.
|
@bar-capsule The order for your three PRs is #21, then #20, then this one. Once #21 merges I'll push the alignment commit here myself. It updates the The |
|
@bar-capsule the adapters here can't complete a handshake with the TypeScript reference Guardian, or with any Guardian that follows the schema. Against this branch at @President caught this on #162, and @Lrd0036 fixed it there in d077978 with a 277-line contract test. The same commit moves git fetch https://github.com/GenAI-Security-Project/agent-control-standard pull/162/head
git cherry-pick -s d07797805945801e443ab04eaf3a1f8c5c332ff8
# stops on adapters/codex/tests/test_adapter.py, which doesn't exist on this branch
git rm adapters/codex/tests/test_adapter.py
git show 3d4bdb3e84665e6db13835bc075ee8ec876bc14b -- adapters/_common/acs_common.py | git apply --3way
git add adapters/_common/acs_common.py
git cherry-pick --continueThe commit keeps @Lrd0036 as author, with both sign-offs. On my machine |
Read ServerHello directly from the JSON-RPC result on fresh and cached handshakes. Update both Python response producers and the affected fixtures while retaining response binding, signature verification, and whole-envelope cache validation. Add focused regressions for direct-result negotiation, cache reuse, tampering, unsigned responses, request binding, legacy wrappers, schema conformance, and the shipped Python Guardian round trip. Signed-off-by: Lrd0036 <lrd0036@auburn.edu> Signed-off-by: Bar Kaduri <bar@capsule.security>
handshake.json says clients MUST treat methods absent from the ServerHello's methods_evaluated as ALLOW-by-default. The adapters never read the field, so every method was sent, and a Guardian's error on an unevaluated one counted as a decision failure: fail-closed blocked every prompt, and fail-open logged a spurious fail_open_bypass per lifecycle event. All three adapters now skip methods the Guardian does not evaluate and record them as method_not_evaluated. The turn still opens locally when turnStart is unevaluated, and a toolCallResult drops its request_id_ref when the originating request was not sent. Claude Code returns no output for a skipped hook, leaving its own permission flow in charge; Cursor returns its explicit allow shapes, since failClosed gates read an empty reply as a failed hook. With no negotiated list, behavior is unchanged. Signed-off-by: Bar Kaduri <bar@capsule.security>
|
@rocklambros - I cherry-picked d077978 as you laid out: 243 passed, matching yours, and NAT 35/35. I found another problem: the adapters never read Fixed in the next commit: unevaluated methods are recorded as method_not_evaluated and not sent, the turn still opens locally, and a result never cites a request that wasn't sent. 8 new tests (7 covering Claude Code and Cursor, 1 for NAT); adapter gate now 250 passed with 1 expected skip, NAT 36/36. Thanks @Lrd0036 !! |
Anchor the Core citation guard to its section and ordered requirement names so upstream diagrams do not break conformance checks. Preserve behavioral assertions and cover moved, missing, and renamed citations. Disable checkout credential persistence in the adapter jobs and correct the setup-bun version comment to match its existing pin. Signed-off-by: Lrd0036 <lrd0036@auburn.edu> Signed-off-by: Rock Lambros <rock@rockcyber.com>
The adapter notes described the conditional subagentStart floor, the Wrapped MCP scope, and the SHOULD-level liveness rule as open proposals. They are now part of ACS-Core, so the notes state them as the floor. The conformance tables now say what each adapter does about them. Claude Code and Cursor emit subagentStart, and NAT does not. Claude Code and Cursor flatten MCP tool calls onto toolCallRequest and toolCallResult. None of the three wraps any other MCP surface, which leaves a session that uses MCP short of ACS-Core there. None of them sends system/ping, so a deployment must name an alternative liveness mechanism. Only comments, docstrings, documentation, and the wording of one installer notice change. Runtime logic and test assertions stay as they were. Signed-off-by: Rock Lambros <rock@rockcyber.com>
Signed-off-by: Rock Lambros <rock@rockcyber.com>
|
@almogbhl @stefanoamorelli this is ready for review. These are the coding agent adapters, so it's your call, and an approval from either of you covers everything under adapters/. The PR also touches .github/workflows/adapter_tests.yml, .gitignore, and CONTRIBUTING.md, which need a project lead's approval, so I've added @afogel for those. #21 merged, so the ACS-Core floor these adapters describe is on integration now, and this branch carries it. I cherry-picked Lance's citation-guard fix from #162 (49f5232), which anchors the guard on requirement names so the diagram #77 added doesn't break it anymore. The same commit sets persist-credentials: false on the adapter workflow's checkouts. eb69849 replaces the "PR #21 (open; not in this branch)" hedges and updates the subagentStart, Wrapped MCP, and liveness notes to match the merged floor. Nothing in the runtime logic or the test assertions changed. On integration plus this branch, the adapter suite passes 251 tests with 3 expected skips (the live Claude CLI check and the manual Cursor procedure). I couldn't run the NAT suite, because it needs the NVIDIA runtime. @bar-capsule can you run python3 run_conformance.py nat once more? Your last run was 36 of 36. #20 doesn't gate this, since the two PRs share no files. @bar-capsule the hold on pushing to bar/adapters is lifted. Once this merges, please open the subagentStop wiring as a new PR against #131. |
…orce flags The find patterns put a word boundary after the path, and no boundary sits between / or ~ and the space after it, so find / -delete, find ~ -delete, and find / -exec rm passed. The path now ends at whitespace. A new pattern catches rm -r -f / and other orders of separate recursive and force flags. Signed-off-by: Rock Lambros <rock@rockcyber.com>
Everything in this review is fixed on the current head, including the alignment with the merged ACS-Core floor.
afogel
left a comment
There was a problem hiding this comment.
Hey! adding a few more blocking changes, unfortunately, and made some suggestions for layout of the functionality for easier maintainability and readability (and hopefully reviewability moving forward). Also, I noticed we probably should cover async functionality for this, but we can likely kick that to a future PR rather than expanding scope here.
|
|
||
| --- | ||
|
|
||
| ## Directory layout (identical across all three adapters) |
There was a problem hiding this comment.
Blocking: let's give adapters/ a package layout with the boundaries a future SDK needs.
We're not calling this an SDK yet. But _common is already becoming the client library, and example_guardian a Guardian library. If we set those boundaries and the names users depend on now, the later move is a rename and a publish.
What the current layout costs:
claude-codeandexample-guardianaren't valid module names, so every test usessys.path.insert(...).- Three files named
acs_adapter.pycollide insys.modules.run_conformance.py:167runs each suite in a subprocess to work around it. - Client logic (
_guardian_roundtrip,_fail,_force_deny, handshake wiring, posture globals) is copied into each adapter, and the copies have drifted apart.
Proposed layout:
adapters/
├── pyproject.toml # distribution "acs-adapters"; extra [nat]
├── src/acs/ # permanent import name
│ ├── core/ # no I/O: envelope, signing, decision, handshake types, errors, schemas/
│ ├── client/ # config, posture, session, store, transport, audit, govern()
│ ├── integrations/<framework>/ # translation only: events, hooks, responses, wire, __main__
│ ├── guardian/ # server, replay/skew/chain, Policy protocol
│ ├── examples/destructive_bash.py
│ └── testing/ # CaptureGuardian, assert_conforms(...)
├── tests/ # mirrors src/acs/
└── docs/<framework>/ # mapping.md, *.example configs
Imports flow integrations → client → core ← guardian, enforced in CI by an import-linter contract. The client stays synchronous in this PR. Keeping core/ free of I/O lets an async client be added in a follow-up without touching it (see the comment on nat/acs_adapter.py:995).
Names users depend on. Fix these now:
- Import path
acs. The distribution name changes later, not the imports. Check first that no common PyPI package already installs a top-levelacsmodule. - Hook commands as console scripts (
acs-claude-code-hook,acs-cursor-hookunder[project.scripts]), so user configs never refer to a module path. ACS_*environment variables, documented as stable.- An
acs.integrationsentry-point group, so integrations from other repos plug in the same way.
Also: each layer's public API goes in __all__, with internals in _-prefixed modules. Use one package version from metadata (today NAT says 0.1.2 and Claude Code says 0.1.3), and bundle the schemas into core/schemas/.
Where today's files go:
| Today | Moves to |
|---|---|
acs_common.py: JCS, HKDF, signing, error codes, decision rules |
core/ |
acs_common.py: handshake cache, session state, audit, URL checks |
client/ |
Each adapter's round trip, _fail, _force_deny, posture globals |
client/, written once |
Each adapter's payloads, translators, HOOK_MAP, turn/subagent handling |
integrations/<framework>/ |
example_guardian.py wire handling / toy policy |
guardian/ / examples/ |
capture_guardian.py, test_harness.py, e2e_report.py |
testing/ |
Why this helps:
- Migration: becoming the SDK changes only the distribution name. Imports, hook commands, environment variables and tests stay the same.
- Maintenance: posture and handshake fixes land once, in
client/, not three times. - Readability: each integration contains only its framework's translation.
- Review: a move-only first commit shows up as renames, so the 19.7k-line diff stops being 19.7k lines to read.
| @@ -0,0 +1,1064 @@ | |||
| #!/usr/bin/env python3 | |||
There was a problem hiding this comment.
Part of the proposed layout change: this file can split into an integration plus shared client code.
| Concern | Functions | Moves to |
|---|---|---|
Native event → HookEvent |
_agent_id, _is_subagent_spawn, _tool_use_request_id |
integrations/claude_code/events.py |
| Event → payload | _payload_*, HOOK_MAP, KNOWN_UNMAPPED |
integrations/claude_code/hooks.py |
| Decision → native output | _pretool_response, _block_response, _translate_* |
integrations/claude_code/responses.py |
| Turns, round trip, posture | _open_turn, _close_turn, call_guardian, _guardian_roundtrip, _fail, _force_deny |
client/ |
| Entry point | main |
__main__.py, about 5 lines |
What to share with Cursor: five functions are near-identical and can move to client/ now: _effective_default_deny, call_guardian, build_turn_start_request, _guardian_roundtrip, and _current_turn_id. The rest, including main, _fail, _force_deny and translate_response, have drifted apart. Make them converge in small steps with the tests passing, and extract once they match. Extracting now would mean a shared version with a flag for every difference.
Why this helps:
- Maintenance: 1,064 lines here and 1,262 in Cursor shrink to translation only, and the protocol logic exists once.
- Review: each integration can be checked against its
mapping.mdwithout reading transport code.
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) | ||
|
|
||
|
|
||
| def normalize_decision(result: Any) -> tuple[str, str, dict]: |
There was a problem hiding this comment.
Suggestion, non-blocking: return a Decision value instead of a tuple. Goes in core/decision.py.
normalize_decision returns (decision, reasoning, modifications). Every translator then takes it as four positional arguments, and each adapter repeats the decision not in KNOWN_DECISIONS check (claude-code:768, cursor:952, nat:862) with its own fail-closed branch.
# core/types.py: shared JSON types
JSONValue: TypeAlias = str | int | float | bool | None | list["JSONValue"] | dict[str, "JSONValue"]
JSONObject: TypeAlias = dict[str, JSONValue]
# core/decision.py
Disposition: TypeAlias = Literal["allow", "deny", "modify", "ask", "defer"]
@dataclass(frozen=True)
class Decision:
disposition: Disposition
reasoning: str = ""
modifications: Modifications | None = None # frozen dataclass for the modifications.json shapes
@classmethod
def from_result(cls, result: JSONValue) -> Decision:
"""Never raises. Unknown disposition, bad MODIFY composition → deny (§6.3)."""modify_composition_violation moves into from_result, so an invalid MODIFY can't be constructed at all. result is typed JSONValue, not Any, because it's whatever json.loads returned, and from_result has to narrow it.
Why this helps:
- Maintenance: "an unknown disposition means deny" lives in one place for all three adapters, and the three
KNOWN_DECISIONScopies go away. - Readability: translators take a single typed
Decisionargument, and a type checker can verify every branch ondisposition. - Migration:
Decisionis a natural part of the publicacs.coreAPI.
| if (not method_evaluated(server_hello, origin) | ||
| and request["params"]["payload"].pop("request_id_ref", None) is not None): | ||
| # The originating request was never sent, so citing it would dangle. | ||
| sign_envelope(request, session_id=request["params"]["metadata"]["session_id"]) |
There was a problem hiding this comment.
Suggestion: sign once, as the last step before sending. If we restructure the layout, I imagine this would go in core/envelope.py.
Currently, build_request signs the envelope, then this branch removes request_id_ref from the signed payload and signs it again. Cursor does the same at line 1156. It's correct today, but every future edit after signing has to remember to re-sign.
SessionKey = NewType("SessionKey", bytes) # the HKDF-derived per-session key
@dataclass(frozen=True)
class Envelope:
rpc_id: str # JSON-RPC id, needed to bind the response
method: str
request_id: str
timestamp: str
metadata: Mapping[str, JSONValue] # JSONValue: see core/types.py
payload: Mapping[str, JSONValue]
def without_ref(self) -> Envelope: ... # returns a copy; nothing to re-sign
def signed_body(self, key: SessionKey) -> bytes: ... # the only place a signature is createdclient/transport.py calls .signed_body() and POSTs the result directly. Because it returns bytes, the same code serves today's synchronous transport and a future async one.
Why this helps:
- Maintenance: nothing runs between signing and sending, so forgetting to re-sign becomes impossible.
- Review: one function produces both the signature and the bytes on the wire.
|
|
||
| # ─── Main flow ────────────────────────────────────────────────────────────── | ||
|
|
||
| def _guardian_roundtrip(request: dict[str, Any], hook_name: str, |
There was a problem hiding this comment.
Suggestion: classify the Guardian's answer here, and decide what to do about it somewhere else. In how I'm thinking about it, this would go in client/posture.py.
This function does three jobs at once. It finds out what happened, chooses fail closed or the configured posture, and writes the hook's native response through _fail and _force_deny. Because the response is already written, it returns a (response, terminal) tuple, and every caller has to remember to check terminal. The rule "which causes fail closed?" is spread across 10 return statements.
@dataclass(frozen=True)
class Decided:
decision: Decision # good, bound, signed result
@dataclass(frozen=True)
class Undecided: # no usable answer arrived → §6.4 posture applies
cause: str # transport_failure, decision_timeout, adapter_exception, …
audit: Mapping[str, JSONValue] # extra fields for the audit record
@dataclass(frozen=True)
class Refused: # something answered wrongly → always fail closed (#32)
cause: str # binding mismatch, bad signature, refusal codes, oversize
audit: Mapping[str, JSONValue]
Outcome: TypeAlias = Decided | Undecided | RefusedThe round trip returns an Outcome with no side effects. FailPosture.resolve(outcome) turns it into a Decision (see my comment on line 172), and the integration writes the native response.
Why this helps:
- Review: the fail-closed rule becomes one readable list: the causes that produce
Refused. - Maintenance: the tests can check the classification without capturing stdout. Cursor's
_guardian_roundtriphas the same shape and uses the same code.
| result=context.output, | ||
| request_id_ref=correlation_id if request_sent else None, | ||
| ) | ||
| response = self._call_guardian(request) |
There was a problem hiding this comment.
Suggestion: run the blocking Guardian call off the event loop.
| response = self._call_guardian(request) | |
| response = await asyncio.to_thread(self._call_guardian, request) |
Why this helps:
- Correctness: frees the event loop during the Guardian round trip. The behavior and the existing
exceptclauses are unchanged. - Apply this together with the
import asynciosuggestion on line 48.
| "allow": "allow", "deny": "deny", "ask": "ask", | ||
| } | ||
|
|
||
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) |
There was a problem hiding this comment.
Suggestion: use the shared KNOWN_DECISIONS instead of redefining it.
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) | |
| from acs_common import KNOWN_DECISIONS # noqa: E402 |
Why this helps:
- Maintenance: one definition of the five dispositions. If the spec changes them, three copies won't drift.
- Note: the
acs_commonimport above has already succeeded by this line. Adding it to that import list is cleaner still.
| "allow": "allow", "deny": "deny", "ask": "ask", "defer": "ask", # no native defer | ||
| } | ||
|
|
||
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) |
There was a problem hiding this comment.
Suggestion: use the shared KNOWN_DECISIONS instead of redefining it.
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) | |
| from acs_common import KNOWN_DECISIONS # noqa: E402 |
Why this helps:
- Maintenance: one definition of the five dispositions. If the spec changes them, three copies won't drift.
- Note: the
acs_commonimport above has already succeeded by this line. Adding it to that import list is cleaner still.
| return str(data) | ||
|
|
||
|
|
||
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) |
There was a problem hiding this comment.
Suggestion: use the shared KNOWN_DECISIONS instead of redefining it.
| KNOWN_DECISIONS = frozenset({"allow", "deny", "modify", "ask", "defer"}) | |
| from acs_common import KNOWN_DECISIONS # noqa: E402 |
Why this helps:
- Maintenance: one definition of the five dispositions. If the spec changes them, three copies won't drift.
- Note: the
acs_commonimport above has already succeeded by this line. Adding it to that import list is cleaner still.
|
|
||
| **What this proves — and what it does not.** This suite proves **emission conformance**: the reference adapters, driven through their real production entry points, emit schema-valid, signed ACS v0.1.0 Core traffic and honor the decisions it tests. It is **not** a requirement-by-requirement audit of every ACS-Core MUST — `docs/spec/conformance.md` and the sections it cites contain far more normative requirements (handshake/negotiation edge cases, full decision semantics, two-sided live payload validation, hook-completeness, Wrapped MCP) than are checked here. A full ACS-Core deployment-conformance claim also spans the Guardian, the framework wiring, and production configuration — not the adapter alone. That larger program is tracked as a separate milestone (requirement ledger + behavioral tests); do not read a green run here as "ACS-Core conformant." | ||
|
|
||
| Known limitations kept in view: Cursor's real-framework wiring is a manual GUI procedure, and Wrapped MCP is validated for namespace shape only, not full wrapping. ACS-Core requires `protocols/MCP/*` for any session that involves MCP and lets only MCP `tools/call` collapse into the generic tool hooks. These adapters perform that collapse and wrap no other MCP surface, so a session that uses MCP falls short of ACS-Core there. Milestone #33 tracks the reference-stack side. |
There was a problem hiding this comment.
Small ask: state the Trace scope.
| Known limitations kept in view: Cursor's real-framework wiring is a manual GUI procedure, and Wrapped MCP is validated for namespace shape only, not full wrapping. ACS-Core requires `protocols/MCP/*` for any session that involves MCP and lets only MCP `tools/call` collapse into the generic tool hooks. These adapters perform that collapse and wrap no other MCP surface, so a session that uses MCP falls short of ACS-Core there. Milestone #33 tracks the reference-stack side. | |
| Known limitations kept in view: Cursor's real-framework wiring is a manual GUI procedure, and Wrapped MCP is validated for namespace shape only, not full wrapping. ACS-Core requires `protocols/MCP/*` for any session that involves MCP and lets only MCP `tools/call` collapse into the generic tool hooks. These adapters perform that collapse and wrap no other MCP surface, so a session that uses MCP falls short of ACS-Core there. Milestone #33 tracks the reference-stack side. The adapters also emit no Trace events and do not claim ACS-Trace: `ACS_AUDIT` lines are local audit records, not OpenTelemetry or OCSF output. |
Why this helps:
- Readability: the limitations list is complete, so nobody reads "ACS v0.1.0 conformance" as covering Trace. The OTel spec gaps go to separate issues and don't block this PR.
Summary
A top-level
adapters/directory with reference adapters that wire three agent frameworks to an ACS Guardian through configuration only — no agent code changes — plus a runnable example Guardian and the conformance machinery that proves what the adapters emit.adapters/claude-code/settings.jsonwiring, explicit turn tracking (turnStart/turnEnd), native allow/deny/ask, modify via mergedupdatedInput, automated live tests againstclaude --printadapters/cursor/hooks.jsonwiring, documented-field payloads (docs.cursor.com, 2026-08-22),permission+ exit-code-2 blockingadapters/nat/FunctionMiddlewarefor NVIDIA NAT 1.7.0, configured in workflow YAML; a Guardian deny prevents the target function executingadapters/example-guardian/adapters/_common/acs_common(RFC 8785/JCS + HKDF-per-session HMAC signing, handshake with signed-ServerHello binding, total decision normalization) + the conformance and emission suites265 automated checks green in CI: 230 in the adapter gate (guardian conformance,
_common, claude-code, cursor — including emission tests that validate the exact bytes each adapter emits against the in-repo schemas and recompute signatures independently) plus 35 NAT, plus one documented manual procedure for Cursor live verification.Scope, stated plainly
tests/live_verification.md); the adapter is fully tested headlessly. Claude Code and NAT have automated live tests.KNOWN_UNMAPPED+ eachmapping.md) — fabricating unknowable fields would corrupt the artifacts they exist for.subagentStopre-wires once Set the ACS-Core floor: MODIFY and system/ping to SHOULD, Wrapped MCP and subagentStart as conditional MUSTs #21 makesfinal_chain_hashoptional.git diffagainst the base touches nospecification/file: adapters, the CI workflow,.gitignore, and one CONTRIBUTING section.The adapter pattern
ACS-Core specifies what a hook event looks like on the wire and what the Guardian's decision looks like coming back. It does not dictate how a framework physically wires the interception in. Each adapter demonstrates the boundary choice for its framework:
hookSpecificOutput.permissionDecisionargv[1]permission(top-level, per-event) + exit code 2FunctionMiddlewareclassACSGuardianDenied(NAT 1.7.0) orInvocationAction.SKIP(NAT dev)All three emit the same signed ACS envelope. Decision honoring follows §6.4: fail-open-with-audit by default, fail-closed via
ACS_DEFAULT_DENY=1or the ServerHello posture; Guardian refusals always fail closed (deliberately stricter than v0.1 text, tracked in #32).The top-level
adapters/README.mdcontains a step-by-step walkthrough with concrete JSON payloads, a cross-adapter comparison table, and a flow diagram. Read that first.Why in-spec
adapters/and not separate reposSingle repo for spec + reference implementations on the first batch makes the spec evolve alongside the adapters that exercise it (the tests on this PR found several real schema gaps between docs and actual behavior — that feedback loop is what makes the spec text trustworthy). When the pattern stabilizes and individual adapters need their own release cycle, splitting to separate repos (or packaging, per the SDK plan) is straightforward.
Sequencing
Base is
integration,status:blockedon #21 — the Core floor this posture conforms to. When #21 lands, one alignment commit updates the floor references and wiressubagentStop.Running
Closes #134.