Merge branch 'main' into claude/fix-vscode-smoke-vscode-import

Signed-off-by: Jonathan D.A. Jewell <6759885+hyperpolymath@users.noreply.github.com>

Author: hyperpolymath

.claude/CLAUDE.md

@@ -1,3 +1,30 @@
+## 🚨 Disambiguation (read first)
+
+**This repo is `hyperpolymath/affinescript`.** It is **NOT** `hyperpolymath/ephapax`.
+
+| | This repo | NOT this repo |
+|---|---|---|
+| Name | **AffineScript** | Ephapax |
+| Path | `hyperpolymath/affinescript` | `hyperpolymath/ephapax` |
+| File extension | `.affine` (plus face dialects) | `.eph` |
+| Build | `dune-project` at root | `Cargo.toml` at root |
+| Type checker | `lib/borrow.ml` (OCaml) | `ephapax-linear/src/{linear,affine}.rs` (Rust) |
+| Proofs | None mechanized; soundness arguments live in `lib/borrow.ml` + `docs/CAPABILITY-MATRIX.adoc` + issue #177 (CORE-01) | `formal/Semantics.v` (Coq), `src/abi/Ephapax/…` (Idris2) |
+
+**The trap.** Ephapax is internally dyadic — it contains `ephapax-linear` and `ephapax-affine` *sublanguages* inside one Rust crate. **The `ephapax-affine` sublanguage is NOT AffineScript.** The word `affine` is shared because both type systems happen to be substructural-logic-family — that's a logic-family fact, not a project relationship.
+
+**Rule for agents:** before applying any prior-session lesson, memory entry, or snippet, check whether it was about *AffineScript* or about *ephapax*. They share zero AST / typing / borrow-checker / codegen. The only shared surface is the compile target (`hyperpolymath/typed-wasm`) and the shared Rust verifier crate (`crates/typed-wasm-verify/` *in* that repo).
+
+When in doubt: state the context shift explicitly ("switching from ephapax context to AffineScript context") so the user sees the boundary respected.
+
+**Canonical disambiguation doc** (single source of truth):
+https://github.com/hyperpolymath/nextgen-languages/blob/main/docs/disambiguation/ephapax-vs-affinescript.md
+
+**Companion memory entry** (in user auto-memory):
+`feedback_affinescript_ephapax_siblings_not_impl_proof.md`
+
+---
+
 ## Machine-Readable Artefacts
 
 The following files in `.machine_readable/` contain structured project metadata:

.github/workflows/casket-pages.yml

@@ -80,6 +80,15 @@ jobs:
 
       - name: Setup Pages
         uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
+        with:
+          # Self-provision Pages on first run instead of failing with
+          # 404 ("Get Pages site failed"). The repo had Pages disabled
+          # at the GitHub level since the workflow was added; rather
+          # than maintain that as out-of-band state, let the workflow
+          # enable it. Idempotent on subsequent runs. The workflow's
+          # own permissions (pages: write, id-token: write) authorise
+          # this.
+          enablement: true
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0

.github/workflows/ci.yml

@@ -10,6 +10,12 @@ on:
 permissions:
   contents: read
 
+# Actions concurrency pool. Applied only to read-only check workflows
+# (no publish/mutation), so cancelling a superseded run is always safe.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -169,7 +175,6 @@ jobs:
         run: opam install . --deps-only --with-test --with-doc
 
       - name: Run tests with bisect_ppx instrumentation
-        continue-on-error: true
         run: |
           opam exec -- dune runtest --force --instrument-with bisect_ppx
 
@@ -211,14 +216,12 @@ jobs:
     # (see CLAUDE.md "Runtime Exemptions") because the VS Code extension
     # host is npm/Node-native and no Deno/JSR equivalent exists.
     #
-    # The extension's wasm module imports the `Vscode` /
-    # `VscodeLanguageClient` modules from the @hyperpolymath/affine-vscode
-    # adapter. Until #104 publishes the adapter to npm, we install the
-    # in-tree source at packages/affine-vscode/ as a file: dependency so
-    # `require("@hyperpolymath/affine-vscode")` in out/extension.cjs
-    # resolves and the WASM instantiates cleanly. Drop the file: step
-    # once the npm publish lands; the optionalDependencies entry will
-    # take over.
+    # Self-contained as of the codegen-embed fix: `--vscode-extension`
+    # codegen now inlines the affine-vscode adapter source into the
+    # generated .cjs at compile time, so activation no longer depends on
+    # the @hyperpolymath/affine-vscode npm package being installed
+    # (previously gated on #104's npm publish). A real regression should
+    # turn this job red and gate, so no `continue-on-error`.
     runs-on: ubuntu-latest
 
     steps:
@@ -232,25 +235,33 @@ jobs:
 
       - name: Install test runner dependencies
         working-directory: editors/vscode
-        # The compiled out/extension.cjs is checked in (see #35 Phase 3),
-        # so the smoke test does not need the OCaml toolchain — only the
-        # Node-side test runner deps. peerDeps `vscode` is provided by
-        # @vscode/test-electron at launch.
+        # The compiled out/extension.cjs is checked in (see #35 Phase 3)
+        # and now embeds the affine-vscode adapter inline (codegen-embed),
+        # so the smoke test only needs the @vscode/test-electron runner
+        # deps. `vscode` itself is provided by the test runner at launch.
+        # The #381 SKIP-when-missing guard remains downstream as a safety
+        # net but is now expected to find the adapter present.
         run: npm install --no-audit --no-fund
 
-      - name: Install in-tree affine-vscode adapter (pre-#104)
+      - name: Report adapter availability
         working-directory: editors/vscode
-        # Until @hyperpolymath/affine-vscode is published to npm (#104),
-        # wire the in-tree source as a file: dependency so the wasm's
-        # Vscode / VscodeLanguageClient imports resolve at instantiation.
-        # --no-save keeps editors/vscode/package.json clean; --no-audit /
-        # --no-fund match the previous step's flags for log noise parity.
-        run: npm install --no-audit --no-fund --no-save file:../../packages/affine-vscode
+        # Surface the @hyperpolymath/affine-vscode publish state in the
+        # workflow log before the smoke runs. Either it resolves (smoke
+        # exercises real activation) or it doesn't (smoke skips cleanly
+        # per the #139 suiteSetup detector). Either case is a green run.
+        run: |
+          if node -e "require.resolve('@hyperpolymath/affine-vscode')" 2>/dev/null; then
+            echo "::notice title=adapter::@hyperpolymath/affine-vscode present — smoke will run"
+          else
+            echo "::notice title=adapter::@hyperpolymath/affine-vscode NOT installed (optional, awaits #104 npm publish) — smoke will skip"
+          fi
 
       - name: Run in-editor smoke (xvfb)
         working-directory: editors/vscode
         # Headless display required because @vscode/test-electron launches
-        # the real Electron-based VS Code binary.
+        # the real Electron-based VS Code binary. When the adapter is not
+        # available the suite calls `this.skip()` in suiteSetup and exits
+        # 0 with all tests marked skipped (mocha's expected behaviour).
         run: xvfb-run -a npm test
 
   migration-assistant: