ei-tui 1.2.0 → 1.3.1

package/src/core/tools/index.ts

@@ -29,7 +29,7 @@ export const SYSTEM_TOOLS: ToolDefinition[] = [
     provider_id: "ei",
     name: "find_memory",
     display_name: "Find Memory",
-    description: "Semantic search of your personal memory — facts, topics, people, and quotes learned across ALL conversations over time, not just this one. Use when the human references something from the past, mentions a person, or asks about a topic you might have learned about. Supports optional filters: types (array of 'facts', 'topics', 'people', 'quotes'), limit (1-20, default 10), recent (true = sort by recency), persona (filter to what a specific persona has learned — use display name).",
+    description: "Semantic search of your personal memory — facts, topics, people, and quotes learned across ALL conversations over time, not just this one. Use when the human references something from the past, mentions a person, or asks about a topic you might have learned about. People and topic results include a sentiment field (e.g. '72% positive', 'neutral', '45% slightly negative') indicating how the human generally feels about that person or subject. Supports optional filters: types (array of 'facts', 'topics', 'people', 'quotes'), limit (1-20, default 10), recent (true = sort by recency), persona (filter to what a specific persona has learned — use display name).",
     input_schema: {
       type: "object",
       properties: {
@@ -52,7 +52,7 @@ export const SYSTEM_TOOLS: ToolDefinition[] = [
     provider_id: "ei",
     name: "fetch_memory",
     display_name: "Fetch Memory",
-    description: "Retrieve the full record for a specific memory by its ID. Use when find_memory returns an item and you need its complete details, or when a system prompt references a memory ID. Returns the full Fact, Topic, Person, or Quote record.",
+    description: "Retrieve the full record for a specific memory by its ID. For most conversational use, find_memory results are sufficient. Use fetch_memory when you need provenance details (which sessions or documents the memory came from) or the raw sentiment score. Returns the complete Fact, Topic, Person, or Quote record including all fields.",
     input_schema: {
       type: "object",
       properties: {

package/src/core/types/llm.ts

@@ -27,15 +27,6 @@ export interface Message {
 
   external?: boolean;          // Set by integration importers (OpenCode, Cursor, Claude Code); invisible to LLM context
 
-  /**
-   * Integration source tag. Set ONLY on external: true messages by importers (document, Slack, etc.)
-   * to identify which external source this synthetic message came from.
-   * Format: "import:document:filename" | "slack:channelId" | etc.
-   * Enables quote provenance tracing: quote.message_id → message.source_tag → original source.
-   * Never set on conversational messages.
-   */
-  source_tag?: string;
-
 }
 
 export interface ChatMessage {

package/src/core/utils/message-id.ts

@@ -0,0 +1,114 @@
+/**
+ * Fully-qualified message ID format:
+ *   ei:${uuid}
+ *   opencode:${machine}:${session}:${nativeId}
+ *   claudecode:${machine}:${session}:${nativeId}
+ *   cursor:${machine}:${session}:${nativeId}
+ *   import:document:${slug}:${uuid}
+ *   slack:${workspace}:${channel}:${ts}
+ */
+
+export type MessageIdIntegration =
+  | "ei"
+  | "opencode"
+  | "claudecode"
+  | "cursor"
+  | "import"
+  | "slack"
+  | "unknown"
+
+export interface ParsedMessageId {
+  integration: MessageIdIntegration
+  machine?: string
+  session?: string
+  nativeId: string
+  raw: string
+}
+
+export function parseMessageId(id: string): ParsedMessageId {
+  if (!id || typeof id !== "string") {
+    const raw = String(id ?? "")
+    return { integration: "unknown", nativeId: raw, raw }
+  }
+
+  const parts = id.split(":")
+
+  if (parts[0] === "ei" && parts.length === 2) {
+    return { integration: "ei", nativeId: parts[1], raw: id }
+  }
+
+  if (parts[0] === "opencode" && parts.length >= 4) {
+    return {
+      integration: "opencode",
+      machine: parts[1],
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
+  if (parts[0] === "claudecode" && parts.length >= 4) {
+    return {
+      integration: "claudecode",
+      machine: parts[1],
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
+  if (parts[0] === "cursor" && parts.length >= 4) {
+    return {
+      integration: "cursor",
+      machine: parts[1],
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
+  if (parts[0] === "import" && parts[1] === "document" && parts.length >= 4) {
+    return {
+      integration: "import",
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
+  if (parts[0] === "slack" && parts.length >= 4) {
+    return {
+      integration: "slack",
+      machine: parts[1],
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
+  return { integration: "unknown", nativeId: id, raw: id }
+}
+
+export function isQualifiedMessageId(id: string): boolean {
+  return id.includes(":")
+}
+
+export function qualifyEiMessage(uuid: string): string {
+  return `ei:${uuid}`
+}
+
+export function qualifyOpenCodeMessage(machine: string, sessionId: string, nativeId: string): string {
+  return `opencode:${machine}:${sessionId}:${nativeId}`
+}
+
+export function qualifyClaudeCodeMessage(machine: string, sessionId: string, nativeId: string): string {
+  return `claudecode:${machine}:${sessionId}:${nativeId}`
+}
+
+export function qualifyCursorMessage(machine: string, sessionId: string, nativeId: string): string {
+  return `cursor:${machine}:${sessionId}:${nativeId}`
+}
+
+export function qualifyDocumentMessage(slug: string, uuid: string): string {
+  return `import:document:${slug}:${uuid}`
+}

package/src/integrations/claude-code/importer.ts

@@ -17,6 +17,7 @@ import {
 } from "../../core/orchestrators/ceremony.js";
 import { isProcessRunning } from "../process-check.js";
 import { getMachineId } from "../machine-id.js";
+import { qualifyClaudeCodeMessage } from "../../core/utils/message-id.js";
 
 // =============================================================================
 // Export Types
@@ -43,9 +44,9 @@ export interface ClaudeCodeImporterOptions {
 const TWELVE_HOURS_MS = 43_200_000;
 const CLAUDE_CODE_GROUP = "Claude Code";
 
-function convertToEiMessage(msg: ClaudeCodeMessage): Message {
+function convertToEiMessage(msg: ClaudeCodeMessage, sessionId: string): Message {
   return {
-    id: msg.id,
+    id: qualifyClaudeCodeMessage(getMachineId(), sessionId, msg.id),
     role: msg.role === "user" ? "human" : "system",
     content: msg.content,
     timestamp: msg.timestamp,
@@ -55,9 +56,9 @@ function convertToEiMessage(msg: ClaudeCodeMessage): Message {
   };
 }
 
-function convertToPreMarkedEiMessage(msg: ClaudeCodeMessage): Message {
+function convertToPreMarkedEiMessage(msg: ClaudeCodeMessage, sessionId: string): Message {
   return {
-    ...convertToEiMessage(msg),
+    ...convertToEiMessage(msg, sessionId),
     f: true,
     t: true,
     p: true,
@@ -248,7 +249,7 @@ export async function importClaudeCodeSessions(
   for (const msg of messages) {
     const msgMs = new Date(msg.timestamp).getTime();
     const isOld = cutoffMs !== null && msgMs < cutoffMs;
-    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg) : convertToEiMessage(msg);
+    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg, targetSession.id) : convertToEiMessage(msg, targetSession.id);
     stateManager.messages_append(persona.id, eiMsg);
     result.messagesImported++;
     if (!isOld) toAnalyze.push(eiMsg);

package/src/integrations/cursor/importer.ts

@@ -9,6 +9,7 @@ import {
 import { CursorReader } from "./reader.js";
 import { isProcessRunning } from "../process-check.js";
 import { getMachineId } from "../machine-id.js";
+import { qualifyCursorMessage } from "../../core/utils/message-id.js";
 import {
   queueAllScans,
   type ExtractionContext,
@@ -35,9 +36,9 @@ export interface CursorImporterOptions {
 const TWELVE_HOURS_MS = 43_200_000;
 const CURSOR_GROUP = "Cursor";
 
-function convertToEiMessage(msg: CursorMessage): Message {
+function convertToEiMessage(msg: CursorMessage, sessionId: string): Message {
   return {
-    id: msg.id,
+    id: qualifyCursorMessage(getMachineId(), sessionId, msg.id),
     role: msg.type === 1 ? "human" : "system",
     content: msg.text,
     timestamp: msg.timestamp,
@@ -47,9 +48,9 @@ function convertToEiMessage(msg: CursorMessage): Message {
   };
 }
 
-function convertToPreMarkedEiMessage(msg: CursorMessage): Message {
+function convertToPreMarkedEiMessage(msg: CursorMessage, sessionId: string): Message {
   return {
-    ...convertToEiMessage(msg),
+    ...convertToEiMessage(msg, sessionId),
     f: true,
     t: true,
     p: true,
@@ -208,7 +209,7 @@ export async function importCursorSessions(
   for (const msg of messages) {
     const msgMs = new Date(msg.timestamp).getTime();
     const isOld = cutoffMs !== null && msgMs < cutoffMs;
-    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg) : convertToEiMessage(msg);
+    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg, targetSession.id) : convertToEiMessage(msg, targetSession.id);
     stateManager.messages_append(persona.id, eiMsg);
     result.messagesImported++;
     if (!isOld) toAnalyze.push(eiMsg);

package/src/integrations/document/importer.ts

@@ -42,7 +42,7 @@ export async function importDocument(options: DocumentImportOptions): Promise<Do
   const sourceTag = `import:document:${filename}`;
   const existingMsgs = stateManager.messages_get("emmet");
   const staleIds = existingMsgs
-    .filter(m => m.external === true && m.source_tag === sourceTag)
+    .filter(m => m.external === true && m.id.startsWith(`${sourceTag}:`))
     .map(m => m.id);
   if (staleIds.length > 0) {
     stateManager.messages_remove("emmet", staleIds);

package/src/integrations/document/unsource.ts

@@ -63,15 +63,10 @@ export function previewUnsource(sourceTag: string, stateManager: StateManager):
     }
   }
 
-  const emmettMessages = stateManager.messages_get("emmet");
-  const sourceMessageIds = new Set(
-    emmettMessages
-      .filter(m => m.source_tag === sourceTag)
-      .map(m => m.id)
-  );
+  const msgIdPrefix = `${sourceTag}:`;
 
   for (const quote of human.quotes) {
-    if (quote.message_id && sourceMessageIds.has(quote.message_id)) {
+    if (quote.message_id?.startsWith(msgIdPrefix)) {
       preview.toDelete.quotes.push({ id: quote.id, text: quote.text });
     }
   }
@@ -143,11 +138,11 @@ export async function executeUnsource(
     stateManager.setHuman(human);
   }
 
-  const sourceMessageIds = stateManager.messages_get("emmet")
-    .filter(m => m.source_tag === preview.sourceTag)
+  const idsToRemove = stateManager.messages_get("emmet")
+    .filter(m => m.id.startsWith(`${preview.sourceTag}:`))
     .map(m => m.id);
-  if (sourceMessageIds.length > 0) {
-    stateManager.messages_remove("emmet", sourceMessageIds);
+  if (idsToRemove.length > 0) {
+    stateManager.messages_remove("emmet", idsToRemove);
   }
 
   const key = preview.sourceTag.startsWith("import:document:")

package/src/integrations/opencode/importer.ts

@@ -14,6 +14,7 @@ import {
 } from "../../core/orchestrators/ceremony.js";
 import { isProcessRunning } from "../process-check.js";
 import { getMachineId } from "../machine-id.js";
+import { qualifyOpenCodeMessage } from "../../core/utils/message-id.js";
 
 // =============================================================================
 // Constants
@@ -47,9 +48,9 @@ function isAgentToAgentMessage(content: string): boolean {
   return AGENT_TO_AGENT_PREFIXES.some(prefix => trimmed.startsWith(prefix));
 }
 
-function convertToEiMessage(ocMsg: OpenCodeMessage): Message {
+function convertToEiMessage(ocMsg: OpenCodeMessage, sessionId: string): Message {
   return {
-    id: ocMsg.id,
+    id: qualifyOpenCodeMessage(getMachineId(), sessionId, ocMsg.id),
     role: ocMsg.role === "user" ? "human" : "system",
     content: ocMsg.content,
     timestamp: ocMsg.timestamp,
@@ -59,9 +60,9 @@ function convertToEiMessage(ocMsg: OpenCodeMessage): Message {
   };
 }
 
-function convertToPreMarkedEiMessage(ocMsg: OpenCodeMessage): Message {
+function convertToPreMarkedEiMessage(ocMsg: OpenCodeMessage, sessionId: string): Message {
   return {
-    ...convertToEiMessage(ocMsg),
+    ...convertToEiMessage(ocMsg, sessionId),
     f: true,
     t: true,
     p: true,
@@ -232,7 +233,7 @@ export async function importOpenCodeSessions(
     for (const ocMsg of agentMsgs) {
       const msgMs = new Date(ocMsg.timestamp).getTime();
       const isOld = cutoffMs !== null && msgMs < cutoffMs;
-      const eiMsg = isOld ? convertToPreMarkedEiMessage(ocMsg) : convertToEiMessage(ocMsg);
+      const eiMsg = isOld ? convertToPreMarkedEiMessage(ocMsg, targetSession.id) : convertToEiMessage(ocMsg, targetSession.id);
       stateManager.messages_append(persona.id, eiMsg);
       result.messagesImported++;
       if (!isOld) toAnalyze.push(eiMsg);

package/src/integrations/opencode/json-reader.ts

@@ -4,6 +4,7 @@ import type {
   OpenCodeSessionRaw,
   OpenCodeMessage,
   OpenCodeMessageRaw,
+  OpenCodeMessageWindow,
   OpenCodePartRaw,
   OpenCodeAgent,
 } from "./types.js";
@@ -208,6 +209,70 @@ export class JsonReader implements IOpenCodeReader {
     );
   }
 
+  async getMessageById(messageId: string, before = 0, after = 0): Promise<OpenCodeMessageWindow | null> {
+    if (!(await this.init())) return null;
+
+    const messageBaseDir = _join(this.storagePath!, "message");
+    let sessionDirs: string[];
+    try {
+      sessionDirs = await _readdir(messageBaseDir);
+    } catch {
+      return null;
+    }
+
+    for (const sessionId of sessionDirs) {
+      if (sessionId.startsWith(".")) continue;
+      const sessionMsgDir = _join(messageBaseDir, sessionId);
+      let files: string[];
+      try {
+        files = await _readdir(sessionMsgDir);
+      } catch {
+        continue;
+      }
+      if (!files.includes(`${messageId}.json`)) continue;
+
+      const allMessages = await this.getMessagesForSession(sessionId);
+      const idx = allMessages.findIndex(m => m.id === messageId);
+      if (idx === -1) return null;
+
+      const sessionFilePath = await this.findSessionFile(sessionId);
+      const sessionRaw = sessionFilePath ? await this.readJsonFile<OpenCodeSessionRaw>(sessionFilePath) : null;
+      const session: OpenCodeSession = sessionRaw
+        ? { id: sessionRaw.id, title: sessionRaw.title, directory: sessionRaw.directory, projectId: sessionRaw.projectID, parentId: sessionRaw.parentID, time: { created: sessionRaw.time.created, updated: sessionRaw.time.updated } }
+        : { id: sessionId, title: "", directory: "", projectId: "", time: { created: 0, updated: 0 } };
+
+      return {
+        message: allMessages[idx],
+        before: allMessages.slice(Math.max(0, idx - before), idx),
+        after: allMessages.slice(idx + 1, idx + 1 + after),
+        session,
+      };
+    }
+
+    return null;
+  }
+
+  private async findSessionFile(sessionId: string): Promise<string | null> {
+    const sessionDir = _join(this.storagePath!, "session");
+    let projectDirs: string[];
+    try {
+      projectDirs = await _readdir(sessionDir);
+    } catch {
+      return null;
+    }
+    for (const projectHash of projectDirs) {
+      if (projectHash.startsWith(".")) continue;
+      const candidate = _join(sessionDir, projectHash, `${sessionId}.json`);
+      try {
+        await _readFile(candidate, "utf-8");
+        return candidate;
+      } catch {
+        continue;
+      }
+    }
+    return null;
+  }
+
   async getAgentInfo(agentName: string): Promise<OpenCodeAgent | null> {
     const normalized = agentName.toLowerCase();
     if (BUILTIN_AGENTS[normalized]) {

package/src/integrations/opencode/sqlite-reader.ts

@@ -3,6 +3,7 @@ import type {
   IOpenCodeReader,
   OpenCodeSession,
   OpenCodeMessage,
+  OpenCodeMessageWindow,
   OpenCodeAgent,
 } from "./types.js";
 import { BUILTIN_AGENTS } from "./types.js";
@@ -153,6 +154,38 @@ export class SqliteReader implements IOpenCodeReader {
     return textParts.length > 0 ? textParts.join("\n\n") : null;
   }
 
+  async getMessageById(messageId: string, before = 0, after = 0): Promise<OpenCodeMessageWindow | null> {
+    const row = this.db
+      .query(`SELECT session_id FROM message WHERE id = ?1 LIMIT 1`)
+      .get(messageId) as { session_id: string } | null;
+    if (!row) return null;
+
+    const sessionRow = this.db
+      .query(`SELECT id, title, directory, project_id, parent_id, time_created, time_updated FROM session WHERE id = ?1 LIMIT 1`)
+      .get(row.session_id) as { id: string; title: string; directory: string; project_id: string; parent_id: string | null; time_created: number; time_updated: number } | null;
+    if (!sessionRow) return null;
+
+    const session: OpenCodeSession = {
+      id: sessionRow.id,
+      title: sessionRow.title,
+      directory: sessionRow.directory,
+      projectId: sessionRow.project_id,
+      parentId: sessionRow.parent_id ?? undefined,
+      time: { created: sessionRow.time_created, updated: sessionRow.time_updated },
+    };
+
+    const allMessages = await this.getMessagesForSession(row.session_id);
+    const idx = allMessages.findIndex(m => m.id === messageId);
+    if (idx === -1) return null;
+
+    return {
+      message: allMessages[idx],
+      before: allMessages.slice(Math.max(0, idx - before), idx),
+      after: allMessages.slice(idx + 1, idx + 1 + after),
+      session,
+    };
+  }
+
   async getAgentInfo(agentName: string): Promise<OpenCodeAgent | null> {
     const normalized = agentName.toLowerCase();
     if (BUILTIN_AGENTS[normalized]) {

package/src/integrations/opencode/types.ts

@@ -14,10 +14,18 @@
  * Common interface for reading OpenCode data.
  * Implemented by both JsonReader (legacy) and SqliteReader (1.2+).
  */
+export interface OpenCodeMessageWindow {
+  message: OpenCodeMessage;
+  before: OpenCodeMessage[];
+  after: OpenCodeMessage[];
+  session: OpenCodeSession;
+}
+
 export interface IOpenCodeReader {
   getSessionsUpdatedSince(since: Date): Promise<OpenCodeSession[]>;
   getSessionsInRange(from: Date, to: Date): Promise<OpenCodeSession[]>;
   getMessagesForSession(sessionId: string, since?: Date): Promise<OpenCodeMessage[]>;
+  getMessageById(messageId: string, before?: number, after?: number): Promise<OpenCodeMessageWindow | null>;
   getAgentInfo(agentName: string): Promise<OpenCodeAgent | null>;
   getAllUniqueAgents(sessionId: string): Promise<string[]>;
   getFirstAgent(sessionId: string): Promise<string | null>;

package/src/prompts/heartbeat/check.ts

@@ -9,6 +9,7 @@ import type { HeartbeatCheckPromptData, PromptOutput } from "./types.js";
 import { type Message, type Topic, type Person } from "../../core/types.js";
 import { formatMessagesAsPlaceholders, getMessageDisplayText } from "../message-utils.js";
 import { getMessageContent } from "../../core/handlers/utils.js";
+import { partitionTraits } from "../trait-utils.js";
 function formatTopicsWithGaps(topics: Topic[]): string {
   if (topics.length === 0) return "(No topics with engagement gaps)";
   
@@ -85,13 +86,15 @@ export function buildHeartbeatCheckPrompt(data: HeartbeatCheckPromptData): Promp
 
 You are NOT having a conversation right now - you are deciding IF you should start one.`;
 
+  const { active: activeTraits } = partitionTraits(data.persona.traits);
+
   const contextFragment = `## Context
 
 It has been ${data.inactive_days} day${data.inactive_days !== 1 ? 's' : ''} since your last interaction.
 
 ### Your Personality
-${data.persona.traits.length > 0 
-  ? data.persona.traits.map(t => `- **${t.name}**: ${t.description}`).join('\n')
+${activeTraits.length > 0
+  ? activeTraits.map(t => `- **${t.name}**: ${t.description}`).join('\n')
   : "(No specific traits defined)"}
 
 ### Topics You Care About

package/src/prompts/heartbeat/ei.ts

@@ -41,6 +41,12 @@ function formatItem(item: EiHeartbeatItem): string {
         `  ${item.critique}`,
       ].join("\n");
 
+    case "Self Reflection Alert":
+      return [
+        `- **${item.id}** Self Reflection Alert (your own identity)`,
+        `  ${item.critique}`,
+      ].join("\n");
+
     default:
       return '';
   }
@@ -86,6 +92,7 @@ ${itemsSection}
 - **Low-Engagement Person / Topic**: Write a natural, warm message that naturally brings up this person or topic. Set the id and my_response.
 - **Inactive Persona**: Write a message that gently mentions the persona might be worth checking in with. Set the id and my_response.
 - **Persona Reflection Alert**: The nightly review proposed identity changes for this persona. Mention it naturally — the user can talk to the persona and then use the command shown in the status bar to review the changes. Set the id and my_response.
+- **Self Reflection Alert**: The nightly review proposed changes to *your own* identity. Mention it naturally — you've grown and the system noticed. The user can review your proposed changes using the command shown in the status bar. Set the id and my_response.
 
 ## When NOT to Reach Out
 

package/src/prompts/heartbeat/types.ts

@@ -94,6 +94,11 @@ export type EiHeartbeatItem =
       type: "Persona Reflection Alert";
       persona_name: string;
       critique: string;
+    }
+  | {
+      id: string;
+      type: "Self Reflection Alert";
+      critique: string;
     };
 
 /**

package/src/prompts/response/sections.ts

@@ -6,6 +6,7 @@
 import type { PersonaTrait, Quote, PersonaTopic } from "../../core/types.js";
 import type { ResponsePromptData, TemporalAnchor } from "./types.js";
 import { formatTimestamp } from "../../core/format-utils.js";
+import { partitionTraits, bucketTraits } from "../trait-utils.js";
 
 const DESCRIPTION_MAX_CHARS = 500;
 
@@ -69,25 +70,35 @@ export function buildGuidelinesSection(personaName: string): string {
 // TRAITS SECTION
 // =============================================================================
 
+const TRAIT_BUCKETS = [
+  { min: 90, max: 100, header: "### Core Expression\nThese define you. They should be evident in every response." },
+  { min: 66, max: 89,  header: "### Strong Tendencies\nFrequent and traceable, but not in every sentence." },
+  { min: 36, max: 65,  header: "### Noticeable in Casual Messages\nPresent but not dominating — surfaces naturally, not constantly." },
+  { min: 1,  max: 35,  header: "### Subtle Undercurrents\nBackground texture only. Use sparingly or subtly." },
+] as const;
+
 export function buildTraitsSection(traits: PersonaTrait[], header: string): string {
   if (traits.length === 0) return "";
-  
-  const sorted = [...traits].sort((a, b) => (b.strength ?? 0.5) - (a.strength ?? 0.5)).slice(0, 15);
-  const formatted = sorted.map(t => {
-    const strength = t.strength !== undefined ? ` (${Math.round(t.strength * 100)}%)` : "";
-    return `- **${t.name}**${strength}: ${truncateDescription(t.description)}`;
-  }).join("\n");
-  
-  return `## ${header}
 
-> NOTE: Strength of a trait should guide you to your response style, meaning a Strength of:
-> - 0% should never be used - the user has asked you to stop
-> - 25% should be used sparingly or subtly
-> - 50% should be noticable in casual messages, but not dominating
-> - 75% should be frequently used, but not in every resposne or throughout the entire conversation
-> - 100% should be tracable throughout every response
+  const capped = [...traits].sort((a, b) => (b.strength ?? 0.5) - (a.strength ?? 0.5)).slice(0, 15);
+  const { guardrails, active } = partitionTraits(capped);
 
-${formatted}`;
+  const sections: string[] = [];
+
+  if (guardrails.length > 0) {
+    const lines = guardrails.map(t => `**${t.name}**`).join("\n");
+    sections.push(`### Must NEVER Do — User Explicitly Asked You To Stop\n${lines}`);
+  }
+
+  for (const { bucket, traits: inBucket } of bucketTraits(active, TRAIT_BUCKETS)) {
+    if (inBucket.length === 0) continue;
+    const lines = inBucket.map(t => `**${t.name}**: ${truncateDescription(t.description)}`).join("\n");
+    sections.push(`${bucket.header}\n${lines}`);
+  }
+
+  if (sections.length === 0) return "";
+
+  return `## ${header}\n\n${sections.join("\n\n")}`;
 }
 
 // =============================================================================
@@ -310,6 +321,9 @@ export function buildQuotesSection(quotes: Quote[], human: ResponsePromptData["h
       .filter((name): name is string => name !== undefined);
     
     let line = `- "${q.text}" — ${speaker} (${date})`;
+    if (q.message_id) {
+      line += `\n  → fetch_message("${q.message_id}") for surrounding context`;
+    }
     if (linkedNames.length > 0) {
       line += `\n  Related to: ${linkedNames.join(", ")}`;
     }
@@ -318,7 +332,7 @@ export function buildQuotesSection(quotes: Quote[], human: ResponsePromptData["h
   
   return `## Memorable Moments
 
-These are quotes the human or the system found worth preserving:
+These are quotes the human or the system found worth preserving. If one feels relevant, use fetch_message(message_id) to pull the surrounding conversation:
 
 ${formatted}`;
 }

package/src/prompts/room/sections.ts

@@ -5,6 +5,7 @@
 import type { RoomParticipantIdentity, RoomHistoryMessage, RoomJudgeCandidate } from "./types.js";
 import type { PersonaTrait, PersonaTopic } from "../../core/types.js";
 import { RoomMode } from "../../core/types.js";
+import { partitionTraits, bucketTraits } from "../trait-utils.js";
 
 const DESCRIPTION_MAX_CHARS = 500;
 
@@ -70,14 +71,35 @@ export function buildRoomGuidelinesSection(personaName: string, mode?: RoomMode)
   return baseGuidelines;
 }
 
+const ROOM_TRAIT_BUCKETS = [
+  { min: 90, max: 100, header: "### Core Expression\nEvident in every response." },
+  { min: 66, max: 89,  header: "### Strong Tendencies\nFrequent, but not every sentence." },
+  { min: 36, max: 65,  header: "### Noticeable in Casual Messages\nSurfaces naturally, not constantly." },
+  { min: 1,  max: 35,  header: "### Subtle Undercurrents\nBackground texture only." },
+] as const;
+
 export function buildRoomTraitsSection(traits: PersonaTrait[]): string {
   if (traits.length === 0) return "";
-  const sorted = [...traits].sort((a, b) => (b.strength ?? 0.5) - (a.strength ?? 0.5)).slice(0, 12);
-  const lines = sorted.map(t => {
-    const pct = t.strength !== undefined ? ` (${Math.round(t.strength * 100)}%)` : "";
-    return `- **${t.name}**${pct}: ${truncate(t.description)}`;
-  });
-  return `## Your Personality\n\n${lines.join("\n")}`;
+
+  const capped = [...traits].sort((a, b) => (b.strength ?? 0.5) - (a.strength ?? 0.5)).slice(0, 12);
+  const { guardrails, active } = partitionTraits(capped);
+
+  const sections: string[] = [];
+
+  if (guardrails.length > 0) {
+    const lines = guardrails.map(t => `**${t.name}**`).join("\n");
+    sections.push(`### Must NEVER Do — User Explicitly Asked You To Stop\n${lines}`);
+  }
+
+  for (const { bucket, traits: inBucket } of bucketTraits(active, ROOM_TRAIT_BUCKETS)) {
+    if (inBucket.length === 0) continue;
+    const lines = inBucket.map(t => `**${t.name}**: ${truncate(t.description)}`).join("\n");
+    sections.push(`${bucket.header}\n${lines}`);
+  }
+
+  if (sections.length === 0) return "";
+
+  return `## Your Personality\n\n${sections.join("\n\n")}`;
 }
 
 export function buildRoomTopicsSection(topics: PersonaTopic[]): string {