@vibe-forge/core 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/core",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "imports": {
     "#~/*.js": {
       "__vibe-forge__": {
@@ -22,60 +22,61 @@
         "require": "./dist/index.js"
       }
     },
-    "./channel": {
+    "./adapter": {
       "__vibe-forge__": {
-        "default": "./src/channel.ts"
+        "default": "./src/adapter/index.ts"
       },
       "default": {
-        "import": "./dist/channel.mjs",
-        "require": "./dist/channel.js"
+        "import": "./dist/adapter.mjs",
+        "require": "./dist/adapter.js"
       }
     },
-    "./utils/*": {
+    "./channel": {
       "__vibe-forge__": {
-        "default": "./src/utils/*.ts"
+        "default": "./src/channel.ts"
       },
       "default": {
-        "import": "./dist/utils/*.mjs",
-        "require": "./dist/utils/*.js"
+        "import": "./dist/channel.mjs",
+        "require": "./dist/channel.js"
       }
     },
-    "./controllers/task": {
+    "./schema": {
       "__vibe-forge__": {
-        "default": "./src/controllers/task/index.ts"
+        "default": "./src/schema.ts"
       },
       "default": {
-        "import": "./dist/controllers/task/index.mjs",
-        "require": "./dist/controllers/task/index.js"
+        "import": "./dist/schema.mjs",
+        "require": "./dist/schema.js"
       }
     },
-    "./controllers/benchmark": {
+    "./hooks": {
       "__vibe-forge__": {
-        "default": "./src/controllers/benchmark/index.ts"
+        "default": "./src/hooks/index.ts"
       },
       "default": {
-        "import": "./dist/controllers/benchmark/index.mjs",
-        "require": "./dist/controllers/benchmark/index.js"
+        "import": "./dist/hooks/index.mjs",
+        "require": "./dist/hooks/index.js"
       }
     },
-    "./schema": {
+    "./utils/*": {
       "__vibe-forge__": {
-        "default": "./src/schema.ts"
+        "default": "./src/utils/*.ts"
       },
       "default": {
-        "import": "./dist/schema.mjs",
-        "require": "./dist/schema.js"
+        "import": "./dist/utils/*.mjs",
+        "require": "./dist/utils/*.js"
       }
     },
-    "./hooks": {
+    "./controllers/*": {
       "__vibe-forge__": {
-        "default": "./src/hooks/index.ts"
+        "default": "./src/controllers/*/index.ts"
       },
       "default": {
-        "import": "./dist/hooks/index.mjs",
-        "require": "./dist/hooks/index.js"
+        "import": "./dist/controllers/*/index.mjs",
+        "require": "./dist/controllers/*/index.js"
       }
-    }
+    },
+    "./package.json": "./package.json"
   },
   "dependencies": {
     "fast-glob": "^3.3.3",

package/src/channel.ts

@@ -4,12 +4,46 @@ export interface ChannelMap {}
 
 export type ChannelType = keyof ChannelMap
 
+export const channelAccessSchema = z.object({
+  // 管理员
+  admins: z.array(z.string()).optional().describe(
+    '频道管理员账号（sender ID），管理员拥有管理操作权限且不受以下访问控制限制'
+  ),
+  // 会话类型控制
+  allowPrivateChat: z.boolean().optional().describe('是否允许私聊消息，默认 true'),
+  allowGroupChat: z.boolean().optional().describe('是否允许群聊消息，默认 true'),
+  // 群组访问控制
+  allowedGroups: z.array(z.string()).optional().describe('群组白名单（channel ID），设置后仅在指定群中响应'),
+  blockedGroups: z.array(z.string()).optional().describe('群组黑名单（channel ID），在指定群中不响应'),
+  // 用户访问控制
+  allowedSenders: z.array(z.string()).optional().describe('发送者白名单（sender ID），设置后仅白名单内的用户可交互'),
+  blockedSenders: z.array(z.string()).optional().describe('发送者黑名单（sender ID），黑名单内的用户消息将被忽略')
+})
+
+export type ChannelAccessConfig = z.infer<typeof channelAccessSchema>
+
 export const channelBaseSchema = z.object({
-  type: z.string().min(1).describe('频道类型'),
-  title: z.string().optional().describe('频道标题'),
-  description: z.string().optional().describe('频道说明'),
-  enabled: z.boolean().optional().describe('是否启用'),
-  admins: z.array(z.string()).optional().describe('频道管理员账号')
+  // 基础配置
+  type: z
+    .string().min(1)
+    .describe('频道类型'),
+  title: z
+    .string().optional()
+    .describe('频道标题'),
+  description: z
+    .string().optional()
+    .describe('频道说明'),
+  enabled: z
+    .boolean().optional()
+    .describe('是否启用'),
+  // 会话行为
+  systemPrompt: z
+    .string().optional()
+    .describe('在此频道启动会话时注入的系统提示词'),
+  // 访问权限控制
+  access: channelAccessSchema
+    .optional()
+    .describe('频道访问权限配置')
 })
 
 export type ChannelBaseConfig = z.infer<typeof channelBaseSchema>
@@ -25,9 +59,27 @@ export interface ChannelConnection<TMessage> {
   startReceiving?: (options: {
     handlers: ChannelEventHandlers
   }) => Promise<void>
+  /**
+   * Called when a new session is being created for this channel.
+   * The channel implementation can use this to inject channel-specific context
+   * (e.g. bot profile fetched from platform API) into the system prompt.
+   */
+  generateSystemPrompt?: (inbound: ChannelInboundEvent) => Promise<string | undefined>
   close?: () => Promise<void>
 }
 
+export interface ChannelLogger {
+  error: (...msg: unknown[]) => void | Promise<void>
+  warn: (...msg: unknown[]) => void | Promise<void>
+  info: (...msg: unknown[]) => void | Promise<void>
+  debug: (...msg: unknown[]) => void | Promise<void>
+  trace: (...msg: unknown[]) => void | Promise<void>
+}
+
+export interface ChannelConnectionOptions {
+  logger?: ChannelLogger
+}
+
 export interface ChannelInboundEvent {
   channelType: string
   sessionType: string
@@ -70,6 +122,11 @@ export const defineChannel = <TConfigSchema extends z.ZodTypeAny, TMessageSchema
   descriptor: ChannelDescriptor<TConfigSchema, TMessageSchema>
 ) => descriptor
 
-export const defineChannelConnection = <TConfigSchema extends z.ZodTypeAny, TMessageSchema extends z.ZodTypeAny>(
-  connect: (config: z.infer<TConfigSchema>) => Promise<ChannelConnection<z.infer<TMessageSchema>>>
-) => connect
+export type ChannelCreateFn<TConfig = unknown, TMessage = unknown> = (
+  config: TConfig,
+  options?: ChannelConnectionOptions
+) => Promise<ChannelConnection<TMessage>>
+
+export const defineCreateChannelConnection = <TConfigSchema extends z.ZodTypeAny, TMessageSchema extends z.ZodTypeAny>(
+  connect: ChannelCreateFn<z.infer<TConfigSchema>, z.infer<TMessageSchema>>
+): ChannelCreateFn<z.infer<TConfigSchema>, z.infer<TMessageSchema>> => connect

package/src/config/types.ts

@@ -1,8 +1,14 @@
-import type { ChannelConfig } from '../channels'
+import type { ChannelConfig } from '../channel'
 import type { PluginConfig } from '../hooks'
 
 export interface AdapterMap {}
 
+export interface AdapterBuiltinModel {
+  value: string
+  title: string
+  description: string
+}
+
 export interface ModelServiceConfig {
   /**
    * 模型服务展示标题
@@ -228,6 +234,7 @@ export interface ConfigSection {
   modelServices?: Config['modelServices']
   channels?: Config['channels']
   adapters?: Config['adapters']
+  adapterBuiltinModels?: Record<string, AdapterBuiltinModel[]>
   plugins?: {
     plugins?: Config['plugins']
     enabledPlugins?: Config['enabledPlugins']

package/src/controllers/task/prepare.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
 
-import type { AdapterCtx, AdapterQueryOptions } from '@vibe-forge/core'
 import { loadConfig } from '@vibe-forge/core'
+import type { AdapterCtx, AdapterQueryOptions } from '@vibe-forge/core/adapter'
 import { getCache, setCache } from '@vibe-forge/core/utils/cache'
 import { createLogger } from '@vibe-forge/core/utils/create-logger'
 import { uuid } from '@vibe-forge/core/utils/uuid'

package/src/controllers/task/run.ts

@@ -1,12 +1,8 @@
-import type {
-  AdapterCtx,
-  AdapterOutputEvent,
-  AdapterQueryOptions,
-  ModelServiceConfig,
-  TaskDetail
-} from '@vibe-forge/core'
-import { loadAdapter } from '@vibe-forge/core'
-import { callHook } from '@vibe-forge/core/utils/api'
+import type { AdapterCtx, AdapterOutputEvent, AdapterQueryOptions } from '#~/adapter/index.js'
+import { loadAdapter } from '#~/adapter/index.js'
+import type { ModelServiceConfig } from '#~/config.js'
+import type { TaskDetail } from '#~/types.js'
+import { callHook } from '#~/utils/api.js'
 
 import { prepare } from './prepare'
 import type { RunTaskOptions } from './type'
@@ -26,17 +22,29 @@ const resolveQueryModel = (params: {
   inputModel?: string
 }) => {
   const inputModel = normalizeNonEmptyString(params.inputModel)
-  if (inputModel?.includes(',')) return inputModel
+  // User explicitly provided a model → pass through as-is.
+  // The adapter decides CCR vs native based on whether it contains ",".
+  if (inputModel != null) return inputModel
 
+  // No explicit model → auto-resolve from modelServices config.
+  // Produces "service,model" format when services are configured,
+  // which signals the adapter to route through CCR.
   const mergedModelServices = {
     ...(params.config?.modelServices ?? {}),
     ...(params.userConfig?.modelServices ?? {})
   }
-  const mergedDefaultModel = pickFirstNonEmptyString([params.userConfig?.defaultModel, params.config?.defaultModel])
-  const mergedDefaultModelService = pickFirstNonEmptyString([
-    params.userConfig?.defaultModelService,
-    params.config?.defaultModelService
-  ])
+  const mergedDefaultModel = pickFirstNonEmptyString(
+    [
+      params.userConfig?.defaultModel,
+      params.config?.defaultModel
+    ]
+  )
+  const mergedDefaultModelService = pickFirstNonEmptyString(
+    [
+      params.userConfig?.defaultModelService,
+      params.config?.defaultModelService
+    ]
+  )
 
   const serviceEntries = Object.entries(mergedModelServices)
   const modelToService = new Map<string, string>()
@@ -54,20 +62,21 @@ const resolveQueryModel = (params: {
     }
   }
 
+  if (availableModels.length === 0) return undefined
+
   const resolveDefaultModel = () => {
-    if (availableModels.length === 0) return undefined
     if (mergedDefaultModel && modelToService.has(mergedDefaultModel)) return mergedDefaultModel
     if (mergedDefaultModelService && mergedModelServices[mergedDefaultModelService]) {
-      const service = mergedModelServices[mergedDefaultModelService]
+      const service = mergedModelServices[mergedDefaultModelService] as ModelServiceConfig | undefined
       const models = Array.isArray(service?.models)
-        ? service?.models.filter(item => typeof item === 'string' && item.trim() !== '')
+        ? service?.models.filter((item: unknown) => typeof item === 'string' && (item as string).trim() !== '')
         : []
       if (models.length > 0) return models[0]
     }
     return availableModels[0]
   }
 
-  const resolvedModel = inputModel ?? resolveDefaultModel()
+  const resolvedModel = resolveDefaultModel()
   if (!resolvedModel) return undefined
 
   const resolvedService = modelToService.get(resolvedModel) ??

package/src/env.ts

@@ -11,8 +11,6 @@ export interface ServerEnv {
   __VF_PROJECT_AI_CLIENT_MODE__?: 'dev' | 'static'
   __VF_PROJECT_AI_CLIENT_BASE__?: string
   __VF_PROJECT_AI_CLIENT_DIST_PATH__?: string
-  __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_PATH__?: string
-  __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_ARGS__?: string
 }
 
 export function loadEnv(): ServerEnv {
@@ -26,10 +24,7 @@ export function loadEnv(): ServerEnv {
     __VF_PROJECT_AI_SERVER_ALLOW_CORS__,
     __VF_PROJECT_AI_CLIENT_MODE__ = 'static',
     __VF_PROJECT_AI_CLIENT_BASE__,
-    __VF_PROJECT_AI_CLIENT_DIST_PATH__,
-
-    __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_PATH__,
-    __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_ARGS__
+    __VF_PROJECT_AI_CLIENT_DIST_PATH__
   } = processEnv || {}
   return {
     __VF_PROJECT_AI_SERVER_HOST__,
@@ -42,12 +37,8 @@ export function loadEnv(): ServerEnv {
     __VF_PROJECT_AI_SERVER_ALLOW_CORS__: __VF_PROJECT_AI_SERVER_ALLOW_CORS__ != null
       ? __VF_PROJECT_AI_SERVER_ALLOW_CORS__ === 'true'
       : true,
-    __VF_PROJECT_AI_CLIENT_MODE__:
-      __VF_PROJECT_AI_CLIENT_MODE__ as ServerEnv['__VF_PROJECT_AI_CLIENT_MODE__'],
+    __VF_PROJECT_AI_CLIENT_MODE__: __VF_PROJECT_AI_CLIENT_MODE__ as ServerEnv['__VF_PROJECT_AI_CLIENT_MODE__'],
     __VF_PROJECT_AI_CLIENT_BASE__,
-    __VF_PROJECT_AI_CLIENT_DIST_PATH__,
-
-    __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_PATH__,
-    __VF_PROJECT_AI_ADAPTER_CLAUDE_CODE_CLI_ARGS__
+    __VF_PROJECT_AI_CLIENT_DIST_PATH__
   }
 }

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './adapter'
 export * from './config'
 export * from './controllers/benchmark'
 export * from './controllers/config'