Merge origin/dev into feature/upgrade-minimax-m2.7 (resolve conflicts)

src/agents/builtin-agents/agent-overrides.ts

@@ -44,6 +44,10 @@ export function mergeAgentConfig(
   const { prompt_append, ...rest } = migratedOverride
   const merged = deepMerge(base, rest as Partial<AgentConfig>)
 
+  if (merged.prompt && typeof merged.prompt === 'string' && merged.prompt.startsWith('file://')) {
+    merged.prompt = resolvePromptAppend(merged.prompt, directory)
+  }
+
   if (prompt_append && merged.prompt) {
     merged.prompt = merged.prompt + "\n" + resolvePromptAppend(prompt_append, directory)
   }

src/agents/builtin-agents/atlas-agent.ts

@@ -39,7 +39,7 @@ export function maybeCreateAtlasConfig(input: {
   const atlasRequirement = AGENT_MODEL_REQUIREMENTS["atlas"]
 
   const atlasResolution = applyModelResolution({
-    uiSelectedModel: orchestratorOverride?.model ? undefined : uiSelectedModel,
+    uiSelectedModel: orchestratorOverride?.model !== undefined ? undefined : uiSelectedModel,
     userModel: orchestratorOverride?.model,
     requirement: atlasRequirement,
     availableModels,

src/agents/builtin-agents/general-agents.ts

@@ -8,6 +8,7 @@ import { buildAgent, isFactory } from "../agent-builder"
 import { applyOverrides } from "./agent-overrides"
 import { applyEnvironmentContext } from "./environment-context"
 import { applyModelResolution, getFirstFallbackModel } from "./model-resolution"
+import { log } from "../../shared/logger"
 
 export function collectPendingBuiltinAgents(input: {
   agentSources: Record<BuiltinAgentName, import("../agent-builder").AgentSource>
@@ -69,13 +70,19 @@ export function collectPendingBuiltinAgents(input: {
     const isPrimaryAgent = isFactory(source) && source.mode === "primary"
 
     let resolution = applyModelResolution({
-      uiSelectedModel: (isPrimaryAgent && !override?.model) ? uiSelectedModel : undefined,
+      uiSelectedModel: (isPrimaryAgent && override?.model === undefined) ? uiSelectedModel : undefined,
       userModel: override?.model,
       requirement,
       availableModels,
       systemDefaultModel,
     })
-    if (!resolution && isFirstRunNoCache && !override?.model) {
+    if (!resolution) {
+      if (override?.model) {
+        log("[agent-registration] User-configured model could not be resolved, falling back", {
+          agent: agentName,
+          configuredModel: override.model,
+        })
+      }
       resolution = getFirstFallbackModel(requirement)
     }
     if (!resolution) continue

src/agents/builtin-agents/sisyphus-agent.ts

@@ -52,7 +52,7 @@ export function maybeCreateSisyphusConfig(input: {
   if (disabledAgents.includes("sisyphus") || !meetsSisyphusAnyModelRequirement) return undefined
 
   let sisyphusResolution = applyModelResolution({
-    uiSelectedModel: sisyphusOverride?.model ? undefined : uiSelectedModel,
+    uiSelectedModel: sisyphusOverride?.model !== undefined ? undefined : uiSelectedModel,
     userModel: sisyphusOverride?.model,
     requirement: sisyphusRequirement,
     availableModels,

src/agents/dynamic-agent-prompt-builder.test.ts

@@ -181,7 +181,7 @@ describe("buildParallelDelegationSection", () => {
 
   it("#given non-Claude model with deep category #when building #then returns aggressive delegation section", () => {
     //#given
-    const model = "google/gemini-3-pro"
+    const model = "google/gemini-3.1-pro"
     const categories = [deepCategory, otherCategory]
 
     //#when
@@ -237,7 +237,7 @@ describe("buildParallelDelegationSection", () => {
 describe("buildNonClaudePlannerSection", () => {
   it("#given non-Claude model #when building #then returns plan agent section", () => {
     //#given
-    const model = "google/gemini-3-pro"
+    const model = "google/gemini-3.1-pro"
 
     //#when
     const result = buildNonClaudePlannerSection(model)
@@ -272,4 +272,3 @@ describe("buildNonClaudePlannerSection", () => {
   })
 })
 
-

src/agents/hephaestus/gpt-5-3-codex.ts

@@ -162,6 +162,10 @@ Asking the user is the LAST resort after exhausting creative alternatives.
 - User asks a question implying work → Answer briefly, DO the implied work in the same turn
 - You wrote a plan in your response → EXECUTE the plan before ending turn — plans are starting lines, not finish lines
 
+### Task Scope Clarification
+
+You handle multi-step sub-tasks of a SINGLE GOAL. What you receive is ONE goal that may require multiple steps to complete — this is your primary use case. Only reject when given MULTIPLE INDEPENDENT goals in one request.
+
 ## Hard Constraints
 
 ${hardBlocks}

src/agents/hephaestus/gpt-5-4.ts

@@ -121,6 +121,10 @@ When blocked: try a different approach → decompose the problem → challenge a
 - User asks a question implying work → Answer briefly, DO the implied work in the same turn
 - You wrote a plan in your response → EXECUTE the plan before ending turn — plans are starting lines, not finish lines
 
+### Task Scope Clarification
+
+You handle multi-step sub-tasks of a SINGLE GOAL. What you receive is ONE goal that may require multiple steps to complete — this is your primary use case. Only reject when given MULTIPLE INDEPENDENT goals in one request.
+
 ## Hard Constraints
 
 ${hardBlocks}

src/agents/hephaestus/gpt.ts

@@ -112,6 +112,10 @@ Asking the user is the LAST resort after exhausting creative alternatives.
 - Note assumptions in final message, not as questions mid-work
 - Need context? Fire explore/librarian in background IMMEDIATELY — continue only with non-overlapping work while they search
 
+### Task Scope Clarification
+
+You handle multi-step sub-tasks of a SINGLE GOAL. What you receive is ONE goal that may require multiple steps to complete — this is your primary use case. Only reject when given MULTIPLE INDEPENDENT goals in one request.
+
 ## Hard Constraints
 
 ${hardBlocks}

src/agents/prometheus/system-prompt.test.ts

@@ -0,0 +1,42 @@
+import { describe, it, expect } from "bun:test"
+import { getPrometheusPrompt } from "./system-prompt"
+
+describe("getPrometheusPrompt", () => {
+  describe("#given question tool is not disabled", () => {
+    describe("#when generating prompt", () => {
+      it("#then should include Question tool references", () => {
+        const prompt = getPrometheusPrompt(undefined, [])
+
+        expect(prompt).toContain("Question({")
+      })
+    })
+  })
+
+  describe("#given question tool is disabled via disabled_tools", () => {
+    describe("#when generating prompt", () => {
+      it("#then should strip Question tool code examples", () => {
+        const prompt = getPrometheusPrompt(undefined, ["question"])
+
+        expect(prompt).not.toContain("Question({")
+      })
+    })
+
+    describe("#when disabled_tools includes question among other tools", () => {
+      it("#then should strip Question tool code examples", () => {
+        const prompt = getPrometheusPrompt(undefined, ["todowrite", "question", "interactive_bash"])
+
+        expect(prompt).not.toContain("Question({")
+      })
+    })
+  })
+
+  describe("#given no disabled_tools provided", () => {
+    describe("#when generating prompt with undefined", () => {
+      it("#then should include Question tool references", () => {
+        const prompt = getPrometheusPrompt(undefined, undefined)
+
+        expect(prompt).toContain("Question({")
+      })
+    })
+  })
+})

src/agents/prometheus/system-prompt.ts

@@ -52,16 +52,34 @@ export function getPrometheusPromptSource(model?: string): PrometheusPromptSourc
  * Gemini models → Gemini-optimized prompt (aggressive tool-call enforcement, thinking checkpoints)
  * Default (Claude, etc.) → Claude-optimized prompt (modular sections)
  */
-export function getPrometheusPrompt(model?: string): string {
+export function getPrometheusPrompt(model?: string, disabledTools?: readonly string[]): string {
   const source = getPrometheusPromptSource(model)
+  const isQuestionDisabled = disabledTools?.includes("question") ?? false
 
+  let prompt: string
   switch (source) {
     case "gpt":
-      return getGptPrometheusPrompt()
+      prompt = getGptPrometheusPrompt()
+      break
     case "gemini":
-      return getGeminiPrometheusPrompt()
+      prompt = getGeminiPrometheusPrompt()
+      break
     case "default":
     default:
-      return PROMETHEUS_SYSTEM_PROMPT
+      prompt = PROMETHEUS_SYSTEM_PROMPT
   }
+
+  if (isQuestionDisabled) {
+    prompt = stripQuestionToolReferences(prompt)
+  }
+
+  return prompt
+}
+
+/**
+ * Removes Question tool usage examples from prompt text when question tool is disabled.
+ */
+function stripQuestionToolReferences(prompt: string): string {
+  // Remove Question({...}) code blocks (multi-line)
+  return prompt.replace(/```typescript\n\s*Question\(\{[\s\S]*?\}\)\s*\n```/g, "")
 }

src/agents/sisyphus-junior/default.ts

@@ -35,6 +35,11 @@ Task NOT complete without:
 - ${verificationText}
 </Verification>
 
+<Termination>
+STOP after first successful verification. Do NOT re-verify.
+Maximum status checks: 2. Then stop regardless.
+</Termination>
+
 <Style>
 - Start immediately. No acknowledgments.
 - Match user's communication style.

src/agents/types.ts

@@ -128,7 +128,7 @@ export type AgentName = BuiltinAgentName;
 export type AgentOverrideConfig = Partial<AgentConfig> & {
   prompt_append?: string;
   variant?: string;
-  fallback_models?: string | string[];
+  fallback_models?: string | (string | import("../config/schema/fallback-models").FallbackModelObject)[];
 };
 
 export type AgentOverrides = Partial<