revert #6130: doesn't really work well
This commit is contained in:
@@ -7,7 +7,6 @@ import {
|
||||
runStructuredSubagent,
|
||||
StructuredSubagentError,
|
||||
type StructuredSubagentSchemaMode,
|
||||
toStructuredSubagentIsolationControls,
|
||||
} from "../task/structured-subagent";
|
||||
import type { AgentProgress, SingleResult } from "../task/types";
|
||||
import type { NestedRepoPatch } from "../task/worktree";
|
||||
@@ -15,7 +14,6 @@ import type { ToolSession } from "../tools";
|
||||
import { ToolError } from "../tools/tool-errors";
|
||||
import { withBridgeTimeoutPause } from "./bridge-timeout";
|
||||
import type { JsStatusEvent } from "./js/shared/types";
|
||||
|
||||
// Import review tools for side effects (registers subagent tool handlers).
|
||||
import "../tools/review";
|
||||
|
||||
@@ -132,7 +130,14 @@ export async function runEvalAgent(args: unknown, options: EvalAgentBridgeOption
|
||||
`agent() blocked: turn token budget exhausted (${turnBudget.spent}/${turnBudget.total} output tokens). Raise or drop the +Nk! ceiling to continue.`,
|
||||
);
|
||||
}
|
||||
const isolation = toStructuredSubagentIsolationControls(parsed);
|
||||
const isolation =
|
||||
Object.hasOwn(parsed, "isolated") || Object.hasOwn(parsed, "apply") || Object.hasOwn(parsed, "merge")
|
||||
? {
|
||||
...(parsed.isolated !== undefined ? { requested: parsed.isolated } : {}),
|
||||
...(parsed.merge === false ? { merge: "patch" as const } : {}),
|
||||
...(parsed.apply !== undefined ? { apply: parsed.apply } : {}),
|
||||
}
|
||||
: undefined;
|
||||
|
||||
try {
|
||||
const execution = await withBridgeTimeoutPause(
|
||||
|
||||
Reference in New Issue
Block a user