mixdog 1.4.2 → 1.4.3

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

@@ -29,6 +29,7 @@ import { workerStageForStatus } from '../worker-rows.mjs';
 import { handoffContent } from '../../../handoff-attachments.mjs';
 import { whileTurnDispatched } from '../../../../runtime/agent/orchestrator/session/manager/runtime-state.mjs';
 import { takeStoppedShellJobs } from '../../../../runtime/agent/orchestrator/session/manager/turn-reap.mjs';
+import { turnReportText } from '../../../../runtime/agent/orchestrator/session/loop/turn-report.mjs';
 
 // Mid-turn worker persistence cadence. The watchdog sweep runs every second;
 // a transcript save is far more expensive than a bookkeeping stamp, so the
@@ -114,7 +115,7 @@ export function createSpawnRunner({
       tag,
       sessionId: session.id,
       ...presetDescriptor(agent, preset, presetName),
-      content: result?.content || '',
+      content: turnReportText(result),
       ...(sessionSurface?.canonical === true ? { handoffOnly: true } : {}),
       ...(abnormalError ? { error: abnormalError } : {}),
     };
@@ -124,11 +125,24 @@ export function createSpawnRunner({
     const { args, session, workerCwd } = prepared;
     // The caller's forwarded files ride along as attachment parts.
     const prompt = handoffContent(prepared.prompt, args.attachmentParts);
+    // Host-set only (a routine executor, routine-executor.mjs): the trusted
+    // text skills are selected from, so nothing else in the prompt selects one.
+    const selection = typeof args.skillSelection === 'string' ? { skillSelection: args.skillSelection } : {};
     return whileTurnDispatched(session.id, () => {
       if (typeof sessionSurface?.runTurn === 'function' && sessionSurface.canRun?.(session) !== false) {
-        return sessionSurface.runTurn({ session, prompt, context: args.context || null, cwd: workerCwd, ...turnHooks });
+        return sessionSurface.runTurn({
+          session,
+          prompt,
+          context: args.context || null,
+          cwd: workerCwd,
+          ...selection,
+          ...turnHooks,
+        });
       }
-      return mgr.askSession(session.id, prompt, args.context || null, null, workerCwd, null, turnHooks);
+      return mgr.askSession(session.id, prompt, args.context || null, null, workerCwd, null, {
+        ...turnHooks,
+        ...selection,
+      });
     });
   }
 
@@ -180,8 +194,8 @@ export function createSpawnRunner({
           : {}),
       };
       const result = await runTurn(prepared, turnHooks);
-      // The early preview no longer promises body suppression, so the canonical
-      // notifyTaskCompletion is left to fire exactly once with output via the
+      // The early preview does not promise body suppression, so the canonical
+      // notifyTaskCompletion fires exactly once with output via the
       // resolve/reconcile/finally path.
       const finalValue = completionValue(result);
       if (job?.status === 'cancelled') {
@@ -220,7 +234,11 @@ export function createSpawnRunner({
       }
       finalStatus = 'error';
       noteStoppedShellJobsOnError(error, await takeStoppedShellJobs(session.id));
-      reconcileJobStreamStalled(job, error);
+      reconcileJobStreamStalled(job, error, {
+        tag,
+        sessionId: session.id,
+        ...presetDescriptor(agent, preset, presetName),
+      });
       throw error;
     } finally {
       turnReview.complete();

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

@@ -2,7 +2,15 @@ import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { ensureProcessListenerHeadroom } from '../../runtime/shared/process-listener-headroom.mjs';
 import { AGENT_TOOL } from './agent-tool/tool-def.mjs';
-import { agentScope, envTimeoutMs, callerSessionForContext, terminalPidForContext } from './agent-tool/helpers.mjs';
+import { cancelBackgroundTask } from '../../runtime/shared/background-tasks.mjs';
+import { closeManagedSession } from '../lifecycle/shared.mjs';
+import {
+  agentScope,
+  clean,
+  envTimeoutMs,
+  callerSessionForContext,
+  terminalPidForContext,
+} from './agent-tool/helpers.mjs';
 import { createTagRegistry } from './agent-tool/tag-registry.mjs';
 import { createJobViews } from './agent-tool/job-views.mjs';
 import { liveAgentStatusRow } from './agent-tool/job-views/session-progress.mjs';
@@ -106,6 +114,9 @@ export function createStandaloneAgent({
   });
   const sendFlow = createSendFlow({
     mgr,
+    cfgMod,
+    dataDir,
+    STANDALONE_SOURCE_ROOT,
     defaultCwd,
     sessionSurface,
     canUseSessionSurface,
@@ -129,6 +140,44 @@ export function createStandaloneAgent({
     listProviderModels,
   });
 
+  /**
+   * Run one workflow agent (`args.agent`, `args.prompt`, optional `cwd` and
+   * `attachmentParts`) to completion and resolve `{ sessionId, content }` —
+   * for a caller that has no session to hand the result to (a routine's
+   * executor, routine-executor.mjs). `context.callerSessionId` is the id the
+   * agent is created under: its run stamp and unattended policy come from it.
+   * Rejects when the agent fails or is cancelled, or `signal` aborts (which
+   * cancels it). The agent's session is closed afterwards.
+   */
+  async function runToCompletion(args = {}, context = {}, { signal = null } = {}) {
+    await awaitKeychainPrewarm();
+    const abortError = () =>
+      signal?.reason instanceof Error ? signal.reason : new Error(String(signal?.reason || 'agent run aborted'));
+    if (signal?.aborted) throw abortError();
+    const job = spawnFlow.startDeferredSpawnJob({ ...args, type: 'spawn' }, clean(context.callerCwd), context, context);
+    const onAbort = () => cancelBackgroundTask(job.taskId, 'agent run aborted', { notify: false });
+    signal?.addEventListener?.('abort', onAbort, { once: true });
+    let value = null;
+    try {
+      value = await job.promise;
+    } finally {
+      signal?.removeEventListener?.('abort', onAbort);
+    }
+    const sessionId = clean(job.meta?.sessionId) || clean(value?.sessionId);
+    if (sessionId) {
+      try {
+        await closeManagedSession(mgr, sessionId, 'routine-executor-finished');
+      } catch {
+        /* the run's result stands; a close that fails is swept with idle agents */
+      }
+    }
+    if (signal?.aborted) throw abortError();
+    if (job.status === 'cancelled') throw new Error('the agent run was cancelled');
+    if (job.status !== 'completed') throw new Error(job.error || 'the agent run failed');
+    const result = value ?? job.result;
+    return { sessionId: sessionId || null, content: String(result?.content ?? '') };
+  }
+
   function getStatus(context = {}) {
     if (!isKeychainPrewarmReady()) {
       void awaitKeychainPrewarm();
@@ -162,6 +211,7 @@ export function createStandaloneAgent({
   return {
     tools: [AGENT_TOOL],
     execute,
+    runToCompletion,
     onStatusChange: (listener) => {
       if (typeof listener !== 'function') return () => {};
       statusListeners.add(listener);

package/src/session-runtime/services/channel-admin.mjs

@@ -25,6 +25,7 @@ import {
 } from '../../runtime/channels/lib/webhooks-db.mjs';
 import { normalizeAutomationAttachments } from '../../runtime/shared/automation-attachments.mjs';
 import { assertRoutineOwner, routineOwnerProblem } from '../routine-owner.mjs';
+import { assertRoutineExecutor } from '../routine-executor.mjs';
 import { hasEnabledAutomation } from '../../runtime/shared/automation-presence.mjs';
 import { resolveScheduleTimezone, validateScheduleCron } from '../../runtime/shared/schedule-time.mjs';
 import { scheduleNameTakenError, scheduleRenameRunningError } from '../../runtime/channels/lib/schedule-errors.mjs';
@@ -203,6 +204,8 @@ function scheduleToDisplay(s, ownerProblem = '') {
     instructions: s.prompt,
     // The bot it belongs to: each run is a turn in that bot's chat.
     owner: s.ownerAgentId || MIXY_AGENT_ID,
+    // The sub-agent that carries each fire out first (routine-executor.mjs); null = the bot itself.
+    executorAgentId: s.executorAgentId || null,
     // Why it is paused for its owner (routine-owner.mjs); absent when it runs.
     ...(ownerProblem ? { ownerProblem } : {}),
     nextFireAt: isoOrUndefined(s.nextFireAt),
@@ -250,6 +253,13 @@ function scheduleOwner(owner, existing) {
   return existing?.ownerAgentId || MIXY_AGENT_ID;
 }
 
+// A save's executor: `executorAgentId` undefined keeps the saved one on an
+// overwrite; null or '' clears it; an id must be a delegatable sub-agent.
+async function routineExecutor(executorAgentId, existing) {
+  if (executorAgentId === undefined) return existing?.executorAgentId || null;
+  return assertRoutineExecutor(executorAgentId);
+}
+
 /** Each owner's problem (routine-owner.mjs) for its stored rows, probed once
  *  per owner. */
 function ownerProblems() {
@@ -319,6 +329,7 @@ export async function saveSchedule(
     enabled,
     instructions,
     owner,
+    executorAgentId,
     overwrite = false,
     newName,
   } = {},
@@ -340,6 +351,7 @@ export async function saveSchedule(
   }
   const ownerAgentId = scheduleOwner(owner, existing);
   await assertRoutineOwner(ownerAgentId);
+  const executor = await routineExecutor(executorAgentId, existing);
   const whenCron = hasTime ? validateScheduleCron(foldDaysIntoCron(normalizeCron(time), days)) : null;
   const whenAt = hasAt ? parseAtDatetime(at) : null;
   const scheduleTimezone = hasTime ? resolveScheduleTimezone(timezone) : null;
@@ -356,6 +368,7 @@ export async function saveSchedule(
     enabled: enabled !== false,
     nextFireAt: whenAt,
     ownerAgentId,
+    executorAgentId: executor,
   };
   let saved;
   if (renaming) {
@@ -407,6 +420,7 @@ async function listWebhooks() {
     instructions: ep.instructions,
     // The bot it belongs to: each run is a turn in that bot's chat.
     owner: ep.ownerAgentId || MIXY_AGENT_ID,
+    executorAgentId: ep.executorAgentId || null,
     ...(problems[index] ? { ownerProblem: problems[index] } : {}),
     lastEventAt: isoOrUndefined(ep.lastEventAt),
     lastSuccessAt: isoOrUndefined(ep.lastSuccessAt),
@@ -428,6 +442,7 @@ export async function saveWebhook({
   enabled,
   instructions,
   owner,
+  executorAgentId,
   overwrite = false,
 } = {}) {
   const id = assertName(name, 'webhook name');
@@ -445,6 +460,7 @@ export async function saveWebhook({
   }
   const ownerAgentId = scheduleOwner(owner, existing);
   await assertRoutineOwner(ownerAgentId);
+  const executor = await routineExecutor(executorAgentId, existing);
   // Secret semantics: an explicit value always wins; an EMPTY value on an
   // overwrite PRESERVES the stored secret (editing instructions must not
   // silently rotate the key the external service was configured with); only
@@ -464,11 +480,13 @@ export async function saveWebhook({
     instructions: body,
     enabled: enabled !== false,
     ownerAgentId,
+    executorAgentId: executor,
   });
   automationProbe.invalidate();
   return {
     name: id,
     owner: saved.ownerAgentId || ownerAgentId,
+    executorAgentId: saved.executorAgentId || null,
     description: saved.description,
     parser: saved.parser,
     ...(saved.cwd ? { cwd: saved.cwd } : {}),

package/src/session-runtime/services/hook-bus/command-handler.mjs

@@ -1,9 +1,10 @@
 import { existsSync } from 'node:fs';
-import { spawn, spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { MAX_BUFFER_BYTES } from './constants.mjs';
 import { handlerTimeoutS } from './handler-timeout.mjs';
 import { abortReason, throwIfAborted } from '../../../runtime/shared/abort-race.mjs';
 import { scrubRuntimeRootVars } from '../../../runtime/agent/orchestrator/tools/env-scrub.mjs';
+import { spawnTreeKill } from '../../../runtime/agent/orchestrator/mcp/child-tree.mjs';
 
 function resolvePlaceholders(str, projectDir, pluginData, pluginRoot = null) {
   if (typeof str !== 'string') return str;
@@ -23,17 +24,13 @@ export function defaultShellKind() {
   return process.platform === 'win32' ? 'powershell' : 'bash';
 }
 
-// POSIX children share a detached process group; Windows taskkill owns the tree.
+// POSIX children share a detached process group; on Windows the shared
+// creation-checked tree kill owns the tree, off the event loop.
 function killProcessTree(child, signal = 'SIGTERM') {
   if (!child || child.pid == null) return;
   if (process.platform === 'win32') {
-    try {
-      spawnSync('taskkill', ['/pid', String(child.pid), '/T', '/F'], { windowsHide: true });
-    } catch {
-      try {
-        child.kill(signal);
-      } catch {}
-    }
+    if (child.exitCode !== null || child.signalCode !== null) return;
+    spawnTreeKill([child.pid], { root: child });
     return;
   }
   try {
@@ -48,8 +45,7 @@ function killProcessTree(child, signal = 'SIGTERM') {
 const KILL_GRACE_MS = 2000;
 function terminateTree(child) {
   killProcessTree(child, 'SIGTERM');
-  // /F is already a hard termination. A later Windows retry could address a
-  // recycled PID instead of the process this handler created.
+  // The Windows tree kill is already a hard termination.
   if (process.platform === 'win32') return;
   const timer = setTimeout(() => killProcessTree(child, 'SIGKILL'), KILL_GRACE_MS);
   timer.unref?.();

package/src/session-runtime/services/plugin-admin.mjs

@@ -4,6 +4,7 @@ import { basename, dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { createHash, randomUUID } from 'node:crypto';
 import { readJsonStateSync, updateJsonAtomicSync, withFileLockSync } from '../../runtime/shared/atomic-file.mjs';
+import { announceStoredStateChange } from '../../runtime/shared/config.mjs';
 import { resolvePluginData } from '../../runtime/shared/plugin-paths.mjs';
 import { pluginManifest } from '../../runtime/shared/plugin-manifest.mjs';
 import { pluginMetadata } from '../../runtime/shared/plugin-metadata.mjs';
@@ -60,6 +61,9 @@ function mutateRegistry(dataDir, mutator) {
     },
     { secret: true, fsyncDir: true, backup: true }
   );
+  // Other processes connect or drop the plugin's MCP servers on this (the
+  // live install's registry only; an explicit dataDir is a separate store).
+  if (resolve(dataDir) === resolve(resolvePluginData())) announceStoredStateChange('plugins');
   return result;
 }
 

package/src/session-runtime/services/seeds.mjs

@@ -127,6 +127,13 @@ export function retireSeededPackCopies({ rootDir, dataDir, backup = makeBackup(d
     if (![bundled, ...(history.outputStyles[name] || [])].includes(fileHash(copy))) continue;
     if (backup.move(copy)) retired.push(`output-styles/${name}`);
   }
+  for (const name of childNames(join(dataDir, 'orchestration'), 'md')) {
+    const bundled = fileHash(join(rootDir, 'orchestration', name));
+    if (!bundled) continue;
+    const copy = join(dataDir, 'orchestration', name);
+    if (![bundled, ...(history.orchestration[name] || [])].includes(fileHash(copy))) continue;
+    if (backup.move(copy)) retired.push(`orchestration/${name}`);
+  }
   return retired;
 }
 

package/src/session-runtime/services/usage-stats-model.mjs

@@ -24,8 +24,11 @@
 import { billableInputTokensForProvider } from '../../runtime/shared/llm/cost.mjs';
 import { hourlySeries } from './usage-stats-hours.mjs';
 import {
+  FAST_KEY,
   isConversationUsageSource,
+  isFastCall,
   knownCostTurns,
+  sortFastBesideModel,
   usageRollupDayKey,
 } from '../../runtime/shared/llm/usage-rollup.mjs';
 
@@ -132,11 +135,14 @@ function providerBucket(state, provider, kind) {
   return bucket;
 }
 
-function modelBucket(provider, model) {
-  let bucket = provider.models.get(model);
+// A model's Fast-mode calls are their own row beside its normal row.
+function modelBucket(provider, model, fast = false) {
+  const key = fast ? model + FAST_KEY : model;
+  let bucket = provider.models.get(key);
   if (!bucket) {
     bucket = {
       model,
+      fast,
       turns: 0,
       input: 0,
       output: 0,
@@ -146,7 +152,7 @@ function modelBucket(provider, model) {
       sessions: new Set(),
       sessionsComplete: true,
     };
-    provider.models.set(model, bucket);
+    provider.models.set(key, bucket);
   }
   return bucket;
 }
@@ -166,9 +172,9 @@ function addUsage(target, usage) {
   target.speedMs = (target.speedMs || 0) + (usage.speedMs || 0);
 }
 
-function foldRoute(state, providerId, modelId, kind, usage) {
+function foldRoute(state, providerId, modelId, kind, usage, fast = false) {
   const provider = providerBucket(state, providerId, kind);
-  const model = modelBucket(provider, modelId);
+  const model = modelBucket(provider, modelId, fast);
   for (const bucket of [provider, model]) {
     addUsage(bucket, usage);
     if (usage.turns > 0 && (!usage.sessions || usage.sessionsComplete === false)) {
@@ -258,7 +264,7 @@ function foldRollupDay(state, key, day, conversationOnly) {
       speedOutput: num(raw?.speedOutput),
       speedMs: num(raw?.speedMs),
     };
-    foldRoute(state, providerId, modelId, text(raw?.kind), usage);
+    foldRoute(state, providerId, modelId, text(raw?.kind), usage, raw?.fast === true);
     addDaily(state, key, usage, providerId);
   }
 
@@ -313,7 +319,14 @@ function foldEvent(state, key, event, conversationOnly) {
     speedOutput: timed ? output : 0,
     speedMs: timed ? durationMs : 0,
   };
-  foldRoute(state, providerId, modelId, text(event?.providerKind), usage);
+  // Tiers are kept on the record's rates (see makeUsageRecord), not top level.
+  const kind = text(event?.providerKind);
+  const fast = isFastCall({
+    kind,
+    requestServiceTier: event?.rates?.requestServiceTier,
+    serviceTier: event?.rates?.serviceTier,
+  });
+  foldRoute(state, providerId, modelId, kind, usage, fast);
   addDaily(state, key, usage, providerId);
 
   if (durationMs > 0) {
@@ -513,9 +526,12 @@ function exportRoute(bucket, totalTokens) {
 function exportProviders(state, { totalTokens, modelLimit }) {
   return [...state.providers.values()]
     .map((bucket) => {
-      const models = [...bucket.models.values()]
-        .map((model) => ({ model: model.model, ...exportRoute(model, totalTokens) }))
-        .sort((a, b) => b.tokens - a.tokens || b.costUsd - a.costUsd);
+      const exported = [...bucket.models.values()].map((model) => ({
+        model: model.model,
+        ...(model.fast ? { fast: true } : {}),
+        ...exportRoute(model, totalTokens),
+      }));
+      const models = sortFastBesideModel(exported, (row) => row.model, ['tokens', 'costUsd']);
       return {
         provider: bucket.provider,
         providerKind: bucket.providerKind,
@@ -535,7 +551,12 @@ function exportUnpricedModels(state) {
   const rows = [];
   for (const provider of state.providers.values()) {
     for (const model of provider.models.values()) {
-      if (model.turns > 0 && model.costKnownTurns < model.turns)
+      // A model's Fast bucket is the same identity as its normal one.
+      if (
+        model.turns > 0 &&
+        model.costKnownTurns < model.turns &&
+        !rows.some((row) => row.provider === provider.provider && row.model === model.model)
+      )
         rows.push({ provider: provider.provider, model: model.model });
     }
   }

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

@@ -12,7 +12,7 @@ import { sessionOptions } from './session-options.mjs';
  *  time. A boot connect still mid-handshake is caught on the first user
  *  turn by refreshInitialDeferredMcpSurface (session-turn-api), which
  *  re-folds the live registry before the prompt renders. */
-function seedToolSurface(deps, reason) {
+function seedToolSurface(deps, reason, coreMemoryContext) {
   const { rt, mcpClient, modelStandaloneTools, applyPreSessionToolSelection } = deps;
   let connectedMcpTools = [];
   try {
@@ -37,6 +37,8 @@ function seedToolSurface(deps, reason) {
   // process-wide firstTurnCompleted.
   rt.session.deferredInitialRefreshPending = !/resume/i.test(String(reason || ''));
   applyPreSessionToolSelection();
+  // Built from the settings as they stand: its first turn need not rebuild it.
+  deps.noteToolAvailability?.(rt.session, coreMemoryContext);
 }
 
 /** Adopt the provider session and publish it to hooks and statusline. */
@@ -45,7 +47,7 @@ export function materializeSession(deps, reason, coreMemoryContext) {
   // adoptSession attaches the hook bridge (boot/infrastructure.mjs sessionAdopter).
   adoptSession(mgr.createSession(sessionOptions(deps, coreMemoryContext)));
   rt.reservedSessionId = null;
-  seedToolSurface(deps, reason);
+  seedToolSurface(deps, reason, coreMemoryContext);
   writeStatuslineRoute(statusRoutes, rt.session, rt.route);
   hooks.emit('session:create', {
     sessionId: rt.session.id,

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

@@ -111,6 +111,8 @@ export function sessionOptions(deps, coreMemoryContext) {
     cwd: rt.currentCwd,
     ...(rt.desktopSession && typeof rt.desktopSession === 'object' ? { desktopSession: rt.desktopSession } : {}),
     coreMemoryContext,
+    // Prompt settings from the in-memory config (its disk copy trails it).
+    promptConfig: rt.config,
     workflow,
     workflowContext,
     ...(leadWorkflowParts ? { leadWorkflowParts } : {}),

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

@@ -67,7 +67,6 @@ export function createBuiltinToolSettings(
     webSearchEnabled,
     invalidateContextStatusCache,
     invalidatePreSessionToolSurface,
-    refreshEmptySessionToolPolicy,
   },
   localSettings
 ) {
@@ -201,19 +200,15 @@ export function createBuiltinToolSettings(
     async setWebSearchEnabled(enabled) {
       const config = getConfig();
       saveConfigAndAdopt(setModuleEnabledInConfig({ ...config }, 'webSearch', enabled !== false));
-      // Empty/reserved sessions rebuild now so session entry does not still
-      // advertise web_search. A conversation keeps its frozen schema.
-      await refreshEmptySessionToolPolicy?.();
       return this.getToolModuleSettings();
     },
     /** Which user instruction files (AGENTS.md / CLAUDE.md) new sessions load:
-     *  'all' | 'agents' | 'claude' | 'off'. The empty session rebuilds now. */
+     *  'all' | 'agents' | 'claude' | 'off'. An empty session rebuilds at its next turn. */
     async setInstructionFiles(mode) {
       if (!INSTRUCTION_FILES_MODES.includes(mode)) {
         throw new TypeError(`Instruction files must be one of ${INSTRUCTION_FILES_MODES.join(', ')}.`);
       }
       saveConfigAndAdopt({ ...getConfig(), instructionFiles: mode });
-      await refreshEmptySessionToolPolicy?.();
       return this.getToolModuleSettings();
     },
     /** The global "Auto reasoning base": the effort Auto works around. */
@@ -238,7 +233,6 @@ export function createBuiltinToolSettings(
       if (memoryEnabled) nextConfig = setBuiltinInstalledInConfig(nextConfig, 'memory', true);
       saveConfigAndAdopt(nextConfig);
       invalidateContextStatusCache();
-      await refreshEmptySessionToolPolicy?.();
       return this.getToolModuleSettings();
     },
     async setBuiltinToolEnabled(name, enabled) {
@@ -268,7 +262,6 @@ export function createBuiltinToolSettings(
       }
       // Turning Auto on loads nothing: the judge starts on its first turn.
       if (name === 'autoEffort' && enabled === false) await shutdownEffortJudge();
-      await refreshEmptySessionToolPolicy?.();
       return this.getToolModuleSettings();
     },
     /** Extensions → Built-in Install: run the feature's preparation adapter
@@ -300,7 +293,6 @@ export function createBuiltinToolSettings(
         await syncLocalProviderRegistry?.(true);
       }
       if (name === 'memory') invalidateContextStatusCache();
-      await refreshEmptySessionToolPolicy?.();
       return this.getToolModuleSettings();
     },
     /** Extensions → Code Tidy: which engines exist, where each one comes from,

package/src/session-runtime/setup-tool/connector-widen-approval.mjs

@@ -93,4 +93,4 @@ export async function askToWidenConnectorTool(
     permission: level,
     note: `The user approved on the card; ${tool} is now ${level}.`,
   };
-}
+}

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

@@ -92,7 +92,14 @@ const ACTION_APPLIES_TO = {
   set_heartbeat_interval:
     "Mixy's heartbeat from the next tick: the next check is due the new interval after the last one; no restart required",
   set_reactions_enabled:
-    "bots' chats; while off a reaction is refused at once and new chats are not offered the tool; reactions already left stay visible",
+    "bots' chats, this conversation included, from their next turn; while off a reaction is refused at once; reactions already left stay visible",
+  set_profile: 'every conversation, this one included, from its next turn',
+  set_instruction_files: 'every conversation, this one included, from its next turn',
+  set_memory_enabled: 'every conversation, this one included, from its next turn',
+  set_web_search_enabled: 'every conversation, this one included, from its next turn',
+  set_builtin_enabled: 'every conversation, this one included, from its next turn',
+  install_builtin: 'every conversation, this one included, from its next turn',
+  set_output_style: 'every conversation, this one included, from its next turn',
   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',

package/src/session-runtime/setup-tool/extended-actions.mjs

@@ -307,6 +307,8 @@ export const EXTENDED_SETUP_HANDLERS = Object.freeze({
       owner: input.owner,
     });
     const next = { ...pick(previous, entryKeys), ...input };
+    // Omitted keeps the saved executor without checking it again (channel-admin.mjs).
+    if (!own(input, 'executorAgentId')) delete next.executorAgentId;
     if (kind === 'schedule') {
       if (previous.whenAt && !own(input, 'time') && !own(input, 'at')) {
         next.at = new Date(previous.whenAt).toISOString();

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

@@ -212,6 +212,11 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
         description:
           "The bot id that owns the schedule or webhook; each run is a turn in that bot's chat, where it replies with the result. The bot must exist (no representative bot yet = refused). New entries default to the bot of the calling thread (the representative bot = lead); on overwrite, omission keeps the owner.",
       },
+      executorAgentId: {
+        ...removableText,
+        description:
+          'The workflow sub-agent id (Worker, …) that carries out each run first, on its own model; only its final report goes to the owner bot, which relays it in its own words. Must be an enabled workflow sub-agent: never a bot (the representative bot included); unknown or turned-off ids are refused. Set it for recurring work that suits a sub-agent; leave it unset for trivial chat-only routines (the owner bot then does the work itself). null or "" clears it; on overwrite, omission keeps it.',
+      },
       overwrite: { ...boolean, description: 'Explicitly update an existing entry; omitted fields are preserved.' },
     },
     ['name']
@@ -238,6 +243,16 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
       maximum: 400,
       description: 'Windows only: notification sound volume percent.',
     },
+    sessionAutoArchiveDays: {
+      type: 'integer',
+      enum: [0, 1, 7, 14, 30, 90],
+      description: 'Days without conversation before a session is archived; 0 = never (default 7).',
+    },
+    sessionAutoDeleteDays: {
+      type: 'integer',
+      enum: [0, 7, 30, 90],
+      description: 'Days archived before a session is deleted; 0 = never (default 90).',
+    },
     botOverlay: object(
       {
         enabled: {
@@ -302,6 +317,17 @@ export const SETUP_EXTENDED_PROPERTIES = Object.freeze({
     markdownDefaultView: { type: 'string', enum: ['preview', 'rich', 'source'] },
     linkPreview: boolean,
     toolActivityExpansion: { type: 'string', enum: ['collapsed', 'commands', 'all'] },
+    composerStyle: {
+      type: 'string',
+      enum: ['simple', 'basic', 'detail'],
+      description:
+        'How much the composer shows: simple = the model only; basic (UI label "Normal") = plus usage; detail = plus workflow and delegation (default detail).',
+    },
+    questionAnswerConfirm: {
+      ...boolean,
+      description:
+        'On: picking a single-choice question option only selects it until Send/Next; off: the pick answers at once (default off).',
+    },
     uiFont: { ...text, description: 'Installed font family for the UI; "" restores the built-in font.' },
     codeFont: { ...text, description: 'Installed font family for code; "" restores the built-in font.' },
     skinTransparency: {
@@ -377,4 +403,6 @@ export const SETUP_HANDOFFS = Object.freeze({
   notifications: 'Notification permission/subscription requires a user gesture on the device receiving notifications.',
   pairing: 'Pairing credentials and OS permission approvals remain in the visible UI.',
   memoryContent: 'Use the memory tool for Core Memory, not setup.',
+  instructionTexts:
+    'The Delegation and Output style instruction texts are edited in Settings → Delegation / Output style (revision-checked free text); choose the active output style with set_output_style.',
 });

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

@@ -447,13 +447,38 @@ export const SETUP_TOOL_DEFS = Object.freeze([
               enum: [...WORKTREE_NEW_TASK_DEFAULTS],
               description: 'branch = new tasks use the current branch (default); worktree = a new worktree.',
             },
-            branchPrefix: { type: 'string', description: 'Ref prefix ending with "/"; default "mixdog/".' },
+            branchPrefix: {
+              type: 'string',
+              description:
+                'Optional ref prefix ending with "/", e.g. "mixdog/"; "" (default) names branches after the task alone.',
+            },
             sizeWarnBytes: {
               type: 'integer',
               minimum: 0,
               description: 'Repository size that asks for confirmation first; 0 never asks.',
             },
             autoCleanup: { type: 'boolean', description: 'Remove clean, merged worktrees when their task ends.' },
+            maxWorktrees: {
+              type: 'integer',
+              minimum: 0,
+              maximum: 1000,
+              description:
+                'With autoCleanup: keep at most this many worktrees, least recently used cleaned first; 0 = no limit. Default 15.',
+            },
+            unusedDays: {
+              type: 'integer',
+              minimum: 0,
+              maximum: 3650,
+              description: 'With autoCleanup: clean up worktrees unused this many days; 0 = never. Default 30.',
+            },
+            cleanupArchived: {
+              type: 'boolean',
+              description: 'With autoCleanup: archiving a session cleans up its worktrees. Default true.',
+            },
+            deleteBranch: {
+              type: 'boolean',
+              description: 'Cleanup also deletes the branch (its tip stays under a recovery ref). Default false.',
+            },
           },
           description: 'set_worktree_settings: only the given fields change.',
         },