@bastani/atomic 0.9.16-alpha.9 → 0.9.16

package/dist/builtin/intercom/index.bundle.mjs

@@ -9224,11 +9224,13 @@ function runSynchronousCallback(descriptor, callback) {
   }
 }
 async function runCallback(descriptor, callback) {
+  if (!reporter)
+    return callback();
+  await yieldToEventLoop();
   const active = beginActivity(descriptor);
   if (!active)
     return callback();
   try {
-    await yieldToEventLoop();
     return await callback();
   } finally {
     active.reporter.finished(active.activity.id);
@@ -11960,12 +11962,34 @@ var init_runner_events = __esm(() => {
   init_callback_activity();
 });
 
+// src/core/mandatory-runtime-tools.ts
+function isTrustedMandatoryRuntimeTool(registration) {
+  return MANDATORY_TOOL_NAMES.has(registration.definition.name) && TRUSTED_MANDATORY_DEFINITIONS.has(registration.definition);
+}
+function isMandatoryRuntimeTool(name) {
+  return MANDATORY_TOOL_NAMES.has(name);
+}
+function appendRegisteredMandatoryTools(tools, registry) {
+  for (const name of MANDATORY_TOOL_NAMES) {
+    const tool = registry.get(name);
+    if (tool && !tools.some((candidate) => candidate.name === name))
+      tools.push(tool);
+  }
+  return tools;
+}
+var MANDATORY_TOOL_NAMES, TRUSTED_MANDATORY_DEFINITIONS;
+var init_mandatory_runtime_tools = __esm(() => {
+  MANDATORY_TOOL_NAMES = new Set(["intercom"]);
+  TRUSTED_MANDATORY_DEFINITIONS = new WeakSet;
+});
+
 // src/core/extensions/runner-registries.ts
 function collectRegisteredTools(extensions) {
   const toolsByName = new Map;
   for (const ext of extensions) {
     for (const tool of ext.tools.values()) {
-      if (!toolsByName.has(tool.definition.name)) {
+      const existing = toolsByName.get(tool.definition.name);
+      if (!existing || isMandatoryRuntimeTool(tool.definition.name) && isTrustedMandatoryRuntimeTool(tool)) {
         toolsByName.set(tool.definition.name, tool);
       }
     }
@@ -11973,13 +11997,16 @@ function collectRegisteredTools(extensions) {
   return Array.from(toolsByName.values());
 }
 function findToolDefinition(extensions, toolName) {
+  let first;
   for (const ext of extensions) {
     const tool = ext.tools.get(toolName);
-    if (tool) {
+    if (!tool)
+      continue;
+    first ??= tool;
+    if (isMandatoryRuntimeTool(toolName) && isTrustedMandatoryRuntimeTool(tool))
       return tool.definition;
-    }
   }
-  return;
+  return first?.definition;
 }
 function collectFlags(extensions) {
   const allFlags = new Map;
@@ -12047,6 +12074,9 @@ function resolveRegisteredCommands(extensions) {
     return { ...command, invocationName };
   });
 }
+var init_runner_registries = __esm(() => {
+  init_mandatory_runtime_tools();
+});
 
 // src/core/extensions/runner-shortcuts.ts
 function resolveExtensionShortcuts(extensions, resolvedKeybindings, hasUI) {
@@ -12110,6 +12140,7 @@ var init_runner_shortcuts = __esm(() => {
     "app.thinking.toggle",
     "app.editor.external",
     "app.message.followUp",
+    "app.message.copy",
     "tui.input.submit",
     "tui.select.confirm",
     "tui.select.cancel",
@@ -12573,6 +12604,7 @@ var init_runner = __esm(() => {
   init_loader_runtime();
   init_runner_context();
   init_runner_events();
+  init_runner_registries();
   init_runner_shortcuts();
   init_runner_ui();
   init_stale_context();
@@ -14776,11 +14808,13 @@ async function _runAgentContinue() {
 }
 async function _continueQueuedAgentMessages() {
   await this._agentEventQueue;
-  while (!this._queuedMessagesPaused && this.agent.hasQueuedMessages()) {
+  while (!this._stopAfterTurnBlockedContinuation && !this._queuedMessagesPaused && this.agent.hasQueuedMessages()) {
     await this.agent.continue();
     await this.waitForRetry();
     await this._agentEventQueue;
   }
+  if (this._stopAfterTurnBlockedContinuation)
+    return;
   await answerAdmittedQueuedMessage(this);
 }
 async function answerAdmittedQueuedMessage(session) {
@@ -16171,14 +16205,13 @@ function getToolDefinition(name) {
 }
 function setActiveToolsByName(toolNames) {
   const tools = [];
-  const validToolNames = [];
   for (const name of toolNames) {
     const tool = this._toolRegistry.get(name);
-    if (tool) {
+    if (tool)
       tools.push(tool);
-      validToolNames.push(name);
-    }
   }
+  appendRegisteredMandatoryTools(tools, this._toolRegistry);
+  const validToolNames = tools.map((tool) => tool.name);
   this.agent.state.tools = tools;
   this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
   this.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;
@@ -16235,7 +16268,7 @@ function _rebuildSystemPrompt(toolNames) {
     customPrompt: loaderSystemPrompt,
     appendSystemPrompt,
     selectedTools: validToolNames,
-    excludedTools: this._excludedToolNames ? Array.from(this._excludedToolNames) : undefined,
+    excludedTools: this._excludedToolNames ? Array.from(this._excludedToolNames).filter((name) => !isMandatoryRuntimeTool(name)) : undefined,
     toolSnippets,
     promptGuidelines
   };
@@ -16248,6 +16281,7 @@ function _refreshBaseSystemPromptFromActiveTools() {
 }
 var agentSessionStateMethods;
 var init_agent_session_state = __esm(() => {
+  init_mandatory_runtime_tools();
   init_skill_catalog();
   init_system_prompt();
   agentSessionStateMethods = {
@@ -17275,6 +17309,17 @@ function _installAgentToolHooks() {
 }
 function _installAgentNextTurnRefresh() {
   const previousPrepareNextTurnWithContext = this.agent.prepareNextTurnWithContext ?? (this.agent.prepareNextTurn ? async (_turn, signal) => await this.agent.prepareNextTurn?.(signal) : undefined);
+  const previousShouldStopAfterTurn = this.agent.shouldStopAfterTurn;
+  this.agent.shouldStopAfterTurn = async (turn, signal) => {
+    const toolCallIds = turn.message.content.filter((part) => part.type === "toolCall").map((part) => part.id);
+    const terminatingBatch = toolCallIds.length > 0 && toolCallIds.every((id) => this._terminatingToolCallIds.has(id));
+    for (const id of toolCallIds)
+      this._terminatingToolCallIds.delete(id);
+    const shouldStop = await previousShouldStopAfterTurn?.(turn, signal) ?? false;
+    this._stopAfterTurnBlockedContinuation = shouldStop;
+    await settleFallbackAfterTurn(this, turn, terminatingBatch);
+    return shouldStop;
+  };
   const previousTransformContext = this.agent.transformContext;
   this.agent.transformContext = async (messages, signal) => {
     const transformed = previousTransformContext ? await previousTransformContext(messages, signal) : messages;
@@ -17282,24 +17327,17 @@ function _installAgentNextTurnRefresh() {
     assertToolPairingInvariant(guarded);
     return guarded;
   };
-  this.agent.prepareNextTurnWithContext = async (turn, signal) => {
-    const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
-    const previousContext = previousSnapshot?.context ?? turn.context;
-    const toolCallIds = turn.message.content.filter((part) => part.type === "toolCall").map((part) => part.id);
-    const terminatingBatch = toolCallIds.length > 0 && toolCallIds.every((id) => this._terminatingToolCallIds.has(id));
-    for (const id of toolCallIds)
-      this._terminatingToolCallIds.delete(id);
-    const messages = turn.toolResults.length > 0 && !terminatingBatch ? await this._preflightPostToolContext(previousContext.messages, signal) : previousContext.messages;
-    const preserveFallbackForFailure = turn.message.role === "assistant" && !this.agent.hasQueuedMessages() && (turn.message.stopReason === "length" || this._isEmptyCompletion?.(turn.message) === true || this._isSafetyRefusal?.(turn.message) === true);
-    if (!preserveFallbackForFailure && (turn.toolResults.length === 0 || terminatingBatch)) {
-      await this._agentEventQueue;
-      await this._settleFallbackModelScope();
-    }
+  const prepareTurn = async (turn, signal) => {
+    const compactedMessages = turn.toolResults.length > 0 ? await this._preflightPostToolContext(turn.context.messages, signal) : turn.context.messages;
+    const compactedContext = compactedMessages === turn.context.messages ? turn.context : { ...turn.context, messages: compactedMessages };
+    const preparedTurn = compactedContext === turn.context ? turn : { ...turn, context: compactedContext };
+    const previousSnapshot = await previousPrepareNextTurnWithContext?.(preparedTurn, signal);
+    const previousContext = previousSnapshot?.context ?? compactedContext;
     return {
       ...previousSnapshot,
       context: {
         ...previousContext,
-        messages,
+        messages: previousContext.messages,
         systemPrompt: this._systemPromptOverride ?? this._baseSystemPrompt,
         tools: this.agent.state.tools.slice()
       },
@@ -17307,6 +17345,14 @@ function _installAgentNextTurnRefresh() {
       thinkingLevel: this.agent.state.thinkingLevel
     };
   };
+  this.agent.prepareNextTurnWithContext = prepareTurn;
+}
+async function settleFallbackAfterTurn(session, turn, terminatingBatch) {
+  const preserveFallbackForFailure = turn.message.role === "assistant" && !session.agent.hasQueuedMessages() && (turn.message.stopReason === "length" || session._isEmptyCompletion?.(turn.message) === true || session._isSafetyRefusal?.(turn.message) === true);
+  if (!preserveFallbackForFailure && (turn.toolResults.length === 0 || terminatingBatch)) {
+    await session._agentEventQueue;
+    await session._settleFallbackModelScope();
+  }
 }
 var agentSessionToolHooksMethods;
 var init_agent_session_tool_hooks = __esm(() => {
@@ -17389,6 +17435,7 @@ var init_loader_virtual_modules = __esm(() => {
 });
 
 // src/core/extensions/loader-core.ts
+var runtimeEventBuses;
 var init_loader_core = __esm(() => {
   init_event_loop();
   init_paths();
@@ -17398,6 +17445,7 @@ var init_loader_core = __esm(() => {
   init_loader_resources();
   init_loader_runtime();
   init_loader_virtual_modules();
+  runtimeEventBuses = new WeakMap;
 });
 
 // src/core/package-manager-manifest.ts
@@ -22491,7 +22539,7 @@ class FastModeSelectorComponent {
   }
   invalidate() {}
   render(width) {
-    const lines = [truncateToWidth10(theme.bold(theme.fg("accent", "Codex fast mode")), width)];
+    const lines = [truncateToWidth10(theme.bold(theme.fg("accent", "Fast mode")), width)];
     for (const line of wrapTextWithAnsi3(DESCRIPTION, Math.max(20, width))) {
       lines.push(theme.fg("muted", line));
     }
@@ -22574,7 +22622,7 @@ class FastModeSelectorComponent {
     return this.getFocusedRow() === row ? theme.fg("muted", text) : theme.fg("dim", text);
   }
 }
-var ROWS, LABEL_WIDTH = 16, DESCRIPTION = "Priority tier for supported OpenAI and shared ChatGPT Codex transports.", ROW_DETAILS;
+var ROWS, LABEL_WIDTH = 16, DESCRIPTION = "Use faster routing for the selected model when supported by its provider.", ROW_DETAILS;
 var init_fast_mode_selector = __esm(() => {
   init_theme();
   ROWS = ["chat", "workflow"];
@@ -23801,6 +23849,10 @@ var init_keybindings = __esm(() => {
       defaultKeys: windowsKeybindings ? "alt+q" : "alt+up",
       description: "Restore queued messages"
     },
+    "app.message.copy": {
+      defaultKeys: "ctrl+x",
+      description: "Copy fullscreen selection or last agent message"
+    },
     "app.clipboard.pasteImage": {
       defaultKeys: windowsKeybindings ? "alt+v" : "ctrl+v",
       description: "Paste image from clipboard (text fallback)"
@@ -25186,6 +25238,9 @@ function createSettingsChangeHandler(callbacks) {
       case "fullscreen-exit-output":
         callbacks.onFullscreenExitOutputChange(newValue);
         break;
+      case "fullscreen-copy-on-select":
+        callbacks.onFullscreenCopyOnSelectChange(newValue === "true");
+        break;
       case "editor-padding":
         callbacks.onEditorPaddingXChange(parseInt(newValue, 10));
         break;
@@ -25573,6 +25628,13 @@ function insertUiToggles(items, config) {
     values: ["transcript", "resume-hint"]
   });
   insertAfter(items, "fullscreen-exit-output", {
+    id: "fullscreen-copy-on-select",
+    label: "Fullscreen copy on select",
+    description: "Copy selected transcript text automatically on mouse release",
+    currentValue: config.fullscreenCopyOnSelect ? "true" : "false",
+    values: ["true", "false"]
+  });
+  insertAfter(items, "fullscreen-copy-on-select", {
     id: "editor-padding",
     label: "Editor padding",
     description: "Horizontal padding for input editor (0-3)",
@@ -38647,6 +38709,8 @@ function _refreshToolRegistry(options) {
   const allowedToolNames = this._allowedToolNames;
   const excludedToolNames = this._excludedToolNames;
   const isExposedTool = (name) => {
+    if (isMandatoryRuntimeTool(name))
+      return true;
     if (allowedToolNames && !allowedToolNames.has(name)) {
       return false;
     }
@@ -38655,10 +38719,10 @@ function _refreshToolRegistry(options) {
     }
     return true;
   };
-  const registeredTools = this._extensionRunner.getAllRegisteredTools();
+  const registeredTools = this._extensionRunner.getAllRegisteredTools().filter((tool) => !isMandatoryRuntimeTool(tool.definition.name) || isTrustedMandatoryRuntimeTool(tool));
   const allCustomTools = [
     ...registeredTools,
-    ...this._customTools.map((definition) => ({
+    ...this._customTools.filter((definition) => !isMandatoryRuntimeTool(definition.name)).map((definition) => ({
       definition,
       sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" })
     }))
@@ -38779,6 +38843,7 @@ function _buildRuntime(options) {
 var agentSessionToolRegistryMethods;
 var init_agent_session_tool_registry = __esm(() => {
   init_extensions();
+  init_mandatory_runtime_tools();
   init_model_registry();
   init_tools();
   init_session_temp_dir();
@@ -39621,6 +39686,7 @@ class AgentSessionBase {
   _postToolCompactionPreflightError = undefined;
   _pendingPostToolCompactionGuard = undefined;
   _terminatingToolCallIds = new Set;
+  _stopAfterTurnBlockedContinuation = false;
   _disposed = false;
   _branchSummaryAbortController = undefined;
   _sessionSummaryAbortController = undefined;
@@ -39769,11 +39835,12 @@ var init_builtin_packages = __esm(() => {
     { packageName: "@bastani/subagents", workspaceDirName: "subagents", distDirName: "subagents" },
     { packageName: "@bastani/mcp", workspaceDirName: "mcp", distDirName: "mcp" },
     { packageName: "@bastani/web-access", workspaceDirName: "web-access", distDirName: "web-access" },
-    { packageName: "@bastani/intercom", workspaceDirName: "intercom", distDirName: "intercom" }
+    { packageName: "@bastani/intercom", workspaceDirName: "intercom", distDirName: "intercom", mandatory: true }
   ];
   BUILTIN_PACKAGES = WORKSPACE_BUILTINS.map((spec) => ({
     packageName: spec.packageName,
     distDirName: spec.distDirName,
+    mandatory: spec.mandatory === true,
     requiredEntries: requiredEntriesForBuiltin(spec.distDirName),
     sourceCandidates: ({ here, packageDir, isSourceCheckout }) => isSourceCheckout ? [join37(packageDir, "..", spec.workspaceDirName), join37(here, "..", "..", "..", spec.workspaceDirName)] : []
   }));
@@ -43099,7 +43166,9 @@ var init_resource_loader_extensions = __esm(() => {
 var init_resource_loader_reload = __esm(() => {
   init_event_loop();
   init_paths();
+  init_builtin_packages();
   init_loader();
+  init_mandatory_runtime_tools();
   init_resource_loader_assets();
   init_resource_loader_context_files();
   init_resource_loader_discovery();
@@ -44256,6 +44325,28 @@ var init_settings_manager_ui_accessors = __esm(() => {
       state.markModified("fullscreenExitOutput");
       state.save();
     },
+    getFullscreenCopyOnSelect() {
+      return settingsInternals(this).settings.fullscreenCopyOnSelect !== false;
+    },
+    setFullscreenCopyOnSelect(enabled) {
+      const state = settingsInternals(this);
+      state.globalSettings.fullscreenCopyOnSelect = enabled;
+      state.markModified("fullscreenCopyOnSelect");
+      state.save();
+    },
+    getTerminalCapabilityOverrides() {
+      const terminal = settingsInternals(this).settings.terminal;
+      const overrides = {};
+      if (typeof terminal?.hyperlinks === "boolean")
+        overrides.hyperlinks = terminal.hyperlinks;
+      if (terminal?.images === "kitty" || terminal?.images === "iterm2")
+        overrides.images = terminal.images;
+      else if (terminal?.images === false)
+        overrides.images = null;
+      if (typeof terminal?.trueColor === "boolean")
+        overrides.trueColor = terminal.trueColor;
+      return overrides;
+    },
     getEditorPaddingX() {
       return settingsInternals(this).settings.editorPaddingX ?? 0;
     },
@@ -44401,6 +44492,14 @@ var init_resource_loader = __esm(() => {
   init_resource_loader_core();
   init_skill_catalog();
 });
+// src/core/mandatory-resource-loader.ts
+var init_mandatory_resource_loader = __esm(() => {
+  init_builtin_packages();
+  init_loader();
+  init_mandatory_runtime_tools();
+  init_skill_catalog();
+});
+
 // src/core/model-resolver-defaults.ts
 function findPreferredAvailableModel(availableModels) {
   for (const [provider, defaultId] of Object.entries(defaultModelPerProvider)) {
@@ -44441,7 +44540,7 @@ var init_model_resolver_defaults = __esm(() => {
     huggingface: "moonshotai/Kimi-K2.6",
     fireworks: "accounts/fireworks/models/kimi-k2p6",
     together: "moonshotai/Kimi-K2.6",
-    baseten: "zai-org/GLM-5.2",
+    baseten: "zai-org/GLM-5.3",
     opencode: "kimi-k2.6",
     "opencode-go": "kimi-k2.6",
     "kimi-coding": "kimi-for-coding",
@@ -45099,6 +45198,7 @@ var init_session_cwd = __esm(() => {
 var init_agent_session_services = __esm(() => {
   init_config();
   init_paths();
+  init_mandatory_resource_loader();
   init_model_runtime();
   init_resource_loader();
   init_sdk();
@@ -45435,6 +45535,7 @@ var init_sdk = __esm(() => {
   init_agent_session();
   init_auth_guidance();
   init_codex_fast_mode();
+  init_mandatory_resource_loader();
   init_messages();
   init_model_resolver();
   init_model_runtime();
@@ -45538,7 +45639,12 @@ var init_list_models = __esm(() => {
 });
 
 // src/cli/startup-ui.ts
-import { ProcessTerminal, setKeybindings, TuiMainScreen } from "@earendil-works/pi-tui";
+import {
+  ProcessTerminal,
+  setCapabilityOverrides,
+  setKeybindings,
+  TuiMainScreen
+} from "@earendil-works/pi-tui";
 var init_startup_ui = __esm(() => {
   init_config();
   init_keybindings();
@@ -45626,7 +45732,7 @@ var init_main_first_time_setup = __esm(() => {
   init_startup_ui();
 });
 // src/cli/session-picker.ts
-import { ProcessTerminal as ProcessTerminal2, setKeybindings as setKeybindings2, TuiMainScreen as TuiMainScreen2 } from "@earendil-works/pi-tui";
+import { ProcessTerminal as ProcessTerminal2, setCapabilityOverrides as setCapabilityOverrides2, setKeybindings as setKeybindings2, TuiMainScreen as TuiMainScreen2 } from "@earendil-works/pi-tui";
 var init_session_picker = __esm(() => {
   init_config();
   init_keybindings();
@@ -45634,7 +45740,7 @@ var init_session_picker = __esm(() => {
 });
 
 // src/main-session.ts
-import { ProcessTerminal as ProcessTerminal3, setKeybindings as setKeybindings3, TuiMainScreen as TuiMainScreen3 } from "@earendil-works/pi-tui";
+import { ProcessTerminal as ProcessTerminal3, setCapabilityOverrides as setCapabilityOverrides3, setKeybindings as setKeybindings3, TuiMainScreen as TuiMainScreen3 } from "@earendil-works/pi-tui";
 import chalk10 from "chalk";
 var init_main_session = __esm(() => {
   init_session_picker();
@@ -48452,7 +48558,7 @@ var init_slash_commands = __esm(() => {
     { name: "tree", description: "Navigate session tree (switch branches)" },
     { name: "thinking", description: "Set thinking level", argumentHint: "<level>" },
     { name: "scoped-models", description: "Enable/disable models for ctrl+p cycling" },
-    { name: "fast", description: "Configure OpenAI fast mode for chat and workflows in supported models" },
+    { name: "fast", description: "Configure fast mode for chat and workflows on supported models" },
     { name: "export", description: "Export session (HTML default, or specify path: .html/.jsonl)" },
     { name: "import", description: "Import and resume a session from a JSONL file" },
     { name: "share", description: "Share session as a secret GitHub gist" },
@@ -49078,6 +49184,7 @@ function createFullscreenTui(options) {
       openUrl: openBrowser
     }),
     onRightClickPaste: options.onRightClickPaste,
+    copyOnSelect: options.copyOnSelect,
     copySelection: options.copySelection ?? copySelectionToHostClipboard
   }, options.shouldHandleViewportInput, options.onOverlayUnhandledInput);
 }
@@ -49119,7 +49226,7 @@ function createInteractiveTuiReference(getTui) {
     getPrototypeOf: () => Reflect.getPrototypeOf(getTui())
   });
 }
-var viewportInputListeners, viewportInputGates, overlayUnhandledInputHandlers, viewportInputReplays, viewportInputSubscriptions, SGR_MOUSE_SEQUENCE, LEFT_MOUSE_MODIFIER_MASK, AtomicTuiAltScreen, AtomicTuiMainScreen;
+var viewportInputListeners, viewportInputGates, overlayUnhandledInputHandlers, viewportInputReplays, overlayOwnedSelections, viewportInputSubscriptions, SGR_MOUSE_SEQUENCE, LEFT_MOUSE_MODIFIER_MASK, AtomicTuiAltScreen, AtomicTuiMainScreen;
 var init_interactive_tui = __esm(() => {
   init_clipboard();
   init_open_browser();
@@ -49128,6 +49235,7 @@ var init_interactive_tui = __esm(() => {
   viewportInputGates = new WeakMap;
   overlayUnhandledInputHandlers = new WeakMap;
   viewportInputReplays = new WeakSet;
+  overlayOwnedSelections = new WeakSet;
   viewportInputSubscriptions = new WeakMap;
   SGR_MOUSE_SEQUENCE = /^\x1b\[<(\d+);\d+;\d+([Mm])/;
   LEFT_MOUSE_MODIFIER_MASK = 4 | 8 | 16;
@@ -49143,8 +49251,20 @@ var init_interactive_tui = __esm(() => {
       deferral.shouldDeferViewportInputToOverlay = () => !viewportInputReplays.has(this) && deferToOverlay?.() === true;
     }
     applyLineResets(lines) {
+      if (overlayOwnedSelections.has(this) && !this.isFocusedOverlay())
+        this.clearOverlayOwnedSelection();
       return stripOverlayActiveRowMarker(super.applyLineResets(lines));
     }
+    clearOverlayOwnedSelection() {
+      const selection = this;
+      selection.selectionAnchor = undefined;
+      selection.selectionFocus = undefined;
+      selection.selectionInitialRange = undefined;
+      selection.selectionPressActive = false;
+      selection.selectionDragged = false;
+      selection.lastClick = undefined;
+      overlayOwnedSelections.delete(this);
+    }
     isPiTuiMouseSequence(data) {
       if (parseMouseSequences(data))
         return true;
@@ -49221,6 +49341,7 @@ var init_interactive_tui = __esm(() => {
         if (isLeftMouseButton(sequence))
           viewportListener(sequence.data);
       }
+      overlayOwnedSelections.add(this);
     }
     replayViewportInput(viewportListener, data) {
       viewportInputReplays.add(this);
@@ -49288,7 +49409,11 @@ var init_interactive_tui = __esm(() => {
 });
 
 // src/modes/interactive/interactive-mode-base.ts
-import { isKeyRelease as isKeyRelease3, isViewportTUI } from "@earendil-works/pi-tui";
+import {
+  isKeyRelease as isKeyRelease3,
+  isViewportTUI,
+  setCapabilityOverrides as setCapabilityOverrides4
+} from "@earendil-works/pi-tui";
 function isFullscreenViewportAction(data, keybindings) {
   return FULLSCREEN_VIEWPORT_ACTIONS.some((action) => keybindings.matches(data, action));
 }
@@ -49349,6 +49474,18 @@ class InteractiveModeBase {
       return false;
     return this.defaultEditor.handleInput(data);
   }
+  setFullscreenCopyOnSelect(enabled) {
+    if (this.renderer.mode === "fullscreen")
+      this.renderer.setCopyOnSelect(enabled);
+  }
+  getFullscreenCopyOnSelect() {
+    return this.renderer.mode === "fullscreen" ? this.renderer.getCopyOnSelect() : undefined;
+  }
+  async copyActiveFullscreenSelection() {
+    if (this.renderer.mode !== "fullscreen" || !this.renderer.hasActiveSelection())
+      return;
+    return this.renderer.copyActiveSelectionToClipboard();
+  }
   onRightClickPaste = () => {
     this.handleRightClickPaste();
   };
@@ -49548,11 +49685,13 @@ class InteractiveModeBase {
       await this.rebindCurrentSession();
       await this.themeController.applyFromSettings();
     });
+    setCapabilityOverrides4(this.settingsManager.getTerminalCapabilityOverrides());
     this.version = VERSION;
     this.renderer = createInteractiveTui({
       showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
       logDirectory: runtimeHost.services.agentDir,
       terminal: options.terminal,
+      copyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
       onRightClickPaste: this.onRightClickPaste,
       shouldHandleViewportInput: this.shouldHandleViewportInput,
       onOverlayUnhandledInput: this.onOverlayUnhandledInput,
@@ -50675,6 +50814,7 @@ var init_interactive_deferred_startup = __esm(() => {
     try {
       await this.bindCurrentSessionExtensions();
       await this.session.reload({ reason: "startup" });
+      this.applyRuntimeSettings();
       this.rebuildChatFromMessages();
       if (!this.promptTurnWorkingLoaderActive) {
         this.stopWorkingLoader();
@@ -51363,6 +51503,7 @@ ${warningLines}`, 0, 0));
 });
 
 // src/modes/interactive/interactive-session-runtime.ts
+import { setCapabilityOverrides as setCapabilityOverrides5 } from "@earendil-works/pi-tui";
 var init_interactive_session_runtime = __esm(() => {
   init_interactive_mode_base();
   init_interactive_mode_deps();
@@ -51449,6 +51590,8 @@ var init_interactive_session_runtime = __esm(() => {
     }
   };
   InteractiveModeBase.prototype.applyRuntimeSettings = function() {
+    setCapabilityOverrides5(this.settingsManager.getTerminalCapabilityOverrides());
+    this.setFullscreenCopyOnSelect(this.settingsManager.getFullscreenCopyOnSelect());
     this.transcriptScrollView?.setScrollbar(this.settingsManager.getFullscreenScrollbar());
     this.footer.setSession(this.session);
     this.usageMeter.setSession(this.session);
@@ -52965,6 +53108,9 @@ var init_interactive_input_handling = __esm(() => {
     });
     this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
     this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
+    this.defaultEditor.onAction("app.message.copy", () => {
+      this.handleCopyCommand({ preferSelection: true });
+    });
     this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
     this.defaultEditor.onAction("app.session.tree", () => this.showTreeSelector());
     this.defaultEditor.onAction("app.session.fork", () => this.showUserMessageSelector());
@@ -53872,7 +54018,8 @@ var init_interactive_agent_events = __esm(() => {
         } else if (event.reason === "manual") {
           this.manualCompactionTakeoverPending = false;
         }
-        if (!manualTakeoverPending && this.settingsManager.getShowTerminalProgress()) {
+        const resumesActiveRun = event.midTurn && !event.aborted && !event.errorMessage && !manualTakeoverPending;
+        if (!manualTakeoverPending && !resumesActiveRun && this.settingsManager.getShowTerminalProgress()) {
           this.ui.terminal.setProgress(false);
         }
         if (!manualTakeoverPending && this.autoCompactionEscapeHandlerSaved) {
@@ -54888,7 +55035,7 @@ var init_interactive_selectors = __esm(() => {
   };
   InteractiveModeBase.prototype.showFastModeSelector = function() {
     if (!this.hasCodexFastModeSupportedModels()) {
-      this.showWarning("Codex fast mode requires a supported OpenAI or shared ChatGPT Codex transport model.");
+      this.showWarning("Fast mode isn't available for any configured model.");
       return;
     }
     this.showSelector((done) => {
@@ -54947,6 +55094,7 @@ var init_interactive_selectors = __esm(() => {
         showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
         fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
         fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
+        fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
         editorPaddingX: this.settingsManager.getEditorPaddingX(),
         outputPad: this.settingsManager.getOutputPad(),
         showCacheMissNotices: this.settingsManager.getShowCacheMissNotices(),
@@ -55064,6 +55212,10 @@ var init_interactive_selectors = __esm(() => {
         onFullscreenExitOutputChange: (output) => {
           this.settingsManager.setFullscreenExitOutput(output);
         },
+        onFullscreenCopyOnSelectChange: (enabled) => {
+          this.settingsManager.setFullscreenCopyOnSelect(enabled);
+          this.setFullscreenCopyOnSelect(enabled);
+        },
         onEditorPaddingXChange: (padding) => {
           this.settingsManager.setEditorPaddingX(padding);
           this.defaultEditor.setPaddingX(padding);
@@ -56050,18 +56202,8 @@ var init_interactive_slash_commands = __esm(() => {
         activeHeader.setExpanded(this.toolOutputExpanded);
       }
       setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-      this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+      this.applyRuntimeSettings();
       await this.themeController.applyFromSettings();
-      const editorPaddingX = this.settingsManager.getEditorPaddingX();
-      const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
-      this.defaultEditor.setPaddingX(editorPaddingX);
-      this.defaultEditor.setAutocompleteMaxVisible(autocompleteMaxVisible);
-      if (this.editor !== this.defaultEditor) {
-        this.editor.setPaddingX?.(editorPaddingX);
-        this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
-      }
-      this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-      this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
       this.setupAutocompleteProvider();
       const runner = this.session.extensionRunner;
       this.setupExtensionShortcuts(runner);
@@ -56254,7 +56396,12 @@ Gist: ${hyperlink3(gistUrl, gistUrl)}`);
       }
     }
   };
-  InteractiveModeBase.prototype.handleCopyCommand = async function() {
+  InteractiveModeBase.prototype.handleCopyCommand = async function(options = {}) {
+    if (options.preferSelection && this.getFullscreenCopyOnSelect() === false) {
+      const selectionCopied = await this.copyActiveFullscreenSelection();
+      if (selectionCopied !== undefined)
+        return;
+    }
     const text = this.session.getLastAssistantText();
     if (!text) {
       this.showError("No agent messages to copy yet.");
@@ -56801,6 +56948,7 @@ var init_rpc_extension_ui = __esm(() => {
 });
 
 // src/modes/rpc/rpc-session-binding.ts
+import { setCapabilityOverrides as setCapabilityOverrides6 } from "@earendil-works/pi-tui";
 var init_rpc_session_binding = __esm(() => {
   init_footer_data_provider();
   init_output_guard();
@@ -56877,7 +57025,7 @@ var init_config_selector = __esm(() => {
 });
 
 // src/cli/config-selector.ts
-import { ProcessTerminal as ProcessTerminal6, TuiMainScreen as TuiMainScreen8 } from "@earendil-works/pi-tui";
+import { ProcessTerminal as ProcessTerminal6, setCapabilityOverrides as setCapabilityOverrides7, TuiMainScreen as TuiMainScreen8 } from "@earendil-works/pi-tui";
 var init_config_selector2 = __esm(() => {
   init_config_selector();
   init_theme();
@@ -56924,6 +57072,7 @@ var init_package_manager_cli = __esm(() => {
 });
 
 // src/main.ts
+import { setCapabilityOverrides as setCapabilityOverrides8 } from "@earendil-works/pi-tui";
 import chalk15 from "chalk";
 var init_main = __esm(() => {
   init_args();
@@ -56938,6 +57087,7 @@ var init_main = __esm(() => {
   init_auth_storage();
   init_builtin_packages();
   init_http_dispatcher();
+  init_mandatory_resource_loader();
   init_model_resolver();
   init_model_runtime();
   init_output_guard();
@@ -57373,6 +57523,59 @@ function isSessionInfo(value) {
   return session.status === undefined || typeof session.status === "string";
 }
 
+// dist/builtin/intercom/group.ts
+function intercomGroupFromEnv() {
+  return process.env.ATOMIC_INTERCOM_GROUP ?? process.env.PI_INTERCOM_GROUP;
+}
+function normalizeGroup(value) {
+  if (typeof value !== "string")
+    return DEFAULT_GROUP;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : DEFAULT_GROUP;
+}
+function normalizeGroups(values, legacyGroup) {
+  const groups = new Set;
+  for (const value of values ?? [])
+    groups.add(normalizeGroup(value));
+  if (legacyGroup !== undefined)
+    groups.add(normalizeGroup(legacyGroup));
+  if (groups.size === 0)
+    groups.add(DEFAULT_GROUP);
+  return groups;
+}
+function validateRuntimeGroup(value) {
+  if (typeof value !== "string" || value.trim().length === 0) {
+    throw new Error("A non-empty intercom group name is required");
+  }
+  const group = normalizeGroup(value);
+  if (RESERVED_RUNTIME_GROUPS.has(group.toLowerCase())) {
+    throw new Error(`Intercom group name "${group}" is reserved; choose another name`);
+  }
+  return group;
+}
+function resolveHomeGroup(config, ctx) {
+  const fromPolicy = ctx?.subagentPolicy?.intercomGroup;
+  if (typeof fromPolicy === "string" && fromPolicy.trim().length > 0) {
+    return normalizeGroup(fromPolicy);
+  }
+  const fromContext = ctx?.orchestrationContext?.intercomGroup;
+  if (typeof fromContext === "string" && fromContext.trim().length > 0) {
+    return normalizeGroup(fromContext);
+  }
+  const fromEnv = intercomGroupFromEnv();
+  if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
+    return normalizeGroup(fromEnv);
+  }
+  if (config && typeof config.group === "string" && config.group.trim().length > 0) {
+    return normalizeGroup(config.group);
+  }
+  return DEFAULT_GROUP;
+}
+var DEFAULT_GROUP = "default", RESERVED_RUNTIME_GROUPS;
+var init_group = __esm(() => {
+  RESERVED_RUNTIME_GROUPS = new Set(["true", "auto"]);
+});
+
 // dist/builtin/intercom/broker/client.ts
 import { EventEmitter as EventEmitter2 } from "events";
 import net from "net";
@@ -57380,10 +57583,11 @@ import { randomUUID as randomUUID8 } from "crypto";
 function toError(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
-var BROKER_SOCKET, PRESENCE_ACK_TIMEOUT_MS = 5000, IntercomClient;
+var BROKER_SOCKET, GROUP_REQUEST_TIMEOUT_MS = 5000, PRESENCE_ACK_TIMEOUT_MS = 5000, IntercomClient;
 var init_client = __esm(() => {
   init_paths2();
   init_pending_send_registry();
+  init_group();
   BROKER_SOCKET = getBrokerSocketPath();
   IntercomClient = class IntercomClient extends EventEmitter2 {
     returnAddress;
@@ -57392,8 +57596,11 @@ var init_client = __esm(() => {
     _supervisorSessionId = null;
     _messageSource;
     pendingSends = new PendingSendRegistry;
+    pendingGroupLists = new Map;
     pendingLists = new Map;
     pendingPresence = new Map;
+    pendingMemberships = new Map;
+    _groups = normalizeGroups();
     pendingLiveWorkflowStageRoutes = new Map;
     pendingSupervisorAuthorizations = new Map;
     disconnecting = false;
@@ -57406,17 +57613,23 @@ var init_client = __esm(() => {
     }
     failPending(error) {
       this.pendingSends.rejectAll(error);
+      for (const pending of this.pendingGroupLists.values())
+        pending.reject(error);
       for (const pending of this.pendingLists.values())
         pending.reject(error);
       for (const pending of this.pendingSupervisorAuthorizations.values())
         pending.reject(error);
       for (const pending of this.pendingPresence.values())
         pending.reject(error);
+      for (const pending of this.pendingMemberships.values())
+        pending.reject(error);
       for (const pending of this.pendingLiveWorkflowStageRoutes.values())
         pending.reject(error);
       this.pendingLists.clear();
+      this.pendingGroupLists.clear();
       this.pendingSupervisorAuthorizations.clear();
       this.pendingPresence.clear();
+      this.pendingMemberships.clear();
       this.pendingLiveWorkflowStageRoutes.clear();
     }
     get sessionId() {
@@ -57425,6 +57638,9 @@ var init_client = __esm(() => {
     get supervisorSessionId() {
       return this._supervisorSessionId;
     }
+    get groups() {
+      return [...this._groups];
+    }
     isConnected() {
       const socket = this.socket;
       return Boolean(socket && this._sessionId && !this.disconnecting && !socket.destroyed && !socket.writableEnded && socket.writable);
@@ -57447,6 +57663,7 @@ var init_client = __esm(() => {
         return Promise.reject(new Error("Already connected"));
       }
       this._messageSource = messageSource ?? readSubagentMessageSource();
+      this._groups = normalizeGroups(session.groups, session.group);
       return new Promise((resolve15, reject) => {
         const socket = net.connect(BROKER_SOCKET);
         this.socket = socket;
@@ -57598,6 +57815,18 @@ var init_client = __esm(() => {
           pending.resolve(sessions);
           break;
         }
+        case "groups": {
+          const { requestId, groups } = brokerMessage;
+          if (typeof requestId !== "string" || !Array.isArray(groups) || !groups.every((summary) => typeof summary === "object" && summary !== null && typeof summary.group === "string" && typeof summary.sessionCount === "number" && typeof summary.member === "boolean")) {
+            throw new Error("Invalid groups message");
+          }
+          const pending = this.pendingGroupLists.get(requestId);
+          if (!pending)
+            return;
+          this.pendingGroupLists.delete(requestId);
+          pending.resolve(groups);
+          break;
+        }
         case "supervisor_authorized": {
           const { requestId, capability, supervisorSessionId, childName } = brokerMessage;
           if (typeof requestId !== "string" || typeof capability !== "string" || typeof supervisorSessionId !== "string" || typeof childName !== "string") {
@@ -57728,18 +57957,39 @@ var init_client = __esm(() => {
           if (!pending)
             return;
           this.pendingPresence.delete(brokerMessage.requestId);
+          this._groups = pending.groups === undefined ? normalizeGroups(undefined, brokerMessage.group) : normalizeGroups(pending.groups);
           pending.resolve(brokerMessage.group);
           break;
         }
+        case "membership_ack": {
+          const { requestId, groups } = brokerMessage;
+          if (typeof requestId !== "string" || !Array.isArray(groups) || !groups.every((group) => typeof group === "string")) {
+            throw new Error("Invalid membership_ack message");
+          }
+          const pending = this.pendingMemberships.get(requestId);
+          if (!pending)
+            return;
+          this.pendingMemberships.delete(requestId);
+          const normalizedGroups = [...normalizeGroups(groups)];
+          this._groups = new Set(normalizedGroups);
+          pending.resolve(normalizedGroups);
+          break;
+        }
         case "presence_failed": {
           if (typeof brokerMessage.requestId !== "string" || typeof brokerMessage.reason !== "string") {
             throw new Error("Invalid presence_failed message");
           }
-          const pending = this.pendingPresence.get(brokerMessage.requestId);
-          if (!pending)
+          const presence = this.pendingPresence.get(brokerMessage.requestId);
+          if (presence) {
+            this.pendingPresence.delete(brokerMessage.requestId);
+            presence.reject(new Error(brokerMessage.reason));
+            break;
+          }
+          const membership = this.pendingMemberships.get(brokerMessage.requestId);
+          if (!membership)
             return;
-          this.pendingPresence.delete(brokerMessage.requestId);
-          pending.reject(new Error(brokerMessage.reason));
+          this.pendingMemberships.delete(brokerMessage.requestId);
+          membership.reject(new Error(brokerMessage.reason));
           break;
         }
         case "peer_disconnected": {
@@ -57835,6 +58085,78 @@ var init_client = __esm(() => {
         }
       });
     }
+    listGroups() {
+      let socket;
+      try {
+        socket = this.requireActiveSocket();
+      } catch (error) {
+        return Promise.reject(toError(error));
+      }
+      const requestId = randomUUID8();
+      return new Promise((resolve15, reject) => {
+        const timeout = setTimeout(() => {
+          if (!this.pendingGroupLists.delete(requestId))
+            return;
+          reject(new Error("List groups timeout"));
+        }, GROUP_REQUEST_TIMEOUT_MS);
+        this.pendingGroupLists.set(requestId, {
+          resolve: (groups) => {
+            clearTimeout(timeout);
+            resolve15(groups);
+          },
+          reject: (error) => {
+            clearTimeout(timeout);
+            reject(error);
+          }
+        });
+        try {
+          writeMessage(socket, { type: "list_groups", requestId });
+        } catch (error) {
+          clearTimeout(timeout);
+          this.pendingGroupLists.delete(requestId);
+          reject(toError(error));
+        }
+      });
+    }
+    joinGroup(group) {
+      return this.updateMembership("join_group", group);
+    }
+    leaveGroup(group) {
+      return this.updateMembership("leave_group", group);
+    }
+    updateMembership(type, group) {
+      let socket;
+      try {
+        socket = this.requireActiveSocket();
+      } catch (error) {
+        return Promise.reject(toError(error));
+      }
+      const requestId = randomUUID8();
+      return new Promise((resolve15, reject) => {
+        const timeout = setTimeout(() => {
+          if (!this.pendingMemberships.delete(requestId))
+            return;
+          reject(new Error("Membership update timeout"));
+        }, GROUP_REQUEST_TIMEOUT_MS);
+        this.pendingMemberships.set(requestId, {
+          resolve: (groups) => {
+            clearTimeout(timeout);
+            resolve15(groups);
+          },
+          reject: (error) => {
+            clearTimeout(timeout);
+            reject(error);
+          }
+        });
+        try {
+          writeMessage(socket, group === undefined ? { type, requestId } : { type, requestId, group });
+        } catch (error) {
+          clearTimeout(timeout);
+          this.pendingMemberships.delete(requestId);
+          reject(toError(error));
+        }
+      });
+    }
     authorizeSupervisorChild(childName, capability) {
       let socket;
       try {
@@ -57966,6 +58288,10 @@ var init_client = __esm(() => {
         return false;
       }
       writeMessage(socket, { type: "presence", ...updates });
+      if (updates.groups !== undefined)
+        this._groups = normalizeGroups(updates.groups, updates.group);
+      else if (updates.group !== undefined)
+        this._groups = normalizeGroups(undefined, updates.group);
       return true;
     }
     updatePresenceAcked(updates) {
@@ -57990,7 +58316,11 @@ var init_client = __esm(() => {
             return;
           reject(new Error("Presence update timeout"));
         }, PRESENCE_ACK_TIMEOUT_MS);
-        this.pendingPresence.set(requestId, { resolve: wrappedResolve, reject: wrappedReject });
+        this.pendingPresence.set(requestId, {
+          resolve: wrappedResolve,
+          reject: wrappedReject,
+          ...updates.groups === undefined ? {} : { groups: [...updates.groups] }
+        });
         try {
           writeMessage(socket, { type: "presence", ...updates, requestId });
         } catch (error) {
@@ -58541,12 +58871,6 @@ function loadConfig2() {
       }
       config.maxPendingAsks = Number(parsedConfig.maxPendingAsks);
     }
-    if (Object.hasOwn(parsedConfig, "enabled")) {
-      if (typeof parsedConfig.enabled !== "boolean") {
-        throw new Error(`"enabled" must be a boolean`);
-      }
-      config.enabled = parsedConfig.enabled;
-    }
     if (Object.hasOwn(parsedConfig, "replyHint")) {
       if (typeof parsedConfig.replyHint !== "boolean") {
         throw new Error(`"replyHint" must be a boolean`);
@@ -58583,7 +58907,6 @@ var init_config3 = __esm(() => {
     brokerArgs: [...DEFAULT_BROKER_ARGS],
     confirmSend: false,
     maxPendingAsks: DEFAULT_MAX_PENDING_REPLY_WAITS,
-    enabled: true,
     replyHint: true
   };
 });
@@ -58769,49 +59092,6 @@ var init_parent_ask_handoff = __esm(() => {
   PROCESS_PARENT_ASK_CLAIMS = Symbol.for("atomic/subagents/parent-ask-claims@1");
 });
 
-// dist/builtin/intercom/group.ts
-function intercomGroupFromEnv() {
-  return process.env.ATOMIC_INTERCOM_GROUP ?? process.env.PI_INTERCOM_GROUP;
-}
-function normalizeGroup(value) {
-  if (typeof value !== "string")
-    return DEFAULT_GROUP;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : DEFAULT_GROUP;
-}
-function validateRuntimeGroup(value) {
-  if (typeof value !== "string" || value.trim().length === 0) {
-    throw new Error("A non-empty intercom group name is required");
-  }
-  const group = normalizeGroup(value);
-  if (RESERVED_RUNTIME_GROUPS.has(group.toLowerCase())) {
-    throw new Error(`Intercom group name "${group}" is reserved; choose another name`);
-  }
-  return group;
-}
-function resolveHomeGroup(config, ctx) {
-  const fromPolicy = ctx?.subagentPolicy?.intercomGroup;
-  if (typeof fromPolicy === "string" && fromPolicy.trim().length > 0) {
-    return normalizeGroup(fromPolicy);
-  }
-  const fromContext = ctx?.orchestrationContext?.intercomGroup;
-  if (typeof fromContext === "string" && fromContext.trim().length > 0) {
-    return normalizeGroup(fromContext);
-  }
-  const fromEnv = intercomGroupFromEnv();
-  if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
-    return normalizeGroup(fromEnv);
-  }
-  if (config && typeof config.group === "string" && config.group.trim().length > 0) {
-    return normalizeGroup(config.group);
-  }
-  return DEFAULT_GROUP;
-}
-var DEFAULT_GROUP = "default", RESERVED_RUNTIME_GROUPS;
-var init_group = __esm(() => {
-  RESERVED_RUNTIME_GROUPS = new Set(["true", "auto"]);
-});
-
 // dist/builtin/intercom/intercom-utils.ts
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
@@ -59484,23 +59764,25 @@ workflow stage, use the exact \`<runId>:<stageKey>\` target; send messages to pe
 queue automatically.
 
 Usage:
-  intercom({ action: "list" })                    → List sessions in your group
-  intercom({ action: "list", group: "name" })     → Read-only peek at another group's sessions
-  intercom({ action: "join", group: "name" })     → Join or create a named group
+  intercom({ action: "list" })                    → List sessions visible through your groups
+  intercom({ action: "list", group: "name" })     → Read-only peek at one group's sessions
+  intercom({ action: "groups" })                  → Discover every available group and your memberships
+  intercom({ action: "join", group: "name" })     → Add a named group membership
+  intercom({ action: "leave", group: "name" })    → Leave one named group
   intercom({ action: "leave" })                   → Return to your resolved home group
-  intercom({ action: "send", to: "session-name", message: "..." })  → Send message (own group only)
+  intercom({ action: "send", to: "session-name", message: "..." })  → Send message (shared group only)
   intercom({ action: "ask", to: "session-name", message: "..." })   → Ask and wait for reply
   intercom({ action: "reply", message: "..." })                      → Reply to the active or exact pending ask
   intercom({ action: "pending" })                                      → List unresolved inbound asks
-  intercom({ action: "status" })                  → Show connection status and your group
+  intercom({ action: "status" })                  → Show connection status and all your groups
 
-The "join" action changes this session's group in place. "default" is the shared
-default group; "true" and "auto" are reserved for subagent auto-groups. Joining
-does not grant cross-group access: contact_supervisor is the only cross-group path.`,
-    promptSnippet: "Use to coordinate with other local agent sessions in your intercom group: list peers, send updates, ask for help, or check intercom connectivity. Groups are isolated; you can only message sessions in your own group.",
+The "join" action is additive. "default" is the shared default group; "true" and
+"auto" are reserved for subagent auto-groups. Ordinary delivery requires at least
+one shared membership; contact_supervisor remains the only cross-group path.`,
+    promptSnippet: "Use to coordinate with other local agent sessions that share an intercom group: discover groups or peers, send updates, ask for help, or check connectivity. Ordinary messages require a shared membership.",
     parameters: Type14.Object({
       action: Type14.String({
-        description: "Action: 'list', 'join', 'leave', 'send', 'ask', 'reply', 'pending', or 'status'"
+        description: "Action: 'list', 'groups', 'join', 'leave', 'send', 'ask', 'reply', 'pending', or 'status'"
       }),
       to: Type14.Optional(Type14.String({
         description: "Live session name, exact full session ID, or exact `<runId>:<stageKey>` for a known workflow stage; send messages to pending stages queue automatically (for 'send', 'ask', or targeted 'reply')"
@@ -59518,7 +59800,7 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
         description: "Exact pending-ask message ID; disambiguates concurrent asks, including asks from one sender"
       })),
       group: Type14.Optional(Type14.String({
-        description: "Group name for 'join'; read-only group filter for 'list'/'status'. 'send'/'ask' are locked to your own group."
+        description: "Group name for 'join' or optional targeted 'leave'; read-only group filter for 'list'/'status'. 'send'/'ask' use shared memberships."
       }))
     }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
@@ -59534,17 +59816,20 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
       }
       syncPresenceIdentity(ctx.sessionManager.getSessionId());
       const { action, to, message, attachments, replyTo, group } = params;
-      const requestedGroup = typeof group === "string" && group.trim() ? normalizeGroup(group) : undefined;
-      const resolveOwnGroup = async () => {
-        const sessions = await connectedClient.listSessions();
-        const self = sessions.find((s) => s.id === connectedClient.sessionId);
-        return normalizeGroup(self?.group);
+      const resolveOwnGroups = (sessions) => {
+        if (Array.isArray(connectedClient.groups)) {
+          return connectedClient.groups.map((membership) => normalizeGroup(membership));
+        }
+        const self = sessions?.find((session) => session.id === connectedClient.sessionId);
+        return [...normalizeGroups(self?.groups, self?.group)];
       };
+      const isOnlyOwnGroup = (candidate, ownGroups) => candidate !== undefined && ownGroups.length === 1 && ownGroups[0] === candidate;
+      const requestedGroup = typeof group === "string" && group.trim() ? normalizeGroup(group) : undefined;
       if ((action === "send" || action === "ask") && requestedGroup) {
-        const ownGroup = await resolveOwnGroup();
-        if (requestedGroup !== ownGroup) {
+        const ownGroups = resolveOwnGroups();
+        if (!ownGroups.includes(requestedGroup)) {
           return {
-            content: [{ type: "text", text: `The 'group' parameter is read-only for 'list'/'status'. '${action}' is always locked to your own group ("${ownGroup}"); it cannot target group "${requestedGroup}".` }],
+            content: [{ type: "text", text: `The 'group' parameter is read-only for 'list'/'status'. '${action}' is always locked to your groups (${ownGroups.join(", ")}); it cannot target group "${requestedGroup}".` }],
             isError: true,
             details: { error: true }
           };
@@ -59563,15 +59848,12 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
             };
           }
           try {
-            const acknowledgedGroup = await connectedClient.updatePresenceAcked({ group: targetGroup });
-            if (acknowledgedGroup !== targetGroup) {
-              throw new Error(`Broker acknowledged group "${acknowledgedGroup}" instead of "${targetGroup}"`);
-            }
-            deps.setJoinedGroup(targetGroup);
+            const groups = await connectedClient.joinGroup(targetGroup);
+            deps.setJoinedGroups(groups);
             return {
-              content: [{ type: "text", text: `Joined intercom group "${targetGroup}".` }],
+              content: [{ type: "text", text: `Joined intercom group "${targetGroup}". Memberships: ${groups.join(", ")}.` }],
               isError: false,
-              details: { group: targetGroup }
+              details: { group: targetGroup, groups }
             };
           } catch (error) {
             return {
@@ -59582,37 +59864,59 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
           }
         }
         case "leave": {
-          if (typeof group === "string" && group.trim().length > 0) {
+          let targetGroup;
+          let homeGroup;
+          try {
+            targetGroup = typeof group === "string" && group.trim().length > 0 ? validateRuntimeGroup(group) : undefined;
+            if (targetGroup === undefined)
+              homeGroup = validateRuntimeGroup(deps.homeGroup());
+          } catch (error) {
             return {
-              content: [{ type: "text", text: "The 'leave' action does not accept a group; it returns to the resolved home group." }],
+              content: [{ type: "text", text: `Cannot leave intercom group: ${getErrorMessage(error)}` }],
               isError: true,
               details: { error: true }
             };
           }
-          let targetGroup;
           try {
-            targetGroup = validateRuntimeGroup(deps.homeGroup());
+            let groups;
+            if (targetGroup === undefined) {
+              if (homeGroup === undefined)
+                throw new Error("Intercom home group is unavailable");
+              await connectedClient.updatePresenceAcked({ groups: [homeGroup] });
+              groups = connectedClient.groups;
+              deps.clearJoinedGroups();
+            } else {
+              groups = await connectedClient.leaveGroup(targetGroup);
+              deps.setJoinedGroups(groups);
+            }
+            const text = targetGroup === undefined ? `Returned to home intercom membership. Memberships: ${groups.join(", ")}.` : `Left intercom group "${targetGroup}". Memberships: ${groups.join(", ")}.`;
+            return {
+              content: [{ type: "text", text }],
+              isError: false,
+              details: targetGroup === undefined ? { group: homeGroup, groups } : { groups }
+            };
           } catch (error) {
             return {
-              content: [{ type: "text", text: `Cannot leave intercom group: ${getErrorMessage(error)}` }],
+              content: [{ type: "text", text: `Failed to leave group: ${getErrorMessage(error)}` }],
               isError: true,
               details: { error: true }
             };
           }
+        }
+        case "groups": {
           try {
-            const acknowledgedGroup = await connectedClient.updatePresenceAcked({ group: targetGroup });
-            if (acknowledgedGroup !== targetGroup) {
-              throw new Error(`Broker acknowledged group "${acknowledgedGroup}" instead of "${targetGroup}"`);
-            }
-            deps.clearJoinedGroup();
+            const groups = await connectedClient.listGroups();
+            const lines = groups.map(({ group: groupName, sessionCount, member }) => `- ${groupName} — ${sessionCount} session${sessionCount === 1 ? "" : "s"}${member ? " [member]" : ""}`);
             return {
-              content: [{ type: "text", text: `Returned to home intercom group "${targetGroup}".` }],
+              content: [{ type: "text", text: `**Intercom groups:**
+${lines.join(`
+`)}` }],
               isError: false,
-              details: { group: targetGroup }
+              details: { groups }
             };
           } catch (error) {
             return {
-              content: [{ type: "text", text: `Failed to leave group: ${getErrorMessage(error)}` }],
+              content: [{ type: "text", text: `Failed to list groups: ${getErrorMessage(error)}` }],
               isError: true,
               details: { error: true }
             };
@@ -59622,7 +59926,7 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
           try {
             const mySessionId = connectedClient.sessionId;
             const ownSessions = await connectedClient.listSessions();
-            const currentSession = ownSessions.find((s) => s.id === mySessionId);
+            const currentSession = ownSessions.find((session) => session.id === mySessionId);
             if (!currentSession) {
               return {
                 content: [{ type: "text", text: "Current session is missing from intercom session list." }],
@@ -59630,34 +59934,34 @@ does not grant cross-group access: contact_supervisor is the only cross-group pa
                 details: { error: true }
               };
             }
-            const ownGroup = normalizeGroup(currentSession.group);
-            if (requestedGroup && requestedGroup !== ownGroup) {
+            const ownGroups = resolveOwnGroups(ownSessions);
+            if (requestedGroup && !isOnlyOwnGroup(requestedGroup, ownGroups)) {
               const peeked = await connectedClient.listSessions(requestedGroup);
               const section = peeked.length === 0 ? `**Group [${requestedGroup}] (read-only peek):**
 No sessions in this group.` : `**Group [${requestedGroup}] (read-only peek):**
-${peeked.map((s) => formatSessionListRow(s, currentSession.cwd, s.id === mySessionId)).join(`
+${peeked.map((session) => formatSessionListRow(session, currentSession.cwd, session.id === mySessionId)).join(`
 `)}`;
               return {
-                content: [{ type: "text", text: `Your group: ${ownGroup}
+                content: [{ type: "text", text: `Your groups: ${ownGroups.join(", ")}
 
 ${section}` }],
                 isError: false,
-                details: { group: ownGroup, peekGroup: requestedGroup }
+                details: { group: ownGroups.at(-1), groups: ownGroups, peekGroup: requestedGroup }
               };
             }
-            const otherSessions = ownSessions.filter((s) => s.id !== mySessionId);
-            const currentSection = `**Current session** (group: ${ownGroup}):
+            const otherSessions = ownSessions.filter((session) => session.id !== mySessionId);
+            const currentSection = `**Current session** (groups: ${ownGroups.join(", ")}):
 ${formatSessionListRow(currentSession, currentSession.cwd, true)}`;
             const otherSection = otherSessions.length === 0 ? `**Other sessions:**
-No other sessions in your group (${ownGroup}).` : `**Other sessions** (group: ${ownGroup}):
-${otherSessions.map((s) => formatSessionListRow(s, currentSession.cwd, false)).join(`
+No other sessions share any of your groups.` : `**Other visible sessions:**
+${otherSessions.map((session) => formatSessionListRow(session, currentSession.cwd, false)).join(`
 `)}`;
             return {
               content: [{ type: "text", text: `${currentSection}
 
 ${otherSection}` }],
               isError: false,
-              details: { group: ownGroup }
+              details: { group: ownGroups.at(-1), groups: ownGroups }
             };
           } catch (error) {
             return {
@@ -59965,21 +60269,26 @@ ${lines.join(`
           try {
             const mySessionId = connectedClient.sessionId;
             const sessions = await connectedClient.listSessions();
-            const self = sessions.find((s) => s.id === mySessionId);
-            const ownGroup = normalizeGroup(self?.group);
-            const peekSection = requestedGroup && requestedGroup !== ownGroup ? `
-Peeked group [${requestedGroup}]: ${(await connectedClient.listSessions(requestedGroup)).length} session(s)` : "";
+            const ownGroups = resolveOwnGroups(sessions);
+            const selectedGroup = isOnlyOwnGroup(requestedGroup, ownGroups) ? undefined : requestedGroup;
+            const selectedGroupSessions = selectedGroup === undefined ? undefined : await connectedClient.listSessions(selectedGroup);
+            const selectedSection = selectedGroupSessions === undefined ? "" : `
+Selected group [${selectedGroup}]: ${selectedGroupSessions.length} session(s)`;
             return {
               content: [{
                 type: "text",
                 text: `**Intercom Status:**
 Connected: Yes
 Session ID: ${mySessionId}
-Group: ${ownGroup}
-Active sessions in group: ${sessions.length}${peekSection}`
+Groups: ${ownGroups.join(", ")}
+Active visible sessions: ${sessions.length}${selectedSection}`
               }],
               isError: false,
-              details: { group: ownGroup }
+              details: {
+                group: ownGroups.at(-1),
+                groups: ownGroups,
+                ...selectedGroup === undefined ? {} : { selectedGroup, selectedGroupSessionCount: selectedGroupSessions?.length ?? 0 }
+              }
             };
           } catch (error) {
             return {
@@ -60433,8 +60742,6 @@ function registerIntercomLifecycle(pi, deps) {
     deps.setSessionStartedAt(null);
   }
   pi.on("session_start", async (_event, ctx) => {
-    if (!deps.config.enabled)
-      return;
     if (hasActiveSession)
       await cleanupRuntime("Session replaced");
     hasActiveSession = true;
@@ -61769,7 +62076,7 @@ function piIntercomExtension(pi, testOverrides = {}) {
   let runtimeGeneration = 0;
   let agentRunning = false;
   let sessionHomeGroup = null;
-  let joinedGroup = null;
+  let joinedGroups = null;
   const activeTools = new Map;
   let replyTracker = new ReplyTracker;
   const replyWaiters = new ReplyWaiterRegistry(DEFAULT_REPLY_TIMEOUT_MS, config.maxPendingAsks);
@@ -61824,19 +62131,21 @@ function piIntercomExtension(pi, testOverrides = {}) {
   function resolveSessionHomeGroup() {
     return sessionHomeGroup ?? resolveHomeGroup(config, getLiveContext());
   }
+  function currentIntercomGroups() {
+    return joinedGroups === null ? normalizeGroups(undefined, resolveSessionHomeGroup()) : new Set(joinedGroups);
+  }
   function currentIntercomGroup() {
-    return joinedGroup ?? resolveSessionHomeGroup();
+    return [...currentIntercomGroups()].at(-1) ?? resolveSessionHomeGroup();
   }
-  function setJoinedGroup(group) {
+  function setJoinedGroups(groups) {
+    joinedGroups = normalizeGroups(groups);
     const sessionId = currentSessionId;
-    if (!sessionId)
-      return;
-    setRuntimeIntercomGroup(sessionId, group);
-    joinedGroup = group;
+    if (sessionId)
+      setRuntimeIntercomGroup(sessionId, currentIntercomGroup());
   }
-  function clearJoinedGroup() {
+  function clearJoinedGroups() {
+    joinedGroups = null;
     const sessionId = currentSessionId;
-    joinedGroup = null;
     if (sessionId)
       clearRuntimeIntercomGroup(sessionId);
   }
@@ -61854,6 +62163,7 @@ function piIntercomExtension(pi, testOverrides = {}) {
       startedAt: sessionStartedAt,
       lastActivity: Date.now(),
       status: currentStatus(),
+      groups: [...currentIntercomGroups()],
       group: currentIntercomGroup()
     };
   }
@@ -62273,7 +62583,7 @@ function piIntercomExtension(pi, testOverrides = {}) {
       const nextClient = new IntercomClient(`${currentSessionId}:pending-stage-route:${runId}`);
       state.client = nextClient;
       attachPendingStageRouteClientHandlers(runId, state, nextClient);
-      await nextClient.connect({ ...buildRegistration(), name: undefined, group: normalizeGroup(route.group) }, undefined, undefined, readSubagentMessageSource(runtimeContext?.subagentPolicy));
+      await nextClient.connect({ ...buildRegistration(), name: undefined, groups: [normalizeGroup(route.group)], group: normalizeGroup(route.group) }, undefined, undefined, readSubagentMessageSource(runtimeContext?.subagentPolicy));
       if (!pendingStageRouteClientIsCurrent(runId, state, contextAtStart, generationAtStart)) {
         await nextClient.disconnect();
         throw new Error("Intercom runtime no longer active");
@@ -62332,9 +62642,6 @@ function piIntercomExtension(pi, testOverrides = {}) {
     await ensurePendingStageRouteClient(runId, { ...route, group: routeGroup });
   }
   async function ensureConnected(reason) {
-    if (!config.enabled) {
-      throw new Error("Intercom disabled");
-    }
     if (disposed || shuttingDown) {
       throw new Error("Intercom shutting down");
     }
@@ -62476,7 +62783,7 @@ function piIntercomExtension(pi, testOverrides = {}) {
     clearReconnectTimer,
     setRuntimeContext: (value) => {
       if (value === null) {
-        clearJoinedGroup();
+        clearJoinedGroups();
         sessionHomeGroup = null;
       } else {
         sessionHomeGroup = resolveHomeGroup(config, value);
@@ -62539,8 +62846,8 @@ function piIntercomExtension(pi, testOverrides = {}) {
     beginReplyWait: (from, replyTo, signal) => replyWaiters.begin(from, replyTo, signal),
     confirmSend: config.confirmSend,
     homeGroup: resolveSessionHomeGroup,
-    setJoinedGroup,
-    clearJoinedGroup,
+    setJoinedGroups,
+    clearJoinedGroups,
     replyTracker: () => replyTracker
   });
   registerIntercomOverlay(pi, {