Skip to content

DO NOT MERGE — merge train: 4461,4489,4601,4605,4593,4530,4462,4567,4594,4569,4624 - #4626

Closed
trinity-ability wants to merge 27 commits into
devfrom
train/20261117-1746
Closed

trinity-ability wants to merge 27 commits into
devfrom
train/20261117-1746

Conversation

@trinity-ability

Copy link
Copy Markdown
Contributor

Integration surface for #4461, #4489, #4601, #4605, #4593, #4530, #4462, #4567, #4594, #4569, #4624. Never merged; members merge individually once green.

vybe and others added 27 commits November 10, 2026 21:48
4,430 first-party findings across 690 files (June: 1,361). Compares against
the 2026-06-02 audit, lists hotspots, and notes the frontend .js coverage gap.
Follow-up issues: #4457, #4458, #4459, #4460.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…ert expiry wording

Since #4016 the sync_failing, sync_diverged and git_bloat rows keep their
own row type, so queueSeenLine and queueEnding, which keyed on
type === 'alert', dropped the "seen N times" line and said "nobody
answered in time" when one expired. Both now treat a row with a subject
(the platform alert's condition key) as an alert too.

Fixes #4139
…4486)

The platform prompt teaches agents tool names on every turn, and only the
delegation contract was pinned against the real MCP tool surface. A tool
renamed or removed while another section still named it would fail silently.

Checks every mcp__trinity__<name> in the prompt module, and every backticked
snake_case token in the rendered instructions at each tier: it is a published
tool or listed as a non-tool, and the non-tool list has no stale entries.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Docker's host-core formula recorded one busy core as 100%, so the default
80/95 thresholds marked an ordinary capped agent critical. Record CPU as a
percent of the container's own limit (NanoCpus, else quota/period, else
the host).

Fixes #4529
lint_sys_modules only skips a file that declares a top-level
_STUBBED_MODULE_NAMES list and an autouse _restore_sys_modules
fixture. The CPU-limit test used a private name, so the CI job
counted six new stub writes.

Fixes #4529
The router validates against the fleet ceiling (#506) but the DB layer still
rejected values above 10, so PUT /capacity returned 500 for 11..ceiling.

Fixes #4564

Signed-off-by: Alex Castillo <alex.castillog33@gmail.com>
…d sidebar

PortalConversation and PortalSidebar passed the slug to PortalAvatar while the text beside it showed the display label, so the initials and tint disagreed with the briefing.
…cepts (#4578)

The stall service passed free-text reasons ('queue head moved', 'queue drained') to platform_alerts.clear, which forwards them to ask_service.clear_platform. That only accepts condition_cleared or superseded, so the ValueError was swallowed and the alert stayed pending. Use the default reason and add a test that every clear reason in the service is accepted.
#4514)

The skills hint reserved two lines (min-h-[2.5rem], 40px). The longest hint, the server's set.message, wraps to three lines at the dialog's desktop width and four at 390px, so switching the steward resized the dialog. Reserve four text-xs lines below sm and three from sm up, when the panel is already at max-w-lg.
…d issues, DCO, AI-assisted PRs, open-PR cap

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…Abilityai/trinity-enterprise#1277)

Open-core half of GitHub App authentication.

- services/github_token_provider.py: a seam through which a registered
  provider supplies a short-lived token scoped to one repository. Inert
  with no provider registered.
- settings_service.resolve_github_token(repo, agent_name, owner_id,
  permissions): per-agent PAT, per-user PAT, provider, platform PAT.
  Returns (token, tier, expires_at). A provider failure on a covered repo
  raises GithubTokenUnavailable; the platform PAT is used only when the
  provider answers "not covered".
- resolve_github_pat, resolve_github_pat_candidates and
  get_github_pat_for_agent are unchanged and never consult the provider.
  Their answers are persisted or baked into a container environment.
- github_app_credentials joins SECRET_SETTING_KEYS: encrypted at rest,
  refused in cleartext, covered by key rotation.
  settings_service.get_stored_secret_setting reads it with no env leg.
- Installation tokens (ghs_<appid>_<JWT>, about 390 characters, with
  ".", "-", "_") are redacted whole by both credential_sanitizer copies,
  scrub.js and reportSummary.js. The pattern matches by structure with
  bounded quantifiers, so it is linear on repeated prefixes and leaves
  ordinary text such as "boroughs_population_2020-2024_final.csv" alone.
- enterprise-docs-guard: the new seam file joins SEAM_FILES.

Refs Abilityai/trinity-enterprise#1277

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…ix (#4518)

merge-train: mechanical, per the merge-train note on the PR. Mounts the real
PortalConversation and asserts the header and transcript avatar tiles take the
display label; red with PortalConversation.vue reverted to dev.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… refuses non-secret keys (#4624)

Mechanical, per the merge-train note on the PR.
- resolve_github_token docstring states that it does no per-caller
  authorization and passes permissions through unvalidated.
- get_stored_secret_setting raises for a key outside SECRET_SETTING_KEYS, so
  the lazy legacy migration can never run on an ordinary setting; one test.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@vybe vybe added the ui PR touches the frontend UI — triggers Playwright e2e tests label Nov 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ui PR touches the frontend UI — triggers Playwright e2e tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants