clay-server 3.4.0-beta.2 → 3.4.0-beta.21

package/lib/daemon-projects.js

@@ -41,10 +41,10 @@ function scanAndRegisterWorktrees(relay, parentPath, parentSlug, parentIcon, par
       if (worktreeRegistry[parentSlug][j] === wtSlug) { alreadyRegistered = true; break; }
     }
     if (alreadyRegistered) continue;
-    var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, accessible: wt.accessible };
+    var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, external: wt.external };
     relay.addProject(wt.path, wtSlug, wt.branch || wt.dirName, parentIcon, parentOwnerId, wtMeta);
     worktreeRegistry[parentSlug].push(wtSlug);
-    console.log("[daemon] Registered worktree:", wtSlug, "->", wt.path, wt.accessible ? "(accessible)" : "(inaccessible)");
+    console.log("[daemon] Registered worktree:", wtSlug, "->", wt.path, wt.external ? "(external)" : "(inside project folder)");
   }
   daemonSync.register(getWorktreeSyncKey(parentSlug), function () {
     rescanWorktrees(relay, parentPath, parentSlug, parentIcon, parentOwnerId);
@@ -79,7 +79,7 @@ function rescanWorktrees(relay, parentPath, parentSlug, parentIcon, parentOwnerI
         if (existingSlugs[ei] === wtSlug) { found = true; break; }
       }
       if (!found) {
-        var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, accessible: wt.accessible };
+        var wtMeta = { parentSlug: parentSlug, branch: wt.branch || wt.dirName, external: wt.external };
         relay.addProject(wt.path, wtSlug, wt.branch || wt.dirName, parentIcon, parentOwnerId, wtMeta);
         if (!worktreeRegistry[parentSlug]) worktreeRegistry[parentSlug] = [];
         worktreeRegistry[parentSlug].push(wtSlug);

package/lib/daemon.js

@@ -978,7 +978,7 @@ var relay = createServer({
     if (!result.ok) return result;
     // Register the new worktree as ephemeral project
     var wtSlug = parentSlug + "--" + dirName;
-    var wtMeta = { parentSlug: parentSlug, branch: branchName, accessible: true };
+    var wtMeta = { parentSlug: parentSlug, branch: branchName, external: false };
     relay.addProject(result.path, wtSlug, branchName, parent.icon, parent.ownerId, wtMeta);
     registerWorktreeSlug(parentSlug, wtSlug);
     console.log("[daemon] Created worktree:", wtSlug, "->", result.path);
@@ -1041,64 +1041,6 @@ function shutdownProjects() {
 
 // Worktree tracking extracted to daemon-projects.js
 
-// --- Register projects ---
-var projects = config.projects || [];
-for (var i = 0; i < projects.length; i++) {
-  var p = projects[i];
-  if (fs.existsSync(p.path)) {
-    console.log("[daemon] Adding project:", p.slug, "→", p.path);
-    relay.addProject(p.path, p.slug, p.title, p.icon, p.ownerId);
-    // Discover and register worktrees for this project
-    scanAndRegisterWorktrees(relay, p.path, p.slug, p.icon, p.ownerId);
-  } else {
-    console.log("[daemon] Skipping missing project:", p.path);
-  }
-}
-
-// Migrate legacy mates storage before registration
-mates.migrateLegacyMates();
-
-// Register existing mates as projects
-if (usersModule.isMultiUser()) {
-  // Multi-user mode: iterate over all users and load each user's mates
-  var allUsers = usersModule.getAllUsers();
-  for (var ui = 0; ui < allUsers.length; ui++) {
-    var mateCtx = mates.buildMateCtx(allUsers[ui].id);
-    var userMates = mates.getAllMates(mateCtx);
-    for (var mi = 0; mi < userMates.length; mi++) {
-      var m = userMates[mi];
-      var mateDir = mates.getMateDir(mateCtx, m.id);
-      var mateSlug = "mate-" + m.id;
-      var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
-      if (fs.existsSync(mateDir)) {
-        var mateDef = m.builtinKey ? require("./builtin-mates").getBuiltinByKey(m.builtinKey) : null;
-        var isHost = !!(mateDef && mateDef.hostAgent);
-        console.log("[daemon] Adding mate project:", mateSlug + (isHost ? " (host agent)" : ""));
-        relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true, mateDisplayName: mateName, isHostAgent: isHost });
-      }
-    }
-  }
-} else {
-  // Single-user mode: use null ctx
-  var mateCtx = mates.buildMateCtx(null);
-  var allMates = mates.getAllMates(mateCtx);
-  for (var mi = 0; mi < allMates.length; mi++) {
-    var m = allMates[mi];
-    var mateDir = mates.getMateDir(mateCtx, m.id);
-    var mateSlug = "mate-" + m.id;
-    var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
-    if (fs.existsSync(mateDir)) {
-      var mateDef2 = m.builtinKey ? require("./builtin-mates").getBuiltinByKey(m.builtinKey) : null;
-      var isHost2 = !!(mateDef2 && mateDef2.hostAgent);
-      console.log("[daemon] Adding mate project:", mateSlug + (isHost2 ? " (host agent)" : ""));
-      relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true, mateDisplayName: mateName, isHostAgent: isHost2 });
-    }
-  }
-}
-
-// Sync ~/.clayrc on startup
-try { syncClayrc(config.projects); } catch (e) {}
-
 // --- IPC server ---
 // Clean up stale socket/config left by a previously killed daemon
 var existingConfig = loadConfig();
@@ -1334,6 +1276,64 @@ var ipc = createIPCServer(socketPath(), function (msg) {
   }
 });
 
+// --- Register projects ---
+var projects = config.projects || [];
+for (var i = 0; i < projects.length; i++) {
+  var p = projects[i];
+  if (fs.existsSync(p.path)) {
+    console.log("[daemon] Adding project:", p.slug, "→", p.path);
+    relay.addProject(p.path, p.slug, p.title, p.icon, p.ownerId);
+    // Discover and register worktrees for this project
+    scanAndRegisterWorktrees(relay, p.path, p.slug, p.icon, p.ownerId);
+  } else {
+    console.log("[daemon] Skipping missing project:", p.path);
+  }
+}
+
+// Migrate legacy mates storage before registration
+mates.migrateLegacyMates();
+
+// Register existing mates as projects
+if (usersModule.isMultiUser()) {
+  // Multi-user mode: iterate over all users and load each user's mates
+  var allUsers = usersModule.getAllUsers();
+  for (var ui = 0; ui < allUsers.length; ui++) {
+    var mateCtx = mates.buildMateCtx(allUsers[ui].id);
+    var userMates = mates.getAllMates(mateCtx);
+    for (var mi = 0; mi < userMates.length; mi++) {
+      var m = userMates[mi];
+      var mateDir = mates.getMateDir(mateCtx, m.id);
+      var mateSlug = "mate-" + m.id;
+      var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
+      if (fs.existsSync(mateDir)) {
+        var mateDef = m.builtinKey ? require("./builtin-mates").getBuiltinByKey(m.builtinKey) : null;
+        var isHost = !!(mateDef && mateDef.hostAgent);
+        console.log("[daemon] Adding mate project:", mateSlug + (isHost ? " (host agent)" : ""));
+        relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true, mateDisplayName: mateName, isHostAgent: isHost });
+      }
+    }
+  }
+} else {
+  // Single-user mode: use null ctx
+  var mateCtx = mates.buildMateCtx(null);
+  var allMates = mates.getAllMates(mateCtx);
+  for (var mi = 0; mi < allMates.length; mi++) {
+    var m = allMates[mi];
+    var mateDir = mates.getMateDir(mateCtx, m.id);
+    var mateSlug = "mate-" + m.id;
+    var mateName = (m.profile && m.profile.displayName) || m.name || "New Mate";
+    if (fs.existsSync(mateDir)) {
+      var mateDef2 = m.builtinKey ? require("./builtin-mates").getBuiltinByKey(m.builtinKey) : null;
+      var isHost2 = !!(mateDef2 && mateDef2.hostAgent);
+      console.log("[daemon] Adding mate project:", mateSlug + (isHost2 ? " (host agent)" : ""));
+      relay.addProject(mateDir, mateSlug, mateName, null, m.createdBy, null, { isMate: true, mateDisplayName: mateName, isHostAgent: isHost2 });
+    }
+  }
+}
+
+// Sync ~/.clayrc on startup
+try { syncClayrc(config.projects); } catch (e) {}
+
 // --- Cleanup stale SDK warmup CLI session files ---
 //
 // On adapter init the SDK is given a dummy "hi" prompt to discover models,

package/lib/project-connection.js

@@ -22,6 +22,28 @@ function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   }
 }
 
+function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, sessionId) {
+  var model = initialModel || "";
+  var models = initialModels || [];
+  if (model && models.length > 0) {
+    var found = false;
+    for (var i = 0; i < models.length; i++) {
+      var entry = models[i];
+      if (typeof entry === "string" ? entry === model : (entry.value === model || entry.id === model || entry.resolvedModel === model)) found = true;
+    }
+    if (!found) model = typeof models[0] === "string" ? models[0] : (models[0].value || models[0].id || "");
+  }
+  return {
+    type: "model_info",
+    model: model,
+    models: models,
+    vendor: initialVendor,
+    sessionId: sessionId || null,
+    availableVendors: sm.availableVendors || [],
+    installedVendors: sm.installedVendors || [],
+  };
+}
+
 /**
  * Attach connection/disconnection handlers to a project context.
  *
@@ -116,7 +138,7 @@ function attachConnection(ctx) {
     if (!_warmedUp) {
       _warmedUp = true;
       if (typeof warmup === "function") {
-        try { warmup(); }
+        try { warmup(wsUser && wsUser.linuxUser ? wsUser.linuxUser : null); }
         catch (e) { console.error("[project-connection] warmup failed for " + slug + ":", e && e.message ? e.message : e); }
       }
     }
@@ -166,11 +188,12 @@ function attachConnection(ctx) {
     if (sm.slashCommands) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
-    var initialModel = (restoredActive && restoredActive.model) || sm.currentModel || "";
-    if (initialModel) {
-      sendTo(ws, { type: "model_info", model: initialModel, models: initialModels, vendor: initialVendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
-    }
-    sendTo(ws, { type: "config_state", model: initialModel, mode: sm.currentPermissionMode || "default", effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    var initialModel = (restoredActive && restoredActive.model) || ((sm.defaultModelByVendor || {})[initialVendor]) || "";
+    // Vendor installation state is needed even before a new project has a
+    // model. Always send it so reconnects cannot fall back to "Not installed."
+    var initialModelInfo = buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, restoredActive ? restoredActive.localId : null);
+    sendTo(ws, initialModelInfo);
+    sendTo(ws, { type: "config_state", model: initialModelInfo.model, vendor: initialVendor, sessionId: restoredActive ? restoredActive.localId : null, mode: sm.currentPermissionMode || "default", effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "last_vendor", vendor: sm.lastVendor || "" });
     sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
     sendTo(ws, { type: "term_list", terminals: tm.list() });
@@ -271,6 +294,7 @@ function attachConnection(ctx) {
       if (active.isProcessing) {
         sendTo(ws, { type: "status", status: "processing" });
       }
+      sendTo(ws, { type: "active_background_tasks", tasks: active.activeBackgroundTasks || [] });
       var pendingIds = Object.keys(active.pendingPermissions);
       for (var pi = 0; pi < pendingIds.length; pi++) {
         var p = active.pendingPermissions[pendingIds[pi]];
@@ -333,4 +357,8 @@ function attachConnection(ctx) {
   };
 }
 
-module.exports = { attachConnection: attachConnection, dispatchMessageSafely: dispatchMessageSafely };
+module.exports = {
+  attachConnection: attachConnection,
+  buildInitialModelInfo: buildInitialModelInfo,
+  dispatchMessageSafely: dispatchMessageSafely,
+};

package/lib/project-debate.js

@@ -604,6 +604,7 @@ function attachDebate(ctx) {
     var _modMate = matesModule.getMate(mateCtx, debate.moderatorId);
     ctx.sdk.createMentionSession({
       vendor: _modMate ? _modMate.vendor : null,
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: claudeMd,
       initialContext: digests,
       initialMessage: quickBriefPrompt,
@@ -799,6 +800,7 @@ function attachDebate(ctx) {
     var _modMate2 = matesModule.getMate(mateCtx, debate.moderatorId);
     ctx.sdk.createMentionSession({
       vendor: _modMate2 ? _modMate2.vendor : null,
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: claudeMd,
       initialContext: moderatorContext,
       initialMessage: "Begin the debate on: " + debate.topic,
@@ -994,6 +996,7 @@ function attachDebate(ctx) {
       var _panMate = matesModule.getMate(debate.mateCtx, mateId);
       ctx.sdk.createMentionSession({
         vendor: _panMate ? _panMate.vendor : null,
+        linuxUser: debate.mateCtx && debate.mateCtx.linuxUser ? debate.mateCtx.linuxUser : undefined,
         claudeMd: claudeMd,
         initialContext: panelistContext + historyContext,
         initialMessage: "The moderator addresses you:\n\n" + moderatorText,
@@ -1530,6 +1533,7 @@ function attachDebate(ctx) {
         var _modMate3 = matesModule.getMate(mateCtx, debate.moderatorId);
         ctx.sdk.createMentionSession({
           vendor: _modMate3 ? _modMate3.vendor : null,
+          linuxUser: mateCtx.linuxUser || undefined,
           claudeMd: claudeMd,
           initialContext: moderatorContext,
           initialMessage: resumePrompt,

package/lib/project-mate-interaction.js

@@ -179,6 +179,7 @@ function attachMateInteraction(ctx) {
   var _digestQueue = [];
   var _digestBusy = false;
   var _digestWorkerTurns = 0;
+  var _digestWorkerLinuxUser = null;
   var DIGEST_WORKER_MAX_TURNS = 20;
 
   function enqueueDigest(job) {
@@ -191,6 +192,13 @@ function attachMateInteraction(ctx) {
     _digestBusy = true;
     var job = _digestQueue.shift();
 
+    if (_digestWorker && _digestWorkerLinuxUser !== (job.linuxUser || null)) {
+      try { _digestWorker.close(); } catch (e) {}
+      _digestWorker = null;
+      _digestWorkerTurns = 0;
+      _digestWorkerLinuxUser = null;
+    }
+
     var mateDir = matesModule.getMateDir(job.mateCtx, job.mateId);
     var knowledgeDir = path.join(mateDir, "knowledge");
 
@@ -315,6 +323,7 @@ function attachMateInteraction(ctx) {
       try { _digestWorker.close(); } catch (e) {}
       _digestWorker = null;
       _digestWorkerTurns = 0;
+      _digestWorkerLinuxUser = null;
     }
 
     var responseText = "";
@@ -328,12 +337,14 @@ function attachMateInteraction(ctx) {
           console.error("[digest-worker] Error:", err);
           _digestWorker = null;
           _digestWorkerTurns = 0;
+          _digestWorkerLinuxUser = null;
           if (job.onError) job.onError(err);
           processDigestQueue();
         },
       });
     } else {
       sdk.createMentionSession({
+        linuxUser: job.linuxUser || undefined,
         claudeMd: "",
         model: "haiku",
         initialContext: "[Digest Worker] You generate memory digests. Respond with ONLY JSON.",
@@ -344,10 +355,15 @@ function attachMateInteraction(ctx) {
         onError: function (err) {
           console.error("[digest-worker] Create error:", err);
           _digestWorker = null;
+          _digestWorkerLinuxUser = null;
           if (job.onError) job.onError(err);
           processDigestQueue();
         },
-      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function (err) {
+      }).then(function (ws) {
+        _digestWorker = ws;
+        _digestWorkerTurns = 1;
+        _digestWorkerLinuxUser = job.linuxUser || null;
+      }).catch(function (err) {
         if (job.onError) job.onError(err || new Error("digest worker creation failed"));
         processDigestQueue();
       });
@@ -378,6 +394,7 @@ function attachMateInteraction(ctx) {
 
     enqueueDigest({
       mateCtx: mateCtx,
+      linuxUser: mateCtx.linuxUser || undefined,
       mateId: mateId,
       type: "mention",
       conversationContent: conversationContent,
@@ -473,6 +490,7 @@ function attachMateInteraction(ctx) {
 
     enqueueDigest({
       mateCtx: mateCtx,
+      linuxUser: mateCtx.linuxUser || undefined,
       mateId: mateId,
       type: "dm",
       priorSummary: priorSummary || "",
@@ -716,6 +734,7 @@ function attachMateInteraction(ctx) {
       // Create new persistent mention session
       sdk.createMentionSession({
         vendor: mate.vendor || null,
+        linuxUser: getLinuxUserForSession(session) || undefined,
         claudeMd: claudeMd,
         initialContext: mentionContext,
         initialMessage: mentionFullInput,
@@ -887,6 +906,7 @@ function attachMateInteraction(ctx) {
     ].join("\n");
 
     sdk.createMentionSession({
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: "",
       model: "haiku",
       initialContext: synthesisContext,

package/lib/project-memory.js

@@ -339,6 +339,7 @@ function attachMemory(ctx) {
     var gateText = "";
     var _gateSession = null;
     sdk.createMentionSession({
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: "",
       model: "haiku",
       initialContext: gateContext,
@@ -448,6 +449,7 @@ function attachMemory(ctx) {
     var updateText = "";
     var _updateSession = null;
     sdk.createMentionSession({
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: "",
       model: "haiku",
       initialContext: updateContext,
@@ -553,6 +555,7 @@ function attachMemory(ctx) {
     var initText = "";
     var _initSession = null;
     sdk.createMentionSession({
+      linuxUser: mateCtx.linuxUser || undefined,
       claudeMd: "",
       model: "haiku",
       initialContext: initContext,

package/lib/project-models.js

@@ -0,0 +1,220 @@
+var yoke = require("./yoke");
+
+function modelEntryValue(entry) {
+  if (!entry) return "";
+  if (typeof entry === "string") return entry;
+  return entry.value || entry.id || "";
+}
+
+function modelEntryMatches(entry, value) {
+  if (!entry || !value) return false;
+  if (typeof entry === "string") return entry === value;
+  return entry.value === value || entry.id === value || entry.resolvedModel === value;
+}
+
+function attachModels(ctx) {
+  var cwd = ctx.cwd;
+  var slug = ctx.slug;
+  var sm = ctx.sm;
+  var sdk = ctx.sdk;
+  var adapters = ctx.adapters;
+  var sendTo = ctx.sendTo;
+  var getSessionForWs = ctx.getSessionForWs;
+  var getLinuxUserForWs = ctx.getLinuxUserForWs;
+  var serverPort = ctx.serverPort;
+  var serverTls = ctx.serverTls;
+  var serverAuthToken = ctx.serverAuthToken;
+
+  async function loadVendorModels(ws, msg) {
+    var vendor = msg.vendor || "";
+    var requestId = msg.requestId || null;
+    var loadError = null;
+    var vendorAdapter = null;
+    var session = getSessionForWs(ws);
+
+    if (!vendor) {
+      sendTo(ws, {
+        type: "model_info",
+        vendor: vendor,
+        requestId: requestId,
+        modelStatus: "error",
+        error: "No vendor was selected.",
+        model: "",
+        models: [],
+        sessionId: session ? session.localId : null,
+      });
+      return;
+    }
+
+    try {
+      var modelLinuxUser = getLinuxUserForWs(ws);
+      vendorAdapter = adapters[vendor] || null;
+      if (!vendorAdapter) {
+        vendorAdapter = await yoke.lazyCreateAdapter(adapters, vendor, {
+          cwd: cwd,
+          linuxUser: modelLinuxUser || undefined,
+          clayPort: serverPort,
+          clayTls: serverTls,
+          clayAuthToken: serverAuthToken,
+          slug: slug,
+        });
+      }
+
+      var cachedModels = (sm.modelsByVendor && sm.modelsByVendor[vendor]) || [];
+      var cachedCapabilities = sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor];
+      var needsReadyMetadata = !cachedCapabilities || cachedModels.length === 0;
+      if (vendorAdapter && needsReadyMetadata && typeof vendorAdapter.init === "function") {
+        try {
+          var readyResult = await vendorAdapter.init({
+            cwd: cwd,
+            linuxUser: modelLinuxUser || undefined,
+            clayPort: serverPort,
+            clayTls: serverTls,
+            clayAuthToken: serverAuthToken,
+            slug: slug,
+          });
+          sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
+          sm.capabilitiesByVendor[vendor] = readyResult.capabilities || {};
+          sm.modelsByVendor = sm.modelsByVendor || {};
+          if (Array.isArray(readyResult.models) && readyResult.models.length > 0) {
+            sm.modelsByVendor[vendor] = readyResult.models;
+          }
+        } catch (e) {
+          loadError = e;
+          console.error("[project-models] " + vendor + " init failed:", e.message || e);
+        }
+      }
+
+      if (vendorAdapter) {
+        sm.availableVendors = Object.keys(adapters);
+        sm.modelsByVendor = sm.modelsByVendor || {};
+        var currentModels = sm.modelsByVendor[vendor] || [];
+        if (currentModels.length === 0 && typeof vendorAdapter.supportedModels === "function") {
+          try {
+            var supported = await vendorAdapter.supportedModels();
+            if (Array.isArray(supported) && supported.length > 0) {
+              sm.modelsByVendor[vendor] = supported;
+              loadError = null;
+            }
+          } catch (e) {
+            if (!loadError) loadError = e;
+            console.error("[project-models] " + vendor + " model listing failed:", e.message || e);
+          }
+        }
+      } else {
+        loadError = new Error("The vendor adapter is unavailable.");
+      }
+    } catch (e) {
+      loadError = e;
+      console.error("[project-models] model loading failed for " + vendor + ":", e.message || e);
+    }
+
+    var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[vendor]) || [];
+    var modelToSend = modelEntryValue(vendorModels[0]);
+    var preferredModel = (session && session.vendor === vendor && session.model) || (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "";
+    if (preferredModel) {
+      for (var i = 0; i < vendorModels.length; i++) {
+        if (modelEntryMatches(vendorModels[i], preferredModel)) {
+          modelToSend = modelEntryValue(vendorModels[i]);
+          break;
+        }
+      }
+    }
+    var vendorInfo = yoke.getVendorInfo(vendor);
+    var displayName = vendorInfo ? vendorInfo.displayName : vendor;
+    var status = vendorModels.length > 0 ? "ready" : (loadError ? "error" : "empty");
+    var errorText = "";
+    if (status === "error") {
+      errorText = "Could not load " + displayName + " models: " + (loadError.message || loadError);
+    } else if (status === "empty") {
+      errorText = displayName + " returned no models. Check CLI authentication and retry.";
+    }
+    sendTo(ws, {
+      type: "model_info",
+      model: modelToSend,
+      models: vendorModels,
+      vendor: vendor,
+      sessionId: session ? session.localId : null,
+      capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor]) || {},
+      availableVendors: sm.availableVendors || [],
+      installedVendors: sm.installedVendors || [],
+      requestId: requestId,
+      modelStatus: status,
+      error: errorText,
+    });
+  }
+
+  async function selectModel(ws, msg) {
+    var session = getSessionForWs(ws);
+    if (!session) {
+      sendTo(ws, { type: "model_selection_result", requestId: msg.requestId || null, ok: false, error: "No active session." });
+      return;
+    }
+    var sessionVendor = session.vendor || sm.defaultVendor || "claude";
+    if (msg.vendor && msg.vendor !== sessionVendor) {
+      sendTo(ws, {
+        type: "model_selection_result",
+        requestId: msg.requestId || null,
+        ok: false,
+        error: "The session vendor changed before the model selection completed.",
+      });
+      return;
+    }
+    var knownModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
+    if (knownModels.length > 0) {
+      var known = false;
+      for (var i = 0; i < knownModels.length; i++) {
+        if (modelEntryMatches(knownModels[i], msg.model)) {
+          known = true;
+          break;
+        }
+      }
+      if (!known) {
+        sendTo(ws, {
+          type: "model_selection_result",
+          requestId: msg.requestId || null,
+          ok: false,
+          error: "That model is not available for the selected vendor.",
+        });
+        return;
+      }
+    }
+    var result = await sdk.setModel(session, msg.model);
+    sendTo(ws, {
+      type: "model_selection_result",
+      requestId: msg.requestId || null,
+      ok: !!(result && result.ok),
+      model: result && result.model ? result.model : msg.model,
+      vendor: sessionVendor,
+      error: result && result.error ? result.error : "",
+    });
+  }
+
+  function handleMessage(ws, msg) {
+    if (msg.type === "get_vendor_models") {
+      loadVendorModels(ws, msg).catch(function(e) {
+        console.error("[project-models] Unexpected model loading failure:", e.message || e);
+      });
+      return true;
+    }
+    if (msg.type === "set_model" && msg.model) {
+      selectModel(ws, msg).catch(function(e) {
+        sendTo(ws, { type: "model_selection_result", requestId: msg.requestId || null, ok: false, error: e.message || String(e) });
+      });
+      return true;
+    }
+    return false;
+  }
+
+  return {
+    handleMessage: handleMessage,
+    loadVendorModels: loadVendorModels,
+    selectModel: selectModel,
+  };
+}
+
+module.exports = {
+  attachModels: attachModels,
+  modelEntryMatches: modelEntryMatches,
+  modelEntryValue: modelEntryValue,
+};