@dickpy/dsh-imagegen 1.5.0 → 1.5.1

package/lib/index.js

@@ -1,4 +1,5 @@
-import { SettingsConflictError, installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import * as settingsModule from "@deepseek-ai/dsh-settings";
+import { SettingsConflictError } from "@deepseek-ai/dsh-settings";
 import z from "schemastery";
 import { createHash, randomUUID } from "node:crypto";
 import { promises } from "node:fs";
@@ -7,6 +8,29 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 import { defineTool } from "@deepseek-ai/dsh-tools";
+//#region src/settings-compat.ts
+const compatModule = settingsModule;
+/** Brand namespaces where the installed settings package still exposes it. */
+function settingsNamespaceCompat(value) {
+	return compatModule.settingsNamespace?.(value) ?? value;
+}
+/**
+* Register an optional settings section across the rc.7 and alpha.2 APIs.
+* rc.7 exposes a module helper; alpha.2 moves the helper onto the provider.
+*/
+function installSettingsSectionCompat(ctx, ns, schema, entry, hooks) {
+	const legacyInstaller = compatModule.installSettingsSection;
+	if (legacyInstaller !== void 0) {
+		legacyInstaller(ctx, ns, schema, entry, hooks);
+		return;
+	}
+	ctx.inject(["settings"], (sctx) => {
+		const provider = sctx.get("settings");
+		if (provider.installSection === void 0) throw new TypeError("dsh-settings does not expose installSection");
+		provider.installSection(ctx, ns, schema, entry, hooks);
+	});
+}
+//#endregion
 //#region src/protocol.ts
 /**
 * Wire contract shared by the host and client halves of dsh-imagegen: the
@@ -16,7 +40,7 @@ import { defineTool } from "@deepseek-ai/dsh-tools";
 /** Settings namespace this plugin owns (host settings seam + bridge). */
 const IMAGEGEN_SETTINGS_NAMESPACE = "dsh-imagegen";
 /** Published package version shared by the host updater and the client UI. */
-const PLUGIN_VERSION = "1.5.0";
+const PLUGIN_VERSION = "1.5.1";
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 const SETTINGS_API = {
 	describe: "/api/dsh-imagegen/settings/describe",
@@ -2312,7 +2336,7 @@ function makeRoutes(deps) {
 				}
 				const expectedRevision = typeof body.expectedRevision === "number" ? body.expectedRevision : void 0;
 				try {
-					await deps.settings.mutate(settingsNamespace(ns), body.ops, expectedRevision);
+					await deps.settings.mutate(ns, body.ops, expectedRevision);
 				} catch (error) {
 					writeJson(res, 200, failureOf(error));
 					return;
@@ -3446,7 +3470,7 @@ const inject = [
 	"commands"
 ];
 /** The branded settings namespace of this plugin (the card edits it). */
-const ImageGenSettingsNamespace = settingsNamespace(IMAGEGEN_SETTINGS_NAMESPACE);
+const ImageGenSettingsNamespace = settingsNamespaceCompat(IMAGEGEN_SETTINGS_NAMESPACE);
 const Config = z.object({
 	enabled: z.boolean().default(true),
 	announceToAgent: z.boolean().default(true),
@@ -3656,7 +3680,7 @@ function apply(ctx, config) {
 			text: guidanceFor(value.channels, value.defaultChannelId)
 		});
 	};
-	installSettingsSection(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
+	installSettingsSectionCompat(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
 		setSource: (source) => {
 			current = source;
 			sync();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dickpy/dsh-imagegen",
   "description": "AI image generation plugin for the dsh web GUI: text-to-image and image-to-image through configurable provider channels (gpt-image-2 / grok-imagine-image / nanobanana series / seedream-5.0-pro / dall-e-3, with native xAI Grok Imagine, Google Nano Banana and ByteDance Seedream request shaping), with per-channel model catalogs and a New Session / Image Generation tab entry opening a three-column studio beside the native conversation.",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -15,9 +15,12 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-store",
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-api-session-controller",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-tool"
       ],
@@ -28,21 +31,24 @@
     "schemastery": "^3.18.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-attachment": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-commands": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-system-prompt": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.7",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-api-remotes": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-store": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-commands": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.1.2-alpha.2",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",

package/src/client/ImageGenPanel.tsx

@@ -11,7 +11,8 @@
 import { useEffect, useRef, useState, type CSSProperties, type PointerEvent as ReactPointerEvent } from 'react'
 import { createPortal } from 'react-dom'
 import { Button, Pill } from '@deepseek-ai/dsh-client-ui-primitives'
-import type { ISessions, SessionId } from '@deepseek-ai/dsh-client-runtime/client'
+import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client'
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
 import type { ImageGenApi } from './api.ts'
 import { errorMessage, tt } from './helpers.ts'

package/src/client/SettingsCard.tsx

@@ -14,7 +14,7 @@
 
 import { useEffect, useRef, useState } from 'react'
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
-import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
+import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-store'
 import { CardForm, booleanField, secretField, textField, type CardActions, type CardShell, type FieldState as CardFieldState } from './settings-form.ts'
 import { ChannelsForm, type ChannelDraft, type ChannelsFormActions, type ChannelsFormState } from './channels-form.ts'
 import type { ImageGenScope } from './settings-scope.ts'

package/src/client/channels-form.ts

@@ -12,7 +12,7 @@
  *  - path ops never navigate *inside* the channels array.
  */
 
-import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
+import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-store'
 import type { ChannelConfig, ModelMapping } from '../protocol.ts'
 import type { ImageGenScope, SettingsOp } from './settings-scope.ts'
 

package/src/client/conversation-sync.ts

@@ -1,6 +1,6 @@
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
 import type { ConversationController, IConversation } from '@deepseek-ai/dsh-client-ui-conversation/client'
-import type { SessionId } from '@deepseek-ai/dsh-client-runtime/client'
+import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client'
 
 /** Document event used to bridge chat tool results into the image workspace. */
 export const CHAT_IMAGE_EVENT = 'dsh-imagegen:chat-images'

package/src/client/image-toolview.tsx

@@ -1,7 +1,10 @@
 /** Inline renderer for image-generation tool-result attachments. */
 
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment'
-import type { ClientContext, SessionId, ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client'
+import type { ToolCallBlock } from '@deepseek-ai/dsh-client-ui-conversation/client'
+import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
 import { useEffect, useMemo, useState } from 'react'
 import { AGENT_IMAGE_API } from '../protocol.ts'
 import { CHAT_IMAGE_EVENT } from './conversation-sync.ts'
@@ -31,10 +34,9 @@ function isSettled(block: ToolCallBlock): block is Extract<ToolCallBlock, { kind
   return 'kind' in block
 }
 
-function imageRefsOf(block: ToolCallBlock): ImageAttachmentRef[] {
-  if (!isSettled(block)) return []
-  const resultContent = block.resultView?.card === 'generic' ? block.resultView.content ?? [] : []
-  return [...block.content, ...resultContent]
+function imageRefsOf(block: ToolCallBlock): ImageAttachmentRef[] {
+  if (!isSettled(block)) return []
+  return block.content
     .flatMap(content => content.type === 'image' ? [content.attachment] : [])
 }
 
@@ -169,8 +171,12 @@ export function registerImageToolviews(ctx: ClientContext): void {
   }
 
   ctx.slots.inject('tool.call.toolview', function* () {
-    for (const key of ['generate_image', 'edit_image', 'get_image_generation_task']) {
-      yield ctx.slots.register({ name: 'tool.call.toolview', key }, ImageToolView)
-    }
-  })
-}
+    for (const key of ['generate_image', 'edit_image', 'get_image_generation_task']) {
+      yield ctx.slots.register({
+        name: 'tool.call.toolview',
+        key,
+        inject: (sessionId: string) => ({ sessionId: sessionId as SessionId }),
+      }, ImageToolView)
+    }
+  })
+}

package/src/client/index.ts

@@ -11,12 +11,13 @@
  * whole boot when a plugin apply throws, and an external plugin must not take
  * the GUI down.
  */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
-import type { ISessions } from '@deepseek-ai/dsh-client-runtime/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
 import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
-import type {} from '@deepseek-ai/dsh-client-locale/client'
-// Type-only: pulls the LocaleNamespaceMap merge table.
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
+// Type-only: pulls the LocaleNamespaceMap merge table.
 import type {} from '@deepseek-ai/dsh-client-ui-slots'
 import { ImageGenApi } from './api.ts'
 import { ImageGenController } from './controller.ts'

package/src/client/mount.tsx

@@ -15,7 +15,7 @@
  * and both get the `position: relative` base in panel.module.css.
  */
 
-import type { ISessions } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
 import { createRoot, type Root } from 'react-dom/client'
 import type { ImageGenApi } from './api.ts'
 import type { ImageGenController } from './controller.ts'

package/src/client/settings-form.ts

@@ -7,7 +7,8 @@
  * sibling UI package).
  */
 
-import { createSnapshotStore, type SettingsScope, type SettingsScopeSnapshot, type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
+import { createSnapshotStore, type SnapshotStore } from '@deepseek-ai/dsh-client-store'
+import type { SettingsScope, SettingsScopeSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client'
 
 /** The write one field's staged text performs when the card is saved. */
 export type FieldWrite =

package/src/client/settings-scope.ts

@@ -10,10 +10,10 @@
 
 import {
   createSnapshotStore,
-  type SettingsScope,
-  type SettingsScopeSnapshot,
   type SnapshotStore,
-} from '@deepseek-ai/dsh-client-runtime/client'
+} from '@deepseek-ai/dsh-client-store'
+import type { SettingsPathOpView } from '@deepseek-ai/dsh-api-remotes/client'
+import type { SettingsScope, SettingsScopeSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client'
 import { SETTINGS_API, type ChannelConfig } from '../protocol.ts'
 
 /** The fields this plugin's settings card edits. */
@@ -158,6 +158,10 @@ class BridgeScopeController<T> implements SettingsScope<T> {
     return this.enqueue(() => this.writeOps([{ op: 'unset', path: [field] }]))
   }
 
+  mutate(ops: readonly SettingsPathOpView[], expectedRevision?: number): Promise<void> {
+    return this.enqueue(() => this.writeOps([...ops] as SettingsOp[], expectedRevision))
+  }
+
   /** Apply several path ops in one revision-fenced mutate call (atomic save).
    *  Path ops may address plain-object fields (e.g. `channelSecrets.<id>`),
    *  but never navigate *inside* arrays — write array fields wholesale. */
@@ -206,8 +210,8 @@ class BridgeScopeController<T> implements SettingsScope<T> {
     this.accept(view, writable)
   }
 
-  private async writeOps(ops: SettingsOp[]): Promise<void> {
-    const revision = this.getSnapshot().revision
+  private async writeOps(ops: SettingsOp[], expectedRevision?: number): Promise<void> {
+    const revision = expectedRevision ?? this.getSnapshot().revision
     let response
     try {
       response = await this.api.mutate({

package/src/index.ts

@@ -8,7 +8,7 @@
  */
 
 import type { Context } from '@deepseek-ai/cordis'
-import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings'
+import { installSettingsSectionCompat, settingsNamespaceCompat } from './settings-compat.ts'
 import z from 'schemastery'
 // Type-only: pulls the webServer Context merge (route registration).
 import type {} from '@deepseek-ai/dsh-host-webserver'
@@ -43,7 +43,7 @@ export { listTemplates, readTemplateImage, refreshTemplates, clearTemplateMemo }
 export { checkForUpdate, clearUpdateCache, compareVersions, CURRENT_VERSION, installUpdate, profileFromProcess } from './updater.ts'
 
 /** The branded settings namespace of this plugin (the card edits it). */
-export const ImageGenSettingsNamespace = settingsNamespace(IMAGEGEN_SETTINGS_NAMESPACE)
+export const ImageGenSettingsNamespace = settingsNamespaceCompat(IMAGEGEN_SETTINGS_NAMESPACE)
 
 /**
  * Plugin config, validated by the same-named schemastery schema.
@@ -323,7 +323,7 @@ export function apply(ctx: Context, config?: Config): void {
     })
   }
 
-  installSettingsSection(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
+  installSettingsSectionCompat(ctx, ImageGenSettingsNamespace, Config, config ?? {}, {
     setSource: (source) => {
       current = source
       sync()

package/src/protocol.ts

@@ -8,7 +8,7 @@
 export const IMAGEGEN_SETTINGS_NAMESPACE = 'dsh-imagegen'
 
 /** Published package version shared by the host updater and the client UI. */
-export const PLUGIN_VERSION = '1.5.0'
+export const PLUGIN_VERSION = '1.5.1'
 
 /** Same-origin route family (loopback-only, mirroring the dsh-ssh fence). */
 export const SETTINGS_API = {

package/src/routes.ts

@@ -9,7 +9,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http'
 import { randomUUID } from 'node:crypto'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import type { ImageAttachmentRef, ImageMediaType, SaveImageAttachment } from '@deepseek-ai/dsh-attachment'
-import { SettingsConflictError, settingsNamespace, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
+import { SettingsConflictError, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
 import type { UpstreamConfig } from './engine.ts'
 import { enhancePrompt, listImageModels, listPromptModels, type PromptModelConfig } from './prompt-enhancer.ts'
 import { normalizeImageModels } from './image-models.ts'
@@ -563,7 +563,9 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
         }
         const expectedRevision = typeof body.expectedRevision === 'number' ? body.expectedRevision : undefined
         try {
-          await deps.settings.mutate(settingsNamespace(ns), body.ops, expectedRevision)
+          // The alpha.2 settings package no longer exports settingsNamespace;
+          // the bridge already checked this value against our fixed namespace.
+          await deps.settings.mutate(ns, body.ops, expectedRevision)
         } catch (error) {
           writeJson(res, 200, failureOf(error))
           return

package/src/settings-compat.ts

@@ -0,0 +1,60 @@
+/** Compatibility helpers for the dsh-settings API transition. */
+
+import type { Context } from '@deepseek-ai/cordis'
+import * as settingsModule from '@deepseek-ai/dsh-settings'
+import type { SettingsNamespace, SettingsSectionHooks } from '@deepseek-ai/dsh-settings'
+import type z from 'schemastery'
+
+type SettingsModuleCompat = {
+  settingsNamespace?: (value: string) => SettingsNamespace
+  installSettingsSection?: <T>(
+    ctx: Context,
+    ns: SettingsNamespace,
+    schema: z<T>,
+    entry: T,
+    hooks: SettingsSectionHooks<T>,
+  ) => void
+}
+
+interface SettingsProviderCompat {
+  installSection?: <T>(
+    owner: Context,
+    ns: SettingsNamespace,
+    schema: z<T>,
+    entry: T,
+    hooks: SettingsSectionHooks<T>,
+  ) => void
+}
+
+const compatModule = settingsModule as unknown as SettingsModuleCompat
+
+/** Brand namespaces where the installed settings package still exposes it. */
+export function settingsNamespaceCompat(value: string): SettingsNamespace {
+  return compatModule.settingsNamespace?.(value) ?? value as SettingsNamespace
+}
+
+/**
+ * Register an optional settings section across the rc.7 and alpha.2 APIs.
+ * rc.7 exposes a module helper; alpha.2 moves the helper onto the provider.
+ */
+export function installSettingsSectionCompat<T>(
+  ctx: Context,
+  ns: SettingsNamespace,
+  schema: z<T>,
+  entry: T,
+  hooks: SettingsSectionHooks<T>,
+): void {
+  const legacyInstaller = compatModule.installSettingsSection
+  if (legacyInstaller !== undefined) {
+    legacyInstaller(ctx, ns, schema, entry, hooks)
+    return
+  }
+
+  ctx.inject(['settings'], (sctx) => {
+    const provider = sctx.get('settings') as unknown as SettingsProviderCompat
+    if (provider.installSection === undefined) {
+      throw new TypeError('dsh-settings does not expose installSection')
+    }
+    provider.installSection(ctx, ns, schema, entry, hooks)
+  })
+}