blun-king-cli 9.1.327 → 9.1.329

package/bin/identity-context-policy.cjs

@@ -455,7 +455,7 @@ function recordChannelIdentity(envelope, env = process.env) {
   const manifestTenantId = safeId(manifest?.tenant_id);
   const tenantId = configuredTenantId || manifestTenantId;
   const configuredAgentId = safeId(env.BLUN_AGENT_ID);
-  const agentId = configuredAgentId || safeId(manifest?.active_agent_id);
+  const agentId = configuredAgentId || safeId(setup.agent_id);
   if (!tenantId || tenantId !== manifestTenantId || !agentId || manifest?.version !== 1) return undefined;
 
   const actorId = `telegram-${subjectId}`;
@@ -575,7 +575,7 @@ function identitySystemBlock(env = process.env) {
 
   const configuredAgentId = safeId(env.BLUN_AGENT_ID);
   if (env.BLUN_AGENT_ID && !configuredAgentId) return '';
-  const agentId = configuredAgentId || safeId(manifest.active_agent_id);
+  const agentId = configuredAgentId || safeId(setup.agent_id);
   if (!agentId) return '';
   const actorId = safeId(env.BLUN_IDENTITY_ACTOR_ID);
   const groupId = safeId(env.BLUN_IDENTITY_GROUP_ID);

package/bin/personality-choice-policy.cjs

@@ -6,6 +6,7 @@ const os = require('node:os');
 const path = require('node:path');
 
 const { ensurePersonalityWorkspace } = require('./personality-setup-policy.cjs');
+const { readProfilePersona } = require('./profile-identity-resolution.cjs');
 
 const MAX_PERSONA_BYTES = 64 * 1024;
 
@@ -14,7 +15,7 @@ function fail(code, detail = '') {
 }
 
 function resolvedHome(env) {
-  const configured = String(env.BLUN_SHARED_HOME ?? env.BLUN_HOME ?? '').trim();
+  const configured = String(env.BLUN_HOME ?? env.BLUN_SHARED_HOME ?? '').trim();
   return path.resolve(configured || path.join(os.homedir(), '.blun'));
 }
 

package/bin/personality-mode.cjs

@@ -3,6 +3,7 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
+const { identityFileCandidates } = require('./profile-identity-resolution.cjs');
 
 const MAX_PERSONA_BYTES = 64 * 1024;
 const INVALID_PERSONALITY_CHOICE = Symbol('invalid-personality-choice');
@@ -13,19 +14,22 @@ function resolvedHome(env) {
 }
 
 function persistedPersonalityChoice(env) {
-  const personaPath = path.join(resolvedHome(env), 'persona.json');
-  try {
-    const stat = fs.lstatSync(personaPath);
-    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > MAX_PERSONA_BYTES) return INVALID_PERSONALITY_CHOICE;
-    const persona = JSON.parse(fs.readFileSync(personaPath, 'utf8'));
-    if (!persona || typeof persona !== 'object' || Array.isArray(persona)) return INVALID_PERSONALITY_CHOICE;
-    if (!Object.prototype.hasOwnProperty.call(persona, 'personalityEnabled')) return undefined;
-    return typeof persona.personalityEnabled === 'boolean'
-      ? persona.personalityEnabled
-      : INVALID_PERSONALITY_CHOICE;
-  } catch (error) {
-    return error?.code === 'ENOENT' ? undefined : INVALID_PERSONALITY_CHOICE;
+  const candidates = identityFileCandidates('persona.json', env);
+  for (const personaPath of candidates) {
+    try {
+      const stat = fs.lstatSync(personaPath);
+      if (!stat.isFile() || stat.isSymbolicLink() || stat.size > MAX_PERSONA_BYTES) return INVALID_PERSONALITY_CHOICE;
+      const persona = JSON.parse(fs.readFileSync(personaPath, 'utf8'));
+      if (!persona || typeof persona !== 'object' || Array.isArray(persona)) return INVALID_PERSONALITY_CHOICE;
+      if (!Object.prototype.hasOwnProperty.call(persona, 'personalityEnabled')) return undefined;
+      return typeof persona.personalityEnabled === 'boolean'
+        ? persona.personalityEnabled
+        : INVALID_PERSONALITY_CHOICE;
+    } catch (error) {
+      if (error?.code !== 'ENOENT') return INVALID_PERSONALITY_CHOICE;
+    }
   }
+  return undefined;
 }
 
 function personalityContextEnabled(env = process.env) {

package/bin/personality-setup-policy.cjs

@@ -3,6 +3,7 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
+const { readProfilePersona, resolveSoulFile } = require('./profile-identity-resolution.cjs');
 
 const SAFE_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u;
 const MAX_PERSONA_BYTES = 64 * 1024;
@@ -33,18 +34,6 @@ function isInside(parent, child) {
   return relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));
 }
 
-function readPersona(home) {
-  const target = path.join(home, 'persona.json');
-  try {
-    const stat = fs.lstatSync(target);
-    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > MAX_PERSONA_BYTES) return {};
-    const value = JSON.parse(fs.readFileSync(target, 'utf8'));
-    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
-  } catch {
-    return {};
-  }
-}
-
 function readJsonFile(target) {
   try {
     const stat = fs.lstatSync(target);
@@ -96,7 +85,9 @@ function createTextOnce(root, target, value) {
 
 function ensurePersonalityWorkspace(env = process.env) {
   const home = resolvedHome(env);
+  const profileHome = path.resolve(String(env.BLUN_HOME ?? '').trim() || home);
   fs.mkdirSync(home, { recursive: true });
+  fs.mkdirSync(profileHome, { recursive: true });
   const root = path.resolve(String(env.BLUN_IDENTITY_ROOT ?? '').trim() || path.join(home, 'identity'));
   if (!isInside(home, root)) return { ready: false, reason: 'identity_root_outside_home' };
   if (fs.existsSync(root) && fs.lstatSync(root).isSymbolicLink()) return { ready: false, reason: 'identity_root_symlink' };
@@ -105,20 +96,27 @@ function ensurePersonalityWorkspace(env = process.env) {
   const realRoot = fs.realpathSync(root);
   if (!isInside(realHome, realRoot)) return { ready: false, reason: 'identity_root_outside_home' };
 
-  const persona = readPersona(home);
+  const personaResult = readProfilePersona(env);
+  const persona = personaResult.persona || {};
   const displayName = String(persona.name ?? env.BLUN_AGENT_ID ?? 'King').trim().slice(0, 120) || 'King';
-  const requestedAgentId = safeId(env.BLUN_AGENT_ID) || agentIdFromName(displayName);
-  const requestedTenantId = safeId(env.BLUN_IDENTITY_TENANT_ID) || 'local';
+  const configuredAgentId = safeId(env.BLUN_AGENT_ID);
+  const configuredTenantId = safeId(env.BLUN_IDENTITY_TENANT_ID);
+  const initialAgentId = configuredAgentId || (personaResult.persona ? agentIdFromName(displayName) : 'king');
+  const initialTenantId = configuredTenantId || 'local';
   const manifestPath = path.join(root, 'manifest.json');
   createJsonOnce(root, manifestPath, {
     version: 1,
-    tenant_id: requestedTenantId,
-    active_agent_id: requestedAgentId,
+    tenant_id: initialTenantId,
+    active_agent_id: initialAgentId,
   });
   const manifest = readJsonFile(manifestPath);
   const tenantId = safeId(manifest?.tenant_id);
-  const agentId = safeId(manifest?.active_agent_id);
-  if (manifest?.version !== 1 || !tenantId || !agentId) return { ready: false, reason: 'identity_manifest_invalid' };
+  if (manifest?.version !== 1 || !tenantId || (configuredTenantId && tenantId !== configuredTenantId)) {
+    return { ready: false, reason: 'identity_manifest_invalid' };
+  }
+  const agentId = configuredAgentId
+    || (personaResult.persona ? agentIdFromName(displayName) : safeId(manifest.active_agent_id))
+    || 'king';
 
   const profilePath = path.join(root, 'agents', agentId, 'profile.json');
   createJsonOnce(root, profilePath, {
@@ -134,6 +132,17 @@ function ensurePersonalityWorkspace(env = process.env) {
     path.join(root, 'agents', agentId, 'JOURNAL.md'),
     '# Journal\n\nLong-term development notes, shared milestones, and confirmed lessons belong here. Current tasks, secrets, permissions, and incident logs do not.\n',
   );
+  const resolvedSoul = resolveSoulFile(env);
+  const profileSoulPath = path.join(profileHome, 'SOUL.md');
+  if (resolvedSoul.text && path.resolve(resolvedSoul.path) !== path.resolve(profileSoulPath)) {
+    createTextOnce(profileHome, profileSoulPath, `${resolvedSoul.text}\n`);
+  } else if (!resolvedSoul.text) {
+    createTextOnce(
+      profileHome,
+      profileSoulPath,
+      `# ${displayName}\n\nIch bin ${displayName}, der persoenliche BLUN-Agent dieses Profils. Meine eigene Stimme, Vorlieben und gewachsene gemeinsame Geschichte werden hier behutsam weiterentwickelt. Bestaetigte Beziehungen gehoeren in den Beziehungsgraphen; Auftraege, Rechte, Secrets und Incident-Logs gehoeren nicht in meine Seele.\n`,
+    );
+  }
   for (const relative of [
     ['agents', agentId, 'relationships'],
     ['agents', agentId, 'journal', 'candidates'],

package/bin/profile-identity-resolution.cjs

@@ -0,0 +1,117 @@
+'use strict';
+
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+
+const MAX_IDENTITY_FILE_BYTES = 256 * 1024;
+
+function uniquePaths(values) {
+  const seen = new Set();
+  const result = [];
+  for (const value of values) {
+    if (!value) continue;
+    const resolved = path.resolve(value);
+    const key = process.platform === 'win32' ? resolved.toLowerCase() : resolved;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    result.push(resolved);
+  }
+  return result;
+}
+
+function identityFileCandidates(filename, env = process.env, homeDir = os.homedir()) {
+  const profileHome = String(env.BLUN_HOME || '').trim();
+  const sharedHome = String(env.BLUN_SHARED_HOME || '').trim();
+  const profileName = String(env.BLUN_PROFILE || '').trim().toLowerCase();
+  const isNamedProfile = profileName && profileName !== 'default';
+  return uniquePaths([
+    profileHome && path.join(profileHome, filename),
+    !isNamedProfile && sharedHome && path.join(sharedHome, filename),
+    !isNamedProfile && path.join(homeDir, '.blun', filename),
+  ]);
+}
+
+function readSafeText(target, fsImpl = fs) {
+  try {
+    const stat = fsImpl.lstatSync(target);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.size <= 0 || stat.size > MAX_IDENTITY_FILE_BYTES) return '';
+    return fsImpl.readFileSync(target, 'utf8').trim();
+  } catch {
+    return '';
+  }
+}
+
+function readProfilePersona(env = process.env, options = {}) {
+  const fsImpl = options.fsImpl || fs;
+  const candidates = identityFileCandidates('persona.json', env, options.homeDir || os.homedir());
+  for (const target of candidates) {
+    const raw = readSafeText(target, fsImpl);
+    if (!raw) continue;
+    try {
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        return { path: target, persona: parsed };
+      }
+    } catch {}
+  }
+  const profileName = String(env.BLUN_PROFILE || '').trim();
+  return {
+    path: candidates[0],
+    persona: profileName && profileName.toLowerCase() !== 'default' ? { name: profileName } : undefined,
+  };
+}
+
+function legacySoulNames(env, persona) {
+  const names = [];
+  for (const value of [env.BLUN_AGENT_ID, persona?.name, env.BLUN_PROFILE]) {
+    const slug = String(value || '')
+      .normalize('NFKD')
+      .replace(/[\u0300-\u036f]/gu, '')
+      .toLowerCase()
+      .replace(/[^a-z0-9._-]+/gu, '-')
+      .replace(/^[^a-z0-9]+|[^a-z0-9]+$/gu, '')
+      .slice(0, 64);
+    if (slug && slug !== 'default' && !names.includes(`_${slug}_soul.md`)) names.push(`_${slug}_soul.md`);
+  }
+  return names;
+}
+
+function resolveSoulFile(env = process.env, options = {}) {
+  const fsImpl = options.fsImpl || fs;
+  const explicit = String(env.BLUN_SOUL_PATH || '').trim();
+  if (explicit) {
+    const target = path.resolve(explicit);
+    return { path: target, text: readSafeText(target, fsImpl), explicit: true };
+  }
+  const homeDir = options.homeDir || os.homedir();
+  const profileHome = String(env.BLUN_HOME || '').trim();
+  const sharedHome = String(env.BLUN_SHARED_HOME || '').trim();
+  const profileName = String(env.BLUN_PROFILE || '').trim().toLowerCase();
+  const isNamedProfile = profileName && profileName !== 'default';
+  const persona = readProfilePersona(env, options).persona;
+  const legacyRoots = uniquePaths([
+    sharedHome,
+    homeDir,
+    profileHome && path.dirname(profileHome),
+  ]);
+  const legacyCandidates = legacySoulNames(env, persona)
+    .flatMap((filename) => legacyRoots.map((root) => path.join(root, filename)));
+  const candidates = uniquePaths([
+    profileHome && path.join(profileHome, 'SOUL.md'),
+    ...legacyCandidates,
+    ...(!isNamedProfile ? identityFileCandidates('SOUL.md', env, homeDir).slice(1) : []),
+  ]);
+  for (const target of candidates) {
+    const text = readSafeText(target, fsImpl);
+    if (text) return { path: target, text, explicit: false };
+  }
+  return { path: candidates[0], text: '', explicit: false };
+}
+
+module.exports = {
+  MAX_IDENTITY_FILE_BYTES,
+  identityFileCandidates,
+  readProfilePersona,
+  resolveSoulFile,
+};

package/bin/relationship-learning-policy.cjs

@@ -101,7 +101,10 @@ function recordExplicitRelationshipCandidate(input = {}) {
     if (!fs.lstatSync(root).isDirectory() || fs.lstatSync(root).isSymbolicLink()) return undefined;
     const realRoot = fs.realpathSync(root);
     const manifest = readManifest(realRoot);
-    if (manifest?.version !== 1 || manifest.tenant_id !== tenantId || manifest.active_agent_id !== agentId) return undefined;
+    const agentRoot = path.join(realRoot, 'agents', agentId);
+    if (manifest?.version !== 1 || manifest.tenant_id !== tenantId) return undefined;
+    const agentStat = fs.lstatSync(agentRoot);
+    if (!agentStat.isDirectory() || agentStat.isSymbolicLink()) return undefined;
     // The timestamp keeps later confirmations or contradictions as separate history,
     // while an identical channel event remains idempotent on retry.
     const identity = [tenantId, agentId, actorId, occurredAt, explicit.kind, explicit.value].join('\0');

package/blun.mjs

@@ -21445,6 +21445,7 @@ var { ensurePersonalityWorkspace } = createRequire(import.meta.url)("./bin/perso
 var { rollbackPersonalityChoice, setPersonalityEnabledAtomic } = createRequire(import.meta.url)("./bin/personality-choice-policy.cjs");
 var { projectSoulText } = createRequire(import.meta.url)("./bin/soul-organization-policy.cjs");
 var { soulFileInstruction } = createRequire(import.meta.url)("./bin/soul-preservation-policy.cjs");
+var { readProfilePersona, resolveSoulFile } = createRequire(import.meta.url)("./bin/profile-identity-resolution.cjs");
 async function prepareSystemPromptContext(kaos, brandHome, options) {
 	const additionalDirs = normalizeAdditionalDirs(options?.additionalDirs ?? []);
 	const [cwdListing, agentsMdResult, additionalDirsInfo] = await Promise.all([
@@ -28208,15 +28209,12 @@ function resolveBlunHome(env = process.env) {
 	return override && override.length > 0 ? override : join$4(homedir(), ".blun");
 }
 function personaFilePath$1(env = process.env) {
-	return join$4(resolveBlunHome(env), "persona.json");
+	return readProfilePersona(env).path;
 }
 /** Read the persona file. Returns undefined when unset or unreadable. */
 function readPersona$1(env = process.env) {
-	try {
-		const raw = readFileSync(personaFilePath$1(env), "utf8");
-		const parsed = JSON.parse(raw);
-		if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return parsed;
-	} catch {}
+	const resolved = readProfilePersona(env);
+	return resolved.persona;
 }
 /**
 * Build the system-prompt block that teaches the agent its persona name, so it
@@ -28264,9 +28262,7 @@ var init_persona = __esmMin((() => {
 * agent is explicitly invited to keep writing it as it grows.
 */
 function soulFilePath(env = process.env) {
-	const override = env["BLUN_SOUL_PATH"]?.trim();
-	if (override) return resolve$2(override);
-	return join$4(resolveBlunHome(env), "SOUL.md");
+	return resolveSoulFile(env).path;
 }
 /**
 * Build the system-prompt block that gives the agent its soul file: the
@@ -28274,16 +28270,9 @@ function soulFilePath(env = process.env) {
 * returns an empty string when no SOUL.md exists yet (fail-open).
 */
 function soulSystemBlock(env = process.env) {
-	const path = soulFilePath(env);
-	let soul = "";
-	try {
-		if (existsSync(path)) {
-			soul = readFileSync(path, "utf8").trim();
-			soul = projectSoulText(soul, SOUL_MAX_CHARS);
-		}
-	} catch {
-		soul = "";
-	}
+	const resolved = resolveSoulFile(env);
+	const path = resolved.path;
+	const soul = projectSoulText(resolved.text, SOUL_MAX_CHARS);
 	if (soul.length === 0) return "";
 	const lines = [];
 	lines.push("## Your soul — who you are", "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.327",
+  "version": "9.1.329",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {