@sparkelf/dsh-patch-session-log-trajectory-toolbar 0.2.0-rc.2 → 0.2.0-rc.21

package/package.json

@@ -4,11 +4,11 @@
     "formatVersion": 1,
     "variants": [
       {
-        "dsh": ">=0.1.6-alpha.1",
+        "dsh": ">=0.1.7-alpha.2",
         "file": "./patches/session-log-trajectory-toolbar.patch",
         "id": "session-log-desktop-trajectory-toolbar",
         "target": {
-          "baseRevision": "0a15e36e7f82b6ed45af6fa9759f29b40dcd965d",
+          "baseRevision": "00102833dfaee1da9f48a3a8eae9d34005a75218",
           "kind": "dsh-source",
           "paths": [
             "packages/client/ui-trajectory/",
@@ -32,5 +32,5 @@
     "url": "git+https://github.com/SparkElf/deepseek-harness-plus.git"
   },
   "type": "module",
-  "version": "0.2.0-rc.2"
+  "version": "0.2.0-rc.21"
 }

package/patches/session-log-trajectory-toolbar.patch

@@ -24,7 +24,7 @@ index c286665666..66365f0adc 100644
    gap: 4px;
    border: 0.5px solid var(--dsw-alias-border-l4);
 diff --git a/packages/client/ui-trajectory/src/client/TrajectoryToolbar.tsx b/packages/client/ui-trajectory/src/client/TrajectoryToolbar.tsx
-index 92d7ce9ab0..dfbc88f1e3 100644
+index c3861f03a9..a63ac8823b 100644
 --- a/packages/client/ui-trajectory/src/client/TrajectoryToolbar.tsx
 +++ b/packages/client/ui-trajectory/src/client/TrajectoryToolbar.tsx
 @@ -1,5 +1,6 @@
@@ -32,7 +32,7 @@ index 92d7ce9ab0..dfbc88f1e3 100644
  
 +import type { ReactNode } from 'react'
  import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
- import { IconSearchOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+ import { IconSearchOutlineRegular } from '@deepseek-ai/dsh-client-ui-primitives'
  import type { NS } from './locales.ts'
 @@ -26,6 +27,8 @@ export interface TrajectoryToolbarProps {
    searchQuery: string
@@ -58,16 +58,16 @@ index 92d7ce9ab0..dfbc88f1e3 100644
 -        <div className={css.search}>
 +        <div className={css.utilities} data-trajectory-toolbar-utilities="">{utilities}</div>
 +        <div className={css.search} data-trajectory-search="">
-           <IconSearchOutline16 size={11} className={css.searchIcon} />
+           <IconSearchOutlineRegular size={11} className={css.searchIcon} />
            <input
              type="search"
 diff --git a/packages/client/ui-trajectory/src/client/TrajectoryView.tsx b/packages/client/ui-trajectory/src/client/TrajectoryView.tsx
-index 4f8bc63d9c..cedf2511ea 100644
+index 6c2cd98ec8..97c614b584 100644
 --- a/packages/client/ui-trajectory/src/client/TrajectoryView.tsx
 +++ b/packages/client/ui-trajectory/src/client/TrajectoryView.tsx
-@@ -130,7 +130,9 @@ export function TrajectoryView({
+@@ -133,7 +133,9 @@ export function TrajectoryView({
    useSession, useTrajectory, useDuration, loadOlder, loadImage, setActualDuration,
-   viewRequest, completeViewRequest, renderSlot, t,
+   viewRequest, completeViewRequest, renderSlot, t, jsonStringWrapping,
  }: ConvViewProps
 -  & PropsRenderSlots<'conversation.trajectory.images'>
 +  & PropsRenderSlots<
@@ -76,7 +76,7 @@ index 4f8bc63d9c..cedf2511ea 100644
    & InjectFace<TrajectoryViewInjected>
    & PropsLocale<'trajectory'>) {
    const [collapsedTurns, setCollapsedTurns] = useState<ReadonlySet<number>>(EMPTY_TURN_IDS)
-@@ -523,6 +525,7 @@ export function TrajectoryView({
+@@ -526,6 +528,7 @@ export function TrajectoryView({
          onToggleAllAssistants={toggleAllAssistants}
          searchQuery={searchQuery}
          onSearchQueryChange={setSearchQuery}
@@ -85,10 +85,10 @@ index 4f8bc63d9c..cedf2511ea 100644
        />
        <TrajectoryTimeline
 diff --git a/packages/client/ui-trajectory/src/client/index.ts b/packages/client/ui-trajectory/src/client/index.ts
-index 118f3b2c28..a8c71cf9ee 100644
+index 935a43ff2c..0e978fa263 100644
 --- a/packages/client/ui-trajectory/src/client/index.ts
 +++ b/packages/client/ui-trajectory/src/client/index.ts
-@@ -36,6 +36,13 @@ export type {
+@@ -37,6 +37,13 @@ export type {
    UseTrajectory,
  } from './trajectory-contract.ts'
  
@@ -102,7 +102,7 @@ index 118f3b2c28..a8c71cf9ee 100644
  /** Required services: the conversation slot, registries, ordinary Session paging, and the locale service. */
  export const inject = ['slots', 'sessions', 'uiSession', 'uiConversation', 'locale']
  
-@@ -82,6 +89,7 @@ export function apply(ctx: Context): void {
+@@ -84,6 +91,7 @@ export function apply(ctx: Context): void {
      label: () => t('view.trajectory'),
      children: {
        'conversation.trajectory.images': { kind: 'single', scope: 'session' },
@@ -111,18 +111,33 @@ index 118f3b2c28..a8c71cf9ee 100644
      inject: (sessionId: SessionId): TrajectoryViewInjected => {
        const session = ctx.sessions.binding(sessionId)?.session
 diff --git a/packages/session-query/session-log-export/package.json b/packages/session-query/session-log-export/package.json
-index 8992ab79e9..7d9f7763f9 100644
+index 6812223661..473e7b63dd 100644
 --- a/packages/session-query/session-log-export/package.json
 +++ b/packages/session-query/session-log-export/package.json
-@@ -59,6 +59,7 @@
-     "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
-     "@deepseek-ai/dsh-client-ui-renderer": "workspace:^",
-     "@deepseek-ai/dsh-client-ui-session": "workspace:^",
-+    "@deepseek-ai/dsh-client-ui-trajectory": "workspace:^",
-     "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
-     "@deepseek-ai/dsh-commands": "workspace:^",
-     "@deepseek-ai/dsh-session": "workspace:^",
-@@ -74,7 +75,8 @@
+@@ -47,8 +47,8 @@
+     "@deepseek-ai/dsh-session-persistence": "workspace:*"
+   },
+   "devDependencies": {
+-    "@deepseek-ai/cordis": "workspace:~",
+     "@deepseek-ai/cordis-plugin-loader": "workspace:~",
++    "@deepseek-ai/cordis": "workspace:~",
+     "@deepseek-ai/dsh-agent": "workspace:*",
+     "@deepseek-ai/dsh-attachment": "workspace:*",
+     "@deepseek-ai/dsh-client-connection": "workspace:*",
+@@ -61,10 +61,11 @@
+     "@deepseek-ai/dsh-client-ui-renderer": "workspace:*",
+     "@deepseek-ai/dsh-client-ui-session": "workspace:*",
+     "@deepseek-ai/dsh-client-ui-slots": "workspace:*",
++    "@deepseek-ai/dsh-client-ui-trajectory": "workspace:*",
+     "@deepseek-ai/dsh-commands": "workspace:*",
+-    "@deepseek-ai/dsh-session": "workspace:*",
+     "@deepseek-ai/dsh-session-persistence": "workspace:*",
+     "@deepseek-ai/dsh-session-query": "workspace:*",
++    "@deepseek-ai/dsh-session": "workspace:*",
+     "@types/react": "~18.3.1",
+     "react": "^18.2.0"
+   },
+@@ -75,7 +76,8 @@
          "@deepseek-ai/dsh-client-ui-commands",
          "@deepseek-ai/dsh-client-ui-conversation",
          "@deepseek-ai/dsh-client-ui-renderer",
@@ -182,28 +197,38 @@ index cc13d3f49d..1d22e64cfd 100644
 +  .trajectoryButton { display: inline-flex; }
 +}
 diff --git a/packages/session-query/session-log-export/src/client/HeaderAction.tsx b/packages/session-query/session-log-export/src/client/HeaderAction.tsx
-index cb20cb9f9d..6f5eefab95 100644
+index 9810fb86d3..44a8e042d7 100644
 --- a/packages/session-query/session-log-export/src/client/HeaderAction.tsx
 +++ b/packages/session-query/session-log-export/src/client/HeaderAction.tsx
-@@ -1,9 +1,16 @@
+@@ -1,11 +1,11 @@
  import { useState } from 'react'
  import type { ReactNode } from 'react'
- import { IconDownloadOutline16, IconEllipsisOutline16, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
--import { SessionLogDownloadDialog, type SessionLogDownloadDialogProps } from './Dialog.tsx'
+ import type { ObservableSnapshot } from '@deepseek-ai/dsh-client-store'
+-import type { InjectFace } from '@deepseek-ai/dsh-client-ui-slots'
 +import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+ import type { SessionId } from '@deepseek-ai/dsh-session/types'
+ import { IconDownloadOutlineRegular, IconEllipsisOutlineRegular, IconPaperPlaneOutlineRegular, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
+-import { SessionLogDownloadDialog, type SessionLogDownloadDialogProps } from './Dialog.tsx'
+-import type { SessionLogDownloadDialogInjected } from './Dialog.tsx'
 +import { NS } from './locales.ts'
 +import { SessionLogDownloadDialog, type SessionLogDownloadDialogInjected, type SessionLogDownloadDialogProps } from './Dialog.tsx'
  import css from './HeaderAction.module.css'
  
+ /** Session download controls with observable feedback availability and a Session feedback action. */
+@@ -21,6 +21,12 @@ export interface SessionLogDownloadHeaderInjected extends SessionLogDownloadDial
+ /** Session download props plus the optional feedback action. */
+ export type SessionLogDownloadHeaderProps = SessionLogDownloadDialogProps & InjectFace<SessionLogDownloadHeaderInjected>
+ 
++/** Trajectory toolbar presentation of the same download controller. */
 +type SessionLogDownloadToolbarActionProps =
 +  PropsRuntime<'conversation.trajectory.toolbar.utilities'>
 +  & PropsLocale<typeof NS>
 +  & InjectFace<SessionLogDownloadDialogInjected>
 +
  /**
-  * Render the Session Header more-actions icon button, its download menu, and the shared result dialog.
+  * Render the Session Header menu with download and optional feedback actions.
   * @param props - Session runtime, download controller, and localized copy.
-@@ -31,6 +38,7 @@ export function SessionLogDownloadHeaderAction(props: SessionLogDownloadDialogPr
+@@ -53,6 +59,7 @@ export function SessionLogDownloadHeaderAction(props: SessionLogDownloadHeaderPr
            <button
              type="button"
              className={css.moreButton}
@@ -211,7 +236,7 @@ index cb20cb9f9d..6f5eefab95 100644
              aria-label={t('header.more')}
              aria-haspopup="menu"
              aria-expanded={open}
-@@ -45,3 +53,31 @@ export function SessionLogDownloadHeaderAction(props: SessionLogDownloadDialogPr
+@@ -67,3 +74,31 @@ export function SessionLogDownloadHeaderAction(props: SessionLogDownloadHeaderPr
      </>
    )
  }
@@ -238,33 +263,45 @@ index cb20cb9f9d..6f5eefab95 100644
 +      title={t('header.action')}
 +      onClick={() => { void request(sessionId) }}
 +    >
-+      <IconDownloadOutline16 size={11} />
++      <IconDownloadOutlineRegular size={11} />
 +      <span>{t('header.action')}</span>
 +    </button>
 +  )
 +}
 diff --git a/packages/session-query/session-log-export/src/client/index.ts b/packages/session-query/session-log-export/src/client/index.ts
-index 97187311fa..a6ca23e3b3 100644
+index bcba0dd581..ed8e67e4d0 100644
 --- a/packages/session-query/session-log-export/src/client/index.ts
 +++ b/packages/session-query/session-log-export/src/client/index.ts
-@@ -7,9 +7,12 @@ import type {} from '@deepseek-ai/dsh-client-ui-commands/client'
- import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
+@@ -8,9 +8,14 @@ import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
  import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
  import type {} from '@deepseek-ai/dsh-client-ui-session/client'
+ import type {} from '@deepseek-ai/dsh-client-ui-message-feedback/client'
 +import type {} from '@deepseek-ai/dsh-client-ui-trajectory/client'
+ import { createSnapshotStore } from '@deepseek-ai/dsh-client-store'
  import { SessionLogDownloadController } from './controller.ts'
- import type { SessionLogDownloadDialogInjected } from './Dialog.tsx'
--import { SessionLogDownloadHeaderAction } from './HeaderAction.tsx'
+-import { SessionLogDownloadHeaderAction, type SessionLogDownloadHeaderInjected } from './HeaderAction.tsx'
++import type { SessionLogDownloadDialogInjected } from './Dialog.tsx'
 +import {
 +  SessionLogDownloadHeaderAction, SessionLogDownloadToolbarAction,
++  type SessionLogDownloadHeaderInjected,
 +} from './HeaderAction.tsx'
  import { en, NS, zh, type SessionLogDownloadKey } from './locales.ts'
  
  declare module '@deepseek-ai/cordis' {
-@@ -34,6 +37,11 @@ export const inject = ['slots', 'locale']
+@@ -35,6 +40,21 @@ export const inject = ['slots', 'locale']
   */
  export function apply(ctx: ClientContext): void {
    const controller = new SessionLogDownloadController()
++  // The Header presentation carries the feedback action the official tree added, so its
++  // injection supplies that hook; the Trajectory presentation is download-only and shares
++  // the same controller, request, and dismiss.
++  const injectHeaderAction = (): SessionLogDownloadHeaderInjected => ({
++    hooks: { sessionLogDownload: controller.store, feedbackAvailable },
++    request: (sessionId: SessionId) => controller.download(sessionId),
++    dismiss: (sessionId: SessionId) => { controller.dismiss(sessionId) },
++    // The feedback plugin can unload between the menu render and this click.
++    openFeedback: (sessionId: SessionId) => { ctx.get('feedbackUi')?.openSession(sessionId) },
++  })
 +  const injectAction = (): SessionLogDownloadDialogInjected => ({
 +    hooks: { sessionLogDownload: controller.store },
 +    request: (sessionId: SessionId) => controller.download(sessionId),
@@ -273,16 +310,18 @@ index 97187311fa..a6ca23e3b3 100644
    ctx.provide('sessionLogDownload', controller)
    ctx.effect(() => async () => { await controller.dispose() }, 'session-log-download: browser download lifecycle')
    ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'session-log-download: browser dictionaries')
-@@ -44,12 +52,14 @@ export function apply(ctx: ClientContext): void {
+@@ -52,14 +72,14 @@ export function apply(ctx: ClientContext): void {
      name: 'conversation.session.header.utilities',
      id: 'session-log-download',
      locale: NS,
--    inject: (): SessionLogDownloadDialogInjected => ({
--      hooks: { sessionLogDownload: controller.store },
+-    inject: (): SessionLogDownloadHeaderInjected => ({
+-      hooks: { sessionLogDownload: controller.store, feedbackAvailable },
 -      request: (sessionId: SessionId) => controller.download(sessionId),
 -      dismiss: (sessionId: SessionId) => { controller.dismiss(sessionId) },
+-      // The feedback plugin can unload between the menu render and this click.
+-      openFeedback: (sessionId: SessionId) => { ctx.get('feedbackUi')?.openSession(sessionId) },
 -    }),
-+    inject: injectAction,
++    inject: injectHeaderAction,
    }, SessionLogDownloadHeaderAction))
 +  ctx.slots.inject('conversation.trajectory.toolbar.utilities', () => ctx.slots.register({
 +    name: 'conversation.trajectory.toolbar.utilities',
@@ -294,10 +333,10 @@ index 97187311fa..a6ca23e3b3 100644
  
  export type { SessionLogDownloadDialogInjected, SessionLogDownloadDialogProps } from './Dialog.tsx'
 diff --git a/packages/session-query/session-log-export/tsconfig.client.json b/packages/session-query/session-log-export/tsconfig.client.json
-index 6e3e746c4c..c5e2c7b69c 100644
+index 1735561ff3..e5b6da6a26 100644
 --- a/packages/session-query/session-log-export/tsconfig.client.json
 +++ b/packages/session-query/session-log-export/tsconfig.client.json
-@@ -23,6 +23,7 @@
+@@ -25,6 +25,7 @@
      { "path": "../../client/ui-renderer" },
      { "path": "../../client/ui-session" },
      { "path": "../../client/ui-slots" },