smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: renamed subagent handoff flow to use yield instead of submit_result

Browse Source 
- Renamed subagent completion flow from `submit_result` to `yield` across SDK tools, prompts, and docs.
- Updated executor/task handling to require and parse `yield` calls, replacing legacy submit-result extraction and state flags.
- Added `subagent-yield-reminder` and updated system prompts to require `yield` with `result.data` or `result.error`.
- Renamed hidden-tool and registration plumbing to `yield`, including discovery helpers and renderer/test surface.
This commit is contained in:
can1357
2026-04-26 00:29:52 +02:00
parent 6bd4cf24fd
commit ecd1554eba
30 changed files with 200 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/test/task/executor-subagent-reminders.test.ts
+21 -21
View File
@@ -6,7 +6,7 @@ import type { CreateAgentSessionResult } from "../../src/sdk";
import * as sdkModule from "../../src/sdk";
import type { AgentSession, AgentSessionEvent, PromptOptions } from "../../src/session/agent-session";
import type { AuthStorage } from "../../src/session/auth-storage";
import { runSubprocess, SUBAGENT_WARNING_MISSING_SUBMIT_RESULT } from "../../src/task/executor";
import { runSubprocess, SUBAGENT_WARNING_MISSING_YIELD } from "../../src/task/executor";
import type { AgentDefinition } from "../../src/task/types";
import { EventBus } from "../../src/utils/event-bus";
@@ -55,7 +55,7 @@ function createMockSession(
sessionManager: {
appendSessionInit: () => {},
},
getActiveToolNames: () => ["read", "submit_result"],
getActiveToolNames: () => ["read", "yield"],
setActiveToolsByName: async (_toolNames: string[]) => {},
subscribe: (listener: (event: AgentSessionEvent) => void) => {
listeners.push(listener);
@@ -90,7 +90,7 @@ function mockCreateAgentSession(session: AgentSession) {
return vi.spyOn(sdkModule, "createAgentSession").mockResolvedValue(createSessionResult(session));
}
describe("runSubprocess submit_result reminders", () => {
describe("runSubprocess yield reminders", () => {
afterEach(() => {
vi.restoreAllMocks();
});
@@ -114,7 +114,7 @@ describe("runSubprocess submit_result reminders", () => {
enableLsp: false,
};
it("sends reminder prompt when subagent stops without submit_result", async () => {
it("sends reminder prompt when subagent stops without yield", async () => {
const prompts: string[] = [];
const promptOptions: Array<PromptOptions | undefined> = [];
const session = createMockSession(({ text, options, promptIndex, emit, state }) => {
@@ -129,7 +129,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: "tool-1",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success", data: { done: true } },
@@ -145,12 +145,12 @@ describe("runSubprocess submit_result reminders", () => {
expect(promptOptions).toHaveLength(2);
expect(promptOptions[0]?.attribution).toBe("agent");
expect(promptOptions[1]?.attribution).toBe("agent");
expect(prompts[1]).toContain("You stopped without calling submit_result");
expect(prompts[1]).toContain("You stopped without calling yield");
expect(result.output).toContain('"done": true');
expect(result.output.includes("SYSTEM WARNING")).toBe(false);
});
it("keeps null submit_result warning when subagent submits success without data", async () => {
it("keeps null yield warning when subagent submits success without data", async () => {
const session = createMockSession(({ promptIndex, emit, state }) => {
if (promptIndex === 1) {
const assistant = createAssistantStopMessage("partial output");
@@ -161,7 +161,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: "tool-2",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success" },
@@ -173,21 +173,21 @@ describe("runSubprocess submit_result reminders", () => {
mockCreateAgentSession(session);
const result = await runSubprocess({ ...baseOptions, id: "subagent-2" });
expect(result.output).toContain("SYSTEM WARNING: Subagent called submit_result with null data.");
expect(result.output).toContain("SYSTEM WARNING: Subagent called yield with null data.");
});
it("retries when submit_result tool returns an error before succeeding", async () => {
it("retries when yield tool returns an error before succeeding", async () => {
const prompts: string[] = [];
const session = createMockSession(({ text, promptIndex, emit, state }) => {
prompts.push(text);
if (promptIndex === 1) {
const assistant = createAssistantStopMessage("attempted submit_result");
const assistant = createAssistantStopMessage("attempted yield");
state.messages.push(assistant);
emit({ type: "message_end", message: assistant });
emit({
type: "tool_execution_end",
toolCallId: "tool-error",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Output does not match schema" }],
details: { status: "error", error: "Output does not match schema" },
@@ -199,7 +199,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: "tool-success",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success", data: { ok: true } },
@@ -221,7 +221,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: "tool-thinking-fallback",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success", data: { ok: true } },
@@ -268,7 +268,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: `tool-thinking-override-${index}`,
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success", data: { ok: true } },
@@ -292,11 +292,11 @@ describe("runSubprocess submit_result reminders", () => {
expect(createAgentSessionSpy.mock.calls[0]?.[0]?.thinkingLevel).toBe(cases[0].expectedThinkingLevel);
expect(createAgentSessionSpy.mock.calls[1]?.[0]?.thinkingLevel).toBe(cases[1].expectedThinkingLevel);
});
it("fails after 3 reminders when submit_result is never called for a structured task", async () => {
it("fails after 3 reminders when yield is never called for a structured task", async () => {
const prompts: string[] = [];
const session = createMockSession(({ text, promptIndex, emit, state }) => {
prompts.push(text);
const assistant = createAssistantStopMessage(promptIndex === 1 ? "did work" : "still no submit_result");
const assistant = createAssistantStopMessage(promptIndex === 1 ? "did work" : "still no yield");
state.messages.push(assistant);
emit({ type: "message_end", message: assistant });
});
@@ -311,11 +311,11 @@ describe("runSubprocess submit_result reminders", () => {
expect(prompts).toHaveLength(4);
expect(result.exitCode).toBe(1);
expect(result.aborted).toBe(false);
expect(result.stderr).toBe(SUBAGENT_WARNING_MISSING_SUBMIT_RESULT);
expect(result.stderr).toBe(SUBAGENT_WARNING_MISSING_YIELD);
expect(result.abortReason).toBeUndefined();
});
it("surfaces abort reason when submit_result reports aborted status", async () => {
it("surfaces abort reason when yield reports aborted status", async () => {
const session = createMockSession(({ promptIndex, emit, state }) => {
if (promptIndex === 1) {
const assistant = createAssistantStopMessage("cannot proceed");
@@ -325,7 +325,7 @@ describe("runSubprocess submit_result reminders", () => {
emit({
type: "tool_execution_end",
toolCallId: "tool-abort",
toolName: "submit_result",
toolName: "yield",
result: {
content: [{ type: "text", text: "Task aborted: blocked by permissions" }],
details: { status: "aborted", error: "blocked by permissions" },
@@ -336,7 +336,7 @@ describe("runSubprocess submit_result reminders", () => {
mockCreateAgentSession(session);
const result = await runSubprocess({ ...baseOptions, id: "subagent-aborted-submit-result" });
const result = await runSubprocess({ ...baseOptions, id: "subagent-aborted-yield" });
expect(result.aborted).toBe(true);
expect(result.abortReason).toBe("blocked by permissions");
});
packages/coding-agent/test/task/executor-warnings.test.ts
+20 -22
View File
@@ -1,39 +1,39 @@
import { describe, expect, it } from "bun:test";
import {
finalizeSubprocessOutput,
SUBAGENT_WARNING_MISSING_SUBMIT_RESULT,
SUBAGENT_WARNING_NULL_SUBMIT_RESULT,
SUBAGENT_WARNING_MISSING_YIELD,
SUBAGENT_WARNING_NULL_YIELD,
} from "../../src/task/executor";
describe("subagent warning injection", () => {
it("injects null-data warning when submit_result is success without data", () => {
it("injects null-data warning when yield is success without data", () => {
const result = finalizeSubprocessOutput({
rawOutput: "partial output",
exitCode: 0,
stderr: "",
doneAborted: false,
signalAborted: false,
submitResultItems: [{ status: "success" }],
yieldItems: [{ status: "success" }],
outputSchema: undefined,
});
expect(result.rawOutput).toBe(`${SUBAGENT_WARNING_NULL_SUBMIT_RESULT}\n\npartial output`);
expect(result.hasSubmitResult).toBe(true);
expect(result.rawOutput).toBe(`${SUBAGENT_WARNING_NULL_YIELD}\n\npartial output`);
expect(result.hasYield).toBe(true);
});
it("injects missing-submit warning when subagent exits cleanly without submit_result", () => {
it("injects missing-submit warning when subagent exits cleanly without yield", () => {
const result = finalizeSubprocessOutput({
rawOutput: "",
exitCode: 0,
stderr: "",
doneAborted: false,
signalAborted: false,
submitResultItems: undefined,
yieldItems: undefined,
outputSchema: { properties: { ok: { type: "boolean" } } },
});
expect(result.rawOutput).toBe(SUBAGENT_WARNING_MISSING_SUBMIT_RESULT);
expect(result.hasSubmitResult).toBe(false);
expect(result.rawOutput).toBe(SUBAGENT_WARNING_MISSING_YIELD);
expect(result.hasYield).toBe(false);
});
it("does not inject missing-submit warning when fallback completion is recoverable", () => {
@@ -43,7 +43,7 @@ describe("subagent warning injection", () => {
stderr: "",
doneAborted: false,
signalAborted: false,
submitResultItems: undefined,
yieldItems: undefined,
outputSchema: { type: "object", properties: { ok: { type: "boolean" } }, required: ["ok"] },
});
@@ -58,13 +58,11 @@ describe("subagent warning injection", () => {
stderr: "",
doneAborted: false,
signalAborted: false,
submitResultItems: undefined,
yieldItems: undefined,
outputSchema: { type: "object", properties: { ok: { type: "boolean" } }, required: ["ok"] },
});
expect(result.rawOutput).toBe(
`${SUBAGENT_WARNING_MISSING_SUBMIT_RESULT}\n\nagent stopped after writing analysis`,
);
expect(result.rawOutput).toBe(`${SUBAGENT_WARNING_MISSING_YIELD}\n\nagent stopped after writing analysis`);
});
it("does not inject missing-submit warning when execution exits non-zero", () => {
@@ -74,7 +72,7 @@ describe("subagent warning injection", () => {
stderr: "subagent terminated",
doneAborted: true,
signalAborted: false,
submitResultItems: undefined,
yieldItems: undefined,
outputSchema: { type: "object", properties: { ok: { type: "boolean" } }, required: ["ok"] },
});
@@ -83,32 +81,32 @@ describe("subagent warning injection", () => {
expect(result.exitCode).toBe(1);
});
it("normalizes explicit aborted submit_result into aborted payload", () => {
it("normalizes explicit aborted yield into aborted payload", () => {
const result = finalizeSubprocessOutput({
rawOutput: "partial output",
exitCode: 1,
stderr: "old error",
doneAborted: false,
signalAborted: false,
submitResultItems: [{ status: "aborted", error: "blocked by permissions" }],
yieldItems: [{ status: "aborted", error: "blocked by permissions" }],
outputSchema: undefined,
});
expect(result.abortedViaSubmitResult).toBe(true);
expect(result.abortedViaYield).toBe(true);
expect(result.exitCode).toBe(0);
expect(result.stderr).toBe("blocked by permissions");
expect(result.rawOutput).toContain('"aborted": true');
expect(result.rawOutput).toContain('"blocked by permissions"');
});
it("accepts successful submit_result data without warning", () => {
it("accepts successful yield data without warning", () => {
const result = finalizeSubprocessOutput({
rawOutput: "should be replaced",
exitCode: 1,
stderr: "should clear",
doneAborted: false,
signalAborted: false,
submitResultItems: [{ status: "success", data: { ok: true } }],
yieldItems: [{ status: "success", data: { ok: true } }],
outputSchema: undefined,
});
@@ -125,7 +123,7 @@ describe("subagent warning injection", () => {
stderr: "",
doneAborted: false,
signalAborted: false,
submitResultItems: undefined,
yieldItems: undefined,
outputSchema: undefined,
});