@eve-horizon/cli 0.2.6 → 0.2.8

package/dist/commands/build.js

@@ -5,6 +5,19 @@ const args_1 = require("../lib/args");
 const client_1 = require("../lib/client");
 const output_1 = require("../lib/output");
 const node_child_process_1 = require("node:child_process");
+const ERROR_CODES = {
+    auth_error: { code: 'auth_error', label: 'Authentication Error', hint: "Check GITHUB_TOKEN via 'eve secrets set'" },
+    clone_error: { code: 'clone_error', label: 'Git Clone Error', hint: "Verify repo URL and access. Check 'eve secrets list'" },
+    build_error: { code: 'build_error', label: 'Build Error', hint: "Run 'eve build diagnose <build_id>' for full output" },
+    timeout_error: { code: 'timeout_error', label: 'Timeout Error', hint: 'Consider increasing timeout or checking resources' },
+    resource_error: { code: 'resource_error', label: 'Resource Error', hint: 'Check disk space and memory on build worker' },
+    registry_error: { code: 'registry_error', label: 'Registry Error', hint: "Check registry credentials via 'eve secrets list'" },
+    deploy_error: { code: 'deploy_error', label: 'Deploy Error', hint: "Run 'eve env diagnose <project> <env>'" },
+    unknown_error: { code: 'unknown_error', label: 'Unknown Error', hint: "Run 'eve build diagnose <build_id>' or 'eve job diagnose <job_id>'" },
+};
+function getErrorCodeInfo(code) {
+    return ERROR_CODES[code] ?? ERROR_CODES.unknown_error;
+}
 // ---------------------------------------------------------------------------
 // Entry point
 // ---------------------------------------------------------------------------
@@ -154,6 +167,17 @@ async function handleRuns(positionals, flags, context, json) {
     }
     formatRunList(response.data);
 }
+function formatLogTimestamp(timestamp) {
+    if (!timestamp)
+        return '';
+    try {
+        const d = new Date(timestamp);
+        return `[${d.toLocaleTimeString('en-US', { hour12: false })}] `;
+    }
+    catch {
+        return '';
+    }
+}
 async function handleLogs(positionals, flags, context, json) {
     const buildId = positionals[0] ?? (0, args_1.getStringFlag)(flags, ['id']);
     const runId = (0, args_1.getStringFlag)(flags, ['run']);
@@ -171,20 +195,26 @@ async function handleLogs(positionals, flags, context, json) {
         return;
     }
     for (const entry of logs.logs) {
+        const prefix = formatLogTimestamp(entry.timestamp);
         const line = entry.line;
         if (typeof line.message === 'string') {
-            console.log(line.message);
-            continue;
+            console.log(`${prefix}${line.message}`);
         }
-        if (Array.isArray(line.lines)) {
+        else if (Array.isArray(line.lines)) {
             for (const item of line.lines) {
                 if (typeof item === 'string') {
-                    console.log(item);
+                    console.log(`${prefix}${item}`);
                 }
             }
-            continue;
         }
-        console.log(JSON.stringify(line));
+        else {
+            console.log(`${prefix}${JSON.stringify(line)}`);
+        }
+        if (line.level === 'error' && typeof line.error_code === 'string') {
+            const info = getErrorCodeInfo(line.error_code);
+            console.log(`${prefix}  Type: ${info.label}`);
+            console.log(`${prefix}  Hint: ${info.hint}`);
+        }
     }
 }
 async function handleArtifacts(positionals, flags, context, json) {
@@ -255,17 +285,22 @@ async function handleDiagnose(positionals, flags, context, json) {
             const line = entry.line;
             if (typeof line.message === 'string') {
                 console.log(line.message);
-                continue;
             }
-            if (Array.isArray(line.lines)) {
+            else if (Array.isArray(line.lines)) {
                 for (const item of line.lines) {
                     if (typeof item === 'string') {
                         console.log(item);
                     }
                 }
-                continue;
             }
-            console.log(JSON.stringify(line));
+            else {
+                console.log(JSON.stringify(line));
+            }
+            if (line.level === 'error' && typeof line.error_code === 'string') {
+                const info = getErrorCodeInfo(line.error_code);
+                console.log(`  Type: ${info.label}`);
+                console.log(`  Hint: ${info.hint}`);
+            }
         }
     }
     else {
@@ -320,6 +355,11 @@ function formatRunList(runs) {
         if (run.error_message) {
             console.log(`  Error: ${run.error_message}`);
         }
+        if (run.error_code) {
+            const info = getErrorCodeInfo(run.error_code);
+            console.log(`  Error Type: ${info.label}`);
+            console.log(`  Hint:       ${info.hint}`);
+        }
     }
     console.log('');
     console.log(`Total: ${runs.length} runs`);

package/dist/commands/env.js

@@ -267,11 +267,22 @@ async function handleDeploy(positionals, flags, context, json) {
     else {
         if (response.pipeline_run) {
             console.log('');
-            console.log('Pipeline deployment queued.');
+            console.log('Pipeline deployment started.');
             console.log(`  Pipeline Run: ${response.pipeline_run.run.id}`);
             console.log(`  Pipeline:     ${response.pipeline_run.run.pipeline_name}`);
             console.log(`  Status:       ${response.pipeline_run.run.status}`);
             console.log(`  Environment:  ${response.environment.name}`);
+            const watchFlag = (0, args_1.toBoolean)(flags.watch);
+            const shouldWatch = watchFlag ?? true; // default: watch
+            if (shouldWatch) {
+                const timeoutRaw = (0, args_1.getStringFlag)(flags, ['timeout']);
+                const timeoutSeconds = timeoutRaw ? parseInt(timeoutRaw, 10) : 300; // 5 min default for pipeline
+                const pipelineResult = await watchPipelineRun(context, projectId, response.pipeline_run.run.pipeline_name, response.pipeline_run.run.id, Number.isFinite(timeoutSeconds) ? timeoutSeconds : 300);
+                // After pipeline completes, watch deployment health if it succeeded
+                if (pipelineResult === 'succeeded') {
+                    await watchDeploymentStatus(context, projectId, envName, 120);
+                }
+            }
             return;
         }
         console.log('');
@@ -603,6 +614,47 @@ function getDeploymentWarnings(status) {
     }
     return Array.from(new Set(warnings));
 }
+/**
+ * Poll a pipeline run until it reaches a terminal status.
+ * Returns the final status string.
+ */
+async function watchPipelineRun(context, projectId, pipelineName, runId, timeoutSeconds) {
+    const start = Date.now();
+    const pollIntervalMs = 3000;
+    const terminalStatuses = ['succeeded', 'failed', 'cancelled'];
+    console.log('');
+    console.log('Watching pipeline run...');
+    while ((Date.now() - start) / 1000 < timeoutSeconds) {
+        const detail = await (0, client_1.requestJson)(context, `/projects/${projectId}/pipelines/${pipelineName}/runs/${runId}`);
+        const elapsed = Math.floor((Date.now() - start) / 1000);
+        const stepSummary = detail.steps
+            .map(s => `${s.step_name}:${s.status}`)
+            .join(', ');
+        console.log(`  [${elapsed}s] ${detail.run.status} (${stepSummary || 'no steps'})`);
+        if (terminalStatuses.includes(detail.run.status)) {
+            if (detail.run.status === 'succeeded') {
+                console.log('  Pipeline run succeeded.');
+            }
+            else if (detail.run.status === 'failed') {
+                console.log(`  Pipeline run failed.`);
+                // Show error from failed steps
+                for (const step of detail.steps) {
+                    if (step.status === 'failed') {
+                        console.log(`    Step "${step.step_name}" failed.`);
+                    }
+                }
+            }
+            else {
+                console.log(`  Pipeline run ${detail.run.status}.`);
+            }
+            return detail.run.status;
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    }
+    console.log(`  Pipeline run did not complete within ${timeoutSeconds}s.`);
+    console.log(`  Run "eve pipeline show-run ${pipelineName} ${runId}" to check status.`);
+    return 'timeout';
+}
 async function watchDeploymentStatus(context, projectId, envName, timeoutSeconds) {
     const start = Date.now();
     const pollIntervalMs = 3000;

package/dist/commands/job.js

@@ -1012,6 +1012,22 @@ function formatJobDetails(job) {
             console.log(`    Key:            ${job.workspace.key}`);
         }
     }
+    // Resolved Git
+    if (job.resolved_git) {
+        const rg = job.resolved_git;
+        console.log('');
+        console.log('  Resolved Git:');
+        if (rg.resolved_sha)
+            console.log(`    SHA:      ${rg.resolved_sha}`);
+        if (rg.resolved_branch)
+            console.log(`    Branch:   ${rg.resolved_branch}`);
+        if (rg.ref_source)
+            console.log(`    Source:   ${rg.ref_source}`);
+        if (rg.pushed !== undefined)
+            console.log(`    Pushed:   ${rg.pushed}`);
+        if (rg.commits?.length)
+            console.log(`    Commits:  ${rg.commits.join(', ')}`);
+    }
     console.log('');
     console.log(`  Created:     ${formatDate(job.created_at)}`);
     console.log(`  Updated:     ${formatDate(job.updated_at)}`);
@@ -1795,6 +1811,22 @@ function formatResultFull(response) {
         if (pipelineOutput?.deploy?.preview_url) {
             console.log(`Preview: ${pipelineOutput.deploy.preview_url}`);
         }
+        // Display git metadata if present in result_json
+        const resolvedGit = response.resultJson.resolved_git;
+        if (resolvedGit) {
+            console.log('');
+            console.log('Git:');
+            if (resolvedGit.resolved_sha)
+                console.log(`  SHA:      ${resolvedGit.resolved_sha}`);
+            if (resolvedGit.resolved_branch)
+                console.log(`  Branch:   ${resolvedGit.resolved_branch}`);
+            if (resolvedGit.ref_source)
+                console.log(`  Source:   ${resolvedGit.ref_source}`);
+            if (resolvedGit.pushed !== undefined)
+                console.log(`  Pushed:   ${resolvedGit.pushed}`);
+            if (resolvedGit.commits?.length)
+                console.log(`  Commits:  ${resolvedGit.commits.join(', ')}`);
+        }
     }
     console.log('');
     console.log('Result:');

package/dist/commands/pipeline.js

@@ -35,7 +35,8 @@ async function handlePipeline(subcommand, positionals, flags, context) {
                 '  show-run <pipeline> <run-id>              - show pipeline run status and steps\n' +
                 '  approve <run-id>                          - approve a blocked pipeline run\n' +
                 '  cancel <run-id> [--reason <text>]         - cancel pipeline run\n' +
-                '  logs <pipeline> <run-id> [--step <name>]  - show logs for pipeline run');
+                '  logs <pipeline> <run-id> [--step <name>]  - show logs for pipeline run\n' +
+                '                                              Options: --follow (-f) stream live');
     }
 }
 async function handleList(positionals, flags, context, json) {
@@ -150,6 +151,24 @@ function formatPipelineRunDetail(detail) {
         if (step.error_message) {
             console.log(`  Error: ${step.error_message}`);
         }
+        // Task 3.1: Show structured error code info when available
+        const errorCode = step.error_code;
+        if (errorCode) {
+            const info = getErrorCodeInfo(errorCode);
+            console.log(`  Type:  ${info.label}`);
+            console.log(`  Hint:  ${info.hint}`);
+        }
+        // Task 2.4: Surface build_id hints on failure
+        if (step.status === 'failed' && step.step_type === 'build') {
+            const buildId = step.output_json?.build_id
+                ?? step.result_json?.build_id;
+            if (buildId) {
+                console.log(`  Hint: Run 'eve build diagnose ${buildId}' for full build details`);
+            }
+            else {
+                console.log(`  Hint: Run 'eve build diagnose' with the build ID for details`);
+            }
+        }
     }
     console.log('');
     console.log(`Total: ${steps.length} steps`);
@@ -326,7 +345,11 @@ async function handleLogs(positionals, flags, context, json) {
     const stepName = (0, args_1.getStringFlag)(flags, ['step']);
     const projectId = (0, args_1.getStringFlag)(flags, ['project']) ?? context.projectId;
     if (!pipelineName || !runId || !projectId) {
-        throw new Error('Usage: eve pipeline logs <pipeline_name> <run-id> [--step <step_name>] [--project <id>]');
+        throw new Error('Usage: eve pipeline logs <pipeline_name> <run-id> [--step <step_name>] [--follow] [--project <id>]');
+    }
+    const follow = Boolean(flags.follow) || Boolean(flags.f);
+    if (follow) {
+        return handlePipelineFollow(context, pipelineName, runId, stepName ?? null);
     }
     // First get the run details to know which steps exist
     const runDetail = await (0, client_1.requestJson)(context, `/projects/${projectId}/pipelines/${pipelineName}/runs/${runId}`);
@@ -367,6 +390,24 @@ async function handleLogs(positionals, flags, context, json) {
         if (step.error_message) {
             console.log(`Error: ${step.error_message}`);
         }
+        // Show structured error code info when available
+        const errorCode = step.error_code;
+        if (errorCode) {
+            const info = getErrorCodeInfo(errorCode);
+            console.log(`Type:  ${info.label}`);
+            console.log(`Hint:  ${info.hint}`);
+        }
+        // Surface build_id hints on failure
+        if (step.status === 'failed' && step.step_type === 'build') {
+            const buildId = step.output_json?.build_id
+                ?? step.result_json?.build_id;
+            if (buildId) {
+                console.log(`Hint: Run 'eve build diagnose ${buildId}' for full build details`);
+            }
+            else {
+                console.log(`Hint: Run 'eve build diagnose' with the build ID for details`);
+            }
+        }
         if (step.result_text) {
             console.log('');
             console.log('Result:');
@@ -384,6 +425,158 @@ async function handleLogs(positionals, flags, context, json) {
     if (!stepName) {
         console.log(`Total steps: ${stepsToShow.length}`);
     }
+    // Fetch actual logs from the REST endpoint
+    const logsUrl = stepName
+        ? `/pipeline-runs/${runId}/logs?step=${encodeURIComponent(stepName)}`
+        : `/pipeline-runs/${runId}/logs`;
+    try {
+        const logsResp = await (0, client_1.requestJson)(context, logsUrl);
+        if (logsResp?.logs && Array.isArray(logsResp.logs) && logsResp.logs.length > 0) {
+            console.log('\n--- Logs ---');
+            for (const entry of logsResp.logs) {
+                const ts = entry.timestamp ? formatPipelineTime(entry.timestamp) : '';
+                const step = entry.step_name ? `[${entry.step_name}] ` : '';
+                const content = entry.content ?? {};
+                if (content.message) {
+                    console.log(`${ts}${step}${content.message}`);
+                }
+                else if (content.lines && Array.isArray(content.lines)) {
+                    for (const line of content.lines) {
+                        console.log(`${ts}${step}${line}`);
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Logs endpoint may not exist yet; silently skip
+    }
+}
+async function handlePipelineFollow(context, pipelineName, runId, stepFilter) {
+    const endpoint = stepFilter
+        ? `${context.apiUrl}/pipeline-runs/${runId}/steps/${encodeURIComponent(stepFilter)}/stream`
+        : `${context.apiUrl}/pipeline-runs/${runId}/stream`;
+    console.log(`Following pipeline run ${runId}...`);
+    const headers = {
+        Accept: 'text/event-stream',
+    };
+    if (context.token) {
+        headers.Authorization = `Bearer ${context.token}`;
+    }
+    try {
+        const response = await fetch(endpoint, { headers });
+        if (!response.ok) {
+            const text = await response.text();
+            throw new Error(`HTTP ${response.status}: ${text}`);
+        }
+        if (!response.body) {
+            throw new Error('No response body received');
+        }
+        const reader = response.body.getReader();
+        const decoder = new TextDecoder();
+        let buffer = '';
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            buffer += decoder.decode(value, { stream: true });
+            const lines = buffer.split('\n');
+            buffer = lines.pop() ?? '';
+            let currentEvent = '';
+            let currentData = '';
+            for (const line of lines) {
+                if (line.startsWith('event:')) {
+                    currentEvent = line.slice(6).trim();
+                }
+                else if (line.startsWith('data:')) {
+                    currentData = line.slice(5).trim();
+                }
+                else if (line === '' && currentData) {
+                    processPipelineSSEEvent(currentEvent, currentData);
+                    currentEvent = '';
+                    currentData = '';
+                }
+            }
+        }
+        // Process any remaining data in buffer
+        if (buffer.trim()) {
+            const remainingLines = buffer.split('\n');
+            let currentEvent = '';
+            let currentData = '';
+            for (const line of remainingLines) {
+                if (line.startsWith('event:')) {
+                    currentEvent = line.slice(6).trim();
+                }
+                else if (line.startsWith('data:')) {
+                    currentData = line.slice(5).trim();
+                }
+            }
+            if (currentData) {
+                processPipelineSSEEvent(currentEvent, currentData);
+            }
+        }
+        console.log('');
+        console.log('Stream ended.');
+    }
+    catch (error) {
+        const err = error;
+        console.error(`Error following pipeline run: ${err.message}`);
+        process.exit(1);
+    }
+}
+function processPipelineSSEEvent(eventType, dataStr) {
+    try {
+        const data = JSON.parse(dataStr);
+        if (eventType === 'log') {
+            const stepName = data.step_name ?? '???';
+            const content = data.line ?? {};
+            const timestamp = data.timestamp;
+            const timeStr = timestamp ? formatPipelineTime(timestamp) : '';
+            if (content.message) {
+                console.log(`${timeStr}[${stepName}] ${content.message}`);
+            }
+            else if (content.lines && Array.isArray(content.lines)) {
+                for (const l of content.lines) {
+                    console.log(`${timeStr}[${stepName}] ${l}`);
+                }
+            }
+            else {
+                console.log(`${timeStr}[${stepName}] ${JSON.stringify(content)}`);
+            }
+        }
+        else if (eventType === 'complete') {
+            console.log(`\nPipeline run completed: ${data.status}`);
+        }
+        else if (eventType === 'error') {
+            console.error(`\nPipeline run failed: ${data.errorMessage ?? data.status}`);
+            process.exit(1);
+        }
+    }
+    catch {
+        // Ignore malformed events
+    }
+}
+function formatPipelineTime(timestamp) {
+    try {
+        const d = new Date(timestamp);
+        return `[${d.toLocaleTimeString('en-US', { hour12: false })}] `;
+    }
+    catch {
+        return '';
+    }
+}
+const ERROR_CODES = {
+    auth_error: { code: 'auth_error', label: 'Authentication Error', hint: "Check GITHUB_TOKEN via 'eve secrets set'" },
+    clone_error: { code: 'clone_error', label: 'Git Clone Error', hint: "Verify repo URL and access. Check 'eve secrets list'" },
+    build_error: { code: 'build_error', label: 'Build Error', hint: "Run 'eve build diagnose <build_id>' for full output" },
+    timeout_error: { code: 'timeout_error', label: 'Timeout Error', hint: 'Consider increasing timeout or checking resources' },
+    resource_error: { code: 'resource_error', label: 'Resource Error', hint: 'Check disk space and memory on build worker' },
+    registry_error: { code: 'registry_error', label: 'Registry Error', hint: "Check registry credentials via 'eve secrets list'" },
+    deploy_error: { code: 'deploy_error', label: 'Deploy Error', hint: "Run 'eve env diagnose <project> <env>'" },
+    unknown_error: { code: 'unknown_error', label: 'Unknown Error', hint: "Run 'eve build diagnose <build_id>' or 'eve job diagnose <job_id>'" },
+};
+function getErrorCodeInfo(code) {
+    return ERROR_CODES[code] ?? ERROR_CODES.unknown_error;
 }
 function buildQuery(params) {
     const search = new URLSearchParams();

package/dist/lib/help.js

@@ -991,8 +991,22 @@ for cloud deployments. Credentials are stored per-profile.`,
                 usage: 'eve pipeline cancel <run-id> [--reason <text>]',
                 examples: ['eve pipeline cancel prun_xxx --reason "superseded"'],
             },
+            logs: {
+                description: 'Show logs for a pipeline run',
+                usage: 'eve pipeline logs <pipeline> <run-id> [--step <name>] [--follow]',
+                options: [
+                    '--step <name>        Show logs for a specific step only',
+                    '--follow (-f)        Stream live logs via SSE',
+                    '--project <id>       Project ID (uses profile default)',
+                ],
+                examples: [
+                    'eve pipeline logs deploy-test prun_xxx',
+                    'eve pipeline logs deploy-test prun_xxx --step build',
+                    'eve pipeline logs deploy-test prun_xxx --follow',
+                ],
+            },
         },
-        examples: ['eve pipeline list', 'eve pipeline run deploy-test --ref abc123 --env test'],
+        examples: ['eve pipeline list', 'eve pipeline run deploy-test --ref abc123 --env test', 'eve pipeline logs deploy-test prun_xxx --follow'],
     },
     workflow: {
         description: 'Inspect workflows defined in the project manifest (read-only in Phase 1).',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eve-horizon/cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Eve Horizon CLI",
   "license": "MIT",
   "repository": {