@rubytech/create-maxy-code 0.1.442 → 0.1.443

package/dist/__tests__/converge-client-admins.test.js

@@ -0,0 +1,50 @@
+// Task 1623 — acceptance for the installer convergence that drops the vestigial
+// admins[] key from existing client account.json. Filesystem fixtures under a
+// tmp dir; no installer side effects. Runs under `node --test dist/__tests__/*`.
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { removeClientAdminsKey } from "../converge-client-admins.js";
+function makeRoot() {
+    return mkdtempSync(join(tmpdir(), "conv-1623-"));
+}
+function acct(root, id, cfg) {
+    mkdirSync(join(root, id), { recursive: true });
+    writeFileSync(join(root, id, "account.json"), JSON.stringify(cfg, null, 2));
+}
+function hasAdmins(root, id) {
+    return "admins" in JSON.parse(readFileSync(join(root, id, "account.json"), "utf-8"));
+}
+test("removes admins from a client, keeps it on the house, is idempotent", () => {
+    const root = makeRoot();
+    try {
+        acct(root, "c1", { accountId: "c1", role: "client", admins: [] });
+        acct(root, "h1", { accountId: "h1", role: "house", admins: [{ userId: "u1", role: "owner" }] });
+        acct(root, "c2", { accountId: "c2", role: "client" }); // already stripped
+        const first = removeClientAdminsKey(root);
+        assert.equal(first.find((r) => r.accountId === "c1")?.action, "removed");
+        assert.equal(first.find((r) => r.accountId === "h1")?.action, "house-kept");
+        assert.equal(first.find((r) => r.accountId === "c2")?.action, "absent");
+        assert.equal(hasAdmins(root, "c1"), false);
+        assert.equal(hasAdmins(root, "h1"), true);
+        const second = removeClientAdminsKey(root);
+        assert.equal(second.find((r) => r.accountId === "c1")?.action, "absent");
+    }
+    finally {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+test("unreadable account.json is reported, not thrown", () => {
+    const root = makeRoot();
+    try {
+        mkdirSync(join(root, "bad"), { recursive: true });
+        writeFileSync(join(root, "bad", "account.json"), "{ not json");
+        const res = removeClientAdminsKey(root);
+        assert.equal(res.find((r) => r.accountId === "bad")?.action, "unreadable");
+    }
+    finally {
+        rmSync(root, { recursive: true, force: true });
+    }
+});

package/dist/converge-client-admins.js

@@ -0,0 +1,67 @@
+// Task 1623 — installer convergence. A client sub-account never carries admins[]
+// (Task 999 retired the seats, Task 1596 the inbound read). This removes the
+// vestigial key from every existing role:'client' account.json on each install,
+// reaching all installs and brands without a per-box script. The house keeps its
+// admins[] (the real install-wide access surface). Atomic temp-write + rename,
+// idempotent, one auditable line per file; contents are never echoed.
+import { existsSync, readdirSync, readFileSync, writeFileSync, renameSync, statSync, rmSync } from "node:fs";
+import { join } from "node:path";
+export function removeClientAdminsKey(accountsDir) {
+    const out = [];
+    let entries = [];
+    try {
+        entries = readdirSync(accountsDir);
+    }
+    catch {
+        return out;
+    }
+    for (const entry of entries) {
+        if (entry.startsWith("."))
+            continue;
+        const dir = join(accountsDir, entry);
+        try {
+            if (!statSync(dir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        const cfgPath = join(dir, "account.json");
+        if (!existsSync(cfgPath))
+            continue;
+        let cfg;
+        try {
+            cfg = JSON.parse(readFileSync(cfgPath, "utf-8"));
+        }
+        catch {
+            out.push({ accountId: entry, action: "unreadable" });
+            continue;
+        }
+        if (cfg.role === "house") {
+            out.push({ accountId: entry, action: "house-kept" });
+            continue;
+        }
+        if (cfg.role !== "client" || !("admins" in cfg)) {
+            out.push({ accountId: entry, action: "absent" });
+            continue;
+        }
+        delete cfg.admins;
+        const tmp = `${cfgPath}.1623.tmp`;
+        try {
+            writeFileSync(tmp, JSON.stringify(cfg, null, 2) + "\n");
+            renameSync(tmp, cfgPath);
+            out.push({ accountId: entry, action: "removed" });
+        }
+        catch {
+            // A write/rename failure (full disk, permissions, file changed under us):
+            // remove any half-written temp so no .1623.tmp is orphaned, and label it
+            // write-failed (the file was readable — "unreadable" would misdescribe it).
+            try {
+                rmSync(tmp, { force: true });
+            }
+            catch { /* best-effort cleanup */ }
+            out.push({ accountId: entry, action: "write-failed" });
+        }
+    }
+    return out;
+}

package/dist/index.js

@@ -10,6 +10,7 @@ import { buildHeartbeatCronBlock, mergeHeartbeatBlock } from "./cron-registratio
 import { validateTierFlag, validateEntitlementBase64, applyTierToAccountConfig, entitlementPath } from "./tier-flag.js";
 import { parseOsRelease, isUbuntuLike as isUbuntuLikePure, parseAptCacheCandidate, decideAptResolution, } from "./apt-resolve.js";
 import { findPeerBrandOnDefaultNeo4jPort } from "./peer-brand-detect.js";
+import { removeClientAdminsKey } from "./converge-client-admins.js";
 import { resolveNeo4jPidfileScrub } from "./neo4j-pidfile-scrub.js";
 import { runInitLogging } from "./init-logging.js";
 import { requireSupportedPlatform, detectPlatform } from "./platform-detect.js";
@@ -2574,6 +2575,13 @@ function deployPayload() {
     // installer is its own npm package and doesn't bundle the platform lib.
     // Mirrors checkAdminAuthInvariant() in platform/lib/admins-write/src/index.ts;
     // future divergence between the two should be caught by the test suite.
+    // Task 1623 — converge existing client account.json to drop the vestigial
+    // admins[] key before the invariant check reads them. House untouched.
+    for (const r of removeClientAdminsKey(join(INSTALL_DIR, "data", "accounts"))) {
+        if (r.action === "removed" || r.action === "unreadable" || r.action === "write-failed") {
+            console.log(`  [converge-1623] account=${r.accountId.slice(0, 8)} admins=${r.action}`);
+        }
+    }
     runInstallInvariantCheck(persistentUsersFile, join(INSTALL_DIR, "data", "accounts"));
     // The version marker is NOT written here. It is stamped at the very end of a
     // fully-successful install (after plugin registration and every throwing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-code",
-  "version": "0.1.442",
+  "version": "0.1.443",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy-code": "./dist/index.js"