Merge remote-tracking branch 'origin/main' into brandon/mock-db

Author: brandonkachen

.agents/base2/base2.ts

@@ -314,14 +314,12 @@ ${buildArray(
     `- For any task requiring 3+ steps, use the write_todos tool to write out your step-by-step implementation plan. Include ALL of the applicable tasks in the list.${isFast ? '' : ' You should include a step to review the changes after you have implemented the changes.'}:${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'} You may be able to do reviewing and validation in parallel in the same step. Skip write_todos for simple tasks like quick edits or answering questions.`,
   (isDefault || isMax) &&
     `- For quick problems, use <think></think> tags to think through the problem. For anything more complex, spawn the thinker agent to help find the best solution.`,
-  isMax &&
-    'You should use <think></think> tags all the time to help arrive at the best solution!',
   isLite &&
     '- IMPORTANT: You must spawn the editor-gpt-5 agent to implement the changes after you have gathered all the context you need. This agent will do the best job of implementing the changes so you must spawn it for all changes. Do not pass any prompt or params to the editor agent when spawning it. It will make its own best choices of what to do.',
   isDefault &&
     '- IMPORTANT: You must spawn the editor agent to implement the changes after you have gathered all the context you need. This agent will do the best job of implementing the changes so you must spawn it for all non-trivial changes. Do not pass any prompt or params to the editor agent when spawning it. It will make its own best choices of what to do.',
   isMax &&
-    `- IMPORTANT: You must spawn the editor-multi-prompt agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
+    `- IMPORTANT: You must spawn the editor-multi-prompt agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious. You should also prompt it to implement the full task rather than just a single step.`,
   isFast &&
     '- Implement the changes using the str_replace or write_file tools. Implement all the changes in one go.',
   isFast &&

common/src/testing/fixtures/agent-runtime.ts

@@ -61,6 +61,7 @@ export const TEST_AGENT_RUNTIME_IMPL = Object.freeze<
     email: 'test-email',
     discord_id: 'test-discord-id',
     referral_code: 'ref-test-code',
+    banned: false,
   }),
   fetchAgentFromDatabase: async () => null,
   startAgentRun: async () => 'test-agent-run-id',

common/src/types/contracts/database.ts

@@ -51,8 +51,9 @@ type User = {
   email: string
   discord_id: string | null
   referral_code: string | null
+  banned: boolean
 }
-export const userColumns = ['id', 'email', 'discord_id', 'referral_code'] as const
+export const userColumns = ['id', 'email', 'discord_id', 'referral_code', 'banned'] as const
 export type UserColumn = keyof User
 export type GetUserInfoFromApiKeyInput<T extends UserColumn> = {
   apiKey: string

evals/impl/agent-runtime.ts

@@ -37,6 +37,7 @@ export const EVALS_AGENT_RUNTIME_IMPL = Object.freeze<AgentRuntimeDeps>({
     email: 'test-email',
     discord_id: 'test-discord-id',
     referral_code: 'ref-test-code',
+    banned: false,
   }),
   fetchAgentFromDatabase: async () => null,
   startAgentRun: async () => 'test-agent-run-id',

packages/internal/src/db/migrations/0032_flawless_lily_hollister.sql

@@ -0,0 +1 @@
+ALTER TABLE "user" ADD COLUMN "banned" boolean DEFAULT false NOT NULL;