claude-task-worker 0.68.0 → 0.70.0

package/README.md

@@ -185,6 +185,7 @@ claude-task-worker exec-issue --project app-a --epic 100 --label priority-high
 {
   "mode": "default",
   "advisor": false,
+  "permission": "bypassPermissions",
   "projects": {
     "app-a": "/Users/me/repos/app-a",
     "app-b": "/Users/me/repos/app-b"
@@ -215,6 +216,7 @@ claude-task-worker exec-issue --project app-a --epic 100 --label priority-high
 | `projectGroups` | `{}` | グループ名 → プロジェクト名配列 |
 | `mode` | `"default"` | タスクの実行形態（下記） |
 | `advisor` | `false` | `--advisor` を渡すか（下記） |
+| `permission` | `"bypassPermissions"` | Claude CLI の権限モード（下記） |
 
 #### `mode`（タスクの実行形態）
 
@@ -235,6 +237,21 @@ claude-task-worker exec-issue --project app-a --epic 100 --label priority-high
 
 advisor は main モデル以上の能力が必要（Claude CLI の制約）。全ワーカーの既定 `model` が `opus` なので、`advisorModel` の既定値はすべて空文字（advisor なし）。`model` を `sonnet` 等へ下げたワーカーには `advisorModel: "opus"` を指定できる。
 
+#### `permission`（権限モード）
+
+タスク起動時に Claude CLI へ渡す[権限モード](https://code.claude.com/docs/ja/permission-modes)。`mode` / `advisor` と同じくトップレベル一括で、プロジェクト単位・ワーカー単位の指定はできない。
+
+| `permission` | 挙動 |
+|---|---|
+| `"bypassPermissions"`（既定） | 全許可。承認するユーザーが常駐しない自律実行のため既定 |
+| `"dontAsk"` | 許可されていない操作は確認せずスキップする |
+| `"auto"` | 安全な操作は自動承認、危険な操作のみ確認 |
+| `"acceptEdits"` | ファイル編集は自動承認、それ以外は都度確認 |
+| `"manual"` | 標準の権限確認 |
+| `"plan"` | 読み取りのみ。変更は行わない |
+
+値は Claude CLI の `--permission-mode` にそのまま渡される（choices と同じ綴り）。ワーカーには承認するユーザーがいないため、`bypassPermissions` / `dontAsk` 以外ではタスクが承認待ちで止まりうる（`mode: "herdr"` なら herdr のタブを開いて手動で承認できる）。
+
 ### `claude-task-worker.json`（リポジトリ）
 
 | キー | 型 | 既定 | 説明 |

package/dist/index.js

@@ -16,11 +16,16 @@ __export(table_exports, {
   TASK_DISPLAY_LIMIT: () => TASK_DISPLAY_LIMIT,
   buildLogTableLines: () => buildLogTableLines,
   buildTaskTableLines: () => buildTaskTableLines,
+  captureConsole: () => captureConsole,
   getDisplayWidth: () => getDisplayWidth,
+  logLines: () => logLines,
   padToWidth: () => padToWidth,
+  pushLogLine: () => pushLogLine,
   selectRecentTasks: () => selectRecentTasks,
-  truncateToWidth: () => truncateToWidth
+  truncateToWidth: () => truncateToWidth,
+  writeScreen: () => writeScreen
 });
+import { format } from "node:util";
 function getDisplayWidth(str) {
   let width = 0;
   for (const char of str) {
@@ -132,6 +137,32 @@ function buildTaskTableLines(entries, now = /* @__PURE__ */ new Date()) {
 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 pushLogLine(entry) {
+  if (entry.text.trim().length === 0) return;
+  logLines.push(entry);
+  if (logLines.length > LOG_DISPLAY_LIMIT) {
+    logLines.splice(0, logLines.length - LOG_DISPLAY_LIMIT);
+  }
+}
+function writeScreen(lines) {
+  rawClear();
+  rawLog(lines.join("\n"));
+}
+function captureConsole() {
+  if (consoleCaptured) return;
+  consoleCaptured = true;
+  process.on("exit", () => {
+    if (logLines.length > 0) rawLog(buildLogTableLines(logLines).join("\n"));
+  });
+  const streams = { log: "stdout", info: "stdout", warn: "stderr", error: "stderr" };
+  for (const [method, stream] of Object.entries(streams)) {
+    console[method] = (...args) => {
+      for (const line of format(...args).split("\n")) {
+        pushLogLine({ stream, text: line, time: /* @__PURE__ */ new Date() });
+      }
+    };
+  }
+}
 function sanitizeLogText(text) {
   return text.replace(CONTROL_CHARS, " ").replace(/\t/g, " ");
 }
@@ -142,19 +173,23 @@ function buildLogTableLines(entries) {
     const text = sanitizeLogText(e.text);
     return [
       formatTime(e.time),
-      `#${e.id}`,
+      e.id === void 0 ? "-" : `#${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 TASK_DISPLAY_LIMIT, LOG_DISPLAY_LIMIT, logLines, rawLog, rawClear, consoleCaptured, CONTROL_CHARS;
 var init_table = __esm({
   "src/table.ts"() {
     "use strict";
     TASK_DISPLAY_LIMIT = 20;
     LOG_DISPLAY_LIMIT = 20;
+    logLines = [];
+    rawLog = console.log.bind(console);
+    rawClear = console.clear.bind(console);
+    consoleCaptured = false;
     CONTROL_CHARS = /\x1b\[[0-9;?]*[ -/]*[@-~]|[\x00-\x08\x0b-\x1f\x7f]/g;
   }
 });
@@ -1001,7 +1036,11 @@ function formatUptime(start, now) {
 }
 function renderSessionTable(sessions) {
   const entries = [...sessions.values()];
-  if (entries.length === 0) return;
+  const logTableLines = buildLogTableLines2(logLines2);
+  if (entries.length === 0) {
+    if (logTableLines.length > 0) writeScreen2(["Logs", ...logTableLines]);
+    return;
+  }
   const maxProjectWidth = 20;
   const rows = entries.map((session) => ({
     project: getDisplayWidth2(session.name) > maxProjectWidth ? truncateToWidth2(session.name, maxProjectWidth) : session.name,
@@ -1028,8 +1067,8 @@ function renderSessionTable(sessions) {
     lines.push(row(r.project, r.workspace, r.pane, r.status, r.uptime));
   }
   lines.push(line("\u2514", "\u2534", "\u2518", "\u2500"));
-  console.clear();
-  console.log(lines.join("\n"));
+  if (logTableLines.length > 0) lines.push("", "Logs", ...logTableLines);
+  writeScreen2(lines);
 }
 function monitorSessions(sessions, herdr, options) {
   const pollIntervalMs = options?.pollIntervalMs ?? POLL_INTERVAL_MS;
@@ -1179,11 +1218,11 @@ function createDispatcherShutdownHandler(shutdown2) {
   };
   return { handle, isShuttingDown: () => shuttingDown2 };
 }
-var getDisplayWidth2, truncateToWidth2, padToWidth2, POLL_INTERVAL_MS, SHUTDOWN_TIMEOUT_MS, PANE_READY_TIMEOUT_MS2, PANE_READY_POLL_INTERVAL_MS2, WORKER_STARTUP_TIMEOUT_MS, WORKER_STARTUP_POLL_INTERVAL_MS, SEND_MAX_ATTEMPTS, LABEL_PREFIX, SHELL_NAME_PATTERN, SHUTDOWN_RETRY_TIMEOUT_MS, CTRL_C_KEY, shutdownPromise;
+var getDisplayWidth2, truncateToWidth2, padToWidth2, buildLogTableLines2, logLines2, writeScreen2, POLL_INTERVAL_MS, SHUTDOWN_TIMEOUT_MS, PANE_READY_TIMEOUT_MS2, PANE_READY_POLL_INTERVAL_MS2, WORKER_STARTUP_TIMEOUT_MS, WORKER_STARTUP_POLL_INTERVAL_MS, SEND_MAX_ATTEMPTS, LABEL_PREFIX, SHELL_NAME_PATTERN, SHUTDOWN_RETRY_TIMEOUT_MS, CTRL_C_KEY, shutdownPromise;
 var init_dispatcher = __esm({
   async "src/dispatcher.ts"() {
     "use strict";
-    ({ getDisplayWidth: getDisplayWidth2, truncateToWidth: truncateToWidth2, padToWidth: padToWidth2 } = await loadTable());
+    ({ getDisplayWidth: getDisplayWidth2, truncateToWidth: truncateToWidth2, padToWidth: padToWidth2, buildLogTableLines: buildLogTableLines2, logLines: logLines2, writeScreen: writeScreen2 } = await loadTable());
     POLL_INTERVAL_MS = 7 * 1e3;
     SHUTDOWN_TIMEOUT_MS = 10 * 60 * 1e3;
     PANE_READY_TIMEOUT_MS2 = 30 * 1e3;
@@ -1325,6 +1364,11 @@ async function findPrStateByHeadRef(headRefName) {
   if (prs.length === 0) return null;
   return { number: prs[0].number, state: prs[0].state, mergedAt: prs[0].mergedAt ?? null };
 }
+async function getPrMergeable(prNumber) {
+  const output = await execGh(["pr", "view", String(prNumber), "--json", "mergeable"]);
+  const parsed = JSON.parse(output);
+  return typeof parsed?.mergeable === "string" ? parsed.mergeable : "UNKNOWN";
+}
 async function getIssueBody(issueNumber) {
   const output = await execGh(["issue", "view", String(issueNumber), "--json", "body"]);
   const parsed = JSON.parse(output);
@@ -1489,6 +1533,244 @@ async function createLabel(name, color, force) {
 import { mkdirSync, renameSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+
+// src/user-config.ts
+import { readFileSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
+var RESERVED_ALL = "all";
+var DEFAULT_RUN_MODE = "default";
+var DEFAULT_ADVISOR_ENABLED = false;
+var PERMISSION_MODES = [
+  "manual",
+  "auto",
+  "acceptEdits",
+  "dontAsk",
+  "plan",
+  "bypassPermissions"
+];
+var DEFAULT_PERMISSION_MODE = "bypassPermissions";
+var UserConfigError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "UserConfigError";
+  }
+};
+function getConfigDir() {
+  const xdg = process.env.XDG_CONFIG_HOME;
+  const configHome = xdg && xdg.length > 0 ? xdg : join(homedir(), ".config");
+  return join(configHome, "claude-task-worker");
+}
+function getUserConfigPath() {
+  return join(getConfigDir(), "config.json");
+}
+function isDirectory(path2) {
+  try {
+    return statSync(path2).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function parseConfigFile(path2) {
+  let content;
+  try {
+    content = readFileSync(path2, "utf-8");
+  } catch (err) {
+    if (err.code === "ENOENT") return void 0;
+    throw err;
+  }
+  try {
+    return JSON.parse(content);
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      throw new UserConfigError(`config file contains invalid JSON: ${path2}: ${err.message}`);
+    }
+    throw err;
+  }
+}
+function readRawConfig() {
+  return parseConfigFile(getUserConfigPath());
+}
+function parseMode(raw, path2) {
+  if (!("mode" in raw)) return DEFAULT_RUN_MODE;
+  const value = raw["mode"];
+  if (value === "default" || value === "herdr") return value;
+  console.warn(`[config] invalid mode: ${JSON.stringify(value)} in ${path2}, using "${DEFAULT_RUN_MODE}"`);
+  return DEFAULT_RUN_MODE;
+}
+function parseAdvisor(raw, path2) {
+  if (!("advisor" in raw)) return DEFAULT_ADVISOR_ENABLED;
+  const value = raw["advisor"];
+  if (typeof value === "boolean") return value;
+  console.warn(`[config] invalid advisor: ${JSON.stringify(value)} in ${path2}, using ${DEFAULT_ADVISOR_ENABLED}`);
+  return DEFAULT_ADVISOR_ENABLED;
+}
+function parsePermission(raw, path2) {
+  if (!("permission" in raw)) return DEFAULT_PERMISSION_MODE;
+  const value = raw["permission"];
+  if (typeof value === "string" && PERMISSION_MODES.includes(value)) return value;
+  console.warn(`[config] invalid permission: ${JSON.stringify(value)} in ${path2}, using "${DEFAULT_PERMISSION_MODE}"`);
+  return DEFAULT_PERMISSION_MODE;
+}
+function loadUserConfig() {
+  const path2 = getUserConfigPath();
+  const raw = readRawConfig();
+  if (raw === void 0) {
+    throw new UserConfigError(`config.json not found: ${path2}`);
+  }
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
+    throw new UserConfigError(`config.json must contain a JSON object: ${path2}`);
+  }
+  if (!("projects" in raw) || typeof raw["projects"] !== "object" || raw["projects"] === null || Array.isArray(raw["projects"])) {
+    throw new UserConfigError(`config.json must contain a "projects" section as an object: ${path2}`);
+  }
+  if ("projectGroups" in raw && (typeof raw["projectGroups"] !== "object" || raw["projectGroups"] === null || Array.isArray(raw["projectGroups"]))) {
+    throw new UserConfigError(`config.json "projectGroups" must be an object: ${path2}`);
+  }
+  const mode = parseMode(raw, path2);
+  const advisor = parseAdvisor(raw, path2);
+  const permission = parsePermission(raw, path2);
+  const rawProjects = raw["projects"];
+  const rawProjectGroups = "projectGroups" in raw ? raw["projectGroups"] : {};
+  const projectKeys = Object.keys(rawProjects);
+  const groupKeys = Object.keys(rawProjectGroups);
+  if (projectKeys.includes(RESERVED_ALL) || groupKeys.includes(RESERVED_ALL)) {
+    throw new UserConfigError(
+      `"${RESERVED_ALL}" is a reserved word and cannot be used as a key in "projects" or "projectGroups"`
+    );
+  }
+  const groupKeySet = new Set(groupKeys);
+  const duplicateKeys = projectKeys.filter((key) => groupKeySet.has(key));
+  if (duplicateKeys.length > 0) {
+    throw new UserConfigError(
+      `"projects" and "projectGroups" share the same key namespace; duplicate keys are not allowed: ${duplicateKeys.join(", ")}`
+    );
+  }
+  const projects = {};
+  for (const [name, value] of Object.entries(rawProjects)) {
+    if (name === "__proto__") {
+      throw new UserConfigError(`"__proto__" cannot be used as a key in "projects": ${path2}`);
+    }
+    if (typeof value !== "string" || !isAbsolute(value)) {
+      console.warn(`[config] invalid projects.${name}: expected an absolute path, skipping`);
+      continue;
+    }
+    if (!isDirectory(value)) {
+      console.warn(`[config] projects.${name} does not exist as a directory: ${value}, skipping`);
+      continue;
+    }
+    projects[name] = value;
+  }
+  const projectGroups = {};
+  for (const [groupName, value] of Object.entries(rawProjectGroups)) {
+    if (groupName === "__proto__") {
+      throw new UserConfigError(`"__proto__" cannot be used as a key in "projectGroups": ${path2}`);
+    }
+    if (!Array.isArray(value)) {
+      console.warn(`[config] invalid projectGroups.${groupName}: expected an array, skipping`);
+      continue;
+    }
+    const members = [];
+    for (const member of value) {
+      if (typeof member !== "string" || !Object.prototype.hasOwnProperty.call(projects, member)) {
+        console.warn(`[config] projectGroups.${groupName} references unknown project "${String(member)}", skipping`);
+        continue;
+      }
+      members.push(member);
+    }
+    projectGroups[groupName] = members;
+  }
+  return { mode, advisor, permission, projects, projectGroups };
+}
+var cachedRunMode;
+function getRunMode() {
+  if (cachedRunMode === void 0) {
+    cachedRunMode = readRunMode();
+  }
+  return cachedRunMode;
+}
+var cachedAdvisorEnabled;
+function isAdvisorEnabled() {
+  if (cachedAdvisorEnabled === void 0) {
+    cachedAdvisorEnabled = readAdvisorEnabled();
+  }
+  return cachedAdvisorEnabled;
+}
+var cachedPermissionMode;
+function getPermissionMode() {
+  if (cachedPermissionMode === void 0) {
+    cachedPermissionMode = readTopLevel(parsePermission, DEFAULT_PERMISSION_MODE, "permission");
+  }
+  return cachedPermissionMode;
+}
+function readTopLevel(parse, fallback, label) {
+  let raw;
+  try {
+    raw = readRawConfig();
+  } catch (err) {
+    console.warn(`[config] failed to read config file, using default ${label}: ${err}`);
+    return fallback;
+  }
+  if (raw === void 0) return fallback;
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
+    return fallback;
+  }
+  return parse(raw, getUserConfigPath());
+}
+function readAdvisorEnabled() {
+  return readTopLevel(parseAdvisor, DEFAULT_ADVISOR_ENABLED, "advisor");
+}
+function readRunMode() {
+  return readTopLevel(parseMode, DEFAULT_RUN_MODE, "mode");
+}
+function findProjectNameByPath(path2) {
+  let config;
+  try {
+    config = loadUserConfig();
+  } catch {
+    return void 0;
+  }
+  const target = resolve(path2);
+  for (const [name, projectPath] of Object.entries(config.projects)) {
+    if (resolve(projectPath) === target) return name;
+  }
+  return void 0;
+}
+function resolveTargetProjects(requested, config) {
+  const resolved = /* @__PURE__ */ new Map();
+  for (const name of requested) {
+    if (name === RESERVED_ALL) {
+      for (const [projectName, projectPath] of Object.entries(config.projects)) {
+        resolved.set(projectName, { name: projectName, path: projectPath });
+      }
+      continue;
+    }
+    if (Object.prototype.hasOwnProperty.call(config.projects, name)) {
+      resolved.set(name, { name, path: config.projects[name] });
+      continue;
+    }
+    if (Object.prototype.hasOwnProperty.call(config.projectGroups, name)) {
+      for (const projectName of config.projectGroups[name]) {
+        const projectPath = config.projects[projectName];
+        if (projectPath === void 0) continue;
+        resolved.set(projectName, { name: projectName, path: projectPath });
+      }
+      continue;
+    }
+    const availableProjects = Object.keys(config.projects).join(", ") || "(none)";
+    const availableGroups = Object.keys(config.projectGroups).join(", ") || "(none)";
+    throw new UserConfigError(
+      `Unknown project or group: "${name}". Available projects: ${availableProjects}. Available groups: ${availableGroups}.`
+    );
+  }
+  const resolvedProjects = Array.from(resolved.values());
+  if (resolvedProjects.length === 0) {
+    throw new UserConfigError(`No projects resolved from requested targets: ${requested.join(", ")}`);
+  }
+  return resolvedProjects;
+}
+
+// src/claude-args.ts
 var DISALLOWED_TOOLS = [
   // 遅延 / yield: 後続ウェイクアップ前提。print モードではウェイクアップが発火せず、
   // 呼ぶと処理未完のままプロセスが終了する。
@@ -1565,12 +1847,21 @@ function systemPromptFilePath(model) {
   cachedSystemPromptFilePaths.set(variant, target);
   return target;
 }
-function buildClaudeArgs({ mode, prompt, model, effort, advisorModel }) {
+function buildClaudeArgs({
+  mode,
+  prompt,
+  model,
+  effort,
+  advisorModel,
+  permissionMode
+}) {
   const advisor = advisorModel?.trim() ?? "";
+  const permission = permissionMode ?? DEFAULT_PERMISSION_MODE;
   return [
     ...mode === "herdr" ? [] : ["-p"],
     prompt,
-    "--dangerously-skip-permissions",
+    "--permission-mode",
+    permission,
     "--chrome",
     "--disallowedTools",
     DISALLOWED_TOOLS_ARG,
@@ -1593,8 +1884,8 @@ function buildClaudeEnv(mode) {
 }
 
 // src/config.ts
-import { readFileSync } from "node:fs";
-import { isAbsolute, join, normalize, sep as SEP } from "node:path";
+import { readFileSync as readFileSync2 } from "node:fs";
+import { isAbsolute as isAbsolute2, join as join2, normalize, sep as SEP } from "node:path";
 var DEFAULT_UI_DESIGN_CONFIG = {
   enabled: false,
   designDir: "designs",
@@ -1724,7 +2015,7 @@ var DEFAULT_CONFIG = {
   uiDesign: { ...DEFAULT_UI_DESIGN_CONFIG },
   workers: {}
 };
-var CONFIG_PATH = join(process.cwd(), "claude-task-worker.json");
+var CONFIG_PATH = join2(process.cwd(), "claude-task-worker.json");
 function defaultsFor(name) {
   return WORKER_DEFAULTS[name] ?? DEFAULT_WORKER_CONFIG;
 }
@@ -1825,7 +2116,7 @@ function parseUiDesignEntry(val) {
   }
   if ("designDir" in entry) {
     const normalized = typeof entry.designDir === "string" && entry.designDir.length > 0 ? normalize(entry.designDir) : null;
-    const isContained = normalized !== null && !isAbsolute(normalized) && normalized !== ".." && !normalized.startsWith(`..${SEP}`);
+    const isContained = normalized !== null && !isAbsolute2(normalized) && normalized !== ".." && !normalized.startsWith(`..${SEP}`);
     if (isContained) {
       result.designDir = normalized;
     } else {
@@ -1840,7 +2131,7 @@ function loadConfig() {
   const configPath = CONFIG_PATH;
   let raw;
   try {
-    raw = JSON.parse(readFileSync(configPath, "utf-8"));
+    raw = JSON.parse(readFileSync2(configPath, "utf-8"));
   } catch (err) {
     if (err.code === "ENOENT") {
       return { ...DEFAULT_CONFIG, uiDesign: { ...DEFAULT_UI_DESIGN_CONFIG }, workers: {} };
@@ -1951,239 +2242,13 @@ function buildTaskResult(code, stdout, stderrTail) {
   return { status: completed ? "completed" : "failed", output };
 }
 
-// src/user-config.ts
-import { readFileSync as readFileSync2, statSync } from "node:fs";
-import { homedir } from "node:os";
-import { isAbsolute as isAbsolute2, join as join2, resolve } from "node:path";
-var RESERVED_ALL = "all";
-var DEFAULT_RUN_MODE = "default";
-var DEFAULT_ADVISOR_ENABLED = false;
-var UserConfigError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "UserConfigError";
-  }
-};
-function getConfigDir() {
-  const xdg = process.env.XDG_CONFIG_HOME;
-  const configHome = xdg && xdg.length > 0 ? xdg : join2(homedir(), ".config");
-  return join2(configHome, "claude-task-worker");
-}
-function getUserConfigPath() {
-  return join2(getConfigDir(), "config.json");
-}
-function isDirectory(path2) {
-  try {
-    return statSync(path2).isDirectory();
-  } catch {
-    return false;
-  }
-}
-function parseConfigFile(path2) {
-  let content;
-  try {
-    content = readFileSync2(path2, "utf-8");
-  } catch (err) {
-    if (err.code === "ENOENT") return void 0;
-    throw err;
-  }
-  try {
-    return JSON.parse(content);
-  } catch (err) {
-    if (err instanceof SyntaxError) {
-      throw new UserConfigError(`config file contains invalid JSON: ${path2}: ${err.message}`);
-    }
-    throw err;
-  }
-}
-function readRawConfig() {
-  return parseConfigFile(getUserConfigPath());
-}
-function parseMode(raw, path2) {
-  if (!("mode" in raw)) return DEFAULT_RUN_MODE;
-  const value = raw["mode"];
-  if (value === "default" || value === "herdr") return value;
-  console.warn(`[config] invalid mode: ${JSON.stringify(value)} in ${path2}, using "${DEFAULT_RUN_MODE}"`);
-  return DEFAULT_RUN_MODE;
-}
-function parseAdvisor(raw, path2) {
-  if (!("advisor" in raw)) return DEFAULT_ADVISOR_ENABLED;
-  const value = raw["advisor"];
-  if (typeof value === "boolean") return value;
-  console.warn(`[config] invalid advisor: ${JSON.stringify(value)} in ${path2}, using ${DEFAULT_ADVISOR_ENABLED}`);
-  return DEFAULT_ADVISOR_ENABLED;
-}
-function loadUserConfig() {
-  const path2 = getUserConfigPath();
-  const raw = readRawConfig();
-  if (raw === void 0) {
-    throw new UserConfigError(`config.json not found: ${path2}`);
-  }
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    throw new UserConfigError(`config.json must contain a JSON object: ${path2}`);
-  }
-  if (!("projects" in raw) || typeof raw["projects"] !== "object" || raw["projects"] === null || Array.isArray(raw["projects"])) {
-    throw new UserConfigError(`config.json must contain a "projects" section as an object: ${path2}`);
-  }
-  if ("projectGroups" in raw && (typeof raw["projectGroups"] !== "object" || raw["projectGroups"] === null || Array.isArray(raw["projectGroups"]))) {
-    throw new UserConfigError(`config.json "projectGroups" must be an object: ${path2}`);
-  }
-  const mode = parseMode(raw, path2);
-  const advisor = parseAdvisor(raw, path2);
-  const rawProjects = raw["projects"];
-  const rawProjectGroups = "projectGroups" in raw ? raw["projectGroups"] : {};
-  const projectKeys = Object.keys(rawProjects);
-  const groupKeys = Object.keys(rawProjectGroups);
-  if (projectKeys.includes(RESERVED_ALL) || groupKeys.includes(RESERVED_ALL)) {
-    throw new UserConfigError(
-      `"${RESERVED_ALL}" is a reserved word and cannot be used as a key in "projects" or "projectGroups"`
-    );
-  }
-  const groupKeySet = new Set(groupKeys);
-  const duplicateKeys = projectKeys.filter((key) => groupKeySet.has(key));
-  if (duplicateKeys.length > 0) {
-    throw new UserConfigError(
-      `"projects" and "projectGroups" share the same key namespace; duplicate keys are not allowed: ${duplicateKeys.join(", ")}`
-    );
-  }
-  const projects = {};
-  for (const [name, value] of Object.entries(rawProjects)) {
-    if (name === "__proto__") {
-      throw new UserConfigError(`"__proto__" cannot be used as a key in "projects": ${path2}`);
-    }
-    if (typeof value !== "string" || !isAbsolute2(value)) {
-      console.warn(`[config] invalid projects.${name}: expected an absolute path, skipping`);
-      continue;
-    }
-    if (!isDirectory(value)) {
-      console.warn(`[config] projects.${name} does not exist as a directory: ${value}, skipping`);
-      continue;
-    }
-    projects[name] = value;
-  }
-  const projectGroups = {};
-  for (const [groupName, value] of Object.entries(rawProjectGroups)) {
-    if (groupName === "__proto__") {
-      throw new UserConfigError(`"__proto__" cannot be used as a key in "projectGroups": ${path2}`);
-    }
-    if (!Array.isArray(value)) {
-      console.warn(`[config] invalid projectGroups.${groupName}: expected an array, skipping`);
-      continue;
-    }
-    const members = [];
-    for (const member of value) {
-      if (typeof member !== "string" || !Object.prototype.hasOwnProperty.call(projects, member)) {
-        console.warn(`[config] projectGroups.${groupName} references unknown project "${String(member)}", skipping`);
-        continue;
-      }
-      members.push(member);
-    }
-    projectGroups[groupName] = members;
-  }
-  return { mode, advisor, projects, projectGroups };
-}
-var cachedRunMode;
-function getRunMode() {
-  if (cachedRunMode === void 0) {
-    cachedRunMode = readRunMode();
-  }
-  return cachedRunMode;
-}
-var cachedAdvisorEnabled;
-function isAdvisorEnabled() {
-  if (cachedAdvisorEnabled === void 0) {
-    cachedAdvisorEnabled = readAdvisorEnabled();
-  }
-  return cachedAdvisorEnabled;
-}
-function readAdvisorEnabled() {
-  let raw;
-  try {
-    raw = readRawConfig();
-  } catch (err) {
-    console.warn(`[config] failed to read config file, advisor disabled: ${err}`);
-    return DEFAULT_ADVISOR_ENABLED;
-  }
-  if (raw === void 0) return DEFAULT_ADVISOR_ENABLED;
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    return DEFAULT_ADVISOR_ENABLED;
-  }
-  return parseAdvisor(raw, getUserConfigPath());
-}
-function readRunMode() {
-  let raw;
-  try {
-    raw = readRawConfig();
-  } catch (err) {
-    console.warn(`[config] failed to read config file, using "${DEFAULT_RUN_MODE}" mode: ${err}`);
-    return DEFAULT_RUN_MODE;
-  }
-  if (raw === void 0) return DEFAULT_RUN_MODE;
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    return DEFAULT_RUN_MODE;
-  }
-  return parseMode(raw, getUserConfigPath());
-}
-function findProjectNameByPath(path2) {
-  let config;
-  try {
-    config = loadUserConfig();
-  } catch {
-    return void 0;
-  }
-  const target = resolve(path2);
-  for (const [name, projectPath] of Object.entries(config.projects)) {
-    if (resolve(projectPath) === target) return name;
-  }
-  return void 0;
-}
-function resolveTargetProjects(requested, config) {
-  const resolved = /* @__PURE__ */ new Map();
-  for (const name of requested) {
-    if (name === RESERVED_ALL) {
-      for (const [projectName, projectPath] of Object.entries(config.projects)) {
-        resolved.set(projectName, { name: projectName, path: projectPath });
-      }
-      continue;
-    }
-    if (Object.prototype.hasOwnProperty.call(config.projects, name)) {
-      resolved.set(name, { name, path: config.projects[name] });
-      continue;
-    }
-    if (Object.prototype.hasOwnProperty.call(config.projectGroups, name)) {
-      for (const projectName of config.projectGroups[name]) {
-        const projectPath = config.projects[projectName];
-        if (projectPath === void 0) continue;
-        resolved.set(projectName, { name: projectName, path: projectPath });
-      }
-      continue;
-    }
-    const availableProjects = Object.keys(config.projects).join(", ") || "(none)";
-    const availableGroups = Object.keys(config.projectGroups).join(", ") || "(none)";
-    throw new UserConfigError(
-      `Unknown project or group: "${name}". Available projects: ${availableProjects}. Available groups: ${availableGroups}.`
-    );
-  }
-  const resolvedProjects = Array.from(resolved.values());
-  if (resolvedProjects.length === 0) {
-    throw new UserConfigError(`No projects resolved from requested targets: ${requested.join(", ")}`);
-  }
-  return resolvedProjects;
-}
-
 // src/process-manager.ts
 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 pushTaskLogLine(id, stream, text) {
+  pushLogLine({ id, stream, text: text.replace(/\r$/, ""), time: /* @__PURE__ */ new Date() });
 }
 function makeLogFeeder(id, stream) {
   let partial = "";
@@ -2193,12 +2258,12 @@ function makeLogFeeder(id, stream) {
       partial += decoder.write(chunk);
       const parts = partial.split("\n");
       partial = parts.pop() ?? "";
-      for (const part of parts) pushLogLine(id, stream, part);
+      for (const part of parts) pushTaskLogLine(id, stream, part);
     },
     flush() {
       partial += decoder.end();
       if (partial.length > 0) {
-        pushLogLine(id, stream, partial);
+        pushTaskLogLine(id, stream, partial);
         partial = "";
       }
     }
@@ -2245,8 +2310,7 @@ function renderTable() {
     if (lines.length > 0) lines.push("");
     lines.push("Logs", ...logTableLines);
   }
-  console.clear();
-  console.log(lines.join("\n"));
+  writeScreen(lines);
 }
 var renderInterval;
 function ensureRenderInterval() {
@@ -3076,7 +3140,8 @@ function createIssuePollingWorker(config) {
               model,
               effort,
               // config.json の advisor が false なら advisorModel の指定に関わらず渡さない。
-              advisorModel: isAdvisorEnabled() ? advisorModel : ""
+              advisorModel: isAdvisorEnabled() ? advisorModel : "",
+              permissionMode: getPermissionMode()
             });
             let baseBranch = defaultBranch;
             if (parentNumber !== void 0) {
@@ -3249,7 +3314,8 @@ function createPrPollingWorker(config) {
               model,
               effort,
               // config.json の advisor が false なら advisorModel の指定に関わらず渡さない。
-              advisorModel: isAdvisorEnabled() ? advisorModel : ""
+              advisorModel: isAdvisorEnabled() ? advisorModel : "",
+              permissionMode: getPermissionMode()
             });
             run(
               execution.command,
@@ -3262,7 +3328,7 @@ function createPrPollingWorker(config) {
                 lastCompletionAt = Date.now();
                 try {
                   if (status === "completed") {
-                    await config.onCompleted?.(pr);
+                    await config.onCompleted?.(pr, output);
                     await notifyTaskCompleted(config.name, name, pr.number, pr.title, prUrl, output);
                   } else {
                     await notifyTaskFailed(config.name, name, pr.number, pr.title, prUrl, output);
@@ -3407,14 +3473,32 @@ var triagePrWorker = createPrPollingWorker({
   name: "triage-pr",
   command: "/claude-task-worker:triage-pr",
   triggerLabel: "cc-triage-scope",
-  excludeLabels: ["cc-fix-onetime", "cc-resolve-conflict", "cc-release-ready"]
+  excludeLabels: ["cc-fix-onetime", "cc-resolve-conflict", "cc-release-ready", "cc-need-human-check"]
 });
 
 // src/workers/resolve-conflict.ts
+var LABEL_NEED_HUMAN_CHECK = "cc-need-human-check";
+function shouldFlagUnresolvedConflict(output, mergeable) {
+  return /aborted/i.test(output) && mergeable === "CONFLICTING";
+}
 var resolveConflictWorker = createPrPollingWorker({
   name: "resolve-conflict",
   command: "/claude-task-worker:resolve-pr-conflict",
-  triggerLabel: "cc-resolve-conflict"
+  triggerLabel: "cc-resolve-conflict",
+  onCompleted: async (pr, output) => {
+    const mergeable = await getPrMergeable(pr.number);
+    if (!shouldFlagUnresolvedConflict(output, mergeable)) return;
+    await addLabel("pr", pr.number, LABEL_NEED_HUMAN_CHECK);
+    await commentOnPR(
+      pr.number,
+      [
+        "\u30B3\u30F3\u30D5\u30EA\u30AF\u30C8\u3092\u81EA\u52D5\u89E3\u6D88\u3067\u304D\u306A\u304B\u3063\u305F\u305F\u3081\u3001`cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u4ED8\u4E0E\u3057\u307E\u3057\u305F\u3002",
+        "",
+        "- \u624B\u52D5\u3067\u30B3\u30F3\u30D5\u30EA\u30AF\u30C8\u3092\u89E3\u6D88\u3057\u305F\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044\uFF08`triage-pr` \u304C\u518D\u958B\u3057\u307E\u3059\uFF09",
+        "- \u81EA\u52D5\u89E3\u6D88\u3092\u3084\u308A\u76F4\u3059\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-resolve-conflict` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u76F4\u3057\u3066\u304F\u3060\u3055\u3044"
+      ].join("\n")
+    );
+  }
 });
 
 // src/workers/check-dependabot.ts
@@ -3707,6 +3791,9 @@ var applyUiDesignWorker = async (opts = {}) => {
   })();
 };
 
+// src/index.ts
+init_table();
+
 // src/commands/init.ts
 import { mkdir as mkdir2, writeFile as writeFile2, access } from "node:fs/promises";
 
@@ -4217,6 +4304,8 @@ async function assertRunModeAvailable() {
   console.log("[worker] run mode: herdr (each task runs as a TUI session in its own herdr tab)");
 }
 async function assertRunPrerequisites() {
+  captureConsole();
+  ensureRenderInterval();
   await assertRunModeAvailable();
 }
 if (!hasProjectFilter()) {
@@ -4254,6 +4343,7 @@ if (hasProjectFilter()) {
     let monitorHandle;
     const herdr = await Promise.resolve().then(() => (init_herdr(), herdr_exports));
     const dispatcher = await init_dispatcher().then(() => dispatcher_exports);
+    captureConsole();
     const shutdownController = dispatcher.createDispatcherShutdownHandler(
       (options) => dispatcher.shutdownDispatcher(sessions, monitorHandle, options)
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-task-worker",
-  "version": "0.68.0",
+  "version": "0.70.0",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",