dsh-side-chat-plus 0.4.1 → 0.4.3

package/lib/index.js

@@ -336,20 +336,24 @@ function buildApi(ctx, sideChats, getSettings) {
 		});
 		else {
 			const data = decodeBase64(part.data);
-			await ctx.attachments.validateImage({
-				data,
-				mediaType: part.mediaType,
-				...part.name === void 0 ? {} : { name: part.name }
-			});
-			const attachment = await ctx.attachments.saveImage({
-				data,
-				mediaType: part.mediaType,
-				...part.name === void 0 ? {} : { name: part.name }
-			});
-			blocks.push({
-				type: "image",
-				attachment
-			});
+			try {
+				await ctx.attachments.validateImage({
+					data,
+					mediaType: part.mediaType,
+					...part.name === void 0 ? {} : { name: part.name }
+				});
+				const attachment = await ctx.attachments.saveImage({
+					data,
+					mediaType: part.mediaType,
+					...part.name === void 0 ? {} : { name: part.name }
+				});
+				blocks.push({
+					type: "image",
+					attachment
+				});
+			} catch (error) {
+				throw new SidechatError("bad-image", error instanceof Error ? error.message : String(error), 400);
+			}
 		}
 		blocks.push({
 			type: "text",
@@ -512,6 +516,7 @@ function buildApi(ctx, sideChats, getSettings) {
 		const content = requireContent(payload);
 		const lookupEnabled = optionalBoolean(payload, "lookupEnabled");
 		const parent = parentOf(parentSessionId);
+		const blocks = await durableContent(content, lookupEnabled);
 		const record = payload;
 		const parentConfig = parent.session.requestHeader?.()?.config;
 		const parentProvider = parentConfig?.provider ?? parent.options.provider ?? "";
@@ -580,7 +585,7 @@ function buildApi(ctx, sideChats, getSettings) {
 		};
 		sideChats.set(childId, child);
 		persist();
-		await deliver(child, userMessage(await durableContent(content, lookupEnabled)));
+		await deliver(child, userMessage(blocks));
 		return {
 			childId,
 			provider,
@@ -637,7 +642,13 @@ function buildApi(ctx, sideChats, getSettings) {
 	/** Fold one side chat's transcript. */
 	const history = async (payload) => {
 		const childId = requireString(payload, "childId");
-		return { messages: foldTranscript((await ctx.sessionQuery.readSession(childId)).events) };
+		let events;
+		try {
+			events = (await ctx.sessionQuery.readSession(childId)).events;
+		} catch (error) {
+			throw new SidechatError("not-found", error instanceof Error ? error.message : String(error), 404);
+		}
+		return { messages: foldTranscript(events) };
 	};
 	/** The deployment-resolved image policy (for client-side fast-path checks). */
 	const limits = () => {
@@ -854,6 +865,21 @@ function buildApi(ctx, sideChats, getSettings) {
 		}
 	};
 }
+/**
+* Resolve this plugin's settings namespace: the Loader entry id that owns the
+* running fiber. Both reads are defensive because this package builds against
+* its own cordis, so the upstream `Fiber.entry` augmentation is not visible
+* here. `undefined` (no owning entry, e.g. a bare programmatic mount) leaves
+* the settings face unbound: the plugin still runs, only its preferences stay
+* unavailable instead of being written to a namespace nobody owns.
+*/
+function settingsNamespaceOf(ctx) {
+	const owner = ctx.fiber?.entry;
+	const fromFiber = owner?.options?.id ?? owner?.id;
+	if (typeof fromFiber === "string" && fromFiber !== "") return fromFiber;
+	const located = ctx.get("loader")?.locate?.(ctx.fiber);
+	return typeof located === "string" && located !== "" ? located : void 0;
+}
 /** Read the connection row's trustedHosts, or empty (loopback-only fence). */
 function trustedHostsOf(ctx) {
 	const loader = ctx.get("loader");
@@ -865,7 +891,7 @@ function apply(ctx) {
 	const sideChats = /* @__PURE__ */ new Map();
 	let settingsFace;
 	ctx.inject(["settings"], (sctx) => {
-		const ns = ctx.entry?.id;
+		const ns = settingsNamespaceOf(ctx);
 		if (ns === void 0) return;
 		sctx.effect(() => sctx.settings.configure({ auto: false }, ctx.fiber));
 		const viewOf = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-side-chat-plus",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "侧边聊天 Plus (Side chat Plus) — DSH web plugin: select text in a conversation and ask it in a per-session side chat (hidden ordinary session, own right-side panel, inherits model/effort/permissions, lookup toggle).",
   "private": false,
   "type": "module",
@@ -92,23 +92,23 @@
     "@deepseek-ai/dsh-agent-preset-registry": "^0.1.7-0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-attachment": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-session": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-session-query": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-workspace": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-permission-presets": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-settings": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session-query": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-workspace": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-permission-presets": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.1",
     "@types/node": "^24.0.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.1",
@@ -119,8 +119,8 @@
     "tsdown": "^0.22.2",
     "typescript": "^5.6.0",
     "vitest": "^4.1.8",
-    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-alpha.1",
-    "@deepseek-ai/dsh-session-format-catalog": "0.1.7-alpha.1"
+    "@deepseek-ai/dsh-agent-preset-registry": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session-format-catalog": "0.1.7-rc.1"
   },
   "scripts": {
     "build": "node -e \"require('node:fs').rmSync('lib',{recursive:true,force:true})\" && tsc -p tsconfig.build.json && tsdown && node scripts/check-seed-exports.mjs",

package/src/client/index.tsx

@@ -90,6 +90,12 @@ interface SidechatSnapshot {
   mainQuestion: SideQuestionItem[] | null
   /** Question ids the user deleted from the panel list. */
   dismissedQuestionIds: string[]
+  /**
+   * Whether this deployment offers the built-in right sidebar. False means
+   * `panelHome: 'sidebar-right'` cannot be honoured and the panel falls back to
+   * the classic floating container instead of becoming unreachable.
+   */
+  dockAvailable: boolean
 }
 
 /** The whole browser-side store (one per activation). */
@@ -106,6 +112,8 @@ interface SidechatStore {
   closePanel(): void
   /** Install (or clear) the dock-mode launcher; openPanel() fires it after opening. */
   setDockLaunch(fn: (() => void) | null): void
+  /** Record whether the built-in right sidebar exists in this deployment. */
+  setDockAvailable(available: boolean): void
   setActive(childId: string): void
   patch(partial: Partial<PanelState>): void
 }
@@ -143,6 +151,10 @@ function createStore(): SidechatStore {
   let prefs: SubchatPrefs = { ...SUBCHAT_PREFS_DEFAULTS }
   let mainQuestion: SideQuestionItem[] | null = null
   let dismissedQuestionIds: string[] = []
+  // Optimistic until the dock effect has inspected the services: a deployment
+  // whose sidebar services are missing flips this to false and the panel
+  // renders floating instead of nowhere.
+  let dockAvailable = true
   // Per-conversation panel state so switching away and back restores the side
   // chats instead of resetting them. The side chats stay live on the host, so
   // the client must remember each conversation's open panel + active child.
@@ -153,10 +165,10 @@ function createStore(): SidechatStore {
   let dockLaunch: (() => void) | null = null
   // Cached snapshot: useSyncExternalStore compares identity, so the object is
   // only rebuilt on a mutation — never inside getSnapshot itself.
-  let snapshot: SidechatSnapshot = { current, panel, anchor, prefs, mainQuestion, dismissedQuestionIds }
+  let snapshot: SidechatSnapshot = { current, panel, anchor, prefs, mainQuestion, dismissedQuestionIds, dockAvailable }
 
   const notify = (): void => {
-    snapshot = { current, panel, anchor, prefs, mainQuestion, dismissedQuestionIds }
+    snapshot = { current, panel, anchor, prefs, mainQuestion, dismissedQuestionIds, dockAvailable }
     for (const fn of [...listeners]) fn()
   }
 
@@ -214,6 +226,11 @@ function createStore(): SidechatStore {
     setDockLaunch(fn) {
       dockLaunch = fn
     },
+    setDockAvailable(available) {
+      if (available === dockAvailable) return
+      dockAvailable = available
+      notify()
+    },
     setActive(childId) {
       panel = { ...panel, activeChildId: childId, messages: [], error: null }
       notify()
@@ -1755,7 +1772,7 @@ function SideChatShell(props: {
           onOpen={() => { props.store.openPanel(snap.panel.parentSessionId) }}
         />
       )}
-      {snap.prefs.panelHome === 'floating' && (
+      {(snap.prefs.panelHome === 'floating' || !snap.dockAvailable) && (
         <SidechatPanel
           store={props.store}
           t={props.t}
@@ -2187,9 +2204,14 @@ export function apply(ctx: Context): void {
           ?? sidebarRight?.tabs
         if (sidebarRight === undefined || sidebarRightTabs === undefined) {
           phase = 'unavailable'
+          // The floating container takes over (SideChatShell renders it while
+          // `dockAvailable` is false); the notice only explains why the dock
+          // preference is not in effect.
+          store.setDockAvailable(false)
           store.patch({ error: translate(activeLocale, 'dock.unavailable') })
           return
         }
+        store.setDockAvailable(true)
         const dockT = (key: SidechatLocaleKey): string => translate(activeLocale, key)
 
         const disposeType = sidebarRightTabs.register({

package/src/index.ts

@@ -270,9 +270,16 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
         blocks.push({ type: 'text', text: part.text })
       } else {
         const data = decodeBase64(part.data)
-        await ctx.attachments.validateImage({ data, mediaType: part.mediaType, ...(part.name === undefined ? {} : { name: part.name }) })
-        const attachment = await ctx.attachments.saveImage({ data, mediaType: part.mediaType, ...(part.name === undefined ? {} : { name: part.name }) })
-        blocks.push({ type: 'image', attachment })
+        try {
+          await ctx.attachments.validateImage({ data, mediaType: part.mediaType, ...(part.name === undefined ? {} : { name: part.name }) })
+          const attachment = await ctx.attachments.saveImage({ data, mediaType: part.mediaType, ...(part.name === undefined ? {} : { name: part.name }) })
+          blocks.push({ type: 'image', attachment })
+        } catch (error) {
+          // The attachment store rejects a malformed/oversized image with its
+          // own error type; report it as a client-side bad request (400) rather
+          // than an unexplained host fault (500).
+          throw new SidechatError('bad-image', error instanceof Error ? error.message : String(error), 400)
+        }
       }
     }
     blocks.push({ type: 'text', text: lookupEnabled ? LOOKUP_GUIDANCE : NO_LOOKUP_GUIDANCE })
@@ -445,6 +452,10 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
     const content = requireContent(payload)
     const lookupEnabled = optionalBoolean(payload, 'lookupEnabled')
     const parent = parentOf(parentSessionId)
+    // Validate and durably store the prompt's images BEFORE the side chat
+    // exists: a rejected image must not leave a live, empty side chat (and a
+    // persisted record) behind for a request that never ran.
+    const blocks = await durableContent(content, lookupEnabled)
 
     const record = payload as { provider?: unknown; model?: unknown; reasoningEffort?: unknown; preset?: unknown }
     const parentConfig = parent.session.requestHeader?.()?.config
@@ -539,7 +550,7 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
     sideChats.set(childId, child)
     persist()
 
-    await deliver(child, userMessage(await durableContent(content, lookupEnabled)))
+    await deliver(child, userMessage(blocks))
     return { childId, provider, model, ...(reasoningEffort === undefined ? {} : { reasoningEffort }) }
   }
 
@@ -603,8 +614,15 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
   /** Fold one side chat's transcript. */
   const history = async (payload: unknown): Promise<{ messages: Array<{ role: 'user' | 'assistant'; blocks: TranscriptBlock[] }> }> => {
     const childId = requireString(payload, 'childId')
-    const snapshot = await ctx.sessionQuery.readSession(childId)
-    return { messages: foldTranscript(snapshot.events) }
+    let events: readonly SideSessionEvent[]
+    try {
+      events = (await ctx.sessionQuery.readSession(childId)).events
+    } catch (error) {
+      // A side chat whose session is gone (deleted, disposed, or an id from a
+      // previous run) is a client-side absence, not a host fault.
+      throw new SidechatError('not-found', error instanceof Error ? error.message : String(error), 404)
+    }
+    return { messages: foldTranscript(events) }
   }
 
   /** The deployment-resolved image policy (for client-side fast-path checks). */
@@ -882,6 +900,40 @@ function buildApi(ctx: Context, sideChats: Map<string, SidechatRecord>, getSetti
   }
 }
 
+/**
+ * The Loader entry that owns a fiber, as the Loader records it. The owning
+ * entry lives on the FIBER (`fiber.entry = fiber.parent[Entry.key]` in
+ * cordis-plugin-loader), never as a plain `ctx.entry`; `Entry.options.id` is
+ * the raw configured id and `Entry.id` the nested-qualified one, and the
+ * settings service keys namespaces by the raw one
+ * (`configEditor.entries().find(row => row.options.id === ns)`).
+ */
+interface SideEntryOwner {
+  entry?: { id?: string; options?: { id?: string } }
+}
+
+/** The loader face this plugin needs to locate its own entry (best-effort). */
+interface SideLoaderFace {
+  locate?: (fiber?: unknown) => string | undefined
+}
+
+/**
+ * Resolve this plugin's settings namespace: the Loader entry id that owns the
+ * running fiber. Both reads are defensive because this package builds against
+ * its own cordis, so the upstream `Fiber.entry` augmentation is not visible
+ * here. `undefined` (no owning entry, e.g. a bare programmatic mount) leaves
+ * the settings face unbound: the plugin still runs, only its preferences stay
+ * unavailable instead of being written to a namespace nobody owns.
+ */
+function settingsNamespaceOf(ctx: Context): string | undefined {
+  const owner = (ctx.fiber as SideEntryOwner | undefined)?.entry
+  const fromFiber = owner?.options?.id ?? owner?.id
+  if (typeof fromFiber === 'string' && fromFiber !== '') return fromFiber
+  const loader = ctx.get('loader') as SideLoaderFace | undefined
+  const located = loader?.locate?.(ctx.fiber)
+  return typeof located === 'string' && located !== '' ? located : undefined
+}
+
 /** Read the connection row's trustedHosts, or empty (loopback-only fence). */
 function trustedHostsOf(ctx: Context): string[] {
   const loader = ctx.get('loader') as { entries?: () => Iterable<{ options: { name: string; config?: unknown } }> } | undefined
@@ -899,9 +951,10 @@ export function apply(ctx: Context): void {
   const sideChats = new Map<string, SidechatRecord>()
   let settingsFace: SubchatSettingsFace | undefined
 
-  // Settings namespaces are now Loader entry ids, including user-renamed rows.
+  // Settings namespaces are Loader entry ids, including user-renamed rows: the
+  // id is read off the owning fiber (see `settingsNamespaceOf`).
   ctx.inject(['settings'], (sctx: Context) => {
-    const ns = (ctx as Context & { entry?: { id: string } }).entry?.id
+    const ns = settingsNamespaceOf(ctx)
     if (ns === undefined) return
     sctx.effect(() => sctx.settings.configure({ auto: false }, ctx.fiber))
     const viewOf = (): { value?: unknown; revision?: number } => {