diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d88b18fe44..53def587701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Docs: https://docs.openclaw.ai - Discord: optimize reaction notification handling to skip unnecessary message fetches in `off`/`all`/`allowlist` modes, streamline reaction routing, and improve reaction emoji formatting. (#18248) Thanks @thewilloftheshadow and @victorGPT. - CLI/Pairing: make `openclaw qr --remote` prefer `gateway.remote.url` over tailscale/public URL resolution and register the `openclaw clawbot qr` legacy alias path. (#18091) - CLI/QR: restore fail-fast validation for `openclaw qr --remote` when neither `gateway.remote.url` nor tailscale `serve`/`funnel` is configured, preventing unusable remote pairing QR flows. (#18166) Thanks @mbelinky. +- Auto-reply/Subagents: propagate group context (`groupId`, `groupChannel`, `space`) when spawning via `/subagents spawn`, matching tool-triggered subagent spawn behavior. - Agents/Tools/exec: add a preflight guard that detects likely shell env var injection (e.g. `$DM_JSON`, `$TMPDIR`) in Python/Node scripts before execution, preventing recurring cron failures and wasted tokens when models emit mixed shell+language source. (#12836) - Agents/Tools: make loop detection progress-aware and phased by hard-blocking known `process(action=poll|log)` no-progress loops, warning on generic identical-call repeats, warning + no-progress-blocking ping-pong alternation loops (10/20), coalescing repeated warning spam into threshold buckets (including canonical ping-pong pairs), adding a global circuit breaker at 30 no-progress repeats, and emitting structured diagnostic `tool.loop` warning/error events for loop actions. (#16808) Thanks @akramcodez and @beca-oc. - Agents/Tools: scope the `message` tool schema to the active channel so Telegram uses `buttons` and Discord uses `components`. (#18215) Thanks @obviyus. diff --git a/src/auto-reply/reply/commands-subagents-spawn.test.ts b/src/auto-reply/reply/commands-subagents-spawn.test.ts index e4f602dcc81..9dca5f91eea 100644 --- a/src/auto-reply/reply/commands-subagents-spawn.test.ts +++ b/src/auto-reply/reply/commands-subagents-spawn.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; -import { resetSubagentRegistryForTests } from "../../agents/subagent-registry.js"; import type { SpawnSubagentResult } from "../../agents/subagent-spawn.js"; +import { resetSubagentRegistryForTests } from "../../agents/subagent-registry.js"; const hoisted = vi.hoisted(() => { const spawnSubagentDirectMock = vi.fn(); @@ -126,6 +126,28 @@ describe("/subagents spawn command", () => { expect(spawnParams.task).toBe("do the thing"); }); + it("passes group context from session entry to spawnSubagentDirect", async () => { + spawnSubagentDirectMock.mockResolvedValue(acceptedResult()); + const params = buildCommandTestParams("/subagents spawn beta do the thing", baseCfg); + params.sessionEntry = { + sessionId: "session-main", + updatedAt: Date.now(), + groupId: "group-1", + groupChannel: "#group-channel", + space: "workspace-1", + }; + const result = await handleSubagentsCommand(params, true); + expect(result).not.toBeNull(); + expect(result?.reply?.text).toContain("Spawned subagent beta"); + + const [, spawnCtx] = spawnSubagentDirectMock.mock.calls[0]; + expect(spawnCtx).toMatchObject({ + agentGroupId: "group-1", + agentGroupChannel: "#group-channel", + agentGroupSpace: "workspace-1", + }); + }); + it("returns forbidden for unauthorized cross-agent spawn", async () => { spawnSubagentDirectMock.mockResolvedValue( forbiddenResult("agentId is not allowed for sessions_spawn (allowed: alpha)"), diff --git a/src/auto-reply/reply/commands-subagents.ts b/src/auto-reply/reply/commands-subagents.ts index 7ec0f44dfcc..0535ddb68fa 100644 --- a/src/auto-reply/reply/commands-subagents.ts +++ b/src/auto-reply/reply/commands-subagents.ts @@ -1,7 +1,8 @@ import crypto from "node:crypto"; +import type { SubagentRunRecord } from "../../agents/subagent-registry.js"; +import type { CommandHandler } from "./commands-types.js"; import { AGENT_LANE_SUBAGENT } from "../../agents/lanes.js"; import { abortEmbeddedPiRun } from "../../agents/pi-embedded.js"; -import type { SubagentRunRecord } from "../../agents/subagent-registry.js"; import { clearSubagentRunSteerRestart, listSubagentRunsForRequester, @@ -35,7 +36,6 @@ import { } from "../../shared/subagents-format.js"; import { INTERNAL_MESSAGE_CHANNEL } from "../../utils/message-channel.js"; import { stopSubagentsForRequester } from "./abort.js"; -import type { CommandHandler } from "./commands-types.js"; import { clearSessionQueues } from "./queue.js"; import { formatRunLabel, formatRunStatus, sortSubagentRuns } from "./subagents-utils.js"; @@ -681,6 +681,9 @@ export const handleSubagentsCommand: CommandHandler = async (params, allowTextCo agentAccountId: params.ctx.AccountId, agentTo: params.command.to, agentThreadId: params.ctx.MessageThreadId, + agentGroupId: params.sessionEntry?.groupId ?? null, + agentGroupChannel: params.sessionEntry?.groupChannel ?? null, + agentGroupSpace: params.sessionEntry?.space ?? null, }, ); if (result.status === "accepted") {