@eve-horizon/cli 0.2.12 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eve-horizon/cli",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Eve Horizon CLI",
   "license": "MIT",
   "repository": {
@@ -24,14 +24,15 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "yaml": "^2.5.1",
-    "@eve/shared": "0.0.1"
+    "yaml": "^2.5.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "typescript": "^5.7.0"
+    "esbuild": "^0.27.3",
+    "typescript": "^5.7.0",
+    "@eve/shared": "0.0.1"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json"
+    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node22 --outfile=dist/index.js --format=cjs --external:yaml"
   }
 }

package/dist/commands/admin.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAdmin = handleAdmin;
-const args_1 = require("../lib/args");
-const client_1 = require("../lib/client");
-const output_1 = require("../lib/output");
-async function handleAdmin(subcommand, positionals, flags, context) {
-    const json = Boolean(flags.json);
-    switch (subcommand) {
-        case 'invite': {
-            const githubUsername = (0, args_1.getStringFlag)(flags, ['github']);
-            const email = (0, args_1.getStringFlag)(flags, ['email']);
-            const role = (0, args_1.getStringFlag)(flags, ['role']) ?? 'member';
-            const orgId = (0, args_1.getStringFlag)(flags, ['org']) ?? context.orgId;
-            if (!email) {
-                throw new Error('Usage: eve admin invite --email <email> [--github <username>] [--role <role>] [--org <org_id>]');
-            }
-            if (!['owner', 'admin', 'member'].includes(role)) {
-                throw new Error(`Invalid role: ${role}. Must be one of: owner, admin, member`);
-            }
-            if (!orgId) {
-                throw new Error('No org specified. Use --org <org_id> or set a default org in your profile.');
-            }
-            const results = {
-                keys_registered: 0,
-                identities: [],
-            };
-            // Add user to org first - this creates the user if they don't exist
-            if (orgId) {
-                const membership = await (0, client_1.requestJson)(context, `/orgs/${orgId}/members`, {
-                    method: 'POST',
-                    body: {
-                        email,
-                        role,
-                    },
-                });
-                results.membership = membership;
-            }
-            // Fetch and register GitHub SSH keys if username provided
-            // Now that user exists (created via org membership), identity registration will work
-            if (githubUsername) {
-                const keys = await fetchGitHubKeys(githubUsername);
-                if (keys.length === 0) {
-                    throw new Error(`No SSH keys found for GitHub user: ${githubUsername}`);
-                }
-                for (const publicKey of keys) {
-                    const identity = await (0, client_1.requestJson)(context, '/auth/identities', {
-                        method: 'POST',
-                        body: {
-                            email,
-                            public_key: publicKey,
-                            label: `github-${githubUsername}`,
-                        },
-                    });
-                    results.identities.push(identity);
-                    results.keys_registered += 1;
-                }
-            }
-            const summary = [
-                `Invited ${email}`,
-                results.keys_registered > 0 ? `${results.keys_registered} SSH key(s) registered` : null,
-                results.membership ? `Added to ${orgId} as ${role}` : null,
-            ].filter(Boolean).join(', ');
-            (0, output_1.outputJson)(results, json, `+ ${summary}`);
-            return;
-        }
-        default:
-            throw new Error('Usage: eve admin <invite>');
-    }
-}
-async function fetchGitHubKeys(username) {
-    const response = await fetch(`https://github.com/${username}.keys`);
-    if (!response.ok) {
-        if (response.status === 404) {
-            throw new Error(`GitHub user not found: ${username}`);
-        }
-        throw new Error(`Failed to fetch GitHub keys: HTTP ${response.status}`);
-    }
-    const text = await response.text();
-    return text.trim().split('\n').filter(k => k.length > 0);
-}

package/dist/commands/agents.js

@@ -1,445 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAgents = handleAgents;
-const node_child_process_1 = require("node:child_process");
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const yaml_1 = require("yaml");
-const shared_1 = require("@eve/shared");
-const harness_capabilities_js_1 = require("../lib/harness-capabilities.js");
-const args_1 = require("../lib/args");
-const client_1 = require("../lib/client");
-const output_1 = require("../lib/output");
-const git_js_1 = require("../lib/git.js");
-function readYamlFile(filePath) {
-    const raw = (0, node_fs_1.readFileSync)(filePath, 'utf-8');
-    const parsed = (0, yaml_1.parse)(raw);
-    if (!parsed || typeof parsed !== 'object') {
-        throw new Error(`Invalid YAML in ${filePath}`);
-    }
-    return parsed;
-}
-function resolveAgentsConfigPaths(repoRoot, manifest) {
-    const xEve = manifest['x-eve'] ||
-        manifest['x_eve'] ||
-        {};
-    const agentsBlock = xEve['agents'] || {};
-    const chatBlock = xEve['chat'] || {};
-    const manifestChat = manifest['chat'] || {};
-    const agentsPath = (0, node_path_1.resolve)(repoRoot, pickString(agentsBlock.config_path) ?? 'agents/agents.yaml');
-    const teamsPath = (0, node_path_1.resolve)(repoRoot, pickString(agentsBlock.teams_path) ?? 'agents/teams.yaml');
-    const chatPath = (0, node_path_1.resolve)(repoRoot, pickString(chatBlock.config_path) ?? pickString(manifestChat.config_path) ?? 'agents/chat.yaml');
-    return { agentsPath, teamsPath, chatPath };
-}
-function pickString(value) {
-    return typeof value === 'string' && value.trim().length > 0 ? value : undefined;
-}
-function ensureFileExists(path, label) {
-    if (!(0, node_fs_1.existsSync)(path)) {
-        throw new Error(`Missing ${label} at ${path}. Update manifest config_path or add the file.`);
-    }
-    return path;
-}
-function isLocalApiUrl(apiUrl) {
-    try {
-        const url = new URL(apiUrl);
-        const host = url.hostname.toLowerCase();
-        return (host === 'localhost' ||
-            host === '127.0.0.1' ||
-            host === '0.0.0.0' ||
-            host.endsWith('.lvh.me') ||
-            host.endsWith('.localhost'));
-    }
-    catch {
-        return false;
-    }
-}
-function loadAgentsConfig(repoRoot) {
-    const eveDir = (0, node_path_1.join)(repoRoot, '.eve');
-    const manifestPath = (0, node_path_1.join)(eveDir, 'manifest.yaml');
-    if ((0, node_fs_1.existsSync)(manifestPath)) {
-        const manifest = readYamlFile(manifestPath);
-        const xEve = manifest['x-eve'] ||
-            manifest['x_eve'] ||
-            {};
-        const policy = xEve['agents'] || null;
-        const defaults = xEve['defaults'] || null;
-        return { source: { type: 'manifest', path: manifestPath }, policy, manifest_defaults: defaults };
-    }
-    return { source: { type: 'none' }, policy: null };
-}
-async function resolvePacksAndMerge(repoRoot, manifest, projectSlug) {
-    const xEve = (manifest['x-eve'] ?? manifest['x_eve']);
-    const packs = (xEve?.packs ?? []);
-    if (packs.length === 0)
-        return null;
-    console.log(`Resolving ${packs.length} pack(s)...`);
-    // 1. Resolve all packs
-    const resolvedPacks = [];
-    for (const entry of packs) {
-        const resolved = await (0, shared_1.resolvePack)(entry, projectSlug, repoRoot);
-        resolvedPacks.push(resolved);
-        console.log(`  ✓ ${resolved.id} (${resolved.skillPaths.length} skills)`);
-    }
-    // 2. Check for agent ID collisions across packs
-    const seenAgentIds = new Map();
-    for (const pack of resolvedPacks) {
-        for (const agentId of Object.keys(pack.agents)) {
-            if (seenAgentIds.has(agentId)) {
-                throw new Error(`Agent ID collision: "${agentId}" defined in both pack "${seenAgentIds.get(agentId)}" and "${pack.id}". ` +
-                    `Agent IDs must be unique across all packs.`);
-            }
-            seenAgentIds.set(agentId, pack.id);
-        }
-    }
-    // 3. Merge pack bases in listed order
-    let mergedAgents = {};
-    let mergedTeams = {};
-    let mergedChat = { routes: [] };
-    const xEveFragments = [];
-    for (const pack of resolvedPacks) {
-        mergedAgents = (0, shared_1.mergeMapConfig)(mergedAgents, pack.agents);
-        mergedTeams = (0, shared_1.mergeMapConfig)(mergedTeams, pack.teams);
-        if (pack.chat) {
-            mergedChat = (0, shared_1.mergeChatConfig)(mergedChat, pack.chat);
-        }
-        if (pack.xEve) {
-            xEveFragments.push(pack.xEve);
-        }
-    }
-    // 4. Load project overlay files and merge on top
-    const configPaths = resolveAgentsConfigPaths(repoRoot, manifest);
-    if ((0, node_fs_1.existsSync)(configPaths.agentsPath)) {
-        const projectAgents = (0, yaml_1.parse)((0, node_fs_1.readFileSync)(configPaths.agentsPath, 'utf-8')) ?? {};
-        mergedAgents = (0, shared_1.mergeMapConfig)(mergedAgents, projectAgents);
-    }
-    if ((0, node_fs_1.existsSync)(configPaths.teamsPath)) {
-        const projectTeams = (0, yaml_1.parse)((0, node_fs_1.readFileSync)(configPaths.teamsPath, 'utf-8')) ?? {};
-        mergedTeams = (0, shared_1.mergeMapConfig)(mergedTeams, projectTeams);
-    }
-    if ((0, node_fs_1.existsSync)(configPaths.chatPath)) {
-        const projectChat = (0, yaml_1.parse)((0, node_fs_1.readFileSync)(configPaths.chatPath, 'utf-8')) ?? {};
-        mergedChat = (0, shared_1.mergeChatConfig)(mergedChat, projectChat);
-    }
-    // 5. Merge x-eve (strip packs + install_agents from project overlay)
-    const projectXEve = (xEve ?? {});
-    const { packs: _p, install_agents: _ia, ...projectXEveRest } = projectXEve;
-    (0, shared_1.mergeXEve)(xEveFragments, projectXEveRest);
-    // 6. Validate effective config
-    validateEffectiveConfig(mergedAgents, mergedTeams, mergedChat);
-    // 7. Write lockfile
-    const lockfile = {
-        resolved_at: new Date().toISOString(),
-        project_slug: projectSlug,
-        packs: resolvedPacks.map((p) => ({
-            id: p.id,
-            source: p.source,
-            ref: p.ref,
-            pack_version: 1,
-        })),
-        effective: {
-            agents_count: Object.keys((0, shared_1.extractInnerMap)(mergedAgents, 'agents')).length,
-            teams_count: Object.keys((0, shared_1.extractInnerMap)(mergedTeams, 'teams')).length,
-            routes_count: (mergedChat.routes ?? []).length,
-            profiles_count: 0,
-            agents_hash: simpleHash(JSON.stringify(mergedAgents)),
-            teams_hash: simpleHash(JSON.stringify(mergedTeams)),
-            chat_hash: simpleHash(JSON.stringify(mergedChat)),
-        },
-    };
-    const eveDir = (0, node_path_1.join)(repoRoot, '.eve');
-    (0, node_fs_1.mkdirSync)(eveDir, { recursive: true });
-    const lockfilePath = (0, node_path_1.join)(eveDir, 'packs.lock.yaml');
-    (0, node_fs_1.writeFileSync)(lockfilePath, (0, yaml_1.stringify)(lockfile), 'utf-8');
-    console.log(`  ✓ Lockfile written: .eve/packs.lock.yaml`);
-    // 8. Return effective config as YAML strings
-    const packRefs = resolvedPacks.map((p) => ({ id: p.id, source: p.source, ref: p.ref }));
-    return {
-        agentsYaml: (0, yaml_1.stringify)(mergedAgents),
-        teamsYaml: (0, yaml_1.stringify)(mergedTeams),
-        chatYaml: (0, yaml_1.stringify)(mergedChat),
-        packRefs,
-    };
-}
-function validateEffectiveConfig(agents, teams, chat) {
-    // Extract inner maps (handles both nested `{ version: 1, agents: { ... } }` and flat formats)
-    const agentsMap = (0, shared_1.extractInnerMap)(agents, 'agents');
-    const teamsMap = (0, shared_1.extractInnerMap)(teams, 'teams');
-    // Check slug uniqueness
-    const slugs = new Set();
-    for (const [, entry] of Object.entries(agentsMap)) {
-        if (typeof entry !== 'object' || entry === null)
-            continue;
-        const agent = entry;
-        const slug = agent.slug;
-        if (slug) {
-            if (slugs.has(slug)) {
-                throw new Error(`Duplicate agent slug "${slug}" in effective config. Slugs must be unique.`);
-            }
-            slugs.add(slug);
-        }
-    }
-    // Check team references
-    const agentIds = new Set(Object.keys(agentsMap));
-    for (const [teamId, entry] of Object.entries(teamsMap)) {
-        if (typeof entry !== 'object' || entry === null)
-            continue;
-        const team = entry;
-        const lead = team.lead;
-        if (lead && !agentIds.has(lead)) {
-            throw new Error(`Team "${teamId}" references unknown agent "${lead}" as lead.`);
-        }
-        const members = (team.members ?? []);
-        for (const member of members) {
-            if (!agentIds.has(member)) {
-                throw new Error(`Team "${teamId}" references unknown agent "${member}" as member.`);
-            }
-        }
-    }
-    // Check route targets (supports "team:name" and "agent:name" prefixes)
-    const teamIds = new Set(Object.keys(teamsMap));
-    const routes = (chat.routes ?? []);
-    for (const route of routes) {
-        if (!route.target)
-            continue;
-        let targetId = route.target;
-        if (targetId.startsWith('team:')) {
-            targetId = targetId.slice(5);
-            if (!teamIds.has(targetId)) {
-                throw new Error(`Route "${route.id}" targets unknown team "${route.target}".`);
-            }
-        }
-        else if (targetId.startsWith('agent:')) {
-            targetId = targetId.slice(6);
-            if (!agentIds.has(targetId)) {
-                throw new Error(`Route "${route.id}" targets unknown agent "${route.target}".`);
-            }
-        }
-        else if (!agentIds.has(targetId) && !teamIds.has(targetId)) {
-            throw new Error(`Route "${route.id}" targets unknown agent/team "${route.target}".`);
-        }
-    }
-}
-function simpleHash(input) {
-    let hash = 0;
-    for (let i = 0; i < input.length; i++) {
-        const char = input.charCodeAt(i);
-        hash = ((hash << 5) - hash) + char;
-        hash = hash & hash; // Convert to 32bit integer
-    }
-    return Math.abs(hash).toString(16).padStart(8, '0');
-}
-async function handleAgents(subcommand, positionals, flags, context) {
-    const command = subcommand ?? 'config';
-    const json = Boolean(flags.json);
-    const includeHarnesses = !((0, args_1.getBooleanFlag)(flags, ['no-harnesses']) ?? false);
-    const repoRoot = (0, node_path_1.resolve)((0, args_1.getStringFlag)(flags, ['repo-dir', 'repo_dir', 'dir', 'path']) ?? process.cwd());
-    switch (command) {
-        case 'config': {
-            const result = loadAgentsConfig(repoRoot);
-            const response = {
-                repo_root: repoRoot,
-                source: result.source,
-                policy: result.policy,
-            };
-            if (result.manifest_defaults) {
-                response.manifest_defaults = result.manifest_defaults;
-            }
-            if (includeHarnesses) {
-                const harnesses = await (0, client_1.requestJson)(context, '/harnesses');
-                response.harnesses = harnesses.data;
-                response.capabilities = harness_capabilities_js_1.HARNESS_CAPABILITIES;
-            }
-            if (json) {
-                (0, output_1.outputJson)(response, json);
-                return;
-            }
-            console.log(`Agents config source: ${result.source.type}`);
-            if ('path' in result.source) {
-                console.log(`Path: ${result.source.path}`);
-            }
-            if (!result.policy) {
-                console.log('No policy found. Add x-eve.agents to .eve/manifest.yaml.');
-            }
-            else {
-                const profiles = result.policy.profiles || {};
-                const profileNames = Object.keys(profiles);
-                console.log(`Profiles: ${profileNames.length ? profileNames.join(', ') : 'none'}`);
-            }
-            if (includeHarnesses) {
-                const harnesses = response.harnesses;
-                if (harnesses?.length) {
-                    const ready = harnesses.filter((h) => h.auth.available).length;
-                    console.log(`Harnesses: ${harnesses.length} (${ready} ready)`);
-                }
-            }
-            return;
-        }
-        case 'sync': {
-            const projectId = (0, args_1.getStringFlag)(flags, ['project']) ?? context.projectId;
-            if (!projectId) {
-                throw new Error('Missing project id. Provide --project or set a profile default.');
-            }
-            const ref = (0, args_1.getStringFlag)(flags, ['ref']);
-            const local = (0, args_1.getBooleanFlag)(flags, ['local']) ?? false;
-            const allowDirty = (0, args_1.getBooleanFlag)(flags, ['allow-dirty', 'allow_dirty']) ?? false;
-            const forceNonlocal = (0, args_1.getBooleanFlag)(flags, ['force-nonlocal', 'force_nonlocal']) ?? false;
-            if (local && ref) {
-                throw new Error('Use either --local or --ref, not both.');
-            }
-            if (!local && !ref) {
-                throw new Error('Missing --ref. Use --ref <sha|branch> or --local for dev sync.');
-            }
-            if (local && !forceNonlocal && !isLocalApiUrl(context.apiUrl)) {
-                throw new Error(`--local sync is only allowed for local API URLs (localhost or *.lvh.me). ` +
-                    `Current API: ${context.apiUrl}. Use --force-nonlocal to override.`);
-            }
-            const gitRoot = (0, git_js_1.getGitRoot)(repoRoot);
-            if (!gitRoot) {
-                throw new Error('Not a git repository. Run from the repo root or pass --repo-dir <path>.');
-            }
-            const dirty = (0, git_js_1.isGitDirty)(gitRoot);
-            if (dirty && !allowDirty) {
-                throw new Error('Working tree is dirty. Commit changes or pass --allow-dirty to sync anyway.');
-            }
-            const manifestPath = (0, node_path_1.join)(repoRoot, '.eve', 'manifest.yaml');
-            if (!(0, node_fs_1.existsSync)(manifestPath)) {
-                throw new Error(`Missing manifest at ${manifestPath}. Expected .eve/manifest.yaml.`);
-            }
-            const manifest = readYamlFile(manifestPath);
-            // Pack resolution: if packs exist, resolve and merge before posting
-            const projectSlug = manifest.project ?? projectId.replace(/^proj_/, '');
-            const packResult = await resolvePacksAndMerge(repoRoot, manifest, projectSlug);
-            let agentsYaml;
-            let teamsYaml;
-            let chatYaml;
-            let packRefs;
-            if (packResult) {
-                agentsYaml = packResult.agentsYaml;
-                teamsYaml = packResult.teamsYaml;
-                chatYaml = packResult.chatYaml;
-                packRefs = packResult.packRefs;
-            }
-            else {
-                const configPaths = resolveAgentsConfigPaths(repoRoot, manifest);
-                agentsYaml = (0, node_fs_1.readFileSync)(ensureFileExists(configPaths.agentsPath, 'agents config'), 'utf-8');
-                teamsYaml = (0, node_fs_1.readFileSync)(ensureFileExists(configPaths.teamsPath, 'teams config'), 'utf-8');
-                chatYaml = (0, node_fs_1.readFileSync)(ensureFileExists(configPaths.chatPath, 'chat config'), 'utf-8');
-            }
-            let gitSha;
-            let branch;
-            let gitRef = ref ?? 'local';
-            if (ref) {
-                gitSha = await (0, git_js_1.resolveGitRef)(context, projectId, ref, repoRoot);
-                branch = (0, git_js_1.resolveGitBranch)(gitRoot, ref) ?? undefined;
-            }
-            else {
-                gitSha = (0, node_child_process_1.execSync)('git rev-parse HEAD', { cwd: gitRoot, encoding: 'utf-8' }).trim();
-                branch = (0, git_js_1.getGitBranch)(gitRoot) ?? undefined;
-            }
-            if (dirty) {
-                gitRef = `dirty:${gitRef}`;
-            }
-            const response = await (0, client_1.requestJson)(context, `/projects/${projectId}/agents/sync`, {
-                method: 'POST',
-                body: {
-                    agents_yaml: agentsYaml,
-                    teams_yaml: teamsYaml,
-                    chat_yaml: chatYaml,
-                    git_sha: gitSha,
-                    branch,
-                    git_ref: gitRef,
-                    pack_refs: packRefs,
-                },
-            });
-            if (json) {
-                (0, output_1.outputJson)(response, json);
-                return;
-            }
-            console.log(`✓ Agents config synced to ${projectId}`);
-            if (packRefs) {
-                console.log(`  Packs: ${packRefs.map((p) => p.id).join(', ')}`);
-                console.log(`  Source: merged (packs + project overlay)`);
-            }
-            else {
-                const configPaths = resolveAgentsConfigPaths(repoRoot, manifest);
-                console.log(`  Agents: ${configPaths.agentsPath}`);
-                console.log(`  Teams:  ${configPaths.teamsPath}`);
-                console.log(`  Chat:   ${configPaths.chatPath}`);
-            }
-            if (gitSha)
-                console.log(`  Git SHA: ${gitSha.substring(0, 8)}`);
-            if (branch)
-                console.log(`  Branch: ${branch}`);
-            if (dirty)
-                console.log('  Warning: working tree dirty — marked non-deployable');
-            return;
-        }
-        case 'runtime-status': {
-            const orgId = (0, args_1.getStringFlag)(flags, ['org']) ?? context.orgId;
-            if (!orgId) {
-                throw new Error('Missing org id. Provide --org or set a profile default.');
-            }
-            const response = await (0, client_1.requestJson)(context, `/orgs/${orgId}/agent-runtime/status`);
-            if (json) {
-                (0, output_1.outputJson)(response, json);
-                return;
-            }
-            formatAgentRuntimeStatus(response, orgId);
-            return;
-        }
-        default:
-            throw new Error('Usage: eve agents <config|sync|runtime-status>');
-    }
-}
-function formatAgentRuntimeStatus(response, orgId) {
-    console.log(`Agent Runtime Status: ${orgId}`);
-    if (response.pods.length === 0) {
-        console.log('');
-        console.log('No agent runtime pods found.');
-        return;
-    }
-    const nameWidth = Math.max(7, ...response.pods.map((pod) => pod.pod_name.length));
-    const statusWidth = Math.max(6, ...response.pods.map((pod) => pod.status.length));
-    const capacityWidth = Math.max(8, ...response.pods.map((pod) => String(pod.capacity).length));
-    const ageWidth = Math.max(3, ...response.pods.map((pod) => formatAgeSeconds(pod.last_heartbeat_at).length));
-    console.log('');
-    const header = [
-        padRight('Pod', nameWidth),
-        padRight('Status', statusWidth),
-        padRight('Capacity', capacityWidth),
-        padRight('Age', ageWidth),
-        'Last Heartbeat',
-    ].join('  ');
-    console.log(header);
-    console.log('-'.repeat(header.length));
-    for (const pod of response.pods) {
-        const age = formatAgeSeconds(pod.last_heartbeat_at);
-        console.log([
-            padRight(pod.pod_name, nameWidth),
-            padRight(pod.status, statusWidth),
-            padRight(String(pod.capacity), capacityWidth),
-            padRight(age, ageWidth),
-            pod.last_heartbeat_at,
-        ].join('  '));
-    }
-}
-function padRight(value, width) {
-    return value.length >= width ? value : `${value}${' '.repeat(width - value.length)}`;
-}
-function formatAgeSeconds(isoDate) {
-    const timestamp = Date.parse(isoDate);
-    if (!Number.isFinite(timestamp)) {
-        return '-';
-    }
-    const diffSeconds = Math.max(0, Math.floor((Date.now() - timestamp) / 1000));
-    if (diffSeconds < 60) {
-        return `${diffSeconds}s`;
-    }
-    const diffMinutes = Math.floor(diffSeconds / 60);
-    if (diffMinutes < 60) {
-        return `${diffMinutes}m`;
-    }
-    const diffHours = Math.floor(diffMinutes / 60);
-    return `${diffHours}h`;
-}