@tyhld/conductor 0.12.150 → 0.12.151

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/headless.js CHANGED
@@ -19,7 +19,7 @@ import { createInterface } from 'node:readline';
19
19
  import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
20
20
  import path from 'node:path';
21
21
  import os from 'node:os';
22
- import { CENTRAL_BUSY_HOLD_MAX_MS, RELAY_DELIVER_MAX, RELAY_FETCH_TIMEOUT_MS, RELAY_HEARTBEAT_INTERVAL_MS, RELAY_RESTORE_ORPHANS_ENABLED, ackResumeSignal, buildAnchor, buildSendText, canDeliver, completeWithReportOutcome, createRelayState, deliverJobEndFacts, deliveryReport, fetchCommand, fetchCommandState, fetchCommandStatus, fetchControlWithUpdate, fetchOrphans, flushPendingJobEndFacts, isTerminalCommandStatus, kindOf, markDelivered, noteCentralDown, noteCentralUp, noteDrain, noteReadiness, patchStatus, recoverStuckProcessedReports, reconnectDelayMs, WAIT_CLOSED_STATUS, FINISH_GATE_KINDS, reportDelivery, selectOrphanToRestore, sendHeartbeat, } from './relay.js';
22
+ import { CENTRAL_BUSY_HOLD_MAX_MS, RELAY_DELIVER_MAX, RELAY_FETCH_TIMEOUT_MS, RELAY_HEARTBEAT_INTERVAL_MS, RELAY_RESTORE_ORPHANS_ENABLED, ackResumeSignal, buildAnchor, buildSendText, canDeliver, completeWithReportOutcome, createRelayState, deliverJobEndFacts, deliveryReport, fetchCommand, fetchCommandState, fetchCommandStatus, fetchControlWithUpdate, fetchOrphans, flushPendingJobEndFacts, isTerminalCommandStatus, kindOf, markDelivered, noteCentralDown, noteCentralUp, noteDrain, noteReadiness, patchStatus, pruneLogLine, pruneStaleWorktrees, recoverStuckProcessedReports, reconnectDelayMs, WAIT_CLOSED_STATUS, FINISH_GATE_KINDS, reportDelivery, selectOrphanToRestore, sendHeartbeat, } from './relay.js';
23
23
  import { claudePinPath, readClaudePinLine, } from './autoupdate-flags.js';
24
24
  const log = (msg) => {
25
25
  console.log(`[headless] ${msg}`);
@@ -1278,6 +1278,8 @@ resumeNote) {
1278
1278
  else {
1279
1279
  args.push('--session-id', sessionId);
1280
1280
  }
1281
+ // ★職人へ渡す前に、フォルダが消えた作業場所の登録を片付ける(便 0204a1b9)。失敗しても起動は続ける。
1282
+ log(pruneLogLine(cfg.site, cfg.workDir, pruneStaleWorktrees(cfg.workDir)));
1281
1283
  let proc;
1282
1284
  try {
1283
1285
  proc = spawn(claudeBin, args, {
package/dist/relay.js CHANGED
@@ -22,7 +22,7 @@
22
22
  * 唯一の例外は「選択メニューが出ているか」の真偽(hasChoiceMenu)で、これは③アイドル判定が
23
23
  * メニューへ指示を流し込まないための落とし穴ガード専用。中身は読まない。
24
24
  */
25
- import { execFileSync } from 'node:child_process';
25
+ import { execFileSync, spawnSync } from 'node:child_process';
26
26
  import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, utimesSync, writeFileSync, } from 'node:fs';
27
27
  import os from 'node:os';
28
28
  import path from 'node:path';
@@ -4091,6 +4091,42 @@ export function tmuxPaneCwd(site) {
4091
4091
  return null;
4092
4092
  }
4093
4093
  }
4094
+ const runGitPrune = (dir) => {
4095
+ const r = spawnSync('git', ['-C', dir, 'worktree', 'prune', '--verbose'], {
4096
+ encoding: 'utf8',
4097
+ timeout: 10_000,
4098
+ stdio: ['ignore', 'pipe', 'pipe'],
4099
+ // ★件数は「Removing 」で始まる行で数えるので、git の文言を訳させない。
4100
+ env: { ...process.env, LC_ALL: 'C' },
4101
+ });
4102
+ return { status: r.status, stdout: r.stdout ?? '', stderr: r.stderr ?? '', error: r.error };
4103
+ };
4104
+ /** `git worktree prune --verbose` の出力から、消した登録の件数を数える(git は stderr に出す)。 */
4105
+ export function countPruned(output) {
4106
+ return output.split('\n').filter((l) => l.startsWith('Removing ')).length;
4107
+ }
4108
+ /** dir のリポで git worktree prune を1回流す。★例外は投げない(失敗は ok:false で返す)。 */
4109
+ export function pruneStaleWorktrees(dir, run = runGitPrune) {
4110
+ try {
4111
+ const r = run(dir);
4112
+ if (r.error)
4113
+ return { ok: false, reason: r.error.message };
4114
+ if (r.status !== 0) {
4115
+ const first = (r.stderr || r.stdout).trim().split('\n')[0] ?? '';
4116
+ return { ok: false, reason: `exit=${r.status ?? 'null'} ${first}`.trim() };
4117
+ }
4118
+ return { ok: true, removed: countPruned(`${r.stderr}\n${r.stdout}`) };
4119
+ }
4120
+ catch (err) {
4121
+ return { ok: false, reason: err instanceof Error ? err.message : String(err) };
4122
+ }
4123
+ }
4124
+ /** 記録に残す1行(成功は件数・失敗は理由)。 */
4125
+ export function pruneLogLine(site, dir, r) {
4126
+ return r.ok
4127
+ ? `site=${site} 消えた作業場所の登録を片付けました: ${r.removed} 件(${dir})`
4128
+ : `WARN site=${site} 消えた作業場所の登録を片付けられませんでした(配達は続けます): ${r.reason}(${dir})`;
4129
+ }
4094
4130
  /** Claude Code がその作業場所の会話の記録を置く場所(作業場所の英数字以外を - にした名前)。 */
4095
4131
  export function claudeTranscriptDir(cwd, env = process.env) {
4096
4132
  const base = (env.CLAUDE_CONFIG_DIR ?? '').trim() || path.join(env.HOME ?? os.homedir(), '.claude');
@@ -6325,6 +6361,12 @@ export async function relayTick(cfg, state, hooks) {
6325
6361
  }
6326
6362
  log(`site=${cfg.site} id=${cmd.id} 会話を新しくしました(1便1context)`);
6327
6363
  }
6364
+ // ── 配る直前に、フォルダが消えた作業場所の登録を片付ける(便 0204a1b9) ──
6365
+ // ★失敗しても配達は止めない(1行の記録だけ残す)。窓の場所が読めないときも同じ。
6366
+ const pruneDir = tmuxPaneCwd(cfg.site);
6367
+ log(pruneDir === null
6368
+ ? `WARN site=${cfg.site} 窓の場所が読めないので、消えた作業場所の登録の片付けを見送りました(配達は続けます)`
6369
+ : pruneLogLine(cfg.site, pruneDir, pruneStaleWorktrees(pruneDir)));
6328
6370
  // ── tmux 送信 ──
6329
6371
  // この送信に固有のアンカー(buildAnchor(id))を本文末尾に埋め込む。
6330
6372
  // 画面にエコーされたアンカー行を「今回ジョブの境界」として記録し、完了検出は
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tyhld/conductor",
3
- "version": "0.12.150",
3
+ "version": "0.12.151",
4
4
  "description": "采配くん管制の見守りアプリ(conductor-agent)。各PCで常駐し、中央(devlog-tracker)へ定期的に生存報告(heartbeat)を送る常駐CLI。",
5
5
  "type": "module",
6
6
  "bin": {