@2en/clawly-plugins 1.21.5 → 1.21.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/gateway/config-repair.ts +31 -14
- package/package.json +1 -1
package/gateway/config-repair.ts
CHANGED
|
@@ -21,19 +21,6 @@ export function registerConfigRepair(api: PluginApi) {
|
|
|
21
21
|
api.registerGatewayMethod('clawly.config.repair', async ({params, respond}) => {
|
|
22
22
|
const dryRun = params.dryRun === true
|
|
23
23
|
|
|
24
|
-
const cfg = api.pluginConfig as Record<string, unknown> | undefined
|
|
25
|
-
const baseUrl =
|
|
26
|
-
typeof cfg?.modelGatewayBaseUrl === 'string' ? cfg.modelGatewayBaseUrl.replace(/\/$/, '') : ''
|
|
27
|
-
const token = typeof cfg?.modelGatewayToken === 'string' ? cfg.modelGatewayToken : ''
|
|
28
|
-
|
|
29
|
-
if (!baseUrl || !token) {
|
|
30
|
-
respond(true, {
|
|
31
|
-
...(dryRun ? {ok: false} : {repaired: false}),
|
|
32
|
-
detail: 'Plugin config missing modelGatewayBaseUrl or modelGatewayToken — cannot repair',
|
|
33
|
-
})
|
|
34
|
-
return
|
|
35
|
-
}
|
|
36
|
-
|
|
37
24
|
const stateDir = resolveStateDir(api)
|
|
38
25
|
if (!stateDir) {
|
|
39
26
|
respond(true, {
|
|
@@ -46,9 +33,39 @@ export function registerConfigRepair(api: PluginApi) {
|
|
|
46
33
|
const configPath = path.join(stateDir, 'openclaw.json')
|
|
47
34
|
const config = readOpenclawConfig(configPath)
|
|
48
35
|
|
|
49
|
-
//
|
|
36
|
+
// Resolve credentials: prefer api.pluginConfig (in-memory), fall back to
|
|
37
|
+
// the on-disk provider entry or plugin config entry. After a force-update
|
|
38
|
+
// api.pluginConfig may be empty because it is immutable at runtime, but the
|
|
39
|
+
// backfill in model-gateway-setup writes credentials back to the file.
|
|
40
|
+
const cfg = api.pluginConfig as Record<string, unknown> | undefined
|
|
50
41
|
const providers = (config.models as any)?.providers as Record<string, any> | undefined
|
|
51
42
|
const provider = providers?.[PROVIDER_NAME] as Record<string, unknown> | undefined
|
|
43
|
+
const filePluginCfg = (config.plugins as any)?.entries?.['clawly-plugins']?.config as
|
|
44
|
+
| Record<string, unknown>
|
|
45
|
+
| undefined
|
|
46
|
+
|
|
47
|
+
const baseUrl = (
|
|
48
|
+
(typeof cfg?.modelGatewayBaseUrl === 'string' && cfg.modelGatewayBaseUrl) ||
|
|
49
|
+
(typeof provider?.baseUrl === 'string' && provider.baseUrl) ||
|
|
50
|
+
(typeof filePluginCfg?.modelGatewayBaseUrl === 'string' &&
|
|
51
|
+
filePluginCfg.modelGatewayBaseUrl) ||
|
|
52
|
+
''
|
|
53
|
+
).replace(/\/$/, '')
|
|
54
|
+
const token =
|
|
55
|
+
(typeof cfg?.modelGatewayToken === 'string' && cfg.modelGatewayToken) ||
|
|
56
|
+
(typeof provider?.apiKey === 'string' && provider.apiKey) ||
|
|
57
|
+
(typeof filePluginCfg?.modelGatewayToken === 'string' && filePluginCfg.modelGatewayToken) ||
|
|
58
|
+
''
|
|
59
|
+
|
|
60
|
+
if (!baseUrl || !token) {
|
|
61
|
+
respond(true, {
|
|
62
|
+
...(dryRun ? {ok: false} : {repaired: false}),
|
|
63
|
+
detail: 'Plugin config missing modelGatewayBaseUrl or modelGatewayToken — cannot repair',
|
|
64
|
+
})
|
|
65
|
+
return
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
// Check current provider state
|
|
52
69
|
const currentBaseUrl = typeof provider?.baseUrl === 'string' ? provider.baseUrl : ''
|
|
53
70
|
const currentApiKey = typeof provider?.apiKey === 'string' ? provider.apiKey : ''
|
|
54
71
|
|