@sireai/optimus 0.1.5 → 0.1.6

package/dist/cli/optimus.js

@@ -23,6 +23,7 @@ import { TriageRunner } from "../task-environment/orchestration/triage-runner.js
 import { OptimusRuntime } from "../task-environment/runtime/optimus-runtime.js";
 import { SQLiteTaskStore } from "../task-environment/storage/sqlite-task-store.js";
 import { SQLiteEventStore } from "../task-environment/storage/sqlite-event-store.js";
+import { buildTaskExecutionMetrics, formatExecutionMetricsCompact } from "../task-environment/observability/execution-metrics.js";
 import { FeishuNotifier } from "../task-environment/delivery/feishu-notifier.js";
 import { TaskDeliveryDispatcher } from "../task-environment/delivery/task-delivery-dispatcher.js";
 import { TaskDeliveryService } from "../task-environment/delivery/task-delivery-service.js";
@@ -924,12 +925,24 @@ async function promptSetupAnswers(defaults) {
         }
         return rl.question(prompt);
     };
+    const printSetupSection = (title, detail) => {
+        console.log(`\n[${title}]`);
+        if (detail) {
+            console.log(detail);
+        }
+    };
+    const renderSetupPrompt = (label, promptLabel, defaultValue) => {
+        const suffix = defaultValue !== undefined ? ` [${defaultValue}]` : "";
+        return `[${label}] ${promptLabel}${suffix}: `;
+    };
     try {
         if (await pathExists(configPath)) {
             console.log(`Existing config found at ${configPath}. Press Enter to keep current values.`);
         }
-        const repoPath = (await ask(`Repository path [${defaults.repoPath}]: `)).trim() || defaults.repoPath;
-        const repoAlias = (await ask(`Repository alias [${defaults.repoAlias}]: `)).trim() || defaults.repoAlias;
+        printSetupSection("Repository", "Register the primary local repository used by Optimus.");
+        const repoPath = (await ask(renderSetupPrompt("Required", "Repository path", defaults.repoPath))).trim() || defaults.repoPath;
+        const repoAlias = (await ask(renderSetupPrompt("Required", "Repository alias", defaults.repoAlias))).trim() || defaults.repoAlias;
+        printSetupSection("Codex", "Choose one authentication mode, then fill the fields that follow.");
         const codexAuthMode = await askSetupCodexAuthMode({ ask, defaultMode: defaults.codexAuthMode });
         let codexApiKey;
         let codexProviderId;
@@ -937,54 +950,57 @@ async function promptSetupAnswers(defaults) {
         let codexProviderBaseUrl;
         let codexProviderApiKeyEnvName;
         if (codexAuthMode === "openai_api_key") {
-            codexApiKey = (await ask("OpenAI API key for OPENAI_API_KEY (leave blank to keep existing): ")).trim() || undefined;
+            codexApiKey = (await ask(renderSetupPrompt("Optional", "OpenAI API key for OPENAI_API_KEY", "leave blank to keep existing"))).trim() || undefined;
         }
         else if (codexAuthMode === "model_provider") {
-            codexProviderId = (await ask(`Provider id [${defaults.codexProviderId ?? ""}]: `)).trim() || defaults.codexProviderId;
-            codexProviderDisplayName = (await ask(`Provider display name [${defaults.codexProviderDisplayName ?? ""}]: `)).trim() || defaults.codexProviderDisplayName;
-            codexProviderBaseUrl = (await ask(`Provider base URL [${defaults.codexProviderBaseUrl ?? ""}]: `)).trim() || defaults.codexProviderBaseUrl;
-            codexProviderApiKeyEnvName = (await ask(`Provider API key env name [${defaults.codexProviderApiKeyEnvName ?? ""}]: `)).trim() || defaults.codexProviderApiKeyEnvName;
+            codexProviderId = (await ask(renderSetupPrompt("Required", "Provider id", defaults.codexProviderId ?? ""))).trim() || defaults.codexProviderId;
+            codexProviderDisplayName = (await ask(renderSetupPrompt("Required", "Provider display name", defaults.codexProviderDisplayName ?? ""))).trim() || defaults.codexProviderDisplayName;
+            codexProviderBaseUrl = (await ask(renderSetupPrompt("Required", "Provider base URL", defaults.codexProviderBaseUrl ?? ""))).trim() || defaults.codexProviderBaseUrl;
+            codexProviderApiKeyEnvName = (await ask(renderSetupPrompt("Required", "Provider API key env name", defaults.codexProviderApiKeyEnvName ?? ""))).trim() || defaults.codexProviderApiKeyEnvName;
             const providerKeyLabel = codexProviderApiKeyEnvName || defaults.codexProviderApiKeyEnvName || "the configured provider env";
-            codexApiKey = (await ask(`Provider API key value for ${providerKeyLabel} (leave blank to keep existing): `)).trim() || undefined;
+            codexApiKey = (await ask(renderSetupPrompt("Optional", `Provider API key value for ${providerKeyLabel}`, "leave blank to keep existing"))).trim() || undefined;
         }
-        const enableFeishuInput = (await ask(`Enable Feishu delivery? [${defaults.enableFeishu ? "Y/n" : "y/N"}] `)).trim().toLowerCase();
+        printSetupSection("Feishu", "Enable this module when task notifications should be sent to Feishu.");
+        const enableFeishuInput = (await ask(renderSetupPrompt("Optional module", "Enable Feishu delivery", defaults.enableFeishu ? "Y/n" : "y/N"))).trim().toLowerCase();
         const enableFeishu = enableFeishuInput.length === 0
             ? defaults.enableFeishu
             : ["y", "yes"].includes(enableFeishuInput);
         const feishuWebhook = enableFeishu
-            ? (await ask(`Feishu webhook [${defaults.feishuWebhook ? "configured" : ""}]: `)).trim() || defaults.feishuWebhook
+            ? (await ask(renderSetupPrompt("Required", "Feishu webhook", defaults.feishuWebhook ? "configured" : ""))).trim() || defaults.feishuWebhook
             : undefined;
         const feishuSecret = enableFeishu
-            ? (await ask(`Feishu secret (optional) [${defaults.feishuSecret ? "configured" : ""}]: `)).trim() || defaults.feishuSecret
+            ? (await ask(renderSetupPrompt("Optional", "Feishu secret", defaults.feishuSecret ? "configured" : ""))).trim() || defaults.feishuSecret
             : undefined;
-        const enableJiraInput = (await ask(`Enable Jira integration? [${defaults.enableJira ? "Y/n" : "y/N"}] `)).trim().toLowerCase();
+        printSetupSection("Jira", "Enable this module when Optimus should read issues or comment back to Jira.");
+        const enableJiraInput = (await ask(renderSetupPrompt("Optional module", "Enable Jira integration", defaults.enableJira ? "Y/n" : "y/N"))).trim().toLowerCase();
         const enableJira = enableJiraInput.length === 0
             ? defaults.enableJira
             : ["y", "yes"].includes(enableJiraInput);
         const jiraBaseUrl = enableJira
-            ? (await ask(`Jira base URL [${defaults.jiraBaseUrl ?? ""}]: `)).trim() || defaults.jiraBaseUrl
+            ? (await ask(renderSetupPrompt("Required", "Jira base URL", defaults.jiraBaseUrl ?? ""))).trim() || defaults.jiraBaseUrl
             : undefined;
         const jiraMcpUrl = enableJira
-            ? (await ask(`Jira MCP URL [${defaults.jiraMcpUrl ?? ""}]: `)).trim() || defaults.jiraMcpUrl
+            ? (await ask(renderSetupPrompt("Required", "Jira MCP URL", defaults.jiraMcpUrl ?? ""))).trim() || defaults.jiraMcpUrl
             : undefined;
         const jiraUsername = enableJira
-            ? (await ask(`Jira username [${defaults.jiraUsername ?? ""}]: `)).trim() || defaults.jiraUsername
+            ? (await ask(renderSetupPrompt("Required", "Jira username", defaults.jiraUsername ?? ""))).trim() || defaults.jiraUsername
             : undefined;
         const jiraPersonalToken = enableJira
-            ? (await ask(`Jira personal token [${defaults.jiraPersonalToken ? "configured" : ""}]: `)).trim() || defaults.jiraPersonalToken
+            ? (await ask(renderSetupPrompt("Required", "Jira personal token", defaults.jiraPersonalToken ? "configured" : ""))).trim() || defaults.jiraPersonalToken
             : undefined;
-        const enableSentryInput = (await ask(`Enable Sentry integration? [${defaults.enableSentry ? "Y/n" : "y/N"}] `)).trim().toLowerCase();
+        printSetupSection("Sentry", "Enable this module when tasks can be created from Sentry events.");
+        const enableSentryInput = (await ask(renderSetupPrompt("Optional module", "Enable Sentry integration", defaults.enableSentry ? "Y/n" : "y/N"))).trim().toLowerCase();
         const enableSentry = enableSentryInput.length === 0
             ? defaults.enableSentry
             : ["y", "yes"].includes(enableSentryInput);
         const sentryBaseUrl = enableSentry
-            ? (await ask(`Sentry base URL [${defaults.sentryBaseUrl ?? ""}]: `)).trim() || defaults.sentryBaseUrl
+            ? (await ask(renderSetupPrompt("Required", "Sentry base URL", defaults.sentryBaseUrl ?? ""))).trim() || defaults.sentryBaseUrl
             : undefined;
         const sentryOrg = enableSentry
-            ? (await ask(`Sentry org [${defaults.sentryOrg ?? ""}]: `)).trim() || defaults.sentryOrg
+            ? (await ask(renderSetupPrompt("Required", "Sentry org", defaults.sentryOrg ?? ""))).trim() || defaults.sentryOrg
             : undefined;
         const sentryAuthToken = enableSentry
-            ? (await ask(`Sentry auth token [${defaults.sentryAuthToken ? "configured" : ""}]: `)).trim() || defaults.sentryAuthToken
+            ? (await ask(renderSetupPrompt("Required", "Sentry auth token", defaults.sentryAuthToken ? "configured" : ""))).trim() || defaults.sentryAuthToken
             : undefined;
         return {
             repoPath,
@@ -1079,7 +1095,7 @@ function normalizeSetupCodexAuthMode(value) {
 }
 function renderSetupCodexAuthModePrompt(defaultMode) {
     const defaultIndex = SETUP_CODEX_AUTH_MODE_OPTIONS.find((option) => option.mode === defaultMode)?.index ?? "1";
-    const lines = ["Codex auth mode:"];
+    const lines = ["[Required] Codex auth mode:"];
     for (const option of SETUP_CODEX_AUTH_MODE_OPTIONS) {
         const defaultSuffix = option.index === defaultIndex ? " (default)" : "";
         lines.push(`${option.index}. ${option.label} [${option.mode}]${defaultSuffix}`);
@@ -2389,6 +2405,7 @@ async function main() {
             const taskRuns = runs.filter((run) => run.taskId === task.taskId);
             const activeRun = runs.find((run) => run.runId === task.activeRunId) ?? taskRuns.slice(-1)[0];
             const timing = activeRun ? buildRunTimingSnapshot(activeRun, config) : { elapsedMs: 0, idleMs: 0, timeoutKind: null };
+            const activeMetrics = activeRun ? buildTaskExecutionMetrics(activeRun) : undefined;
             return {
                 taskId: task.taskId,
                 taskPackageId: task.taskPackageId,
@@ -2415,9 +2432,14 @@ async function main() {
                 elapsedMs: activeRun ? timing.elapsedMs : null,
                 idleMs: activeRun ? timing.idleMs : null,
                 timeoutKind: activeRun ? timing.timeoutKind : null,
+                metrics: activeMetrics ? {
+                    ...activeMetrics,
+                    display: formatExecutionMetricsCompact(activeMetrics)
+                } : null,
                 nextAction: buildTaskNextAction(task.status, activeRun?.failureCategory),
                 runs: taskRuns.slice(-3).map((run) => {
                     const timing = buildRunTimingSnapshot(run, config);
+                    const metrics = buildTaskExecutionMetrics(run);
                     return {
                         runId: run.runId,
                         status: run.status,
@@ -2444,7 +2466,11 @@ async function main() {
                         cancelRequestedAt: run.cancelRequestedAt ?? null,
                         elapsedMs: timing.elapsedMs,
                         idleMs: timing.idleMs,
-                        timeoutKind: timing.timeoutKind
+                        timeoutKind: timing.timeoutKind,
+                        metrics: metrics ? {
+                            ...metrics,
+                            display: formatExecutionMetricsCompact(metrics)
+                        } : null
                     };
                 })
             };
@@ -3119,6 +3145,10 @@ function renderTaskResultReport(input) {
         if (latestRun.endedAt) {
             lines.push(`Ended At: ${latestRun.endedAt}`);
         }
+        const metrics = formatExecutionMetricsCompact(buildTaskExecutionMetrics(latestRun));
+        if (metrics) {
+            lines.push(`Metrics: ${metrics}`);
+        }
     }
     lines.push("");
     lines.push("Summary");
@@ -3142,6 +3172,10 @@ function renderTaskResultReport(input) {
         lines.push("Delivery");
         lines.push(`Outcome: ${input.deliveryBundle.outcome}`);
         lines.push(`Decision: ${input.deliveryBundle.summary.decision}`);
+        const metrics = formatExecutionMetricsCompact(input.deliveryBundle.metrics);
+        if (metrics) {
+            lines.push(`Metrics: ${metrics}`);
+        }
         if (input.deliveryBundle.warnings?.length) {
             lines.push(`Warnings: ${input.deliveryBundle.warnings.join(", ")}`);
         }