@jskit-ai/assistant-core 0.2.28 → 0.2.30

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Claude's model list is kept once per account in the server process instead of once per account-query owner, as plan usage already is: an owner the host creates again (a restarted service, a reopened project) answers `readCatalogue` from the list another owner read, without starting a tool-free Claude, while the account's credentials and Claude Code are unchanged. A credentials change (sign-in, sign-out, token refresh) or a Claude Code update still reads it again, and an owner's `invalidate()` drops the list of every account it used, for every owner.
 - Test fixture only: the responsive assistant fixture's avatar is drawn in the theme's `primary` and `on-primary` roles instead of a raw `#6750a4` and `white`, so it follows the dark scheme like the rest of the conversation. A package test runs `jskit check m3`'s raw-colour rule over the fixture, which the check itself skips with every `fixtures/` folder.
 - The assistant settings resource (`assistantConfigResource`) has a required boolean `canUpdate` attribute: whether the signed-in person may change the settings, as the server decides (`@jskit-ai/assistant-runtime`'s settings pane shows Save only when it is true).
 - **Breaking (data-access redesign).** The assistant operations are API contracts: `assistantContract` and `assistantConfigContract` (view and patch, the two its routes serve), which replace `assistantResource` and `assistantConfigResource`.

package/examples/conversation/package.json

@@ -8,14 +8,14 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.2.28",
-    "@jskit-ai/http-runtime": "0.2.14",
-    "@jskit-ai/kernel": "0.2.14",
+    "@jskit-ai/assistant-core": "0.2.30",
+    "@jskit-ai/http-runtime": "0.2.15",
+    "@jskit-ai/kernel": "0.2.15",
     "@jskit-ai/material-web": "0.1.3",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0",
-    "@jskit-ai/connectors-core": "0.2.15",
-    "@jskit-ai/connectors-catalog": "0.2.15"
+    "@jskit-ai/connectors-core": "0.2.17",
+    "@jskit-ai/connectors-catalog": "0.2.17"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.7",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-core",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "type": "module",
   "scripts": {
     "test": "jskit test"
@@ -52,7 +52,7 @@
     "@ai-sdk/togetherai": "^3.0.49",
     "@ai-sdk/xai": "^4.0.58",
     "@jskit-ai/agent": "0.1.2",
-    "@jskit-ai/resource-core": "0.1.205",
+    "@jskit-ai/resource-core": "0.1.206",
     "@openrouter/ai-sdk-provider": "^3.0.0",
     "ai": "^7.0.152",
     "json-rest-schema": "^1.0.17",
@@ -60,8 +60,8 @@
     "ws": "^8.20.1"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.2.14",
-    "@jskit-ai/kernel": "0.2.14",
+    "@jskit-ai/http-runtime": "0.2.15",
+    "@jskit-ai/kernel": "0.2.15",
     "vue": "^3.5.13",
     "vuetify": "^4.3.0"
   },

package/src/server/conversation/claudeProcess.js

@@ -290,6 +290,10 @@ const PLAN_USAGE_CURRENT_MS = 420_000;
 // for the account shares it, so however many ask, the account's one-shot Claude
 // starts at most once per idle interval.
 const planUsageReads = new Map();
+// One model list per Claude account in this server process, with the credentials
+// and Claude Code revision it answered for. An owner the host creates again (a
+// restarted service, a reopened project) reads it without starting a Claude.
+const catalogueReads = new Map();
 
 /**
  * Claude Code answers `get_usage` from the usage endpoint, or from its saved copy
@@ -320,9 +324,10 @@ export function claudeCatalogueModels(initialization) {
 
 /**
  * Native account queries share process reuse, caches and retryable cleanup. Plan
- * usage is shared by `accountIdentity` with every other owner in the process, so
- * that identity names exactly one Claude account. `configRoot` is the account's
- * Claude configuration directory, whose credentials the model list follows.
+ * usage and the model list are shared by `accountIdentity` with every other owner
+ * in the process, so that identity names exactly one Claude account. `configRoot`
+ * is the account's Claude configuration directory, whose credentials the model
+ * list follows.
  * @param {object} options
  * @param {(request: { signal: AbortSignal, purpose: string }) => Promise<ClaudeCodeProcess>} options.createProcess
  * @param {(context: Record<string, any>) => Promise<string>} options.accountIdentity
@@ -342,7 +347,8 @@ export function createClaudeAccountQueries({
   });
   const accountProcessStops = new Set();
   const accountReads = new Set();
-  let catalog;
+  // Accounts whose shared model list this owner used, and the reads it started.
+  const catalogueAccounts = new Set();
   const catalogStarts = new Map();
   // Accounts whose shared plan-usage reading this owner used, and the reads it started.
   const usageAccounts = new Set();
@@ -409,8 +415,10 @@ export function createClaudeAccountQueries({
     const identity = await accountIdentity(context);
     assertCurrent(expectedRevision);
     // An answer is kept until its account, credentials or executable change, so
-    // reading it again starts no Claude.
-    const kept = catalog?.identity === identity ? catalog : null;
+    // reading it again, from this owner or any other, starts no Claude.
+    const catalogueKey = JSON.stringify([configRoot, identity]);
+    catalogueAccounts.add(catalogueKey);
+    const kept = catalogueReads.get(catalogueKey);
     if (kept && kept.revision === await catalogueRevision(kept.command)) {
       assertCurrent(expectedRevision);
       return kept.value;
@@ -425,7 +433,7 @@ export function createClaudeAccountQueries({
         messageCode: "assistant.claude.accountChangedRefreshModels"
       });
       assertCurrent(expectedRevision);
-      catalog = { identity, command, revision: answered, value };
+      catalogueReads.set(catalogueKey, { command, revision: answered, value });
       return value;
     })().finally(() => { catalogStarts.delete(identity); }));
     return catalogStarts.get(identity);
@@ -495,8 +503,10 @@ export function createClaudeAccountQueries({
 
   async function invalidate() {
     revision++;
-    // Dropped at once: a read started before this cannot store its answer.
-    catalog = null;
+    // Dropped at once: a read started before this cannot store its answer, and
+    // the next request for an account this owner used reads its model list again.
+    for (const catalogueKey of catalogueAccounts) catalogueReads.delete(catalogueKey);
+    catalogueAccounts.clear();
     for (const controller of accountReads) {
       controller.abort(error("Claude account query was cancelled for reconnection.", { messageCode: "assistant.claude.accountQueryCancelled" }));
     }

package/test/claudeProcess.test.js

@@ -814,6 +814,45 @@ test("Claude model list starts a Claude only after its account, credentials or C
   assert.equal(await model(), "read-5");
 });
 
+test("Claude model list is read once per account for every owner the host creates again", async (t) => {
+  const root = await mkdtemp(join(tmpdir(), "jskit-claude-catalogue-owners-"));
+  t.after(() => rm(root, { recursive: true, force: true }));
+  const configRoot = join(root, ".claude");
+  const otherConfigRoot = join(root, "other", ".claude");
+  await mkdir(otherConfigRoot, { recursive: true });
+  await mkdir(configRoot);
+  const credentials = join(configRoot, ".credentials.json");
+  const command = join(root, "claude");
+  await writeFile(credentials, "signed in");
+  await writeFile(command, "2.1.1");
+  const starts = [];
+  // A restarted service or a reopened project creates its account queries again.
+  const owner = (account = "account", accountConfigRoot = configRoot) => createClaudeAccountQueries({
+    accountIdentity: async () => account, configRoot: accountConfigRoot,
+    createProcess({ purpose }) {
+      starts.push(purpose);
+      return { command, initialization: { models: [{ value: `read-${starts.length}` }] }, async stop() { return { scopeEmpty: true }; } };
+    } });
+  const model = async (queries) => (await queries.readCatalogue({})).models[0].value;
+  const first = owner();
+  assert.equal(await model(first), "read-1");
+  const restarted = owner();
+  assert.equal(await model(restarted), "read-1");
+  // Another account, or the same name in another Claude configuration, reads its own.
+  assert.equal(await model(owner("other account")), "read-2");
+  assert.equal(await model(owner("account", otherConfigRoot)), "read-3");
+  // A token refresh replaces the credentials, so the next read of any owner starts a Claude.
+  await writeFile(`${credentials}.next`, "refreshed");
+  await rename(`${credentials}.next`, credentials);
+  assert.equal(await model(owner()), "read-4");
+  assert.equal(await model(restarted), "read-4");
+  // One owner's reconnection drops the account's list for every owner.
+  await restarted.invalidate();
+  assert.equal(await model(first), "read-5");
+  assert.deepEqual(starts, Array(5).fill("catalogue"));
+  await first.invalidate();
+});
+
 test("Claude account queries label temporary startup and reuse each account's recent reading", async () => {
   const starts = [];
   let stops = 0;