@duckmind/dm-windows-x64 0.61.4 → 0.61.9

package/extensions/dm-subagents/src/runs/shared/nested-events.js

@@ -2,8 +2,7 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {
-  ASYNC_DIR,
-  RESULTS_DIR,
+  DIRS,
   TEMP_ROOT_DIR
 } from "../../shared/types.js";
 import { isSafeNestedPathId, parseNestedPathEnv, sanitizeNestedPath } from "./nested-path.js";
@@ -18,9 +17,12 @@ import {
   SUBAGENT_PARENT_RUN_ID_ENV
 } from "./dm-args.js";
 import { writeAtomicJson } from "../../shared/atomic-json.js";
+import { sanitizeProcessTerminal } from "../background/process-terminal.js";
+import { THINKING_LEVELS } from "../../shared/model-info.js";
 export const NESTED_EVENTS_DIR = path.join(TEMP_ROOT_DIR, "nested-subagent-events");
 const ROUTE_FILE = "route.json";
 const REGISTRY_FILE = "registry.json";
+const ROUTE_INDEX_DIR = ".route-index";
 const MAX_EVENT_BYTES = 64 * 1024;
 const MAX_STEPS = 12;
 const MAX_CHILDREN = 16;
@@ -43,6 +45,15 @@ function containedPath(base, candidate) {
 function commonRouteRoot(route) {
   return path.dirname(path.resolve(route.eventSink));
 }
+function routeIndexRoot() {
+  return path.join(NESTED_EVENTS_DIR, ROUTE_INDEX_DIR, "roots");
+}
+function routeIndexDir(rootRunId) {
+  return path.join(routeIndexRoot(), encodeURIComponent(rootRunId));
+}
+function routeIndexPath(rootRunId, capabilityToken) {
+  return path.join(routeIndexDir(rootRunId), `${encodeURIComponent(capabilityToken)}.json`);
+}
 function validateRouteShape(route) {
   assertSafeId("rootRunId", route.rootRunId);
   assertSafeId("capabilityToken", route.capabilityToken);
@@ -61,8 +72,10 @@ export function createNestedRoute(rootRunId) {
   const controlInbox = path.join(routeRoot, "controls");
   fs.mkdirSync(eventSink, { recursive: true, mode: 448 });
   fs.mkdirSync(controlInbox, { recursive: true, mode: 448 });
-  fs.writeFileSync(path.join(routeRoot, ROUTE_FILE), `${JSON.stringify({ rootRunId, capabilityToken, createdAt: Date.now() })}
-`, { mode: 384 });
+  const createdAt = Date.now();
+  fs.mkdirSync(routeIndexDir(rootRunId), { recursive: true, mode: 448 });
+  writeAtomicJson(routeIndexPath(rootRunId, capabilityToken), { rootRunId, capabilityToken, routeRoot: path.basename(routeRoot), createdAt });
+  writeAtomicJson(path.join(routeRoot, ROUTE_FILE), { rootRunId, capabilityToken, createdAt });
   return { rootRunId, eventSink, controlInbox, capabilityToken };
 }
 export function resolveNestedRouteFromEnv(env = process.env) {
@@ -121,7 +134,9 @@ function sanitizeTokenUsage(value) {
   const input = clampNumber(raw.input);
   const output = clampNumber(raw.output);
   const total = clampNumber(raw.total);
-  return input !== undefined && output !== undefined && total !== undefined ? { input, output, total } : undefined;
+  const window = clampNumber(raw.window);
+  const windowPeak = clampNumber(raw.windowPeak);
+  return input !== undefined && output !== undefined && total !== undefined ? { input, output, total, ...window !== undefined ? { window } : {}, ...windowPeak !== undefined ? { windowPeak } : {} } : undefined;
 }
 function sanitizeCost(value) {
   if (!value || typeof value !== "object")
@@ -132,6 +147,56 @@ function sanitizeCost(value) {
   const costUsd = clampNumber(raw.costUsd);
   return inputTokens !== undefined && outputTokens !== undefined && costUsd !== undefined ? { inputTokens, outputTokens, costUsd } : undefined;
 }
+function sanitizeLaunchResolvedExtensions(value) {
+  if (!value || typeof value !== "object")
+    return;
+  const raw = value;
+  if (raw.version !== 1 || raw.source !== "launch-resolved" || typeof raw.disableAmbientExtensions !== "boolean")
+    return;
+  const stringList = (input) => Array.isArray(input) ? input.filter((item) => typeof item === "string" && /^sha256:[a-f0-9]{16}$/.test(item)).slice(0, 32) : [];
+  const omitted = raw.omitted && typeof raw.omitted === "object" ? raw.omitted : {};
+  const omittedCount = (key) => Math.max(0, Math.floor(clampNumber(omitted[key]) ?? 0));
+  return {
+    version: 1,
+    source: "launch-resolved",
+    disableAmbientExtensions: raw.disableAmbientExtensions,
+    runtime: stringList(raw.runtime),
+    configured: stringList(raw.configured),
+    effective: stringList(raw.effective),
+    omitted: {
+      runtime: omittedCount("runtime"),
+      configured: omittedCount("configured"),
+      effective: omittedCount("effective")
+    }
+  };
+}
+function sanitizeRuntimeAcknowledgedExtensions(value) {
+  if (!value || typeof value !== "object")
+    return;
+  const raw = value;
+  if (raw.version !== 1 || raw.source !== "child-runtime" || !Array.isArray(raw.ids))
+    return;
+  const ids = [];
+  const seen = new Set;
+  for (const item of raw.ids) {
+    if (typeof item !== "string" || item.length === 0 || item.length > 128 || !/^[A-Za-z0-9._:@+-]+$/.test(item) || item.includes("..") || item.includes("/") || item.includes("\\") || seen.has(item))
+      continue;
+    seen.add(item);
+    ids.push(item);
+  }
+  if (ids.length === 0)
+    return;
+  return {
+    version: 1,
+    source: "child-runtime",
+    ids: ids.slice(0, 32),
+    omitted: Math.max(0, ids.length - 32) + Math.max(0, Math.floor(clampNumber(raw.omitted) ?? 0))
+  };
+}
+function runtimeAcknowledgedEntry(value) {
+  const sanitized = sanitizeRuntimeAcknowledgedExtensions(value);
+  return sanitized ? { runtimeAcknowledgedExtensions: sanitized } : {};
+}
 function sanitizeTurnBudget(value) {
   if (!value || typeof value !== "object")
     return;
@@ -139,7 +204,7 @@ function sanitizeTurnBudget(value) {
   const maxTurns = clampNumber(raw.maxTurns);
   const graceTurns = clampNumber(raw.graceTurns);
   const turnCount = clampNumber(raw.turnCount);
-  const outcome = raw.outcome === "within-budget" || raw.outcome === "wrap-up-requested" || raw.outcome === "exceeded" ? raw.outcome : undefined;
+  const outcome = raw.outcome === "within-budget" || raw.outcome === "wrap-up-requested" || raw.outcome === "termination-deferred" || raw.outcome === "exceeded" ? raw.outcome : undefined;
   if (maxTurns === undefined || graceTurns === undefined || turnCount === undefined || !outcome)
     return;
   return {
@@ -148,11 +213,12 @@ function sanitizeTurnBudget(value) {
     turnCount,
     outcome,
     ...clampNumber(raw.wrapUpRequestedAtTurn) !== undefined ? { wrapUpRequestedAtTurn: clampNumber(raw.wrapUpRequestedAtTurn) } : {},
+    ...clampNumber(raw.terminationDeferredAtTurn) !== undefined ? { terminationDeferredAtTurn: clampNumber(raw.terminationDeferredAtTurn) } : {},
     ...clampNumber(raw.exceededAtTurn) !== undefined ? { exceededAtTurn: clampNumber(raw.exceededAtTurn) } : {}
   };
 }
 function sanitizeState(value, fallback) {
-  return value === "queued" || value === "running" || value === "complete" || value === "failed" || value === "paused" ? value : fallback;
+  return value === "queued" || value === "running" || value === "complete" || value === "failed" || value === "partial" || value === "paused" || value === "stopped" ? value : fallback;
 }
 function sanitizeStep(input, depth) {
   if (!input || typeof input !== "object")
@@ -161,10 +227,15 @@ function sanitizeStep(input, depth) {
   const agent = stringValue(raw.agent, 128);
   if (!agent)
     return;
-  const status = raw.status === "pending" || raw.status === "running" || raw.status === "complete" || raw.status === "completed" || raw.status === "failed" || raw.status === "paused" ? raw.status : "pending";
+  const status = raw.status === "pending" || raw.status === "running" || raw.status === "complete" || raw.status === "completed" || raw.status === "failed" || raw.status === "paused" || raw.status === "stopped" ? raw.status : "pending";
+  const model = stringValue(raw.model);
+  const thinking = THINKING_LEVELS.find((level) => level === raw.thinking);
   return {
     agent,
     status,
+    ...model ? { model } : {},
+    ...thinking ? { thinking } : {},
+    ...stringValue(raw.sessionName, 256) ? { sessionName: stringValue(raw.sessionName, 256) } : {},
     ...stringValue(raw.sessionFile, 2048) ? { sessionFile: stringValue(raw.sessionFile, 2048) } : {},
     ...raw.activityState === "active_long_running" || raw.activityState === "needs_attention" ? { activityState: raw.activityState } : {},
     ...clampNumber(raw.lastActivityAt) !== undefined ? { lastActivityAt: clampNumber(raw.lastActivityAt) } : {},
@@ -177,9 +248,12 @@ function sanitizeStep(input, depth) {
     ...clampNumber(raw.endedAt) !== undefined ? { endedAt: clampNumber(raw.endedAt) } : {},
     ...stringValue(raw.error, 1024) ? { error: stringValue(raw.error, 1024) } : {},
     ...raw.timedOut === true ? { timedOut: true } : {},
+    ...raw.stopped === true ? { stopped: true } : {},
     ...sanitizeTurnBudget(raw.turnBudget) ? { turnBudget: sanitizeTurnBudget(raw.turnBudget) } : {},
     ...raw.turnBudgetExceeded === true ? { turnBudgetExceeded: true } : {},
     ...raw.wrapUpRequested === true ? { wrapUpRequested: true } : {},
+    ...sanitizeLaunchResolvedExtensions(raw.launchResolvedExtensions) ? { launchResolvedExtensions: sanitizeLaunchResolvedExtensions(raw.launchResolvedExtensions) } : {},
+    ...sanitizeRuntimeAcknowledgedExtensions(raw.runtimeAcknowledgedExtensions) ? { runtimeAcknowledgedExtensions: sanitizeRuntimeAcknowledgedExtensions(raw.runtimeAcknowledgedExtensions) } : {},
     ...depth < MAX_DEPTH && Array.isArray(raw.children) ? { children: raw.children.map((child) => sanitizeSummary(child, depth + 1)).filter((child) => Boolean(child)).slice(0, MAX_CHILDREN) } : {}
   };
 }
@@ -201,6 +275,9 @@ export function sanitizeSummary(input, depth = 0) {
     depth: Math.min(Math.max(0, clampNumber(raw.depth) ?? 0), MAX_DEPTH),
     path: pathParts,
     state: sanitizeState(raw.state, "running"),
+    ...stringValue(raw.sessionName, 256) ? { sessionName: stringValue(raw.sessionName, 256) } : {},
+    ...stringValue(raw.model) ? { model: stringValue(raw.model) } : {},
+    ...THINKING_LEVELS.find((level) => level === raw.thinking) ? { thinking: THINKING_LEVELS.find((level) => level === raw.thinking) } : {},
     ...stringValue(raw.asyncDir, 2048) ? { asyncDir: stringValue(raw.asyncDir, 2048) } : {},
     ...clampNumber(raw.pid) !== undefined && clampNumber(raw.pid) > 0 && Number.isInteger(clampNumber(raw.pid)) ? { pid: clampNumber(raw.pid) } : {},
     ...stringValue(raw.sessionId, 256) ? { sessionId: stringValue(raw.sessionId, 256) } : {},
@@ -231,10 +308,13 @@ export function sanitizeSummary(input, depth = 0) {
     ...clampNumber(raw.timeoutMs) !== undefined ? { timeoutMs: clampNumber(raw.timeoutMs) } : {},
     ...clampNumber(raw.deadlineAt) !== undefined ? { deadlineAt: clampNumber(raw.deadlineAt) } : {},
     ...raw.timedOut === true ? { timedOut: true } : {},
+    ...raw.stopped === true ? { stopped: true } : {},
     ...sanitizeTurnBudget(raw.turnBudget) ? { turnBudget: sanitizeTurnBudget(raw.turnBudget) } : {},
     ...raw.turnBudgetExceeded === true ? { turnBudgetExceeded: true } : {},
     ...raw.wrapUpRequested === true ? { wrapUpRequested: true } : {},
     ...stringValue(raw.error, 1024) ? { error: stringValue(raw.error, 1024) } : {},
+    ...sanitizeLaunchResolvedExtensions(raw.launchResolvedExtensions) ? { launchResolvedExtensions: sanitizeLaunchResolvedExtensions(raw.launchResolvedExtensions) } : {},
+    ...sanitizeRuntimeAcknowledgedExtensions(raw.runtimeAcknowledgedExtensions) ? { runtimeAcknowledgedExtensions: sanitizeRuntimeAcknowledgedExtensions(raw.runtimeAcknowledgedExtensions) } : {},
     ...steps && steps.length > 0 ? { steps } : {},
     ...depth < MAX_DEPTH && Array.isArray(raw.children) ? { children: raw.children.map((child) => sanitizeSummary(child, depth + 1)).filter((child) => Boolean(child)).slice(0, MAX_CHILDREN) } : {}
   };
@@ -290,7 +370,38 @@ export function parseNestedEventRecords(content, route) {
 `) ? undefined : -1).map((line) => line.trim() ? parseRecord(line, route) : undefined).filter((event) => Boolean(event));
 }
 function terminal(state) {
-  return state === "complete" || state === "failed" || state === "paused";
+  return state === "complete" || state === "failed" || state === "partial" || state === "paused" || state === "stopped";
+}
+function mergeBoundedChildren(existing, incoming) {
+  if (incoming === undefined)
+    return existing?.slice(0, MAX_CHILDREN);
+  const incomingById = new Map(incoming.map((child) => [child.id, child]));
+  const merged = (existing ?? []).map((child) => incomingById.get(child.id) ?? child);
+  for (const child of incoming) {
+    if (!existing?.some((prior) => prior.id === child.id))
+      merged.push(child);
+  }
+  return merged.slice(0, MAX_CHILDREN);
+}
+function mergeStepSummary(existing, incoming) {
+  if (!existing || existing.agent !== incoming.agent)
+    return { ...incoming, ...incoming.children ? { children: incoming.children.slice(0, MAX_CHILDREN) } : {} };
+  const metadata = { ...existing };
+  delete metadata.status;
+  delete metadata.activityState;
+  delete metadata.lastActivityAt;
+  delete metadata.currentTool;
+  delete metadata.currentToolStartedAt;
+  delete metadata.currentPath;
+  delete metadata.turnCount;
+  delete metadata.toolCount;
+  delete metadata.children;
+  const children = mergeBoundedChildren(existing.children, incoming.children);
+  return {
+    ...metadata,
+    ...incoming,
+    ...children ? { children } : {}
+  };
 }
 function mergeSummary(existing, event) {
   const incomingState = event.type === "subagent.nested.completed" && event.child.state === "running" ? "complete" : event.child.state;
@@ -305,7 +416,18 @@ function mergeSummary(existing, event) {
     return existing;
   if (terminal(existing.state) && terminal(incoming.state) && incomingUpdate === existingUpdate)
     return existing;
-  return { ...existing, ...incoming, state: incoming.state, lastUpdate: Math.max(existingUpdate, incomingUpdate) };
+  const existingSteps = existing.steps ?? [];
+  const incomingSteps = incoming.steps;
+  const steps = incomingSteps === undefined ? existing.steps : Array.from({ length: Math.min(MAX_STEPS, Math.max(existingSteps.length, incomingSteps.length)) }, (_, index) => incomingSteps[index] ? mergeStepSummary(existingSteps[index], incomingSteps[index]) : existingSteps[index]).filter((step) => Boolean(step));
+  const children = mergeBoundedChildren(existing.children, incoming.children);
+  return {
+    ...existing,
+    ...incoming,
+    ...steps ? { steps } : {},
+    ...children ? { children } : {},
+    state: incoming.state,
+    lastUpdate: Math.max(existingUpdate, incomingUpdate)
+  };
 }
 function attachChild(children, event) {
   let updated = false;
@@ -340,67 +462,60 @@ export function applyNestedEvent(registry, event) {
 function registryPath(route) {
   return path.join(commonRouteRoot(route), REGISTRY_FILE);
 }
+function routeFromIndexEntry(rootRunId, filePath) {
+  try {
+    const metadata = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+    if (metadata.rootRunId !== rootRunId || typeof metadata.capabilityToken !== "string" || typeof metadata.routeRoot !== "string")
+      return;
+    const routeRoot = path.join(NESTED_EVENTS_DIR, path.basename(metadata.routeRoot));
+    const route = {
+      rootRunId,
+      eventSink: path.join(routeRoot, "events"),
+      controlInbox: path.join(routeRoot, "controls"),
+      capabilityToken: metadata.capabilityToken
+    };
+    validateRouteShape(route);
+    if (!fs.statSync(route.eventSink).isDirectory() || !fs.statSync(route.controlInbox).isDirectory())
+      return;
+    const routeFilePath = path.join(routeRoot, ROUTE_FILE);
+    try {
+      const routeFile = JSON.parse(fs.readFileSync(routeFilePath, "utf-8"));
+      if (routeFile.rootRunId !== rootRunId || routeFile.capabilityToken !== metadata.capabilityToken)
+        return;
+    } catch (error) {
+      if (error.code !== "ENOENT")
+        return;
+      try {
+        writeAtomicJson(routeFilePath, { rootRunId, capabilityToken: metadata.capabilityToken, createdAt: typeof metadata.createdAt === "number" ? metadata.createdAt : Date.now() });
+      } catch {}
+    }
+    return route;
+  } catch {
+    return;
+  }
+}
 export function findNestedRouteForRootId(rootRunId) {
   assertSafeId("rootRunId", rootRunId);
   let entries;
   try {
-    entries = fs.readdirSync(NESTED_EVENTS_DIR);
+    entries = fs.readdirSync(routeIndexDir(rootRunId));
   } catch (error) {
     if (error.code === "ENOENT")
       return;
     throw error;
   }
   for (const entry of entries) {
-    if (!entry.startsWith(`${rootRunId}-`))
-      continue;
-    const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
-    try {
-      const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8"));
-      if (metadata.rootRunId !== rootRunId || typeof metadata.capabilityToken !== "string")
-        continue;
-      const route = {
-        rootRunId,
-        eventSink: path.join(routeRoot, "events"),
-        controlInbox: path.join(routeRoot, "controls"),
-        capabilityToken: metadata.capabilityToken
-      };
-      validateRouteShape(route);
+    const route = routeFromIndexEntry(rootRunId, path.join(routeIndexDir(rootRunId), entry));
+    if (route)
       return route;
-    } catch {
-      continue;
-    }
   }
   return;
 }
 export function buildNestedRouteIndex() {
-  let entries;
-  try {
-    entries = fs.readdirSync(NESTED_EVENTS_DIR);
-  } catch (error) {
-    if (error.code === "ENOENT")
-      return new Map;
-    throw error;
-  }
   const index = new Map;
-  for (const entry of entries) {
-    const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
-    try {
-      const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8"));
-      if (typeof metadata.rootRunId !== "string" || typeof metadata.capabilityToken !== "string")
-        continue;
-      if (index.has(metadata.rootRunId))
-        continue;
-      const route = {
-        rootRunId: metadata.rootRunId,
-        eventSink: path.join(routeRoot, "events"),
-        controlInbox: path.join(routeRoot, "controls"),
-        capabilityToken: metadata.capabilityToken
-      };
-      validateRouteShape(route);
-      index.set(metadata.rootRunId, route);
-    } catch {
-      continue;
-    }
+  for (const route of listNestedRoutes()) {
+    if (!index.has(route.rootRunId))
+      index.set(route.rootRunId, route);
   }
   return index;
 }
@@ -442,29 +557,28 @@ function collectScopedNestedRuns(children, scope, output = []) {
   return output;
 }
 function listNestedRoutes() {
-  let entries;
+  let rootEntries;
   try {
-    entries = fs.readdirSync(NESTED_EVENTS_DIR);
+    rootEntries = fs.readdirSync(routeIndexRoot());
   } catch (error) {
     if (error.code === "ENOENT")
       return [];
     throw error;
   }
   const routes = [];
-  for (const entry of entries) {
-    const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
+  for (const rootEntry of rootEntries) {
+    let rootRunId;
     try {
-      const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8"));
-      if (typeof metadata.rootRunId !== "string" || typeof metadata.capabilityToken !== "string")
-        continue;
-      const route = {
-        rootRunId: metadata.rootRunId,
-        eventSink: path.join(routeRoot, "events"),
-        controlInbox: path.join(routeRoot, "controls"),
-        capabilityToken: metadata.capabilityToken
-      };
-      validateRouteShape(route);
-      routes.push(route);
+      rootRunId = decodeURIComponent(rootEntry);
+    } catch {
+      continue;
+    }
+    try {
+      for (const entry of fs.readdirSync(path.join(routeIndexRoot(), rootEntry))) {
+        const route = routeFromIndexEntry(rootRunId, path.join(routeIndexRoot(), rootEntry, entry));
+        if (route)
+          routes.push(route);
+      }
     } catch {
       continue;
     }
@@ -534,7 +648,10 @@ export function projectNestedEvents(route) {
     } catch {
       continue;
     }
-    for (const event of parseNestedEventRecords(content, route)) {
+    const records = parseNestedEventRecords(content, route);
+    if (records.length === 0)
+      continue;
+    for (const event of records) {
       registry = applyNestedEvent(registry, event);
       changed = true;
     }
@@ -542,8 +659,27 @@ export function projectNestedEvents(route) {
     changed = true;
   }
   if (changed) {
-    registry = { ...registry, processedEvents: [...seen].slice(-1000) };
+    const processedEvents = [...seen];
+    const retainedEvents = processedEvents.slice(-1000);
+    const evictedEvents = processedEvents.slice(0, -1000);
+    registry = { ...registry, processedEvents: retainedEvents };
     writeAtomicJson(registryPath(route), registry);
+    for (const entry of evictedEvents) {
+      const eventPath = path.join(route.eventSink, entry);
+      if (!containedPath(route.eventSink, eventPath))
+        continue;
+      try {
+        const stat = fs.statSync(eventPath);
+        if (!stat.isFile() || stat.size > MAX_EVENT_BYTES)
+          continue;
+        const content = fs.readFileSync(eventPath, "utf-8");
+        const hasStatusRecord = parseNestedEventRecords(content, route).length > 0;
+        const hasControlResult = content.split(`
+`).some((line) => line.trim() && parseControlResult(line.trim(), route));
+        if (hasStatusRecord && !hasControlResult)
+          fs.unlinkSync(eventPath);
+      } catch {}
+    }
   }
   return registry;
 }
@@ -695,38 +831,46 @@ export function writeNestedControlResult(route, result) {
     throw new Error("Nested control result failed validation.");
   writeRouteRecord(route.eventSink, sanitized.ts, sanitized);
 }
-export function readNestedControlResults(route) {
+function readControlResultsFromFile(route, eventPath) {
+  if (!containedPath(route.eventSink, eventPath))
+    return [];
+  try {
+    const stat = fs.statSync(eventPath);
+    if (!stat.isFile() || stat.size > MAX_EVENT_BYTES)
+      return [];
+    const content = fs.readFileSync(eventPath, "utf-8");
+    const lines = content.includes(`
+`) ? content.split(`
+`).filter((line) => line.trim()) : [content];
+    return lines.map((line) => parseControlResult(line, route)).filter((result) => Boolean(result));
+  } catch {
+    return [];
+  }
+}
+function listNestedEventFiles(route) {
   validateRouteShape(route);
-  let entries = [];
   try {
-    entries = fs.readdirSync(route.eventSink).filter((entry) => entry.endsWith(".json") || entry.endsWith(".jsonl")).sort();
+    return fs.readdirSync(route.eventSink).filter((entry) => entry.endsWith(".json") || entry.endsWith(".jsonl"));
   } catch (error) {
-    if (error.code !== "ENOENT")
-      throw error;
+    if (error.code === "ENOENT")
+      return [];
+    throw error;
   }
-  const results = [];
+}
+export function snapshotNestedEventFiles(route) {
+  return new Set(listNestedEventFiles(route));
+}
+export function findNestedControlResult(route, requestId, targetRunId, ignoredFiles) {
+  const entries = listNestedEventFiles(route).filter((entry) => !ignoredFiles.has(entry)).sort().reverse();
   for (const entry of entries) {
-    const eventPath = path.join(route.eventSink, entry);
-    if (!containedPath(route.eventSink, eventPath))
-      continue;
-    try {
-      const stat = fs.statSync(eventPath);
-      if (!stat.isFile() || stat.size > MAX_EVENT_BYTES)
-        continue;
-      const content = fs.readFileSync(eventPath, "utf-8");
-      const lines = content.includes(`
-`) ? content.split(`
-`).filter((line) => line.trim()) : [content];
-      for (const line of lines) {
-        const result = parseControlResult(line, route);
-        if (result)
-          results.push(result);
-      }
-    } catch {
-      continue;
-    }
+    const result = readControlResultsFromFile(route, path.join(route.eventSink, entry)).find((candidate) => candidate.requestId === requestId && candidate.targetRunId === targetRunId);
+    if (result)
+      return result;
   }
-  return results;
+  return;
+}
+export function readNestedControlResults(route) {
+  return listNestedEventFiles(route).sort().flatMap((entry) => readControlResultsFromFile(route, path.join(route.eventSink, entry)));
 }
 export function nestedRouteEnv(route) {
   return {
@@ -791,6 +935,14 @@ export function nestedSummaryFromAsyncStatus(status, asyncDir, fallback) {
     ...status.pid ? { pid: status.pid } : {},
     ...status.sessionId ? { sessionId: status.sessionId } : {},
     mode: status.mode ?? fallback.mode,
+    ...status.steps?.length === 1 && status.steps[0]?.model ? { model: status.steps[0].model } : {},
+    ...status.steps?.length === 1 && status.steps[0]?.thinking ? { thinking: status.steps[0].thinking } : {},
+    ...status.steps?.length === 1 && status.steps[0]?.sessionName ? { sessionName: status.steps[0].sessionName } : {},
+    ...status.processTerminal ? { processTerminal: sanitizeProcessTerminal(status.processTerminal, { runId: status.runId || fallback.id, runnerProcessInstanceId: status.processTerminal.runnerProcessInstanceId }, `${asyncDir}/status.json`) } : {},
+    ...status.launchResolvedExtensions ? { launchResolvedExtensions: status.launchResolvedExtensions } : {},
+    ...runtimeAcknowledgedEntry(status.runtimeAcknowledgedExtensions),
+    ...status.capabilityCeiling ? { capabilityCeiling: status.capabilityCeiling } : {},
+    ...status.capabilityAudit ? { capabilityAudit: status.capabilityAudit } : {},
     state: status.state,
     ...status.currentStep !== undefined ? { currentStep: status.currentStep } : {},
     ...status.chainStepCount !== undefined ? { chainStepCount: status.chainStepCount } : {},
@@ -805,6 +957,7 @@ export function nestedSummaryFromAsyncStatus(status, asyncDir, fallback) {
     ...status.timeoutMs !== undefined ? { timeoutMs: status.timeoutMs } : {},
     ...status.deadlineAt !== undefined ? { deadlineAt: status.deadlineAt } : {},
     ...status.timedOut !== undefined ? { timedOut: status.timedOut } : {},
+    ...status.stopped !== undefined ? { stopped: status.stopped } : {},
     ...status.turnBudget ? { turnBudget: status.turnBudget } : {},
     ...status.turnBudgetExceeded !== undefined ? { turnBudgetExceeded: status.turnBudgetExceeded } : {},
     ...status.wrapUpRequested !== undefined ? { wrapUpRequested: status.wrapUpRequested } : {},
@@ -813,9 +966,12 @@ export function nestedSummaryFromAsyncStatus(status, asyncDir, fallback) {
     ...status.endedAt !== undefined ? { endedAt: status.endedAt } : {},
     lastUpdate: status.lastUpdate ?? fallback.ts,
     ...status.sessionFile ? { sessionFile: status.sessionFile } : {},
-    ...status.steps?.length ? { steps: status.steps.map((step) => ({
+    ...status.steps?.length ? { steps: status.steps.map((step, index) => ({
       agent: step.agent,
+      ...step.sessionName ? { sessionName: step.sessionName } : {},
       status: step.status,
+      ...step.model ? { model: step.model } : {},
+      ...step.thinking ? { thinking: step.thinking } : {},
       ...step.sessionFile ? { sessionFile: step.sessionFile } : {},
       ...step.activityState ? { activityState: step.activityState } : {},
       ...step.lastActivityAt !== undefined ? { lastActivityAt: step.lastActivityAt } : {},
@@ -827,10 +983,16 @@ export function nestedSummaryFromAsyncStatus(status, asyncDir, fallback) {
       ...step.startedAt !== undefined ? { startedAt: step.startedAt } : {},
       ...step.endedAt !== undefined ? { endedAt: step.endedAt } : {},
       ...step.error ? { error: step.error } : {},
+      ...step.launchResolvedExtensions ? { launchResolvedExtensions: step.launchResolvedExtensions } : {},
+      ...runtimeAcknowledgedEntry(step.runtimeAcknowledgedExtensions),
       ...step.timedOut !== undefined ? { timedOut: step.timedOut } : {},
+      ...step.stopped !== undefined ? { stopped: step.stopped } : {},
       ...step.turnBudget ? { turnBudget: step.turnBudget } : {},
       ...step.turnBudgetExceeded !== undefined ? { turnBudgetExceeded: step.turnBudgetExceeded } : {},
-      ...step.wrapUpRequested !== undefined ? { wrapUpRequested: step.wrapUpRequested } : {}
+      ...step.wrapUpRequested !== undefined ? { wrapUpRequested: step.wrapUpRequested } : {},
+      ...step.processTerminal ? { processTerminal: sanitizeProcessTerminal(step.processTerminal, { runId: status.runId || fallback.id, runnerProcessInstanceId: step.processTerminal.runnerProcessInstanceId }, `${asyncDir}/status.json step ${index}`) } : {},
+      ...step.capabilityCeiling ? { capabilityCeiling: step.capabilityCeiling } : {},
+      ...step.capabilityAudit ? { capabilityAudit: step.capabilityAudit } : {}
     })).slice(0, MAX_STEPS) } : {}
   };
 }
@@ -842,10 +1004,10 @@ export function nestedArtifactEnv(rootRunId, parentRunId) {
 }
 export function isTopLevelAsyncDir(asyncDir) {
   const resolved = path.resolve(asyncDir);
-  return containedPath(ASYNC_DIR, resolved) && !containedPath(path.join(TEMP_ROOT_DIR, "nested-subagent-runs"), resolved);
+  return containedPath(DIRS.async, resolved) && !containedPath(path.join(TEMP_ROOT_DIR, "nested-subagent-runs"), resolved);
 }
 export function nestedResultsPath(rootRunId, id) {
   assertSafeId("rootRunId", rootRunId);
   assertSafeId("id", id);
-  return path.join(RESULTS_DIR, "nested", rootRunId, `${id}.json`);
+  return path.join(DIRS.results, "nested", rootRunId, `${id}.json`);
 }

package/extensions/dm-subagents/src/runs/shared/nested-render.js

@@ -1,7 +1,7 @@
-import { formatDuration, formatTokens, shortenPath } from "../../shared/formatters.js";
+import { formatDuration, formatModelThinking, formatTokenUsage, shortenPath } from "../../shared/formatters.js";
 import { formatActivityLabel } from "../../shared/status-format.js";
 export function countNestedRuns(children) {
-  const counts = { total: 0, running: 0, paused: 0, complete: 0, failed: 0, queued: 0 };
+  const counts = { total: 0, running: 0, paused: 0, complete: 0, failed: 0, partial: 0, rejected: 0, stopped: 0, queued: 0 };
   for (const child of children ?? []) {
     counts.total++;
     counts[child.state]++;
@@ -11,6 +11,9 @@ export function countNestedRuns(children) {
     counts.paused += nested.paused;
     counts.complete += nested.complete;
     counts.failed += nested.failed;
+    counts.partial += nested.partial;
+    counts.rejected += nested.rejected;
+    counts.stopped += nested.stopped;
     counts.queued += nested.queued;
   }
   return counts;
@@ -23,12 +26,17 @@ export function formatNestedAggregate(children) {
     counts.running > 0 ? `${counts.running} running` : "",
     counts.paused > 0 ? `${counts.paused} paused` : "",
     counts.failed > 0 ? `${counts.failed} failed` : "",
+    counts.partial > 0 ? `${counts.partial} partial` : "",
+    counts.rejected > 0 ? `${counts.rejected} rejected` : "",
+    counts.stopped > 0 ? `${counts.stopped} stopped` : "",
     counts.complete > 0 ? `${counts.complete} complete` : "",
     counts.queued > 0 ? `${counts.queued} queued` : ""
   ].filter(Boolean);
   return `+${counts.total} nested run${counts.total === 1 ? "" : "s"}${parts.length ? ` (${parts.join(", ")})` : ""}`;
 }
 function nestedRunLabel(run) {
+  if (run.sessionName?.trim())
+    return run.sessionName.trim();
   if (run.agent)
     return run.agent;
   if (run.agents?.length)
@@ -48,7 +56,7 @@ function formatNestedActivity(input) {
   if (input.toolCount !== undefined)
     facts.push(`${input.toolCount} tools`);
   if (input.totalTokens)
-    facts.push(`${formatTokens(input.totalTokens.total)} tok`);
+    facts.push(formatTokenUsage(input.totalTokens));
   const activity = formatActivityLabel(input.lastActivityAt, input.activityState);
   return activity || facts.length ? [activity, ...facts].filter(Boolean).join(" | ") : undefined;
 }
@@ -73,7 +81,8 @@ function formatNestedRunLines(children, options) {
       }
       const activity = child.state === "running" ? formatNestedActivity(child) : undefined;
       const error = child.error ? ` | error: ${child.error}` : "";
-      lines.push(`${indent}↳ ${nestedRunLabel(child)} [${child.id}] ${child.state}${activity ? ` | ${activity}` : ""}${error}`);
+      const modelThinking = formatModelThinking(child.model, child.thinking);
+      lines.push(`${indent}↳ ${nestedRunLabel(child)} [${child.id}] ${child.state}${modelThinking ? ` | ${modelThinking}` : ""}${activity ? ` | ${activity}` : ""}${error}`);
       if (options.commandHints && lines.length < options.maxLines)
         lines.push(`${indent}  Status: subagent({ action: "status", id: "${child.id}" })`);
       if (depth === options.maxDepth) {
@@ -86,7 +95,8 @@ function formatNestedRunLines(children, options) {
         if (lines.length >= options.maxLines)
           return;
         const stepActivity = step.status === "running" ? formatNestedActivity(step) : undefined;
-        lines.push(`${indent}  ${stepIndex + 1}. ${step.agent} ${step.status}${stepActivity ? ` | ${stepActivity}` : ""}${step.error ? ` | error: ${step.error}` : ""}`);
+        const stepModelThinking = formatModelThinking(step.model, step.thinking);
+        lines.push(`${indent}  ${stepIndex + 1}. ${step.sessionName?.trim() || step.agent} ${step.status}${stepModelThinking ? ` | ${stepModelThinking}` : ""}${stepActivity ? ` | ${stepActivity}` : ""}${step.error ? ` | error: ${step.error}` : ""}`);
         append(step.children, depth + 1, `${indent}    `);
       }
       append(child.children, depth + 1, `${indent}  `);