@openscout/scout 0.2.74 → 0.2.76

package/dist/scout-control-plane-web.mjs

@@ -28706,6 +28706,9 @@ function isLocalAgentRecordOnline(agentName, record) {
   }
   return isLocalAgentSessionAlive(normalizedRecord.tmuxSession);
 }
+function localAgentOnlineFlightKey(agentName, record) {
+  return [agentName, record.transport, record.tmuxSession].join("\x00");
+}
 function isLocalAgentSessionAlive(sessionName) {
   return readTmuxSessionExistsSnapshot(sessionName);
 }
@@ -29478,6 +29481,23 @@ function areHarnessBinariesAvailable(record) {
   return true;
 }
 async function ensureLocalAgentOnline(agentName, record) {
+  const normalizedRecord = normalizeLocalAgentRecord(agentName, record);
+  const flightKey = localAgentOnlineFlightKey(agentName, normalizedRecord);
+  const existingFlight = localAgentOnlineFlights.get(flightKey);
+  if (existingFlight) {
+    return await existingFlight;
+  }
+  const flight = ensureLocalAgentOnlineOnce(agentName, normalizedRecord);
+  localAgentOnlineFlights.set(flightKey, flight);
+  try {
+    return await flight;
+  } finally {
+    if (localAgentOnlineFlights.get(flightKey) === flight) {
+      localAgentOnlineFlights.delete(flightKey);
+    }
+  }
+}
+async function ensureLocalAgentOnlineOnce(agentName, record) {
   const normalizedRecord = normalizeLocalAgentRecord(agentName, record);
   if (isLocalAgentRecordOnline(agentName, normalizedRecord)) {
     return normalizedRecord;
@@ -30545,7 +30565,7 @@ function shouldDisableGeneratedCodexEndpoint(endpoint) {
   }
   return endpoint.metadata?.source === "scout-app";
 }
-var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude", DEFAULT_ONE_TIME_LOCAL_AGENT_CARD_TTL_MS, SUPPORTED_LOCAL_AGENT_HARNESSES, SUPPORTED_SCOUT_HARNESSES, DEFAULT_CLAUDE_SCOUT_ALLOWED_TOOLS, INVOCATION_TASK_PREVIEW_MAX_LENGTH = 96, SCOUT_MESSAGE_ATTACHMENTS_CONTEXT_KEY = "scoutMessageAttachments", TMUX_PASTE_DRAIN_MS = 150, TMUX_VERIFY_FIRST_SAMPLE_MS = 250, TMUX_VERIFY_SECOND_SAMPLE_MS = 750, TMUX_VERIFY_RETRY_SAMPLE_MS = 400, TMUX_CAPTURE_TAIL_LINES = 20, TMUX_DEFAULT_COLUMNS, TMUX_DEFAULT_ROWS, TMUX_READY_TIMEOUT_MS = 20000, TMUX_READY_POLL_MS = 250, TMUX_READY_TAIL_LINES = 80;
+var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude", DEFAULT_ONE_TIME_LOCAL_AGENT_CARD_TTL_MS, SUPPORTED_LOCAL_AGENT_HARNESSES, SUPPORTED_SCOUT_HARNESSES, DEFAULT_CLAUDE_SCOUT_ALLOWED_TOOLS, localAgentOnlineFlights, INVOCATION_TASK_PREVIEW_MAX_LENGTH = 96, SCOUT_MESSAGE_ATTACHMENTS_CONTEXT_KEY = "scoutMessageAttachments", TMUX_PASTE_DRAIN_MS = 150, TMUX_VERIFY_FIRST_SAMPLE_MS = 250, TMUX_VERIFY_SECOND_SAMPLE_MS = 750, TMUX_VERIFY_RETRY_SAMPLE_MS = 400, TMUX_CAPTURE_TAIL_LINES = 20, TMUX_DEFAULT_COLUMNS, TMUX_DEFAULT_ROWS, TMUX_READY_TIMEOUT_MS = 20000, TMUX_READY_POLL_MS = 250, TMUX_READY_TAIL_LINES = 80;
 var init_local_agents = __esm(() => {
   init_codex_executable();
   init_src();
@@ -30592,6 +30612,7 @@ var init_local_agents = __esm(() => {
     "mcp__scout__work_update",
     "Bash(scout:*)"
   ];
+  localAgentOnlineFlights = new Map;
   TMUX_DEFAULT_COLUMNS = parsePositiveInteger2(process.env.OPENSCOUT_LOCAL_AGENT_TMUX_COLUMNS, 160);
   TMUX_DEFAULT_ROWS = parsePositiveInteger2(process.env.OPENSCOUT_LOCAL_AGENT_TMUX_ROWS, 48);
 });
@@ -45460,8 +45481,16 @@ async function sendScoutConversationMessage(input) {
   const createdAtMs = input.createdAtMs ?? Date.now();
   const senderId = await resolveConversationActorId(broker2.baseUrl, broker2.snapshot, broker2.node.id, input.senderId, currentDirectory);
   const mentionResolution = await resolveMentionTargets(broker2.snapshot, input.body, currentDirectory);
-  const availableTargets = (await Promise.all(mentionResolution.resolved.map(async (target) => await ensureTargetRelayAgentRegistered(broker2.baseUrl, broker2.snapshot, broker2.node.id, target.agentId, currentDirectory) ? target : null))).filter((target) => Boolean(target));
-  const validTargets = [...new Set(availableTargets.map((target) => target.agentId).filter((target) => target !== senderId && Boolean(broker2.snapshot.agents[target])))].sort();
+  const mentionedTargetIds = new Set(mentionResolution.resolved.map((target) => target.agentId));
+  const participantTargetIds = input.notifyParticipantAgents && (conversation.kind === "channel" || conversation.kind === "group_direct" || conversation.kind === "thread") ? conversation.participantIds.filter((participantId) => isSteerableParticipant(broker2.snapshot, participantId, senderId)) : [];
+  const candidateTargetIds = [...new Set([
+    ...mentionedTargetIds,
+    ...participantTargetIds
+  ])];
+  const availableTargets = (await Promise.all(candidateTargetIds.map(async (agentId) => await ensureTargetRelayAgentRegistered(broker2.baseUrl, broker2.snapshot, broker2.node.id, agentId, currentDirectory) ? agentId : null))).filter((agentId) => Boolean(agentId));
+  const validTargets = [...new Set(availableTargets.filter((target) => target !== senderId && Boolean(broker2.snapshot.agents[target])))].sort();
+  const mentionedValidTargets = validTargets.filter((targetId) => mentionedTargetIds.has(targetId));
+  const participantValidTargets = validTargets.filter((targetId) => participantTargetIds.includes(targetId));
   const unresolvedTargets = mentionResolution.resolved.filter((target) => !validTargets.includes(target.agentId)).map((target) => target.label).concat(mentionResolution.unresolved).concat(mentionResolution.ambiguous.map((entry) => entry.label));
   const messageId = `m-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const returnAddress = buildScoutReturnAddress2(broker2.snapshot, senderId, {
@@ -45476,9 +45505,9 @@ async function sendScoutConversationMessage(input) {
     class: conversation.kind === "system" ? "system" : "agent",
     body: input.body,
     ...input.replyToMessageId?.trim() ? { replyToMessageId: input.replyToMessageId.trim() } : {},
-    mentions: mentionResolution.resolved.filter((target) => validTargets.includes(target.agentId)).map((target) => ({ actorId: target.agentId, label: target.label })),
+    mentions: mentionResolution.resolved.filter((target) => mentionedValidTargets.includes(target.agentId)).map((target) => ({ actorId: target.agentId, label: target.label })),
     attachments: normalizeOutgoingAttachments(input.attachments),
-    audience: validTargets.length > 0 ? { notify: validTargets, reason: "mention" } : undefined,
+    audience: participantValidTargets.length > 0 ? { notify: participantValidTargets, reason: "conversation_visibility" } : mentionedValidTargets.length > 0 ? { notify: mentionedValidTargets, reason: "mention" } : undefined,
     visibility: conversation.visibility,
     policy: "durable",
     createdAt: createdAtMs,
@@ -45487,11 +45516,22 @@ async function sendScoutConversationMessage(input) {
       destinationKind: "conversation",
       destinationId: conversation.id,
       relayMessageId: messageId,
+      ...participantValidTargets.length ? {
+        deliveryIntent: "group_message",
+        relayTargetIds: participantValidTargets
+      } : {},
       ...clientMessageMetadata(input.clientMessageId),
       returnAddress
     }
   });
-  return { usedBroker: true, conversationId: conversation.id, messageId, invokedTargets: validTargets, unresolvedTargets };
+  return {
+    usedBroker: true,
+    conversationId: conversation.id,
+    messageId,
+    invokedTargets: mentionedValidTargets,
+    ...participantValidTargets.length ? { notifiedTargets: participantValidTargets } : {},
+    unresolvedTargets
+  };
 }
 async function sendScoutConversationSteer(input) {
   const broker2 = await loadScoutBrokerContext();
@@ -62934,6 +62974,26 @@ function defaultSendModeForConversationSession(input) {
   }
   return input.hasActiveRun ? "steer" : "invoke";
 }
+function resolveChatMessagePlacement(chatId, replyToMessageId) {
+  const conversation = queryConversationDefinitionById(chatId);
+  if (conversation?.parentConversationId && conversation.messageId) {
+    return {
+      kind: "thread_reply",
+      parentConversationId: conversation.parentConversationId,
+      anchorMessageId: conversation.messageId,
+      ...replyToMessageId ? { replyToMessageId } : {}
+    };
+  }
+  return replyToMessageId ? { kind: "inline_reply", replyToMessageId } : { kind: "root" };
+}
+function semanticSessionForChat(chatId, session3) {
+  if (session3.kind !== "thread")
+    return session3;
+  const definition = queryConversationDefinitionById(chatId);
+  if (!definition?.parentConversationId)
+    return session3;
+  return querySessionById(definition.parentConversationId) ?? session3;
+}
 function steerContextByTargetAgentId(runs) {
   const entries2 = new Map;
   for (const run of runs) {
@@ -66027,6 +66087,117 @@ async function createOpenScoutWebServer(options) {
     }
     return new Response(Bun.file(entry.path), { headers });
   });
+  const dispatchOperatorChatMessage = async (input) => {
+    const routeSession = querySessionById(input.chatId);
+    if (!routeSession) {
+      return { ok: false, status: 404, error: "chat not found" };
+    }
+    const semanticSession = semanticSessionForChat(input.chatId, routeSession);
+    const { conversationId: routedConversationId, senderId } = resolveConversationRouting(input.chatId);
+    if (!routedConversationId) {
+      return { ok: false, status: 404, error: "chat not found" };
+    }
+    const isOperatorDirectConversation = semanticSession.kind === "direct" && sessionIncludesOperatorParticipant(semanticSession);
+    const isSharedChat = routeSession.kind === "channel" || routeSession.kind === "group_direct" || routeSession.kind === "thread" && !isOperatorDirectConversation;
+    const scopedTargetParticipantIds = Array.isArray(input.targetParticipantIds) ? [...new Set(input.targetParticipantIds.filter((targetId) => typeof targetId === "string").map((targetId) => targetId.trim()).filter(Boolean))] : undefined;
+    const requestedSendMode = input.requestedSendMode?.trim();
+    const selectors = extractAgentSelectors(input.body);
+    const selectorTargetAgentIds = resolveSendSelectorTargetAgentIds(selectors, routeSession.participantIds);
+    const hasExplicitTarget = Boolean(scopedTargetParticipantIds?.length) || selectors.length > 0;
+    const shouldInspectActiveRuns = requestedSendMode?.toLowerCase() === "steer" || !requestedSendMode && (isOperatorDirectConversation || hasExplicitTarget);
+    const activeRuns = shouldInspectActiveRuns ? queryRuns({
+      conversationId: routedConversationId,
+      active: true,
+      limit: 100
+    }) : [];
+    const resolvedTargetIds = new Set([
+      ...scopedTargetParticipantIds ?? [],
+      ...selectorTargetAgentIds
+    ]);
+    const matchedActiveRuns = hasExplicitTarget ? activeRuns.filter((run) => resolvedTargetIds.has(run.agentId)) : activeRuns;
+    const hasActiveRun = matchedActiveRuns.length > 0;
+    const steerContext = steerContextByTargetAgentId(matchedActiveRuns);
+    const sendMode = (requestedSendMode || defaultSendModeForConversationSession({
+      session: semanticSession,
+      hasExplicitTarget,
+      hasActiveRun
+    })).toLowerCase();
+    const shouldCommentOnly = sendMode === "comment" || sendMode === "message" || sendMode === "tell" && !isOperatorDirectConversation;
+    const executionHarness = coerceAgentHarness(input.execution?.harness);
+    const executionModel = optionalString2(input.execution?.model)?.trim();
+    const requestedExecution = executionHarness || executionModel ? {
+      ...executionHarness ? { harness: executionHarness } : {},
+      ...executionModel ? { model: executionModel } : {}
+    } : undefined;
+    const result = shouldCommentOnly ? await sendScoutConversationMessage({
+      conversationId: routedConversationId,
+      senderId,
+      body: input.body,
+      attachments: input.attachments,
+      replyToMessageId: input.replyToMessageId,
+      notifyParticipantAgents: isSharedChat,
+      currentDirectory,
+      source: "scout-web"
+    }) : await sendScoutConversationSteer({
+      conversationId: routedConversationId,
+      senderId,
+      body: input.body,
+      attachments: input.attachments,
+      replyToMessageId: input.replyToMessageId,
+      ...scopedTargetParticipantIds?.length ? { targetParticipantIds: scopedTargetParticipantIds } : {},
+      intent: sendMode === "tell" ? "tell" : sendMode === "invoke" ? "invoke" : "steer",
+      ...sendMode === "steer" && steerContext ? { steerContextByTargetAgentId: steerContext } : {},
+      ...requestedExecution ? { execution: requestedExecution } : {},
+      currentDirectory,
+      source: "scout-web"
+    });
+    if (!result.usedBroker) {
+      return { ok: false, status: 502, error: "broker unreachable" };
+    }
+    const flights = result.flights?.length ? result.flights : result.flight ? [result.flight] : [];
+    return {
+      ok: true,
+      result: {
+        ...result,
+        conversationId: routedConversationId,
+        chatId: routedConversationId,
+        runIds: flights.map((flight) => `run:flight:${flight.id}`)
+      }
+    };
+  };
+  app.post("/api/chats/:chatId/messages", async (c) => {
+    const chatId = c.req.param("chatId");
+    if (!isOpaqueChannelId(chatId)) {
+      return c.json({ error: "chatId must be an opaque chat id" }, 400);
+    }
+    const requestBody2 = await c.req.json().catch(() => ({}));
+    const body = optionalString2(requestBody2.body) ?? "";
+    if (requestBody2.attachments !== undefined && !Array.isArray(requestBody2.attachments)) {
+      return c.json({ error: "attachments must be an array" }, 400);
+    }
+    const attachments = requestBody2.attachments;
+    if (!body.trim() && !attachments?.length) {
+      return c.json({ error: "body or attachments are required" }, 400);
+    }
+    const hasReplyAnchor = requestBody2.replyToMessageId !== undefined && requestBody2.replyToMessageId !== null;
+    const replyToMessageId = hasReplyAnchor ? optionalString2(requestBody2.replyToMessageId)?.trim() : undefined;
+    if (hasReplyAnchor && !replyToMessageId) {
+      return c.json({ error: "replyToMessageId must be a non-empty string" }, 400);
+    }
+    const outcome = await dispatchOperatorChatMessage({
+      chatId,
+      body: body.trim(),
+      ...attachments?.length ? { attachments } : {},
+      ...replyToMessageId ? { replyToMessageId } : {}
+    });
+    if (!outcome.ok) {
+      return c.json({ error: outcome.error }, outcome.status);
+    }
+    return c.json({
+      ...outcome.result,
+      placement: resolveChatMessagePlacement(chatId, replyToMessageId)
+    });
+  });
   app.post("/api/send", async (c) => {
     const { body, chatId, cId, conversationId, threadId, attachments, intent, mode, targetParticipantIds, replyToMessageId, execution } = await c.req.json();
     const messageBody = body?.trim() ?? "";
@@ -66042,11 +66213,22 @@ async function createOpenScoutWebServer(options) {
     if (routeCId && !isOpaqueChannelId(routeCId)) {
       return c.json({ error: "chatId must be an opaque chat id" }, 400);
     }
-    const routeSession = routeCId ? querySessionById(routeCId) : null;
-    if (routeCId && !routeSession) {
-      return c.json({ error: "chat not found" }, 404);
+    if (routeCId) {
+      const outcome = await dispatchOperatorChatMessage({
+        chatId: routeCId,
+        body: messageBody,
+        attachments,
+        replyToMessageId: routedReplyToMessageId,
+        requestedSendMode: optionalString2(intent)?.trim() || optionalString2(mode)?.trim(),
+        targetParticipantIds,
+        execution
+      });
+      if (!outcome.ok) {
+        return c.json({ error: outcome.error }, outcome.status);
+      }
+      return c.json(outcome.result);
     }
-    if (!routeCId && scoutbotRunner) {
+    if (scoutbotRunner) {
       try {
         const result2 = await scoutbotRunner.postOperatorMessage({
           body: messageBody,
@@ -66063,7 +66245,7 @@ async function createOpenScoutWebServer(options) {
         return c.json({ error: message }, /unknown scoutbot thread/i.test(message) ? 404 : 500);
       }
     }
-    const { directAgentId, channel, conversationId: routedConversationId, senderId } = resolveConversationRouting(routeCId);
+    const { directAgentId, channel, senderId } = resolveConversationRouting(undefined);
     if (directAgentId) {
       if (directAgentId === SCOUTBOT_AGENT_ID && scoutbotRunner) {
         try {
@@ -66096,70 +66278,6 @@ async function createOpenScoutWebServer(options) {
         runIds: result2.flight ? [`run:flight:${result2.flight.id}`] : []
       });
     }
-    if (routedConversationId) {
-      const isOperatorDirectConversation = routeSession?.kind === "direct" && sessionIncludesOperatorParticipant(routeSession);
-      const scopedTargetParticipantIds = Array.isArray(targetParticipantIds) ? [...new Set(targetParticipantIds.filter((targetId) => typeof targetId === "string").map((targetId) => targetId.trim()).filter(Boolean))] : undefined;
-      const requestedSendMode = optionalString2(intent)?.trim() || optionalString2(mode)?.trim();
-      const selectors = extractAgentSelectors(messageBody);
-      const selectorTargetAgentIds = resolveSendSelectorTargetAgentIds(selectors, routeSession?.participantIds ?? []);
-      const hasExplicitTarget = Boolean(scopedTargetParticipantIds?.length) || selectors.length > 0;
-      const shouldInspectActiveRuns = requestedSendMode?.toLowerCase() === "steer" || !requestedSendMode && (isOperatorDirectConversation || hasExplicitTarget);
-      const activeRuns = shouldInspectActiveRuns ? queryRuns({
-        conversationId: routedConversationId,
-        active: true,
-        limit: 100
-      }) : [];
-      const resolvedTargetIds = new Set([
-        ...scopedTargetParticipantIds ?? [],
-        ...selectorTargetAgentIds
-      ]);
-      const matchedActiveRuns = hasExplicitTarget ? activeRuns.filter((run) => resolvedTargetIds.has(run.agentId)) : activeRuns;
-      const hasActiveRun = matchedActiveRuns.length > 0;
-      const steerContext = steerContextByTargetAgentId(matchedActiveRuns);
-      const sendMode = (requestedSendMode || defaultSendModeForConversationSession({
-        session: routeSession,
-        hasExplicitTarget,
-        hasActiveRun
-      })).toLowerCase();
-      const shouldCommentOnly = sendMode === "comment" || sendMode === "message" || sendMode === "tell" && !isOperatorDirectConversation;
-      const executionHarness = coerceAgentHarness(execution?.harness);
-      const executionModel = optionalString2(execution?.model)?.trim();
-      const requestedExecution = executionHarness || executionModel ? {
-        ...executionHarness ? { harness: executionHarness } : {},
-        ...executionModel ? { model: executionModel } : {}
-      } : undefined;
-      const result2 = shouldCommentOnly ? await sendScoutConversationMessage({
-        conversationId: routedConversationId,
-        senderId,
-        body: messageBody,
-        attachments,
-        replyToMessageId: routedReplyToMessageId,
-        currentDirectory,
-        source: "scout-web"
-      }) : await sendScoutConversationSteer({
-        conversationId: routedConversationId,
-        senderId,
-        body: messageBody,
-        attachments,
-        replyToMessageId: routedReplyToMessageId,
-        ...scopedTargetParticipantIds?.length ? { targetParticipantIds: scopedTargetParticipantIds } : {},
-        intent: sendMode === "tell" ? "tell" : sendMode === "invoke" ? "invoke" : "steer",
-        ...sendMode === "steer" && steerContext ? { steerContextByTargetAgentId: steerContext } : {},
-        ...requestedExecution ? { execution: requestedExecution } : {},
-        currentDirectory,
-        source: "scout-web"
-      });
-      if (!result2.usedBroker) {
-        return c.json({ error: "broker unreachable" }, 502);
-      }
-      const flights = result2.flights?.length ? result2.flights : result2.flight ? [result2.flight] : [];
-      return c.json({
-        ...result2,
-        conversationId: routedConversationId,
-        chatId: routedConversationId,
-        runIds: flights.map((flight) => `run:flight:${flight.id}`)
-      });
-    }
     const result = await sendScoutMessage({
       senderId,
       body: messageBody,