Uh oh!
There was an error while loading. Please reload this page.
feat(spec,metadata-protocol,rest,client): 直挂面 packages / datasources 可发现,SDK 跟随通告的 base(#6633 · 路线 B) - #6712
Merged
os-project-manager merged 7 commits intoAug 8, 2026
Conversation
… key (#6633 stage 1) The base for the `datasources/:name/external/*` federation-admin family (ADR-0015 §6.2). Optional like `mcp`: absent = not mounted (ADR-0076 D12). `packages` already existed; only `datasources` is new. Generated artifacts (authorable-surface/api.json, references/api/discovery.mdx) regenerated via check:generated --fix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
…f the package service is registered (#6633 stage 2) serviceToRouteKey gains `package: 'packages'`; the route flows through a NON_SLOT_SERVICE_ROUTES loop because `package` is not a CoreServiceName slot (a non-slot SERVICE_CONFIG row is the retired graphql defect and would fabricate a services entry). `datasources` deliberately stays un-advertised here — same disposition as mcp (#5679): the federation mount belongs to the REST host this builder cannot see. Conformance tests pin both directions. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
…s as projections of the recorded direct mounts (#6633 stage 3) Mounted => advertised (ADR-0076 D12's unstated half): RestServer. getDirectMountRouteBases() derives the advertised bases from the very route arrays the direct-mount registrars iterated to mount (#5822) — one fact, two consumers, so #6306's future mount-base move carries the advertisement with it by construction. Not mounted => not advertised: a boot without the package service deletes the protocol's optimistic packages entry. End-to-end parity pin drives the composed surface at both /api/v1 and a non-default base, plus the scoped mount. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
…routes.datasources (#6633 stage 4) The five federation-admin methods go through getRoute('datasources'): connected clients follow the advertised base, unconnected (or unadvertising servers) fall back to the /api/v1/datasources convention byte-identically. routeMap stays total over the declared ApiRoutes keys. Cases B and C from the issue pinned as tests — C asserts all five external.* URLs plus packages.* in one case so a half-fix cannot stay green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
…-follows-discovered-base
…gin/main The generated artifact text-merged (AGENTS.md §11): this branch's older copy won the hunk main had grown (GetMetaItemLayeredResponse / GetMetaItemResponse keys). Rebuilt from the MERGED source, so the artifact now carries both sides and the branch delta vs main is exactly the one intended `api/ApiRoutes:datasources` line. check:generated: all 10 up to date. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
Contributor
📓 Docs Drift CheckThis PR changes 4 package(s): 116 hand-written doc(s) reference the affected code and may need an implementation-accuracy re-verification:
|
os-project-manager
marked this pull request as ready for review
August 8, 2026 13:25
os-project-manager
enabled auto-merge
August 8, 2026 13:25
Uh oh!
There was an error while loading. Please reload this page.
os-project-manager
deleted the
claude/issue-6633-sdk-follows-discovered-base
branch
August 8, 2026 13:53
This was referenced Aug 8, 2026
This was referenced Aug 8, 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes#6633
按维护者 2026-08-08 裁定(路线 B,#6633 评论 5225249241;#6306 的前置卡)实施:方向 a + b + c 全取。跨席预派发声明已发且否决窗口开放(spec-surface 席 #6298 评论 5225247046;metadata 席 #6367 评论 5225247338),实施期间多次复读 #6633 评论,无任何席位异议。
缺陷(全部实测,
origin/main=78f0be872复核;原始测量点e39dd66e7)ObjectStackClient):discovery 通告routes.packages: '/backend/api/v9/packages'+routes.datasources: '/backend/api/v9/datasources'时,packages.list跟随(→/backend/api/v9/packages),而external.listTables仍打/api/v1/datasources/pg_main/external/tables—— client 五个external.*方法硬编码、无任何 discovery 机制。routes.packages:getDiscovery()(services 注册package+external-datasource时)routes 键实测仅['data','metadata'];registerDiscoveryEndpoints只 overridedata/metadata/ui/mcp/auth。已挂载而不通告,即 ADR-0076 D12「advertise everything mounted」缺失的另一半。四阶段(依赖序,每阶段一个 commit)
d61072d85):ApiRoutesSchema新增datasources键(federation-admin 家族的 base)。注意:packages键在origin/main已存在(discovery.zod.ts既有声明),故 spec 阶段只需新增datasources—— 与派发卡「gains apackagesroute key and adatasourcesroute key」的表述相比,前者已成立,以现场为准。optional 语义同mcp:缺席 = 未挂载。生成物(authorable-surface/api.json、references/api/discovery.mdx)经check:generated --fix再生。37c1bd117):serviceToRouteKey增package: 'packages';路由值经新增的NON_SLOT_SERVICE_ROUTES小循环流入(package不是CoreServiceNameslot,进SERVICE_CONFIG会重演已退役的graphql缺陷并伪造services可用性条目)。datasources在本 builder 刻意不通告——处置同mcp(routes.mcp 是 REST /discovery 发出、objectui 真实消费、但 ApiRoutesSchema 从未声明的键(#4828 同族,低一层) #5679):federation 挂载属于 REST 宿主,本 builder 看不见;dispatcher 宿主根本没有/datasources域,通告即 D12 禁止的「通告未挂载」。conformance 测试钉住两个方向。076f8365b):/discovery的routes.packages/routes.datasources是已录制直挂路由的投影(RestServer.getDirectMountRouteBases(),读的就是 registrar 挂载时迭代的那批数组,rest 的 9 条 direct-mount 路由对RestServer不可枚举 —— 因此进不了/openapi.json,也进不了任何运行时自省 #5822)——通告与挂载同源派生,配置了api.apiPath时,rest 的 9 条 direct-mount 路由挂在{basePath}/{version}而不是{apiPath}#6306 未来移 base 时通告按构造跟随,不需要再改这里。未挂载 ⇒ 不通告:无packageservice 的 boot 会删掉 protocol 乐观通告的packages键。今天直挂 registrar 挂在 plugin 的versionedBase(/api/v1)而非getApiBasePath(),通告如实反映这一点(设apiPath的部署会通告/api/v1/...——那正是路由真实所在;配置了api.apiPath时,rest 的 9 条 direct-mount 路由挂在{basePath}/{version}而不是{apiPath}#6306 落地后两者一起移动)。aff5f3c94):五个external.*方法经getRoute('datasources')派生 base;未连接或服务端未通告时 fallback/api/v1/datasources,URL 与旧硬编码逐字节一致。routeMap对声明键保持 TOTAL。ScopedProjectClient无external.*副本(已核对),无第二份需要改。验收钉 —— mounted ⇒ advertised 奇偶钉
packages/rest/src/discovery-advertised-direct-mounts.parity.test.ts:用与生产完全相同的组合(RestServer.registerRoutes()+mountAndRecordDirectRoutes(...))boot 真实 rest 面到一张真实 handler 表,经该表读/discovery,再断言通告的routes.packages/routes.datasourcesURL 在同一张表里解析并应答。四个用例:默认 base、非默认 base(/backend/api/v9,载荷用例:证明通告不再从 convention 二次推导)、未挂载 ⇒ 不通告、scoped 挂载(environmentId 代入)。任何只动挂载或只动通告一侧的未来改动(含 #6306 移路由)在此必红——反向验证已实测(见下)。client 侧三案:A(未连接 →
/api/v1/...逐字节不变,沿用既有 pin 测试)、B(已连接但无新键 → fallback 不变)、C(通告 rebased 键 →packages.*与全部五个external.*一起跟随;五个断言合在一个用例,半修不可能保绿)。反向验证(预测先行,逐向实测 —— 全部在 merge
origin/main之后的合并结果上重跑)回退方式:只
git apply -R我自己那一阶段对该文件的 diff,main 期间对同文件的改动保持在位,故测量不被 main 的改动混淆(protocol.ts、rest-server.ts在停机期间被 main 改过,变更区与我的区段无交叠)。每次测量后立即git checkout HEAD --还原,收尾已核 worktree 干净。listTables收到/api/v1/...;A/B 保绿(fallback 逐字节同,双向绿,不作为反向证据)rest-server.ts,保留奇偶钉)datasourcesundefined(packages因 stage-2 的/api/v1/packages恰好同值——被掩盖的漂移);非默认 base 案红在'/api/v1/packages' ≠ '/backend/api/v9/packages'(奇偶钉存在的意义);未挂载案红在datasources;scoped 案红在未代入packages iff测试红(undefined);datasources阴性钉双向绿(方向钉,排除出反向证据);rest 奇偶钉在此回退下保绿(stage 3 从录制挂载投影,不读 protocol 通告)——stage 2 的独立红通道只有本包 conformance 测试,如实申报discovery.zod.ts)datasources被 strip → undefined);client typecheck 红(routeMap 多余属性)与 metadata-protocoldeclaredRouteKeys红为预测未实测(避免为一次同义反复的 tsc 红做两轮全量 spec dist 重建;正向 typecheck 已在门禁跑)与
origin/main的合并(d6d1a50be)停机期间 main 前进约 3.7 小时。已 merge(无冲突),并按 AGENTS.md §9/§10/§11 处理:
packages/spec/authorable-surface/api.json被文本合并,本分支较旧的副本吃掉了 main 新增的GetMetaItemLayeredResponse/GetMetaItemResponse键。已按 §11 从合并后的源重建 spec 并再生该产物(46e82d44d),现分支相对 main 的 delta 恰为我意图中的一行api/ApiRoutes:datasources;pre-commit 的os-regen标记也已确认清除。protocol.ts/rest-server.ts,但变更区(rest ~2904/4354/4510,protocol ~28/1026/10163)与我的区段(rest ~3378 与 ~9200,protocol ~2768)无交叠,我的代码在合并后完好。门禁(全部在合并结果上实跑)
70 successful, 70 total。345 files / 8832 tests、metadata-protocol58 / 629、rest69 / 1043、client21 / 271。pnpm lint(eslint 无输出)、typecheck-spec、typecheck-client全绿。@objectstack/rest与@objectstack/metadata-protocol不声明typecheck脚本(二者是 DEBT 台账包),其 tsc 由check:type-check-debt复测——该门禁 GATE_OK,全仓无任何 DEBT/TEST_DEBT 上升(rest TEST_DEBT 实测 152 < 记录 163,只有信息性「可下调」行,按 AGENTS.md 不欠记账)。lint.yml两个作业的check:*全家共 39 项 GATE_OK / 0 GATE_FAIL,含check:generated(10 项生成物全部 up to date)、check:route-envelope、check:error-code-casing、check:engine-double-contract、check:nul-bytes、check:type-check-coverage、check:adr-0087-registration、check:i18n{,-coverage}、新增的check:kernel-hook-pairs等。ratchet 的 baseline 均已对齐d6d1a50。changeset 覆盖四包(spec/metadata-protocol/rest minor,client patch;无 breaking,故无需 ADR-0087 处置标记)。本 PR 带 changeset,不适用
skip-changeset标签。备注
getRoute()的硬编码面(email.send、约 20 条cloud.environments.*、ScopedProjectClient的 scope 前缀)——单独立 issue(未认领),不在本卡四车道内。🤖 Generated with Claude Code
https://claude.ai/code/session_017uFVNMmTxLpmfQYiuKM1Yx
Generated by Claude Code