@agent-compose/cli 0.3.1 → 0.3.3

package/dist/index.js

@@ -137,7 +137,8 @@ async function saveLocalSettings(projectDir, settings) {
 var [_project, _projectDir] = findProjectRoot();
 var _local = loadLocalSettings(_projectDir);
 var _global = loadGlobalSettings();
-var _activeEnv = _local.env ?? (_project.envs?.["prod"] ? "prod" : undefined);
+var _candidateEnv = _local.env ?? _project.defaultEnv ?? "prod";
+var _activeEnv = _project.envs?.[_candidateEnv] ? _candidateEnv : undefined;
 var _envUrl = _activeEnv ? _project.envs?.[_activeEnv]?.url : undefined;
 var _envDashboardUrl = _activeEnv ? _project.envs?.[_activeEnv]?.dashboardUrl : undefined;
 var _envKey = _activeEnv ? _local.keys?.[_activeEnv] : undefined;
@@ -257,8 +258,15 @@ function fmt(ms) {
   return `${Math.floor(ms / 60000)}m ${Math.floor(ms % 60000 / 1000)}s`;
 }
 function extractToolSnippet(toolInput) {
-  const raw = toolInput ? String(toolInput) : "";
-  return raw.match(/"(?:command|file_path|url|query|pattern)":"([^"]{1,80})/)?.[1] ?? "";
+  if (!toolInput || typeof toolInput !== "object")
+    return "";
+  const input = toolInput;
+  for (const key of ["command", "file_path", "url", "query", "pattern"]) {
+    const value = input[key];
+    if (typeof value === "string" && value.length > 0)
+      return value.slice(0, 80);
+  }
+  return "";
 }
 function printAgentMessage(data) {
   const message = data.message;
@@ -280,7 +288,7 @@ function printAgentMessage(data) {
       break;
     }
     case "tool_use": {
-      const detail = extractToolSnippet(message.toolInputPreview);
+      const detail = extractToolSnippet(message.toolInput);
       process.stdout.write(`  ${pc.cyan("→")} ${pc.bold(String(message.toolName ?? "tool"))}${detail ? `  ${pc.dim(detail)}` : ""}
 `);
       break;
@@ -291,6 +299,15 @@ function printAgentMessage(data) {
       break;
   }
 }
+function printConsoleLine(line) {
+  const text = line.line.trimEnd();
+  if (!text)
+    return;
+  const label = line.stream === "stderr" ? pc.red("stderr") : pc.dim("stdout");
+  const color = line.stream === "stderr" ? pc.red : pc.dim;
+  process.stdout.write(`${label} ${color(text)}
+`);
+}
 function printEvent(event, data, state) {
   switch (event) {
     case "step_started":
@@ -424,45 +441,81 @@ ${pc.bold(pc.yellow("⊘ Run canceled"))}
   }
 }
 var TERMINAL_EVENTS = new Set(["run_complete", "run_failed", "run_canceled"]);
+var CONSOLE_POLL_MS = 500;
 async function streamLogs(runId, opts) {
   const client = makeClient(opts);
+  const view = opts.view ?? "all";
   const state = {
     agentStart: new Map,
     agentLabel: new Map,
     startedAt: Date.now()
   };
   let lastSeq = 0;
+  let lastLogId = 0;
+  let stopConsole = false;
   const MAX_RETRIES = 5;
-  for (let attempt = 0;attempt <= MAX_RETRIES; attempt++) {
-    let settled = false;
-    try {
-      for await (const ev of client.streamRunLogs(runId, { lastEventId: lastSeq })) {
-        const seq = ev.seq ?? 0;
-        if (seq > 0)
-          lastSeq = seq;
-        printEvent(ev.event, ev, state);
-        if (TERMINAL_EVENTS.has(ev.event)) {
-          settled = true;
-          break;
+  const drainConsole = async () => {
+    const lines = await client.listRunLogs(runId, { afterId: lastLogId, limit: 200, direction: "asc" });
+    for (const line of lines) {
+      if (line.id > lastLogId)
+        lastLogId = line.id;
+      printConsoleLine(line);
+    }
+  };
+  const consoleLoop = view === "agent" ? null : (async () => {
+    while (!stopConsole) {
+      await drainConsole().catch((err) => {
+        if (err instanceof AgentComposeError2 && err.status === 404)
+          return;
+        throw err;
+      });
+      if (!stopConsole)
+        await new Promise((r) => setTimeout(r, CONSOLE_POLL_MS));
+    }
+    await drainConsole().catch(() => {});
+  })();
+  try {
+    for (let attempt = 0;attempt <= MAX_RETRIES; attempt++) {
+      let settled = false;
+      try {
+        for await (const ev of client.streamRunLogs(runId, { lastEventId: lastSeq })) {
+          const seq = ev.seq ?? 0;
+          if (seq > 0)
+            lastSeq = seq;
+          if (view !== "console" || TERMINAL_EVENTS.has(ev.event)) {
+            printEvent(ev.event, ev, state);
+          }
+          if (TERMINAL_EVENTS.has(ev.event)) {
+            settled = true;
+            break;
+          }
         }
+      } catch (err) {
+        if (err instanceof AgentComposeError2) {
+          console.error(`Error: failed to connect to log stream (${err.status})`);
+          process.exit(1);
+        }
+        throw err;
       }
-    } catch (err) {
-      if (err instanceof AgentComposeError2) {
-        console.error(`Error: failed to connect to log stream (${err.status})`);
-        process.exit(1);
-      }
-      throw err;
+      if (settled)
+        return;
+      if (attempt < MAX_RETRIES)
+        await new Promise((r) => setTimeout(r, 200));
     }
-    if (settled)
-      return;
-    if (attempt < MAX_RETRIES)
-      await new Promise((r) => setTimeout(r, 200));
+  } finally {
+    stopConsole = true;
+    await consoleLoop;
   }
   console.error("Error: stream closed without terminal event after retries");
   process.exit(1);
 }
-var logsCommand = new Command2("logs").description("Stream logs for a run").argument("<run-id>", "Run ID").option("--url <url>", "Server URL", parseUrlFlag, defaultUrl).option("--api-key <key>", "API key", defaultApiKey).action(async (runId, opts) => {
-  await streamLogs(runId, opts);
+var logsCommand = new Command2("logs").description("Stream logs for a run").argument("<run-id>", "Run ID").option("--agent", "Show structured agent/lifecycle events only").option("--console", "Show raw runner stdout/stderr only").option("--url <url>", "Server URL", parseUrlFlag, defaultUrl).option("--api-key <key>", "API key", defaultApiKey).action(async (runId, opts) => {
+  if (opts.agent && opts.console) {
+    console.error("Error: choose only one of --agent or --console");
+    process.exit(1);
+  }
+  const view = opts.agent ? "agent" : opts.console ? "console" : "all";
+  await streamLogs(runId, { ...opts, view });
 });
 
 // src/commands/invoke.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-compose/cli",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Command-line interface for agent-compose — register, invoke, and monitor workflows from your terminal.",
   "license": "MIT",
   "repository": {
@@ -44,7 +44,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@agent-compose/sdk": "^0.5.0",
+    "@agent-compose/sdk": "^0.5.2",
     "commander": "^12.0.0",
     "picocolors": "^1.1.1"
   },

package/skills/ac:generate-workflow.md

@@ -355,9 +355,7 @@ workflow that must be registered in the same factory. Walk them
 through it in user terms:
 
 1. "I'll add the `workflow-memory` recipe to your project."
-   Copy from `templates/workflow-memory.ts` (or
-   `.agentc/smoketest/workflows/workflow-memory.ts` for the smoke
-   variant).
+   Copy from `.agentc/templates/workflow-memory.ts`.
 2. "Run `agentc register ./workflow-memory.ts` once to install it."
 3. "Now any workflow with `memory: true` will trigger it after each
    successful run."