@proxysoul/soulforge 2.15.2 → 2.15.3

package/dist/index.js

@@ -62500,7 +62500,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.15.2",
+    version: "2.15.3",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -477974,24 +477974,170 @@ Reopen the editor (Ctrl+E twice) for changes to take effect.`);
 }
 function handleTimeouts(_input, ctx) {
   const cfg = loadConfig();
-  const current = cfg.toolTimeout ?? 2;
-  const options = [
-    { value: "1", label: "1 min" },
-    { value: "2", label: "2 min", description: "default" },
-    { value: "5", label: "5 min" },
-    { value: "10", label: "10 min" },
-    { value: "20", label: "20 min" },
-    { value: "0", label: "No timeout", description: "tools run until completion" }
-  ];
+  const currentToolTimeout = cfg.toolTimeout ?? 2;
+  const watchdogEnabled = cfg.watchdog ?? false;
+  const wd = cfg.watchdogTimeouts ?? {};
+  const currentTool = `tool:${currentToolTimeout}`;
+  const wdFirstSec = (wd.firstChunkMs ?? 180000) / 1000;
+  const wdChunkSec = (wd.chunkMs ?? 120000) / 1000;
+  const wdToolSec = (wd.toolMaxMs ?? 900000) / 1000;
+  const wdForceSec = (wd.forceResolveMs ?? 5000) / 1000;
+  const wdFirst = `wd-first:${wdFirstSec}`;
+  const wdChunk = `wd-chunk:${wdChunkSec}`;
+  const wdTool = `wd-tool:${wdToolSec}`;
+  const wdForce = `wd-force:${wdForceSec}`;
+  const timeoutPickers = {
+    "tool-timeout": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Tool Timeout",
+        icon: icon("clock"),
+        currentValue: currentTool,
+        scopeEnabled: false,
+        options: [
+          { value: "tool:1", label: "1 min" },
+          { value: "tool:2", label: "2 min", description: "default" },
+          { value: "tool:5", label: "5 min" },
+          { value: "tool:10", label: "10 min" },
+          { value: "tool:20", label: "20 min" },
+          { value: "tool:0", label: "No timeout", description: "tools run until completion" }
+        ],
+        onSelect: (value) => {
+          const timeout = Number(value.split(":")[1]);
+          ctx2.saveToScope({ toolTimeout: timeout }, "global");
+          sysMsg(ctx2, `Tool timeout \u2192 ${timeout === 0 ? "none" : `${timeout}m`} (global)`);
+        }
+      });
+    },
+    "watchdog-toggle": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Watchdog",
+        icon: icon("clock"),
+        currentValue: watchdogEnabled ? "watchdog:on" : "watchdog:off",
+        scopeEnabled: false,
+        options: [
+          {
+            value: "watchdog:on",
+            label: "Watchdog: On",
+            description: "enable auto-retry on stalls"
+          },
+          {
+            value: "watchdog:off",
+            label: "Watchdog: Off",
+            description: "disable auto-retry on stalls"
+          }
+        ],
+        onSelect: (value) => {
+          const enabled = value === "watchdog:on";
+          ctx2.saveToScope({ watchdog: enabled }, "global");
+          sysMsg(ctx2, `Watchdog ${enabled ? "enabled" : "disabled"} (global)`);
+        }
+      });
+    },
+    "wd-first": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Watchdog \u2014 First Chunk Timeout",
+        icon: icon("clock"),
+        currentValue: wdFirst,
+        scopeEnabled: false,
+        options: [
+          { value: "wd-first:5", label: "5s" },
+          { value: "wd-first:15", label: "15s" },
+          { value: "wd-first:30", label: "30s" },
+          { value: "wd-first:60", label: "60s" },
+          { value: "wd-first:120", label: "120s" },
+          { value: "wd-first:180", label: "180s", description: "default" }
+        ],
+        onSelect: (value) => {
+          const sec = Number(value.split(":")[1]);
+          ctx2.saveToScope({ watchdogTimeouts: { ...wd, firstChunkMs: sec * 1000 } }, "global");
+          sysMsg(ctx2, `Watchdog first-chunk timeout \u2192 ${sec}s (global)`);
+        }
+      });
+    },
+    "wd-chunk": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Watchdog \u2014 Chunk Timeout",
+        icon: icon("clock"),
+        currentValue: wdChunk,
+        scopeEnabled: false,
+        options: [
+          { value: "wd-chunk:5", label: "5s" },
+          { value: "wd-chunk:15", label: "15s" },
+          { value: "wd-chunk:30", label: "30s" },
+          { value: "wd-chunk:60", label: "60s" },
+          { value: "wd-chunk:120", label: "120s", description: "default" },
+          { value: "wd-chunk:180", label: "180s" }
+        ],
+        onSelect: (value) => {
+          const sec = Number(value.split(":")[1]);
+          ctx2.saveToScope({ watchdogTimeouts: { ...wd, chunkMs: sec * 1000 } }, "global");
+          sysMsg(ctx2, `Watchdog chunk timeout \u2192 ${sec}s (global)`);
+        }
+      });
+    },
+    "wd-tool": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Watchdog \u2014 Tool Max Timeout",
+        icon: icon("clock"),
+        currentValue: wdTool,
+        scopeEnabled: false,
+        options: [
+          { value: "wd-tool:60", label: "1 min" },
+          { value: "wd-tool:300", label: "5 min" },
+          { value: "wd-tool:600", label: "10 min" },
+          { value: "wd-tool:900", label: "15 min", description: "default" },
+          { value: "wd-tool:1800", label: "30 min" },
+          { value: "wd-tool:3600", label: "60 min" }
+        ],
+        onSelect: (value) => {
+          const sec = Number(value.split(":")[1]);
+          ctx2.saveToScope({ watchdogTimeouts: { ...wd, toolMaxMs: sec * 1000 } }, "global");
+          sysMsg(ctx2, `Watchdog tool-max timeout \u2192 ${sec}s (global)`);
+        }
+      });
+    },
+    "wd-force": (_input2, ctx2) => {
+      ctx2.openCommandPicker({
+        title: "Watchdog \u2014 Force-Resolve Timeout",
+        icon: icon("clock"),
+        currentValue: wdForce,
+        scopeEnabled: false,
+        options: [
+          { value: "wd-force:1", label: "1s" },
+          { value: "wd-force:5", label: "5s", description: "default" },
+          { value: "wd-force:10", label: "10s" },
+          { value: "wd-force:30", label: "30s" }
+        ],
+        onSelect: (value) => {
+          const sec = Number(value.split(":")[1]);
+          ctx2.saveToScope({ watchdogTimeouts: { ...wd, forceResolveMs: sec * 1000 } }, "global");
+          sysMsg(ctx2, `Watchdog force-resolve timeout \u2192 ${sec}s (global)`);
+        }
+      });
+    }
+  };
   ctx.openCommandPicker({
-    title: "Tool Timeout",
+    title: "Timeouts & Watchdog",
     icon: icon("clock"),
-    currentValue: String(current),
+    currentValue: currentTool,
     scopeEnabled: false,
-    options,
+    options: [
+      {
+        value: "tool-timeout",
+        label: "Tool Timeout",
+        description: `${currentToolTimeout === 0 ? "none" : currentToolTimeout + "m"}`
+      },
+      { value: "watchdog-toggle", label: "Watchdog", description: watchdogEnabled ? "On" : "Off" },
+      { value: "wd-first", label: "First Chunk Timeout", description: `${wdFirstSec}s` },
+      { value: "wd-chunk", label: "Chunk Timeout", description: `${wdChunkSec}s` },
+      { value: "wd-tool", label: "Tool Max Timeout", description: `${wdToolSec}s` },
+      { value: "wd-force", label: "Force-Resolve Timeout", description: `${wdForceSec}s` }
+    ],
     onSelect: (value) => {
-      ctx.saveToScope({ toolTimeout: Number(value) }, "global");
-      sysMsg(ctx, `Tool timeout \u2192 ${value === "0" ? "none" : `${value}m`} (global)`);
+      const handler4 = timeoutPickers[value];
+      if (handler4) {
+        handler4("", ctx);
+      }
     }
   });
 }
@@ -478338,8 +478484,8 @@ function register4(map2) {
   map2.set("/settings", handleSettingsHub);
   map2.set("/lock-in", handleLockIn);
   map2.set("/theme", handleTheme);
-  map2.set("/watchdog", handleWatchdog);
   map2.set("/timeouts", handleTimeouts);
+  map2.set("/watchdog", handleTimeouts);
 }
 function matchConfigPrefix(cmd) {
   if (cmd === "/font nerd")
@@ -478356,7 +478502,7 @@ function matchConfigPrefix(cmd) {
     return handleTheme;
   return null;
 }
-var handleVerbose, handleWatchdog, handleVimHints, settingsHandlers, OPACITY_LEVELS, OPACITY_OPTIONS, BORDER_STRENGTH_OPTIONS, BORDER_STRENGTH_LABELS, handleTheme = (input, ctx) => {
+var handleVerbose, handleVimHints, settingsHandlers, OPACITY_LEVELS, OPACITY_OPTIONS, BORDER_STRENGTH_OPTIONS, BORDER_STRENGTH_LABELS, handleTheme = (input, ctx) => {
   const arg = input.replace(/^\/theme\s*/, "").trim();
   const current = useThemeStore.getState().name;
   const isTransparent = useThemeStore.getState().tokens.bgApp === "transparent";
@@ -478476,18 +478622,6 @@ var init_config3 = __esm(() => {
     offDescription: "show compact tool call summaries",
     messageTemplate: (v4, s2) => `Verbose mode ${v4 === "on" ? "on" : "off"} (${s2})`
   });
-  handleWatchdog = createTogglePicker({
-    configKey: "watchdog",
-    title: "Stream Stall Watchdog",
-    iconName: "dog",
-    onValue: "on",
-    offValue: "off",
-    onLabel: "On",
-    offLabel: "Off",
-    onDescription: "auto-retry when stream stalls (connection hangs)",
-    offDescription: "no automatic stall detection or retry",
-    messageTemplate: (v4, s2) => `Watchdog ${v4 === "on" ? "enabled" : "disabled"} (${s2})`
-  });
   handleVimHints = createTogglePicker({
     configKey: "vimHints",
     title: "Vim Hints",
@@ -484851,19 +484985,12 @@ var init_registry = __esm(() => {
       category: "System",
       tags: ["onboarding", "setup", "welcome"]
     },
-    {
-      cmd: "/watchdog",
-      ic: "dog",
-      desc: "Toggle stream stall watchdog (auto-retry on hangs)",
-      category: "System",
-      tags: ["stall", "retry", "timeout"]
-    },
     {
       cmd: "/timeouts",
       ic: "clock",
-      desc: "Set tool call timeout (shell, project, agents)",
+      desc: "Configure tool and watchdog timeouts",
       category: "System",
-      tags: ["timeout", "shell", "agent"]
+      tags: ["timeout", "shell", "agent", "watchdog", "stall"]
     },
     {
       cmd: "/checkpoint",
@@ -488369,6 +488496,21 @@ var init_compaction_logs = __esm(() => {
   })));
 });
 
+// src/types/index.ts
+function clampWatchdogTimeouts(raw2) {
+  const clamp = (value, min, max, fallback) => {
+    if (value === undefined)
+      return fallback;
+    return Math.max(min, Math.min(max, value));
+  };
+  return {
+    firstChunkMs: clamp(raw2?.firstChunkMs, 30000, 600000, 180000),
+    chunkMs: clamp(raw2?.chunkMs, 30000, 600000, 120000),
+    toolMaxMs: clamp(raw2?.toolMaxMs, 120000, 1800000, 900000),
+    forceResolveMs: clamp(raw2?.forceResolveMs, 1000, 30000, 5000)
+  };
+}
+
 // src/hooks/chat/message-processing.ts
 function safeParseArgs(raw2) {
   if (!raw2)
@@ -490222,9 +490364,10 @@ Proceeding without it will significantly reduce capabilities \u2014 no soul tool
         if (!result) {
           throw new Error("Stream aborted before result was assigned");
         }
-        const STALL_CHUNK_MS = 120000;
-        const STALL_FIRST_CHUNK_MS = 180000;
-        const STALL_TOOL_MAX_MS = 900000;
+        const wd = clampWatchdogTimeouts(effectiveConfig2.watchdogTimeouts);
+        const STALL_CHUNK_MS = wd.chunkMs;
+        const STALL_FIRST_CHUNK_MS = wd.firstChunkMs;
+        const STALL_TOOL_MAX_MS = wd.toolMaxMs;
         let lastActivityTs = Date.now();
         let lastToolActivityTs = Date.now();
         let toolsInFlight = 0;
@@ -490268,7 +490411,7 @@ Proceeding without it will significantly reduce capabilities \u2014 no soul tool
           lastToolActivityTs = Date.now();
         });
         let stallAbortedAt = 0;
-        const STALL_FORCE_RESOLVE_MS = 5000;
+        const STALL_FORCE_RESOLVE_MS = wd.forceResolveMs;
         if (effectiveConfig2.watchdog)
           stallWatchdog = setInterval(() => {
             if (stallAborted && Date.now() - stallAbortedAt >= STALL_FORCE_RESOLVE_MS) {
@@ -506814,6 +506957,18 @@ function OptionRow2({
   textFaint,
   successColor
 }) {
+  if (option2.kind === "separator") {
+    return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+      flexDirection: "row",
+      backgroundColor: popupBg,
+      paddingX: 1,
+      children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+        fg: textFaint,
+        bg: popupBg,
+        children: "\u2500".repeat(innerW - 4)
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
   const isDisabled = option2.disabled === true;
   const bg2 = isActive && !isDisabled ? popupHl : popupBg;
   const activeColor = option2.color ?? brandSecondary;
@@ -506940,9 +507095,11 @@ function CommandPicker({ visible, config: config2, onClose }) {
           initial[sel.key] = sel.value;
         setSelectorState(initial);
       }
-      let idx = filteredOptions.findIndex((o3) => o3.value === config2.currentValue);
-      if (idx < 0)
-        idx = filteredOptions.findIndex((o3) => !o3.disabled);
+      const curVal = config2.currentValue;
+      let idx = curVal ? Array.isArray(curVal) ? filteredOptions.findIndex((o3) => curVal.includes(o3.value)) : filteredOptions.findIndex((o3) => o3.value === curVal) : -1;
+      if (idx < 0) {
+        idx = filteredOptions.findIndex((o3) => !o3.disabled && o3.kind !== "separator");
+      }
       const startIdx = idx >= 0 ? idx : 0;
       setCursor(startIdx);
       setScrollOffset(Math.max(0, startIdx - Math.floor(maxVisible / 2)));
@@ -507041,7 +507198,7 @@ function CommandPicker({ visible, config: config2, onClose }) {
           if (prev > 0) {
             let next = prev - 1;
             const start3 = next;
-            while (filteredOptions[next]?.disabled) {
+            while (filteredOptions[next]?.kind === "separator" || filteredOptions[next]?.disabled) {
               next = next > 0 ? next - 1 : filteredOptions.length - 1;
               if (next === start3)
                 break;
@@ -507063,7 +507220,7 @@ function CommandPicker({ visible, config: config2, onClose }) {
           if (prev < filteredOptions.length - 1) {
             let next = prev + 1;
             const start3 = next;
-            while (filteredOptions[next]?.disabled) {
+            while (filteredOptions[next]?.kind === "separator" || filteredOptions[next]?.disabled) {
               next = next < filteredOptions.length - 1 ? next + 1 : 0;
               if (next === start3)
                 break;
@@ -507138,7 +507295,7 @@ function CommandPicker({ visible, config: config2, onClose }) {
     }
     if (evt.name === "return" && focusZone === ZONE_LIST) {
       const option2 = filteredOptions[cursor];
-      if (option2 && !option2.disabled) {
+      if (option2 && !option2.disabled && option2.kind !== "separator") {
         const cb = config2.onSelect;
         const val = option2.value;
         const s2 = config2.scopeEnabled ? scope : undefined;
@@ -507236,7 +507393,7 @@ function CommandPicker({ visible, config: config2, onClose }) {
         }, undefined, false, undefined, this) : filteredOptions.slice(clampedOffset, clampedOffset + maxVisible).map((option2, vi) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(OptionRow2, {
           option: option2,
           isActive: vi + clampedOffset === cursor,
-          isCurrent: option2.value === config2.currentValue,
+          isCurrent: config2.currentValue ? Array.isArray(config2.currentValue) ? config2.currentValue.includes(option2.value) : option2.value === config2.currentValue : false,
           innerW,
           popupBg: POPUP_BG,
           popupHl: POPUP_HL,

package/dist/workers/io.worker.js

@@ -49658,7 +49658,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.15.2",
+    version: "2.15.3",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxysoul/soulforge",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "Graph-powered code intelligence — multi-agent coding with codebase-aware AI",
   "repository": {
     "type": "git",