@openscout/scout 0.2.42 → 0.2.44

package/dist/main.mjs

@@ -4536,7 +4536,7 @@ class ClaudeStreamJsonSession {
       sessionId: this.claudeSessionId
     };
   }
-  async invoke(prompt, timeoutMs = 5 * 60000) {
+  async invoke(prompt, stallTimeoutMs = 10 * 60000) {
     await this.ensureStarted();
     if (!this.process?.stdin) {
       throw new Error(`Claude stream-json session for ${this.options.agentName} is not running.`);
@@ -4548,19 +4548,13 @@ class ClaudeStreamJsonSession {
       const turn = {
         id: randomUUID(),
         output: [],
-        timer: setTimeout(() => {
-          this.interrupt().catch(() => {
-            return;
-          });
-          if (this.activeTurn?.id === turn.id) {
-            this.activeTurn = null;
-          }
-          reject(new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`));
-        }, timeoutMs),
+        timer: null,
+        stallMs: stallTimeoutMs,
         resolve: resolve5,
         reject
       };
       this.activeTurn = turn;
+      this.resetTurnWatchdog(turn);
     });
     const payload = JSON.stringify({
       type: "user",
@@ -4584,6 +4578,20 @@ class ClaudeStreamJsonSession {
       this.process.kill("SIGINT");
     }
   }
+  resetTurnWatchdog(turn) {
+    if (turn.timer) {
+      clearTimeout(turn.timer);
+    }
+    turn.timer = setTimeout(() => {
+      this.interrupt().catch(() => {
+        return;
+      });
+      if (this.activeTurn?.id === turn.id) {
+        this.activeTurn = null;
+      }
+      turn.reject(new Error(`${this.options.agentName} stalled \u2014 no stream event in ${turn.stallMs}ms`));
+    }, turn.stallMs);
+  }
   async shutdown(options = {}) {
     const turn = this.activeTurn;
     this.activeTurn = null;
@@ -4718,6 +4726,7 @@ class ClaudeStreamJsonSession {
     if (!turn) {
       return;
     }
+    this.resetTurnWatchdog(turn);
     if (event.type === "assistant") {
       const content = event.message?.content ?? event.content ?? [];
       for (const part of content) {
@@ -8346,7 +8355,13 @@ async function askScoutQuestion(input) {
       targetDiagnostic: await describeScoutTargetAvailability(broker.snapshot, target, currentDirectory)
     };
   }
-  const conversation = await ensureBrokerConversation(broker.baseUrl, broker.snapshot, broker.node.id, input.channel, senderId, [target.agentId]);
+  let conversation;
+  if (!input.channel) {
+    const dm = await ensureBrokerDirectConversationBetween(broker.baseUrl, broker.snapshot, broker.node.id, senderId, target.agentId);
+    conversation = dm.conversation;
+  } else {
+    conversation = await ensureBrokerConversation(broker.baseUrl, broker.snapshot, broker.node.id, input.channel, senderId, [target.agentId]);
+  }
   const messageId = `m-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const messageBody = input.body.trim().startsWith(target.label) ? input.body.trim() : `${target.label} ${input.body.trim()}`;
   const speechText = input.shouldSpeak ? stripScoutAgentSelectorLabels(messageBody) : "";
@@ -8369,7 +8384,7 @@ async function askScoutQuestion(input) {
     createdAt: input.createdAtMs ?? Date.now(),
     metadata: {
       source: "scout-cli",
-      relayChannel: input.channel ?? "shared",
+      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
       relayTarget: target.agentId,
       returnAddress
     }
@@ -8389,7 +8404,7 @@ async function askScoutQuestion(input) {
     createdAt: Date.now(),
     metadata: {
       source: "scout-cli",
-      relayChannel: input.channel ?? "shared",
+      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
       relayTarget: target.agentId,
       returnAddress
     }

package/dist/pair-supervisor.mjs

@@ -4498,7 +4498,7 @@ class ClaudeStreamJsonSession {
       sessionId: this.claudeSessionId
     };
   }
-  async invoke(prompt, timeoutMs = 5 * 60000) {
+  async invoke(prompt, stallTimeoutMs = 10 * 60000) {
     await this.ensureStarted();
     if (!this.process?.stdin) {
       throw new Error(`Claude stream-json session for ${this.options.agentName} is not running.`);
@@ -4510,19 +4510,13 @@ class ClaudeStreamJsonSession {
       const turn = {
         id: randomUUID(),
         output: [],
-        timer: setTimeout(() => {
-          this.interrupt().catch(() => {
-            return;
-          });
-          if (this.activeTurn?.id === turn.id) {
-            this.activeTurn = null;
-          }
-          reject(new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`));
-        }, timeoutMs),
+        timer: null,
+        stallMs: stallTimeoutMs,
         resolve: resolve3,
         reject
       };
       this.activeTurn = turn;
+      this.resetTurnWatchdog(turn);
     });
     const payload = JSON.stringify({
       type: "user",
@@ -4546,6 +4540,20 @@ class ClaudeStreamJsonSession {
       this.process.kill("SIGINT");
     }
   }
+  resetTurnWatchdog(turn) {
+    if (turn.timer) {
+      clearTimeout(turn.timer);
+    }
+    turn.timer = setTimeout(() => {
+      this.interrupt().catch(() => {
+        return;
+      });
+      if (this.activeTurn?.id === turn.id) {
+        this.activeTurn = null;
+      }
+      turn.reject(new Error(`${this.options.agentName} stalled \u2014 no stream event in ${turn.stallMs}ms`));
+    }, turn.stallMs);
+  }
   async shutdown(options = {}) {
     const turn = this.activeTurn;
     this.activeTurn = null;
@@ -4680,6 +4688,7 @@ class ClaudeStreamJsonSession {
     if (!turn) {
       return;
     }
+    this.resetTurnWatchdog(turn);
     if (event.type === "assistant") {
       const content = event.message?.content ?? event.content ?? [];
       for (const part of content) {

package/dist/scout-web-server.mjs

@@ -3941,7 +3941,7 @@ class ClaudeStreamJsonSession {
       sessionId: this.claudeSessionId
     };
   }
-  async invoke(prompt, timeoutMs = 5 * 60000) {
+  async invoke(prompt, stallTimeoutMs = 10 * 60000) {
     await this.ensureStarted();
     if (!this.process?.stdin) {
       throw new Error(`Claude stream-json session for ${this.options.agentName} is not running.`);
@@ -3953,19 +3953,13 @@ class ClaudeStreamJsonSession {
       const turn = {
         id: randomUUID(),
         output: [],
-        timer: setTimeout(() => {
-          this.interrupt().catch(() => {
-            return;
-          });
-          if (this.activeTurn?.id === turn.id) {
-            this.activeTurn = null;
-          }
-          reject(new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`));
-        }, timeoutMs),
+        timer: null,
+        stallMs: stallTimeoutMs,
         resolve: resolve3,
         reject
       };
       this.activeTurn = turn;
+      this.resetTurnWatchdog(turn);
     });
     const payload = JSON.stringify({
       type: "user",
@@ -3989,6 +3983,20 @@ class ClaudeStreamJsonSession {
       this.process.kill("SIGINT");
     }
   }
+  resetTurnWatchdog(turn) {
+    if (turn.timer) {
+      clearTimeout(turn.timer);
+    }
+    turn.timer = setTimeout(() => {
+      this.interrupt().catch(() => {
+        return;
+      });
+      if (this.activeTurn?.id === turn.id) {
+        this.activeTurn = null;
+      }
+      turn.reject(new Error(`${this.options.agentName} stalled \u2014 no stream event in ${turn.stallMs}ms`));
+    }, turn.stallMs);
+  }
   async shutdown(options = {}) {
     const turn = this.activeTurn;
     this.activeTurn = null;
@@ -4123,6 +4131,7 @@ class ClaudeStreamJsonSession {
     if (!turn) {
       return;
     }
+    this.resetTurnWatchdog(turn);
     if (event.type === "assistant") {
       const content = event.message?.content ?? event.content ?? [];
       for (const part of content) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openscout/scout",
-  "version": "0.2.42",
+  "version": "0.2.44",
   "description": "Published Scout package that installs the `scout` command",
   "license": "UNLICENSED",
   "type": "module",
@@ -23,6 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@openscout/runtime": "0.2.42"
+    "@openscout/runtime": "0.2.44"
   }
 }