@mofeng2223/dsh-claude-provider 0.4.6 → 0.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mofeng2223/dsh-claude-provider",
-  "version": "0.4.6",
-  "description": "Custom Claude provider support for DeepSeek Harness 0.1.6-alpha.2",
+  "version": "0.5.0",
+  "description": "Custom Claude provider support for DeepSeek Harness 0.1.7-alpha.2",
   "author": "mofeng2223",
   "license": "MIT",
   "repository": {
@@ -24,7 +24,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.2"
+    "@deepseek-ai/schemastery": "3.18.4",
+    "js-yaml": "^4.3.2"
   },
   "exports": {
     ".": "./src/index.js",
@@ -37,7 +38,8 @@
     "cordis.patch.yml",
     "README.md",
     "README.zh-CN.md",
-    "LICENSE"
+    "LICENSE",
+    "scripts/migrate-legacy-types.mjs"
   ],
   "scripts": {
     "build": "node scripts/build-client.mjs",
@@ -60,6 +62,6 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-ui-settings-models": "0.1.6-alpha.2"
+    "@deepseek-ai/dsh-client-ui-settings-models": "0.1.7-alpha.2"
   }
 }

package/scripts/migrate-legacy-types.mjs

@@ -0,0 +1,42 @@
+import { readFile, writeFile, copyFile } from 'node:fs/promises'
+import { join, resolve } from 'node:path'
+import { homedir } from 'node:os'
+import { pathToFileURL } from 'node:url'
+import yaml from 'js-yaml'
+
+// Recover only UI type markers skipped when DSH was upgraded before this plugin.
+// Model settings and credential references remain owned by llm-pi-ai.
+export function recoverProviderTypes(legacy, current, providers) {
+  const result = { ...current }
+  for (const [id, type] of Object.entries(legacy ?? {})) {
+    if (type === 'claude-adaptive' && providers?.[id]?.api === 'anthropic-messages'
+      && !Object.hasOwn(result, id)) result[id] = type
+  }
+  return result
+}
+
+export async function migrateLegacyTypes(home, profile = 'web') {
+  const target = join(home, 'profiles', profile, 'cordis.patch.yml')
+  let legacy
+  try { legacy = yaml.load(await readFile(join(home, 'settings.yaml.imported'), 'utf8')) }
+  catch (error) { if (error.code === 'ENOENT') return { recovered: 0 }; throw error }
+  const text = await readFile(target, 'utf8')
+  const patches = yaml.load(text) ?? []
+  if (!Array.isArray(patches)) throw new Error('Expected a profile patch list')
+  const providerEntry = patches.find(entry => entry.id === 'llm-pi-ai')
+  const markerEntry = patches.find(entry => entry.id === 'dsh-claude-provider')
+  const current = markerEntry?.config?.providerTypes ?? {}
+  const merged = recoverProviderTypes(legacy?.['dsh-claude-provider']?.providerTypes, current, providerEntry?.config?.providers)
+  const recovered = Object.keys(merged).length - Object.keys(current).length
+  if (!recovered) return { recovered: 0 }
+  const backup = `${target}.before-claude-migration-${Date.now()}`
+  await copyFile(target, backup)
+  if (markerEntry) markerEntry.config = { ...markerEntry.config, providerTypes: merged }
+  else patches.push({ id: 'dsh-claude-provider', config: { providerTypes: merged } })
+  await writeFile(target, yaml.dump(patches, { lineWidth: -1, noRefs: true }), { mode: 0o600 })
+  return { recovered, backup }
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href) {
+  console.log(JSON.stringify(await migrateLegacyTypes(process.env.DSH_HOME ?? join(homedir(), '.dsh'), process.argv[2] ?? 'web')))
+}

package/src/index.js

@@ -6,8 +6,8 @@ export const inject = ['llm', 'settings']
 export const CLAUDE_PROVIDER_TYPE = 'claude-adaptive'
 export const CLAUDE_PROVIDER_SETTINGS_NS = 'dsh-claude-provider'
 
-const ProviderTypeSettings = z.object({
-  providerTypes: z.dict(z.const(CLAUDE_PROVIDER_TYPE)).default({}),
+export const Config = z.object({
+  providerTypes: z.dict(z.const(CLAUDE_PROVIDER_TYPE)).default({}).volatile(),
 })
 
 export const CLAUDE_DISCOVERY_API = 'mofeng-anthropic-models'
@@ -207,7 +207,7 @@ export async function discoverAnthropicModels({ baseURL, apiKey, signal, fetchIm
 
 function configuredCredentialRef(ctx, provider) {
   if (typeof provider !== 'string' || provider.length === 0) return undefined
-  const section = ctx.get('settings')?.get(PI_AI_SETTINGS_NS)
+  const section = ctx.get('settings')?.describe().find(entry => entry.ns === PI_AI_SETTINGS_NS)?.value
   const profile = section?.providers?.[provider]
   const ref = profile?.apiKeyEnv
   return typeof ref === 'string' && ref.length > 0 ? ref : undefined
@@ -260,10 +260,5 @@ function installClaudeModelDiscovery(ctx) {
 }
 
 export function apply(ctx) {
-  ctx.settings.register(
-    CLAUDE_PROVIDER_SETTINGS_NS,
-    ProviderTypeSettings,
-    { base: { providerTypes: {} } },
-  )
   installClaudeModelDiscovery(ctx)
 }