Files
oh-my-pi/packages/coding-agent/test/task/executor-pass-through.test.ts
T
roboomp e7645cec49 fix(task): forward parent-discovered rules, extensions, and custom tools to subagents
Each `runSubprocess` call re-ran `loadCapability<Rule>()`,
`loadSessionExtensions()`, and `discoverAndLoadCustomTools()` because
`ExecutorOptions` and the `createAgentSession()` call inside the executor
omitted three pass-through fields the parent had already paid for. The
already-correct paths (skills, context files, workspace tree, MCP manager)
showed the intended pattern.

- Cache `rules`, `extensionsResult`, and `loadedCustomTools` on the
  parent's `ToolSession`.
- Add `rules` / `preloadedExtensions` / `preloadedCustomTools` to
  `ExecutorOptions`; forward them from both `runSubprocess` call sites
  in `task/index.ts` and into the executor's `createAgentSession()`.
- Add `preloadedCustomTools` to `CreateAgentSessionOptions` and skip
  `discoverAndLoadCustomTools()` when it is supplied.
- Shallow-clone `extensionsResult.extensions` when reusing
  `preloadedExtensions`, so the per-session autoresearch + custom-tools
  inline wrappers never leak back into the caller's array.

Fixes #2190
2026-06-09 13:58:21 +00:00

140 lines
4.9 KiB
TypeScript

/**
* Verifies parent-discovered rules, extensions, and custom tools are forwarded
* to `createAgentSession` so subagents skip the FS scans the parent already
* paid for. Regression guard for issue #2190.
*/
import { afterEach, describe, expect, it, vi } from "bun:test";
import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
import { Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
import type { LoadedCustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
import type { LoadExtensionsResult } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
import type { CreateAgentSessionResult } from "@oh-my-pi/pi-coding-agent/sdk";
import * as sdkModule from "@oh-my-pi/pi-coding-agent/sdk";
import type { AgentSession, AgentSessionEvent, PromptOptions } from "@oh-my-pi/pi-coding-agent/session/agent-session";
import { runSubprocess } from "@oh-my-pi/pi-coding-agent/task/executor";
import type { AgentDefinition } from "@oh-my-pi/pi-coding-agent/task/types";
import { EventBus } from "@oh-my-pi/pi-coding-agent/utils/event-bus";
function createMockSession(onPrompt: (params: { emit: (event: AgentSessionEvent) => void }) => void): AgentSession {
const listeners: Array<(event: AgentSessionEvent) => void> = [];
const emit = (event: AgentSessionEvent) => {
for (const listener of listeners) listener(event);
};
const session = {
state: { messages: [] },
agent: { state: { systemPrompt: ["test"] } },
model: undefined,
extensionRunner: undefined,
sessionManager: { appendSessionInit: () => {} },
getActiveToolNames: () => ["read", "yield"],
setActiveToolsByName: async (_toolNames: string[]) => {},
subscribe: (listener: (event: AgentSessionEvent) => void) => {
listeners.push(listener);
return () => {
const index = listeners.indexOf(listener);
if (index >= 0) listeners.splice(index, 1);
};
},
prompt: async (_text: string, _options?: PromptOptions) => {
onPrompt({ emit });
},
waitForIdle: async () => {},
getLastAssistantMessage: () => undefined,
abort: async () => {},
dispose: async () => {},
};
return session as unknown as AgentSession;
}
function yieldEmittingSession(): AgentSession {
return createMockSession(({ emit }) => {
emit({
type: "tool_execution_end",
toolCallId: "tool-pass-through",
toolName: "yield",
result: {
content: [{ type: "text", text: "Result submitted." }],
details: { status: "success", data: { ok: true } },
},
isError: false,
});
});
}
function createSessionResult(session: AgentSession): CreateAgentSessionResult {
return {
session,
extensionsResult: { extensions: [], errors: [], runtime: {} as unknown } as unknown as LoadExtensionsResult,
setToolUIContext: () => {},
eventBus: new EventBus(),
};
}
const baseAgent: AgentDefinition = {
name: "task",
description: "test",
systemPrompt: "test",
source: "bundled",
};
const baseOptions = {
cwd: "/tmp",
agent: baseAgent,
task: "do work",
index: 0,
id: "subagent-pass-through",
settings: Settings.isolated(),
modelRegistry: { refresh: async () => {} } as unknown as ModelRegistry,
enableLsp: false,
};
describe("runSubprocess parent-discovery pass-through (issue #2190)", () => {
afterEach(() => {
vi.restoreAllMocks();
});
it("forwards rules, preloadedExtensions, and preloadedCustomTools to createAgentSession", async () => {
const session = yieldEmittingSession();
const spy = vi.spyOn(sdkModule, "createAgentSession").mockResolvedValue(createSessionResult(session));
const rules: Rule[] = [{ name: "rule-a" } as unknown as Rule];
const preloadedExtensions = {
extensions: [],
errors: [],
runtime: { sentinel: "runtime" } as unknown,
} as unknown as LoadExtensionsResult;
const preloadedCustomTools: LoadedCustomTool[] = [
{ path: "tools/x.ts", resolvedPath: "/abs/tools/x.ts", tool: { name: "x" } } as unknown as LoadedCustomTool,
];
const result = await runSubprocess({
...baseOptions,
rules,
preloadedExtensions,
preloadedCustomTools,
});
expect(result.exitCode).toBe(0);
expect(spy).toHaveBeenCalledTimes(1);
const forwarded = spy.mock.calls[0]?.[0];
// Identity, not equality: passing a clone would defeat the perf fix.
expect(forwarded?.rules).toBe(rules);
expect(forwarded?.preloadedExtensions).toBe(preloadedExtensions);
expect(forwarded?.preloadedCustomTools).toBe(preloadedCustomTools);
});
it("forwards undefined when the parent has not pre-discovered state", async () => {
const session = yieldEmittingSession();
const spy = vi.spyOn(sdkModule, "createAgentSession").mockResolvedValue(createSessionResult(session));
const result = await runSubprocess({ ...baseOptions });
expect(result.exitCode).toBe(0);
const forwarded = spy.mock.calls[0]?.[0];
expect(forwarded?.rules).toBeUndefined();
expect(forwarded?.preloadedExtensions).toBeUndefined();
expect(forwarded?.preloadedCustomTools).toBeUndefined();
});
});