@geminilight/mindos 1.0.29 → 1.1.4

package/dist/server/handlers/agent-runtime-codex.js

@@ -1,5 +1,8 @@
 import { createCodexAppServerClient, createCodexAppServerStdioTransport, } from '../../agent-runtime/codex-app-server.js';
+import { compactRuntimeFailureMessage } from '../../agent-runtime/runtime-errors.js';
+import { resolveCommandPath } from '../../protocols/acp/index.js';
 import { errorResponse, json } from '../response.js';
+import { defaultCheckNativeRuntimeHealth, } from './agent-runtimes.js';
 const NO_STORE_HEADERS = { 'Cache-Control': 'no-store' };
 const MAX_THREAD_LIST_LIMIT = 100;
 export async function handleCodexThreadsGet(searchParams, services = {}) {
@@ -12,7 +15,7 @@ export async function handleCodexThreadsGet(searchParams, services = {}) {
         });
     }
     catch (error) {
-        return errorResponse(error);
+        return codexThreadErrorResponse(error);
     }
 }
 export async function handleCodexThreadGet(threadId, searchParams, services = {}) {
@@ -28,7 +31,7 @@ export async function handleCodexThreadGet(threadId, searchParams, services = {}
         });
     }
     catch (error) {
-        return errorResponse(error);
+        return codexThreadErrorResponse(error);
     }
 }
 export async function handleCodexThreadForkPost(threadId, body, services = {}) {
@@ -42,7 +45,7 @@ export async function handleCodexThreadForkPost(threadId, body, services = {}) {
         });
     }
     catch (error) {
-        return errorResponse(error);
+        return codexThreadErrorResponse(error);
     }
 }
 export async function handleCodexThreadArchivePost(threadId, services = {}) {
@@ -54,7 +57,7 @@ export async function handleCodexThreadArchivePost(threadId, services = {}) {
         return json({ ok: true }, { headers: NO_STORE_HEADERS });
     }
     catch (error) {
-        return errorResponse(error);
+        return codexThreadErrorResponse(error);
     }
 }
 export async function handleCodexThreadUnarchivePost(threadId, services = {}) {
@@ -67,10 +70,28 @@ export async function handleCodexThreadUnarchivePost(threadId, services = {}) {
         });
     }
     catch (error) {
-        return errorResponse(error);
+        return codexThreadErrorResponse(error);
     }
 }
+class CodexThreadRuntimeUnavailableError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'CodexThreadRuntimeUnavailableError';
+    }
+}
+function codexThreadErrorResponse(error) {
+    const status = error instanceof CodexThreadRuntimeUnavailableError ? 409 : 500;
+    const message = error instanceof Error ? error.message : String(error);
+    const compactError = new Error(compactRuntimeFailureMessage(message, {
+        runtime: 'codex',
+        fallback: 'Codex app-server error',
+    }));
+    if (error instanceof Error)
+        compactError.name = error.name;
+    return errorResponse(compactError, status);
+}
 async function withCodexClient(services, run) {
+    await ensureCodexThreadRuntimeAvailable(services);
     const client = await (services.createCodexClient?.() ?? createCodexAppServerClient(createCodexAppServerStdioTransport()));
     try {
         await client.initialize();
@@ -80,6 +101,22 @@ async function withCodexClient(services, run) {
         await client.close?.();
     }
 }
+async function ensureCodexThreadRuntimeAvailable(services) {
+    if (services.createCodexClient)
+        return;
+    const resolveRuntimeCommand = services.resolveRuntimeCommand ?? resolveCommandPath;
+    const binaryPath = await resolveRuntimeCommand('codex');
+    if (!binaryPath) {
+        throw new CodexThreadRuntimeUnavailableError('Codex executable was not detected. Install Codex or start MindOS from an environment where the codex command is available.');
+    }
+    const health = await (services.checkCodexRuntimeHealth?.(binaryPath) ?? defaultCheckNativeRuntimeHealth({
+        runtime: 'codex',
+        agent: { id: 'codex-acp', name: 'Codex', binaryPath },
+    }));
+    if (health.status !== 'available') {
+        throw new CodexThreadRuntimeUnavailableError(`Codex is ${health.status === 'signed-out' ? 'signed out' : 'unavailable'}.${health.reason ? ` ${health.reason}` : ''}`);
+    }
+}
 function parseThreadListParams(searchParams) {
     const limit = parseLimit(searchParams.get('limit'));
     if (limit instanceof Error)

package/dist/server/handlers/agent-runtime-codex.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-runtime-codex.js","sourceRoot":"","sources":["../../../src/server/handlers/agent-runtime-codex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-runtime-codex.js","sourceRoot":"","sources":["../../../src/server/handlers/agent-runtime-codex.ts"],"names":[],"mappings":"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"}

package/dist/server/handlers/agent-runtimes.d.ts

@@ -1,4 +1,6 @@
 import { type AcpAgentOverride } from '../../protocols/acp/index.js';
+import { type CodexShellEnvValueReader } from '../../agent-runtime/codex-env.js';
+import type { AgentRuntimeEnvironmentSettings } from '../../agent-runtime/runtime-env.js';
 import { type MindosServerResponse } from '../response.js';
 export type AgentRuntimeKind = 'mindos' | 'acp' | 'codex' | 'claude';
 export type AgentRuntimeStatus = 'available' | 'missing' | 'signed-out' | 'error';
@@ -83,6 +85,7 @@ export type AgentRuntimePayload = {
 };
 export type AgentRuntimesSettings = {
     acpAgents?: Record<string, AcpAgentOverride>;
+    agentRuntimeEnv?: AgentRuntimeEnvironmentSettings;
 };
 export type NativeRuntimeHealthResult = {
     status: Exclude<AgentRuntimeStatus, 'missing'>;
@@ -117,8 +120,15 @@ export declare function checkCodexProviderEnvironment(input?: {
     env?: NodeJS.ProcessEnv;
     configText?: string;
     configPath?: string;
+    readShellEnvValue?: CodexShellEnvValueReader;
 }): NativeRuntimeHealthResult;
 export declare function defaultCheckNativeRuntimeHealth(input: NativeRuntimeHealthInput): Promise<NativeRuntimeHealthResult>;
+export declare function checkClaudeRuntimeHealth(input: {
+    binaryPath: string;
+    timeoutMs?: number;
+    importSdk?: () => Promise<unknown>;
+    checkCliVersion?: (binaryPath: string, timeoutMs: number) => Promise<NativeRuntimeHealthResult>;
+}): Promise<NativeRuntimeHealthResult>;
 export declare function handleAgentRuntimesGet(searchParams: URLSearchParams, services?: AgentRuntimesServices): Promise<MindosServerResponse<AgentRuntimesPayload | AgentRuntimePayload | {
     error: string;
 }>>;

package/dist/server/handlers/agent-runtimes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-runtimes.d.ts","sourceRoot":"","sources":["../../../src/server/handlers/agent-runtimes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-runtimes.d.ts","sourceRoot":"","sources":["../../../src/server/handlers/agent-runtimes.ts"],"names":[],"mappings":"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"}

package/dist/server/handlers/agent-runtimes.js

@@ -1,8 +1,7 @@
 import { detectLocalAcpAgents as defaultDetectLocalAcpAgents, resolveCommandPath, } from '../../protocols/acp/index.js';
+import { readCodexConfigText, resolveCodexProviderEnvironment, } from '../../agent-runtime/codex-env.js';
+import { compactRuntimeDiagnosticHints, summarizeRuntimeFailure, } from '../../agent-runtime/runtime-errors.js';
 import { spawn } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import { errorResponse, json, privateCacheHeaders } from '../response.js';
 const mindosCapabilities = {
     ownsModelSelection: true,
@@ -80,15 +79,28 @@ const nativeRuntimeDefinitions = [
 function isRecord(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
-function classifyRuntimeFailure(message) {
+function classifyRuntimeFailure(message, runtime) {
     const normalized = message.trim() || 'Runtime failed to start.';
+    const summary = summarizeRuntimeFailure(normalized, { runtime });
     if (/\b(login|log in|signin|sign in|auth|authentication|unauthori[sz]ed|credential|api key|token)\b/i.test(normalized)) {
-        return { status: 'signed-out', reason: normalized };
+        return {
+            status: 'signed-out',
+            reason: summary.reason,
+            ...(summary.diagnosticHints ? { diagnosticHints: summary.diagnosticHints } : {}),
+        };
     }
     if (/missing environment variable/i.test(normalized)) {
-        return { status: 'signed-out', reason: normalized };
+        return {
+            status: 'signed-out',
+            reason: summary.reason,
+            ...(summary.diagnosticHints ? { diagnosticHints: summary.diagnosticHints } : {}),
+        };
     }
-    return { status: 'error', reason: normalized };
+    return {
+        status: 'error',
+        reason: summary.reason,
+        ...(summary.diagnosticHints ? { diagnosticHints: summary.diagnosticHints } : {}),
+    };
 }
 function isResolvedCommandSource(value) {
     return value === 'user-override' || value === 'descriptor' || value === 'registry';
@@ -163,9 +175,13 @@ function isClaudeAgent(agent) {
 }
 function nativeDescriptor(input) {
     const status = input.source ? input.source.status ?? 'available' : input.missing?.status ?? 'missing';
-    const reason = input.source?.reason ?? input.missing?.reason;
+    const rawReason = input.source?.reason ?? input.missing?.reason;
+    const reasonSummary = rawReason ? summarizeRuntimeFailure(rawReason, { runtime: input.id }) : null;
+    const reason = reasonSummary?.reason;
+    const sourceDiagnosticHints = compactRuntimeDiagnosticHints(input.source?.diagnosticHints ?? input.missing?.diagnosticHints, { runtime: input.id }).filter((hint) => hint !== reason);
     const diagnosticHints = Array.from(new Set([
-        ...(input.source?.diagnosticHints ?? input.missing?.diagnosticHints ?? []),
+        ...sourceDiagnosticHints,
+        ...(reasonSummary?.diagnosticHints ?? []),
         ...nativeRuntimeDiagnosticHints({
             id: input.id,
             name: input.name,
@@ -339,7 +355,7 @@ function buildAcpScopedPayload(input) {
     }));
     return { runtimes, installed, notInstalled };
 }
-async function checkProcessVersion(command, args, timeoutMs) {
+async function checkProcessVersion(command, args, timeoutMs, runtime) {
     return new Promise((resolve) => {
         const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'] });
         let stdout = '';
@@ -359,24 +375,24 @@ async function checkProcessVersion(command, args, timeoutMs) {
         }, timeoutMs);
         child.stdout.on('data', (chunk) => { stdout += String(chunk); });
         child.stderr.on('data', (chunk) => { stderr += String(chunk); });
-        child.once('error', (error) => finish(classifyRuntimeFailure(error.message)));
+        child.once('error', (error) => finish(classifyRuntimeFailure(error.message, runtime)));
         child.once('exit', (code) => {
             if (code === 0) {
                 finish({ status: 'available' });
                 return;
             }
-            finish(classifyRuntimeFailure((stderr || stdout || `${command} exited with code ${code ?? 'unknown'}`).trim()));
+            finish(classifyRuntimeFailure((stderr || stdout || `${command} exited with code ${code ?? 'unknown'}`).trim(), runtime));
         });
     });
 }
 async function checkCodexCliRuntime(command, timeoutMs) {
-    const appServerHelp = await checkProcessVersion(command, ['app-server', '--help'], timeoutMs);
+    const appServerHelp = await checkProcessVersion(command, ['app-server', '--help'], timeoutMs, 'codex');
     if (appServerHelp.status !== 'available')
         return appServerHelp;
     const providerEnvironment = checkCodexProviderEnvironment();
     if (providerEnvironment.status !== 'available')
         return providerEnvironment;
-    const loginStatus = await checkProcessVersion(command, ['login', 'status'], timeoutMs);
+    const loginStatus = await checkProcessVersion(command, ['login', 'status'], timeoutMs, 'codex');
     return mergeCodexProviderAndLoginHealth(providerEnvironment, loginStatus);
 }
 export function mergeCodexProviderAndLoginHealth(providerEnvironment, loginStatus) {
@@ -396,55 +412,36 @@ export function mergeCodexProviderAndLoginHealth(providerEnvironment, loginStatu
 }
 export function checkCodexProviderEnvironment(input = {}) {
     const env = input.env ?? process.env;
-    const configText = input.configText ?? readCodexConfigText(input.configPath, env);
-    if (!configText)
-        return { status: 'available' };
-    const provider = extractTomlStringValue(configText, 'model_provider');
-    if (!provider)
-        return { status: 'available' };
-    const providerSection = extractTomlSection(configText, `model_providers.${provider}`);
-    const envKey = providerSection ? extractTomlStringValue(providerSection, 'env_key') : undefined;
-    if (!envKey || env[envKey])
+    const resolution = resolveCodexProviderEnvironment({
+        env,
+        configText: input.configText,
+        configPath: input.configPath,
+        readShellEnvValue: input.readShellEnvValue,
+    });
+    if (!resolution.envKey)
         return { status: 'available' };
+    if (resolution.value) {
+        return {
+            status: 'available',
+            ...(resolution.source === 'login-shell'
+                ? { diagnosticHints: [`Codex provider environment key ${resolution.envKey} was found through MindOS runtime environment fallback and will be injected only into Codex app-server.`] }
+                : {}),
+        };
+    }
+    const configText = input.configText ?? readCodexConfigText(input.configPath, env);
+    const provider = configText ? extractTomlStringValue(configText, 'model_provider') : undefined;
     return {
         status: 'signed-out',
-        reason: `Codex model provider "${provider}" requires ${envKey}, but MindOS cannot see that environment variable. Export ${envKey} before starting MindOS, or switch Codex to a provider that does not require it.`,
+        reason: provider
+            ? `Codex model provider "${provider}" requires ${resolution.envKey}, but MindOS cannot see that environment variable in the app process, OS user environment, or login shell. Export ${resolution.envKey} in your shell profile or OS user environment before starting MindOS, or switch Codex to a provider that does not require it.`
+            : `Codex requires ${resolution.envKey}, but MindOS cannot see that environment variable in the app process, OS user environment, or login shell.`,
     };
 }
-function readCodexConfigText(configPath, env) {
-    const resolvedPath = configPath ?? join(env.CODEX_HOME || join(homedir(), '.codex'), 'config.toml');
-    try {
-        if (!existsSync(resolvedPath))
-            return undefined;
-        return readFileSync(resolvedPath, 'utf8');
-    }
-    catch {
-        return undefined;
-    }
-}
 function extractTomlStringValue(text, key) {
     const escapedKey = escapeRegExp(key);
     const match = text.match(new RegExp(`^\\s*${escapedKey}\\s*=\\s*"([^"]*)"\\s*$`, 'm'));
     return match?.[1]?.trim() || undefined;
 }
-function extractTomlSection(text, sectionName) {
-    const lines = text.split(/\r?\n/);
-    const targetHeader = `[${sectionName}]`;
-    const sectionLines = [];
-    let inSection = false;
-    for (const line of lines) {
-        const trimmed = line.trim();
-        if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
-            if (inSection)
-                break;
-            inSection = trimmed === targetHeader;
-            continue;
-        }
-        if (inSection)
-            sectionLines.push(line);
-    }
-    return inSection ? sectionLines.join('\n') : undefined;
-}
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -453,32 +450,52 @@ export async function defaultCheckNativeRuntimeHealth(input) {
     if (input.runtime === 'codex') {
         return checkCodexCliRuntime(input.agent.binaryPath, timeoutMs);
     }
-    return checkClaudeSdkRuntime(input.agent.binaryPath, timeoutMs);
+    return checkClaudeRuntimeHealth({ binaryPath: input.agent.binaryPath, timeoutMs });
 }
-async function checkClaudeSdkRuntime(binaryPath, timeoutMs) {
-    try {
-        await withTimeout(import('@anthropic-ai/claude-agent-sdk'), timeoutMs, `Claude Agent SDK health check timed out after ${timeoutMs}ms.`);
+export async function checkClaudeRuntimeHealth(input) {
+    const timeoutMs = input.timeoutMs ?? NATIVE_HEALTH_TIMEOUT_MS;
+    const binaryPath = input.binaryPath;
+    const importSdk = input.importSdk ?? (() => import('@anthropic-ai/claude-agent-sdk'));
+    const checkCliVersion = input.checkCliVersion ?? ((path, ms) => checkProcessVersion(path, ['--version'], ms, 'claude'));
+    if (!binaryPath.trim() || binaryPath.startsWith('sdk:')) {
         return {
-            status: 'available',
+            status: 'error',
+            reason: 'Claude Code requires a local claude executable on the MindOS server PATH. MindOS does not bundle the Claude Agent SDK native runtime.',
             diagnosticHints: [
-                binaryPath.startsWith('sdk:')
-                    ? 'Claude Agent SDK is bundled with MindOS; a global claude command is optional.'
-                    : `Claude CLI was also detected at ${binaryPath}; MindOS uses Claude Agent SDK first and falls back to CLI if needed.`,
+                'Install Claude Code locally and restart MindOS so the server process can resolve the claude command.',
             ],
         };
     }
-    catch (error) {
-        if (!binaryPath.startsWith('sdk:')) {
-            const fallback = await checkProcessVersion(binaryPath, ['--version'], timeoutMs);
+    const cliHealth = await checkCliVersion(binaryPath, timeoutMs);
+    if (cliHealth.status !== 'available')
+        return cliHealth;
+    try {
+        const sdk = await withTimeout(importSdk(), timeoutMs, `Claude Agent SDK health check timed out after ${timeoutMs}ms.`);
+        if (typeof sdk.query === 'function') {
             return {
-                ...fallback,
+                status: 'available',
                 diagnosticHints: [
-                    ...(fallback.diagnosticHints ?? []),
-                    `Claude Agent SDK is unavailable; MindOS will use CLI fallback. ${error instanceof Error ? error.message : String(error)}`,
+                    ...(cliHealth.diagnosticHints ?? []),
+                    `Claude Agent SDK bridge is available and will use the local Claude Code CLI at ${binaryPath}.`,
                 ],
             };
         }
-        throw error;
+        return {
+            status: 'available',
+            diagnosticHints: [
+                ...(cliHealth.diagnosticHints ?? []),
+                `Claude Code CLI is available at ${binaryPath}; Claude Agent SDK bridge did not expose query(), so MindOS will use CLI fallback.`,
+            ],
+        };
+    }
+    catch (error) {
+        return {
+            status: 'available',
+            diagnosticHints: [
+                ...(cliHealth.diagnosticHints ?? []),
+                `Claude Code CLI is available at ${binaryPath}; Claude Agent SDK bridge is unavailable, so MindOS will use CLI fallback. ${error instanceof Error ? error.message : String(error)}`,
+            ],
+        };
     }
 }
 async function applyNativeRuntimeHealth(installed, services) {
@@ -506,7 +523,7 @@ async function applyNativeRuntimeHealth(installed, services) {
             };
         }
         catch (error) {
-            const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error));
+            const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error), runtime);
             return {
                 ...(isRecord(raw) ? raw : detected),
                 status: result.status,
@@ -519,40 +536,11 @@ async function applyNativeRuntimeHealth(installed, services) {
 async function detectNativeRuntimeDefinition(candidate, services) {
     const checkNativeRuntimeHealth = services.checkNativeRuntimeHealth ?? defaultCheckNativeRuntimeHealth;
     const resolveRuntimeCommand = services.resolveRuntimeCommand ?? resolveCommandPath;
+    if (candidate.runtime === 'claude') {
+        return detectClaudeNativeRuntimeDefinition(candidate, services);
+    }
     const binaryPath = await resolveRuntimeCommand(candidate.command);
     if (!binaryPath) {
-        if (candidate.runtime === 'claude') {
-            const sdkBinaryPath = 'sdk:@anthropic-ai/claude-agent-sdk';
-            try {
-                const health = await checkNativeRuntimeHealth({
-                    runtime: candidate.runtime,
-                    agent: { id: candidate.id, name: candidate.name, binaryPath: sdkBinaryPath },
-                    timeoutMs: NATIVE_HEALTH_TIMEOUT_MS,
-                });
-                return {
-                    id: candidate.id,
-                    name: candidate.name,
-                    binaryPath: sdkBinaryPath,
-                    status: health.status,
-                    reason: health.reason,
-                    diagnosticHints: [
-                        ...(health.diagnosticHints ?? []),
-                        'Global claude command was not detected; CLI fallback will be unavailable until it is installed or on MindOS server PATH.',
-                    ],
-                };
-            }
-            catch (error) {
-                const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error));
-                return {
-                    id: candidate.id,
-                    name: candidate.name,
-                    installCmd: candidate.installCmd,
-                    packageName: candidate.installCmd.match(/npm install -g (.+)/)?.[1],
-                    status: 'error',
-                    reason: `Claude Agent SDK is unavailable and the global claude command was not detected. ${result.reason ?? ''}`.trim(),
-                };
-            }
-        }
         return {
             id: candidate.id,
             name: candidate.name,
@@ -579,7 +567,59 @@ async function detectNativeRuntimeDefinition(candidate, services) {
         };
     }
     catch (error) {
-        const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error));
+        const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error), candidate.runtime);
+        return {
+            id: candidate.id,
+            name: candidate.name,
+            binaryPath,
+            resolvedCommand: { cmd: candidate.command, args: [], source: 'descriptor' },
+            status: result.status,
+            ...(result.reason ? { reason: result.reason } : {}),
+        };
+    }
+}
+async function detectClaudeNativeRuntimeDefinition(candidate, services) {
+    const checkNativeRuntimeHealth = services.checkNativeRuntimeHealth ?? defaultCheckNativeRuntimeHealth;
+    const resolveRuntimeCommand = services.resolveRuntimeCommand ?? resolveCommandPath;
+    const commandResolution = { failureReason: undefined };
+    const binaryPath = await withTimeout(resolveRuntimeCommand(candidate.command), RUNTIME_DETECTION_TIMEOUT_MS, `Claude Code executable detection timed out after ${RUNTIME_DETECTION_TIMEOUT_MS}ms.`).catch((error) => {
+        commandResolution.failureReason = error instanceof Error ? error.message : String(error);
+        return null;
+    });
+    if (!binaryPath) {
+        const timedOut = commandResolution.failureReason?.includes('timed out after');
+        return {
+            id: candidate.id,
+            name: candidate.name,
+            installCmd: candidate.installCmd,
+            packageName: candidate.installCmd.match(/npm install -g (.+)/)?.[1],
+            status: 'missing',
+            reason: timedOut
+                ? `${commandResolution.failureReason} MindOS does not bundle the Claude Agent SDK native runtime.`
+                : 'Claude Code executable was not detected. MindOS does not bundle the Claude Agent SDK native runtime.',
+            diagnosticHints: [
+                'Install Claude Code locally or add claude to the PATH used to start MindOS.',
+            ],
+        };
+    }
+    try {
+        const health = await checkNativeRuntimeHealth({
+            runtime: candidate.runtime,
+            agent: { id: candidate.id, name: candidate.name, binaryPath },
+            timeoutMs: NATIVE_HEALTH_TIMEOUT_MS,
+        });
+        return {
+            id: candidate.id,
+            name: candidate.name,
+            binaryPath,
+            resolvedCommand: { cmd: candidate.command, args: [], source: 'descriptor' },
+            status: health.status,
+            ...(health.reason ? { reason: health.reason } : {}),
+            ...(health.diagnosticHints ? { diagnosticHints: health.diagnosticHints } : {}),
+        };
+    }
+    catch (error) {
+        const result = classifyRuntimeFailure(error instanceof Error ? error.message : String(error), candidate.runtime);
         return {
             id: candidate.id,
             name: candidate.name,