@tyhld/conductor 0.12.67 → 0.12.68

package/dist/headless.js

@@ -16,7 +16,7 @@
  */
 import { execFileSync, spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
-import { createWriteStream, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { RELAY_DELIVER_MAX, RELAY_FETCH_TIMEOUT_MS, RELAY_HEARTBEAT_INTERVAL_MS, RELAY_PENDING_TIMEOUT_MS, RELAY_RESTORE_ORPHANS_ENABLED, buildAnchor, buildSendText, canDeliver, completeWithReport, createRelayState, deliveryReport, fetchCommand, fetchCommandStatus, fetchControl, fetchOrphans, isTerminalCommandStatus, kindOf, markDelivered, noteCentralDown, noteCentralUp, noteReadiness, patchStatus, reconnectDelayMs, selectOrphanToRestore, sendHeartbeat, } from './relay.js';
@@ -190,7 +190,6 @@ function claudeBinCandidates() {
     // nvm の各 node 版の bin（新しい版から）
     const nvmDir = path.join(h, '.nvm', 'versions', 'node');
     try {
-        const { readdirSync } = require('node:fs');
         const versions = readdirSync(nvmDir)
             .filter((v) => v.startsWith('v'))
             .sort((a, b) => {
@@ -207,8 +206,11 @@ function claudeBinCandidates() {
             candidates.push(path.join(nvmDir, v, 'bin', 'claude'));
         }
     }
-    catch {
-        // nvm が無い場合
+    catch (e) {
+        // nvm が無い（ENOENT）は正常。それ以外は探索の失敗として記録する。
+        if (e?.code !== 'ENOENT') {
+            console.error('[conductor] nvm claude exploration failed:', e);
+        }
     }
     // その他の既知の場所
     candidates.push(path.join(h, '.local', 'bin', 'claude'), path.join(h, '.claude', 'local', 'claude'), '/usr/local/bin/claude', '/usr/bin/claude');
@@ -823,6 +825,7 @@ export async function restoreHeadlessOrphans(cfg, state) {
         const cmd = { id: pick.id, body: pick.body };
         const job = spawnClaudeProcess(cfg, cmd, sessionId, attempt, true);
         if (job === null) {
+            await patchStatus(cfg, pick.id, 'failed', 'claude が見つかりません（手元の孤児復元を中止）');
             state.relay.abandoned.add(pick.id);
             log(`ERROR site=${cfg.site} id=${pick.id} 手元の孤児復元: claude が見つからない → 放棄`);
             return;
@@ -880,6 +883,7 @@ export async function restoreHeadlessOrphans(cfg, state) {
     const cmd = { id: pick.id, body: pick.body };
     const job = spawnClaudeProcess(cfg, cmd, sessionId, attempt, true);
     if (job === null) {
+        await patchStatus(cfg, pick.id, 'failed', 'claude が見つかりません（孤児復元を中止）');
         await sendCommandEvents(cfg, pick.id, [{
                 type: 'error',
                 text: 'claude が見つかりません（孤児復元を中止）',
@@ -973,6 +977,7 @@ export async function headlessTick(cfg, state, hooks) {
                 : sessionIdForCommand(retry.cmd.id, retry.attempt);
             const job = spawnClaudeProcess(cfg, retry.cmd, sessionId, retry.attempt, isResume);
             if (job === null) {
+                await patchStatus(cfg, retry.cmd.id, 'failed', 'claude が見つかりません（自動再開を中止）');
                 await sendCommandEvents(cfg, retry.cmd.id, [{
                         type: 'error',
                         text: 'claude が見つかりません（自動再開を中止）',
@@ -1029,6 +1034,7 @@ export async function headlessTick(cfg, state, hooks) {
         const job = spawnClaudeProcess(cfg, cmd, sessionId, attempt, isResume);
         if (job === null) {
             // ★起動失敗を管制へ知らせる（「起動しました」とは言わない）
+            await patchStatus(cfg, cmd.id, 'failed', 'claude が見つかりません（起動できませんでした）');
             await sendCommandEvents(cfg, cmd.id, [{
                     type: 'error',
                     text: 'claude が見つかりません（起動できませんでした）',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyhld/conductor",
-  "version": "0.12.67",
+  "version": "0.12.68",
   "description": "采配くん管制の見守りアプリ（conductor-agent）。各PCで常駐し、中央(devlog-tracker)へ定期的に生存報告(heartbeat)を送る常駐CLI。",
   "type": "module",
   "bin": {