dsh-gpt-adapter 0.2.4 → 0.2.6

package/lib/index.js

@@ -809,7 +809,7 @@ var JsonStorage = class {
 };
 
 // src/host.ts
-import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
+import { Config as NativeConfig, PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { createRequire } from "node:module";
 import { readFileSync } from "node:fs";
 import { createHash as createHash6 } from "node:crypto";
@@ -989,58 +989,72 @@ function projectSchema(json, preserveNativeLevels) {
   keys.list = offered.map((level) => z.const(level));
   return schema.toJSON();
 }
-function nativeWrite(next, current, resolve4, contextEdits) {
+function nativeWrite(next, current, base, resolve4, contextEdits, contextWrites) {
   if (!next.providers) return next;
   return {
     ...next,
     providers: Object.fromEntries(
       Object.entries(next.providers).map(([provider, raw]) => {
         const profile = raw;
-        if (!Array.isArray(profile?.models)) return [provider, profile];
-        const previous = current.providers?.[provider]?.models ?? [];
+        const inherited = base?.providers?.[provider] ?? {};
+        const ownershipProfile = {
+          ...inherited,
+          ...current.providers?.[provider]
+        };
+        const effectiveProfile = { ...inherited, ...profile };
+        const ownsModels = Array.isArray(profile?.models);
+        const models = ownsModels ? profile.models : inherited.models?.map(
+          (model) => projectModel(provider, model, resolve4, ownershipProfile)
+        );
+        if (!Array.isArray(models)) return [provider, profile];
+        const previous = ownershipProfile.models ?? [];
+        const savedModels = models.map((model) => {
+          const original = previous.find((row) => row.id === model.id);
+          const capability = resolve4(provider, model, ownershipProfile);
+          if (!capability) return model;
+          const managed = projectModel(
+            provider,
+            model,
+            resolve4,
+            ownershipProfile
+          );
+          if (original && JSON.stringify(model.reasoningEfforts) !== JSON.stringify(managed.reasoningEfforts))
+            throw new Error(
+              "GPT \u601D\u8003\u7B49\u7EA7\u7531\u63D2\u4EF6\u9884\u8BBE\u7BA1\u7406\uFF1B\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\uFF0C\u6216\u5728\u6A21\u578B\u80FD\u529B\u8986\u76D6\u4E2D\u4FEE\u6539\uFF0C\u505C\u7528\u81EA\u52A8\u9002\u914D\u53EF\u6062\u590D\u539F\u751F\u7F16\u8F91\u3002"
+            );
+          const restored = { ...model };
+          const projectedContext = original ? projectModel(provider, original, resolve4, ownershipProfile).contextWindow : void 0;
+          const editedContext = ownsModels && (original ? model.contextWindow !== projectedContext : Object.hasOwn(model, "contextWindow"));
+          const budgetChanged = editedContext || !original || model.maxTokens !== original.maxTokens || model.maxTokens === void 0 && effectiveProfile.defaultMaxTokens !== ownershipProfile.defaultMaxTokens || model.contextWindow === void 0 && effectiveProfile.defaultContextWindow !== ownershipProfile.defaultContextWindow;
+          if (!editedContext) {
+            if (original && Object.hasOwn(original, "contextWindow"))
+              restored.contextWindow = original.contextWindow;
+            else delete restored.contextWindow;
+          } else {
+            if (model.contextWindow !== void 0 && !validContextWindow(model.contextWindow))
+              throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
+            contextEdits.push({
+              provider,
+              modelId: model.id,
+              previousTokens: original?.contextWindow
+            });
+          }
+          if (budgetChanged)
+            contextWrites?.validate?.(
+              provider,
+              editedContext ? model : { ...model, contextWindow: capability.contextWindow },
+              profile
+            );
+          if (original && Object.hasOwn(original, "reasoningEfforts"))
+            restored.reasoningEfforts = structuredClone(
+              original.reasoningEfforts
+            );
+          else delete restored.reasoningEfforts;
+          return restored;
+        });
         return [
           provider,
-          {
-            ...profile,
-            models: profile.models.map((model) => {
-              const original = previous.find((row) => row.id === model.id);
-              const ownershipProfile = current.providers?.[provider] ?? profile;
-              const capability = resolve4(provider, model, ownershipProfile);
-              if (!capability) return model;
-              const managed = projectModel(
-                provider,
-                model,
-                resolve4,
-                ownershipProfile
-              );
-              if (original && JSON.stringify(model.reasoningEfforts) !== JSON.stringify(managed.reasoningEfforts))
-                throw new Error(
-                  "GPT \u601D\u8003\u7B49\u7EA7\u7531\u63D2\u4EF6\u9884\u8BBE\u7BA1\u7406\uFF1B\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\uFF0C\u6216\u5728\u6A21\u578B\u80FD\u529B\u8986\u76D6\u4E2D\u4FEE\u6539\uFF0C\u505C\u7528\u81EA\u52A8\u9002\u914D\u53EF\u6062\u590D\u539F\u751F\u7F16\u8F91\u3002"
-                );
-              const restored = { ...model };
-              const projectedContext = original ? projectModel(provider, original, resolve4, ownershipProfile).contextWindow : void 0;
-              const editedContext = original ? model.contextWindow !== projectedContext : Object.hasOwn(model, "contextWindow");
-              if (!editedContext) {
-                if (original && Object.hasOwn(original, "contextWindow"))
-                  restored.contextWindow = original.contextWindow;
-                else delete restored.contextWindow;
-              } else {
-                if (model.contextWindow !== void 0 && !validContextWindow(model.contextWindow))
-                  throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u662F\u6B63\u7684\u5B89\u5168\u6574\u6570");
-                contextEdits.push({
-                  provider,
-                  modelId: model.id,
-                  previousTokens: original?.contextWindow
-                });
-              }
-              if (original && Object.hasOwn(original, "reasoningEfforts"))
-                restored.reasoningEfforts = structuredClone(
-                  original.reasoningEfforts
-                );
-              else delete restored.reasoningEfforts;
-              return restored;
-            })
-          }
+          ownsModels ? { ...profile, models: savedModels } : profile
         ];
       })
     )
@@ -1050,6 +1064,15 @@ function installSettingsOverlay(settings, resolve4, contextWrites) {
   settings = settings[symbols.original] ?? settings;
   const originalDescribe = settings.describe;
   const originalWrite = settings.write;
+  const editableResolve = (provider, model, profile) => {
+    const capability = resolve4(provider, model, profile);
+    if (!capability) return void 0;
+    const manual = contextWrites?.editableContext ? contextWrites.editableContext(provider, model) : model.contextWindow;
+    const projected = { ...capability };
+    if (manual === void 0) delete projected.contextWindow;
+    else projected.contextWindow = manual;
+    return projected;
+  };
   let viewRevision;
   function describe(options) {
     return originalDescribe.call(this, options).map((row) => {
@@ -1091,8 +1114,8 @@ function installSettingsOverlay(settings, resolve4, contextWrites) {
         ...managed ? {
           schema: projectSchema(row.schema, other),
           value,
-          base: projectConfiguration(row.base, resolve4),
-          user: projectConfiguration(row.user, resolve4)
+          base: projectConfiguration(row.base, editableResolve),
+          user: projectConfiguration(row.user, editableResolve)
         } : {},
         ...typeof row.revision === "number" ? { revision: viewRevision.revision } : {}
       };
@@ -1106,13 +1129,15 @@ function installSettingsOverlay(settings, resolve4, contextWrites) {
       ns,
       ns !== "llm-pi-ai" ? change : (current, base, schema) => nativeWrite(
         change(
-          projectConfiguration(current, resolve4),
-          projectConfiguration(base, resolve4),
+          projectConfiguration(structuredClone(current), editableResolve),
+          projectConfiguration(structuredClone(base), editableResolve),
           schema
         ),
         current,
-        resolve4,
-        edits
+        base,
+        editableResolve,
+        edits,
+        contextWrites
       ),
       expected,
       paths
@@ -1179,6 +1204,7 @@ function installSettingsOverlay(settings, resolve4, contextWrites) {
         edits.push({ provider, modelId, previousTokens: model.contextWindow });
         if (tokens === void 0) delete model.contextWindow;
         else model.contextWindow = tokens;
+        contextWrites?.validate?.(provider, model, next.providers[provider]);
         return next;
       },
       expected,
@@ -2646,13 +2672,7 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
             op: "set",
             path: ["providers", provider, "models"],
             value: [...existing, ...added].map(
-              (model) => projectModel(
-                provider,
-                model,
-                (route, row) => this.capability(route, row.id, row.name),
-                void 0,
-                ids.has(model.id)
-              )
+              (model) => this.editableModel(provider, model, ids.has(model.id))
             )
           }
         ],
@@ -2786,12 +2806,7 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
             op: "set",
             path: ["providers", provider, "models"],
             value: nextModels.map(
-              (model) => projectModel(
-                provider,
-                model,
-                (route, row) => this.capability(route, row.id, row.name),
-                void 0
-              )
+              (model) => this.editableModel(provider, model)
             )
           }
         ],
@@ -2799,16 +2814,35 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
       );
     await runner.removeStale(staleIds);
   }
+  /** Internal model-list writes must use the same manual fields as native drafts. */
+  editableModel(provider, model, existing = true) {
+    const capability = this.capability(provider, model.id, model.name);
+    if (!capability) return model;
+    const tokens = existing ? this.editableContextWindow(provider, model) : model.contextWindow;
+    return projectModel(
+      provider,
+      tokens === void 0 ? model : { ...model, contextWindow: tokens },
+      () => capability,
+      void 0,
+      false
+    );
+  }
+  editableContextWindow(provider, model) {
+    const context = this.contextWindow(provider, model.id);
+    return context.source === "legacy-override" ? context.effectiveTokens : model.contextWindow;
+  }
   /** Resolve raw metadata separately from merged capabilities and cached overrides. */
-  contextWindow(provider, modelId, nativeDefault) {
-    const { descriptor, profile } = this.profile(provider);
+  contextWindow(provider, modelId, nativeDefault, profileOverride) {
+    const { descriptor, profile: storedProfile } = this.profile(provider);
+    const inherited = descriptor.base?.providers?.[provider];
+    const profile = profileOverride ? { ...inherited, ...profileOverride } : storedProfile;
     const overrides = JSON.parse(
       this.routeOptions(provider, profile)?.overridesJSON ?? "{}"
     );
     const row = profile.models?.length ? profile.models.find((model) => model.id === modelId) : profile.modelOverrides?.[modelId];
     const snapshot = this.snapshots.get(provider);
     const raw = snapshot?.models.find((model) => model.id === modelId);
-    const userProfile = descriptor.user?.providers?.[provider];
+    const userProfile = profileOverride ?? descriptor.user?.providers?.[provider];
     const providerDefault = userProfile?.defaultContextWindow ?? (profile.defaultContextWindow !== 1e6 || descriptor.base === void 0 && descriptor.user === void 0 ? profile.defaultContextWindow : void 0);
     const catalogModel = getBuiltinModels(provider).find(
       (model) => model.id === modelId
@@ -2823,6 +2857,28 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
       nativeDefault: nativeDefault ?? catalogModel?.contextWindow ?? profile.defaultContextWindow
     });
   }
+  /** Both native form saves and the compatibility RPC validate the same budget. */
+  validateContextWindow(provider, model, profile) {
+    const effective = model.contextWindow ?? this.contextWindow(provider, model.id, void 0, profile).defaultTokens;
+    const compaction = this.nativeDescribe().find(
+      (entry) => entry.ns === "compaction-basic"
+    )?.value;
+    const policy = compaction?.modelPolicies?.find(
+      (entry) => entry.provider === provider && entry.model === model.id
+    );
+    const headroom = policy?.headroomTokens ?? compaction?.headroomTokens ?? 0;
+    const inherited = this.nativeDescribe().find((entry) => entry.ns === "llm-pi-ai")?.base?.providers?.[provider];
+    const defaults = NativeConfig({
+      providers: {
+        [provider]: {
+          defaultMaxTokens: profile.defaultMaxTokens ?? inherited?.defaultMaxTokens
+        }
+      }
+    }).providers.get()[provider];
+    const output = model.maxTokens ?? getBuiltinModels(provider).find((entry) => entry.id === model.id)?.maxTokens ?? defaults.defaultMaxTokens;
+    if (effective <= output + headroom)
+      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u5927\u4E8E\u5F53\u524D\u6700\u5927\u8F93\u51FA\u548C\u538B\u7F29\u9884\u7559\u7684\u603B\u548C");
+  }
   contextWriteRevision() {
     return this.nativeDescribe().find((row) => row.ns === this.settingsNs)?.revision;
   }
@@ -2863,18 +2919,6 @@ var GptModels = class extends (_a = Service, _codexStatus_dec = [Remote], _refre
       throw new Error("\u8BF7\u5148\u542F\u7528\u8BE5 GPT \u6A21\u578B\u7684\u81EA\u52A8\u9002\u914D");
     const index = profile.models?.findIndex((model) => model.id === modelId) ?? -1;
     if (index < 0) throw new Error("\u6A21\u578B\u5DF2\u53D8\u66F4\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5");
-    const effective = tokens ?? this.contextWindow(provider, modelId).defaultTokens;
-    const row = profile.models[index];
-    const compaction = this.nativeDescribe().find(
-      (entry) => entry.ns === "compaction-basic"
-    )?.value;
-    const policy = compaction?.modelPolicies?.find(
-      (entry) => entry.provider === provider && entry.model === modelId
-    );
-    const headroom = policy?.headroomTokens ?? compaction?.headroomTokens ?? 0;
-    const output = validContextWindow(row.maxTokens) ? row.maxTokens : 0;
-    if (effective <= output + headroom)
-      throw new Error("\u4E0A\u4E0B\u6587\u7A97\u53E3\u5FC5\u987B\u5927\u4E8E\u5F53\u524D\u6700\u5927\u8F93\u51FA\u548C\u538B\u7F29\u9884\u7559\u7684\u603B\u548C");
     if (!this.contextWriter) throw new Error("\u4E0A\u4E0B\u6587\u8BBE\u7F6E\u6682\u4E0D\u53EF\u7528");
     await this.contextWriter(
       provider,
@@ -3041,6 +3085,8 @@ async function apply2(ctx, config) {
       ctx.settings,
       (provider, model, profile) => typeof model.id === "string" ? service.capability(provider, model.id, model.name, profile) : void 0,
       {
+        editableContext: (provider, model) => service.editableContextWindow(provider, model),
+        validate: (provider, model, profile) => service.validateContextWindow(provider, model, profile),
         revision: () => service.contextWriteRevision(),
         saved: (edits, revision) => service.clearLegacyContext(edits, revision)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gpt-adapter",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "private": false,
   "publishConfig": {
     "access": "public"

package/scripts/build.mjs

@@ -3,6 +3,8 @@ import { mkdir, writeFile, rm, readFile } from 'node:fs/promises'
 import { createHash } from 'node:crypto'
 import { createRequire } from 'node:module'
 import { compatibilitySource, menuSource } from './compat.mjs'
+import { nativeContextSettingsSource } from './native-context-settings.mjs'
+import { fileURLToPath } from 'node:url'
 
 await rm('lib', { recursive: true, force: true })
 await mkdir('lib', { recursive: true })
@@ -30,6 +32,7 @@ const settings = await readFile(
   require.resolve('@deepseek-ai/dsh-client-ui-settings-models/client'),
   'utf8',
 )
+const nativeContextSettings = nativeContextSettingsSource()
 const styleNames = [
   'customized',
   'customizedSummary',
@@ -62,8 +65,41 @@ await build({
     'react',
     'react/jsx-runtime',
     '@deepseek-ai/dsh-client-ui-primitives',
+    '@deepseek-ai/dsh-client-store',
   ],
   plugins: [
+    {
+      name: 'native-context-settings',
+      setup(build) {
+        build.onResolve(
+          { filter: new RegExp('^dsh-gpt-adapter/native-context-settings$') },
+          () => ({
+            path: 'native-context-settings',
+            namespace: 'gpt-context',
+          }),
+        )
+        build.onLoad({ filter: /.*/, namespace: 'gpt-context' }, () => ({
+          contents: `
+            import * as React from 'react';
+            import * as JSX from 'react/jsx-runtime';
+            import * as Primitives from '@deepseek-ai/dsh-client-ui-primitives';
+            import * as Store from '@deepseek-ai/dsh-client-store';
+            import { ContextWindowPreset } from ${JSON.stringify(fileURLToPath(new URL('../src/client/context-window-preset.tsx', import.meta.url)))};
+            import { isGptModel } from ${JSON.stringify(fileURLToPath(new URL('../src/capabilities.ts', import.meta.url)))};
+            import { validContextWindow } from ${JSON.stringify(fileURLToPath(new URL('../src/context-window.ts', import.meta.url)))};
+            const native = ((require) => { ${nativeContextSettings.body} })((name) => {
+              const modules = {'react': React, 'react/jsx-runtime': JSX, '@deepseek-ai/dsh-client-ui-primitives': Primitives, '@deepseek-ai/dsh-client-store': Store};
+              if (!(name in modules)) throw new Error('Unsupported native Models dependency: ' + name);
+              return modules[name];
+            });
+            export const NativeModelsSection = native.ModelsSection;
+            export const expectedModelsSectionSource = ${JSON.stringify(nativeContextSettings.expectedModelsSectionSource)};
+          `,
+          loader: 'js',
+          resolveDir: fileURLToPath(new URL('../', import.meta.url)),
+        }))
+      },
+    },
     {
       name: 'native-settings-styles',
       setup(build) {

package/scripts/native-context-settings.mjs

@@ -0,0 +1,139 @@
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import ts from 'typescript'
+
+/** Adapt the pinned native model field without editing the installed package. */
+export function nativeContextSettingsSource() {
+  const require = createRequire(import.meta.url)
+  const pkg = require('@deepseek-ai/dsh-client-ui-settings-models/package.json')
+  if (pkg.version !== '0.2.2-rc.1')
+    throw new Error('Unsupported native Models UI ' + pkg.version)
+  const source = readFileSync(
+    require.resolve('@deepseek-ai/dsh-client-ui-settings-models/client'),
+    'utf8',
+  )
+  const ast = ts.createSourceFile(
+    'native-models.js',
+    source,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.JS,
+  )
+  const nodes = []
+  const walk = (node) => {
+    nodes.push(node)
+    ts.forEachChild(node, walk)
+  }
+  walk(ast)
+  const one = (matches, label) => {
+    if (matches.length !== 1)
+      throw new Error('Unsupported native Models UI: ' + label)
+    return matches[0]
+  }
+  const factory = one(
+    nodes.filter(
+      (node) =>
+        ts.isPropertyAssignment(node) &&
+        node.name.getText(ast) === 'factory' &&
+        ts.isArrowFunction(node.initializer) &&
+        node.initializer.parameters[0]?.name.getText(ast) === 'require',
+    ),
+    'module factory',
+  ).initializer
+  const models = one(
+    nodes.filter(
+      (node) =>
+        ts.isFunctionDeclaration(node) && node.name?.text === 'ModelsSection',
+    ),
+    'ModelsSection',
+  )
+  const input = one(
+    nodes.filter(
+      (node) =>
+        ts.isCallExpression(node) &&
+        node.arguments[0] &&
+        ts.isStringLiteral(node.arguments[0]) &&
+        node.arguments[0].text === 'input' &&
+        node.arguments[1] &&
+        ts.isObjectLiteralExpression(node.arguments[1]) &&
+        node.arguments[1].properties.some(
+          (prop) =>
+            ts.isPropertyAssignment(prop) &&
+            prop.name.getText(ast) === 'value' &&
+            prop.initializer.getText(ast) === 'props[field].value',
+        ),
+    ),
+    'context capacity input',
+  )
+  let label = input.parent
+  while (
+    label &&
+    !(
+      ts.isCallExpression(label) &&
+      label.arguments[0] &&
+      ts.isStringLiteral(label.arguments[0]) &&
+      label.arguments[0].text === 'label'
+    )
+  )
+    label = label.parent
+  if (!label) throw new Error('Unsupported native Models UI: capacity label')
+  const eligible =
+    'field === "contextWindow" && props.inputField === "input" && isGptModel(model)'
+  const edits = [
+    {
+      start: input.getStart(ast),
+      end: input.end,
+      text:
+        '(' +
+        eligible +
+        ' ? (0, react_jsx_runtime.jsx)(ContextWindowPreset, {' +
+        'inputProps: ' +
+        input.arguments[1].getText(ast) +
+        ',' +
+        'tokens: Number.isNaN(model[field]) ? NaN : parseCapacity(props[field].value),' +
+        'onValueChange: props[field].onChange,' +
+        'onCustomValueChange: (text) => {' +
+        'props[field].onChange(text);' +
+        'if (!validContextWindow(parseCapacity(text))) props.onFieldChange(field, NaN);' +
+        '}' +
+        '}) : ' +
+        input.getText(ast) +
+        ')',
+    },
+    {
+      start: label.arguments[0].getStart(ast),
+      end: label.arguments[0].end,
+      text: '(' + eligible + ' ? "div" : "label")',
+    },
+  ]
+  for (const statement of factory.body.statements) {
+    if (
+      ts.isExpressionStatement(statement) &&
+      ts.isBinaryExpression(statement.expression) &&
+      statement.expression.left.getText(ast).startsWith('exports.')
+    )
+      edits.push({
+        start: statement.getStart(ast),
+        end: statement.end,
+        text: '',
+      })
+  }
+  const returns = factory.body.statements.filter(ts.isReturnStatement)
+  const result = one(returns, 'factory return')
+  edits.push({
+    start: result.getStart(ast),
+    end: result.end,
+    text: 'return { ModelsSection, ModelListEditor, ProviderEditor, validateDeepSeekModels };',
+  })
+  const start = factory.body.getStart(ast) + 1
+  let body = source.slice(start, factory.body.end - 1)
+  for (const edit of edits.sort((a, b) => b.start - a.start)) {
+    if (edit.start < start || edit.end > factory.body.end)
+      throw new Error('Native Models edit is outside the verified factory')
+    body =
+      body.slice(0, edit.start - start) +
+      edit.text +
+      body.slice(edit.end - start)
+  }
+  return { source, body, expectedModelsSectionSource: models.getText(ast) }
+}

package/dist/src/client/context-window.d.ts

@@ -1,9 +0,0 @@
-import { type ContextWindowResolution } from '../context-window.js';
-export declare function ContextWindowControl({ provider, modelId, value, revision, busy, save, }: {
-    provider: string;
-    modelId: string;
-    value: ContextWindowResolution;
-    revision: number;
-    busy: boolean;
-    save(args: Record<string, unknown>): Promise<boolean | undefined>;
-}): import("react/jsx-runtime").JSX.Element;