@clunkyard/cli 2.1.0 → 2.1.2

package/README.md

@@ -43,8 +43,8 @@ Python, Rust and .NET binding installation needs no Unix shell or GNU Make.
 JavaScript, TypeScript and the Vane/Cadence/Glyph Node routes use WebAssembly.
 
 `@2` receives compatible tooling updates. For an exact tool version, run
-`npx --yes @clunkyard/cli@2.1.0` or set
-`CLUNKYARD='npx --yes @clunkyard/cli@2.1.0'` with Make. Commit the npm lockfile
+`npx --yes @clunkyard/cli@2.1.2` or set
+`CLUNKYARD='npx --yes @clunkyard/cli@2.1.2'` with Make. Commit the npm lockfile
 for reproducible JavaScript/TypeScript dependencies. Match replays record the
 game rules and robot actions; local timings do not qualify hosted budgets.
 

package/catalogue.json

@@ -1,9 +1,9 @@
 {
   "v": 1,
-  "release": "v2.0.0-kit.3",
+  "release": "v2.0.0-kit.4",
   "sdkVersion": "2.0.0",
-  "source": "a0ba86a696e761a3586a2485340b8943e7c498e9",
-  "generatorSource": "a0ba86a696e761a3586a2485340b8943e7c498e9",
+  "source": "0b70a867d3aa9e497cc35c77d3e83f7bc32d8aa8",
+  "generatorSource": "331c7d1ed0910cd796ddcb99eca6674e8ef3f198",
   "engine": {
     "file": "clunkyard-engine-v2.0.0-kit.3.tar.gz",
     "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.3/clunkyard-engine-v2.0.0-kit.3.tar.gz",
@@ -2764,7 +2764,7 @@
       }
     },
     "cadence": {
-      "version": "v2.0.0-kit.2",
+      "version": "v2.0.0-kit.4",
       "sdkVersion": "2.0.0",
       "language": "cadence",
       "portable": true,
@@ -2788,10 +2788,10 @@
       ],
       "requirements": {},
       "starter": {
-        "file": "starter-cadence-v2.0.0-kit.2.tar.gz",
-        "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.2/starter-cadence-v2.0.0-kit.2.tar.gz",
-        "bytes": 11879,
-        "sha256": "04caaa7a2f9708cb72a10c346020cb67c7b9e36e693665d8747330f497e41639",
+        "file": "starter-cadence-v2.0.0-kit.4.tar.gz",
+        "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.4/starter-cadence-v2.0.0-kit.4.tar.gz",
+        "bytes": 5008,
+        "sha256": "05f57fc5fd7dc44e195a75f9ef543caa1c0ade0cde1ae534361d690a13b61d6b",
         "expandedBytes": 1048576
       },
       "boilerplate": {
@@ -2801,7 +2801,10 @@
         "clunkyard-template.json": "20574b7c0257af409190a7285ef25d6392e3e2fdec5f19b98fdb6d6246baa12a",
         "Makefile": "e592144ef3560c9efc206b275b54e0eacfa048e447c5f5188eb587db3e3e3e5e",
         "package.json": "22787cf021d078334fe4b55eeaa67cb5c6fe7f09e9929c6fddbe2d4b7e9697e2",
-        "README.md": "4f0c4faa83288a221c4ae844c89940a49dbafbdd149a0dbbfc84b758d9158be2",
+        "README.md": [
+          "4f0c4faa83288a221c4ae844c89940a49dbafbdd149a0dbbfc84b758d9158be2",
+          "28d93ffc6c52a67eacf9401d38173712be1377b87a779856c834b76e6123ffeb"
+        ],
         ".gitignore": "217e0fb356990d296c3d031f78f013157da8897b2b19f8545e66ca9da4acb207",
         "Dockerfile": "326fc3aedb21c5e9b3578a3e56d02bba40fe02f0368aaaef0f2f2e6d60a4b01f",
         ".dockerignore": "42bec36c9d4ba42ddbeb8c715b6c0ce0cc5dd9711ef7fb8ed034f78d944da57c"
@@ -2874,9 +2877,25 @@
       "tools": [
         "node",
         "make",
-        "clang"
+        "clang",
+        "wasm-ld"
       ],
-      "requirements": {},
+      "requirements": {
+        "checks": [
+          {
+            "label": "Clang wasm32 backend",
+            "command": "clang",
+            "args": [
+              "--print-targets"
+            ],
+            "hint": "Install Clang with the wasm32 backend and wasm-ld (clang and lld on Ubuntu).",
+            "outputPattern": "\\bwasm32\\b"
+          }
+        ],
+        "notes": [
+          "Install Clang with the wasm32 backend and wasm-ld (the clang and lld packages on Ubuntu). No WASI sysroot is needed."
+        ]
+      },
       "starter": {
         "file": "starter-vane-wasm-v2.0.0-kit.2.tar.gz",
         "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.2/starter-vane-wasm-v2.0.0-kit.2.tar.gz",
@@ -2896,7 +2915,7 @@
       }
     },
     "cadence-wasm": {
-      "version": "v2.0.0-kit.2",
+      "version": "v2.0.0-kit.4",
       "sdkVersion": "2.0.0",
       "language": "cadence-wasm",
       "portable": false,
@@ -2918,14 +2937,30 @@
       "tools": [
         "node",
         "make",
-        "clang"
+        "clang",
+        "wasm-ld"
       ],
-      "requirements": {},
+      "requirements": {
+        "checks": [
+          {
+            "label": "Clang wasm32 backend",
+            "command": "clang",
+            "args": [
+              "--print-targets"
+            ],
+            "hint": "Install Clang with the wasm32 backend and wasm-ld (clang and lld on Ubuntu).",
+            "outputPattern": "\\bwasm32\\b"
+          }
+        ],
+        "notes": [
+          "Install Clang with the wasm32 backend and wasm-ld (the clang and lld packages on Ubuntu). No WASI sysroot is needed."
+        ]
+      },
       "starter": {
-        "file": "starter-cadence-wasm-v2.0.0-kit.2.tar.gz",
-        "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.2/starter-cadence-wasm-v2.0.0-kit.2.tar.gz",
-        "bytes": 11352,
-        "sha256": "277fa15404cc496fbeed10a7bd2c7645652b0b0e3a5e8bf5dd0423460ef22c0c",
+        "file": "starter-cadence-wasm-v2.0.0-kit.4.tar.gz",
+        "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.4/starter-cadence-wasm-v2.0.0-kit.4.tar.gz",
+        "bytes": 5075,
+        "sha256": "d29837c2814f8c4704425e993aedc88d20d6569adb6f4c5837c6758cd16119e7",
         "expandedBytes": 1048576
       },
       "boilerplate": {
@@ -2935,7 +2970,10 @@
         "clunkyard-template.json": "57534aa1c8e39312569ab7c771fbe1d557b632545ccff0de0744bc3ea72ca61b",
         "Makefile": "e592144ef3560c9efc206b275b54e0eacfa048e447c5f5188eb587db3e3e3e5e",
         "package.json": "729e27022cdcd2bcaaab508e20d4df8e74cea64e0efbe92077786a4bdda11d40",
-        "README.md": "3daa50f3c62cfdb8fc8e5179f007c7887fbfab456074d359ce2d3e67ce22ebc2",
+        "README.md": [
+          "3daa50f3c62cfdb8fc8e5179f007c7887fbfab456074d359ce2d3e67ce22ebc2",
+          "1b11eca38ddff77a6c4b044eee5e641f256bf36a65c5ceda771858bd02b73761"
+        ],
         ".gitignore": "217e0fb356990d296c3d031f78f013157da8897b2b19f8545e66ca9da4acb207"
       }
     },
@@ -2962,9 +3000,25 @@
       "tools": [
         "node",
         "make",
-        "clang"
+        "clang",
+        "wasm-ld"
       ],
-      "requirements": {},
+      "requirements": {
+        "checks": [
+          {
+            "label": "Clang wasm32 backend",
+            "command": "clang",
+            "args": [
+              "--print-targets"
+            ],
+            "hint": "Install Clang with the wasm32 backend and wasm-ld (clang and lld on Ubuntu).",
+            "outputPattern": "\\bwasm32\\b"
+          }
+        ],
+        "notes": [
+          "Install Clang with the wasm32 backend and wasm-ld (the clang and lld packages on Ubuntu). No WASI sysroot is needed."
+        ]
+      },
       "starter": {
         "file": "starter-glyph-wasm-v2.0.0-kit.2.tar.gz",
         "url": "https://github.com/clunkyard/game-kit/releases/download/v2.0.0-kit.2/starter-glyph-wasm-v2.0.0-kit.2.tar.gz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clunkyard/cli",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Shared local builds, matches and replays for Clunkyard robots",
   "license": "MIT",
   "engines": {

package/project.cjs

@@ -6,7 +6,16 @@ const catalogue=require('./catalogue.json');
 const json=value=>JSON.stringify(value,null,2)+'\n';
 const hash=data=>crypto.createHash('sha256').update(data).digest('hex');
 const normalized=data=>data.toString('utf8').replace(/\r\n/g,'\n');
-const known=(data,expected)=>Boolean(expected)&&(hash(data)===expected||hash(normalized(data))===expected);
+function managedHashes(expected) {
+  if(expected===undefined)return [];
+  const hashes=Array.isArray(expected)?expected:[expected];
+  if(!hashes.length||hashes.length>2||hashes.some(value=>typeof value!=='string'||!(/^[a-f0-9]{64}$/).test(value)))throw new Error('Invalid managed-file checksum catalogue.');
+  return hashes;
+}
+function known(data,expected) {
+  const hashes=managedHashes(expected);
+  return hashes.includes(hash(data))||hashes.includes(hash(normalized(data)));
+}
 const nodeLanguage=language=>['javascript','typescript'].includes(language);
 
 function readManifest(directory) {
@@ -71,7 +80,7 @@ npx --yes @clunkyard/cli@2 match 77 3d zero-g
 
 Keep a baseline commit. Repeat several seeds and rulesets; compare contacts, battery, aim, shots, hits and eliminations in the replay. Local trials run programs as your user. Use hosted trials to measure arena budgets before a tournament.
 
-The CLI packages SDK ${catalogue.sdkVersion}/protocol 2 asset identities from the immutable [${catalogue.release} release](https://github.com/clunkyard/game-kit/releases/tag/${catalogue.release}). \`@2\` receives compatible tooling fixes without copying scripts into your robot repository. To reproduce an exact tool version, use \`npx --yes @clunkyard/cli@2.1.0\` or set \`CLUNKYARD='npx --yes @clunkyard/cli@2.1.0'\` with Make. SDK/engine caches are identified by their content hashes and remain reusable across CLI updates.
+The CLI packages SDK ${catalogue.sdkVersion}/protocol 2 asset identities from the immutable [${catalogue.release} release](https://github.com/clunkyard/game-kit/releases/tag/${catalogue.release}). \`@2\` receives compatible tooling fixes without copying scripts into your robot repository. To reproduce an exact tool version, use \`npx --yes @clunkyard/cli@2.1.2\` or set \`CLUNKYARD='npx --yes @clunkyard/cli@2.1.2'\` with Make. SDK/engine caches are identified by their content hashes and remain reusable across CLI updates.
 
 ## Play online
 
@@ -85,6 +94,7 @@ You can also create your own GitHub repository from this template, connect it in
 
 function migrate(directory) {
   const root=path.resolve(directory),manifest=readManifest(root),row=catalogue.languages[manifest.language];
+  for(const expected of Object.values(row.boilerplate))managedHashes(expected);
   const files={'Makefile':makefile(),...(nodeLanguage(manifest.language)?nodeMetadata(manifest.language):{})};
   const retired=['clunkyard.cjs','clunkyard-archive.cjs','clunkyard.lock.json','clunkyard-template.json'];
   const remove=[...retired,...(!nodeLanguage(manifest.language)?['package.json']:[])];
@@ -108,7 +118,7 @@ function migrate(directory) {
   }
   const guide=path.join(root,'README.md'),oldGuide=fs.existsSync(guide)?fs.readFileSync(guide,'utf8'):null;
   const generated=readme(manifest.language,manifest.entry);
-  if(oldGuide===null||known(oldGuide,row.boilerplate['README.md']))fs.writeFileSync(guide,generated);
+  if(oldGuide===null||oldGuide===generated||known(oldGuide,row.boilerplate['README.md']))fs.writeFileSync(guide,generated);
   else if(!oldGuide.includes('## Clunkyard CLI'))fs.appendFileSync(guide,'\n## Clunkyard CLI\n\nShared tooling is available through `npx --yes @clunkyard/cli@2 doctor`, `build`, `match` and `replay`. See [the local development guide](https://clunkyard.com/sdk/player-kit) for npm installation and private Git. SDK/engine asset identities are pinned in the CLI package.\n');
   const ignore=path.join(root,'.gitignore'),ignored=fs.existsSync(ignore)?fs.readFileSync(ignore,'utf8'):'';
   const additions=['.clunkyard/','replays/','build/','node_modules/'].filter(line=>!ignored.split(/\r?\n/).includes(line));

package/runtime.cjs

@@ -71,7 +71,7 @@ function run(command, args, options={}) {
 }
 function environment() {
   const paths=[path.join(sdk,'lib'),process.env.LD_LIBRARY_PATH].filter(Boolean).join(path.delimiter);
-  return {...process.env,CLUNKYARD_SDK:sdk,CLUNKYARD_PROJECT:root,CLUNKYARD_LIB:path.join(sdk,'lib',library),LD_LIBRARY_PATH:paths,
+  return {...process.env,CLUNKYARD_SDK:sdk,CLUNKYARD_PROJECT:root,CLUNKYARD_WASM_INCLUDE:path.join(engine,'sdk','wasm','abi4'),CLUNKYARD_LIB:path.join(sdk,'lib',library),LD_LIBRARY_PATH:paths,
     ...(process.platform==='darwin'?{DYLD_LIBRARY_PATH:[path.join(sdk,'lib'),process.env.DYLD_LIBRARY_PATH].filter(Boolean).join(path.delimiter)}:{}),
     ...(process.platform==='win32'?{PATH:[path.join(sdk,'lib'),process.env.PATH].filter(Boolean).join(path.delimiter),CC:cCompiler(false),CXX:cCompiler(true)}:{}),
     TMPDIR:path.join(cache,'tmp'),NODE_PATH:npmSDK?path.join(root,'node_modules'):path.join(sdk,'bindings','javascript'),
@@ -249,7 +249,7 @@ function doctor(){
     const result=spawnSync(command[0],[...command.slice(1),...check.args],{encoding:'utf8',env:environment(),timeout:10000});
     const output=String(result.stdout||'')+String(result.stderr||'');
     const version=check.versionPattern?Number(output.match(new RegExp(check.versionPattern))?.[1]):null;
-    const ok=!result.error&&result.status===0&&(!check.minimum||version>=check.minimum);
+    const ok=!result.error&&result.status===0&&(!check.minimum||version>=check.minimum)&&(!check.outputPattern||new RegExp(check.outputPattern).test(output));
     console.log(`${ok?'ok':'missing'} ${check.label}${ok?'':': '+check.hint}`);if(!ok)missing++;
   }
   if(lock.language==='clojure'){try{console.log('ok Clojure runtime: '+clojureClasspath())}catch(error){console.log('missing '+error.message);missing++}}