@cortexkit/common-auth 0.2.3 → 0.2.5

package/dist/store/rows.js

@@ -1,3 +1,4 @@
+import { PoolOperationError } from './errors.js';
 import { assertNotInsideHook, runInsideHook } from './hooks.js';
 import { DUPLICATE_IDENTITY_REASON, disableIdentityDuplicates, disableIn, recordIdentityIn, } from './identity.js';
 import { notReadyError, readPool, runOperation, withTransaction, } from './mutate.js';
@@ -355,6 +356,98 @@ function hasStateAccount(state, id) {
     const accounts = state.accounts;
     return isRecord(accounts) && Object.hasOwn(accounts, id);
 }
+/** The id a roster row carries, or undefined for a row that names none. */
+function rosterIdOf(raw) {
+    return isRecord(raw) && typeof raw.id === 'string' ? raw.id : undefined;
+}
+/**
+ * Why `ids` is not an order of this roster: it must name every distinct
+ * roster id exactly once and nothing else.
+ */
+function orderProblem(roster, ids) {
+    if (!Array.isArray(ids))
+        return 'ids must be an array of roster ids';
+    const rosterIds = new Set();
+    for (const raw of roster) {
+        const id = rosterIdOf(raw);
+        if (id !== undefined)
+            rosterIds.add(id);
+    }
+    const given = new Set();
+    for (const id of ids) {
+        if (typeof id !== 'string')
+            return 'ids must be an array of roster ids';
+        if (given.has(id))
+            return `id ${id} appears more than once`;
+        if (!rosterIds.has(id))
+            return `id ${id} is not in the roster`;
+        given.add(id);
+    }
+    const missing = [...rosterIds].filter((id) => !given.has(id));
+    if (missing.length > 0)
+        return `the order leaves out roster id(s) ${missing.join(', ')}`;
+    return undefined;
+}
+/**
+ * The roster in the new order. Every roster row is kept as the same object,
+ * so its serialized bytes are unchanged. Rows that carry an id fill the
+ * positions such rows held before, in the order of `ids`; a second row with
+ * an already-seen id (invalid, but preserved) travels right after the first.
+ * A row that names no id cannot be ordered by id, so it keeps its position.
+ */
+function reorderedRoster(roster, ids) {
+    const byId = new Map();
+    for (const raw of roster) {
+        const id = rosterIdOf(raw);
+        if (id === undefined)
+            continue;
+        const group = byId.get(id);
+        if (group)
+            group.push(raw);
+        else
+            byId.set(id, [raw]);
+    }
+    const sequence = ids.flatMap((id) => byId.get(id) ?? []);
+    let next = 0;
+    return roster.map((raw) => rosterIdOf(raw) === undefined ? raw : sequence[next++]);
+}
+/**
+ * Sets the roster order in one config write. `ids` must name every roster id
+ * exactly once; anything else refuses (`invalid-order`) before writing. The
+ * roster rows, the per-row entries and the state file are left as they are:
+ * only the order of the legacy `accounts` array changes, which older readers
+ * load as is. It takes the extra locks, then the store locks, and no row or
+ * provider-wide lock, since no row's credential, identity or quota changes.
+ * An order equal to the current one writes nothing.
+ */
+export async function reorderRows(rt, ids, options = {}) {
+    assertNotInsideHook('reorder');
+    const { ctx } = rt;
+    const onFailure = options.onFailure;
+    return runOperation(ctx, 'reorder', undefined, onFailure && ((_rowId, error) => onFailure(error)), async (locks, progress) => {
+        for (const extra of options.extraLocks ?? [])
+            await locks.acquire(extra);
+        return withTransaction(ctx, locks, progress, { operation: 'reorder', rowId: undefined }, async (tx) => {
+            const roster = tx.roster();
+            const problem = orderProblem(roster, ids);
+            if (problem)
+                throw new PoolOperationError({
+                    operation: 'reorder',
+                    phase: 'before-first-write',
+                    retryable: false,
+                    kind: 'invalid-order',
+                    message: problem,
+                });
+            const order = [...ids];
+            const next = reorderedRoster(roster, order);
+            if (next.every((raw, index) => raw === roster[index]))
+                return { ids: order, outcome: 'unchanged' };
+            tx.config.accounts = next;
+            await tx.commitConfig();
+            return { ids: order, outcome: 'reordered' };
+        });
+    });
+}
 export async function recordRowIdentity(rt, id, identity, options = {}) {
     assertNotInsideHook('recordIdentity');
     return runOperation(rt.ctx, 'recordIdentity', id, options.onFailure, async (locks, progress) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cortexkit/common-auth",
-  "version": "0.2.3",
-  "description": "Shared plumbing for the CortexKit auth plugins: loopback RPC, file locks and atomic writes, logger, sidebar state file, TUI preferences and TUI build.",
+  "version": "0.2.5",
+  "description": "Shared code for the CortexKit auth plugins: account pool, quota and routing, commands and auth menu, OpenCode 2 hooks, Claustrum custody, and plumbing (loopback RPC, file locks, logger, sidebar state, TUI preferences and build).",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -51,6 +51,30 @@
     "./routing": {
       "types": "./dist/routing/index.d.ts",
       "import": "./dist/routing/index.js"
+    },
+    "./commands": {
+      "types": "./dist/commands/index.d.ts",
+      "import": "./dist/commands/index.js"
+    },
+    "./auth-menu": {
+      "types": "./dist/auth-menu/index.d.ts",
+      "import": "./dist/auth-menu/index.js"
+    },
+    "./opencode2": {
+      "types": "./dist/opencode2/index.d.ts",
+      "import": "./dist/opencode2/index.js"
+    },
+    "./claustrum": {
+      "types": "./dist/claustrum/index.d.ts",
+      "import": "./dist/claustrum/index.js"
+    },
+    "./cachekeep": {
+      "types": "./dist/cachekeep/index.d.ts",
+      "import": "./dist/cachekeep/index.js"
+    },
+    "./dump": {
+      "types": "./dist/dump/index.d.ts",
+      "import": "./dist/dump/index.js"
     }
   },
   "files": [
@@ -73,7 +97,9 @@
   "peerDependencies": {
     "@opentui/core": ">=0.5.12",
     "@opentui/solid": ">=0.5.12",
-    "solid-js": "1.9.12"
+    "solid-js": "1.9.12",
+    "@cortexkit/claustrum-client": ">=0.5.0",
+    "@opencode/plugin": ">=2.0.21"
   },
   "peerDependenciesMeta": {
     "@opentui/core": {
@@ -84,10 +110,18 @@
     },
     "solid-js": {
       "optional": true
+    },
+    "@cortexkit/claustrum-client": {
+      "optional": true
+    },
+    "@opencode/plugin": {
+      "optional": true
     }
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.14",
+    "@cortexkit/claustrum-client": "0.5.0",
+    "@opencode/plugin": "2.0.21",
     "@opentui/core": ">=0.5.12",
     "@opentui/solid": ">=0.5.12",
     "@tsconfig/bun": "1.0.11",