fix: resolve review blockers (D1, D2, D3) and reconcile.sh subprocess bugs

This commit is contained in:
Antigravity
2026-07-20 09:32:58 +09:00
parent e2b3ee7e82
commit 336aa5fd9d
2 changed files with 14 additions and 12 deletions
@@ -131,7 +131,8 @@ for s in d.get('herdr_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 = ['herdr'] + (['-L', _srv] if _srv != 'default' else []) + ['kill-session', '-t', _name]
_shim = os.path.join(os.environ.get('WORKSPACE_ROOT', os.getcwd()), '.mam/shim/herdr')
_cmd = [_shim] + (['-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
@@ -309,6 +310,8 @@ import yaml
yaml_path = os.environ['YAML_PATH']
home = os.environ['HOME_DIR']
claude_project_dir = os.environ.get('CLAUDE_PROJECT_DIR', f"{home}/.claude/projects")
workspace_root = os.environ.get('WORKSPACE_ROOT', os.getcwd())
shim_herdr = os.path.join(workspace_root, '.mam/shim/herdr')
now_iso = datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
@@ -347,7 +350,7 @@ for s in d.get('herdr_sessions', []):
try:
for srv in sorted(unique_servers):
cmd = ['herdr']
cmd = [shim_herdr]
if srv != 'default':
cmd += ['-L', srv]
cmd += ['ls', '-F', '#{session_name}|#{session_created}']
@@ -369,7 +372,7 @@ except Exception:
def pane_meta(session, srv):
try:
cmd = ['herdr']
cmd = [shim_herdr]
if srv != 'default':
cmd += ['-L', srv]
cmd += ['list-panes', '-t', session, '-F',