@ctliz/agent-intercom-claude 0.13.0-connect.7 → 0.13.0-connect.9

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Unreleased
+
+## 0.13.0-connect.9 - 2026-09-06
+
+- Add `intercom_join` so Claude sessions can create or join a named team without tmux. `/intercom-create` and `/intercom-join` call the same tool. Named teams share `~/.pi/agent/intercom/named-teams.json` with Pi, Codex, and OpenCode.
+
+## 0.13.0-connect.8 - 2026-08-24
+
+- Document Grok Build and AGY support in detail on the npm package page, including packages, tools, identity, shared scope, Auto-Team participation, and polling-only delivery.
+- Add Grok Build and AGY to npm search metadata and clarify that their dedicated launchers load the Claude MCP runtime without a separate `claude-intercom-mcp` installation.
+
 ## 0.13.0-connect.7 - 2026-08-24
 
 - Synchronize companion install pins with the hosted-CI-validated Orchestrator release.

package/README.md

@@ -13,7 +13,35 @@
 | AGY | [`agent-intercom-agy`](https://github.com/ctliz/agent-intercom-agy) |
 | Fleet lifecycle | [`agent-intercom-orchestrator`](https://github.com/ctliz/agent-intercom-orchestrator) |
 
-Grok Build and AGY use lightweight npm-packaged MCP launchers backed by this Claude MCP runtime. They retain inbound messages for `intercom_pending` polling but do not provide wake-on-message.
+## Grok Build and AGY support
+
+Grok Build and AGY are supported as first-class protocol peers through two dedicated npm packages:
+
+| Host | npm package | Installed MCP launcher |
+|---|---|---|
+| Grok Build | [`@ctliz/agent-intercom-grok`](https://www.npmjs.com/package/@ctliz/agent-intercom-grok) | `agent-intercom-grok-mcp` |
+| AGY | [`@ctliz/agent-intercom-agy`](https://www.npmjs.com/package/@ctliz/agent-intercom-agy) | `agent-intercom-agy-mcp` |
+
+The host packages depend on `@ctliz/agent-intercom-claude` and load its MCP runtime internally. Users do **not** need to install or place `claude-intercom-mcp` on `PATH` separately. Once connected, Grok and AGY sessions share the same local broker and protocol as Pi, Codex, Claude Code, and OpenCode, and expose the MCP operations: `intercom_whoami`, `intercom_list`, `intercom_send`, `intercom_ask`, `intercom_reply`, `intercom_pending`, `intercom_status`, `intercom_team`, `intercom_join`, and `intercom_set_summary`.
+
+Install the host adapter before installing its plugin:
+
+```bash
+npm install -g @ctliz/agent-intercom-grok
+npm install -g @ctliz/agent-intercom-agy
+```
+
+For multi-pane or Auto-Team-style use, the supervisor must give every MCP child a unique literal identity and the same scope as its intended peers:
+
+```text
+AGENT_INTERCOM_SESSION_ID=<unique-pane-or-worker-id>
+AGENT_INTERCOM_SESSION_NAME=<human-readable-name>
+AGENT_INTERCOM_SCOPE_ID=<shared-team-or-workspace-scope>
+```
+
+The plugin manifests intentionally do not contain static session IDs, because sharing one ID across concurrent panes would create identity collisions. `CLAUDE_INTERCOM_SESSION_ID` and `CLAUDE_INTERCOM_NAME` remain higher-priority compatibility aliases.
+
+Grok Build and AGY currently provide polling-only MCP integrations. Messages are durably retained, but there is no host-specific wake bridge to inject a new turn. Each active agent should call `intercom_pending` at startup and at natural work boundaries. They can join an existing team and exchange messages with every other adapter, but Agent Intercom Orchestrator does not currently spawn or lifecycle-manage Grok or AGY workers.
 
 ## Maintenance & Upstream Provenance
 
@@ -101,13 +129,13 @@ Install via npm using the `connect` dist-tag:
 ```bash
 npm install -g @ctliz/agent-intercom-claude@connect
 # or by exact prerelease version
-npm install -g @ctliz/agent-intercom-claude@0.13.0-connect.7
+npm install -g @ctliz/agent-intercom-claude@0.13.0-connect.9
 ```
 
 Or install from GitHub source at the exact tag so the command-line entry points are on `PATH`:
 
 ```bash
-git clone --depth 1 --branch v0.13.0-connect.7 https://github.com/ctliz/agent-intercom-claude.git
+git clone --depth 1 --branch v0.13.0-connect.9 https://github.com/ctliz/agent-intercom-claude.git
 cd agent-intercom-claude && npm ci && npm link
 ```
 
@@ -121,7 +149,7 @@ This provides:
 To let a Pi manager create Claude workers with owned systemd cgroups, leases, model/effort selection, logs, and verified cleanup, install the companion Pi packages:
 
 ```bash
-pi install git:github.com/ctliz/agent-intercom-pi@v0.12.0-connect.7
+pi install git:github.com/ctliz/agent-intercom-pi@v0.12.0-connect.9
 pi install git:github.com/ctliz/agent-intercom-orchestrator@v0.12.0-connect.5
 ```
 
@@ -155,9 +183,9 @@ With `--transport mcp`, `cci` does this automatically for each normal headless w
 
 ### Other stdio MCP hosts
 
-The `claude-intercom-mcp` executable is a standard stdio MCP server. Grok Build and AGY can use the dedicated `@ctliz/agent-intercom-grok` and `@ctliz/agent-intercom-agy` packages, which install host-specific launchers backed by this runtime. For a source checkout, configure `node` with the absolute path to `dist/claude-server.mjs`. Node 22.19+ is required.
+The `claude-intercom-mcp` executable is a standard stdio MCP server, but Grok Build and AGY should normally use the dedicated `@ctliz/agent-intercom-grok` and `@ctliz/agent-intercom-agy` packages. Those packages install `agent-intercom-grok-mcp` and `agent-intercom-agy-mcp`, depend on this package, and load its runtime internally. A separate global `claude-intercom-mcp` installation is not required. For a source-only checkout, configure `node` with the absolute path to `dist/claude-server.mjs`. Node 22.19+ is required.
 
-Install the host packages with `npm install -g @ctliz/agent-intercom-grok` or `npm install -g @ctliz/agent-intercom-agy`, then install their GitHub plugin at the matching release tag.
+Install the matching host package globally, then install its GitHub plugin at the matching release tag.
 
 Use `AGENT_INTERCOM_SESSION_ID` and `AGENT_INTERCOM_SESSION_NAME` for a host-neutral identity; `CLAUDE_INTERCOM_SESSION_ID` and `CLAUDE_INTERCOM_NAME` remain higher-priority compatibility aliases. Do not share a fixed session ID between concurrent host sessions.
 
@@ -170,17 +198,16 @@ grok mcp add agent-intercom \
   -e AGENT_INTERCOM_SESSION_ID=grok-probe-01 \
   -e AGENT_INTERCOM_SESSION_NAME=grok-probe \
   -e CLAUDE_INTERCOM_MODEL=grok-build \
-  -- claude-intercom-mcp
+  -- agent-intercom-grok-mcp
 ```
 
-For AGY, add the equivalent entry to `~/.gemini/config/mcp_config.json` (replace the source-checkout paths when using an installed `claude-intercom-mcp` executable):
+For AGY, add the equivalent entry to `~/.gemini/config/mcp_config.json`:
 
 ```json
 {
   "mcpServers": {
     "agent-intercom": {
-      "command": "/absolute/path/to/node",
-      "args": ["/absolute/path/to/agent-intercom-claude/dist/claude-server.mjs"],
+      "command": "agent-intercom-agy-mcp",
       "env": {
         "AGENT_INTERCOM_SESSION_ID": "agy-probe-01",
         "AGENT_INTERCOM_SESSION_NAME": "agy-probe",
@@ -240,6 +267,7 @@ tools without the skill.
 
 - `intercom_whoami`: show this session's intercom ID, name, cwd, and model.
 - `intercom_team`: show the current manager and live coworkers owned by that manager.
+- `intercom_join`: list, join, or create a named team without tmux (`create: true` joins as manager).
 - `intercom_status`: show connection status and pending message counts.
 - `intercom_list`: list local Pi, Codex, and Claude sessions in your scope (protocol v4 is same-scope; cross-scope contact requires an exact full session ID).
 - `intercom_set_summary`: publish a short discoverable status.

package/claude/cci.ts

@@ -283,7 +283,7 @@ export function buildTuiAppendSystemPrompt(
     "When such an event arrives, treat it as a request from that peer:",
     "- If it is marked \"[asking — awaiting your reply]\", the sender is BLOCKING on your answer. Do the work if appropriate, then answer with the intercom_reply tool: intercom_reply({ message: \"...\" }).",
     "- Otherwise, act if needed and use intercom_send to respond or acknowledge.",
-    "Use intercom_team to find your manager and managed coworkers. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise.",
+    "Use intercom_team to find your manager and managed coworkers. Use intercom_join to create or join a named team without tmux. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise.",
   ].join("\n");
 }
 

package/claude/mcp-protocol.ts

@@ -94,6 +94,23 @@ export function buildToolDefinitions(runtime: ClaudeIntercomRuntime): ToolDefini
       annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
       handler: async () => runtime.team(),
     },
+    {
+      name: "intercom_join",
+      description: "List, join, or create a named intercom team without tmux. Omit name to list joinable teams. Set create=true to create a team and join as manager.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          name: { type: "string", description: "Team name to join. Omit to list joinable teams." },
+          create: { type: "boolean", description: "Create this named team and join as manager. Requires name." },
+        },
+        additionalProperties: false,
+      },
+      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true },
+      handler: async (args) => runtime.join(
+        typeof args.name === "string" ? args.name : undefined,
+        args.create === true,
+      ),
+    },
     {
       name: "intercom_status",
       description: "Show intercom connection status, active sessions, unread messages, and pending asks.",

package/claude/named-teams.ts

@@ -0,0 +1,178 @@
+import { randomBytes } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { ensureIntercomRuntimeDir, getAgentDirPath, getIntercomDirPath } from "../broker/paths.ts";
+import { writeDurableJson } from "../durable-json.ts";
+
+export const NAMED_TEAMS_FILE = "named-teams.json";
+export const NAMED_TEAMS_VERSION = 1;
+export const NAMED_TEAM_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9_-]{0,31}$/;
+
+export interface NamedTeam {
+  name: string;
+  scopeId: string;
+  managerSessionId: string;
+  createdAt: number;
+}
+
+interface NamedTeamsFile {
+  version: number;
+  teams: NamedTeam[];
+}
+
+function isNamedTeamScope(value: string): boolean {
+  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?: string): string {
+  return join(getIntercomDirPath(agentDir ?? getAgentDirPath()), NAMED_TEAMS_FILE);
+}
+
+function genericReadError(): Error {
+  return new Error("Could not read the local named-team list.");
+}
+
+function genericWriteError(): Error {
+  return new Error("Could not create that named team.");
+}
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function parseStoredTeam(value: unknown): NamedTeam | undefined {
+  if (!isPlainObject(value)) return undefined;
+  if (typeof value.name !== "string" || !NAMED_TEAM_NAME_PATTERN.test(value.name)) return undefined;
+  if (typeof value.scopeId !== "string" || !isNamedTeamScope(value.scopeId)) return undefined;
+  if (typeof value.managerSessionId !== "string" || !value.managerSessionId.trim()) return undefined;
+  if (value.managerSessionId !== value.managerSessionId.trim() || /[\u0000-\u001f\u007f]/.test(value.managerSessionId)) {
+    return undefined;
+  }
+  if (typeof value.createdAt !== "number" || !Number.isSafeInteger(value.createdAt) || value.createdAt <= 0) {
+    return undefined;
+  }
+  return {
+    name: value.name,
+    scopeId: value.scopeId,
+    managerSessionId: value.managerSessionId,
+    createdAt: value.createdAt,
+  };
+}
+
+export function rejectManagedJoin(env: NodeJS.ProcessEnv = process.env): string | undefined {
+  if (env.AGENT_INTERCOM_WORKER_ID?.trim() || env.AGENT_INTERCOM_OWNED === "1" || env.AGENT_INTERCOM_TEAM_MANIFEST?.trim()) {
+    return "This session is already a managed member and cannot join another team.";
+  }
+  return undefined;
+}
+
+export function parseTeamName(raw: string): string {
+  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;
+}
+
+export function generateNamedTeamScope(existing: Iterable<string> = []): string {
+  const taken = new Set(existing);
+  for (let attempt = 0; attempt < 8; attempt += 1) {
+    const scopeId = randomBytes(24).toString("hex");
+    if (!taken.has(scopeId)) return scopeId;
+  }
+  throw genericWriteError();
+}
+
+export function listNamedTeams(agentDir?: string): NamedTeam[] {
+  let raw: string;
+  try {
+    raw = readFileSync(teamsFilePath(agentDir), "utf8");
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") return [];
+    throw genericReadError();
+  }
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw genericReadError();
+  }
+  if (!isPlainObject(parsed) || parsed.version !== NAMED_TEAMS_VERSION || !Array.isArray(parsed.teams)) {
+    throw genericReadError();
+  }
+
+  const teams: NamedTeam[] = [];
+  const names = new Set<string>();
+  const scopes = new Set<string>();
+  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;
+}
+
+export function findNamedTeam(name: string, agentDir?: string): NamedTeam | undefined {
+  return listNamedTeams(agentDir).find((team) => team.name === name);
+}
+
+export function createNamedTeam(input: {
+  name: string;
+  managerSessionId: string;
+  agentDir?: string;
+  now?: number;
+  generateScope?: () => string;
+}): NamedTeam {
+  const name = parseTeamName(input.name);
+  const managerSessionId = input.managerSessionId.trim();
+  if (!managerSessionId || managerSessionId !== input.managerSessionId || /[\u0000-\u001f\u007f]/.test(managerSessionId)) {
+    throw genericWriteError();
+  }
+
+  const existing = listNamedTeams(input.agentDir);
+  if (existing.some((team) => team.name === name)) {
+    throw new Error(`A named team called ${name} already exists.`);
+  }
+
+  const scopeId = (input.generateScope ?? (() => generateNamedTeamScope(existing.map((team) => team.scopeId))))();
+  if (!isNamedTeamScope(scopeId) || existing.some((team) => team.scopeId === scopeId)) {
+    throw genericWriteError();
+  }
+
+  const team: NamedTeam = {
+    name,
+    scopeId,
+    managerSessionId,
+    createdAt: input.now ?? Date.now(),
+  };
+  const dir = getIntercomDirPath(input.agentDir ?? getAgentDirPath());
+  ensureIntercomRuntimeDir(dir);
+  const payload: NamedTeamsFile = { version: NAMED_TEAMS_VERSION, teams: [...existing, team] };
+  writeDurableJson(teamsFilePath(input.agentDir), payload);
+  return team;
+}
+
+export function formatJoinableNamedTeamList(teams: Array<Pick<NamedTeam, "name">>): string {
+  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");
+}
+
+export function formatCreateSuccess(input: { team: string; name: string }): string {
+  return `Created team ${input.team} and joined as manager.\nDisplay name: ${input.name}`;
+}
+
+export function formatNamedJoinSuccess(input: { team: string; name: string }): string {
+  return `Joined team ${input.team}.\nRole: teammate\nDisplay name: ${input.name}`;
+}

package/claude/runtime.ts

@@ -9,6 +9,16 @@ import { getAskTimeoutMs, loadConfig } from "../config.ts";
 import { appendInboxMessage } 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";
 
 export interface ClaudeRuntimeIdentity {
   sessionId: string;
@@ -215,7 +225,7 @@ export class ClaudeIntercomRuntime {
   private replyWaiters = new Map<string, ReplyWaiter>();
 
   private readonly clientFactory: () => IntercomClient;
-  private readonly capturedScopeId: string | undefined;
+  private capturedScopeId: string | undefined;
   private readonly prepareConnection: () => Promise<void>;
   private readonly reconnectDelays: number[];
 
@@ -224,13 +234,11 @@ export class ClaudeIntercomRuntime {
     // Capture AGENT_INTERCOM_SCOPE_ID exactly once at runtime construction so that
     // reconnects reuse the same private scope even if process.env is mutated later.
     this.capturedScopeId = intercomScopeIdFromEnvForRegistration(process.env);
-    // Freeze the exact env value the client should see for scope resolution.
-    // When capturedScopeId is undefined (unscoped), pass an empty env so the client
-    // does not silently re-read a later-mutated AGENT_INTERCOM_SCOPE_ID.
-    const scopeSnapshot: NodeJS.ProcessEnv = this.capturedScopeId
-      ? { AGENT_INTERCOM_SCOPE_ID: this.capturedScopeId }
-      : {};
-    this.clientFactory = options.clientFactory ?? (() => new IntercomClient({ env: scopeSnapshot }));
+    // Reconnects reuse capturedScopeId even if process.env is mutated later.
+    // An explicit join/create updates capturedScopeId, then rebuilds the client.
+    this.clientFactory = options.clientFactory ?? (() => new IntercomClient({
+      env: this.capturedScopeId ? { AGENT_INTERCOM_SCOPE_ID: this.capturedScopeId } : {},
+    }));
     this.prepareConnection = options.prepareConnection ?? (async () => {
       const config = loadConfig();
       if (!config.enabled) throw new Error("Intercom disabled");
@@ -326,6 +334,50 @@ export class ClaudeIntercomRuntime {
     if (client) await client.disconnect();
   }
 
+  async switchRuntimeScope(nextScopeId: string, managerSessionId?: string): Promise<void> {
+    if (managerSessionId) process.env.AGENT_INTERCOM_MANAGER_TARGET = managerSessionId;
+    else delete process.env.AGENT_INTERCOM_MANAGER_TARGET;
+    if (this.capturedScopeId === nextScopeId && process.env.AGENT_INTERCOM_SCOPE_ID === nextScopeId) {
+      return;
+    }
+    this.reconnectEnabled = false;
+    this.clearReconnectTimer();
+    if (this.connectPromise) {
+      try { await this.connectPromise; } catch { /* ignore in-flight connect */ }
+    }
+    const previous = this.client;
+    this.client = null;
+    if (previous) await previous.disconnect().catch(() => undefined);
+    this.capturedScopeId = nextScopeId;
+    process.env.AGENT_INTERCOM_SCOPE_ID = nextScopeId;
+    this.reconnectEnabled = true;
+    await this.connect();
+  }
+
+  async join(name?: string, create = false): Promise<ToolResult> {
+    const blocked = rejectManagedJoin();
+    if (blocked) return textResult(blocked, { ok: false }, true);
+    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()) {
+        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" });
+    } catch (error) {
+      return textResult(error instanceof Error ? error.message : String(error), { ok: false }, true);
+    }
+  }
+
   private handleIncomingMessage(from: SessionInfo, message: Message): void {
     const waiter = this.replyWaiters.get(message.replyTo ?? "");
     if (waiter) {

package/commands/intercom-create.md

@@ -0,0 +1,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.
+
+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 })`

package/commands/intercom-join.md

@@ -0,0 +1,10 @@
+---
+description: Join a named intercom team, or list joinable teams
+argument-hint: [team-name]
+---
+
+Join a named Intercom team without tmux.
+
+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.
+
+Example: `intercom_join({ name: "billing" })`

package/dist/cci.mjs

@@ -3403,7 +3403,7 @@ function buildTuiAppendSystemPrompt(name, id, transport = "mcp") {
     "When such an event arrives, treat it as a request from that peer:",
     '- If it is marked "[asking \u2014 awaiting your reply]", the sender is BLOCKING on your answer. Do the work if appropriate, then answer with the intercom_reply tool: intercom_reply({ message: "..." }).',
     "- Otherwise, act if needed and use intercom_send to respond or acknowledge.",
-    "Use intercom_team to find your manager and managed coworkers. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise."
+    "Use intercom_team to find your manager and managed coworkers. Use intercom_join to create or join a named team without tmux. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise."
   ].join("\n");
 }
 function nativeClaudeFeatureEnv(transport) {

package/dist/ccim.mjs

@@ -3407,7 +3407,7 @@ function buildTuiAppendSystemPrompt(name, id, transport = "mcp") {
     "When such an event arrives, treat it as a request from that peer:",
     '- If it is marked "[asking \u2014 awaiting your reply]", the sender is BLOCKING on your answer. Do the work if appropriate, then answer with the intercom_reply tool: intercom_reply({ message: "..." }).',
     "- Otherwise, act if needed and use intercom_send to respond or acknowledge.",
-    "Use intercom_team to find your manager and managed coworkers. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise."
+    "Use intercom_team to find your manager and managed coworkers. Use intercom_join to create or join a named team without tmux. You also have intercom_list, intercom_whoami, intercom_status, intercom_pending, and intercom_set_summary. Keep intercom replies concise."
   ].join("\n");
 }
 function nativeClaudeFeatureEnv(transport) {

package/dist/claude-server.mjs

@@ -2145,6 +2145,148 @@ function formatIntercomTeam(team) {
   return lines.join("\n");
 }
 
+// claude/named-teams.ts
+import { randomBytes } from "node:crypto";
+import { readFileSync as readFileSync6 } from "node:fs";
+import { join as join7 } 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 join7(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;
+  }
+  return {
+    name: value.name,
+    scopeId: value.scopeId,
+    managerSessionId: value.managerSessionId,
+    createdAt: value.createdAt
+  };
+}
+function rejectManagedJoin(env = process.env) {
+  if (env.AGENT_INTERCOM_WORKER_ID?.trim() || env.AGENT_INTERCOM_OWNED === "1" || env.AGENT_INTERCOM_TEAM_MANIFEST?.trim()) {
+    return "This session is already a managed member and cannot join another team.";
+  }
+  return void 0;
+}
+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 = randomBytes(24).toString("hex");
+    if (!taken.has(scopeId)) return scopeId;
+  }
+  throw genericWriteError();
+}
+function listNamedTeams(agentDir) {
+  let raw;
+  try {
+    raw = readFileSync6(teamsFilePath(agentDir), "utf8");
+  } catch (error2) {
+    if (error2 && typeof error2 === "object" && "code" in error2 && error2.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 findNamedTeam(name, agentDir) {
+  return listNamedTeams(agentDir).find((team) => team.name === name);
+}
+function createNamedTeam(input) {
+  const name = parseTeamName(input.name);
+  const managerSessionId = input.managerSessionId.trim();
+  if (!managerSessionId || managerSessionId !== input.managerSessionId || /[\u0000-\u001f\u007f]/.test(managerSessionId)) {
+    throw genericWriteError();
+  }
+  const existing = listNamedTeams(input.agentDir);
+  if (existing.some((team2) => team2.name === name)) {
+    throw new Error(`A named team called ${name} already exists.`);
+  }
+  const scopeId = (input.generateScope ?? (() => generateNamedTeamScope(existing.map((team2) => team2.scopeId))))();
+  if (!isNamedTeamScope(scopeId) || existing.some((team2) => team2.scopeId === scopeId)) {
+    throw genericWriteError();
+  }
+  const team = {
+    name,
+    scopeId,
+    managerSessionId,
+    createdAt: input.now ?? Date.now()
+  };
+  const dir = getIntercomDirPath(input.agentDir ?? getAgentDirPath());
+  ensureIntercomRuntimeDir(dir);
+  const payload = { version: NAMED_TEAMS_VERSION, teams: [...existing, team] };
+  writeDurableJson(teamsFilePath(input.agentDir), payload);
+  return team;
+}
+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");
+}
+function formatCreateSuccess(input) {
+  return `Created team ${input.team} and joined as manager.
+Display name: ${input.name}`;
+}
+function formatNamedJoinSuccess(input) {
+  return `Joined team ${input.team}.
+Role: teammate
+Display name: ${input.name}`;
+}
+
 // claude/runtime.ts
 function matchesPendingSender(entry, to) {
   return entry.from.id === to || entry.from.name?.toLowerCase() === to.toLowerCase() || entry.from.id.startsWith(to);
@@ -2305,8 +2447,9 @@ var ClaudeIntercomRuntime = class {
   constructor(identity = buildClaudeRuntimeIdentity(), options = {}) {
     this.identity = identity;
     this.capturedScopeId = intercomScopeIdFromEnvForRegistration(process.env);
-    const scopeSnapshot = this.capturedScopeId ? { AGENT_INTERCOM_SCOPE_ID: this.capturedScopeId } : {};
-    this.clientFactory = options.clientFactory ?? (() => new IntercomClient({ env: scopeSnapshot }));
+    this.clientFactory = options.clientFactory ?? (() => new IntercomClient({
+      env: this.capturedScopeId ? { AGENT_INTERCOM_SCOPE_ID: this.capturedScopeId } : {}
+    }));
     this.prepareConnection = options.prepareConnection ?? (async () => {
       const config = loadConfig();
       if (!config.enabled) throw new Error("Intercom disabled");
@@ -2394,6 +2537,51 @@ var ClaudeIntercomRuntime = class {
     this.client = null;
     if (client) await client.disconnect();
   }
+  async switchRuntimeScope(nextScopeId, managerSessionId) {
+    if (managerSessionId) process.env.AGENT_INTERCOM_MANAGER_TARGET = managerSessionId;
+    else delete process.env.AGENT_INTERCOM_MANAGER_TARGET;
+    if (this.capturedScopeId === nextScopeId && process.env.AGENT_INTERCOM_SCOPE_ID === nextScopeId) {
+      return;
+    }
+    this.reconnectEnabled = false;
+    this.clearReconnectTimer();
+    if (this.connectPromise) {
+      try {
+        await this.connectPromise;
+      } catch {
+      }
+    }
+    const previous = this.client;
+    this.client = null;
+    if (previous) await previous.disconnect().catch(() => void 0);
+    this.capturedScopeId = nextScopeId;
+    process.env.AGENT_INTERCOM_SCOPE_ID = nextScopeId;
+    this.reconnectEnabled = true;
+    await this.connect();
+  }
+  async join(name, create = false) {
+    const blocked = rejectManagedJoin();
+    if (blocked) return textResult(blocked, { ok: false }, true);
+    try {
+      if (create) {
+        if (typeof name !== "string" || !name.trim()) {
+          return textResult("Creating a team requires a name.", { ok: false }, true);
+        }
+        const team2 = createNamedTeam({ name: parseTeamName(name), managerSessionId: this.identity.sessionId });
+        await this.switchRuntimeScope(team2.scopeId, team2.managerSessionId);
+        return textResult(formatCreateSuccess({ team: team2.name, name: this.identity.name }), { ok: true, team: team2.name, role: "manager" });
+      }
+      if (!name?.trim()) {
+        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" });
+    } catch (error2) {
+      return textResult(error2 instanceof Error ? error2.message : String(error2), { ok: false }, true);
+    }
+  }
   handleIncomingMessage(from, message) {
     const waiter = this.replyWaiters.get(message.replyTo ?? "");
     if (waiter) {
@@ -2641,6 +2829,23 @@ function buildToolDefinitions(runtime2) {
       annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
       handler: async () => runtime2.team()
     },
+    {
+      name: "intercom_join",
+      description: "List, join, or create a named intercom team without tmux. Omit name to list joinable teams. Set create=true to create a team and join as manager.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          name: { type: "string", description: "Team name to join. Omit to list joinable teams." },
+          create: { type: "boolean", description: "Create this named team and join as manager. Requires name." }
+        },
+        additionalProperties: false
+      },
+      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true },
+      handler: async (args) => runtime2.join(
+        typeof args.name === "string" ? args.name : void 0,
+        args.create === true
+      )
+    },
     {
       name: "intercom_status",
       description: "Show intercom connection status, active sessions, unread messages, and pending asks.",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ctliz/agent-intercom-claude",
-  "version": "0.13.0-connect.7",
-  "description": "Claude Code MCP plugin and wakeable worker for direct local messaging with Pi, Codex, and Claude coding-agent sessions.",
+  "version": "0.13.0-connect.9",
+  "description": "Claude Code MCP plugin and wakeable worker for local messaging with Pi, Codex, OpenCode, Grok Build, and AGY agents.",
   "license": "AGPL-3.0-or-later",
   "type": "module",
   "main": "dist/claude-server.mjs",
@@ -64,7 +64,11 @@
     "intercom",
     "multi-agent",
     "pi",
-    "codex"
+    "codex",
+    "opencode",
+    "grok",
+    "grok-build",
+    "agy"
   ],
   "peerDependencies": {
     "@ctliz/agent-intercom-core": "0.2.0"

package/scripts/verify-packed-runtime.mjs

@@ -120,7 +120,9 @@ try {
   if (typeof plugin.commands !== "string") throw new Error("plugin.json missing commands declaration");
   const commandEntry1 = entries.get("package/commands/intercom.md");
   const commandEntry2 = entries.get("package/commands/intercom-id.md");
-  if (!commandEntry1 || !commandEntry2) throw new Error("Packed adapter missing commands markdown files");
+  const commandEntry3 = entries.get("package/commands/intercom-create.md");
+  const commandEntry4 = entries.get("package/commands/intercom-join.md");
+  if (!commandEntry1 || !commandEntry2 || !commandEntry3 || !commandEntry4) throw new Error("Packed adapter missing commands markdown files");
 
   // 5. Assert all dist bundles exist and adhere to Core externalization
   for (const bundle of bundles) {

package/skills/claude-intercom/SKILL.md

@@ -30,6 +30,7 @@ proxy-backed Claude profiles; `ccim` safe mode intentionally does not.
 
 - `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_status`: connection, active session count, unread messages, pending asks.
 - `intercom_list`: list connected Pi, Codex, and Claude sessions.
 - `intercom_set_summary`: publish a short discoverable status.
@@ -42,7 +43,7 @@ proxy-backed Claude profiles; `ccim` safe mode intentionally does not.
 
 1. Call `intercom_status` or `intercom_whoami` to confirm this session is connected.
 2. Call `intercom_set_summary` with a concise status so peers can discover your role.
-3. If this is an orchestrator-owned coworker, call `intercom_team` to get the manager and sibling targets without searching globally. Otherwise use `intercom_list`.
+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.
 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`.