@aron98/load-lock 1.6.0 → 1.6.1

package/README.md

@@ -8,7 +8,8 @@
 <p align="center">
   <a href="https://github.com/aron98/load-lock/actions/workflows/ci.yml"><img src="https://github.com/aron98/load-lock/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
   <a href="https://www.npmjs.com/package/@aron98/load-lock"><img src="https://img.shields.io/npm/v/@aron98/load-lock?color=%233fb950" alt="npm version"></a>
-  <a href="https://www.npmjs.com/package/@aron98/load-lock"><img src="https://img.shields.io/npm/dm/@aron98/load-lock?color=%233fb950" alt="npm downloads"></a>
+  <a href="https://www.npmjs.com/package/@aron98/load-lock"><img src="https://badgen.net/npm/dm/@aron98/load-lock?color=3fb950" alt="npm downloads"></a>
+  <a href="https://skills.sh/aron98/load-lock"><img src="https://skills.sh/b/aron98/load-lock" alt="skills.sh"></a>
   <a href="https://github.com/aron98/load-lock/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green" alt="license MIT"></a>
   <img src="https://img.shields.io/badge/node-%E2%89%A520-green" alt="node >= 20">
 </p>

package/dist/mcp/server.js

@@ -47,7 +47,7 @@ export function buildServer(opts) {
     const drift = opts.drift !== undefined ? opts.drift : detectCliDrift(packageVersion());
     if (drift)
         process.stderr.write(drift.message + "\n");
-    const server = new McpServer({ name: opts.serverName ?? "load-lock", version: "0.1.0" }, { instructions: POLICY_BRIEF + "\n\n" + SETUP_HINT + (drift ? "\n\n" + drift.message : "") });
+    const server = new McpServer({ name: opts.serverName ?? "load-lock", version: packageVersion() }, { instructions: POLICY_BRIEF + "\n\n" + SETUP_HINT + (drift ? "\n\n" + drift.message : "") });
     const json = (v) => ({
         content: [{ type: "text", text: JSON.stringify(v, null, 2) }],
     });

package/dist/test/ace-mcp.test.js

@@ -9,7 +9,9 @@
  * Rules from the same revision: backend/app/domain/kinds/MCP.md (inline
  * secrets), compliance_mcp_rule_checks_service.py (`_first_non_flag`,
  * companion-file roots), artifact_import_zip_safety_service.py (forbidden
- * names in a non-plugin bundle).
+ * names in a non-plugin bundle), and artifact_import_entry_points_service.py
+ * (`_split_mcp_bundle_members`, `_require_companion_files_match` — the MCP
+ * bundle layout rules mirrored below; issue #98).
  */
 import test from "node:test";
 import assert from "node:assert/strict";
@@ -141,14 +143,61 @@ test("ace mcp.json: local npx server running `load-lock mcp` at the package.json
             assert.match(String(v), /\$\{[^}]+\}/, `env ${k} must be a \${VAR} placeholder`);
     }
 });
-test("ace/mcp folder: only mcp.json + README, nothing ACE's bundle rules would flag", () => {
-    const files = readdirSync(ACE_MCP_DIR).sort();
-    assert.deepEqual(files, ["README.md", "mcp.json"]);
-    // companion_files roots (must match companion_files) and names forbidden in a non-plugin bundle.
-    for (const bad of ["bin", "scripts", "config", "references", ".claude-plugin", ".mcp.json", ".lsp.json", ".opencode"]) {
-        assert.ok(!files.includes(bad), bad);
+/**
+ * Every file in the ace/mcp bundle, as `member` paths relative to the bundle
+ * root (POSIX separators), mirroring what ACE's `parse_mcp_zip` sees.
+ */
+function listBundleMembers(dir, rel = "") {
+    const members = [];
+    for (const e of readdirSync(dir, { withFileTypes: true })) {
+        const relPath = rel ? `${rel}/${e.name}` : e.name;
+        if (e.isDirectory())
+            members.push(...listBundleMembers(join(dir, e.name), relPath));
+        else
+            members.push(relPath);
+    }
+    return members.sort();
+}
+test("ace/mcp bundle: _split_mcp_bundle_members — only mcp.json at the root", () => {
+    // ACE's artifact_import_entry_points_service.py `_split_mcp_bundle_members`:
+    // the bundle root may contain ONLY `mcp.json`; every other member must live
+    // under one of bin/ | scripts/ | config/ | references/. A root-level file
+    // like the old README.md gets the whole bundle rejected (issue #98).
+    const members = listBundleMembers(ACE_MCP_DIR);
+    assert.ok(members.includes("mcp.json"), "mcp.json must exist at the bundle root");
+    const rootFiles = members.filter((m) => !m.includes("/"));
+    assert.deepEqual(rootFiles, ["mcp.json"], "only mcp.json at the bundle root");
+    const allowedDirs = ["bin", "scripts", "config", "references"];
+    for (const entry of readdirSync(ACE_MCP_DIR)) {
+        if (entry === "mcp.json")
+            continue;
+        assert.ok(allowedDirs.includes(entry), `root member ${entry} must be a directory under ${allowedDirs.join("|")}/`);
+    }
+    for (const m of members) {
+        if (m === "mcp.json")
+            continue;
+        assert.ok(allowedDirs.includes(m.split("/")[0]), `member ${m} must be under ${allowedDirs.join("|")}/`);
+    }
+    // Names forbidden in a non-plugin bundle (artifact_import_zip_safety_service.py).
+    for (const bad of [".claude-plugin", ".mcp.json", ".lsp.json", ".opencode"]) {
+        assert.ok(!members.includes(bad), bad);
+    }
+});
+test("ace/mcp bundle: _require_companion_files_match — bin|scripts|config == companion_files", () => {
+    // ACE's artifact_import_entry_points_service.py
+    // `_require_companion_files_match`: every file under bin/, scripts/ or
+    // config/ must be listed in the manifest's `companion_files`, and every
+    // `companion_files` entry must exist — exactly. Files under references/
+    // are exempt (issue #98 moved README.md there).
+    const members = listBundleMembers(ACE_MCP_DIR);
+    const companionRoots = ["bin", "scripts", "config"];
+    const declared = new Set((manifest.companion_files ?? []));
+    const present = members.filter((m) => companionRoots.includes(m.split("/")[0]));
+    assert.deepEqual([...declared].sort(), present, "companion_files and the files under bin|scripts|config must match exactly");
+    // references/ members must NOT need a companion_files entry.
+    for (const m of members.filter((m2) => m2.startsWith("references/"))) {
+        assert.ok(!declared.has(m), `references/ member ${m} is exempt from companion_files`);
     }
-    assert.equal(manifest.companion_files, undefined);
 });
 test("ace mcp.json: pin is declared in scripts/check-pins.mjs", async () => {
     const pins = (await import(pathToFileURL(join(REPO_ROOT, "scripts", "check-pins.mjs")).href));

package/dist/test/mcp.test.js

@@ -50,6 +50,23 @@ test("mcp: `load-lock mcp` serves the same MCP server as load-lock-mcp (#65)", a
         await d.stop();
     }
 });
+test("mcp: initialize reports this package's version from package.json (#97)", async () => {
+    const d = await startDaemon();
+    const viaBin = await connectMcp(d); // load-lock-mcp entry point
+    const viaCli = await connectMcp(d, {}, [cliMainPath, "mcp"]); // `load-lock mcp`
+    try {
+        const pkgVersion = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "..", "package.json"), "utf8")).version;
+        assert.ok(pkgVersion, "package.json has a version");
+        assert.equal(viaBin.getServerVersion()?.version, pkgVersion, "load-lock-mcp serverInfo.version matches package.json");
+        assert.equal(viaCli.getServerVersion()?.version, pkgVersion, "`load-lock mcp` serverInfo.version matches package.json");
+        assert.notEqual(pkgVersion, "0.1.0", "guards against the old hard-coded constant");
+    }
+    finally {
+        await viaCli.close();
+        await viaBin.close();
+        await d.stop();
+    }
+});
 test("mcp: tool listing + acquire/release/configure round trip", async () => {
     const d = await startDaemon();
     const c = await connectMcp(d);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aron98/load-lock",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Machine-wide counting semaphore coordinating resource-intensive work across parallel coding agents (OpenCode, Codex CLI, Claude Code, ...)",
   "type": "module",
   "license": "MIT",

package/skills/load-lock/SKILL.md

@@ -7,7 +7,7 @@ description: >-
   queued FIFO, sleep honestly with bounded waits instead of polling, and
   release the permit when done. Use when several agents on one machine risk
   overloading it by starting heavy work in the same minute. If load-lock is
-  not installed, this skill runs it via `npx -y @aron98/load-lock@1.6.0`
+  not installed, this skill runs it via `npx -y @aron98/load-lock@1.6.1`
   (downloads the pinned npm package), and load-lock keeps its shared state in
   ~/.local/state/load-lock (a small per-user daemon started on first use).
 ---
@@ -26,7 +26,7 @@ Use the first of these that works; they all talk to the same daemon:
 1. **load-lock MCP tools** (`acquire`, `wait_for_turn`, `run_with_permit`,
    ...), if your harness lists them. The rest of this skill names them.
 2. **`load-lock` on PATH**: check with `load-lock version`.
-3. **Pinned npx**: `npx -y @aron98/load-lock@1.6.0 <command>` (Node >= 20).
+3. **Pinned npx**: `npx -y @aron98/load-lock@1.6.1 <command>` (Node >= 20).
    It downloads that exact npm package once into the npx cache. Below,
    read `load-lock` as this whole prefix. `npm install -g @aron98/load-lock`
    makes it permanent.