fix: attribute spawned task runs to child agent · opencla...

Recent Commits to openclaw:main

Alix-007 · 2026-06-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ export type RegisterSubagentRunParams = {`
`147`	`147`	`requesterDisplayKey: string;`
`148`	`148`	`task: string;`
`149`	`149`	`taskName?: string;`
	`150`	`+agentId?: string;`
`150`	`151`	`cleanup: "delete" \| "keep";`
`151`	`152`	`label?: string;`
`152`	`153`	`model?: string;`
`@@ -690,6 +691,7 @@ export function createSubagentRunManager(params: {`
`690`	`691`	`runId,`
`691`	`692`	`label: registerParams.label,`
`692`	`693`	`task: registerParams.task,`
	`694`	`+agentId: registerParams.agentId,`
`693`	`695`	`deliveryStatus:`
`694`	`696`	`registerParams.expectsCompletionMessage === false ? "not_applicable" : "pending",`
`695`	`697`	`startedAt: now,`

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,45 @@ describe("spawnSubagentDirect seam flow", () => {`
`187`	`187`	`expect(result.childSessionKey).toMatch(/^agent:task-manager:subagent:/);`
`188`	`188`	`});`
`189`	`189`
	`190`	`+it("registers the target agent id for cross-agent task attribution", async () => {`
	`191`	`+hoisted.configOverride = createConfigOverride({`
	`192`	`+agents: {`
	`193`	`+defaults: {`
	`194`	`+workspace: os.tmpdir(),`
	`195`	`+},`
	`196`	`+list: [`
	`197`	`+{`
	`198`	`+id: "main",`
	`199`	`+workspace: "/tmp/workspace-main",`
	`200`	`+subagents: {`
	`201`	`+allowAgents: ["worker"],`
	`202`	`+},`
	`203`	`+},`
	`204`	`+{`
	`205`	`+id: "worker",`
	`206`	`+workspace: "/tmp/workspace-worker",`
	`207`	`+},`
	`208`	`+],`
	`209`	`+},`
	`210`	`+});`
	`211`	`+`
	`212`	`+const result = await spawnSubagentDirect(`
	`213`	`+{`
	`214`	`+task: "attribute worker run",`
	`215`	`+agentId: "worker",`
	`216`	`+},`
	`217`	`+{`
	`218`	`+agentSessionKey: "agent:main:main",`
	`219`	`+},`
	`220`	`+);`
	`221`	`+`
	`222`	`+expect(result.status).toBe("accepted");`
	`223`	`+expect(result.childSessionKey).toMatch(/^agent:worker:subagent:/);`
	`224`	`+const registerInput = firstRegisteredSubagentRun();`
	`225`	`+expect(registerInput.childSessionKey).toBe(result.childSessionKey);`
	`226`	`+expect(registerInput.agentId).toBe("worker");`
	`227`	`+});`
	`228`	`+`
`190`	`229`	`it("accepts a spawned run across session patching, runtime-model persistence, registry registration, and lifecycle emission", async () => {`
`191`	`230`	`const operations: string[] = [];`
`192`	`231`	`let persistedStore: Record<string, Record<string, unknown>> \| undefined;`

Original file line number	Diff line number	Diff line change
`@@ -1670,6 +1670,7 @@ export async function spawnSubagentDirect(`
`1670`	`1670`	`requesterDisplayKey: ownership.completionRequesterDisplayKey,`
`1671`	`1671`	`task,`
`1672`	`1672`	`taskName,`
	`1673`	`+agentId: targetAgentId,`
`1673`	`1674`	`cleanup,`
`1674`	`1675`	`label: label \|\| undefined,`
`1675`	`1676`	`model: resolvedModel,`

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,11 @@`
`2`	`2`	`import { statSync } from "node:fs";`
`3`	`3`	`import path from "node:path";`
`4`	`4`	`import { afterEach, describe, expect, it, vi } from "vitest";`
`5`		`-import { executeSqliteQuerySync, getNodeSqliteKysely } from "../infra/kysely-sync.js";`
	`5`	`+import {`
	`6`	`+executeSqliteQuerySync,`
	`7`	`+executeSqliteQueryTakeFirstSync,`
	`8`	`+getNodeSqliteKysely,`
	`9`	`+} from "../infra/kysely-sync.js";`
`6`	`10`	`import type { DB as OpenClawStateKyselyDatabase } from "../state/openclaw-state-db.generated.js";`
`7`	`11`	`import {`
`8`	`12`	`closeOpenClawStateDatabase,`
`@@ -518,6 +522,46 @@ describe("task-registry store runtime", () => {`
`518`	`522`	`});`
`519`	`523`	`});`
`520`	`524`
	`525`	`+it("persists inferred child-session agent ids in sqlite task rows", async () => {`
	`526`	`+await withOpenClawTestState(`
	`527`	`+{ layout: "state-only", prefix: "openclaw-task-agent-id-" },`
	`528`	`+async () => {`
	`529`	`+const created = createTaskRecord({`
	`530`	`+runtime: "subagent",`
	`531`	`+ownerKey: "agent:main:main",`
	`532`	`+scopeKind: "session",`
	`533`	`+childSessionKey: "agent:worker:subagent:child",`
	`534`	`+runId: "run-worker-subagent-sqlite",`
	`535`	`+task: "Inspect worker state",`
	`536`	`+status: "running",`
	`537`	`+deliveryStatus: "pending",`
	`538`	`+});`
	`539`	`+`
	`540`	`+const database = openOpenClawStateDatabase();`
	`541`	`+const db = getNodeSqliteKysely<TaskRegistryTestDatabase>(database.db);`
	`542`	`+const row = executeSqliteQueryTakeFirstSync(`
	`543`	`+database.db,`
	`544`	`+db`
	`545`	`+.selectFrom("task_runs")`
	`546`	`+.select(["agent_id", "child_session_key", "owner_key"])`
	`547`	`+.where("task_id", "=", created.taskId),`
	`548`	`+);`
	`549`	`+`
	`550`	`+expect(row).toEqual({`
	`551`	`+agent_id: "worker",`
	`552`	`+child_session_key: "agent:worker:subagent:child",`
	`553`	`+owner_key: "agent:main:main",`
	`554`	`+});`
	`555`	`+`
	`556`	`+resetTaskRegistryForTests({ persist: false });`
	`557`	`+expect(findTaskByRunId("run-worker-subagent-sqlite")).toMatchObject({`
	`558`	`+taskId: created.taskId,`
	`559`	`+agentId: "worker",`
	`560`	`+});`
	`561`	`+},`
	`562`	`+);`
	`563`	`+});`
	`564`	`+`
`521`	`565`	`it("persists requester origin atomically when creating sqlite tasks", async () => {`
`522`	`566`	`await withOpenClawTestState(`
`523`	`567`	`{ layout: "state-only", prefix: "openclaw-task-create-origin-" },`

Original file line number	Diff line number	Diff line change
`@@ -2092,6 +2092,28 @@ describe("task-registry", () => {`
`2092`	`2092`	`});`
`2093`	`2093`	`});`
`2094`	`2094`
	`2095`	`+it("uses the child session agent for cross-agent background task attribution", async () => {`
	`2096`	`+await withTaskRegistryTempDir(async (root) => {`
	`2097`	`+process.env.OPENCLAW_STATE_DIR = root;`
	`2098`	`+resetTaskRegistryMemoryForTest({ persist: false });`
	`2099`	`+`
	`2100`	`+const created = createTaskRecord({`
	`2101`	`+runtime: "subagent",`
	`2102`	`+ownerKey: "agent:main:main",`
	`2103`	`+scopeKind: "session",`
	`2104`	`+childSessionKey: "agent:worker:subagent:child",`
	`2105`	`+runId: "run-worker-subagent",`
	`2106`	`+task: "Inspect worker state",`
	`2107`	`+status: "running",`
	`2108`	`+deliveryStatus: "pending",`
	`2109`	`+});`
	`2110`	`+`
	`2111`	`+expect(created.agentId).toBe("worker");`
	`2112`	`+expect(listTasksForAgentId("worker").map((task) => task.taskId)).toEqual([created.taskId]);`
	`2113`	`+expect(listTasksForAgentId("main")).toEqual([]);`
	`2114`	`+});`
	`2115`	`+});`
	`2116`	`+`
`2095`	`2117`	`it("projects inspection-time orphaned tasks as lost without mutating the registry", async () => {`
`2096`	`2118`	`await withTaskRegistryTempDir(async () => {`
`2097`	`2119`	`resetTaskRegistryMemoryForTest();`

Original file line number	Diff line number	Diff line change
`@@ -929,11 +929,13 @@ function mergeExistingTaskForCreate(`
`929`	`929`
`930`	`930`	`function resolveTaskAgentId(params: {`
`931`	`931`	`explicitAgentId?: string;`
	`932`	`+childSessionKey?: string;`
`932`	`933`	`ownerKey: string;`
`933`	`934`	`requesterSessionKey: string;`
`934`	`935`	`}): string \| undefined {`
`935`	`936`	`return (`
`936`	`937`	`normalizeOptionalString(params.explicitAgentId) ??`
	`938`	`+parseAgentSessionKey(params.childSessionKey)?.agentId ??`
`937`	`939`	`parseAgentSessionKey(params.ownerKey)?.agentId ??`
`938`	`940`	`parseAgentSessionKey(params.requesterSessionKey)?.agentId`
`939`	`941`	`);`
`@@ -1713,6 +1715,7 @@ export function createTaskRecord(params: {`
`1713`	`1715`	`});`
`1714`	`1716`	`const agentId = resolveTaskAgentId({`
`1715`	`1717`	`explicitAgentId: params.agentId,`
	`1718`	`+childSessionKey: params.childSessionKey,`
`1716`	`1719`	`ownerKey,`
`1717`	`1720`	`requesterSessionKey,`
`1718`	`1721`	`});`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main