@openscout/scout 0.2.49 → 0.2.51

package/dist/main.mjs

@@ -932,8 +932,8 @@ var init_agent_selectors = __esm(() => {
   init_agent_address();
 });
 
-// ../protocol/src/relay-agent-card.ts
-function buildRelayReturnAddress(input) {
+// ../protocol/src/scout-agent-card.ts
+function buildScoutReturnAddress(input) {
   const next = {
     actorId: input.actorId,
     handle: input.handle.trim()
@@ -7505,7 +7505,9 @@ var init_paths = __esm(() => {
       endpoints: "/v1/endpoints",
       conversations: "/v1/conversations",
       invocations: "/v1/invocations",
-      activity: "/v1/activity"
+      activity: "/v1/activity",
+      collaborationRecords: "/v1/collaboration/records",
+      collaborationEvents: "/v1/collaboration/events"
     }
   };
 });
@@ -7610,14 +7612,14 @@ function displayNameForBrokerActor(snapshot, actorId) {
 function firstEndpointForActor(snapshot, actorId) {
   return Object.values(snapshot.endpoints).filter((endpoint) => endpoint.agentId === actorId).sort((lhs, rhs) => lhs.id.localeCompare(rhs.id))[0];
 }
-function buildScoutReturnAddress(snapshot, actorId, options = {}) {
+function buildScoutReturnAddress2(snapshot, actorId, options = {}) {
   const agent = snapshot.agents[actorId];
   const actor = snapshot.actors[actorId];
   const endpoint = firstEndpointForActor(snapshot, actorId);
   const selector = agent?.selector?.trim() || metadataString2(agent?.metadata, "selector") || metadataString2(actor?.metadata, "selector");
   const defaultSelector = agent?.defaultSelector?.trim() || metadataString2(agent?.metadata, "defaultSelector") || metadataString2(actor?.metadata, "defaultSelector");
   const projectRoot = endpoint?.projectRoot ?? endpoint?.cwd ?? metadataString2(agent?.metadata, "projectRoot") ?? metadataString2(actor?.metadata, "projectRoot");
-  return buildRelayReturnAddress({
+  return buildScoutReturnAddress({
     actorId,
     handle: agent?.handle?.trim() || actor?.handle?.trim() || actorId,
     displayName: agent?.displayName || actor?.displayName,
@@ -7776,7 +7778,9 @@ async function resolveMentionTargets(snapshot, text, currentDirectory) {
   const unresolved = [...mentions.unparsed];
   const ambiguous = [];
   const candidateMap = new Map;
-  const endpointBackedAgentIds = [...new Set(Object.values(snapshot.endpoints).map((endpoint) => endpoint.agentId).filter((agentId) => agentId && agentId !== OPERATOR_ID))];
+  const endpointBackedAgentIds = [
+    ...new Set(Object.values(snapshot.endpoints).map((endpoint) => endpoint.agentId).filter((agentId) => agentId && agentId !== OPERATOR_ID))
+  ];
   for (const agent of Object.values(snapshot.agents)) {
     if (isSupersededBrokerAgent(snapshot, agent.id)) {
       continue;
@@ -7786,14 +7790,19 @@ async function resolveMentionTargets(snapshot, text, currentDirectory) {
   for (const selector of selectors) {
     if (selector.definitionId === "system")
       continue;
-    const discovered = await resolveRelayAgentConfig(selector, { currentDirectory });
+    const discovered = await resolveRelayAgentConfig(selector, {
+      currentDirectory
+    });
     if (discovered && !candidateMap.has(discovered.agentId)) {
       candidateMap.set(discovered.agentId, {
         agentId: discovered.agentId,
         definitionId: discovered.definitionId,
         nodeQualifier: discovered.instance.nodeQualifier,
         workspaceQualifier: discovered.instance.workspaceQualifier,
-        aliases: [discovered.instance.selector, discovered.instance.defaultSelector]
+        aliases: [
+          discovered.instance.selector,
+          discovered.instance.defaultSelector
+        ]
       });
     }
     const candidates = Array.from(candidateMap.values());
@@ -8033,8 +8042,12 @@ async function ensureTargetRelayAgentRegistered(baseUrl, snapshot, nodeId, agent
 }
 function conversationDefinition(snapshot, nodeId, channel, senderId, targetParticipantIds = []) {
   const normalizedChannel = channel?.trim() || "shared";
-  const sharedParticipants = [...new Set([OPERATOR_ID, senderId, ...Object.keys(snapshot.agents)])].sort();
-  const scopedParticipants = [...new Set([OPERATOR_ID, senderId, ...targetParticipantIds])].sort();
+  const sharedParticipants = [
+    ...new Set([OPERATOR_ID, senderId, ...Object.keys(snapshot.agents)])
+  ].sort();
+  const scopedParticipants = [
+    ...new Set([OPERATOR_ID, senderId, ...targetParticipantIds])
+  ].sort();
   if (normalizedChannel === "voice") {
     return {
       id: BROKER_VOICE_CHANNEL_ID,
@@ -8085,7 +8098,12 @@ function conversationDefinition(snapshot, nodeId, channel, senderId, targetParti
 async function ensureBrokerConversation(baseUrl, snapshot, nodeId, channel, senderId, targetParticipantIds = []) {
   const definition = conversationDefinition(snapshot, nodeId, channel, senderId, targetParticipantIds);
   const existing = snapshot.conversations[definition.id];
-  const nextParticipants = [...new Set([...existing?.participantIds ?? [], ...definition.participantIds])].sort();
+  const nextParticipants = [
+    ...new Set([
+      ...existing?.participantIds ?? [],
+      ...definition.participantIds
+    ])
+  ].sort();
   if (!existing || existing.kind !== definition.kind || existing.visibility !== definition.visibility || existing.shareMode !== definition.shareMode || nextParticipants.length !== existing.participantIds.length) {
     const nextConversation = {
       ...definition,
@@ -8107,6 +8125,221 @@ function directConversationIdForActors(sourceId, targetId) {
   }
   return `dm.${[sourceId, targetId].sort().join(".")}`;
 }
+function relayChannelMetadata(conversation, explicitChannel) {
+  const normalized = explicitChannel?.trim();
+  if (normalized) {
+    return normalized;
+  }
+  return conversation.kind === "direct" ? "dm" : "shared";
+}
+function relayAudienceReason(conversation) {
+  return conversation.kind === "direct" ? "direct_message" : "mention";
+}
+function buildScoutEntityId(prefix, createdAtMs) {
+  return `${prefix}-${createdAtMs.toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+}
+function createTrackedWorkItemSummary(record) {
+  if (record.kind !== "work_item") {
+    throw new Error(`expected work_item collaboration record, received ${record.kind}`);
+  }
+  return {
+    id: record.id,
+    title: record.title,
+    summary: record.summary ?? null,
+    state: record.state,
+    acceptanceState: record.acceptanceState,
+    ownerId: record.ownerId ?? null,
+    nextMoveOwnerId: record.nextMoveOwnerId ?? null,
+    conversationId: record.conversationId ?? null,
+    priority: record.priority ?? null
+  };
+}
+async function createScoutTrackedWorkItem(input) {
+  const recordId = buildScoutEntityId("work", input.createdAtMs);
+  const record = {
+    id: recordId,
+    kind: "work_item",
+    state: "open",
+    acceptanceState: input.workItem.acceptanceState ?? "pending",
+    title: input.workItem.title.trim(),
+    summary: input.workItem.summary?.trim() || undefined,
+    createdById: input.senderId,
+    ownerId: input.targetAgentId,
+    nextMoveOwnerId: input.targetAgentId,
+    conversationId: input.conversationId,
+    parentId: input.workItem.parentId?.trim() || undefined,
+    priority: input.workItem.priority,
+    labels: input.workItem.labels?.map((label) => label.trim()).filter(Boolean),
+    createdAt: input.createdAtMs,
+    updatedAt: input.createdAtMs,
+    requestedById: input.senderId,
+    metadata: {
+      source: input.source,
+      ...input.workItem.metadata ?? {}
+    }
+  };
+  await brokerPostJson(input.baseUrl, scoutBrokerPaths.v1.collaborationRecords, record);
+  const event = {
+    id: buildScoutEntityId("evt", input.createdAtMs),
+    recordId,
+    recordKind: "work_item",
+    kind: "created",
+    actorId: input.senderId,
+    at: input.createdAtMs,
+    summary: input.workItem.summary?.trim() || input.workItem.title.trim(),
+    metadata: {
+      source: input.source
+    }
+  };
+  await brokerPostJson(input.baseUrl, scoutBrokerPaths.v1.collaborationEvents, event);
+  return createTrackedWorkItemSummary(record);
+}
+function normalizeOptionalString2(value) {
+  if (value === null || value === undefined) {
+    return;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function normalizeWorkItemLabels(labels) {
+  if (!labels) {
+    return;
+  }
+  const normalized = labels.map((label) => label.trim()).filter(Boolean);
+  return normalized.length > 0 ? normalized : undefined;
+}
+function normalizeWorkItemProgress(progress) {
+  if (!progress) {
+    return;
+  }
+  const normalized = {};
+  if (typeof progress.completedSteps === "number") {
+    normalized.completedSteps = progress.completedSteps;
+  }
+  if (typeof progress.totalSteps === "number") {
+    normalized.totalSteps = progress.totalSteps;
+  }
+  if (typeof progress.percent === "number") {
+    normalized.percent = progress.percent;
+  }
+  if (typeof progress.checkpoint === "string" && progress.checkpoint.trim()) {
+    normalized.checkpoint = progress.checkpoint.trim();
+  }
+  if (typeof progress.summary === "string" && progress.summary.trim()) {
+    normalized.summary = progress.summary.trim();
+  }
+  return Object.keys(normalized).length > 0 ? normalized : undefined;
+}
+function normalizeWorkItemWaitingOn(waitingOn) {
+  if (!waitingOn) {
+    return;
+  }
+  const label = waitingOn.label.trim();
+  if (!label) {
+    return;
+  }
+  return {
+    ...waitingOn,
+    label,
+    targetId: normalizeOptionalString2(waitingOn.targetId)
+  };
+}
+function deriveWorkItemEventKind(previous, next) {
+  if (next.acceptanceState !== previous.acceptanceState) {
+    if (next.acceptanceState === "accepted") {
+      return "accepted";
+    }
+    if (next.acceptanceState === "reopened") {
+      return "reopened";
+    }
+  }
+  if (next.state !== previous.state) {
+    switch (next.state) {
+      case "waiting":
+        return "waiting";
+      case "review":
+        return "review_requested";
+      case "done":
+        return "done";
+      case "cancelled":
+        return "cancelled";
+      case "working":
+        return previous.state === "open" ? "claimed" : "progressed";
+      case "open":
+      default:
+        return "progressed";
+    }
+  }
+  if (next.ownerId !== previous.ownerId || next.nextMoveOwnerId !== previous.nextMoveOwnerId) {
+    return "handoff";
+  }
+  return "progressed";
+}
+function summarizeWorkItemUpdate(record) {
+  if (record.progress?.summary?.trim()) {
+    return record.progress.summary.trim();
+  }
+  if (record.summary?.trim()) {
+    return record.summary.trim();
+  }
+  return record.title.trim();
+}
+function brokerSnapshotWorkItem(snapshot, workId) {
+  const record = snapshot.collaborationRecords[workId];
+  return record?.kind === "work_item" ? record : null;
+}
+async function updateScoutWorkItem(input) {
+  const broker = await loadScoutBrokerContext();
+  if (!broker) {
+    return null;
+  }
+  const current = brokerSnapshotWorkItem(broker.snapshot, input.workId.trim());
+  if (!current) {
+    throw new Error(`unknown work item: ${input.workId}`);
+  }
+  const updatedAtMs = input.updatedAtMs ?? Date.now();
+  const nextState = input.state ?? current.state;
+  const nextSummary = input.summary === undefined ? current.summary : normalizeOptionalString2(input.summary) ?? undefined;
+  const nextOwnerId = input.ownerId === undefined ? current.ownerId : normalizeOptionalString2(input.ownerId);
+  const nextMoveOwnerId = input.nextMoveOwnerId === undefined ? current.nextMoveOwnerId : normalizeOptionalString2(input.nextMoveOwnerId);
+  const nextPriority = input.priority === undefined ? current.priority : input.priority ?? undefined;
+  const nextLabels = input.labels === undefined ? current.labels : normalizeWorkItemLabels(input.labels);
+  const nextProgress = input.progress === undefined ? current.progress : normalizeWorkItemProgress(input.progress);
+  const waitingOn = input.waitingOn === undefined ? nextState === "waiting" ? current.waitingOn : undefined : normalizeWorkItemWaitingOn(input.waitingOn);
+  const updated = {
+    ...current,
+    title: normalizeOptionalString2(input.title) ?? current.title,
+    summary: nextSummary,
+    state: nextState,
+    acceptanceState: input.acceptanceState ?? current.acceptanceState,
+    ownerId: nextOwnerId,
+    nextMoveOwnerId,
+    priority: nextPriority,
+    labels: nextLabels,
+    waitingOn,
+    progress: nextProgress,
+    updatedAt: updatedAtMs,
+    startedAt: current.startedAt ?? (nextState === "working" ? updatedAtMs : current.startedAt),
+    reviewRequestedAt: nextState === "review" ? current.reviewRequestedAt ?? updatedAtMs : current.reviewRequestedAt,
+    completedAt: nextState === "done" || nextState === "cancelled" ? current.completedAt ?? updatedAtMs : current.completedAt,
+    metadata: input.metadata ? { ...current.metadata ?? {}, ...input.metadata } : current.metadata
+  };
+  await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.collaborationRecords, updated);
+  const event = {
+    id: buildScoutEntityId("evt", updatedAtMs),
+    recordId: updated.id,
+    recordKind: "work_item",
+    kind: deriveWorkItemEventKind(current, updated),
+    actorId: input.actorId,
+    at: updatedAtMs,
+    summary: normalizeOptionalString2(input.eventSummary) ?? summarizeWorkItemUpdate(updated),
+    metadata: {
+      source: input.source?.trim() || "scout-mcp"
+    }
+  };
+  await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.collaborationEvents, event);
+  return createTrackedWorkItemSummary(updated);
+}
 async function ensureBrokerDirectConversationBetween(baseUrl, snapshot, nodeId, sourceId, targetId) {
   const conversationId = targetId === SCOUT_AGENT_ID && sourceId === OPERATOR_ID ? BROKER_SHARED_CHANNEL_ID : directConversationIdForActors(sourceId, targetId);
   const participantIds = [...new Set([sourceId, targetId])].sort();
@@ -8154,7 +8387,9 @@ async function sendScoutMessage(input) {
   const mentionResolution = await resolveMentionTargets(broker.snapshot, input.body, currentDirectory);
   const senderId = await resolveConversationActorId(broker.baseUrl, broker.snapshot, broker.node.id, input.senderId, currentDirectory);
   const availableTargets = (await Promise.all(mentionResolution.resolved.map(async (target) => await ensureTargetRelayAgentRegistered(broker.baseUrl, broker.snapshot, broker.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(broker.snapshot.agents[target])))].sort();
+  const validTargets = [
+    ...new Set(availableTargets.map((target) => target.agentId).filter((target) => target !== senderId && Boolean(broker.snapshot.agents[target])))
+  ].sort();
   const unresolvedTargets = mentionResolution.resolved.filter((target) => !validTargets.includes(target.agentId)).map((target) => target.label).concat(mentionResolution.unresolved).concat(mentionResolution.ambiguous.map((entry) => entry.label));
   if (unresolvedTargets.length > 0) {
     return { usedBroker: true, invokedTargets: [], unresolvedTargets };
@@ -8168,7 +8403,7 @@ async function sendScoutMessage(input) {
   }
   const messageId = `m-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const speechText = input.shouldSpeak ? stripScoutAgentSelectorLabels(input.body) : "";
-  const returnAddress = buildScoutReturnAddress(broker.snapshot, senderId, {
+  const returnAddress = buildScoutReturnAddress2(broker.snapshot, senderId, {
     conversationId: conversation.id,
     replyToMessageId: messageId
   });
@@ -8181,18 +8416,25 @@ async function sendScoutMessage(input) {
     body: input.body,
     mentions: mentionResolution.resolved.filter((target) => validTargets.includes(target.agentId)).map((target) => ({ actorId: target.agentId, label: target.label })),
     speech: speechText ? { text: speechText } : undefined,
-    audience: validTargets.length > 0 ? { notify: validTargets, reason: "mention" } : undefined,
+    audience: validTargets.length > 0 ? { notify: validTargets, reason: relayAudienceReason(conversation) } : undefined,
     visibility: conversation.visibility,
     policy: "durable",
     createdAt: createdAtMs,
     metadata: {
       source: "scout-cli",
-      relayChannel: input.channel ?? "shared",
+      relayChannel: relayChannelMetadata(conversation, input.channel),
+      relayTargetIds: validTargets,
       relayMessageId: messageId,
       returnAddress
     }
   });
-  return { usedBroker: true, invokedTargets: validTargets, unresolvedTargets };
+  return {
+    usedBroker: true,
+    conversationId: conversation.id,
+    messageId,
+    invokedTargets: validTargets,
+    unresolvedTargets
+  };
 }
 async function sendScoutMessageToAgentIds(input) {
   const broker = await loadScoutBrokerContext();
@@ -8207,7 +8449,9 @@ async function sendScoutMessageToAgentIds(input) {
   const createdAtMs = input.createdAtMs ?? Date.now();
   const source = input.source?.trim() || "scout-mcp";
   const senderId = await resolveConversationActorId(broker.baseUrl, broker.snapshot, broker.node.id, input.senderId, currentDirectory);
-  const requestedTargetIds = [...new Set(input.targetAgentIds.map((targetId) => targetId.trim()).filter(Boolean).filter((targetId) => targetId !== senderId))];
+  const requestedTargetIds = [
+    ...new Set(input.targetAgentIds.map((targetId) => targetId.trim()).filter(Boolean).filter((targetId) => targetId !== senderId))
+  ];
   const availableTargets = (await Promise.all(requestedTargetIds.map(async (targetId) => await ensureTargetRelayAgentRegistered(broker.baseUrl, broker.snapshot, broker.node.id, targetId, currentDirectory) ? targetId : null))).filter((targetId) => Boolean(targetId && broker.snapshot.agents[targetId]));
   const unresolvedTargetIds = requestedTargetIds.filter((targetId) => !availableTargets.includes(targetId));
   if (unresolvedTargetIds.length > 0) {
@@ -8226,7 +8470,7 @@ async function sendScoutMessageToAgentIds(input) {
   }
   const messageId = `m-${createdAtMs.toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const speechText = input.shouldSpeak ? input.body.trim() : "";
-  const returnAddress = buildScoutReturnAddress(broker.snapshot, senderId, {
+  const returnAddress = buildScoutReturnAddress2(broker.snapshot, senderId, {
     conversationId: conversation.id,
     replyToMessageId: messageId
   });
@@ -8244,14 +8488,14 @@ async function sendScoutMessageToAgentIds(input) {
     speech: speechText ? { text: speechText } : undefined,
     audience: availableTargets.length > 0 ? {
       notify: availableTargets,
-      reason: conversation.kind === "direct" ? "direct_message" : "mention"
+      reason: relayAudienceReason(conversation)
     } : undefined,
     visibility: conversation.visibility,
     policy: "durable",
     createdAt: createdAtMs,
     metadata: {
       source,
-      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
+      relayChannel: relayChannelMetadata(conversation, input.channel),
       relayTargetIds: availableTargets,
       relayMessageId: messageId,
       returnAddress
@@ -8297,7 +8541,7 @@ async function sendScoutDirectMessage(input) {
   const targetAgentId = directSession.targetId;
   const targetAgent = broker.snapshot.agents[targetAgentId] ?? ("agent" in directSession ? directSession.agent : undefined);
   const targetLabel = `@${targetAgent?.handle?.trim() || targetAgent?.displayName?.trim() || targetAgentId}`;
-  const returnAddress = buildScoutReturnAddress(broker.snapshot, OPERATOR_ID, {
+  const returnAddress = buildScoutReturnAddress2(broker.snapshot, OPERATOR_ID, {
     conversationId: directSession.conversation.id,
     replyToMessageId: messageId
   });
@@ -8375,8 +8619,12 @@ async function askScoutAgentById(input) {
       raw: targetLabel.replace(/^@/, ""),
       label: targetLabel,
       definitionId: broker.snapshot.agents[targetAgentId]?.definitionId ?? metadataString2(broker.snapshot.agents[targetAgentId]?.metadata, "definitionId") ?? targetAgentId,
-      ...broker.snapshot.agents[targetAgentId]?.workspaceQualifier ? { workspaceQualifier: broker.snapshot.agents[targetAgentId]?.workspaceQualifier } : {},
-      ...broker.snapshot.agents[targetAgentId]?.nodeQualifier ? { nodeQualifier: broker.snapshot.agents[targetAgentId]?.nodeQualifier } : {}
+      ...broker.snapshot.agents[targetAgentId]?.workspaceQualifier ? {
+        workspaceQualifier: broker.snapshot.agents[targetAgentId]?.workspaceQualifier
+      } : {},
+      ...broker.snapshot.agents[targetAgentId]?.nodeQualifier ? {
+        nodeQualifier: broker.snapshot.agents[targetAgentId]?.nodeQualifier
+      } : {}
     }
   };
   const targetReady = await ensureTargetRelayAgentRegistered(broker.baseUrl, broker.snapshot, broker.node.id, targetAgentId, currentDirectory);
@@ -8396,10 +8644,19 @@ async function askScoutAgentById(input) {
   }
   const messageId = `m-${createdAtMs.toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const speechText = input.shouldSpeak ? input.body.trim() : "";
-  const returnAddress = buildScoutReturnAddress(broker.snapshot, senderId, {
+  const returnAddress = buildScoutReturnAddress2(broker.snapshot, senderId, {
     conversationId: conversation.id,
     replyToMessageId: messageId
   });
+  const workItem = input.workItem ? await createScoutTrackedWorkItem({
+    baseUrl: broker.baseUrl,
+    senderId,
+    targetAgentId,
+    conversationId: conversation.id,
+    createdAtMs,
+    source,
+    workItem: input.workItem
+  }) : undefined;
   await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.messages, {
     id: messageId,
     conversationId: conversation.id,
@@ -8411,15 +8668,16 @@ async function askScoutAgentById(input) {
     speech: speechText ? { text: speechText } : undefined,
     audience: {
       notify: [targetAgentId],
-      reason: conversation.kind === "direct" ? "direct_message" : "mention"
+      reason: relayAudienceReason(conversation)
     },
     visibility: conversation.visibility,
     policy: "durable",
     createdAt: createdAtMs,
     metadata: {
       source,
-      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
+      relayChannel: relayChannelMetadata(conversation, input.channel),
       relayTarget: targetAgentId,
+      collaborationRecordId: workItem?.id,
       returnAddress
     }
   });
@@ -8430,6 +8688,7 @@ async function askScoutAgentById(input) {
     targetAgentId,
     action: "consult",
     task: input.body.trim(),
+    collaborationRecordId: workItem?.id,
     conversationId: conversation.id,
     messageId,
     execution: input.executionHarness ? { harness: input.executionHarness } : undefined,
@@ -8438,8 +8697,9 @@ async function askScoutAgentById(input) {
     createdAt: createdAtMs,
     metadata: {
       source,
-      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
+      relayChannel: relayChannelMetadata(conversation, input.channel),
       relayTarget: targetAgentId,
+      collaborationRecordId: workItem?.id,
       returnAddress
     }
   });
@@ -8447,7 +8707,8 @@ async function askScoutAgentById(input) {
     usedBroker: true,
     flight: invocationResponse.flight,
     conversationId: conversation.id,
-    messageId
+    messageId,
+    workItem
   };
 }
 async function askScoutQuestion(input) {
@@ -8490,10 +8751,20 @@ async function askScoutQuestion(input) {
   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) : "";
-  const returnAddress = buildScoutReturnAddress(broker.snapshot, senderId, {
+  const createdAt = input.createdAtMs ?? Date.now();
+  const returnAddress = buildScoutReturnAddress2(broker.snapshot, senderId, {
     conversationId: conversation.id,
     replyToMessageId: messageId
   });
+  const workItem = input.workItem ? await createScoutTrackedWorkItem({
+    baseUrl: broker.baseUrl,
+    senderId,
+    targetAgentId: target.agentId,
+    conversationId: conversation.id,
+    createdAtMs: createdAt,
+    source: "scout-cli",
+    workItem: input.workItem
+  }) : undefined;
   await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.messages, {
     id: messageId,
     conversationId: conversation.id,
@@ -8503,14 +8774,18 @@ async function askScoutQuestion(input) {
     body: messageBody,
     mentions: [{ actorId: target.agentId, label: target.label }],
     speech: speechText ? { text: speechText } : undefined,
-    audience: { notify: [target.agentId], reason: "mention" },
+    audience: {
+      notify: [target.agentId],
+      reason: relayAudienceReason(conversation)
+    },
     visibility: conversation.visibility,
     policy: "durable",
-    createdAt: input.createdAtMs ?? Date.now(),
+    createdAt,
     metadata: {
       source: "scout-cli",
-      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
+      relayChannel: relayChannelMetadata(conversation, input.channel),
       relayTarget: target.agentId,
+      collaborationRecordId: workItem?.id,
       returnAddress
     }
   });
@@ -8521,16 +8796,18 @@ async function askScoutQuestion(input) {
     targetAgentId: target.agentId,
     action: "consult",
     task: messageBody,
+    collaborationRecordId: workItem?.id,
     conversationId: conversation.id,
     messageId,
     execution: input.executionHarness ? { harness: input.executionHarness } : undefined,
     ensureAwake: true,
     stream: false,
-    createdAt: Date.now(),
+    createdAt,
     metadata: {
       source: "scout-cli",
-      relayChannel: input.channel ?? (conversation.kind === "direct" ? "dm" : "shared"),
+      relayChannel: relayChannelMetadata(conversation, input.channel),
       relayTarget: target.agentId,
+      collaborationRecordId: workItem?.id,
       returnAddress
     }
   });
@@ -8538,7 +8815,8 @@ async function askScoutQuestion(input) {
     usedBroker: true,
     flight: invocationResponse.flight,
     conversationId: conversation.id,
-    messageId
+    messageId,
+    workItem
   };
 }
 async function loadBrokerFlight(baseUrl, flightId) {
@@ -8734,17 +9012,25 @@ async function listScoutAgents(options = {}) {
       continue;
     if (isSupersededBrokerAgent(broker.snapshot, message.actorId))
       continue;
-    const current = messageStats.get(message.actorId) ?? { messages: 0, lastSeen: null };
+    const current = messageStats.get(message.actorId) ?? {
+      messages: 0,
+      lastSeen: null
+    };
     current.messages += 1;
-    current.lastSeen = maxDefined([current.lastSeen, normalizeUnixTimestamp(message.createdAt)]);
+    current.lastSeen = maxDefined([
+      current.lastSeen,
+      normalizeUnixTimestamp(message.createdAt)
+    ]);
     messageStats.set(message.actorId, current);
   }
-  return [...new Set([
-    ...Object.keys(broker.snapshot.agents ?? {}),
-    ...Array.from(endpointsByAgent.keys()),
-    ...Array.from(messageStats.keys()),
-    ...Array.from(configuredAgentIds.values())
-  ])].filter((agentId) => agentId && agentId !== OPERATOR_ID).filter((agentId) => !isSupersededBrokerAgent(broker.snapshot, agentId)).map((agentId) => {
+  return [
+    ...new Set([
+      ...Object.keys(broker.snapshot.agents ?? {}),
+      ...Array.from(endpointsByAgent.keys()),
+      ...Array.from(messageStats.keys()),
+      ...Array.from(configuredAgentIds.values())
+    ])
+  ].filter((agentId) => agentId && agentId !== OPERATOR_ID).filter((agentId) => !isSupersededBrokerAgent(broker.snapshot, agentId)).map((agentId) => {
     const endpoints = endpointsByAgent.get(agentId) ?? [];
     const brokerMessages = messageStats.get(agentId);
     const registrationKind = configuredAgentIds.has(agentId) ? "configured" : "broker";
@@ -8911,6 +9197,12 @@ function renderAmbiguousCandidate(label) {
     return "";
   return trimmed.startsWith("@") ? trimmed : `@${trimmed}`;
 }
+function renderConversationRoute(conversationId) {
+  if (!conversationId) {
+    return "conversation";
+  }
+  return conversationId.startsWith("dm.") ? `DM ${conversationId}` : `conversation ${conversationId}`;
+}
 function formatScoutAskRoutingError(result, targetLabel) {
   const renderedTarget = renderScoutTargetLabel(targetLabel);
   const diagnostic = result.targetDiagnostic;
@@ -8956,12 +9248,15 @@ async function runAskWithOptions(context, options) {
   if (!result.flight) {
     throw new Error(formatScoutAskRoutingError(result, options.targetLabel));
   }
-  context.stderr(`asking ${result.flight.targetAgentId}... (flight ${result.flight.id})`);
+  context.stderr(`asking ${result.flight.targetAgentId} as ${senderId} via ${renderConversationRoute(result.conversationId)}... (flight ${result.flight.id})`);
   const completed = await waitForScoutFlight(resolveScoutBrokerUrl(), result.flight.id, {
     timeoutSeconds: options.timeoutSeconds,
     onUpdate: (_flight, detail) => context.stderr(detail)
   });
   context.output.writeValue({
+    senderId,
+    conversationId: result.conversationId ?? null,
+    messageId: result.messageId ?? null,
     flight: completed,
     output: completed.output ?? completed.summary ?? ""
   }, (value) => value.output);
@@ -9018,6 +9313,13 @@ function renderScoutAgentList(entries) {
 }
 function renderScoutMessagePostResult(result) {
   const lines = [result.message];
+  if (result.senderId) {
+    lines.push(`From: ${result.senderId}`);
+  }
+  if (result.conversationId) {
+    const route = result.conversationId.startsWith("dm.") ? "DM" : "Conversation";
+    lines.push(`${route}: ${result.conversationId}`);
+  }
   if (result.invokedTargets.length > 0) {
     lines.push(`Routed to: ${result.invokedTargets.join(", ")}`);
   }
@@ -9136,6 +9438,8 @@ async function runSendCommand(context, args) {
     throw new Error(formatScoutSendRoutingError(result.unresolvedTargets));
   }
   context.output.writeValue({
+    senderId,
+    conversationId: result.conversationId,
     message: options.message,
     invokedTargets: result.invokedTargets,
     unresolvedTargets: result.unresolvedTargets
@@ -9185,23 +9489,74 @@ var init_broadcast = __esm(async () => {
   ]);
 });
 
-// ../runtime/src/relay-agent-cards.ts
+// ../runtime/src/scout-agent-cards.ts
 function metadataString3(metadata, key) {
   const value = metadata?.[key];
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
-function buildRelayAgentCard(binding, options = {}) {
+function metadataStringArray(metadata, key) {
+  const value = metadata?.[key];
+  if (!Array.isArray(value)) {
+    return;
+  }
+  const next = value.filter((entry) => typeof entry === "string" && entry.trim().length > 0);
+  return next.length > 0 ? next : undefined;
+}
+function metadataStringMatrix(metadata, key) {
+  const value = metadata?.[key];
+  if (!Array.isArray(value)) {
+    return;
+  }
+  const next = value.filter((entry) => Array.isArray(entry)).map((entry) => entry.filter((item) => typeof item === "string" && item.trim().length > 0)).filter((entry) => entry.length > 0);
+  return next.length > 0 ? next : undefined;
+}
+function metadataRecord2(metadata, key) {
+  const value = metadata?.[key];
+  if (!value || Array.isArray(value) || typeof value !== "object") {
+    return;
+  }
+  return value;
+}
+function metadataRecordArray(metadata, key) {
+  const value = metadata?.[key];
+  if (!Array.isArray(value)) {
+    return;
+  }
+  const next = value.filter((entry) => Boolean(entry) && !Array.isArray(entry) && typeof entry === "object");
+  return next.length > 0 ? next : undefined;
+}
+function buildScoutAgentCard(binding, options = {}) {
   const projectRoot = binding.endpoint.projectRoot ?? metadataString3(binding.agent.metadata, "projectRoot") ?? binding.endpoint.cwd ?? process.cwd();
   const currentDirectory = options.currentDirectory?.trim() || projectRoot;
   const handle = binding.agent.handle?.trim() || binding.agent.definitionId;
   const selector = binding.agent.selector?.trim() || metadataString3(binding.agent.metadata, "selector");
   const defaultSelector = binding.agent.defaultSelector?.trim() || metadataString3(binding.agent.metadata, "defaultSelector");
   const branch = metadataString3(binding.agent.metadata, "branch") || metadataString3(binding.endpoint.metadata, "branch");
+  const description = metadataString3(binding.agent.metadata, "description");
+  const version = metadataString3(binding.agent.metadata, "version");
+  const documentationUrl = metadataString3(binding.agent.metadata, "documentationUrl") || metadataString3(binding.agent.metadata, "docsUrl");
+  const provider = metadataRecord2(binding.agent.metadata, "provider");
+  const skills = metadataRecordArray(binding.agent.metadata, "skills");
+  const defaultInputModes = metadataStringArray(binding.agent.metadata, "defaultInputModes");
+  const defaultOutputModes = metadataStringArray(binding.agent.metadata, "defaultOutputModes");
+  const supportedInterfaces = metadataRecordArray(binding.agent.metadata, "supportedInterfaces");
+  const securitySchemes = metadataRecord2(binding.agent.metadata, "securitySchemes");
+  const securityRequirements = metadataStringMatrix(binding.agent.metadata, "securityRequirements");
   return {
     id: binding.agent.id,
     agentId: binding.agent.id,
     definitionId: binding.agent.definitionId,
     displayName: binding.agent.displayName,
+    ...description ? { description } : {},
+    ...provider ? { provider } : {},
+    ...version ? { version } : {},
+    ...documentationUrl ? { documentationUrl } : {},
+    ...skills ? { skills } : {},
+    ...defaultInputModes ? { defaultInputModes } : {},
+    ...defaultOutputModes ? { defaultOutputModes } : {},
+    ...supportedInterfaces ? { supportedInterfaces } : {},
+    ...securitySchemes ? { securitySchemes } : {},
+    ...securityRequirements ? { securityRequirements } : {},
     handle,
     ...selector ? { selector } : {},
     ...defaultSelector ? { defaultSelector } : {},
@@ -9216,7 +9571,7 @@ function buildRelayAgentCard(binding, options = {}) {
     ...options.createdById?.trim() ? { createdById: options.createdById.trim() } : {},
     brokerRegistered: options.brokerRegistered ?? false,
     ...options.inboxConversationId?.trim() ? { inboxConversationId: options.inboxConversationId.trim() } : {},
-    returnAddress: buildRelayReturnAddress({
+    returnAddress: buildScoutReturnAddress({
       actorId: binding.agent.id,
       handle,
       displayName: binding.agent.displayName,
@@ -9238,7 +9593,7 @@ function buildRelayAgentCard(binding, options = {}) {
     }
   };
 }
-var init_relay_agent_cards = __esm(() => {
+var init_scout_agent_cards = __esm(() => {
   init_src();
 });
 
@@ -9291,7 +9646,7 @@ async function createScoutAgentCard(input) {
     inboxConversationId = session.conversation.id;
     createdById = session.sourceId;
   }
-  return buildRelayAgentCard(binding, {
+  return buildScoutAgentCard(binding, {
     currentDirectory,
     createdById,
     brokerRegistered: syncResult?.brokerRegistered ?? false,
@@ -9299,7 +9654,7 @@ async function createScoutAgentCard(input) {
   });
 }
 var init_service2 = __esm(async () => {
-  init_relay_agent_cards();
+  init_scout_agent_cards();
   await __promiseAll([
     init_local_agents(),
     init_service()
@@ -9307,13 +9662,16 @@ var init_service2 = __esm(async () => {
 });
 
 // ../../apps/desktop/src/ui/terminal/cards.ts
-function renderRelayAgentCard(card) {
+function renderScoutAgentCard(card) {
   const lines = [
     `${card.displayName} [@${card.handle}]`,
     `Agent: ${card.agentId}`,
     `Project: ${card.projectRoot}`,
     `Runtime: ${card.harness} via ${card.transport}${card.sessionId ? ` (${card.sessionId})` : ""}`
   ];
+  if (card.description) {
+    lines.push(`About: ${card.description}`);
+  }
   if (card.selector) {
     lines.push(`Selector: ${card.selector}`);
   }
@@ -9330,6 +9688,12 @@ function renderRelayAgentCard(card) {
   if (card.returnAddress.conversationId) {
     lines.push(`Reply-To: ${card.returnAddress.conversationId}`);
   }
+  if (card.skills && card.skills.length > 0) {
+    lines.push(`Skills: ${card.skills.map((skill) => skill.name).join(", ")}`);
+  }
+  if (card.documentationUrl) {
+    lines.push(`Docs: ${card.documentationUrl}`);
+  }
   return lines.join(`
 `);
 }
@@ -9395,7 +9759,7 @@ async function runCardCommand(context, args) {
     currentDirectory: options.currentDirectory,
     createdById: resolveScoutAgentName(options.requesterId)
   });
-  context.output.writeValue(card, renderRelayAgentCard);
+  context.output.writeValue(card, renderScoutAgentCard);
 }
 var init_card = __esm(async () => {
   init_context();
@@ -39549,11 +39913,7 @@ function buildIdentityCandidate(entry) {
     ...entry.workspace ? { workspaceQualifier: entry.workspace } : {},
     ...entry.node ? { nodeQualifier: entry.node } : {},
     ...entry.harness ? { harness: entry.harness } : {},
-    aliases: [
-      entry.selector,
-      entry.defaultSelector,
-      entry.handle
-    ].filter((value) => Boolean(value && value.trim().length > 0))
+    aliases: [entry.selector, entry.defaultSelector, entry.handle].filter((value) => Boolean(value && value.trim().length > 0))
   };
 }
 function decorateAgentLabels(entries) {
@@ -39756,7 +40116,11 @@ async function resolveScoutAgentForMcp(input) {
   const diagnosis = diagnoseAgentIdentity(selector, identityCandidates);
   if (diagnosis.kind === "resolved") {
     const match = candidates.find((candidate) => candidate.agentId === diagnosis.match.agentId) ?? null;
-    return { kind: match ? "resolved" : "unresolved", candidate: match, candidates: [] };
+    return {
+      kind: match ? "resolved" : "unresolved",
+      candidate: match,
+      candidates: []
+    };
   }
   if (diagnosis.kind === "ambiguous") {
     const ambiguous = diagnosis.candidates.map((candidate) => candidates.find((entry) => entry.agentId === candidate.agentId)).filter((candidate) => Boolean(candidate));
@@ -39770,8 +40134,22 @@ function defaultScoutMcpDependencies(env) {
     resolveBrokerUrl: () => env.OPENSCOUT_BROKER_URL?.trim() || resolveScoutBrokerUrl(),
     searchAgents: ({ query, currentDirectory, limit }) => searchScoutAgentsForMcp({ query, currentDirectory, limit }),
     resolveAgent: ({ label, currentDirectory }) => resolveScoutAgentForMcp({ label, currentDirectory }),
-    sendMessage: ({ senderId, body, channel, shouldSpeak, currentDirectory }) => sendScoutMessage({ senderId, body, channel, shouldSpeak, currentDirectory }),
-    sendMessageToAgentIds: ({ senderId, body, targetAgentIds, channel, shouldSpeak, currentDirectory, source }) => sendScoutMessageToAgentIds({
+    sendMessage: ({ senderId, body, channel, shouldSpeak, currentDirectory }) => sendScoutMessage({
+      senderId,
+      body,
+      channel,
+      shouldSpeak,
+      currentDirectory
+    }),
+    sendMessageToAgentIds: ({
+      senderId,
+      body,
+      targetAgentIds,
+      channel,
+      shouldSpeak,
+      currentDirectory,
+      source
+    }) => sendScoutMessageToAgentIds({
       senderId,
       body,
       targetAgentIds,
@@ -39780,23 +40158,43 @@ function defaultScoutMcpDependencies(env) {
       currentDirectory,
       source
     }),
-    askQuestion: ({ senderId, targetLabel, body, channel, shouldSpeak, currentDirectory }) => askScoutQuestion({
+    askQuestion: ({
+      senderId,
+      targetLabel,
+      body,
+      workItem,
+      channel,
+      shouldSpeak,
+      currentDirectory
+    }) => askScoutQuestion({
       senderId,
       targetLabel,
       body,
+      workItem,
       channel,
       shouldSpeak,
       currentDirectory
     }),
-    askAgentById: ({ senderId, targetAgentId, body, channel, shouldSpeak, currentDirectory, source }) => askScoutAgentById({
+    askAgentById: ({
       senderId,
       targetAgentId,
       body,
+      workItem,
+      channel,
+      shouldSpeak,
+      currentDirectory,
+      source
+    }) => askScoutAgentById({
+      senderId,
+      targetAgentId,
+      body,
+      workItem,
       channel,
       shouldSpeak,
       currentDirectory,
       source
     }),
+    updateWorkItem: (input) => updateScoutWorkItem(input),
     waitForFlight: (baseUrl, flightId, options) => waitForScoutFlight(baseUrl, flightId, options)
   };
 }
@@ -39923,10 +40321,19 @@ function createScoutMcpServer(options) {
       destructiveHint: false,
       openWorldHint: false
     }
-  }, async ({ body, currentDirectory, senderId, channel, shouldSpeak, mentionAgentIds }) => {
+  }, async ({
+    body,
+    currentDirectory,
+    senderId,
+    channel,
+    shouldSpeak,
+    mentionAgentIds
+  }) => {
     const resolvedCurrentDirectory = resolveToolCurrentDirectory(currentDirectory, options.defaultCurrentDirectory);
     const resolvedSenderId = await deps.resolveSenderId(senderId, resolvedCurrentDirectory, env);
-    const explicitTargetIds = [...new Set((mentionAgentIds ?? []).map((value) => value.trim()).filter(Boolean))];
+    const explicitTargetIds = [
+      ...new Set((mentionAgentIds ?? []).map((value) => value.trim()).filter(Boolean))
+    ];
     if (explicitTargetIds.length > 0) {
       const result2 = await deps.sendMessageToAgentIds({
         senderId: resolvedSenderId,
@@ -39964,8 +40371,8 @@ function createScoutMcpServer(options) {
       senderId: resolvedSenderId,
       mode: "body_mentions",
       usedBroker: result.usedBroker,
-      conversationId: null,
-      messageId: null,
+      conversationId: result.conversationId ?? null,
+      messageId: result.messageId ?? null,
       invokedTargetIds: result.invokedTargets,
       unresolvedTargetIds: result.unresolvedTargets
     };
@@ -39976,13 +40383,14 @@ function createScoutMcpServer(options) {
   });
   server.registerTool("invocations_ask", {
     title: "Ask Scout Agent",
-    description: "Create a broker-backed Scout invocation. Prefer targetAgentId when the host already resolved an @mention.",
+    description: "Create a broker-backed Scout invocation. Provide workItem to mint a durable workId beyond the message and flight ids.",
     inputSchema: object2({
       body: string2().min(1),
       currentDirectory: string2().optional(),
       senderId: string2().optional(),
       targetAgentId: string2().optional(),
       targetLabel: string2().optional(),
+      workItem: workItemInputSchema.optional(),
       channel: string2().optional(),
       shouldSpeak: boolean2().optional(),
       awaitReply: boolean2().optional(),
@@ -39998,7 +40406,18 @@ function createScoutMcpServer(options) {
       destructiveHint: false,
       openWorldHint: false
     }
-  }, async ({ body, currentDirectory, senderId, targetAgentId, targetLabel, channel, shouldSpeak, awaitReply, timeoutSeconds }) => {
+  }, async ({
+    body,
+    currentDirectory,
+    senderId,
+    targetAgentId,
+    targetLabel,
+    workItem,
+    channel,
+    shouldSpeak,
+    awaitReply,
+    timeoutSeconds
+  }) => {
     const resolvedCurrentDirectory = resolveToolCurrentDirectory(currentDirectory, options.defaultCurrentDirectory);
     const resolvedSenderId = await deps.resolveSenderId(senderId, resolvedCurrentDirectory, env);
     const shouldAwait = Boolean(awaitReply);
@@ -40007,6 +40426,7 @@ function createScoutMcpServer(options) {
         senderId: resolvedSenderId,
         targetAgentId: targetAgentId.trim(),
         body,
+        workItem,
         channel,
         shouldSpeak,
         currentDirectory: resolvedCurrentDirectory,
@@ -40023,9 +40443,13 @@ function createScoutMcpServer(options) {
         conversationId: result2.conversationId ?? null,
         messageId: result2.messageId ?? null,
         flight: completedFlight2 ?? result2.flight ?? null,
+        flightId: completedFlight2?.id ?? result2.flight?.id ?? null,
         output: completedFlight2?.output ?? completedFlight2?.summary ?? null,
         unresolvedTargetId: result2.unresolvedTargetId ?? null,
         unresolvedTargetLabel: null,
+        workItem: result2.workItem ?? null,
+        workId: result2.workItem?.id ?? null,
+        workUrl: result2.workItem ? `/api/work/${encodeURIComponent(result2.workItem.id)}` : null,
         targetDiagnostic: result2.targetDiagnostic ?? null
       };
       return {
@@ -40037,6 +40461,7 @@ function createScoutMcpServer(options) {
       senderId: resolvedSenderId,
       targetLabel: targetLabel.trim(),
       body,
+      workItem,
       channel,
       shouldSpeak,
       currentDirectory: resolvedCurrentDirectory
@@ -40052,9 +40477,13 @@ function createScoutMcpServer(options) {
       conversationId: result.conversationId ?? null,
       messageId: result.messageId ?? null,
       flight: completedFlight ?? result.flight ?? null,
+      flightId: completedFlight?.id ?? result.flight?.id ?? null,
       output: completedFlight?.output ?? completedFlight?.summary ?? null,
       unresolvedTargetId: null,
       unresolvedTargetLabel: result.unresolvedTarget ?? null,
+      workItem: result.workItem ?? null,
+      workId: result.workItem?.id ?? null,
+      workUrl: result.workItem ? `/api/work/${encodeURIComponent(result.workItem.id)}` : null,
       targetDiagnostic: result.targetDiagnostic ?? null
     };
     return {
@@ -40062,6 +40491,42 @@ function createScoutMcpServer(options) {
       structuredContent
     };
   });
+  server.registerTool("work_update", {
+    title: "Update Scout Work",
+    description: "Update a durable Scout work item and append a matching collaboration event.",
+    inputSchema: object2({
+      currentDirectory: string2().optional(),
+      senderId: string2().optional(),
+      work: workItemUpdateSchema
+    }),
+    outputSchema: workUpdateResultSchema,
+    annotations: {
+      readOnlyHint: false,
+      idempotentHint: false,
+      destructiveHint: false,
+      openWorldHint: false
+    }
+  }, async ({ currentDirectory, senderId, work }) => {
+    const resolvedCurrentDirectory = resolveToolCurrentDirectory(currentDirectory, options.defaultCurrentDirectory);
+    const resolvedSenderId = await deps.resolveSenderId(senderId, resolvedCurrentDirectory, env);
+    const workItem = await deps.updateWorkItem({
+      ...work,
+      actorId: resolvedSenderId,
+      source: "scout-mcp"
+    });
+    const structuredContent = {
+      currentDirectory: resolvedCurrentDirectory,
+      senderId: resolvedSenderId,
+      usedBroker: workItem !== null,
+      workItem,
+      workId: workItem?.id ?? null,
+      workUrl: workItem ? `/api/work/${encodeURIComponent(workItem.id)}` : null
+    };
+    return {
+      content: createTextContent(structuredContent),
+      structuredContent
+    };
+  });
   return server;
 }
 async function runScoutMcpServer(options) {
@@ -40072,7 +40537,7 @@ async function runScoutMcpServer(options) {
   const transport = new StdioServerTransport;
   await server.connect(transport);
 }
-var AGENT_STATE_VALUES, REGISTRATION_KIND_VALUES, RESOLVE_KIND_VALUES, flightSchema, agentCandidateSchema, whoAmISchema, searchResultSchema, resolveResultSchema, sendResultSchema, askResultSchema;
+var AGENT_STATE_VALUES, REGISTRATION_KIND_VALUES, RESOLVE_KIND_VALUES, flightSchema, trackedWorkItemSchema, workItemInputSchema, waitingOnSchema, progressSchema, workItemUpdateSchema, agentCandidateSchema, whoAmISchema, searchResultSchema, resolveResultSchema, sendResultSchema, askResultSchema, workUpdateResultSchema;
 var init_scout_mcp = __esm(async () => {
   init_mcp();
   init_stdio2();
@@ -40081,8 +40546,18 @@ var init_scout_mcp = __esm(async () => {
   init_v4();
   init_product();
   await init_service();
-  AGENT_STATE_VALUES = ["offline", "idle", "active", "waiting", "discovered"];
-  REGISTRATION_KIND_VALUES = ["broker", "configured", "discovered"];
+  AGENT_STATE_VALUES = [
+    "offline",
+    "idle",
+    "active",
+    "waiting",
+    "discovered"
+  ];
+  REGISTRATION_KIND_VALUES = [
+    "broker",
+    "configured",
+    "discovered"
+  ];
   RESOLVE_KIND_VALUES = ["resolved", "ambiguous", "unresolved"];
   flightSchema = object2({
     id: string2(),
@@ -40097,6 +40572,61 @@ var init_scout_mcp = __esm(async () => {
     completedAt: number2().optional(),
     metadata: record(string2(), unknown()).optional()
   });
+  trackedWorkItemSchema = object2({
+    id: string2(),
+    title: string2(),
+    summary: string2().nullable(),
+    state: _enum2(["open", "working", "waiting", "review", "done", "cancelled"]),
+    acceptanceState: _enum2(["none", "pending", "accepted", "reopened"]),
+    ownerId: string2().nullable(),
+    nextMoveOwnerId: string2().nullable(),
+    conversationId: string2().nullable(),
+    priority: _enum2(["low", "normal", "high", "urgent"]).nullable()
+  });
+  workItemInputSchema = object2({
+    title: string2().min(1),
+    summary: string2().optional(),
+    priority: _enum2(["low", "normal", "high", "urgent"]).optional(),
+    labels: array(string2()).optional(),
+    parentId: string2().optional(),
+    acceptanceState: _enum2(["none", "pending", "accepted", "reopened"]).optional(),
+    metadata: record(string2(), unknown()).optional()
+  });
+  waitingOnSchema = object2({
+    kind: _enum2([
+      "actor",
+      "question",
+      "work_item",
+      "approval",
+      "artifact",
+      "condition"
+    ]),
+    label: string2().min(1),
+    targetId: string2().optional(),
+    metadata: record(string2(), unknown()).optional()
+  });
+  progressSchema = object2({
+    completedSteps: number2().optional(),
+    totalSteps: number2().optional(),
+    checkpoint: string2().optional(),
+    summary: string2().optional(),
+    percent: number2().optional()
+  });
+  workItemUpdateSchema = object2({
+    workId: string2().min(1),
+    title: string2().optional(),
+    summary: string2().nullable().optional(),
+    state: _enum2(["open", "working", "waiting", "review", "done", "cancelled"]).optional(),
+    acceptanceState: _enum2(["none", "pending", "accepted", "reopened"]).optional(),
+    ownerId: string2().nullable().optional(),
+    nextMoveOwnerId: string2().nullable().optional(),
+    priority: _enum2(["low", "normal", "high", "urgent"]).nullable().optional(),
+    labels: array(string2()).optional(),
+    waitingOn: waitingOnSchema.nullable().optional(),
+    progress: progressSchema.nullable().optional(),
+    metadata: record(string2(), unknown()).optional(),
+    eventSummary: string2().optional()
+  });
   agentCandidateSchema = object2({
     agentId: string2(),
     label: string2(),
@@ -40151,11 +40681,23 @@ var init_scout_mcp = __esm(async () => {
     conversationId: string2().nullable(),
     messageId: string2().nullable(),
     flight: flightSchema.nullable(),
+    flightId: string2().nullable(),
     output: string2().nullable(),
     unresolvedTargetId: string2().nullable(),
     unresolvedTargetLabel: string2().nullable(),
+    workItem: trackedWorkItemSchema.nullable(),
+    workId: string2().nullable(),
+    workUrl: string2().nullable(),
     targetDiagnostic: object2({}).catchall(unknown()).nullable()
   });
+  workUpdateResultSchema = object2({
+    currentDirectory: string2(),
+    senderId: string2(),
+    usedBroker: boolean2(),
+    workItem: trackedWorkItemSchema.nullable(),
+    workId: string2().nullable(),
+    workUrl: string2().nullable()
+  });
 });
 
 // ../../apps/desktop/src/cli/commands/mcp.ts
@@ -55989,46 +56531,30 @@ import { dirname as dirname12, join as join26, resolve as resolve10 } from "path
 import { fileURLToPath as fileURLToPath8 } from "url";
 function renderServerCommandHelp() {
   return [
-    "scout server \u2014 desktop web UI (Bun runtime)",
+    "scout server \u2014 Scout web UI (Bun runtime)",
     "",
     "Usage:",
     "  scout server start [options]",
     "  scout server open [options]",
-    "  scout server control-plane start [options]",
-    "  scout server control-plane open [options]",
     "",
     "Subcommands:",
-    "  start              Full desktop web API + UI assets (default stack).",
-    "  open               Open the full web UI and start it on demand if needed.",
-    "  control-plane start Pairing + relay/shell activity only (`@openscout/web` surface).",
-    "  control-plane open  Open the control-plane UI and start it on demand if needed.",
+    "  start              Start the Scout web UI server.",
+    "  open               Open the Scout web UI (starts server on demand if needed).",
     "",
     "Options:",
-    "  --port <n>        Listen port (default 3200; env SCOUT_WEB_PORT)",
-    "  --static          Serve built UI from disk (sets SCOUT_STATIC=1)",
-    "  --static-root DIR Static client root (env SCOUT_STATIC_ROOT)",
-    "  --vite-url URL    Dev proxy target for non-API routes (env SCOUT_VITE_URL)",
+    "  --port <n>        Listen port (default 3200; env OPENSCOUT_WEB_PORT)",
+    "  --static          Serve built UI from disk",
+    "  --static-root DIR Static client root (env OPENSCOUT_WEB_STATIC_ROOT)",
+    "  --vite-url URL    Dev proxy target for non-API routes (env OPENSCOUT_WEB_VITE_URL)",
     "  --cwd DIR         Workspace / setup root (env OPENSCOUT_SETUP_CWD)",
     "  --path PATH       Browser path for `open` (default /)",
     "",
-    "Requires `bun` on PATH.",
-    "Published installs include dist/client for the full web UI and dist/control-plane-client",
-    "for the minimal control-plane UI; if present and you do not pass --vite-url, the matching",
-    "static assets are used by default."
+    "Requires `bun` on PATH."
   ].join(`
 `);
 }
 function resolveScoutWebServerEntry() {
-  const mainDir = dirname12(fileURLToPath8(import.meta.url));
-  const bundled = join26(mainDir, "scout-web-server.mjs");
-  if (existsSync18(bundled)) {
-    return bundled;
-  }
-  const source = fileURLToPath8(new URL("../../server/index.ts", import.meta.url));
-  if (existsSync18(source)) {
-    return source;
-  }
-  throw new ScoutCliError("Could not find Scout web server entry. Rebuild @openscout/scout or run from the OpenScout repository.");
+  return resolveScoutControlPlaneWebServerEntry();
 }
 function resolveScoutControlPlaneWebServerEntry() {
   const mainDir = dirname12(fileURLToPath8(import.meta.url));
@@ -56051,25 +56577,25 @@ function parseServerFlags(args) {
       const v = args[++i];
       if (!v)
         throw new ScoutCliError("--port requires a value");
-      env.SCOUT_WEB_PORT = v;
+      env.OPENSCOUT_WEB_PORT = v;
       continue;
     }
     if (a === "--static") {
-      env.SCOUT_STATIC = "1";
+      env.NODE_ENV = "production";
       continue;
     }
     if (a === "--static-root") {
       const v = args[++i];
       if (!v)
         throw new ScoutCliError("--static-root requires a value");
-      env.SCOUT_STATIC_ROOT = v;
+      env.OPENSCOUT_WEB_STATIC_ROOT = v;
       continue;
     }
     if (a === "--vite-url") {
       const v = args[++i];
       if (!v)
         throw new ScoutCliError("--vite-url requires a value");
-      env.SCOUT_VITE_URL = v;
+      env.OPENSCOUT_WEB_VITE_URL = v;
       continue;
     }
     if (a === "--cwd") {
@@ -56087,15 +56613,15 @@ function parseServerFlags(args) {
       continue;
     }
     if (a.startsWith("--port=")) {
-      env.SCOUT_WEB_PORT = a.slice("--port=".length);
+      env.OPENSCOUT_WEB_PORT = a.slice("--port=".length);
       continue;
     }
     if (a.startsWith("--static-root=")) {
-      env.SCOUT_STATIC_ROOT = a.slice("--static-root=".length);
+      env.OPENSCOUT_WEB_STATIC_ROOT = a.slice("--static-root=".length);
       continue;
     }
     if (a.startsWith("--vite-url=")) {
-      env.SCOUT_VITE_URL = a.slice("--vite-url=".length);
+      env.OPENSCOUT_WEB_VITE_URL = a.slice("--vite-url=".length);
       continue;
     }
     if (a.startsWith("--cwd=")) {
@@ -56110,9 +56636,9 @@ function parseServerFlags(args) {
   }
   return { env, openPath };
 }
-function resolveBundledStaticClientRoot(entry, mode) {
+function resolveBundledStaticClientRoot(entry, _mode) {
   const entryDir = dirname12(entry);
-  const clientDirectory = mode === "control-plane" ? join26(entryDir, "control-plane-client") : join26(entryDir, "client");
+  const clientDirectory = join26(entryDir, "client");
   const indexPath = join26(clientDirectory, "index.html");
   return existsSync18(indexPath) ? clientDirectory : null;
 }
@@ -56120,12 +56646,18 @@ function buildMergedServerEnv(entry, mode, flagEnv) {
   const bundledStaticClientRoot = resolveBundledStaticClientRoot(entry, mode);
   const autoEnv = {};
   if (bundledStaticClientRoot) {
-    const wantsVite = Boolean(flagEnv.SCOUT_VITE_URL ?? process.env.SCOUT_VITE_URL);
+    const wantsVite = Boolean(flagEnv.OPENSCOUT_WEB_VITE_URL ?? process.env.OPENSCOUT_WEB_VITE_URL);
     if (!wantsVite) {
-      autoEnv.SCOUT_STATIC = "1";
-      autoEnv.SCOUT_STATIC_ROOT = bundledStaticClientRoot;
+      autoEnv.NODE_ENV = "production";
+      autoEnv.OPENSCOUT_WEB_STATIC_ROOT = bundledStaticClientRoot;
     }
   }
+  if (flagEnv.SCOUT_WEB_PORT) {
+    autoEnv.OPENSCOUT_WEB_PORT = flagEnv.SCOUT_WEB_PORT;
+  }
+  if (flagEnv.OPENSCOUT_SETUP_CWD) {
+    autoEnv.OPENSCOUT_SETUP_CWD = flagEnv.OPENSCOUT_SETUP_CWD;
+  }
   return { ...process.env, ...autoEnv, ...flagEnv };
 }
 function parseServerSelection(args) {
@@ -56133,7 +56665,7 @@ function parseServerSelection(args) {
     return {
       action: "start",
       flagArgs: args.slice(1),
-      entry: resolveScoutWebServerEntry(),
+      entry: resolveScoutControlPlaneWebServerEntry(),
       mode: "full"
     };
   }
@@ -56141,16 +56673,14 @@ function parseServerSelection(args) {
     return {
       action: "open",
       flagArgs: args.slice(1),
-      entry: resolveScoutWebServerEntry(),
+      entry: resolveScoutControlPlaneWebServerEntry(),
       mode: "full"
     };
   }
   if (args[0] === "control-plane") {
-    if (args[1] !== "start" && args[1] !== "open") {
-      throw new ScoutCliError("expected: scout server control-plane <start|open>");
-    }
+    const sub = args[1] === "start" || args[1] === "open" ? args[1] : "start";
     return {
-      action: args[1],
+      action: sub,
       flagArgs: args.slice(2),
       entry: resolveScoutControlPlaneWebServerEntry(),
       mode: "control-plane"
@@ -56172,7 +56702,7 @@ function normalizeServerOpenPath(value) {
   return `/${trimmed}`;
 }
 function resolveServerPort(env) {
-  const envValue = env.SCOUT_WEB_PORT?.trim();
+  const envValue = (env.OPENSCOUT_WEB_PORT ?? env.SCOUT_WEB_PORT)?.trim();
   if (envValue) {
     const port = Number.parseInt(envValue, 10);
     if (!Number.isFinite(port) || port <= 0) {
@@ -118141,11 +118671,7 @@ function renderScoutHelp(version2 = "0.2.18") {
     "",
     "Commands:",
     commandLines,
-    ...deprecatedLines ? [
-      "",
-      "Deprecated aliases:",
-      deprecatedLines
-    ] : [],
+    ...deprecatedLines ? ["", "Deprecated aliases:", deprecatedLines] : [],
     "",
     "Global flags:",
     '  --json        Structured JSON (doctor: NDJSON stream; last object has phase "complete")',
@@ -118162,6 +118688,10 @@ function renderScoutHelp(version2 = "0.2.18") {
     "  scout menu",
     "  scout server open",
     "",
+    "One-to-one delegation:",
+    '  scout ask --to hudson "review the parser"      # DM by default',
+    '  scout ask --as premotion.master.mini --to hudson "build the editor"',
+    "",
     "Addressing:",
     "  @name                              short form; requires exactly one live match",
     "  @name.harness:<codex|claude|...>   pin a specific harness (alias: runtime:)",