@ctliz/agent-intercom-codex 0.12.1 → 0.13.0

package/dist/coi.mjs

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-process.stderr.write("[agent-intercom-build] package=@ctliz/agent-intercom-codex version=0.12.1 target=coi sourceSha256=9e94589286ec909b8fd50e96f38fa52f7c21424081d18e8155e01cd3bffde8fb\n");
+process.stderr.write("[agent-intercom-build] package=@ctliz/agent-intercom-codex version=0.13.0 target=coi sourceSha256=04013522326f3042c72f6454a9c79e26d2d1c8de7af57769ed890e50fca514e3\n");
 
 // codex/coi.ts
 import { once as once2 } from "node:events";
 import { spawn as spawn4, spawnSync as spawnSync2 } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
-import { existsSync as existsSync6, readdirSync, rmSync, statSync } from "node:fs";
-import { basename as basename2, join as join8, resolve as resolve4 } from "node:path";
-import { setTimeout as delay2 } from "node:timers/promises";
+import { existsSync as existsSync6, readdirSync, rmSync as rmSync2, statSync } from "node:fs";
+import { basename as basename2, join as join10, resolve as resolve4 } from "node:path";
+import { setTimeout as delay3 } from "node:timers/promises";
 import { types as nodeUtilTypes4 } from "node:util";
 
 // codex/bridge-daemon.ts
@@ -1575,6 +1575,7 @@ function isMessage(value) {
   if (typeof content.text !== "string") {
     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;
   return content.attachments === void 0 || Array.isArray(content.attachments) && content.attachments.every(isAttachment);
 }
 function isSessionInfo(value) {
@@ -2165,6 +2166,7 @@ var IntercomClient = class extends EventEmitter2 {
       expectsReply: options.expectsReply,
       content: {
         text: options.text,
+        ...options.team === void 0 ? {} : { team: options.team },
         attachments: options.attachments
       }
     };
@@ -3079,6 +3081,213 @@ function formatIntercomTeam(team) {
   return lines.join("\n");
 }
 
+// codex/named-teams.ts
+import { randomBytes as randomBytes2 } from "node:crypto";
+import { readFileSync as readFileSync8 } from "node:fs";
+import { join as join8 } from "node:path";
+var NAMED_TEAMS_FILE = "named-teams.json";
+var NAMED_TEAMS_VERSION = 1;
+var NAMED_TEAM_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9_-]{0,31}$/;
+function isNamedTeamScope(value) {
+  if (value.length !== 48) return false;
+  for (const char of value) {
+    if (!(char >= "0" && char <= "9" || char >= "a" && char <= "f")) return false;
+  }
+  return true;
+}
+function teamsFilePath(agentDir) {
+  return join8(getIntercomDirPath(agentDir ?? getAgentDirPath()), NAMED_TEAMS_FILE);
+}
+function genericReadError() {
+  return new Error("Could not read the local named-team list.");
+}
+function genericWriteError() {
+  return new Error("Could not create that named team.");
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseStoredTeam(value) {
+  if (!isPlainObject(value)) return void 0;
+  if (typeof value.name !== "string" || !NAMED_TEAM_NAME_PATTERN.test(value.name)) return void 0;
+  if (typeof value.scopeId !== "string" || !isNamedTeamScope(value.scopeId)) return void 0;
+  if (typeof value.managerSessionId !== "string" || !value.managerSessionId.trim()) return void 0;
+  if (value.managerSessionId !== value.managerSessionId.trim() || /[\u0000-\u001f\u007f]/.test(value.managerSessionId)) {
+    return void 0;
+  }
+  if (typeof value.createdAt !== "number" || !Number.isSafeInteger(value.createdAt) || value.createdAt <= 0) {
+    return void 0;
+  }
+  if (value.memberSessionIds !== void 0 && (!Array.isArray(value.memberSessionIds) || !value.memberSessionIds.every((id) => typeof id === "string" && id.trim() === id && id.length > 0 && !/[\u0000-\u001f\u007f]/.test(id)) || new Set(value.memberSessionIds).size !== value.memberSessionIds.length || !value.memberSessionIds.includes(value.managerSessionId))) return void 0;
+  if (value.work !== void 0 && (typeof value.work !== "string" || !value.work.trim() || value.work.length > 2e3)) return void 0;
+  return {
+    name: value.name,
+    scopeId: value.scopeId,
+    managerSessionId: value.managerSessionId,
+    createdAt: value.createdAt,
+    ...value.memberSessionIds === void 0 ? {} : { memberSessionIds: value.memberSessionIds },
+    ...value.work === void 0 ? {} : { work: value.work }
+  };
+}
+function parseTeamName(raw) {
+  const name = raw.trim();
+  if (!name || name.includes(" ") || !NAMED_TEAM_NAME_PATTERN.test(name)) {
+    throw new Error("Team names start with a letter and may include letters, numbers, hyphens, or underscores (max 32).");
+  }
+  return name;
+}
+function generateNamedTeamScope(existing = []) {
+  const taken = new Set(existing);
+  for (let attempt = 0; attempt < 8; attempt += 1) {
+    const scopeId = randomBytes2(24).toString("hex");
+    if (!taken.has(scopeId)) return scopeId;
+  }
+  throw genericWriteError();
+}
+function listNamedTeams(agentDir) {
+  let raw;
+  try {
+    raw = readFileSync8(teamsFilePath(agentDir), "utf8");
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") return [];
+    throw genericReadError();
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw genericReadError();
+  }
+  if (!isPlainObject(parsed) || parsed.version !== NAMED_TEAMS_VERSION || !Array.isArray(parsed.teams)) {
+    throw genericReadError();
+  }
+  const teams = [];
+  const names = /* @__PURE__ */ new Set();
+  const scopes = /* @__PURE__ */ new Set();
+  for (const entry of parsed.teams) {
+    const team = parseStoredTeam(entry);
+    if (!team || names.has(team.name) || scopes.has(team.scopeId)) throw genericReadError();
+    names.add(team.name);
+    scopes.add(team.scopeId);
+    teams.push(team);
+  }
+  return teams;
+}
+function formatJoinableNamedTeamList(teams) {
+  if (teams.length === 0) {
+    return 'No joinable named teams found.\nCreate one with intercom_join({ name: "billing", create: true }).';
+  }
+  return [
+    "Joinable named teams:",
+    ...teams.map((team, index) => `  ${index + 1}) ${team.name}`)
+  ].join("\n");
+}
+
+// codex/named-team-membership.ts
+import { mkdirSync as mkdirSync5, rmSync } from "node:fs";
+import { join as join9 } from "node:path";
+import { setTimeout as delay2 } from "node:timers/promises";
+function namedTeamMemberIds(team) {
+  return team.memberSessionIds ?? [team.managerSessionId];
+}
+function sessionNamedTeams(sessionId, agentDir) {
+  return listNamedTeams(agentDir).filter((team) => namedTeamMemberIds(team).includes(sessionId));
+}
+async function appendNamedTeamMembership(input) {
+  const name = parseTeamName(input.name);
+  const memberIds = [.../* @__PURE__ */ new Set([input.selfId, ...input.members ?? []])];
+  if (memberIds.some((id) => !id || id.trim() !== id || /[\u0000-\u001f\u007f]/.test(id))) {
+    throw new Error("Invalid team member session ID");
+  }
+  if (input.work !== void 0 && (!input.work.trim() || input.work.length > 2e3)) {
+    throw new Error("Work must be a non-empty task description (max 2000 characters)");
+  }
+  const dir = getIntercomDirPath(input.agentDir ?? getAgentDirPath());
+  ensureIntercomRuntimeDir(dir);
+  const lock = join9(dir, "named-teams.lock");
+  const deadline = Date.now() + 5e3;
+  for (; ; ) {
+    try {
+      mkdirSync5(lock, { mode: 448 });
+      break;
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+      if (Date.now() >= deadline) throw new Error("Team registry is busy; retry. If a writer crashed, remove the stale named-teams.lock directory after verifying no writer is active.");
+      await delay2(25);
+    }
+  }
+  try {
+    const teams = listNamedTeams(input.agentDir);
+    let team = teams.find((entry) => entry.name === name);
+    if (input.create) {
+      if (team) throw new Error(`A named team called ${name} already exists; join it instead.`);
+      team = { name, scopeId: generateNamedTeamScope(teams.map((entry) => entry.scopeId)), managerSessionId: input.selfId, createdAt: Date.now() };
+      teams.push(team);
+    }
+    if (!team) throw new Error(`Team "${name}" does not exist; create it explicitly.`);
+    if (memberIds.some((id) => id !== input.selfId) && team.managerSessionId !== input.selfId) {
+      throw new Error(`Only the manager of team "${name}" may add other sessions`);
+    }
+    if (input.work !== void 0 && !input.create) {
+      throw new Error("Work is set when creating a team; use a new team for a different task");
+    }
+    const updated = {
+      ...team,
+      memberSessionIds: [.../* @__PURE__ */ new Set([...namedTeamMemberIds(team), ...memberIds])],
+      ...input.work === void 0 ? {} : { work: input.work.trim() }
+    };
+    writeDurableJson(join9(dir, NAMED_TEAMS_FILE), {
+      version: NAMED_TEAMS_VERSION,
+      teams: teams.map((entry) => entry.name === name ? updated : entry)
+    });
+    return updated;
+  } finally {
+    rmSync(lock, { recursive: true });
+  }
+}
+function requireNamedTeamMembers(name, selfId, peerId, agentDir) {
+  const team = listNamedTeams(agentDir).find((entry) => entry.name === name);
+  if (!team) throw new Error(`Unknown team "${name}"`);
+  const members = namedTeamMemberIds(team);
+  if (!members.includes(selfId) || !members.includes(peerId)) {
+    throw new Error(`Both sessions must belong to team "${name}" before messaging`);
+  }
+  return team;
+}
+function resolveNamedMessageTeam(selfId, peerId, requested, agentDir) {
+  if (requested !== void 0) return requireNamedTeamMembers(requested, selfId, peerId, agentDir).name;
+  const mine = sessionNamedTeams(selfId, agentDir);
+  const shared = mine.filter((team) => namedTeamMemberIds(team).includes(peerId));
+  if (shared.length === 1) return shared[0].name;
+  if (shared.length > 1) throw new Error("Multiple shared teams; specify `team` for this task");
+  return void 0;
+}
+function namedTeamRoster(team, selfId, sessions) {
+  return {
+    name: team.name,
+    ...team.work ? { work: team.work } : {},
+    self: { id: selfId, isManager: selfId === team.managerSessionId },
+    manager: { target: team.managerSessionId, connected: sessions.some((entry) => entry.id === team.managerSessionId) },
+    members: namedTeamMemberIds(team).map((id) => ({
+      id,
+      target: id,
+      name: sessions.find((entry) => entry.id === id)?.name,
+      role: id === team.managerSessionId ? "manager" : "member",
+      connected: sessions.some((entry) => entry.id === id)
+    }))
+  };
+}
+function formatNamedTeamRoster(team) {
+  return [
+    `Team: ${team.name}`,
+    ...team.work ? [`Work: ${team.work}`] : [],
+    `You: ${team.self.id}${team.self.isManager ? " [manager]" : ""}`,
+    `Manager: ${team.manager.target}${team.manager.connected ? "" : " [offline]"}`,
+    "Members:",
+    ...team.members.map((member) => `- ${member.name || member.id} (${member.id}) [${member.role}]${member.connected ? "" : " [offline]"}`)
+  ].join("\n");
+}
+
 // codex/runtime.ts
 function formatAttachments(attachments) {
   if (!attachments?.length) return "";
@@ -3134,10 +3343,20 @@ function formatSessionList(sessions, currentSessionId, currentCwd) {
   }).join("\n");
 }
 
+// codex/team-guidance.ts
+var 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.`;
+
 // codex/bridge-daemon.ts
 var APPROVED_INTERCOM_TOOLS = /* @__PURE__ */ new Set([
   "intercom_whoami",
   "intercom_team",
+  "intercom_join",
   "intercom_status",
   "intercom_list",
   "intercom_set_summary",
@@ -3171,6 +3390,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,
@@ -3266,7 +3486,7 @@ function intercomSendFromArgs(rawArgs) {
   } catch {
     return null;
   }
-  return typeof args.to === "string" && typeof args.message === "string" ? { to: args.to, message: args.message } : null;
+  return typeof args.to === "string" && typeof args.message === "string" ? { to: args.to, message: args.message, ...typeof args.team === "string" ? { team: args.team } : {} } : null;
 }
 function getCompletedIntercomSend(params) {
   if (!params || typeof params !== "object") return null;
@@ -3294,7 +3514,7 @@ function asOptionalPositiveInteger(value, name) {
   return validateAskTimeoutMs(value, name);
 }
 function normalizeToolName(name) {
-  const mcpMatch = name.match(/(?:^|__|\.)intercom_(whoami|status|list|set_summary|send|ask|pending|reply)$/);
+  const mcpMatch = name.match(/(?:^|__|\.)intercom_(whoami|team|join|status|list|set_summary|send|ask|pending|reply)$/);
   if (mcpMatch) return `intercom_${mcpMatch[1]}`;
   return name;
 }
@@ -3417,7 +3637,7 @@ var VirtualCodexAgent = class {
   }
   scheduleReconnect() {
     if (!this.reconnectEnabled || this.reconnectTimer) return;
-    const delay3 = this.reconnectDelays[Math.min(this.reconnectAttempt, this.reconnectDelays.length - 1)];
+    const delay4 = this.reconnectDelays[Math.min(this.reconnectAttempt, this.reconnectDelays.length - 1)];
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
       void this.connectIntercom().then(() => {
@@ -3431,7 +3651,7 @@ var VirtualCodexAgent = class {
 `);
         this.scheduleReconnect();
       });
-    }, delay3);
+    }, delay4);
     this.reconnectTimer.unref?.();
   }
   clearReconnectTimer() {
@@ -3470,6 +3690,14 @@ var VirtualCodexAgent = class {
   onNotification(message) {
     const threadId = getNotificationThreadId(message.params);
     if (!threadId || threadId !== this.threadId) return;
+    if (message.method === "thread/name/updated" && isRecord2(message.params)) {
+      const name = message.params.threadName;
+      if (typeof name === "string" && name.trim() && name !== this.agent.name) {
+        this.agent.name = name;
+        this.client.updatePresence({ name });
+      }
+      return;
+    }
     if (message.method === "error") {
       const params = isRecord2(message.params) ? message.params : {};
       const detail = isRecord2(params.error) && typeof params.error.message === "string" ? params.error.message : "Codex turn error";
@@ -3516,13 +3744,19 @@ var VirtualCodexAgent = class {
     if (this.threadId) {
       try {
         const sandbox2 = bridgeAgentSandboxMode(this.agent);
-        await this.app.request("thread/resume", {
+        const result2 = await this.app.request("thread/resume", {
           threadId: this.threadId,
           cwd: this.agent.cwd,
           model: this.agent.model ?? null,
           approvalPolicy: bridgeAgentApprovalPolicy(this.agent),
           sandbox: sandbox2
         });
+        if (isRecord2(result2) && isRecord2(result2.thread)) {
+          this.onNotification({ method: "thread/name/updated", params: {
+            threadId: this.threadId,
+            threadName: result2.thread.name
+          } });
+        }
         return this.threadId;
       } catch {
         this.threadId = null;
@@ -3535,7 +3769,7 @@ var VirtualCodexAgent = class {
       approvalPolicy: bridgeAgentApprovalPolicy(this.agent),
       sandbox,
       serviceName: "codex-intercom",
-      developerInstructions: this.agent.instructions ?? null,
+      developerInstructions: [this.agent.instructions, TASK_TEAM_GUIDANCE].filter(Boolean).join("\n\n"),
       threadSource: "cli"
     });
     this.threadId = getThreadId(result);
@@ -3548,7 +3782,7 @@ var VirtualCodexAgent = class {
   routeMessage(from, message) {
     const toolWaiter = this.toolReplyWaiters.get(message.replyTo ?? "");
     if (toolWaiter) {
-      if (from.id === toolWaiter.from) {
+      if (from.id === toolWaiter.from && message.content.team === toolWaiter.team) {
         this.toolReplyWaiters.delete(message.replyTo ?? "");
         clearTimeout(toolWaiter.timeout);
         toolWaiter.cleanup?.();
@@ -3594,7 +3828,7 @@ var VirtualCodexAgent = class {
     this.waiters.delete(turnId);
     const reply = this.finalMessages.get(turnId)?.trim() || "Codex turn completed without a final message.";
     for (const waiter of waiters) {
-      await this.client.send(waiter.from.id, { text: reply, replyTo: waiter.message.id }).catch((error) => {
+      await this.client.send(waiter.from.id, { text: reply, replyTo: waiter.message.id, team: waiter.message.content.team }).catch((error) => {
         process.stderr.write(`reply failed for ${this.agent.id}: ${error instanceof Error ? error.message : String(error)}
 `);
       });
@@ -3606,12 +3840,16 @@ var VirtualCodexAgent = class {
     const lowerTo = send.to.toLowerCase();
     const remaining = [];
     for (const waiter of waiters) {
+      if (send.team !== void 0 && send.team !== waiter.message.content.team) {
+        remaining.push(waiter);
+        continue;
+      }
       const matchesSender = send.to === waiter.from.id || waiter.from.id.startsWith(send.to) || waiter.from.name?.toLowerCase() === lowerTo;
       if (!matchesSender) {
         remaining.push(waiter);
         continue;
       }
-      await this.client.send(waiter.from.id, { text: send.message, replyTo: waiter.message.id }).catch((error) => {
+      await this.client.send(waiter.from.id, { text: send.message, replyTo: waiter.message.id, team: waiter.message.content.team }).catch((error) => {
         remaining.push(waiter);
         process.stderr.write(`reply failed for ${this.agent.id}: ${error instanceof Error ? error.message : String(error)}
 `);
@@ -3676,8 +3914,32 @@ name: ${this.agent.name}
 cwd: ${this.agent.cwd}`,
           { session_id: this.agent.id, name: this.agent.name, cwd: this.agent.cwd, model: this.agent.model ?? "codex-app-server" }
         );
+      case "intercom_join": {
+        if (args.name === void 0) {
+          if (args.create || args.members !== void 0 || args.work !== void 0) throw new Error("Creating or extending a team requires a name");
+          return textToolResult(formatJoinableNamedTeamList(listNamedTeams()));
+        }
+        if (args.members !== void 0 && !Array.isArray(args.members)) throw new Error("members must be an array");
+        const sessions = await this.client.listSessions();
+        const members = Array.from(args.members ?? [], (member) => {
+          const id = resolveSessionTarget(sessions, asString(member, "member"));
+          if (!id) throw new Error("Team member is not connected");
+          return id;
+        });
+        const team = await appendNamedTeamMembership({ name: asString(args.name, "name"), selfId: this.agent.id, members, create: args.create === true, ...args.work === void 0 ? {} : { work: asString(args.work, "work") } });
+        const roster = namedTeamRoster(team, this.agent.id, sessions);
+        return textToolResult(formatNamedTeamRoster(roster), { ok: true, team: team.name, roster });
+      }
       case "intercom_team": {
         const sessions = await this.client.listSessions();
+        const mine = sessionNamedTeams(this.agent.id);
+        const requested = args.team === void 0 ? void 0 : asString(args.team, "team");
+        const selected = requested ? mine.filter((entry) => entry.name === requested) : mine;
+        if (requested && !selected.length) throw new Error("You do not belong to that team");
+        if (selected.length) {
+          const teams = selected.map((entry) => namedTeamRoster(entry, this.agent.id, sessions));
+          return textToolResult(teams.map(formatNamedTeamRoster).join("\n\n"), { teams });
+        }
         const team = await resolveIntercomTeam({ selfId: this.agent.id, sessions });
         return textToolResult(formatIntercomTeam(team), team);
       }
@@ -3706,7 +3968,8 @@ Active sessions: ${sessions.length}`,
         const to = asString(args.to, "to");
         const message = asString(args.message, "message");
         const sendTo = await this.resolveTarget(to);
-        const result = await this.client.send(sendTo, { text: message });
+        const team = resolveNamedMessageTeam(this.agent.id, sendTo, args.team === void 0 ? void 0 : asString(args.team, "team"));
+        const result = await this.client.send(sendTo, { text: message, team });
         if (!result.delivered) {
           return textToolResult(`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);
         }
@@ -3719,10 +3982,11 @@ Active sessions: ${sessions.length}`,
         const message = asString(args.message, "message");
         const timeoutMs = asOptionalPositiveInteger(args.timeout_ms, "timeout_ms") ?? DEFAULT_ASK_TIMEOUT_MS;
         const sendTo = await this.resolveTarget(to);
+        const team = resolveNamedMessageTeam(this.agent.id, sendTo, args.team === void 0 ? void 0 : asString(args.team, "team"));
         const questionId = randomUUID4();
-        const replyPromise = this.waitForToolReply(sendTo, questionId, timeoutMs, signal);
+        const replyPromise = this.waitForToolReply(sendTo, questionId, timeoutMs, signal, team);
         void replyPromise.catch(() => void 0);
-        const result = await this.client.send(sendTo, { messageId: questionId, text: message, expectsReply: true });
+        const result = await this.client.send(sendTo, { messageId: questionId, text: message, expectsReply: true, team });
         if (!result.delivered) {
           this.rejectToolReply(questionId, new Error(result.reason ?? "Session may not exist or has disconnected."));
           return textToolResult(`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);
@@ -3758,7 +4022,7 @@ ${reply.content.text}${formatAttachments(reply.content.attachments)}`, { ok: tru
     const sessions = await this.client.listSessions();
     return resolveSessionTarget(sessions, to) ?? to;
   }
-  waitForToolReply(from, replyTo, timeoutMs = DEFAULT_ASK_TIMEOUT_MS, signal) {
+  waitForToolReply(from, replyTo, timeoutMs = DEFAULT_ASK_TIMEOUT_MS, signal, team) {
     return new Promise((resolve5, reject) => {
       if (signal?.aborted) {
         reject(new Error("intercom_ask cancelled"));
@@ -3782,7 +4046,7 @@ ${reply.content.text}${formatAttachments(reply.content.attachments)}`, { ok: tru
         reject(new Error(`No reply from "${from}" within ${Math.round(timeoutMs / 1e3)} seconds`));
       }, timeoutMs);
       signal?.addEventListener("abort", onAbort, { once: true });
-      this.toolReplyWaiters.set(replyTo, { from, resolve: resolve5, reject, timeout, cleanup });
+      this.toolReplyWaiters.set(replyTo, { from, team, resolve: resolve5, reject, timeout, cleanup });
     });
   }
   rejectToolReply(replyTo, error) {
@@ -4503,7 +4767,7 @@ async function waitForSocket(socketPath, proc, timeoutMs = 1e4) {
       throw new Error(`Codex app-server exited before creating ${socketPath}`);
     }
     if (existsSync6(socketPath)) return;
-    await delay2(50);
+    await delay3(50);
   }
   throw new Error(`Timed out waiting for Codex app-server socket: ${socketPath}`);
 }
@@ -4627,16 +4891,16 @@ function cleanupOldCoiStateFiles(intercomDir, now = Date.now(), maxAgeMs = COI_S
   }
   for (const entry of entries) {
     if (!/^coi-.+-state\.json$/.test(entry)) continue;
-    const path = join8(intercomDir, entry);
+    const path = join10(intercomDir, entry);
     try {
       const stat = statSync(path);
-      if (now - stat.mtimeMs > maxAgeMs) rmSync(path, { force: true });
+      if (now - stat.mtimeMs > maxAgeMs) rmSync2(path, { force: true });
     } catch {
     }
   }
 }
 function resetCoiStateForFreshStart(statePath, fresh) {
-  if (fresh) rmSync(statePath, { force: true });
+  if (fresh) rmSync2(statePath, { force: true });
 }
 async function runCoi(options, env = process.env) {
   const scopeId = intercomScopeIdFromEnv(env);
@@ -4663,11 +4927,11 @@ async function runCoi(options, env = process.env) {
   const name = options.name ?? identity.name;
   const intercomDir = getIntercomDirPath();
   cleanupOldCoiStateFiles(intercomDir);
-  const socketPath = options.socketPath ?? join8(intercomDir, `coi-${process.pid}.sock`);
-  const statePath = options.statePath ?? join8(intercomDir, `coi-${sanitizeSegment(id)}-state.json`);
+  const socketPath = options.socketPath ?? join10(intercomDir, `coi-${process.pid}.sock`);
+  const statePath = options.statePath ?? join10(intercomDir, `coi-${sanitizeSegment(id)}-state.json`);
   const fresh = env.AGENT_INTERCOM_FRESH === "1";
   resetCoiStateForFreshStart(statePath, fresh);
-  rmSync(socketPath, { force: true });
+  rmSync2(socketPath, { force: true });
   const resumeRequest = resolveCoiResumeRequest(options.codexArgs);
   const agent = {
     id,
@@ -4692,7 +4956,7 @@ async function runCoi(options, env = process.env) {
   const cleanup = async () => {
     await daemon?.stop().catch(() => void 0);
     await stopChild(appServer);
-    rmSync(socketPath, { force: true });
+    rmSync2(socketPath, { force: true });
   };
   let daemon = null;
   let cleaned = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctliz/agent-intercom-codex",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Codex MCP plugin and wakeable worker for local messaging with Pi, Claude Code, OpenCode, Grok Build, and AGY agents.",
   "license": "AGPL-3.0-or-later",
   "type": "module",
@@ -38,6 +38,7 @@
     ".codex-plugin/**/*",
     ".mcp.json",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE",
     "THIRD_PARTY_NOTICES.md",
     "licenses/**/*",

package/skills/codex-intercom/SKILL.md

@@ -23,8 +23,8 @@ messages to those workers create or resume app-server threads and start turns.
 ## Tools
 
 - `intercom_whoami`: show this session's intercom ID, name, cwd, and model.
-- `intercom_team`: show the current orchestrator manager and live same-manager coworkers.
-- `intercom_join`: list, join, or create a named team without tmux (`create: true` joins as manager).
+- `intercom_team({ team? })`: inspect one task team or list all memberships; falls back to managed-team discovery.
+- `intercom_join({ name?, create?, members?, work? })`: list, join, or create an additive task team; the manager adds connected peers in one call.
 - `intercom_status`: check connection, active session count, unread messages,
   and unresolved inbound asks.
 - `intercom_list`: list connected Pi and Codex sessions.
@@ -40,8 +40,8 @@ messages to those workers create or resume app-server threads and start turns.
    connected.
 2. Call `intercom_set_summary` with a concise status when other sessions need
    to discover your role.
-3. If this is an orchestrator-owned coworker, call `intercom_team` to get the manager and sibling targets without searching globally. To form a team without tmux, call `intercom_join({ name: "billing", create: true })` in one session and `intercom_join({ name: "billing" })` in the others. Otherwise use `intercom_list`.
-4. Use `intercom_send` for non-blocking updates and handoffs.
+3. 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. An explicit create/join request is approval; never ask again for an approved task or inbound team message. After approval, discover peers and call `intercom_join({ name: "billing", create: true, members: ["front", "writer"], work: "Current task" })`. Do not ask the user to join each terminal manually. Reuse the approved team for the same task; new tasks may need new teams. Joining preserves all previous memberships and each team's manager/member roles.
+4. Use `intercom_send` for non-blocking updates and handoffs. Include `team` for task messages, especially when multiple teams are shared. Without a shared team, omit `team` for initial ungrouped contact; unrelated memberships do not block contact or silently create teams.
 5. Use `intercom_ask` only when you need the answer before continuing. Assignments, progress/status checkpoints, notifications, and completion reports use `intercom_send`.
 6. Call `intercom_pending` before ending a coordination turn, then answer
    blocking asks with `intercom_reply`.
@@ -73,7 +73,7 @@ intercom_pending({ mark_read: false })
 intercom_reply({ message: "Use GET/PUT/DELETE only, max 3 retries." })
 ```
 
-When multiple asks are pending, select the sender with `to`. If that sender has multiple unresolved asks, select `oldest` or `latest` without using protocol IDs:
+Replies inherit the original message's team, never a mutable current team. Prefer `askId` or `contextId` returned by `intercom_pending` (contextId also selects ordinary messages). Mixed-team pending contexts require explicit selection; `team` cannot override the original. Within one task, `to` plus `oldest`/`latest` also selects an ask:
 
 ```typescript
 intercom_reply({

package/types.ts

@@ -55,6 +55,7 @@ export interface Message {
   expectsReply?: boolean;
   content: {
     text: string;
+    team?: string;
     attachments?: Attachment[];
   };
 }