ei-tui 0.6.4 → 0.6.6

package/tui/src/util/yaml-human.ts

@@ -51,6 +51,19 @@ function readOnlyToEnd<T extends WithReadOnlyFields>(item: T): T {
   return { ...rest, learned_on, learned_by, validated_date, last_mentioned, last_updated, last_changed_by } as T;
 }
 
+const FIELD_ORDER = ['id', 'name', 'description', 'sentiment', 'relationship', 'category', 'exposure_current', 'exposure_desired'];
+
+function canonicalFieldOrder<T extends object>(item: T): T {
+  const ordered: Record<string, unknown> = {};
+  for (const key of FIELD_ORDER) {
+    if (key in item) ordered[key] = (item as Record<string, unknown>)[key];
+  }
+  for (const [key, val] of Object.entries(item)) {
+    if (!(key in ordered)) ordered[key] = val;
+  }
+  return ordered as T;
+}
+
 function buildGroupCheckboxMap(itemGroups: string[], allGroups: string[]): Record<string, boolean>[] {
   const activeSet = new Set(itemGroups);
   return [...new Set([...allGroups, ...itemGroups])].map(g => ({ [g]: activeSet.has(g) }));
@@ -65,8 +78,10 @@ function toYAMLIdentifiers(identifiers: PersonIdentifier[], personaLookup?: Map<
   });
 }
 
-function knownTypesComment(personaLookup?: Map<string, string>): string {
-  const lines = [`# Valid types: ${BUILT_IN_IDENTIFIER_TYPES.join(', ')}`];
+function knownTypesComment(people: Person[], personaLookup?: Map<string, string>): string {
+  const userTypes = people.flatMap(p => (p.identifiers ?? []).map(i => i.type));
+  const allTypes = [...new Set([...BUILT_IN_IDENTIFIER_TYPES, ...userTypes])];
+  const lines = [`# Valid types: ${allTypes.join(', ')}`];
   if (personaLookup && personaLookup.size > 0) {
     lines.push(`# Personas: ${Array.from(personaLookup.values()).join(', ')}`);
   }
@@ -84,11 +99,68 @@ function parseGroupCheckboxMap(groups: Record<string, boolean>[] | undefined): s
   return result;
 }
 
-export function humanToYAML(human: HumanEntity, personaLookup?: Map<string, string>, allGroups: string[] = []): string {
-  const data: EditableHumanData = {
-    facts: human.facts.map(f => { const { interested_personas: _ip, persona_groups, ...rest } = readOnlyToEnd(f); return { ...rest, persona_groups: buildGroupCheckboxMap(persona_groups ?? [], allGroups), _delete: false }; }),
-    topics: human.topics.map(t => { const { interested_personas: _ip, persona_groups, ...rest } = readOnlyToEnd(t); return { ...rest, persona_groups: buildGroupCheckboxMap(persona_groups ?? [], allGroups), _delete: false }; }),
-    people: human.people.map(p => {
+function sectionStub(type: "facts" | "topics" | "people", people: Person[], personaLookup?: Map<string, string>): string {
+  if (type === "facts") {
+    return [
+      `  # --- New Fact (uncomment to create) ---`,
+      `  # - name: ''`,
+      `  #   description: ''`,
+      `  #   sentiment: 0`,
+    ].join('\n');
+  }
+
+  if (type === "topics") {
+    return [
+      `  # --- New Topic (uncomment to create) ---`,
+      `  # - name: ''`,
+      `  #   description: ''`,
+      `  #   category: ''  # Interest, Goal, Dream, Conflict, Concern, Fear, Hope, Plan, Project`,
+      `  #   exposure_desired: 0.5`,
+      `  #   sentiment: 0`,
+    ].join('\n');
+  }
+
+  const userTypes = people.flatMap(p => (p.identifiers ?? []).map(i => i.type));
+  const allTypes = [...new Set([...BUILT_IN_IDENTIFIER_TYPES, ...userTypes])];
+  const identifierTypeHint = allTypes.join(', ');
+  const personaNames = personaLookup && personaLookup.size > 0
+    ? Array.from(personaLookup.values()).join(', ')
+    : null;
+
+  return [
+    `  # --- New Person (uncomment to create) ---`,
+    `  # - name: ''`,
+    `  #   description: ''`,
+    `  #   relationship: ''`,
+    `  #   exposure_desired: 0.5`,
+    `  #   sentiment: 0`,
+    `  #   identifiers:`,
+    `  #     # Valid types: ${identifierTypeHint}`,
+    ...(personaNames ? [`  #     # Personas: ${personaNames}`] : []),
+    `  #     - type: ''`,
+    `  #       value: ''`,
+    `  #       primary: true`,
+  ].join('\n');
+}
+
+export function humanToYAML(
+  human: HumanEntity,
+  personaLookup?: Map<string, string>,
+  allGroups: string[] = [],
+  sections?: Set<"facts" | "topics" | "people">,
+): string {
+  const activeSections = sections ?? new Set<"facts" | "topics" | "people">(["facts", "topics", "people"]);
+
+  const data: Partial<EditableHumanData> = {};
+
+  if (activeSections.has("facts") && human.facts.length > 0) {
+    data.facts = human.facts.map(f => { const { interested_personas: _ip, persona_groups, ...rest } = readOnlyToEnd(f); return { ...rest, persona_groups: buildGroupCheckboxMap(persona_groups ?? [], allGroups), _delete: false }; });
+  }
+  if (activeSections.has("topics") && human.topics.length > 0) {
+    data.topics = human.topics.map(t => { const { interested_personas: _ip, persona_groups, ...rest } = readOnlyToEnd(t); return { ...rest, persona_groups: buildGroupCheckboxMap(persona_groups ?? [], allGroups), _delete: false }; });
+  }
+  if (activeSections.has("people") && human.people.length > 0) {
+    data.people = human.people.map(p => {
       const { identifiers, interested_personas: _ip, persona_groups, ...rest } = readOnlyToEnd(p);
       return {
         ...rest,
@@ -96,31 +168,51 @@ export function humanToYAML(human: HumanEntity, personaLookup?: Map<string, stri
         identifiers: toYAMLIdentifiers(identifiers ?? [], personaLookup),
         _delete: false as const,
       };
-    }),
+    });
+  }
+
+  const personComment = knownTypesComment(human.people, personaLookup);
+
+  const applyReadOnlyMarkers = (yaml: string): string =>
+    yaml
+      .replace(/^(\s+)(learned_on: .+)$/mg, '$1# [read-only] $2')
+      .replace(/^(\s+)(learned_by: )(.+)$/mg, (_, indent, key, val) => {
+        const trimmed = val.trim();
+        const displayName = personaLookup?.get(trimmed) ?? trimmed;
+        return `${indent}# [read-only] ${key}${displayName}`;
+      })
+      .replace(/^(\s+)(validated_date: .+)$/mg, '$1# [read-only] $2')
+      .replace(/^(\s+)(last_mentioned: .+)$/mg, '$1# [read-only] $2')
+      .replace(/^(\s+)(last_updated: .+)$/mg, '$1# [read-only] $2')
+      .replace(/^(\s+)(last_changed_by: )(.+)$/mg, (_, indent, key, val) => {
+        const trimmed = val.trim();
+        const displayName = personaLookup?.get(trimmed) ?? trimmed;
+        return `${indent}# [read-only] ${key}${displayName}`;
+      })
+      .replace(/^(\s+)(identifiers:)/mg, (_, indent, _key) => {
+        return `${indent}${personComment}\n${indent}identifiers:`;
+      });
+
+  const serializeSection = (key: "facts" | "topics" | "people", items: unknown[] | undefined): string => {
+    const stub = sectionStub(key, human.people, personaLookup);
+    if (!items || items.length === 0) {
+      return `${key}:\n${stub}`;
+    }
+    const ordered = (items as object[]).map(canonicalFieldOrder);
+    const itemsYaml = YAML.stringify(ordered, { lineWidth: 0 })
+      .split('\n')
+      .map(line => `  ${line}`)
+      .join('\n')
+      .trimEnd();
+    return `${key}:\n${applyReadOnlyMarkers(itemsYaml)}\n${stub}`;
   };
 
-  const personComment = knownTypesComment(personaLookup);
-
-  return YAML.stringify(data, {
-    lineWidth: 0,
-  })
-  .replace(/^(\s+)(learned_on: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(learned_by: )(.+)$/mg, (_, indent, key, val) => {
-    const trimmed = val.trim();
-    const displayName = personaLookup?.get(trimmed) ?? trimmed;
-    return `${indent}# [read-only] ${key}${displayName}`;
-  })
-  .replace(/^(\s+)(validated_date: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(last_mentioned: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(last_updated: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(last_changed_by: )(.+)$/mg, (_, indent, key, val) => {
-    const trimmed = val.trim();
-    const displayName = personaLookup?.get(trimmed) ?? trimmed;
-    return `${indent}# [read-only] ${key}${displayName}`;
-  })
-  .replace(/^(\s+)(identifiers:)/mg, (_, indent, _key) => {
-    return `${indent}${personComment}\n${indent}identifiers:`;
-  });
+  const parts: string[] = [];
+  if (activeSections.has("facts")) parts.push(serializeSection("facts", data.facts));
+  if (activeSections.has("topics")) parts.push(serializeSection("topics", data.topics));
+  if (activeSections.has("people")) parts.push(serializeSection("people", data.people));
+
+  return parts.join('\n') + '\n';
 }
 
 export interface HumanYAMLResult {
@@ -133,6 +225,9 @@ export interface HumanYAMLResult {
   changedFactIds: Set<string>;
   changedTopicIds: Set<string>;
   changedPersonIds: Set<string>;
+  skippedFactCount: number;
+  skippedTopicCount: number;
+  skippedPersonCount: number;
 }
 
 function identifiersEqual(a: PersonIdentifier[] | undefined, b: PersonIdentifier[] | undefined): boolean {
@@ -187,12 +282,12 @@ function personChanged(parsed: Person, original: Person): boolean {
   return !identifiersEqual(parsed.identifiers, original.identifiers);
 }
 
-export function humanFromYAML(yamlContent: string, original?: HumanEntity): HumanYAMLResult {
+export function humanFromYAML(yamlContent: string, original?: HumanEntity, current?: HumanEntity): HumanYAMLResult {
   const stripped = yamlContent
     .split('\n')
     .filter(line => !/^\s*#\s*\[read-only\]/.test(line))
     .join('\n');
-  const data = YAML.parse(stripped) as EditableHumanData;
+  const data = (YAML.parse(stripped) ?? {}) as EditableHumanData;
 
   const deletedFactIds: string[] = [];
   const deletedTopicIds: string[] = [];
@@ -200,6 +295,15 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
   const changedFactIds = new Set<string>();
   const changedTopicIds = new Set<string>();
   const changedPersonIds = new Set<string>();
+  let skippedFactCount = 0;
+  let skippedTopicCount = 0;
+  let skippedPersonCount = 0;
+
+  const staleInState = (id: string | undefined, originalItem: { last_updated: string } | undefined, currentItems: { id: string; last_updated: string }[] | undefined): boolean => {
+    if (!id || !originalItem || !current || !currentItems) return false;
+    const currentItem = currentItems.find(i => i.id === id);
+    return !!currentItem && currentItem.last_updated !== originalItem.last_updated;
+  };
 
   const facts: Fact[] = [];
   for (const f of data.facts ?? []) {
@@ -207,16 +311,21 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
       deletedFactIds.push(f.id);
     } else {
       const { _delete, persona_groups: groupMap, ...parsed } = f;
+      if (!parsed.id) parsed.id = crypto.randomUUID();
       const originalFact = original?.facts.find(of => of.id === parsed.id);
       const fact: Fact = originalFact
         ? { ...originalFact, ...parsed, persona_groups: parseGroupCheckboxMap(groupMap) }
-        : { ...parsed, persona_groups: parseGroupCheckboxMap(groupMap) };
+        : { ...parsed, last_updated: new Date().toISOString(), persona_groups: parseGroupCheckboxMap(groupMap) };
       facts.push(fact);
       if (!originalFact || factChanged(fact, originalFact)) {
-        if (fact.description && !originalFact?.validated_date) {
-          fact.validated_date = new Date().toISOString();
+        if (staleInState(parsed.id, originalFact, current?.facts)) {
+          skippedFactCount++;
+        } else {
+          if (fact.description && !originalFact?.validated_date) {
+            fact.validated_date = new Date().toISOString();
+          }
+          changedFactIds.add(fact.id);
         }
-        changedFactIds.add(fact.id);
       }
     }
   }
@@ -227,13 +336,18 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
       deletedTopicIds.push(t.id);
     } else {
       const { _delete, persona_groups: groupMap, ...parsed } = t;
+      if (!parsed.id) parsed.id = crypto.randomUUID();
       const originalTopic = original?.topics.find(ot => ot.id === parsed.id);
       const topic: Topic = originalTopic
         ? { ...originalTopic, ...parsed, persona_groups: parseGroupCheckboxMap(groupMap) }
-        : { ...parsed, persona_groups: parseGroupCheckboxMap(groupMap) };
+        : { ...parsed, last_updated: new Date().toISOString(), persona_groups: parseGroupCheckboxMap(groupMap) };
       topics.push(topic);
       if (!originalTopic || topicChanged(topic, originalTopic)) {
-        changedTopicIds.add(topic.id);
+        if (staleInState(parsed.id, originalTopic, current?.topics)) {
+          skippedTopicCount++;
+        } else {
+          changedTopicIds.add(topic.id);
+        }
       }
     }
   }
@@ -244,6 +358,7 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
       deletedPersonIds.push(p.id);
     } else {
       const { _delete, identifiers: yamlIdentifiers, persona_groups: groupMap, ...parsed } = p;
+      if (!parsed.id) parsed.id = crypto.randomUUID();
       const identifiers: PersonIdentifier[] = (yamlIdentifiers ?? []).map(({ type, value, primary }) => ({
         type,
         value,
@@ -252,10 +367,14 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
       const originalPerson = original?.people.find(op => op.id === parsed.id);
       const person: Person = originalPerson
         ? { ...originalPerson, ...parsed, identifiers, persona_groups: parseGroupCheckboxMap(groupMap) }
-        : { ...parsed, identifiers, persona_groups: parseGroupCheckboxMap(groupMap) };
+        : { ...parsed, last_updated: new Date().toISOString(), identifiers, persona_groups: parseGroupCheckboxMap(groupMap) };
       people.push(person);
       if (!originalPerson || personChanged(person, originalPerson)) {
-        changedPersonIds.add(person.id);
+        if (staleInState(parsed.id, originalPerson, current?.people)) {
+          skippedPersonCount++;
+        } else {
+          changedPersonIds.add(person.id);
+        }
       }
     }
   }
@@ -270,5 +389,8 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
     changedFactIds,
     changedTopicIds,
     changedPersonIds,
+    skippedFactCount,
+    skippedTopicCount,
+    skippedPersonCount,
   };
 }

package/tui/src/util/yaml-persona.ts

@@ -7,6 +7,7 @@ import type {
   ProviderAccount,
 } from "../../../src/core/types.js";
 import { modelGuidToDisplay, displayToModelGuid } from "./yaml-shared.js";
+import { parseDuration, formatDuration } from "./duration.js";
 
 const PLACEHOLDER_LONG_DESC = "Detailed description of this persona's personality, background, and role";
 
@@ -36,8 +37,8 @@ interface EditablePersonaData {
   groups_visible?: Record<string, boolean>[];
   traits: YAMLTrait[];
   topics: YAMLPersonaTopic[];
-  heartbeat_delay_ms?: string | number;
-  context_window_hours?: number;
+  heartbeat_delay_ms?: string | null;
+  context_window_hours?: number | null;
   is_paused?: boolean;
   pause_until?: string;
   is_static?: boolean;
@@ -175,10 +176,10 @@ export function newPersonaFromYAML(yamlContent: string, allTools?: ToolDefinitio
     groups_visible: groupsVisible.length > 0 ? groupsVisible : ["General"],
     traits,
     topics,
-    heartbeat_delay_ms: data.heartbeat_delay_ms === 'default' || data.heartbeat_delay_ms === undefined
+    heartbeat_delay_ms: data.heartbeat_delay_ms == null
       ? undefined
-      : Number(data.heartbeat_delay_ms) || undefined,
-    context_window_hours: data.context_window_hours,
+      : parseDuration(data.heartbeat_delay_ms) ?? undefined,
+    context_window_hours: data.context_window_hours ?? undefined,
     tools: resolvePersonaToolsFromMap(data.tools, allTools ?? [], allProviders ?? []),
   };
 }
@@ -216,8 +217,8 @@ export function personaToYAML(persona: PersonaEntity, allGroups?: string[], allT
       : persona.topics.map(({ name, perspective, approach, personal_stake, exposure_current, exposure_desired }) => ({
           name, perspective, approach, personal_stake, exposure_current, exposure_desired
         })),
-    heartbeat_delay_ms: persona.heartbeat_delay_ms || 'default',
-    context_window_hours: persona.context_window_hours,
+    heartbeat_delay_ms: persona.heartbeat_delay_ms ? formatDuration(persona.heartbeat_delay_ms) : null,
+    context_window_hours: persona.context_window_hours ?? null,
     is_paused: persona.is_paused || undefined,
     pause_until: persona.pause_until,
     is_static: persona.is_static || undefined,
@@ -324,10 +325,10 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
     groups_visible: groupsVisible,
     traits,
     topics,
-    heartbeat_delay_ms: data.heartbeat_delay_ms === 'default' || data.heartbeat_delay_ms === undefined
+    heartbeat_delay_ms: data.heartbeat_delay_ms == null
       ? undefined
-      : Number(data.heartbeat_delay_ms) || undefined,
-    context_window_hours: data.context_window_hours,
+      : parseDuration(data.heartbeat_delay_ms) ?? undefined,
+    context_window_hours: data.context_window_hours ?? undefined,
     is_paused: data.is_paused ?? false,
     pause_until: data.pause_until,
     is_static: data.is_static ?? false,

package/tui/src/util/yaml-provider.ts

@@ -5,10 +5,15 @@ import type {
 } from "../../../src/core/types.js";
 import { modelGuidToDisplay } from "./yaml-shared.js";
 
+const tokenFormatter = new Intl.NumberFormat("en-US", { notation: "compact", maximumFractionDigits: 1 });
+const formatTokens = (n: number) => tokenFormatter.format(n);
+
 interface EditableModelData {
   name: string;
+  model_id?: string;
   token_limit?: number;
   max_output_tokens?: number;
+  thinking_budget?: number;
   _delete?: boolean;
 }
 
@@ -45,11 +50,14 @@ function parseModels(editableModels: EditableModelData[]): import('../../../src/
   const result: import('../../../src/core/types.js').ModelConfig[] = [];
   for (const m of editableModels) {
     if (m._delete) continue;
+    const modelId = m.model_id ?? undefined;
     result.push({
       id: crypto.randomUUID(),
       name: m.name,
-      token_limit: m.token_limit,
-      max_output_tokens: m.max_output_tokens,
+      model_id: (modelId === null || modelId === m.name) ? undefined : modelId,
+      token_limit: m.token_limit ?? undefined,
+      max_output_tokens: m.max_output_tokens ?? undefined,
+      thinking_budget: m.thinking_budget ?? undefined,
     });
   }
   return result;
@@ -70,6 +78,10 @@ export function newProviderToYAML(name?: string): string {
   const modelsYAML = [
     "models:",
     "  - name: (default)",
+    "    model_id: (default)",
+    "    token_limit: null",
+    "    max_output_tokens: null",
+    "    thinking_budget: null",
     "    # _delete: true",
     "# _delete: true   # Delete this entire provider",
   ].join("\n");
@@ -141,16 +153,26 @@ export function providerToYAML(account: ProviderAccount): string {
   if (modelList.length > 0) {
     for (const m of modelList) {
       modelLines.push(`  - name: ${m.name}`);
-      if (m.token_limit !== undefined) {
-        modelLines.push(`    token_limit: ${m.token_limit}`);
-      }
-      if (m.max_output_tokens !== undefined) {
-        modelLines.push(`    max_output_tokens: ${m.max_output_tokens}`);
+      modelLines.push(`    model_id: ${m.model_id ?? m.name}`);
+      modelLines.push(`    token_limit: ${m.token_limit ?? null}`);
+      modelLines.push(`    max_output_tokens: ${m.max_output_tokens ?? null}`);
+      modelLines.push(`    thinking_budget: ${m.thinking_budget ?? null}`);
+      if (m.total_calls !== undefined || m.total_tokens_in !== undefined) {
+        const tokensIn = m.total_tokens_in ?? 0;
+        const tokensOut = m.total_tokens_out ?? 0;
+        modelLines.push(`    # stats: ${formatTokens(m.total_calls ?? 0)} calls · ${formatTokens(tokensIn)} in / ${formatTokens(tokensOut)} out`);
+        if (m.last_used) {
+          modelLines.push(`    # used: ${m.last_used}`);
+        }
       }
       modelLines.push(`    _delete: false`);
     }
   } else {
     modelLines.push("  - name: (default)");
+    modelLines.push(`    model_id: (default)`);
+    modelLines.push(`    token_limit: null`);
+    modelLines.push(`    max_output_tokens: null`);
+    modelLines.push(`    thinking_budget: null`);
     modelLines.push("    _delete: false");
   }
   modelLines.push("_delete: false   # Set to true to delete this entire provider");
@@ -185,11 +207,14 @@ export function providerFromYAML(yamlContent: string, original: ProviderAccount)
   for (const m of data.models ?? []) {
     if (m._delete) continue;
     const existing = existingModels.find(em => em.name === m.name);
+    const modelId = m.model_id ?? undefined;
     parsedModels.push({
       id: existing?.id ?? crypto.randomUUID(),
       name: m.name,
-      token_limit: m.token_limit,
-      max_output_tokens: m.max_output_tokens,
+      model_id: (modelId === null || modelId === m.name) ? undefined : modelId,
+      token_limit: m.token_limit ?? undefined,
+      max_output_tokens: m.max_output_tokens ?? undefined,
+      thinking_budget: m.thinking_budget ?? undefined,
       total_calls: existing?.total_calls,
       total_tokens_in: existing?.total_tokens_in,
       total_tokens_out: existing?.total_tokens_out,

package/tui/src/util/yaml-settings.ts

@@ -8,6 +8,7 @@ import type {
 import type { ClaudeCodeSettings } from "../../../src/integrations/claude-code/types.js";
 import type { CursorSettings } from "../../../src/integrations/cursor/types.js";
 import { modelGuidToDisplay, displayToModelGuid } from "./yaml-shared.js";
+import { parseDuration, formatDuration } from "./duration.js";
 
 interface EditableSettingsData {
   default_model?: string | null;
@@ -15,7 +16,7 @@ interface EditableSettingsData {
   rewrite_model?: string | null;
   time_mode?: "24h" | "12h" | "local" | "utc" | null;
   name_display?: string | null;
-  default_heartbeat_ms?: number | null;
+  default_heartbeat_ms?: string | null;
   default_context_window_hours?: number | null;
   message_min_count?: number | null;
   message_max_age_days?: number | null;
@@ -28,28 +29,28 @@ interface EditableSettingsData {
   };
   opencode?: {
     integration?: boolean | null;
-    polling_interval_ms?: number | null;
+    polling_interval_ms?: string | null;
     last_sync?: string | null;
     extraction_point?: string | null;
     extraction_model?: string | null;
   };
   claudeCode?: {
     integration?: boolean | null;
-    polling_interval_ms?: number | null;
+    polling_interval_ms?: string | null;
     last_sync?: string | null;
     extraction_point?: string | null;
     extraction_model?: string | null;
   };
   cursor?: {
     integration?: boolean | null;
-    polling_interval_ms?: number | null;
+    polling_interval_ms?: string | null;
     last_sync?: string | null;
     extraction_point?: string | null;
   };
   backup?: {
     enabled?: boolean | null;
     max_backups?: number | null;
-    interval_ms?: number | null;
+    interval_ms?: string | null;
   };
 }
 
@@ -65,7 +66,7 @@ export function settingsToYAML(settings: HumanSettings | undefined, accounts: Pr
     rewrite_model: guidToDisplay(settings?.rewrite_model),
     time_mode: settings?.time_mode ?? null,
     name_display: settings?.name_display ?? null,
-    default_heartbeat_ms: settings?.default_heartbeat_ms ?? 1800000,
+    default_heartbeat_ms: formatDuration(settings?.default_heartbeat_ms ?? 1800000),
     default_context_window_hours: settings?.default_context_window_hours ?? 8,
     message_min_count: settings?.message_min_count ?? 200,
     message_max_age_days: settings?.message_max_age_days ?? 14,
@@ -78,28 +79,28 @@ export function settingsToYAML(settings: HumanSettings | undefined, accounts: Pr
     },
     opencode: {
       integration: settings?.opencode?.integration ?? false,
-      polling_interval_ms: settings?.opencode?.polling_interval_ms ?? 60000,
+      polling_interval_ms: formatDuration(settings?.opencode?.polling_interval_ms ?? 60000),
       extraction_model: guidToDisplay(settings?.opencode?.extraction_model) ?? 'default',
       last_sync: settings?.opencode?.last_sync ?? null,
       extraction_point: settings?.opencode?.extraction_point ?? null,
     },
     claudeCode: {
       integration: settings?.claudeCode?.integration ?? false,
-      polling_interval_ms: settings?.claudeCode?.polling_interval_ms ?? 60000,
+      polling_interval_ms: formatDuration(settings?.claudeCode?.polling_interval_ms ?? 60000),
       extraction_model: guidToDisplay(settings?.claudeCode?.extraction_model) ?? 'default',
       last_sync: settings?.claudeCode?.last_sync ?? null,
       extraction_point: settings?.claudeCode?.extraction_point ?? null,
     },
     cursor: {
       integration: settings?.cursor?.integration ?? false,
-      polling_interval_ms: settings?.cursor?.polling_interval_ms ?? 60000,
+      polling_interval_ms: formatDuration(settings?.cursor?.polling_interval_ms ?? 60000),
       last_sync: settings?.cursor?.last_sync ?? null,
       extraction_point: settings?.cursor?.extraction_point ?? null,
     },
     backup: {
       enabled: settings?.backup?.enabled ?? false,
       max_backups: settings?.backup?.max_backups ?? 24,
-      interval_ms: settings?.backup?.interval_ms ?? 3600000,
+      interval_ms: formatDuration(settings?.backup?.interval_ms ?? 3600000),
     },
   };
 
@@ -117,6 +118,11 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
   const nullToUndefined = <T>(value: T | null | undefined): T | undefined =>
     value === null ? undefined : value;
 
+  const parseMsDuration = (value: string | null | undefined, fallback: number): number | undefined => {
+    if (value == null) return undefined;
+    return parseDuration(value) ?? fallback;
+  };
+
   const displayToGuid = (display: string | null | undefined): string | undefined => {
     if (!display || display === 'default') return undefined;
     return displayToModelGuid(display, accounts) ?? display;
@@ -138,7 +144,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
   if (data.opencode) {
     opencode = {
       integration: nullToUndefined(data.opencode.integration),
-      polling_interval_ms: nullToUndefined(data.opencode.polling_interval_ms),
+      polling_interval_ms: parseMsDuration(data.opencode.polling_interval_ms, 60000),
       last_sync: original?.opencode?.last_sync,
       extraction_point: original?.opencode?.extraction_point,
       processed_sessions: original?.opencode?.processed_sessions,
@@ -150,7 +156,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
   if (data.claudeCode) {
     claudeCode = {
       integration: nullToUndefined(data.claudeCode.integration),
-      polling_interval_ms: nullToUndefined(data.claudeCode.polling_interval_ms),
+      polling_interval_ms: parseMsDuration(data.claudeCode.polling_interval_ms, 60000),
       last_sync: original?.claudeCode?.last_sync,
       extraction_point: original?.claudeCode?.extraction_point,
       processed_sessions: original?.claudeCode?.processed_sessions,
@@ -162,7 +168,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
   if (data.cursor) {
     cursor = {
       integration: nullToUndefined(data.cursor.integration),
-      polling_interval_ms: nullToUndefined(data.cursor.polling_interval_ms),
+      polling_interval_ms: parseMsDuration(data.cursor.polling_interval_ms, 60000),
       last_sync: original?.cursor?.last_sync,
       extraction_point: original?.cursor?.extraction_point,
       processed_sessions: original?.cursor?.processed_sessions,
@@ -174,7 +180,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
     backup = {
       enabled: nullToUndefined(data.backup.enabled),
       max_backups: nullToUndefined(data.backup.max_backups),
-      interval_ms: nullToUndefined(data.backup.interval_ms),
+      interval_ms: parseMsDuration(data.backup.interval_ms, 3600000),
       last_backup: original?.backup?.last_backup,
     };
   }
@@ -186,7 +192,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
     rewrite_model: displayToGuid(data.rewrite_model),
     time_mode: nullToUndefined(data.time_mode),
     name_display: nullToUndefined(data.name_display),
-    default_heartbeat_ms: nullToUndefined(data.default_heartbeat_ms),
+    default_heartbeat_ms: parseMsDuration(data.default_heartbeat_ms, 1800000),
     default_context_window_hours: nullToUndefined(data.default_context_window_hours),
     message_min_count: nullToUndefined(data.message_min_count),
     message_max_age_days: nullToUndefined(data.message_max_age_days),