@vibe-forge/core 0.7.5 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/core",
-  "version": "0.7.5",
+  "version": "0.8.3",
   "imports": {
     "#~/*.js": {
       "__vibe-forge__": {
@@ -22,15 +22,6 @@
         "require": "./dist/index.js"
       }
     },
-    "./adapter": {
-      "__vibe-forge__": {
-        "default": "./src/adapter/index.ts"
-      },
-      "default": {
-        "import": "./dist/adapter.mjs",
-        "require": "./dist/adapter.js"
-      }
-    },
     "./channel": {
       "__vibe-forge__": {
         "default": "./src/channel.ts"
@@ -49,44 +40,11 @@
         "require": "./dist/schema.js"
       }
     },
-    "./hooks": {
-      "__vibe-forge__": {
-        "default": "./src/hooks/index.ts"
-      },
-      "default": {
-        "import": "./dist/hooks/index.mjs",
-        "require": "./dist/hooks/index.js"
-      }
-    },
-    "./utils/*": {
-      "__vibe-forge__": {
-        "default": "./src/utils/*.ts"
-      },
-      "default": {
-        "import": "./dist/utils/*.mjs",
-        "require": "./dist/utils/*.js"
-      }
-    },
-    "./controllers/*": {
-      "__vibe-forge__": {
-        "default": "./src/controllers/*/index.ts"
-      },
-      "default": {
-        "import": "./dist/controllers/*/index.mjs",
-        "require": "./dist/controllers/*/index.js"
-      }
-    },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "fast-glob": "^3.3.3",
-    "front-matter": "^4.0.2",
-    "js-yaml": "^4.1.1",
-    "node-notifier": "^10.0.1",
-    "zod": "^3.24.1"
-  },
-  "devDependencies": {
-    "@types/js-yaml": "^4.0.9",
-    "@types/node-notifier": "^8.0.5"
+    "zod": "^3.24.1",
+    "@vibe-forge/types": "^0.8.3",
+    "@vibe-forge/utils": "^0.8.3"
   }
 }

package/src/env.ts

@@ -1,6 +1,10 @@
 import { env as processEnv } from 'node:process'
 
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
+import type { LogLevel } from '@vibe-forge/utils/log-level'
+import { normalizeLogLevel } from '@vibe-forge/utils/log-level'
+
+export type { LogLevel } from '@vibe-forge/utils/log-level'
+export { normalizeLogLevel, resolveServerLogLevel } from '@vibe-forge/utils/log-level'
 
 export interface ServerEnv {
   __VF_PROJECT_AI_SERVER_HOST__: string
@@ -16,30 +20,6 @@ export interface ServerEnv {
   __VF_PROJECT_AI_CLIENT_DIST_PATH__?: string
 }
 
-const LOG_LEVELS = ['debug', 'info', 'warn', 'error'] as const satisfies readonly LogLevel[]
-
-export function normalizeLogLevel(value: unknown): LogLevel | undefined {
-  if (typeof value !== 'string') return undefined
-  const normalized = value.trim().toLowerCase()
-  return LOG_LEVELS.includes(normalized as LogLevel)
-    ? normalized as LogLevel
-    : undefined
-}
-
-export function resolveServerLogLevel(
-  env: {
-    __VF_PROJECT_AI_SERVER_LOG_LEVEL__?: unknown
-    __VF_PROJECT_AI_SERVER_DEBUG__?: unknown
-  },
-  fallback: LogLevel = 'info'
-): LogLevel {
-  if (env.__VF_PROJECT_AI_SERVER_DEBUG__ === true || env.__VF_PROJECT_AI_SERVER_DEBUG__ === 'true') {
-    return 'debug'
-  }
-
-  return normalizeLogLevel(env.__VF_PROJECT_AI_SERVER_LOG_LEVEL__) ?? fallback
-}
-
 export function loadEnv(): ServerEnv {
   const {
     __VF_PROJECT_AI_SERVER_HOST__ = 'localhost',

package/src/index.ts

@@ -1,9 +1,4 @@
-export * from './config'
-export * from './controllers/benchmark'
-export * from './controllers/config'
-export * from './controllers/system'
 export * from './env'
-export * from './hooks'
 export * from './schema'
 export * from './tools'
 export * from './types'

package/src/types.ts

@@ -1,72 +1,13 @@
-import type { z } from 'zod'
-import type { AskUserQuestionParamsSchema, InteractionOptionSchema } from './schema.js'
-
-export interface Project {
-  id: string
-  name: string
-  path: string
-}
-
-export type SessionStatus = 'running' | 'completed' | 'failed' | 'terminated' | 'waiting_input'
-
-export type SessionPermissionMode = 'default' | 'acceptEdits' | 'plan' | 'dontAsk' | 'bypassPermissions'
-
-export interface Session {
-  id: string
-  parentSessionId?: string
-  title?: string
-  createdAt: number
-  messageCount?: number
-  lastMessage?: string
-  lastUserMessage?: string
-  isStarred?: boolean
-  isArchived?: boolean
-  tags?: string[]
-  status?: SessionStatus
-  model?: string
-  adapter?: string
-  permissionMode?: SessionPermissionMode
-}
-
-export type ChatMessageContent =
-  | { type: 'text'; text: string }
-  | { type: 'image'; url: string; name?: string; size?: number; mimeType?: string }
-  | { type: 'tool_use'; id: string; name: string; input: any }
-  | { type: 'tool_result'; tool_use_id: string; content: any; is_error?: boolean }
-
-export interface ChatMessage {
-  id: string
-  role: 'user' | 'assistant' | 'system'
-  content: string | ChatMessageContent[]
-  model?: string
-  usage?: {
-    input_tokens: number
-    output_tokens: number
-    cache_read_input_tokens?: number
-    cache_creation_input_tokens?: number
-  }
-  toolCall?: {
-    id?: string
-    name: string
-    args: Record<string, unknown>
-    status?: 'pending' | 'success' | 'error'
-    output?: unknown
-  }
-  createdAt: number
-}
-
-export type InteractionOption = z.infer<typeof InteractionOptionSchema>
-export type AskUserQuestionParams = z.infer<typeof AskUserQuestionParamsSchema>
-
-export interface TaskDetail {
-  ctxId: string
-  sessionId: string
-  status: 'pending' | 'running' | 'completed' | 'failed' | 'stopped'
-  pid?: number
-  startTime: number
-  endTime?: number
-  description?: string
-  adapterType?: string
-  model?: string
-  exitCode?: number
-}
+export type {
+  AskUserQuestionParams,
+  ChatMessage,
+  ChatMessageContent,
+  ConfigSource,
+  EffortLevel,
+  Project,
+  Session,
+  SessionPermissionMode,
+  SessionStatus,
+  TaskDetail,
+  TaskRuntime
+} from '@vibe-forge/types'

package/src/ws.ts

@@ -1,13 +1,3 @@
-import type { AdapterErrorData, SessionInfo } from './adapter/index.js'
-import type { AskUserQuestionParams, ChatMessage } from './types.js'
+import type { AdapterErrorData, AskUserQuestionParams, SessionInfo, WSEvent as SharedWSEvent } from '@vibe-forge/types'
 
-export type WSEvent =
-  | { type: 'error'; data: AdapterErrorData; message?: string }
-  | { type: 'message'; message: ChatMessage }
-  | { type: 'session_info'; info: SessionInfo }
-  | { type: 'tool_result'; toolCallId: string; output: any; isError: boolean }
-  | { type: 'adapter_result'; result: any; usage?: any }
-  | { type: 'adapter_event'; data: any }
-  | { type: 'session_updated'; session: any }
-  | { type: 'interaction_request'; id: string; payload: AskUserQuestionParams }
-  | { type: 'interaction_response'; id: string; data: string | string[] }
+export type WSEvent = SharedWSEvent<AdapterErrorData, SessionInfo, any, AskUserQuestionParams>

package/src/adapter/index.ts

@@ -1,6 +0,0 @@
-import type { Adapter } from './type'
-
-export * from './loader'
-export * from './type'
-
-export const defineAdapter = <T extends Adapter>(adapter: T): Adapter => adapter

package/src/adapter/loader.ts

@@ -1,11 +0,0 @@
-import type { Adapter } from './type'
-
-const resolveAdapterPackageName = (type: string) => (
-  type.startsWith('@') ? type : `@vibe-forge/adapter-${type}`
-)
-
-export const loadAdapter = async (type: string) =>
-  (
-    // eslint-disable-next-line ts/no-require-imports
-    require(resolveAdapterPackageName(type))
-  ).default as Adapter

package/src/adapter/type.ts

@@ -1,117 +0,0 @@
-import type { Cache, Config } from '@vibe-forge/core'
-
-import type { Logger } from '#~/utils/create-logger.js'
-import type { AdapterAssetPlan, AssetDiagnostic, WorkspaceAssetBundle } from '#~/utils/workspace-assets.js'
-
-import type { ChatMessage, ChatMessageContent } from '../types'
-
-export type AdapterMessageContent = ChatMessageContent
-
-export interface AdapterErrorData {
-  message: string
-  code?: string
-  details?: unknown
-  fatal?: boolean
-}
-
-export type AdapterOutputEvent =
-  | { type: 'init'; data: SessionInitInfo }
-  | { type: 'summary'; data: SessionSummaryInfo }
-  | { type: 'message'; data: ChatMessage }
-  | { type: 'error'; data: AdapterErrorData }
-  | { type: 'exit'; data: { exitCode?: number; stderr?: string } }
-  | { type: 'stop'; data?: ChatMessage }
-
-export type SessionInfo =
-  | ({ type: 'init' } & SessionInitInfo)
-  | ({ type: 'summary' } & SessionSummaryInfo)
-
-export interface SessionInitInfo {
-  uuid: string
-  model: string
-  adapter?: string
-  version: string
-  tools: string[]
-  slashCommands: string[]
-  cwd: string
-  agents: string[]
-  title?: string
-  assetDiagnostics?: AssetDiagnostic[]
-}
-
-export interface SessionSummaryInfo {
-  summary: string
-  leafUuid: string
-}
-
-export type AdapterEvent =
-  | { type: 'message'; content: AdapterMessageContent[]; parentUuid?: string }
-  | { type: 'interrupt' }
-  | { type: 'stop' }
-
-export interface AdapterCtx {
-  ctxId: string
-
-  cwd: string
-  env: Record<string, string | null | undefined>
-
-  cache: {
-    set: <K extends keyof Cache>(key: K, value: Cache[K]) => Promise<{
-      cachePath: string
-    }>
-    get: <K extends keyof Cache>(key: K) => Promise<Cache[K] | undefined>
-  }
-  logger: Logger
-
-  configs: [Config?, Config?]
-  assets?: WorkspaceAssetBundle
-}
-
-export interface AdapterQueryOptions {
-  description?: string
-
-  type: 'create' | 'resume'
-  runtime: 'server' | 'cli' | 'mcp'
-  sessionId: string
-  model?: string
-  mode?: 'stream' | 'direct'
-
-  systemPrompt?: string
-  appendSystemPrompt?: boolean
-  permissionMode?: 'default' | 'acceptEdits' | 'plan' | 'dontAsk' | 'bypassPermissions'
-
-  mcpServers?: {
-    include?: string[]
-    exclude?: string[]
-  }
-  tools?: {
-    include?: string[]
-    exclude?: string[]
-  }
-  skills?: {
-    include?: string[]
-    exclude?: string[]
-  }
-
-  extraOptions?: string[]
-  promptAssetIds?: string[]
-  assetPlan?: AdapterAssetPlan
-
-  onEvent: (event: AdapterOutputEvent) => void
-}
-
-export interface AdapterSession {
-  kill: () => void
-  emit: (event: AdapterEvent) => void
-  pid?: number
-}
-
-export interface Adapter {
-  init?: (
-    ctx: AdapterCtx
-  ) => Promise<void>
-  query: (
-    ctx: AdapterCtx,
-    options: AdapterQueryOptions
-  ) => Promise<AdapterSession>
-}

package/src/config/load.ts

@@ -1,122 +0,0 @@
-import { existsSync } from 'node:fs'
-import { readFile } from 'node:fs/promises'
-import { resolve } from 'node:path'
-import process from 'node:process'
-
-import { load } from 'js-yaml'
-
-import type { AdapterMap, Config } from './types'
-
-const loadJSConfig = async (paths: string[]) => {
-  for (const path of paths) {
-    try {
-      const configPath = resolve(process.cwd(), path)
-      if (!existsSync(configPath)) {
-        continue
-      }
-      // eslint-disable-next-line ts/no-require-imports
-      return (require(configPath)?.default ?? {}) as Config
-    } catch (e) {
-      console.error(`Failed to load config file ${path}: ${e}`)
-    }
-  }
-}
-
-const loadJSONConfig = async (paths: string[], jsonVariables: Record<string, string | null | undefined>) => {
-  for (const path of paths) {
-    try {
-      const configPath = resolve(process.cwd(), path)
-      if (!existsSync(configPath)) {
-        continue
-      }
-      const configContent = await readFile(configPath, 'utf-8')
-      const configResolvedContent = configContent
-        .replace(/\$\{(\w+)\}/g, (_, key) => jsonVariables[key] ?? `$\{${key}}`)
-      return JSON.parse(configResolvedContent) as Config
-    } catch (e) {
-      console.error(`Failed to load config file ${path}: ${e}`)
-    }
-  }
-}
-
-const loadYAMLConfig = async (paths: string[], jsonVariables: Record<string, string | null | undefined>) => {
-  for (const path of paths) {
-    try {
-      const configPath = resolve(process.cwd(), path)
-      if (!existsSync(configPath)) {
-        continue
-      }
-      const configContent = await readFile(configPath, 'utf-8')
-      const configResolvedContent = configContent
-        .replace(/\$\{(\w+)\}/g, (_, key) => jsonVariables[key] ?? `$\{${key}}`)
-      return load(configResolvedContent) as Config
-    } catch (e) {
-      console.error(`Failed to load config file ${path}: ${e}`)
-    }
-  }
-}
-
-let configCache: Promise<readonly [Config | undefined, Config | undefined]> | null = null
-
-export const resetConfigCache = () => {
-  configCache = null
-}
-
-export const loadConfig = (options: {
-  jsonVariables?: Record<string, string | null | undefined>
-}) => {
-  if (configCache) {
-    return configCache
-  }
-
-  configCache = (async () =>
-    [
-      await loadJSONConfig(
-        [
-          './.ai.config.json',
-          './infra/.ai.config.json'
-        ],
-        options.jsonVariables ?? {}
-      ) ??
-        await loadYAMLConfig(
-          [
-            './.ai.config.yaml',
-            './.ai.config.yml',
-            './infra/.ai.config.yaml',
-            './infra/.ai.config.yml'
-          ],
-          options.jsonVariables ?? {}
-        ),
-      await loadJSONConfig(
-        [
-          './.ai.dev.config.json',
-          './infra/.ai.dev.config.json'
-        ],
-        options.jsonVariables ?? {}
-      ) ??
-        await loadYAMLConfig(
-          [
-            './.ai.dev.config.yaml',
-            './.ai.dev.config.yml',
-            './infra/.ai.dev.config.yaml',
-            './infra/.ai.dev.config.yml'
-          ],
-          options.jsonVariables ?? {}
-        )
-    ] as const)()
-  return configCache
-}
-
-export const loadAdapterConfig = async <
-  K extends keyof AdapterMap,
->(
-  name: K,
-  options: { jsonVariables?: Record<string, string> }
-) => {
-  const [projectConfig, userConfig] = await loadConfig(options)
-  return {
-    ...(projectConfig?.adapters?.[name] ?? {}),
-    ...(userConfig?.adapters?.[name] ?? {})
-  } as unknown as NonNullable<Config['adapters']>[K]
-}
-