Clean up all tmux occurrences from dev skills and integrate herdr wrapper translation shim with dynamic env and workspace ID parsing

.agents/skills/multi-agent-mux-monitor/scripts/reconcile.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # reconcile.sh — multi-agent-mux-monitor 의 부속 스크립트
-# YAML ↔ tmux ↔ 디스크 artifact 간 drift 감지 (+ YAML 자동 갱신).
+# YAML ↔ herdr ↔ 디스크 artifact 간 drift 감지 (+ YAML 자동 갱신).
 #
 # Usage:
 #   bash reconcile.sh --once --emit-diff            # drift 감지 + 갱신
@@ -9,7 +9,7 @@
 # --dry-run: 부수효과 없는 read-only. "지금 뭐 돌고 있지?" 질문에 안전.
 #            multi-agent-mux-status 스킬이 이걸 재사용.
 #
-# 출력 (JSON): {timestamp, yaml_path, tmux_sessions_alive, tmux_confirmed, drifts, actions}
+# 출력 (JSON): {timestamp, yaml_path, herdr_sessions_alive, herdr_confirmed, drifts, actions}
 #
 # Exit codes: 0 = ok | 1 = YAML not found | 2 = error
 set -euo pipefail
@@ -106,7 +106,7 @@ import registry
 
 # Executed INSIDE lib.sh::atomic_dump_yaml (system python3 + PyYAML), under the
 # YAML flock with schema-validate + .bak (review item 5). Marks matching running
-# sessions terminated and kills their tmux (review item 3 behaviour preserved),
+# sessions terminated and kills their herdr (review item 3 behaviour preserved),
 # or aborts the write entirely when nothing matches. The untrusted MQTT job id /
 # event arrive via env (MQTT_JID / MQTT_EVENT) — never spliced into source (P1-B).
 _MUTATION = r'''
@@ -116,10 +116,10 @@ _jid = os.environ['MQTT_JID']
 _event = os.environ['MQTT_EVENT']
 _now = datetime.now(timezone.utc)
 _changed = False
-for s in d.get('tmux_sessions', []):
+for s in d.get('herdr_sessions', []):
     if s.get('delegate_job_id') == _jid and s.get('status') == 'running':
         _name = s.get('name')
-        _srv = s.get('tmux_server') or 'default'
+        _srv = s.get('herdr_server') or 'default'
         if _event == 'completed':
             s['delegate_job_id'] = None
             print('MQTT Monitor: job completed on ' + str(_name) + ' — session kept alive', flush=True)
@@ -129,7 +129,7 @@ for s in d.get('tmux_sessions', []):
             s['terminated_at'] = _now.strftime('%Y-%m-%dT%H:%M:%SZ')
             s['terminated_at_epoch'] = int(_now.timestamp())
             s['termination_mode'] = 'auto-detected (MQTT ' + _event + ')'
-            _cmd = ['tmux'] + (['-L', _srv] if _srv != 'default' else []) + ['kill-session', '-t', _name]
+            _cmd = ['herdr'] + (['-L', _srv] if _srv != 'default' else []) + ['kill-session', '-t', _name]
             subprocess.run(_cmd, capture_output=True)
             print('MQTT Monitor: terminated + killed ' + str(_name) + ' on ' + str(_srv) + ' due to MQTT ' + _event, flush=True)
             _changed = True
@@ -328,21 +328,21 @@ except NameError:
 drifts = []
 actions = []
 
-# === 현재 tmux 상태 — transient 실패를 'no sessions' 와 구분 (P1-E) ===
-tmux_sessions = []
-tmux_confirmed = True
+# === 현재 herdr 상태 — transient 실패를 'no sessions' 와 구분 (P1-E) ===
+herdr_sessions = []
+herdr_confirmed = True
 
-# YAML 에 등록된 고유한 tmux_server 목록 수집 + 환경변수 TMUX_SERVER_NAME 포함
+# YAML 에 등록된 고유한 herdr_server 목록 수집 + 환경변수 HERDR_SERVER_NAME 포함
 unique_servers = {'default'}
-if 'TMUX_SERVER_NAME' in os.environ:
-    unique_servers.add(os.environ['TMUX_SERVER_NAME'])
-for s in d.get('tmux_sessions', []):
-    srv = s.get('tmux_server') or 'default'
+if 'HERDR_SERVER_NAME' in os.environ:
+    unique_servers.add(os.environ['HERDR_SERVER_NAME'])
+for s in d.get('herdr_sessions', []):
+    srv = s.get('herdr_server') or 'default'
     unique_servers.add(srv)
 
 try:
     for srv in sorted(unique_servers):
-        cmd = ['tmux']
+        cmd = ['herdr']
         if srv != 'default':
             cmd += ['-L', srv]
         cmd += ['ls', '-F', '#{session_name}|#{session_created}']
@@ -352,19 +352,19 @@ try:
                 if not line:
                     continue
                 name, created = line.split('|', 1)
-                tmux_sessions.append({'name': name, 'created': int(created), 'server': srv})
+                herdr_sessions.append({'name': name, 'created': int(created), 'server': srv})
         else:
             err = (r.stderr or '').lower()
             is_empty = ('no server running' in err) or ('no sessions' in err) or ('failed to connect' in err)
             if not is_empty:
-                tmux_confirmed = False
+                herdr_confirmed = False
 except Exception:
-    tmux_confirmed = False
+    herdr_confirmed = False
 
 
 def pane_meta(session, srv):
     try:
-        cmd = ['tmux']
+        cmd = ['herdr']
         if srv != 'default':
             cmd += ['-L', srv]
         cmd += ['list-panes', '-t', session, '-F',
@@ -376,35 +376,35 @@ def pane_meta(session, srv):
         return None
 
 
-yaml_sessions = d.get('tmux_sessions', [])
+yaml_sessions = d.get('herdr_sessions', [])
 yaml_session_names = {s['name'] for s in yaml_sessions if s.get('name')}
-alive_set = {(t['name'], t.get('server', 'default')) for t in tmux_sessions}
+alive_set = {(t['name'], t.get('server', 'default')) for t in herdr_sessions}
 
-# === drift A: tmux dead + YAML running → auto-terminate ===
-# tmux 응답을 확정했을 때만. transient 실패 시 모두 terminated 로 마크하지 않음 (P1-E)
-if tmux_confirmed:
+# === drift A: herdr dead + YAML running → auto-terminate ===
+# herdr 응답을 확정했을 때만. transient 실패 시 모두 terminated 로 마크하지 않음 (P1-E)
+if herdr_confirmed:
     for s in yaml_sessions:
         name = s.get('name')
         if not name:
             continue
         # 'stopped' 도 deliberate한 종료 상태 — drift 로 보지 않고 그대로 둔다.
-        # (없으면 tmux-dead stopped 세션을 'terminated' 로 덮어써 resumable 플래그가 소실됨)
+        # (없으면 herdr-dead stopped 세션을 'terminated' 로 덮어써 resumable 플래그가 소실됨)
         if s.get('status') in ('terminated', 'archived', 'stopped'):
             continue
-        srv = s.get('tmux_server') or 'default'
+        srv = s.get('herdr_server') or 'default'
         if (name, srv) not in alive_set:
             s['status'] = 'terminated'
             s['terminated_at'] = now_iso
             s['terminated_at_epoch'] = int(datetime.now(timezone.utc).timestamp())
-            s['termination_mode'] = 'auto-detected (tmux gone)'
+            s['termination_mode'] = 'auto-detected (herdr gone)'
             pane = s.get('pane') or {}
             drifts.append({'class': 'A', 'name': name,
-                           'msg': f"{name}: tmux gone (was pane {pane.get('pid')}, cmd {pane.get('cmd')}). Marked terminated."})
+                           'msg': f"{name}: herdr gone (was pane {pane.get('pid')}, cmd {pane.get('cmd')}). Marked terminated."})
             actions.append(f"terminated: {name}")
 
-# === drift B: tmux alive + not in YAML → auto-register ===
-if tmux_confirmed:
-    for t in tmux_sessions:
+# === drift B: herdr alive + not in YAML → auto-register ===
+if herdr_confirmed:
+    for t in herdr_sessions:
         name = t['name']
         if name in yaml_session_names:
             continue
@@ -434,14 +434,14 @@ if tmux_confirmed:
         entry = {
             'name': name,
             'status': 'running',
-            'tmux_session_created_at': datetime.fromtimestamp(t['created'], tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'),
-            'tmux_session_epoch': t['created'],
-            'tmux_server': srv,
+            'herdr_session_created_at': datetime.fromtimestamp(t['created'], tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'),
+            'herdr_session_epoch': t['created'],
+            'herdr_server': srv,
             'pane': {'index': 0, 'pid': pm['pid'], 'cmd': agent, 'cmd_full': cmd_full, 'cwd': pm['cwd']},
             # P2: cwd 인용
-            'start_command': f'tmux {server_opt}new-session -d -s "{name}" -x 140 -y 40 -c "{pm["cwd"]}" "{cmd_full}"',
-            'attach_command': f'tmux {server_opt}attach -t {name}',
-            'kill_command': f'tmux {server_opt}kill-session -t {name}',
+            'start_command': f'herdr {server_opt}new-session -d -s "{name}" -x 140 -y 40 -c "{pm["cwd"]}" "{cmd_full}"',
+            'attach_command': f'herdr {server_opt}attach -t {name}',
+            'kill_command': f'herdr {server_opt}kill-session -t {name}',
             'last_visible_status': 'running',
             'last_visible_note': 'auto-registered by monitor',
         }
@@ -465,14 +465,14 @@ if tmux_confirmed:
         elif agent == 'cline':
             entry['child_pid'] = 0
             entry['cline_conversation_id_own'] = None
-        d.setdefault('tmux_sessions', []).append(entry)
+        d.setdefault('herdr_sessions', []).append(entry)
         yaml_session_names.add(name)
         drifts.append({'class': 'B', 'name': name,
-                       'msg': f"{name}: tmux found but not in YAML. Auto-registered (pane {pm['pid']}, cmd {pm['cmd']}, cwd {pm['cwd']})."})
+                       'msg': f"{name}: herdr found but not in YAML. Auto-registered (pane {pm['pid']}, cmd {pm['cmd']}, cwd {pm['cwd']})."})
         actions.append(f"registered: {name}")
 
 # === drift C: claude 새 session id materialize (per-row own id) ===
-for s in d.get('tmux_sessions', []):
+for s in d.get('herdr_sessions', []):
     if not s.get('name', '').endswith('-creator-claude'):
         continue
     if s.get('status') != 'running':
@@ -507,7 +507,7 @@ for s in d.get('tmux_sessions', []):
     actions.append(f"updated session id: {sid}")
 
 # === drift C (agy): agy 새 session id materialize (per-row own id) ===
-for s in d.get('tmux_sessions', []):
+for s in d.get('herdr_sessions', []):
     if not s.get('name', '').endswith('-creator-agy'):
         continue
     if s.get('status') != 'running':
@@ -531,7 +531,7 @@ for s in d.get('tmux_sessions', []):
             pass
 
 # === drift C (hermes): hermes 새 session id materialize (per-row own id) ===
-for s in d.get('tmux_sessions', []):
+for s in d.get('herdr_sessions', []):
     if not s.get('name', '').endswith('-creator-hermes'):
         continue
     if s.get('status') != 'running':
@@ -556,7 +556,7 @@ for s in d.get('tmux_sessions', []):
             pass
 
 # === drift C (cline): cline 새 session id materialize (per-row own id) ===
-for s in d.get('tmux_sessions', []):
+for s in d.get('herdr_sessions', []):
     if not s.get('name', '').endswith('-creator-cline'):
         continue
     if s.get('status') != 'running':
@@ -630,8 +630,8 @@ if cn.get('session_id'):
 result = {
     'timestamp': now_iso,
     'yaml_path': yaml_path,
-    'tmux_sessions_alive': sorted(f"{t['name']}|{t.get('server', 'default')}" for t in tmux_sessions),
-    'tmux_confirmed': tmux_confirmed,
+    'herdr_sessions_alive': sorted(f"{t['name']}|{t.get('server', 'default')}" for t in herdr_sessions),
+    'herdr_confirmed': herdr_confirmed,
     'drifts': drifts,
     'actions': actions,
 }