mixdog 1.3.2 → 1.3.4

package/src/standalone/session-service.mjs

@@ -23,6 +23,7 @@ import { createViewerRegistry } from './session-service/viewers.mjs';
 import { createSessionEntries } from './session-service/entries.mjs';
 import { createSessionCalls } from './session-service/session-calls.mjs';
 import { createQuotaResumeScheduler } from './session-service/quota-resume.mjs';
+import { createAgentRouteFollow } from './session-service/agent-route-follow.mjs';
 import { registerDelegatedApprovalOpener } from '../runtime/shared/delegated-approval-host.mjs';
 
 const EXTERNAL_SESSION_ACTIONS = new Set([
@@ -209,6 +210,14 @@ export function createSessionService({
   // A sub-agent's approval shows in its top-level chat; one not loaded is
   // brought up so the copy (and its notifications) appear there.
   const unregisterApprovalOpener = registerDelegatedApprovalOpener((sessionId) => calls.materializeSession(sessionId));
+  // A bot's saved route reaches its hosted home and room-member chats from their next turn.
+  const agentRouteFollow = createAgentRouteFollow({
+    sessionsById,
+    sessionOwner: projection.sessionOwner,
+    advance: projection.advance,
+    publishStep: projection.publishStep,
+    log,
+  });
   const quotaUsableReader = typeof readQuotaUsable === 'function' ? readQuotaUsable : async () => false;
   const quotaResume = quotaResumeStore
     ? createQuotaResumeScheduler({
@@ -224,6 +233,7 @@ export function createSessionService({
     if (stopPromise) return stopPromise;
     closed = true;
     unregisterApprovalOpener();
+    agentRouteFollow.unsubscribe();
     quotaResume?.stop();
     stopPromise = Promise.resolve().then(async () => {
       try {

package/src/standalone/session-tool-output.mjs

@@ -24,6 +24,7 @@ export function sessionListOutput(page, limit, { rich = true } = {}) {
         : {}),
       ...(row.status ? { status: row.status } : {}),
       ...(row.cwd ? { cwd: row.cwd } : {}),
+      ...(row.archived === true ? { archived: true } : {}),
     };
     if (!rich) return base;
     // The bot it belongs to: its chat, room seat or the task's creator.

package/src/standalone/staged-import.mjs

@@ -0,0 +1,47 @@
+// Staged dynamic import of a large module graph. Loading a graph (file reads,
+// compilation, evaluation) runs synchronously inside one import() call, so the
+// daemon's session-runtime warm-up held the event loop for ~0.5 s in one
+// piece right after `daemon-ready`. Importing the graph's top-level stages one
+// loop turn apart splits that block without changing what is loaded.
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+// A static `import … from './x'`, `export … from './x'` or bare `import './x'`
+// at the start of a line, in source order.
+const STATIC_RELATIVE_IMPORT =
+  /^(?:import|export)\b[^;]*?\bfrom\s*['"](\.{1,2}\/[^'"]+)['"]|^import\s*['"](\.{1,2}\/[^'"]+)['"]/gm;
+
+/** The relative static imports of the module at `url`, resolved, in source order. */
+export function staticRelativeImports(url) {
+  const source = readFileSync(fileURLToPath(url), 'utf8');
+  return [...source.matchAll(STATIC_RELATIVE_IMPORT)].map((match) => new URL(match[1] || match[2], url).href);
+}
+
+const nextTurn = () => new Promise((resolve) => setImmediate(resolve));
+
+/**
+ * import(url), after importing each static relative dependency of `stagesOf`
+ * (in its source order, one loop turn apart). Module evaluation order is the
+ * one a single import gives — dependencies depth-first in source order — as
+ * long as no module of a stage's graph imports `stagesOf` or an importer of it
+ * back. Staging stops at the first stage that fails, so no later stage
+ * evaluates; the final import then reports the failure as a single import
+ * would.
+ */
+export async function importInStages(url, stagesOf) {
+  let stages = [];
+  try {
+    stages = staticRelativeImports(stagesOf);
+  } catch {
+    // Unreadable source: one import, as before.
+  }
+  for (const stage of stages) {
+    try {
+      await import(stage);
+    } catch {
+      break;
+    }
+    await nextTurn();
+  }
+  return import(url);
+}

package/src/tui/App.jsx

@@ -516,6 +516,8 @@ export function App({ store, initialStatusLine = '', forceOnboarding = false, on
     syncPromptLayoutRows,
     showPromptHint,
     clearPromptHint,
+    installPastedImages,
+    installPastedTexts,
   });
 
   // PROMPT HANDLER cluster extracted to app/use-prompt-handlers.mjs.

package/src/tui/app/message-selector.mjs

@@ -45,6 +45,8 @@ export function useMessageSelector({
   syncPromptLayoutRows,
   showPromptHint,
   clearPromptHint,
+  installPastedImages,
+  installPastedTexts,
 }) {
   // Cheap enough to recompute only when the transcript array identity changes;
   // the prompt asks for this on every Escape, never per keystroke.
@@ -64,11 +66,22 @@ export function useMessageSelector({
         return false;
       }
       clearPromptHint();
+      // The prompt's pasted blocks return with it, so its tokens still expand.
+      if (restored.pastedImages) installPastedImages?.(restored.pastedImages, { merge: true });
+      if (restored.pastedTexts) installPastedTexts?.(restored.pastedTexts, { merge: true });
       syncPromptLayoutRows(text);
       setPromptDraftOverride({ id: Date.now(), value: text });
+      if (restored.notice) showPromptHint(restored.notice, 'error');
       return true;
     },
-    [clearPromptHint, syncPromptLayoutRows, setPromptDraftOverride, showPromptHint]
+    [
+      clearPromptHint,
+      syncPromptLayoutRows,
+      setPromptDraftOverride,
+      showPromptHint,
+      installPastedImages,
+      installPastedTexts,
+    ]
   );
 
   const openMessageSelector = useCallback(() => {
@@ -89,7 +102,7 @@ export function useMessageSelector({
         own.close();
         let restored;
         try {
-          restored = store.rewindToItem?.(value);
+          restored = store.rewindToItem?.(value, { restoreFiles: false });
         } catch (error) {
           showPromptHint(`rewind failed: ${error?.message || error}`, 'error');
           return;

package/src/tui/app/model-options.mjs

@@ -221,6 +221,18 @@ export const loadProviderDisplayNames = async (store) => {
   return names;
 };
 
+/** Provider names for the picker: custom rows' own `providerName` first, then
+ *  setup names over them (setup wins). Works when setup is missing or failed. */
+export const catalogProviderDisplayNames = (models, setupNames = null) => {
+  const names = {};
+  for (const model of Array.isArray(models) ? models : []) {
+    const provider = String(model?.provider || '').trim();
+    const name = String(model?.providerName || '').trim();
+    if (provider.startsWith('custom-') && name) names[provider] = name;
+  }
+  return { ...names, ...setupNames };
+};
+
 /** `{ id, text }` for each provider whose model list failed, with the reason
  *  (the setup row's `catalogError`) and what to do about it. */
 export const loadProviderCatalogFailures = async (store) => {
@@ -368,9 +380,11 @@ const routeModelDetails = (route) =>
     .filter(Boolean)
     .join(' · ');
 
-export const routeLabel = (route) => {
+export const routeLabel = (route, providerNames = null) => {
   if (!route?.provider || !route?.model) return '(unset)';
-  return [providerDisplayName(route.provider), routeModelDetails(route)].filter(Boolean).join(' · ');
+  return [resolveProviderDisplayName(route.provider, providerNames), routeModelDetails(route)]
+    .filter(Boolean)
+    .join(' · ');
 };
 
 export const routeModelLabel = (route) => (route?.model ? routeModelDetails(route) : '(unset)');

package/src/tui/app/model-picker.mjs

@@ -14,6 +14,7 @@ import {
   normalizeModelOptions,
   buildCatalogFailureItems,
   buildModelProviderItems,
+  catalogProviderDisplayNames,
   loadProviderCatalogFailures,
   loadProviderDisplayNames,
 } from './model-options.mjs';
@@ -83,7 +84,7 @@ export function createModelPicker({
     }
 
     const models = normalizeModelOptions(providerModels);
-    const providerNames = await loadProviderDisplayNames(store);
+    const providerNames = catalogProviderDisplayNames(models, await loadProviderDisplayNames(store));
     const catalogFailures = await loadProviderCatalogFailures(store);
     const activeRoute = options.currentRoute || {
       provider: state.provider,

package/src/tui/app/route-pickers.mjs

@@ -7,6 +7,7 @@
  * openers (openModelPicker) thread as lazy getter wrappers so they resolve the
  * live binding at call time.
  */
+import { loadProviderDisplayNames } from './model-options.mjs';
 import { createAgentsPicker } from './route-pickers/agents-picker.mjs';
 import { createOutputStylePicker } from './route-pickers/output-style-picker.mjs';
 import { createWorkflowPicker } from './route-pickers/workflow-picker.mjs';
@@ -59,7 +60,8 @@ export function createRoutePickers({
           store.pushNotice('Web-search model save is already running.', 'warn');
           return;
         }
-        store.pushNotice(`Web-search model set to ${routeLabel(result)}`, 'info');
+        const providerNames = await loadProviderDisplayNames(store);
+        store.pushNotice(`Web-search model set to ${routeLabel(result, providerNames)}`, 'info');
         return result;
       },
       onAfterSelect: null,