mixdog 1.3.0 → 1.3.2

package/src/session-runtime/workflow-agents-api/agent-editor.mjs

@@ -1,6 +1,23 @@
 import { join } from 'node:path';
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import {
+  accessSync,
+  constants as fsConstants,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  renameSync,
+  rmSync,
+  statSync,
+} from 'node:fs';
+import {
+  holdsNoData,
+  parseJsonText,
+  readJsonStateSync,
+  writeFileAtomicSync,
+  writeJsonAtomicSync,
+} from '../../runtime/shared/atomic-file.mjs';
 import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { hasOwn } from '../../runtime/shared/object.mjs';
 import { serializeFrontmatterDoc } from '../../runtime/shared/markdown-frontmatter.mjs';
@@ -12,6 +29,7 @@ import {
   clearAgentDefinitionCache,
 } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 import {
+  BOT_AGENT_KIND,
   canonicalizeAgentRouteStorage,
   isAgentDisabled,
   WORKFLOW_AGENT_KIND,
@@ -34,6 +52,7 @@ import {
   parseConnectorPolicy,
   readConnectorsFile,
   storedConnectorPolicy,
+  assertConnectorPolicyNotWidened,
 } from '../../runtime/agent/orchestrator/mcp/agent-connectors.mjs';
 
 /** A policy given to save → its stored form (null removes the field). Only a
@@ -43,9 +62,24 @@ function connectorPolicyInput(value) {
   return storedConnectorPolicy(parseConnectorPolicy(value));
 }
 import { STANDALONE_ROOT } from '../runtime-paths.mjs';
+import { homeThreadEvidence } from '../../runtime/shared/agent-kind.mjs';
+import { migrateAgentKinds } from '../../runtime/shared/agent-kind-migration.mjs';
+import { BOT_SPLIT_BACKUP_DIRS, migrateBotsToOwnStore } from '../../runtime/shared/bot-split-migration.mjs';
+import { backupUserData } from '../../runtime/shared/user-data-guard.mjs';
+import { normalizeWorkflowRoute } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
+import {
+  botDir,
+  botStoreActive,
+  migratedBotIds,
+  mixyIdentityDir,
+  readBotRoute,
+  readMixyRoute,
+  userDefinitionDir,
+} from '../../runtime/shared/agent-store.mjs';
 
 const isFixedAgent = (id) => FIXED_AGENT_SLOTS.some((agent) => agent.id === id);
-const hasUserAgentFile = (dataDir, id) => existsSync(join(dataDir, 'agents', id, 'AGENT.md'));
+const userDir = userDefinitionDir;
+const hasUserAgentFile = (dataDir, id) => existsSync(join(userDir(dataDir, id), 'AGENT.md'));
 // An archived (deleted) agent's AGENT.md, moved aside beside the tombstone:
 // no loader reads it, and restoring moves it back.
 const ARCHIVED_AGENT_FILE = 'AGENT.md.archived';
@@ -57,28 +91,94 @@ function hiddenFrontmatter(definition) {
   return rest;
 }
 
-// The definition's persisted `kind` marker (isContactAgentId reads it), or
-// null: only the Workflows page's create writes one (`kind: agent`).
+// The definition's kind (isContactAgentId reads it), or null: the explicit
+// marker bot creation (`kind: bot`) or the Workflows page (`kind: agent`)
+// wrote, else the read-only decision for an unmarked one (agent-kind.mjs).
 function kindOf(definition) {
-  const kind = definition?.frontmatter?.kind;
-  return typeof kind === 'string' && kind.trim() ? kind.trim() : null;
+  return definition?.kind || null;
 }
 
-// A save's `kind`: given only when creating, and only as the workflow-agent
-// marker. Unmarked agents are contacts (봇); a kind never changes later.
+// A save's `kind`: given only when creating, as the bot or workflow-agent
+// marker. Unmarked agents are workflow agents; a kind never changes later.
 function creationKind(payload, existed) {
   if (!hasOwn(payload, 'kind')) return null;
   if (existed) throw new Error("an agent's kind is set when it is created and cannot change");
-  if (payload.kind !== WORKFLOW_AGENT_KIND) throw new Error(`agent kind must be "${WORKFLOW_AGENT_KIND}" or absent`);
-  return WORKFLOW_AGENT_KIND;
+  if (payload.kind !== BOT_AGENT_KIND && payload.kind !== WORKFLOW_AGENT_KIND) {
+    throw new Error(`agent kind must be "${BOT_AGENT_KIND}", "${WORKFLOW_AGENT_KIND}" or absent`);
+  }
+  return payload.kind;
 }
 
 function readManifest(dir) {
+  return readManifestStrict(join(dir, 'agent.json')) || {};
+}
+
+// Definition files are user-authored: every write is atomic (a crash never
+// leaves one torn or NUL-filled) and keeps the replaced copy as `<file>.bak`.
+const DEFINITION_WRITE = Object.freeze({ backup: true, mode: 0o644 });
+const writeDefinitionText = (file, text) => writeFileAtomicSync(file, text, DEFINITION_WRITE);
+const writeManifest = (file, manifest) => writeJsonAtomicSync(file, manifest, DEFINITION_WRITE);
+
+// The manifest object at `file`, or null when it is missing, unreadable, holds
+// no data (empty, or NUL-filled by a crash) or is not a JSON object.
+function readManifestStrict(file) {
   try {
-    const value = JSON.parse(readFileSync(join(dir, 'agent.json'), 'utf8'));
-    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    const text = readFileSync(file, 'utf8');
+    if (holdsNoData(text)) return null;
+    const value = parseJsonText(text);
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : null;
   } catch {
-    return {};
+    return null;
+  }
+}
+
+// A read-only agent.json is a standing refusal, not a transient lock: the
+// atomic write's rename onto it fails with EPERM and is retried for seconds,
+// synchronously on the host's event loop. Refuse it up front (one stat, no wait),
+// in the same synchronous stretch as the write so no-widen checks stay atomic.
+function assertManifestWritable(file) {
+  try {
+    accessSync(file, fsConstants.W_OK);
+  } catch (error) {
+    if (error?.code === 'ENOENT') return;
+    throw new Error(`${file} is not writable (${error?.code || error}); make it writable, then save again`);
+  }
+}
+
+function requireManifestObject(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new TypeError('not a JSON object');
+  return value;
+}
+
+// The manifest to modify and write back: {} when agent.json is missing. A
+// damaged one (NUL-filled or torn by a crash, not an object) first gets its
+// last good copy back (agent.json.bak; the damaged bytes are kept aside as
+// agent.json.corrupt-<ts>). With no good copy it stays where it is and the
+// write is refused: the keys it held (connectors, avatar, route…) are unknown,
+// and rewriting from {} would drop a connector deny list — a manifest without
+// one means "every connector on".
+function readManifestForUpdate(dir) {
+  const file = join(dir, 'agent.json');
+  const manifest = readJsonStateSync(file, {
+    validate: requireManifestObject,
+    keepWithoutBackup: true,
+    mode: DEFINITION_WRITE.mode,
+  });
+  if (manifest) return manifest;
+  if (!existsSync(file)) return {};
+  throw new Error(
+    `${file} is damaged and has no good copy to restore; it was left untouched. Fix or delete the file, then save again`
+  );
+}
+
+// A text file's trimmed content; '' when it is missing, unreadable or holds no
+// data (a crash can leave it NUL-filled, which trim() keeps).
+function readTextOrEmpty(file) {
+  try {
+    const text = readFileSync(file, 'utf8');
+    return holdsNoData(text) ? '' : text.trim();
+  } catch {
+    return '';
   }
 }
 
@@ -96,11 +196,7 @@ export const AGENT_DEFINITION_CONFLICT = 'AGENT_DEFINITION_CONFLICT';
 const LEAD_PERSONA_MAX_BYTES = 256 * 1024;
 
 function readPersona(dir) {
-  try {
-    return readFileSync(join(dir, PERSONA_FILE), 'utf8').trim();
-  } catch {
-    return '';
-  }
+  return readTextOrEmpty(join(dir, PERSONA_FILE));
 }
 
 const IMAGE_DATA_URL = /^data:image\/(png|gif|webp);base64,/;
@@ -171,7 +267,7 @@ function avatarUpdate(value, dir) {
 function syncAvatarFiles(dir, avatar, writes) {
   for (const { path, bytes } of writes) {
     mkdirSync(join(dir, AGENT_AVATAR_DIR), { recursive: true });
-    writeFileSync(join(dir, path), bytes);
+    writeFileAtomicSync(join(dir, path), bytes, { mode: 0o644 });
   }
   const keep = new Set(
     avatar?.kind === 'custom'
@@ -227,25 +323,419 @@ const stableJson = (value) =>
 function writeAgentFiles(dir, { name, description, body, extra = {}, manifest = {} }) {
   const meta = { name, ...(description ? { description } : {}) };
   mkdirSync(dir, { recursive: true });
-  writeFileSync(join(dir, 'AGENT.md'), serializeFrontmatterDoc({ ...meta, ...extra }, body));
+  writeDefinitionText(join(dir, 'AGENT.md'), serializeFrontmatterDoc({ ...meta, ...extra }, body));
   // loadAgentDefinition prefers the manifest for name/description.
-  writeFileSync(join(dir, 'agent.json'), `${JSON.stringify({ ...meta, ...manifest }, null, 2)}\n`);
+  writeManifest(join(dir, 'agent.json'), { ...meta, ...manifest });
   rmSync(join(dir, AGENT_DELETED_MARKER), { force: true });
   rmSync(join(dir, ARCHIVED_AGENT_FILE), { force: true });
 }
 
+const isArchivedAgent = (dataDir, id) => existsSync(join(userDir(dataDir, id), AGENT_DELETED_MARKER));
+
+// A save's avatar and connectors applied to `manifest` (in place); returns the
+// avatar update (its image writes), null when the save gives no avatar.
+function applyManifestEdits(manifest, payload, dir, options) {
+  // New custom images arrive as checked bytes, stored under content hashes.
+  const update = hasOwn(payload, 'avatar') ? avatarUpdate(payload.avatar, dir) : null;
+  if (update?.avatar) manifest.avatar = update.avatar;
+  else if (update) delete manifest.avatar;
+  // Connectors: a policy replaces the saved one, null removes the field
+  // (every connector on), absent leaves it as saved.
+  if (hasOwn(payload, 'connectors')) {
+    const connectors = connectorPolicyInput(payload.connectors);
+    // For a remote client: against the manifest just read, in the same synchronous stretch as its write.
+    if (options?.noWiden) assertConnectorPolicyNotWidened(manifest.connectors ?? null, connectors);
+    if (connectors) manifest.connectors = connectors;
+    else delete manifest.connectors;
+  }
+  return update;
+}
+
+// A saved definition's files in `dir`: AGENT.md and agent.json, PERSONA.md
+// (`persona` '' removes it, null leaves it) and the avatar images.
+function writeSavedDefinition(dir, files, persona, update) {
+  writeAgentFiles(dir, files);
+  if (persona) writeDefinitionText(join(dir, PERSONA_FILE), `${persona}\n`);
+  else if (persona === '') rmSync(join(dir, PERSONA_FILE), { force: true });
+  // Only the images the manifest names stay.
+  syncAvatarFiles(dir, normalizeAgentAvatar(files.manifest.avatar), update?.writes ?? []);
+}
+
+// A save's id, name and description: a new agent's id comes from its name.
+function resolveSaveTarget(loadAgentDefinition, payload, dataDir) {
+  const id = agentEditorId(clean(payload.id));
+  if (hasOwn(payload, 'id') && !id) {
+    throw new Error('agent id must contain letters/numbers (dashes and dots allowed)');
+  }
+  if (id && isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and cannot be edited`);
+  const name = oneLine(payload.name);
+  if (!name && !id) throw new Error('agent name must not be empty');
+  return {
+    // An archived agent keeps its id: its chat is never handed to a new one.
+    id:
+      id ||
+      availableAgentId(
+        name,
+        (candidate) =>
+          Boolean(loadAgentDefinition(dataDir, candidate)) ||
+          isArchivedAgent(dataDir, candidate) ||
+          // An id the split copied stays the bot's, even once purged; a
+          // folder in either store keeps its id too.
+          migratedBotIds(dataDir).has(candidate) ||
+          (botStoreActive(dataDir) &&
+            (existsSync(join(dataDir, 'agents', candidate)) || existsSync(botDir(dataDir, candidate))))
+      ),
+    name,
+    description: oneLine(payload.description),
+  };
+}
+
+/** The name and face an archived (deleted) agent left, per id; null for
+ *  any id that is not archived. Its chat lists under them. */
+function archivedIdentities(dataDir, agentIds) {
+  const ids = Array.isArray(agentIds) ? agentIds.filter((id) => typeof id === 'string') : [];
+  return Object.fromEntries(
+    ids.map((agentId) => {
+      const id = agentEditorId(agentId);
+      if (!id || id !== agentId || !isArchivedAgent(dataDir, id)) return [agentId, null];
+      const manifest = readManifest(userDir(dataDir, id));
+      return [agentId, { name: oneLine(manifest.name) || id, avatar: normalizeAgentAvatar(manifest.avatar) ?? null }];
+    })
+  );
+}
+
+// A custom avatar's images as data URLs by state, read from `dir`; null
+// without an idle image.
+function customAvatarImages(dir, avatar) {
+  const states = {};
+  for (const [state, file] of Object.entries(avatar.states)) {
+    const image = readAvatarImage(dir, file);
+    if (image) states[state] = image;
+  }
+  return states.idle ? { states } : null;
+}
+
+// Mixy (the Lead) has no agent definition to edit: only its PERSONA.md
+// (성격) and AGENT.md (일하는 방식, agent mode only), read by the runtime
+// from Mixy's identity folder: bots/mixy once the bot store is active,
+// agents/lead before (mixyIdentityDir, agent-store.mjs). Saved empty, the
+// file goes. `dataDirOf()` resolves the data folder on each call.
+function createLeadIdentityApi(dataDirOf) {
+  const leadDir = () => mixyIdentityDir(dataDirOf());
+  function readLeadFile(file) {
+    return readTextOrEmpty(join(leadDir(), file));
+  }
+  function saveLeadFile(file, text) {
+    const value = String(text ?? '').trim();
+    if (Buffer.byteLength(value) > LEAD_PERSONA_MAX_BYTES) throw new Error(`${file} is larger than 256 KB`);
+    const dir = leadDir();
+    if (value) {
+      mkdirSync(dir, { recursive: true });
+      writeDefinitionText(join(dir, file), `${value}\n`);
+    } else rmSync(join(dir, file), { force: true });
+    // Mixy's threads take it from their next turn (the save answers at once).
+    void publishAgentProfileChange();
+    return readLeadFile(file);
+  }
+
+  // Whether Mixy was created (the "대표 에이전트 만들기" first run): the
+  // explicit `created` flag in Mixy's agent.json (leadDir). null until decided —
+  // the desktop host decides once (an existing profile counts as created).
+  // Also Mixy's display name (`name`, read by the runtime's identity line) and
+  // face (`avatar`, as every agent manifest): '' / null mean the defaults.
+  // `homeChatted`: whether Mixy's home thread holds any conversation (the
+  // host reads it to tell v1.3.0's never-used automatic Mixy apart).
+  function getLeadStatus() {
+    const manifest = readManifest(leadDir());
+    // A v1.3.0 automatic Mixy the split left in agents/lead still counts as
+    // decided (its routines keep running) until bots/mixy says otherwise.
+    const legacy = readManifest(join(dataDirOf(), 'agents', LEAD_AGENT_ID)).created;
+    let created = null;
+    if (typeof manifest.created === 'boolean') created = manifest.created;
+    else if (typeof legacy === 'boolean') created = legacy;
+    return {
+      created,
+      name: oneLine(manifest.name),
+      avatar: normalizeAgentAvatar(manifest.avatar) ?? null,
+      homeChatted: homeThreadEvidence(dataDirOf(), LEAD_AGENT_ID).chatted,
+      // Mixy's own model (never the Lead's); null: its thread keeps its own.
+      route: readMixyRoute(dataDirOf()),
+    };
+  }
+  // Mixy's name and face, chosen in the 대표 에이전트 dialog or its profile:
+  // a name '' and an avatar null go back to the defaults; absent keys are kept.
+  function saveLeadIdentity(payload = {}) {
+    const dir = leadDir();
+    const manifest = readManifestForUpdate(dir);
+    if (hasOwn(payload, 'name')) {
+      const name = oneLine(payload.name);
+      if (name.length > 64) throw new Error('name must be 64 characters or fewer');
+      if (name) manifest.name = name;
+      else delete manifest.name;
+    }
+    const update = hasOwn(payload, 'avatar') ? avatarUpdate(payload.avatar, dir) : null;
+    if (update?.avatar) manifest.avatar = update.avatar;
+    else if (update) delete manifest.avatar;
+    mkdirSync(dir, { recursive: true });
+    writeManifest(join(dir, 'agent.json'), manifest);
+    syncAvatarFiles(dir, normalizeAgentAvatar(manifest.avatar), update?.writes ?? []);
+    // The name is in Mixy's prompt (its identity line); the face is not.
+    if (hasOwn(payload, 'name')) void publishAgentProfileChange();
+    return getLeadStatus();
+  }
+  // Sets the flag (and Mixy's 하는 일 when given); every other key is kept.
+  // A damaged Lead manifest (NUL-filled, torn, not an object) gets its last
+  // good copy back first. Without one it is left alone — nothing is written,
+  // the status stays as read — since a rewrite would drop its connector policy.
+  function setLeadCreated(created, description) {
+    if (typeof created !== 'boolean') throw new TypeError('created must be a boolean');
+    let manifest;
+    try {
+      manifest = readManifestForUpdate(leadDir());
+    } catch (error) {
+      process.stderr.write(`[agents] ${error.message}; Mixy's created flag was not saved\n`);
+      return getLeadStatus();
+    }
+    manifest.created = created;
+    const job = oneLine(description);
+    if (job) manifest.description = job;
+    mkdirSync(leadDir(), { recursive: true });
+    writeManifest(join(leadDir(), 'agent.json'), manifest);
+    return getLeadStatus();
+  }
+
+  return {
+    leadDir,
+    getLeadPersona: () => readLeadFile(PERSONA_FILE),
+    saveLeadPersona: (text) => saveLeadFile(PERSONA_FILE, text),
+    getLeadAgentBody: () => readLeadFile('AGENT.md'),
+    saveLeadAgentBody: (text) => saveLeadFile('AGENT.md', text),
+    getLeadStatus,
+    saveLeadIdentity,
+    setLeadCreated,
+    // Mixy's connector policy, in its agent.json (`next` null removes it).
+    getLeadConnectorPolicy: () => readConnectorsFile(join(leadDir(), 'agent.json')),
+    setLeadConnectorPolicy: (next) => {
+      const manifest = readManifestForUpdate(leadDir());
+      if (next) manifest.connectors = next;
+      else delete manifest.connectors;
+      mkdirSync(leadDir(), { recursive: true });
+      writeManifest(join(leadDir(), 'agent.json'), manifest);
+    },
+  };
+}
+
+// Whether each agent's definition is on disk, decided per id from the files
+// themselves: 'deleted' only when every source is PROVEN absent (ENOENT) or
+// tombstoned, 'unknown' on any other read fault. A list read swallows
+// directory errors, so its absence never proves a deletion; this does.
+function definitionPresence({ dataDir, rootDir, stat }, agentIds) {
+  const probe = (path) => {
+    try {
+      stat(path);
+      return 'present';
+    } catch (error) {
+      return error?.code === 'ENOENT' || error?.code === 'ENOTDIR' ? 'absent' : 'unknown';
+    }
+  };
+  const presence = (agentId) => {
+    const id = agentEditorId(agentId);
+    if (!id || id !== agentId) return 'unknown';
+    const user = probe(join(userDir(dataDir, id), 'AGENT.md'));
+    if (user !== 'absent') return user;
+    const tombstone = probe(join(userDir(dataDir, id), AGENT_DELETED_MARKER));
+    if (tombstone === 'present') return 'deleted';
+    if (tombstone === 'unknown') return 'unknown';
+    const shipped = probe(join(rootDir, 'agents', id, 'AGENT.md'));
+    return shipped === 'absent' ? 'deleted' : shipped;
+  };
+  const ids = Array.isArray(agentIds) ? agentIds.filter((id) => typeof id === 'string') : [];
+  return Object.fromEntries(ids.map((id) => [id, presence(id)]));
+}
+
+// A definition folder's revision: a hash of the three files an editor writes.
+function definitionDirRevision(dir) {
+  const hash = createHash('sha256');
+  for (const name of ['agent.json', 'AGENT.md', PERSONA_FILE]) {
+    hash.update(`${name}\0`);
+    try {
+      hash.update(readFileSync(join(dir, name)));
+    } catch {
+      hash.update('\u0001absent');
+    }
+    hash.update('\0');
+  }
+  return hash.digest('hex').slice(0, 24);
+}
+
+/** The one-time split of bots into bots/ (bot-split-migration.mjs), from
+ *  the config as it is now; the catalogs read the store from here on. */
+function migrateBotStore(deps) {
+  const dataDir = resolveDataDir(deps);
+  const config = deps.getConfig();
+  const result = migrateBotsToOwnStore({
+    dataDir,
+    shippedRoot: deps.rootDir ?? STANDALONE_ROOT,
+    routeOf: (id) => deps.agentRouteFromConfig(config, id),
+    leadRoute: normalizeWorkflowRoute(deps.resolveRoute(config, {})),
+    // The definitions the split copies or a re-sync replaces go with it.
+    backup: () => backupUserData(dataDir, 'bot-split', { dirs: BOT_SPLIT_BACKUP_DIRS }),
+    log: (line) => process.stderr.write(`${line}\n`),
+  });
+  clearAgentDefinitionCache();
+  deps.listCustomAgentIds?.(dataDir);
+  return result;
+}
+
+/** The one-time `kind: agent` stamp for agents made before the marker
+ *  (agent-kind-migration.mjs); runs before the bot split so a workflow
+ *  agent is never copied to bots/. */
+function migrateAgentKindMarkers(deps) {
+  const dataDir = resolveDataDir(deps);
+  const result = migrateAgentKinds({
+    dataDir,
+    shippedRoot: deps.rootDir ?? STANDALONE_ROOT,
+    backup: () => backupUserData(dataDir, 'agent-kind', { dirs: BOT_SPLIT_BACKUP_DIRS }),
+    // A restored bot's own route goes back to the config, where a workflow
+    // agent's lives (unless the config already holds that model).
+    restoreRoute: (id, route) => {
+      const config = deps.getConfig();
+      const current = deps.agentRouteFromConfig(config, id);
+      if (current?.provider === route.provider && current?.model === route.model) return;
+      deps.saveConfigAndAdopt(canonicalizeAgentRouteStorage({ ...config, agents: { ...config.agents, [id]: route } }));
+    },
+    log: (line) => process.stderr.write(`${line}\n`),
+  });
+  clearAgentDefinitionCache();
+  deps.listCustomAgentIds?.(dataDir);
+  return result;
+}
+
+// Deleting (archiving), restoring and purging agents, and the config cleanup
+// a removed agent needs.
+function createAgentArchiveApi({
+  dataDirOf,
+  getConfig,
+  saveConfigAndAdopt,
+  loadAgentDefinition,
+  shippedDir,
+  announceBotChange,
+  getAgentDefinition,
+}) {
+  // A removed custom agent must not leave a dangling route/preset or a
+  // disabled-roster entry that would silently disable a later agent of the
+  // same id.
+  function dropAgentRoute(id) {
+    const nextConfig = withAgentDisabled(getConfig(), id, false);
+    if (nextConfig.agents && id in nextConfig.agents) {
+      const agents = { ...nextConfig.agents };
+      delete agents[id];
+      nextConfig.agents = agents;
+    }
+    saveConfigAndAdopt(canonicalizeAgentRouteStorage(nextConfig));
+  }
+
+  async function deleteAgentDefinition(agentId) {
+    const id = agentEditorId(agentId);
+    if (!id) throw new Error(`unknown agent "${agentId}"`);
+    if (isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and cannot be deleted`);
+    const builtIn = isFixedAgent(id);
+    const dataDir = dataDirOf();
+    const dir = userDir(dataDir, id);
+    if (!hasUserAgentFile(dataDir, id)) {
+      if (builtIn) throw new Error(`agent "${id}" has no user override to reset`);
+      if (!loadAgentDefinition(dataDir, id)) throw new Error(`agent "${id}" not found`);
+    }
+    // Agents are global (no workflow rosters): deleting a custom agent removes
+    // it from every surface at once — catalog, editor, routes, and spawn (the
+    // spawn path rejects unknown agent ids).
+    if (builtIn) {
+      rmSync(dir, { recursive: true, force: true });
+      clearAgentDefinitionCache(id);
+      const sourceFallback = loadAgentDefinition(dataDir, id);
+      // Its threads, and the Leads listing it, take the shipped definition.
+      await announceBotChange(dataDir);
+      return { id, deleted: true, revertedToBuiltIn: Boolean(sourceFallback) };
+    }
+    // A custom agent is archived: its AGENT.md (what makes it an agent
+    // anywhere) moves aside, the tombstone keeps the packaged copy of a
+    // starter from coming back, and the rest (agent.json: name and face,
+    // persona, memory, its model and on/off) stays for its archived chat —
+    // until restoreAgentDefinition brings it back or purgeAgentDefinition.
+    mkdirSync(dir, { recursive: true });
+    if (existsSync(join(dir, 'AGENT.md'))) renameSync(join(dir, 'AGENT.md'), join(dir, ARCHIVED_AGENT_FILE));
+    writeFileAtomicSync(join(dir, AGENT_DELETED_MARKER), 'deleted\n');
+    clearAgentDefinitionCache(id);
+    // The Leads listing it drop it from their roster from their next turn.
+    await announceBotChange(dataDir);
+    return { id, deleted: true, revertedToBuiltIn: false };
+  }
+
+  /** An archived agent back as it was, under its own id: its AGENT.md moved
+   *  back (a starter without a copy of its own returns to the packaged one)
+   *  and the tombstone gone. Its routines stay off (the host). */
+  async function restoreAgentDefinition(agentId) {
+    const id = agentEditorId(agentId);
+    if (!id || isHiddenAgent(id) || isFixedAgent(id)) throw new Error(`unknown agent "${agentId}"`);
+    const dataDir = dataDirOf();
+    if (!isArchivedAgent(dataDir, id)) throw new Error(`agent "${id}" is not deleted`);
+    const dir = userDir(dataDir, id);
+    const kept = join(dir, ARCHIVED_AGENT_FILE);
+    if (!existsSync(kept) && !existsSync(join(shippedDir(id), 'AGENT.md'))) {
+      throw new Error(`agent "${id}" was deleted before deleted agents were kept, so it cannot be restored`);
+    }
+    if (existsSync(kept)) renameSync(kept, join(dir, 'AGENT.md'));
+    rmSync(join(dir, AGENT_DELETED_MARKER), { force: true });
+    clearAgentDefinitionCache(id);
+    // Back in the roster of the Leads that list it, from their next turn.
+    await announceBotChange(dataDir);
+    return getAgentDefinition(id);
+  }
+
+  /** Deleting an archived agent again: everything it left goes for good. A
+   *  starter keeps only its tombstone, so its packaged copy stays gone. */
+  async function purgeAgentDefinition(agentId) {
+    const id = agentEditorId(agentId);
+    if (!id || isHiddenAgent(id) || isFixedAgent(id)) throw new Error(`unknown agent "${agentId}"`);
+    const dataDir = dataDirOf();
+    // Never a live agent; one deleted before archiving existed left nothing.
+    if (!isArchivedAgent(dataDir, id)) return { id, purged: false };
+    const dir = userDir(dataDir, id);
+    rmSync(dir, { recursive: true, force: true });
+    clearAgentDefinitionCache(id);
+    dropAgentRoute(id);
+    if (loadAgentDefinition(dataDir, id)) {
+      mkdirSync(dir, { recursive: true });
+      writeFileAtomicSync(join(dir, AGENT_DELETED_MARKER), 'deleted\n');
+      clearAgentDefinitionCache(id);
+    }
+    return { id, purged: true };
+  }
+
+  return { dropAgentRoute, deleteAgentDefinition, restoreAgentDefinition, purgeAgentDefinition };
+}
+
 // Agent catalog + editor surface: fixed services stay built-in; starter and
 // user-authored agents are custom definitions under agents/<id>/AGENT.md.
 export function createAgentEditorApi(deps) {
   const { getConfig, loadAgentDefinition, listCustomAgentIds, saveConfigAndAdopt, setAgentRoute } = deps;
-  const routeFor = (config, id) => effectiveAgentRoute(deps, config, id);
+  // A store bot's route lives in its folder; every other agent's in the config.
+  const ownRoute = (config, id) => {
+    const bot = readBotRoute(resolveDataDir(deps), id);
+    return bot !== undefined ? bot : deps.agentRouteFromConfig(config, id);
+  };
+  const routeFor = (config, id) => effectiveAgentRoute({ ...deps, agentRouteFromConfig: ownRoute }, config, id);
   // `route` falls back to Main; this says whether the agent has a route of
   // its own, so a surface never shows (or saves) the Main fallback as one.
-  const routeConfigured = (config, id) => Boolean(deps.agentRouteFromConfig(config, id));
+  const routeConfigured = (config, id) => Boolean(ownRoute(config, id));
   const shippedDir = (id) => join(deps.rootDir ?? STANDALONE_ROOT, 'agents', id);
   // The manifest in effect: the user's own copy if any, else the shipped one.
-  const manifestDirOf = (dataDir, id) => (hasUserAgentFile(dataDir, id) ? join(dataDir, 'agents', id) : shippedDir(id));
+  const manifestDirOf = (dataDir, id) => (hasUserAgentFile(dataDir, id) ? userDir(dataDir, id) : shippedDir(id));
   const manifestOf = (dataDir, id) => readManifest(manifestDirOf(dataDir, id));
+  // The same, to be written back: the user's copy is recovered or refused when
+  // damaged (readManifestForUpdate); a shipped one is only read.
+  const manifestForUpdate = (dataDir, id) =>
+    hasUserAgentFile(dataDir, id) ? readManifestForUpdate(userDir(dataDir, id)) : readManifest(shippedDir(id));
   const avatarOf = (dataDir, id) => normalizeAgentAvatar(manifestOf(dataDir, id).avatar);
   // A saved, archived or restored bot reaches the prompts that embed it: the
   // fresh scan republishes the shared bot list the Lead rosters read (a new id
@@ -291,20 +781,8 @@ export function createAgentEditorApi(deps) {
   // The stored definition's revision: a hash of the three files an editor
   // writes, from the copy in effect. An editor that loaded it can send it back
   // as `expectedRevision`, and a save over a newer copy is refused.
-  function definitionRevision(dataDir, id) {
-    const dir = hasUserAgentFile(dataDir, id) ? join(dataDir, 'agents', id) : shippedDir(id);
-    const hash = createHash('sha256');
-    for (const name of ['agent.json', 'AGENT.md', PERSONA_FILE]) {
-      hash.update(`${name}\0`);
-      try {
-        hash.update(readFileSync(join(dir, name)));
-      } catch {
-        hash.update('\u0001absent');
-      }
-      hash.update('\0');
-    }
-    return hash.digest('hex').slice(0, 24);
-  }
+  const definitionRevision = (dataDir, id) =>
+    definitionDirRevision(hasUserAgentFile(dataDir, id) ? userDir(dataDir, id) : shippedDir(id));
 
   function getAgentDefinition(agentId) {
     const id = agentEditorId(agentId);
@@ -326,37 +804,16 @@ export function createAgentEditorApi(deps) {
       kind: kindOf(definition),
       disabled: isAgentDisabled(getConfig(), id),
       avatar: avatarOf(dataDir, id),
-      persona: readPersona(hasUserAgentFile(dataDir, id) ? join(dataDir, 'agents', id) : shippedDir(id)),
+      persona: readPersona(hasUserAgentFile(dataDir, id) ? userDir(dataDir, id) : shippedDir(id)),
       revision: definitionRevision(dataDir, id),
     };
   }
 
-  function resolveSaveTarget(payload, dataDir) {
-    const id = agentEditorId(clean(payload.id));
-    if (hasOwn(payload, 'id') && !id) {
-      throw new Error('agent id must contain letters/numbers (dashes and dots allowed)');
-    }
-    if (id && isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and cannot be edited`);
-    const name = oneLine(payload.name);
-    if (!name && !id) throw new Error('agent name must not be empty');
-    return {
-      // An archived agent keeps its id: its chat is never handed to a new one.
-      id:
-        id ||
-        availableAgentId(
-          name,
-          (candidate) => Boolean(loadAgentDefinition(dataDir, candidate)) || isArchivedAgent(dataDir, candidate)
-        ),
-      name,
-      description: oneLine(payload.description),
-    };
-  }
-
-  async function saveAgentDefinition(payload = {}) {
+  async function saveAgentDefinition(payload = {}, options) {
     const body = String(payload.body || '').trim();
     if (!body) throw new Error('AGENT.md body must not be empty');
     const dataDir = resolveDataDir(deps);
-    const { id, name, description } = resolveSaveTarget(payload, dataDir);
+    const { id, name, description } = resolveSaveTarget(loadAgentDefinition, payload, dataDir);
     // Opt-in (the agent profile): without `expectedRevision` the last write
     // wins, as for the Workflows editor and the setup tool.
     if (hasOwn(payload, 'expectedRevision') && String(payload.expectedRevision) !== definitionRevision(dataDir, id)) {
@@ -370,25 +827,30 @@ export function createAgentEditorApi(deps) {
     const reclaimed = !existed && isArchivedAgent(dataDir, id);
     const kind = creationKind(payload, existed);
     const definition = { name: name || id, description, body };
-    const manifest = hiddenManifest(manifestOf(dataDir, id));
-    const dir = join(dataDir, 'agents', id);
-    // New custom images arrive as checked bytes, stored under content hashes.
-    const update = hasOwn(payload, 'avatar') ? avatarUpdate(payload.avatar, dir) : null;
-    if (update?.avatar) manifest.avatar = update.avatar;
-    else if (update) delete manifest.avatar;
-    // Connectors: a policy replaces the saved one, null removes the field
-    // (every connector on), absent leaves it as saved.
-    if (hasOwn(payload, 'connectors')) {
-      const connectors = connectorPolicyInput(payload.connectors);
-      if (connectors) manifest.connectors = connectors;
-      else delete manifest.connectors;
+    const manifest = hiddenManifest(manifestForUpdate(dataDir, id));
+    // With the bot store, a new bot is made in bots/ and a new agent in
+    // agents/; either keeps its `kind` marker, so its kind never rests on
+    // the folder alone (a copy read without the store is still a bot).
+    const storeBot = !existed && kind === BOT_AGENT_KIND && botStoreActive(dataDir);
+    // An id is one definition's in one store: a new bot never takes an id
+    // agents/ holds (an archived agent's included), a new agent never one of
+    // bots/ (or one the split moved there, even if since deleted).
+    if (!existed && botStoreActive(dataDir)) {
+      const taken = storeBot
+        ? existsSync(join(dataDir, 'agents', id))
+        : existsSync(botDir(dataDir, id)) || migratedBotIds(dataDir).has(id);
+      if (taken) throw new Error(`agent id "${id}" is already in use; pick another name`);
     }
+    const dir = storeBot ? botDir(dataDir, id) : userDir(dataDir, id);
+    const inStore = dir === botDir(dataDir, id);
+    const update = applyManifestEdits(manifest, payload, dir, options);
     // PERSONA.md (tone, how it addresses the user): written when given and
     // non-empty, removed when given empty, untouched when absent.
     const persona = hasOwn(payload, 'persona') ? String(payload.persona ?? '').trim() : null;
     // Equal to the shipped agent: keep no copy so it follows the shipped
     // version — unless the manifest (an avatar) or a persona differs.
     const absorbed =
+      !inStore &&
       !persona &&
       stableJson(manifest) === stableJson(hiddenManifest(readManifest(shippedDir(id)))) &&
       absorbSaveEqualToShipped({
@@ -403,11 +865,7 @@ export function createAgentEditorApi(deps) {
     if (!absorbed) {
       // Hidden frontmatter (the `kind` marker included) survives every edit.
       const extra = kind ? { ...hiddenFrontmatter(current), kind } : hiddenFrontmatter(current);
-      writeAgentFiles(dir, { ...definition, extra, manifest });
-      if (persona) writeFileSync(join(dir, PERSONA_FILE), `${persona}\n`);
-      else if (persona === '') rmSync(join(dir, PERSONA_FILE), { force: true });
-      // Only the images the manifest names stay.
-      syncAvatarFiles(dir, normalizeAgentAvatar(manifest.avatar), update?.writes ?? []);
+      writeSavedDefinition(dir, { ...definition, extra, manifest }, persona, update);
     }
     clearAgentDefinitionCache(id);
     if (reclaimed) dropAgentRoute(id);
@@ -421,143 +879,29 @@ export function createAgentEditorApi(deps) {
     return getAgentDefinition(id);
   }
 
-  // A removed custom agent must not leave a dangling route/preset or a
-  // disabled-roster entry that would silently disable a later agent of the
-  // same id.
-  function dropAgentRoute(id) {
-    const nextConfig = withAgentDisabled(getConfig(), id, false);
-    if (nextConfig.agents && id in nextConfig.agents) {
-      const agents = { ...nextConfig.agents };
-      delete agents[id];
-      nextConfig.agents = agents;
+  const { dropAgentRoute, deleteAgentDefinition, restoreAgentDefinition, purgeAgentDefinition } = createAgentArchiveApi(
+    {
+      dataDirOf: () => resolveDataDir(deps),
+      getConfig,
+      saveConfigAndAdopt,
+      loadAgentDefinition,
+      shippedDir,
+      announceBotChange,
+      getAgentDefinition,
     }
-    saveConfigAndAdopt(canonicalizeAgentRouteStorage(nextConfig));
-  }
-
-  async function deleteAgentDefinition(agentId) {
-    const id = agentEditorId(agentId);
-    if (!id) throw new Error(`unknown agent "${agentId}"`);
-    if (isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and cannot be deleted`);
-    const builtIn = isFixedAgent(id);
-    const dataDir = resolveDataDir(deps);
-    const dir = join(dataDir, 'agents', id);
-    if (!hasUserAgentFile(dataDir, id)) {
-      if (builtIn) throw new Error(`agent "${id}" has no user override to reset`);
-      if (!loadAgentDefinition(dataDir, id)) throw new Error(`agent "${id}" not found`);
-    }
-    // Agents are global (no workflow rosters): deleting a custom agent removes
-    // it from every surface at once — catalog, editor, routes, and spawn (the
-    // spawn path rejects unknown agent ids).
-    if (builtIn) {
-      rmSync(dir, { recursive: true, force: true });
-      clearAgentDefinitionCache(id);
-      const sourceFallback = loadAgentDefinition(dataDir, id);
-      // Its threads, and the Leads listing it, take the shipped definition.
-      await announceBotChange(dataDir);
-      return { id, deleted: true, revertedToBuiltIn: Boolean(sourceFallback) };
-    }
-    // A custom agent is archived: its AGENT.md (what makes it an agent
-    // anywhere) moves aside, the tombstone keeps the packaged copy of a
-    // starter from coming back, and the rest (agent.json: name and face,
-    // persona, memory, its model and on/off) stays for its archived chat —
-    // until restoreAgentDefinition brings it back or purgeAgentDefinition.
-    mkdirSync(dir, { recursive: true });
-    if (existsSync(join(dir, 'AGENT.md'))) renameSync(join(dir, 'AGENT.md'), join(dir, ARCHIVED_AGENT_FILE));
-    writeFileSync(join(dir, AGENT_DELETED_MARKER), 'deleted\n');
-    clearAgentDefinitionCache(id);
-    // The Leads listing it drop it from their roster from their next turn.
-    await announceBotChange(dataDir);
-    return { id, deleted: true, revertedToBuiltIn: false };
-  }
-
-  const isArchivedAgent = (dataDir, id) => existsSync(join(dataDir, 'agents', id, AGENT_DELETED_MARKER));
+  );
 
-  /** An archived agent back as it was, under its own id: its AGENT.md moved
-   *  back (a starter without a copy of its own returns to the packaged one)
-   *  and the tombstone gone. Its routines stay off (the host). */
-  async function restoreAgentDefinition(agentId) {
-    const id = agentEditorId(agentId);
-    if (!id || isHiddenAgent(id) || isFixedAgent(id)) throw new Error(`unknown agent "${agentId}"`);
-    const dataDir = resolveDataDir(deps);
-    if (!isArchivedAgent(dataDir, id)) throw new Error(`agent "${id}" is not deleted`);
-    const dir = join(dataDir, 'agents', id);
-    const kept = join(dir, ARCHIVED_AGENT_FILE);
-    if (!existsSync(kept) && !existsSync(join(shippedDir(id), 'AGENT.md'))) {
-      throw new Error(`agent "${id}" was deleted before deleted agents were kept, so it cannot be restored`);
-    }
-    if (existsSync(kept)) renameSync(kept, join(dir, 'AGENT.md'));
-    rmSync(join(dir, AGENT_DELETED_MARKER), { force: true });
-    clearAgentDefinitionCache(id);
-    // Back in the roster of the Leads that list it, from their next turn.
-    await announceBotChange(dataDir);
-    return getAgentDefinition(id);
-  }
+  const archivedAgentIdentities = (agentIds = []) => archivedIdentities(resolveDataDir(deps), agentIds);
 
-  /** Deleting an archived agent again: everything it left goes for good. A
-   *  starter keeps only its tombstone, so its packaged copy stays gone. */
-  async function purgeAgentDefinition(agentId) {
-    const id = agentEditorId(agentId);
-    if (!id || isHiddenAgent(id) || isFixedAgent(id)) throw new Error(`unknown agent "${agentId}"`);
-    const dataDir = resolveDataDir(deps);
-    // Never a live agent; one deleted before archiving existed left nothing.
-    if (!isArchivedAgent(dataDir, id)) return { id, purged: false };
-    const dir = join(dataDir, 'agents', id);
-    rmSync(dir, { recursive: true, force: true });
-    clearAgentDefinitionCache(id);
-    dropAgentRoute(id);
-    if (loadAgentDefinition(dataDir, id)) {
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(join(dir, AGENT_DELETED_MARKER), 'deleted\n');
-      clearAgentDefinitionCache(id);
-    }
-    return { id, purged: true };
-  }
-
-  /** The name and face an archived (deleted) agent left, per id; null for
-   *  any id that is not archived. Its chat lists under them. */
-  function archivedAgentIdentities(agentIds = []) {
-    const dataDir = resolveDataDir(deps);
-    const ids = Array.isArray(agentIds) ? agentIds.filter((id) => typeof id === 'string') : [];
-    return Object.fromEntries(
-      ids.map((agentId) => {
-        const id = agentEditorId(agentId);
-        if (!id || id !== agentId || !isArchivedAgent(dataDir, id)) return [agentId, null];
-        const manifest = readManifest(join(dataDir, 'agents', id));
-        return [agentId, { name: oneLine(manifest.name) || id, avatar: normalizeAgentAvatar(manifest.avatar) ?? null }];
-      })
+  const agentDefinitionPresence = (agentIds = []) =>
+    definitionPresence(
+      {
+        dataDir: resolveDataDir(deps),
+        rootDir: deps.rootDir ?? STANDALONE_ROOT,
+        stat: deps.statSync ?? statSync,
+      },
+      agentIds
     );
-  }
-
-  // Whether each agent's definition is on disk, decided per id from the files
-  // themselves: 'deleted' only when every source is PROVEN absent (ENOENT) or
-  // tombstoned, 'unknown' on any other read fault. A list read swallows
-  // directory errors, so its absence never proves a deletion; this does.
-  function agentDefinitionPresence(agentIds = []) {
-    const dataDir = resolveDataDir(deps);
-    const rootDir = deps.rootDir ?? STANDALONE_ROOT;
-    const stat = deps.statSync ?? statSync;
-    const probe = (path) => {
-      try {
-        stat(path);
-        return 'present';
-      } catch (error) {
-        return error?.code === 'ENOENT' || error?.code === 'ENOTDIR' ? 'absent' : 'unknown';
-      }
-    };
-    const presence = (agentId) => {
-      const id = agentEditorId(agentId);
-      if (!id || id !== agentId) return 'unknown';
-      const user = probe(join(dataDir, 'agents', id, 'AGENT.md'));
-      if (user !== 'absent') return user;
-      const tombstone = probe(join(dataDir, 'agents', id, AGENT_DELETED_MARKER));
-      if (tombstone === 'present') return 'deleted';
-      if (tombstone === 'unknown') return 'unknown';
-      const shipped = probe(join(rootDir, 'agents', id, 'AGENT.md'));
-      return shipped === 'absent' ? 'deleted' : shipped;
-    };
-    const ids = Array.isArray(agentIds) ? agentIds.filter((id) => typeof id === 'string') : [];
-    return Object.fromEntries(ids.map((id) => [id, presence(id)]));
-  }
 
   // A custom avatar's images as data URLs by state, read on demand: the
   // catalog rows (which also reach the setup tool's model output) carry only
@@ -566,9 +910,10 @@ export function createAgentEditorApi(deps) {
     const id = agentEditorId(agentId);
     if (!id || isHiddenAgent(id)) return null;
     const dataDir = resolveDataDir(deps);
-    // Mixy's face lives in agents/lead/agent.json, beside no AGENT.md of its own.
+    // Mixy's face lives in its identity folder's agent.json (mixyIdentityDir:
+    // bots/mixy with the bot store, agents/lead before), beside no AGENT.md.
     const lead = id === LEAD_AGENT_ID;
-    const dir = join(dataDir, 'agents', id);
+    const dir = lead ? leadDir() : userDir(dataDir, id);
     // An archived agent's face stays readable for its archived chat.
     const archived = !lead && isArchivedAgent(dataDir, id);
     const avatar = lead
@@ -577,87 +922,21 @@ export function createAgentEditorApi(deps) {
         ? normalizeAgentAvatar(readManifest(dir).avatar)
         : avatarOf(dataDir, id);
     if (avatar?.kind !== 'custom' || (!lead && !archived && !hasUserAgentFile(dataDir, id))) return null;
-    const states = {};
-    for (const [state, file] of Object.entries(avatar.states)) {
-      const image = readAvatarImage(dir, file);
-      if (image) states[state] = image;
-    }
-    return states.idle ? { states } : null;
-  }
-
-  // Mixy (the Lead) has no agent definition to edit: only its PERSONA.md
-  // (성격) and AGENT.md (일하는 방식, agent mode only), read by the runtime
-  // from agents/lead/. Saved empty, the file goes.
-  const leadDir = () => join(resolveDataDir(deps), 'agents', LEAD_AGENT_ID);
-  function readLeadFile(file) {
-    try {
-      return readFileSync(join(leadDir(), file), 'utf8').trim();
-    } catch {
-      return '';
-    }
-  }
-  function saveLeadFile(file, text) {
-    const value = String(text ?? '').trim();
-    if (Buffer.byteLength(value) > LEAD_PERSONA_MAX_BYTES) throw new Error(`${file} is larger than 256 KB`);
-    const dir = leadDir();
-    if (value) {
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(join(dir, file), `${value}\n`);
-    } else rmSync(join(dir, file), { force: true });
-    // Mixy's threads take it from their next turn (the save answers at once).
-    void publishAgentProfileChange();
-    return readLeadFile(file);
+    return customAvatarImages(dir, avatar);
   }
-  const getLeadPersona = () => readLeadFile(PERSONA_FILE);
-  const saveLeadPersona = (text) => saveLeadFile(PERSONA_FILE, text);
-  const getLeadAgentBody = () => readLeadFile('AGENT.md');
-  const saveLeadAgentBody = (text) => saveLeadFile('AGENT.md', text);
 
-  // Whether Mixy was created (the "대표 에이전트 만들기" first run): the
-  // explicit `created` flag in agents/lead/agent.json. null until decided —
-  // the desktop host decides once (an existing profile counts as created).
-  // Also Mixy's display name (`name`, read by the runtime's identity line) and
-  // face (`avatar`, as every agent manifest): '' / null mean the defaults.
-  function getLeadStatus() {
-    const manifest = readManifest(leadDir());
-    return {
-      created: typeof manifest.created === 'boolean' ? manifest.created : null,
-      name: oneLine(manifest.name),
-      avatar: normalizeAgentAvatar(manifest.avatar) ?? null,
-    };
-  }
-  // Mixy's name and face, chosen in the 대표 에이전트 dialog or its profile:
-  // a name '' and an avatar null go back to the defaults; absent keys are kept.
-  function saveLeadIdentity(payload = {}) {
-    const dir = leadDir();
-    const manifest = readManifest(dir);
-    if (hasOwn(payload, 'name')) {
-      const name = oneLine(payload.name);
-      if (name.length > 64) throw new Error('name must be 64 characters or fewer');
-      if (name) manifest.name = name;
-      else delete manifest.name;
-    }
-    const update = hasOwn(payload, 'avatar') ? avatarUpdate(payload.avatar, dir) : null;
-    if (update?.avatar) manifest.avatar = update.avatar;
-    else if (update) delete manifest.avatar;
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(join(dir, 'agent.json'), `${JSON.stringify(manifest, null, 2)}\n`);
-    syncAvatarFiles(dir, normalizeAgentAvatar(manifest.avatar), update?.writes ?? []);
-    // The name is in Mixy's prompt (its identity line); the face is not.
-    if (hasOwn(payload, 'name')) void publishAgentProfileChange();
-    return getLeadStatus();
-  }
-  // Sets the flag (and Mixy's 하는 일 when given); every other key is kept.
-  function setLeadCreated(created, description) {
-    if (typeof created !== 'boolean') throw new TypeError('created must be a boolean');
-    const manifest = readManifest(leadDir());
-    manifest.created = created;
-    const job = oneLine(description);
-    if (job) manifest.description = job;
-    mkdirSync(leadDir(), { recursive: true });
-    writeFileSync(join(leadDir(), 'agent.json'), `${JSON.stringify(manifest, null, 2)}\n`);
-    return getLeadStatus();
-  }
+  const {
+    leadDir,
+    getLeadPersona,
+    saveLeadPersona,
+    getLeadAgentBody,
+    saveLeadAgentBody,
+    getLeadStatus,
+    saveLeadIdentity,
+    setLeadCreated,
+    getLeadConnectorPolicy,
+    setLeadConnectorPolicy,
+  } = createLeadIdentityApi(() => resolveDataDir(deps));
 
   // The agent's connector policy (see runtime/.../mcp/agent-connectors.mjs),
   // or null when its definition has none: every connector is on. Read as the
@@ -668,7 +947,7 @@ export function createAgentEditorApi(deps) {
     if (!id) throw new Error(`unknown agent "${agentId}"`);
     if (isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and cannot be edited`);
     const dataDir = resolveDataDir(deps);
-    if (id === LEAD_AGENT_ID) return readConnectorsFile(join(leadDir(), 'agent.json'));
+    if (id === LEAD_AGENT_ID) return getLeadConnectorPolicy();
     if (!loadAgentDefinition(dataDir, id)) throw new Error(`agent "${agentId}" not found`);
     return readConnectorsFile(join(manifestDirOf(dataDir, id), 'agent.json'));
   }
@@ -678,13 +957,9 @@ export function createAgentEditorApi(deps) {
     const id = agentEditorId(agentId);
     const next = connectorPolicyInput(connectors);
     getAgentConnectorPolicy(id);
-    if (id === LEAD_AGENT_ID) {
-      const manifest = readManifest(leadDir());
-      if (next) manifest.connectors = next;
-      else delete manifest.connectors;
-      mkdirSync(leadDir(), { recursive: true });
-      writeFileSync(join(leadDir(), 'agent.json'), `${JSON.stringify(manifest, null, 2)}\n`);
-    } else {
+    assertManifestWritable(join(id === LEAD_AGENT_ID ? leadDir() : userDir(resolveDataDir(deps), id), 'agent.json'));
+    if (id === LEAD_AGENT_ID) setLeadConnectorPolicy(next);
+    else {
       const { name, description, body } = loadAgentDefinition(resolveDataDir(deps), id);
       await saveAgentDefinition({ id, name, description, body, connectors: next });
     }
@@ -692,6 +967,8 @@ export function createAgentEditorApi(deps) {
   }
 
   return {
+    migrateAgentKindMarkers: () => migrateAgentKindMarkers(deps),
+    migrateBotStore: () => migrateBotStore(deps),
     getAgentConnectorPolicy,
     setAgentConnectorPolicy,
     listAgents,