@pensar/apex 2.4.0 → 2.5.0-canary.aa559068

package/build/{cli-repbyhkk.js → cli-kya26m6f.js}

@@ -1,6 +1,6 @@
 import {
   detectOSAndEnhancePrompt
-} from "./cli-tznv8pf1.js";
+} from "./cli-8mws7sa5.js";
 import {
   parseTargetUrl
 } from "./cli-c8131c4q.js";
@@ -10,6 +10,7 @@ import {
   create,
   createLogger,
   generateObjectResponse,
+  getActiveTraceCorrelation,
   getApexTracer,
   hasToolCall,
   init_ai,
@@ -24,6 +25,7 @@ import {
   list,
   newMessageId,
   newPartId,
+  newRunId,
   newSessionId,
   read,
   require_tslib,
@@ -32,14 +34,14 @@ import {
   streamResponse,
   withSubagentSessionBaggage,
   write
-} from "./cli-tkc598ey.js";
+} from "./cli-qwv4jsj2.js";
 import {
   ensureValidToken,
   getPensarApiUrl,
   init_auth,
   init_constants,
   signGatewayRequest
-} from "./cli-0n4r54hq.js";
+} from "./cli-jsw8vt43.js";
 import {
   _enum,
   _null,
@@ -60,17 +62,23 @@ import {
   optional,
   preprocess,
   record,
-  require_src,
   safeParse,
   string,
   tool,
   union,
   unknown
-} from "./cli-swpbx60z.js";
+} from "./cli-avmhkjtv.js";
 import {
   config,
   init_config
-} from "./cli-72cvcqhg.js";
+} from "./cli-54egv3xw.js";
+import {
+  getCurrentVersion,
+  init_installation
+} from "./cli-w51z9qjr.js";
+import {
+  require_src
+} from "./cli-knd276ed.js";
 import {
   __commonJS,
   __require,
@@ -102763,12 +102771,7 @@ function camoufoxWindowOptions(window2) {
   const [width, height] = window2;
   return {
     window: [width, height],
-    screen: {
-      minWidth: width,
-      maxWidth: width,
-      minHeight: height,
-      maxHeight: height
-    }
+    screen: { minWidth: width, minHeight: height }
   };
 }
 async function resolveCamoufoxLaunchOptions(headless, opts) {
@@ -104466,6 +104469,19 @@ function assertUrlInScope(url, ctx) {
     throw new ScopeViolationError(hostname, allowedHosts);
   }
 }
+function assertFindingEndpointInScope(endpoint, ctx) {
+  const allowedHosts = getAllowedHosts(ctx);
+  if (allowedHosts.length === 0)
+    return;
+  if (!/^https?:\/\//i.test(endpoint.trim()))
+    return;
+  const hostname = extractHostname2(endpoint);
+  if (!hostname)
+    return;
+  if (!isHostAllowed(hostname, allowedHosts)) {
+    throw new ScopeViolationError(hostname, allowedHosts);
+  }
+}
 function extractHostsFromCommand(command) {
   const hosts = new Set;
   const urlPattern = /https?:\/\/[^\s"'`;|&)<>]+/gi;
@@ -105055,12 +105071,8 @@ const fs = require('fs');
       ...${JSON.stringify(CAMOUFOX_OPTIONS)},
       headless: __headless,
       window: __window,
-      screen: {
-        minWidth: __window[0],
-        maxWidth: __window[0],
-        minHeight: __window[1],
-        maxHeight: __window[1],
-      },
+      // Floor only — exact-pinning a 720px height throws in browserforge.
+      screen: { minWidth: __window[0], minHeight: __window[1] },
     });
     fs.writeFileSync('${SANDBOX_CAMOU_CACHE}', JSON.stringify(__camou));
   }
@@ -106761,7 +106773,7 @@ IMPORTANT: Pass protectedEndpoints in authHints when you've discovered 401/403 e
         if (credentials) {
           ctx.session.credentialManager.addFromAuthCredentials(credentials);
         }
-        const { runAuthenticationAgent } = await import("./authentication-3s97cpk4.js");
+        const { runAuthenticationAgent } = await import("./authentication-87zzmjdd.js");
         const localBus = new AgentEventBus;
         AgentEventBus.attachChild(localBus, ctx.eventBus, subagentId);
         const result = await runAuthenticationAgent({
@@ -107555,7 +107567,7 @@ async function generateThreatModelForEndpoint(ctx, input) {
   return threatModelLimiter(async () => {
     if (ctx.abortSignal?.aborted)
       return null;
-    const { CodeAgent } = await import("./agent-mvpgvgks.js");
+    const { CodeAgent } = await import("./agent-48xj79bj.js");
     const subagentId = newSessionId();
     const subagentName = `Threat Model: ${input.routePath}`;
     ctx.eventBus?.emit("subagent-spawn", {
@@ -108044,6 +108056,16 @@ import {
 } from "node:fs";
 import { join as join13 } from "node:path";
 
+// src/lib/attack-path/types.ts
+init_zod();
+var AttackPathSchema = exports_external.array(exports_external.object({
+  applicationId: exports_external.string().optional(),
+  applicationName: exports_external.string().optional(),
+  host: exports_external.string().optional(),
+  relationshipType: exports_external.string().optional(),
+  notes: exports_external.string().optional()
+}));
+
 // src/lib/cwe/types.ts
 init_zod();
 var CweEntrySchema = exports_external.object({
@@ -108366,6 +108388,47 @@ var MAX_SEVERITY = {
   eq4: { 0: 6, 1: 5, 2: 4 },
   eq5: { 0: 1, 1: 1, 2: 1 }
 };
+var MAX_COMPOSED = {
+  eq1: {
+    0: ["AV:N/PR:N/UI:N/"],
+    1: ["AV:A/PR:N/UI:N/", "AV:N/PR:L/UI:N/", "AV:N/PR:N/UI:P/"],
+    2: ["AV:P/PR:N/UI:N/", "AV:A/PR:L/UI:P/"]
+  },
+  eq2: {
+    0: ["AC:L/AT:N/"],
+    1: ["AC:H/AT:N/", "AC:L/AT:P/"]
+  },
+  eq3: {
+    0: {
+      "0": ["VC:H/VI:H/VA:H/CR:H/IR:H/AR:H/"],
+      "1": ["VC:H/VI:H/VA:L/CR:M/IR:M/AR:H/", "VC:H/VI:H/VA:H/CR:M/IR:M/AR:M/"]
+    },
+    1: {
+      "0": ["VC:L/VI:H/VA:H/CR:H/IR:H/AR:H/", "VC:H/VI:L/VA:H/CR:H/IR:H/AR:H/"],
+      "1": [
+        "VC:L/VI:H/VA:L/CR:H/IR:M/AR:H/",
+        "VC:L/VI:H/VA:H/CR:H/IR:M/AR:M/",
+        "VC:H/VI:L/VA:H/CR:M/IR:H/AR:M/",
+        "VC:H/VI:L/VA:L/CR:M/IR:H/AR:H/",
+        "VC:L/VI:L/VA:H/CR:H/IR:H/AR:M/"
+      ]
+    },
+    2: {
+      "1": ["VC:L/VI:L/VA:L/CR:H/IR:H/AR:H/"]
+    }
+  },
+  eq4: {
+    0: ["SC:H/SI:S/SA:S/"],
+    1: ["SC:H/SI:H/SA:H/"],
+    2: ["SC:L/SI:L/SA:L/"]
+  },
+  eq5: {
+    0: ["E:A/"],
+    1: ["E:P/"],
+    2: ["E:U/"]
+  }
+};
+var NO_IMPACT_METRICS = ["VC", "VI", "VA", "SC", "SI", "SA"];
 var STEP = 0.1;
 var EPSILON = 10 ** -6;
 
@@ -108414,6 +108477,12 @@ var ENVIRONMENTAL_METRICS = [
   "MSA"
 ];
 var SUPPLEMENTAL_METRICS = ["S", "AU", "R", "V", "RE", "U"];
+var KNOWN_METRICS = new Set([
+  ...BASE_METRICS,
+  ...THREAT_METRICS,
+  ...ENVIRONMENTAL_METRICS,
+  ...SUPPLEMENTAL_METRICS
+]);
 function buildVectorString(metrics) {
   const parts = ["CVSS:4.0"];
   for (const metric of BASE_METRICS) {
@@ -108442,39 +108511,49 @@ function buildVectorString(metrics) {
   }
   return parts.join("/");
 }
-function getEffectiveValue(metrics, baseMetric, modifiedMetric) {
-  if (modifiedMetric) {
-    const modValue = metrics[modifiedMetric];
-    if (modValue && modValue !== "X") {
-      return modValue;
-    }
-  }
-  return metrics[baseMetric] ?? "";
+var WORST_CASE_DEFAULTS = {
+  E: "A",
+  CR: "H",
+  IR: "H",
+  AR: "H"
+};
+function getEffectiveValue(metrics, metric) {
+  const record3 = metrics;
+  const selected = record3[metric] ?? "X";
+  const worstCase = WORST_CASE_DEFAULTS[metric];
+  if (worstCase !== undefined && selected === "X") {
+    return worstCase;
+  }
+  const modified = record3[`M${metric}`];
+  if (modified !== undefined && modified !== "X") {
+    return modified;
+  }
+  return selected;
 }
 function computeEQ1(metrics) {
-  const av = getEffectiveValue(metrics, "AV", "MAV");
-  const pr = getEffectiveValue(metrics, "PR", "MPR");
-  const ui = getEffectiveValue(metrics, "UI", "MUI");
+  const av = getEffectiveValue(metrics, "AV");
+  const pr = getEffectiveValue(metrics, "PR");
+  const ui = getEffectiveValue(metrics, "UI");
   if (av === "N" && pr === "N" && ui === "N") {
     return 0;
   }
-  if (!(av === "P" || pr === "H" || ui === "A")) {
+  if ((av === "N" || pr === "N" || ui === "N") && av !== "P") {
     return 1;
   }
   return 2;
 }
 function computeEQ2(metrics) {
-  const ac = getEffectiveValue(metrics, "AC", "MAC");
-  const at = getEffectiveValue(metrics, "AT", "MAT");
+  const ac = getEffectiveValue(metrics, "AC");
+  const at = getEffectiveValue(metrics, "AT");
   if (ac === "L" && at === "N") {
     return 0;
   }
   return 1;
 }
 function computeEQ3(metrics) {
-  const vc = getEffectiveValue(metrics, "VC", "MVC");
-  const vi = getEffectiveValue(metrics, "VI", "MVI");
-  const va = getEffectiveValue(metrics, "VA", "MVA");
+  const vc = getEffectiveValue(metrics, "VC");
+  const vi = getEffectiveValue(metrics, "VI");
+  const va = getEffectiveValue(metrics, "VA");
   if (vc === "H" && vi === "H") {
     return 0;
   }
@@ -108484,11 +108563,11 @@ function computeEQ3(metrics) {
   return 2;
 }
 function computeEQ4(metrics) {
-  const msi = metrics.MSI || "X";
-  const msa = metrics.MSA || "X";
-  const sc = getEffectiveValue(metrics, "SC", "MSC");
-  const si = msi !== "X" ? msi : metrics.SI;
-  const sa = msa !== "X" ? msa : metrics.SA;
+  const msi = getEffectiveValue(metrics, "MSI");
+  const msa = getEffectiveValue(metrics, "MSA");
+  const sc = getEffectiveValue(metrics, "SC");
+  const si = getEffectiveValue(metrics, "SI");
+  const sa = getEffectiveValue(metrics, "SA");
   if (msi === "S" || msa === "S") {
     return 0;
   }
@@ -108498,8 +108577,8 @@ function computeEQ4(metrics) {
   return 2;
 }
 function computeEQ5(metrics) {
-  const e = metrics.E || "A";
-  if (e === "A" || e === "X") {
+  const e = getEffectiveValue(metrics, "E");
+  if (e === "A") {
     return 0;
   }
   if (e === "P") {
@@ -108508,12 +108587,12 @@ function computeEQ5(metrics) {
   return 2;
 }
 function computeEQ6(metrics) {
-  const cr = metrics.CR || "H";
-  const ir = metrics.IR || "H";
-  const ar = metrics.AR || "H";
-  const vc = getEffectiveValue(metrics, "VC", "MVC");
-  const vi = getEffectiveValue(metrics, "VI", "MVI");
-  const va = getEffectiveValue(metrics, "VA", "MVA");
+  const cr = getEffectiveValue(metrics, "CR");
+  const ir = getEffectiveValue(metrics, "IR");
+  const ar = getEffectiveValue(metrics, "AR");
+  const vc = getEffectiveValue(metrics, "VC");
+  const vi = getEffectiveValue(metrics, "VI");
+  const va = getEffectiveValue(metrics, "VA");
   if (cr === "H" && vc === "H" || ir === "H" && vi === "H" || ar === "H" && va === "H") {
     return 0;
   }
@@ -108529,116 +108608,130 @@ function computeMacroVector(metrics) {
   return `${eq1}${eq2}${eq3}${eq4}${eq5}${eq6}`;
 }
 function hasNoImpact(metrics) {
-  const vc = getEffectiveValue(metrics, "VC", "MVC");
-  const vi = getEffectiveValue(metrics, "VI", "MVI");
-  const va = getEffectiveValue(metrics, "VA", "MVA");
-  const sc = getEffectiveValue(metrics, "SC", "MSC");
-  const si = metrics.MSI !== "X" && metrics.MSI ? metrics.MSI : metrics.SI;
-  const sa = metrics.MSA !== "X" && metrics.MSA ? metrics.MSA : metrics.SA;
-  return vc === "N" && vi === "N" && va === "N" && sc === "N" && si === "N" && sa === "N";
+  return NO_IMPACT_METRICS.every((metric) => getEffectiveValue(metrics, metric) === "N");
 }
-function getMetricDistance(metrics, metric) {
-  const levels = METRIC_LEVELS[metric];
-  if (!levels)
-    return 0;
-  let value;
-  const modifiedMetric = `M${metric}`;
-  const metricsRecord = metrics;
-  if (metricsRecord[modifiedMetric] && metricsRecord[modifiedMetric] !== "X") {
-    value = metricsRecord[modifiedMetric] ?? "";
-  } else {
-    value = metricsRecord[metric] ?? "";
+function parseMacroVector(macroVector) {
+  return {
+    eq1: Number(macroVector[0]),
+    eq2: Number(macroVector[1]),
+    eq3: Number(macroVector[2]),
+    eq4: Number(macroVector[3]),
+    eq5: Number(macroVector[4]),
+    eq6: Number(macroVector[5])
+  };
+}
+function lowerMacroVectorScore(eq, step) {
+  const stepped = { ...eq, ...step };
+  return MACROVECTOR_LOOKUP[`${stepped.eq1}${stepped.eq2}${stepped.eq3}${stepped.eq4}${stepped.eq5}${stepped.eq6}`];
+}
+function lowerEq3Eq6Score(eq) {
+  if (eq.eq3 === 0 && eq.eq6 === 0) {
+    const viaEq6 = lowerMacroVectorScore(eq, { eq6: eq.eq6 + 1 });
+    const viaEq3 = lowerMacroVectorScore(eq, { eq3: eq.eq3 + 1 });
+    if (viaEq6 === undefined || viaEq3 === undefined) {
+      return;
+    }
+    return Math.max(viaEq6, viaEq3);
+  }
+  if (eq.eq3 === 1 && eq.eq6 === 0) {
+    return lowerMacroVectorScore(eq, { eq6: eq.eq6 + 1 });
+  }
+  if (eq.eq3 < 2) {
+    return lowerMacroVectorScore(eq, { eq3: eq.eq3 + 1 });
   }
-  if (metric === "E" && (!value || value === "X")) {
-    value = "A";
+  return lowerMacroVectorScore(eq, { eq3: eq.eq3 + 1, eq6: eq.eq6 + 1 });
+}
+function composeMaxVectors(eq) {
+  const eq3Maxima = MAX_COMPOSED.eq3[eq.eq3]?.[eq.eq6];
+  if (eq3Maxima === undefined) {
+    throw new Error(`No max severity vector for eq3=${eq.eq3}, eq6=${eq.eq6}`);
   }
-  if ((metric === "CR" || metric === "IR" || metric === "AR") && (!value || value === "X")) {
-    value = "H";
+  const vectors = [];
+  for (const eq1Max of MAX_COMPOSED.eq1[eq.eq1]) {
+    for (const eq2Max of MAX_COMPOSED.eq2[eq.eq2]) {
+      for (const eq3Max of eq3Maxima) {
+        for (const eq4Max of MAX_COMPOSED.eq4[eq.eq4]) {
+          for (const eq5Max of MAX_COMPOSED.eq5[eq.eq5]) {
+            vectors.push(eq1Max + eq2Max + eq3Max + eq4Max + eq5Max);
+          }
+        }
+      }
+    }
   }
-  return levels[value] || 0;
+  return vectors;
 }
-function getNextLowerScore(macroVector, position) {
-  const digits = macroVector.split("").map(Number);
-  digits[position]++;
-  const nextMacroVector = digits.join("");
-  return MACROVECTOR_LOOKUP[nextMacroVector] ?? null;
+function extractMaxVectorValue(metric, maxVector) {
+  const start = maxVector.indexOf(`${metric}:`);
+  if (start < 0) {
+    throw new Error(`Metric ${metric} missing from max vector ${maxVector}`);
+  }
+  const rest = maxVector.slice(start + metric.length + 1);
+  const end = rest.indexOf("/");
+  return end > 0 ? rest.slice(0, end) : rest;
 }
-function interpolateScore(metrics, macroVector, baseScore) {
-  const eq1 = parseInt(macroVector[0], 10);
-  const eq2 = parseInt(macroVector[1], 10);
-  const eq3 = parseInt(macroVector[2], 10);
-  const eq4 = parseInt(macroVector[3], 10);
-  const eq5 = parseInt(macroVector[4], 10);
-  const eq6 = parseInt(macroVector[5], 10);
-  let meanDistance = 0;
-  let eqCount = 0;
-  const eq1NextLower = getNextLowerScore(macroVector, 0);
-  if (eq1NextLower !== null) {
-    const msd = baseScore - eq1NextLower;
-    const maxDepth = MAX_SEVERITY.eq1[eq1] || 1;
-    const avDist = getMetricDistance(metrics, "AV");
-    const prDist = getMetricDistance(metrics, "PR");
-    const uiDist = getMetricDistance(metrics, "UI");
-    const severityDist = avDist + prDist + uiDist;
-    const normalizedDist = severityDist / (maxDepth * STEP);
-    meanDistance += msd * normalizedDist;
-    eqCount++;
-  }
-  const eq2NextLower = getNextLowerScore(macroVector, 1);
-  if (eq2NextLower !== null) {
-    const msd = baseScore - eq2NextLower;
-    const maxDepth = MAX_SEVERITY.eq2[eq2] || 1;
-    const acDist = getMetricDistance(metrics, "AC");
-    const atDist = getMetricDistance(metrics, "AT");
-    const severityDist = acDist + atDist;
-    const normalizedDist = severityDist / (maxDepth * STEP);
-    meanDistance += msd * normalizedDist;
-    eqCount++;
-  }
-  const eq3eq6MaxSeverity = MAX_SEVERITY.eq3eq6;
-  if (eq3eq6MaxSeverity[eq3] && eq3eq6MaxSeverity[eq3][eq6] !== undefined) {
-    const eq3NextLower = getNextLowerScore(macroVector, 2);
-    if (eq3NextLower !== null) {
-      const msd = baseScore - eq3NextLower;
-      const maxDepth = eq3eq6MaxSeverity[eq3][eq6] || 1;
-      const vcDist = getMetricDistance(metrics, "VC");
-      const viDist = getMetricDistance(metrics, "VI");
-      const vaDist = getMetricDistance(metrics, "VA");
-      const crDist = getMetricDistance(metrics, "CR");
-      const irDist = getMetricDistance(metrics, "IR");
-      const arDist = getMetricDistance(metrics, "AR");
-      const severityDist = vcDist + viDist + vaDist + crDist + irDist + arDist;
-      const normalizedDist = severityDist / (maxDepth * STEP);
-      meanDistance += msd * normalizedDist;
-      eqCount++;
-    }
-  }
-  const eq4NextLower = getNextLowerScore(macroVector, 3);
-  if (eq4NextLower !== null) {
-    const msd = baseScore - eq4NextLower;
-    const maxDepth = MAX_SEVERITY.eq4[eq4] || 1;
-    const scDist = getMetricDistance(metrics, "SC");
-    const siDist = getMetricDistance(metrics, "SI");
-    const saDist = getMetricDistance(metrics, "SA");
-    const severityDist = scDist + siDist + saDist;
-    const normalizedDist = severityDist / (maxDepth * STEP);
-    meanDistance += msd * normalizedDist;
-    eqCount++;
-  }
-  const eq5NextLower = getNextLowerScore(macroVector, 4);
-  if (eq5NextLower !== null) {
-    const msd = baseScore - eq5NextLower;
-    const maxDepth = MAX_SEVERITY.eq5[eq5] || 1;
-    const eDist = getMetricDistance(metrics, "E");
-    const normalizedDist = eDist / (maxDepth * STEP);
-    meanDistance += msd * normalizedDist;
-    eqCount++;
-  }
-  const avgDistance = eqCount > 0 ? meanDistance / eqCount : 0;
-  let finalScore = baseScore - avgDistance;
-  finalScore = Math.max(0, Math.min(10, finalScore));
-  finalScore = Math.round(finalScore * 10) / 10;
-  return finalScore;
+function severityDistances(metrics, maxVector) {
+  const distances = {};
+  for (const [metric, levels] of Object.entries(METRIC_LEVELS)) {
+    const value = getEffectiveValue(metrics, metric);
+    const maxValue = extractMaxVectorValue(metric, maxVector);
+    const level = levels[value];
+    const maxLevel = levels[maxValue];
+    if (level === undefined) {
+      throw new Error(`Unknown value ${metric}:${value}`);
+    }
+    if (maxLevel === undefined) {
+      throw new Error(`Unknown value ${metric}:${maxValue} in ${maxVector}`);
+    }
+    distances[metric] = level - maxLevel;
+  }
+  return distances;
+}
+function interpolateScore(metrics, macroVector, macroScore) {
+  const eq = parseMacroVector(macroVector);
+  let distances;
+  for (const maxVector of composeMaxVectors(eq)) {
+    distances = severityDistances(metrics, maxVector);
+    if (Object.values(distances).every((distance) => distance >= 0)) {
+      break;
+    }
+  }
+  if (distances === undefined) {
+    throw new Error(`No max vectors composed for MacroVector ${macroVector}`);
+  }
+  const severityDistance = {
+    eq1: distances.AV + distances.PR + distances.UI,
+    eq2: distances.AC + distances.AT,
+    eq3eq6: distances.VC + distances.VI + distances.VA + distances.CR + distances.IR + distances.AR,
+    eq4: distances.SC + distances.SI + distances.SA
+  };
+  const lowerScore = {
+    eq1: lowerMacroVectorScore(eq, { eq1: eq.eq1 + 1 }),
+    eq2: lowerMacroVectorScore(eq, { eq2: eq.eq2 + 1 }),
+    eq3eq6: lowerEq3Eq6Score(eq),
+    eq4: lowerMacroVectorScore(eq, { eq4: eq.eq4 + 1 })
+  };
+  const macroVectorDepth = {
+    eq1: MAX_SEVERITY.eq1[eq.eq1] * STEP,
+    eq2: MAX_SEVERITY.eq2[eq.eq2] * STEP,
+    eq3eq6: MAX_SEVERITY.eq3eq6[eq.eq3][eq.eq6] * STEP,
+    eq4: MAX_SEVERITY.eq4[eq.eq4] * STEP
+  };
+  let existingLowerCount = 0;
+  let proportionalDistance = 0;
+  for (const key of ["eq1", "eq2", "eq3eq6", "eq4"]) {
+    const lower = lowerScore[key];
+    if (lower === undefined) {
+      continue;
+    }
+    existingLowerCount++;
+    proportionalDistance += (macroScore - lower) * (severityDistance[key] / macroVectorDepth[key]);
+  }
+  if (lowerMacroVectorScore(eq, { eq5: eq.eq5 + 1 }) !== undefined) {
+    existingLowerCount++;
+  }
+  const meanDistance = existingLowerCount === 0 ? 0 : proportionalDistance / existingLowerCount;
+  const score = Math.max(0, Math.min(10, macroScore - meanDistance));
+  return Math.round((score + EPSILON) * 10) / 10;
 }
 function calculateCVSS4Score(metrics) {
   if (hasNoImpact(metrics)) {
@@ -109480,7 +109573,7 @@ init_lazyLogger();
 var log6 = scopedLogger(() => createLogger("FindingJudge"));
 async function judgeFinding(input, ctx) {
   try {
-    const { FindingJudgeAgent } = await import("./agent-5ejt5vpz.js");
+    const { FindingJudgeAgent } = await import("./agent-ve8pkr6q.js");
     const agent = new FindingJudgeAgent({
       finding: input,
       model: ctx.model,
@@ -109581,7 +109674,8 @@ var documentVulnerabilityInputSchema = exports_external.object({
   pocName: exports_external.string().describe("Short descriptive name for the POC"),
   pocType: exports_external.enum(["bash", "python", "javascript"]).describe("Script language"),
   pocContent: exports_external.string().describe("The full POC script content"),
-  pocDescription: exports_external.string().describe("What this POC demonstrates")
+  pocDescription: exports_external.string().describe("What this POC demonstrates"),
+  attackPath: AttackPathSchema.optional().describe("Required ordered member-to-member hop chain when the finding spans multiple System members; do not leave this chain only in narrative fields")
 });
 function formatMateriality(input) {
   return [
@@ -109651,11 +109745,24 @@ CRITICAL RULES — READ BEFORE CALLING:
 - POC must exit 0 on success (vulnerability confirmed), non-zero on failure
 - POC must print clear evidence of exploitation to stdout
 - Fill the materiality checklist with the concrete exploit path, material security impact, affected non-public asset or abuse path, and why common false-positive traps do not apply
+- When a finding spans multiple System members, populate attackPath with every hop in order; do not leave the chain only in the description or evidence
 - If the tool returns a POC failure or judge rejection, revise your approach and call again
 - Do NOT use this for: positive observations, informational notes, testing limitations, or anything that is not an exploitable security vulnerability
 - If you could not exploit a vulnerability, do NOT call this tool — mention it in your final response summary instead`,
     inputSchema: documentVulnerabilityInputSchema,
     execute: async (input) => {
+      try {
+        assertFindingEndpointInScope(input.endpoint, ctx);
+      } catch (error) {
+        if (error instanceof ScopeViolationError) {
+          return {
+            success: false,
+            error: error.message,
+            message: `Finding endpoint rejected — out of scope: ${error.message}`
+          };
+        }
+        throw error;
+      }
       try {
         const materializedEvidence = formatMateriality(input);
         if (ctx.findingsRegistry) {
@@ -109870,7 +109977,8 @@ CRITICAL RULES — READ BEFORE CALLING:
             vulnerabilityClass: input.vulnerabilityClass
           },
           severity,
-          ...evidenceFiles.length > 0 && { evidenceFiles }
+          ...evidenceFiles.length > 0 && { evidenceFiles },
+          ...input.attackPath && input.attackPath.length > 0 && { attackPath: input.attackPath }
         };
         if (isVulnerability && ctx.findingsRegistry) {
           const check = await ctx.findingsRegistry.register(finding);
@@ -115366,9 +115474,10 @@ class PersistentShell {
 ${commandOutput}`;
       }
       const effectiveExit = cmd.forcedExitCode != null ? cmd.forcedExitCode : Number.isNaN(naturalExitCode) ? 1 : naturalExitCode;
-      const effectiveStderr = cmd.forcedStderrSuffix ? (cmd.stderr || "") + cmd.forcedStderrSuffix : cmd.stderr || "";
+      const diskStderr = readTempfileCapped(cmd.errPath);
       unlinkSafe(cmd.outPath);
       unlinkSafe(cmd.errPath);
+      const effectiveStderr = (diskStderr || cmd.stderr || "") + (cmd.forcedStderrSuffix ?? "");
       const resolve4 = cmd.resolve;
       this.current = null;
       this.pendingCancel = null;
@@ -116106,7 +116215,7 @@ should be passed directly to spawn_pentest_swarm for deep testing.`,
       });
       if (cwd) {
         try {
-          const { WhiteboxAttackSurfaceAgent } = await import("./index-rbzhk712.js");
+          const { WhiteboxAttackSurfaceAgent } = await import("./index-gng8ebqf.js");
           const localBus = new AgentEventBus;
           AgentEventBus.attachChild(localBus, ctx.eventBus, subagentId);
           const agent = new WhiteboxAttackSurfaceAgent({
@@ -116161,7 +116270,7 @@ should be passed directly to spawn_pentest_swarm for deep testing.`,
         }
       }
       try {
-        const { BlackboxAttackSurfaceAgent } = await import("./blackboxAgent-gw0a1ca4.js");
+        const { BlackboxAttackSurfaceAgent } = await import("./blackboxAgent-x0e1wqjx.js");
         const localBus = new AgentEventBus;
         AgentEventBus.attachChild(localBus, ctx.eventBus, subagentId);
         const agent = new BlackboxAttackSurfaceAgent({
@@ -116239,7 +116348,7 @@ Omit \`cwd\` for blackbox mode (live target probing only).`,
       toolCallDescription: exports_external.string().describe("A concise, human-readable description of what this tool call is doing")
     }),
     execute: async ({ target, cwd }) => {
-      const { runPentestWorkflow: workflow } = await import("./pentest-xtc1sjdw.js");
+      const { runPentestWorkflow: workflow } = await import("./pentest-dp9w88pw.js");
       if (!ctx.model) {
         return {
           success: false,
@@ -116299,6 +116408,134 @@ function summarizeFindingsBySeverity(findings) {
   return counts;
 }
 
+// src/core/agents/offSecAgent/tools/smsListMessages.ts
+init_dist();
+init_zod();
+var SMS_LIST_MESSAGES_TOOL_NAME = "sms_list_messages";
+var SMS_TOOL_NAMES = [SMS_LIST_MESSAGES_TOOL_NAME];
+function phoneFromAuthCredentials(session) {
+  const creds = session.config?.authCredentials;
+  const list2 = creds ? Array.isArray(creds) ? creds : [creds] : [];
+  for (const cred of list2) {
+    const phone = cred.additionalFields?.phoneNumber;
+    if (phone)
+      return phone;
+  }
+}
+function sessionHasSmsPasswordless(session) {
+  const refs = session.credentialManager?.listReferences() ?? [];
+  if (refs.some((ref) => ref.additionalFieldKeys?.includes("phoneNumber"))) {
+    return true;
+  }
+  return Boolean(phoneFromAuthCredentials(session));
+}
+function requireAgentApi() {
+  const base = process.env.AGENT_API_URL;
+  const token = process.env.AGENT_API_TOKEN;
+  if (!base || !token) {
+    throw new Error("sms_list_messages requires AGENT_API_URL and AGENT_API_TOKEN (Console sandbox dispatch). Local CLI without Console cannot read inbound SMS.");
+  }
+  return { base: base.replace(/\/+$/, ""), token };
+}
+function resolvePhoneNumber(ctx, input) {
+  if (input.phoneNumber)
+    return input.phoneNumber;
+  const cm = ctx.credentialManager ?? ctx.session.credentialManager;
+  if (input.credentialId) {
+    const stored = cm?.resolve(input.credentialId);
+    const phone = stored?.additionalFields?.phoneNumber;
+    if (!phone) {
+      throw new Error(`Credential ${input.credentialId} has no phoneNumber additional field`);
+    }
+    return phone;
+  }
+  const refs = cm?.listReferences() ?? [];
+  const smsRef = refs.find((ref) => ref.additionalFieldKeys?.includes("phoneNumber"));
+  if (smsRef) {
+    const stored = cm?.resolve(smsRef.id);
+    const phone = stored?.additionalFields?.phoneNumber;
+    if (phone)
+      return phone;
+  }
+  const fromAuth = phoneFromAuthCredentials(ctx.session);
+  if (fromAuth)
+    return fromAuth;
+  throw new Error("No sms-passwordless credential with a phoneNumber field is available");
+}
+async function agentFetch(path, init) {
+  const { token, ...rest } = init;
+  return fetch(path, {
+    ...rest,
+    headers: {
+      Authorization: `Bearer ${token}`,
+      ...rest.headers ?? {}
+    }
+  });
+}
+function smsListMessages(ctx) {
+  return tool({
+    description: `List inbound SMS on a Mobile OTP (sms-passwordless) receiving number.
+
+This is a single read — it does not wait. After the target sends a code, sleep with execute_command (e.g. sleep 5) then call this tool. If the list is empty, sleep and list again, or stop and report what you observed. Do not hang in a wait loop.
+
+Pass sinceMs as Date.now() from the send-code click so earlier messages are ignored. Set claim=true to consume the newest unconsumed message (exclusive; other runs cannot reuse that OTP). Fill the OTP with browser_fill from the returned code/body — do not report phone_verification as a barrier for this flow.
+
+Requires a Console sandbox (AGENT_API_URL). Concurrent lists on the same shared number are exclusive; a 429 means another run holds the number.`,
+    inputSchema: exports_external.object({
+      credentialId: exports_external.string().optional().describe("Credential ID whose additionalFields.phoneNumber is the receiving number. Omit to use the session's sms-passwordless credential."),
+      phoneNumber: exports_external.string().optional().describe("Explicit E.164 receiving number. Prefer credentialId so the number is resolved from the stored credential."),
+      sinceMs: exports_external.number().describe("Epoch milliseconds of the send-code click. Messages received before this timestamp are ignored."),
+      claim: exports_external.boolean().optional().describe("If true, consume the newest unconsumed message so other runs cannot reuse the OTP. Defaults to false (list only)."),
+      toolCallDescription: exports_external.string().describe("A concise, human-readable description of what this tool call is doing")
+    }),
+    execute: async ({ credentialId, phoneNumber, sinceMs, claim }) => {
+      const { base, token } = requireAgentApi();
+      const toPhoneNumber = resolvePhoneNumber(ctx, {
+        credentialId,
+        phoneNumber
+      });
+      const since = new Date(sinceMs).toISOString();
+      const url = new URL(`${base}/agent/sms/messages`);
+      url.searchParams.set("toPhoneNumber", toPhoneNumber);
+      url.searchParams.set("since", since);
+      if (claim)
+        url.searchParams.set("claim", "1");
+      const res = await agentFetch(url.toString(), {
+        method: "GET",
+        token,
+        signal: ctx.abortSignal
+      });
+      if (res.status === 429) {
+        return {
+          success: false,
+          error: "Another agent run holds the exclusive lease on this phone number. Wait and retry, or use a different Mobile OTP number."
+        };
+      }
+      if (res.status === 403) {
+        return {
+          success: false,
+          error: "This phone number is not configured as a Mobile OTP credential in this workspace."
+        };
+      }
+      if (res.status === 409) {
+        return {
+          success: false,
+          error: "That SMS was already claimed. List without claim, or wait for a newer message."
+        };
+      }
+      if (!res.ok) {
+        throw new Error(`SMS list API error ${res.status} ${res.statusText}`);
+      }
+      const data = await res.json();
+      return {
+        success: true,
+        messages: data.messages,
+        claimed: data.claimed
+      };
+    }
+  });
+}
+
 // src/core/utils/concurrency.ts
 var import_api = __toESM(require_src(), 1);
 async function runWithBoundedConcurrency(items, concurrency, fn, abortSignal) {
@@ -117817,7 +118054,7 @@ Returns an array of results with the text output from each agent.`,
   });
 }
 async function runSingleCodingAgent(ctx, codebasePath, objective, agentIndex, name) {
-  const { CodeAgent } = await import("./agent-mvpgvgks.js");
+  const { CodeAgent } = await import("./agent-48xj79bj.js");
   const childSessionId = newSessionId();
   const subagentId = childSessionId;
   ctx.eventBus?.emit("subagent-spawn", {
@@ -118298,13 +118535,17 @@ init_dist();
 init_zod();
 init_id();
 var WORKER_DRAIN_GRACE_MS = 30000;
+var ORIGIN_AUTH_FAILURE_GUIDANCE = `A 401/403 from one resource does not by itself prove authentication failure. Verify the session against a known protected or session endpoint and re-authenticate on the assigned origin only if needed. Call report_error with reason "authentication_failed" only if required authentication cannot be established and this blocks the assigned objective or all further testing; otherwise continue any reachable testing.`;
 function spawnPentestAgent(ctx) {
+  const targetScopeGuidance = ctx.systemScope && ctx.systemScope.memberHosts.length > 0 ? `For a cross-service follow-up, you may instead use a full URL on one of these authorized System Scope members: ${ctx.systemScope.memberHosts.join(", ")}.` : "No structured System Scope is present, so keep the assigned host unchanged.";
   return tool({
     description: `Spawn a single focused pentest sub-agent (worker) to test ONE objective at a time.
 
 Use this AFTER stating your plan and performing light reconnaissance. Call this tool ONCE PER OBJECTIVE — do not batch objectives into a single spawn, because the UI surfaces each spawn as its own timeline.
 
-CRITICAL — \`target\` must be the FULL URL including the endpoint path the caller wants tested (e.g. https://example.com/api/users/{id}), not a bare domain. Forward through whatever URL the orchestrator itself received unless recon turned up a related sibling endpoint that genuinely belongs to a follow-up objective.
+CRITICAL — \`target\` must be a FULL URL including the endpoint path the caller wants tested (e.g. https://example.com/api/users/{id}), not a bare domain. Use the orchestrator's assigned URL by default. Recon-supported sibling endpoints are allowed for a follow-up objective. ${targetScopeGuidance} Never invent a host or endpoint.
+
+Authentication state is origin-specific. Before spawning a cross-service worker that needs authentication, establish and verify a session on its target origin and describe that status in \`context\`. The worker must verify protected access on its assigned origin. ${ORIGIN_AUTH_FAILURE_GUIDANCE}
 
 Each spawn produces an independent TargetedPentestAgent that:
 1. Tests the assigned objective(s) deeply (execute_command, http_request, browser tools)
@@ -118322,7 +118563,7 @@ False-positive discipline: workers should not call document_vulnerability for pu
 Returns the worker's summary, objective results, and finding count — but NOT the findings themselves (those land in the shared registry).`,
     inputSchema: exports_external.object({
       name: exports_external.string().describe("Short human-readable label for this sub-agent shown in the UI (e.g. 'SQLi /api/users', 'IDOR orders', 'Final chain & explore')."),
-      target: exports_external.string().describe("Full target URL INCLUDING the endpoint path you want this worker to focus on (e.g. 'https://example.com/api/users/{id}', 'https://example.com/login'). Pass through whatever URL the orchestrator received as its own target — that is already the domain + endpoint path the console / caller wants tested. Do NOT strip the path back to a bare domain, and do NOT invent a different endpoint; you are not doing endpoint discovery. If a single objective genuinely needs a sibling path (e.g. recon revealed a related admin endpoint on the same host), only then deviate, and keep the full URL."),
+      target: exports_external.string().describe(`Full target URL INCLUDING the endpoint path you want this worker to focus on (e.g. 'https://example.com/api/users/{id}', 'https://example.com/login'). Use the orchestrator's assigned URL by default and never strip it to a bare domain. A recon-supported sibling endpoint is allowed when it belongs to the objective. ${targetScopeGuidance} Never invent a host or endpoint.`),
       objectives: exports_external.array(exports_external.string()).min(1).describe("Testing objectives for this worker. For per-objective fan-out, pass exactly one objective. For the final exploratory pass, pass a single composite objective describing chaining + exploration."),
       context: exports_external.string().optional().describe("Additional grounding context for the worker — e.g. summaries of what earlier workers found, suspicious endpoints to chain, or application-specific guidance. Treated as guidance, not as code to read."),
       toolCallDescription: exports_external.string().describe("Concise, human-readable description of what this spawn is doing (shown in the UI).")
@@ -118334,7 +118575,21 @@ Returns the worker's summary, objective results, and finding count — but NOT t
           message: "spawn_pentest_agent requires a model in the tool context."
         };
       }
-      const { TargetedPentestAgent } = await import("./agent-nhs1w5w0.js");
+      if (typeof target !== "string" || parseTargetUrl(target) === null) {
+        return {
+          success: false,
+          message: `spawn_pentest_agent rejected: "target" is not a valid full URL (received ${JSON.stringify(target)}). ` + `Pass a valid full URL authorized by the assigned target or structured System Scope — do NOT invent, default, or substitute a target.`
+        };
+      }
+      try {
+        assertUrlInScope(target, ctx);
+      } catch (error) {
+        if (error instanceof ScopeViolationError) {
+          return { success: false, message: error.message };
+        }
+        throw error;
+      }
+      const { TargetedPentestAgent } = await import("./agent-7q3c9cjt.js");
       const findingsRegistry = ctx.findingsRegistry ?? FindingsRegistry.fromDirectory(ctx.session.findingsPath, {
         model: ctx.model,
         authConfig: ctx.authConfig,
@@ -118365,12 +118620,15 @@ Returns the worker's summary, objective results, and finding count — but NOT t
         agent = new TargetedPentestAgent({
           target,
           grpc: workerInheritsGrpc(target, ctx.grpc, ctx.target) ? ctx.grpc : undefined,
+          systemScope: ctx.systemScope,
           objectives,
           context: enrichedContext,
           model: ctx.model,
           session: ctx.session,
           authConfig: ctx.authConfig,
           abortSignal: ctx.abortSignal,
+          onStepFinish: ctx.onStepFinish,
+          onCacheMetrics: ctx.onCacheMetrics,
           findingsRegistry,
           eventBus: childBus,
           subagentId,
@@ -118429,7 +118687,7 @@ function workerInheritsGrpc(target, grpc, orchestratorTarget) {
 function buildSharedBrowserSessionContext(existingContext) {
   const note = `## Shared Browser Session
 You are driving the orchestrator's live Playwright browser (NOT a private copy):
-- You are already authenticated for any origin the orchestrator authenticated for. Do NOT re-authenticate unless a request returns 401/403.
+- You inherit authentication only for origins where the orchestrator established it. Verify protected access on your assigned origin first. ${ORIGIN_AUTH_FAILURE_GUIDANCE}
 - Only one agent uses this browser at a time — the orchestrator is paused while you run — so you have exclusive control during your run.
 - Your navigations, \`browser_evaluate\` mutations, cookies, and \`localStorage\`/\`sessionStorage\` writes PERSIST in this browser and are visible to the orchestrator and to workers spawned after you. Leave the session in a reasonable state (avoid logging out or wedging the page) when you finish.`;
   if (!existingContext || existingContext.trim().length === 0) {
@@ -118468,7 +118726,7 @@ Pass every target you want tested — the swarm handles concurrency automaticall
       toolCallDescription: exports_external.string().describe("A concise, human-readable description of what this tool call is doing")
     }),
     execute: async ({ targets }) => {
-      const { runPentestSwarm, DEFAULT_CONCURRENCY: DEFAULT_CONCURRENCY2 } = await import("./pentest-xtc1sjdw.js");
+      const { runPentestSwarm, DEFAULT_CONCURRENCY: DEFAULT_CONCURRENCY2 } = await import("./pentest-dp9w88pw.js");
       if (!ctx.model) {
         return {
           success: false,
@@ -118490,6 +118748,8 @@ Pass every target you want tested — the swarm handles concurrency automaticall
         abortSignal: ctx.abortSignal,
         findingsRegistry,
         eventBus: ctx.eventBus,
+        onStepFinish: ctx.onStepFinish,
+        onCacheMetrics: ctx.onCacheMetrics,
         concurrency: DEFAULT_CONCURRENCY2,
         enableThinking: ctx.enableThinking,
         thinkingEffort: ctx.thinkingEffort,
@@ -119104,6 +119364,29 @@ async function handleSearchResponse(response) {
 // src/core/api/apiClient.ts
 init_auth();
 init_config();
+
+// src/core/api/clientIdentity.ts
+init_installation();
+var CLIENT_HEADERS = {
+  client: "X-Pensar-Client",
+  version: "X-Pensar-Client-Version",
+  command: "X-Pensar-Command"
+};
+var CLIENT_NAME = "cli";
+var currentCommand;
+function getCurrentCommand() {
+  return currentCommand;
+}
+function clientIdentityHeaders() {
+  const command = getCurrentCommand();
+  return {
+    [CLIENT_HEADERS.client]: CLIENT_NAME,
+    [CLIENT_HEADERS.version]: getCurrentVersion(),
+    ...command ? { [CLIENT_HEADERS.command]: command } : {}
+  };
+}
+
+// src/core/api/apiClient.ts
 init_constants();
 async function getAuthHeaders() {
   const cfg = await config.get();
@@ -119117,7 +119400,8 @@ async function getAuthHeaders() {
   }
   const headers = {
     "Content-Type": "application/json",
-    Authorization: `Bearer ${validToken.token}`
+    Authorization: `Bearer ${validToken.token}`,
+    ...clientIdentityHeaders()
   };
   if (cfg.workspaceId) {
     headers["X-Workspace-Id"] = cfg.workspaceId;
@@ -119151,6 +119435,12 @@ async function apiRequest(method, path, body) {
 }
 
 // src/core/api/apps.ts
+var ENDPOINT_TRANSPORTS = [
+  "http",
+  "grpc",
+  "grpc_web",
+  "connect"
+];
 async function listApps(opts) {
   const params = new URLSearchParams;
   if (opts?.limit !== undefined)
@@ -119263,7 +119553,7 @@ var ENDPOINT_TYPES = [
   "file-storage",
   "asset"
 ];
-var ENDPOINT_TRANSPORTS = [
+var ENDPOINT_TRANSPORTS2 = [
   "http",
   "grpc",
   "grpc_web",
@@ -119309,7 +119599,7 @@ var createWorkspaceEndpointInputSchema = exports_external.object({
   endpoint: exports_external.string().min(1).describe("Endpoint path, URL, or route"),
   description: exports_external.string().describe("Endpoint description"),
   type: exports_external.enum(ENDPOINT_TYPES).optional(),
-  transport: exports_external.enum(ENDPOINT_TRANSPORTS).nullish().transform((value) => value ?? undefined).optional().describe("Wire transport; defaults to http when omitted"),
+  transport: exports_external.enum(ENDPOINT_TRANSPORTS2).nullish().transform((value) => value ?? undefined).optional().describe("Wire transport; defaults to http when omitted"),
   location: exports_external.string().optional().describe("Source file path"),
   startLineNumber: exports_external.number().int().min(0).optional(),
   endLineNumber: exports_external.number().int().min(0).optional(),
@@ -119328,7 +119618,7 @@ var updateWorkspaceEndpointInputSchema = exports_external.object({
   endpoint: exports_external.string().min(1).nullish().transform((value) => value ?? undefined).optional(),
   description: exports_external.string().nullish().transform((value) => value ?? undefined).optional(),
   type: exports_external.enum(ENDPOINT_TYPES).nullable().optional(),
-  transport: exports_external.enum(ENDPOINT_TRANSPORTS).nullish().transform((value) => value ?? undefined).optional().describe("Corrected wire transport"),
+  transport: exports_external.enum(ENDPOINT_TRANSPORTS2).nullish().transform((value) => value ?? undefined).optional().describe("Corrected wire transport"),
   location: exports_external.string().nullable().optional(),
   startLineNumber: exports_external.number().int().min(0).nullable().optional(),
   endLineNumber: exports_external.number().int().min(0).nullable().optional(),
@@ -119456,10 +119746,6 @@ Use only when the user explicitly asks to change or repair an existing workspace
   });
 }
 
-// src/core/agents/offSecAgent/tools/workspaceDomains.ts
-init_dist();
-init_zod();
-
 // src/core/api/domains.ts
 async function listDomains() {
   return apiRequest("GET", "/domains");
@@ -119469,6 +119755,8 @@ async function createDomain(data) {
 }
 
 // src/core/agents/offSecAgent/tools/workspaceDomains.ts
+init_dist();
+init_zod();
 var toolCallDescription2 = exports_external.string().describe("A concise description of the workspace operation");
 var listWorkspaceDomainsInputSchema = exports_external.object({
   toolCallDescription: toolCallDescription2
@@ -124352,6 +124640,7 @@ function createAllTools(ctx) {
     email_list_messages: emailListMessages(ctx),
     email_search_messages: emailSearchMessages(ctx),
     email_get_message: emailGetMessage(ctx),
+    sms_list_messages: smsListMessages(ctx),
     web_search: webSearch(ctx),
     get_page: getPage(ctx),
     ...ctx.skillsRegistry ? { read_skill: readSkill(ctx) } : {},
@@ -124439,6 +124728,7 @@ var ALL_TOOL_NAMES = [
   "email_get_attachments",
   "email_mark_read",
   "send_email",
+  "sms_list_messages",
   "web_search",
   "get_page",
   "checkpoint_state",
@@ -124510,6 +124800,7 @@ var PLAN_MODE_TOOL_NAMES = [
   "email_get_message",
   "email_search_messages",
   "email_get_attachments",
+  "sms_list_messages",
   "web_search",
   "get_page",
   "write_plan",
@@ -124521,6 +124812,7 @@ var PLAN_MODE_TOOL_NAMES = [
 var SKILL_TOOL_NAMES = ["read_skill"];
 
 // src/core/agents/offSecAgent/trace.ts
+init_observability();
 import { createHash as createHash2 } from "node:crypto";
 import { appendFileSync as appendFileSync3, mkdirSync as mkdirSync13 } from "node:fs";
 import { dirname as dirname8 } from "node:path";
@@ -124707,13 +124999,15 @@ class StepTraceWriter {
     this.appendRecord(record3);
   }
   appendRecord(record3) {
+    const correlation = getActiveTraceCorrelation();
+    const enriched = correlation ? { ...record3, correlation } : record3;
     try {
-      appendFileSync3(this.tracePath, `${JSON.stringify(record3)}
+      appendFileSync3(this.tracePath, `${JSON.stringify(enriched)}
 `);
     } catch {}
     try {
       this.eventBus?.emit("trace-record", {
-        record: record3,
+        record: enriched,
         subagentId: this.agentId ?? undefined
       });
     } catch {}
@@ -124723,8 +125017,8 @@ class StepTraceWriter {
 // src/core/agents/offSecAgent/offensiveSecurityAgent.ts
 init_dist();
 init_ai();
-import { existsSync as existsSync18, mkdirSync as mkdirSync14, readFileSync as readFileSync8 } from "node:fs";
-import { writeFile as writeFile7 } from "node:fs/promises";
+var import_api2 = __toESM(require_src(), 1);
+import { existsSync as existsSync19, mkdirSync as mkdirSync14 } from "node:fs";
 import { join as join27 } from "node:path";
 init_id();
 init_structured();
@@ -125006,9 +125300,464 @@ var OperatorSettingsObject = exports_external.object({
 // src/core/agents/offSecAgent/offensiveSecurityAgent.ts
 init_session();
 init_lazyLogger();
-var log13 = scopedLogger(() => createLogger("approval-gate"));
+
+// src/core/agents/offSecAgent/interruptedStepFinalization.ts
+import { existsSync as existsSync18, readFileSync as readFileSync8 } from "node:fs";
+
+// src/core/agents/offSecAgent/interruptedStepMessages.ts
+function buildSyntheticToolResults(input) {
+  const output = {
+    type: "error-text",
+    value: `Tool execution aborted: ${input.reason}`
+  };
+  const parts = [];
+  for (const [toolCallId, toolName] of input.inFlightTools) {
+    const result = toolName === input.responseToolName && input.responseSubmitted ? { type: "text", value: "Response submitted." } : output;
+    parts.push({
+      type: "tool-result",
+      toolCallId,
+      toolName,
+      output: result
+    });
+  }
+  return parts;
+}
+function baseContainsToolCalls(msg, toolCallIds) {
+  if (!Array.isArray(msg.content))
+    return false;
+  const contentToolIds = new Set(msg.content.filter((p) => p.type === "tool-call" && p.toolCallId).map((p) => p.toolCallId));
+  return [...toolCallIds].every((id) => contentToolIds.has(id));
+}
+function buildInterruptedStepMessages(input) {
+  const { base, inFlightTools, completedResults, syntheticParts } = input;
+  const allToolCallIds = new Set([
+    ...inFlightTools.keys(),
+    ...completedResults.map((r) => r.toolCallId)
+  ]);
+  const lastMsg = base[base.length - 1];
+  const needsStepReconstruction = !lastMsg || lastMsg.role !== "assistant" || !baseContainsToolCalls(lastMsg, allToolCallIds);
+  const appended = [];
+  if (needsStepReconstruction) {
+    const stepTools = [
+      ...inFlightTools,
+      ...completedResults.map((r) => [
+        r.toolCallId,
+        r.toolName
+      ])
+    ];
+    const reconstructInput = (toolCallId) => {
+      const raw = input.streamedArgText?.get(toolCallId);
+      if (!raw)
+        return {};
+      try {
+        return JSON.parse(raw);
+      } catch {
+        return { _partial: raw };
+      }
+    };
+    appended.push({
+      role: "assistant",
+      content: stepTools.map(([toolCallId, toolName]) => ({
+        type: "tool-call",
+        toolCallId,
+        toolName,
+        input: reconstructInput(toolCallId)
+      }))
+    });
+  }
+  appended.push({
+    role: "tool",
+    content: [...completedResults, ...syntheticParts]
+  });
+  return { appended, needsStepReconstruction };
+}
+
+// src/core/agents/offSecAgent/interruptedStepFinalization.ts
+function createInterruptedStepFinalizer(deps) {
+  const debug = deps.debugLog;
+  const readBaseFromDisk = deps.readBaseFromDisk ?? (() => {
+    const path = deps.writer.messagesPath;
+    if (!path || !existsSync18(path))
+      return null;
+    try {
+      return JSON.parse(readFileSync8(path, "utf-8"));
+    } catch {
+      return null;
+    }
+  });
+  return async (input) => {
+    const { snapshot, reason } = input;
+    const { inFlightTools, completedResults, streamedArgText } = snapshot;
+    const syntheticParts = buildSyntheticToolResults({
+      inFlightTools,
+      reason,
+      responseToolName: deps.responseToolName,
+      responseSubmitted: deps.responseToolFired()
+    });
+    let emissionError;
+    let hasEmissionError = false;
+    if (debug) {
+      const responseInFlight = [...inFlightTools.entries()].filter(([, n7]) => n7 === deps.responseToolName);
+      if (responseInFlight.length > 0) {
+        debug(`[response-debug] emitSyntheticToolResults closing ${responseInFlight.length} response call(s) ` + `ids=${responseInFlight.map(([id]) => id).join(",")} reason="${reason}" ` + `responseToolFired=${deps.responseToolFired()}`);
+      }
+    }
+    for (const part of syntheticParts) {
+      try {
+        deps.eventBus.emit("tool-result", {
+          toolCallId: part.toolCallId,
+          toolName: part.toolName,
+          result: part.output,
+          sessionId: deps.sessionId,
+          subagentId: deps.subagentId,
+          partId: input.partIdFor?.(part.toolCallId),
+          messageId: input.messageId
+        });
+      } catch (error) {
+        if (!hasEmissionError) {
+          emissionError = error;
+          hasEmissionError = true;
+        }
+      }
+    }
+    if (!deps.writer.messagesPath) {
+      if (hasEmissionError)
+        throw emissionError;
+      return;
+    }
+    deps.writer.cancelTimer();
+    await deps.writer.waitForPendingWrites();
+    let base = deps.writer.latest ?? [];
+    if (base.length === 0) {
+      base = readBaseFromDisk() ?? [];
+    }
+    const { appended, needsStepReconstruction } = buildInterruptedStepMessages({
+      base,
+      inFlightTools,
+      completedResults,
+      syntheticParts,
+      streamedArgText
+    });
+    if (needsStepReconstruction && debug) {
+      const responseReconstructed = [
+        ...inFlightTools,
+        ...completedResults.map((r) => [r.toolCallId, r.toolName])
+      ].filter(([, n7]) => n7 === deps.responseToolName).map(([id]) => id);
+      if (responseReconstructed.length > 0) {
+        debug(`[response-debug] step-reconstruction for response call(s) ` + `ids=${responseReconstructed.join(",")} ` + `preservedArgChars=${responseReconstructed.map((id) => streamedArgText?.get(id)?.length ?? 0).join(",")}`);
+      }
+    }
+    const next = [...base, ...appended];
+    deps.writer.setLatest(next);
+    try {
+      await deps.writer.enqueueWrite(next);
+      deps.writer.markSyntheticsPersisted();
+    } catch {}
+    if (hasEmissionError)
+      throw emissionError;
+  };
+}
+
+// src/core/agents/offSecAgent/messagePersistence.ts
+import { writeFile as writeFile7 } from "node:fs/promises";
+var PERSIST_INTERVAL_MS = 15000;
+
+class AgentMessageWriter {
+  intervalMs;
+  writeImpl;
+  path;
+  pending = null;
+  tail = Promise.resolve();
+  persistTimer = null;
+  syntheticsWritten = false;
+  constructor(options) {
+    this.path = options.messagesPath;
+    this.intervalMs = options.intervalMs ?? PERSIST_INTERVAL_MS;
+    this.writeImpl = options.writeImpl ?? ((p, contents) => writeFile7(p, contents));
+  }
+  get messagesPath() {
+    return this.path;
+  }
+  get latest() {
+    return this.pending;
+  }
+  setLatest(messages) {
+    this.pending = messages;
+  }
+  get syntheticsPersisted() {
+    return this.syntheticsWritten;
+  }
+  markSyntheticsPersisted() {
+    this.syntheticsWritten = true;
+  }
+  schedulePersist() {
+    if (this.persistTimer)
+      return;
+    this.persistTimer = setTimeout(() => {
+      this.persistTimer = null;
+      const toWrite = this.pending;
+      if (!toWrite)
+        return;
+      this.enqueueWrite(toWrite).then(() => {
+        if (this.pending === toWrite)
+          this.pending = null;
+      }).catch(() => {});
+    }, this.intervalMs);
+  }
+  cancelTimer() {
+    if (this.persistTimer) {
+      clearTimeout(this.persistTimer);
+      this.persistTimer = null;
+    }
+  }
+  async enqueueWrite(messages) {
+    const path = this.path;
+    if (!path)
+      return;
+    const contents = JSON.stringify(messages);
+    const write2 = this.tail.then(() => this.writeImpl(path, contents));
+    this.tail = write2.catch(() => {});
+    await write2;
+  }
+  async waitForPendingWrites() {
+    let pending;
+    do {
+      pending = this.tail;
+      await pending;
+    } while (pending !== this.tail);
+  }
+}
+
+// src/core/agents/offSecAgent/streamDiagnostics.ts
+init_structured();
+init_lazyLogger();
+var STREAM_STALL_DEBUG = process.env.STREAM_STALL_DEBUG === "1" || process.env.STREAM_STALL_DEBUG === "true";
+var STREAM_STALL_TICK_MS = 15000;
+var STREAM_STALL_WARN_MS = 20000;
+var STREAM_GAP_RECOVERED_MS = 1e4;
 var RESPONSE_DEBUG = process.env.RESPONSE_DEBUG === "1" || process.env.RESPONSE_DEBUG === "true";
 var rlog = scopedLogger(() => createLogger("response-debug"));
+function responseArgBytes(input) {
+  if (input == null)
+    return 0;
+  if (typeof input === "string")
+    return input.length;
+  try {
+    return JSON.stringify(input).length;
+  } catch {
+    return -1;
+  }
+}
+
+class StreamDiagnostics {
+  opts;
+  stallEnabled;
+  responseDebugEnabled;
+  warn;
+  responseArgChars = new Map;
+  responseSawTerminal = new Map;
+  lastChunkAt = Date.now();
+  lastChunkType = "none";
+  stallStepIndex = -1;
+  stallTimer;
+  constructor(options) {
+    this.opts = options;
+    this.stallEnabled = options.stallEnabled ?? STREAM_STALL_DEBUG;
+    this.responseDebugEnabled = options.responseDebugEnabled ?? RESPONSE_DEBUG;
+    this.warn = options.warn ?? ((message) => rlog.warn(message));
+  }
+  start() {
+    if (!this.stallEnabled || this.stallTimer)
+      return;
+    const label = this.opts.sessionId;
+    const sid = this.opts.subagentId;
+    this.stallTimer = setInterval(() => {
+      const gap = Date.now() - this.lastChunkAt;
+      if (gap > STREAM_STALL_WARN_MS) {
+        this.warn(`[stream-stall] no chunk for ${Math.round(gap / 1000)}s ` + `session=${label} subagent=${sid ?? "-"} step=${this.stallStepIndex} ` + `lastChunkType=${this.lastChunkType} ` + `inFlightTools=${[...this.opts.inFlightTools().values()].join(",")} ` + `responseToolFired=${this.opts.responseToolFired()}`);
+      }
+    }, STREAM_STALL_TICK_MS);
+  }
+  observeChunk(chunk) {
+    if (this.stallEnabled) {
+      const now = Date.now();
+      const gap = now - this.lastChunkAt;
+      this.lastChunkAt = now;
+      this.lastChunkType = chunk.type;
+      if (chunk.type === "start-step")
+        this.stallStepIndex++;
+      if (gap > STREAM_GAP_RECOVERED_MS) {
+        this.warn(`[stream-gap] recovered after ${Math.round(gap / 1000)}s ` + `session=${this.opts.sessionId} chunkType=${chunk.type}`);
+      }
+    }
+    if (this.responseDebugEnabled) {
+      this.traceResponseTool(chunk);
+    }
+  }
+  logSurfacedToolError(info) {
+    if (!this.responseDebugEnabled)
+      return;
+    if (info.toolName !== this.opts.responseToolName)
+      return;
+    this.warn(`[response-debug] tool-error SURFACED id=${info.toolCallId} ` + `streamedArgChars=${info.streamedArgChars} ` + `finishReason=${info.finishReason ?? "unknown"} ` + `outputTokenTruncated=${info.truncated} error=${info.message.slice(0, 300)}`);
+  }
+  logClosingInFlightTool(info) {
+    if (!this.responseDebugEnabled)
+      return;
+    if (info.toolName !== this.opts.responseToolName)
+      return;
+    this.warn(`[response-debug] CLOSING response as "did not complete" id=${info.toolCallId} ` + `streamedArgChars=${this.responseArgChars.get(info.toolCallId) ?? 0} ` + `sawTerminalChunk=${this.responseSawTerminal.get(info.toolCallId) ?? "none"} ` + `finishReason=${info.finishReason ?? "unknown"} outputTokenTruncated=${info.truncated} ` + `responseToolFired=${this.opts.responseToolFired()}`);
+  }
+  stop() {
+    if (this.stallTimer)
+      clearInterval(this.stallTimer);
+    this.stallTimer = undefined;
+  }
+  traceResponseTool(chunk) {
+    const idForChunk = chunk.toolCallId ?? chunk.id;
+    const nameForChunk = chunk.toolName ?? (idForChunk ? this.opts.inFlightTools().get(idForChunk) : undefined);
+    if (nameForChunk !== this.opts.responseToolName || !idForChunk) {
+      if (chunk.type === "finish-step") {
+        const responseInFlight = [...this.opts.inFlightTools().entries()].filter(([, n7]) => n7 === this.opts.responseToolName).map(([id]) => id).join(",");
+        if (responseInFlight) {
+          this.warn(`[response-debug] finish-step finishReason=${chunk.finishReason} ` + `responseInFlight=${responseInFlight} ` + `responseToolFired=${this.opts.responseToolFired()}`);
+        }
+      }
+      return;
+    }
+    switch (chunk.type) {
+      case "tool-input-start":
+        this.responseArgChars.set(idForChunk, 0);
+        this.warn(`[response-debug] tool-input-start id=${idForChunk} session=${this.opts.subagentId ?? this.opts.sessionId}`);
+        break;
+      case "tool-input-delta":
+        this.responseArgChars.set(idForChunk, (this.responseArgChars.get(idForChunk) ?? 0) + (chunk.delta?.length ?? 0));
+        break;
+      case "tool-input-end":
+        this.warn(`[response-debug] tool-input-end id=${idForChunk} argChars=${this.responseArgChars.get(idForChunk) ?? 0}`);
+        break;
+      case "tool-call": {
+        this.responseSawTerminal.set(idForChunk, "tool-call");
+        const inputBytes = responseArgBytes(chunk.input ?? chunk.args);
+        this.warn(`[response-debug] tool-call id=${idForChunk} streamedArgChars=${this.responseArgChars.get(idForChunk) ?? 0} parsedInputBytes=${inputBytes} invalid=${chunk.invalid === true}`);
+        break;
+      }
+      case "tool-error": {
+        this.responseSawTerminal.set(idForChunk, "tool-error");
+        const errMsg = chunk.error instanceof Error ? chunk.error.message : typeof chunk.error === "string" ? chunk.error : JSON.stringify(chunk.error)?.slice(0, 300);
+        this.warn(`[response-debug] tool-error id=${idForChunk} streamedArgChars=${this.responseArgChars.get(idForChunk) ?? 0} stillInFlight=${this.opts.inFlightTools().has(idForChunk)} error=${errMsg}`);
+        break;
+      }
+      case "tool-result":
+        this.responseSawTerminal.set(idForChunk, "tool-result");
+        this.warn(`[response-debug] tool-result id=${idForChunk} streamedArgChars=${this.responseArgChars.get(idForChunk) ?? 0}`);
+        break;
+    }
+  }
+}
+
+// src/core/agents/offSecAgent/toolLifecycle.ts
+class ToolLifecycleTracker {
+  inFlight = new Map;
+  completed = [];
+  streamedArgs = new Map;
+  errors = new Map;
+  observePart(chunk) {
+    switch (chunk.type) {
+      case "tool-input-start":
+        this.inFlight.set(chunk.id, chunk.toolName);
+        this.streamedArgs.set(chunk.id, "");
+        break;
+      case "tool-input-delta":
+        this.streamedArgs.set(chunk.id, (this.streamedArgs.get(chunk.id) ?? "") + (chunk.delta ?? ""));
+        break;
+      case "tool-call":
+        this.inFlight.set(chunk.toolCallId, chunk.toolName);
+        break;
+      case "tool-error": {
+        const toolCallId = chunk.toolCallId;
+        this.inFlight.delete(toolCallId);
+        const errMsg = chunk.error instanceof Error ? chunk.error.message : typeof chunk.error === "string" ? chunk.error : (() => {
+          try {
+            return JSON.stringify(chunk.error);
+          } catch {
+            return String(chunk.error);
+          }
+        })();
+        const partialArgs = chunk.input !== undefined && chunk.input !== null && responseArgBytes(chunk.input) > 2 ? chunk.input : this.streamedArgs.get(toolCallId) ?? "";
+        this.errors.set(toolCallId, {
+          message: errMsg,
+          input: partialArgs,
+          toolName: chunk.toolName
+        });
+        break;
+      }
+      case "tool-result":
+        this.inFlight.delete(chunk.toolCallId);
+        this.completed.push({
+          type: "tool-result",
+          toolCallId: chunk.toolCallId,
+          toolName: chunk.toolName,
+          output: chunk.result ?? chunk.output
+        });
+        break;
+    }
+  }
+  onStepPersisted() {
+    this.completed.length = 0;
+  }
+  flushToolErrorsToResults() {
+    const flushed = [];
+    for (const [toolCallId, info] of this.errors) {
+      this.completed.push({
+        type: "tool-result",
+        toolCallId,
+        toolName: info.toolName,
+        output: {
+          type: "error-text",
+          value: `Tool call failed: ${info.message}`
+        }
+      });
+      flushed.push([toolCallId, info]);
+    }
+    this.errors.clear();
+    return flushed;
+  }
+  clearToolErrors() {
+    this.errors.clear();
+  }
+  clearInFlight() {
+    this.inFlight.clear();
+  }
+  hasUnpersistedState() {
+    return this.inFlight.size > 0 || this.completed.length > 0;
+  }
+  get inFlightTools() {
+    return this.inFlight;
+  }
+  get toolErrors() {
+    return this.errors;
+  }
+  get completedResults() {
+    return this.completed;
+  }
+  get streamedArgText() {
+    return this.streamedArgs;
+  }
+  snapshot() {
+    return {
+      inFlightTools: new Map(this.inFlight),
+      completedResults: this.completed.map((r) => ({ ...r })),
+      streamedArgText: new Map(this.streamedArgs),
+      toolErrors: new Map(this.errors)
+    };
+  }
+}
+
+// src/core/agents/offSecAgent/offensiveSecurityAgent.ts
+var log13 = scopedLogger(() => createLogger("approval-gate"));
+var RESPONSE_DEBUG2 = process.env.RESPONSE_DEBUG === "1" || process.env.RESPONSE_DEBUG === "true";
+var rlog2 = scopedLogger(() => createLogger("response-debug"));
 var WORKSPACE_TOOL_NAME_SET = new Set(WORKSPACE_TOOL_NAMES);
 var WORKSPACE_WRITE_TOOL_NAME_SET = new Set(WORKSPACE_WRITE_TOOL_NAMES);
 var WORKSPACE_TARGET_RE = /\b(?:console|workspace)\b/i;
@@ -125058,21 +125807,6 @@ function filterWorkspaceToolsForRun(activeTools, prompt, hasInteractiveApprovalG
     return true;
   });
 }
-var STREAM_STALL_DEBUG = process.env.STREAM_STALL_DEBUG === "1" || process.env.STREAM_STALL_DEBUG === "true";
-var STREAM_STALL_TICK_MS = 15000;
-var STREAM_STALL_WARN_MS = 20000;
-var STREAM_GAP_RECOVERED_MS = 1e4;
-function responseArgBytes(input) {
-  if (input == null)
-    return 0;
-  if (typeof input === "string")
-    return input.length;
-  try {
-    return JSON.stringify(input).length;
-  } catch {
-    return -1;
-  }
-}
 
 class OffensiveSecurityAgent {
   _streamResult = null;
@@ -125091,18 +125825,19 @@ class OffensiveSecurityAgent {
   drained = Promise.resolve();
   subagentId;
   subagentName;
+  agentMode;
   currentMessageId = null;
   persistentShell;
   browserSession;
   ownsBrowserSession;
   browserDisconnected = false;
+  shellDisposed = false;
   abortSignal;
   userPrompt;
   _session;
-  latestMessages = null;
+  writer;
+  finalizeInterruptedStep;
   messagesPath = null;
-  cancelPersistTimer = null;
-  syntheticsPersisted = false;
   static async create(input) {
     let session = input.session;
     if (!session) {
@@ -125127,6 +125862,7 @@ class OffensiveSecurityAgent {
     this._session = input.session;
     this.subagentId = input.subagentId;
     this.subagentName = input.subagentName;
+    this.agentMode = input.mode ?? "default";
     this.abortSignal = input.abortSignal;
     this.userPrompt = input.prompt;
     this.eventBus = input.eventBus ?? new AgentEventBus;
@@ -125175,10 +125911,13 @@ class OffensiveSecurityAgent {
       agentCwd,
       target: input.target,
       grpc: input.grpc,
+      systemScope: input.systemScope,
       abortSignal: input.abortSignal,
       model: input.model,
       authConfig: input.authConfig,
       eventBus: this.eventBus,
+      onStepFinish: input.forwardUsageCallbacksToSpawnedAgents ? input.onStepFinish : undefined,
+      onCacheMetrics: input.forwardUsageCallbacksToSpawnedAgents ? input.onCacheMetrics : undefined,
       sandbox: input.sandbox,
       findingsRegistry: input.findingsRegistry,
       attackSurfaceRegistry: input.attackSurfaceRegistry,
@@ -125210,8 +125949,8 @@ class OffensiveSecurityAgent {
         ...tools,
         [RESPONSE_TOOL_NAME]: createResponseTool(input.responseSchema, (result) => {
           this._responseToolFired = true;
-          if (RESPONSE_DEBUG) {
-            rlog.warn(`[response-debug] response tool EXECUTED (captured) session=${this.busSessionId} ` + `resultBytes=${responseArgBytes(result)} — happy path`);
+          if (RESPONSE_DEBUG2) {
+            rlog2.warn(`[response-debug] response tool EXECUTED (captured) session=${this.busSessionId} ` + `resultBytes=${responseArgBytes(result)} — happy path`);
           }
           const customResolve = input.resolveResult;
           if (customResolve) {
@@ -125259,7 +125998,11 @@ class OffensiveSecurityAgent {
     const hasEmail = (input.session.config?.emailIntegration?.inboxes?.length ?? 0) > 0;
     const hasSmtp = !!input.session.config?.smtpConfig;
     const emailToolSet = new Set(EMAIL_TOOL_NAMES);
+    const smsToolSet = new Set(SMS_TOOL_NAMES);
+    const hasSms = sessionHasSmsPasswordless(input.session);
     let activeTools = input.activeTools.filter((t) => {
+      if (smsToolSet.has(t))
+        return hasSms;
       if (!emailToolSet.has(t))
         return true;
       if (t === SEND_EMAIL_TOOL_NAME)
@@ -125274,6 +126017,8 @@ class OffensiveSecurityAgent {
       activeTools = Object.keys(tools).filter((t) => {
         if (excluded.has(t))
           return false;
+        if (smsToolSet.has(t))
+          return hasSms;
         if (!emailToolSet.has(t))
           return true;
         if (t === SEND_EMAIL_TOOL_NAME)
@@ -125282,11 +126027,10 @@ class OffensiveSecurityAgent {
       });
     }
     activeTools = filterWorkspaceToolsForRun(activeTools, input.prompt, input.approvalGate !== undefined);
-    if (!existsSync18(messagesDir)) {
+    if (!existsSync19(messagesDir)) {
       mkdirSync14(messagesDir, { recursive: true });
     }
     this.messagesPath = join27(messagesDir, "messages.json");
-    const messagesPath = this.messagesPath;
     const initialMessagesRef = {
       current: input.messages ? [...input.messages] : [
         {
@@ -125295,26 +126039,17 @@ class OffensiveSecurityAgent {
         }
       ]
     };
-    const PERSIST_INTERVAL_MS = 15000;
-    let persistTimer = null;
-    const schedulePersist = () => {
-      if (persistTimer)
-        return;
-      persistTimer = setTimeout(() => {
-        persistTimer = null;
-        if (this.latestMessages) {
-          const toWrite = this.latestMessages;
-          this.latestMessages = null;
-          writeFile7(messagesPath, JSON.stringify(toWrite)).catch(() => {});
-        }
-      }, PERSIST_INTERVAL_MS);
-    };
-    this.cancelPersistTimer = () => {
-      if (persistTimer) {
-        clearTimeout(persistTimer);
-        persistTimer = null;
-      }
-    };
+    this.writer = new AgentMessageWriter({ messagesPath: this.messagesPath });
+    this.finalizeInterruptedStep = createInterruptedStepFinalizer({
+      eventBus: this.eventBus,
+      sessionId: this.busSessionId,
+      subagentId: this.subagentId,
+      writer: this.writer,
+      responseToolName: RESPONSE_TOOL_NAME,
+      responseToolFired: () => this._responseToolFired,
+      ...RESPONSE_DEBUG2 ? { debugLog: (message) => rlog2.warn(message) } : {}
+    });
+    const schedulePersist = () => this.writer.schedulePersist();
     const baseSystemPrompt = input.system ?? detectOSAndEnhancePrompt(buildBaseSystemPrompt({
       sandboxMode: agentCwd === input.session.rootPath
     }));
@@ -125339,10 +126074,10 @@ class OffensiveSecurityAgent {
       sessionPath: messagesDir,
       sessionId: this.busSessionId,
       onStepFinish: async (event) => {
-        this.latestMessages = [
+        this.writer.setLatest([
           ...initialMessagesRef.current,
           ...event.response.messages
-        ];
+        ]);
         schedulePersist();
         traceWriter.recordStep(event.response.messages, {
           inputTokens: event.usage.inputTokens ?? 0,
@@ -125364,16 +126099,14 @@ class OffensiveSecurityAgent {
         traceWriter.markSummarized();
       },
       onFinish: async (event) => {
-        if (persistTimer) {
-          clearTimeout(persistTimer);
-          persistTimer = null;
-        }
-        if (!this.syntheticsPersisted) {
-          const finalMessages = this.latestMessages ?? [
+        this.writer.cancelTimer();
+        if (!this.writer.syntheticsPersisted) {
+          const finalMessages = this.writer.latest ?? [
             ...initialMessagesRef.current,
             ...event.response.messages
           ];
-          await writeFile7(messagesPath, JSON.stringify(finalMessages)).catch(() => {});
+          this.writer.setLatest(finalMessages);
+          await this.writer.enqueueWrite(finalMessages).catch(() => {});
         }
         await input.onFinish?.(event);
       },
@@ -125425,205 +126158,34 @@ class OffensiveSecurityAgent {
           return p;
         }
       };
-      const inFlightTools = new Map;
-      const completedResults = [];
+      const tracker = new ToolLifecycleTracker;
       let streamError = null;
-      const responseArgChars = new Map;
-      const responseSawTerminal = new Map;
-      const streamedArgText = new Map;
-      const toolErrors = new Map;
-      let lastChunkAt = Date.now();
-      let lastChunkType = "none";
-      let stallStepIndex = -1;
-      let stallTimer;
-      if (STREAM_STALL_DEBUG) {
-        const label = this._session.id;
-        stallTimer = setInterval(() => {
-          const gap = Date.now() - lastChunkAt;
-          if (gap > STREAM_STALL_WARN_MS) {
-            rlog.warn(`[stream-stall] no chunk for ${Math.round(gap / 1000)}s ` + `session=${label} subagent=${sid ?? "-"} step=${stallStepIndex} ` + `lastChunkType=${lastChunkType} ` + `inFlightTools=${[...inFlightTools.values()].join(",")} ` + `responseToolFired=${this._responseToolFired}`);
-          }
-        }, STREAM_STALL_TICK_MS);
-      }
+      const diagnostics = new StreamDiagnostics({
+        sessionId: this._session.id,
+        subagentId: sid,
+        inFlightTools: () => tracker.inFlightTools,
+        responseToolFired: () => this._responseToolFired,
+        responseToolName: RESPONSE_TOOL_NAME
+      });
+      diagnostics.start();
       try {
         for await (const chunk of this.streamResult.fullStream) {
-          if (STREAM_STALL_DEBUG) {
-            const now = Date.now();
-            const gap = now - lastChunkAt;
-            lastChunkAt = now;
-            lastChunkType = chunk.type;
-            if (chunk.type === "start-step")
-              stallStepIndex++;
-            if (gap > STREAM_GAP_RECOVERED_MS) {
-              rlog.warn(`[stream-gap] recovered after ${Math.round(gap / 1000)}s ` + `session=${this._session.id} chunkType=${chunk.type}`);
-            }
-          }
-          if (RESPONSE_DEBUG) {
-            const c = chunk;
-            const idForChunk = c.toolCallId ?? c.id;
-            const nameForChunk = c.toolName ?? (idForChunk ? inFlightTools.get(idForChunk) : undefined);
-            if (nameForChunk === RESPONSE_TOOL_NAME && idForChunk) {
-              if (chunk.type === "tool-input-start") {
-                responseArgChars.set(idForChunk, 0);
-                rlog.warn(`[response-debug] tool-input-start id=${idForChunk} session=${this.busSessionId}`);
-              } else if (chunk.type === "tool-input-delta") {
-                responseArgChars.set(idForChunk, (responseArgChars.get(idForChunk) ?? 0) + (c.delta?.length ?? 0));
-              } else if (chunk.type === "tool-input-end") {
-                rlog.warn(`[response-debug] tool-input-end id=${idForChunk} argChars=${responseArgChars.get(idForChunk) ?? 0}`);
-              } else if (chunk.type === "tool-call") {
-                responseSawTerminal.set(idForChunk, "tool-call");
-                const inputBytes = responseArgBytes(c.input ?? c.args);
-                const invalid = c.invalid === true;
-                rlog.warn(`[response-debug] tool-call id=${idForChunk} streamedArgChars=${responseArgChars.get(idForChunk) ?? 0} parsedInputBytes=${inputBytes} invalid=${invalid}`);
-              } else if (chunk.type === "tool-error") {
-                responseSawTerminal.set(idForChunk, "tool-error");
-                const errMsg = c.error instanceof Error ? c.error.message : typeof c.error === "string" ? c.error : JSON.stringify(c.error)?.slice(0, 300);
-                rlog.warn(`[response-debug] tool-error id=${idForChunk} streamedArgChars=${responseArgChars.get(idForChunk) ?? 0} stillInFlight=${inFlightTools.has(idForChunk)} error=${errMsg}`);
-              } else if (chunk.type === "tool-result") {
-                responseSawTerminal.set(idForChunk, "tool-result");
-                rlog.warn(`[response-debug] tool-result id=${idForChunk} streamedArgChars=${responseArgChars.get(idForChunk) ?? 0}`);
-              } else if (chunk.type === "finish-step") {
-                const fr = c.finishReason;
-                rlog.warn(`[response-debug] finish-step finishReason=${fr} responseInFlight=${[
-                  ...inFlightTools.entries()
-                ].filter(([, n7]) => n7 === RESPONSE_TOOL_NAME).map(([id]) => id).join(",")} responseToolFired=${this._responseToolFired}`);
-              }
-            }
-          }
-          switch (chunk.type) {
-            case "start-step":
-              ids.messageId = newMessageId();
-              this.currentMessageId = ids.messageId;
-              ids.textPartId = undefined;
-              break;
-            case "text-start":
-              ids.textPartId = newPartId();
-              break;
-            case "text-end":
-              ids.textPartId = undefined;
-              break;
-            case "tool-input-start":
-              inFlightTools.set(chunk.id, chunk.toolName);
-              streamedArgText.set(chunk.id, "");
-              break;
-            case "tool-input-delta": {
-              const d = chunk;
-              streamedArgText.set(d.id, (streamedArgText.get(d.id) ?? "") + (d.delta ?? ""));
-              break;
-            }
-            case "tool-call":
-              inFlightTools.set(chunk.toolCallId, chunk.toolName);
-              break;
-            case "tool-error": {
-              const te2 = chunk;
-              inFlightTools.delete(te2.toolCallId);
-              const errMsg = te2.error instanceof Error ? te2.error.message : typeof te2.error === "string" ? te2.error : (() => {
-                try {
-                  return JSON.stringify(te2.error);
-                } catch {
-                  return String(te2.error);
-                }
-              })();
-              const partialArgs = te2.input !== undefined && te2.input !== null && responseArgBytes(te2.input) > 2 ? te2.input : streamedArgText.get(te2.toolCallId) ?? "";
-              toolErrors.set(te2.toolCallId, {
-                message: errMsg,
-                input: partialArgs,
-                toolName: te2.toolName
-              });
-              break;
-            }
-            case "tool-result": {
-              const tc = chunk;
-              inFlightTools.delete(tc.toolCallId);
-              completedResults.push({
-                type: "tool-result",
-                toolCallId: tc.toolCallId,
-                toolName: tc.toolName,
-                output: tc.result ?? tc.output
-              });
-              break;
-            }
-            case "finish-step": {
-              completedResults.length = 0;
-              const finishReason = chunk.finishReason;
-              const truncated = finishReason === "length";
-              for (const [toolCallId, info] of toolErrors) {
-                if (RESPONSE_DEBUG && info.toolName === RESPONSE_TOOL_NAME) {
-                  rlog.warn(`[response-debug] tool-error SURFACED id=${toolCallId} ` + `streamedArgChars=${(streamedArgText.get(toolCallId) ?? "").length} ` + `finishReason=${finishReason ?? "unknown"} ` + `outputTokenTruncated=${truncated} error=${info.message.slice(0, 300)}`);
-                }
-                bus.emit("tool-result", {
-                  toolCallId,
-                  toolName: info.toolName,
-                  result: {
-                    type: "error-text",
-                    value: truncated ? `Tool call failed: the model's output was truncated at its max output tokens before the "${info.toolName}" arguments were complete. ${info.message}` : `Tool call failed: ${info.message}`
-                  },
-                  sessionId: this.busSessionId,
-                  subagentId: sid,
-                  partId: ids.toolPartId?.(toolCallId),
-                  messageId: ids.messageId
-                });
-              }
-              toolErrors.clear();
-              for (const [toolCallId, toolName] of inFlightTools) {
-                if (RESPONSE_DEBUG && toolName === RESPONSE_TOOL_NAME) {
-                  rlog.warn(`[response-debug] CLOSING response as "did not complete" id=${toolCallId} ` + `streamedArgChars=${responseArgChars.get(toolCallId) ?? 0} ` + `sawTerminalChunk=${responseSawTerminal.get(toolCallId) ?? "none"} ` + `finishReason=${finishReason ?? "unknown"} outputTokenTruncated=${truncated} ` + `responseToolFired=${this._responseToolFired}`);
-                }
-                const result2 = toolName === RESPONSE_TOOL_NAME && this._responseToolFired ? { type: "text", value: "Response submitted." } : {
-                  type: "error-text",
-                  value: truncated ? "Tool call did not complete: the model's output was truncated at its max output tokens before the arguments were finalized." : "Tool call did not complete"
-                };
-                bus.emit("tool-result", {
-                  toolCallId,
-                  toolName,
-                  result: result2,
-                  sessionId: this.busSessionId,
-                  subagentId: sid,
-                  partId: ids.toolPartId?.(toolCallId),
-                  messageId: ids.messageId
-                });
-              }
-              inFlightTools.clear();
-              break;
-            }
-          }
+          diagnostics.observeChunk(chunk);
+          this.applyStreamPart(chunk, { ids, tracker, diagnostics });
           bus.emitStreamPart(chunk, ids);
         }
       } catch (err) {
         streamError = err;
       } finally {
-        if (stallTimer)
-          clearInterval(stallTimer);
-        this.persistentShell?.dispose();
-        for (const [toolCallId, info] of toolErrors) {
-          const result2 = {
-            type: "error-text",
-            value: `Tool call failed: ${info.message}`
-          };
-          bus.emit("tool-result", {
-            toolCallId,
-            toolName: info.toolName,
-            result: result2,
-            sessionId: this.busSessionId,
-            subagentId: sid,
-            partId: ids.toolPartId?.(toolCallId),
-            messageId: ids.messageId
-          });
-          completedResults.push({
-            type: "tool-result",
-            toolCallId,
-            toolName: info.toolName,
-            output: result2
-          });
-        }
-        toolErrors.clear();
-        if (inFlightTools.size > 0 || completedResults.length > 0) {
-          const reason = this.abortSignal?.aborted ? "Agent aborted by user" : streamError instanceof Error && streamError.message ? streamError.message : "Stream terminated unexpectedly";
-          try {
-            await this.emitSyntheticToolResults(inFlightTools, completedResults, reason, ids.toolPartId, ids.messageId, streamedArgText);
-          } catch {}
+        const finalizeError = await this.finalizeRun({
+          tracker,
+          diagnostics,
+          ids,
+          streamError
+        });
+        if (streamError === null && finalizeError !== null) {
+          streamError = finalizeError;
         }
-        await this.disconnectOwnedBrowser();
       }
       if (streamError) {
         throw streamError;
@@ -125639,22 +126201,32 @@ class OffensiveSecurityAgent {
       }
       return;
     };
-    const spanLabel = this.subagentName ?? sid;
-    const drain = !sid ? runConsume() : withSubagentSessionBaggage(sid, () => getApexTracer().startActiveSpan(`invoke_agent ${spanLabel}`, {
-      attributes: {
-        "gen_ai.operation.name": "invoke_agent",
-        "gen_ai.agent.name": spanLabel
+    const isSubagent = Boolean(sid);
+    const spanLabel = isSubagent ? this.subagentName ?? sid ?? "subagent" : this.agentMode;
+    const runId = isSubagent ? undefined : newRunId();
+    const runSpanAttributes = {
+      "gen_ai.operation.name": "invoke_agent",
+      "gen_ai.agent.name": spanLabel,
+      "gen_ai.conversation.id": this.busSessionId,
+      "pensar.session.id": this.busSessionId,
+      ...isSubagent ? {} : {
+        "pensar.run.id": runId,
+        "pensar.agent.mode": this.agentMode
       }
-    }, async (span) => {
+    };
+    const runInSpan = () => getApexTracer().startActiveSpan(`invoke_agent ${spanLabel}`, { attributes: runSpanAttributes }, async (span) => {
       try {
         return await runConsume();
       } catch (err) {
         span.recordException(err);
+        span.setStatus({ code: import_api2.SpanStatusCode.ERROR });
+        span.setAttribute("error.type", err instanceof Error ? err.name : "Error");
         throw err;
       } finally {
         span.end();
       }
-    }));
+    });
+    const drain = !isSubagent ? runInSpan() : withSubagentSessionBaggage(sid, runInSpan);
     let rejectDrain;
     this._drainRejection = new Promise((_2, reject) => {
       rejectDrain = reject;
@@ -125678,6 +126250,141 @@ class OffensiveSecurityAgent {
     await this.disconnectOwnedBrowser();
     return result;
   }
+  applyStreamPart(chunk, ctx) {
+    const { ids, tracker, diagnostics } = ctx;
+    const sid = this.subagentId;
+    const bus = this.eventBus;
+    switch (chunk.type) {
+      case "start-step":
+        ids.messageId = newMessageId();
+        this.currentMessageId = ids.messageId;
+        ids.textPartId = undefined;
+        break;
+      case "text-start":
+        ids.textPartId = newPartId();
+        break;
+      case "text-end":
+        ids.textPartId = undefined;
+        break;
+      case "finish-step": {
+        tracker.onStepPersisted();
+        const finishReason = chunk.finishReason;
+        const truncated = finishReason === "length";
+        for (const [toolCallId, info] of tracker.toolErrors) {
+          diagnostics.logSurfacedToolError({
+            toolCallId,
+            toolName: info.toolName,
+            message: info.message,
+            streamedArgChars: (tracker.streamedArgText.get(toolCallId) ?? "").length,
+            finishReason,
+            truncated
+          });
+          bus.emit("tool-result", {
+            toolCallId,
+            toolName: info.toolName,
+            result: {
+              type: "error-text",
+              value: truncated ? `Tool call failed: the model's output was truncated at its max output tokens before the "${info.toolName}" arguments were complete. ${info.message}` : `Tool call failed: ${info.message}`
+            },
+            sessionId: this.busSessionId,
+            subagentId: sid,
+            partId: ids.toolPartId?.(toolCallId),
+            messageId: ids.messageId
+          });
+        }
+        tracker.clearToolErrors();
+        for (const [toolCallId, toolName] of tracker.inFlightTools) {
+          diagnostics.logClosingInFlightTool({
+            toolCallId,
+            toolName,
+            finishReason,
+            truncated
+          });
+          const result = toolName === RESPONSE_TOOL_NAME && this._responseToolFired ? { type: "text", value: "Response submitted." } : {
+            type: "error-text",
+            value: truncated ? "Tool call did not complete: the model's output was truncated at its max output tokens before the arguments were finalized." : "Tool call did not complete"
+          };
+          bus.emit("tool-result", {
+            toolCallId,
+            toolName,
+            result,
+            sessionId: this.busSessionId,
+            subagentId: sid,
+            partId: ids.toolPartId?.(toolCallId),
+            messageId: ids.messageId
+          });
+        }
+        tracker.clearInFlight();
+        break;
+      }
+      default:
+        tracker.observePart(chunk);
+    }
+  }
+  async finalizeRun(input) {
+    const { tracker, diagnostics, ids, streamError } = input;
+    const sid = this.subagentId;
+    const bus = this.eventBus;
+    diagnostics.stop();
+    let finalizationError;
+    let hasFinalizationError = false;
+    const recordFinalizationError = (error) => {
+      if (hasFinalizationError)
+        return;
+      finalizationError = error;
+      hasFinalizationError = true;
+    };
+    try {
+      try {
+        this.disposeOwnedShell();
+      } catch (error) {
+        recordFinalizationError(error);
+      }
+      for (const [toolCallId, info] of tracker.flushToolErrorsToResults()) {
+        const result = {
+          type: "error-text",
+          value: `Tool call failed: ${info.message}`
+        };
+        try {
+          bus.emit("tool-result", {
+            toolCallId,
+            toolName: info.toolName,
+            result,
+            sessionId: this.busSessionId,
+            subagentId: sid,
+            partId: ids.toolPartId?.(toolCallId),
+            messageId: ids.messageId
+          });
+        } catch (error) {
+          recordFinalizationError(error);
+        }
+      }
+      if (tracker.hasUnpersistedState()) {
+        const reason = this.abortSignal?.aborted ? "Agent aborted by user" : streamError instanceof Error && streamError.message ? streamError.message : "Stream terminated unexpectedly";
+        try {
+          await this.finalizeInterruptedStep({
+            snapshot: tracker.snapshot(),
+            reason,
+            partIdFor: ids.toolPartId,
+            messageId: ids.messageId
+          });
+        } catch (error) {
+          recordFinalizationError(error);
+        }
+      }
+    } catch (error) {
+      recordFinalizationError(error);
+    } finally {
+      await this.disconnectOwnedBrowser();
+    }
+    return hasFinalizationError ? finalizationError : null;
+  }
+  disposeOwnedShell() {
+    if (this.shellDisposed)
+      return;
+    this.shellDisposed = true;
+    this.persistentShell?.dispose();
+  }
   async disconnectOwnedBrowser() {
     if (this.browserDisconnected)
       return;
@@ -125693,102 +126400,6 @@ class OffensiveSecurityAgent {
   get response() {
     return this.streamResult.response;
   }
-  async emitSyntheticToolResults(inFlightTools, completedResults, reason, partIdFor, messageId, streamedArgText) {
-    const sid = this.subagentId;
-    const output = {
-      type: "error-text",
-      value: `Tool execution aborted: ${reason}`
-    };
-    const syntheticParts = [];
-    if (RESPONSE_DEBUG) {
-      const responseInFlight = [...inFlightTools.entries()].filter(([, n7]) => n7 === RESPONSE_TOOL_NAME);
-      if (responseInFlight.length > 0) {
-        rlog.warn(`[response-debug] emitSyntheticToolResults closing ${responseInFlight.length} response call(s) ` + `ids=${responseInFlight.map(([id]) => id).join(",")} reason="${reason}" ` + `aborted=${this.abortSignal?.aborted === true} responseToolFired=${this._responseToolFired}`);
-      }
-    }
-    for (const [toolCallId, toolName] of inFlightTools) {
-      const result = toolName === RESPONSE_TOOL_NAME && this._responseToolFired ? { type: "text", value: "Response submitted." } : output;
-      this.eventBus.emit("tool-result", {
-        toolCallId,
-        toolName,
-        result,
-        sessionId: this.busSessionId,
-        subagentId: sid,
-        partId: partIdFor?.(toolCallId),
-        messageId
-      });
-      syntheticParts.push({
-        type: "tool-result",
-        toolCallId,
-        toolName,
-        output: result
-      });
-    }
-    if (!this.messagesPath)
-      return;
-    this.cancelPersistTimer?.();
-    let base = this.latestMessages ?? [];
-    if (base.length === 0 && existsSync18(this.messagesPath)) {
-      try {
-        base = JSON.parse(readFileSync8(this.messagesPath, "utf-8"));
-      } catch {}
-    }
-    const allToolCallIds = new Set([
-      ...inFlightTools.keys(),
-      ...completedResults.map((r) => r.toolCallId)
-    ]);
-    const lastMsg = base[base.length - 1];
-    const needsStepReconstruction = !lastMsg || lastMsg.role !== "assistant" || !this.baseContainsToolCalls(lastMsg, allToolCallIds);
-    const appended = [];
-    if (needsStepReconstruction) {
-      const stepTools = [
-        ...inFlightTools,
-        ...completedResults.map((r) => [
-          r.toolCallId,
-          r.toolName
-        ])
-      ];
-      const reconstructInput = (toolCallId) => {
-        const raw = streamedArgText?.get(toolCallId);
-        if (!raw)
-          return {};
-        try {
-          return JSON.parse(raw);
-        } catch {
-          return { _partial: raw };
-        }
-      };
-      if (RESPONSE_DEBUG) {
-        const responseReconstructed = stepTools.filter(([, n7]) => n7 === RESPONSE_TOOL_NAME).map(([id]) => id);
-        if (responseReconstructed.length > 0) {
-          rlog.warn(`[response-debug] step-reconstruction for response call(s) ` + `ids=${responseReconstructed.join(",")} ` + `preservedArgChars=${responseReconstructed.map((id) => streamedArgText?.get(id)?.length ?? 0).join(",")}`);
-        }
-      }
-      const toolCalls = stepTools.map(([toolCallId, toolName]) => ({
-        type: "tool-call",
-        toolCallId,
-        toolName,
-        input: reconstructInput(toolCallId)
-      }));
-      appended.push({ role: "assistant", content: toolCalls });
-    }
-    appended.push({
-      role: "tool",
-      content: [...completedResults, ...syntheticParts]
-    });
-    const next = [...base, ...appended];
-    this.latestMessages = next;
-    try {
-      await writeFile7(this.messagesPath, JSON.stringify(next));
-      this.syntheticsPersisted = true;
-    } catch {}
-  }
-  baseContainsToolCalls(msg, toolCallIds) {
-    if (!Array.isArray(msg.content))
-      return false;
-    const contentToolIds = new Set(msg.content.filter((p) => p.type === "tool-call" && p.toolCallId).map((p) => p.toolCallId));
-    return [...toolCallIds].every((id) => contentToolIds.has(id));
-  }
 }
 var AGENT_PAUSE_TOOLS = new Set([ASK_USER_QUESTIONS_TOOL_NAME]);
 function wrapToolsWithApprovalGate(tools, gate, exemptToolNames) {
@@ -125828,4 +126439,4 @@ function wrapToolsWithApprovalGate(tools, gate, exemptToolNames) {
   return wrapped;
 }
 
-export { AgentEventBus, INTERNAL_ID_PATTERN, ApprovalGate, OPERATOR_MODES, OPERATOR_MODE_CYCLE, createInitialOperatorState, buildProvidedFilesSection, buildSessionWorkspaceSection, buildBaseSystemPrompt, BASE_SYSTEM_PROMPT, isMemoryEnabled, addMemory2 as addMemory, ASK_USER_QUESTIONS_TOOL_NAME, AskUserQuestionSchema, transformScriptToFunction, parseStorageStateResult, setHeadlessMode, setUserAgent, setViewportSize, PlaywrightMcpSession, createBrowserTools, ScopeViolationError, getAllowedHosts, isHostAllowed, extractHostname2 as extractHostname, assertUrlInScope, extractHostsFromCommand, assertCommandInScope, checkSandboxPlaywright, installSandboxPlaywright, ensureSandboxPlaywright, ensureSandboxBrowser, createSandboxBrowserTools, BROWSER_TOOL_NAMES, createBrowserToolset, checkpointState, completeAuthentication, crawlAuthenticated, createAttackSurfaceReport, createFile, createTask2 as createTask, delegateAuth, detectAuthScheme, documentApp, EndpointTransportEnum, GrpcEndpointMetadataSchema, toGrpcPentestContext, grpcAuthorityTarget, pLimit, documentEndpoint, CweEntrySchema, ValidatedCweEntrySchema, hasCanonicalName, documentVulnerability, createEmailToolset, EMAIL_TOOL_NAMES, SEND_EMAIL_TOOL_NAME, executeCommand, extractJsEndpoints, getMemory2 as getMemory, getPage, grep, httpRequest, listFiles, listMemories2 as listMemories, listTasksTool, readTempfileCapped, getApexTmpRoot, extractFallbackStdout, PersistentShell, probeAuthEndpoints, provideComparisonResults, readFile2 as readFile, readSkill, REPORT_ERROR_TOOL_NAME, ReportErrorReasonSchema, createReportErrorTool, PentestReportedError, RESPONSE_TOOL_NAME, createResponseTool, runAttackSurface, runPentestWorkflow, runWithBoundedConcurrency, spawnCodingAgent, FindingsRegistry, planFilePath, readPlan, hasPlan, spawnPentestAgent, spawnPentestSwarm, submitPlan, testEndpointVariations, updateFile, updateTask2 as updateTask, validateDiscovery, webSearch, apiRequest, listApps, getApp, createApp, updateApp, deleteApp, listEndpoints, getEndpoint, createEndpoint, updateEndpoint, deleteEndpoint, searchApps, searchEndpoints, listWorkspaceApps, createWorkspaceApp, updateWorkspaceApp, listWorkspaceEndpoints, createWorkspaceEndpoint, updateWorkspaceEndpoint, listWorkspaceDomains, createWorkspaceDomain, writePlan, createAllTools, ALL_TOOL_NAMES, FAST_STRIKE_EXCLUDED_TOOL_NAMES, PLAN_MODE_TOOL_NAMES, SKILL_TOOL_NAMES, StepTraceWriter, OffensiveSecurityAgent };
+export { AgentEventBus, INTERNAL_ID_PATTERN, ApprovalGate, OPERATOR_MODES, OPERATOR_MODE_CYCLE, createInitialOperatorState, buildProvidedFilesSection, buildSessionWorkspaceSection, buildBaseSystemPrompt, BASE_SYSTEM_PROMPT, isMemoryEnabled, addMemory2 as addMemory, ASK_USER_QUESTIONS_TOOL_NAME, AskUserQuestionSchema, transformScriptToFunction, parseStorageStateResult, setHeadlessMode, setUserAgent, setViewportSize, PlaywrightMcpSession, createBrowserTools, ScopeViolationError, getAllowedHosts, isHostAllowed, extractHostname2 as extractHostname, assertUrlInScope, extractHostsFromCommand, assertCommandInScope, checkSandboxPlaywright, installSandboxPlaywright, ensureSandboxPlaywright, ensureSandboxBrowser, createSandboxBrowserTools, BROWSER_TOOL_NAMES, createBrowserToolset, checkpointState, completeAuthentication, crawlAuthenticated, createAttackSurfaceReport, createFile, createTask2 as createTask, delegateAuth, detectAuthScheme, documentApp, EndpointTransportEnum, GrpcEndpointMetadataSchema, toGrpcPentestContext, grpcAuthorityTarget, pLimit, documentEndpoint, AttackPathSchema, CweEntrySchema, ValidatedCweEntrySchema, hasCanonicalName, documentVulnerability, createEmailToolset, EMAIL_TOOL_NAMES, SEND_EMAIL_TOOL_NAME, executeCommand, extractJsEndpoints, getMemory2 as getMemory, getPage, grep, httpRequest, listFiles, listMemories2 as listMemories, listTasksTool, readTempfileCapped, getApexTmpRoot, extractFallbackStdout, PersistentShell, probeAuthEndpoints, provideComparisonResults, readFile2 as readFile, readSkill, REPORT_ERROR_TOOL_NAME, ReportErrorReasonSchema, createReportErrorTool, PentestReportedError, RESPONSE_TOOL_NAME, createResponseTool, runAttackSurface, runPentestWorkflow, SMS_LIST_MESSAGES_TOOL_NAME, SMS_TOOL_NAMES, sessionHasSmsPasswordless, runWithBoundedConcurrency, spawnCodingAgent, FindingsRegistry, planFilePath, readPlan, hasPlan, spawnPentestAgent, spawnPentestSwarm, submitPlan, testEndpointVariations, updateFile, updateTask2 as updateTask, validateDiscovery, webSearch, apiRequest, ENDPOINT_TRANSPORTS, listApps, getApp, createApp, updateApp, deleteApp, listEndpoints, getEndpoint, createEndpoint, updateEndpoint, deleteEndpoint, searchApps, searchEndpoints, listWorkspaceApps, createWorkspaceApp, updateWorkspaceApp, listWorkspaceEndpoints, createWorkspaceEndpoint, updateWorkspaceEndpoint, listDomains, createDomain, listWorkspaceDomains, createWorkspaceDomain, writePlan, createAllTools, ALL_TOOL_NAMES, FAST_STRIKE_EXCLUDED_TOOL_NAMES, PLAN_MODE_TOOL_NAMES, SKILL_TOOL_NAMES, StepTraceWriter, OffensiveSecurityAgent };