Skip to content

Import orgs (history-preserving, merge-commit) - #6

Merged
andrei-hasna merged 9 commits into
mainfrom
import/orgs
Aug 13, 2026
Merged

Import orgs (history-preserving, merge-commit)#6
andrei-hasna merged 9 commits into
mainfrom
import/orgs

Conversation

@andrei-hasna

@andrei-hasna andrei-hasna commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Import orgs (history-preserving, merge-commit)

Imports hasna/orgs (@hasna/orgs 0.1.0) into the monorepo under apps/orgs via the ratified filter-repo + history-capsule mechanism (import-mechanics-codex.md). DO NOT MERGE with squash/rebase — merge-commit only (squash/rebase breaks imported-history reachability).

Mechanism evidence

  • PR freeze: hasna/orgs had 0 open PRs at import time — verified gh pr list -R hasna/orgs --state open.
  • Rewrite: git filter-repo --to-subdirectory-filter apps/orgs --preserve-commit-hashes --preserve-commit-encoding on a fresh mirror (git-filter-repo a40bce548d2c, venv /tmp/opencode/import-proof/venv). 10 commits parsed.
  • Capsule: 889a8a017f8df7604a030232f8cd483eedf5c8fc — tree = rewritten main tree; parents = all peeled ref tips, deduped (shas + ancestor-of-other-parent). 2 refs peeled (main, feat/open-orgs-graph-context); 0 skipped (non-commit); 1 parent after dedupe (feat branch is an ancestor of main — all its commits remain reachable).
  • Parent-set equality: refset (2 peeled tips) vs capsule-parent coverage — GAPS=0.
  • Tree gate: rewritten apps/orgs subtree cc99c47f == mono subtree cc99c47f, git diff --exit-code rc=0; blob multiset 19/19 identical, 0 diffs.
  • Hygiene: no .gitattributes/.gitmodules/LFS in the member tree; staged secrets scan 0 findings (19 files, 186,750 bytes); git diff --cached --check rc=0.
  • Tag manifest: hasna/orgs has zero tags (verified on the original mirror). Manifest: scratch wave1a-orgs/tag-commit-manifest.md (/tmp/opencode/wave1a-orgs/tag-commit-manifest.md).

Absorption notes

  • bun install rc=0 (root workspace, 546 packages).
  • bun run check rc=0 (names/secrets/manifests/publish-guard; publish guard: orgs — 7 tarball entries, 0 internal-infra strings).
  • TURBO_SCM_BASE=origin/main turbo run build/test/lint --affected — build rc=0, test rc=0 (24 pass / 0 fail / 86 expect), lint rc=0 (member has no lint script).
  • No absorption fixes required — member is mono-green as-is.
  • Member bun.lock preserved in-tree per the access/billing/calendar pattern.

Notes

  • Commits are rewritten (shas changed, signatures stripped — documented filter-repo behavior); authorship, dates, messages and Agent: trailers preserved (10 commits).
  • Old repo hasna/orgs is NOT archived/deleted (owner gate: backup-first).

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

andrei-hasna and others added 9 commits June 23, 2026 07:40
* feat: build open org graph context layer

* chore: preserve spark02 repo state

Preserve reviewed non-risky working tree changes before fleet repo redistribution. Risky local-only paths, if any, were left uncommitted.

* Productize open-orgs storage and install guidance

---------

Co-authored-by: Andrei Hasna <andrei-hasna@users.noreply.github.com>
Co-authored-by: Codewith <codewith@hasna.local>
Ensure this repo LICENSE file is the COMPLETE canonical Apache License 2.0 text, byte-compatible with https://www.apache.org/licenses/LICENSE-2.0.txt (~202 lines, sections 1-9 plus APPENDIX, canonical line wrapping). Some repos here ship only the ~17-line Apache boilerplate NOTICE (a real licensing gap — Apache-2.0 section 4(a) requires shipping a copy of the License itself); others ship the full text REFLOWED so GitHub cannot detect it. Both are fixed by writing the canonical text.
COPYRIGHT: if the CURRENT LICENSE has a specific copyright line (e.g. "Copyright 2026 Hasna, Inc."), carry it verbatim into the APPENDIX placeholders. If it has none, leave the canonical placeholders exactly as apache.org ships them — do NOT invent a year or entity.
Change no other file, except a README line explicitly claiming a different license (correct to Apache-2.0), and package.json "license" if relicensing from MIT.
VERIFY: LICENSE contains "TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION" and "APPENDIX: How to apply the Apache License to your work", exceeds 150 lines.

X-Factory-Run: run_f00ff4f5aec4
Merge capsule 889a8a0 (rewritten history of hasna/orgs, 10 commits) into the monorepo.

Agent: agent-ea
@andrei-hasna
andrei-hasna merged commit c6d02c7 into main Aug 13, 2026
4 checks passed
andrei-hasna added a commit that referenced this pull request Aug 17, 2026
## Import org delta — hasna/orgs → apps/orgs (VERIFY-DELTA lane v5)

The org repo moved past the import freeze: hasna/orgs gained f95d43c8 "chore(contracts): add hasna.contract.json (#5)" and 0d0937a5 "chore: drop legacy open-orgs bin alias; canonicalize README (#6)" after the freeze content was imported (import merge c6d02c7, freeze 1f86ece).

This PR imports the delta via cherry-pick -X subtree=apps/orgs (commits 93ff41e, 77b7f3b). Member subtree now matches org HEAD exactly.

- org HEAD: 0d0937a559f28c77c8b9d7c5fac5d88b4e0838b2
- delta: add apps/orgs/hasna.contract.json; drop legacy open-orgs bin alias; canonicalize README open-* naming
- member subtree vs org HEAD: identical (0 tracked diffs)
- gates: bun run check (names/secrets/manifests/publish-guard) rc=0; member tests pass

Agent: aemilianus
andrei-hasna added a commit that referenced this pull request Aug 17, 2026
Merge delta import: releases from hasna/releases (hasna.contract.json #6). CI green at head 979abca; publish-guard, gates, build+test, test-suites, verify-generated all pass.

Agent: aemilianus
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant