Merge branch 'main' into subscription-client

Author: jahooma

agents-graveyard/base/base-factory.ts

@@ -7,7 +7,7 @@ import {
 } from './base-prompts'
 
 import type { SecretAgentDefinition } from '../../agents/types/secret-agent-definition'
-import type { ModelName } from 'types/agent-definition'
+import type { ModelName } from '../../agents/types/agent-definition'
 
 export const base = (
   model: ModelName,

agents-graveyard/base/base-lite-grok-4-fast.ts

@@ -1,15 +1,13 @@
-import {
-  PLACEHOLDER
-} from 'types/secret-agent-definition'
-
 import { buildArray } from '@codebuff/common/util/array'
 import { closeXml } from '@codebuff/common/util/xml'
 
 import baseLite from './base-lite'
 import { publisher } from '../constants'
 
-import type {
-  SecretAgentDefinition} from 'types/secret-agent-definition';
+import {
+  PLACEHOLDER,
+  type SecretAgentDefinition,
+} from '../../agents/types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   ...baseLite,

agents-graveyard/base2-with-task-researcher.ts

@@ -3,8 +3,8 @@ import { buildArray } from '@codebuff/common/util/array'
 import { publisher } from '../agents/constants'
 import { type SecretAgentDefinition } from '../agents/types/secret-agent-definition'
 
-import type { ToolCall } from 'types/agent-definition'
-import type { UserMessage } from 'types/util-types'
+import type { ToolCall } from '../agents/types/agent-definition'
+import type { UserMessage } from '../agents/types/util-types'
 
 export const createBase2WithTaskResearcher: () => Omit<
   SecretAgentDefinition,

agents-graveyard/base2/task-researcher/base2-gpt-5-with-task-researcher.ts

@@ -6,7 +6,7 @@ import {
   type SecretAgentDefinition,
 } from '../../types/secret-agent-definition'
 
-import type { ToolCall } from 'types/agent-definition'
+import type { ToolCall } from '../../../agents/types/agent-definition'
 
 export const createBase2WithTaskResearcher: () => Omit<
   SecretAgentDefinition,

agents-graveyard/base2/task-researcher/base2-with-task-researcher-planner-pro.ts

@@ -6,7 +6,7 @@ import {
   type SecretAgentDefinition,
 } from '../../../agents/types/secret-agent-definition'
 
-import type { ToolCall } from 'types/agent-definition'
+import type { ToolCall } from '../../../agents/types/agent-definition'
 
 export const createBase2WithTaskResearcher: () => Omit<
   SecretAgentDefinition,

agents-graveyard/editor/reviewer-editor-gpt-5.ts

@@ -1,6 +1,6 @@
 import { createCodeEditor } from './editor'
 
-import type { AgentDefinition } from 'types/agent-definition'
+import type { AgentDefinition } from '../../agents/types/agent-definition'
 
 
 const definition: AgentDefinition = {

agents-graveyard/editor/reviewer-editor.ts

@@ -1,7 +1,7 @@
 
 import { publisher } from '../constants'
 
-import type { AgentDefinition} from 'types/agent-definition';
+import type { AgentDefinition } from '../../agents/types/agent-definition'
 
 export const createCodeEditor = (options: {
   model: 'gpt-5' | 'opus'

agents-graveyard/file-explorer/file-q-and-a.ts

@@ -1,7 +1,7 @@
 import { publisher } from '../constants'
 
 import type { SecretAgentDefinition } from '../types/secret-agent-definition'
-import type { ToolCall } from 'types/agent-definition'
+import type { ToolCall } from '../../agents/types/agent-definition'
 
 const paramsSchema = {
   type: 'object' as const,

agents-graveyard/orchestrator/iterative-orchestrator/base2-with-files-input.ts

@@ -1,6 +1,6 @@
 import { createBase2 } from '../../base2/base2'
 
-import type { SecretAgentDefinition } from 'types/secret-agent-definition'
+import type { SecretAgentDefinition } from '../../../agents/types/secret-agent-definition'
 
 
 const definition: SecretAgentDefinition = {

agents-graveyard/thinker/thinker-lite.ts

@@ -1,6 +1,6 @@
 import thinker from './thinker'
 
-import type { SecretAgentDefinition } from 'types/secret-agent-definition'
+import type { SecretAgentDefinition } from '../../agents/types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   ...thinker,