@lota-sdk/core 0.1.11 → 0.1.13

package/src/storage/generated-document-storage.service.ts

@@ -1,6 +1,6 @@
 import { S3Client } from 'bun'
 
-import { env } from '../config/env-shapes'
+import { getRuntimeConfig } from '../runtime/runtime-config'
 
 function toSafeSegment(value: string): string {
   return value
@@ -27,12 +27,13 @@ class GeneratedDocumentStorageService {
 
   private get client(): InstanceType<typeof S3Client> {
     if (!this._client) {
+      const config = getRuntimeConfig()
       this._client = new S3Client({
-        accessKeyId: env.S3_ACCESS_KEY_ID,
-        secretAccessKey: env.S3_SECRET_ACCESS_KEY,
-        bucket: env.S3_BUCKET,
-        endpoint: env.S3_ENDPOINT,
-        region: env.S3_REGION,
+        accessKeyId: config.s3.accessKeyId,
+        secretAccessKey: config.s3.secretAccessKey,
+        bucket: config.s3.bucket,
+        endpoint: config.s3.endpoint,
+        region: config.s3.region,
       })
     }
     return this._client

package/src/storage/index.ts

@@ -0,0 +1,10 @@
+export * from './attachment-parser'
+export * from './attachment-storage.service'
+export * from './generated-document-storage.service'
+export type { MessagePartLike, ReadableUploadPageMode, ReadableUploadPagePart } from './attachments.types'
+export {
+  buildOrganizationDocumentStorageKey,
+  buildUploadStorageKey,
+  buildUploadStoragePrefix,
+  readNonNegativeInteger,
+} from './attachments.utils'

package/src/system-agents/delegated-agent-factory.ts

@@ -7,11 +7,12 @@ import { isRecord } from '../utils/string'
 import { assertSubstantiveAgentResult } from './agent-result'
 
 type AgentProviderOptions = ToolLoopAgentSettings['providerOptions']
+type AgentModel = LanguageModel | (() => LanguageModel)
 
 interface DelegatedAgentDefinition {
   id: string
   description: string
-  model: LanguageModel
+  model: AgentModel
   providerOptions?: AgentProviderOptions
   instructions: string
   tools?: ToolSet
@@ -24,6 +25,10 @@ interface DelegatedAgentDefinitionWithContext<TContext> extends Omit<DelegatedAg
   createTools: (context: TContext) => ToolSet
 }
 
+function resolveAgentModel(model: AgentModel): LanguageModel {
+  return typeof model === 'function' ? model() : model
+}
+
 function buildCurrentDateContext(now = new Date()): string {
   const isoDate = now.toISOString().slice(0, 10)
   const humanDate = new Intl.DateTimeFormat('en-US', {
@@ -75,6 +80,9 @@ When your analysis is complete, return your final answer directly as markdown te
 </termination>`
 
 const MAX_RETAINED_AGENT_MESSAGES = 10
+const MAX_NON_SUBSTANTIVE_AGENT_RESULT_ATTEMPTS = 2
+const NON_SUBSTANTIVE_AGENT_RESULT_RETRY_PROMPT =
+  'Return a complete substantive markdown answer. Do not reply with an empty result, placeholder, or tool-only outcome.'
 
 export function retainCriticalAgentMessages(messages: ModelMessage[]): ModelMessage[] {
   const systemMessages = messages.filter((message) => message.role === 'system')
@@ -112,6 +120,31 @@ function resolveDelegatedAgentTemperature(definition: {
   return definition.temperature ?? 0.2
 }
 
+async function generateSubstantiveDelegatedAgentResult(params: {
+  label: string
+  task: string
+  abortSignal?: AbortSignal
+  createAgent: () => ToolLoopAgent<never, ToolSet>
+}): Promise<string> {
+  let lastError: unknown
+
+  for (let attempt = 0; attempt < MAX_NON_SUBSTANTIVE_AGENT_RESULT_ATTEMPTS; attempt += 1) {
+    const prompt = attempt === 0 ? params.task : `${params.task}\n\n${NON_SUBSTANTIVE_AGENT_RESULT_RETRY_PROMPT}`
+    const result = await params.createAgent().generate({ prompt, abortSignal: params.abortSignal })
+
+    try {
+      return assertSubstantiveAgentResult(result.text, params.label)
+    } catch (error) {
+      lastError = error
+      if (params.abortSignal?.aborted) {
+        throw error
+      }
+    }
+  }
+
+  throw lastError ?? new Error(`${params.label} must contain substantive text.`)
+}
+
 export function createDelegatedAgentTool(definition: DelegatedAgentDefinition): ToolDefinition<void> {
   const maxSteps = definition.maxSteps ?? 10
   const temperature = resolveDelegatedAgentTemperature(definition)
@@ -124,20 +157,28 @@ export function createDelegatedAgentTool(definition: DelegatedAgentDefinition):
         inputSchema: z.object({ task: z.string().min(1) }),
         execute: async ({ task }: { task: string }, { abortSignal }) => {
           const agentTools = definition.tools
-          const agent = new ToolLoopAgent({
-            id: definition.id,
-            model: definition.model,
-            ...(definition.providerOptions ? { providerOptions: definition.providerOptions } : {}),
-            instructions: buildDelegatedAgentInstructions(definition.instructions, agentTools),
-            tools: agentTools,
-            maxOutputTokens: definition.maxOutputTokens ?? 4096,
-            ...(typeof temperature === 'number' ? { temperature } : {}),
-            stopWhen: [stepCountIs(maxSteps)],
-            prepareStep: async ({ messages }) => ({ messages: retainCriticalAgentMessages(messages) }),
-          })
-
-          const result = await agent.generate({ prompt: task, abortSignal })
-          return { task, result: assertSubstantiveAgentResult(result.text, `${definition.id} result`) }
+          const createAgent = () =>
+            new ToolLoopAgent({
+              id: definition.id,
+              model: resolveAgentModel(definition.model),
+              ...(definition.providerOptions ? { providerOptions: definition.providerOptions } : {}),
+              instructions: buildDelegatedAgentInstructions(definition.instructions, agentTools),
+              tools: agentTools,
+              maxOutputTokens: definition.maxOutputTokens ?? 4096,
+              ...(typeof temperature === 'number' ? { temperature } : {}),
+              stopWhen: [stepCountIs(maxSteps)],
+              prepareStep: async ({ messages }) => ({ messages: retainCriticalAgentMessages(messages) }),
+            })
+
+          return {
+            task,
+            result: await generateSubstantiveDelegatedAgentResult({
+              label: `${definition.id} result`,
+              task,
+              abortSignal,
+              createAgent,
+            }),
+          }
         },
       }),
   } as const satisfies ToolDefinition<void>
@@ -157,20 +198,28 @@ export function createDelegatedAgentToolWithContext<TContext>(
         inputSchema: z.object({ task: z.string().min(1) }),
         execute: async ({ task }: { task: string }, { abortSignal }) => {
           const agentTools = definition.createTools(context)
-          const agent = new ToolLoopAgent({
-            id: definition.id,
-            model: definition.model,
-            ...(definition.providerOptions ? { providerOptions: definition.providerOptions } : {}),
-            instructions: buildDelegatedAgentInstructions(definition.instructions, agentTools),
-            tools: agentTools,
-            maxOutputTokens: definition.maxOutputTokens ?? 4096,
-            ...(typeof temperature === 'number' ? { temperature } : {}),
-            stopWhen: [stepCountIs(maxSteps)],
-            prepareStep: async ({ messages }) => ({ messages: retainCriticalAgentMessages(messages) }),
-          })
-
-          const result = await agent.generate({ prompt: task, abortSignal })
-          return { task, result: assertSubstantiveAgentResult(result.text, `${definition.id} result`) }
+          const createAgent = () =>
+            new ToolLoopAgent({
+              id: definition.id,
+              model: resolveAgentModel(definition.model),
+              ...(definition.providerOptions ? { providerOptions: definition.providerOptions } : {}),
+              instructions: buildDelegatedAgentInstructions(definition.instructions, agentTools),
+              tools: agentTools,
+              maxOutputTokens: definition.maxOutputTokens ?? 4096,
+              ...(typeof temperature === 'number' ? { temperature } : {}),
+              stopWhen: [stepCountIs(maxSteps)],
+              prepareStep: async ({ messages }) => ({ messages: retainCriticalAgentMessages(messages) }),
+            })
+
+          return {
+            task,
+            result: await generateSubstantiveDelegatedAgentResult({
+              label: `${definition.id} result`,
+              task,
+              abortSignal,
+              createAgent,
+            }),
+          }
         },
       }),
   } as const satisfies ToolDefinition<TContext>

package/src/system-agents/index.ts

@@ -0,0 +1,4 @@
+export * from './agent-result'
+export * from './delegated-agent-factory'
+export * from './helper-agent-options'
+export * from './recent-activity-title-refiner.agent'

package/src/system-agents/recent-activity-title-refiner.agent.ts

@@ -1,6 +1,7 @@
 import { ToolLoopAgent } from 'ai'
 
 import { bifrostModel } from '../bifrost/bifrost'
+import { getLeadAgentDisplayName } from '../config/agent-defaults'
 import {
   OPENROUTER_STRUCTURED_HELPER_MODEL_ID,
   OPENROUTER_HIGH_REASONING_PROVIDER_OPTIONS,
@@ -10,8 +11,42 @@ import { resolveHelperAgentOptions } from './helper-agent-options'
 
 const RECENT_ACTIVITY_TITLE_MAX_TOKENS = 256
 
+export function buildRecentActivityTitleRefinerPrompt(): string {
+  const leadAgentDisplayName = getLeadAgentDisplayName() || 'the lead agent'
+
+  return `<agent-instructions>
+You are ${leadAgentDisplayName} writing the visible title for a recent activity item.
+
+<goal>
+Turn recent activity context into a short label that helps the user quickly recognize and reopen the task.
+</goal>
+
+<rules>
+- Write 4-10 words when possible.
+- Prefer concrete task language over generic labels.
+- Mention the agent only when it adds useful context.
+- Focus on what the user was trying to accomplish.
+- Avoid generic phrases like "Chat", "Conversation", "Recent activity", "Task", or "Workstream update".
+- Avoid punctuation at the end.
+- Do not invent details that are not present in the input.
+- If the input is too weak for improvement, return the current system title.
+</rules>
+
+<examples>
+- "Review pending decisions with ${leadAgentDisplayName}"
+- "Extract website intelligence findings"
+- "Discuss onboarding repository indexing"
+- "Review PRD from GitHub indexing"
+</examples>
+
+<output>
+Return only the title text. No quotes, labels, JSON, markdown, or explanation.
+</output>
+</agent-instructions>`
+}
+
 export const recentActivityTitleRefinerPrompt = `<agent-instructions>
-You are the Chief of Staff writing the visible title for a recent activity item.
+You are the lead agent writing the visible title for a recent activity item.
 
 <goal>
 Turn recent activity context into a short label that helps the user quickly recognize and reopen the task.
@@ -29,7 +64,7 @@ Turn recent activity context into a short label that helps the user quickly reco
 </rules>
 
 <examples>
-- "Review pending decisions with Chief"
+- "Review pending decisions with the lead agent"
 - "Extract website intelligence findings"
 - "Discuss onboarding repository indexing"
 - "Review PRD from GitHub indexing"
@@ -46,7 +81,7 @@ export function createRecentActivityTitleRefinerAgent(options: CreateHelperToolL
     model: bifrostModel(OPENROUTER_STRUCTURED_HELPER_MODEL_ID),
     providerOptions: OPENROUTER_HIGH_REASONING_PROVIDER_OPTIONS,
     ...resolveHelperAgentOptions(options, {
-      instructions: recentActivityTitleRefinerPrompt,
+      instructions: buildRecentActivityTitleRefinerPrompt(),
       maxOutputTokens: RECENT_ACTIVITY_TITLE_MAX_TOKENS,
     }),
   })

package/src/system-agents/regular-chat-memory-digest.agent.ts

@@ -10,7 +10,7 @@ import { resolveHelperAgentOptions } from './helper-agent-options'
 
 const REGULAR_CHAT_MEMORY_DIGEST_MAX_TOKENS = 8_192
 
-export const regularChatMemoryDigestPrompt = `<agent-instructions>
+const regularChatMemoryDigestPrompt = `<agent-instructions>
 You are the regular-chat memory digest synthesizer.
 
 <goal>

package/src/system-agents/skill-extractor.agent.ts

@@ -11,7 +11,7 @@ import { resolveHelperAgentOptions } from './helper-agent-options'
 
 const SKILL_EXTRACTOR_MAX_TOKENS = 8_192
 
-export const skillExtractorPrompt = `<agent-instructions>
+const skillExtractorPrompt = `<agent-instructions>
 You are the skill extractor.
 
 <goal>

package/src/system-agents/skill-manager.agent.ts

@@ -11,7 +11,7 @@ import { resolveHelperAgentOptions } from './helper-agent-options'
 
 const SKILL_MANAGER_MAX_TOKENS = 4_096
 
-export const skillManagerPrompt = `<agent-instructions>
+const skillManagerPrompt = `<agent-instructions>
 You are the skill manager.
 
 <goal>
@@ -49,7 +49,7 @@ Return a JSON object with:
 </output-contract>
 </agent-instructions>`
 
-export const MergedSkillSchema = z.object({
+const MergedSkillSchema = z.object({
   name: z.string(),
   description: z.string(),
   instructions: z.string(),
@@ -65,8 +65,6 @@ export const SkillManagerOutputSchema = z.object({
   mergedSkill: MergedSkillSchema.optional(),
 })
 
-export type SkillManagerOutput = z.infer<typeof SkillManagerOutputSchema>
-
 export function createSkillManagerAgent(options: CreateHelperToolLoopAgentOptions) {
   return new ToolLoopAgent({
     id: 'skill-manager',

package/src/tools/execution-plan.tool.ts

@@ -4,8 +4,8 @@ import {
   ResumeExecutionPlanRunArgsSchema,
   ReplaceExecutionPlanArgsSchema,
   SubmitExecutionNodeResultArgsSchema,
-} from '@lota-sdk/shared/schemas/tools'
-import type { ExecutionPlanToolResultData } from '@lota-sdk/shared/schemas/tools'
+} from '@lota-sdk/shared'
+import type { ExecutionPlanToolResultData } from '@lota-sdk/shared'
 import { tool } from 'ai'
 
 import type { RecordIdRef } from '../db/record-id'

package/src/tools/firecrawl-client.ts

@@ -1,12 +1,12 @@
 import Firecrawl from '@mendable/firecrawl-js'
 
-import { env } from '../config/env-shapes'
+import { getRuntimeConfig } from '../runtime/runtime-config'
 
 let _firecrawlClient: Firecrawl | undefined
 
 export function getFirecrawlClient(): Firecrawl {
   if (!_firecrawlClient) {
-    _firecrawlClient = new Firecrawl({ apiKey: env.FIRECRAWL_API_KEY })
+    _firecrawlClient = new Firecrawl({ apiKey: getRuntimeConfig().firecrawl.apiKey })
   }
   return _firecrawlClient
 }

package/src/tools/index.ts

@@ -0,0 +1,12 @@
+export * from './execution-plan.tool'
+export * from './fetch-webpage.tool'
+export * from './log-hello-world.tool'
+export * from './memory-block.tool'
+export * from './read-file-parts.tool'
+export * from './remember-memory.tool'
+export * from './research-topic.tool'
+export * from './search-tools'
+export * from './search-web.tool'
+export * from './team-think.tool'
+export * from './tool-contract'
+export * from './user-questions.tool'

package/src/tools/research-topic.tool.ts

@@ -12,7 +12,7 @@ export const researchTopicTool = createDelegatedAgentTool({
   id: 'researchTopic',
   description:
     'Delegate a research task to a dedicated research agent that searches the web, fetches pages, and returns a synthesized markdown report. Call multiple instances in parallel for broad research across different topics.',
-  model: bifrostChatModel(OPENROUTER_WEB_RESEARCH_MODEL_ID),
+  model: () => bifrostChatModel(OPENROUTER_WEB_RESEARCH_MODEL_ID),
   providerOptions: OPENROUTER_MEDIUM_REASONING_PROVIDER_OPTIONS,
   instructions: RESEARCHER_PROMPT,
   tools: { searchWeb: searchWebTool.create(), fetchWebpage: fetchWebpageTool.create() },

package/src/tools/team-think.tool.ts

@@ -1,4 +1,4 @@
-import type { ChatMessage } from '@lota-sdk/shared/schemas/chat-message'
+import type { ChatMessage } from '@lota-sdk/shared'
 import { stepCountIs } from 'ai'
 import type { ToolSet } from 'ai'
 

package/src/tools/user-questions.tool.ts

@@ -1,5 +1,5 @@
-import { USER_QUESTIONS_TOOL_NAME, UserQuestionsArgsSchema } from '@lota-sdk/shared/schemas/tools'
-import type { UserQuestionsArgs } from '@lota-sdk/shared/schemas/tools'
+import { USER_QUESTIONS_TOOL_NAME, UserQuestionsArgsSchema } from '@lota-sdk/shared'
+import type { UserQuestionsArgs } from '@lota-sdk/shared'
 import { tool } from 'ai'
 
 import type { ToolDefinition } from '../ai/definitions'

package/src/utils/index.ts

@@ -0,0 +1,6 @@
+export * from './async'
+export * from './date-time'
+export * from './error'
+export * from './errors'
+export * from './hono-error-handler'
+export * from './string'

package/src/workers/bootstrap.ts

@@ -2,26 +2,17 @@ import { configureLogger, serverLogger } from '../config/logger'
 import { LOTA_SDK_DATABASE_NAME } from '../db/sdk-database'
 import { SurrealDBService, databaseService, setDatabaseService } from '../db/service'
 import { connectWithStartupRetry, waitForDatabaseBootstrap } from '../db/startup'
+import { parseWorkerBootstrapEnv } from '../runtime/runtime-config'
 import { getConfiguredPluginDatabaseConnector } from '../runtime/runtime-extensions'
 
-/**
- * Sandboxed BullMQ workers run in separate child processes where createLotaRuntime
- * was never called, so the global databaseService proxy has no backing instance.
- * Create one from env vars so the proxy resolves.
- */
-function getRequiredEnv(key: string): string {
-  const value = process.env[key]
-  if (!value) throw new Error(`Missing required env var: ${key}`)
-  return value
-}
-
 function ensureDatabaseServiceConfigured(): void {
+  const env = parseWorkerBootstrapEnv(process.env)
   const db = new SurrealDBService({
-    url: getRequiredEnv('SURREALDB_URL'),
-    namespace: getRequiredEnv('SURREALDB_NAMESPACE'),
+    url: env.SURREALDB_URL,
+    namespace: env.SURREALDB_NAMESPACE,
     database: LOTA_SDK_DATABASE_NAME,
-    username: process.env.SURREALDB_USER,
-    password: process.env.SURREALDB_PASSWORD,
+    username: env.SURREALDB_USER,
+    password: env.SURREALDB_PASSWORD,
   })
   setDatabaseService(db)
 }
@@ -35,6 +26,7 @@ export async function initializeSandboxedWorkerRuntime(): Promise<void> {
   }
 
   sandboxedWorkerRuntimePromise = (async () => {
+    const env = parseWorkerBootstrapEnv(process.env)
     await configureLogger()
 
     ensureDatabaseServiceConfigured()
@@ -58,7 +50,7 @@ export async function initializeSandboxedWorkerRuntime(): Promise<void> {
 
     await waitForDatabaseBootstrap({
       databaseService,
-      expectedFingerprint: process.env.DB_SCHEMA_FINGERPRINT,
+      expectedFingerprint: env.DB_SCHEMA_FINGERPRINT,
       label: 'sandboxed worker runtime',
       logger: serverLogger,
       connect: () => databaseService.connect(),

package/src/workers/index.ts

@@ -0,0 +1,7 @@
+export * from './bootstrap'
+export * from './regular-chat-memory-digest.helpers'
+export * from './worker-utils'
+export * from './utils/file-section-chunker'
+export * from './utils/repomix-file-sections'
+export * from './utils/repo-structure-extractor'
+export * from './utils/repomix-process-concurrency'

package/src/workers/regular-chat-memory-digest.runner.ts

@@ -1,4 +1,4 @@
-import { toTimestamp } from '@lota-sdk/shared/runtime/chat-message-metadata'
+import { toTimestamp } from '@lota-sdk/shared'
 import { BoundQuery } from 'surrealdb'
 import { z } from 'zod'
 

package/src/workers/skill-extraction.runner.ts

@@ -1,4 +1,4 @@
-import { toTimestamp } from '@lota-sdk/shared/runtime/chat-message-metadata'
+import { toTimestamp } from '@lota-sdk/shared'
 import { BoundQuery } from 'surrealdb'
 import { z } from 'zod'
 

package/src/workers/utils/{repo-indexer-chunker.ts → file-section-chunker.ts}

@@ -1,16 +1,15 @@
-export const DEFAULT_REPOMIX_CHUNK_MAX_CHARS = 250_000
-const MIN_REPOMIX_CHUNK_MAX_CHARS = 4_000
-export const DEFAULT_REPOMIX_CHUNK_MIN_CHARS = 10_000
+export const DEFAULT_FILE_SECTION_CHUNK_MAX_CHARS = 250_000
+const MIN_FILE_SECTION_CHUNK_MAX_CHARS = 4_000
+export const DEFAULT_FILE_SECTION_CHUNK_MIN_CHARS = 10_000
 const SECTION_SEPARATOR_LENGTH = 2
-const FILE_SECTION_HEADER_SOURCE = '^## File:\\s+(.+)$'
 
-interface RepomixSection {
+export interface FileSection {
   kind: 'preamble' | 'file'
   content: string
   filePath?: string
 }
 
-export interface RepomixContextChunk {
+export interface FileSectionChunk {
   index: number
   totalChunks: number
   content: string
@@ -22,7 +21,7 @@ export interface RepomixContextChunk {
   lastFilePath: string | null
 }
 
-interface RepomixChunkOptions {
+export interface FileSectionChunkOptions {
   maxChars?: number
   minChunkChars?: number
   preserveCodeFenceIntegrity?: boolean
@@ -35,14 +34,14 @@ function estimateTokenCountFromChars(text: string): number {
 
 function normalizeMaxChars(value?: number): number {
   if (typeof value !== 'number' || !Number.isFinite(value)) {
-    return DEFAULT_REPOMIX_CHUNK_MAX_CHARS
+    return DEFAULT_FILE_SECTION_CHUNK_MAX_CHARS
   }
-  return Math.max(MIN_REPOMIX_CHUNK_MAX_CHARS, Math.floor(value))
+  return Math.max(MIN_FILE_SECTION_CHUNK_MAX_CHARS, Math.floor(value))
 }
 
 function normalizeMinChunkChars(value: number | undefined, maxChars: number): number {
   if (typeof value !== 'number' || !Number.isFinite(value)) {
-    return Math.min(DEFAULT_REPOMIX_CHUNK_MIN_CHARS, Math.floor(maxChars * 0.35))
+    return Math.min(DEFAULT_FILE_SECTION_CHUNK_MIN_CHARS, Math.floor(maxChars * 0.35))
   }
   const normalized = Math.max(512, Math.floor(value))
   return Math.min(normalized, Math.floor(maxChars * 0.6))
@@ -156,9 +155,9 @@ function mergeTinyTailParts(parts: string[], options: { minChunkChars: number; m
 }
 
 async function splitOversizedSection(
-  section: RepomixSection,
+  section: FileSection,
   options: { maxChars: number; minChunkChars: number; preserveCodeFenceIntegrity: boolean },
-): Promise<RepomixSection[]> {
+): Promise<FileSection[]> {
   if (section.content.length <= options.maxChars) {
     return [section]
   }
@@ -188,43 +187,12 @@ async function splitOversizedSection(
   }))
 }
 
-function parseRepomixSections(repomixOutput: string): RepomixSection[] {
-  const source = repomixOutput.trim()
-  if (!source) return []
-
-  const matches = Array.from(source.matchAll(new RegExp(FILE_SECTION_HEADER_SOURCE, 'gm')))
-  if (matches.length === 0) {
-    return [{ kind: 'preamble', content: source }]
-  }
-
-  const sections: RepomixSection[] = []
-  const firstMatch = matches.at(0)
-  const firstIndex = firstMatch ? firstMatch.index : 0
-  if (firstIndex > 0) {
-    const preamble = source.slice(0, firstIndex).trim()
-    if (preamble) {
-      sections.push({ kind: 'preamble', content: preamble })
-    }
-  }
-
-  for (const [index, match] of matches.entries()) {
-    const start = match.index
-    const nextStart = matches[index + 1]?.index ?? source.length
-    const content = source.slice(start, nextStart).trim()
-    if (!content) continue
-    const filePath = (match[1] ?? '').trim()
-    sections.push({ kind: 'file', content, filePath: filePath || undefined })
-  }
-
-  return sections
-}
-
 function mergeTinyChunks(
-  chunks: Omit<RepomixContextChunk, 'index' | 'totalChunks'>[],
+  chunks: Omit<FileSectionChunk, 'index' | 'totalChunks'>[],
   options: { minChunkChars: number; maxChars: number },
-): Omit<RepomixContextChunk, 'index' | 'totalChunks'>[] {
+): Omit<FileSectionChunk, 'index' | 'totalChunks'>[] {
   if (chunks.length <= 1) return chunks
-  const merged: Omit<RepomixContextChunk, 'index' | 'totalChunks'>[] = []
+  const merged: Omit<FileSectionChunk, 'index' | 'totalChunks'>[] = []
 
   for (const chunk of chunks) {
     const previous = merged.at(-1)
@@ -252,15 +220,18 @@ function mergeTinyChunks(
   return merged
 }
 
-export async function chunkRepomixOutput(
-  repomixOutput: string,
-  options: RepomixChunkOptions = {},
-): Promise<RepomixContextChunk[]> {
+export async function chunkFileSections(
+  fileSections: readonly FileSection[],
+  options: FileSectionChunkOptions = {},
+): Promise<FileSectionChunk[]> {
   const maxChars = normalizeMaxChars(options.maxChars)
   const minChunkChars = normalizeMinChunkChars(options.minChunkChars, maxChars)
   const preserveCodeFenceIntegrity = options.preserveCodeFenceIntegrity ?? true
 
-  const rawSections = parseRepomixSections(repomixOutput)
+  const rawSections = fileSections
+    .map((section) => ({ kind: section.kind, content: section.content.trim(), filePath: section.filePath }))
+    .filter((section) => section.content.length > 0)
+
   const splitSections = await Promise.all(
     rawSections.map(
       async (section) => await splitOversizedSection(section, { maxChars, minChunkChars, preserveCodeFenceIntegrity }),
@@ -270,7 +241,7 @@ export async function chunkRepomixOutput(
 
   if (sections.length === 0) return []
 
-  const chunks: Omit<RepomixContextChunk, 'index' | 'totalChunks'>[] = []
+  const chunks: Omit<FileSectionChunk, 'index' | 'totalChunks'>[] = []
   let currentParts: string[] = []
   let currentCharLength = 0
   let currentSectionCount = 0

package/src/workers/utils/repo-structure-extractor.ts

@@ -1,17 +1,14 @@
 import { readdir, readFile } from 'node:fs/promises'
 import path from 'node:path'
 
-import {
-  RepositoryStructureArtifactSchema,
-  RepositoryStructureSummarySchema,
-} from '@lota-sdk/shared/schemas/repository-structure'
+import { RepositoryStructureArtifactSchema, RepositoryStructureSummarySchema } from '@lota-sdk/shared'
 import type {
   RepositoryStructureArtifact,
   RepositoryStructureComponent,
   RepositoryStructureShape,
   RepositoryStructureSignal,
   RepositoryStructureSummary,
-} from '@lota-sdk/shared/schemas/repository-structure'
+} from '@lota-sdk/shared'
 
 const EXTRACTOR_VERSION = 'repository-structure-extractor.v1'
 const IGNORED_DIR_NAMES = new Set([