Commit e1ac5bd
committed
Merge origin/main into claude/issue-14478-duration-unit-in-key-name
Three text conflicts, all co-insertions — both intents stack, nothing dropped:
packages/spec/src/migrations/registry.ts
step 18's hand-written `rationale` (both sides appended a sentence: main's
keeps its adjacency to the families it names, this branch's "Finally, …"
stays final), plus one add/add in the generated `semantic:18` region
(`epoch-instant-keys-renamed` beside `esignature-config-deadline-keys-retired`)
and one in `retired-key:18` (`data/FilePersistenceConfig:autoSaveInterval`
beside `data/ESignatureConfig:reminderDays`). The two generated regions are
re-derived from `src/migrations/entries/**` by the regeneration commit that
follows; the entry files themselves merged as pure adds.
packages/spec/src/type-alias-convention.pin.test.ts
a machine-checked count stated in three places. 825 (base) - 13 (main's
whole-family retirement) + 1 (this branch's `EpochMs`) = 813, and 813 is
what the file's own regex counts in the merged tree — not arithmetic.
packages/spec/llms.txt
the schema inventory total. 207 - 3 + 1 = 205, matching the per-domain
table (which merged cleanly) and the merged `*.zod.ts` census.
The 16 `merge=os-regen` paths both sides moved take origin/main's side here,
per scripts/pm/os-regen-merge.sh step 2; the regeneration commit that follows
re-derives them on the merged tree. No `content/docs/releases/` edit.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01G4138K1EG7kQ81FNba5Kp4716 files changed
Lines changed: 60229 additions & 9948 deletions
File tree
- .changeset
- .claude
- agents
- hooks
- skills
- dogfood-verification
- pm-dispatch
- references
- lanes
- .github/workflows
- content/docs
- api
- automation
- data-modeling
- deployment
- getting-started
- kernel
- contracts
- permissions
- protocol
- kernel
- objectql
- references
- ai
- api
- automation
- data
- identity
- integration
- kernel
- security
- system
- ui
- ui
- docs
- adr
- audits
- qa/platform-checklist
- areas
- examples
- app-showcase/src/data/objects
- app-todo/test
- packages
- adapters/hono/src
- cli
- src
- commands
- migrate
- lint
- utils
- test
- helpers
- core
- examples
- src/security
- drivers
- driver-memory/src
- driver-sql/src
- formula/src
- lint/src
- mcp/src
- metadata-protocol/src
- metadata/src/utils
- objectql/src
- integrity
- validation
- platform-objects
- scripts
- src
- apps/translations
- audit
- identity
- system
- plugins
- plugin-approvals/src
- plugin-auth
- src
- plugin-email/src
- plugin-hono-server/src
- plugin-security/src
- plugin-sharing/src
- objects
- translations
- plugin-webhooks/src
- qa/dogfood/test
- rest/src
- runtime/src
- domains
- security
- services
- service-analytics/src
- __tests__
- strategies
- service-automation/src
- builtin
- service-cluster-redis/src
- service-datasource/src
- __tests__
- service-i18n
- src
- service-realtime/src
- service-settings/src
- service-storage/src
- spec
- api-surface
- authorable-defaults
- authorable-surface
- declaration-map
- export-origins
- json-schema.manifest
- liveness
- scripts
- lib
- src
- ai
- api
- automation
- contracts
- data
- identity
- kernel
- migrations
- entries
- retired-defs
- retired-keys
- semantic
- security
- system
- ui
- scripts
- audits
- docs-audit
- pm
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
Lines changed: 18 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
0 commit comments