mixdog 0.9.35 → 0.9.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.35",
+  "version": "0.9.36",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/src/runtime/agent/orchestrator/mcp/client.mjs

@@ -16,7 +16,7 @@ import { readServicePort, markServiceUnreachable, isConnRefuseError } from '../.
 const AUTO_DETECT_PORTS = {
     'mixdog-memory': { discovery: 'memory', dir: 'mixdog', file: 'active-instance.json', portField: 'memory_port', endpoint: '/mcp' },
 };
-const DEFAULT_MCP_CALL_TIMEOUT_MS = 0;
+const DEFAULT_MCP_CALL_TIMEOUT_MS = 120000;
 // Per-server STARTUP handshake budget (connect + listTools). Codex parity: 10s.
 export const DEFAULT_MCP_STARTUP_TIMEOUT_MS = 10000;
 // --- State ---
@@ -227,12 +227,12 @@ export async function executeMcpTool(name, args) {
     return capMcpOutput(text);
 }
 
-// MCP per-tool-call timeout. Disabled by default: external MCP tools can be
-// long-running, and replaying an arbitrary tool after a timeout can duplicate
-// side effects. Operators may opt in with MIXDOG_MCP_CALL_TIMEOUT_MS or a
-// per-server timeoutMs/callTimeoutMs config value. On expiry we close the
-// transport so the next dispatch reconnects fresh, but we do not retry the
-// timed-out call automatically.
+// MCP per-tool-call timeout. Default 2min: a hung/unresponsive MCP server
+// (e.g. a busy editor) must not stall a tool call indefinitely. Genuinely
+// long-running tools can raise/disable it via MIXDOG_MCP_CALL_TIMEOUT_MS or a
+// per-server timeoutMs/callTimeoutMs config value (0/off/none/false disables).
+// On expiry we close the transport so the next dispatch reconnects fresh, but
+// we do not retry the timed-out call automatically (avoids side-effect dupes).
 export function resolveMcpCallTimeoutMs(cfg = {}, env = process.env) {
     const raw = cfg?.timeoutMs ?? cfg?.timeout_ms ?? cfg?.callTimeoutMs ?? cfg?.call_timeout_ms
         ?? env?.MIXDOG_MCP_CALL_TIMEOUT_MS;

package/src/tui/dist/index.mjs

@@ -23461,11 +23461,13 @@ function createContextState({ runtime, getState, getPendingSessionReset }) {
   });
   const routeState = () => {
     const state = getState();
+    const base = baseRouteState();
+    const sameContextRoute = state.sessionId === base.sessionId && state.clientHostPid === base.clientHostPid && state.provider === base.provider && state.model === base.model && state.effort === base.effort && state.fast === base.fast && state.contextWindow === base.contextWindow && state.rawContextWindow === base.rawContextWindow;
     return {
-      ...baseRouteState(),
-      displayContextWindow: state.displayContextWindow || 0,
-      compactBoundaryTokens: state.compactBoundaryTokens || 0,
-      autoCompactTokenLimit: state.autoCompactTokenLimit || 0
+      ...base,
+      displayContextWindow: sameContextRoute ? state.displayContextWindow || 0 : 0,
+      compactBoundaryTokens: sameContextRoute ? state.compactBoundaryTokens || 0 : 0,
+      autoCompactTokenLimit: sameContextRoute ? state.autoCompactTokenLimit || 0 : 0
     };
   };
   function syncContextDisplayFields(ctx = null) {

package/src/tui/engine/context-state.mjs

@@ -48,11 +48,20 @@ export function createContextState({ runtime, getState, getPendingSessionReset }
 
   const routeState = () => {
     const state = getState();
+    const base = baseRouteState();
+    const sameContextRoute = state.sessionId === base.sessionId
+      && state.clientHostPid === base.clientHostPid
+      && state.provider === base.provider
+      && state.model === base.model
+      && state.effort === base.effort
+      && state.fast === base.fast
+      && state.contextWindow === base.contextWindow
+      && state.rawContextWindow === base.rawContextWindow;
     return {
-      ...baseRouteState(),
-      displayContextWindow: state.displayContextWindow || 0,
-      compactBoundaryTokens: state.compactBoundaryTokens || 0,
-      autoCompactTokenLimit: state.autoCompactTokenLimit || 0,
+      ...base,
+      displayContextWindow: sameContextRoute ? (state.displayContextWindow || 0) : 0,
+      compactBoundaryTokens: sameContextRoute ? (state.compactBoundaryTokens || 0) : 0,
+      autoCompactTokenLimit: sameContextRoute ? (state.autoCompactTokenLimit || 0) : 0,
     };
   };