dsh-oauth-login 0.2.4 → 0.2.7

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { LlmFailure, Message, RetryPolicyConfig, StreamChunk } from "@deepseek-ai/dsh-llm";
+import { LlmFailure, RequestMessage, RetryPolicyConfig, StreamChunk } from "@deepseek-ai/dsh-llm";
 import { Api, AuthInteraction, AuthOperationOptions, Context, Credential, CredentialInfo, CredentialStore, Model, MutableModels, Provider, StreamOptions } from "@earendil-works/pi-ai";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -395,7 +395,7 @@ declare function decodeHostedImage(base64: string): {
  * pi-ai replay cannot represent assistant ImageBlocks. Drop them before the
  * next request so replay metadata still lines up with remaining content.
  */
-declare function stripAssistantImages(messages: readonly Message[]): Message[];
+declare function stripAssistantImages(messages: readonly RequestMessage[]): RequestMessage[];
 declare function injectHostedImages(source: AsyncIterable<StreamChunk>, capture: HostedCapture, save: (input: SaveImageAttachment) => Promise<ImageAttachmentRef>): AsyncGenerator<StreamChunk>;
 //#endregion
 //#region src/oauth-refresh.d.ts

package/lib/index.js

@@ -1,5 +1,5 @@
 import { LlmError, ReasoningEffortId, RetryPolicySchema, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
-import { createModels, defaultProviderAuthContext } from "@earendil-works/pi-ai";
+import { createModels, defaultProviderAuthContext, getCurrentTools, normalizeContext } from "@earendil-works/pi-ai";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { basename, dirname, join, resolve } from "node:path";
@@ -762,6 +762,10 @@ const OPENROUTER_REFRESH_MS = 9e5;
 const OPENROUTER_COOLDOWN_MS = 6e4;
 //#endregion
 //#region src/native-tools.ts
+/**
+* OAuth routes that already have provider-hosted search / image tools.
+* DSH's web_search function tool would hide those and bill a second key.
+*/
 /** DSH model-facing tools that steal traffic from a subscribed provider. */
 const DSH_WEB_TOOL_NAMES = ["web_search", "web_fetch"];
 /** Matching tool-web prompt sections. */
@@ -1041,10 +1045,15 @@ function wrapOnPayload(existing, providerId, api, policy = DEFAULT_NATIVE_TOOL_P
 	};
 }
 function filterPiContext(context, providerId, api, policy = DEFAULT_NATIVE_TOOL_POLICY) {
-	if (nativePlan(providerId, api, policy) === void 0 || context.tools === void 0) return context;
+	if (nativePlan(providerId, api, policy) === void 0) return context;
 	return {
 		...context,
-		tools: context.tools.filter((tool) => !isDshWebToolName(tool.name))
+		...context.tools === void 0 ? {} : { tools: context.tools.filter((tool) => !isDshWebToolName(tool.name)) },
+		messages: context.messages.map((message) => message.role !== "system" ? message : {
+			...message,
+			...message.toolsAdded === void 0 ? {} : { toolsAdded: message.toolsAdded.filter((tool) => !isDshWebToolName(tool.name)) },
+			...message.toolsRemoved === void 0 ? {} : { toolsRemoved: message.toolsRemoved.filter((tool) => !isDshWebToolName(tool.name)) }
+		})
 	};
 }
 /**
@@ -1056,7 +1065,7 @@ function filterPiContext(context, providerId, api, policy = DEFAULT_NATIVE_TOOL_
 * when the provider serializer later emits `tools: []`.
 */
 function prepareNativeToolRequest(context, options, providerId, api, policy = DEFAULT_NATIVE_TOOL_POLICY) {
-	if (context.tools === void 0 || nativePlan(providerId, api, policy) === void 0) return {
+	if (context.tools === void 0 && getCurrentTools(context.messages).length === 0 || nativePlan(providerId, api, policy) === void 0) return {
 		context,
 		options
 	};
@@ -1903,12 +1912,12 @@ function harnessProvider(spec, native = DEFAULT_NATIVE_TOOL_POLICY, catalog) {
 		stream: (model, context, options) => {
 			const request = prepareNativeToolRequest(context, options ?? {}, spec.id, model.api, native);
 			const guarded = spec.id === "openrouter" ? prepareOpenRouterOptions(model, request.options, catalog) : request.options;
-			return base.stream(model, request.context, guarded);
+			return base.stream(model, normalizeContext(request.context), guarded);
 		},
 		streamSimple: (model, context, options) => {
 			const request = prepareNativeToolRequest(context, options ?? {}, spec.id, model.api, native);
 			const guarded = spec.id === "openrouter" ? prepareOpenRouterOptions(model, request.options, catalog) : request.options;
-			return base.streamSimple(model, request.context, guarded);
+			return base.streamSimple(model, normalizeContext(request.context), guarded);
 		}
 	};
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-oauth-login",
   "description": "DSH-owned subscription login powered by Pi AI adapters: OAuth plus official Plan API keys, with an independent credential store.",
-  "version": "0.2.4",
+  "version": "0.2.7",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -90,16 +90,17 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh": ">=0.2.0-rc.2 <0.2.1",
     "@deepseek-ai/dsh-atomic-write": "*",
     "@deepseek-ai/dsh-attachment": "*",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.5-rc.3 <0.1.6",
+    "@deepseek-ai/dsh-client-connection": ">=0.2.0-rc.2 <0.2.1",
     "@deepseek-ai/dsh-home-paths": "*",
     "@deepseek-ai/dsh-host-webserver": "*",
     "@deepseek-ai/dsh-invariants": "*",
     "@deepseek-ai/dsh-llm": "*",
     "@deepseek-ai/dsh-llm-pi-ai": "*",
     "@deepseek-ai/schemastery": "^3.18.2",
-    "@earendil-works/pi-ai": "^0.85.1",
+    "@earendil-works/pi-ai": "^0.87.1",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
@@ -109,6 +110,9 @@
     "@deepseek-ai/cordis": {
       "optional": true
     },
+    "@deepseek-ai/dsh": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-atomic-write": {
       "optional": true
     },
@@ -141,33 +145,33 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-atomic-write": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-attachment": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-authorization": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-brand": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-session": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-credentials": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-fs": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-home-paths": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-invariants": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-launch-environment": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-settings": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-timeout": "0.1.5-rc.3",
-    "@deepseek-ai/dsh-util-values": "0.1.5-rc.3",
-    "@deepseek-ai/schemastery": "3.18.2",
-    "@earendil-works/pi-ai": "0.85.1",
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-atomic-write": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-authorization": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-brand": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-fs": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-timeout": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-util-values": "0.2.0-rc.2",
+    "@deepseek-ai/schemastery": "3.18.4",
+    "@earendil-works/pi-ai": "0.87.1",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/semver": "7.7.1",

package/src/client/SearchableModelSelect.tsx

@@ -322,18 +322,22 @@ export function SearchableModelSelect(
     close()
   }
 
-  const settleSelection = (accepted: boolean): void => {
-    if (accepted) {
+  const settleSelection = (result: Awaited<ReturnType<ModelSelectInjected['select']>>): void => {
+    if (result === undefined) return
+    if (result.ok) {
       if (rootRef.current !== null) close(true)
       return
     }
-    const message = directory.getSnapshot().error
-    if (message !== null) {
-      noticeSeq.current += 1
-      window.clearTimeout(noticeTimer.current)
-      setNotice({ seq: noticeSeq.current, text: t('error.action', { message }) })
-      noticeTimer.current = window.setTimeout(() => { setNotice(null) }, 4000)
-    }
+    const { error } = result
+    noticeSeq.current += 1
+    window.clearTimeout(noticeTimer.current)
+    setNotice({
+      seq: noticeSeq.current,
+      text: error.code === 'session/writer-held'
+        ? t('error.sessionInUse')
+        : t('error.action', { message: `${error.code}: ${error.message}` }),
+    })
+    noticeTimer.current = window.setTimeout(() => { setNotice(null) }, 4000)
   }
 
   const choose = (selection: ModelSelection): void => {

package/src/client/index.tsx

@@ -62,8 +62,8 @@ export function apply(ctx: ClientContext): void {
           if (available) directory.load().catch(() => { /* surfaced on the store */ })
         },
         select: (selection: ModelSelection) => available
-          ? directory.select(selection).then(() => true, () => false)
-          : Promise.resolve(false),
+          ? directory.select(selection)
+          : Promise.resolve(undefined),
         ts,
       }
     },

package/src/hosted-images.ts

@@ -4,7 +4,7 @@
  */
 
 import type { ImageAttachmentRef, ImageMediaType, SaveImageAttachment } from '@deepseek-ai/dsh-attachment'
-import type { Message, StreamChunk } from '@deepseek-ai/dsh-llm'
+import type { RequestMessage, StreamChunk } from '@deepseek-ai/dsh-llm'
 import type { HostedCapture, HostedImage } from './hosted-capture.ts'
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -107,7 +107,7 @@ function extensionFor(mediaType: ImageMediaType): string {
  * pi-ai replay cannot represent assistant ImageBlocks. Drop them before the
  * next request so replay metadata still lines up with remaining content.
  */
-export function stripAssistantImages(messages: readonly Message[]): Message[] {
+export function stripAssistantImages(messages: readonly RequestMessage[]): RequestMessage[] {
   return messages.map(message => {
     if (message.role !== 'assistant') return message
     const content = message.content.filter(block => block.type !== 'image')

package/src/native-tools.ts

@@ -3,6 +3,7 @@
  * DSH's web_search function tool would hide those and bill a second key.
  */
 
+import { getCurrentTools } from '@earendil-works/pi-ai'
 import type { Context as PiContext, StreamOptions } from '@earendil-works/pi-ai'
 import type { ReplayEnvelope, StreamChunk } from '@deepseek-ai/dsh-llm'
 import { piLoginProviderByRoute } from './catalog.ts'
@@ -391,10 +392,15 @@ export function filterPiContext(
   api: string | undefined,
   policy: NativeToolPolicy = DEFAULT_NATIVE_TOOL_POLICY,
 ): PiContext {
-  if (nativePlan(providerId, api, policy) === undefined || context.tools === undefined) return context
+  if (nativePlan(providerId, api, policy) === undefined) return context
   return {
     ...context,
-    tools: context.tools.filter(tool => !isDshWebToolName(tool.name)),
+    ...(context.tools === undefined ? {} : { tools: context.tools.filter(tool => !isDshWebToolName(tool.name)) }),
+    messages: context.messages.map(message => message.role !== 'system' ? message : {
+      ...message,
+      ...(message.toolsAdded === undefined ? {} : { toolsAdded: message.toolsAdded.filter(tool => !isDshWebToolName(tool.name)) }),
+      ...(message.toolsRemoved === undefined ? {} : { toolsRemoved: message.toolsRemoved.filter(tool => !isDshWebToolName(tool.name)) }),
+    }),
   }
 }
 
@@ -413,7 +419,7 @@ export function prepareNativeToolRequest<TOptions extends StreamOptions>(
   api: string | undefined,
   policy: NativeToolPolicy = DEFAULT_NATIVE_TOOL_POLICY,
 ): { context: PiContext; options: TOptions & StreamOptions } {
-  if (context.tools === undefined || nativePlan(providerId, api, policy) === undefined) {
+  if ((context.tools === undefined && getCurrentTools(context.messages).length === 0) || nativePlan(providerId, api, policy) === undefined) {
     return { context, options }
   }
   const onPayload = wrapOnPayload(options?.onPayload, providerId, api, policy)

package/src/provider.ts

@@ -1,5 +1,6 @@
 /** Installed pi-ai providers remapped onto independent harness routes. */
 
+import { normalizeContext } from '@earendil-works/pi-ai'
 import { builtinProviders } from '@earendil-works/pi-ai/providers/all'
 import type { Api, ApiKeyAuth, Model, Provider } from '@earendil-works/pi-ai'
 import { PI_LOGIN_PROVIDERS } from './catalog.ts'
@@ -108,7 +109,7 @@ export function harnessProvider(
         ? prepareOpenRouterOptions(model, request.options, catalog) : request.options
       return base.stream(
         model,
-        request.context,
+        normalizeContext(request.context),
         // pi-ai's generic ApiStreamOptions<T> is a conditional type. The
         // preparation step preserves every provider-specific field and only
         // adds StreamOptions.onPayload, but TypeScript cannot prove that for T.
@@ -121,7 +122,7 @@ export function harnessProvider(
         ? prepareOpenRouterOptions(model, request.options, catalog) : request.options
       return base.streamSimple(
         model,
-        request.context,
+        normalizeContext(request.context),
         guarded,
       )
     },