@link-assistant/hive-mind 2.0.22 → 2.0.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 2.0.24
+
+### Patch Changes
+
+- 4cdff62: Improve task disk usage diagnostics for repository and Docker container filesystem reporting.
+
+## 2.0.23
+
+### Patch Changes
+
+- 4778963: Add `--sub-agent-model` for Claude Code subagents and agent teams. The option is accepted by solve, hive, and Telegram command parsing, validates Claude aliases/full IDs plus `inherit`, and maps to `CLAUDE_CODE_SUBAGENT_MODEL` only when explicitly provided so Claude Code defaults remain unchanged.
+
 ## 2.0.22
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/agent-commander.lib.mjs

@@ -8,7 +8,7 @@
  */
 
 import { resolveCodexReasoningEffort } from './codex.options.lib.mjs';
-import { mapModelForTool } from './models/index.mjs';
+import { mapClaudeSubAgentModelToEnvValue, mapModelForTool } from './models/index.mjs';
 import { buildCodexDisable1mContextConfigArgs, buildCodexSubSessionSizeConfigArgs, parseSubSessionSize } from './sub-session-size.lib.mjs';
 import { detectUsageLimit } from './usage-limit.lib.mjs';
 import { getCacheReadTokenCount, getCumulativeContextInputTokens, getOutputTokenCount } from './context-fill.lib.mjs';
@@ -54,6 +54,7 @@ const buildClaudeToolOptions = (argv = {}) => {
   if (argv.disable1mContext) extraEnv.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
   if (argv.showThinkingContent) extraEnv.CLAUDE_CODE_SHOW_THINKING = '1';
   if (argv.planModel) extraEnv.ANTHROPIC_DEFAULT_OPUS_MODEL = argv.planModel;
+  if (argv.subAgentModel) extraEnv.CLAUDE_CODE_SUBAGENT_MODEL = mapClaudeSubAgentModelToEnvValue(argv.subAgentModel);
   appendExtraEnv(options, extraEnv);
 
   return options;

package/src/claude.lib.mjs

@@ -21,7 +21,7 @@ import { seedCumulativeAnthropicCost, addAnthropicRunCost } from './anthropic-co
 import { buildSolveResumeCommand } from './solve.resume-command.lib.mjs'; // Issue #942
 import { SESSION_FORCE_KILLED_MARKER, postTrackedComment } from './tool-comments.lib.mjs'; // Issue #1625
 import { handleClaudeRuntimeSwitch } from './claude.runtime-switch.lib.mjs'; // see issue #1141
-import { CLAUDE_MODELS as availableModels } from './models/index.mjs'; // Issue #1221
+import { CLAUDE_MODELS as availableModels, mapClaudeSubAgentModelToEnvValue } from './models/index.mjs'; // Issue #1221, #1978
 import { buildMcpConfigWithoutPlaywright, ensureClaudePlaywrightMcpServer } from './playwright-mcp.lib.mjs';
 import { resolveClaudeSessionToolFlags } from './useless-tools.lib.mjs';
 import { ensureClaudeQuietConfig } from './claude-quiet-config.lib.mjs';
@@ -658,6 +658,7 @@ export const executeClaudeCommand = async params => {
     let execCommand;
     const mappedModel = mapModelToId(argv.model);
     const resolvedPlanModel = argv.planModel ? mapModelToId(argv.planModel) : undefined; // Issue #1223
+    const resolvedSubAgentModel = argv.subAgentModel ? mapClaudeSubAgentModelToEnvValue(argv.subAgentModel) : undefined; // Issue #1978
     const effectiveModel = resolvedPlanModel ? 'opusplan' : mappedModel;
     const resolvedExecutionModel = resolvedPlanModel ? mappedModel : undefined;
     // Issue #1949: Let Claude Code handle transient overload (529) fallback via its own
@@ -706,12 +707,13 @@ export const executeClaudeCommand = async params => {
       // Issue #1706: --sub-session-size + --disable-1m-context. Resolve here, then pass into getClaudeEnv along with the rest.
       const { parsed: parsedSubSessionSize, contextWindowTokens } = await resolveSubSessionSize({ rawValue: argv.subSessionSize, tool: 'claude', modelId: effectiveModel, fetchModelInfo, log });
       // Issue #817: streaming mode sets exitAfterStopDelayMs=60000 so the headless Claude process stays alive between NDJSON turns.
-      const claudeEnv = getClaudeEnv({ thinkingBudget: resolvedThinkingBudget, model: effectiveModel, thinkLevel, maxBudget, planModel: resolvedPlanModel, executionModel: resolvedExecutionModel, showThinkingContent: argv.showThinkingContent, exitAfterStopDelayMs: streamingInput ? 60_000 : undefined, disable1mContext: !!argv.disable1mContext, subSessionSize: parsedSubSessionSize, contextWindowTokens });
+      const claudeEnv = getClaudeEnv({ thinkingBudget: resolvedThinkingBudget, model: effectiveModel, thinkLevel, maxBudget, planModel: resolvedPlanModel, executionModel: resolvedExecutionModel, subAgentModel: resolvedSubAgentModel, showThinkingContent: argv.showThinkingContent, exitAfterStopDelayMs: streamingInput ? 60_000 : undefined, disable1mContext: !!argv.disable1mContext, subSessionSize: parsedSubSessionSize, contextWindowTokens });
       if (argv.verbose) claudeEnv.ANTHROPIC_LOG = 'debug';
       const modelMaxOutputTokens = getMaxOutputTokensForModel(effectiveModel);
       if (argv.verbose) {
         await log(`📊 CLAUDE_CODE_MAX_OUTPUT_TOKENS: ${modelMaxOutputTokens}, MCP_TIMEOUT: ${claudeCode.mcpTimeout}ms, MCP_TOOL_TIMEOUT: ${claudeCode.mcpToolTimeout}ms, ANTHROPIC_LOG: debug`, { verbose: true });
         if (resolvedPlanModel) await log(`📊 opusplan: plan=${resolvedPlanModel}, exec=${resolvedExecutionModel}`, { verbose: true });
+        if (claudeEnv.CLAUDE_CODE_SUBAGENT_MODEL) await log(`📊 CLAUDE_CODE_SUBAGENT_MODEL: ${claudeEnv.CLAUDE_CODE_SUBAGENT_MODEL}`, { verbose: true });
         if (resolvedThinkingBudget !== undefined) await log(`📊 MAX_THINKING_TOKENS: ${resolvedThinkingBudget}`, { verbose: true });
         if (claudeEnv.CLAUDE_CODE_EFFORT_LEVEL) await log(`📊 CLAUDE_CODE_EFFORT_LEVEL: ${claudeEnv.CLAUDE_CODE_EFFORT_LEVEL}`, { verbose: true });
         if (claudeEnv.CLAUDE_CODE_SHOW_THINKING) await log(`📊 CLAUDE_CODE_SHOW_THINKING: ${claudeEnv.CLAUDE_CODE_SHOW_THINKING}`, { verbose: true });

package/src/config.lib.mjs

@@ -543,9 +543,11 @@ export const supportsThinkingBudget = (version, minVersion = '2.1.12') => {
 // Supports planModel/executionModel for opusplan mode (Issue #1223)
 // Issue #1706: supports subSessionSize (parsed) + disable1mContext to cap
 // auto-compaction sub-session size and opt out of the 1M extended context.
+// Issue #1978: supports subAgentModel for Claude Code native subagents and agent teams.
 // See: https://code.claude.com/docs/en/env-vars and https://code.claude.com/docs/en/model-config
 //   ANTHROPIC_DEFAULT_OPUS_MODEL  → model used in plan mode (and for 'opus' alias)
 //   ANTHROPIC_DEFAULT_SONNET_MODEL → model used in execution mode (and for 'sonnet' alias)
+//   CLAUDE_CODE_SUBAGENT_MODEL     → model used by all subagents and agent teams
 //   CLAUDE_CODE_DISABLE_1M_CONTEXT, CLAUDE_CODE_AUTO_COMPACT_WINDOW, CLAUDE_AUTOCOMPACT_PCT_OVERRIDE
 export const getClaudeEnv = (options = {}) => {
   // Get max output tokens based on model (Issue #1221)
@@ -619,6 +621,12 @@ export const getClaudeEnv = (options = {}) => {
     env.ANTHROPIC_DEFAULT_SONNET_MODEL = String(options.executionModel);
   }
 
+  // Issue #1978: Set Claude Code native subagent/agent-team model only when
+  // explicitly requested. Leaving this unset preserves Claude Code defaults.
+  if (options.subAgentModel) {
+    env.CLAUDE_CODE_SUBAGENT_MODEL = String(options.subAgentModel);
+  }
+
   // Issue #1706: --disable-1m-context. Sets CLAUDE_CODE_DISABLE_1M_CONTEXT=1.
   if (options.disable1mContext) {
     env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';

package/src/hive.mjs

@@ -74,7 +74,7 @@ if (isRunningDirectly) {
     const { validateClaudeConnection } = claudeLib;
     // Import model validation library
     const modelValidation = await import('./models/index.mjs');
-    const { validateAndExitOnInvalidModel, defaultModels, resolveRuntimeDefaultModel } = modelValidation;
+    const { validateAndExitOnInvalidClaudeSubAgentModel, validateAndExitOnInvalidModel, defaultModels, resolveRuntimeDefaultModel } = modelValidation;
     const githubLib = await import('./github.lib.mjs');
     const { checkGitHubPermissions, fetchAllIssuesWithPagination, fetchProjectIssues, isRateLimitError, batchCheckPullRequestsForIssues, parseGitHubUrl, batchCheckArchivedRepositories } = githubLib;
     // Import YouTrack-related functions
@@ -473,6 +473,9 @@ if (isRunningDirectly) {
       }
       await validateAndExitOnInvalidModel(argv.planModel, tool, safeExit);
     }
+    if (argv.subAgentModel) {
+      await validateAndExitOnInvalidClaudeSubAgentModel(argv.subAgentModel, tool, safeExit);
+    }
 
     // Handle -s (--skip-issues-with-prs) and --auto-continue interaction
     const hasExplicitAutoContinue = rawArgs.includes('--auto-continue');

package/src/isolation-runner.lib.mjs

@@ -58,6 +58,11 @@ const DOCKER_ISOLATION_SHELL = 'sh';
 // less headroom than this cannot safely pull one. Diagnostic only — never
 // blocks startup. See issue #1914.
 const DOCKER_ISOLATION_LOW_DISK_GIB = 40;
+// Docker-only start gate used to capture the container writable-layer baseline
+// before the task command begins cloning or generating files. The parent
+// releases the gate immediately after `docker inspect --size`; the fallback
+// keeps the task from hanging forever if the parent exits at the wrong time.
+const DOCKER_START_GATE_WAIT_TENTHS = 300;
 // Sentinel start-command's detached docker logger records when it cannot capture
 // the container's real exit code. A terminal `$ --status` carrying this value is
 // ambiguous — the container may still be running — so we cross-check it against
@@ -94,6 +99,16 @@ function buildShellCommand(command, args = []) {
   return [command, ...args].map(shellQuote).join(' ');
 }
 
+function buildDockerStartGatePath(sessionId) {
+  return sessionId ? `/tmp/hive-mind-disk-baseline-${sessionId}` : null;
+}
+
+function buildDockerStartGatedCommand(taskCommand, sessionId) {
+  const gatePath = buildDockerStartGatePath(sessionId);
+  if (!gatePath) return taskCommand;
+  return `gate=${shellQuote(gatePath)}; i=0; while [ ! -e "$gate" ] && [ "$i" -lt ${DOCKER_START_GATE_WAIT_TENTHS} ]; do i=$((i+1)); sleep 0.1; done; rm -f "$gate"; exec ${taskCommand}`;
+}
+
 function shouldRunPrivilegedDockerIsolation(image, env = process.env) {
   return String(env.HIVE_MIND_IMAGE_VARIANT || '').toLowerCase() === 'dind' || String(image || '').includes('hive-mind-dind');
 }
@@ -234,7 +249,8 @@ export function buildDockerIsolationStartArgs(command, args = [], options = {})
     startArgs.push('--volume', `${mount.source}:${mount.target}`);
   }
 
-  startArgs.push('--detached', '--session', sessionId, '--', buildShellCommand(command, args));
+  const taskCommand = buildShellCommand(command, args);
+  startArgs.push('--detached', '--session', sessionId, '--', buildDockerStartGatedCommand(taskCommand, sessionId));
   return startArgs;
 }
 
@@ -541,7 +557,7 @@ async function logDockerIsolationPostLaunchDiagnostics(sessionId, env = process.
  * @param {string} [options.sessionId] - UUID for session tracking (auto-generated if not provided)
  * @param {string} [options.tool] - AI tool selected for the task; used to scope Docker auth mounts
  * @param {boolean} [options.verbose] - Enable verbose logging
- * @returns {Promise<{success: boolean, sessionId: string, output: string, error?: string, warning?: string}>}
+ * @returns {Promise<{success: boolean, sessionId: string, output: string, error?: string, warning?: string, containerFilesystemStartBytes?: number|null}>}
  */
 export async function executeWithIsolation(command, args, options = {}) {
   const { backend, verbose = false } = options;
@@ -598,6 +614,15 @@ export async function executeWithIsolation(command, args, options = {}) {
     if (result.error) stream(`[VERBOSE] isolation-runner: Error: ${result.error}`);
   }
 
+  let containerFilesystemStartBytes = null;
+  if (result.success && backend === 'docker') {
+    try {
+      containerFilesystemStartBytes = await getDockerContainerWritableLayerSize(sessionId, verbose);
+    } finally {
+      await releaseDockerContainerStartGate(sessionId, verbose);
+    }
+  }
+
   // Issue #1939: capture the freshly-launched docker session's reported status
   // and the live container state together, so the next iteration has the data to
   // diagnose a premature "executed/-1" status (problem #1) or a surprise image
@@ -611,6 +636,7 @@ export async function executeWithIsolation(command, args, options = {}) {
       success: true,
       sessionId,
       output: result.output,
+      containerFilesystemStartBytes,
     };
   }
 
@@ -831,6 +857,77 @@ export async function checkDockerContainerRunning(containerName, verbose = false
   }
 }
 
+export function parseDockerContainerWritableLayerSizeOutput(output) {
+  const text = String(output || '').trim();
+  if (!text) return null;
+  const bytes = Number.parseInt(text.split(/\s+/)[0], 10);
+  return Number.isFinite(bytes) && bytes >= 0 ? bytes : null;
+}
+
+/**
+ * Best-effort size of a Docker task container's writable layer.
+ *
+ * `docker inspect --size` exposes `.SizeRw`, which excludes the image's base
+ * layers and counts only filesystem data created or changed by this container.
+ * That is the closest Docker-native representation of per-task disk usage.
+ *
+ * @param {string} containerName - Container name (the session UUID)
+ * @param {boolean} [verbose] - Enable verbose logging
+ * @returns {Promise<number|null>} Writable layer bytes, or null when unavailable.
+ */
+export async function getDockerContainerWritableLayerSize(containerName, verbose = false) {
+  if (!containerName) return null;
+  try {
+    const result = await $({ mirror: false })`docker inspect --size -f ${'{{.SizeRw}}'} ${containerName}`;
+    const bytes = parseDockerContainerWritableLayerSizeOutput(result.stdout?.toString() || '');
+    if (verbose) {
+      const label = bytes === null ? 'unknown' : `${bytes} bytes`;
+      console.log(`[VERBOSE] isolation-runner: docker writable layer size for '${containerName}': ${label}`);
+    }
+    return bytes;
+  } catch (error) {
+    if (verbose) {
+      const stderr = error?.stderr?.toString?.().trim();
+      console.log(`[VERBOSE] isolation-runner: could not inspect writable layer size for '${containerName}': ${stderr || error?.message || error}`);
+    }
+    return null;
+  }
+}
+
+/**
+ * Release the Docker-only start gate after the writable-layer baseline has been
+ * captured. Best-effort: the gated task also has a timeout fallback.
+ *
+ * @param {string} containerName - Container name (the session UUID)
+ * @param {boolean} [verbose] - Enable verbose logging
+ * @returns {Promise<boolean>} true when the gate file was touched.
+ */
+export async function releaseDockerContainerStartGate(containerName, verbose = false) {
+  const gatePath = buildDockerStartGatePath(containerName);
+  if (!containerName || !gatePath) return false;
+  const releaseCommand = `touch ${shellQuote(gatePath)}`;
+  let lastError = null;
+
+  for (let attempt = 1; attempt <= 5; attempt++) {
+    try {
+      await $({ mirror: false })`docker exec ${containerName} sh -c ${releaseCommand}`;
+      if (verbose) {
+        console.log(`[VERBOSE] isolation-runner: released docker start gate for '${containerName}'`);
+      }
+      return true;
+    } catch (error) {
+      lastError = error;
+      await new Promise(resolve => setTimeout(resolve, 200));
+    }
+  }
+
+  if (verbose) {
+    const stderr = lastError?.stderr?.toString?.().trim();
+    console.log(`[VERBOSE] isolation-runner: could not release docker start gate for '${containerName}': ${stderr || lastError?.message || lastError}`);
+  }
+  return false;
+}
+
 /**
  * Best-effort removal for a Docker container backing a native
  * `$ --isolated docker` session.

package/src/models/index.mjs

@@ -742,6 +742,62 @@ export const validateModelName = (model, tool = 'claude') => {
   };
 };
 
+export const CLAUDE_SUB_AGENT_MODEL_INHERIT = 'inherit';
+
+export const normalizeClaudeSubAgentModelName = model => {
+  if (model === undefined || model === null) return model;
+  if (typeof model !== 'string') return model;
+
+  const trimmed = model.trim();
+  return trimmed.toLowerCase() === CLAUDE_SUB_AGENT_MODEL_INHERIT ? CLAUDE_SUB_AGENT_MODEL_INHERIT : trimmed;
+};
+
+const looksLikeClaudeProviderModelId = model => {
+  if (typeof model !== 'string') return false;
+  const normalized = model.toLowerCase();
+  return normalized.startsWith('claude-') || normalized.startsWith('anthropic/') || normalized.startsWith('anthropic.') || normalized.includes('.anthropic.');
+};
+
+/**
+ * Validate the Claude Code subagent/agent-team model override.
+ *
+ * Claude Code documents CLAUDE_CODE_SUBAGENT_MODEL as accepting full provider
+ * model IDs, normal Claude model aliases, and the special value "inherit".
+ * Keep "inherit" scoped to this option so it does not become a valid main
+ * session model.
+ *
+ * @param {string} model - The subagent model override value
+ * @returns {{ valid: boolean, message?: string, suggestions?: string[], mappedModel?: string }}
+ */
+export const validateClaudeSubAgentModelName = model => {
+  const normalized = normalizeClaudeSubAgentModelName(model);
+
+  if (normalized === CLAUDE_SUB_AGENT_MODEL_INHERIT) {
+    return {
+      valid: true,
+      mappedModel: CLAUDE_SUB_AGENT_MODEL_INHERIT,
+    };
+  }
+
+  const validation = validateModelName(normalized, 'claude');
+  if (validation.valid) return validation;
+  if (looksLikeClaudeProviderModelId(normalized)) {
+    return {
+      valid: true,
+      mappedModel: normalized,
+    };
+  }
+
+  return validation;
+};
+
+export const mapClaudeSubAgentModelToEnvValue = model => {
+  const result = validateClaudeSubAgentModelName(model);
+  if (result.valid && result.mappedModel) return result.mappedModel;
+  const normalized = normalizeClaudeSubAgentModelName(model);
+  return mapModelForTool('claude', normalized);
+};
+
 /**
  * Validate model name and exit with error if invalid
  * This is the main entry point for model validation in solve.mjs, hive.mjs, etc.
@@ -767,6 +823,46 @@ export const validateAndExitOnInvalidModel = async (model, tool = 'claude', exit
   return true;
 };
 
+/**
+ * Validate --sub-agent-model and exit with error if invalid.
+ *
+ * This option maps to Claude Code's CLAUDE_CODE_SUBAGENT_MODEL, so it is only
+ * meaningful for the Claude tool even when solve/hive supports multiple tools.
+ *
+ * @param {string} model - The subagent model override value
+ * @param {string} tool - The selected tool
+ * @param {Function} exitFn - Function to call for exiting (default: process.exit)
+ * @returns {Promise<boolean>} True if valid, exits process if invalid
+ */
+export const validateAndExitOnInvalidClaudeSubAgentModel = async (model, tool = 'claude', exitFn = null) => {
+  if (model === undefined || model === null || model === '') return true;
+
+  if (tool !== 'claude') {
+    await log(`❌ --sub-agent-model is only supported with --tool claude (current tool: ${tool})`, { level: 'error' });
+    if (exitFn) {
+      await exitFn(1, '--sub-agent-model requires --tool claude');
+    } else {
+      process.exit(1);
+    }
+    return false;
+  }
+
+  const result = validateClaudeSubAgentModelName(model);
+
+  if (!result.valid) {
+    await log(`❌ Invalid --sub-agent-model: ${result.message}`, { level: 'error' });
+
+    if (exitFn) {
+      await exitFn(1, 'Invalid sub-agent model name');
+    } else {
+      process.exit(1);
+    }
+    return false;
+  }
+
+  return true;
+};
+
 /**
  * Format the list of available models for help text
  * @param {string} tool - The tool name

package/src/session-monitor.lib.mjs

@@ -338,19 +338,32 @@ async function resolvePullRequestUrlFromSessionLog(logPath, ctx, { verbose = fal
 }
 
 /**
- * Issue #1945: Parse `📊 [DISK]` checkpoint markers out of the captured solve
- * log and, when the captured sizes cross the 5 GB threshold(s), build a
- * Telegram extraSection that warns the operator. Returns an empty string if
- * the log is unreadable or contains no markers.
+ * Issue #1945/#1988: Parse `📊 [DISK]` repository-size checkpoint markers out
+ * of the captured solve log, optionally add docker writable-layer sizes, and
+ * build the Telegram extraSection. Returns an empty string if there is no
+ * repository or docker filesystem data to show.
  */
-async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, readFile = fs.readFile } = {}) {
-  if (!logPath) return '';
+async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, readFile = fs.readFile, isolationBackend = null, containerFilesystemStartBytes = null, containerFilesystemAfterBytes = null } = {}) {
+  if (!logPath && !Number.isFinite(containerFilesystemStartBytes) && !Number.isFinite(containerFilesystemAfterBytes)) return '';
   try {
     const diskLib = await import('./solve.disk-diagnostics.lib.mjs');
-    const logText = await readFile(logPath, 'utf8');
+    let logText = '';
+    if (logPath) {
+      try {
+        logText = await readFile(logPath, 'utf8');
+      } catch (readError) {
+        if (verbose) {
+          console.log(`[VERBOSE] Could not read session log ${logPath} for disk diagnostics: ${readError?.message || readError}`);
+        }
+      }
+    }
     const parsed = diskLib.parseDiskMarkers(logText);
-    if (!parsed.afterClone && !parsed.afterAgent) return '';
-    return diskLib.formatDiskDiagnosticsBlock(parsed);
+    if (!parsed.afterClone && !parsed.afterAgent && !Number.isFinite(containerFilesystemStartBytes) && !Number.isFinite(containerFilesystemAfterBytes)) return '';
+    return diskLib.formatDiskDiagnosticsBlock(parsed, {
+      isolationBackend,
+      containerFilesystemStartBytes,
+      containerFilesystemAfterBytes,
+    });
   } catch (error) {
     if (verbose) {
       console.log(`[VERBOSE] Could not inspect session log ${logPath} for disk diagnostics: ${error?.message || error}`);
@@ -359,6 +372,26 @@ async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, read
   }
 }
 
+async function getDockerContainerFilesystemSizeForSession(sessionName, sessionInfo, { verbose = false, sizeProvider = null } = {}) {
+  if (sessionInfo?.isolationBackend !== 'docker') return null;
+  const containerName = sessionInfo.sessionId || sessionName;
+  if (!containerName) return null;
+  try {
+    if (typeof sizeProvider === 'function') {
+      const bytes = await sizeProvider(containerName, { sessionName, sessionInfo, verbose });
+      return Number.isFinite(bytes) ? bytes : null;
+    }
+    const runner = await getIsolationRunner();
+    if (typeof runner.getDockerContainerWritableLayerSize !== 'function') return null;
+    return await runner.getDockerContainerWritableLayerSize(containerName, verbose);
+  } catch (error) {
+    if (verbose) {
+      console.log(`[VERBOSE] Could not inspect docker filesystem size for ${containerName}: ${error?.message || error}`);
+    }
+    return null;
+  }
+}
+
 function isSuccessfulTaskCompletion({ exitCode = null, status = null } = {}) {
   const outcome = classifySessionOutcome({ exitCode, status });
   if (outcome.failed) return false;
@@ -783,13 +816,22 @@ export async function monitorSessions(bot, verbose = false, options = {}) {
           }
         }
 
-        // Issue #1945: append a "💾 Disk usage" block (with warnings when the
-        // cloned repo, the delta during the run, or the total exceed 5 GB)
-        // parsed from the captured solve log markers.
+        // Issue #1945/#1988: append a "💾 Disk usage" block from repository
+        // size markers and, for docker isolation, the container writable layer.
         const diskExtraSections = [];
         try {
           const diskLogPath = statusResult?.logPath || sessionInfo?.logPath || null;
-          const diskBlock = await buildDiskDiagnosticsExtraSection(diskLogPath, { verbose });
+          const containerFilesystemAfterBytes = await getDockerContainerFilesystemSizeForSession(sessionName, sessionInfo, {
+            verbose,
+            sizeProvider: options.dockerContainerSizeProvider,
+          });
+          const diskBlock = await buildDiskDiagnosticsExtraSection(diskLogPath, {
+            verbose,
+            readFile: options.readFile,
+            isolationBackend: sessionInfo?.isolationBackend || statusResult?.isolation || null,
+            containerFilesystemStartBytes: Number.isFinite(sessionInfo?.containerFilesystemStartBytes) ? sessionInfo.containerFilesystemStartBytes : null,
+            containerFilesystemAfterBytes,
+          });
           if (diskBlock) diskExtraSections.push(diskBlock);
         } catch (diskError) {
           if (verbose) {

package/src/session-store.lib.mjs

@@ -33,7 +33,7 @@ import path from 'node:path';
 // excluded so the snapshot stays small and safe to reload.
 // `args` (#1927 review follow-up) is persisted so a killed /solve can be resumed
 // with its exact original invocation plus `--resume <lastSessionId>`.
-const PERSISTABLE_FIELDS = ['chatId', 'messageId', 'startTime', 'url', 'command', 'isolationBackend', 'sessionId', 'tool', 'infoBlock', 'urlContext', 'requesterUserId', 'showLimits', 'locale', 'logPath', 'args'];
+const PERSISTABLE_FIELDS = ['chatId', 'messageId', 'startTime', 'url', 'command', 'isolationBackend', 'sessionId', 'containerFilesystemStartBytes', 'tool', 'infoBlock', 'urlContext', 'requesterUserId', 'showLimits', 'locale', 'logPath', 'args'];
 
 /**
  * Resolve the directory durable bot state is written to. Honors

package/src/solve.config.lib.mjs

@@ -333,6 +333,11 @@ export const SOLVE_OPTION_DEFINITIONS = {
     description: 'Fallback model to switch to on model capacity/overload errors (and, for Fable 5, on safety-classifier refusals). When supported, retries resume the same session with this model. Defaults: claude fable/claude-fable-5 -> opus (Opus 4.8); claude mythos-5/claude-mythos-5 -> fable; claude opus/opus-4-8 -> opus-4-7; claude opus-4-7 -> opus-4-6; codex gpt-5.5 -> gpt-5.4; all others unset.',
     default: undefined,
   },
+  'sub-agent-model': {
+    type: 'string',
+    description: 'Claude Code subagent/agent-team model override. Sets CLAUDE_CODE_SUBAGENT_MODEL only when provided. Accepts Claude model aliases, full model IDs, or "inherit" to use normal Claude Code subagent model resolution. Only works with --tool claude.',
+    default: undefined,
+  },
   'show-thinking-content': {
     type: 'boolean',
     description: 'Show thinking content in Claude responses. Opus 4.7+ omits thinking content by default (applies to Opus 4.8 as well); this option opts in to receive summarized thinking blocks. Disabled by default. Only affects --tool claude.',

package/src/solve.disk-diagnostics.lib.mjs

@@ -10,12 +10,8 @@
  *
  * Both checkpoints are written to the captured solve log as a single-line
  * structured marker. The Telegram bot's `session-monitor.lib.mjs` parses those
- * markers and, on the completion message, surfaces a Telegram block plus
- * warnings when any of the three thresholds from the issue are crossed:
- *
- *   - cloned repository  > WARNING_THRESHOLD_BYTES
- *   - delta during run   > WARNING_THRESHOLD_BYTES
- *   - total space used   > WARNING_THRESHOLD_BYTES
+ * markers and, on the completion message, surfaces a Telegram block plus a
+ * warning when total task disk usage crosses the configured threshold.
  *
  * Implementation notes:
  *
@@ -220,54 +216,79 @@ export function computeDiskWarnings(parsed, threshold = WARNING_THRESHOLD_BYTES)
 
 /**
  * Telegram block (Markdown code fence) describing the captured sizes plus,
- * when any threshold is crossed, a `⚠️ Warnings:` tail. Returns an empty
- * string when there are no markers in the log (no logs ⇒ no surprise output).
+ * when the task total crosses the threshold, a warning tail. Returns an empty
+ * string when there are no markers or docker container filesystem sizes to show
+ * (no logs ⇒ no surprise output).
  *
  * Returned shape:
  *
  *   💾 Disk usage (gh-issue-solver-…)
  *   ```
- *   Cloned repository: 12.0 GB
- *   After agent:       12.4 GB (+500.0 MB)
- *   Threshold:         5.0 GB
+ *   Repository size:
+ *     Cloned:          12.0 GB
+ *     On completion:   12.4 GB (+500 MB)
  *
- *   ⚠️ Cloned repository exceeds 5.0 GB
- *   ⚠️ Total disk usage exceeds 5.0 GB
+ *   ⚠️ Total disk usage per task exceeds 5.0 GB
  *   ```
  *
  * @param {{afterClone: object|null, afterAgent: object|null}} parsed
  * @param {Object} [options]
  * @param {number} [options.threshold=WARNING_THRESHOLD_BYTES]
  * @param {string} [options.title='💾 Disk usage']
+ * @param {string} [options.isolationBackend] - Adds container filesystem details for docker isolation.
+ * @param {number|null} [options.containerFilesystemStartBytes]
+ * @param {number|null} [options.containerFilesystemAfterBytes]
  * @returns {string}
  */
 export function formatDiskDiagnosticsBlock(parsed, options = {}) {
-  if (!parsed || (!parsed.afterClone && !parsed.afterAgent)) return '';
   const threshold = Number.isFinite(options.threshold) ? options.threshold : WARNING_THRESHOLD_BYTES;
   const title = options.title || '💾 Disk usage';
-  const warnings = computeDiskWarnings(parsed, threshold);
+  const isolationBackend = String(options.isolationBackend || '').toLowerCase();
+  const isDockerIsolation = isolationBackend === 'docker';
+  const containerFilesystemStartBytes = Number.isFinite(options.containerFilesystemStartBytes) ? options.containerFilesystemStartBytes : null;
+  const containerFilesystemAfterBytes = Number.isFinite(options.containerFilesystemAfterBytes) ? options.containerFilesystemAfterBytes : null;
+  const hasRepositoryMarkers = Boolean(parsed?.afterClone || parsed?.afterAgent);
+  const hasContainerFilesystemMarkers = isDockerIsolation && (containerFilesystemStartBytes !== null || containerFilesystemAfterBytes !== null);
+  if (!hasRepositoryMarkers && !hasContainerFilesystemMarkers) return '';
+
   const lines = [];
-  const cloneBytes = parsed.afterClone?.bytes ?? null;
-  const totalBytes = parsed.afterAgent?.bytes ?? null;
-  const deltaBytes = parsed.afterAgent?.deltaBytes ?? null;
-  if (cloneBytes !== null) {
-    lines.push(`Cloned repository: ${formatBytes(cloneBytes)}`);
+  const cloneBytes = parsed?.afterClone?.bytes ?? null;
+  const totalBytes = parsed?.afterAgent?.bytes ?? null;
+  const deltaBytes = parsed?.afterAgent?.deltaBytes ?? null;
+
+  const pushSizeLine = (label, bytes, suffix = '') => {
+    if (bytes === null) return;
+    lines.push(`  ${label.padEnd(16)} ${formatBytes(bytes)}${suffix}`);
+  };
+
+  if (hasRepositoryMarkers) {
+    lines.push('Repository size:');
+    pushSizeLine('Cloned:', cloneBytes);
+    if (totalBytes !== null) {
+      const deltaStr = deltaBytes !== null ? ` (${formatBytesDelta(deltaBytes)})` : '';
+      pushSizeLine('On completion:', totalBytes, deltaStr);
+    } else if (deltaBytes !== null) {
+      lines.push(`  ${'Delta during run:'.padEnd(16)} ${formatBytesDelta(deltaBytes)}`);
+    }
   }
-  if (totalBytes !== null) {
-    const deltaStr = deltaBytes !== null ? ` (${formatBytesDelta(deltaBytes)})` : '';
-    lines.push(`After agent:       ${formatBytes(totalBytes)}${deltaStr}`);
-  } else if (deltaBytes !== null) {
-    lines.push(`Delta during run:  ${formatBytesDelta(deltaBytes)}`);
+
+  if (hasContainerFilesystemMarkers) {
+    lines.push('Container filesystem size:');
+    pushSizeLine('On start:', containerFilesystemStartBytes);
+    pushSizeLine('On completion:', containerFilesystemAfterBytes);
   }
-  lines.push(`Threshold:         ${formatBytes(threshold)}`);
+
+  const taskTotalBytes = isDockerIsolation && containerFilesystemAfterBytes !== null ? containerFilesystemAfterBytes : (totalBytes ?? cloneBytes);
   const warningLines = [];
-  if (warnings.cloneTooLarge) warningLines.push(`⚠️ Cloned repository exceeds ${formatBytes(threshold)}`);
-  if (warnings.deltaTooLarge) warningLines.push(`⚠️ Folder grew by more than ${formatBytes(threshold)} during the run`);
-  if (warnings.totalTooLarge) warningLines.push(`⚠️ Total disk usage exceeds ${formatBytes(threshold)}`);
+  if (Number.isFinite(taskTotalBytes) && taskTotalBytes > threshold) {
+    warningLines.push(`⚠️ Total disk usage per task exceeds ${formatBytes(threshold)}`);
+  }
+
   if (warningLines.length) {
     lines.push('');
     lines.push(...warningLines);
   }
+
   return `${title}\n\`\`\`\n${lines.join('\n')}\n\`\`\``;
 }
 

package/src/solve.mjs

@@ -64,7 +64,7 @@ const { attachFinalLogIfMissing } = await import('./attach-logs-guarantee.lib.mj
 // "did the AI post anything?" check in --auto-attach-solution-summary).
 const { postTrackedComment, USAGE_LIMIT_REACHED_MARKER } = await import('./tool-comments.lib.mjs');
 const { prepareFeedbackAndTimestamps, checkUncommittedChanges, checkForkActions } = await import('./solve.preparation.lib.mjs');
-const { validateAndExitOnInvalidModel } = await import('./models/index.mjs');
+const { validateAndExitOnInvalidClaudeSubAgentModel, validateAndExitOnInvalidModel } = await import('./models/index.mjs');
 const { autoAcceptInviteForRepo } = await import('./solve.accept-invite.lib.mjs');
 const { handleAutoForkOption, handleMaintainerForkAccess } = await import('./solve.fork-detection.lib.mjs');
 // Initialize log file early (before argument parsing) to capture all output
@@ -243,6 +243,7 @@ if (argv.planModel) {
   }
   await validateAndExitOnInvalidModel(argv.planModel, tool, safeExit);
 }
+if (argv.subAgentModel) await validateAndExitOnInvalidClaudeSubAgentModel(argv.subAgentModel, tool, safeExit);
 
 // Perform all system checks (skip tool connection check in dry-run or when --skip-tool-connection-check; model validation always runs)
 const skipToolConnectionCheck = argv.dryRun || argv.skipToolConnectionCheck || argv.toolConnectionCheck === false;

package/src/telegram-bot.mjs

@@ -316,7 +316,7 @@ if (config.dryRun) {
 const { buildUserMention } = await import('./buildUserMention.lib.mjs');
 const { reportError, initializeSentry, addBreadcrumb } = await import('./sentry.lib.mjs');
 const { parseGitHubUrl, validateGitHubEntityExistence } = await import('./github.lib.mjs');
-const { validateModelName, buildModelOptionDescription } = await import('./models/index.mjs');
+const { validateClaudeSubAgentModelName, validateModelName, buildModelOptionDescription } = await import('./models/index.mjs');
 const { resolveIsolation, createIsolationAwareQueueCallback } = await import('./telegram-isolation.lib.mjs');
 const limitsLib = await import('./limits.lib.mjs');
 const { formatUsageMessage, formatCodexLimitsSection, getAllCachedLimits } = limitsLib;
@@ -435,6 +435,12 @@ function validateModelInArgs(args, tool = 'claude') {
       if (!validation.valid) {
         return validation.message;
       }
+    } else if (args[i] === '--sub-agent-model' || args[i].startsWith('--sub-agent-model=')) {
+      const modelName = args[i] === '--sub-agent-model' ? args[i + 1] : args[i].substring('--sub-agent-model='.length);
+      if (!modelName) continue;
+      if (tool !== 'claude') return `--sub-agent-model is only supported with --tool claude (current tool: ${tool})`;
+      const validation = validateClaudeSubAgentModelName(modelName);
+      if (!validation.valid) return `Invalid --sub-agent-model: ${validation.message}`;
     }
   }
   return null;

package/src/telegram-command-execution.lib.mjs

@@ -127,6 +127,10 @@ export function buildExecuteAndUpdateMessage(deps) {
       trackSession(session, sessionInfo, VERBOSE);
       await safeEdit(formatStartingWorkSessionMessage({ sessionName: session, isolationBackend: iso.backend, infoBlock, locale }));
       result = await iso.runner.executeWithIsolation(commandName, args, { backend: iso.backend, sessionId: session, tool, verbose: VERBOSE });
+      if (result.success && sessionInfo && Number.isFinite(result.containerFilesystemStartBytes)) {
+        sessionInfo.containerFilesystemStartBytes = result.containerFilesystemStartBytes;
+        trackSession(session, sessionInfo, VERBOSE);
+      }
       if (!result.success) {
         // The launch never produced a live container — drop the optimistic
         // tracking so a phantom session is not monitored or resumed.

package/src/telegram-isolation.lib.mjs

@@ -92,6 +92,7 @@ export function createIsolationAwareQueueCallback(botIsolationBackend, botIsolat
             command: item.command || 'solve',
             isolationBackend: iso.backend,
             sessionId: sid,
+            containerFilesystemStartBytes: Number.isFinite(r.containerFilesystemStartBytes) ? r.containerFilesystemStartBytes : null,
             tool,
             infoBlock: item.infoBlock,
             // Issue #1688: propagate URL context + requester through the queue so the