refactor: extract orchestrator execution core

plugins/reporting-governance/src/adapters/index.mjs

@@ -3,6 +3,7 @@ export { runDispatcherAdapter } from './dispatcher.mjs';
 export { runBridgeSupervisorAdapter } from './bridge-supervisor.mjs';
 export { runSenderBindingAdapter } from './sender-binding.mjs';
 export { runOrchestratorAdapter } from './orchestrator.mjs';
+export { createDefaultOrchestratorExecutionArgs, buildSenderCommand, runOrchestratorExecution } from './orchestrator-execution.mjs';
 export { parseOrchestratorCliArgs, formatOrchestratorHelp, runWatchdogAutoNotifyOrchestrator, runOrchestratorCli } from './orchestrator-cli.mjs';
 
 export { createRuntimeBinding } from './runtime-binding.mjs';

plugins/reporting-governance/src/adapters/orchestrator-cli.mjs

@@ -1,41 +1,18 @@
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { spawnSync } from 'node:child_process';
+import {
+  buildSenderCommand,
+  createDefaultOrchestratorExecutionArgs,
+  runOrchestratorExecution,
+} from './orchestrator-execution.mjs';
 
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..');
-const DEFAULT_STATE_PATH = path.join(packageRoot, 'memory', 'watchdog-state.json');
-const DEFAULT_EVIDENCE_DIR = path.join(packageRoot, 'state', 'long-task-watchdog');
-const DEFAULT_EVENT_DIR = path.join(packageRoot, 'state', 'long-task-watchdog-events');
-const DEFAULT_QUEUE_DIR = path.join(packageRoot, 'state', 'operator-notify-queue');
-const DEFAULT_SPOOL_DIR = path.join(packageRoot, 'state', 'operator-notify-dispatch-spool');
-const DEFAULT_RECEIPT_DIR = path.join(packageRoot, 'state', 'operator-notify-bridge-receipts');
-const DEFAULT_WATCHDOG_SCRIPT = path.join(packageRoot, 'scripts', 'long_task_watchdog.mjs');
-const DEFAULT_DISPATCHER_SCRIPT = path.join(packageRoot, 'scripts', 'operator_notify_dispatcher.mjs');
-const DEFAULT_SUPERVISOR_SCRIPT = path.join(packageRoot, 'scripts', 'operator_notify_bridge_supervisor.mjs');
 const DEFAULT_SENDER_BINDING_SCRIPT = path.join(packageRoot, 'scripts', 'operator_notify_sender_binding.mjs');
+const DEFAULT_ARGS = createDefaultOrchestratorExecutionArgs({ packageRoot });
 
 export function parseOrchestratorCliArgs(argv) {
-  const args = {
-    state: DEFAULT_STATE_PATH,
-    evidenceDir: DEFAULT_EVIDENCE_DIR,
-    eventDir: DEFAULT_EVENT_DIR,
-    queueDir: DEFAULT_QUEUE_DIR,
-    spoolDir: DEFAULT_SPOOL_DIR,
-    receiptDir: DEFAULT_RECEIPT_DIR,
-    watchdogScript: DEFAULT_WATCHDOG_SCRIPT,
-    dispatcherScript: DEFAULT_DISPATCHER_SCRIPT,
-    supervisorScript: DEFAULT_SUPERVISOR_SCRIPT,
-    senderCommand: null,
-    senderMode: null,
-    openclawBin: 'openclaw',
-    now: null,
-    compact: false,
-    writeState: false,
-    claim: false,
-    dryRun: false,
-    help: false,
-  };
+  const args = { ...DEFAULT_ARGS };
 
   for (let i = 0; i < argv.length; i += 1) {
     const token = argv[i];
@@ -97,105 +74,13 @@ export function printOrchestratorHelp(options = {}) {
   process.stdout.write(`${formatOrchestratorHelp(options)}\n`);
 }
 
-export function buildSenderCommand(args) {
-  if (args.senderCommand) return args.senderCommand;
-  if (!args.senderMode) return null;
-  const cmd = [
-    JSON.stringify(process.execPath),
-    JSON.stringify(DEFAULT_SENDER_BINDING_SCRIPT),
-    '--mode', JSON.stringify(args.senderMode),
-    '--openclaw-bin', JSON.stringify(args.openclawBin),
-    '--compact',
-  ];
-  return cmd.join(' ');
-}
-
-export function runNodeScript(scriptPath, scriptArgs) {
-  return spawnSync(process.execPath, [scriptPath, ...scriptArgs], {
-    cwd: packageRoot,
-    encoding: 'utf8',
-  });
-}
-
-export function parseJsonOutput(label, result) {
-  const stdout = result.stdout ?? '';
-  try {
-    return stdout.trim() ? JSON.parse(stdout) : null;
-  } catch (error) {
-    throw new Error(`${label} emitted non-JSON stdout: ${error instanceof Error ? error.message : String(error)}`);
-  }
-}
-
-export function ensureSuccess(label, result) {
-  if (result.status !== 0) {
-    throw new Error(`${label} failed with status ${result.status ?? 'null'}: ${(result.stderr ?? '').trim() || '(no stderr)'}`);
-  }
-}
-
 export function runWatchdogAutoNotifyOrchestrator(args) {
-  const senderCommand = buildSenderCommand(args);
-
-  const watchdogArgs = [
-    '--state', path.resolve(args.state),
-    '--evidence-dir', path.resolve(args.evidenceDir),
-    '--event-dir', path.resolve(args.eventDir),
-    '--notification-dir', path.resolve(args.queueDir),
-    '--compact',
-  ];
-  if (args.writeState) watchdogArgs.push('--write-state');
-  if (args.now) watchdogArgs.push('--now', args.now);
-  const watchdog = runNodeScript(path.resolve(args.watchdogScript), watchdogArgs);
-  ensureSuccess('watchdog runner', watchdog);
-  const watchdogPayload = parseJsonOutput('watchdog runner', watchdog);
-
-  const dispatcherArgs = [
-    '--queue-dir', path.resolve(args.queueDir),
-    '--spool-dir', path.resolve(args.spoolDir),
-    '--compact',
-  ];
-  if (args.claim) dispatcherArgs.push('--claim');
-  if (args.now) dispatcherArgs.push('--now', args.now);
-  const dispatcher = runNodeScript(path.resolve(args.dispatcherScript), dispatcherArgs);
-  ensureSuccess('dispatcher', dispatcher);
-  const dispatcherPayload = parseJsonOutput('dispatcher', dispatcher);
-
-  const supervisorArgs = [
-    '--queue-dir', path.resolve(args.queueDir),
-    '--spool-dir', path.resolve(args.spoolDir),
-    '--receipt-dir', path.resolve(args.receiptDir),
-    '--dispatcher-script', path.resolve(args.dispatcherScript),
-    '--compact',
-  ];
-  if (args.dryRun) supervisorArgs.push('--dry-run');
-  if (senderCommand) supervisorArgs.push('--sender-command', senderCommand);
-  if (args.now) supervisorArgs.push('--now', args.now);
-  const supervisor = runNodeScript(path.resolve(args.supervisorScript), supervisorArgs);
-  ensureSuccess('bridge supervisor', supervisor);
-  const supervisorPayload = parseJsonOutput('bridge supervisor', supervisor);
-
+  const payload = runOrchestratorExecution(args, { senderBindingScript: DEFAULT_SENDER_BINDING_SCRIPT });
   return {
-    ok: true,
-    tool: 'watchdog_auto_notify_orchestrator',
-    version: 'mvp-v1',
-    now: args.now ?? null,
-    executionOrder: [
-      'runner',
-      'queue',
-      'dispatcher',
-      'bridge',
-      senderCommand ? 'sender' : 'sender_unconfigured',
-      'ack_or_blocked_or_pending',
-    ],
+    ...payload,
     orchestration: {
       script: path.resolve(import.meta.filename),
-      senderCommandConfigured: Boolean(senderCommand),
-      senderMode: args.senderMode ?? null,
-      dryRun: args.dryRun,
-    },
-    result: {
-      watchdog: watchdogPayload?.result ?? null,
-      dispatcher: dispatcherPayload?.result ?? null,
-      supervisor: supervisorPayload?.result ?? null,
+      ...payload.orchestration,
     },
   };
 }
@@ -222,4 +107,4 @@ export function main(argv = process.argv.slice(2), options = {}) {
   }
 }
 
-export { packageRoot };
+export { buildSenderCommand, packageRoot };

plugins/reporting-governance/src/adapters/orchestrator-execution.mjs

@@ -0,0 +1,104 @@
+import path from 'node:path';
+import process from 'node:process';
+import { runWatchdogAdapter } from './watchdog.mjs';
+import { runDispatcherAdapter } from './dispatcher.mjs';
+import { runBridgeSupervisorAdapter } from './bridge-supervisor.mjs';
+
+export const DEFAULT_OPENCLAW_BIN = 'openclaw';
+
+export function createDefaultOrchestratorExecutionArgs({ packageRoot }) {
+  return {
+    state: path.join(packageRoot, 'memory', 'watchdog-state.json'),
+    evidenceDir: path.join(packageRoot, 'state', 'long-task-watchdog'),
+    eventDir: path.join(packageRoot, 'state', 'long-task-watchdog-events'),
+    queueDir: path.join(packageRoot, 'state', 'operator-notify-queue'),
+    spoolDir: path.join(packageRoot, 'state', 'operator-notify-dispatch-spool'),
+    receiptDir: path.join(packageRoot, 'state', 'operator-notify-bridge-receipts'),
+    watchdogScript: path.join(packageRoot, 'scripts', 'long_task_watchdog.mjs'),
+    dispatcherScript: path.join(packageRoot, 'scripts', 'operator_notify_dispatcher.mjs'),
+    supervisorScript: path.join(packageRoot, 'scripts', 'operator_notify_bridge_supervisor.mjs'),
+    senderCommand: null,
+    senderMode: null,
+    openclawBin: DEFAULT_OPENCLAW_BIN,
+    now: null,
+    compact: false,
+    writeState: false,
+    claim: false,
+    dryRun: false,
+    help: false,
+  };
+}
+
+export function buildSenderCommand(args, { senderBindingScript }) {
+  if (args.senderCommand) return args.senderCommand;
+  if (!args.senderMode) return null;
+  const cmd = [
+    JSON.stringify(process.execPath),
+    JSON.stringify(senderBindingScript),
+    '--mode', JSON.stringify(args.senderMode),
+    '--openclaw-bin', JSON.stringify(args.openclawBin),
+    '--compact',
+  ];
+  return cmd.join(' ');
+}
+
+export function runOrchestratorExecution(args, { senderBindingScript } = {}) {
+  const senderCommand = buildSenderCommand(args, { senderBindingScript });
+
+  const watchdogPayload = runWatchdogAdapter({
+    scriptPath: path.resolve(args.watchdogScript),
+    state: args.state,
+    evidenceDir: args.evidenceDir,
+    eventDir: args.eventDir,
+    notificationDir: args.queueDir,
+    now: args.now,
+    compact: true,
+    writeState: args.writeState,
+  });
+
+  const dispatcherPayload = runDispatcherAdapter({
+    scriptPath: path.resolve(args.dispatcherScript),
+    queueDir: args.queueDir,
+    spoolDir: args.spoolDir,
+    now: args.now,
+    compact: true,
+    claim: args.claim,
+  });
+
+  const supervisorPayload = runBridgeSupervisorAdapter({
+    scriptPath: path.resolve(args.supervisorScript),
+    queueDir: args.queueDir,
+    spoolDir: args.spoolDir,
+    receiptDir: args.receiptDir,
+    dispatcherScript: path.resolve(args.dispatcherScript),
+    senderCommand,
+    now: args.now,
+    compact: true,
+    dryRun: args.dryRun,
+  });
+
+  return {
+    ok: true,
+    tool: 'watchdog_auto_notify_orchestrator',
+    version: 'mvp-v1',
+    now: args.now ?? null,
+    executionOrder: [
+      'runner',
+      'queue',
+      'dispatcher',
+      'bridge',
+      senderCommand ? 'sender' : 'sender_unconfigured',
+      'ack_or_blocked_or_pending',
+    ],
+    orchestration: {
+      senderCommandConfigured: Boolean(senderCommand),
+      senderMode: args.senderMode ?? null,
+      dryRun: args.dryRun,
+    },
+    result: {
+      watchdog: watchdogPayload?.result ?? null,
+      dispatcher: dispatcherPayload?.result ?? null,
+      supervisor: supervisorPayload?.result ?? null,
+    },
+  };
+}

plugins/reporting-governance/src/adapters/orchestrator.mjs

@@ -1,7 +1,7 @@
 import path from 'node:path';
-import { ensureSuccess, parseJsonStdout, runNodeScript } from './_script-runner.mjs';
 import { createRuntimeBinding, resolveScriptPath } from './runtime-binding.mjs';
 import { loadDeploymentProfileArtifact, createDeploymentBindingContract, assertUseTimePathWithinRepoRoot } from '../storage/profile-artifact.mjs';
+import { runOrchestratorExecution } from './orchestrator-execution.mjs';
 
 export function runOrchestratorAdapter({
   scriptPath = null,
@@ -42,7 +42,7 @@ export function runOrchestratorAdapter({
     cwd: repoRootOverride,
     scripts: resolvedDeploymentBinding?.scripts,
   });
-  const resolvedScriptPath = path.resolve(scriptPath ?? resolvedDeploymentBinding?.entrypoint ?? resolveScriptPath('orchestrator', { runtimeBinding: binding }));
+  const resolvedOrchestratorScriptPath = path.resolve(scriptPath ?? resolvedDeploymentBinding?.entrypoint ?? resolveScriptPath('orchestrator', { runtimeBinding: binding }));
   const resolvedWatchdogScript = path.resolve(watchdogScript ?? resolveScriptPath('watchdog', { runtimeBinding: binding }));
   const resolvedDispatcherScript = path.resolve(dispatcherScript ?? resolveScriptPath('dispatcher', { runtimeBinding: binding }));
   const resolvedSupervisorScript = path.resolve(supervisorScript ?? resolveScriptPath('bridgeSupervisor', { runtimeBinding: binding }));
@@ -59,26 +59,33 @@ export function runOrchestratorAdapter({
     ? path.resolve(receiptDir)
     : null;
 
-  const args = [];
-  if (state) args.push('--state', path.resolve(state));
-  if (evidenceDir) args.push('--evidence-dir', path.resolve(evidenceDir));
-  if (eventDir) args.push('--event-dir', path.resolve(eventDir));
-  if (resolvedQueueDir) args.push('--queue-dir', resolvedQueueDir);
-  if (resolvedSpoolDir) args.push('--spool-dir', resolvedSpoolDir);
-  if (resolvedReceiptDir) args.push('--receipt-dir', resolvedReceiptDir);
-  if (resolvedWatchdogScript) args.push('--watchdog-script', resolvedWatchdogScript);
-  if (resolvedDispatcherScript) args.push('--dispatcher-script', resolvedDispatcherScript);
-  if (resolvedSupervisorScript) args.push('--supervisor-script', resolvedSupervisorScript);
-  if (senderCommand) args.push('--sender-command', senderCommand);
-  if (senderMode) args.push('--sender-mode', senderMode);
-  if (openclawBin) args.push('--openclaw-bin', openclawBin);
-  if (now) args.push('--now', now);
-  if (writeState) args.push('--write-state');
-  if (claim) args.push('--claim');
-  if (dryRun) args.push('--dry-run');
-  if (compact) args.push('--compact');
+  const payload = runOrchestratorExecution({
+    state,
+    evidenceDir,
+    eventDir,
+    queueDir: resolvedQueueDir,
+    spoolDir: resolvedSpoolDir,
+    receiptDir: resolvedReceiptDir,
+    watchdogScript: resolvedWatchdogScript,
+    dispatcherScript: resolvedDispatcherScript,
+    supervisorScript: resolvedSupervisorScript,
+    senderCommand,
+    senderMode,
+    openclawBin,
+    now,
+    compact,
+    writeState,
+    claim,
+    dryRun,
+  }, {
+    senderBindingScript: resolveScriptPath('senderBinding', { runtimeBinding: binding }),
+  });
 
-  const result = runNodeScript(resolvedScriptPath, args, { runtimeBinding: binding });
-  ensureSuccess('orchestrator adapter', result);
-  return parseJsonStdout('orchestrator adapter', result);
+  return {
+    ...payload,
+    orchestration: {
+      script: resolvedOrchestratorScriptPath,
+      ...payload.orchestration,
+    },
+  };
 }