claude-task-worker 0.39.2 → 0.40.0

package/dist/index.js

@@ -12,9 +12,13 @@ var __export = (target, all) => {
 // src/table.ts
 var table_exports = {};
 __export(table_exports, {
+  LOG_DISPLAY_LIMIT: () => LOG_DISPLAY_LIMIT,
+  TASK_DISPLAY_LIMIT: () => TASK_DISPLAY_LIMIT,
+  buildLogTableLines: () => buildLogTableLines,
   buildTaskTableLines: () => buildTaskTableLines,
   getDisplayWidth: () => getDisplayWidth,
   padToWidth: () => padToWidth,
+  selectRecentTasks: () => selectRecentTasks,
   truncateToWidth: () => truncateToWidth
 });
 function getDisplayWidth(str) {
@@ -61,74 +65,97 @@ function formatTime(date) {
   const s = String(date.getSeconds()).padStart(2, "0");
   return `${h}:${m}:${s}`;
 }
+function renderBoxTable(headers, groups) {
+  const allRows = groups.flat();
+  const widths = headers.map(
+    (h, i) => Math.max(1, getDisplayWidth(h), ...allRows.map((r) => getDisplayWidth(r[i] ?? "")))
+  );
+  const border = (l, m, r) => `${l}${widths.map((w) => "\u2500".repeat(w + 2)).join(m)}${r}`;
+  const row = (cells) => `\u2502 ${cells.map((c, i) => padToWidth(c ?? "", widths[i])).join(" \u2502 ")} \u2502`;
+  const lines = [];
+  lines.push(border("\u250C", "\u252C", "\u2510"));
+  lines.push(row(headers));
+  lines.push(border("\u251C", "\u253C", "\u2524"));
+  const nonEmpty = groups.filter((g) => g.length > 0);
+  nonEmpty.forEach((group, gi) => {
+    if (gi > 0) lines.push(border("\u251C", "\u253C", "\u2524"));
+    for (const r of group) lines.push(row(r));
+  });
+  lines.push(border("\u2514", "\u2534", "\u2518"));
+  return lines;
+}
+function taskRecency(t) {
+  return (t.finishedAt ?? t.startedAt).getTime();
+}
+function selectRecentTasks(entries, limit = TASK_DISPLAY_LIMIT) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const e of entries) byId.set(e.id, e);
+  const unique = [...byId.values()];
+  const running2 = unique.filter((t) => t.status === "running").sort((a, b) => taskRecency(b) - taskRecency(a));
+  const finished = unique.filter((t) => t.status !== "running").sort((a, b) => taskRecency(b) - taskRecency(a));
+  return [...running2, ...finished].slice(0, limit);
+}
 function buildTaskTableLines(entries, now = /* @__PURE__ */ new Date()) {
   if (entries.length === 0) return [];
   const runningTasks = entries.filter((t) => t.status === "running");
   const finishedTasks = entries.filter((t) => t.status !== "running");
   const maxTitleWidth = 40;
   const maxPathWidth = 40;
-  const runningRows = runningTasks.map((t) => ({
-    id: `#${t.id}`,
-    title: getDisplayWidth(t.title) > maxTitleWidth ? truncateToWidth(t.title, maxTitleWidth) : t.title,
-    worker: t.workerName,
-    path: t.path ? t.path.length > maxPathWidth ? truncateToWidth(t.path, maxPathWidth) : t.path : "",
-    // herdr モードでは agent ステータス（working / blocked 等）を併記し、
-    // 人の介入が必要な blocked にも気づけるようにする。
-    status: t.agentStatus ? `${t.status}:${t.agentStatus}` : t.status,
-    time: formatTime(t.startedAt),
-    duration: formatDuration(t.startedAt, now)
-  }));
-  const finishedRows = finishedTasks.map((t) => ({
-    id: `#${t.id}`,
-    title: getDisplayWidth(t.title) > maxTitleWidth ? truncateToWidth(t.title, maxTitleWidth) : t.title,
-    worker: t.workerName,
-    path: t.path ? t.path.length > maxPathWidth ? truncateToWidth(t.path, maxPathWidth) : t.path : "",
-    status: t.status,
-    time: formatTime(t.finishedAt ?? t.startedAt),
-    duration: formatDuration(t.startedAt, t.finishedAt ?? now)
-  }));
-  const allRows = [...runningRows, ...finishedRows];
-  const hasPath = allRows.some((r) => r.path !== "");
-  const colWidths = {
-    id: Math.max(3, ...allRows.map((r) => r.id.length)),
-    title: Math.max(5, ...allRows.map((r) => getDisplayWidth(r.title))),
-    worker: Math.max(6, ...allRows.map((r) => r.worker.length)),
-    ...hasPath ? { path: Math.max(8, ...allRows.map((r) => r.path.length)) } : {},
-    status: Math.max(6, ...allRows.map((r) => r.status.length)),
-    time: Math.max(4, ...allRows.map((r) => r.time.length)),
-    duration: Math.max(8, ...allRows.map((r) => r.duration.length))
-  };
-  const pad = (s, w, useDisplayWidth = false) => useDisplayWidth ? padToWidth(s, w) : s + " ".repeat(w - s.length);
-  const cols = hasPath ? [
-    colWidths.id,
-    colWidths.title,
-    colWidths.worker,
-    colWidths.path,
-    colWidths.status,
-    colWidths.time,
-    colWidths.duration
-  ] : [colWidths.id, colWidths.title, colWidths.worker, colWidths.status, colWidths.time, colWidths.duration];
-  const line = (l, m, r, f) => `${l}${cols.map((w) => f.repeat(w + 2)).join(m)}${r}`;
-  const row = (id, title, worker, path2, status, time, duration) => hasPath ? `\u2502 ${pad(id, colWidths.id)} \u2502 ${pad(title, colWidths.title, true)} \u2502 ${pad(worker, colWidths.worker)} \u2502 ${pad(path2, colWidths.path)} \u2502 ${pad(status, colWidths.status)} \u2502 ${pad(time, colWidths.time)} \u2502 ${pad(duration, colWidths.duration)} \u2502` : `\u2502 ${pad(id, colWidths.id)} \u2502 ${pad(title, colWidths.title, true)} \u2502 ${pad(worker, colWidths.worker)} \u2502 ${pad(status, colWidths.status)} \u2502 ${pad(time, colWidths.time)} \u2502 ${pad(duration, colWidths.duration)} \u2502`;
-  const lines = [];
-  lines.push(line("\u250C", "\u252C", "\u2510", "\u2500"));
-  lines.push(row("#", "Title", "Worker", "Worktree", "Status", "Time", "Duration"));
-  lines.push(line("\u251C", "\u253C", "\u2524", "\u2500"));
-  for (const r of runningRows) {
-    lines.push(row(r.id, r.title, r.worker, r.path, r.status, r.time, r.duration));
-  }
-  if (runningRows.length > 0 && finishedRows.length > 0) {
-    lines.push(line("\u251C", "\u253C", "\u2524", "\u2500"));
-  }
-  for (const r of finishedRows) {
-    lines.push(row(r.id, r.title, r.worker, r.path, r.status, r.time, r.duration));
-  }
-  lines.push(line("\u2514", "\u2534", "\u2518", "\u2500"));
-  return lines;
+  const truncTitle = (s) => getDisplayWidth(s) > maxTitleWidth ? truncateToWidth(s, maxTitleWidth) : s;
+  const truncPath = (p) => p ? getDisplayWidth(p) > maxPathWidth ? truncateToWidth(p, maxPathWidth) : p : "";
+  const hasPath = entries.some((t) => truncPath(t.path) !== "");
+  const runningRows = runningTasks.map(
+    (t) => taskRow(
+      t,
+      truncTitle(t.title),
+      truncPath(t.path),
+      hasPath,
+      t.agentStatus ? `${t.status}:${t.agentStatus}` : t.status,
+      formatTime(t.startedAt),
+      formatDuration(t.startedAt, now)
+    )
+  );
+  const finishedRows = finishedTasks.map(
+    (t) => taskRow(
+      t,
+      truncTitle(t.title),
+      truncPath(t.path),
+      hasPath,
+      t.status,
+      formatTime(t.finishedAt ?? t.startedAt),
+      formatDuration(t.startedAt, t.finishedAt ?? now)
+    )
+  );
+  const headers = hasPath ? ["#", "Title", "Worker", "Worktree", "Status", "Time", "Duration"] : ["#", "Title", "Worker", "Status", "Time", "Duration"];
+  return renderBoxTable(headers, [runningRows, finishedRows]);
+}
+function taskRow(t, title, path2, hasPath, status, time, duration) {
+  return hasPath ? [`#${t.id}`, title, t.workerName, path2, status, time, duration] : [`#${t.id}`, title, t.workerName, status, time, duration];
+}
+function sanitizeLogText(text) {
+  return text.replace(CONTROL_CHARS, " ").replace(/\t/g, " ");
+}
+function buildLogTableLines(entries) {
+  if (entries.length === 0) return [];
+  const maxTextWidth = 100;
+  const rows = entries.map((e) => {
+    const text = sanitizeLogText(e.text);
+    return [
+      formatTime(e.time),
+      `#${e.id}`,
+      e.stream,
+      getDisplayWidth(text) > maxTextWidth ? truncateToWidth(text, maxTextWidth) : text
+    ];
+  });
+  return renderBoxTable(["Time", "#", "Stream", "Log"], [rows]);
 }
+var TASK_DISPLAY_LIMIT, LOG_DISPLAY_LIMIT, CONTROL_CHARS;
 var init_table = __esm({
   "src/table.ts"() {
     "use strict";
+    TASK_DISPLAY_LIMIT = 20;
+    LOG_DISPLAY_LIMIT = 20;
+    CONTROL_CHARS = /\x1b\[[0-9;?]*[ -/]*[@-~]|[\x00-\x08\x0b-\x1f\x7f]/g;
   }
 });
 
@@ -1843,6 +1870,7 @@ async function assertRemoteTrackingExists(epicBranch) {
 // src/process-manager.ts
 import { spawn } from "node:child_process";
 import { basename } from "node:path";
+import { StringDecoder } from "node:string_decoder";
 init_table();
 
 // src/task-result.ts
@@ -2059,6 +2087,38 @@ var childProcesses = /* @__PURE__ */ new Map();
 var herdrTasks = /* @__PURE__ */ new Map();
 var herdrAbortSignal = { aborted: false };
 var tasks = /* @__PURE__ */ new Map();
+var logLines = [];
+function pushLogLine(id, stream, text) {
+  const trimmed = text.replace(/\r$/, "");
+  if (trimmed.trim().length === 0) return;
+  logLines.push({ id, stream, text: trimmed, time: /* @__PURE__ */ new Date() });
+  if (logLines.length > LOG_DISPLAY_LIMIT) {
+    logLines.splice(0, logLines.length - LOG_DISPLAY_LIMIT);
+  }
+}
+function makeLogFeeder(id, stream) {
+  let partial = "";
+  const decoder = new StringDecoder("utf-8");
+  return {
+    feed(chunk) {
+      partial += decoder.write(chunk);
+      const parts = partial.split("\n");
+      partial = parts.pop() ?? "";
+      for (const part of parts) pushLogLine(id, stream, part);
+    },
+    flush() {
+      partial += decoder.end();
+      if (partial.length > 0) {
+        pushLogLine(id, stream, partial);
+        partial = "";
+      }
+    }
+  };
+}
+function pruneTaskHistory() {
+  const finished = [...tasks.values()].filter((t) => t.status !== "running").sort((a, b) => (b.finishedAt ?? b.startedAt).getTime() - (a.finishedAt ?? a.startedAt).getTime());
+  for (const t of finished.slice(TASK_DISPLAY_LIMIT)) tasks.delete(t.id);
+}
 var shuttingDown = false;
 function setShuttingDown() {
   shuttingDown = true;
@@ -2088,8 +2148,14 @@ function isWorkerAtCapacity(workerName) {
   return count >= getWorkerConfig(workerName).maxConcurrentTasks;
 }
 function renderTable() {
-  const lines = buildTaskTableLines([...tasks.values()]);
-  if (lines.length === 0) return;
+  const taskLines = buildTaskTableLines(selectRecentTasks([...tasks.values()]));
+  const logTableLines = buildLogTableLines(logLines);
+  if (taskLines.length === 0 && logTableLines.length === 0) return;
+  const lines = [...taskLines];
+  if (logTableLines.length > 0) {
+    if (lines.length > 0) lines.push("");
+    lines.push("Logs", ...logTableLines);
+  }
   console.clear();
   console.log(lines.join("\n"));
 }
@@ -2116,6 +2182,7 @@ async function finishTask(id, result, onComplete) {
     task.finishedAt = /* @__PURE__ */ new Date();
     task.agentStatus = void 0;
   }
+  pruneTaskHistory();
   renderTable();
 }
 function resolveProjectName(cwd = process.cwd()) {
@@ -2159,6 +2226,7 @@ async function runViaHerdr(args, id, onComplete, cwd, env) {
   herdrTasks.delete(id);
 }
 function run(command, args, id, title, workerName, path2, onComplete, cwd, env) {
+  tasks.delete(id);
   tasks.set(id, {
     id,
     title,
@@ -2180,9 +2248,12 @@ function run(command, args, id, title, workerName, path2, onComplete, cwd, env)
     ...env ? { env: { ...process.env, ...env } } : {}
   });
   childProcesses.set(id, child);
+  const stdoutFeeder = makeLogFeeder(id, "stdout");
+  const stderrFeeder = makeLogFeeder(id, "stderr");
   const outputChunks = [];
   child.stdout?.on("data", (chunk) => {
     outputChunks.push(chunk);
+    stdoutFeeder.feed(chunk);
   });
   const stderrChunks = [];
   let stderrLen = 0;
@@ -2193,8 +2264,11 @@ function run(command, args, id, title, workerName, path2, onComplete, cwd, env)
       stderrLen -= stderrChunks[0].length;
       stderrChunks.shift();
     }
+    stderrFeeder.feed(chunk);
   });
   child.on("close", async (code) => {
+    stdoutFeeder.flush();
+    stderrFeeder.flush();
     const result = buildTaskResult(
       code,
       Buffer.concat(outputChunks).toString("utf-8"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-task-worker",
-  "version": "0.39.2",
+  "version": "0.40.0",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -12,7 +12,7 @@
     "dev": "tsc --noEmit --watch",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "test": "node --experimental-strip-types --test \"src/**/*.test.ts\" \"plugin/scripts/**/*.test.mjs\"",
+    "test": "node --experimental-strip-types --import ./scripts/test-resolver.mjs --test \"src/**/*.test.ts\" \"plugin/scripts/**/*.test.mjs\"",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "version": "node scripts/sync-plugin-version.mjs && git add plugin/.claude-plugin/plugin.json",