clay-server 5.1.1-beta.1 → 5.2.0-beta.10

package/lib/daemon.js

@@ -20,7 +20,7 @@ process.setMaxListeners(50);
 
 // Remove CLAUDECODE env var so the SDK can spawn Claude Code child processes
 // (prevents "cannot be launched inside another Claude Code session" error)
-delete process.env.CLAUDECODE;
+require("./yoke/host-environment").prepare(process.env);
 
 var fs = require("fs");
 var path = require("path");
@@ -67,6 +67,8 @@ try {
   console.error("[daemon] ensureMultiUser threw (continuing):", e && e.message);
 }
 
+config = require("./project-ownership").repair(config, usersModule.getAllUsers(), saveConfig, osUsersMod.resolveOsUserInfo);
+
 if (projectLogContext.initializeProjectKnowledge(config)) {
   saveConfig(config);
   console.log("[daemon] Assigned stable knowledge identities to existing projects");
@@ -187,7 +189,14 @@ function registerProjectWorktrees(project, requestUser) {
   }
 }
 
+var projectLifecycle = require("./daemon-project-lifecycle").attachProjectLifecycle({
+  getConfig: function () { return config; }, setConfig: function (next) { config = next; }, saveConfig: saveConfig,
+  getRelay: function () { return relay; }, resolveIdentity: osUsersMod.resolveOsUserInfo,
+  findUser: usersModule.findUserById, registerWorktrees: registerProjectWorktrees,
+});
+var lifecycleCallbacks = require("./daemon-project-lifecycle-callbacks").attachLifecycleCallbacks({ service: projectLifecycle });
 var relay = createServer({
+  projectLifecycle: projectLifecycle,
   tlsOptions: tlsOptions,
   caPath: caRoot,
   builtinCert: config.builtinCert || false,
@@ -198,122 +207,11 @@ var relay = createServer({
   osUsers: config.osUsers || false,
   lanHost: lanIp ? lanIp + ":" + config.port : null,
   getRemovedProjects: function (userId) { return getFilteredRemovedProjects(config, userId); },
-  onAddProject: function (absPath, wsUser) {
-    // Check if already registered
-    for (var j = 0; j < config.projects.length; j++) {
-      if (config.projects[j].path === absPath) {
-        return { ok: true, slug: config.projects[j].slug, existing: true };
-      }
-    }
-    var slugs = config.projects.map(function (p) { return p.slug; });
-    var slug = generateSlug(absPath, slugs);
-    var projectEntry = { path: absPath, slug: slug, addedAt: Date.now(), visibility: "private" };
-    projectEntry.projectKnowledgeId = rememberedProjectKnowledgeId(absPath);
-    // The user who adds a project always becomes the owner
-    if (wsUser && wsUser.id) {
-      projectEntry.ownerId = wsUser.id;
-    }
-    config.projects.push(projectEntry);
-    relay.addProject(absPath, slug, null, null, wsUser ? wsUser.id : null, null, projectRuntimeOptions(projectEntry));
-    // Remove from removedProjects if present
-    if (config.removedProjects) {
-      config.removedProjects = config.removedProjects.filter(function (rp) { return rp.path !== absPath; });
-    }
-    saveConfig(config);
-    try { syncClayrc(config.projects); } catch (e) {}
-    console.log("[daemon] Added project (web):", slug, "→", absPath);
-    // OS users mode: grant ACL to project owner
-    if (config.osUsers) {
-      var newProj = config.projects[config.projects.length - 1];
-      if (newProj.ownerId) {
-        var ownerUser = usersModule.findUserById(newProj.ownerId);
-        if (ownerUser && ownerUser.linuxUser) {
-          grantProjectAccess(absPath, ownerUser.linuxUser);
-        }
-      }
-    }
-    // Discover and register worktrees for the new project
-    registerProjectWorktrees(projectEntry, wsUser);
-    // Broadcast updated project list to all clients
-    relay.broadcastAll({
-      type: "projects_updated",
-      projects: relay.getProjects(),
-      projectCount: config.projects.length,
-    });
-    return { ok: true, slug: slug };
-  },
-  onCreateProject: function (projectName, wsUser) {
-    console.log("[daemon] onCreateProject wsUser:", JSON.stringify(wsUser ? { id: wsUser.id, role: wsUser.role, username: wsUser.username, linuxUser: wsUser.linuxUser } : null));
-    var os = require("os");
-    var execFileSync = require("child_process").execFileSync;
-    var baseDir;
-    if (config.osUsers) {
-      baseDir = "/var/clay/projects";
-    } else {
-      baseDir = config.projectsDir || path.join(REAL_HOME, "clay-projects");
-    }
-    try { fs.mkdirSync(baseDir, { recursive: true }); } catch (e) {}
-    // Generate slug and deduplicate
-    var slugs = config.projects.map(function (p) { return p.slug; });
-    var slug = generateSlug(path.join(baseDir, projectName), slugs);
-    var targetDir = path.join(baseDir, slug);
-    try {
-      fs.mkdirSync(targetDir, { recursive: true });
-      // Run git init
-      if (config.osUsers && wsUser) {
-        var linuxUser = wsUser.linuxUser;
-        if (linuxUser) {
-          var uidGid = null;
-          try {
-            uidGid = {
-              uid: parseInt(execFileSync("id", ["-u", linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10),
-              gid: parseInt(execFileSync("id", ["-g", linuxUser], { encoding: "utf8", stdio: "pipe" }).trim(), 10),
-            };
-          } catch (e) {}
-          if (uidGid) {
-            fs.chmodSync(targetDir, 0o700);
-            execFileSync("chown", ["-R", linuxUser + ":" + linuxUser, targetDir]);
-            var gitInit = osUsersMod.wrapSpawnAsUser("git", ["init"], { cwd: targetDir, uid: uidGid.uid, gid: uidGid.gid, env: { PATH: "/usr/local/bin:/usr/bin:/bin" } });
-            execFileSync(gitInit.command, gitInit.args, gitInit.options);
-          } else {
-            execFileSync("git", ["init"], { cwd: targetDir });
-          }
-        } else {
-          execFileSync("git", ["init"], { cwd: targetDir });
-        }
-      } else {
-        execFileSync("git", ["init"], { cwd: targetDir });
-      }
-    } catch (e) {
-      try { fs.rmSync(targetDir, { recursive: true, force: true }); } catch (ce) {}
-      return { ok: false, error: "Failed to create project: " + e.message };
-    }
-    // Register project - creator always becomes owner, default private
-    var projectEntry = { path: targetDir, slug: slug, addedAt: Date.now(), visibility: "private" };
-    projectEntry.projectKnowledgeId = projectLogContext.createProjectKnowledgeId();
-    if (wsUser && wsUser.id) {
-      projectEntry.ownerId = wsUser.id;
-    }
-    relay.addProject(targetDir, slug, null, null, wsUser ? wsUser.id : null, null, projectRuntimeOptions(projectEntry));
-    config.projects.push(projectEntry);
-    saveConfig(config);
-    try { syncClayrc(config.projects); } catch (e) {}
-    console.log("[daemon] Created project:", slug, "→", targetDir, "entry:", JSON.stringify({ ownerId: projectEntry.ownerId, visibility: projectEntry.visibility }));
-    // OS users mode: grant ACL
-    if (config.osUsers && wsUser && wsUser.linuxUser) {
-      console.log("[daemon] Granting ACL:", targetDir, "→", wsUser.linuxUser);
-      grantProjectAccess(targetDir, wsUser.linuxUser);
-    } else if (config.osUsers) {
-      console.log("[daemon] Skipping ACL grant: osUsers=true but linuxUser=", wsUser && wsUser.linuxUser);
-    }
-    relay.broadcastAll({
-      type: "projects_updated",
-      projects: relay.getProjects(),
-      projectCount: config.projects.length,
-    });
-    return { ok: true, slug: slug };
-  },
+  onAddProject: lifecycleCallbacks.onAddProject,
+  onCreateProject: lifecycleCallbacks.onCreateProject,
   onCloneProject: function (cloneUrl, wsUser, callback) {
+    wsUser = wsUser && usersModule.findUserById(wsUser.id);
+    if (usersModule.isMultiUser() && !wsUser) { callback({ ok: false, error: "A valid account is required." }); return; }
     var os = require("os");
     var spawn = require("child_process").spawn;
     var execFileSync = require("child_process").execFileSync;
@@ -323,12 +221,15 @@ var relay = createServer({
     } else {
       baseDir = config.projectsDir || path.join(REAL_HOME, "clay-projects");
     }
-    try { fs.mkdirSync(baseDir, { recursive: true }); } catch (e) {}
     // Derive slug from repo URL
     var repoName = cloneUrl.replace(/\.git$/, "").split("/").pop() || "project";
     var slugs = config.projects.map(function (p) { return p.slug; });
     var slug = generateSlug(path.join(baseDir, repoName), slugs);
-    var targetDir = path.join(baseDir, slug);
+    var targetDir;
+    var directoryClaim;
+    var settled = false;
+    function finish(result) { if (settled) return; settled = true; callback(result); }
+    function cleanup() { if (directoryClaim) { try { directoryClaim.cleanup(); } catch (error) {} } }
     // Clone as user to use their git credentials
     var spawnOpts = { cwd: baseDir };
     if (config.osUsers && wsUser && wsUser.linuxUser) {
@@ -341,22 +242,23 @@ var relay = createServer({
         });
       } catch (e) {}
     }
-    // Pre-create target directory as root and chown to user
-    if (fs.existsSync(targetDir)) {
-      callback({ ok: false, error: "Target directory already exists: " + targetDir });
+    try {
+      directoryClaim = require("./project-directory-claim").claim({ baseDir: baseDir, slug: slug, projects: config.projects, userId: wsUser && wsUser.id });
+      targetDir = directoryClaim.path;
+      directoryClaim.assertOwned();
+      if (config.osUsers && wsUser && wsUser.linuxUser && spawnOpts.uid != null) fs.chownSync(targetDir, spawnOpts.uid, spawnOpts.gid);
+      directoryClaim.assertOwned();
+    } catch (error) {
+      cleanup();
+      finish({ ok: false, error: "Failed to prepare project directory: " + error.message });
       return;
     }
-    if (config.osUsers && wsUser && wsUser.linuxUser && spawnOpts.uid != null) {
-      try {
-        fs.mkdirSync(targetDir, { mode: 0o700 });
-        fs.chownSync(targetDir, spawnOpts.uid, spawnOpts.gid);
-      } catch (e) {
-        callback({ ok: false, error: "Failed to prepare project directory: " + e.message });
-        return;
-      }
-    }
-    var cloneSpawn = osUsersMod.wrapSpawnAsUser("git", ["clone", cloneUrl, targetDir], spawnOpts);
-    var proc = spawn(cloneSpawn.command, cloneSpawn.args, cloneSpawn.options);
+    var proc;
+    try {
+      directoryClaim.assertOwned();
+      var cloneSpawn = osUsersMod.wrapSpawnAsUser("git", ["clone", cloneUrl, targetDir], spawnOpts);
+      proc = spawn(cloneSpawn.command, cloneSpawn.args, cloneSpawn.options);
+    } catch (error) { cleanup(); finish({ ok: false, error: "Failed to start git clone: " + error.message }); return; }
     var stderrBuf = "";
     proc.stderr.on("data", function (chunk) { stderrBuf += chunk.toString(); });
     // 5 minute timeout
@@ -365,19 +267,23 @@ var relay = createServer({
     }, 5 * 60 * 1000);
     proc.on("close", function (code) {
       clearTimeout(cloneTimeout);
+      if (settled) return;
+      try { directoryClaim.assertOwned(); } catch (error) { finish({ ok: false, error: error.message }); return; }
       if (code !== 0) {
-        try { fs.rmSync(targetDir, { recursive: true, force: true }); } catch (ce) {}
+        cleanup();
         var errMsg = stderrBuf.trim().split("\n").pop() || "Clone failed (exit code " + code + ")";
-        callback({ ok: false, error: errMsg });
+        finish({ ok: false, error: errMsg });
         return;
       }
       // chown and restrict permissions if osUsers
       if (config.osUsers && wsUser && wsUser.linuxUser) {
         try {
+          directoryClaim.assertOwned();
           fs.chmodSync(targetDir, 0o700);
           execFileSync("chown", ["-R", wsUser.linuxUser + ":" + wsUser.linuxUser, targetDir]);
         } catch (e) {}
       }
+      if (usersModule.isMultiUser() && (!wsUser || !usersModule.findUserById(wsUser.id))) { finish({ ok: false, error: "The creating account is no longer available." }); return; }
       // Register project - creator always becomes owner
       // Creator always becomes owner, default private
       var projectEntry = { path: targetDir, slug: slug, addedAt: Date.now(), visibility: "private" };
@@ -385,9 +291,11 @@ var relay = createServer({
       if (wsUser && wsUser.id) {
         projectEntry.ownerId = wsUser.id;
       }
-      relay.addProject(targetDir, slug, null, null, wsUser ? wsUser.id : null, null, projectRuntimeOptions(projectEntry));
-      config.projects.push(projectEntry);
-      saveConfig(config);
+      try {
+        directoryClaim.assertOwned();
+        config = require("./project-ownership").register(config, projectEntry, usersModule.getAllUsers(), saveConfig, osUsersMod.resolveOsUserInfo);
+      } catch (error) { finish({ ok: false, error: "Failed to register project: " + error.message }); return; }
+      relay.addProject(targetDir, slug, null, null, projectEntry.ownerId || null, null, projectRuntimeOptions(projectEntry));
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Cloned project:", slug, "→", targetDir);
       if (config.osUsers && wsUser && wsUser.linuxUser) {
@@ -398,12 +306,13 @@ var relay = createServer({
         projects: relay.getProjects(),
         projectCount: config.projects.length,
       });
-      callback({ ok: true, slug: slug });
+      finish({ ok: true, slug: slug });
     });
     proc.on("error", function (err) {
       clearTimeout(cloneTimeout);
-      try { fs.rmSync(targetDir, { recursive: true, force: true }); } catch (ce) {}
-      callback({ ok: false, error: "Failed to start git clone: " + err.message });
+      if (settled) return;
+      cleanup();
+      finish({ ok: false, error: "Failed to start git clone: " + err.message });
     });
   },
   onRemoveProject: function (slug, userId) {
@@ -444,40 +353,7 @@ var relay = createServer({
       });
       return { ok: true };
     }
-    var found = null;
-    for (var j = 0; j < config.projects.length; j++) {
-      if (config.projects[j].slug === slug) { found = config.projects[j]; break; }
-    }
-    if (!found) return { ok: false, error: "Project not found" };
-    // Cascade remove worktrees belonging to this parent
-    cleanupWorktreesForParent(relay, slug);
-    // Save to removedProjects for re-add functionality
-    if (!config.removedProjects) config.removedProjects = [];
-    config.removedProjects.push({
-      path: found.path,
-      title: found.title || null,
-      icon: found.icon || null,
-      userId: userId || null,
-      projectKnowledgeId: found.projectKnowledgeId || null,
-      removedAt: Date.now(),
-    });
-    // Cap at 20 entries (oldest first)
-    if (config.removedProjects.length > 20) {
-      config.removedProjects = config.removedProjects.slice(config.removedProjects.length - 20);
-    }
-    relay.removeProject(slug);
-    config.projects = config.projects.filter(function (p) { return p.slug !== slug; });
-    saveConfig(config);
-    // Remove from .clayrc so it doesn't appear in restore prompt
-    if (found.path) { try { removeFromClayrc(found.path); } catch (e) {} }
-    try { syncClayrc(config.projects); } catch (e) {}
-    console.log("[daemon] Removed project (web):", slug);
-    relay.broadcastAll({
-      type: "projects_updated",
-      projects: relay.getProjects(),
-      projectCount: config.projects.length,
-    });
-    return { ok: true };
+    return lifecycleCallbacks.onRemoveProject(slug, userId);
   },
   onReorderProjects: function (slugs) {
     // Build a slug->project map from current projects
@@ -511,25 +387,8 @@ var relay = createServer({
     return { ok: true };
   },
   onSetProjectTitle: function (slug, newTitle) {
-    relay.setProjectTitle(slug, newTitle);
-    for (var ti = 0; ti < config.projects.length; ti++) {
-      if (config.projects[ti].slug === slug) {
-        if (newTitle) {
-          config.projects[ti].title = newTitle;
-        } else {
-          delete config.projects[ti].title;
-        }
-        break;
-      }
-    }
-    saveConfig(config);
-    try { syncClayrc(config.projects); } catch (e) {}
-    relay.broadcastAll({
-      type: "projects_updated",
-      projects: relay.getProjects(),
-      projectCount: config.projects.length,
-    });
-    return { ok: true };
+    if (isWorktreeSlug(slug)) { relay.setProjectTitle(slug, newTitle); return { ok: true }; }
+    return lifecycleCallbacks.onSetProjectTitle(slug, newTitle);
   },
   onSetProjectIcon: function (slug, newIcon) {
     relay.setProjectIcon(slug, newIcon);
@@ -553,30 +412,28 @@ var relay = createServer({
     return { ok: true };
   },
   onSetProjectSessionVisibilityDefault: function (slug, visibility) {
-    var result = daemonProjectAccess.setSessionVisibilityDefault(config, slug, visibility);
-    if (result.error) return { ok: false, error: result.error };
-    saveConfig(config);
-    relay.broadcastAll({ type: "projects_updated", projects: relay.getProjects(), projectCount: config.projects.length });
-    return result;
+    return projectLifecycle.update(slug, "session_visibility", visibility);
   },
   onProjectOwnerChanged: function (slug, ownerId) {
+    if (!config.osUsers) return projectLifecycle.update(slug, "owner", ownerId);
     if (slug.indexOf("mate-") === 0) return {error:"Mate ownership cannot be transferred."};
+    if (!ownerId || !usersModule.findUserById(ownerId)) return { error: "A valid owner is required." };
     console.log("[daemon] onProjectOwnerChanged:", slug, "→", ownerId);
+    var previousConfig = JSON.parse(JSON.stringify(config));
     var oldOwnerId = null;
     var projectIdx = -1;
     for (var oi = 0; oi < config.projects.length; oi++) {
       if (config.projects[oi].slug === slug) {
         oldOwnerId = config.projects[oi].ownerId || null;
         projectIdx = oi;
-        if (ownerId) {
-          config.projects[oi].ownerId = ownerId;
-        } else {
-          delete config.projects[oi].ownerId;
-        }
+        config.projects[oi].ownerId = ownerId;
         break;
       }
     }
-    saveConfig(config);
+    try { saveConfig(config); } catch (error) { config = previousConfig; throw error; }
+    relay.forEachProject(function (project, projectSlug) {
+      if (projectSlug === slug || daemonProjectAccess.parentSlugFor(projectSlug) === slug) project.setProjectOwner(ownerId);
+    });
     // OS users mode: revoke old owner ACL, grant new owner ACL
     if (config.osUsers && projectIdx >= 0) {
       var projectPath = config.projects[projectIdx].path;
@@ -615,18 +472,7 @@ var relay = createServer({
     return { envrc: "" };
   },
   onSetProjectEnv: function (slug, envrc) {
-    for (var ei = 0; ei < config.projects.length; ei++) {
-      if (config.projects[ei].slug === slug) {
-        if (envrc) {
-          config.projects[ei].envrc = envrc;
-        } else {
-          delete config.projects[ei].envrc;
-        }
-        saveConfig(config);
-        return { ok: true };
-      }
-    }
-    return { ok: false, error: "Project not found" };
+    return lifecycleCallbacks.onSetProjectEnv(slug, envrc);
   },
   onGetSharedEnv: function () {
     return { envrc: config.sharedEnv || "" };
@@ -826,6 +672,7 @@ var relay = createServer({
     return { ok: true, updateChannel: config.updateChannel };
   },
   onSetPin: function (pin) {
+    if (usersModule.isMultiUser()) return { ok: false, error: 'Server PIN is unavailable while account authentication is enabled.' };
     saveDaemonSetting(config, "pinHash", pin ? generateAuthToken(pin) : null, saveConfig);
     relay.setAuthToken(config.pinHash);
     console.log("[daemon] PIN", pin ? "set" : "removed", "(web)");
@@ -926,6 +773,7 @@ var relay = createServer({
     spawnAndRestart();
   },
   onSetProjectVisibility: function (slug, visibility) {
+    if (!config.osUsers) return projectLifecycle.update(slug, "visibility", visibility);
     if (slug.indexOf("mate-") === 0) return {error:"Mates cannot be shared."};
     for (var i = 0; i < config.projects.length; i++) {
       if (config.projects[i].slug === slug) {
@@ -961,6 +809,7 @@ var relay = createServer({
     return { error: "Project not found" };
   },
   onSetProjectAllowedUsers: function (slug, allowedUsers) {
+    if (!config.osUsers && !daemonProjectAccess.parentSlugFor(slug)) return projectLifecycle.update(slug, "allowed_users", allowedUsers);
     var accessBefore = daemonProjectAccess.getProjectAccess(config, slug, config.osUsers);
     var result = daemonProjectAccess.setAllowedUsers(config, slug, allowedUsers);
     if (result.error) return result;
@@ -1061,8 +910,9 @@ var relay = createServer({
 // process may implement the optional shutdownIfIdle(ms); adapters without one
 // (Claude, which runs in-process or under sdk-worker) are simply skipped.
 // The CLAY_CODEX_* names are kept as aliases for backwards compatibility.
-var IDLE_MS = Number(process.env.CLAY_ADAPTER_IDLE_MS) || Number(process.env.CLAY_CODEX_IDLE_MS) || 5 * 60 * 1000;
-var REAP_MS = Number(process.env.CLAY_ADAPTER_REAPER_MS) || Number(process.env.CLAY_CODEX_REAPER_MS) || 60 * 1000;
+var adapterReaperConfig = require("./yoke/host-environment").reaper(process.env);
+var IDLE_MS = adapterReaperConfig.idleMs;
+var REAP_MS = adapterReaperConfig.reapMs;
 var reaperHandle = setInterval(function () {
   if (!relay || typeof relay.forEachProject !== "function") return;
   relay.forEachProject(function (ctx) {
@@ -1130,11 +980,11 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       }
       var slugs = config.projects.map(function (p) { return p.slug; });
       var slug = generateSlug(absPath, slugs);
-      var projectEntry = { path: absPath, slug: slug, addedAt: Date.now(), visibility: "private" };
+      var projectEntry = { path: absPath, slug: slug, addedAt: Date.now(), visibility: "private", ownershipRecovery: "required" };
       projectEntry.projectKnowledgeId = rememberedProjectKnowledgeId(absPath);
-      relay.addProject(absPath, slug, null, null, null, null, projectRuntimeOptions(projectEntry));
-      config.projects.push(projectEntry);
-      saveConfig(config);
+      config = require("./project-ownership").register(config, projectEntry, usersModule.getAllUsers(), saveConfig, osUsersMod.resolveOsUserInfo);
+      var registeredProject = config.projects[config.projects.length - 1];
+      relay.addProject(absPath, slug, null, null, registeredProject.ownerId || null, null, projectRuntimeOptions(registeredProject));
       try { syncClayrc(config.projects); } catch (e) {}
       console.log("[daemon] Added project:", slug, "→", absPath);
       // Discover and register worktrees for the new project
@@ -1203,6 +1053,7 @@ var ipc = createIPCServer(socketPath(), function (msg) {
       };
 
     case "set_pin": {
+      if (usersModule.isMultiUser()) return { ok: false, error: 'Server PIN is unavailable while account authentication is enabled.' };
       config.pinHash = msg.pinHash || null;
       relay.setAuthToken(config.pinHash);
       saveConfig(config);
@@ -1365,6 +1216,10 @@ var ipc = createIPCServer(socketPath(), function (msg) {
 var projects = config.projects || [];
 for (var i = 0; i < projects.length; i++) {
   var p = projects[i];
+  if (!projectLifecycle.canRestore(p)) {
+    console.log("[daemon] Project removal needs recovery; runtime remains stopped:", p.slug);
+    continue;
+  }
   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, null, projectRuntimeOptions(p));
@@ -1411,7 +1266,7 @@ if (usersModule.isMultiUser()) {
       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)) {
+      if (!m.lifecycleDeletion && 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)" : ""));
@@ -1428,7 +1283,7 @@ if (usersModule.isMultiUser()) {
     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)) {
+    if (!m.lifecycleDeletion && 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)" : ""));
@@ -1465,58 +1320,7 @@ try { syncClayrc(config.projects); } catch (e) {}
 // Multi-user OS-isolated installs have per-user ~/.claude trees that the
 // daemon process can't traverse; the inline cleanup in claude-worker.js
 // covers those.
-function cleanupSdkWarmupSessions() {
-  var sessionHygiene = require("./session-hygiene");
-  var projectsRoot = path.join(REAL_HOME, ".claude", "projects");
-  var projectDirs;
-  try { projectDirs = fs.readdirSync(projectsRoot, { withFileTypes: true }); }
-  catch (e) { return; }
-
-  var deleted = 0;
-  var nowMs = Date.now();
-  var MAX_BYTES = 64 * 1024;
-  var MIN_AGE_MS = 60 * 1000;
-
-  for (var di = 0; di < projectDirs.length; di++) {
-    if (!projectDirs[di].isDirectory()) continue;
-    var projDir = path.join(projectsRoot, projectDirs[di].name);
-    var files;
-    try { files = fs.readdirSync(projDir); } catch (e) { continue; }
-
-    for (var fi = 0; fi < files.length; fi++) {
-      var f = files[fi];
-      if (!f.endsWith(".jsonl")) continue;
-      var fp = path.join(projDir, f);
-
-      var st;
-      try { st = fs.statSync(fp); } catch (e) { continue; }
-      if (st.size >= MAX_BYTES) continue;
-      if (nowMs - st.mtimeMs < MIN_AGE_MS) continue;
-
-      var raw;
-      try { raw = fs.readFileSync(fp, "utf8"); } catch (e) { continue; }
-      var lines = raw.split("\n");
-      var events = [];
-      var parseOk = true;
-      for (var li = 0; li < lines.length; li++) {
-        var line = lines[li];
-        if (!line) continue;
-        var ev;
-        try { ev = JSON.parse(line); } catch (e) { parseOk = false; break; }
-        if (!ev || typeof ev !== "object") continue;
-        events.push(ev);
-      }
-      if (!parseOk) continue;
-      if (!sessionHygiene.isClaudeWarmupTranscript(events)) continue;
-
-      try { fs.unlinkSync(fp); deleted++; } catch (e) {}
-    }
-  }
-
-  if (deleted > 0) {
-    console.log("[daemon] Removed " + deleted + " stale SDK warmup session file(s)");
-  }
-}
+function cleanupSdkWarmupSessions() { return require("./yoke/maintenance").cleanup(REAL_HOME); }
 
 // --- Start listening (with retry for port-in-use during update handoff) ---
 var listenRetries = 0;

package/lib/default-ai-runtime.js

@@ -3,11 +3,7 @@
 var modelEntryMatches = require("./model-entry").modelEntryMatches;
 var modelEntryValue = require("./model-entry").modelEntryValue;
 
-var KNOWN_VENDORS = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
-var VENDOR_FAMILY_ORDER = {
-  claude: ["opus", "sonnet", "haiku"],
-  codex: ["astra", "sol", "gpt", "o"],
-};
+var providerInfo = require("./yoke/vendor-registry").getVendorInfo;
 
 function text(entry) {
   if (typeof entry === "string") return entry;
@@ -18,10 +14,10 @@ function selectTopModel(vendor, catalog) {
   var models = catalog && Array.isArray(catalog.models) ? catalog.models : [];
   if (!models.length) return "";
   var defaultModel = catalog.defaultModel;
-  if (KNOWN_VENDORS.indexOf(vendor) === -1 && defaultModel) {
+  if (!providerInfo(vendor) && defaultModel) {
     for (var di = 0; di < models.length; di++) if (modelEntryMatches(models[di], defaultModel)) return modelEntryValue(models[di]);
   }
-  var familyOrder = VENDOR_FAMILY_ORDER[vendor] || [];
+  var familyOrder = (providerInfo(vendor) || {}).preferredModelFamilies || [];
   if (familyOrder.length) {
     for (var fi = 0; fi < familyOrder.length; fi++) {
       for (var mi = 0; mi < models.length; mi++) if (new RegExp("(^|[^a-z])" + familyOrder[fi] + "([^a-z]|$)", "i").test(text(models[mi]))) return modelEntryValue(models[mi]);
@@ -114,4 +110,4 @@ function createDefaultAiRuntimeResolver(deps) {
   };
 }
 
-module.exports = { resolveDefaultAiRuntime: resolveDefaultAiRuntime, createDefaultAiRuntimeResolver: createDefaultAiRuntimeResolver, selectTopModel: selectTopModel, exactModel: exactModel, resolveEffort: resolveEffort, KNOWN_VENDORS: KNOWN_VENDORS, VENDOR_FAMILY_ORDER: VENDOR_FAMILY_ORDER };
+module.exports = { resolveDefaultAiRuntime: resolveDefaultAiRuntime, createDefaultAiRuntimeResolver: createDefaultAiRuntimeResolver, selectTopModel: selectTopModel, exactModel: exactModel, resolveEffort: resolveEffort, KNOWN_VENDORS: Object.keys(require("./yoke/vendor-registry").VENDOR_REGISTRY), VENDOR_FAMILY_ORDER: require("./yoke/model-preferences").families() };