From 5c528a53f36cae0378f0a2382399feb6ed843f14 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 1 May 2026 19:55:37 +0100 Subject: [PATCH] refactor: trim migration helper exports --- extensions/migrate-claude/source.ts | 2 +- extensions/migrate-hermes/config.ts | 2 +- extensions/migrate-hermes/items.ts | 43 +++++++++-------------------- extensions/migrate-hermes/source.ts | 2 +- 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/extensions/migrate-claude/source.ts b/extensions/migrate-claude/source.ts index 0e38385b18c..1534e3b83de 100644 --- a/extensions/migrate-claude/source.ts +++ b/extensions/migrate-claude/source.ts @@ -2,7 +2,7 @@ import os from "node:os"; import path from "node:path"; import { exists, isDirectory, readJsonObject, resolveHomePath } from "./helpers.js"; -export type ClaudeArchivePath = { +type ClaudeArchivePath = { id: string; path: string; relativePath: string; diff --git a/extensions/migrate-hermes/config.ts b/extensions/migrate-hermes/config.ts index 7bac58b4f48..fe09a5eb2bb 100644 --- a/extensions/migrate-hermes/config.ts +++ b/extensions/migrate-hermes/config.ts @@ -57,7 +57,7 @@ function providerConfig(entry: HermesProviderConfig): Record { }; } -export function collectHermesProviders( +function collectHermesProviders( config: Record, modelRef?: string, ): HermesProviderConfig[] { diff --git a/extensions/migrate-hermes/items.ts b/extensions/migrate-hermes/items.ts index 598c7cb6de2..47ff8b3d4ff 100644 --- a/extensions/migrate-hermes/items.ts +++ b/extensions/migrate-hermes/items.ts @@ -7,29 +7,6 @@ import { } from "openclaw/plugin-sdk/migration"; import { readString } from "./helpers.js"; -export type HermesModelDetails = { - model: string; -}; - -export type HermesSecretDetails = { - envVar: string; - provider: string; - profileId: string; -}; - -export type HermesModelItem = MigrationItem & { - id: "config:default-model"; - kind: "config"; - action: "skip" | "update"; - details: HermesModelDetails; -}; - -export type HermesSecretItem = MigrationItem & { - kind: "secret"; - action: "skip" | "create"; - details: HermesSecretDetails; -}; - export const HERMES_REASON_ALREADY_CONFIGURED = "already configured"; export const HERMES_REASON_DEFAULT_MODEL_CONFIGURED = "default model already configured"; export const HERMES_REASON_INCLUDE_SECRETS = "use --include-secrets to import"; @@ -43,7 +20,7 @@ export function createHermesModelItem(params: { model: string; currentModel?: string; overwrite?: boolean; -}): HermesModelItem { +}): MigrationItem { const alreadyConfigured = params.currentModel === params.model; const conflict = Boolean(params.currentModel && !params.overwrite && !alreadyConfigured); return createMigrationItem({ @@ -58,10 +35,10 @@ export function createHermesModelItem(params: { ? HERMES_REASON_DEFAULT_MODEL_CONFIGURED : undefined, details: { model: params.model }, - }) as HermesModelItem; + }); } -export function readHermesModelDetails(item: MigrationItem): HermesModelDetails | undefined { +export function readHermesModelDetails(item: MigrationItem): { model: string } | undefined { const model = readString(item.details?.model); return model ? { model } : undefined; } @@ -72,8 +49,12 @@ export function createHermesSecretItem(params: { target: string; includeSecrets?: boolean; existsAlready?: boolean; - details: HermesSecretDetails; -}): HermesSecretItem { + details: { + envVar: string; + provider: string; + profileId: string; + }; +}): MigrationItem { const skipped = !params.includeSecrets; const conflict = Boolean(params.existsAlready && !skipped); return createMigrationItem({ @@ -90,10 +71,12 @@ export function createHermesSecretItem(params: { ? HERMES_REASON_AUTH_PROFILE_EXISTS : undefined, details: params.details, - }) as HermesSecretItem; + }); } -export function readHermesSecretDetails(item: MigrationItem): HermesSecretDetails | undefined { +export function readHermesSecretDetails( + item: MigrationItem, +): { envVar: string; provider: string; profileId: string } | undefined { const envVar = readString(item.details?.envVar); const provider = readString(item.details?.provider); const profileId = readString(item.details?.profileId); diff --git a/extensions/migrate-hermes/source.ts b/extensions/migrate-hermes/source.ts index 83d5de8a65d..4a3cf5315a1 100644 --- a/extensions/migrate-hermes/source.ts +++ b/extensions/migrate-hermes/source.ts @@ -13,7 +13,7 @@ export type HermesSource = { archivePaths: HermesArchivePath[]; }; -export type HermesArchivePath = { +type HermesArchivePath = { id: string; path: string; relativePath: string;