mixdog 0.9.174 → 1.0.0

package/src/session-runtime/model-capabilities.mjs

@@ -1,140 +1 @@
-// Provider/model capability probes: fast-tier + hosted web-search support, and
-// in-memory model-settings updates. saveModelSettings returns the next config;
-// callers persist via saveConfigAndAdopt so a new-task setWorkflow debounce
-// never collides with a sync mixdog-config lock (ELOCKCONTENDED).
-import { clean, hasOwn } from './session-text.mjs';
-import { modelSupportsServiceTier } from '../runtime/agent/orchestrator/providers/model-service-tiers.mjs';
-import { openAiDirectSupportsFast } from '../runtime/agent/orchestrator/providers/openai-direct-request.mjs';
-
-const FAST_CAPABLE_PROVIDERS = new Set([
-  'anthropic',
-  'anthropic-oauth',
-  'openai',
-  'openai-oauth',
-  'cursor-oauth',
-  'cursor-api',
-]);
-export const LAZY_SECRET_PROVIDERS = new Set(['openai-oauth', 'anthropic-oauth', 'grok-oauth']);
-
-export function routeFastKey(provider, model) {
-  const p = clean(provider);
-  const m = clean(model);
-  return p && m ? `${p}/${m}` : '';
-}
-
-function openAiModelSupportsHostedWebSearch(model) {
-  const id = clean(model?.id || model).toLowerCase();
-  if (!id) return false;
-  if (model?.supportsWebSearch === true) return true;
-  const tools = [
-    ...(Array.isArray(model?.supportedTools) ? model.supportedTools : []),
-    ...(Array.isArray(model?.tools) ? model.tools : []),
-    ...(Array.isArray(model?.capabilities?.tools) ? model.capabilities.tools : []),
-  ].map((tool) => clean(tool?.type || tool?.name || tool).toLowerCase());
-  if (tools.some((tool) => tool === 'web_search' || tool === 'web_search_preview')) return true;
-  if (/codex|image|audio|tts|stt|embedding|rerank|moderation|search-preview/.test(id)) return false;
-  return /^gpt-(5(?:\.|$|-)|4\.1(?:-|$)|4o(?:-|$)|4\.5(?:-|$))/.test(id) || /^o[34](?:-|$)/.test(id);
-}
-
-function grokModelSupportsHostedWebSearch(model) {
-  const id = clean(model?.id || model).toLowerCase();
-  if (!id || /imagine|image|video|composer/.test(id)) return false;
-  if (id === 'grok-build') return false;
-  return /^grok-/.test(id);
-}
-
-function geminiModelSupportsHostedWebSearch(model) {
-  const id = clean(model?.id || model).toLowerCase();
-  if (!id || /embedding|aqa|imagen|veo|tts|image|computer-use|customtools/.test(id)) return false;
-  return /^gemini-(3(?:\.|-|$)|2\.5-|2\.0-flash)/.test(id);
-}
-
-function anthropicModelSupportsHostedWebSearch(model) {
-  const id = clean(model?.id || model).toLowerCase();
-  if (!id) return false;
-  const match = id.match(/^claude-(opus|sonnet|haiku)-(\d+)(?:[-.](\d+))?/);
-  if (!match) return false;
-  return (Number(match[2]) || 0) >= 4;
-}
-
-function anthropicModelMetaSupportsFast(model) {
-  const id = clean(model?.id || model).toLowerCase();
-  return /^claude-(opus|sonnet)/.test(id);
-}
-
-export function fastCapableFor(provider, model, effort = null, modelParameters = {}) {
-  const p = clean(provider);
-  if (!FAST_CAPABLE_PROVIDERS.has(p)) return false;
-  if (p === 'cursor-oauth' || p === 'cursor-api') {
-    const fastEfforts = Array.isArray(model?.fastEfforts) ? model.fastEfforts.map(clean) : [];
-    if (model?.fastCapable !== true && fastEfforts.length === 0) return false;
-    const selectedEffort = clean(effort);
-    if (Array.isArray(model?.parameterVariants) && model.parameterVariants.length) {
-      const parameters = modelParameters && typeof modelParameters === 'object' ? modelParameters : {};
-      return model.parameterVariants.some(
-        (variant) =>
-          variant?.fast === 'true' &&
-          (!selectedEffort || !variant.effort || clean(variant.effort) === selectedEffort) &&
-          Object.entries(parameters).every(([key, value]) => !variant?.[key] || clean(variant[key]) === clean(value))
-      );
-    }
-    return !selectedEffort || fastEfforts.length === 0 || fastEfforts.includes(selectedEffort);
-  }
-  if (p === 'openai') return openAiDirectSupportsFast(model);
-  if (p === 'openai-oauth') return modelSupportsServiceTier(model, 'priority');
-  if (p === 'anthropic' || p === 'anthropic-oauth') return anthropicModelMetaSupportsFast(model);
-  return false;
-}
-
-// webSearchCapableFor needs the web-search-route normalizers, which live in
-// workflow.mjs and themselves are pure. Wire them in via a factory to keep
-// this module free of a circular import at load time.
-export function makeWebSearchCapableFor(normalizeWebSearchProviderId, isWebSearchCapableProvider) {
-  return function webSearchCapableFor(provider, model) {
-    const p = normalizeWebSearchProviderId(provider);
-    if (!isWebSearchCapableProvider(p)) return false;
-    if (p === 'openai' || p === 'openai-oauth') return openAiModelSupportsHostedWebSearch(model);
-    if (p === 'grok-oauth' || p === 'xai') return grokModelSupportsHostedWebSearch(model);
-    if (p === 'gemini') return geminiModelSupportsHostedWebSearch(model);
-    if (p === 'anthropic' || p === 'anthropic-oauth') return anthropicModelSupportsHostedWebSearch(model);
-    return model?.supportsWebSearch === true;
-  };
-}
-
-export function fastPreferenceFor(config, provider, model) {
-  const key = routeFastKey(provider, model);
-  if (!key) return false;
-  const saved = config?.modelSettings?.[key];
-  return Boolean(saved && typeof saved === 'object' && saved.fast === true);
-}
-
-export function saveModelSettings(cfgMod, route, { fastCapable = true, baseConfig = null } = {}) {
-  const key = routeFastKey(route?.provider, route?.model);
-  if (!key) return baseConfig || cfgMod.loadConfig();
-  const nextConfig = baseConfig || cfgMod.loadConfig();
-  const modelSettings = { ...(nextConfig.modelSettings || {}) };
-  const nextSetting = { ...(modelSettings[key] || {}) };
-  if (hasOwn(route, 'effort') && route.effort) nextSetting.effort = route.effort;
-  else delete nextSetting.effort;
-  if (fastCapable) nextSetting.fast = route.fast === true;
-  else nextSetting.fast = false;
-  if (route.modelParameters && typeof route.modelParameters === 'object') {
-    nextSetting.modelParameters = Object.fromEntries(
-      Object.entries(route.modelParameters)
-        .map(([key, value]) => [clean(key), clean(value)])
-        .filter(([key, value]) => key && value)
-    );
-  } else {
-    delete nextSetting.modelParameters;
-  }
-  const contextPercent = Number(route.contextPercent);
-  if (Number.isFinite(contextPercent) && contextPercent >= 10 && contextPercent <= 100) {
-    nextSetting.contextPercent = Math.round(contextPercent / 10) * 10;
-  } else {
-    delete nextSetting.contextPercent;
-  }
-  modelSettings[key] = nextSetting;
-
-  const savedConfig = { ...nextConfig, modelSettings };
-  return savedConfig;
-}
+export * from '../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';

package/src/session-runtime/model-recency.mjs

@@ -1,7 +1,7 @@
 // Provider-model version parsing, recency comparison, sorting, and cache-row
 // construction. Pure except for the
 // injected route provider (for sort priority) and webSearchCapableFor predicate.
-import { clean } from './session-text.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 
 function parsedProviderModelVersion(id) {
   const text = clean(id).toLowerCase();

package/src/session-runtime/model-route/route-persist.mjs

@@ -3,9 +3,9 @@
  * the current session: modelSettings save, lead-preset persistence and the
  * fast/effort tuning of a session that runs on the selected route.
  */
-import { saveModelSettings } from '../model-capabilities.mjs';
+import { saveModelSettings } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
 import { writeStatuslineRoute } from '../statusline-route.mjs';
-import { sessionUsesRoute } from '../session-route-policy.mjs';
+import { sessionUsesRoute } from '../../runtime/agent/orchestrator/runtime-core/session-route-policy.mjs';
 
 export function createRoutePersistence(deps) {
   const {

package/src/session-runtime/model-route/route-tuning.mjs

@@ -1,9 +1,9 @@
 /**
  * route-tuning.mjs — fast and effort changes on the current main route.
  */
-import { normalizeEffortInput } from '../effort.mjs';
-import { fastCapableFor } from '../model-capabilities.mjs';
-import { workflowPresetId } from '../workflow.mjs';
+import { normalizeEffortInput } from '../../runtime/agent/orchestrator/runtime-core/effort.mjs';
+import { fastCapableFor } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
+import { workflowPresetId } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 
 export function createRouteTuning(deps, persist) {
   const { getConfig, getRoute, setRouteState, resolveRoute, lookupModelMeta, refreshRouteEffort } = deps;

package/src/session-runtime/model-route/set-route.mjs

@@ -3,19 +3,19 @@
  * adopt it into config, then decide how the current session follows it
  * (untouched, tuned, recreated, or updated in place when empty).
  */
-import { clean, hasOwn } from '../session-text.mjs';
-import { fastCapableFor } from '../model-capabilities.mjs';
+import { clean, hasOwn } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { fastCapableFor } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
 import {
   ensureProviderEnabled,
   findPreset,
   modelMetaLooksResolved,
   validateRequestedModelSelector,
-} from '../config-helpers.mjs';
+} from '../../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 import { getModelMetadataSync } from '../../runtime/agent/orchestrator/providers/model-catalog.mjs';
-import { workflowPresetId } from '../workflow.mjs';
+import { workflowPresetId } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 import { writeStatuslineRoute } from '../statusline-route.mjs';
-import { sessionHasRouteHistory, shouldRecreateEmptySessionForRouteChange } from '../session-route-policy.mjs';
-import { rebuildDeferredToolSurfaceForProvider } from '../tool-catalog.mjs';
+import { sessionHasRouteHistory, shouldRecreateEmptySessionForRouteChange } from '../../runtime/agent/orchestrator/runtime-core/session-route-policy.mjs';
+import { rebuildDeferredToolSurfaceForProvider } from '../../runtime/agent/orchestrator/runtime-core/tool-catalog.mjs';
 
 /** The request, completed from the live route where the caller left gaps. */
 function completeRequest(deps, next) {

package/src/session-runtime/model-route/web-search-route.mjs

@@ -2,10 +2,10 @@
  * web-search-route.mjs — the native web-search route: read with the
  * follow-Main default, list candidate models, and validate + save a selection.
  */
-import { clean, hasOwn } from '../session-text.mjs';
-import { coerceEffortFor } from '../effort.mjs';
-import { fastCapableFor } from '../model-capabilities.mjs';
-import { ensureProviderEnabled } from '../config-helpers.mjs';
+import { clean, hasOwn } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { coerceEffortFor } from '../../runtime/agent/orchestrator/runtime-core/effort.mjs';
+import { fastCapableFor } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
+import { ensureProviderEnabled } from '../../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 import {
   isDefaultWebSearchRouteConfig,
   isWebSearchCapableProvider,
@@ -13,7 +13,7 @@ import {
   webSearchRouteOrDefault,
   WEB_SEARCH_DEFAULT_MODEL,
   WEB_SEARCH_DEFAULT_PROVIDER,
-} from '../workflow.mjs';
+} from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 
 const defaultWebSearchRoute = (toolType) =>
   normalizeWebSearchRouteConfig({

package/src/session-runtime/model-route-api.mjs

@@ -15,7 +15,7 @@ import { createWebSearchRouteApi } from './model-route/web-search-route.mjs';
 import { createSetRoute } from './model-route/set-route.mjs';
 import { createRouteTuning } from './model-route/route-tuning.mjs';
 
-export { shouldRecreateEmptySessionForRouteChange } from './session-route-policy.mjs';
+export { shouldRecreateEmptySessionForRouteChange } from '../runtime/agent/orchestrator/runtime-core/session-route-policy.mjs';
 
 export function createModelRouteApi(deps) {
   const persist = createRoutePersistence(deps);

package/src/session-runtime/native-web-search/routes.mjs

@@ -3,7 +3,7 @@
  * configured web-search route, or the Main model when the route is the
  * follow-Main default.
  */
-import { webSearchRouteOrDefault } from '../workflow.mjs';
+import { webSearchRouteOrDefault } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 
 export function createWebSearchRouteCandidates({
   getRoute,

package/src/session-runtime/native-web-search/tool-shape.mjs

@@ -2,7 +2,7 @@
  * tool-shape.mjs — provider-specific shape of the hosted web-search tool,
  * the prompt that drives it and the flattening of its cited sources.
  */
-import { clean } from '../session-text.mjs';
+import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 
 export function normalizeWebSearchAllowedDomain(site) {
   const raw = clean(site);
@@ -32,7 +32,7 @@ export function nativeWebSearchTool(args = {}, toolType = 'web_search', provider
   const type = clean(toolType) || 'web_search';
   const location = nativeWebSearchUserLocation(args.locale);
   if (providerName === 'gemini') {
-    return { type: type || 'google_search' };
+    return { type };
   }
   if (providerName === 'anthropic' || providerName === 'anthropic-oauth') {
     const tool = {

package/src/session-runtime/output-styles.mjs

@@ -4,8 +4,8 @@
 // shared with the CJS rules builder that injects the style into the prompt.
 import { join } from 'node:path';
 import { readFileSync, readdirSync, statSync } from 'node:fs';
-import { clean } from './session-text.mjs';
-import { readJsonSafe } from './fs-utils.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { readJsonSafe } from '../runtime/agent/orchestrator/runtime-core/fs-utils.mjs';
 import {
   DEFAULT_OUTPUT_STYLE_ID,
   matchOutputStyle,

package/src/session-runtime/prewarm/channel-start.mjs

@@ -80,6 +80,7 @@ export function createChannelStart({
       bootProfile('channels:start-skipped');
       return;
     }
+    clearTimeout(timers.channelStartTimer);
     timers.channelStartTimer = setTimeout(() => {
       timers.channelStartTimer = null;
       if (isCloseRequested()) return;

package/src/session-runtime/provider-auth/accounts.mjs

@@ -1,6 +1,6 @@
 // provider-auth/accounts.mjs — the per-provider account roster and account
 // switching, with the bounded background usage sweep that refreshes quotas.
-import { listProviderAccounts, updateProviderAccounts } from '../../standalone/provider-admin.mjs';
+import { listProviderAccounts, updateProviderAccounts } from '../services/provider-admin.mjs';
 import { getProvider } from '../../runtime/agent/orchestrator/providers/registry.mjs';
 import { fetchOAuthUsageSnapshot } from '../../runtime/agent/orchestrator/providers/oauth-usage.mjs';
 
@@ -59,7 +59,12 @@ export function createAccountApi(
       const pool = listProviderAccounts(providerId);
       const provider = getProvider(providerId);
       if (provider?.forAccount && !accountUsageSweeps.has(providerId)) {
-        accountUsageSweeps.set(providerId, sweepAccountUsage(providerId, provider, pool.accounts));
+        accountUsageSweeps.set(
+          providerId,
+          sweepAccountUsage(providerId, provider, pool.accounts).catch(() => {
+            /* usage sweep is best-effort */
+          })
+        );
       }
       return pool;
     },

package/src/session-runtime/provider-auth/login.mjs

@@ -8,7 +8,7 @@ import {
   saveOpenAIUsageSessionKey,
   saveOpenCodeGoUsageAuth,
   saveProviderApiKey,
-} from '../../standalone/provider-admin.mjs';
+} from '../services/provider-admin.mjs';
 
 export function createLoginApi({ cfgMod, awaitKeychainPrewarm, reloadFullConfig }, refresh) {
   async function completeOAuthLogin(login) {

package/src/session-runtime/provider-auth-api.mjs

@@ -1,4 +1,4 @@
-import { renderProviderStatus } from '../standalone/provider-admin.mjs';
+import { renderProviderStatus } from './services/provider-admin.mjs';
 import { createAuthRefresh } from './provider-auth/refresh.mjs';
 import { createAccountApi } from './provider-auth/accounts.mjs';
 import { createSetupApi } from './provider-auth/setup.mjs';

package/src/session-runtime/provider-models/model-meta.mjs

@@ -1,7 +1,7 @@
 // provider-models/model-meta.mjs
 // Per-route model metadata keyed by (provider, model), and the catalog
 // revision that decides when every provider-derived cache must be dropped.
-import { clean } from '../session-text.mjs';
+import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { catalogRevision } from '../provider-catalog-cache.mjs';
 
 export function modelMetaKey(providerId, modelId) {

package/src/session-runtime/provider-models/row-hydration.mjs

@@ -2,9 +2,9 @@
 // Turning cached catalog rows into picker rows: the user's saved per-model
 // settings (alias, effort, fast, parameters, context budget) layered on top,
 // then the route-provider-first sort.
-import { effortItemsFor } from '../effort.mjs';
-import { fastCapableFor, fastPreferenceFor } from '../model-capabilities.mjs';
-import { modelSettingsFor } from '../config-helpers.mjs';
+import { effortItemsFor } from '../../runtime/agent/orchestrator/runtime-core/effort.mjs';
+import { fastCapableFor, fastPreferenceFor } from '../../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
+import { modelSettingsFor } from '../../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 
 export function hydrateProviderModelRow(cfg, row) {
   const saved = modelSettingsFor(cfg, row.provider, row.id);

package/src/session-runtime/provider-usage.mjs

@@ -4,7 +4,7 @@
 // `caches` object (so invalidateProviderCaches still resets the same
 // references) and all config/registry reads flow through supplied accessors so
 // live-binding is preserved.
-import { clean } from './session-text.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 
 // A post-redeem dashboard rebuild is best effort: past this budget the caller
 // gets its confirmed outcome and the surface revalidates on its own cadence.
@@ -57,7 +57,7 @@ export function createProviderUsage({
   function refreshStatuslineUsageSnapshot(routeLike = {}) {
     const providerId = clean(routeLike.provider);
     const modelId = clean(routeLike.model);
-    if (!providerId?.includes('oauth')) return;
+    if (!providerId.includes('oauth')) return;
     const providerObj = reg().getProvider(providerId);
     if (!providerObj) return;
     void fetchOAuthUsageSnapshot({ provider: providerId, model: modelId }, providerObj, (message) => {

package/src/session-runtime/quick-model-rows/model-meta.mjs

@@ -1,6 +1,6 @@
 // Offline model metadata for quick picker rows: the sync catalog lookup and a
 // model record filled from it.
-import { clean } from '../session-text.mjs';
+import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { getModelMetadataSync } from '../../runtime/agent/orchestrator/providers/model-catalog.mjs';
 
 export function metadataFor(provider, modelId) {

package/src/session-runtime/quick-model-rows/provider-rows.mjs

@@ -1,7 +1,7 @@
 // Quick (offline) main-model picker rows: every enabled provider's cached
 // models plus the routes the profile already names (current, presets,
 // workflow and agent routes), deduplicated per provider:model.
-import { clean } from '../session-text.mjs';
+import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { providerCachedModelsSync } from '../../runtime/agent/orchestrator/providers/provider-catalog-cache.mjs';
 import { metadataFor } from './model-meta.mjs';
 

package/src/session-runtime/quick-model-rows/web-search-rows.mjs

@@ -1,9 +1,9 @@
 // Quick (offline) web-search model rows: the "Default" row that follows the
 // main model, cached or built-in quick models per capable provider, and the
 // configured/current routes, deduplicated per provider:model.
-import { clean } from '../session-text.mjs';
+import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import { QUICK_WEB_SEARCH_MODELS } from '../quick-web-search-models.mjs';
-import { WEB_SEARCH_DEFAULT_PROVIDER, WEB_SEARCH_DEFAULT_MODEL } from '../workflow.mjs';
+import { WEB_SEARCH_DEFAULT_PROVIDER, WEB_SEARCH_DEFAULT_MODEL } from '../../runtime/agent/orchestrator/runtime-core/workflow.mjs';
 import { providerCachedModelsSync } from '../../runtime/agent/orchestrator/providers/provider-catalog-cache.mjs';
 import { hydratedModel } from './model-meta.mjs';
 

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

@@ -2,8 +2,8 @@
 // runtime API. Stateless helpers are imported directly; the runtime injects
 // live state getters plus the closure callbacks (`deps`). Each surface lives in
 // its own module and shares the extension-change sync and scope decorators.
-import { clean } from './session-text.mjs';
-import { EXTENSION_SCOPE_KINDS, withExtensionScope } from './extension-scopes.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { EXTENSION_SCOPE_KINDS, withExtensionScope } from '../runtime/agent/orchestrator/runtime-core/extension-scopes.mjs';
 import { createExtensionSync } from './resource-extension-sync.mjs';
 import { createScopeDecorators } from './resource-scope-decorate.mjs';
 import { createMcpResourceApi } from './resource-mcp-api.mjs';

package/src/session-runtime/resource-mcp-api.mjs

@@ -2,7 +2,7 @@
 // servers a plugin's manifest or script contributes.
 import { join } from 'node:path';
 import { existsSync } from 'node:fs';
-import { clean } from './session-text.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import {
   normalizePluginMcpServerConfig,
   pluginMcpServerName,
@@ -11,10 +11,10 @@ import {
   pluginServerMatcher,
   resolveContainedPluginPath,
   mergeMcpServerConfig,
-} from './plugin-mcp.mjs';
+} from '../runtime/agent/orchestrator/runtime-core/plugin-mcp.mjs';
 
 /** The `mcpServers` map of a config as a fresh object (never the live one). */
-export function mcpServersOf(config) {
+function mcpServersOf(config) {
   return config.mcpServers && typeof config.mcpServers === 'object' ? { ...config.mcpServers } : {};
 }
 

package/src/session-runtime/resource-plugins-api.mjs

@@ -1,12 +1,12 @@
 // Plugin registry edits and the MCP entries a plugin owns.
-import { clean } from './session-text.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import {
   addPlugin as registryAddPlugin,
   removePlugin as registryRemovePlugin,
   setPluginEnabled as registrySetPluginEnabled,
   updatePlugin as registryUpdatePlugin,
-} from '../standalone/plugin-admin.mjs';
-import { pluginMcpServerName, pluginServerMatcher } from './plugin-mcp.mjs';
+} from './services/plugin-admin.mjs';
+import { pluginMcpServerName, pluginServerMatcher } from '../runtime/agent/orchestrator/runtime-core/plugin-mcp.mjs';
 
 const pluginKey = (plugin) => clean(plugin.id || plugin.name || plugin);
 

package/src/session-runtime/resource-recall-api.mjs

@@ -1,12 +1,12 @@
 // Memory control and recall: the current session's own rows first, then the
 // memory runtime (with a forced ingest of the live session when it is empty).
-import { clean, toolResponseText, isEmptyRecallText, currentSessionRecallRows } from './session-text.mjs';
+import { clean, toolResponseText, isEmptyRecallText, currentSessionRecallRows } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 
 function isIdentityRecallQuery(query) {
   const q = clean(query).toLowerCase().replace(/\s+/g, '');
   if (!q) return false;
   return (
-    /(?:\uB0B4\uAC00|\uB098\uB294|\uB098|\uC0AC\uC6A9\uC790|\uC720\uC800|user|my|me).*(?:\uB204\uAD6C|\uB204\uAD70|\uC815\uCCB4|\uC774\uB984|name|identity)|(?:whoami|whoami\?|whoami？)|who(?:am)?i|whoami/.test(
+    /(?:\uB0B4\uAC00|\uB098\uB294|\uB098|\uC0AC\uC6A9\uC790|\uC720\uC800|user|my|me).*(?:\uB204\uAD6C|\uB204\uAD70|\uC815\uCCB4|\uC774\uB984|name|identity)|who(?:am)?i/.test(
       q
     ) ||
     /^(?:\uB098\uB204\uAD6C\uB0D0|\uB098\uB294\uB204\uAD6C\uB0D0|\uB0B4\uAC00\uB204\uAD6C\uB0D0|\uB0B4\uC774\uB984\uBB50|\uB0B4\uC774\uB984\uBB50\uC57C|whoami)$/i.test(

package/src/session-runtime/resource-scope-decorate.mjs

@@ -2,13 +2,13 @@
 // entry's own root list (null = global); `inheritedScope` is the owning
 // plugin's; and `activeHere` says whether the CURRENT cwd sees the entry, so
 // panels can badge "not in this project" without redoing the path match.
-import { clean } from './session-text.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
 import {
   cwdWithinProjects,
   extensionScopeProjects,
   extensionScopesFromConfig,
   pluginIdForMcpServer,
-} from './extension-scopes.mjs';
+} from '../runtime/agent/orchestrator/runtime-core/extension-scopes.mjs';
 
 function listOf(status, key) {
   return Array.isArray(status?.[key]) ? status[key] : [];

package/src/session-runtime/route-resolution.mjs

@@ -1,9 +1,9 @@
 // Route resolution against the live runtime record: pick a model for a
 // model-less first turn and refresh the route's effort / Fast / context
 // fields from provider metadata.
-import { ensureProviderEnabled } from './config-helpers.mjs';
-import { clean } from './session-text.mjs';
-import { effortItemsFor } from './effort.mjs';
+import { ensureProviderEnabled } from '../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
+import { clean } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { effortItemsFor } from '../runtime/agent/orchestrator/runtime-core/effort.mjs';
 import { runAbortable, throwIfAborted } from '../runtime/shared/abort-race.mjs';
 import { resolveRouteContextState, resolveRouteEffortState, routeModelDisplay } from './route-state.mjs';
 

package/src/session-runtime/route-state.mjs

@@ -1,9 +1,9 @@
 // Pure route derivations: the effective effort / Fast capability of a route
 // against provider model metadata, and its context-window percentage.
-import { modelMetaLooksResolved, modelSettingsFor } from './config-helpers.mjs';
-import { clean, hasOwn } from './session-text.mjs';
-import { coerceEffortFor } from './effort.mjs';
-import { fastCapableFor } from './model-capabilities.mjs';
+import { modelMetaLooksResolved, modelSettingsFor } from '../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
+import { clean, hasOwn } from '../runtime/agent/orchestrator/runtime-core/session-text.mjs';
+import { coerceEffortFor } from '../runtime/agent/orchestrator/runtime-core/effort.mjs';
+import { fastCapableFor } from '../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
 import { providerCachedModelMetadataSync } from '../runtime/agent/orchestrator/providers/provider-catalog-cache.mjs';
 
 export function resolveRouteEffortState(targetRoute = {}, modelMeta = null) {

package/src/session-runtime/runtime-bootstrap.mjs

@@ -3,7 +3,7 @@
 // two steps stay separate exports because the runtime creates
 // provider-readiness state between them.
 import { performance } from 'node:perf_hooks';
-import { ensureStandaloneEnvironment } from '../standalone/seeds.mjs';
+import { ensureStandaloneEnvironment } from './services/seeds.mjs';
 import { listOfficeJournals } from '../runtime/office/core/journal.mjs';
 import { bootProfile, profiledImport } from './boot-profile.mjs';
 import {

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

@@ -1,4 +1,4 @@
-import { SESSION_ID_PATTERN } from './lifecycle/shared.mjs';
+import { SESSION_ID_PATTERN } from '../runtime/agent/orchestrator/runtime-core/session-id.mjs';
 
 function requiredSessionId(value) {
   const sessionId = String(value || '').trim();

package/src/session-runtime/runtime-feature-gates.mjs

@@ -4,8 +4,8 @@
 //
 // Key names mirror the dependency names of settings-api.mjs / the session-build
 // deps, so the runtime can hand them straight through.
-import { builtinFeatureActive, featureDisallowedToolsFor, localGitToolsActive } from './builtin-features.mjs';
-import { moduleEnabled, recapEnabled } from './config-helpers.mjs';
+import { builtinFeatureActive, featureDisallowedToolsFor, localGitToolsActive } from '../runtime/agent/orchestrator/runtime-core/builtin-features.mjs';
+import { moduleEnabled, recapEnabled } from '../runtime/agent/orchestrator/runtime-core/config-helpers.mjs';
 import { browserBridgeAvailableSync } from '../runtime/browser-bridge/client.mjs';
 import { computerBridgeAvailableSync } from '../runtime/computer-bridge/client.mjs';
 

package/src/session-runtime/runtime-modules.mjs

@@ -2,9 +2,9 @@
 // a feature first needs them, then load once per session runtime.
 import { performance } from 'node:perf_hooks';
 import { fileURLToPath } from 'node:url';
-import { getStandaloneMemoryRuntime } from '../standalone/memory-runtime-proxy.mjs';
+import { getStandaloneMemoryRuntime } from './services/memory-runtime-proxy.mjs';
 import { bootProfile } from './boot-profile.mjs';
-import { CODE_GRAPH_RUNTIME, STANDALONE_DATA_DIR, WEB_SEARCH_RUNTIME } from './runtime-paths.mjs';
+import { CODE_GRAPH_RUNTIME, WEB_SEARCH_RUNTIME, pluginDataDir } from './runtime-paths.mjs';
 
 const MEMORY_RUNTIME_ENTRY = fileURLToPath(new URL('../runtime/memory/index.mjs', import.meta.url));
 
@@ -18,7 +18,7 @@ export function createLazyRuntimeModules({ rt, cfgMod }) {
     rt.memoryModPromise ??= Promise.resolve().then(() => {
       const runtime = getStandaloneMemoryRuntime({
         entry: MEMORY_RUNTIME_ENTRY,
-        dataDir: process.env.MIXDOG_DATA_DIR || cfgMod.getPluginData?.() || STANDALONE_DATA_DIR,
+        dataDir: process.env.MIXDOG_DATA_DIR || pluginDataDir(cfgMod),
       });
       // Session teardown must never stop a process shared by every other live
       // session. The daemon owns the actual stop()/deregister lifecycle.

package/src/session-runtime/runtime-paths.mjs

@@ -12,7 +12,11 @@ export const CODE_GRAPH_RUNTIME = '../runtime/agent/orchestrator/tools/code-grap
 export const STATUSLINE_SESSION_ROUTES = '../vendor/statusline/src/gateway/session-routes.mjs';
 
 const SESSION_RUNTIME_DIR = dirname(fileURLToPath(import.meta.url));
-const STANDALONE_SOURCE_ROOT = dirname(SESSION_RUNTIME_DIR);
-export const STANDALONE_ROOT = STANDALONE_SOURCE_ROOT;
+export const STANDALONE_ROOT = dirname(SESSION_RUNTIME_DIR);
 const mixdogHome = process.env.MIXDOG_HOME || join(homedir(), '.mixdog');
 export const STANDALONE_DATA_DIR = process.env.MIXDOG_DATA_DIR || join(mixdogHome, 'data');
+
+/** The data directory a runtime writes to: its config module's plugin data dir, else the standalone default. */
+export function pluginDataDir(cfgMod) {
+  return cfgMod.getPluginData?.() || STANDALONE_DATA_DIR;
+}

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

@@ -1,6 +1,6 @@
 import { shouldPersistModelVisibleToolCompletion } from '../runtime/shared/tool-execution-contract.mjs';
-import { saveModelSettings } from './model-capabilities.mjs';
-import { renderToolSearch } from './tool-catalog.mjs';
+import { saveModelSettings } from '../runtime/agent/orchestrator/runtime-core/model-capabilities.mjs';
+import { renderToolSearch } from '../runtime/agent/orchestrator/runtime-core/tool-catalog.mjs';
 
 export function __renderToolSearchForTest(args = {}, session = {}, mode = 'full', options = {}) {
   return renderToolSearch(args, session, mode, options);

package/src/{runtime/shared → session-runtime}/schedule-session-run.mjs

@@ -6,12 +6,12 @@
  * filter as its own type, so it shows in desktop Recent / TUI resume), the
  * schedule's provider/model route, and the schedule's project cwd.
  */
-import { loadConfig } from '../agent/orchestrator/config.mjs';
-import { createSession } from '../agent/orchestrator/session/manager/session-lifecycle.mjs';
-import { askSession } from '../agent/orchestrator/session/manager/ask-session.mjs';
-import { modelRouteFields, parseScheduleModelRef } from './schedule-model-ref.mjs';
+import { loadConfig } from '../runtime/agent/orchestrator/config.mjs';
+import { createSession } from '../runtime/agent/orchestrator/session/manager/session-lifecycle.mjs';
+import { askSession } from '../runtime/agent/orchestrator/session/manager/ask-session.mjs';
+import { modelRouteFields, parseScheduleModelRef } from '../runtime/shared/schedule-model-ref.mjs';
 import { automationWorkflowOpts } from './automation-workflow.mjs';
-import { automationPromptContent } from './automation-attachments.mjs';
+import { automationPromptContent } from '../runtime/shared/automation-attachments.mjs';
 
 /** Resolve schedule.model into a {provider,model,effort?,fast?} route. */
 function scheduleRouteFromModelRef(modelRef, config = null) {