Repository navigation
chore: reconcile main into dev before the v0.8.5 cut - #1777
Merged
Merged
Conversation
…p (f5d69be) Public main's enterprise gitlink referenced 630cca9 — the tip of the feature/78-portal-history-hardening branch (portal voice mode, ElevenLabs TTS + Scribe STT), which was added AFTER the #106 umbrella squash-merged to enterprise main and was never itself landed on the enterprise trunk. That left main pointing at a dangling, off-trunk enterprise commit and inverted vs dev (dev=f5d69be is on enterprise main; main=630cca9 was ahead). This reverts main to f5d69be — the enterprise-main tip that already carries the full Client Portal (#79 exposure seam, #104 roster/sessions/chat, #106 history hardening + chat sessions + cross-chat search) minus voice mode. Voice mode stays on its feature branch, unshipped, per decision to hold it. dev already points at f5d69be, so this restores dev == main on a valid on-trunk pointer. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…pages One page per topic (getting started, agents, chat/sessions, credentials, scheduling, collaboration, channels, MCP/API, operations, sharing, deployment, security, advanced, troubleshooting) plus a generated question index. Answers derived from user docs and verified against code; .claude pointer picks up the generate-user-docs FAQ step. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
… authentication Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…e-pointer fix(enterprise): align main's submodule pointer to on-trunk f5d69be (revert dangling 630cca9)
Create research/ as the home for Ability AI's open research work: - Quantum-Steered Cognition (qrng-agent-consciousness-whitepaper, 2026-07-14) - A Measurably Self-Improving Multi-Agent Forecasting System (closed-loop-forecasting, 2026-07-11) Each paper lives in its own subfolder as a dated PDF of the final manuscript; README.md carries the index and naming conventions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…main docs(research): add open research folder with first two papers (main)
Links the new animated architecture explainer (https://youtu.be/XDLOq1crF9w) in the README "Watch more" list and at the top of the Platform Overview section of docs/user-docs/videos.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
docs: add llms.txt for agent-native discovery
…ideo-main docs: add architecture explainer video to README and video library (main)
Bumps [body-parser](https://github.com/expressjs/body-parser) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](expressjs/body-parser@v2.2.2...v2.3.0) --- updated-dependencies: - dependency-name: body-parser dependency-version: 2.3.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [fast-uri](https://github.com/fastify/fast-uri) from 3.1.2 to 3.1.4. - [Release notes](https://github.com/fastify/fast-uri/releases) - [Commits](fastify/fast-uri@v3.1.2...v3.1.4) --- updated-dependencies: - dependency-name: fast-uri dependency-version: 3.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
) Bumps [hono](https://github.com/honojs/hono) from 4.12.25 to 4.12.31. - [Release notes](https://github.com/honojs/hono/releases) - [Commits](honojs/hono@v4.12.25...v4.12.31) --- updated-dependencies: - dependency-name: hono dependency-version: 4.12.31 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Brings dev up to date with 13 commits that landed directly on main: hono 4.12.31 (#1738), fast-uri 3.1.4 (#1736), body-parser 2.3.0 (#1733), llms.txt, FAQ + PAT-scope user docs, open-research folder, architecture explainer video links, and the earlier enterprise-pointer alignment on main. Required before the v0.8.5 dev→main cut so the release merge is conflict-free. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> # Conflicts: # .claude # docs/user-docs/faq/channels-and-messaging.md # docs/user-docs/integrations/github-pat-setup.md # src/backend/enterprise
AndriiPasternak31
approved these changes
Jul 26, 2026
AndriiPasternak31
left a comment
AndriiPasternak31
left a comment
Contributor
There was a problem hiding this comment.
/validate-pr — APPROVE. Merge with a merge commit, not squash (confirmed).
I verified all four conflict resolutions independently rather than trusting the description:
| Claimed resolution | Verification | Result |
|---|---|---|
src/backend/enterprise → e898cef8 |
compare vs old pin: ahead 1, behind 0; commit is the ent#220 rooms fix |
✅ |
.claude → dev's de7fc71 (main's is a strict ancestor) |
compare 2228cfc7...de7fc716 → ahead_by 10, behind_by 0 |
✅ nothing lost |
github-pat-setup.md → dev side |
byte-identical to origin/dev, differs from main |
✅ |
faq/channels-and-messaging.md → dev side |
byte-identical to origin/dev, differs from main |
✅ |
No content silently dropped. I enumerated every file main changed since the merge-base (829a114d) and classified each in the merge result: 24 carry main's version, 3 deliberately carry dev's (the two declared above + README.md, where dev is strictly richer — main would have removed the agent-install runbook). Main's explainer-video line (XDLOq1crF9w) is present in both README.md and videos.md — already in dev, preserved here.
Dependency pins — no downgrade, nothing lost. The two genuinely-merged files resolve correctly:
src/mcp-server/package.json: dev's override set withhonoraised>=4.12.25→>=4.12.31;axios/qs/ip-address/esbuild/fast-uri/@hono/node-serverpins all intact.- root
package.json:fast-uri ^3.1.2→^3.1.4, all other pins identical. - Both lockfiles parse (v3); mcp lock resolves
hono 4.12.31, consistent with the override.
Why merge-commit is right: squashing collapses main's 13 commits into one new commit, so dev would not carry them as ancestors and the next dev→main release merge re-conflicts on every one — the exact trap the body flags.
Security scan clean; docs/deps only, no backend module or os.getenv (packaging checks N/A). CI all green. Sequence #1776 → #1777 → #1778 → #1765 simulated locally: all clean, final enterprise pointer e898cef8.
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
3 participants
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.
What
Merge-commit reconcile of
main→dev(13 commits that landed directly on main): hono 4.12.31 (#1738), fast-uri 3.1.4 (#1736), body-parser 2.3.0 (#1733), llms.txt, the 264-QA FAQ + PAT-scope docs, open-research folder, explainer-video links, and main's earlier enterprise-pointer alignment.Why
Required by the v0.8.5 freeze-plan recheck (2026-07-26): main is ahead of dev, so cutting dev→main without this risks a conflicted release merge.
Conflict resolutions
src/backend/enterprisegitlink → e898cef8 (enterprise-main TIP, same target as chore(enterprise): bump submodule to enterprise-main tip e898cef — ent#220 rooms security fix #1776 — the ent#220 rooms security fix; the two PRs merge cleanly in either order).claudegitlink → dev'sde7fc71(main's pointer is a strict ancestor — verified)docs/user-docs/integrations/github-pat-setup.md→ dev side: main's older text pre-dates Wire the agent GitHub PAT for theghCLI + REST API (not just git) #1574 (gh CLI now ships in the base image andGH_TOKEN/GITHUB_TOKENare wired); dev's version describes the current codedocs/user-docs/faq/channels-and-messaging.md→ dev side (dev-only added Q&A)🤖 Generated with Claude Code