chati-dev 4.5.13 → 4.5.14

package/src/memory/magic-docs.js

@@ -1,14 +1,14 @@
 /**
- * Magic Docs — Auto-updating CLAUDE.md after agent handoffs.
+ * Magic Docs: update Chati's provider-neutral project context after handoffs.
  *
  * Inspired by Claude Code's Magic Docs system that uses `# MAGIC DOC:` headers
  * to trigger background self-updating documentation.
  *
- * This module updates only the `## Current State` section of CLAUDE.md,
- * preserving all other user-written sections untouched.
+ * This module updates only `.chati/project-context.md`. Provider-native root
+ * files consume this canonical artifact and are never used as its source.
  */
 
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
 
 const SECTION_HEADER = '## Current State';
@@ -20,7 +20,7 @@ const SECTION_HEADER = '## Current State';
 const SECTION_REGEX = /^## Current State\n([\s\S]*?)(?=\n## |\n---|$(?![\s\S]))/m;
 
 /**
- * Update CLAUDE.md with current project state after a handoff.
+ * Update the neutral project context with current state after a handoff.
  *
  * @param {string} projectDir - Project root directory
  * @param {object} context - Current state to write
@@ -28,12 +28,13 @@ const SECTION_REGEX = /^## Current State\n([\s\S]*?)(?=\n## |\n---|$(?![\s\S]))/
  * @param {string} [context.pipelinePosition] - Pipeline phase/step
  * @param {string} [context.activeTask] - Current task ID + title
  * @param {number} [context.progress] - Pipeline completion percentage
+ * @param {number} [context.validationScore] - Latest independent validation score
  * @param {Array<{what: string, why: string}>} [context.decisions] - Recent decisions
  * @param {string[]} [context.nextSteps] - Planned next steps
  * @returns {{ updated: boolean, path: string }}
  */
-export function updateClaudeMd(projectDir, context = {}) {
-  const claudePath = join(projectDir, 'CLAUDE.md');
+export function updateProjectContext(projectDir, context = {}) {
+  const contextPath = join(projectDir, '.chati', 'project-context.md');
   const timestamp = new Date().toISOString().split('T')[0];
 
   // Build the new section content
@@ -42,7 +43,13 @@ export function updateClaudeMd(projectDir, context = {}) {
   if (context.currentAgent) lines.push(`- **Agent**: ${context.currentAgent}`);
   if (context.pipelinePosition) lines.push(`- **Pipeline**: ${context.pipelinePosition}`);
   if (context.activeTask) lines.push(`- **Task**: ${context.activeTask}`);
-  if (context.progress !== undefined) lines.push(`- **Progress**: ${context.progress}%`);
+  const progress = typeof context.progress === 'number'
+    ? context.progress
+    : (context.progress?.percent ?? context.progress?.progress);
+  if (progress !== undefined) lines.push(`- **Progress**: ${progress}%`);
+  if (typeof context.validationScore === 'number') {
+    lines.push(`- **Validation Score**: ${context.validationScore}`);
+  }
   lines.push(`- **Last Updated**: ${timestamp}`);
 
   if (context.decisions && context.decisions.length > 0) {
@@ -65,39 +72,51 @@ export function updateClaudeMd(projectDir, context = {}) {
   const newSection = lines.join('\n');
 
   try {
-    if (!existsSync(claudePath)) {
-      // Create CLAUDE.md with just the Current State section
-      writeFileSync(claudePath, newSection + '\n', 'utf-8');
-      return { updated: true, path: claudePath };
+    mkdirSync(join(projectDir, '.chati'), { recursive: true });
+    if (!existsSync(contextPath)) {
+      writeFileSync(contextPath, newSection + '\n', 'utf-8');
+      return { updated: true, path: contextPath };
     }
 
-    const content = readFileSync(claudePath, 'utf-8');
+    const content = readFileSync(contextPath, 'utf-8');
 
     // Handle empty file as creation
     if (!content || content.trim().length === 0) {
-      writeFileSync(claudePath, newSection + '\n', 'utf-8');
-      return { updated: true, path: claudePath };
+      writeFileSync(contextPath, newSection + '\n', 'utf-8');
+      return { updated: true, path: contextPath };
     }
 
     let updatedContent;
     if (SECTION_REGEX.test(content)) {
       // Replace existing section
-      updatedContent = content.replace(SECTION_REGEX, newSection);
+      updatedContent = content.replace(SECTION_REGEX, `${newSection}\n`);
     } else {
-      // Find insertion point — after first heading or at the top
-      const firstHeadingEnd = content.indexOf('\n## ');
-      if (firstHeadingEnd !== -1) {
-        // Insert before the first ## section
-        updatedContent = content.slice(0, firstHeadingEnd) + '\n\n' + newSection + '\n' + content.slice(firstHeadingEnd);
+      // Managed installer metadata must remain replaceable without swallowing
+      // runtime state. Insert state immediately after that managed block.
+      const managedEnd = '<!-- chati-context:end -->';
+      const managedEndIndex = content.indexOf(managedEnd);
+      if (managedEndIndex !== -1) {
+        const insertionPoint = managedEndIndex + managedEnd.length;
+        updatedContent = content.slice(0, insertionPoint) + '\n\n' + newSection + content.slice(insertionPoint);
       } else {
-        // Append at end
-        updatedContent = content.trimEnd() + '\n\n' + newSection + '\n';
+        // Legacy context: insert before the first secondary section.
+        const firstHeadingEnd = content.indexOf('\n## ');
+        if (firstHeadingEnd !== -1) {
+        // Insert before the first ## section
+          updatedContent = content.slice(0, firstHeadingEnd) + '\n\n' + newSection + '\n' + content.slice(firstHeadingEnd);
+        } else {
+          // Append at end
+          updatedContent = content.trimEnd() + '\n\n' + newSection + '\n';
+        }
       }
     }
 
-    writeFileSync(claudePath, updatedContent, 'utf-8');
-    return { updated: true, path: claudePath };
+    writeFileSync(contextPath, updatedContent, 'utf-8');
+    return { updated: true, path: contextPath };
   } catch { /* expected: operation may fail gracefully */
-    return { updated: false, path: claudePath };
+    return { updated: false, path: contextPath };
   }
 }
+
+// Backward-compatible export for integrations compiled against the old name.
+export const updateClaudeMd = updateProjectContext;

package/src/orchestrator/cli.js

@@ -12,6 +12,7 @@
  */
 
 import { resolveFrameworkDir } from '../utils/framework-dir.js';
+import { parseProviderConfig } from '../utils/config-parser.js';
 import { isFeatureEnabled } from '../utils/feature-flags.js';
 import { runScriptTask, formatScriptHandoff } from '../executors/runner.js';
 
@@ -52,7 +53,7 @@ import {
 import {
   recordEvent, EventType, clearTimeline,
 } from '../intelligence/timeline.js';
-import { updateClaudeMd } from '../memory/magic-docs.js';
+import { updateProjectContext } from '../memory/magic-docs.js';
 import {
   loadRuntimeInstallationV2, resolveRuntimeInvocationV2,
   describeRuntimeInstallationV2, V2_PLANNING_AGENTS,
@@ -571,13 +572,14 @@ function sessionToPipelineState(session, projectDir) {
  * Exported for testing (path resolution must hold in every install layout).
  */
 export function buildSpawnCommand(agent, projectDir, previousAgent, provider, timeout, model = null, strictProvider = false, routing = {}) {
+  if (!provider) throw new Error('A routed provider is required to build an agent spawn command');
   const parts = [
     'node', RUNNER('run-agent.js'),
     '--agent', agent,
     '--task-id', `${agent}-task`,
     '--project-dir', JSON.stringify(resolve(projectDir)),
     '--previous-agent', previousAgent || 'none',
-    '--provider', provider || 'claude',
+    '--provider', provider,
     ...(model ? ['--model', model] : []),
     ...(routing.provider_id ? ['--provider-id', routing.provider_id] : []),
     ...(routing.reasoning_configuration ? ['--reasoning-configuration', routing.reasoning_configuration] : []),
@@ -593,6 +595,7 @@ export function buildSpawnCommand(agent, projectDir, previousAgent, provider, ti
  * Exported for testing.
  */
 export function buildParallelSpawnCommand(agents, projectDir, previousAgent, provider, timeout, model = null, strictProvider = false) {
+  if (!provider) throw new Error('A routed provider is required to build a parallel spawn command');
   const taskIds = agents.map(a => `${a}-task`).join(',');
   const parts = [
     'node', RUNNER('run-parallel.js'),
@@ -600,7 +603,7 @@ export function buildParallelSpawnCommand(agents, projectDir, previousAgent, pro
     '--task-ids', taskIds,
     '--project-dir', JSON.stringify(resolve(projectDir)),
     '--previous-agent', previousAgent || 'none',
-    '--provider', provider || 'claude',
+    '--provider', provider,
     ...(model ? ['--model', model] : []),
     ...(strictProvider ? ['--strict-provider'] : []),
     '--timeout', String(timeout || 900000),
@@ -622,10 +625,10 @@ export function buildRoutedParallelSpawnCommands(agents, projectDir, previousAge
 }
 
 /**
- * Model map — canonical model tier per agent.
- * Matches framework/hooks/model-governance.js AGENT_MODELS.
+ * Legacy v1 model map retained only for pre-v2 installations. New installs
+ * resolve exact task bindings from the signed capability snapshot.
  */
-const AGENT_MODEL_MAP = {
+const LEGACY_V1_AGENT_MODEL_MAP = {
   'greenfield-wu': { provider: 'claude', model: 'haiku', upgrade: 'sonnet if multi-stack or enterprise' },
   'brownfield-wu': { provider: 'claude', model: 'opus', upgrade: 'no downgrade' },
   brief:           { provider: 'claude', model: 'sonnet', upgrade: 'opus if enterprise or 10+ integrations' },
@@ -643,7 +646,8 @@ const AGENT_MODEL_MAP = {
 
 /**
  * Resolve provider and model for an agent.
- * Checks config.yaml for agent_overrides, falls back to AGENT_MODEL_MAP defaults.
+ * V2 uses the signed task catalog. Pre-v2 installations retain their explicit
+ * compatibility map and optional config overrides.
  */
 export function resolveAgentModel(agent, projectDir) {
   const v2Artifact = loadRuntimeInstallationV2(projectDir);
@@ -658,7 +662,7 @@ export function resolveAgentModel(agent, projectDir) {
       source: 'installation-v2',
     };
   }
-  const defaults = AGENT_MODEL_MAP[agent] || { provider: 'claude', model: 'sonnet', upgrade: '' };
+  const defaults = LEGACY_V1_AGENT_MODEL_MAP[agent] || { provider: 'claude', model: 'sonnet', upgrade: '' };
 
   // Check config.yaml for agent_overrides
   try {
@@ -690,7 +694,7 @@ function estimateContextBracket(completedCount, totalCount) {
 }
 
 /**
- * Write session lock block to CLAUDE.local.md.
+ * Write session lock blocks to every enabled harness's native local file.
  */
 function replaceBlock(content, startMarker, endMarker, newInner) {
   const block = `${startMarker}\n${newInner}\n${endMarker}`;
@@ -704,6 +708,7 @@ function replaceBlock(content, startMarker, endMarker, newInner) {
 
 function sessionLockTargets(projectDir) {
   const frameworkDir = resolveFrameworkDir(projectDir);
+  const enabled = new Set(parseProviderConfig(projectDir).enabled);
   return [
     { path: join(projectDir, 'CLAUDE.local.md'), invocation: '/chati', provider: 'claude' },
     { path: join(projectDir, 'AGENTS.override.md'), invocation: '$chati', provider: 'codex' },
@@ -714,7 +719,7 @@ function sessionLockTargets(projectDir) {
     orchestratorPath: existsSync(join(projectDir, frameworkDir, '.adapted', target.provider, 'orchestrator', 'chati.md'))
       ? `${frameworkDir}/.adapted/${target.provider}/orchestrator/chati.md`
       : `${frameworkDir}/orchestrator/chati.md`,
-  })).filter(({ path }) => path.endsWith('CLAUDE.local.md') || existsSync(path));
+  })).filter(({ provider, path }) => enabled.has(provider) && existsSync(path));
 }
 
 function removeLegacyPauseSection(content) {
@@ -763,7 +768,7 @@ function writeSessionLock(projectDir, currentAgent, stateInfo = {}) {
 }
 
 /**
- * Remove session lock block from CLAUDE.local.md.
+ * Remove session lock blocks from every enabled harness's native local file.
  */
 function removeSessionLock(projectDir, resumeMsg) {
   const stateInner = `## Current State
@@ -1352,15 +1357,15 @@ async function handleScaffoldDecision(projectDir, session, decision, agent, scor
 
   const nextAgent = advanceResult.nextAgent || '';
   const progress = getPipelineProgress(advanceResult.state || pipelineState);
-  try { updateClaudeMd(projectDir, { currentAgent: nextAgent, progress }); } catch { /* non-fatal */ }
+  try { updateProjectContext(projectDir, { currentAgent: nextAgent, progress: progress.progress }); } catch { /* non-fatal */ }
   try {
     if (nextAgent) {
       writeSessionLock(projectDir, nextAgent, {
         phase:    updates.mode || session.mode,
         mode:     session.execution_mode || 'interactive',
         position: updates.pipeline_position,
-        total:    progress.total,
-        progress: progress.percent,
+        total:    progress.totalAgents,
+        progress: progress.progress,
       });
     }
   } catch { /* non-fatal */ }
@@ -1954,9 +1959,9 @@ async function handleAdvance(projectDir, args) {
         phase: 'rail', mode: session.execution_mode || 'interactive',
         position: runtimePipeline.length, total: runtimePipeline.length, progress: 100,
       });
-      updateClaudeMd(projectDir, {
+      updateProjectContext(projectDir, {
         currentAgent: 'rail',
-        progress: { progress: 100, completedCount: runtimePipeline.length, totalAgents: runtimePipeline.length },
+        progress: 100,
       });
     } catch { /* non-fatal: the canonical session state has already been persisted */ }
     return {
@@ -2069,12 +2074,12 @@ async function handleAdvance(projectDir, args) {
     return errorResult(`Session update failed: ${saveResult.error}`, 'SESSION_WRITE_FAILED');
   }
 
-  // Refresh Magic Docs: CLAUDE.md (public) + CLAUDE.local.md (runtime lock+state).
+  // Refresh the provider-neutral project context and native runtime locks.
   // Non-fatal: if updates fail, pipeline state already advanced on disk.
   const nextAgent = advanceResult.nextAgent || '';
   const progress = getPipelineProgress(advanceResult.state || pipelineState);
   try {
-    updateClaudeMd(projectDir, { currentAgent: nextAgent, progress });
+    updateProjectContext(projectDir, { currentAgent: nextAgent, progress: progress.progress });
   } catch { /* non-fatal */ }
   try {
     if (nextAgent) {
@@ -2082,8 +2087,8 @@ async function handleAdvance(projectDir, args) {
         phase: updates.mode || session.mode,
         mode: session.execution_mode || 'interactive',
         position: updates.pipeline_position,
-        total: progress.total,
-        progress: progress.percent,
+        total: progress.totalAgents,
+        progress: progress.progress,
       });
     } else {
       // Pipeline complete: reset lock to INACTIVE
@@ -2237,6 +2242,7 @@ async function handleInit(projectDir, args) {
   let preservedName = args.name || '';
   let preservedIdes = [];
   let preservedMcps = [];
+  let preservedProviders = [];
   try {
     const existingPath = join(projectDir, '.chati', 'session.yaml');
     if (existsSync(existingPath)) {
@@ -2244,8 +2250,12 @@ async function handleInit(projectDir, args) {
       preservedName = preservedName || existing.project?.name || '';
       preservedIdes = existing.ides || [];
       preservedMcps = existing.mcps || [];
+      preservedProviders = existing.providers_enabled || [];
     }
   } catch { /* expected: session may not exist */ }
+  if (preservedProviders.length === 0) {
+    preservedProviders = parseProviderConfig(projectDir).enabled;
+  }
   const name = preservedName;
 
   const isGreenfield = type === 'greenfield';
@@ -2289,6 +2299,7 @@ async function handleInit(projectDir, args) {
       language,
       ides: preservedIdes,
       mcps: preservedMcps,
+      providersEnabled: preservedProviders,
     });
 
     if (!result.created) {
@@ -2395,7 +2406,7 @@ async function handleStatus(projectDir) {
   // (no context_* fields yet), the block falls back to estimateContextBracket
   // so the existing response shape stays stable for consumers.
   const activeModel     = session.active_model || null;
-  const activeProvider  = session.active_provider || (session.providers_enabled || ['claude'])[0];
+  const activeProvider  = session.active_provider || (session.providers_enabled || [])[0] || null;
   const windowTokens    = session.context_window_tokens != null
     ? session.context_window_tokens
     : resolveContextLimit(activeModel, activeProvider);
@@ -2758,12 +2769,9 @@ function generateTeamId(slug) {
 }
 
 /**
- * Agent Teams require BOTH the feature flag AND a Claude provider.
- *
- * Why provider gate: Agent Teams uses Claude Code's native Task tool / subagent
- * spawn API. Gemini and Codex have no equivalent — calling spawn_team for those
- * providers would fail. We always fall back silently to spawn_parallel
- * (Gemini) or spawn_autonomous (Codex) when the active provider is not claude.
+ * The legacy native team runner requires an explicitly active Claude harness.
+ * Runtime v2 always uses the strict provider-neutral parallel runner, whose
+ * members keep their own signed provider and model bindings.
  */
 export function isAgentTeamsEnabled(projectDir) {
   // The v1 Agent Teams runner is Claude-specific. Provider-neutral v2 routes
@@ -2777,26 +2785,15 @@ export function isAgentTeamsEnabled(projectDir) {
 
   // Feature flag check
   const flagMatch = raw.match(/agent_teams:\s*(true|false)/);
-  // If field is explicitly set, respect it
-  if (flagMatch) {
-    if (flagMatch[1] !== 'true') return false;
-  } else {
-    // If field is absent (pre-v4.2.0 projects), default to true for Claude provider
-    // Claude Code supports Agent tool natively; Gemini/Codex fall back to sequential
-    const providerMatch = raw.match(/primary_provider:\s*["']?(\w+)/);
-    const provider = providerMatch ? providerMatch[1].toLowerCase() : 'claude';
-    if (provider !== 'claude') return false;
-  }
+  if (!flagMatch || flagMatch[1] !== 'true') return false;
 
-  // Provider gate — Agent Teams is Claude-only.
-  // Read primary_provider from session.yaml (preferred) or active_provider
-  // field. Default to 'claude' if neither exists (early bootstrap).
+  // Never infer a primary harness. The legacy native team path is available
+  // only while the session explicitly records Claude as the active provider.
   const sessionPath = join(projectDir, '.chati', 'session.yaml');
-  if (!existsSync(sessionPath)) return true; // No session yet — assume claude
+  if (!existsSync(sessionPath)) return false;
   const sessionRaw = readFileSync(sessionPath, 'utf-8');
-  const providerMatch = sessionRaw.match(/^\s*(?:active_provider|primary_provider):\s*["']?(\w+)/m);
-  const provider = providerMatch ? providerMatch[1] : 'claude';
-  return provider === 'claude';
+  const providerMatch = sessionRaw.match(/^\s*active_provider:\s*["']?(\w+)/m);
+  return providerMatch?.[1] === 'claude';
 }
 
 async function handleSpawnTeam(projectDir, args) {
@@ -2890,7 +2887,15 @@ async function handleSpawnTeam(projectDir, args) {
 
   // Update session with team entry
   const previousAgent = args['previous-agent'] || 'none';
-  const provider = args.provider || 'claude';
+  const { session: activeSession } = loadSession(projectDir);
+  const provider = activeSession?.active_provider || null;
+  if (provider !== 'claude') {
+    return {
+      action: 'spawn_parallel',
+      fallback_required: true,
+      fallback_reason: 'native_team_requires_explicit_claude_session',
+    };
+  }
 
   try {
     const { loaded, session } = loadSession(projectDir);

package/src/orchestrator/handoff-engine.js

@@ -8,7 +8,7 @@
 import { buildHandoff, saveHandoff, loadHandoff } from '../tasks/handoff.js';
 import { readAgentMemory } from '../memory/agent-memory.js';
 import { getRelevantGotchas } from '../memory/gotchas.js';
-import { updateClaudeMd } from '../memory/magic-docs.js';
+import { updateProjectContext } from '../memory/magic-docs.js';
 import { generateContextFiles } from '../config/context-file-generator.js';
 import { existsSync, readdirSync } from 'fs';
 import { join } from 'path';
@@ -68,14 +68,16 @@ export function executeHandoff(projectDir, params) {
       };
     }
 
-    // Auto-update CLAUDE.md with current state (Magic Docs)
+    // Update the provider-neutral Chati project context (Magic Docs).
     try {
       const agentName = params.fromTask?.agent || params.fromTask?.name || params.fromTask?.id?.split('-')[0] || 'agent';
-      updateClaudeMd(projectDir, {
+      updateProjectContext(projectDir, {
         currentAgent: agentName,
         pipelinePosition: handoff.status || 'in_progress',
         activeTask: params.fromTask?.title || params.fromTask?.id || null,
-        progress: params.validation?.score || null,
+        validationScore: typeof params.validation?.score === 'number'
+          ? params.validation.score
+          : null,
         decisions: params.decisions
           ? Object.entries(params.decisions).map(([what, why]) => ({ what, why: String(why) }))
           : [],
@@ -85,7 +87,7 @@ export function executeHandoff(projectDir, params) {
       });
     } catch { /* Magic Docs update is non-critical */ }
 
-    // Sync GEMINI.md and AGENTS.md with updated CLAUDE.md (multi-CLI parity)
+    // Regenerate native harness contexts from the neutral canonical artifact.
     try {
       generateContextFiles(projectDir);
     } catch { /* Context file sync is non-critical */ }

package/src/orchestrator/session-manager.js

@@ -135,7 +135,7 @@ const DEFAULT_SESSION = {
   // Execution Mode (Article XVII) — canonical. Article XVIII was deprecated
   // 2026-04-18: execution_profile + profile_transitions were folded into
   // execution_mode (set in DEFAULT_SESSION above as 'interactive'/'autonomous').
-  providers_enabled: ['claude'],
+  providers_enabled: [],
   // BUILD → DEPLOY preview state (user approves before devops ships).
   preview: {
     status: 'inactive',
@@ -176,6 +176,7 @@ export function initSession(projectDir, options = {}) {
     started_at: new Date().toISOString(),
     ides: options.ides || [],
     mcps: options.mcps || [],
+    providers_enabled: options.providersEnabled || [],
   };
 
   try {
@@ -219,7 +220,8 @@ export function migrateSession(session) {
       if (entry.task_id && entry.provider && entry.model) return entry;
       const model = entry.actual || entry.recommended;
       if (!entry.agent || !model || !entry.timestamp) return entry;
-      const provider = entry.provider || 'claude';
+      const provider = entry.provider || inferLegacyProvider(model);
+      if (!provider) return entry;
       if (!['claude', 'codex', 'grok', 'gemini'].includes(provider)) return entry;
       normalizedLegacySelections = true;
       return {
@@ -279,7 +281,17 @@ export function migrateSession(session) {
   if (!Array.isArray(session.decision_trail))       session.decision_trail = [];
   if (!Array.isArray(session.teams))                session.teams = [];
   if (!Array.isArray(session.team_events))          session.team_events = [];
-  if (!Array.isArray(session.providers_enabled))    session.providers_enabled = ['claude'];
+  if (!Array.isArray(session.providers_enabled)) {
+    const providersByIde = {
+      'claude-code': 'claude',
+      'gemini-cli': 'gemini',
+      'codex-cli': 'codex',
+      'grok-cli': 'grok',
+    };
+    const inferred = (session.ides || []).map(ide => providersByIde[ide]).filter(Boolean);
+    if (session.active_provider) inferred.unshift(session.active_provider);
+    session.providers_enabled = [...new Set(inferred)];
+  }
   if (!Array.isArray(session.model_selections))     session.model_selections = [];
   if (!session.preview || typeof session.preview !== 'object') {
     session.preview = {
@@ -329,6 +341,15 @@ export function migrateSession(session) {
   return { migrated: true, fromVersion, toVersion: CURRENT_SCHEMA_VERSION };
 }
 
+function inferLegacyProvider(model) {
+  const normalized = String(model || '').toLowerCase();
+  if (/claude|opus|sonnet|haiku|fable/.test(normalized)) return 'claude';
+  if (/grok/.test(normalized)) return 'grok';
+  if (/gemini/.test(normalized)) return 'gemini';
+  if (/gpt|codex|terra|luna/.test(normalized)) return 'codex';
+  return null;
+}
+
 /**
  * Load current session state.
  * @param {string} projectDir

package/src/terminal/cli-registry.js

@@ -128,7 +128,7 @@ export function getAllProviders() {
  * Load enabled providers from project config.yaml.
  *
  * @param {string} projectDir - Project root directory
- * @returns {{ primary: string, enabled: string[] }}
+ * @returns {{ primary: string|null, enabled: string[] }}
  */
 export function loadEnabledProviders(projectDir) {
   const { primary, enabled } = parseProviderConfig(projectDir);
@@ -136,7 +136,7 @@ export function loadEnabledProviders(projectDir) {
 
   // Filter out invalid provider names (typos in config.yaml)
   const validEnabled = enabled.filter(name => validNames.includes(name));
-  const validPrimary = validNames.includes(primary) ? primary : validEnabled[0] || null;
+  const validPrimary = validNames.includes(primary) ? primary : null;
 
   return { primary: validPrimary, enabled: validEnabled };
 }
@@ -148,7 +148,7 @@ export function loadEnabledProviders(projectDir) {
  * @param {string} agent - Agent name
  * @param {string} projectDir - Project root directory
  * @param {Record<string, {provider: string, model: string, tier: string}>} agentModels - Agent model assignments
- * @returns {{ provider: string, model: string }}
+ * @returns {{ provider: string|null, model: string|null }}
  */
 export function resolveProviderForAgent(agent, projectDir, agentModels) {
   const { primary, enabled } = loadEnabledProviders(projectDir);
@@ -174,8 +174,8 @@ export function resolveProviderForAgent(agent, projectDir, agentModels) {
   // Legacy fallback only. Installation v2 routes from the signed task catalog.
   const fallbackProvider = primary || enabled[0];
   const provider = PROVIDERS[fallbackProvider];
-  const defaultModel = provider ? Object.keys(provider.modelMap)[0] : 'sonnet';
-  return { provider: fallbackProvider, model: defaultModel };
+  const defaultModel = provider ? Object.keys(provider.modelMap)[0] : null;
+  return { provider: fallbackProvider || null, model: defaultModel };
 }
 
 /**

package/src/terminal/prompt-builder.js

@@ -2,7 +2,7 @@
  * @fileoverview Prompt builder for multi-terminal agent execution.
  *
  * Builds a complete, self-contained prompt for spawned agent terminals.
- * When an agent runs in a separate `claude -p` process, it has zero
+ * When an agent runs in a separate provider process, it has zero
  * conversation history — the prompt must contain everything: PRISM
  * context, agent definition, previous handoff, write scope, and
  * output format instructions.
@@ -18,7 +18,7 @@ import { resolveOverlayPath } from '../installer/provider-overlay.js';
 import { resolveProviderForAgent } from './cli-registry.js';
 import { buildCompactGotchasSummary } from '../memory/gotchas-injector.js';
 import { estimateTokens } from './cost-tracker.js';
-import { PROVIDER_LIMITS as PROVIDER_TOKEN_LIMITS } from '../utils/provider-limits.js';
+import { resolveContextLimit } from '../utils/provider-limits.js';
 
 // Import AGENT_MODELS from model-governance (safe — named export,
 // does not trigger main() which is guarded by fileURLToPath check).
@@ -152,6 +152,10 @@ export function buildAgentPrompt(config) {
   if (!config.projectDir) {
     throw new Error('buildAgentPrompt requires config.projectDir');
   }
+  const runtimeV2 = existsSync(join(config.projectDir, '.chati', 'v2', 'installation.json'));
+  if (runtimeV2 && (!config.provider || !config.model)) {
+    throw new Error('Runtime v2 requires an exact routed provider and model binding');
+  }
 
   const sections = [];
 
@@ -203,8 +207,8 @@ export function buildAgentPrompt(config) {
   const resolved = (config.projectDir && AGENT_MODELS[config.agent])
     ? resolveProviderForAgent(config.agent, config.projectDir, AGENT_MODELS)
     : { provider: staticAssignment.provider, model: staticAssignment.model };
-  const resolvedProvider = config.provider || resolved.provider || 'claude';
-  const model = config.model || resolved.model || staticAssignment.model || 'sonnet';
+  const resolvedProvider = config.provider || resolved.provider || staticAssignment.provider;
+  const model = config.model || resolved.model || staticAssignment.model;
 
   // 8. Session context (uses resolved model/provider)
   sections.push(buildSessionSection(config, { model, provider: resolvedProvider }));
@@ -391,8 +395,8 @@ function buildSessionSection(config, resolvedModelInfo = {}) {
     `- **User Level**: ${state.user_level || 'auto'}`,
     `- **Execution Mode**: ${state.execution_mode || 'autonomous'}`,
     `- **Your Agent**: ${config.agent}`,
-    `- **Your Model**: ${resolvedModelInfo.model || 'sonnet'}`,
-    `- **Your Provider**: ${resolvedModelInfo.provider || 'claude'}`,
+    `- **Your Model**: ${resolvedModelInfo.model || 'unbound'}`,
+    `- **Your Provider**: ${resolvedModelInfo.provider || 'unbound'}`,
   ];
 
   return lines.join('\n');
@@ -479,11 +483,11 @@ export function buildAntiLazinessSection(agent) {
  * Validate prompt size against provider-specific limits.
  *
  * @param {string} prompt - The assembled prompt string
- * @param {string} [provider='claude'] - Provider name for limit lookup
+ * @param {string|null} [provider=null] - Provider name for limit lookup
  * @returns {{ valid: boolean, level: string, ratio: number, estimatedTokens: number, limit: number, message: string|null }}
  */
-export function validatePromptSize(prompt, provider = 'claude') {
-  const limit = PROVIDER_TOKEN_LIMITS[provider] || PROVIDER_TOKEN_LIMITS.claude;
+export function validatePromptSize(prompt, provider = null) {
+  const limit = resolveContextLimit(undefined, provider);
   const tokens = estimateTokens(prompt);
   const ratio = tokens / limit;
 
@@ -737,7 +741,7 @@ export function buildPresetSection(preset) {
  * Build output format instructions so the agent produces a parseable handoff.
  */
 function buildOutputInstructions(config) {
-  const providerValue = config?.provider || 'claude';
+  const providerValue = config?.provider || 'unbound';
   const modelValue = config?.model || 'unknown';
 
   return `<!-- OUTPUT INSTRUCTIONS -->