Upload docs/protocols/UPSTREAM_SYNC.md with huggingface_hub

docs/protocols/UPSTREAM_SYNC.md

@@ -7,10 +7,24 @@ syncs cheap.
 ## Upstream
 
 - Tracked upstream: [mann1x/opencode](https://github.com/mann1x/opencode)
-  (dev fork; opencode-of-record is anomalyco/opencode).
+  (dev fork; opencode-of-record is anomalyco/opencode, fetched as the
+  `record` remote).
 - Default upstream branch: `dev`.
 - Sync cadence: weekly is the target, more often when upstream is
   hot.
+- ⚠️ **Sync the fork FIRST.** A sync is only meaningful if
+  mann1x/opencode `dev` has itself been updated from anomalyco
+  (GitHub "Sync fork", or locally: merge `record/dev` into the fork's
+  `dev` and push — expect conflicts in any locally-pinned dep files).
+  On 2026-07-15 the fork was 2 commits past a 1757-commit-stale base;
+  syncing against it would have been a no-op.
+- First full sync completed **2026-07-15**: dev merged
+  anomalyco/opencode `dev` @ `05c3e40a` (sync-branch merge
+  `540d82d630`, landed on dev as `c896a910f9`). Since that merge the
+  histories are properly joined — future syncs are a plain
+  `git merge upstream/dev` with a real merge-base (no graft needed).
+  Full gotcha log: see "2026-07-15 — first full opencode sync" below
+  the Registry.
 
 ## The rule
 
@@ -90,16 +104,75 @@ Add an entry in the same PR you add the hook.
 | `tiered-inference` (dep) | `packages/opencode/package.json` (`dependencies."@opencoti/tiers": "workspace:*"`) | F1 — Tiered Inference Engine | [features/tiered_inference.md](../features/tiered_inference.md) |
 | `memory-tools-resolvability` (dep) | `packages/opencode/package.json` (`dependencies."@opencoti/memory": "workspace:*"`) | F4 M5 — Memory / Embedder | [features/memory_embedder.md](../features/memory_embedder.md) |
 | `opencoti-default-plugins` (import) | `packages/opencode/src/config/config.ts` (just below the existing `ConfigPlugin` import) | F4 M5 follow-up — auto-wire opencoti plugins | [features/memory_embedder.md](../features/memory_embedder.md) |
-| `opencoti-default-plugins` (call site) | `packages/opencode/src/config/config.ts` (in the config-loader Effect.fnUntraced body, just before the `return { config: result, … }`) | F4 M5 follow-up — auto-wire opencoti plugins | [features/memory_embedder.md](../features/memory_embedder.md) |
-| `tiered-inference-setup` (import) | `packages/opencode/src/index.ts` (just after the existing `isRecord` import) | F1 M5.7 — Tier-0 setup CLI | [features/tiered_inference.md](../features/tiered_inference.md) |
+| `opencoti-default-plugins` (call site) | `packages/opencode/src/config/config.ts` (inside `loadInstanceState` Effect.fnUntraced — upstream split the single loader into several Effect.fnUntraced functions 2026-07-15; the old `return { config: result, … }` anchor is gone) | F4 M5 follow-up — auto-wire opencoti plugins | [features/memory_embedder.md](../features/memory_embedder.md) |
+| `tiered-inference-setup` (import) | `packages/opencode/src/index.ts` (import block, after the `Heap` import — the former `isRecord` import anchor was removed upstream 2026-07-15) | F1 M5.7 — Tier-0 setup CLI | [features/tiered_inference.md](../features/tiered_inference.md) |
 | `tiered-inference-setup` (call site) | `packages/opencode/src/index.ts` (`.command(tierCommand)` after `.command(DbCommand)`) | F1 M5.7 — Tier-0 setup CLI | [features/tiered_inference.md](../features/tiered_inference.md) |
 | `opencoti-server-autostart` (import) | `packages/opencode/src/config/config.ts` (just below the `opencoti-default-plugins` import) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
-| `opencoti-server-autostart` (schema) | `packages/opencode/src/config/config.ts` (`opencoti: Schema.optional(Schema.Struct({ server: ... }))` block in the main config schema) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
-| `opencoti-server-autostart` (call site) | `packages/opencode/src/config/config.ts` (in the config-loader Effect.fnUntraced body, just after the `opencoti-default-plugins` call site, before `return { config: result, … }`) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
+| `opencoti-server-autostart` (schema) | **`packages/core/src/v1/config/config.ts`** (`opencoti:` block in `ConfigV1.Info` — RELOCATED 2026-07-15: upstream moved the config schema out of packages/opencode into core/v1) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
+| `opencoti-server-autostart` (call site) | `packages/opencode/src/config/config.ts` (inside `loadInstanceState` Effect.fnUntraced, just after the `opencoti-default-plugins` call site; since 2026-07-15 upstream's `Log` module is gone — the hook `yield*`s `Effect.forkDetach` on a fiber that awaits the autostart promise and logs the outcome via `Effect.logInfo`/`Effect.logWarning`, formatting through `describeAutostartOutcome` exported by the additive package) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
 | `opencoti-server-client` (dep) | `packages/opencode/package.json` (`dependencies."@opencoti/opencoti-server-client": "workspace:*"`) | F3 M3 — opencoti-server TS client + autostart | [features/opencoti_server.md](../features/opencoti_server.md) |
 
 The two TS edits carry `// opencoti-hook: tiered-inference — see docs/features/tiered_inference.md` markers; the `package.json` dep has no anchor comment (JSON has no comments) — this registry table is its only anchor. On upstream merges, if upstream renames any of these files or restructures the `run` Effect.fn around the call-site marker, the marker comments remain the canonical pointer for re-applying the hook.
 
+### 2026-07-15 — first full opencode sync (#682): method + gotchas
+
+First (and history-joining) sync: dev merged anomalyco/opencode `dev`
+@ `05c3e40a` (+1757 commits past the 2026-05-21 import base
+`dbd709376b`). Executed in an isolated worktree on branch
+`sync/opencode-2026-07-15`; landed on dev as `c896a910f9`.
+
+**Method (one-time — not needed again):** the bootstrap commit
+`b34a23097f` was a squashed import with no shared history, so a plain
+merge had no merge-base. Fix: `git replace --graft b34a23097f
+dbd709376b` (the empirically-identified import base — found by
+blob-matching untouched files against upstream commits), then a
+normal 3-way `git merge record/dev`, then `git replace -d b34a23097f`.
+The merge commit permanently joins the histories.
+
+**Conflict surface (10 files, all predicted):** the 5 hook files +
+resurrected identity files (re-deleted) + `packages/extensions` zip
+artifacts + root `package.json`/`bun.lock`. `config/config.ts` and
+`index.ts` were taken upstream-wholesale and the hooks hand-replayed
+(upstream refactor destroyed the anchors — see updated Registry rows).
+
+**Gotchas (verified this sync — check these FIRST next time):**
+
+1. **Corrupt bun store after a crashed install.** A postinstall crash
+   (Debian's broken `/usr/bin/node-gyp` on `tree-sitter-powershell`)
+   left `node_modules/.bun/<pkg>` half-extracted; a later
+   `--ignore-scripts` install did NOT repair it → hundreds of phantom
+   typecheck errors (`Cannot find module 'drizzle-orm/sqlite-core'`).
+   Rule: after ANY failed `bun install`, `rm -rf node_modules` before
+   trusting typecheck. (Root cause fixed 2026-07-15: Debian 11's apt
+   node-gyp 7.1.2 is broken under node 22 — `npm install -g node-gyp`
+   puts a working v13 at `/usr/local/bin`; full `bun install` with
+   postinstall scripts now works on solidPC.)
+2. **`.gitignore` coredump patterns swallowed `packages/core`.** Our
+   unanchored `core` / `core.*` ignore patterns hid upstream's new
+   package. Fixed by root-anchoring (`/core`, `/core.*`). Any
+   unanchored ignore pattern can collide with future upstream names.
+3. **Bootstrap-zip artifacts create phantom conflicts.** The squashed
+   import lost a symlink (`extensions/zed/LICENSE`), an exec bit
+   (`script/sync-zed.ts`), and silently dropped a whole file
+   (`packages/opencode/script/build-node.ts` — which also survived
+   UNTRACKED on disk and blocked the dev merge until moved aside).
+   Any modify/delete conflict on a file we never touched is probably
+   a zip artifact — resolve toward upstream.
+4. **Upstream deleted the `Log` module** (Effect logging is the new
+   idiom): any hook passing `log` must drop/adapt it. The config
+   schema now lives in `packages/core/src/v1/config/config.ts`
+   (`ConfigV1.Info`); `fix-node-pty` postinstall moved to
+   `packages/core`.
+5. **Husky pre-push runs `bun typecheck`** — it fails in any scratch
+   worktree without node_modules; use `--no-verify` there (content
+   already verified in the sync worktree).
+6. ~~Open follow-ups~~ both CLOSED 2026-07-15: autostart-outcome
+   logging restored via `Effect.forkDetach` + `describeAutostartOutcome`
+   (see Registry row); system node-gyp fixed via `npm install -g
+   node-gyp` (v13 at `/usr/local/bin` shadows Debian's broken 7.1.2),
+   so full `bun install` with scripts works on solidPC.
+
+
 **F3 M4 (2026-05-23): no new registry rows.** M4 (session +
 turn events flowing into opencoti-server) ships as a pure
 plugin (`@opencoti/session-events-plugin`) that subscribes to
@@ -1718,3 +1791,28 @@ server-context meta field/aggregate-init position; the virtuals are additive.
 - `llamafile/version.h` — `OPENCOTI_TAG` default + `OPENCOTI_VERSION_STRING` (bump the default together with `vendors/llamafile/OPENCOTI_TAG` on every packaged cut).
 - `llamafile/main.cpp` — `--version` + help banner print `llamafile vX.Y.Z (opencoti-X.Y.Z-<tag>)`; `llamafile vX.Y.Z` token must stay FIRST (scripts/llamafile-version.sh contract).
 - `llamafile/BUILD.mk` — `OPENCOTI_TAG_FLAG` injection (make var from build pipeline) + `version.h` dep on `main.o`.
+
+## 2026-07-15 — 0134 cuda-cross-sbsa (#681, aarch64/DGX Spark lane)
+
+### `0134-cuda-cross-sbsa` (#681)
+Marker: `opencoti-hook: cuda-cross-sbsa` (3 sites). Build-script-only — no
+kernel/host C++ change; native x86_64 builds byte-unaffected (flag default off,
+`OPENCOTI_HOST_GCC/GXX` default to `gcc`/`g++`).
+- `llamafile/cuda.sh` — `--cross-sbsa` flag: dedicated build dir
+  `~/.cache/llamafile-cuda-sbsa-build` (never mix aarch64 objects into the
+  x86_64 cache), arch set sm_110f (Jetson Thor) + sm_121a (DGX Spark GB10),
+  and `-ccbin aarch64-linux-gnu-g++ -target-dir sbsa-linux` riding in
+  **ARCH_FLAGS** (the LINK receives ARCH_FLAGS — putting them in COMMON_FLAGS
+  emits an x86_64 DSO). `-lcuda` resolves against the sbsa driver stub.
+  Tunable `OPENCOTI_SBSA_CCBIN`. Requires CUDA 13.x + the cuda-cross-sbsa
+  target packages (cached at `.opencoti/cross-sbsa/debs/`).
+- `llamafile/build-functions.sh` — `compile_ggml_core` host TUs go through
+  `${OPENCOTI_HOST_GCC:-gcc}` / `${OPENCOTI_HOST_GXX:-g++}` so the cross build
+  doesn't mix host arches at link.
+Consumers: `build:llamafile:cuda-sbsa` pipeline lane (stages
+`vendors/dist/llamafile/cuda-sbsa/<ver>/ggml-cuda.so`, NO ~/.llamafile
+side-load mirror — bug-224 cache-poisoning class) and
+`build:llamafile:package --arch aarch64` (embeds ONLY the sbsa DSO).
+Sync note: on a future llamafile bump re-anchor the two cuda.sh insertion
+points (after the BUILD_DIR selection block; after the CUDA-13 arch-selection
+chain, BEFORE the `--compress` block so `--compress-mode` still appends).