@aexol/spectral 0.9.257 → 0.9.259

package/dist/agent/agents.d.ts

@@ -1,5 +1,9 @@
 export type AgentMode = "primary" | "subagent";
 export interface AgentConfig {
+    /** Backend row id (cloud agents only — system agents have none). */
+    id?: string;
+    /** Parent PRIMARY agent id (cloud subagents only; null/undefined = root). */
+    parentId?: string | null;
     name: string;
     description: string;
     mode: AgentMode;
@@ -33,9 +37,17 @@ export declare function refreshCloudAgents(opts: {
 /**
  * Discover all agents available to a session: built-in system agents
  * (SYSTEM_AGENTS, read-only) plus cloud agents from the backend cache
- * (refreshCloudAgents, managed in Aexol Studio). Cloud agents override
- * system agents on name collision. Never throws and never touches the
- * network — offline / logged-out sessions simply get the system agents.
+ * (refreshCloudAgents, managed in Aexol Studio).
+ *
+ * Discovery is name-agnostic: ALL agents are returned, including cloud
+ * agents that share a name with a system agent (subagent names are no
+ * longer globally unique per team). Name-collision precedence is applied
+ * at resolution time in `resolveAgentByName` (system agents win in
+ * team-wide mode; a primary's own subtree wins in scoped mode).
+ * Primaries remain unique per team by construction (the backend blocks
+ * reserved system names for cloud primaries).
+ * Never throws and never touches the network — offline / logged-out
+ * sessions simply get the system agents.
  */
 export declare function discoverAgents(teamId?: string): AgentConfig[];
 export declare function discoverPrimaryAgent(teamId?: string): AgentConfig | null;
@@ -49,6 +61,70 @@ export declare function discoverPrimaryAgent(teamId?: string): AgentConfig | nul
  * silently injects an arbitrary primary agent.
  */
 export declare function resolveSelectedPrimaryAgent(selectedName: string | null | undefined, teamId?: string): AgentConfig | null;
+/**
+ * Minimal reference to an active PRIMARY agent used to anchor parent-aware
+ * subagent name resolution.
+ */
+export type AgentSubtreeRef = Pick<AgentConfig, "id" | "name">;
+/**
+ * Filter a flat agent list down to the subtree of an active primary agent:
+ * the primary itself plus its direct children (subagents whose `parentId`
+ * points at it).
+ *
+ * Returns the list UNCHANGED when no primary ref is given — standalone
+ * sessions and system primaries (built-in ghost has no backend id) fall
+ * back to team-wide resolution.
+ */
+export declare function agentsInSubtree(agents: AgentConfig[], activePrimary?: AgentSubtreeRef | null): AgentConfig[];
+/**
+ * The set of agents a session can actually reach:
+ *
+ * - Scoped (an `activePrimary` cloud primary): the primary's subtree plus
+ *   the built-in system agents — a same-named cloud subagent in the
+ *   subtree intentionally shadows the system agent, so system agents are
+ *   only appended when their name is free in the subtree.
+ * - Team-wide (no active primary): system agents win over same-named
+ *   cloud agents (dedupe keeps the system row, first).
+ */
+export declare function reachableAgents(agents: AgentConfig[], activePrimary?: AgentSubtreeRef | null): AgentConfig[];
+/**
+ * Outcome of resolving an agent name against a discovered agent list,
+ * optionally scoped to an active primary's subtree.
+ */
+export type AgentResolution = {
+    status: "ok";
+    agent: AgentConfig;
+} | {
+    status: "not-found";
+    name: string;
+    candidates: AgentConfig[];
+} | {
+    status: "ambiguous";
+    name: string;
+    conflicting: AgentConfig[];
+};
+/**
+ * Resolve an agent name to a single agent.
+ *
+ * - Team-wide (no `activePrimary`, e.g. the built-in ghost session):
+ *   SYSTEM agents always win over same-named cloud agents, so a cloud
+ *   subagent named "executor" can no longer hijack the system executor.
+ *   Only when no system agent has that name does resolution fall through
+ *   to the cloud first-match (historical behavior for team-wide
+ *   duplicates — not an error in fallback mode).
+ * - Scoped (an `activePrimary` cloud primary with a backend id):
+ *   candidates are scoped to the primary's subtree (the primary itself +
+ *   its direct children, plus any other agent sharing the primary's name),
+ *   so same-named subagents under different primaries resolve to the
+ *   caller's own subtree. A same-named cloud subagent in the subtree
+ *   intentionally shadows the system agent (that primary's own
+ *   "executor"). If the name is NOT in the subtree, resolution falls back
+ *   to SYSTEM agents (never to cloud agents of other trees). A name that
+ *   matches multiple agents within the subtree (legacy data) is
+ *   ambiguous — the caller must surface the conflict, never silently
+ *   pick one.
+ */
+export declare function resolveAgentByName(name: string, agents: AgentConfig[], activePrimary?: AgentSubtreeRef | null): AgentResolution;
 /**
  * Prepend the primary agent's system prompt above the base system prompt.
  *

package/dist/agent/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/agent/agents.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAC/C,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CAClB;AA6ED,eAAO,MAAM,aAAa,EAAE,WAAW,EAkDtC,CAAC;AAkBF,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAO3E;AACD;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,yEAAyE;IACzE,YAAY,EAAE,IAAI,CAAC;IACnB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG;IACF,YAAY,EAAE,KAAK,CAAC;IACpB,4EAA4E;IAC5E,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA6EnC;AACD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,MAAM,CAAC,EAAE,MAAM,GACd,WAAW,EAAE,CAMf;AACD,wBAAgB,oBAAoB,CAClC,MAAM,CAAC,EAAE,MAAM,GACd,WAAW,GAAG,IAAI,CAiBpB;AACD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACvC,MAAM,CAAC,EAAE,MAAM,GACd,WAAW,GAAG,IAAI,CAgBpB;AACD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,IAAI,CAChB,WAAW,EACX,MAAM,GAAG,aAAa,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,CAC7D,GAAG,IAAI,GACP,MAAM,GAAG,SAAS,CAQpB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,IAAI,CACT,WAAW,EACX,MAAM,GAAG,aAAa,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,CAC7D,GAAG,IAAI,GACP,MAAM,CAYR"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/agent/agents.ts"],"names":[],"mappings":"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"}

package/dist/agent/agents.js

@@ -155,6 +155,8 @@ export async function refreshCloudAgents(opts) {
                 agents: [
                     { teamId },
                     {
+                        id: true,
+                        parentId: true,
                         name: true,
                         description: true,
                         systemPrompt: true,
@@ -172,6 +174,8 @@ export async function refreshCloudAgents(opts) {
                 typeof a.description === "string" &&
                 typeof a.systemPrompt === "string")
                 .map((a) => ({
+                id: typeof a.id === "string" ? a.id : undefined,
+                parentId: typeof a.parentId === "string" ? a.parentId : null,
                 name: a.name,
                 description: a.description,
                 mode: a.mode === "PRIMARY" ? "primary" : "subagent",
@@ -213,18 +217,21 @@ export async function refreshCloudAgents(opts) {
 /**
  * Discover all agents available to a session: built-in system agents
  * (SYSTEM_AGENTS, read-only) plus cloud agents from the backend cache
- * (refreshCloudAgents, managed in Aexol Studio). Cloud agents override
- * system agents on name collision. Never throws and never touches the
- * network — offline / logged-out sessions simply get the system agents.
+ * (refreshCloudAgents, managed in Aexol Studio).
+ *
+ * Discovery is name-agnostic: ALL agents are returned, including cloud
+ * agents that share a name with a system agent (subagent names are no
+ * longer globally unique per team). Name-collision precedence is applied
+ * at resolution time in `resolveAgentByName` (system agents win in
+ * team-wide mode; a primary's own subtree wins in scoped mode).
+ * Primaries remain unique per team by construction (the backend blocks
+ * reserved system names for cloud primaries).
+ * Never throws and never touches the network — offline / logged-out
+ * sessions simply get the system agents.
  */
 export function discoverAgents(teamId) {
     const cloudAgents = getCloudAgentCache(teamId ?? LEGACY_CLOUD_TEAM).agents;
-    const agentMap = new Map();
-    for (const agent of SYSTEM_AGENTS)
-        agentMap.set(agent.name, agent);
-    for (const agent of cloudAgents)
-        agentMap.set(agent.name, agent);
-    return Array.from(agentMap.values());
+    return [...SYSTEM_AGENTS, ...cloudAgents];
 }
 export function discoverPrimaryAgent(teamId) {
     const agents = discoverAgents(teamId);
@@ -232,8 +239,9 @@ export function discoverPrimaryAgent(teamId) {
     if (primaries.length === 0)
         return null;
     if (primaries.length > 1) {
-        // Cloud agents override built-in system agents (same precedence as
-        // discovery): a cloud primary always wins over the built-in ghost.
+        // A cloud primary always wins over the built-in ghost. (Cloud
+        // primaries cannot use reserved system names — the backend blocks
+        // it — so this only fires for a genuine primary-selection override.)
         const cloudPrimary = primaries.find((a) => a.source === "cloud");
         const chosen = cloudPrimary ?? primaries[0];
         console.warn(chalk.yellow(`Multiple primary agents found (${primaries.map((a) => a.name).join(", ")}). Using "${chosen.name}".`));
@@ -261,6 +269,96 @@ export function resolveSelectedPrimaryAgent(selectedName, teamId) {
     const agents = discoverAgents(teamId);
     return (agents.find((agent) => agent.mode === "primary" && agent.name === selectedName) ?? null);
 }
+/**
+ * Filter a flat agent list down to the subtree of an active primary agent:
+ * the primary itself plus its direct children (subagents whose `parentId`
+ * points at it).
+ *
+ * Returns the list UNCHANGED when no primary ref is given — standalone
+ * sessions and system primaries (built-in ghost has no backend id) fall
+ * back to team-wide resolution.
+ */
+export function agentsInSubtree(agents, activePrimary) {
+    if (!activePrimary)
+        return agents;
+    return agents.filter((a) => a.name === activePrimary.name ||
+        (activePrimary.id !== undefined &&
+            (a.id === activePrimary.id || a.parentId === activePrimary.id)));
+}
+/**
+ * The set of agents a session can actually reach:
+ *
+ * - Scoped (an `activePrimary` cloud primary): the primary's subtree plus
+ *   the built-in system agents — a same-named cloud subagent in the
+ *   subtree intentionally shadows the system agent, so system agents are
+ *   only appended when their name is free in the subtree.
+ * - Team-wide (no active primary): system agents win over same-named
+ *   cloud agents (dedupe keeps the system row, first).
+ */
+export function reachableAgents(agents, activePrimary) {
+    if (!activePrimary) {
+        const systemAgents = agents.filter((a) => a.source === "system");
+        const systemNames = new Set(systemAgents.map((a) => a.name));
+        return [
+            ...systemAgents,
+            ...agents.filter((a) => a.source !== "system" && !systemNames.has(a.name)),
+        ];
+    }
+    const subtree = agentsInSubtree(agents, activePrimary);
+    const subtreeNames = new Set(subtree.map((a) => a.name));
+    return [
+        ...subtree,
+        ...agents.filter((a) => a.source === "system" && !subtreeNames.has(a.name)),
+    ];
+}
+/**
+ * Resolve an agent name to a single agent.
+ *
+ * - Team-wide (no `activePrimary`, e.g. the built-in ghost session):
+ *   SYSTEM agents always win over same-named cloud agents, so a cloud
+ *   subagent named "executor" can no longer hijack the system executor.
+ *   Only when no system agent has that name does resolution fall through
+ *   to the cloud first-match (historical behavior for team-wide
+ *   duplicates — not an error in fallback mode).
+ * - Scoped (an `activePrimary` cloud primary with a backend id):
+ *   candidates are scoped to the primary's subtree (the primary itself +
+ *   its direct children, plus any other agent sharing the primary's name),
+ *   so same-named subagents under different primaries resolve to the
+ *   caller's own subtree. A same-named cloud subagent in the subtree
+ *   intentionally shadows the system agent (that primary's own
+ *   "executor"). If the name is NOT in the subtree, resolution falls back
+ *   to SYSTEM agents (never to cloud agents of other trees). A name that
+ *   matches multiple agents within the subtree (legacy data) is
+ *   ambiguous — the caller must surface the conflict, never silently
+ *   pick one.
+ */
+export function resolveAgentByName(name, agents, activePrimary) {
+    const scope = agentsInSubtree(agents, activePrimary);
+    const matches = scope.filter((a) => a.name === name);
+    if (matches.length === 1)
+        return { status: "ok", agent: matches[0] };
+    if (matches.length > 1 && !activePrimary) {
+        // Team-wide: a system agent always beats same-named cloud agents;
+        // otherwise keep the historical first-match. Duplicates across the
+        // team are only an error inside a scoped subtree.
+        const systemMatch = matches.find((a) => a.source === "system");
+        return { status: "ok", agent: systemMatch ?? matches[0] };
+    }
+    if (matches.length > 1)
+        return { status: "ambiguous", name, conflicting: matches };
+    if (!activePrimary)
+        return { status: "not-found", name, candidates: scope };
+    // Scoped: no match in the subtree — fall back to built-in system
+    // agents (never to cloud agents of other trees).
+    const systemMatch = agents.find((a) => a.source === "system" && a.name === name);
+    if (systemMatch)
+        return { status: "ok", agent: systemMatch };
+    const candidates = [
+        ...scope,
+        ...agents.filter((a) => a.source === "system"),
+    ];
+    return { status: "not-found", name, candidates };
+}
 /**
  * Prepend the primary agent's system prompt above the base system prompt.
  *

package/dist/agent/index.d.ts

@@ -95,5 +95,13 @@ export default function subagentExtension(ext: ExtensionAPI, opts?: {
     disabledAgents?: string[];
     emitSubagentEvent?: (event: ServerEvent) => void;
     teamId?: string;
+    /**
+     * Resolve the session's active primary-agent name on each tool call
+     * (mirrors the bridge's per-turn primary-injection logic). The
+     * subagent uses it to scope name resolution to the primary's
+     * subtree so same-named subagents under different primaries resolve
+     * to the caller's own subtree. Returns null when no primary applies.
+     */
+    resolveActivePrimaryName?: () => string | null | undefined;
 }): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/agent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAEX,UAAU,EAEV,SAAS,EAET,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAKrB,MAAM,8BAA8B,CAAC;AAItC,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAGN,KAAK,cAAc,EACnB,MAAM,uCAAuC,CAAC;AAS/C,OAAO,KAAK,EAAE,sBAAsB,EAAgB,MAAM,6CAA6C,CAAC;AAyGxG;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,CAAC,GACpF,MAAM,CAYR;AAyND;;;GAGG;AACH,wBAAgB,oCAAoC,CACnD,cAAc,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAChD,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,cAAc,CAAC,CAe5D;AAgCD,wBAAgB,oBAAoB,CACnC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,gBAAgB,EACrB,SAAS,CAAC,EAAE,MAAM,GAChB,SAAS,EAAE,CAkDb;AAyBD;;;;;;;;;;GAUG;AACH;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACxC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,6EAA6E;IAC7E,GAAG,EAAE,cAAc,CAAC;CACpB;AAED,8EAA8E;AAC9E,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,wBAAwB,CAAC;AAmF1E,2FAA2F;AAC3F,wBAAgB,+BAA+B,CAC9C,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GACtD,IAAI,CAEN;AAmBD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,GAC9D,MAAM,CAiBR;AA4lBD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACxC,GAAG,EAAE,YAAY,EACjB,IAAI,CAAC,EAAE;IACN,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,GACC,IAAI,CAmaN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAEX,UAAU,EAEV,SAAS,EAET,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAKrB,MAAM,8BAA8B,CAAC;AAItC,OAAO,EACN,KAAK,WAAW,EAQhB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAGN,KAAK,cAAc,EACnB,MAAM,uCAAuC,CAAC;AAS/C,OAAO,KAAK,EAAE,sBAAsB,EAAgB,MAAM,6CAA6C,CAAC;AAyGxG;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,CAAC,GACpF,MAAM,CAYR;AAyND;;;GAGG;AACH,wBAAgB,oCAAoC,CACnD,cAAc,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,GAChD,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,cAAc,CAAC,CAe5D;AAgCD,wBAAgB,oBAAoB,CACnC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,gBAAgB,EACrB,SAAS,CAAC,EAAE,MAAM,GAChB,SAAS,EAAE,CAkDb;AAyBD;;;;;;;;;;GAUG;AACH;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACxC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,6EAA6E;IAC7E,GAAG,EAAE,cAAc,CAAC;CACpB;AAED,8EAA8E;AAC9E,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,wBAAwB,CAAC;AAqF1E,2FAA2F;AAC3F,wBAAgB,+BAA+B,CAC9C,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GACtD,IAAI,CAEN;AAmBD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,QAAQ,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,GAC9D,MAAM,CAiBR;AAwnBD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACxC,GAAG,EAAE,YAAY,EACjB,IAAI,CAAC,EAAE;IACN,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,wBAAwB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC3D,GACC,IAAI,CAwbN"}

package/dist/agent/index.js

@@ -37,7 +37,7 @@ import { RETRY_DEFAULT_BASE_DELAY_MS, RETRY_DEFAULT_MAX_RETRIES, RETRY_MAX_BACKO
 import { mutateSystemPrompt } from "../sdk/coding-agent/core/system-prompt-mutator.js";
 import { sleep } from "../sdk/coding-agent/utils/sleep.js";
 import { Type } from "typebox";
-import { discoverAgents, agentMetadataBlock, } from "./agents.js";
+import { discoverAgents, agentMetadataBlock, resolveAgentByName, reachableAgents, resolveSelectedPrimaryAgent, } from "./agents.js";
 import { loadAgentSettings } from "../server/handlers/agent-settings.js";
 import { buildTpsUsageFields, computeTpsMetrics, } from "../server/agent-bridge/tps-metrics.js";
 import { randomUUID } from "node:crypto";
@@ -388,7 +388,7 @@ async function mapWithConcurrencyLimit(items, concurrency, fn) {
     await Promise.all(workers);
     return results;
 }
-async function runSingleAgentWithTimeout(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries) {
+async function runSingleAgentWithTimeout(defaultCwd, agents, activePrimary, agentName, task, cwd, step, signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries) {
     const timeoutMs = SUBAGENT_TIMEOUT_MS;
     const timeoutSeconds = timeoutMs / 1000;
     const controller = new AbortController();
@@ -402,7 +402,7 @@ async function runSingleAgentWithTimeout(defaultCwd, agents, agentName, task, cw
             signal.addEventListener("abort", onParentAbort, { once: true });
     }
     try {
-        const result = await runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, controller.signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries);
+        const result = await runSingleAgent(defaultCwd, agents, activePrimary, agentName, task, cwd, step, controller.signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries);
         // If the timeout fired (and parent signal did not), surface a clean
         // timeout error result rather than a bare "aborted" result.
         if (controller.signal.aborted &&
@@ -479,12 +479,36 @@ export function resolveSubagentMaxAttempts(explicit, settings) {
 // ---------------------------------------------------------------------------
 // Core — run a single subagent in-process via agentLoop
 // ---------------------------------------------------------------------------
-async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries) {
+async function runSingleAgent(defaultCwd, agents, activePrimary, agentName, task, cwd, step, signal, onUpdate, makeDetails, parentToolCallId, onInternalEvent, ext, ctx, maxRetries) {
     const normalizedAgentName = agentName.replace(/^@/, "");
-    const agent = agents.find((a) => a.name === normalizedAgentName);
-    if (!agent) {
-        const available = agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
-        const suggestion = suggestAgentName(normalizedAgentName, agents);
+    // Parent-aware resolution: with an active cloud primary, candidates are
+    // scoped to its subtree (the primary + its direct children), so
+    // same-named subagents under different primaries resolve to the
+    // caller's own subtree. Without one, this is the historical team-wide
+    // first-match. Ambiguity (legacy duplicate names in-scope) is surfaced,
+    // never silently resolved.
+    const resolution = resolveAgentByName(normalizedAgentName, agents, activePrimary);
+    if (resolution.status === "ambiguous") {
+        const conflicts = resolution.conflicting
+            .map((a) => `${a.name} (id: ${a.id ?? a.filePath})`)
+            .join(", ");
+        return {
+            agent: agentName,
+            agentSource: "unknown",
+            task,
+            exitCode: 1,
+            messages: [],
+            stderr: `Ambiguous agent name "${agentName}": multiple agents share this name in scope — ${conflicts}. Disambiguate by picking a unique name.`,
+            usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+            step,
+            errorMessage: `Ambiguous agent name: ${agentName}`,
+        };
+    }
+    if (resolution.status === "not-found") {
+        const available = resolution.candidates
+            .map((a) => `${a.name} (${a.source})`)
+            .join(", ") || "none";
+        const suggestion = suggestAgentName(normalizedAgentName, resolution.candidates);
         return {
             agent: agentName,
             agentSource: "unknown",
@@ -496,6 +520,7 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             step,
         };
     }
+    const agent = resolution.agent;
     // Build combined system prompt without leaking an injected primary-agent
     // block into the isolated subagent context.
     const combinedPrompt = buildSubagentSystemPrompt(ctx.getBaseSystemPrompt(), agent);
@@ -1012,6 +1037,23 @@ export default function subagentExtension(ext, opts) {
                 ...(liveSettings.disabledSubagents ?? []),
             ]);
             const agents = discoverAgents(opts?.teamId).filter((a) => !disabledSet.has(a.name));
+            // Parent-aware resolution scope: when the session has an active
+            // CLOUD primary (one with a backend id), name resolution is scoped
+            // to that primary's subtree. System primaries (built-in ghost) have
+            // no id and anchor no subtree — team-wide resolution applies.
+            const activePrimaryName = opts?.resolveActivePrimaryName?.() ?? null;
+            const activePrimaryRef = activePrimaryName
+                ? (resolveSelectedPrimaryAgent(activePrimaryName, opts?.teamId) ?? null)
+                : null;
+            const subtree = activePrimaryRef?.id
+                ? activePrimaryRef
+                : null;
+            // Agent listings in error messages reflect the reachable set —
+            // subtree + system agents in scoped mode (a session under a
+            // cloud primary can still delegate to built-in system agents),
+            // system-first dedupe in team-wide mode — so the model only sees
+            // what it can actually resolve.
+            const visibleAgents = reachableAgents(agents, subtree);
             const hasChain = (params.chain?.length ?? 0) > 0;
             const hasTasks = (params.tasks?.length ?? 0) > 0;
             const hasSingle = Boolean(params.agent && params.task);
@@ -1092,7 +1134,7 @@ export default function subagentExtension(ext, opts) {
                 }
                 : undefined;
             if (modeCount !== 1) {
-                const available = agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
+                const available = visibleAgents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
                 return {
                     content: [
                         {
@@ -1132,7 +1174,7 @@ export default function subagentExtension(ext, opts) {
                             }
                         }
                         : undefined;
-                    const result = await runSingleAgentWithTimeout(ctx.cwd, agents, step.agent, taskWithContext, step.cwd, i + 1, signal, chainUpdate, makeDetails("chain"), _toolCallId, emitSubagentToolProgress, ext, ctx, params.maxRetries);
+                    const result = await runSingleAgentWithTimeout(ctx.cwd, agents, subtree, step.agent, taskWithContext, step.cwd, i + 1, signal, chainUpdate, makeDetails("chain"), _toolCallId, emitSubagentToolProgress, ext, ctx, params.maxRetries);
                     results.push(result);
                     const isError = result.exitCode !== 0 ||
                         result.stopReason === "error" ||
@@ -1214,7 +1256,7 @@ export default function subagentExtension(ext, opts) {
                     }
                 };
                 const results = await mapWithConcurrencyLimit(params.tasks, MAX_CONCURRENCY, async (t, index) => {
-                    const result = await runSingleAgentWithTimeout(ctx.cwd, agents, t.agent, t.task, t.cwd, undefined, signal, (partial) => {
+                    const result = await runSingleAgentWithTimeout(ctx.cwd, agents, subtree, t.agent, t.task, t.cwd, undefined, signal, (partial) => {
                         if (partial.details?.results[0]) {
                             allResults[index] = partial.details.results[0];
                             emitParallelUpdate();
@@ -1254,7 +1296,7 @@ export default function subagentExtension(ext, opts) {
             }
             // ── Single mode ─────────────────────────────────────────────
             if (params.agent && params.task) {
-                const result = await runSingleAgentWithTimeout(ctx.cwd, agents, params.agent, params.task, params.cwd, undefined, signal, onUpdate, makeDetails("single"), _toolCallId, emitSubagentToolProgress, ext, ctx, params.maxRetries);
+                const result = await runSingleAgentWithTimeout(ctx.cwd, agents, subtree, params.agent, params.task, params.cwd, undefined, signal, onUpdate, makeDetails("single"), _toolCallId, emitSubagentToolProgress, ext, ctx, params.maxRetries);
                 const isError = result.exitCode !== 0 ||
                     result.stopReason === "error" ||
                     result.stopReason === "aborted";
@@ -1284,7 +1326,7 @@ export default function subagentExtension(ext, opts) {
                     details: persistDetails(makeDetails("single")([result])),
                 };
             }
-            const available = agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
+            const available = visibleAgents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
             return {
                 content: [
                     {

package/dist/extensions/browser/browser-service.d.ts

@@ -3,6 +3,10 @@ import type { BrowserConfig } from "./config.js";
 export interface PlaywrightLaunchers {
     chromium: {
         launch(opts: Record<string, unknown>): Promise<Browser>;
+        connectOverCDP?(opts: {
+            endpointURL: string;
+            timeout?: number;
+        }): Promise<Browser>;
     };
     firefox: {
         launch(opts: Record<string, unknown>): Promise<Browser>;
@@ -11,6 +15,16 @@ export interface PlaywrightLaunchers {
         launch(opts: Record<string, unknown>): Promise<Browser>;
     };
 }
+/** Default CDP endpoint for `browser_attach` (Chrome/Arc `--remote-debugging-port=9222`). */
+export declare const DEFAULT_CDP_ENDPOINT = "http://127.0.0.1:9222";
+/**
+ * Normalize a user-provided CDP endpoint:
+ *   - undefined/""           → DEFAULT_CDP_ENDPOINT
+ *   - bare port ("9222")     → http://127.0.0.1:9222
+ *   - host:port, no scheme   → http://host:port
+ *   - full URL               → as-is
+ */
+export declare function normalizeCdpEndpoint(input?: string): string;
 export interface NetworkRequest {
     index: number;
     url: string;
@@ -36,6 +50,10 @@ export declare class BrowserService {
     private _recording;
     private closePromise;
     private launchLock;
+    /** CDP attach mode: connected to the user's own browser, not a launch we own. */
+    private cdpMode;
+    /** Normalized CDP endpoint of the attached browser (cdpMode only). */
+    private cdpEndpoint;
     /** Unique marker identifying the process tree of the current launch. */
     private launchToken;
     /**
@@ -107,6 +125,35 @@ export declare class BrowserService {
     selectTab(index: number): Promise<{
         index: number;
     }>;
+    /** Wire a page into the service's buffers (console, network, dialogs). */
+    private wirePage;
+    /**
+     * CDP attach guard: if we are attached and the CDP connection dropped
+     * (user closed the browser, debugging port went away), reset to default
+     * mode so the next call auto-launches the built-in browser.
+     */
+    private checkCdpConnection;
+    /** True when attached to the user's own browser via CDP (and still connected). */
+    isAttached(): boolean;
+    /**
+     * Attach to the user's own browser over CDP (e.g. Arc/Chrome launched with
+     * `--remote-debugging-port`). Idempotent: re-attaching while already
+     * attached returns the current state without reconnecting. The attached
+     * browser is NOT ours: we never launch it, never kill it, and
+     * `close()`/`detachCdp()` only disconnect the Playwright client.
+     */
+    attachOverCdp(endpoint?: string): Promise<{
+        endpoint: string;
+        tabCount: number;
+        titles: string[];
+    }>;
+    /**
+     * Detach from the attached CDP browser. In CDP mode `browser.close()` only
+     * disconnects the Playwright client — the user's browser keeps running.
+     * Subsequent calls auto-launch the built-in browser as usual. Returns
+     * `true` if a CDP connection was detached.
+     */
+    detachCdp(): Promise<boolean>;
     private installDialogInterceptor;
     getPendingDialogs(): Array<{
         message: string;

package/dist/extensions/browser/browser-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-service.d.ts","sourceRoot":"","sources":["../../../src/extensions/browser/browser-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser-service.d.ts","sourceRoot":"","sources":["../../../src/extensions/browser/browser-service.ts"],"names":[],"mappings":"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"}

package/dist/extensions/browser/browser-service.js

@@ -205,6 +205,25 @@ function launchArgsFor(browserName, token) {
         return base;
     return [`${BROWSER_MARKER}${token}`, ...base];
 }
+/** Default CDP endpoint for `browser_attach` (Chrome/Arc `--remote-debugging-port=9222`). */
+export const DEFAULT_CDP_ENDPOINT = "http://127.0.0.1:9222";
+/**
+ * Normalize a user-provided CDP endpoint:
+ *   - undefined/""           → DEFAULT_CDP_ENDPOINT
+ *   - bare port ("9222")     → http://127.0.0.1:9222
+ *   - host:port, no scheme   → http://host:port
+ *   - full URL               → as-is
+ */
+export function normalizeCdpEndpoint(input) {
+    const raw = (input ?? "").trim();
+    if (!raw)
+        return DEFAULT_CDP_ENDPOINT;
+    if (/^\d{1,5}$/.test(raw))
+        return `http://127.0.0.1:${raw}`;
+    if (!/^https?:\/\//i.test(raw))
+        return `http://${raw}`;
+    return raw;
+}
 let _pw = null;
 let _pwError = null;
 let _preflightResult = null;
@@ -333,6 +352,10 @@ export class BrowserService {
     _recording = null;
     closePromise = null;
     launchLock = null;
+    /** CDP attach mode: connected to the user's own browser, not a launch we own. */
+    cdpMode = false;
+    /** Normalized CDP endpoint of the attached browser (cdpMode only). */
+    cdpEndpoint = null;
     /** Unique marker identifying the process tree of the current launch. */
     launchToken = null;
     /**
@@ -479,6 +502,7 @@ export class BrowserService {
         }
     }
     async ensureBrowser() {
+        this.checkCdpConnection();
         // Serialize launches — if a launch is in progress, wait for it
         if (this.launchLock) {
             await this.launchLock;
@@ -517,20 +541,9 @@ export class BrowserService {
             this.context = await this.browser.newContext({
                 viewport: this.config.viewport,
             });
-            this.context.on("page", (page) => {
-                page.on("console", (msg) => {
-                    this.consoleBuffer.push({
-                        type: msg.type(),
-                        text: msg.text(),
-                        pageUrl: page.url(),
-                    });
-                });
-                this.trackNetworkRequest(page);
-                this.installDialogInterceptor(page);
-            });
+            this.context.on("page", (page) => this.wirePage(page));
             const page = await this.context.newPage();
-            this.trackNetworkRequest(page);
-            this.installDialogInterceptor(page);
+            this.wirePage(page);
             this.pages = [page];
             this.activePageIndex = 0;
         };
@@ -544,16 +557,19 @@ export class BrowserService {
         }
     }
     getBrowser() {
+        this.checkCdpConnection();
         if (!this.browser?.isConnected())
             throw new Error("Browser is not connected.");
         return this.browser;
     }
     getActiveContext() {
+        this.checkCdpConnection();
         if (!this.context)
             throw new Error("No active context.");
         return this.context;
     }
     getActivePage() {
+        this.checkCdpConnection();
         if (this.pages.length === 0)
             throw new Error("No active page.");
         if (this.activePageIndex >= this.pages.length)
@@ -575,6 +591,7 @@ export class BrowserService {
         return { url: page.url(), title: await page.title() };
     }
     async closePage() {
+        this.checkCdpConnection();
         const openBlankPage = async () => {
             if (!this.context) {
                 this.pages = [];
@@ -628,11 +645,17 @@ export class BrowserService {
         this.config.viewport = { width, height };
     }
     listTabs() {
-        return this.pages.map((p, i) => ({
-            index: i,
-            title: p.url() ? `Tab ${i}` : p.url(),
-            url: p.url(),
-        }));
+        this.checkCdpConnection();
+        return this.pages.map((p, i) => {
+            const url = p.url();
+            return {
+                index: i,
+                // `page.title()` is async, so the URL is the best synchronous
+                // stand-in; fall back to "Tab N" only when the page has no URL.
+                title: url || `Tab ${i}`,
+                url,
+            };
+        });
     }
     async createTab() {
         if (!this.context)
@@ -665,6 +688,177 @@ export class BrowserService {
         await page.bringToFront();
         return { index };
     }
+    /** Wire a page into the service's buffers (console, network, dialogs). */
+    wirePage(page) {
+        page.on("console", (msg) => {
+            this.consoleBuffer.push({
+                type: msg.type(),
+                text: msg.text(),
+                pageUrl: page.url(),
+            });
+        });
+        this.trackNetworkRequest(page);
+        this.installDialogInterceptor(page);
+    }
+    /**
+     * CDP attach guard: if we are attached and the CDP connection dropped
+     * (user closed the browser, debugging port went away), reset to default
+     * mode so the next call auto-launches the built-in browser.
+     */
+    checkCdpConnection() {
+        if (!this.cdpMode)
+            return;
+        if (isBrowserConnected(this.browser)) {
+            // Prune pages the user closed: a dead Page would surface as
+            // "Target closed" on the next tool call.
+            const live = this.pages.filter((p) => !p.isClosed());
+            if (live.length !== this.pages.length) {
+                this.pages = live;
+                if (this.activePageIndex >= this.pages.length)
+                    this.activePageIndex = 0;
+            }
+            return;
+        }
+        this.cdpMode = false;
+        this.cdpEndpoint = null;
+        this.browser = null;
+        this.context = null;
+        this.pages = [];
+        this.activePageIndex = 0;
+        this._recording = null;
+        releaseProcessCleanup(this);
+        throw new Error("CDP connection lost — call browser_attach again.");
+    }
+    /** True when attached to the user's own browser via CDP (and still connected). */
+    isAttached() {
+        return this.cdpMode && isBrowserConnected(this.browser);
+    }
+    /**
+     * Attach to the user's own browser over CDP (e.g. Arc/Chrome launched with
+     * `--remote-debugging-port`). Idempotent: re-attaching while already
+     * attached returns the current state without reconnecting. The attached
+     * browser is NOT ours: we never launch it, never kill it, and
+     * `close()`/`detachCdp()` only disconnect the Playwright client.
+     */
+    async attachOverCdp(endpoint) {
+        const normalized = normalizeCdpEndpoint(endpoint);
+        // Serialize with an in-flight launch: an attach that tears down the
+        // browser mid-launch would leak it (pid bookkeeping and cleanup
+        // handlers would be released for a browser that is about to die).
+        if (this.launchLock)
+            await this.launchLock;
+        // Idempotent: already attached to a live CDP browser → current state.
+        if (this.cdpMode && isBrowserConnected(this.browser)) {
+            const titles = await Promise.all(this.pages.slice(0, 5).map(async (p) => {
+                try {
+                    return await p.title();
+                }
+                catch {
+                    return "";
+                }
+            }));
+            return { endpoint: this.cdpEndpoint ?? normalized, tabCount: this.pages.length, titles };
+        }
+        // Reachability probe: short-timeout GET to /json/version so a wrong
+        // endpoint fails fast with an actionable message.
+        const versionUrl = `${normalized.replace(/\/+$/, "")}/json/version`;
+        let reachable = false;
+        try {
+            const res = await fetch(versionUrl, { signal: AbortSignal.timeout(3_000) });
+            reachable = res.ok;
+        }
+        catch {
+            reachable = false;
+        }
+        if (!reachable) {
+            throw new Error(`Cannot reach the CDP endpoint at ${normalized} (GET ${versionUrl} failed). ` +
+                `Launch your browser with remote debugging first, e.g.: ` +
+                `open -a Arc --args --remote-debugging-port=9222 ` +
+                `(or: open -a "Google Chrome" --args --remote-debugging-port=9222), then call browser_attach again.`);
+        }
+        const pw = loadPlaywright();
+        const connect = pw.chromium.connectOverCDP?.bind(pw.chromium);
+        if (!connect) {
+            throw new Error("connectOverCDP is not available in this Playwright build.");
+        }
+        // Tear down anything we had (a launched browser, a stale CDP connection)
+        // before attaching.
+        await this.close();
+        this.browser = await connect({ endpointURL: normalized, timeout: 10_000 });
+        // Claim CDP mode IMMEDIATELY after connect(): from here on the browser
+        // is the user's, so every close/kill path must take the CDP branch
+        // (disconnect only). A wiring failure below must never leave a state
+        // where a later close() takes the non-CDP branch and would close the
+        // user's default context (all their tabs).
+        this.cdpMode = true;
+        this.cdpEndpoint = normalized;
+        try {
+            // contexts()[0] is the user's default context (their cookies/logins).
+            const context = this.browser.contexts()[0] ?? (await this.browser.newContext());
+            this.context = context;
+            context.on("page", (page) => {
+                this.wirePage(page);
+                if (!this.pages.includes(page))
+                    this.pages.push(page);
+            });
+            for (const page of context.pages()) {
+                this.wirePage(page);
+                this.pages.push(page);
+            }
+            if (this.pages.length === 0) {
+                const page = await context.newPage();
+                this.wirePage(page);
+                this.pages.push(page);
+            }
+            this.activePageIndex = 0;
+        }
+        catch (err) {
+            // Wiring failed after connect(): detach (disconnect-only) so the
+            // user's browser is never closed, then surface the original error.
+            await this.detachCdp().catch(() => { });
+            throw err;
+        }
+        // We do not own this process — drop any launch-time pid evidence so no
+        // kill path can ever target it, and make sure no kill handler is attached.
+        this.browserPid = null;
+        this.browserPids = [];
+        this.verifiedBrowserPids = [];
+        this.verifiedBrowserPidsAt = 0;
+        this.verifiedBrowserPidsToken = null;
+        releaseProcessCleanup(this);
+        const titles = await Promise.all(this.pages.slice(0, 5).map(async (p) => {
+            try {
+                return await p.title();
+            }
+            catch {
+                return "";
+            }
+        }));
+        return { endpoint: normalized, tabCount: this.pages.length, titles };
+    }
+    /**
+     * Detach from the attached CDP browser. In CDP mode `browser.close()` only
+     * disconnects the Playwright client — the user's browser keeps running.
+     * Subsequent calls auto-launch the built-in browser as usual. Returns
+     * `true` if a CDP connection was detached.
+     */
+    async detachCdp() {
+        if (!this.cdpMode)
+            return false;
+        const browser = this.browser;
+        this.cdpMode = false;
+        this.cdpEndpoint = null;
+        this.browser = null;
+        this.context = null;
+        this.pages = [];
+        this.activePageIndex = 0;
+        this._recording = null;
+        releaseProcessCleanup(this);
+        if (browser) {
+            await browser.close().catch(() => { });
+        }
+        return true;
+    }
     installDialogInterceptor(page) {
         page.on("dialog", (dialog) => {
             this.pendingDialogs.push({
@@ -771,6 +965,26 @@ export class BrowserService {
                 }
             };
             const closeTimeout = 5000; // 5 seconds per operation
+            // CDP attach mode: the browser belongs to the user — disconnect only.
+            // Never close their tabs, never touch the process tree.
+            if (this.cdpMode) {
+                const cdpBrowser = this.browser;
+                this.cdpMode = false;
+                this.cdpEndpoint = null;
+                if (cdpBrowser) {
+                    await withTimeout(cdpBrowser.close().catch((e) => {
+                        process.stderr.write(`[browser] cdp disconnect: ${e.message}\n`);
+                    }), closeTimeout, "cdp browser.close() (disconnect)");
+                }
+                this.pages = [];
+                this.activePageIndex = 0;
+                this.context = null;
+                this.browser = null;
+                this.launchToken = null;
+                releaseProcessCleanup(this);
+                this._recording = null;
+                return;
+            }
             const browser = this.browser;
             const context = this.context;
             let browserCloseFailed = false;
@@ -836,6 +1050,8 @@ export class BrowserService {
      * process without waiting for a graceful close. Safe to call at any time.
      */
     forceKillBrowserProcess() {
+        if (this.cdpMode)
+            return; // never signal a browser we do not own
         this.killBrowserProcess();
     }
     /**
@@ -850,6 +1066,8 @@ export class BrowserService {
      */
     killBrowserProcess(browser = this.browser, opts) {
         try {
+            if (this.cdpMode)
+                return; // never signal a browser we do not own
             const token = this.launchToken ?? this.lastLaunchToken;
             const marker = token ? `${BROWSER_MARKER}${token}` : undefined;
             // `process()` only exists on BrowserServer/ElectronApplication, but keep
@@ -895,6 +1113,8 @@ export class BrowserService {
      */
     killBrowserProcessSync() {
         try {
+            if (this.cdpMode)
+                return; // never signal a browser we do not own
             const verified = new Set(this.verifiedBrowserPids);
             if (verified.size === 0)
                 return;
@@ -967,6 +1187,11 @@ export class BrowserService {
     }
     // ── Recording ──────────────────────────────────────────────
     async startRecording(opts) {
+        if (this.cdpMode) {
+            // Video recording needs a browser+context we own (recordVideo is set at
+            // context creation) — the user's attached browser cannot be recorded.
+            throw new Error("Video recording is not supported in attach mode (CDP). Use browser_detach to switch back to the built-in browser first.");
+        }
         if (this._recording) {
             throw new Error("Recording is already active. Use stopRecording() first.");
         }
@@ -1025,15 +1250,10 @@ export class BrowserService {
             },
         });
         this.context.on("page", (page) => {
-            page.on("console", (msg) => {
-                this.consoleBuffer.push({ type: msg.type(), text: msg.text(), pageUrl: page.url() });
-            });
-            this.trackNetworkRequest(page);
-            this.installDialogInterceptor(page);
+            this.wirePage(page);
         });
         const page = await this.context.newPage();
-        this.trackNetworkRequest(page);
-        this.installDialogInterceptor(page);
+        this.wirePage(page);
         this.pages = [page];
         this.activePageIndex = 0;
         await page.goto(currentUrl, { waitUntil: "domcontentloaded", timeout: this.config.navigationTimeout }).catch(() => { });

package/dist/extensions/browser/index.d.ts

@@ -6,7 +6,7 @@
  * control a real browser: navigate, click, type, evaluate JS, take
  * screenshots, inspect network traffic, and more.
  *
- * All 31 tools match the same API surface as playwright-mcp, but without
+ * All 33 tools match the same API surface as playwright-mcp, but without
  * the MCP protocol layer — they call Playwright directly from Node.js.
  *
  * Architecture:
@@ -16,9 +16,9 @@
  *     first, then the browser, then a SIGKILL fallback for the Chromium
  *     process so a visible window is never orphaned)
  *
- * Registered tools (31):
+ * Registered tools (33):
  *   Core:        browser_navigate, browser_navigate_back, browser_close, browser_resize,
- *                browser_quit
+ *                browser_quit, browser_attach, browser_detach
  *   Tabs:        browser_tabs
  *   Input:       browser_click, browser_type, browser_press_key, browser_hover,
  *                browser_drag, browser_select_option, browser_fill_form, browser_file_upload

package/dist/extensions/browser/index.js

@@ -6,7 +6,7 @@
  * control a real browser: navigate, click, type, evaluate JS, take
  * screenshots, inspect network traffic, and more.
  *
- * All 31 tools match the same API surface as playwright-mcp, but without
+ * All 33 tools match the same API surface as playwright-mcp, but without
  * the MCP protocol layer — they call Playwright directly from Node.js.
  *
  * Architecture:
@@ -16,9 +16,9 @@
  *     first, then the browser, then a SIGKILL fallback for the Chromium
  *     process so a visible window is never orphaned)
  *
- * Registered tools (31):
+ * Registered tools (33):
  *   Core:        browser_navigate, browser_navigate_back, browser_close, browser_resize,
- *                browser_quit
+ *                browser_quit, browser_attach, browser_detach
  *   Tabs:        browser_tabs
  *   Input:       browser_click, browser_type, browser_press_key, browser_hover,
  *                browser_drag, browser_select_option, browser_fill_form, browser_file_upload
@@ -150,7 +150,7 @@ function countRegisteredTools(ext) {
         let count = 0;
         const knownTools = [
             "browser_navigate", "browser_navigate_back", "browser_close", "browser_resize",
-            "browser_quit",
+            "browser_quit", "browser_attach", "browser_detach",
             "browser_tabs",
             "browser_click", "browser_type", "browser_press_key", "browser_hover",
             "browser_drag", "browser_select_option", "browser_fill_form", "browser_file_upload",

package/dist/extensions/browser/tools/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/extensions/browser/tools/core.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAwBvD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI,CAoJ7E"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/extensions/browser/tools/core.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAwBvD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI,CA0Q7E"}

package/dist/extensions/browser/tools/core.js

@@ -104,13 +104,37 @@ export function registerCoreTools(ext, bs) {
     const quitTool = {
         name: "browser_quit",
         label: "Browser Quit",
-        description: "Close the WHOLE browser: closes the browser context, the browser itself and kills the Chromium process. Unlike browser_close (which only closes the current tab), this tears the browser down completely. Use it when you are done working with the browser or when the browser window does not want to close.",
+        description: "Close the WHOLE browser: closes the browser context, the browser itself and kills the Chromium process. Unlike browser_close (which only closes the current tab), this tears the browser down completely. Use it when you are done working with the browser or when the browser window does not want to close. In CDP attach mode (browser_attach) this detaches from the user's browser instead of closing it — their browser keeps running.",
         promptSnippet: "`browser_quit` — close the whole browser and kill the Chromium process",
         parameters: {
             type: "object",
             properties: {},
         },
         async execute() {
+            // CDP attach mode: "quit" means detach — the user's browser is not ours
+            // to close, and there is no process tree of ours to kill.
+            if (bs.isAttached()) {
+                // Stop an in-flight WebRTC stream (module-level stream state must
+                // not stay "active" after the detach — same path as
+                // `session_shutdown` in ../index.ts).
+                try {
+                    await stopActiveStream();
+                }
+                catch {
+                    /* no stream active — ignore */
+                }
+                await bs.detachCdp();
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: "✓ Detached from your browser (CDP attach mode). Your browser keeps running — the agent never closes it. " +
+                                "Subsequent browser calls will auto-launch the built-in Chromium.",
+                        },
+                    ],
+                    details: { detached: true },
+                };
+            }
             try {
                 // Same order as the `session_shutdown` handler in ../index.ts: stream
                 // → recording → browser → SIGKILL fallback.
@@ -139,6 +163,98 @@ export function registerCoreTools(ext, bs) {
             }
         },
     };
+    const attachTool = {
+        name: "browser_attach",
+        label: "Browser Attach",
+        description: "Connect the agent to the user's OWN browser (Arc, Chrome, Chromium, Edge, ...) over CDP. " +
+            "Call this when the user says they launched their own browser with a remote-debugging port " +
+            "(e.g. `open -a Arc --args --remote-debugging-port=9222`) and want the agent to use it. " +
+            "The agent then drives the user's real browser — its existing tabs, cookies and logins. " +
+            "Video recording is NOT available in attach mode. Use browser_detach to return to the built-in browser.",
+        promptSnippet: "`browser_attach { endpoint? }` — connect to the user's own browser via CDP (remote debugging port)",
+        parameters: {
+            type: "object",
+            properties: {
+                endpoint: {
+                    type: "string",
+                    description: "CDP endpoint URL (default http://127.0.0.1:9222). A bare port like \"9222\" is accepted and normalized to http://127.0.0.1:9222.",
+                },
+            },
+        },
+        async execute(_toolCallId, params) {
+            const p = params;
+            try {
+                const { endpoint, tabCount, titles } = await bs.attachOverCdp(p.endpoint);
+                const tabList = titles.filter((t) => t.length > 0).slice(0, 5);
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: [
+                                `✓ Attached to your browser via CDP: ${endpoint}`,
+                                `Tabs open: ${tabCount}${tabList.length ? ` — ${tabList.map((t) => `"${t}"`).join(", ")}` : ""}`,
+                                "",
+                                "You are now driving the user's real browser (their tabs, cookies and logins).",
+                                "Video recording is not available in attach mode.",
+                            ].join("\n"),
+                        },
+                    ],
+                    details: { attached: true, endpoint, tabCount },
+                };
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                return {
+                    content: [{ type: "text", text: `Browser attach failed: ${msg}` }],
+                    details: { isError: true },
+                };
+            }
+        },
+    };
+    const detachTool = {
+        name: "browser_detach",
+        label: "Browser Detach",
+        description: "Disconnect from the user's browser (CDP attach mode) WITHOUT closing it — the user's browser keeps running. " +
+            "After detaching, the next browser call auto-launches the built-in Chromium exactly as usual. " +
+            "Does nothing when not attached.",
+        promptSnippet: "`browser_detach` — disconnect from the user's browser (CDP) without closing it",
+        parameters: {
+            type: "object",
+            properties: {},
+        },
+        async execute() {
+            try {
+                // Stop an in-flight WebRTC stream before detaching (module-level
+                // stream state must not stay "active" — same path as
+                // `session_shutdown` in ../index.ts).
+                try {
+                    await stopActiveStream();
+                }
+                catch {
+                    /* no stream active — ignore */
+                }
+                const detached = await bs.detachCdp();
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: detached
+                                ? "✓ Detached from your browser. It keeps running — the agent never closes it. Subsequent browser calls will use the built-in Chromium."
+                                : "Not attached to a user browser — nothing to detach.",
+                        },
+                    ],
+                    details: { detached },
+                };
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                return {
+                    content: [{ type: "text", text: `Browser detach failed: ${msg}` }],
+                    details: { isError: true },
+                };
+            }
+        },
+    };
     const resizeTool = {
         name: "browser_resize",
         label: "Browser Resize",
@@ -164,7 +280,7 @@ export function registerCoreTools(ext, bs) {
             }
         },
     };
-    for (const tool of [navigateTool, navigateBackTool, closeTool, quitTool, resizeTool]) {
+    for (const tool of [navigateTool, navigateBackTool, closeTool, quitTool, attachTool, detachTool, resizeTool]) {
         try {
             ext.registerTool(tool);
         }

package/dist/server/agent-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-bridge.d.ts","sourceRoot":"","sources":["../../src/server/agent-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-bridge.d.ts","sourceRoot":"","sources":["../../src/server/agent-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAEH,OAAO,KAAK,EAEV,YAAY,EAQb,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAQL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAatC,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AActC,OAAO,EACL,kBAAkB,IAAI,yBAAyB,EAEhD,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAI3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AA6BpE,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,aAAa,GACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,EAC3B,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,UAAU,4BAA4B;IACpC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;CACpC;AAED,sEAAsE;AACtE,MAAM,MAAM,oBAAoB,GAAG,OAAO,yBAAyB,CAAC;AAmCpE,MAAM,WAAW,kBAAkB;IACjC,kFAAkF;IAClF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qFAAqF;IACrF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,2EAA2E;IAC3E,GAAG,EAAE,MAAM,CAAC;IACZ,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,IAAI,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACnC;;;;;OAKG;IACH,0BAA0B,EAAE,CAAC,GAAG,EAAE;QAChC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,6EAA6E;QAC7E,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,KAAK,IAAI,CAAC;IACX;;;OAGG;IACH,yBAAyB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB;;;;OAIG;IACH,cAAc,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;IAC1C;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,qEAAqE;IACrE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;;;;;;;;;OAWG;IACH,yBAAyB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AA+ED,yFAAyF;AACzF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,YAAY,GAAG,IAAI,CAmB1E;AA0DD,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAC,CAAe;IAC/B,OAAO,CAAC,iCAAiC,CAAqB;IAC9D,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,OAAO,CAAC,CAA0B;IAC1C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,IAAI,CAAqB;IACjC;;;;;OAKG;IACH,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC;;;;OAIG;IACH,OAAO,CAAC,aAAa,CAAC,CAAiB;IACvC;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAC5D,OAAO,CAAC,YAAY,CAAC,CAAuB;IAC5C,8EAA8E;IAC9E,OAAO,CAAC,kBAAkB,CAAC,CAAgC;IAC3D;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe,CAAK;IAC5B,sFAAsF;IACtF,OAAO,CAAC,iBAAiB,CAMT;IAChB,OAAO,CAAC,WAAW,CACuD;IAC1E,OAAO,CAAC,mBAAmB,CAA+B;IAC1D;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB,CAAK;IAClC;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAC,CAA2B;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAC5D;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB,CAO5B;IACJ;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB,CAAqC;IAChE;;;;;OAKG;IACH,OAAO,CAAC,aAAa,CAA6B;gBAEtC,IAAI,EAAE,kBAAkB;IAIpC;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAQlC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsZ5B,OAAO,CAAC,4BAA4B;IAQpC;;;;;OAKG;YACW,qBAAqB;IAcnC;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3C;;;;;;;;;;;;OAYG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAmC3B,OAAO,CAAC,sBAAsB;YAahB,oBAAoB;IA8BlC;;;;;;;;;;;;OAYG;IACH;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,0BAA0B;IAoFlC;;;;;;;;;;;;;;;OAeG;IACH;;;;;;;;OAQG;IACH,wBAAwB,IAAI,MAAM,GAAG,SAAS;IAI9C;;;;;;;;;OASG;IACH,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAI3C;;;;OAIG;IACH,eAAe,IACX;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GACxE,SAAS;IAIb,mDAAmD;IACnD,WAAW,IAAI,OAAO;IAItB,mEAAmE;IACnE,UAAU,IAAI,OAAO;IAIrB,2EAA2E;IAC3E,MAAM,IAAI,OAAO;IAIjB;;;;OAIG;IACG,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzE,gBAAgB,IAAI,KAAK,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IAgBF,iBAAiB,IAAI;QACnB,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,CAAC;QACtE,QAAQ,EAAE;YACR,QAAQ,EAAE,OAAO,CAAC;YAClB,UAAU,EAAE,OAAO,CAAC;YACpB,UAAU,EAAE,OAAO,CAAC;YACpB,MAAM,EAAE,OAAO,CAAC;SACjB,CAAC;KACH;IAYD,OAAO,CAAC,iBAAiB;IAmCnB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAmFpE;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,iCAAiC;IAkBzC;;;;;;OAMG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAoBpD;;;;;;;;;OASG;IACH,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI;IAI7D;;;;;;;;;;;;OAYG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CrE;;;;;;;;OAQG;YACW,iBAAiB;IAqB/B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,0BAA0B;IAoBlC;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAM1B,2EAA2E;IAC3E,OAAO,CAAC,6BAA6B;IAOrC;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;;;OAOG;IACH,OAAO,CAAC,2BAA2B;IAYnC;;;;OAIG;IACH,OAAO,CAAC,8BAA8B;IAQtC,yEAAyE;IACzE,OAAO,CAAC,iCAAiC;IAOzC,OAAO,CAAC,iBAAiB;IAazB;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,uBAAuB;IAMzB,OAAO,CACX,OAAO,CAAC,EAAE,MAAM,GAAG,4BAA4B,GAC9C,OAAO,CAAC,gBAAgB,CAAC;IAY5B,OAAO,IAAI,IAAI;IAiDf;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAoCrB;;;;;;;;OAQG;IACH,OAAO,CAAC,6BAA6B;IAiCrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAqB7B,uEAAuE;IACvE,OAAO,CAAC,wBAAwB;IAMhC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,sBAAsB;IAqE9B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,iBAAiB,GAAG,IAAI;CAsvBzC"}

package/dist/server/agent-bridge.js

@@ -400,6 +400,16 @@ export class AgentBridge {
                 disabledAgents: [],
                 teamId: this.opts.teamId,
                 emitSubagentEvent: (event) => this.emitAndBuffer(event),
+                // Parent-aware subagent resolution: the tool re-resolves the
+                // session's active primary on every call, mirroring the
+                // before_agent_start injection logic exactly (session override
+                // wins over settings; disabled toggle suppresses both).
+                resolveActivePrimaryName: () => {
+                    const settings = loadAgentSettings(this.opts.cwd, this.opts.agentDir);
+                    if (!settings.primaryAgentEnabled)
+                        return null;
+                    return this.opts.activePrimaryAgent ?? settings.activePrimaryAgent;
+                },
             });
         });
         extensionFactories.push(desktopScreenshotExtension);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/spectral",
-  "version": "0.9.257",
+  "version": "0.9.259",
   "description": "AI coding agent for Aexol with relay-based browser access.",
   "type": "module",
   "private": false,