@gethmy/harness 1.5.0 → 1.6.0

package/dist/cli.js

@@ -1802,6 +1802,7 @@ init_dist();
 
 // src/exec-types.ts
 var DEFAULT_METRIC_TIMEOUT_MS = 300000;
+var SANDBOX_STARTUP_GRACE_MS = 60000;
 
 // src/gate-config-error.ts
 init_dist();
@@ -2516,8 +2517,8 @@ function errText(err) {
 }
 
 // src/verification.ts
-init_log();
 import { execFileSync as execFileSync4, spawn as spawn2 } from "node:child_process";
+init_log();
 
 // src/pm.ts
 init_log();
@@ -2749,11 +2750,108 @@ function resolveXcodeScheme(pt) {
   }
 }
 
+// src/repair-sandbox.ts
+init_log();
+import { randomUUID } from "node:crypto";
+import { promisify } from "node:util";
+var TAG8 = "repair-sandbox";
+async function dockerExec(argv, opts) {
+  const { execFile } = await import("node:child_process");
+  return promisify(execFile)("docker", argv, {
+    encoding: "utf-8",
+    ...opts
+  });
+}
+var MAX_OUTPUT_BUFFER2 = 20971520;
+var PROBE_TIMEOUT_MS = 1e4;
+var SANDBOX_MOUNT = "/repo";
+var SANDBOX_MEMORY = "4g";
+var SANDBOX_PIDS = "512";
+var dockerProbe = null;
+async function sandboxAvailable() {
+  if (dockerProbe === true)
+    return true;
+  try {
+    await dockerExec(["version", "--format", "{{.Server.Version}}"], {
+      timeout: PROBE_TIMEOUT_MS
+    });
+    dockerProbe = true;
+  } catch {
+    dockerProbe = false;
+  }
+  return dockerProbe;
+}
+function __resetSandboxProbe() {
+  dockerProbe = null;
+}
+async function removeContainer(name) {
+  try {
+    await dockerExec(["rm", "--force", name], { timeout: PROBE_TIMEOUT_MS });
+    log.warn(TAG8, `removed the timed-out sandbox container ${name}`);
+  } catch {}
+}
+function sandboxRunArgs(image, worktree, command, name) {
+  return [
+    "run",
+    "--rm",
+    ...name ? ["--name", name] : [],
+    "--network=none",
+    "--cap-drop=ALL",
+    "--security-opt=no-new-privileges",
+    `--memory=${SANDBOX_MEMORY}`,
+    `--pids-limit=${SANDBOX_PIDS}`,
+    ...typeof process.getuid === "function" && typeof process.getgid === "function" ? ["--user", `${process.getuid()}:${process.getgid()}`] : [],
+    "--env",
+    "HOME=/tmp",
+    "--volume",
+    `${worktree}:${SANDBOX_MOUNT}`,
+    "--workdir",
+    SANDBOX_MOUNT,
+    "--entrypoint",
+    command.cmd,
+    image,
+    ...command.args
+  ];
+}
+async function runInSandbox(args) {
+  const name = `harmony-repair-${randomUUID()}`;
+  const argv = sandboxRunArgs(args.image, args.worktree, args.command, name);
+  log.info(TAG8, `sandbox: ${args.command.cmd} ${args.command.args.join(" ")} (image ${args.image})`);
+  try {
+    const { stdout } = await dockerExec(argv, {
+      timeout: args.timeoutMs,
+      maxBuffer: MAX_OUTPUT_BUFFER2
+    });
+    return { passed: true, output: stdout ?? "" };
+  } catch (err) {
+    const e = err;
+    const output = `${e.stdout ?? ""}${e.stderr ?? ""}`;
+    if (typeof e.code !== "number") {
+      const timedOut = e.killed === true || e.signal != null;
+      if (timedOut)
+        await removeContainer(name);
+      return {
+        passed: false,
+        output,
+        sandboxError: timedOut ? `the sandbox timed out after ${args.timeoutMs}ms` : `the sandbox did not run: ${e.message ?? "unknown error"}`
+      };
+    }
+    if (e.code === 125) {
+      return {
+        passed: false,
+        output,
+        sandboxError: `the sandbox could not start (image "${args.image}" missing or unusable)`
+      };
+    }
+    return { passed: false, output };
+  }
+}
+
 // src/revert-guard.ts
 init_log();
 init_run_containment();
 import { execFileSync as execFileSync3 } from "node:child_process";
-var TAG8 = "revert-guard";
+var TAG9 = "revert-guard";
 var TEST_FILE = /(?:^|\/)__tests__\/|\.(?:test|spec)\.[cm]?[jt]sx?$/;
 function isTestFile(path) {
   return TEST_FILE.test(path);
@@ -2768,7 +2866,7 @@ function refetchBase(worktreePath, baseBranch) {
       stdio: "pipe"
     });
   } catch {
-    log.warn(TAG8, "Failed to re-fetch base for revert guard — using last fetch");
+    log.warn(TAG9, "Failed to re-fetch base for revert guard — using last fetch");
   }
 }
 function listDeletedFilesAgainstBase(worktreePath, baseBranch) {
@@ -2783,7 +2881,7 @@ function listDeletedFilesAgainstBase(worktreePath, baseBranch) {
     return out.split(`
 `).map((l) => l.trim()).filter((l) => l.length > 0);
   } catch (err) {
-    log.warn(TAG8, `Failed to list deleted files: ${err instanceof Error ? err.message : err}`);
+    log.warn(TAG9, `Failed to list deleted files: ${err instanceof Error ? err.message : err}`);
     return [];
   }
 }
@@ -2794,8 +2892,8 @@ function findDeletedTestFiles(worktreePath, baseBranch) {
 
 // src/verification.ts
 init_run_containment();
-var TAG9 = "verification";
-var MAX_OUTPUT_BUFFER2 = 64 * 1024 * 1024;
+var TAG10 = "verification";
+var MAX_OUTPUT_BUFFER3 = 64 * 1024 * 1024;
 async function runVerification(worktreePath, config, workerId) {
   const result = {
     passed: true,
@@ -2805,137 +2903,163 @@ async function runVerification(worktreePath, config, workerId) {
     reviewFindings: [],
     revertWarnings: []
   };
+  const sandbox = verificationSandbox(config);
   if (config.verification.revertGuard) {
-    log.info(TAG9, `[worker:${workerId}] Checking for reverted merged work...`);
+    log.info(TAG10, `[worker:${workerId}] Checking for reverted merged work...`);
     const deletedTests = findDeletedTestFiles(worktreePath, config.worktree.baseBranch);
     if (deletedTests.length > 0) {
       result.revertWarnings = deletedTests.map((f) => `Branch deletes test file '${f}' relative to current ${config.worktree.baseBranch} — ` + "likely an accidental revert of already-merged work. Restore the test or rebase on current main.");
-      log.warn(TAG9, `[worker:${workerId}] Revert guard tripped: ${deletedTests.length} deleted test file(s)`);
+      log.warn(TAG10, `[worker:${workerId}] Revert guard tripped: ${deletedTests.length} deleted test file(s)`);
       result.passed = false;
     } else {
-      log.info(TAG9, `[worker:${workerId}] Revert guard passed`);
+      log.info(TAG10, `[worker:${workerId}] Revert guard passed`);
     }
   }
   if (config.verification.build) {
-    log.info(TAG9, `[worker:${workerId}] Running build...`);
-    result.buildErrors = runBuild(worktreePath, config.verification.timeout);
+    log.info(TAG10, `[worker:${workerId}] Running build...`);
+    result.buildErrors = await runBuild(worktreePath, config.verification.timeout, sandbox);
     if (result.buildErrors.length > 0) {
-      log.warn(TAG9, `[worker:${workerId}] Build failed with ${result.buildErrors.length} error(s)`);
+      log.warn(TAG10, `[worker:${workerId}] Build failed with ${result.buildErrors.length} error(s)`);
       result.passed = false;
     } else {
-      log.info(TAG9, `[worker:${workerId}] Build passed`);
+      log.info(TAG10, `[worker:${workerId}] Build passed`);
     }
   }
   if (config.verification.test && result.buildErrors.length === 0) {
-    log.info(TAG9, `[worker:${workerId}] Running tests...`);
-    result.testFailures = runTests(worktreePath, config.verification.testTimeout);
+    log.info(TAG10, `[worker:${workerId}] Running tests...`);
+    result.testFailures = await runTests(worktreePath, config.verification.testTimeout, sandbox);
     if (result.testFailures.length > 0) {
-      log.warn(TAG9, `[worker:${workerId}] Tests failed with ${result.testFailures.length} failure(s)`);
+      log.warn(TAG10, `[worker:${workerId}] Tests failed with ${result.testFailures.length} failure(s)`);
       result.passed = false;
     } else {
-      log.info(TAG9, `[worker:${workerId}] Tests passed`);
+      log.info(TAG10, `[worker:${workerId}] Tests passed`);
     }
   }
   if (config.verification.lint) {
-    log.info(TAG9, `[worker:${workerId}] Running lint...`);
-    result.lintWarnings = runLint(worktreePath, config.verification.timeout);
+    log.info(TAG10, `[worker:${workerId}] Running lint...`);
+    result.lintWarnings = await runLint(worktreePath, config.verification.timeout, sandbox);
     if (result.lintWarnings.length > 0) {
-      log.warn(TAG9, `[worker:${workerId}] Lint found ${result.lintWarnings.length} issue(s)`);
+      log.warn(TAG10, `[worker:${workerId}] Lint found ${result.lintWarnings.length} issue(s)`);
     } else {
-      log.info(TAG9, `[worker:${workerId}] Lint passed`);
+      log.info(TAG10, `[worker:${workerId}] Lint passed`);
     }
   }
   if (config.verification.deepReview) {
-    log.info(TAG9, `[worker:${workerId}] Running deep review...`);
+    log.info(TAG10, `[worker:${workerId}] Running deep review...`);
     result.reviewFindings = await runDeepReview(worktreePath, config, workerId);
     if (result.reviewFindings.length > 0) {
-      log.warn(TAG9, `[worker:${workerId}] Deep review found ${result.reviewFindings.length} finding(s)`);
+      log.warn(TAG10, `[worker:${workerId}] Deep review found ${result.reviewFindings.length} finding(s)`);
     } else {
-      log.info(TAG9, `[worker:${workerId}] Deep review passed`);
+      log.info(TAG10, `[worker:${workerId}] Deep review passed`);
     }
   }
   return result;
 }
-function runBuild(worktreePath, timeout) {
-  const command = buildCommand(worktreePath);
-  if (!command) {
-    log.warn(TAG9, `No known build toolchain for ${worktreePath} — skipping build`);
-    return [];
+function verificationSandbox(config) {
+  const image = config.verification.sandboxImage?.trim();
+  if (!image)
+    return;
+  return { image };
+}
+async function execStep(command, args) {
+  const { worktreePath, timeout } = args;
+  const sandbox = args.sandbox?.image.trim() ? args.sandbox : undefined;
+  if (sandbox) {
+    if (!await sandboxAvailable()) {
+      return {
+        ok: false,
+        sandboxError: `verification.sandboxImage is set to "${sandbox.image}" but no container runtime answered — ` + "start Docker or unset the image to verify on the host"
+      };
+    }
+    const result = await runInSandbox({
+      image: sandbox.image,
+      worktree: worktreePath,
+      command,
+      timeoutMs: timeout + SANDBOX_STARTUP_GRACE_MS
+    });
+    if (result.sandboxError) {
+      return { ok: false, sandboxError: result.sandboxError };
+    }
+    if (result.passed)
+      return { ok: true };
+    return { ok: false, err: { stdout: result.output, stderr: "" } };
   }
   try {
     execFileSync4(command.cmd, command.args, {
       cwd: worktreePath,
       timeout,
       stdio: "pipe",
-      maxBuffer: MAX_OUTPUT_BUFFER2,
+      maxBuffer: MAX_OUTPUT_BUFFER3,
       env: containedEnv()
     });
-    return [];
+    return { ok: true };
   } catch (err) {
-    return parseErrorOutput(err);
+    return { ok: false, err };
+  }
+}
+async function runBuild(worktreePath, timeout, sandbox) {
+  const command = buildCommand(worktreePath);
+  if (!command) {
+    log.warn(TAG10, `No known build toolchain for ${worktreePath} — skipping build`);
+    return [];
   }
+  const outcome = await execStep(command, { worktreePath, timeout, sandbox });
+  if (outcome.ok)
+    return [];
+  if (outcome.sandboxError) {
+    log.error(TAG10, `Build not verified: ${outcome.sandboxError}`);
+    return [`Build did not run: ${outcome.sandboxError}`];
+  }
+  return parseErrorOutput(outcome.err);
 }
-function runTests(worktreePath, timeout) {
+async function runTests(worktreePath, timeout, sandbox) {
   const command = testCommand(worktreePath);
   if (!command) {
-    log.warn(TAG9, `No test command for detected toolchain in ${worktreePath} — skipping tests`);
+    log.warn(TAG10, `No test command for detected toolchain in ${worktreePath} — skipping tests`);
     return [];
   }
-  try {
-    execFileSync4(command.cmd, command.args, {
-      cwd: worktreePath,
-      timeout,
-      stdio: "pipe",
-      maxBuffer: MAX_OUTPUT_BUFFER2,
-      env: containedEnv()
-    });
+  const outcome = await execStep(command, { worktreePath, timeout, sandbox });
+  if (outcome.ok)
     return [];
-  } catch (err) {
-    const output = combineOutput(err);
-    log.warn(TAG9, `Test run failed:
-${output.slice(-4000) || "(no output captured)"}`);
-    return parseTestFailures(err, timeout);
+  if (outcome.sandboxError) {
+    log.error(TAG10, `Tests not verified: ${outcome.sandboxError}`);
+    return [`Test run did not happen: ${outcome.sandboxError}`];
   }
+  const output = combineOutput(outcome.err);
+  log.warn(TAG10, `Test run failed:
+${output.slice(-4000) || "(no output captured)"}`);
+  return parseTestFailures(outcome.err, timeout);
 }
-function runFormatFix(worktreePath, timeout, workerId) {
+async function runFormatFix(worktreePath, timeout, workerId, sandbox) {
   const command = formatFixCommand(worktreePath);
   if (!command)
     return;
-  try {
-    execFileSync4(command.cmd, command.args, {
-      cwd: worktreePath,
-      timeout,
-      stdio: "pipe",
-      maxBuffer: MAX_OUTPUT_BUFFER2,
-      env: containedEnv()
-    });
-    log.info(TAG9, `[worker:${workerId}] Auto-formatted worktree before commit/push`);
-  } catch (err) {
-    log.warn(TAG9, `[worker:${workerId}] Auto-format step exited non-zero (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
+  const outcome = await execStep(command, { worktreePath, timeout, sandbox });
+  if (outcome.ok) {
+    log.info(TAG10, `[worker:${workerId}] Auto-formatted worktree before commit/push`);
+    return;
   }
+  const why = outcome.sandboxError ? outcome.sandboxError : outcome.err instanceof Error ? outcome.err.message : String(outcome.err);
+  log.warn(TAG10, `[worker:${workerId}] Auto-format step did not complete (non-fatal): ${why}`);
 }
-function runLint(worktreePath, timeout) {
+async function runLint(worktreePath, timeout, sandbox) {
   const command = lintCommand(worktreePath);
   if (!command) {
-    log.info(TAG9, `No lint step for detected toolchain in ${worktreePath} — skipping lint`);
+    log.info(TAG10, `No lint step for detected toolchain in ${worktreePath} — skipping lint`);
     return [];
   }
-  try {
-    execFileSync4(command.cmd, command.args, {
-      cwd: worktreePath,
-      timeout,
-      stdio: "pipe",
-      maxBuffer: MAX_OUTPUT_BUFFER2,
-      env: containedEnv()
-    });
+  const outcome = await execStep(command, { worktreePath, timeout, sandbox });
+  if (outcome.ok)
     return [];
-  } catch (err) {
-    return parseErrorOutput(err);
+  if (outcome.sandboxError) {
+    log.error(TAG10, `Lint not verified: ${outcome.sandboxError}`);
+    return [`Lint did not run: ${outcome.sandboxError}`];
   }
+  return parseErrorOutput(outcome.err);
 }
 async function runDeepReview(worktreePath, config, workerId) {
   if (!supportsDevServer(worktreePath)) {
-    log.info(TAG9, `[worker:${workerId}] Detected non-web toolchain — skipping deep review`);
+    log.info(TAG10, `[worker:${workerId}] Detected non-web toolchain — skipping deep review`);
     return [];
   }
   const port = config.verification.devServerBasePort + workerId;
@@ -2951,7 +3075,7 @@ async function runDeepReview(worktreePath, config, workerId) {
       await waitForDevServer(devServer, 30000);
       await probeDevServer(port);
     } catch (err) {
-      log.error(TAG9, `Dev server did not become ready: ${err instanceof Error ? err.message : err}`);
+      log.error(TAG10, `Dev server did not become ready: ${err instanceof Error ? err.message : err}`);
       return [];
     }
     let diff = "";
@@ -2960,7 +3084,7 @@ async function runDeepReview(worktreePath, config, workerId) {
         cwd: worktreePath,
         encoding: "utf-8",
         timeout: 30000,
-        maxBuffer: MAX_OUTPUT_BUFFER2
+        maxBuffer: MAX_OUTPUT_BUFFER3
       });
     } catch {
       diff = "(unable to retrieve diff)";
@@ -2994,12 +3118,12 @@ async function runDeepReview(worktreePath, config, workerId) {
       encoding: "utf-8",
       timeout: config.verification.timeout,
       stdio: "pipe",
-      maxBuffer: MAX_OUTPUT_BUFFER2,
+      maxBuffer: MAX_OUTPUT_BUFFER3,
       env: containedEnv()
     });
     return parseReviewFindings(output);
   } catch (err) {
-    log.error(TAG9, `Deep review failed: ${err instanceof Error ? err.message : err}`);
+    log.error(TAG10, `Deep review failed: ${err instanceof Error ? err.message : err}`);
     return [];
   } finally {
     if (devServer && !devServer.killed) {
@@ -3037,12 +3161,12 @@ function attemptAutoFix(worktreePath, config, errors) {
     "--",
     fixPrompt
   ];
-  log.info(TAG9, "Spawning Claude for auto-fix...");
+  log.info(TAG10, "Spawning Claude for auto-fix...");
   execFileSync4("claude", args, {
     cwd: worktreePath,
     timeout: config.verification.timeout,
     stdio: "pipe",
-    maxBuffer: MAX_OUTPUT_BUFFER2,
+    maxBuffer: MAX_OUTPUT_BUFFER3,
     env: containedEnv()
   });
 }
@@ -3076,7 +3200,7 @@ async function reportFindings(client, cardId, result, recovery) {
     try {
       await client.createSubtask(cardId, title);
     } catch (err) {
-      log.error(TAG9, `Failed to create subtask: ${err instanceof Error ? err.message : err}`);
+      log.error(TAG10, `Failed to create subtask: ${err instanceof Error ? err.message : err}`);
     }
   }));
   if (overflow > 0) {
@@ -3084,7 +3208,7 @@ async function reportFindings(client, cardId, result, recovery) {
       await client.createSubtask(cardId, `...and ${overflow} more issues`);
     } catch {}
   }
-  log.info(TAG9, `Reported ${Math.min(items.length, maxSubtasks)} finding(s) as subtasks on card ${cardId}`);
+  log.info(TAG10, `Reported ${Math.min(items.length, maxSubtasks)} finding(s) as subtasks on card ${cardId}`);
 }
 function combineOutput(err) {
   const stderr = err?.stderr?.toString() ?? "";
@@ -3117,7 +3241,7 @@ function parseTestFailures(err, timeout) {
   }
   if (e?.code === "ENOBUFS") {
     return [
-      `Test output exceeded the ${MAX_OUTPUT_BUFFER2 / (1024 * 1024)}MB capture limit and the run was killed — ` + "the suite's real result is unknown. Quieten the reporter or raise the limit."
+      `Test output exceeded the ${MAX_OUTPUT_BUFFER3 / (1024 * 1024)}MB capture limit and the run was killed — ` + "the suite's real result is unknown. Quieten the reporter or raise the limit."
     ];
   }
   const combined = combineOutput(err);
@@ -3208,7 +3332,7 @@ async function probeDevServer(port, timeoutMs = 5000) {
 }
 
 // src/gate-collectors.ts
-var TAG10 = "gate-collectors";
+var TAG11 = "gate-collectors";
 async function resolveStageGate(client, card) {
   const currentStage = card.current_stage;
   const playbookId = card.playbook_id;
@@ -3226,7 +3350,7 @@ async function resolveStageGate(client, card) {
       return null;
     return { stage: resolution.stage, gate };
   } catch (err) {
-    log.warn(TAG10, `resolveStageGate failed for stage "${currentStage}": ${err instanceof Error ? err.message : err}`);
+    log.warn(TAG11, `resolveStageGate failed for stage "${currentStage}": ${err instanceof Error ? err.message : err}`);
     return null;
   }
 }
@@ -3261,8 +3385,8 @@ class BuildGreenCollector {
   async collect(_context) {
     const doBuild = this.deps.runBuild ?? runBuild;
     const doLint = this.deps.runLint ?? runLint;
-    const buildErrors = doBuild(this.deps.worktreePath, this.deps.buildTimeout);
-    const lintWarnings = doLint(this.deps.worktreePath, this.deps.lintTimeout);
+    const buildErrors = await doBuild(this.deps.worktreePath, this.deps.buildTimeout, this.deps.sandbox);
+    const lintWarnings = await doLint(this.deps.worktreePath, this.deps.lintTimeout, this.deps.sandbox);
     const buildPassed = buildErrors.length === 0;
     const lintPassed = lintWarnings.length === 0;
     const result = buildPassed ? "passed" : "failed";
@@ -3358,7 +3482,7 @@ function buildGateCollectorRegistry(deps) {
 async function collectGateEvidence(registry, context) {
   const collector = registry[context.gate.kind];
   if (!collector) {
-    log.info(TAG10, `No collector for gate kind "${context.gate.kind}" — reporting blocked`);
+    log.info(TAG11, `No collector for gate kind "${context.gate.kind}" — reporting blocked`);
     return {
       result: "blocked",
       structured: {
@@ -3370,14 +3494,14 @@ async function collectGateEvidence(registry, context) {
     return await collector.collect(context);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    log.warn(TAG10, `Collector for "${context.gate.kind}" threw: ${msg} — reporting blocked`);
+    log.warn(TAG11, `Collector for "${context.gate.kind}" threw: ${msg} — reporting blocked`);
     return { result: "blocked", structured: { error: msg } };
   }
 }
 
 // src/harmony-client.ts
 init_log();
-var TAG11 = "harmony-client";
+var TAG12 = "harmony-client";
 function readClientConfig(env) {
   const apiUrl = env.HARMONY_API_URL?.trim();
   const apiKey = env.HARMONY_API_KEY?.trim();
@@ -3429,7 +3553,7 @@ class HarmonyClient {
       purpose: "gate_evaluation"
     });
     if (!response.ok) {
-      log.warn(TAG11, `Oracle fetch for stage ${stageId} returned ${response.status} — no oracle read, the gate will report blocked`);
+      log.warn(TAG12, `Oracle fetch for stage ${stageId} returned ${response.status} — no oracle read, the gate will report blocked`);
       return null;
     }
     const body = await response.json();
@@ -3713,7 +3837,7 @@ async function runStage(request, deps) {
 }
 
 // src/cli.ts
-var TAG12 = "cli";
+var TAG13 = "cli";
 var GATE_VERIFICATION_TIMEOUT_MS = 600000;
 var SHUTDOWN_HARD_EXIT_MS = 15000;
 var activeRunner = null;
@@ -3744,12 +3868,12 @@ async function runRole(request, prompt, emit2) {
   });
   const runner = new SdkAgentRunner(launch.config);
   activeRunner = runner;
-  log.info(TAG12, `Running stage ${request.stageId} as role ${launch.role ?? "(none — fail-closed)"}`);
+  log.info(TAG13, `Running stage ${request.stageId} as role ${launch.role ?? "(none — fail-closed)"}`);
   const timeoutMs = stageTimeoutMs(process.env);
   let timedOut = false;
   const clock = timeoutMs > 0 ? setTimeout(() => {
     timedOut = true;
-    log.warn(TAG12, `stage ${request.stageId} exceeded ${timeoutMs}ms — stopping the subagent`);
+    log.warn(TAG13, `stage ${request.stageId} exceeded ${timeoutMs}ms — stopping the subagent`);
     runner.stop("timeout");
   }, timeoutMs) : null;
   clock?.unref?.();
@@ -3765,9 +3889,9 @@ async function runRole(request, prompt, emit2) {
       if (relayed)
         emit2(relayed);
       if (event.kind === "error") {
-        log.warn(TAG12, `subagent error: ${event.payload.message}`);
+        log.warn(TAG13, `subagent error: ${event.payload.message}`);
       } else {
-        log.event(TAG12, `subagent ${event.kind}`);
+        log.event(TAG13, `subagent ${event.kind}`);
       }
     }
   } finally {