ei-tui 0.5.0 → 0.5.2

package/tui/src/util/provider-editor.tsx

@@ -15,10 +15,11 @@ export interface EditProviderEditorResult {
   success: boolean;
   account: ProviderAccount | null;
   cancelled: boolean;
+  deleted?: boolean;
 }
 
-export async function createProviderViaEditor(ctx: CommandContext): Promise<NewProviderEditorResult> {
-  let yamlContent = newProviderToYAML();
+export async function createProviderViaEditor(ctx: CommandContext, name?: string): Promise<NewProviderEditorResult> {
+  let yamlContent = newProviderToYAML(name);
   
   while (true) {
     const result = await spawnEditor({
@@ -45,12 +46,14 @@ export async function createProviderViaEditor(ctx: CommandContext): Promise<NewP
     try {
       const account = newProviderFromYAML(result.content);
       
-      // Save to settings
+      if ((account.models ?? []).length === 0) {
+        throw new Error("Provider must have at least one model. Add a model under the models: section.");
+      }
+      
       const human = await ctx.ei.getHuman();
       const accounts = [...(human.settings?.accounts ?? []), account];
       const updates: Partial<HumanSettings> = { accounts };
       
-      // If no system default_model, auto-set to this new provider
       if (!human.settings?.default_model) {
         updates.default_model = account.default_model
           ? `${account.name}:${account.default_model}`
@@ -118,9 +121,22 @@ export async function openProviderEditor(account: ProviderAccount, ctx: CommandC
     }
     
     try {
-      const updated = providerFromYAML(result.content, account);
+      const parseResult = providerFromYAML(result.content, account);
+      
+      if (parseResult._delete) {
+        const human = await ctx.ei.getHuman();
+        const accounts = (human.settings?.accounts ?? []).filter(a => a.id !== account.id);
+        await ctx.ei.updateSettings({ accounts });
+        ctx.showNotification(`Deleted provider "${account.name}"`, "info");
+        return { success: true, account: null, cancelled: false, deleted: true };
+      }
+
+      const updated = parseResult.account;
+
+      if ((updated.models ?? []).length === 0) {
+        throw new Error("Provider must have at least one model. Remove _delete: true from at least one model, or add a new model.");
+      }
       
-      // Update in settings
       const human = await ctx.ei.getHuman();
       const accounts = [...(human.settings?.accounts ?? [])];
       const idx = accounts.findIndex(a => a.id === account.id);
@@ -164,3 +180,4 @@ export async function openProviderEditor(account: ProviderAccount, ctx: CommandC
     }
   }
 }
+

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

@@ -254,7 +254,7 @@ export function newPersonaFromYAML(yamlContent: string, allTools?: ToolDefinitio
   };
 }
 
-export function personaToYAML(persona: PersonaEntity, allGroups?: string[], allTools?: ToolDefinition[], allProviders?: import('../../../src/core/types.js').ToolProvider[]): string {
+export function personaToYAML(persona: PersonaEntity, allGroups?: string[], allTools?: ToolDefinition[], allProviders?: import('../../../src/core/types.js').ToolProvider[], accounts?: ProviderAccount[]): string {
   const useTraitPlaceholder = persona.traits.length === 0;
   const useTopicPlaceholder = persona.topics.length === 0;
   
@@ -265,15 +265,18 @@ export function personaToYAML(persona: PersonaEntity, allGroups?: string[], allT
     groupsForYAML.push({ [groupName]: visibleSet.has(groupName) });
   }
 
-  // Build tools map: all known tools, true if persona has it enabled
   const toolsMap = buildPersonaToolsMap(persona.tools ?? [], allTools ?? [], allProviders ?? []);
+
+  const modelDisplay = (persona.model && accounts && accounts.length > 0)
+    ? modelGuidToDisplay(persona.model, accounts)
+    : persona.model;
   
   const data: EditablePersonaData = {
     display_name: persona.display_name,
     aliases: persona.aliases,
     short_description: persona.short_description,
     long_description: persona.long_description || PLACEHOLDER_LONG_DESC,
-    model: persona.model,
+    model: modelDisplay,
     group_primary: persona.group_primary,
     groups_visible: groupsForYAML,
     traits: useTraitPlaceholder 
@@ -304,7 +307,7 @@ export interface PersonaYAMLResult {
   deletedTopicIds: string[];
 }
 
-export function personaFromYAML(yamlContent: string, original: PersonaEntity, allTools?: ToolDefinition[], allProviders?: import('../../../src/core/types.js').ToolProvider[]): PersonaYAMLResult {
+export function personaFromYAML(yamlContent: string, original: PersonaEntity, allTools?: ToolDefinition[], allProviders?: import('../../../src/core/types.js').ToolProvider[], accounts?: ProviderAccount[]): PersonaYAMLResult {
   const data = YAML.parse(yamlContent) as EditablePersonaData;
   
   const deletedTraitIds: string[] = [];
@@ -377,13 +380,23 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
       }
     }
   }
+
+  let resolvedModel: string | undefined = data.model;
+  if (data.model && accounts && accounts.length > 0) {
+    const guid = displayToModelGuid(data.model, accounts);
+    if (guid !== undefined) {
+      resolvedModel = guid;
+    } else if (data.model.includes(':')) {
+      throw new Error(`Model "${data.model}" not found. Use "ProviderName:modelName" format with a valid provider and model.`);
+    }
+  }
   
   const updates: Partial<PersonaEntity> = {
     display_name: data.display_name,
     aliases: data.aliases,
     short_description: data.short_description,
     long_description: stripPlaceholder(data.long_description, PLACEHOLDER_LONG_DESC),
-    model: data.model,
+    model: resolvedModel,
     group_primary: data.group_primary,
     groups_visible: groupsVisible,
     traits,
@@ -524,7 +537,6 @@ interface EditableSettingsData {
     last_sync?: string | null;
     extraction_point?: string | null;
     extraction_model?: string | null;
-    extraction_token_limit?: string | number | null;
   };
   claudeCode?: {
     integration?: boolean | null;
@@ -532,7 +544,6 @@ interface EditableSettingsData {
     last_sync?: string | null;
     extraction_point?: string | null;
     extraction_model?: string | null;
-    extraction_token_limit?: string | number | null;
   };
   cursor?: {
     integration?: boolean | null;
@@ -547,12 +558,17 @@ interface EditableSettingsData {
   };
 }
 
-export function settingsToYAML(settings: HumanSettings | undefined): string {
+export function settingsToYAML(settings: HumanSettings | undefined, accounts: ProviderAccount[]): string {
+  const guidToDisplay = (guid: string | undefined | null): string | null => {
+    if (!guid) return null;
+    return modelGuidToDisplay(guid, accounts);
+  };
+
   // Always show all editable fields, using null for unset values so YAML displays them
   const data: EditableSettingsData = {
-    default_model: settings?.default_model ?? null,
-    oneshot_model: settings?.oneshot_model ?? null,
-    rewrite_model: settings?.rewrite_model ?? null,
+    default_model: guidToDisplay(settings?.default_model),
+    oneshot_model: guidToDisplay(settings?.oneshot_model),
+    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,
@@ -569,16 +585,14 @@ export function settingsToYAML(settings: HumanSettings | undefined): string {
     opencode: {
       integration: settings?.opencode?.integration ?? false,
       polling_interval_ms: settings?.opencode?.polling_interval_ms ?? 60000,
-      extraction_model: settings?.opencode?.extraction_model ?? 'default',
-      extraction_token_limit: settings?.opencode?.extraction_token_limit ?? 'default',
+      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,
-      extraction_model: settings?.claudeCode?.extraction_model ?? 'default',
-      extraction_token_limit: settings?.claudeCode?.extraction_token_limit ?? 'default',
+      extraction_model: guidToDisplay(settings?.claudeCode?.extraction_model) ?? 'default',
       last_sync: settings?.claudeCode?.last_sync ?? null,
       extraction_point: settings?.claudeCode?.extraction_point ?? null,
     },
@@ -600,14 +614,18 @@ export function settingsToYAML(settings: HumanSettings | undefined): string {
   })
   .replace(/^(\s+)(last_sync: .+)$/mg, '$1# [read-only] $2')
   .replace(/^(\s+)(extraction_point: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(extraction_model: .+)$/mg, '$1$2 # e.g. Anthropic:claude-haiku-4-5')
-  .replace(/^(\s+)(extraction_token_limit: .+)$/mg, '$1$2 # e.g. 100000 for Haiku');
+  .replace(/^(\s+)(extraction_model: .+)$/mg, '$1$2 # e.g. Anthropic:claude-haiku-4-5');
 }
-export function settingsFromYAML(yamlContent: string, original: HumanSettings | undefined): HumanSettings {
+export function settingsFromYAML(yamlContent: string, original: HumanSettings | undefined, accounts: ProviderAccount[]): HumanSettings {
   const data = YAML.parse(yamlContent) as EditableSettingsData;
   
   const nullToUndefined = <T>(value: T | null | undefined): T | undefined => 
     value === null ? undefined : value;
+
+  const displayToGuid = (display: string | null | undefined): string | undefined => {
+    if (!display || display === 'default') return undefined;
+    return displayToModelGuid(display, accounts) ?? display;
+  };
   
   let ceremony: CeremonyConfig | undefined;
   if (data.ceremony) {
@@ -629,12 +647,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
       last_sync: original?.opencode?.last_sync,
       extraction_point: original?.opencode?.extraction_point,
       processed_sessions: original?.opencode?.processed_sessions,
-      extraction_model: (data.opencode.extraction_model != null && data.opencode.extraction_model !== 'default')
-        ? data.opencode.extraction_model
-        : undefined,
-      extraction_token_limit: (data.opencode.extraction_token_limit != null && data.opencode.extraction_token_limit !== 'default')
-        ? Number(data.opencode.extraction_token_limit)
-        : undefined,
+      extraction_model: displayToGuid(data.opencode.extraction_model),
     };
   }
 
@@ -646,12 +659,7 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
       last_sync: original?.claudeCode?.last_sync,
       extraction_point: original?.claudeCode?.extraction_point,
       processed_sessions: original?.claudeCode?.processed_sessions,
-      extraction_model: (data.claudeCode.extraction_model != null && data.claudeCode.extraction_model !== 'default')
-        ? data.claudeCode.extraction_model
-        : undefined,
-      extraction_token_limit: (data.claudeCode.extraction_token_limit != null && data.claudeCode.extraction_token_limit !== 'default')
-        ? Number(data.claudeCode.extraction_token_limit)
-        : undefined,
+      extraction_model: displayToGuid(data.claudeCode.extraction_model),
     };
   }
 
@@ -678,9 +686,9 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
   
   return {
     ...original,
-    default_model: nullToUndefined(data.default_model),
-    oneshot_model: nullToUndefined(data.oneshot_model),
-    rewrite_model: nullToUndefined(data.rewrite_model),
+    default_model: displayToGuid(data.default_model),
+    oneshot_model: displayToGuid(data.oneshot_model),
+    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),
@@ -781,6 +789,13 @@ export function quotesFromYAML(yamlContent: string): QuotesYAMLResult {
 // PROVIDER ACCOUNT SERIALIZATION
 // =============================================================================
 
+interface EditableModelData {
+  name: string;
+  token_limit?: number;
+  max_output_tokens?: number;
+  _delete?: boolean;
+}
+
 interface EditableProviderData {
   name: string;
   type: "llm" | "storage";
@@ -790,50 +805,71 @@ interface EditableProviderData {
   token_limit?: number | null;
   extra_headers?: Record<string, string>;
   enabled?: boolean;
+  models?: EditableModelData[];
+  _delete?: boolean;
 }
 
+export interface ProviderYAMLResult {
+  account: ProviderAccount;
+  _delete: boolean;
+}
 
 function resolveEnvVar(value: string | undefined): string | undefined {
   if (!value || !value.startsWith("$")) return value;
   const varName = value.slice(1);
   return process.env[varName] || value;
 }
-const PLACEHOLDER_PROVIDER: EditableProviderData = {
-  name: "My Provider",
-  type: "llm",
-  url: "https://api.example.com/v1",
-  api_key: "your-api-key-or-$ENVAR",
-  default_model: "model-name",
-  token_limit: null,
-  extra_headers: {},
-  enabled: true,
-};
+
+const PLACEHOLDER_PROVIDER_NAME = "My Provider";
+const PLACEHOLDER_PROVIDER_URL = "https://api.example.com/v1";
+const PLACEHOLDER_PROVIDER_API_KEY = "your-api-key-or-$ENVAR";
+const PLACEHOLDER_PROVIDER_DEFAULT_MODEL = "model-name";
 
 /**
  * Generate YAML template for a NEW provider account
  */
-export function newProviderToYAML(): string {
-  return YAML.stringify(PLACEHOLDER_PROVIDER, {
-    lineWidth: 0,
-  });
+export function newProviderToYAML(name?: string): string {
+  const placeholderData = {
+    name: name ?? PLACEHOLDER_PROVIDER_NAME,
+    type: "llm",
+    url: PLACEHOLDER_PROVIDER_URL,
+    api_key: PLACEHOLDER_PROVIDER_API_KEY,
+    default_model: PLACEHOLDER_PROVIDER_DEFAULT_MODEL,
+    token_limit: null,
+    extra_headers: {},
+    enabled: true,
+  };
+
+  const modelsYAML = [
+    "models:",
+    "  - name: (default)",
+    "    # _delete: true",
+    "# _delete: true   # Delete this entire provider",
+  ].join("\n");
+
+  return YAML.stringify(placeholderData, { lineWidth: 0 }).trimEnd() + "\n" + modelsYAML + "\n";
 }
 
 /**
  * Parse YAML for a NEW provider account
  */
 export function newProviderFromYAML(yamlContent: string): ProviderAccount {
-  const data = YAML.parse(yamlContent) as EditableProviderData;
+  const cleaned = yamlContent
+    .split('\n')
+    .filter(line => !/^\s*#/.test(line))
+    .join('\n');
+  const data = YAML.parse(cleaned) as EditableProviderData;
   
-  if (!data.name || data.name === PLACEHOLDER_PROVIDER.name) {
+  if (!data.name || data.name === PLACEHOLDER_PROVIDER_NAME) {
     throw new Error("Provider name is required");
   }
-  if (!data.url || data.url === PLACEHOLDER_PROVIDER.url) {
+  if (!data.url || data.url === PLACEHOLDER_PROVIDER_URL) {
     throw new Error("Provider URL is required");
   }
-  if (data.api_key === PLACEHOLDER_PROVIDER.api_key) {
+  if (data.api_key === PLACEHOLDER_PROVIDER_API_KEY) {
     data.api_key = undefined;
   }
-  if (data.default_model === PLACEHOLDER_PROVIDER.default_model) {
+  if (data.default_model === PLACEHOLDER_PROVIDER_DEFAULT_MODEL) {
     data.default_model = undefined;
   }
   
@@ -841,6 +877,9 @@ export function newProviderFromYAML(yamlContent: string): ProviderAccount {
     throw new Error(`token_limit must be a number (got: ${JSON.stringify(data.token_limit)}). Note: underscore separators (100_000) are not valid in YAML.`);
   }
 
+  // Parse models: filter out _delete:true items
+  const models = parseModels(data.models ?? []);
+
   return {
     id: crypto.randomUUID(),
     name: data.name,
@@ -851,35 +890,86 @@ export function newProviderFromYAML(yamlContent: string): ProviderAccount {
     token_limit: data.token_limit ?? undefined,
     extra_headers: data.extra_headers && Object.keys(data.extra_headers).length > 0 ? data.extra_headers : undefined,
     enabled: data.enabled ?? true,
+    models: models.length > 0 ? models : undefined,
     created_at: new Date().toISOString(),
   };
 }
 
 /**
- * Serialize existing provider account to YAML for editing
+ * Parse EditableModelData[] into ModelConfig[], generating new GUIDs for models without one.
+ * Filters out models with _delete: true.
+ */
+function parseModels(editableModels: EditableModelData[]): import('../../../src/core/types.js').ModelConfig[] {
+  const result: import('../../../src/core/types.js').ModelConfig[] = [];
+  for (const m of editableModels) {
+    if (m._delete) continue;
+    result.push({
+      id: crypto.randomUUID(),
+      name: m.name,
+      token_limit: m.token_limit,
+      max_output_tokens: m.max_output_tokens,
+    });
+  }
+  return result;
+}
+/**
+ * Serialize existing provider account to YAML for editing.
+ * Shows models[] as a nested section with _delete comments.
+ * Hides internal fields: id, total_calls, total_tokens_in, total_tokens_out, last_used.
  */
 export function providerToYAML(account: ProviderAccount): string {
-  const data: EditableProviderData = {
+  const defaultModelDisplay = account.default_model
+    ? modelGuidToDisplay(account.default_model, [account])
+    : undefined;
+
+  const topData = {
     name: account.name,
     type: account.type as "llm" | "storage",
     url: account.url,
     api_key: account.api_key,
-    default_model: account.default_model,
+    default_model: defaultModelDisplay,
     token_limit: account.token_limit ?? null,
     extra_headers: account.extra_headers,
     enabled: account.enabled ?? true,
   };
-  
-  return YAML.stringify(data, {
-    lineWidth: 0,
-  });
+
+  const topYAML = YAML.stringify(topData, { lineWidth: 0 }).trimEnd();
+
+  const modelLines: string[] = ["models:"];
+  const modelList = account.models ?? [];
+  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(`    _delete: false`);
+    }
+  } else {
+    modelLines.push("  - name: (default)");
+    modelLines.push("    _delete: false");
+  }
+  modelLines.push("_delete: false   # Set to true to delete this entire provider");
+
+  return topYAML + "\n" + modelLines.join("\n") + "\n";
 }
 
 /**
- * Parse YAML for an existing provider account (preserves id and created_at)
+ * Parse YAML for an existing provider account (preserves id and created_at).
+ * Returns { account, _delete } where _delete signals the entire provider should be removed.
+ * Model _delete flags cause individual models to be removed.
+ * Preserves model GUIDs on round-trip; generates new GUIDs for new models.
  */
-export function providerFromYAML(yamlContent: string, original: ProviderAccount): ProviderAccount {
-  const data = YAML.parse(yamlContent) as EditableProviderData;
+export function providerFromYAML(yamlContent: string, original: ProviderAccount): ProviderYAMLResult {
+  // Strip comment lines before parsing (they encode _delete hints)
+  const cleaned = yamlContent
+    .split('\n')
+    .filter(line => !/^\s*#/.test(line))
+    .join('\n');
+  const data = YAML.parse(cleaned) as EditableProviderData;
   
   if (!data.name) {
     throw new Error("Provider name is required");
@@ -892,7 +982,34 @@ export function providerFromYAML(yamlContent: string, original: ProviderAccount)
     throw new Error(`token_limit must be a number (got: ${JSON.stringify(data.token_limit)}). Note: underscore separators (100_000) are not valid in YAML.`);
   }
 
-  return {
+  // Root-level _delete → signal deletion of entire provider
+  if (data._delete) {
+    return {
+      account: original,
+      _delete: true,
+    };
+  }
+
+  // Parse models: preserve existing GUIDs by name match, generate new GUIDs for new models
+  const existingModels = original.models ?? [];
+  const parsedModels: import('../../../src/core/types.js').ModelConfig[] = [];
+  for (const m of data.models ?? []) {
+    if (m._delete) continue;
+    const existing = existingModels.find(em => em.name === m.name);
+    parsedModels.push({
+      id: existing?.id ?? crypto.randomUUID(),
+      name: m.name,
+      token_limit: m.token_limit,
+      max_output_tokens: m.max_output_tokens,
+      // Preserve usage counters from original if model matched
+      total_calls: existing?.total_calls,
+      total_tokens_in: existing?.total_tokens_in,
+      total_tokens_out: existing?.total_tokens_out,
+      last_used: existing?.last_used,
+    });
+  }
+
+  const account: ProviderAccount = {
     id: original.id,
     name: data.name,
     type: (data.type === "storage" ? "storage" : "llm") as ProviderType,
@@ -902,8 +1019,42 @@ export function providerFromYAML(yamlContent: string, original: ProviderAccount)
     token_limit: data.token_limit ?? undefined,
     extra_headers: data.extra_headers && Object.keys(data.extra_headers).length > 0 ? data.extra_headers : undefined,
     enabled: data.enabled ?? true,
+    models: parsedModels.length > 0 ? parsedModels : undefined,
     created_at: original.created_at,
   };
+
+  return { account, _delete: false };
+}
+
+// =============================================================================
+// GUID <-> DISPLAY NAME HELPERS
+// =============================================================================
+
+/**
+ * Convert a model GUID to "ProviderName:modelName" display string.
+ * Falls back to the raw GUID if the model is not found.
+ */
+export function modelGuidToDisplay(guid: string, accounts: ProviderAccount[]): string {
+  for (const account of accounts) {
+    const model = (account.models ?? []).find(m => m.id === guid);
+    if (model) return `${account.name}:${model.name}`;
+  }
+  return guid; // fallback: return raw GUID if not found
+}
+
+/**
+ * Resolve "ProviderName:modelName" display string back to a model GUID.
+ * Returns undefined if no matching provider+model is found.
+ * Handles colons in model names by treating everything after the first colon as the model name.
+ */
+export function displayToModelGuid(display: string, accounts: ProviderAccount[]): string | undefined {
+  const colonIdx = display.indexOf(':');
+  if (colonIdx < 0) return undefined;
+  const providerName = display.substring(0, colonIdx);
+  const modelName = display.substring(colonIdx + 1);
+  const account = accounts.find(a => a.name === providerName);
+  const model = (account?.models ?? []).find(m => m.name === modelName);
+  return model?.id;
 }
 
 // =============================================================================
@@ -971,9 +1122,25 @@ export function contextFromYAML(yamlContent: string): ContextYAMLResult {
 // QUEUE ITEM YAML
 // =============================================================================
 
-export function queueItemsToYAML(items: LLMRequest[]): string {
-  const data = items.map(item => ({
+interface EditableQueueItem {
+  id: string;
+  state: LLMRequestState;
+  created_at: string;
+  attempts: number;
+  last_attempt?: string;
+  retry_after?: string;
+  type?: string;
+  priority?: LLMPriority;
+  next_step?: string;
+  model?: string;
+  data?: Record<string, unknown>;
+  _delete?: boolean;
+}
+
+export function queueItemsToYAML(items: LLMRequest[], accounts: ProviderAccount[]): string {
+  const data: EditableQueueItem[] = items.map(item => ({
     id: item.id,
+    _delete: false,
     state: item.state,
     created_at: item.created_at,
     attempts: item.attempts,
@@ -982,7 +1149,7 @@ export function queueItemsToYAML(items: LLMRequest[]): string {
     type: item.type,
     priority: item.priority,
     next_step: item.next_step,
-    model: item.model,
+    model: item.model ? modelGuidToDisplay(item.model, accounts) : undefined,
     data: item.data,
     // NOTE: system/user prompts omitted (large); to requeue: set state='pending', attempts=0
   }));
@@ -998,25 +1165,40 @@ export interface QueueItemUpdate {
   data?: Record<string, unknown>;
 }
 
-export function queueItemsFromYAML(yamlContent: string): QueueItemUpdate[] {
-  const data = YAML.parse(yamlContent) as QueueItemUpdate[];
+export interface QueueItemsYAMLResult {
+  updates: QueueItemUpdate[];
+  deletedIds: string[];
+}
+
+export function queueItemsFromYAML(yamlContent: string, accounts: ProviderAccount[]): QueueItemsYAMLResult {
+  const data = YAML.parse(yamlContent) as EditableQueueItem[];
   if (!Array.isArray(data)) throw new Error("Expected a YAML array of queue items");
-  return data.map(item => {
+
+  const deletedIds: string[] = [];
+  const updates: QueueItemUpdate[] = [];
+
+  for (const item of data) {
     if (!item.id) throw new Error(`Queue item missing 'id' field`);
+    if (item._delete) {
+      deletedIds.push(item.id);
+      continue;
+    }
     if (!item.state) throw new Error(`Queue item ${item.id} missing 'state' field`);
     const validStates: LLMRequestState[] = ["pending", "processing", "dlq"];
     if (!validStates.includes(item.state)) {
       throw new Error(`Queue item ${item.id} has invalid state '${item.state}'. Valid: ${validStates.join(", ")}`);
     }
-    return {
+    updates.push({
       id: item.id,
       state: item.state,
       attempts: typeof item.attempts === "number" ? item.attempts : 0,
-      model: item.model,
+      model: item.model ? displayToModelGuid(item.model, accounts) ?? item.model : undefined,
       priority: item.priority,
       data: item.data,
-    };
-  });
+    });
+  }
+
+  return { updates, deletedIds };
 }
 
 // =============================================================================

package/src/core/model-context-windows.ts

@@ -1,49 +0,0 @@
-// Last updated: 2026-02-22
-// Prefix-based lookup: "gpt-4o" matches "gpt-4o", "gpt-4o-2024-08-06", "gpt-4o-mini", etc.
-const KNOWN_CONTEXT_WINDOWS: [string, number][] = [
-  // OpenAI
-  ["gpt-4.1", 1_048_576],
-  ["gpt-4o", 128_000],
-  ["gpt-3.5-turbo", 16_384],
-
-  // Anthropic
-  ["claude-opus-4", 200_000],
-  ["claude-sonnet-4", 200_000],
-  ["claude-3.5", 200_000],
-  ["claude-3", 200_000],
-
-  // Google
-  ["gemini-2.5", 1_000_000],
-  ["gemini-2.0", 1_000_000],
-  ["gemini-1.5", 1_000_000],
-
-  // Meta Llama
-  ["llama-3.3", 131_072],
-  ["llama-3.2", 131_072],
-  ["llama-3.1", 131_072],
-
-  // Mistral
-  ["mixtral", 32_768],
-  ["mistral", 32_768],
-
-  // DeepSeek
-  ["deepseek-coder-v2", 163_840],
-  ["deepseek-v3", 131_072],
-  ["deepseek", 131_072],
-
-  // Qwen
-  ["qwen-2.5", 131_072],
-  ["qwen", 131_072],
-];
-
-const DEFAULT_TOKEN_LIMIT = 8192;
-
-export function getKnownContextWindow(modelName: string): number | undefined {
-  const lower = modelName.toLowerCase();
-  for (const [prefix, tokens] of KNOWN_CONTEXT_WINDOWS) {
-    if (lower.startsWith(prefix.toLowerCase())) return tokens;
-  }
-  return undefined;
-}
-
-export { DEFAULT_TOKEN_LIMIT };