@2en/clawly-plugins 1.26.0-beta.1 → 1.26.0

package/config-setup.ts

@@ -1,17 +1,21 @@
 /**
- * On plugin init, patches openclaw.json to set all business config that was
- * previously written by provision's buildConfig().
+ * Reconciles runtime config owned by clawly-plugins after provision has already
+ * established the bootstrap baseline (plugin entry, pluginConfig inputs,
+ * workspace files, install metadata).
  *
- * Domain helpers read the pluginConfig, apply enforce or set-if-missing
- * semantics, and write once if anything changed.  This runs before
- * setupModelGateway so agents.defaults.model is available for the model
- * provider setup.
+ * This file intentionally owns two narrower responsibilities:
+ * - repair legacy state damaged by older provision flows
+ * - reconcile runtime-facing config derived from pluginConfig
  *
- * Backward compatibility: old sprites have pluginConfig with only 4 fields
- * (skill/model gateway credentials). Helpers check for the new fields and
- * skip gracefully when absent.
+ * It does not try to redefine provision's startup contract. Anything that must
+ * exist before the first gateway boot should remain provision-owned.
+ *
+ * Backward compatibility: old sprites may have only the original gateway
+ * credentials in pluginConfig. Helpers check for newer fields and skip
+ * gracefully when absent.
  */
 
+import fs from 'node:fs'
 import path from 'node:path'
 
 import type {PluginApi} from './index'
@@ -377,8 +381,100 @@ export function patchSession(config: Record<string, unknown>): boolean {
   return dirty
 }
 
+const PLUGIN_ID = 'clawly-plugins'
+const NPM_PKG_NAME = '@2en/clawly-plugins'
+
+function asObj(value: unknown): Record<string, unknown> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {}
+}
+
+/**
+ * Self-healing: reconstruct missing `plugins.installs.clawly-plugins` record.
+ * Older provisioned sprites had this record destroyed by a full-overwrite bug
+ * in the provision write-plugins-config step.  Without this record,
+ * `openclaw plugins update` cannot function.
+ */
+export function patchInstallRecord(config: Record<string, unknown>, stateDir: string): boolean {
+  const plugins = asObj(config.plugins)
+  const installs = asObj(plugins.installs)
+
+  // Already has a valid install record — nothing to do
+  if (
+    installs[PLUGIN_ID] &&
+    typeof installs[PLUGIN_ID] === 'object' &&
+    (installs[PLUGIN_ID] as Record<string, unknown>).source &&
+    (installs[PLUGIN_ID] as Record<string, unknown>).spec
+  )
+    return false
+
+  // Read version from installed plugin's package.json
+  const installPath = path.join(stateDir, 'extensions', PLUGIN_ID)
+  const pkgPath = path.join(installPath, 'package.json')
+  let rawPkg: string
+  try {
+    rawPkg = fs.readFileSync(pkgPath, 'utf-8')
+  } catch {
+    // Plugin not installed on disk — skip
+    return false
+  }
+  let version: string | undefined
+  try {
+    const pkg = JSON.parse(rawPkg)
+    if (typeof pkg.version === 'string') version = pkg.version
+  } catch {
+    // package.json is malformed — proceed without version
+  }
+  let installedAt = new Date().toISOString()
+  try {
+    installedAt = fs.statSync(pkgPath).mtime.toISOString()
+  } catch {
+    // Fall back to repair time if file metadata is unavailable.
+  }
+
+  installs[PLUGIN_ID] = {
+    source: 'npm',
+    spec: version ? `${NPM_PKG_NAME}@${version}` : NPM_PKG_NAME,
+    installPath,
+    version,
+    installedAt,
+  }
+  plugins.installs = installs
+  config.plugins = plugins
+  return true
+}
+
+function repairLegacyProvisionState(
+  api: PluginApi,
+  config: Record<string, unknown>,
+  stateDir: string,
+) {
+  const installRecordPatched = patchInstallRecord(config, stateDir)
+  if (installRecordPatched) {
+    api.logger.warn('plugins.installs.clawly-plugins was missing — self-healed from disk.')
+  }
+  return installRecordPatched
+}
+
+function reconcileRuntimeConfig(
+  api: PluginApi,
+  config: Record<string, unknown>,
+  pc: ConfigPluginConfig,
+): boolean {
+  let dirty = false
+  dirty = patchAgent(config, pc) || dirty
+  dirty = patchGateway(config) || dirty
+  dirty = patchBrowser(config) || dirty
+  dirty = patchSession(config) || dirty
+  dirty = patchTts(config, pc) || dirty
+  dirty = patchWebSearch(config, pc) || dirty
+  dirty = patchModelGateway(config, api) || dirty
+  return dirty
+}
+
 // ---------------------------------------------------------------------------
-// Entry point — single read, patch all, single write
+// Entry point — single read, targeted reconcile, single write
 // ---------------------------------------------------------------------------
 
 export function setupConfig(api: PluginApi): void {
@@ -393,13 +489,8 @@ export function setupConfig(api: PluginApi): void {
   const pc = toPC(api)
 
   let dirty = false
-  dirty = patchAgent(config, pc) || dirty
-  dirty = patchGateway(config) || dirty
-  dirty = patchBrowser(config) || dirty
-  dirty = patchSession(config) || dirty
-  dirty = patchTts(config, pc) || dirty
-  dirty = patchWebSearch(config, pc) || dirty
-  dirty = patchModelGateway(config, api) || dirty
+  dirty = repairLegacyProvisionState(api, config, stateDir) || dirty
+  dirty = reconcileRuntimeConfig(api, config, pc) || dirty
 
   if (!dirty) {
     api.logger.info('Config setup: no changes needed.')

package/model-gateway-setup.ts

@@ -1,12 +1,10 @@
 /**
- * On plugin init, patches openclaw.json to add the `clawly-model-gateway`
- * model provider entry.  Credentials come from pluginConfig; the model list
- * is derived from `agents.defaults.model`
- * already present in the config.
+ * Reconciles the `clawly-model-gateway` provider in openclaw.json from
+ * pluginConfig inputs and the current runtime-facing agent defaults.
  *
- * This runs synchronously during plugin registration (before gateway_start).
- * OpenClaw loads the config file once at startup, so writing before the
- * gateway fully starts ensures the provider is active on first boot.
+ * This is a runtime reconcile path, not a provision/bootstrap contract.
+ * The first-boot correctness of gateway startup should not rely on this file
+ * write winning a race against OpenClaw's internal startup snapshot timing.
  */
 
 import fs from 'node:fs'

package/package.json

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