mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 11:36:05 +00:00
fix(assistant): the step after the ask for the answer may only write text, so Claude Sonnet 5.5 can no longer offer its follow-ups a second time instead (#3016)
This commit is contained in:
@@ -54,6 +54,12 @@ export interface AiChatRequest {
|
||||
cacheKey?: string;
|
||||
/** Lets the model search the web with its provider's own search; a client without one ignores it. */
|
||||
webSearch?: boolean;
|
||||
/**
|
||||
* `none` asks for text only: the tools are still sent, so the tool calls
|
||||
* already in the history stay valid, but the model may not call one.
|
||||
* Absent means the model chooses (#3016).
|
||||
*/
|
||||
toolChoice?: 'auto' | 'none';
|
||||
}
|
||||
|
||||
/** A page the model's answer draws on, from its web search. */
|
||||
|
||||
@@ -168,6 +168,8 @@ export class AnthropicMessagesClient implements AiChatClient {
|
||||
})),
|
||||
...(request.webSearch ? [WEB_SEARCH_TOOL] : []),
|
||||
],
|
||||
// `none` is allowed with extended thinking, unlike forcing a tool.
|
||||
...(request.toolChoice === 'none' ? { tool_choice: { type: 'none' } } : {}),
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
|
||||
@@ -143,7 +143,7 @@ export class OpenAiChatClient implements AiChatClient {
|
||||
parameters: toProviderSchema(tool.parameters, this.schemaKind),
|
||||
},
|
||||
})),
|
||||
tool_choice: 'auto',
|
||||
tool_choice: request.toolChoice ?? 'auto',
|
||||
}
|
||||
: {}),
|
||||
...(this.kind === 'openai' && request.cacheKey ? { prompt_cache_key: request.cacheKey } : {}),
|
||||
|
||||
@@ -111,7 +111,7 @@ function toolsOf(request: AiChatRequest, kind: AiConnectionKind): Record<string,
|
||||
});
|
||||
}
|
||||
if (request.webSearch) tools.push({ type: 'web_search' });
|
||||
return tools.length > 0 ? { tools, tool_choice: 'auto', parallel_tool_calls: true } : {};
|
||||
return tools.length > 0 ? { tools, tool_choice: request.toolChoice ?? 'auto', parallel_tool_calls: true } : {};
|
||||
}
|
||||
|
||||
/** The pages an output message cites, as its text's URL annotations name them. */
|
||||
|
||||
@@ -272,6 +272,12 @@ interface Turn {
|
||||
* still gets its answer written (#2789); each is asked at most once.
|
||||
*/
|
||||
askedForAnswer: boolean;
|
||||
/**
|
||||
* The next request may only be answered with text: the step after the ask
|
||||
* for the answer. Claude Sonnet 5.5 offered its follow-ups again instead of
|
||||
* writing, and the turn ended without an answer (#3016).
|
||||
*/
|
||||
textOnlyNext: boolean;
|
||||
/** The chips of follow-ups offered before any answer, shown under the answer once it is written. */
|
||||
followUps: AssistantFollowUps | null;
|
||||
}
|
||||
@@ -360,6 +366,9 @@ function searchParts(
|
||||
/** Streams one answer of the model; a failure or a stop ends the turn here, saved as far as it got. */
|
||||
async function streamAnswer(turn: Turn, rowId: number): Promise<StepAnswer | AgentOutcome> {
|
||||
const { deps, input, w, signal } = turn;
|
||||
// Taken once: only the step right after the ask for the answer is held to text.
|
||||
const textOnly = turn.textOnlyNext;
|
||||
turn.textOnlyNext = false;
|
||||
const answer: StepAnswer = {
|
||||
text: '',
|
||||
received: [],
|
||||
@@ -377,6 +386,7 @@ async function streamAnswer(turn: Turn, rowId: number): Promise<StepAnswer | Age
|
||||
tools: deps.tools.specs(),
|
||||
cacheKey: input.cacheKey,
|
||||
webSearch: deps.webSearch === true && deps.client.webSearch,
|
||||
...(textOnly ? { toolChoice: 'none' as const } : {}),
|
||||
},
|
||||
signal,
|
||||
);
|
||||
@@ -535,6 +545,7 @@ function answeredAsk(call: AiToolCall): AssistantMessagePart {
|
||||
async function askForTheAnswer(turn: Turn, rowId: number, step: StepRecord & { asks: AiToolCall[] }): Promise<null> {
|
||||
const { asks, providerState } = step;
|
||||
turn.askedForAnswer = true;
|
||||
turn.textOnlyNext = true;
|
||||
turn.followUps = followUpsOf(asks[asks.length - 1].args);
|
||||
const parts = [...step.parts, ...asks.map((call) => ({ ...answeredAsk(call), result: WRITE_THE_ANSWER }))];
|
||||
await turn.deps.store.saveStep(rowId, { parts, providerState }, 'complete');
|
||||
@@ -673,6 +684,7 @@ export async function runAgentLoop(
|
||||
knownPlaceIds,
|
||||
nudged: false,
|
||||
askedForAnswer: false,
|
||||
textOnlyNext: false,
|
||||
followUps: null,
|
||||
};
|
||||
return stepsFrom(turn, 0);
|
||||
|
||||
Reference in New Issue
Block a user