mixdog 0.9.68 → 0.9.69

package/src/tui/dist/index.mjs

@@ -6818,10 +6818,10 @@ ${grafted}` : cachedL1;
   }, [sessionId, clientHostPid, provider, model, effort, fast, cwd, statsSignature, contextWindow, displayContextWindow, compactBoundaryTokens, autoCompactTokenLimit, rawContextWindow, resizeEpoch, agentRevision, agentWorkersSignature, agentJobsSignature, activeToolsSignature, refreshTick, themeEpoch]);
   const lines = line ? line.split("\n").slice(0, 2) : [" ", " "];
   const workflowLabel = workflowModeLabel(workflow, remoteEnabled);
-  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", width: "100%", height: 3, overflow: "hidden", justifyContent: "flex-start", paddingLeft: 2, backgroundColor: surfaceBackground(), children: [
+  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", width: "100%", height: 2, overflow: "hidden", justifyContent: "flex-start", paddingLeft: 2, paddingRight: 2, backgroundColor: surfaceBackground(), children: [
     /* @__PURE__ */ jsxs2(Box2, { flexDirection: "row", width: "100%", overflow: "hidden", children: [
       /* @__PURE__ */ jsx2(Box2, { flexGrow: 1, flexShrink: 1, flexBasis: 0, overflow: "hidden", children: /* @__PURE__ */ jsx2(Text2, { wrap: "truncate", children: lines[0] || " " }) }),
-      /* @__PURE__ */ jsx2(Box2, { flexShrink: 0, marginLeft: 1, marginRight: 1, children: /* @__PURE__ */ jsx2(Text2, { color: theme.statusText, wrap: "truncate", children: workflowLabel }) })
+      /* @__PURE__ */ jsx2(Box2, { flexShrink: 0, marginLeft: 1, children: /* @__PURE__ */ jsx2(Text2, { color: theme.statusText, wrap: "truncate", children: workflowLabel }) })
     ] }),
     /* @__PURE__ */ jsx2(Box2, { flexDirection: "row", width: "100%", overflow: "hidden", children: /* @__PURE__ */ jsx2(Box2, { flexGrow: 1, flexShrink: 1, flexBasis: 0, overflow: "hidden", children: /* @__PURE__ */ jsx2(Text2, { wrap: "truncate", children: lines[1] || " " }) }) })
   ] });
@@ -24171,11 +24171,6 @@ function compactEventDetail(event = {}) {
   const parts = [];
   const elapsed = formatElapsedSeconds(Number(event.durationMs ?? event.elapsedMs ?? 0));
   if (elapsed) parts.push(elapsed);
-  const type = String(event.compactType || event.type || "").trim();
-  if (type && type !== "semantic") parts.push(type);
-  const trigger = String(event.trigger || "").toLowerCase();
-  if (trigger === "reactive") parts.push("reactive");
-  else if (trigger === "manual") parts.push("manual");
   const before = Number(event.pressureTokens ?? event.beforeTokens ?? 0);
   const after = Number(event.afterTokens ?? 0);
   const fmtTok = (n) => {
@@ -26658,6 +26653,93 @@ function createSessionFlow(bag) {
   return { leadSessionId, shouldMirrorSteeringEntry, commitSteeringQueueEntries, makeQueueEntry, removeQueuedEntries, requeueEntriesFront, dequeueQueueBatch, drain, enqueue, drainPendingSteering, restoreLeadSteeringFromDisk, autoClearBeforeSubmit, performSessionClear, restoreQueued, resetStats, clearUiActivityBeforeContextSync, resetTuiForPendingSessionReset, snapshotTuiBeforeSessionReset, restoreTuiAfterFailedSessionReset, commitTuiSessionReset, resetStatsAndSyncContext };
 }
 
+// src/tui/engine/turn-watchdog.mjs
+function createTurnWatchdog({
+  runtime,
+  timeoutMs,
+  toolMaxMs,
+  isCurrentTurn,
+  onTrip
+}) {
+  let timer2 = null;
+  let tripped = false;
+  let lastProgressAt = Date.now();
+  let lastProgressLabel = "start";
+  let deferralCeilingAt = 0;
+  function clear() {
+    if (timer2) {
+      clearTimeout(timer2);
+      timer2 = null;
+    }
+  }
+  function refreshFromRuntimeLiveness() {
+    let liveness;
+    try {
+      liveness = runtime.getTurnLiveness?.();
+    } catch {
+      return false;
+    }
+    if (liveness?.stage !== "tool_running") deferralCeilingAt = 0;
+    const progressAt = Number(liveness?.lastProgressAt);
+    const now = Date.now();
+    if (!liveness || !Number.isFinite(progressAt) || progressAt <= now - timeoutMs) return false;
+    if (liveness.stage === "tool_running") {
+      deferralCeilingAt = 0;
+      const toolStartedAt = Number(liveness.toolStartedAt);
+      if (!Number.isFinite(toolStartedAt) || toolStartedAt <= 0) return false;
+      const toolSelfDeadlineMs = Number(liveness.toolSelfDeadlineMs);
+      const toolCeilingMs = Math.max(
+        Number.isFinite(toolSelfDeadlineMs) && toolSelfDeadlineMs > 0 ? toolSelfDeadlineMs + 6e4 : 0,
+        toolMaxMs
+      );
+      if (now - toolStartedAt >= toolCeilingMs) return false;
+      deferralCeilingAt = toolStartedAt + toolCeilingMs;
+    }
+    lastProgressAt = progressAt;
+    lastProgressLabel = `orchestrator:${String(liveness.stage || "unknown")}`;
+    arm();
+    return true;
+  }
+  function arm() {
+    clear();
+    if (tripped) return;
+    const now = Date.now();
+    const remaining = Math.max(1, timeoutMs - Math.max(0, now - lastProgressAt));
+    const ceilingRemaining = deferralCeilingAt > 0 ? Math.max(1, deferralCeilingAt - now) : Infinity;
+    timer2 = setTimeout(() => {
+      if (!isCurrentTurn() || tripped) return;
+      const firedAt = Date.now();
+      const idleMs = firedAt - lastProgressAt;
+      if (idleMs < timeoutMs) {
+        if (deferralCeilingAt > 0 && firedAt >= deferralCeilingAt) {
+          if (refreshFromRuntimeLiveness()) return;
+        } else {
+          arm();
+          return;
+        }
+      } else if (refreshFromRuntimeLiveness()) return;
+      tripped = true;
+      onTrip({ idleMs, lastProgressLabel });
+    }, Math.min(remaining, ceilingRemaining));
+    timer2.unref?.();
+  }
+  function markProgress(label) {
+    if (!isCurrentTurn()) return false;
+    if (tripped) return false;
+    lastProgressAt = Date.now();
+    lastProgressLabel = String(label || "progress");
+    return true;
+  }
+  return {
+    arm,
+    clear,
+    markProgress,
+    get tripped() {
+      return tripped;
+    }
+  };
+}
+
 // src/tui/engine/turn.mjs
 function createRunTurn(bag) {
   const {
@@ -26742,76 +26824,15 @@ function createRunTurn(bag) {
     let assistantText = "";
     let currentAssistantId = null;
     tuiDebug2(`runTurn start turn=${turnIndex} pending=${pending.length} timeoutMs=${LEAD_TURN_TIMEOUT_MS2}`);
-    let watchdogTripped = false;
-    let watchdogTimer = null;
     let watchdogGraceTimer = null;
-    let lastProgressAt = startedAt;
-    let lastProgressLabel = "start";
-    let watchdogDeferralCeilingAt = 0;
     const configuredLeadToolMaxMs = Number(process.env.MIXDOG_LEAD_TOOL_MAX_MS);
     const leadToolMaxMs = Number.isFinite(configuredLeadToolMaxMs) && configuredLeadToolMaxMs > 0 ? configuredLeadToolMaxMs : 30 * 60 * 1e3;
-    const clearWatchdog = () => {
-      if (watchdogTimer) {
-        clearTimeout(watchdogTimer);
-        watchdogTimer = null;
-      }
-      if (watchdogGraceTimer) {
-        clearTimeout(watchdogGraceTimer);
-        watchdogGraceTimer = null;
-      }
-    };
-    const refreshWatchdogFromRuntimeLiveness = () => {
-      let liveness;
-      try {
-        liveness = runtime.getTurnLiveness?.();
-      } catch {
-        return false;
-      }
-      if (liveness?.stage !== "tool_running") watchdogDeferralCeilingAt = 0;
-      const progressAt = Number(liveness?.lastProgressAt);
-      const now = Date.now();
-      if (!liveness || !Number.isFinite(progressAt) || progressAt <= now - LEAD_TURN_TIMEOUT_MS2) return false;
-      if (liveness.stage === "tool_running") {
-        watchdogDeferralCeilingAt = 0;
-        const toolStartedAt = Number(liveness.toolStartedAt);
-        if (!Number.isFinite(toolStartedAt) || toolStartedAt <= 0) return false;
-        const toolSelfDeadlineMs = Number(liveness.toolSelfDeadlineMs);
-        const toolCeilingMs = Math.max(
-          Number.isFinite(toolSelfDeadlineMs) && toolSelfDeadlineMs > 0 ? toolSelfDeadlineMs + 6e4 : 0,
-          leadToolMaxMs
-        );
-        if (now - toolStartedAt >= toolCeilingMs) return false;
-        watchdogDeferralCeilingAt = toolStartedAt + toolCeilingMs;
-      }
-      lastProgressAt = progressAt;
-      lastProgressLabel = `orchestrator:${String(liveness.stage || "unknown")}`;
-      armWatchdog();
-      return true;
-    };
-    const armWatchdog = () => {
-      if (watchdogTimer) {
-        clearTimeout(watchdogTimer);
-        watchdogTimer = null;
-      }
-      if (watchdogTripped) return;
-      const now = Date.now();
-      const remaining = Math.max(1, LEAD_TURN_TIMEOUT_MS2 - Math.max(0, now - lastProgressAt));
-      const ceilingRemaining = watchdogDeferralCeilingAt > 0 ? Math.max(1, watchdogDeferralCeilingAt - now) : Infinity;
-      const delay2 = Math.min(remaining, ceilingRemaining);
-      watchdogTimer = setTimeout(() => {
-        if (!isCurrentTurn()) return;
-        if (watchdogTripped) return;
-        const now2 = Date.now();
-        const idleMs = now2 - lastProgressAt;
-        if (idleMs < LEAD_TURN_TIMEOUT_MS2) {
-          if (watchdogDeferralCeilingAt > 0 && now2 >= watchdogDeferralCeilingAt) {
-            if (refreshWatchdogFromRuntimeLiveness()) return;
-          } else {
-            armWatchdog();
-            return;
-          }
-        } else if (refreshWatchdogFromRuntimeLiveness()) return;
-        watchdogTripped = true;
+    const watchdog = createTurnWatchdog({
+      runtime,
+      timeoutMs: LEAD_TURN_TIMEOUT_MS2,
+      toolMaxMs: leadToolMaxMs,
+      isCurrentTurn,
+      onTrip: ({ idleMs, lastProgressLabel }) => {
         if (_batchTimer !== null) {
           clearTimeout(_batchTimer);
           _batchTimer = null;
@@ -26851,17 +26872,17 @@ function createRunTurn(bag) {
           flushEmitImmediate?.();
         }, 5e3);
         watchdogGraceTimer.unref?.();
-      }, delay2);
-      watchdogTimer.unref?.();
-    };
-    const markTurnProgress = (label) => {
-      if (!isCurrentTurn()) return false;
-      if (watchdogTripped) return;
-      lastProgressAt = Date.now();
-      lastProgressLabel = String(label || "progress");
-      return true;
+      }
+    });
+    const clearWatchdog = () => {
+      watchdog.clear();
+      if (watchdogGraceTimer) {
+        clearTimeout(watchdogGraceTimer);
+        watchdogGraceTimer = null;
+      }
     };
-    armWatchdog();
+    const markTurnProgress = (label) => watchdog.markProgress(label);
+    watchdog.arm();
     let currentAssistantText = "";
     const committedSegments = [];
     let thinkingText = "";
@@ -27607,7 +27628,7 @@ function createRunTurn(bag) {
           flushStreamBatch();
         },
         onReasoningDelta: (chunk) => {
-          if (!isCurrentTurn() || watchdogTripped) return;
+          if (!isCurrentTurn() || watchdog.tripped) return;
           if (String(chunk ?? "")) {
             if (!markTurnProgress("reasoning-delta")) return;
             markPromptCommitted();
@@ -27747,7 +27768,7 @@ function createRunTurn(bag) {
     flushEmit?.();
     _publishedThinkingActive = false;
     const finalStatus = cancelled ? "cancelled" : failed ? "failed" : "done";
-    tuiDebug2(`runTurn end turn=${turnIndex} status=${finalStatus} elapsedMs=${Date.now() - startedAt}${watchdogTripped ? " watchdogTripped=1" : ""} pending=${pending.length}`);
+    tuiDebug2(`runTurn end turn=${turnIndex} status=${finalStatus} elapsedMs=${Date.now() - startedAt}${watchdog.tripped ? " watchdogTripped=1" : ""} pending=${pending.length}`);
     return finalStatus;
   }
   return runTurn;
@@ -28085,6 +28106,15 @@ function createEngineApiB(bag) {
     listWorkflows: () => {
       return runtime.listWorkflows?.() || [];
     },
+    // Workflow pack editing (desktop Workflows page): direct passthroughs —
+    // the runtime owns validation, user-pack persistence, and delete guards.
+    getWorkflowPack: (workflowId) => runtime.getWorkflowPack?.(workflowId) ?? null,
+    saveWorkflowPack: async (payload) => runtime.saveWorkflowPack?.(payload) ?? null,
+    createWorkflow: async (payload) => runtime.createWorkflow?.(payload) ?? null,
+    deleteWorkflow: async (workflowId) => runtime.deleteWorkflow?.(workflowId) ?? null,
+    getAgentDefinition: (agentId) => runtime.getAgentDefinition?.(agentId) ?? null,
+    saveAgentDefinition: async (payload) => runtime.saveAgentDefinition?.(payload) ?? null,
+    deleteAgentDefinition: async (agentId) => runtime.deleteAgentDefinition?.(agentId) ?? null,
     getOutputStyle: () => {
       return runtime.getOutputStyle?.() || runtime.listOutputStyles?.() || null;
     },
@@ -28122,13 +28152,13 @@ function createEngineApiB(bag) {
     // user decision). Off → on claims for this session; on + this session
     // owns → off; on + ANOTHER session owns → move the relay seat here
     // (last-wins) without restarting the worker.
-    toggleRemote: () => {
+    toggleRemote: async () => {
       const enabled = runtime.isRemoteEnabled?.() === true;
       const owner = String(runtime.getRemoteSessionId?.() || "");
       const currentId = String(getState().sessionId || "");
       const workerRunning = runtime.getChannelWorkerStatus?.()?.running === true;
       if (enabled && !workerRunning) {
-        runtime.startRemote?.();
+        await runtime.startRemote?.();
         const next2 = runtime.isRemoteEnabled?.() === true;
         set({ remoteEnabled: next2, remoteSessionId: runtime.getRemoteSessionId?.() || null });
         return next2;
@@ -28138,8 +28168,8 @@ function createEngineApiB(bag) {
         set({ remoteEnabled: true, remoteSessionId: runtime.getRemoteSessionId?.() || null });
         return true;
       }
-      if (enabled) runtime.releaseRemote?.();
-      else runtime.startRemote?.();
+      if (enabled) await runtime.releaseRemote?.();
+      else await runtime.startRemote?.();
       const next = runtime.isRemoteEnabled?.() === true;
       set({ remoteEnabled: next, remoteSessionId: runtime.getRemoteSessionId?.() || null });
       return next;
@@ -28148,16 +28178,16 @@ function createEngineApiB(bag) {
     // turns remote ON here and steals the bridge seat; the previous holder is
     // superseded and flips itself OFF via onRemoteStateChange. Used by the
     // `/remote` slash command — repeated /remote just re-claims (idempotent).
-    claimRemote: () => {
-      runtime.startRemote?.();
+    claimRemote: async () => {
+      await runtime.startRemote?.();
       const next = runtime.isRemoteEnabled?.() === true;
       set({ remoteEnabled: next, remoteSessionId: runtime.getRemoteSessionId?.() || null });
       return next;
     },
     // Idempotent desired-state OFF for desktop controls. Unlike toggleRemote,
     // a delayed/replayed request can never turn remote back on.
-    releaseRemote: () => {
-      runtime.releaseRemote?.();
+    releaseRemote: async () => {
+      await runtime.releaseRemote?.();
       set({ remoteEnabled: false, remoteSessionId: null });
       return false;
     },

package/src/tui/engine/labels.mjs

@@ -39,17 +39,9 @@ export function compactEventLabel(event = {}) {
 }
 
 export function compactEventDetail(event = {}) {
-  // Keep the elapsed time as the lead detail, but no longer discard the rest of
-  // the compact metadata. Surface type/trigger and the boundary/pressure so the
-  // statusdone marker reflects what actually fired.
   const parts = [];
   const elapsed = formatElapsedSeconds(Number(event.durationMs ?? event.elapsedMs ?? 0));
   if (elapsed) parts.push(elapsed);
-  const type = String(event.compactType || event.type || '').trim();
-  if (type && type !== 'semantic') parts.push(type);
-  const trigger = String(event.trigger || '').toLowerCase();
-  if (trigger === 'reactive') parts.push('reactive');
-  else if (trigger === 'manual') parts.push('manual');
   const before = Number(event.pressureTokens ?? event.beforeTokens ?? 0);
   const after = Number(event.afterTokens ?? 0);
   const fmtTok = (n) => {

package/src/tui/engine/session-api-ext.mjs

@@ -368,6 +368,15 @@ export function createEngineApiB(bag) {
     listWorkflows: () => {
       return runtime.listWorkflows?.() || [];
     },
+    // Workflow pack editing (desktop Workflows page): direct passthroughs —
+    // the runtime owns validation, user-pack persistence, and delete guards.
+    getWorkflowPack: (workflowId) => runtime.getWorkflowPack?.(workflowId) ?? null,
+    saveWorkflowPack: async (payload) => runtime.saveWorkflowPack?.(payload) ?? null,
+    createWorkflow: async (payload) => runtime.createWorkflow?.(payload) ?? null,
+    deleteWorkflow: async (workflowId) => runtime.deleteWorkflow?.(workflowId) ?? null,
+    getAgentDefinition: (agentId) => runtime.getAgentDefinition?.(agentId) ?? null,
+    saveAgentDefinition: async (payload) => runtime.saveAgentDefinition?.(payload) ?? null,
+    deleteAgentDefinition: async (agentId) => runtime.deleteAgentDefinition?.(agentId) ?? null,
     getOutputStyle: () => {
       return runtime.getOutputStyle?.() || runtime.listOutputStyles?.() || null;
     },
@@ -407,7 +416,7 @@ export function createEngineApiB(bag) {
     // user decision). Off → on claims for this session; on + this session
     // owns → off; on + ANOTHER session owns → move the relay seat here
     // (last-wins) without restarting the worker.
-    toggleRemote: () => {
+    toggleRemote: async () => {
       const enabled = runtime.isRemoteEnabled?.() === true;
       const owner = String(runtime.getRemoteSessionId?.() || '');
       const currentId = String(getState().sessionId || '');
@@ -417,7 +426,7 @@ export function createEngineApiB(bag) {
       // no-op into a claim or flip a dead relay "off".
       const workerRunning = runtime.getChannelWorkerStatus?.()?.running === true;
       if (enabled && !workerRunning) {
-        runtime.startRemote?.();
+        await runtime.startRemote?.();
         const next = runtime.isRemoteEnabled?.() === true;
         set({ remoteEnabled: next, remoteSessionId: runtime.getRemoteSessionId?.() || null });
         return next;
@@ -427,8 +436,8 @@ export function createEngineApiB(bag) {
         set({ remoteEnabled: true, remoteSessionId: runtime.getRemoteSessionId?.() || null });
         return true;
       }
-      if (enabled) runtime.releaseRemote?.();
-      else runtime.startRemote?.();
+      if (enabled) await runtime.releaseRemote?.();
+      else await runtime.startRemote?.();
       const next = runtime.isRemoteEnabled?.() === true;
       set({ remoteEnabled: next, remoteSessionId: runtime.getRemoteSessionId?.() || null });
       return next;
@@ -437,16 +446,16 @@ export function createEngineApiB(bag) {
     // turns remote ON here and steals the bridge seat; the previous holder is
     // superseded and flips itself OFF via onRemoteStateChange. Used by the
     // `/remote` slash command — repeated /remote just re-claims (idempotent).
-    claimRemote: () => {
-      runtime.startRemote?.();
+    claimRemote: async () => {
+      await runtime.startRemote?.();
       const next = runtime.isRemoteEnabled?.() === true;
       set({ remoteEnabled: next, remoteSessionId: runtime.getRemoteSessionId?.() || null });
       return next;
     },
     // Idempotent desired-state OFF for desktop controls. Unlike toggleRemote,
     // a delayed/replayed request can never turn remote back on.
-    releaseRemote: () => {
-      runtime.releaseRemote?.();
+    releaseRemote: async () => {
+      await runtime.releaseRemote?.();
       set({ remoteEnabled: false, remoteSessionId: null });
       return false;
     },

package/src/tui/engine/turn-watchdog.mjs

@@ -0,0 +1,92 @@
+// Lead-turn stall watchdog. A turn is declared stuck only when NOTHING has
+// progressed for the timeout: local deltas mark progress directly, and before
+// tripping we re-read the orchestrator's own liveness so a long-but-alive tool
+// (its self-deadline plus a grace ceiling) defers the trip instead of aborting
+// real work. Extracted from turn.mjs; the trip ACTION stays there because it
+// unwinds turn-scoped UI state.
+export function createTurnWatchdog({
+  runtime,
+  timeoutMs,
+  toolMaxMs,
+  isCurrentTurn,
+  onTrip,
+}) {
+  let timer = null;
+  let tripped = false;
+  let lastProgressAt = Date.now();
+  let lastProgressLabel = 'start';
+  // While a tool runs, the trip is deferred until this wall-clock ceiling.
+  let deferralCeilingAt = 0;
+
+  function clear() {
+    if (timer) { clearTimeout(timer); timer = null; }
+  }
+
+  // Adopt the orchestrator's liveness as progress when it is fresher than the
+  // local view; returns true when the trip was deferred.
+  function refreshFromRuntimeLiveness() {
+    let liveness;
+    try { liveness = runtime.getTurnLiveness?.(); } catch { return false; }
+    if (liveness?.stage !== 'tool_running') deferralCeilingAt = 0;
+    const progressAt = Number(liveness?.lastProgressAt);
+    const now = Date.now();
+    if (!liveness || !Number.isFinite(progressAt) || progressAt <= now - timeoutMs) return false;
+
+    if (liveness.stage === 'tool_running') {
+      deferralCeilingAt = 0;
+      const toolStartedAt = Number(liveness.toolStartedAt);
+      if (!Number.isFinite(toolStartedAt) || toolStartedAt <= 0) return false;
+      const toolSelfDeadlineMs = Number(liveness.toolSelfDeadlineMs);
+      const toolCeilingMs = Math.max(
+        Number.isFinite(toolSelfDeadlineMs) && toolSelfDeadlineMs > 0 ? toolSelfDeadlineMs + 60_000 : 0,
+        toolMaxMs,
+      );
+      if (now - toolStartedAt >= toolCeilingMs) return false;
+      deferralCeilingAt = toolStartedAt + toolCeilingMs;
+    }
+
+    lastProgressAt = progressAt;
+    lastProgressLabel = `orchestrator:${String(liveness.stage || 'unknown')}`;
+    arm();
+    return true;
+  }
+
+  function arm() {
+    clear();
+    if (tripped) return;
+    const now = Date.now();
+    const remaining = Math.max(1, timeoutMs - Math.max(0, now - lastProgressAt));
+    const ceilingRemaining = deferralCeilingAt > 0 ? Math.max(1, deferralCeilingAt - now) : Infinity;
+    timer = setTimeout(() => {
+      if (!isCurrentTurn() || tripped) return;
+      const firedAt = Date.now();
+      const idleMs = firedAt - lastProgressAt;
+      if (idleMs < timeoutMs) {
+        if (deferralCeilingAt > 0 && firedAt >= deferralCeilingAt) {
+          if (refreshFromRuntimeLiveness()) return;
+        } else {
+          arm();
+          return;
+        }
+      } else if (refreshFromRuntimeLiveness()) return;
+      tripped = true;
+      onTrip({ idleMs, lastProgressLabel });
+    }, Math.min(remaining, ceilingRemaining));
+    timer.unref?.();
+  }
+
+  function markProgress(label) {
+    if (!isCurrentTurn()) return false;
+    if (tripped) return false;
+    lastProgressAt = Date.now();
+    lastProgressLabel = String(label || 'progress');
+    return true;
+  }
+
+  return {
+    arm,
+    clear,
+    markProgress,
+    get tripped() { return tripped; },
+  };
+}

package/src/tui/engine/turn.mjs

@@ -8,6 +8,7 @@ import { toolResultText, toolErrorDisplay } from './tool-result-text.mjs';
 import { toolCallId, toolResultCallId, toolCallName, toolCallArgs } from './tool-call-fields.mjs';
 import { promptDisplayText, STEERING_SUPPRESSED_DISPLAY } from './queue-helpers.mjs';
 import { yieldToRenderer } from './render-timing.mjs';
+import { createTurnWatchdog } from './turn-watchdog.mjs';
 import { aggregateRawResult, aggregateBucketForCategory, aggregateSummaries, assignAggregateSummaryOrder, failureDetailText, toolCallOutcome } from './tool-result-status.mjs';
 
 export function createRunTurn(bag) {
@@ -82,69 +83,19 @@ export function createRunTurn(bag) {
     // teardown runs. Keep this progress-based rather than total wall-clock:
     // long multi-tool turns can legitimately exceed 5m while still producing
     // model/tool events.
-    let watchdogTripped = false;
-    let watchdogTimer = null;
     let watchdogGraceTimer = null;
-    let lastProgressAt = startedAt;
-    let lastProgressLabel = 'start';
-    let watchdogDeferralCeilingAt = 0;
     const configuredLeadToolMaxMs = Number(process.env.MIXDOG_LEAD_TOOL_MAX_MS);
     const leadToolMaxMs = Number.isFinite(configuredLeadToolMaxMs) && configuredLeadToolMaxMs > 0
       ? configuredLeadToolMaxMs
       : 30 * 60 * 1000;
-    const clearWatchdog = () => {
-      if (watchdogTimer) { clearTimeout(watchdogTimer); watchdogTimer = null; }
-      if (watchdogGraceTimer) { clearTimeout(watchdogGraceTimer); watchdogGraceTimer = null; }
-    };
-    const refreshWatchdogFromRuntimeLiveness = () => {
-      let liveness;
-      try { liveness = runtime.getTurnLiveness?.(); } catch { return false; }
-      if (liveness?.stage !== 'tool_running') watchdogDeferralCeilingAt = 0;
-      const progressAt = Number(liveness?.lastProgressAt);
-      const now = Date.now();
-      if (!liveness || !Number.isFinite(progressAt) || progressAt <= now - LEAD_TURN_TIMEOUT_MS) return false;
-
-      if (liveness.stage === 'tool_running') {
-        watchdogDeferralCeilingAt = 0;
-        const toolStartedAt = Number(liveness.toolStartedAt);
-        if (!Number.isFinite(toolStartedAt) || toolStartedAt <= 0) return false;
-        const toolSelfDeadlineMs = Number(liveness.toolSelfDeadlineMs);
-        const toolCeilingMs = Math.max(
-          Number.isFinite(toolSelfDeadlineMs) && toolSelfDeadlineMs > 0 ? toolSelfDeadlineMs + 60_000 : 0,
-          leadToolMaxMs,
-        );
-        if (now - toolStartedAt >= toolCeilingMs) return false;
-        watchdogDeferralCeilingAt = toolStartedAt + toolCeilingMs;
-      }
-
-      lastProgressAt = progressAt;
-      lastProgressLabel = `orchestrator:${String(liveness.stage || 'unknown')}`;
-      armWatchdog();
-      return true;
-    };
-    const armWatchdog = () => {
-      if (watchdogTimer) { clearTimeout(watchdogTimer); watchdogTimer = null; }
-      if (watchdogTripped) return;
-      const now = Date.now();
-      const remaining = Math.max(1, LEAD_TURN_TIMEOUT_MS - Math.max(0, now - lastProgressAt));
-      const ceilingRemaining = watchdogDeferralCeilingAt > 0
-        ? Math.max(1, watchdogDeferralCeilingAt - now)
-        : Infinity;
-      const delay = Math.min(remaining, ceilingRemaining);
-      watchdogTimer = setTimeout(() => {
-        if (!isCurrentTurn()) return;
-        if (watchdogTripped) return;
-        const now = Date.now();
-        const idleMs = now - lastProgressAt;
-        if (idleMs < LEAD_TURN_TIMEOUT_MS) {
-          if (watchdogDeferralCeilingAt > 0 && now >= watchdogDeferralCeilingAt) {
-            if (refreshWatchdogFromRuntimeLiveness()) return;
-          } else {
-            armWatchdog();
-            return;
-          }
-        } else if (refreshWatchdogFromRuntimeLiveness()) return;
-        watchdogTripped = true;
+    // Scheduling/liveness lives in turn-watchdog.mjs; the trip ACTION stays here
+    // because it unwinds this turn's UI state.
+    const watchdog = createTurnWatchdog({
+      runtime,
+      timeoutMs: LEAD_TURN_TIMEOUT_MS,
+      toolMaxMs: leadToolMaxMs,
+      isCurrentTurn,
+      onTrip: ({ idleMs, lastProgressLabel }) => {
         if (_batchTimer !== null) {
           clearTimeout(_batchTimer);
           _batchTimer = null;
@@ -189,17 +140,14 @@ export function createRunTurn(bag) {
           flushEmitImmediate?.();
         }, 5_000);
         watchdogGraceTimer.unref?.();
-      }, delay);
-      watchdogTimer.unref?.();
-    };
-    const markTurnProgress = (label) => {
-      if (!isCurrentTurn()) return false;
-      if (watchdogTripped) return;
-      lastProgressAt = Date.now();
-      lastProgressLabel = String(label || 'progress');
-      return true;
+      },
+    });
+    const clearWatchdog = () => {
+      watchdog.clear();
+      if (watchdogGraceTimer) { clearTimeout(watchdogGraceTimer); watchdogGraceTimer = null; }
     };
-    armWatchdog();
+    const markTurnProgress = (label) => watchdog.markProgress(label);
+    watchdog.arm();
     let currentAssistantText = '';
     // Segments sealed as their own assistant item(s) this turn via
     // commitAssistantSegment (e.g. a tool preamble, then a no-newline tail
@@ -1188,7 +1136,7 @@ export function createRunTurn(bag) {
           flushStreamBatch();
         },
         onReasoningDelta: (chunk) => {
-          if (!isCurrentTurn() || watchdogTripped) return;
+          if (!isCurrentTurn() || watchdog.tripped) return;
           if (String(chunk ?? '')) {
             if (!markTurnProgress('reasoning-delta')) return;
             markPromptCommitted();
@@ -1395,7 +1343,7 @@ export function createRunTurn(bag) {
     flushEmit?.();
     _publishedThinkingActive = false; // turn teardown cleared getState().thinking
     const finalStatus = cancelled ? 'cancelled' : (failed ? 'failed' : 'done');
-    tuiDebug(`runTurn end turn=${turnIndex} status=${finalStatus} elapsedMs=${Date.now() - startedAt}${watchdogTripped ? ' watchdogTripped=1' : ''} pending=${pending.length}`);
+    tuiDebug(`runTurn end turn=${turnIndex} status=${finalStatus} elapsedMs=${Date.now() - startedAt}${watchdog.tripped ? ' watchdogTripped=1' : ''} pending=${pending.length}`);
     return finalStatus;
   }
 

package/src/workflows/default/WORKFLOW.md

@@ -1,7 +1,7 @@
 ---
 id: default
 name: Default
-description: "Default agent workflow — fan-out parallel delegation across independent scopes."
+description: "Fan-out parallel delegation."
 agents: worker, heavy-worker, reviewer, debugger, maintainer
 ---
 

package/src/workflows/solo/WORKFLOW.md

@@ -1,7 +1,7 @@
 ---
 id: solo
 name: Solo
-description: "Solo workflow — Lead handles everything directly."
+description: "Lead handles everything directly."
 agents:
 ---