mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-10-02 15:23:57 +00:00
refactor: centralize ABI metadata into internal/meta/meta.go
- internal/meta/meta.go: add ABIVersion, ABIVersionMin, 45 dispatch
method IDs, SDKCompatibleVersion (single source of truth)
- internal/plugin/cabi/types.go: re-export from meta.go
- internal/plugin/cabi/loader.go: reject plugin when version > ABIVersion;
pass ABIVersion in Start instead of hardcoded 1
- loader.{go,c}: comments reference meta.go as canonical
This commit is contained in:
JianFeeeee
@ -4,6 +4,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
// HOMEAGENT_ABI_VERSION 与 internal/meta/meta.go ABIVersion 同步。
|
||||
// C ABI 通过 version/version_min 协商，旧插件不受影响。
|
||||
#define HOMEAGENT_ABI_VERSION 1
|
||||
|
||||
// PluginAPI — provided by the plugin
|
||||
|
||||
@ -6,6 +6,8 @@ package cabi
|
||||
#cgo LDFLAGS: -ldl
|
||||
#include <stdlib.h>
|
||||
|
||||
// HOMEAGENT_ABI_VERSION 是当前内核的 ABI 版本号，与 internal/meta/meta.go ABIVersion 保持同步。
|
||||
// 旧插件使用低版本 ABI 不受影响——C ABI wrapper 通过 version/version_min 字段协商兼容。
|
||||
#define HOMEAGENT_ABI_VERSION 1
|
||||
|
||||
// PluginAPI — provided by the plugin via plugin_init()
|
||||
@ -94,6 +96,10 @@ func Load(soPath, name string, config map[string]interface{}) (*Handle, error) {
|
||||
C.lib_close(lib)
|
||||
return nil, fmt.Errorf("plugin %s: invalid PluginAPI (version=%d)", name, int(api.version))
|
||||
}
|
||||
if int(api.version) > ABIVersion {
|
||||
C.lib_close(lib)
|
||||
return nil, fmt.Errorf("plugin %s: ABI version %d > core %d, requires newer HomeAgent core", name, int(api.version), ABIVersion)
|
||||
}
|
||||
|
||||
id := atomic.AddInt32(&nextID, 1)
|
||||
ps := &pluginState{id: id, name: name, api: api}
|
||||
@ -146,7 +152,7 @@ func (h *Handle) FreeCoreAPI() {
|
||||
// Start calls the plugin's Start with a CoreAPI pointer.
|
||||
func (h *Handle) Start(corePtr unsafe.Pointer) error {
|
||||
var cErr *C.char
|
||||
if ret := int(C.call_start_plugin(h.api, corePtr, C.int(1), &cErr)); ret != 0 {
|
||||
if ret := int(C.call_start_plugin(h.api, corePtr, C.int(ABIVersion), &cErr)); ret != 0 {
|
||||
errMsg := ""
|
||||
if cErr != nil { errMsg = C.GoString(cErr); C.api_free_string(h.api, cErr) }
|
||||
return fmt.Errorf("start_plugin: %s", errMsg)
|
||||
|
||||
@ -1,56 +1,58 @@
|
||||
package cabi
|
||||
|
||||
// ABI version constants
|
||||
import "gitcode.com/JianFeeeee/HomeAgent/internal/meta"
|
||||
|
||||
// ABI version constants — single source of truth is meta.go
|
||||
const (
|
||||
ABIVersion = 1
|
||||
ABIVersionMin = 1
|
||||
ABIVersion = meta.ABIVersion
|
||||
ABIVersionMin = meta.ABIVersionMin
|
||||
)
|
||||
|
||||
// Dispatch method IDs (mirrors the plugin side constants)
|
||||
// Dispatch method IDs — single source of truth is meta.go
|
||||
const (
|
||||
CoreRegisterTool = 1
|
||||
CoreRegisterStage = 2
|
||||
CoreRegisterOutputCh = 3
|
||||
CoreRegisterPluginAPI = 4
|
||||
CoreInjectText = 5
|
||||
CoreInjectInterruptText = 6
|
||||
CoreInjectTextNoMemory = 7
|
||||
CoreSetAutoRestart = 8
|
||||
CoreMemoryRecall = 9
|
||||
CoreMemoryCommit = 10
|
||||
CoreMemoryIntrospect = 11
|
||||
CoreMemoryMerge = 12
|
||||
CoreMemoryPurge = 13
|
||||
CoreDocQuery = 14
|
||||
CoreKnowledgeSearch = 15
|
||||
CoreSettingsGet = 16
|
||||
CoreSettingsSet = 17
|
||||
CoreSettingsRegisterDef = 18
|
||||
CoreLLMListSources = 19
|
||||
CoreLLMSetSource = 20
|
||||
CoreSocialGetPerson = 21
|
||||
CoreSocialGetNetwork = 22
|
||||
CoreSubscribe = 23
|
||||
CoreUnsubscribe = 24
|
||||
CoreFreeString = 25
|
||||
CoreSettingsGetCore = 26
|
||||
CoreSettingsSetCore = 27
|
||||
CoreSettingsListCore = 28
|
||||
CoreSettingsGetPlugin = 29
|
||||
CoreSettingsSetPlugin = 30
|
||||
CoreSettingsListPlugin = 31
|
||||
CoreDocInsert = 32
|
||||
CoreDocRemove = 33
|
||||
CoreDocStats = 34
|
||||
CoreKnowledgeAdd = 35
|
||||
CoreKnowledgeList = 36
|
||||
CoreLLMCurrentSource = 37
|
||||
CoreSocialGetTrait = 38
|
||||
CoreSocialGetRelations = 39
|
||||
CoreSocialListPersons = 40
|
||||
CoreTextMemoryAppend = 41
|
||||
CoreSettingsList = 42
|
||||
CoreSettingsDefs = 43
|
||||
CoreSettingsDump = 44
|
||||
CoreSettingsPlugins = 45
|
||||
CoreRegisterTool = meta.CoreRegisterTool
|
||||
CoreRegisterStage = meta.CoreRegisterStage
|
||||
CoreRegisterOutputCh = meta.CoreRegisterOutputCh
|
||||
CoreRegisterPluginAPI = meta.CoreRegisterPluginAPI
|
||||
CoreInjectText = meta.CoreInjectText
|
||||
CoreInjectInterruptText = meta.CoreInjectInterruptText
|
||||
CoreInjectTextNoMemory = meta.CoreInjectTextNoMemory
|
||||
CoreSetAutoRestart = meta.CoreSetAutoRestart
|
||||
CoreMemoryRecall = meta.CoreMemoryRecall
|
||||
CoreMemoryCommit = meta.CoreMemoryCommit
|
||||
CoreMemoryIntrospect = meta.CoreMemoryIntrospect
|
||||
CoreMemoryMerge = meta.CoreMemoryMerge
|
||||
CoreMemoryPurge = meta.CoreMemoryPurge
|
||||
CoreDocQuery = meta.CoreDocQuery
|
||||
CoreKnowledgeSearch = meta.CoreKnowledgeSearch
|
||||
CoreSettingsGet = meta.CoreSettingsGet
|
||||
CoreSettingsSet = meta.CoreSettingsSet
|
||||
CoreSettingsRegisterDef = meta.CoreSettingsRegisterDef
|
||||
CoreLLMListSources = meta.CoreLLMListSources
|
||||
CoreLLMSetSource = meta.CoreLLMSetSource
|
||||
CoreSocialGetPerson = meta.CoreSocialGetPerson
|
||||
CoreSocialGetNetwork = meta.CoreSocialGetNetwork
|
||||
CoreSubscribe = meta.CoreSubscribe
|
||||
CoreUnsubscribe = meta.CoreUnsubscribe
|
||||
CoreFreeString = meta.CoreFreeString
|
||||
CoreSettingsGetCore = meta.CoreSettingsGetCore
|
||||
CoreSettingsSetCore = meta.CoreSettingsSetCore
|
||||
CoreSettingsListCore = meta.CoreSettingsListCore
|
||||
CoreSettingsGetPlugin = meta.CoreSettingsGetPlugin
|
||||
CoreSettingsSetPlugin = meta.CoreSettingsSetPlugin
|
||||
CoreSettingsListPlugin = meta.CoreSettingsListPlugin
|
||||
CoreDocInsert = meta.CoreDocInsert
|
||||
CoreDocRemove = meta.CoreDocRemove
|
||||
CoreDocStats = meta.CoreDocStats
|
||||
CoreKnowledgeAdd = meta.CoreKnowledgeAdd
|
||||
CoreKnowledgeList = meta.CoreKnowledgeList
|
||||
CoreLLMCurrentSource = meta.CoreLLMCurrentSource
|
||||
CoreSocialGetTrait = meta.CoreSocialGetTrait
|
||||
CoreSocialGetRelations = meta.CoreSocialGetRelations
|
||||
CoreSocialListPersons = meta.CoreSocialListPersons
|
||||
CoreTextMemoryAppend = meta.CoreTextMemoryAppend
|
||||
CoreSettingsList = meta.CoreSettingsList
|
||||
CoreSettingsDefs = meta.CoreSettingsDefs
|
||||
CoreSettingsDump = meta.CoreSettingsDump
|
||||
CoreSettingsPlugins = meta.CoreSettingsPlugins
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user