@volc-emr/emr-cli 0.1.0-beta.0 → 0.1.0-beta.1

package/dist/agent/agent.js

@@ -3,16 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agent = void 0;
 const planner_1 = require("./planner");
 const executor_1 = require("./executor");
+const logger_1 = require("../runtime/logger");
 class Agent {
     constructor(ctx) {
         this.ctx = ctx;
     }
     async run(task, options = {}) {
+        logger_1.ui.section(`Task`);
+        logger_1.ui.info(task);
         const plan = await (0, planner_1.planTask)(task);
-        console.log("\n📋 Plan:");
-        console.log(plan);
-        if (options.dryRun)
+        logger_1.ui.section(`Plan (${plan.length} step${plan.length > 1 ? "s" : ""})`);
+        plan.forEach((step, i) => {
+            logger_1.ui.raw(`  ${i + 1}. ${step.tool}`);
+            if (step.input && Object.keys(step.input).length > 0) {
+                logger_1.ui.dim(`     ${JSON.stringify(step.input)}`);
+            }
+        });
+        if (options.dryRun) {
+            logger_1.ui.divider();
+            logger_1.ui.info("dry-run mode: no Tool will be executed");
             return;
+        }
         await (0, executor_1.executePlan)(plan, this.ctx, { autoApprove: options.autoApprove });
     }
 }

package/dist/agent/executor.js

@@ -5,21 +5,32 @@ const registry_1 = require("../tools/registry");
 const confirm_1 = require("../runtime/confirm");
 const logger_1 = require("../runtime/logger");
 async function executePlan(plan, ctx, options = {}) {
+    logger_1.ui.section(`Execute (${plan.length} step${plan.length > 1 ? "s" : ""})`);
     for (const [i, step] of plan.entries()) {
         const tool = registry_1.toolList.find((t) => t.name === step.tool);
-        if (!tool)
+        if (!tool) {
+            (0, logger_1.logStep)(i, "fail", step.tool, { error: "Tool not found" });
             throw new Error(`Tool not found: ${step.tool}`);
+        }
         if (tool.riskLevel === "high") {
             const ok = options.autoApprove
                 ? true
-                : await (0, confirm_1.confirm)(`⚠️ 执行 ${tool.name} (input=${JSON.stringify(step.input)})?`);
+                : await (0, confirm_1.confirm)(`⚠ 执行高风险 Tool: ${tool.name} ${JSON.stringify(step.input)}`);
             if (!ok) {
-                (0, logger_1.logStep)(i, `Skipped ${tool.name}`);
+                (0, logger_1.logStep)(i, "skip", tool.name, { reason: "user cancelled" });
                 continue;
             }
         }
-        (0, logger_1.logStep)(i, `Running ${tool.name}`, step.input);
-        const result = await tool.execute(step.input, ctx);
-        (0, logger_1.logStep)(i, `Done ${tool.name}`, result);
+        (0, logger_1.logStep)(i, "run", tool.name, { input: step.input });
+        try {
+            const result = await tool.execute(step.input, ctx);
+            (0, logger_1.logStep)(i, "done", tool.name, { output: result });
+        }
+        catch (err) {
+            (0, logger_1.logStep)(i, "fail", tool.name, { error: err?.message || String(err) });
+            throw err;
+        }
     }
+    logger_1.ui.divider();
+    logger_1.ui.success("Execute finished");
 }

package/dist/index.js

@@ -7,6 +7,7 @@ const registry_1 = require("./tools/registry");
 const memory_1 = require("./runtime/memory");
 const config_1 = require("./runtime/config");
 const confirm_1 = require("./runtime/confirm");
+const logger_1 = require("./runtime/logger");
 const program = new commander_1.Command();
 program
     .name("volc-emr-agent")
@@ -25,15 +26,23 @@ program
         process.env.VOLC_SECRETKEY = opts.secretKey;
     if (opts.region)
         process.env.VOLC_REGION = opts.region;
-    (0, config_1.resolveCredentials)();
-    const agent = new agent_1.Agent({
-        api: registry_1.apiRegistry,
-        memory: memory_1.memory
-    });
-    await agent.run(task, {
-        dryRun: opts.dryRun,
-        autoApprove: opts.yes
-    });
+    try {
+        const creds = (0, config_1.resolveCredentials)();
+        const cfg = (0, config_1.readLocalConfig)();
+        logger_1.ui.dim(`region=${creds.region}  llm=${cfg.llm?.endpoint ? "configured" : "not configured"}`);
+        const agent = new agent_1.Agent({
+            api: registry_1.apiRegistry,
+            memory: memory_1.memory
+        });
+        await agent.run(task, {
+            dryRun: opts.dryRun,
+            autoApprove: opts.yes
+        });
+    }
+    catch (err) {
+        logger_1.ui.error(err?.message || String(err));
+        process.exitCode = 1;
+    }
 });
 program
     .command("init")
@@ -49,10 +58,10 @@ program
     const existing = (0, config_1.readLocalConfig)();
     const hasExisting = !!(existing.accessKey || existing.secretKey);
     if (hasExisting && !opts.force) {
-        console.log(`Detected existing config: ${(0, config_1.configFilePath)()}`);
+        logger_1.ui.info(`Detected existing config: ${(0, config_1.configFilePath)()}`);
         const ok = await (0, confirm_1.confirm)("Overwrite existing credentials?");
         if (!ok) {
-            console.log("Cancelled. No changes made.");
+            logger_1.ui.warn("Cancelled. No changes made.");
             return;
         }
     }
@@ -64,14 +73,14 @@ program
                 defaultValue: existing.accessKey
             }));
         if (!accessKey) {
-            console.error("Access key is required.");
+            logger_1.ui.error("Access key is required.");
             process.exitCode = 1;
             return;
         }
         const secretKey = opts.secretKey ||
             (await session.ask("VOLC Secret Key", { silent: true }));
         if (!secretKey) {
-            console.error("Secret key is required.");
+            logger_1.ui.error("Secret key is required.");
             process.exitCode = 1;
             return;
         }
@@ -109,20 +118,21 @@ program
             };
         }
         const file = (0, config_1.writeLocalConfig)(payload);
-        console.log(`\n✓ Saved to ${file}`);
-        console.log({
-            accessKey: `${accessKey.slice(0, 4)}****`,
-            secretKey: "********",
-            region,
-            llm: llmEndpoint
-                ? {
-                    endpoint: llmEndpoint,
-                    apiKey: payload.llm.apiKey ? "********" : undefined,
-                    model: payload.llm.model || undefined
-                }
-                : "(not configured)"
-        });
-        console.log("\nTip: run `volc-emr-agent run \"列出集群\"` to verify.");
+        logger_1.ui.success(`Saved to ${file}`);
+        logger_1.ui.kv("accessKey", `${accessKey.slice(0, 4)}****`);
+        logger_1.ui.kv("secretKey", "********");
+        logger_1.ui.kv("region", region);
+        if (llmEndpoint) {
+            logger_1.ui.kv("llm.endpoint", llmEndpoint);
+            if (payload.llm.apiKey)
+                logger_1.ui.kv("llm.apiKey", "********");
+            if (payload.llm.model)
+                logger_1.ui.kv("llm.model", payload.llm.model);
+        }
+        else {
+            logger_1.ui.kv("llm", "(not configured)");
+        }
+        logger_1.ui.dim(`Tip: run \`volc-emr-agent run "列出集群"\` to verify.`);
     }
     finally {
         session?.close();
@@ -141,7 +151,7 @@ config
         secretKey: opts.secretKey,
         region: opts.region
     });
-    console.log(`Saved: ${file}`);
+    logger_1.ui.success(`Credentials saved: ${file}`);
 });
 config
     .command("set-llm")
@@ -157,26 +167,25 @@ config
             model: opts.model
         }
     });
-    console.log(`Saved LLM config: ${file}`);
+    logger_1.ui.success(`LLM config saved: ${file}`);
 });
 config
     .command("show")
     .description("Show current local config (secrets are masked)")
     .action(() => {
     const cfg = (0, config_1.readLocalConfig)();
-    const masked = {
-        ...cfg,
-        accessKey: cfg.accessKey ? `${cfg.accessKey.slice(0, 4)}****` : undefined,
-        secretKey: cfg.secretKey ? "********" : undefined,
-        llm: cfg.llm
-            ? {
-                endpoint: cfg.llm.endpoint,
-                apiKey: cfg.llm.apiKey ? "********" : undefined,
-                model: cfg.llm.model
-            }
-            : undefined
-    };
-    console.log("file:", (0, config_1.configFilePath)());
-    console.log(masked);
+    logger_1.ui.section("Local config");
+    logger_1.ui.kv("file", (0, config_1.configFilePath)());
+    logger_1.ui.kv("accessKey", cfg.accessKey ? `${cfg.accessKey.slice(0, 4)}****` : "(missing)");
+    logger_1.ui.kv("secretKey", cfg.secretKey ? "********" : "(missing)");
+    logger_1.ui.kv("region", cfg.region || "(missing)");
+    if (cfg.llm?.endpoint) {
+        logger_1.ui.kv("llm.endpoint", cfg.llm.endpoint);
+        logger_1.ui.kv("llm.apiKey", cfg.llm.apiKey ? "********" : "(missing)");
+        logger_1.ui.kv("llm.model", cfg.llm.model || "(missing)");
+    }
+    else {
+        logger_1.ui.kv("llm", "(not configured)");
+    }
 });
 program.parse();

package/dist/runtime/logger.js

@@ -1,8 +1,122 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ui = void 0;
 exports.logStep = logStep;
-function logStep(i, msg, data) {
-    console.log(`Step ${i + 1}: ${msg}`);
-    if (data)
-        console.log("  ↳", data);
+const useColor = process.stdout.isTTY && process.env.NO_COLOR === undefined && process.env.TERM !== "dumb";
+const c = (code) => (s) => (useColor ? `\x1b[${code}m${s}\x1b[0m` : s);
+const color = {
+    gray: c("90"),
+    red: c("31"),
+    green: c("32"),
+    yellow: c("33"),
+    blue: c("34"),
+    magenta: c("35"),
+    cyan: c("36"),
+    bold: c("1"),
+    dim: c("2")
+};
+const SYM = {
+    info: "ℹ",
+    success: "✔",
+    warn: "⚠",
+    error: "✘",
+    skip: "⊘",
+    arrow: "→",
+    bullet: "•"
+};
+function write(line) {
+    process.stdout.write(line.endsWith("\n") ? line : line + "\n");
+}
+function formatInline(val) {
+    if (val === undefined)
+        return "";
+    if (typeof val === "string")
+        return val;
+    try {
+        return JSON.stringify(val);
+    }
+    catch {
+        return String(val);
+    }
+}
+function formatFull(val) {
+    if (val === undefined)
+        return "";
+    if (typeof val === "string")
+        return val;
+    try {
+        return JSON.stringify(val, null, 2);
+    }
+    catch {
+        return String(val);
+    }
+}
+exports.ui = {
+    info(msg) {
+        write(`${color.cyan(SYM.info)} ${msg}`);
+    },
+    success(msg) {
+        write(`${color.green(SYM.success)} ${msg}`);
+    },
+    warn(msg) {
+        write(`${color.yellow(SYM.warn)} ${msg}`);
+    },
+    error(msg) {
+        write(`${color.red(SYM.error)} ${msg}`);
+    },
+    skip(msg) {
+        write(`${color.yellow(SYM.skip)} ${msg}`);
+    },
+    dim(msg) {
+        write(color.dim(msg));
+    },
+    kv(key, value) {
+        write(`  ${color.gray(key + ":")} ${formatInline(value)}`);
+    },
+    section(title) {
+        write("");
+        write(color.bold(title));
+    },
+    divider() {
+        write(color.dim("─".repeat(48)));
+    },
+    raw(msg) {
+        write(msg);
+    },
+    json(value) {
+        write(typeof value === "string" ? value : JSON.stringify(value, null, 2));
+    }
+};
+function logStep(i, status, toolName, extra) {
+    const idx = color.gray(`[${i + 1}]`);
+    if (status === "run") {
+        const suffix = extra?.input ? color.dim(` ${formatInline(extra.input)}`) : "";
+        write(`${idx} ${color.blue(SYM.arrow)} ${color.bold(toolName)}${suffix}`);
+        return;
+    }
+    if (status === "done") {
+        write(`${idx} ${color.green(SYM.success)} ${toolName}`);
+        if (extra?.output !== undefined) {
+            const out = extra.output;
+            if (out && typeof out === "object" && out.Skipped) {
+                exports.ui.kv("skipped", out.Reason || "true");
+                if (out.Message)
+                    exports.ui.kv("message", out.Message);
+            }
+            else {
+                write(color.dim(formatFull(extra.output)));
+            }
+        }
+        return;
+    }
+    if (status === "skip") {
+        const reason = extra?.reason ? ` (${extra.reason})` : "";
+        write(`${idx} ${color.yellow(SYM.skip)} ${toolName}${color.dim(reason)}`);
+        return;
+    }
+    if (status === "fail") {
+        write(`${idx} ${color.red(SYM.error)} ${toolName}`);
+        if (extra?.error)
+            exports.ui.kv("error", extra.error);
+    }
 }

package/dist/services/emrApi.js

@@ -64,7 +64,6 @@ async function listClusters(params = {}) {
         MaxResults: params.MaxResults,
         NextToken: params.NextToken
     });
-    console.log(body);
     const result = await (0, volcApi_1.callEmr)("ListClusters", body);
     return {
         Items: Array.isArray(result?.Items) ? result.Items : [],
@@ -147,8 +146,6 @@ async function releaseCluster(params) {
 }
 async function createCluster(params) {
     const body = compactBody({ ...params });
-    console.log("createCluster params:", params);
-    console.log(body);
     const resp = await (0, volcApi_1.callEmr)("CreateCluster", body);
     return {
         ClusterId: resp?.ClusterId || "",
@@ -169,7 +166,6 @@ async function findClustersToCleanup({ olderThanDays = 7, states } = {}) {
         ClusterStates: targetStates,
         CreateTimeBefore: threshold
     });
-    console.log(items);
     return items;
 }
 exports.emrApi = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volc-emr/emr-cli",
-  "version": "0.1.0-beta.0",
+  "version": "0.1.0-beta.1",
   "description": "Minimal controllable CLI Agent for Volcengine EMR OpenAPI: Tool-first + Plan/Execute with LLM-driven planner.",
   "keywords": [
     "volcengine",