@2en/clawly-plugins 1.19.1 → 1.20.0

package/model-gateway-setup.ts

@@ -23,6 +23,12 @@ export const EXTRA_GATEWAY_MODELS: Array<{
   alias: string
   input: string[]
 }> = [
+  {
+    id: 'moonshotai/kimi-k2.5',
+    name: 'moonshotai/kimi-k2.5',
+    alias: 'Kimi K2.5',
+    input: ['text', 'image'],
+  },
   {
     id: 'anthropic/claude-sonnet-4.6',
     name: 'anthropic/claude-sonnet-4.6',
@@ -78,16 +84,6 @@ export function writeOpenclawConfig(configPath: string, config: Record<string, u
 }
 
 export function setupModelGateway(api: PluginApi): void {
-  const cfg = api.pluginConfig as Record<string, unknown> | undefined
-  const baseUrl =
-    typeof cfg?.modelGatewayBaseUrl === 'string' ? cfg.modelGatewayBaseUrl.replace(/\/$/, '') : ''
-  const token = typeof cfg?.modelGatewayToken === 'string' ? cfg.modelGatewayToken : ''
-
-  if (!baseUrl || !token) {
-    api.logger.info('Model gateway not configured (missing baseUrl or token), skipping.')
-    return
-  }
-
   const stateDir = resolveStateDir(api)
   if (!stateDir) {
     api.logger.warn('Cannot resolve state dir — model gateway setup skipped.')
@@ -97,7 +93,9 @@ export function setupModelGateway(api: PluginApi): void {
   const configPath = path.join(stateDir, 'openclaw.json')
   const config = readOpenclawConfig(configPath)
 
-  // If provider already exists, check if extra models or aliases need updating
+  // If provider already exists, check if extra models or aliases need updating.
+  // This runs before the credentials check because provisioned sprites have
+  // credentials in openclaw.json directly, not in pluginConfig.
   const existingProvider = (config.models as any)?.providers?.[PROVIDER_NAME]
   if (existingProvider) {
     let dirty = false
@@ -112,14 +110,15 @@ export function setupModelGateway(api: PluginApi): void {
       }
     }
 
-    // Ensure aliases exist for all models
+    // Ensure aliases exist for ALL models (existing + extras)
     const agents = (config.agents ?? {}) as any
     const defaults = agents.defaults ?? {}
     const existingAliases: Record<string, {alias: string}> = defaults.models ?? {}
-    for (const m of EXTRA_GATEWAY_MODELS) {
+    for (const m of existingModels) {
       const key = `${PROVIDER_NAME}/${m.id}`
       if (!existingAliases[key]) {
-        existingAliases[key] = {alias: m.alias}
+        const extra = EXTRA_GATEWAY_MODELS.find((e) => e.id === m.id)
+        existingAliases[key] = {alias: extra?.alias ?? m.id}
         dirty = true
       }
     }
@@ -141,6 +140,17 @@ export function setupModelGateway(api: PluginApi): void {
     return
   }
 
+  // No existing provider — need pluginConfig credentials to create one
+  const cfg = api.pluginConfig as Record<string, unknown> | undefined
+  const baseUrl =
+    typeof cfg?.modelGatewayBaseUrl === 'string' ? cfg.modelGatewayBaseUrl.replace(/\/$/, '') : ''
+  const token = typeof cfg?.modelGatewayToken === 'string' ? cfg.modelGatewayToken : ''
+
+  if (!baseUrl || !token) {
+    api.logger.info('Model gateway not configured (missing baseUrl or token), skipping.')
+    return
+  }
+
   // Derive model IDs from agents.defaults
   const defaultModelFull: string = (config.agents as any)?.defaults?.model?.primary ?? ''
   const imageModelFull: string = (config.agents as any)?.defaults?.imageModel?.primary ?? ''
@@ -166,9 +176,14 @@ export function setupModelGateway(api: PluginApi): void {
           {id: imageModel, name: imageModel, input: ['text', 'image']},
         ]
 
+  const defaultIds = new Set(defaultModels.map((m) => m.id))
   const models = [
     ...defaultModels,
-    ...EXTRA_GATEWAY_MODELS.map(({id, name, input}) => ({id, name, input})),
+    ...EXTRA_GATEWAY_MODELS.filter((m) => !defaultIds.has(m.id)).map(({id, name, input}) => ({
+      id,
+      name,
+      input,
+    })),
   ]
 
   if (!config.models) config.models = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2en/clawly-plugins",
-  "version": "1.19.1",
+  "version": "1.20.0",
   "module": "index.ts",
   "type": "module",
   "repository": {