Refine onboarding state and nickname checks
This commit is contained in:
1 parent
5579db54da
commit
9c013f7d4f
33 files changed
+1523
-119
No files matched your search
@@ -1,4 +1,4 @@
|
||||
import { getContext } from "@obs/context";
|
||||
import { getContext, getRequestLogger } from "@obs/context";
|
||||
import type { LlmClient } from "@llm/llm-client";
|
||||
import type { ChatMessage } from "@llm/types";
|
||||
import type { Tool, ToolContext } from "@tools/tool";
|
||||
@@ -147,11 +147,11 @@ function buildPlannerMessages(
|
||||
approach:
|
||||
"answer-direct | ask-clarification | redirect-to-step | validate-then-explain | lookup-rule-then-answer | soft-decline",
|
||||
targetPhase:
|
||||
"fresh | nickname-pending | photo-pending | both-pending | nickname-rejected | photo-rejected | deadline-near | completed | timed-out",
|
||||
"fresh | nickname-pending | photo-pending | both-pending | step1-completed | nickname-rejected | photo-rejected | deadline-near | completed | timed-out",
|
||||
mustInclude: ["short strings"],
|
||||
mustAvoid: ["short strings"],
|
||||
suggestedTools: [
|
||||
"validate-nickname | check-onboarding-progress | lookup-community-rule | get-room-context",
|
||||
"validate-nickname | check-onboarding-progress | lookup-community-rule | get-room-context | verify-discord-nickname",
|
||||
],
|
||||
tone: "friendly | concise | encouraging | neutral | apologetic",
|
||||
targetLengthChars: 150,
|
||||
@@ -186,8 +186,9 @@ function buildResponderAddendum(plan: PlannerOutput): string {
|
||||
function pickToolsForPlan(
|
||||
plan: PlannerOutput,
|
||||
tools: readonly Tool<unknown, unknown>[],
|
||||
forceTools: boolean,
|
||||
): readonly Tool<unknown, unknown>[] {
|
||||
if (plan.approach === "answer-direct" || plan.approach === "soft-decline") {
|
||||
if (!forceTools && (plan.approach === "answer-direct" || plan.approach === "soft-decline")) {
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -214,8 +215,19 @@ export class OnboardingOrchestrator {
|
||||
maxTokens: number,
|
||||
modelOverride: string,
|
||||
): Promise<string | null> {
|
||||
const logger = getRequestLogger();
|
||||
const deadlineMs = getRemainingDeadlineMs();
|
||||
|
||||
logger.debug(
|
||||
{
|
||||
intent: derived.intent.kind,
|
||||
responderTools: responderTools.map((tool) => tool.name),
|
||||
role: "responder",
|
||||
tier: derived.tier,
|
||||
},
|
||||
"[OnboardingOrchestrator] Responder execution mode decided",
|
||||
);
|
||||
|
||||
if (responderTools.length > 0) {
|
||||
return runWithTools({
|
||||
deadlineMs,
|
||||
@@ -247,6 +259,7 @@ export class OnboardingOrchestrator {
|
||||
derived: DerivedState,
|
||||
messages: ChatMessage[],
|
||||
): Promise<PlannerOutput> {
|
||||
const logger = getRequestLogger();
|
||||
const plannerMessages = buildPlannerMessages(derived, messages);
|
||||
const firstAttempt = await this.llmClient.chatCompletion(plannerMessages, {
|
||||
deadlineMs: getRemainingDeadlineMs(),
|
||||
@@ -262,6 +275,14 @@ export class OnboardingOrchestrator {
|
||||
? tryParsePlannerOutput(firstAttempt.content)
|
||||
: null;
|
||||
if (firstPlan) {
|
||||
logger.debug(
|
||||
{
|
||||
intent: derived.intent.kind,
|
||||
plan: firstPlan,
|
||||
source: "first-attempt",
|
||||
},
|
||||
"[OnboardingOrchestrator] Planner output parsed",
|
||||
);
|
||||
return firstPlan;
|
||||
}
|
||||
|
||||
@@ -285,7 +306,28 @@ export class OnboardingOrchestrator {
|
||||
});
|
||||
|
||||
const retryPlan = retry?.content ? tryParsePlannerOutput(retry.content) : null;
|
||||
return retryPlan ?? getDefaultPlan(derived);
|
||||
if (retryPlan) {
|
||||
logger.debug(
|
||||
{
|
||||
intent: derived.intent.kind,
|
||||
plan: retryPlan,
|
||||
source: "retry",
|
||||
},
|
||||
"[OnboardingOrchestrator] Planner output parsed",
|
||||
);
|
||||
return retryPlan;
|
||||
}
|
||||
|
||||
const fallbackPlan = getDefaultPlan(derived);
|
||||
logger.debug(
|
||||
{
|
||||
intent: derived.intent.kind,
|
||||
plan: fallbackPlan,
|
||||
source: "fallback",
|
||||
},
|
||||
"[OnboardingOrchestrator] Planner fell back to default plan",
|
||||
);
|
||||
return fallbackPlan;
|
||||
}
|
||||
|
||||
private async runTier0(
|
||||
@@ -317,7 +359,8 @@ export class OnboardingOrchestrator {
|
||||
messages,
|
||||
buildResponderAddendum(plan),
|
||||
);
|
||||
const responderTools = pickToolsForPlan(plan, options.tools ?? []);
|
||||
const forceTools = derived.responseMode === "llm-with-tools";
|
||||
const responderTools = pickToolsForPlan(plan, options.tools ?? [], forceTools);
|
||||
|
||||
return this.runDirect(
|
||||
derived,
|
||||
@@ -339,7 +382,8 @@ export class OnboardingOrchestrator {
|
||||
messages,
|
||||
buildResponderAddendum(plan),
|
||||
);
|
||||
const responderTools = pickToolsForPlan(plan, options.tools ?? []);
|
||||
const forceTools = derived.responseMode === "llm-with-tools";
|
||||
const responderTools = pickToolsForPlan(plan, options.tools ?? [], forceTools);
|
||||
|
||||
const draft = await this.runDirect(
|
||||
derived,
|
||||
|
||||
Reference in new issue
Block a user