mixdog 1.3.1 → 1.3.3

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

@@ -22,6 +22,7 @@ export function createRoutedAgentTool({ rt, agentTool, executeAgentControl = nul
           {
             type: '__close_all',
             reason: String(reason || 'agent owner closed'),
+            ...(scope?.processExit === true ? { processExit: true } : {}),
           },
           {
             callerCwd: rt.currentCwd,

package/src/session-runtime/boot/apis.mjs

@@ -60,13 +60,13 @@ import { createSessionTurnApi } from '../session-turn-api.mjs';
 import { createGoalFacadeApi } from '../goal-facade-api.mjs';
 import { createRuntimeReviewApi } from '../runtime-review-api.mjs';
 import { createWorkspaceTransitions, refreshWorkspacePrompt } from '../workspace/transitions.mjs';
-import { saveSession } from '../../runtime/agent/orchestrator/session/store.mjs';
+import { saveSession, saveSessionAsync } from '../../runtime/agent/orchestrator/session/store.mjs';
 import { modelToolSchemaAllowlist } from '../../runtime/agent/orchestrator/runtime-core/tool-profile.mjs';
 import { sessionOptions } from '../session-create/session-options.mjs';
 import { createConversationImportApi } from '../conversation-import/service.mjs';
 import { importError } from '../conversation-import/discovery.mjs';
 import { bootProfile } from '../boot-profile.mjs';
-import { STANDALONE_DATA_DIR } from '../runtime-paths.mjs';
+import { standaloneDataDir } from '../runtime-paths.mjs';
 import { registerBotRouteStore } from '../../runtime/shared/agent-store.mjs';
 import {
   dataDirOf,
@@ -125,6 +125,13 @@ export function wireApis(boot) {
     } catch (error) {
       bootProfile('connector-policy:migrate-failed', { error: error?.message || String(error) });
     }
+    // Agents made before the kind marker get `kind: agent` once, so an update
+    // never turns a workflow agent into a bot (agent-kind-migration.mjs).
+    try {
+      boot.workflowAgentsApi.migrateAgentKindMarkers();
+    } catch (error) {
+      bootProfile('agent-kind:migrate-failed', { error: error?.message || String(error) });
+    }
     // Bots get their own store (bots/) once, before any catalog read; a
     // failed split leaves agents/ read as before (bot-split-migration.mjs).
     try {
@@ -153,28 +160,41 @@ export function wireApis(boot) {
 
 function wireToolPolicyRefresh(boot) {
   const { rt, cfgMod } = boot;
-  const { refreshEmptySessionToolPolicy, switchSessionWorkflow, refreshAgentProfile, applyPendingAgentProfile } =
-    createToolPolicyRefresh({
-      getSession: () => rt.session,
-      getRoute: () => rt.route,
-      getMode: () => rt.mode,
-      getConfig: () => rt.config,
-      getDataDir: () => dataDirOf(cfgMod),
-      getActiveTurnCount: () => rt.activeTurnCount || 0,
-      modelStandaloneTools: boot.modelStandaloneTools,
-      featureDisallowedTools: boot.featureDisallowedTools,
-      loadCoreMemoryContext: boot.loadCoreMemoryContext,
-      loadInstructionFilesContext: (session) =>
-        session.skipInstructionFiles
-          ? ''
-          : loadInstructionFilesContext({ mode: rt.config?.instructionFiles, cwd: session.cwd }),
-      activeWorkflowContext: workflowHelpers.activeWorkflowContext,
-      invalidatePreSessionToolSurface: boot.invalidatePreSessionToolSurface,
-    });
+  const {
+    refreshEmptySessionToolPolicy,
+    switchSessionWorkflow,
+    switchSessionOrchestrationMode,
+    applyPendingSessionSwitches,
+    refreshAgentProfile,
+    applyPendingAgentProfile,
+    currentAgents,
+  } = createToolPolicyRefresh({
+    getSession: () => rt.session,
+    getRoute: () => rt.route,
+    getMode: () => rt.mode,
+    getConfig: () => rt.config,
+    getDataDir: () => dataDirOf(cfgMod),
+    getActiveTurnCount: () => rt.activeTurnCount || 0,
+    modelStandaloneTools: boot.modelStandaloneTools,
+    featureDisallowedTools: boot.featureDisallowedTools,
+    loadCoreMemoryContext: boot.loadCoreMemoryContext,
+    loadInstructionFilesContext: (session) =>
+      session.skipInstructionFiles
+        ? ''
+        : loadInstructionFilesContext({ mode: rt.config?.instructionFiles, cwd: session.cwd }),
+    activeWorkflowContext: workflowHelpers.activeWorkflowContext,
+    invalidatePreSessionToolSurface: boot.invalidatePreSessionToolSurface,
+    // A switch is acknowledged only once saved; a session closed or replaced
+    // since (its generation moved) is not resurrected.
+    persistSession: (session) => saveSessionAsync(session, { expectedGeneration: session.generation }),
+  });
   boot.refreshEmptySessionToolPolicy = refreshEmptySessionToolPolicy;
   boot.switchSessionWorkflow = switchSessionWorkflow;
+  boot.switchSessionOrchestrationMode = switchSessionOrchestrationMode;
+  boot.applyPendingSessionSwitches = applyPendingSessionSwitches;
   boot.refreshAgentProfile = refreshAgentProfile;
   boot.applyPendingAgentProfile = applyPendingAgentProfile;
+  boot.currentAgents = currentAgents;
   // A saved bot reaches this runtime's thread when its prompt embeds it (it
   // runs as that bot, or lists it); the rebuilt prompt is saved with the session.
   const profileChanges = subscribeAgentProfileChanges(async () => {
@@ -192,7 +212,7 @@ function wireToolPolicyRefresh(boot) {
 function builtinFeatureAdapters(boot) {
   const { cfgMod, getMemoryModule } = boot;
   return {
-    prepareBuiltinFeature: async (name) => {
+    prepareBuiltinFeature: async (name, options) => {
       if (name === 'memory') {
         const memory = await getMemoryModule();
         await memory.warmupEmbedding();
@@ -203,7 +223,7 @@ function builtinFeatureAdapters(boot) {
         const { installTidyCoreEngines } = await import('../../runtime/tidy/core-install.mjs');
         // Per-engine failures land in the install job, not in an exception:
         // the feature still installs and the card reports what did not.
-        await installTidyCoreEngines({ pluginData: dataDirOf(cfgMod) });
+        await installTidyCoreEngines({ pluginData: dataDirOf(cfgMod), engines: options?.engines });
       } else if (name === 'localProvider') {
         await installLocalProviderRuntime();
       } else if (name === 'autoEffort') {
@@ -487,7 +507,7 @@ function resourceApiFor(boot) {
     getCurrentCwd: () => rt.currentCwd,
     cfgMod,
     hooks: boot.hooks,
-    STANDALONE_DATA_DIR,
+    STANDALONE_DATA_DIR: standaloneDataDir(),
     saveConfigAndAdopt: boot.saveConfigAndAdopt,
     connectConfiguredMcp: boot.connectConfiguredMcp,
     cancelMcpLogin: boot.cancelMcpLogin,
@@ -574,7 +594,7 @@ function workflowAgentsApiFor(boot) {
     },
     getSession: () => rt.session,
     cfgMod: boot.cfgMod,
-    STANDALONE_DATA_DIR,
+    STANDALONE_DATA_DIR: standaloneDataDir(),
     resolveRoute,
     lookupModelMeta: boot.lookupModelMeta,
     adoptConfig: boot.adoptConfig,
@@ -599,6 +619,7 @@ function workflowAgentsApiFor(boot) {
     invalidatePreSessionToolSurface: boot.invalidatePreSessionToolSurface,
     refreshEmptySessionToolPolicy: boot.refreshEmptySessionToolPolicy,
     switchSessionWorkflow: boot.switchSessionWorkflow,
+    switchSessionOrchestrationMode: boot.switchSessionOrchestrationMode,
   });
 }
 
@@ -641,6 +662,8 @@ function sessionTurnApiFor(boot) {
   return createSessionTurnApi({
     applyPendingRoute: () => boot.modelRouteApi.applyPendingRoute(),
     applyPendingAgentProfile: boot.applyPendingAgentProfile,
+    currentAgents: boot.currentAgents,
+    applyPendingSessionSwitches: boot.applyPendingSessionSwitches,
     prepareTurnWorkspace: boot.workspaceApi.prepareTurnWorkspace,
     admitTurnWorkspace: boot.workspaceApi.admitTurnWorkspace,
     getSession: () => rt.session,
@@ -696,6 +719,7 @@ function sessionTurnApiFor(boot) {
     notificationListeners: boot.notificationListeners,
     awaitInitialMcpConnect: boot.awaitInitialMcpConnect,
     mcpTurnGraceMs: tunables.mcpTurnGraceMs,
+    mcpAgentGraceMs: tunables.mcpAgentGraceMs,
     awaitRoutePreparation: () => routePreparation.wait(),
     getReservedSessionId: () => rt.reservedSessionId,
     assertSessionAdmission: () => assertAdmissionOpen(rt),

package/src/session-runtime/boot/config.mjs

@@ -36,6 +36,7 @@ export async function resolveConfig(boot) {
     contextPercent: params.contextPercent,
     contextTokens: params.contextTokens,
     selectedContextWindow: params.selectedContextWindow,
+    agentOwned: params.sessionProfile?.owner === 'agent' || params.sessionProfile?.visibility === 'agent-only',
   }));
   configureLocalProviderIdleTtl(rt.config.providers?.[LOCAL_PROVIDER_ID]?.idleTtlSeconds);
   setConfiguredShell(normalizeSystemShellConfig(rt.config.shell).command);

package/src/session-runtime/boot/facade.mjs

@@ -7,6 +7,7 @@ import { createRuntimeFacade } from '../runtime-facade.mjs';
 import { bootProfile } from '../boot-profile.mjs';
 import { assertAdmissionOpen, bindSessionAddress } from '../session-address.mjs';
 import { dataDirOf, workflowHelpers } from './shared.mjs';
+import { publicWorkspaceMethods } from '../workspace/transitions.mjs';
 
 export function buildFacade(boot) {
   const { rt, setupTool } = boot;
@@ -41,16 +42,14 @@ export function buildFacade(boot) {
       getLiveWorkspace: boot.workspaceApi.getLiveWorkspace,
       getBranchMenu: boot.workspaceApi.getBranchMenu,
       getProjectBranchMenu: boot.workspaceApi.getProjectBranchMenu,
-      selectBranch: boot.workspaceApi.selectBranch,
       selectProjectBranch: boot.workspaceApi.selectProjectBranch,
       mergeProjectBranch: boot.workspaceApi.mergeProjectBranch,
       inspectProjectBranch: boot.workspaceApi.inspectProjectBranch,
       manageProjectBranch: boot.workspaceApi.manageProjectBranch,
-      requestWorktree: boot.workspaceApi.requestWorktree,
-      mergeWorkspace: boot.workspaceApi.mergeWorkspace,
-      removeWorktree: boot.workspaceApi.removeWorktree,
-      listWorktrees: boot.workspaceApi.listWorktrees,
-      pruneWorktrees: boot.workspaceApi.pruneWorktrees,
+      // selectBranch, requestWorktree, mergeWorkspace, removeWorktree,
+      // listWorktrees, pruneWorktrees: the public arity only, so no external
+      // caller (desktop IPC, the daemon's configure lane) reaches `ownTurn`.
+      ...publicWorkspaceMethods(boot.workspaceApi),
       onWorktreeSetup: boot.workspaceApi.onWorktreeSetup,
       claimSetupRequest: setupTool.claimSetupRequest,
       isSetupRequestActive: setupTool.isSetupRequestActive,
@@ -90,6 +89,14 @@ function reserveSessionId(boot, id) {
 // the configured one is the default for new sessions.
 function currentWorkflow(boot) {
   const { rt, cfgMod } = boot;
+  // A switch chosen while a turn runs shows at once; it applies next turn.
+  const pending = rt.session?.pendingWorkflowId;
+  if (pending) {
+    return workflowHelpers.activeWorkflowSummary(
+      { ...rt.config, workflow: { ...(rt.config?.workflow || {}), active: pending } },
+      dataDirOf(cfgMod)
+    );
+  }
   const active = workflowHelpers.activeWorkflowSummary(rt.config, dataDirOf(cfgMod));
   const current = rt.session?.workflow;
   return current?.id && active?.id && current.id !== active.id ? current : active;
@@ -106,7 +113,9 @@ function facadeGetters(boot) {
     },
     getWorkflow: () => currentWorkflow(boot),
     getOrchestrationMode: () =>
-      rt.session?.id ? sessionOrchestrationMode(rt.session) : configuredOrchestrationMode(rt.config),
+      rt.session?.id
+        ? (rt.session.pendingOrchestrationMode ?? sessionOrchestrationMode(rt.session))
+        : configuredOrchestrationMode(rt.config),
     getOutputStyle: () => boot.getOutputStyleStatusCached().current,
     getContextStatus: boot.computeContextStatus,
     getContextStatusForSession: boot.computeContextStatusForSession,

package/src/session-runtime/boot/infrastructure.mjs

@@ -4,6 +4,7 @@ import { performance } from 'node:perf_hooks';
 import { existsSync, statSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { createStandaloneHookBus } from '../services/hook-bus.mjs';
+import { attachSessionHooks } from '../session-hooks.mjs';
 import { updateCurrentCwdOverride, writeLastSessionCwd } from '../../runtime/shared/user-cwd.mjs';
 import { listRegisteredPlugins, pluginAdminStatus } from '../services/plugin-admin.mjs';
 import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
@@ -17,7 +18,7 @@ import { createCwdPlugins } from '../cwd-plugins.mjs';
 import { injectedMemoryAgentId } from '../services/memory-access.mjs';
 import { listProjectsStrict } from '../../runtime/shared/projects.mjs';
 import { isWithin } from '../../runtime/shared/worktrees/paths.mjs';
-import { STANDALONE_DATA_DIR } from '../runtime-paths.mjs';
+import { standaloneDataDir } from '../runtime-paths.mjs';
 import { SessionAddressError, isAdmissionOpen, ownerLifecycle } from '../session-address.mjs';
 import { dataDirOf } from './shared.mjs';
 
@@ -186,6 +187,17 @@ export function sessionAdopter(boot) {
       }
     }
     rt.session = v;
+    // The PreToolUse/PostToolUse bridge is a non-enumerable property that
+    // neither the store nor a resumed record carries: every session installed
+    // here (create, resume, route swap, clear, the manager's copy) gets it, so
+    // hook rules apply to all of them, not only to freshly created sessions.
+    if (v?.id && typeof v.beforeToolHook !== 'function') {
+      attachSessionHooks(v, {
+        hooks: boot.hooks,
+        hookCommonPayload: (...a) => boot.hookCommonPayload(...a),
+        getCwd: () => rt.currentCwd,
+      });
+    }
     if (v?.id) {
       rt.desktopSession = v.desktopSession || null;
       // Bind every adopted session, including a cold resume and a session
@@ -292,7 +304,7 @@ function wireCwdPlugins(boot) {
     statSync,
     existsSync,
     cfgMod,
-    STANDALONE_DATA_DIR,
+    STANDALONE_DATA_DIR: standaloneDataDir(),
   });
   Object.assign(boot, { resolveCwdPath, applyResolvedCwd, pluginsStatus, loadCoreMemoryContext });
 }

package/src/session-runtime/boot/providers.mjs

@@ -35,7 +35,7 @@ import { createQuickModelRows } from '../quick-model-rows.mjs';
 import { createProviderModels } from '../provider-models.mjs';
 import { createProviderUsage } from '../provider-usage.mjs';
 import { bootProfile } from '../boot-profile.mjs';
-import { STANDALONE_DATA_DIR } from '../runtime-paths.mjs';
+import { standaloneDataDir } from '../runtime-paths.mjs';
 import { outputStyleStatus, resolveRoute, webSearchCapableFor } from './shared.mjs';
 
 export function wireProviders(boot) {
@@ -80,7 +80,7 @@ function wireConfigLifecycle(boot) {
     clean,
     resolve,
     onConfigReloaded: () => boot.invalidateContextStatusCache?.(),
-    STANDALONE_DATA_DIR,
+    STANDALONE_DATA_DIR: standaloneDataDir(),
   });
   const {
     disposeConfigSync,

package/src/session-runtime/boot/shared.mjs

@@ -3,25 +3,31 @@
 import { isKnownProvider } from '../services/provider-admin.mjs';
 import { normalizeAgentPermissionOrNone, readMarkdownDocument } from '../../runtime/shared/markdown-frontmatter.mjs';
 import { makeWebSearchCapableFor } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
-import { makeResolveDefaultProvider, findPreset, makeResolveRoute } from '../../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
+import {
+  makeResolveDefaultProvider,
+  findPreset,
+  makeResolveRoute,
+} from '../../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 import { outputStyleStatus as outputStyleStatusRaw } from '../output-styles.mjs';
 import {
   createWorkflowHelpers,
   createWorkflowRouteHelpers,
   webSearchProviderFamily,
 } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
-import { STANDALONE_ROOT, STANDALONE_DATA_DIR } from '../runtime-paths.mjs';
+import { STANDALONE_ROOT, standaloneDataDir } from '../runtime-paths.mjs';
 
 export const resolveRoute = makeResolveRoute(makeResolveDefaultProvider(isKnownProvider));
 export const webSearchCapableFor = makeWebSearchCapableFor(webSearchProviderFamily);
 
-export const outputStyleStatus = (dataDir = STANDALONE_DATA_DIR, opts = {}) =>
-  outputStyleStatusRaw(STANDALONE_ROOT, dataDir || STANDALONE_DATA_DIR, opts);
+export const outputStyleStatus = (dataDir = standaloneDataDir(), opts = {}) =>
+  outputStyleStatusRaw(STANDALONE_ROOT, dataDir || standaloneDataDir(), opts);
 
-// Workflow/agent pack loaders bound to this runtime's root/data layout.
+// Workflow/agent pack loaders bound to this runtime's root/data layout. The
+// default data dir is the resolver itself, read per call, so a later runtime
+// start in the same process uses its own data folder.
 export const workflowHelpers = createWorkflowHelpers({
   rootDir: STANDALONE_ROOT,
-  dataDir: STANDALONE_DATA_DIR,
+  dataDir: standaloneDataDir,
   readMarkdownDocument,
   normalizeAgentPermissionOrNone,
 });

package/src/session-runtime/boot/tools.mjs

@@ -34,7 +34,9 @@ import {
   createContextStatus,
 } from '../../runtime/agent/orchestrator/runtime-core/context-status.mjs';
 import { createInternalToolExecutor } from '../internal-tool-executor.mjs';
-import { STANDALONE_ROOT, STANDALONE_DATA_DIR } from '../runtime-paths.mjs';
+import { registerWorktreeToolHost } from '../../runtime/shared/worktrees/tool-host.mjs';
+import { createWorktreeToolHost } from '../workspace/worktree-tool.mjs';
+import { STANDALONE_ROOT, standaloneDataDir } from '../runtime-paths.mjs';
 import { dataDirOf, workflowHelpers } from './shared.mjs';
 
 export function wireTools(boot) {
@@ -182,7 +184,7 @@ function wireToolSurface(boot) {
       getCurrentCwd: () => rt.currentCwd,
       cfgMod,
       delegatableAgentIds: workflowHelpers.delegatableAgentIds,
-      dataDir: STANDALONE_DATA_DIR,
+      dataDir: standaloneDataDir(),
       getFeatureDisallowedTools: featureDisallowedTools,
     });
   Object.assign(boot, {
@@ -261,5 +263,23 @@ function wireInternalTools(boot) {
       executeSessionControl: boot.params.executeSessionControl,
     }),
   });
-  Object.assign(boot, { setupTool, disposeInternalTools });
+  // The git tool's managed-worktree operations reach this Lead's workspace
+  // authority (late-bound like the internal tools) through this host.
+  const disposeWorktreeToolHost = registerWorktreeToolHost({
+    sessionId: () => rt.session?.id || null,
+    run: createWorktreeToolHost({
+      getSession: () => rt.session,
+      getWorkspaceApi: () => boot.workspaceApi || null,
+      executeSessionControl: boot.params.executeSessionControl || null,
+    }).run,
+  });
+  Object.assign(boot, {
+    setupTool,
+    disposeInternalTools: () => {
+      disposeWorktreeToolHost();
+      // Its turn snapshot cleanups stop with the runtime (maintenance finishes them).
+      boot.workspaceApi?.dispose();
+      disposeInternalTools();
+    },
+  });
 }