mixdog 1.1.2 → 1.2.0

package/src/session-runtime/services/agent-tool/job-views/agent-list.mjs

@@ -3,6 +3,7 @@
 // progress, filtered by default to workers that can still do work.
 import { ACTIVE_STAGES } from '../tool-def.mjs';
 import { isTerminalWorkerStatus } from '../worker-rows.mjs';
+import { sessionUsageTotals } from '../../../../runtime/shared/session-usage-totals.mjs';
 
 // Idle, closed, errored and reaped/unknown rows are history and stay reachable
 // through the task section (status/read keep their terminal result).
@@ -36,6 +37,7 @@ function agentRow({ tag, session, runtime, progress, now, indexRow = null }) {
     preset: session.presetName || null,
     effort: session.effort || null,
     fast: session.fast === true,
+    ...(session.autoEffort === false ? { autoEffort: false } : {}),
     // Additive: route model parameters (e.g. Daybreak Blue) when the route has any.
     ...(session.modelParameters && Object.keys(session.modelParameters).length
       ? { modelParameters: { ...session.modelParameters } }
@@ -51,6 +53,7 @@ function agentRow({ tag, session, runtime, progress, now, indexRow = null }) {
     clientHostPid: session.clientHostPid || null,
     lastStreamDeltaAt: runtime?.lastStreamDeltaAt ? new Date(runtime.lastStreamDeltaAt).toISOString() : null,
     staleSeconds: runtime?.lastStreamDeltaAt ? Math.floor((now - runtime.lastStreamDeltaAt) / 1000) : null,
+    ...sessionUsageTotals(session),
     windowTokens: Number(session.lastContextTokens ?? session.lastInputTokens) || 0,
     windowCap: Number(session.contextWindow) || null,
     permission: session.permission || null,

package/src/session-runtime/services/agent-tool/job-views/job-lookup.mjs

@@ -69,6 +69,7 @@ export function createJobLookup({ mgr, tags, refreshTagsFromSessions }) {
         model: session.model || null,
         effort: session.effort || null,
         fast: session.fast === true,
+        ...(session.autoEffort === false ? { autoEffort: false } : {}),
       },
     };
   }

package/src/session-runtime/services/agent-tool/job-views/spawn-meta.mjs

@@ -16,6 +16,7 @@ export function preparedSpawnMeta(prepared, extras = {}) {
     model: prepared.preset.model,
     effort: prepared.preset.effort || null,
     fast: prepared.preset.fast === true,
+    ...(prepared.preset.autoEffort === false ? { autoEffort: false } : {}),
   });
 }
 

package/src/session-runtime/services/agent-tool/lead-worker-index.mjs

@@ -72,6 +72,20 @@ export function createLeadWorkerIndex({ dataDir, cfgMod, workerRowFromSession })
     return true;
   }
 
+  /** A workspace transition moved the Lead: its existing row follows (status,
+   *  reap deadline and liveness stamps unchanged). No row: nothing to write. */
+  function updateLeadWorkerCwd(sessionId, cwd) {
+    const id = clean(sessionId);
+    const next = clean(cwd);
+    if (!id || !next) return false;
+    index.write((byKey) => {
+      const current = byKey.get(id);
+      if (!current || current.cwd === next) return;
+      byKey.set(id, { ...current, cwd: next });
+    });
+    return true;
+  }
+
   /** Graceful-exit settlement: every turn this process still claims goes idle
    *  before the runtime disappears. */
   function flushActiveLeadRows() {
@@ -147,6 +161,7 @@ export function createLeadWorkerIndex({ dataDir, cfgMod, workerRowFromSession })
     /** Resolves once every queued Lead index write is on disk. */
     flushLeadWorkerIndexWrites: index.flush,
     upsertLeadSession,
+    updateLeadWorkerCwd,
     removeLeadWorkerRow,
     flushActiveLeadRows,
     recoverStaleLeadRows,

package/src/session-runtime/services/agent-tool/send-flow.mjs

@@ -180,6 +180,7 @@ export function createSendFlow({ mgr, defaultCwd, sessionSurface, canUseSessionS
         preset: session.presetName || null,
         effort: session.effort || null,
         fast: session.fast === true,
+        ...(session.autoEffort === false ? { autoEffort: false } : {}),
       },
       (job, ownerNotifyContext) => runSend(prepared, ownerNotifyContext, job),
       notifyContext

package/src/session-runtime/services/agent-tool/spawn-flow/spawn-plan.mjs

@@ -17,6 +17,7 @@ import { isAgentDisabled } from '../../../../runtime/shared/agent-route-config.m
 import { normalizeAgentPermission } from '../../../../runtime/shared/markdown-frontmatter.mjs';
 import { resolveAgentSpawnPreset } from '../spawn-preset.mjs';
 import { AGENT_OWNER } from '../../../../runtime/agent/orchestrator/agent-owner.mjs';
+import { workspaceCwdLock } from '../../../workspace/admission-gate.mjs';
 
 export function createSpawnPlanner({
   cfgMod,
@@ -52,8 +53,15 @@ export function createSpawnPlanner({
     if (resolveTag(tag, context, { scanSessions: wantsSessionScan(args) })) {
       throw new Error(`agent spawn: tag "${tag}" already exists`);
     }
-    const baseCwd = resolve(callerCwd || defaultCwd || process.cwd());
-    const workerCwd = clean(args.cwd) ? resolve(baseCwd, args.cwd) : baseCwd;
+    // Workers share their Lead's execution root. While the Lead runs in its
+    // worktree, that root is locked: neither args.cwd nor an inherited
+    // (pre-transition) cwd can send a worker elsewhere.
+    const lockedCwd = workspaceCwdLock([
+      context?.ownerSessionId,
+      context?.callerSessionId || context?.sessionId,
+    ]);
+    const baseCwd = resolve(lockedCwd || callerCwd || defaultCwd || process.cwd());
+    const workerCwd = !lockedCwd && clean(args.cwd) ? resolve(baseCwd, args.cwd) : baseCwd;
     const prompt = await resolvePrompt(args, workerCwd);
     if (prepState?.timedOut) {
       throw new Error('agent spawn prep timed out before session bind');

package/src/session-runtime/services/agent-tool/spawn-flow/spawn-prep.mjs

@@ -10,6 +10,7 @@ import { prepareAgentSession } from '../../../../runtime/agent/orchestrator/agen
 import { getProvider } from '../../../../runtime/agent/orchestrator/providers/registry.mjs';
 import { resolveRouteContextState } from '../../../route-state.mjs';
 import { createSpawnPlanner } from './spawn-plan.mjs';
+import { enterWorkerSpawn } from '../../../workspace/admission-gate.mjs';
 
 /** The route fields every worker-row and tag record carries. */
 export function presetDescriptor(agent, preset, presetName) {
@@ -20,6 +21,7 @@ export function presetDescriptor(agent, preset, presetName) {
     model: preset.model,
     effort: preset.effort || null,
     fast: preset.fast === true,
+    ...(preset.autoEffort === false ? { autoEffort: false } : {}),
   };
 }
 
@@ -84,9 +86,9 @@ export function createSpawnPreparer({
     // A sub-100 context share needs the window it selects; a percent alone
     // keeps the full served window.
     const sessionSpec = { ...spec };
-    if (plan.preset.contextPercent) {
-      const { contextPercent, selectedContextWindow } = resolveRouteContextState(plan.preset, null);
-      Object.assign(sessionSpec, { contextPercent, selectedContextWindow });
+    if (plan.preset.contextPercent || plan.preset.contextTokens) {
+      const { contextPercent, selectedContextWindow, contextTokens } = resolveRouteContextState(plan.preset, null);
+      Object.assign(sessionSpec, { contextPercent, selectedContextWindow }, contextTokens ? { contextTokens } : {});
     }
     if (sessionSurface?.canonical === true && typeof sessionSurface.createChild === 'function') {
       return sessionSurface.createChild({ spec: sessionSpec, prompt: plan.prompt, tag: plan.tag });
@@ -99,10 +101,20 @@ export function createSpawnPreparer({
   }
 
   async function prepareSpawnInProcess(args, callerCwd = null, context = {}, prepState = null) {
-    const plan = await resolveSpawnPlan(args, callerCwd, context, prepState);
-    const spec = spawnSessionSpec(plan, args, context);
-    const { session, effectiveCwd } = await createSpawnedSession(plan, spec, prepState);
-    bindSpawnedSession(session, plan);
+    // Shared admission with Lead workspace transitions: no spawn is prepared
+    // while the Lead's workspace changes, no transition starts mid-spawn.
+    const leaveSpawn = enterWorkerSpawn([context?.ownerSessionId, context?.callerSessionId || context?.sessionId]);
+    let plan;
+    let session;
+    let effectiveCwd;
+    try {
+      plan = await resolveSpawnPlan(args, callerCwd, context, prepState);
+      const spec = spawnSessionSpec(plan, args, context);
+      ({ session, effectiveCwd } = await createSpawnedSession(plan, spec, prepState));
+      bindSpawnedSession(session, plan);
+    } finally {
+      leaveSpawn();
+    }
     if (sessionSurface?.canonical !== true) {
       maybePrewarmSpawnTransport(plan, session);
     }

package/src/session-runtime/services/agent-tool/spawn-preset.mjs

@@ -20,6 +20,7 @@ export function resolveAgentSpawnPreset(config, args = {}) {
         model: clean(args.model),
         effort: clean(args.effort) || undefined,
         fast: args.fast === true,
+        ...(args.autoEffort === false ? { autoEffort: false } : {}),
         tools: 'full',
       },
     };
@@ -42,8 +43,10 @@ export function resolveAgentSpawnPreset(config, args = {}) {
         model: agentRoute.model,
         effort: agentRoute.effort,
         fast: agentRoute.fast === true,
+        ...(agentRoute.autoEffort === false ? { autoEffort: false } : {}),
         ...(agentRoute.modelParameters ? { modelParameters: agentRoute.modelParameters } : {}),
         ...(agentRoute.contextPercent ? { contextPercent: agentRoute.contextPercent } : {}),
+        ...(agentRoute.contextTokens ? { contextTokens: agentRoute.contextTokens } : {}),
         tools: 'full',
       },
     };

package/src/session-runtime/services/agent-tool/tag-registry.mjs

@@ -29,7 +29,7 @@ export function createTagRegistry({ dataDir, cfgMod, mgr }) {
     workerRowFromSession: index.workerRowFromSession,
   });
 
-  const { upsertLeadSession } = leadIndex;
+  const { upsertLeadSession, updateLeadWorkerCwd } = leadIndex;
 
   function dispose(options) {
     try {
@@ -103,6 +103,7 @@ export function createTagRegistry({ dataDir, cfgMod, mgr }) {
     upsertWorkerSession: index.upsertWorkerSession,
     upsertWorkerSessionDeferred,
     upsertLeadSession,
+    updateLeadWorkerCwd,
     removeWorkerRow,
     refreshTagsFromIndex,
     tags,

package/src/session-runtime/services/agent-tool/worker-index/row-shape.mjs

@@ -38,6 +38,7 @@ export function normalizeWorkerRows(value) {
       preset: clean(row.preset) || null,
       effort: clean(row.effort) || null,
       fast: typeof row.fast === 'boolean' ? row.fast : null,
+      ...(row.autoEffort === false ? { autoEffort: false } : {}),
       status: clean(row.status) || 'idle',
       stage: clean(row.stage) || clean(row.status) || 'idle',
       createdAt: clean(row.createdAt) || null,
@@ -87,6 +88,10 @@ export function workerRowFromSession(session, fallbackTag = '', extra = {}, getS
     preset: clean(extra.preset) || clean(session?.presetName) || null,
     effort: clean(extra.effort) || clean(session?.effort) || null,
     fast: fastFlag(extra.fast, session?.fast),
+    // Absent means Auto effort is on; an explicit boolean wins over the session's.
+    ...((typeof extra.autoEffort === 'boolean' ? extra.autoEffort : session?.autoEffort) === false
+      ? { autoEffort: false }
+      : {}),
     status,
     stage,
     createdAt: clean(session?.createdAt) || clean(extra.createdAt) || nowIso,

package/src/session-runtime/services/agent-tool/worker-rows.mjs

@@ -133,6 +133,7 @@ export function workerRowToSession(row = {}) {
     presetName: row.preset || null,
     effort: row.effort || null,
     fast: row.fast === true,
+    ...(row.autoEffort === false ? { autoEffort: false } : {}),
     status: row.status || 'idle',
     stage: row.stage || row.status || 'idle',
     createdAt: row.createdAt || null,

package/src/session-runtime/services/agent-tool.mjs

@@ -146,6 +146,7 @@ export function createStandaloneAgent({
     getStatus,
     recoverWorkers,
     upsertLeadSession: registry.upsertLeadSession,
+    updateLeadWorkerCwd: registry.updateLeadWorkerCwd,
     closeAll: closeFlow.closeAll,
     dispose: (options) => registry.dispose(options),
   };

package/src/session-runtime/services/daemon-candidate.mjs

@@ -5,7 +5,8 @@
 // ready handoff so the daemon's code/signal is recorded against its pid, boot
 // time and ready state. Resolves once the candidate reported ready, exited,
 // failed to spawn, or the timeout elapsed; the caller then re-reads discovery
-// and attaches to whoever won.
+// and attaches to whoever won. The resolved `summary()` describes this boot as
+// observed when called, for a caller that has to give up.
 import { fork } from 'node:child_process';
 import { beginDaemonSpawnCapture } from './daemon-crash-capture.mjs';
 
@@ -34,7 +35,7 @@ export function forkDaemonCandidate({
       // Boot diagnostics written to fd 2 reach this log exactly once, even when
       // the candidate never reached ready.
       capture.mirror();
-      resolve();
+      resolve({ summary: capture.summary });
     };
     let child;
     try {

package/src/session-runtime/services/daemon-crash-capture/spawn-capture.mjs

@@ -20,6 +20,11 @@ const CAPTURE_ID_ATTEMPTS = 8;
 const MIRROR_MAX_BYTES = 16 * 1024;
 const MESSAGE_MAX_CHARS = 512;
 const HEAP_FLAG_RE = /^--max-(?:old-space|semi-space|heap)-size=/;
+// Bytes of fd 2 a failure summary scans (the newest ones when larger).
+const SUMMARY_SCAN_MAX_BYTES = 256 * 1024;
+// Node's uncaught-error report (`TypeError: …`, `Error [ERR_…]: …`), V8's
+// fatal abort and the daemon's own `fatal boot error` log line.
+const STDERR_ERROR_LINE_RE = /\b[A-Z][A-Za-z]*Error\b(?: \[[A-Z0-9_]+\])?:|^Error\b|FATAL ERROR|(?<!non-)\bfatal\b/;
 
 function stamp(ms) {
   const iso = new Date(ms).toISOString();
@@ -256,6 +261,8 @@ function noteSpawnError(capture, error) {
 // this stream, so nothing here extends its lifetime.
 function drainStderrPipe(capture, stream) {
   const onData = (chunk) => {
+    // No capture file to read back: keep the newest bytes for summary().
+    capture.pipeText = `${capture.pipeText}${chunk}`.slice(-SUMMARY_SCAN_MAX_BYTES);
     mirrorText(capture.log, chunk);
   };
   stream.on('data', onData);
@@ -272,6 +279,52 @@ function drainStderrPipe(capture, stream) {
   });
 }
 
+/** The candidate's fd 2 as text: the capture file (its newest bytes when
+ *  large) or, when fd 2 fell back to a pipe, what that pipe delivered. */
+function stderrText(capture) {
+  if (!capture.capturePath || capture.removed) return capture.pipeText;
+  try {
+    const handle = fs.openSync(capture.capturePath, 'r');
+    try {
+      const size = fs.fstatSync(handle).size;
+      const length = Math.min(size, SUMMARY_SCAN_MAX_BYTES);
+      const buffer = Buffer.allocUnsafe(length);
+      const bytesRead = fs.readSync(handle, buffer, 0, length, size - length);
+      return buffer.subarray(0, bytesRead).toString('utf8');
+    } finally {
+      fs.closeSync(handle);
+    }
+  } catch {
+    return capture.pipeText;
+  }
+}
+
+/** What a launcher that gave up on this boot needs to name its cause: the
+ *  lifecycle as far as observed, the first error line on fd 2 (else its last
+ *  line, where a stalled boot stopped) and where the full text is. */
+function summarize(capture) {
+  const { record } = capture;
+  const lines = stderrText(capture)
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+  const errorLine = lines.find((line) => STDERR_ERROR_LINE_RE.test(line));
+  return {
+    pid: record.pid,
+    ready: record.ready,
+    spawnedAt: record.spawnedAt,
+    exitedAt: record.exitedAt,
+    exitCode: record.exitCode,
+    exitSignal: record.exitSignal,
+    exitReason: record.exitReason ?? null,
+    uptimeMs: record.uptimeMs,
+    error: record.error,
+    stderrErrorLine: errorLine ? boundedMessage(errorLine) : null,
+    stderrLastLine: lines.length > 0 ? boundedMessage(lines.at(-1)) : null,
+    stderrPath: capture.removed ? null : capture.capturePath,
+  };
+}
+
 /** Attach to the forked child: record its identity and keep a lifetime
  *  listener that survives the ready handoff, so a later exit is still
  *  correlated to this pid, boot time and ready state. */
@@ -347,6 +400,7 @@ export function beginDaemonSpawnCapture({
     readOffset: 0,
     removed: false,
     pipeDrained: null,
+    pipeText: '',
     stderrStdio: 'pipe',
   };
   openCapture(capture, { captureDir, prune, launcherPid, nonce });
@@ -377,5 +431,6 @@ export function beginDaemonSpawnCapture({
      *  recording anything — the child, if any, keeps its duplicate. */
     release: () => closeWriteFd(capture),
     snapshot: () => ({ ...capture.record }),
+    summary: () => summarize(capture),
   };
 }

package/src/session-runtime/session-create/session-options.mjs

@@ -6,6 +6,7 @@ import { hasOwn } from '../../runtime/agent/orchestrator/runtime-core/session-te
 import { toolSpecForMode } from '../../runtime/agent/orchestrator/runtime-core/effort.mjs';
 import { pluginDataDir } from '../runtime-paths.mjs';
 import { LEAD_DISALLOWED_TOOLS } from '../../runtime/agent/orchestrator/runtime-core/tool-defs.mjs';
+import { HEADLESS_TOOL_PROFILE } from '../../runtime/agent/orchestrator/runtime-core/tool-profile.mjs';
 
 // Ownership and permission fields an agent-owned session inherits from its profile.
 function agentOwnedSessionFields(sessionProfile) {
@@ -47,7 +48,13 @@ export function sessionOptions(deps, coreMemoryContext) {
     owner: agentOwned ? 'agent' : 'cli',
     agent: agentOwned ? sessionProfile?.agent || 'worker' : 'lead',
     lane: agentOwned ? 'agent' : 'cli',
-    sourceType: agentOwned ? sessionProfile?.sourceType || 'agent' : 'lead',
+    // One-shot `mixdog exec` runs carry their own source so session catalogs
+    // can keep them out of the user's resumable list.
+    sourceType: agentOwned
+      ? sessionProfile?.sourceType || 'agent'
+      : rt.toolProfile === HEADLESS_TOOL_PROFILE
+        ? 'exec'
+        : 'lead',
     sourceName: agentOwned ? sessionProfile?.sourceName || sessionProfile?.agent || 'agent' : 'main',
     ...(rt.approvalMode ? { approvalMode: rt.approvalMode } : {}),
     clientHostPid: sessionProfile?.clientHostPid || process.pid,
@@ -64,8 +71,10 @@ export function sessionOptions(deps, coreMemoryContext) {
     workflowContext,
     orchestrationMode,
     fast: rt.route.fast === true,
+    autoEffort: rt.route.autoEffort !== false,
     modelParameters: rt.route.modelParameters || {},
     contextPercent: rt.route.contextPercent,
+    contextTokens: rt.route.contextTokens || null,
     selectedContextWindow: rt.route.selectedContextWindow || null,
     compaction:
       rt.config.compaction && typeof rt.config.compaction === 'object'

package/src/session-runtime/session-turn-api.mjs

@@ -34,6 +34,7 @@ export function createSessionTurnApi(deps) {
     sessionOwnerGone: share.sessionOwnerGone,
     agentControl: agent.agentControl,
     taskControl: agent.taskControl,
+    stopShellJob: agent.stopShellJob,
     onNotification: agent.onNotification,
     toolsStatus: agent.toolsStatus,
     selectTools: agent.selectTools,

package/src/session-runtime/settings-api.mjs

@@ -5,9 +5,9 @@
 // `this.*` resolve against the spread target, so cross-member calls (e.g.
 // setProfile -> this.getProfile) keep working when spread into the facade.
 //
-// The members live in five topic modules: profile/onboarding/skills,
+// The members live in six topic modules: profile/onboarding/skills,
 // compaction/auto-clear, built-in tool modules, system (channels, shell,
-// updates) and developer options; the local provider's own methods come from
+// updates), developer options and worktree defaults; the local provider's own methods come from
 // local-provider-settings.mjs.
 import { createLocalProviderSettings } from './local-provider-settings.mjs';
 import { createProfileSettings } from './settings-profile-api.mjs';
@@ -15,6 +15,7 @@ import { createCompactionSettings } from './settings-compaction-api.mjs';
 import { createBuiltinToolSettings } from './settings-builtin-tools-api.mjs';
 import { createSystemSettings } from './settings-system-api.mjs';
 import { createDeveloperSettings } from './settings-developer-api.mjs';
+import { createWorktreeSettings } from './settings-worktree-api.mjs';
 
 export function createSettingsApi(deps) {
   // Optional: callers without a live local provider / gate fall back to the
@@ -38,5 +39,6 @@ export function createSettingsApi(deps) {
     ...createBuiltinToolSettings(shared, localSettings),
     ...createSystemSettings(shared),
     ...createDeveloperSettings(shared),
+    ...createWorktreeSettings(shared),
   };
 }

package/src/session-runtime/settings-builtin-tools-api.mjs

@@ -7,6 +7,7 @@ import {
   builtinInstalled,
   setBuiltinInstalledInConfig,
 } from '../runtime/agent/orchestrator/runtime-core/builtin-features.mjs';
+import { featureEnvOverride, moduleEnabled } from '../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 import { LOCAL_PROVIDER_ID } from '../runtime/local-provider/managed-runtime.mjs';
 import {
   INSTRUCTION_FILES_MODES,
@@ -23,7 +24,7 @@ import {
   shutdownEffortJudge,
 } from '../runtime/effort-judge/judge-client.mjs';
 
-const TOGGLEABLE_BUILTINS = ['git', 'office', 'tidy', 'localProvider', 'autoEffort'];
+const TOGGLEABLE_BUILTINS = ['git', 'office', 'tidy', 'localProvider', 'autoEffort', 'visualize'];
 
 function setLocalProviderEnabledInConfig(configLike, enabled) {
   const next = { ...(configLike || {}) };
@@ -97,6 +98,12 @@ export function createBuiltinToolSettings(
           enabled: tidyToolEnabledFn ? tidyToolEnabledFn() : builtinFeatureActive(config, 'tidy'),
           installed: builtinInstalled(config, 'tidy'),
         },
+        // Ships with the runtime and needs no install; the toggle reflects the
+        // module flag, not live bridge presence.
+        visualize: {
+          enabled: featureEnvOverride('MIXDOG_FEATURE_VISUALIZE') ?? moduleEnabled(config, 'visualize', true),
+          installed: true,
+        },
         localProvider: {
           ...localProvider,
           ...localSettings.status(),
@@ -152,7 +159,7 @@ export function createBuiltinToolSettings(
     },
     async setBuiltinToolEnabled(name, enabled) {
       if (!TOGGLEABLE_BUILTINS.includes(name)) {
-        throw new TypeError('Built-in tool must be git, office, tidy, localProvider, or autoEffort.');
+        throw new TypeError('Built-in tool must be git, office, tidy, localProvider, autoEffort, or visualize.');
       }
       if (name === 'autoEffort' && enabled !== false && !onnxRuntimeSupported()) {
         throw new Error(EFFORT_JUDGE_UNSUPPORTED);

package/src/session-runtime/settings-worktree-api.mjs

@@ -0,0 +1,17 @@
+// Settings → Worktrees: defaults for Lead-session git worktrees
+// (runtime/shared/worktrees/settings.mjs). Values persist at agent config
+// `worktree.<key>`; defaults are not stored.
+import { applyWorktreeSettingsPatch, normalizeWorktreeSettings } from '../runtime/shared/worktrees/settings.mjs';
+
+export function createWorktreeSettings({ getConfig, saveConfigAndAdopt }) {
+  return {
+    getWorktreeSettings() {
+      return normalizeWorktreeSettings(getConfig()?.worktree);
+    },
+    setWorktreeSettings(patch) {
+      const config = getConfig() || {};
+      saveConfigAndAdopt({ ...config, worktree: applyWorktreeSettingsPatch(config.worktree, patch) });
+      return this.getWorktreeSettings();
+    },
+  };
+}

package/src/session-runtime/setup-tool/executor.mjs

@@ -30,6 +30,7 @@ const PROFILE_VALUE_IDS = Object.freeze({
 const ACTION_APPLIES_TO = {
   set_recap_enabled: 'background Memory cycles; no restart required',
   set_auto_update: 'subsequent automatic update checks',
+  set_worktree_settings: 'new tasks and worktrees created afterwards; existing worktrees are unchanged',
   set_system_shell: 'subsequent shell calls',
   save_automation: 'the automation worker; scheduled runs follow the saved timing',
   delete_automation: 'future automation runs',
@@ -93,6 +94,7 @@ function routeInput(source) {
   if (typeof source.fast === 'boolean') next.fast = source.fast;
   if (Object.hasOwn(source, 'modelParameters')) next.modelParameters = { ...source.modelParameters };
   if (Object.hasOwn(source, 'contextPercent')) next.contextPercent = source.contextPercent;
+  if (Object.hasOwn(source, 'contextTokens')) next.contextTokens = source.contextTokens;
   if (Object.hasOwn(source, 'disabled')) next.disabled = source.disabled;
   return next;
 }
@@ -178,6 +180,7 @@ const mainRoute = (rt) => ({
   fastCapable: rt.fastCapable === true,
   modelParameters: rt.modelParameters || {},
   contextPercent: rt.contextPercent ?? null,
+  contextTokens: rt.contextTokens ?? null,
 });
 
 async function automationStatus(rt, { domain }) {
@@ -303,6 +306,7 @@ const SETUP_STATUS_READERS = {
   plugins: (rt) => rt.pluginsStatus?.() || {},
   update: (rt) => rt.getUpdateSettings?.() || {},
   onboarding: (rt) => rt.getOnboardingStatus?.() || {},
+  worktree: (rt) => rt.getWorktreeSettings(),
   schedules: automationStatus,
   webhooks: automationStatus,
   hooks: hookStatus,
@@ -328,11 +332,13 @@ function validateSetupInput(args) {
     if (action !== 'set_agent_route' && Object.hasOwn(args.route, 'disabled')) {
       throw new Error('route.disabled is only accepted by set_agent_route');
     }
-    if (action !== 'set_route' && action !== 'set_agent_route' && Object.hasOwn(args.route, 'contextPercent')) {
-      throw new Error('route.contextPercent is only accepted by set_route and set_agent_route');
+    for (const field of ['contextPercent', 'contextTokens']) {
+      if (action !== 'set_route' && action !== 'set_agent_route' && Object.hasOwn(args.route, field)) {
+        throw new Error(`route.${field} is only accepted by set_route and set_agent_route`);
+      }
     }
   }
-  for (const field of ['desktop', 'appearance', 'webhook', 'compaction', 'providerAccount']) {
+  for (const field of ['desktop', 'appearance', 'webhook', 'compaction', 'providerAccount', 'worktree']) {
     if (args[field] && !Object.keys(args[field]).length) throw new Error(`${field} requires at least one setting`);
   }
   return action;
@@ -507,6 +513,7 @@ const SETUP_ACTION_HANDLERS = {
     rt.deleteLocalProviderModel(requireText(args.confirmationToken, 'confirmationToken')),
   set_system_shell: (rt, args) => rt.setSystemShell({ command: clean(args.command) }),
   set_auto_update: (rt, args) => rt.setAutoUpdate(requireBoolean(args.enabled)),
+  set_worktree_settings: (rt, args) => rt.setWorktreeSettings(args.worktree),
   forget_provider_auth: async (rt, args) => {
     const name = requireText(args.name, 'name');
     const setup = await rt.getProviderSetup({});
@@ -541,7 +548,7 @@ const SETUP_ACTION_HANDLERS = {
   set_mcp_enabled: async (rt, args) => ({
     mcp: mcpRows(await rt.setMcpServerEnabled(requireText(args.name, 'name'), requireBoolean(args.enabled))),
   }),
-  reconnect_mcp: async (rt) => ({ mcp: mcpRows(await rt.reconnectMcp()) }),
+  reconnect_mcp: async (rt, args) => ({ mcp: mcpRows(await rt.reconnectMcp(clean(args.name) || undefined)) }),
   set_disabled_skills: (rt, args) => {
     if (!Array.isArray(args.skills)) throw new Error('skills (array of names) is required');
     return rt.setDisabledSkills(args.skills.map(clean).filter(Boolean));

package/src/session-runtime/setup-tool/settings-contract.mjs

@@ -108,6 +108,8 @@ export const SETUP_MCP_SCHEMA = object({
     additionalProperties: removableText,
     description: 'HTTP header names mapped to existing environment variable names.',
   },
+  startupTimeoutSec: { type: 'number', description: 'Connect/handshake timeout in seconds (>0, default 30).' },
+  toolTimeoutSec: { type: 'number', description: 'Per tool-call timeout in seconds (>0, default 120).' },
 });
 
 export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
@@ -158,7 +160,7 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
       model: {
         ...text,
         description:
-          'Required for new schedules; no default-model fallback. Use provider/model[@effort][+fast][?parameter=value] or an existing preset name. On overwrite, omission preserves the saved model, which must be non-empty.',
+          'Required for new schedules; no default-model fallback. Use provider/model[@effort][+fast][+noauto][?parameter=value] (+noauto: Auto reasoning off; absent = on) or an existing preset name. On overwrite, omission preserves the saved model, which must be non-empty.',
       },
       cwd: text,
       workflow: text,