From 730ea6d2e3eedc5f3a5b4151cdaabd2d744fd828 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Thu, 4 Jun 2026 13:19:46 -0500
Subject: [PATCH] fix(opencode): attribute task child agent on creation
 (#30786)

---
 packages/opencode/src/tool/task.ts       | 1 +
 packages/opencode/test/tool/task.test.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts
index 041a56571..3a2986a73 100644
--- a/packages/opencode/src/tool/task.ts
+++ b/packages/opencode/src/tool/task.ts
@@ -128,6 +128,7 @@ export const TaskTool = Tool.define(
         (yield* sessions.create({
           parentID: ctx.sessionID,
           title: params.description + ` (@${next.name} subagent)`,
+          agent: next.name,
           permission: [
             ...deriveSubagentSessionPermission({
               parentSessionPermission: parent.permission ?? [],
diff --git a/packages/opencode/test/tool/task.test.ts b/packages/opencode/test/tool/task.test.ts
index 66ffd8658..6a9bd766f 100644
--- a/packages/opencode/test/tool/task.test.ts
+++ b/packages/opencode/test/tool/task.test.ts
@@ -412,6 +412,7 @@ describe("tool.task", () => {
 
         const child = yield* sessions.get(result.metadata.sessionId)
         expect(child.parentID).toBe(chat.id)
+        expect(child.agent).toBe("reviewer")
         expect(child.permission).toEqual([
           {
             permission: "todowrite",