@fonlan/dsh-task-kanban 0.2.5 → 0.2.7

package/lib/types/server/settings.d.ts

@@ -1,35 +1,15 @@
 /**
  * User-facing plugin settings (global parallel worker count, per-session-type
- * model/effort/preset defaults), persisted through the settings service
- * namespace `task-kanban`. The DSH settings service requires a lowercase
- * kebab-case namespace (/^[a-z][a-z0-9-]*$/), so the scoped package name
- * cannot be used here.
+ * model/effort/preset defaults), carried by this bundle's entry config: dsh
+ * >= 0.1.7 owns plugin settings as entry config (the plugin's `Config`
+ * schema), so the face reads the config it was applied with and persists
+ * updates through `settings.update`.
  */
 import type { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 import type { KanbanSessionKind, KanbanSettingsShape } from '../shared/card.js';
 export declare const KANBAN_SETTINGS_NS = "task-kanban";
-export declare const KanbanSettingsSchema: z<Schemastery.ObjectS<{
-    maxParallelWorkers: z<number, number>;
-    refinementModel: z<string, string>;
-    refinementProvider: z<string, string>;
-    refinementReasoningEffort: z<string, string>;
-    refinementPreset: z<string, string>;
-    phaseModel: z<string, string>;
-    phaseProvider: z<string, string>;
-    phaseReasoningEffort: z<string, string>;
-    phasePreset: z<string, string>;
-}>, Schemastery.ObjectT<{
-    maxParallelWorkers: z<number, number>;
-    refinementModel: z<string, string>;
-    refinementProvider: z<string, string>;
-    refinementReasoningEffort: z<string, string>;
-    refinementPreset: z<string, string>;
-    phaseModel: z<string, string>;
-    phaseProvider: z<string, string>;
-    phaseReasoningEffort: z<string, string>;
-    phasePreset: z<string, string>;
-}>>;
+export declare const KanbanSettingsSchema: z<KanbanSettingsShape>;
 /** The per-session-type default slice a session kind resolves. */
 export interface KanbanSessionDefaults {
     model: string;
@@ -52,4 +32,4 @@ export interface KanbanSettingsFace {
      */
     sessionDefaults(kind: KanbanSessionKind): KanbanSessionDefaults;
 }
-export declare function registerSettings(ctx: Context): KanbanSettingsFace;
+export declare function registerSettings(ctx: Context, config: KanbanSettingsShape): KanbanSettingsFace;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonlan/dsh-task-kanban",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "DSH web plugin: a task kanban that refines requirements into phased plans, auto-executes them in git worktrees (one session per phase), and auto-merges into the main branch on completion.",
   "license": "MIT",
   "repository": {
@@ -80,52 +80,52 @@
     "@deepseek-ai/cordis": "^4.0.2",
     "@deepseek-ai/dsh-agent": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-agent-presets": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-skill": "^0.1.5-rc.2",
-    "@deepseek-ai/schemastery": "^3.18.2",
     "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-layout": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-session": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-workspace": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.5-rc.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/react": "~18.3.1",
-    "@types/react-dom": "~18.3.0",
-    "tsdown": "^0.22.14",
-    "typescript": "^5.9.0",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-agent-presets": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-agent": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-skill": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
     "@deepseek-ai/schemastery": "^3.18.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-agent": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-layout": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-session": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-workspace": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-skill": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.3",
+    "@types/node": "^22.0.0",
+    "@types/react": "~18.3.1",
+    "@types/react-dom": "~18.3.0",
+    "tsdown": "^0.22.14",
+    "typescript": "^5.9.0",
     "vitest": "^3.2.0"
   },
   "packageManager": "pnpm@11.21.0"

package/src/client/board.css

@@ -358,157 +358,31 @@
 .kb-settings-saved { font-size: 12px; color: #4ade80; }
 .kb-settings-group { border-top: 1px solid rgba(128, 128, 128, 0.22); padding-top: 12px; }
 .kb-settings-group-title { font-size: 12px; font-weight: 600; opacity: 0.9; margin-bottom: 10px; }
-/* Settings card (设置 → 插件配置): mirrors the built-in plugin cards
-   (dsh-client-ui-settings-plugins PluginCard) — same surface, border, head
-   layout, and disclosure chevron, spelled with kb-settings-card prefixed
-   classes. The prefix deliberately does NOT reuse the board's `.kb-card*`
-   classes: the board card carries its own padding/cursor/user-select, and
-   sharing the root class would leak those onto the settings card. */
-.kb-settings-card {
-  border: 1px solid var(--dsw-alias-border-l2);
-  background: var(--dsw-alias-bg-layer-3);
-  border-radius: 12px;
-  list-style: none;
-  transition: border-color .16s, background .16s;
-}
-.kb-settings-card:hover { border-color: var(--dsw-alias-label-dimmed); }
-.kb-settings-card[data-open] {
-  background: var(--dsw-alias-bg-layer-2);
-  border-color: var(--dsw-alias-label-dimmed);
-}
-.kb-settings-card-head {
-  appearance: none;
-  width: 100%;
-  font: inherit;
-  color: inherit;
-  text-align: left;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  border-radius: 12px;
-  align-items: center;
-  gap: 12px;
-  padding: 14px 16px;
+/* Settings page (设置 -> 侧栏「任务看板」): the page owns one entry in the
+   settings sidebar and renders into the panel's content column, so it draws
+   its own header (title plus a one-line summary) above the always-visible
+   body. The body keeps the board's kb-settings control classes. */
+.kb-page {
   display: flex;
+  flex-direction: column;
+  gap: 16px;
+  max-width: 720px;
 }
-.kb-settings-card-head:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary); outline-offset: -2px; }
-.kb-settings-card-headText { flex-direction: column; flex: 1; gap: 4px; min-width: 0; display: flex; }
-.kb-settings-card-title { color: var(--dsw-alias-label-primary); font-size: 15px; font-weight: 600; line-height: 1.4; }
-.kb-settings-card-sub { color: var(--dsw-alias-label-tertiary); font-size: 13px; line-height: 1.5; }
-.kb-settings-card-chevron {
-  color: var(--dsw-alias-label-tertiary);
-  flex: none;
-  transition: transform .16s;
+.kb-page-head {
   display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.kb-settings-card-chevron[data-open] { transform: rotate(180deg); }
-.kb-settings-card-body { border-top: 1px solid var(--dsw-alias-border-l2); margin: 0 16px; padding: 12px 0 8px; }
-.kb-footer-action {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
+  flex-direction: column;
   gap: 6px;
-  width: 32px;
-  height: 32px;
-  border-radius: 6px;
-  border: none;
-  background: transparent;
-  /* same foreground as the settings trigger (its trigger css uses this var) */
-  color: var(--dsw-alias-label-primary, inherit);
-  cursor: pointer;
-}
-.kb-footer-action:hover { background: rgba(128, 128, 128, 0.18); }
-.kb-footer-action-active { background: rgba(59, 130, 246, 0.25); }
-/* Wide mode borrows the settings trigger's metrics (34px tall, 14px label,
-   18px icon) so both controls read as siblings on the same line. */
-.kb-footer-action-wide {
-  width: auto;
-  height: 34px;
-  padding: 0 8px;
-  border-radius: 12px;
-  font-size: 14px;
-}
-.kb-footer-action-wide .kb-footer-label {
-  font-size: 14px;
-  line-height: 22px;
-}
-/* Theme following is handled by the --dsw-alias-* tokens above: they change
-   value with the shell's selected light/dark appearance, so no OS-level
-   prefers-color-scheme override is needed (and one would fight the app
-   theme when the two disagree). */
-/* Same-line placement WITHOUT moving any DOM: the sidebar foot area becomes
-   a reversed flex row, so its LAST child (the settings area) renders on the
-   LEFT and the FIRST child (footer actions = the kanban button) on the RIGHT
-   — exactly "settings, then kanban". The settings trigger flexes to fill the
-   remaining width; the button keeps its content width. */
-.kb-foot-row {
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: stretch;
-  gap: 4px;
-}
-.kb-foot-row > div:first-child {
-  flex: none;
-  width: auto;
-  min-width: 0;
-  display: flex;
-  align-items: center;
 }
-.kb-foot-row > div:last-child {
-  flex: 1;
-  min-width: 0;
-}
-/* Rail (collapsed sidebar): column-reverse stacks the settings circle on top
-   and the kanban icon below it, both centered; the kanban button borrows the
-   settings trigger's rail chrome (36px circle) so the two match. */
-.kb-foot-rail {
-  flex-direction: column-reverse;
-  align-items: center;
-}
-.kb-foot-rail .kb-footer-action {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-  margin: 8px 0 10px;
+.kb-page-title {
+  margin: 0;
+  color: var(--dsw-alias-label-primary);
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 1.4;
 }
-.kb-footer-label {
-  max-width: 110px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+.kb-page-sub {
+  margin: 0;
+  color: var(--dsw-alias-label-tertiary);
+  font-size: 13px;
+  line-height: 1.5;
 }
-/* Narrow screens (mobile drawer / auto-collapse breakpoint): the drawer's
-   foot area is ~256-280px but the footer actions row carries the kanban
-   button PLUS mobile-nav's drawer actions (Files / session log), which
-   together exceed the row and squeeze the settings trigger to zero width
-   (row-reverse overflows left, clipping the button). Below the shell's
-   auto-collapse breakpoint, stack the settings row above the actions and
-   let the actions wrap so nothing is squeezed or clipped. */
-@media (max-width: 1023px) {
-  .kb-foot-row {
-    flex-direction: column-reverse;
-    align-items: stretch;
-  }
-  .kb-foot-row > div:first-child {
-    flex: none;
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    gap: 4px;
-    padding-top: 4px;
-  }
-  .kb-foot-row > div:last-child {
-    flex: none;
-    width: 100%;
-  }
-  /* The footer-actions entries are display:contents wrappers, so the kanban
-     button itself is a flex item of the wrapping actions row; pull it to the
-     first wrap position so it sits directly below the settings row (the
-     mobile-nav drawer actions follow on their own wrapped line). */
-  .kb-foot-row .kb-footer-action {
-    order: -1;
-  }
-}

package/src/client/board.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import type { KanbanCard, Lane, PhaseAttempt, PlanPhase } from '../shared/card'
 import { DROP_RULES, laneOf } from '../shared/lanes'
 import { api, gatewaySkillList, type SkillOption } from './api'
-import { exitBoard, getClient } from './kanban-state'
+import { getClient, leaveKanbanPanel } from './kanban-state'
 import { en, zh } from './locales'
 import './board.css'
 
@@ -158,7 +158,10 @@ export function BoardRoot(props: BoardProps): JSX.Element {
 
   const openSession = useCallback((sessionId: string) => {
     const ctx = getClient()
-    exitBoard()
+    // Return the center column to the Conversation first: `sessions.open` is
+    // wrapped by bindSessionNavigation as well, but a runtime without that
+    // binding must still leave the board before the session renders.
+    leaveKanbanPanel(ctx)
     if (ctx === null) return
     try {
       ;(ctx.sessions as { open(id: string): void }).open(sessionId)

package/src/client/icons.tsx

@@ -0,0 +1,74 @@
+import * as primitives from '@deepseek-ai/dsh-client-ui-primitives'
+
+/** Props every shell icon accepts: square edge in px, color rides currentColor. */
+export interface IconProps {
+  size?: number
+  className?: string
+}
+
+/** One shell icon component. */
+export type IconComponent = (props: IconProps) => JSX.Element
+
+/** The runtime export table, read by capability instead of by one hard-coded name. */
+const table = primitives as unknown as Record<string, IconComponent | undefined>
+
+/** First name the runtime actually provides (a missing export is `undefined`). */
+function firstDefined(...names: string[]): IconComponent | undefined {
+  for (const name of names) {
+    let candidate: IconComponent | undefined
+    try {
+      candidate = table[name]
+    } catch {
+      // Some module namespaces reject unknown names instead of yielding
+      // `undefined`; a rename must never throw on its way to the fallback.
+      continue
+    }
+    if (typeof candidate === 'function') return candidate
+  }
+  return undefined
+}
+
+/**
+ * Self-contained 16×16 checklist glyph (the 0.1.7 artwork) used when the shell
+ * primitives expose none of the names above: the footer entry must render
+ * something even on a runtime whose icon exports we do not know.
+ */
+function ChecklistFallback({ size = 14, className }: IconProps): JSX.Element {
+  return (
+    <svg
+      width={size}
+      height={size}
+      className={className}
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      strokeWidth={1}
+    >
+      <path d="M3.75 6.25C4.7165 6.25 5.5 5.4665 5.5 4.5C5.5 3.5335 4.7165 2.75 3.75 2.75C2.7835 2.75 2 3.5335 2 4.5C2 5.4665 2.7835 6.25 3.75 6.25Z" stroke="currentColor" />
+      <path d="M7.5 4.5H13.5" stroke="currentColor" />
+      <path d="M3.75 13.25C4.7165 13.25 5.5 12.4665 5.5 11.5C5.5 10.5335 4.7165 9.75 3.75 9.75C2.7835 9.75 2 10.5335 2 11.5C2 12.4665 2.7835 13.25 3.75 13.25Z" stroke="currentColor" />
+      <path d="M7.5 11.5H13.5" stroke="currentColor" />
+    </svg>
+  )
+}
+
+/**
+ * The checklist icon used by the sidebar panel row entry.
+ *
+ * DSH 0.1.7 renamed every size-suffixed shell icon (`IconChecklistOutline14`)
+ * into stroke-weight variants (`…Regular` 1px / `…Medium` 1.3px) inside
+ * `@deepseek-ai/dsh-client-ui-primitives`. A stale named import resolves to
+ * `undefined` and React then throws "Element type is invalid" while rendering
+ * the slot entry — the entry is dropped and the button silently disappears
+ * (exactly what upgrading to 0.1.7 did to this plugin). Resolve the name at
+ * runtime, newest first, so the next rename degrades to another shipped
+ * variant instead of taking the button down with it.
+ */
+export const ChecklistIcon: IconComponent =
+  firstDefined(
+    'IconChecklistOutlineRegular',
+    'IconChecklistOutlineMedium',
+    'IconChecklistOutline',
+    'IconChecklistOutline14',
+  ) ?? ChecklistFallback

package/src/client/index.tsx

@@ -4,11 +4,14 @@ import type {} from '@deepseek-ai/dsh-client-locale/client'
 import type {} from '@deepseek-ai/dsh-client-ui-sidebar/client'
 import type {} from '@deepseek-ai/dsh-client-ui-layout/client'
 import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
-import type {} from '@deepseek-ai/dsh-client-ui-settings-plugins/client'
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
 import { BoardRoot } from './board'
-import { KanbanFooterButton, KanbanSettingsCard } from './sections'
+import { KanbanPanelIcon, KanbanSettingsSection } from './sections'
 import { LOCALE_NS, zh, en } from './locales'
-import { setClient, setBoardRoot, bindSessionNavigation } from './kanban-state'
+import { KANBAN_PANEL_ID, setClient, bindSessionNavigation } from './kanban-state'
+
+/** The settings sidebar entry this plugin's page owns (must stay stable). */
+const SETTINGS_SECTION_ID = 'task-kanban'
 
 /** Services required before mounting (provided by the client runtime). */
 export const inject = ['slots', 'sessions', 'workspaces', 'locale']
@@ -16,8 +19,7 @@ export const inject = ['slots', 'sessions', 'workspaces', 'locale']
 /** Client plugin body. */
 export function apply(ctx: ClientContext): void {
   setClient(ctx)
-  setBoardRoot(BoardRoot as unknown as (props: Record<string, unknown>) => React.ReactNode)
-  // Selecting a session while the board is open must leave the board first.
+  // Selecting a session while the board is open must return to the Conversation.
   bindSessionNavigation(ctx)
 
   // Live translate bound to the active locale (labels re-read it per call).
@@ -27,25 +29,43 @@ export function apply(ctx: ClientContext): void {
     return () => off()
   }, 'task-kanban: dictionaries')
 
-  ctx.slots.inject('sidebar.footer.action', () =>
+  // The board is a GLOBAL MAIN PANEL: the shell renders one `main` entry per
+  // selected panel id, so keying it (instead of replacing `main.conversation`)
+  // keeps the Conversation mounted and selectable beside the board, and the
+  // sidebar's own panel row owns the button that selects it (the
+  // `sidebar.panellist` entry below). Nothing of this plugin sits in the
+  // sidebar foot any more, so the Settings trigger can never be squeezed.
+  ctx.slots.inject('main', () =>
+    ctx.slots.register({
+      name: 'main',
+      key: KANBAN_PANEL_ID,
+      locale: LOCALE_NS,
+    } as never, BoardRoot as never),
+  )
+
+  // Sidebar panel row: the shell renders the row (label, tooltip, active state)
+  // and calls `layout.selectPanel(id)` on click; the entry supplies the glyph.
+  ctx.slots.inject('sidebar.panellist', () =>
     ctx.slots.register({
-      name: 'sidebar.footer.action',
-      id: 'task-kanban',
-      order: 60,
+      name: 'sidebar.panellist',
+      id: KANBAN_PANEL_ID,
+      order: 20,
       label: () => t('kanban'),
       locale: LOCALE_NS,
-    }, KanbanFooterButton as never),
+    }, KanbanPanelIcon as never),
   )
 
-  // The plugin's own Settings Card (设置 → 插件配置) rides the `task-kanban`
-  // settings namespace: registering into the keyed `settings.plugin.item` slot
-  // with the namespace string makes the configurable-plugins tab dispatch the
-  // card next to the built-in ones (bash / agent loop / web search).
-  ctx.slots.inject('settings.plugin.item', () =>
+  // The plugin's own settings page (设置 -> 侧栏「任务看板」) rides the
+  // task-kanban settings namespace and registers into the settings.section
+  // list slot, which gives it one entry in the settings sidebar and renders
+  // its content into the panel's content column.
+  ctx.slots.inject('settings.section', () =>
     ctx.slots.register({
-      name: 'settings.plugin.item',
-      key: 'task-kanban',
+      name: 'settings.section',
+      id: SETTINGS_SECTION_ID,
+      order: 200,
+      label: () => t('settingsTitle'),
       locale: LOCALE_NS,
-    }, KanbanSettingsCard as never),
+    }, KanbanSettingsSection as never),
   )
 }