mixdog 1.1.2 → 1.2.0

package/src/standalone/session-transport/call-route.mjs

@@ -91,14 +91,27 @@ export function createCallRoute({ handleCall, clients, lanes, callCache, nowMs }
       // tell a failed CALL from a dead TRANSPORT (which must re-attach). The
       // machine-readable `code` (ECALLIDCONFLICT / ECALLRESULTDROPPED) travels
       // with it: a client must be able to branch on it, not parse prose.
+      // Typed (worktree) failures also carry their plain JSON `details`.
       sendJson(
         res,
         {
           error: err?.message || String(err),
           ...(err?.code ? { code: String(err.code) } : {}),
+          ...jsonDetails(err),
         },
         200
       );
     }
   };
 }
+
+/** `{ details }` when the error's details are a JSON-safe object, else {}. */
+function jsonDetails(err) {
+  const details = err?.details;
+  if (!details || typeof details !== 'object') return {};
+  try {
+    return { details: JSON.parse(JSON.stringify(details)) };
+  } catch {
+    return {};
+  }
+}

package/src/standalone/session-transport/client-registry/client-grace.mjs

@@ -5,11 +5,44 @@
  */
 import { isPidAlive } from '../../../runtime/shared/pid-liveness.mjs';
 
-export function createClientGrace({ clients, log, clientGraceMs, sweepMs, onClientsEmpty, isClosed, dropClient }) {
+const LEASE_MIN_MS = 3_000;
+const LEASE_MAX_MS = 600_000;
+const LEASE_DEFAULT_MS = 30_000;
+const REMOTE_CLIENT_GRACE_DEFAULT_MS = 1_800_000;
+
+/** A remote client's lease: the requested `leaseMs`, clamped to 3s..10min. */
+export function clampLeaseMs(value) {
+  const leaseMs = Number(value);
+  if (!Number.isFinite(leaseMs) || leaseMs <= 0) return LEASE_DEFAULT_MS;
+  return Math.min(LEASE_MAX_MS, Math.max(LEASE_MIN_MS, leaseMs));
+}
+
+// A remote desktop behind a flaky tunnel needs far longer to come back than a
+// local terminal restarting. Read at arm time so the env can change per run.
+function remoteClientGraceMs() {
+  const configured = Number(process.env.MIXDOG_REMOTE_CLIENT_GRACE_MS);
+  return Number.isFinite(configured) && configured >= 0 && process.env.MIXDOG_REMOTE_CLIENT_GRACE_MS
+    ? configured
+    : REMOTE_CLIENT_GRACE_DEFAULT_MS;
+}
+
+export function createClientGrace({
+  clients,
+  log,
+  clientGraceMs,
+  sweepMs,
+  nowMs = () => Date.now(),
+  onClientsEmpty,
+  isClosed,
+  dropClient,
+}) {
   let graceTimer = null;
   let sweepTimer = null;
   let everHadLifecycleClient = false;
   let signalled = false;
+  // Whether the most recently departed lifecycle client was remote; it picks
+  // the empty-clients grace.
+  let lastLifecycleWasRemote = false;
 
   function lifecycleClientCount() {
     let count = 0;
@@ -45,10 +78,14 @@ export function createClientGrace({ clients, log, clientGraceMs, sweepMs, onClie
       try {
         onClientsEmpty();
       } catch {}
-    }, clientGraceMs);
+    }, lastLifecycleWasRemote ? remoteClientGraceMs() : clientGraceMs);
     graceTimer.unref?.();
   }
 
+  function noteLifecycleDropped(client) {
+    lastLifecycleWasRemote = client.remote === true;
+  }
+
   /** A lifecycle client holds the daemon up: remember one ever attached and
    *  cancel any pending grace. */
   function noteLifecycleClient() {
@@ -61,6 +98,11 @@ export function createClientGrace({ clients, log, clientGraceMs, sweepMs, onClie
     if (sweepTimer || isClosed()) return;
     sweepTimer = setInterval(() => {
       for (const [token, c] of [...clients]) {
+        if (c.remote) {
+          // Its owning process is on another machine: liveness is the lease.
+          if (nowMs() - c.lastSeen > c.leaseMs) dropClient(token, 'lease expired');
+          continue;
+        }
         // A client whose owning process died can never read its stream again.
         if (c.leadPid && !isPidAlive(c.leadPid)) dropClient(token, 'lead pid gone');
       }
@@ -77,5 +119,5 @@ export function createClientGrace({ clients, log, clientGraceMs, sweepMs, onClie
     }
   }
 
-  return { lifecycleClientCount, cancel, maybeArm, noteLifecycleClient, startSweep, stopTimers };
+  return { lifecycleClientCount, cancel, maybeArm, noteLifecycleClient, noteLifecycleDropped, startSweep, stopTimers };
 }

package/src/standalone/session-transport/client-registry/registration-replays.mjs

@@ -31,6 +31,7 @@ export function createRegistrationReplays({ clients, log }) {
       replay.leadPid === identity.leadPid &&
       replay.cwd === identity.cwd &&
       replay.lifecycle === identity.lifecycle &&
+      replay.remote === identity.remote &&
       replay.clientKind === identity.clientKind &&
       replay.revision === identity.revision;
     if (sameIdentity && clients.has(replay.token)) {

package/src/standalone/session-transport/client-registry.mjs

@@ -7,7 +7,7 @@
 import { randomUUID } from 'node:crypto';
 import { parsePid } from '../../runtime/shared/pid-liveness.mjs';
 import { createRegistrationReplays } from './client-registry/registration-replays.mjs';
-import { createClientGrace } from './client-registry/client-grace.mjs';
+import { createClientGrace, clampLeaseMs } from './client-registry/client-grace.mjs';
 
 export function createClientRegistry({
   log,
@@ -18,7 +18,7 @@ export function createClientRegistry({
   onClientRegistered,
   onClientDropped,
 }) {
-  // token -> { token, leadPid, cwd, lifecycle, sse, pending, lastSeen }
+  // token -> { token, leadPid, cwd, lifecycle, remote, leaseMs, sse, pending, lastSeen }
   const clients = new Map();
   let closed = false;
   const replays = createRegistrationReplays({ clients, log });
@@ -27,6 +27,7 @@ export function createClientRegistry({
     log,
     clientGraceMs,
     sweepMs,
+    nowMs,
     onClientsEmpty,
     isClosed: () => closed,
     dropClient: (token, reason) => dropClient(token, reason),
@@ -35,6 +36,7 @@ export function createClientRegistry({
   function removeClientRecord(token) {
     const c = clients.get(token);
     if (!c) return;
+    if (c.lifecycle) grace.noteLifecycleDropped(c);
     try {
       c.sse?.end?.();
     } catch {}
@@ -57,6 +59,14 @@ export function createClientRegistry({
     grace.maybeArm(reason);
   }
 
+  /** Refresh a client's lease clock (heartbeat). False for an unknown token. */
+  function touch(token) {
+    const c = clients.get(token);
+    if (!c) return false;
+    c.lastSeen = nowMs();
+    return true;
+  }
+
   function register({
     leadPid,
     cwd,
@@ -64,11 +74,14 @@ export function createClientRegistry({
     clientKind = 'session',
     registrationId = null,
     revision = 0,
+    remote = false,
+    leaseMs,
   } = {}) {
     const identity = {
       leadPid: parsePid(leadPid) || 0,
       cwd: cwd || null,
       lifecycle: lifecycle !== false,
+      remote: remote === true,
       clientKind: clientKind === 'desktop' ? 'desktop' : 'session',
       revision: Math.max(0, Number(revision) || 0),
     };
@@ -79,6 +92,7 @@ export function createClientRegistry({
     clients.set(token, {
       token,
       ...identity,
+      leaseMs: clampLeaseMs(leaseMs),
       sse: null,
       // True while the socket asked us to stop writing (see writeFrame).
       paused: false,
@@ -92,7 +106,8 @@ export function createClientRegistry({
     grace.startSweep();
     log(
       `client registered token=${token} lead=${identity.leadPid} cwd=${identity.cwd || '-'}` +
-        ` lifecycle=${identity.lifecycle} kind=${identity.clientKind}`
+        ` lifecycle=${identity.lifecycle} kind=${identity.clientKind}` +
+        (identity.remote ? ` remote leaseMs=${clients.get(token).leaseMs}` : '')
     );
     if (typeof onClientRegistered === 'function') {
       try {
@@ -102,6 +117,7 @@ export function createClientRegistry({
           cwd: identity.cwd,
           lifecycle: identity.lifecycle,
           clientKind: identity.clientKind,
+          ...(identity.remote ? { remote: true } : {}),
         });
       } catch {}
     }
@@ -124,6 +140,7 @@ export function createClientRegistry({
     forgetReplaysFor: replays.forgetFor,
     dropClient,
     register,
+    touch,
     close,
   };
 }

package/src/standalone/session-transport/routes.mjs

@@ -1,10 +1,12 @@
 /**
  * session-transport/routes.mjs — the HTTP front door: /health (identity
  * travels with every probe), the daemon-token gate, client register /
- * deregister, the /events SSE attach, /call, /shutdown and the /upgrade
+ * deregister / heartbeat, the /events SSE attach, /call, /shutdown, /stop and the /upgrade
  * handshake a newer build uses to replace this daemon.
  */
+import { readFileSync } from 'node:fs';
 import { sendJson, sendError } from '../../runtime/memory/lib/http-wire.mjs';
+import { modelProxyClientMode } from '../../runtime/shared/model-proxy-mode.mjs';
 import {
   compareRuntimeVersions,
   SESSION_CAPABILITY_FINGERPRINT,
@@ -13,6 +15,32 @@ import {
   runtimeVersion,
 } from '../session-wire.mjs';
 
+let installBuildHash;
+/** Build hash of a desktop-installed server runtime: the `.install-complete`
+ *  marker the installer writes at the package root. Null for any other
+ *  install (npm, source checkout, packaged desktop). */
+function remoteInstallBuildHash() {
+  if (installBuildHash !== undefined) return installBuildHash;
+  try {
+    const marker = JSON.parse(readFileSync(new URL('../../../.install-complete', import.meta.url), 'utf8'));
+    installBuildHash = typeof marker?.buildHash === 'string' && marker.buildHash ? marker.buildHash : null;
+  } catch {
+    installBuildHash = null;
+  }
+  return installBuildHash;
+}
+
+/** Turns in flight: what makes a daemon too busy to replace without asking. */
+function busySessionCount(status) {
+  return Math.max(0, Number(status?.busy) || 0);
+}
+
+/** Leave through the embedder's own graceful SIGTERM path. */
+function requestProcessStop() {
+  if (process.listenerCount('SIGTERM') > 0) process.emit('SIGTERM', 'SIGTERM');
+  else process.kill(process.pid, 'SIGTERM');
+}
+
 export function createTransportRoutes({
   serverToken,
   drain,
@@ -25,11 +53,23 @@ export function createTransportRoutes({
   transportMemory,
   onClientsEmpty,
   onUpgradeRequested,
+  admitWork = () => true,
 }) {
+  // Checked on every register/call, last right before the work is handed on
+  // (after the body is read): a daemon that lost (or cannot re-verify) its
+  // owner lease serves nothing.
+  const refuseUnadmitted = (res) => {
+    if (admitWork()) return false;
+    sendError(res, 'daemon owner lease is not held', 503);
+    return true;
+  };
+
   const health = (res) => {
     // Identity travels with EVERY health probe: a view negotiates version
     // skew before it attaches, so an embedder can never forget to publish
     // it and leave clients guessing.
+    const status = getStatus();
+    const busySessions = busySessionCount(status);
     sendJson(res, {
       status: 'ok',
       pid: process.pid,
@@ -38,10 +78,15 @@ export function createTransportRoutes({
       protocol: SESSION_PROTOCOL,
       revision: SESSION_REVISION,
       capabilityFingerprint: SESSION_CAPABILITY_FINGERPRINT,
+      modelProxy: modelProxyClientMode() ? 'client' : null,
       draining: drain.reason || null,
       drainCommitted: drain.committed,
       version: runtimeVersion(),
-      ...getStatus(),
+      packageVersion: runtimeVersion(),
+      buildHash: remoteInstallBuildHash(),
+      ...status,
+      busySessions,
+      idle: busySessions === 0,
       activeCalls: lanes.active,
       queuedCalls: lanes.queued,
       queuedUrgentCalls: lanes.queuedUrgent,
@@ -54,6 +99,7 @@ export function createTransportRoutes({
 
   const register = async (req, res) => {
     const body = await readBody(req);
+    if (refuseUnadmitted(res)) return;
     if (drain.committed) {
       sendError(res, `daemon is draining: ${drain.reason}`, 503);
       return;
@@ -70,6 +116,8 @@ export function createTransportRoutes({
       clientKind: body.clientKind,
       registrationId: body.registrationId,
       revision: body.revision,
+      remote: body.remote === true,
+      leaseMs: body.leaseMs,
     });
     sendJson(res, {
       token: clientToken,
@@ -85,6 +133,16 @@ export function createTransportRoutes({
     sendJson(res, { ok: true });
   };
 
+  // Lease keep-alive for remote clients (the daemon token gate already ran).
+  const heartbeat = async (req, res) => {
+    const body = await readBody(req);
+    if (!body.token || !registry.touch(String(body.token))) {
+      sendError(res, 'unknown client token', 404);
+      return;
+    }
+    sendJson(res, { ok: true });
+  };
+
   const events = (url, res) => {
     const clientToken = url.searchParams.get('token');
     if (!attachSse(clientToken, res)) sendError(res, 'unknown client token', 404);
@@ -92,11 +150,15 @@ export function createTransportRoutes({
   };
 
   const call = async (req, res) => {
+    if (refuseUnadmitted(res)) return;
     if (drain.committed) {
       sendError(res, `daemon is draining: ${drain.reason}`, 503);
       return;
     }
     const body = await readBody(req);
+    // Again right before dispatch: the lease may have been fenced while the
+    // body was still arriving.
+    if (refuseUnadmitted(res)) return;
     await callRoute(body, res);
   };
 
@@ -109,6 +171,19 @@ export function createTransportRoutes({
     }
   };
 
+  // Authenticated stop for a desktop replacing this daemon with another
+  // build: refused while turns run unless forced (the user confirmed).
+  const stop = async (req, res) => {
+    const body = await readBody(req);
+    const busySessions = busySessionCount(getStatus());
+    if (busySessions > 0 && body.force !== true) {
+      sendError(res, `daemon is busy: ${busySessions} running session(s)`, 409);
+      return;
+    }
+    sendJson(res, { ok: true, pid: process.pid, busySessions });
+    setImmediate(requestProcessStop);
+  };
+
   const upgrade = async (req, res) => {
     const body = await readBody(req);
     const requestedProtocol = Number(body.protocol);
@@ -150,8 +225,10 @@ export function createTransportRoutes({
   const tokenRoutes = {
     'POST /client/register': register,
     'POST /client/deregister': deregister,
+    'POST /client/heartbeat': heartbeat,
     'POST /call': call,
     'POST /shutdown': (_req, res) => shutdown(res),
+    'POST /stop': stop,
     'POST /upgrade': upgrade,
   };
 

package/src/standalone/session-transport/stack.mjs

@@ -76,6 +76,7 @@ export function createTransportStack({
   onClientDropped,
   onUpgradeRequested,
   getStatus,
+  admitWork,
 }) {
   const body = createBodyReader();
   const callCache = createSessionCallCache({
@@ -125,6 +126,7 @@ export function createTransportStack({
     }),
     onClientsEmpty,
     onUpgradeRequested,
+    admitWork,
   });
 
   return { registry, clients, lanes, callCache, broadcast, handleRequest };

package/src/standalone/session-transport.mjs

@@ -32,6 +32,9 @@ export function createSessionTransport({
   onClientDropped = null,
   onUpgradeRequested = null,
   getStatus = () => ({}),
+  // Asked before every register/call; false answers 503 (the daemon's owner
+  // lease is not held — daemon-owner.mjs).
+  admitWork = () => true,
 } = {}) {
   if (typeof handleCall !== 'function') throw new Error('handleCall is required');
 
@@ -52,6 +55,7 @@ export function createSessionTransport({
     onClientDropped,
     onUpgradeRequested,
     getStatus,
+    admitWork,
   });
 
   function beginDrain(reason = 'daemon replacement') {
@@ -69,10 +73,19 @@ export function createSessionTransport({
     return true;
   }
 
+  // MIXDOG_SESSION_PORT pins the port (an SSH forward needs a stable one).
+  function configuredPort() {
+    const port = Number(process.env.MIXDOG_SESSION_PORT);
+    return Number.isInteger(port) && port >= 1 && port <= 65535 ? port : 0;
+  }
+
   function start() {
     if (closed) return Promise.reject(new Error('session service transport is closed'));
+    const fixedPort = configuredPort();
     listener ??= createLoopbackListener({
       server: http.createServer(handleRequest),
+      basePort: fixedPort,
+      maxPort: fixedPort,
       onListening(port) {
         boundPort = port;
         log(`session service transport listening on 127.0.0.1:${boundPort} pid=${process.pid}`);
@@ -81,7 +94,17 @@ export function createSessionTransport({
         if (!fatal) log(`server error: ${error?.message || error}`);
       },
     });
-    return listener.start().then((port) => ({ port, token: serverToken }));
+    return listener.start().then(async (port) => {
+      // The listener falls back to an OS-chosen port when the range is busy;
+      // a pinned port must never silently become a different one.
+      if (fixedPort && port !== fixedPort) {
+        await listener.stop();
+        listener = null;
+        boundPort = null;
+        throw new Error(`session port ${fixedPort} (MIXDOG_SESSION_PORT) is unavailable`);
+      }
+      return { port, token: serverToken };
+    });
   }
 
   async function stop() {

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

@@ -18,7 +18,8 @@ function selectableUserItems(items, limit = MAX_SELECTABLE_MESSAGES) {
   for (let index = source.length - 1; index >= 0 && rows.length < limit; index -= 1) {
     const item = source[index];
     if (item?.kind !== 'user') continue;
-    if (item?.id == null) continue;
+    // Prompts a compaction archived are display-only.
+    if (item?.id == null || item.archived === true) continue;
     const text = String(item.text || '').trim();
     if (!text) continue;
     rows.push({ id: String(item.id), text });

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

@@ -191,6 +191,34 @@ const PROVIDER_DISPLAY_NAMES = new Map([
 export const providerDisplayName = (provider) =>
   PROVIDER_DISPLAY_NAMES.get(String(provider || '').toLowerCase()) ?? (provider || 'Provider');
 
+export const resolveProviderDisplayName = (provider, providerNames = null) =>
+  (String(provider || '')
+    .trim()
+    .startsWith('custom-') &&
+    providerNames?.[String(provider).trim()]) ||
+  providerDisplayName(provider);
+
+export const loadProviderDisplayNames = async (store) => {
+  let setup = null;
+  try {
+    setup = await store?.getProviderSetup?.();
+  } catch {
+    return {};
+  }
+  const names = {};
+  for (const group of ['api', 'oauth', 'local']) {
+    const entries = setup?.[group];
+    if (!Array.isArray(entries)) continue;
+    for (const entry of entries) {
+      if (!entry || typeof entry !== 'object') continue;
+      const id = String(entry.id || entry.provider || '').trim();
+      const name = String(entry.name || entry.label || '').trim();
+      if (id && name) names[id] = name;
+    }
+  }
+  return names;
+};
+
 const PROVIDER_DISPLAY_RANKS = {
   default: 0,
   'openai-oauth': 10,
@@ -247,7 +275,7 @@ const routeModelDisplayName = (route) =>
     .filter(Boolean)
     .join(' ');
 
-const groupModelsByProvider = (models) => {
+const groupModelsByProvider = (models, providerNames = null) => {
   const providers = new Map();
   for (const model of models) {
     if (!providers.has(model.provider)) providers.set(model.provider, []);
@@ -257,22 +285,24 @@ const groupModelsByProvider = (models) => {
   const orderedProviders = [...providers.keys()].sort((a, b) => {
     const rank = providerDisplayRank(a) - providerDisplayRank(b);
     if (rank !== 0) return rank;
-    const label = providerDisplayName(a).localeCompare(providerDisplayName(b));
+    const label = resolveProviderDisplayName(a, providerNames).localeCompare(
+      resolveProviderDisplayName(b, providerNames)
+    );
     if (label !== 0) return label;
     return a.localeCompare(b);
   });
   return { providers, orderedProviders };
 };
 
-export const buildModelProviderItems = (models, currentRoute = null) => {
-  const { providers, orderedProviders } = groupModelsByProvider(models);
+export const buildModelProviderItems = (models, currentRoute = null, providerNames = null) => {
+  const { providers, orderedProviders } = groupModelsByProvider(models, providerNames);
   return orderedProviders.map((provider) => {
     const providerModels = providers.get(provider) || [];
     const currentModel =
       currentRoute?.provider === provider ? providerModels.find((model) => model.id === currentRoute.model) : null;
     return {
       value: `provider:${provider}`,
-      label: providerDisplayName(provider),
+      label: resolveProviderDisplayName(provider, providerNames),
       marker: currentModel ? '✓' : '',
       markerColor: theme.success,
       meta: currentModel ? modelRecordDisplayName(currentModel) : '',

package/src/tui/app/model-picker/provider-models-list.mjs

@@ -2,7 +2,7 @@
 // One provider's model list: rows from the catalog, the footer for the
 // highlighted row, and the keys that change its selections (←/→ effort,
 // C/Shift+C context, Tab Fast, T thinking). Enter saves through the caller.
-import { buildProviderModelItems, providerDisplayName } from '../model-options.mjs';
+import { buildProviderModelItems, resolveProviderDisplayName } from '../model-options.mjs';
 import { modelFooter } from './model-footer.mjs';
 import { createRouteSelection } from './route-selection.mjs';
 
@@ -73,7 +73,7 @@ export function openProviderModelsPicker({ view, provider, onBack, saveRoute })
       )
     );
     view.paint({
-      title: providerDisplayName(provider),
+      title: resolveProviderDisplayName(provider, view.providerNames),
       description: options.modelDescription || 'Select a model. Adjust Effort with ←/→.',
       footer: (item) => modelFooter(selection, item?._model),
       help:

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

@@ -10,7 +10,7 @@
  * state (getState) is read through a getter so it always reflects the current
  * render.
  */
-import { normalizeModelOptions, buildModelProviderItems } from './model-options.mjs';
+import { normalizeModelOptions, buildModelProviderItems, loadProviderDisplayNames } from './model-options.mjs';
 import { createModelCatalog } from './model-picker/catalog-load.mjs';
 import { openProviderModelsPicker, saveSelectedRoute } from './model-picker/provider-models-list.mjs';
 
@@ -77,6 +77,7 @@ export function createModelPicker({
     }
 
     const models = normalizeModelOptions(providerModels);
+    const providerNames = await loadProviderDisplayNames(store);
     const activeRoute = options.currentRoute || {
       provider: state.provider,
       model: state.model,
@@ -90,6 +91,7 @@ export function createModelPicker({
       state,
       models,
       activeRoute,
+      providerNames,
       returnTo,
       returnLabel,
       returnOnNestedCancel,
@@ -114,7 +116,7 @@ export function createModelPicker({
         providerListHighlightProvider = renderOptions.highlightProvider;
       }
       const highlightProvider = renderOptions.highlightProvider || providerListHighlightProvider || null;
-      const providerItems = buildModelProviderItems(models, activeRoute);
+      const providerItems = buildModelProviderItems(models, activeRoute, providerNames);
       const providerHighlight = highlightProvider || activeRoute?.provider || null;
       const providerInitialIndex = Math.max(
         0,