@ctliz/agent-intercom-claude 0.14.1 → 0.15.0

package/claude/runtime.ts

@@ -10,15 +10,14 @@ import { appendInboxMessage, defaultInboxPath } from "./inbox.ts";
 import type { Attachment, Message, SessionInfo } from "../types.ts";
 import { formatIntercomTeam, resolveIntercomTeam } from "./team.ts";
 import {
-  createNamedTeam,
-  findNamedTeam,
   formatCreateSuccess,
   formatJoinableNamedTeamList,
   formatNamedJoinSuccess,
   listNamedTeams,
   parseTeamName,
-  rejectManagedJoin,
 } from "./named-teams.ts";
+import { appendNamedTeamMembership, sessionNamedTeams, namedTeamRoster, formatNamedTeamRoster, resolveNamedMessageTeam } from "./named-team-membership.ts";
+import { contextId, askId, replyHint, selectReplyContext } from "./reply-context.ts";
 
 export interface ClaudeRuntimeIdentity {
   sessionId: string;
@@ -78,6 +77,9 @@ function publicPendingEntry(entry: PendingInboundMessage, selector?: string): Re
       ...(entry.from.parentSessionId ? { parent_session_id: entry.from.parentSessionId } : {}),
       ...(entry.from.generation ? { generation: entry.from.generation } : {}),
     },
+    contextId: contextId(entry),
+    ...(entry.message.expectsReply ? { askId: askId(entry) } : {}),
+    ...(entry.message.content.team ? { team: entry.message.content.team } : {}),
     received_at: entry.receivedAt,
     read: entry.read,
     text: entry.message.content.text,
@@ -96,6 +98,7 @@ export interface ToolResult {
 interface ReplyWaiter {
   from: string;
   replyTo: string;
+  team?: string;
   resolve: (message: Message) => void;
   reject: (error: Error) => void;
   timeout: NodeJS.Timeout;
@@ -236,7 +239,7 @@ export class ClaudeIntercomRuntime {
     // reconnects reuse the same private scope even if process.env is mutated later.
     this.capturedScopeId = intercomScopeIdFromEnvForRegistration(process.env);
     // Reconnects reuse capturedScopeId even if process.env is mutated later.
-    // An explicit join/create updates capturedScopeId, then rebuilds the client.
+    // Task-team joins update membership only; registration scope stays fixed.
     this.clientFactory = options.clientFactory ?? (() => new IntercomClient({
       env: this.capturedScopeId ? { AGENT_INTERCOM_SCOPE_ID: this.capturedScopeId } : {},
     }));
@@ -401,25 +404,23 @@ export class ClaudeIntercomRuntime {
     await this.connect();
   }
 
-  async join(name?: string, create = false): Promise<ToolResult> {
-    const blocked = rejectManagedJoin();
-    if (blocked) return textResult(blocked, { ok: false }, true);
+  async join(name?: string, create = false, members?: string[], work?: string): Promise<ToolResult> {
     try {
-      if (create) {
-        if (typeof name !== "string" || !name.trim()) {
-          return textResult("Creating a team requires a name.", { ok: false }, true);
-        }
-        const team = createNamedTeam({ name: parseTeamName(name), managerSessionId: this.identity.sessionId });
-        await this.switchRuntimeScope(team.scopeId, team.managerSessionId);
-        return textResult(formatCreateSuccess({ team: team.name, name: this.identity.name }), { ok: true, team: team.name, role: "manager" });
-      }
       if (!name?.trim()) {
+        if (create || members?.length || work !== undefined) throw new Error("Creating or extending a team requires a name");
         return textResult(formatJoinableNamedTeamList(listNamedTeams()));
       }
-      const team = findNamedTeam(parseTeamName(name));
-      if (!team) return textResult("Could not join that team.", { ok: false }, true);
-      await this.switchRuntimeScope(team.scopeId, team.managerSessionId);
-      return textResult(formatNamedJoinSuccess({ team: team.name, name: this.identity.name }), { ok: true, team: team.name, role: "teammate" });
+      const client = await this.connect();
+      const sessions = await client.listSessions();
+      const memberIds = (members ?? []).map((member) => {
+        const id = resolveSessionTarget(sessions, member);
+        if (!id) throw new Error(`Session "${member}" is not connected`);
+        return id;
+      });
+      const team = await appendNamedTeamMembership({ name: parseTeamName(name), selfId: this.identity.sessionId, members: memberIds, create, work });
+      const roster = namedTeamRoster(team, this.identity.sessionId, sessions);
+      const notice = create ? formatCreateSuccess({ team: team.name, name: this.identity.name }) : formatNamedJoinSuccess({ team: team.name, name: this.identity.name });
+      return textResult(`${notice}\nOther team memberships are unchanged.`, { ok: true, team: team.name, role: roster.self.isManager ? "manager" : "member", roster });
     } catch (error) {
       return textResult(error instanceof Error ? error.message : String(error), { ok: false }, true);
     }
@@ -430,7 +431,7 @@ export class ClaudeIntercomRuntime {
     if (waiter) {
       const senderTarget = from.name || from.id;
       const fromMatches = senderTarget.toLowerCase() === waiter.from.toLowerCase() || from.id === waiter.from;
-      if (fromMatches) {
+      if (fromMatches && message.content.team === waiter.team) {
         this.replyWaiters.delete(waiter.replyTo);
         clearTimeout(waiter.timeout);
         waiter.cleanup?.();
@@ -454,7 +455,7 @@ export class ClaudeIntercomRuntime {
     }
   }
 
-  private waitForReply(from: string, replyTo: string, timeoutMs = getAskTimeoutMs(), signal?: AbortSignal): Promise<Message> {
+  private waitForReply(from: string, replyTo: string, timeoutMs = getAskTimeoutMs(), signal?: AbortSignal, team?: string): Promise<Message> {
     return new Promise((resolve, reject) => {
       if (signal?.aborted) {
         reject(new Error("intercom_ask cancelled"));
@@ -478,7 +479,7 @@ export class ClaudeIntercomRuntime {
         reject(new Error(`No reply from "${from}" within ${Math.round(timeoutMs / 1000)} seconds`));
       }, timeoutMs);
       signal?.addEventListener("abort", onAbort, { once: true });
-      this.replyWaiters.set(replyTo, { from, replyTo, resolve, reject, timeout, cleanup });
+      this.replyWaiters.set(replyTo, { from, replyTo, team, resolve, reject, timeout, cleanup });
     });
   }
 
@@ -497,9 +498,16 @@ export class ClaudeIntercomRuntime {
     );
   }
 
-  async team(): Promise<ToolResult> {
+  async team(name?: string): Promise<ToolResult> {
     const client = await this.connect();
     const sessions = await client.listSessions();
+    const mine = sessionNamedTeams(this.identity.sessionId);
+    const selected = name ? mine.filter((entry) => entry.name === name) : mine;
+    if (name && !selected.length) return textResult(`You do not belong to team "${name}"`, { ok: false }, true);
+    if (selected.length) {
+      const teams = selected.map((entry) => namedTeamRoster(entry, this.identity.sessionId, sessions));
+      return textResult(teams.map(formatNamedTeamRoster).join("\n\n"), { teams });
+    }
     const team = await resolveIntercomTeam({ selfId: client.sessionId ?? this.identity.sessionId, sessions });
     return textResult(formatIntercomTeam(team), team as unknown as Record<string, unknown>);
   }
@@ -549,10 +557,14 @@ export class ClaudeIntercomRuntime {
     return textResult("Summary updated.", { ok: true, summary });
   }
 
-  async send(to: string, message: string, attachments?: Attachment[], replyTo?: string): Promise<ToolResult> {
+  async send(to: string, message: string, attachments?: Attachment[], replyTo?: string, requestedTeam?: string): Promise<ToolResult> {
     const client = await this.connect();
     const sendTo = await this.resolveTarget(to);
-    const result = await client.send(sendTo, { text: message, attachments, replyTo });
+    const source = replyTo ? this.unread.find((entry) => entry.message.id === replyTo && entry.from.id === sendTo) : undefined;
+    if (replyTo && !source) throw new Error("Unknown inbound reply context");
+    if (source && requestedTeam !== undefined && requestedTeam !== source.message.content.team) throw new Error("Reply team must match the original message");
+    const team = source ? source.message.content.team : resolveNamedMessageTeam(this.identity.sessionId, sendTo, requestedTeam);
+    const result = await client.send(sendTo, { text: message, attachments, replyTo: source?.message.expectsReply ? replyTo : undefined, team });
     if (!result.delivered) {
       return textResult(`Message to "${to}" was not delivered: ${result.reason ?? "Session may not exist or has disconnected."}`, { ok: false, message_id: result.id, reason: result.reason }, true);
     }
@@ -560,11 +572,12 @@ export class ClaudeIntercomRuntime {
     return textResult(`Message sent to ${to}.`, { ok: true, message_id: result.id, to });
   }
 
-  async ask(to: string, message: string, attachments?: Attachment[], timeoutMs = getAskTimeoutMs(), signal?: AbortSignal): Promise<ToolResult> {
+  async ask(to: string, message: string, attachments?: Attachment[], timeoutMs = getAskTimeoutMs(), signal?: AbortSignal, requestedTeam?: string): Promise<ToolResult> {
     const client = await this.connect();
     const sendTo = await this.resolveTarget(to);
+    const team = resolveNamedMessageTeam(this.identity.sessionId, sendTo, requestedTeam);
     const questionId = randomUUID();
-    const replyPromise = this.waitForReply(sendTo, questionId, timeoutMs, signal);
+    const replyPromise = this.waitForReply(sendTo, questionId, timeoutMs, signal, team);
     void replyPromise.catch(() => undefined);
     try {
       const result = await client.send(sendTo, {
@@ -572,6 +585,7 @@ export class ClaudeIntercomRuntime {
         text: message,
         attachments,
         expectsReply: true,
+        team,
       });
       if (!result.delivered) {
         this.replyWaiters.get(questionId)?.reject(new Error(result.reason ?? "Session may not exist or has disconnected."));
@@ -596,12 +610,12 @@ export class ClaudeIntercomRuntime {
     const pendingAsks = Array.from(this.unresolvedAsks.values()).sort((a, b) => a.receivedAt - b.receivedAt);
     const lines = [
       unreadMessages.length
-        ? unreadMessages.map((entry) => `- ${formatSessionDisplay(entry.from)}: ${entry.message.content.text}${formatAttachments(entry.message.content.attachments)}`).join("\n")
+        ? unreadMessages.map((entry) => `- ${formatSessionDisplay(entry.from)}${replyHint(entry)}: ${entry.message.content.text}${formatAttachments(entry.message.content.attachments)}`).join("\n")
         : "No unread messages.",
       pendingAsks.length
         ? `\nPending asks:\n${pendingAsks.map((entry) => {
           const selector = pendingSelector(pendingAsks, entry);
-          return `- ${formatSessionDisplay(entry.from)}${selector ? ` [${selector}]` : ""}: ${entry.message.content.text}`;
+          return `- ${formatSessionDisplay(entry.from)}${replyHint(entry)}${selector ? ` [${selector}]` : ""}: ${entry.message.content.text}`;
         }).join("\n")}`
         : "",
     ].filter(Boolean);
@@ -611,10 +625,10 @@ export class ClaudeIntercomRuntime {
     });
   }
 
-  async reply(message: string, to?: string, which?: ReplyWhich): Promise<ToolResult> {
+  async reply(message: string, to?: string, which?: ReplyWhich, askId?: string, contextId?: string, team?: string): Promise<ToolResult> {
     let target: PendingInboundMessage;
     try {
-      target = selectPendingAsk(Array.from(this.unresolvedAsks.values()), to, which);
+      target = selectReplyContext(this.unread, Array.from(this.unresolvedAsks.values()), { to, which, askId, contextId, team });
     } catch (error) {
       return textResult(error instanceof Error ? error.message : String(error), { ok: false }, true);
     }

package/claude/team-guidance.ts

@@ -0,0 +1,7 @@
+export const TASK_TEAM_GUIDANCE = `Intercom task-team rules:
+- When the user delegates to named peers and this task has no approved team, ask once whether to form a team with you and those peers. Wait for approval before creating a team or adding peers. An explicit create/join request is approval; never ask again for an approved task or inbound team message.
+- After approval, discover the connected peers, then intercom_join({ name: "launch", create: true, members: ["front", "writer"], work: "Current task" }) adds everyone in one call. Do not ask the user to join each terminal manually.
+- Membership is additive: joining another team preserves previous teams. Reuse the approved team for the same task; a different task may need a different team.
+- Initial contact without a shared team is allowed: omit team for an ungrouped direct message. Unrelated team memberships must not prevent contact or silently create teams.
+- Include team on task sends/asks, especially when peers share multiple teams. Replies inherit the original message's team via askId or contextId from intercom_pending; never override it using a current team or mix contexts from different tasks.
+- Use intercom_send for assignments, progress/status requests, notifications and follow-ups. Use intercom_ask only when your next step genuinely depends on the answer; keep only one unresolved ask per recipient.`;

package/claude/worker-daemon.ts

@@ -72,6 +72,7 @@ function formatMessage(from: SessionInfo, message: Message, agent: WorkerAgentCo
   return [
     `Intercom message for ${agent.name}.`,
     `From: ${formatSessionDisplay(from)} (${from.id})`,
+    ...(message.content.team ? [`[Team: ${message.content.team}]`] : []),
     `Message id: ${message.id}`,
     "",
     message.content.text,
@@ -235,6 +236,7 @@ export class VirtualClaudeAgent {
         void this.client.send(from.id, {
           text: "This worker is rate limited (too many wakes this minute). Please try again shortly.",
           replyTo: message.id,
+          ...(message.content.team === undefined ? {} : { team: message.content.team }),
         }).catch((error) => {
           process.stderr.write(`worker ${this.agent.id}: rate-limit reply failed: ${error instanceof Error ? error.message : String(error)}\n`);
         });
@@ -305,6 +307,7 @@ export class VirtualClaudeAgent {
         await this.client.send(from.id, {
           text: result.result || "(the worker finished without a final message)",
           replyTo: message.id,
+          ...(message.content.team === undefined ? {} : { team: message.content.team }),
         });
         process.stderr.write(`worker ${this.agent.id}: replied to ${from.name || from.id} (session ${this.sessionId ?? "none"})\n`);
       }
@@ -316,6 +319,7 @@ export class VirtualClaudeAgent {
         await this.client.send(from.id, {
           text: `Worker error: ${text}`,
           replyTo: message.id,
+          ...(message.content.team === undefined ? {} : { team: message.content.team }),
         }).catch((sendError) => {
           process.stderr.write(`worker ${this.agent.id}: error reply failed: ${sendError instanceof Error ? sendError.message : String(sendError)}\n`);
         });

package/commands/intercom-create.md

@@ -3,8 +3,10 @@ description: Create a named intercom team and join it as manager
 argument-hint: [team-name]
 ---
 
-Create a named Intercom team that does not require tmux.
+Create an additive task team without tmux. This explicit command is user approval; do not ask for approval again. Existing memberships and registration scope stay unchanged.
 
 If `$ARGUMENTS` is a valid team name, call `intercom_join` with `create: true` and that name. If `$ARGUMENTS` is empty, ask the user for a name first. Do not invent a team name.
 
-Example: `intercom_join({ name: "billing", create: true })`
+If the user also names peers or describes a task, discover those connected sessions and pass `members` and `work` in the same call. Do not require the user to join each terminal manually.
+
+Example: `intercom_join({ name: "billing", create: true, members: ["front", "writer"], work: "Billing UI" })`

package/commands/intercom-join.md

@@ -3,7 +3,7 @@ description: Join a named intercom team, or list joinable teams
 argument-hint: [team-name]
 ---
 
-Join a named Intercom team without tmux.
+Join an additional named task team without tmux. This explicit command is user approval; do not ask for approval again. Previous memberships and registration scope stay unchanged.
 
 If `$ARGUMENTS` is empty, call `intercom_join` with no arguments to list joinable named teams. If `$ARGUMENTS` is a team name, call `intercom_join` with that name. Do not guess a team name.
 

package/dist/broker.mjs

@@ -1027,14 +1027,15 @@ function isMessage(value) {
     }
     if (message.replyTo !== void 0 || message.expectsReply !== void 0) return false;
   }
-  if (!hasExactDataKeys(message.content, ["text"], ["attachments"])) {
+  if (!hasExactDataKeys(message.content, ["text"], ["attachments", "team"])) {
     return false;
   }
   const content = message.content;
   if (typeof content.text !== "string" || Buffer.byteLength(content.text, "utf-8") > MAX_MESSAGE_TEXT_BYTES) {
     return false;
   }
-  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0)) {
+  if (content.team !== void 0 && (typeof content.team !== "string" || !/^[A-Za-z][A-Za-z0-9_-]{0,31}$/.test(content.team))) return false;
+  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0 || content.team !== void 0)) {
     return false;
   }
   return content.attachments === void 0 || isDenseArrayOf(content.attachments, isAttachment) && content.attachments.length <= MAX_ATTACHMENTS;

package/dist/cci.mjs

@@ -1199,14 +1199,15 @@ function isMessage(value) {
     }
     if (message.replyTo !== void 0 || message.expectsReply !== void 0) return false;
   }
-  if (!hasExactDataKeys(message.content, ["text"], ["attachments"])) {
+  if (!hasExactDataKeys(message.content, ["text"], ["attachments", "team"])) {
     return false;
   }
   const content = message.content;
   if (typeof content.text !== "string") {
     return false;
   }
-  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0)) return false;
+  if (content.team !== void 0 && (typeof content.team !== "string" || !/^[A-Za-z][A-Za-z0-9_-]{0,31}$/.test(content.team))) return false;
+  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0 || content.team !== void 0)) return false;
   return content.attachments === void 0 || isDenseArrayOf(content.attachments, isAttachment);
 }
 function isSessionInfo(value) {
@@ -1829,6 +1830,7 @@ var IntercomClient = class extends EventEmitter {
       ...options.control === void 0 ? {} : { control: options.control },
       content: {
         text: options.text,
+        ...options.team === void 0 ? {} : { team: options.team },
         ...options.attachments === void 0 ? {} : { attachments: options.attachments }
       }
     };
@@ -2497,6 +2499,7 @@ ${agent.instructions}` : "";
   return [
     `Intercom message for ${agent.name}.`,
     `From: ${formatSessionDisplay(from)} (${from.id})`,
+    ...message.content.team ? [`[Team: ${message.content.team}]`] : [],
     `Message id: ${message.id}`,
     "",
     message.content.text,
@@ -2649,7 +2652,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         void this.client.send(from.id, {
           text: "This worker is rate limited (too many wakes this minute). Please try again shortly.",
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         }).catch((error) => {
           process.stderr.write(`worker ${this.agent.id}: rate-limit reply failed: ${error instanceof Error ? error.message : String(error)}
 `);
@@ -2711,7 +2715,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         await this.client.send(from.id, {
           text: result.result || "(the worker finished without a final message)",
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         });
         process.stderr.write(`worker ${this.agent.id}: replied to ${from.name || from.id} (session ${this.sessionId ?? "none"})
 `);
@@ -2723,7 +2728,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         await this.client.send(from.id, {
           text: `Worker error: ${text}`,
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         }).catch((sendError) => {
           process.stderr.write(`worker ${this.agent.id}: error reply failed: ${sendError instanceof Error ? sendError.message : String(sendError)}
 `);
@@ -3088,6 +3094,8 @@ function nativePrompt(from, message) {
   const reply = message.expectsReply ? "\n\nThe sender is blocking. After acting, use Claude's built-in SendMessage tool to reply to this same native peer. A normal assistant response stays local and will not unblock the sender." : "\n\nAct if needed. To acknowledge or report a result, use Claude's built-in SendMessage tool to reply to this same native peer; a normal assistant response stays local.";
   return [
     `[Intercom message from ${formatSessionDisplay(from)} (${from.id})]`,
+    ...message.content.team ? [`[Team: ${message.content.team}]`] : [],
+    `When replying via SendMessage, begin the body with [intercom-context:ctx-${message.id}] so this exact task is retained.`,
     message.content.text,
     formatAttachments(message.content.attachments),
     reply
@@ -3179,7 +3187,7 @@ var NativeClaudeBrokerBridge = class {
       const reason = error instanceof Error ? error.message : String(error);
       this.client.updatePresence({ status: `native delivery error: ${reason}` });
       if (message.expectsReply) {
-        await this.client.send(from.id, { text: `Native Claude delivery failed: ${reason}`, replyTo: message.id }).catch(() => void 0);
+        await this.client.send(from.id, { text: `Native Claude delivery failed: ${reason}`, replyTo: message.id, ...message.content.team === void 0 ? {} : { team: message.content.team } }).catch(() => void 0);
       }
     }
   }
@@ -3189,7 +3197,13 @@ var NativeClaudeBrokerBridge = class {
     if (typeof message !== "object" || message === null || !("content" in message)) return;
     const envelope = stripNativeEnvelope(message.content);
     if (!envelope.body) return;
-    const relay = this.pending.shift();
+    const selector = /^\[intercom-context:ctx-([^\]\r\n]+)\]\s*/.exec(envelope.body);
+    const index = selector ? this.pending.findIndex((entry) => entry.message.id === selector[1]) : this.pending.length === 1 ? 0 : -1;
+    if (index < 0) {
+      this.client.updatePresence({ status: "Reply requires the original intercom-context selector" });
+      return;
+    }
+    const relay = this.pending.splice(index, 1)[0];
     const fromAddress = typeof frame.from === "string" ? frame.from : envelope.from;
     if (fromAddress?.startsWith("uds:")) {
       void this.sendFrame(fromAddress.slice(4), buildNativeReceipt({
@@ -3201,7 +3215,8 @@ var NativeClaudeBrokerBridge = class {
     }
     if (!relay) return;
     void this.client.send(relay.from.id, {
-      text: envelope.body,
+      text: selector ? envelope.body.slice(selector[0].length) : envelope.body,
+      ...relay.message.content.team === void 0 ? {} : { team: relay.message.content.team },
       ...relay.message.expectsReply ? { replyTo: relay.message.id } : {}
     }).then(() => {
       this.client.updatePresence({ status: "idle" });

package/dist/ccim.mjs

@@ -1203,14 +1203,15 @@ function isMessage(value) {
     }
     if (message.replyTo !== void 0 || message.expectsReply !== void 0) return false;
   }
-  if (!hasExactDataKeys(message.content, ["text"], ["attachments"])) {
+  if (!hasExactDataKeys(message.content, ["text"], ["attachments", "team"])) {
     return false;
   }
   const content = message.content;
   if (typeof content.text !== "string") {
     return false;
   }
-  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0)) return false;
+  if (content.team !== void 0 && (typeof content.team !== "string" || !/^[A-Za-z][A-Za-z0-9_-]{0,31}$/.test(content.team))) return false;
+  if (message.control !== void 0 && (content.text !== "" || content.attachments !== void 0 || content.team !== void 0)) return false;
   return content.attachments === void 0 || isDenseArrayOf(content.attachments, isAttachment);
 }
 function isSessionInfo(value) {
@@ -1833,6 +1834,7 @@ var IntercomClient = class extends EventEmitter {
       ...options.control === void 0 ? {} : { control: options.control },
       content: {
         text: options.text,
+        ...options.team === void 0 ? {} : { team: options.team },
         ...options.attachments === void 0 ? {} : { attachments: options.attachments }
       }
     };
@@ -2501,6 +2503,7 @@ ${agent.instructions}` : "";
   return [
     `Intercom message for ${agent.name}.`,
     `From: ${formatSessionDisplay(from)} (${from.id})`,
+    ...message.content.team ? [`[Team: ${message.content.team}]`] : [],
     `Message id: ${message.id}`,
     "",
     message.content.text,
@@ -2653,7 +2656,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         void this.client.send(from.id, {
           text: "This worker is rate limited (too many wakes this minute). Please try again shortly.",
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         }).catch((error) => {
           process.stderr.write(`worker ${this.agent.id}: rate-limit reply failed: ${error instanceof Error ? error.message : String(error)}
 `);
@@ -2715,7 +2719,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         await this.client.send(from.id, {
           text: result.result || "(the worker finished without a final message)",
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         });
         process.stderr.write(`worker ${this.agent.id}: replied to ${from.name || from.id} (session ${this.sessionId ?? "none"})
 `);
@@ -2727,7 +2732,8 @@ var VirtualClaudeAgent = class {
       if (message.expectsReply) {
         await this.client.send(from.id, {
           text: `Worker error: ${text}`,
-          replyTo: message.id
+          replyTo: message.id,
+          ...message.content.team === void 0 ? {} : { team: message.content.team }
         }).catch((sendError) => {
           process.stderr.write(`worker ${this.agent.id}: error reply failed: ${sendError instanceof Error ? sendError.message : String(sendError)}
 `);
@@ -3092,6 +3098,8 @@ function nativePrompt(from, message) {
   const reply = message.expectsReply ? "\n\nThe sender is blocking. After acting, use Claude's built-in SendMessage tool to reply to this same native peer. A normal assistant response stays local and will not unblock the sender." : "\n\nAct if needed. To acknowledge or report a result, use Claude's built-in SendMessage tool to reply to this same native peer; a normal assistant response stays local.";
   return [
     `[Intercom message from ${formatSessionDisplay(from)} (${from.id})]`,
+    ...message.content.team ? [`[Team: ${message.content.team}]`] : [],
+    `When replying via SendMessage, begin the body with [intercom-context:ctx-${message.id}] so this exact task is retained.`,
     message.content.text,
     formatAttachments(message.content.attachments),
     reply
@@ -3183,7 +3191,7 @@ var NativeClaudeBrokerBridge = class {
       const reason = error instanceof Error ? error.message : String(error);
       this.client.updatePresence({ status: `native delivery error: ${reason}` });
       if (message.expectsReply) {
-        await this.client.send(from.id, { text: `Native Claude delivery failed: ${reason}`, replyTo: message.id }).catch(() => void 0);
+        await this.client.send(from.id, { text: `Native Claude delivery failed: ${reason}`, replyTo: message.id, ...message.content.team === void 0 ? {} : { team: message.content.team } }).catch(() => void 0);
       }
     }
   }
@@ -3193,7 +3201,13 @@ var NativeClaudeBrokerBridge = class {
     if (typeof message !== "object" || message === null || !("content" in message)) return;
     const envelope = stripNativeEnvelope(message.content);
     if (!envelope.body) return;
-    const relay = this.pending.shift();
+    const selector = /^\[intercom-context:ctx-([^\]\r\n]+)\]\s*/.exec(envelope.body);
+    const index = selector ? this.pending.findIndex((entry) => entry.message.id === selector[1]) : this.pending.length === 1 ? 0 : -1;
+    if (index < 0) {
+      this.client.updatePresence({ status: "Reply requires the original intercom-context selector" });
+      return;
+    }
+    const relay = this.pending.splice(index, 1)[0];
     const fromAddress = typeof frame.from === "string" ? frame.from : envelope.from;
     if (fromAddress?.startsWith("uds:")) {
       void this.sendFrame(fromAddress.slice(4), buildNativeReceipt({
@@ -3205,7 +3219,8 @@ var NativeClaudeBrokerBridge = class {
     }
     if (!relay) return;
     void this.client.send(relay.from.id, {
-      text: envelope.body,
+      text: selector ? envelope.body.slice(selector[0].length) : envelope.body,
+      ...relay.message.content.team === void 0 ? {} : { team: relay.message.content.team },
       ...relay.message.expectsReply ? { replyTo: relay.message.id } : {}
     }).then(() => {
       this.client.updatePresence({ status: "idle" });