Update server.mjs

Author: GsCommand

server.mjs

@@ -18,7 +18,6 @@ import {
   CANONICAL_ID_SORTED_KEYS_V1
 } from "@commandlayer/runtime-core";
 
-<<<<<<< HEAD
 /**
  * Notes
  * - Node 18+ provides global fetch. Node 22 definitely does.
@@ -45,7 +44,6 @@ process.on("uncaughtException", (err) => {
 // -----------------------
 // app + basic middleware
 // -----------------------
-=======
 >>>>>>> 2864ef4 (fix: resolve server.mjs merge conflict)
 const app = express();
 app.use(express.json({ limit: "2mb" }));
@@ -73,15 +71,13 @@ const ENABLED_VERBS = (
   .map((s) => s.trim())
   .filter(Boolean);
 
-<<<<<<< HEAD
 const SIGNER_ID =
   process.env.RECEIPT_SIGNER_ID ||
   process.env.ENS_NAME ||
   process.env.CL_SIGNER_ID ||
   process.env.SIGNER_ID ||
   "runtime.commandlayer.eth";
 
-=======
 const SIGNER_ID = (
   process.env.RECEIPT_SIGNER_ID ||
   process.env.ENS_NAME ||
@@ -1381,14 +1377,13 @@ app.post("/verify", async (req, res) => {
       pubPem = ensOut.pubkey_pem;
       pubSrc = "ens";
 
-<<<<<<< HEAD
       ensExpect = {
         agent_ens: ensOut.agent_ens,
         signer_ens: ensOut.signer_ens,
         kid: ensOut.kid || null,
         canonical: ensOut.canonical || null,
       };
-=======
+
       // Hash match:
       // - If signature is valid, hash match is implicitly true (it verified).
       // - If signature is invalid and reason is "hash_mismatch", we know it's false.
@@ -1397,7 +1392,7 @@ app.post("/verify", async (req, res) => {
 
       // IMPORTANT: we are not recomputing hash here yet (core doesn't expose it), so keep this null unless you add that helper.
       const recomputed = null;
->>>>>>> 2864ef4 (fix: resolve server.mjs merge conflict)
+ 2864ef4 (fix: resolve server.mjs merge conflict)
 
       // Enforce kid/canonical (when present in ENS) + signer binding
       const kidOk = ensExpect.kid ? String(proof.kid || "") === ensExpect.kid : true;
@@ -1430,10 +1425,9 @@ app.post("/verify", async (req, res) => {
       }
     }
 
-<<<<<<< HEAD
     if (!pubPem) {
       return res.status(400).json({
-=======
+
       return res.json({
         ok: (hashMatches === true) && (sigOk === true) && (schemaOk === true),
         checks: { schema_valid: schemaOk, hash_matches: hashMatches, signature_valid: sigOk },
@@ -1450,7 +1444,7 @@ app.post("/verify", async (req, res) => {
       });
     } catch (e) {
       return res.status(500).json({
->>>>>>> 2864ef4 (fix: resolve server.mjs merge conflict)
+ 2864ef4 (fix: resolve server.mjs merge conflict)
         ok: false,
         checks: {
           schema_valid: wantSchema ? false : null,
@@ -1587,10 +1581,8 @@ app.post("/verify", async (req, res) => {
 app.listen(PORT, HOST, () => {
   console.log(`runtime listening on http://${HOST}:${PORT}`);
 });
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
+
 >>>>>>> 401967b (fix(runtime): /verify reports hash_matches truthfully; ok requires proven hash+sig+schema)
 >>>>>>> 2864ef4 (fix: resolve server.mjs merge conflict)
-=======
+
 >>>>>>> f89e3c2 (fix: remove leftover merge markers)