fix: normalize model name separators in CLI validation

Apply separator normalization (. and _ -> -) to the AWF CLI model
validation path so both 'claude-haiku-4-5' and 'claude-haiku-4.5'
are accepted and resolved to the canonical form 'claude-haiku-4.5'.

This mirrors the existing tolerant behavior in the api-proxy's
model-utils.js / model-resolver.js. The fix also extends to
retired-alias lookups for consistency.

Closes #4907

Author: Copilot

src/copilot-model.test.ts

@@ -26,6 +26,39 @@ describe('validateCopilotModel', () => {
     expect(result).toEqual({ valid: true, resolvedModel: 'gpt-4.1' });
   });
 
+  it('normalizes hyphenated version separator to canonical dot form (claude-haiku-4-5 → claude-haiku-4.5)', () => {
+    const result = validateCopilotModel('claude-haiku-4-5');
+    expect(result).toEqual({ valid: true, resolvedModel: 'claude-haiku-4.5' });
+  });
+
+  it('normalizes underscore separator to canonical dot form (claude_haiku_4_5 → claude-haiku-4.5)', () => {
+    const result = validateCopilotModel('claude_haiku_4_5');
+    expect(result).toEqual({ valid: true, resolvedModel: 'claude-haiku-4.5' });
+  });
+
+  it('normalizes uppercase + hyphen separators (CLAUDE-HAIKU-4-5 → claude-haiku-4.5)', () => {
+    const result = validateCopilotModel('CLAUDE-HAIKU-4-5');
+    expect(result).toEqual({ valid: true, resolvedModel: 'claude-haiku-4.5' });
+  });
+
+  it('normalizes hyphenated version separator for other models (claude-sonnet-4-6 → claude-sonnet-4.6)', () => {
+    const result = validateCopilotModel('claude-sonnet-4-6');
+    expect(result).toEqual({ valid: true, resolvedModel: 'claude-sonnet-4.6' });
+  });
+
+  it('accepts canonical dot form without normalization (claude-haiku-4.5 → claude-haiku-4.5)', () => {
+    const result = validateCopilotModel('claude-haiku-4.5');
+    expect(result).toEqual({ valid: true, resolvedModel: 'claude-haiku-4.5' });
+  });
+
+  it('still rejects retired aliases regardless of separator (gpt-5-codex stays retired)', () => {
+    const result = validateCopilotModel('gpt-5-codex');
+    expect(result.valid).toBe(false);
+    if (result.valid) return;
+    expect(result.reason).toBe('retired');
+    expect(result.message).toContain("Did you mean 'gpt-5.3-codex'?");
+  });
+
   it('rejects unsupported models with suggestion when close to known catalog', () => {
     const result = validateCopilotModel('gpt-5.3-codx');
     expect(result.valid).toBe(false);

src/copilot-model.ts

@@ -13,6 +13,14 @@ export type CopilotModelValidationResult =
   | CopilotModelValidationSuccess
   | CopilotModelValidationFailure;
 
+/**
+ * Normalize separators (`.` and `_`) to `-` for separator-agnostic model matching.
+ * Mirrors the canonicalization used in `containers/api-proxy/model-utils.js`.
+ */
+function normalizeSeparators(s: string): string {
+  return s.replace(/[._]/g, '-');
+}
+
 const RETIRED_COPILOT_MODEL_ALIASES: Record<string, string> = {
   'gpt-5-codex': 'gpt-5.3-codex',
 };
@@ -39,6 +47,16 @@ const SUPPORTED_COPILOT_MODELS = new Set([
   'gemini-3.5-flash',
 ]);
 
+/** Maps separator-normalized names (all `-`) → canonical model name. */
+const NORMALIZED_TO_CANONICAL = new Map<string, string>(
+  [...SUPPORTED_COPILOT_MODELS].map(m => [normalizeSeparators(m), m]),
+);
+
+/** Maps separator-normalized retired alias keys → canonical replacement. */
+const NORMALIZED_RETIRED_ALIASES = new Map<string, string>(
+  Object.entries(RETIRED_COPILOT_MODEL_ALIASES).map(([k, v]) => [normalizeSeparators(k), v]),
+);
+
 function suggestionFor(model: string): string | undefined {
   let best: { candidate: string; distance: number } | undefined;
   for (const candidate of SUPPORTED_COPILOT_MODELS) {
@@ -73,8 +91,11 @@ export function validateCopilotModel(rawModel: string): CopilotModelValidationRe
     return { valid: true, resolvedModel: trimmed };
   }
   const normalized = trimmed.toLowerCase();
+  const separatorNormalized = normalizeSeparators(normalized);
 
-  const retiredReplacement = RETIRED_COPILOT_MODEL_ALIASES[normalized];
+  // Check retired aliases (exact, then separator-normalized)
+  const retiredReplacement =
+    RETIRED_COPILOT_MODEL_ALIASES[normalized] ?? NORMALIZED_RETIRED_ALIASES.get(separatorNormalized);
   if (retiredReplacement) {
     return {
       valid: false,
@@ -83,10 +104,17 @@ export function validateCopilotModel(rawModel: string): CopilotModelValidationRe
     };
   }
 
+  // Exact match
   if (SUPPORTED_COPILOT_MODELS.has(normalized)) {
     return { valid: true, resolvedModel: normalized };
   }
 
+  // Separator-normalized match: treat `.`, `_`, `-` as equivalent
+  const canonicalModel = NORMALIZED_TO_CANONICAL.get(separatorNormalized);
+  if (canonicalModel) {
+    return { valid: true, resolvedModel: canonicalModel };
+  }
+
   const suggested = suggestionFor(normalized);
   return {
     valid: false,