Repository navigation
DO NOT MERGE — merge train: 4371,4405,4358,4363,4370 - #4454
Closed
trinity-ability wants to merge 19 commits into
Closed
trinity-ability wants to merge 19 commits into
trinity-ability wants to merge 19 commits into
Conversation
… the portal keeps its 504/429 (#4352) #4340 (#4284) reduced an unforeseen exception's text to its class plus the reader phrases "timed out" / "at capacity", kept only on an exact lowercase hit. The client portal lowercases the error before matching, so an exception saying "Lock Timed Out" or "Agent At Capacity" lost its 504 / 429 there. _exception_words now finds each phrase case-insensitively and passes it on as the exception spelled it, preferring the lowercase spelling when the text has it. The sync /task mapper, the public and MCP chats, the portal and the scheduler therefore each match the error exactly when they matched the original text. Nothing else of the text is passed on. The scheduler's rate-limit words ("429", "rate limit", "too many requests"), which double the RETRY-001 retry delay, join the reader phrases so that delay works again for an unforeseen exception carrying them. Tests: the reader table now drives the sync /task mapper, the public chat, the inline-auth MCP chat and the real portal_chat; plus the scheduler's retry delay, the early-abort network message, an exception with no text, and the overlapping / dotless-i / long-s spellings.
…etry by default (Abilityai/trinity-enterprise#1093) Claude Code emits a telemetry event on every file read that carries a SHA-256 of the file's contents, and also sends error reports and update/feedback checks. Trinity set no opt-out, so every Claude Code agent did this with no admin opt-in. The base image now sets CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC, DISABLE_TELEMETRY and DISABLE_ERROR_REPORTING to 1 in a root-owned managed-settings drop-in (which beats the agent-writable settings env) and in the image ENV (gates read the process env, some before settings load). .env can no longer set those names, nor the two that would detach every drop-in's env from the CLI.
…d describe the admin-env-union flag correctly (Abilityai/trinity-enterprise#1093)
…tected classes (Abilityai/trinity-enterprise#1093) The feature-flows index gets its Recent Updates row; credential-injection's list of names .env cannot set gains the opt-out and the two names that could detach the managed file tier's env; the product-telemetry page points to where runtime vendor traffic is described.
… caveat, and the feature-flag side effect names its source (Abilityai/trinity-enterprise#1093) The guardrails flow still gave the superseded reason for the ENV layer, which the test docstring and the Dockerfile comment no longer state. The user docs now say what the routing-pin answer already says: the protection is against the agent's own files, not an agent using its passwordless sudo.
… drop the PLANNED note The edit-protection comment in agent_server/routers/files.py still said rendering .mcp.json.template at container startup was planned. It shipped in #2007: startup.sh runs agent_server.mcp_template on every boot. Name it as the second sanctioned path. Comment-only; no behaviour change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
POST /api/webhooks/{token} accepts an optional `context`, documented as
appended to the schedule message. The backend framed it into a `message`
variable that was never used, and called the scheduler with only
{"triggered_by": "webhook"}. The agent always got the bare schedule
message; the only trace of the context was `has_context` in the audit log.
The backend now forwards the stripped, capped context in the trigger body.
The scheduler reads it on webhook triggers only and applies the existing
data-not-instructions frame (now `service.frame_webhook_context`) to both
the execution row's message and the message dispatched to the agent.
Manual and cron triggers are unchanged.
Tests: tests/unit/test_4369_webhook_context_forwarded.py covers the
backend forwarding, the recorded message, the cap, non-webhook triggers
and the dispatched message. The #1968 handler stub now accepts `context`.
Closes #4369
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # docs/memory/feature-flows.md # tests/registry.json
…rop-in only, is Claude-gated in .env, and /health says whether it is in force (Abilityai/trinity-enterprise#1093) - No image ENV for the opt-out names: a recreate replays the old container's Config.Env, so an image value would be frozen into every agent and a later admin opt-in could not reach it. A proxied capture shows the drop-in alone holds. - The three opt-out names are refused from .env on a Claude agent only (RUNTIME_OPT_OUT_KEYS, with its own WARN); DISABLE_TELEMETRY and DISABLE_ERROR_REPORTING are generic names other CLIs and tools read. The two names that could detach the managed file tier stay refused on every runtime. - /health reports vendor_telemetry_opt_out (ok, missing, not_root_owned, writable, altered, unsupported_runtime), so an agent on an older image shows as not covered. - The ordering guard now checks every claude command in every RUN: only the install's `claude --version`, which makes no request, may precede the drop-in. - Recorded from the pinned CLI and a live capture: the customer OTLP export (CLAUDE_CODE_ENABLE_TELEMETRY, /api/ops/costs) is gated on its own name and still delivers claude_code.cost.usage; the CLI drops the two detaching names from every settings file's env, so no pin is needed in the drop-in. Both are on the pin-move checklist.
Corrects facts that no longer match dev: PostgreSQL is the default and the images refuse SQLite (#4233), the database driver is synchronous SQLAlchemy over psycopg2, the scheduler job store is in-memory, trigger idempotency uses the idempotency_keys table, and the runtime is pluggable. Open Question 2 is marked resolved. Adds a table of decisions that stand but that the code does not yet honour, and a Proposed Targets section (not adopted, not binding). PULL_MIGRATION_STATUS: Phase 4 (#2532) is merged, not in review. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…king issues Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…elling, and 429 only as a number of its own (#4352) The exception's own letters no longer reach the error: a phrase found only after lowercasing is passed on title-cased, so the 5xx answer carries fixed words only (#4284). Every status reader still answers what it gave the exception's own text. "429" is passed on only as a number of its own. The digits inside 14290, 0.429 or 429s read as a rate limit and doubled a scheduled run's retry delay.
This was referenced Nov 11, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Integration surface for #4371, #4405, #4358, #4363, #4370. Never merged; members merge individually once green.