@yolk_vat-y/dsh-project-memory 0.4.2 → 0.4.4

package/src/client/locales.ts

@@ -15,6 +15,9 @@ export const zh = {
   'style.mono': '终端',
   'panel.syncing': '同步中…',
   'panel.sync-failed': '同步失败',
+  'panel.hints-on': '显示提示信息',
+  'panel.hints-off': '隐藏提示信息',
+  'drag.cancel': '取消拖拽',
   'panel.empty': '暂无任务',
   'panel.empty-desc': '让模型开始工作并维护 todo 清单后会自动建档',
     'panel.no-session': '还没有会话',
@@ -53,6 +56,9 @@ export const en = {
   'style.mono': 'Mono',
   'panel.syncing': 'Syncing…',
   'panel.sync-failed': 'Sync failed',
+  'panel.hints-on': 'Show hints',
+  'panel.hints-off': 'Hide hints',
+  'drag.cancel': 'Cancel drag',
   'panel.empty': 'No Tasks',
   'panel.empty-desc': 'Tasks are created automatically when the model maintains a todo list',
     'panel.no-session': 'No session yet',

package/src/client/task-data-store.ts

@@ -0,0 +1,136 @@
+/**
+ * Task Data Store — 仅管服务端同步的数据（tasks、boundTaskId、archivedCount）
+ * - 单向数据流：命令执行结果 → setTasks → 广播给其他标签页
+ * - 无 UI 状态，无 localStorage，纯内存 + BroadcastChannel 同步
+ */
+import { useSyncExternalStore } from 'react'
+
+export interface TaskStep {
+  content: string
+  status: 'pending' | 'in_progress' | 'completed'
+}
+
+export interface TaskFile {
+  path: string
+  line?: number
+}
+
+export interface Task {
+  id: string
+  title: string
+  steps: TaskStep[]
+  files: TaskFile[]
+  lastActiveAt: string
+  updatedAt: string
+  archived?: boolean
+}
+
+export interface TaskPayload {
+  tasks: Task[]
+  boundId: string | null
+  archived: number
+}
+
+export function parseTaskPayloadText(text?: string | null): TaskPayload | null {
+  if (!text) return null
+  let jsonBlock: string | null = null
+  const fenced = text.match(/```(?:json)?\s*\n([\s\S]*?)\n```/)
+  if (fenced) jsonBlock = fenced[1]
+  else {
+    const lastBrace = text.lastIndexOf('{')
+    if (lastBrace !== -1) jsonBlock = text.slice(lastBrace)
+  }
+  if (!jsonBlock) return null
+  try {
+    const data = JSON.parse(jsonBlock)
+    if (!Array.isArray(data.tasks)) return null
+    return { tasks: data.tasks, boundId: data.boundId ?? null, archived: data.archived ?? 0 }
+  } catch {
+    return null
+  }
+}
+
+interface TaskDataState {
+  tasks: Task[]
+  boundTaskId: string | null
+  archivedCount: number
+  lastUpdate: number
+}
+
+const SYNC_CHANNEL = typeof window !== 'undefined' ? new BroadcastChannel('dsh-pm-tasks-data') : null
+
+let dataState: TaskDataState = {
+  tasks: [],
+  boundTaskId: null,
+  archivedCount: 0,
+  lastUpdate: 0,
+}
+
+const dataListeners = new Set<() => void>()
+
+function setDataState(next: TaskDataState): void {
+  dataState = next
+  for (const listener of dataListeners) listener()
+}
+
+function broadcastDataUpdate(tasks: Task[], archivedCount: number): void {
+  if (!SYNC_CHANNEL) return
+  SYNC_CHANNEL.postMessage({
+    type: 'PROJECT_TASKS_UPDATED',
+    payload: { tasks, archivedCount },
+  })
+}
+
+if (SYNC_CHANNEL) {
+  SYNC_CHANNEL.onmessage = (event) => {
+    const msg = event.data
+    if (msg?.type === 'PROJECT_TASKS_UPDATED' && msg.payload) {
+      const { tasks, archivedCount } = msg.payload
+      setDataState(prev => ({
+        ...prev,
+        tasks: tasks || [],
+        archivedCount: archivedCount ?? 0,
+        lastUpdate: Date.now(),
+      }))
+    }
+  }
+}
+
+export const taskDataStore = {
+  subscribe(listener: () => void): () => void {
+    dataListeners.add(listener)
+    return () => { dataListeners.delete(listener) }
+  },
+  getSnapshot(): TaskDataState {
+    return dataState
+  },
+  actions: {
+    setTasks(payload: { tasks: Task[]; boundTaskId: string | null; archivedCount: number }): void {
+      const nextTasks = payload.tasks || []
+      const nextArchived = payload.archivedCount ?? 0
+      setDataState({
+        tasks: nextTasks,
+        boundTaskId: payload.boundTaskId ?? null,
+        archivedCount: nextArchived,
+        lastUpdate: Date.now(),
+      })
+      broadcastDataUpdate(nextTasks, nextArchived)
+    },
+    reset(): void {
+      setDataState({
+        tasks: [],
+        boundTaskId: null,
+        archivedCount: 0,
+        lastUpdate: 0,
+      })
+    },
+  },
+}
+
+export function useTaskData(): TaskDataState {
+  return useSyncExternalStore(taskDataStore.subscribe, taskDataStore.getSnapshot, taskDataStore.getSnapshot)
+}
+
+export function useTaskDataActions() {
+  return taskDataStore.actions
+}

package/src/client/task-hooks.ts

@@ -0,0 +1,169 @@
+/**
+ * Task Panel Hooks — 步骤拖拽交互逻辑（useTaskDrag）。
+ * 只依赖 react + task-data-store 类型，不碰数据/UI store。
+ */
+import { useEffect, useRef, useState, useCallback } from 'react'
+import { TaskStep } from './task-data-store.ts'
+
+interface DragState {
+  fromIndex: number
+  stepContent: string
+  clientX: number
+  clientY: number
+  dragging: boolean
+}
+
+/**
+ * useTaskDrag — 步骤拖拽重排（绑定任务内，同一任务卡的步骤行间移动）。
+ *
+ * 交互模型（拖动全程按住鼠标）：
+ *  - 步骤行上按下（左键、非按钮/输入区域）→ 进入预览；
+ *  - 按住 350ms 不松，或按住后移动超过 6px → 唤起跟随鼠标的浮动幽灵卡片；
+ *  - 幽灵悬停到本任务卡内的步骤行时显示蓝色插入线（上半=插到该行前，下半=插到该行后）；
+ *  - 松手（mouseup）：落在有效位置 → onReorder 落子；落在卡外/别的任务卡/原行
+ *    （插入自身前后）/按钮输入等控件上 → 取消；
+ *  - 350ms 内原地松手 = 普通点击，不产生幽灵；Esc → 取消。
+ */
+export function useTaskDrag(
+  taskId: string,
+  steps: TaskStep[],
+  isBound: boolean,
+  onReorder: (fromIndex: number, toIndex: number) => void
+) {
+  const [dragState, setDragState] = useState<DragState | null>(null)
+  const [dropTargetIndex, setDropTargetIndex] = useState<number | null>(null)
+
+  // 最新值镜像：拖拽期间 window 监听只在“会话开始/结束”时挂载/卸载，
+  // 避免每次 mousemove 更新状态导致监听器重挂、连 350ms 定时器都被清掉。
+  const dragRef = useRef(dragState)
+  dragRef.current = dragState
+  const longPressTimer = useRef<number | undefined>(undefined)
+  const dragOrigin = useRef<{ x: number; y: number } | null>(null)
+
+  const clearTimer = useCallback(() => {
+    if (longPressTimer.current !== undefined) {
+      window.clearTimeout(longPressTimer.current)
+      longPressTimer.current = undefined
+    }
+  }, [])
+
+  const cancelDrag = useCallback(() => {
+    clearTimer()
+    dragOrigin.current = null
+    document.body.style.userSelect = ''
+    setDropTargetIndex(null)
+    setDragState(null)
+  }, [clearTimer])
+
+  const startDrag = useCallback((
+    fromIndex: number,
+    stepContent: string,
+    e: React.MouseEvent
+  ) => {
+    if (!isBound || e.button !== 0) return
+    if (dragRef.current) return // 已有预览/拖拽会话
+    e.preventDefault()
+    e.stopPropagation()
+    document.body.style.userSelect = 'none'
+    dragOrigin.current = { x: e.clientX, y: e.clientY }
+    setDropTargetIndex(null)
+    setDragState({ fromIndex, stepContent, clientX: e.clientX, clientY: e.clientY, dragging: false })
+    clearTimer()
+    longPressTimer.current = window.setTimeout(() => {
+      longPressTimer.current = undefined
+      // 350ms 长按 → 唤起幽灵卡片
+      setDragState(prev => (prev ? { ...prev, dragging: true } : null))
+    }, 350)
+  }, [isBound, clearTimer])
+
+  /** 计算某行上 y 坐标对应的插入位（行数下标：上半=该行前，下半=该行后）；非本任务卡返回 null */
+  const dropIndexAt = useCallback((row: Element, clientY: number): number | null => {
+    const parentOl = row.closest('ol')
+    if (!parentOl || !parentOl.closest(`article[data-task-id="${taskId}"]`)) return null
+    const index = Array.from(parentOl.children).indexOf(row)
+    const rect = row.getBoundingClientRect()
+    return clientY < rect.top + rect.height / 2 ? index : index + 1
+  }, [taskId])
+
+  /** 在 (x,y) 处结算：命中有效落点则重排，否则取消；并结束本次拖拽 */
+  const commitDrop = useCallback((x: number, y: number) => {
+    const cur = dragRef.current
+    if (!cur || !cur.dragging) return
+    const el = document.elementFromPoint(x, y) as HTMLElement | null
+    // 松手点在按钮/输入等交互控件上：不落子，直接取消
+    if (el && !el.closest('button, input, textarea, a')) {
+      const row = el.closest('[data-step-row]')
+      if (row) {
+        const drop = dropIndexAt(row, y)
+        if (drop !== null) {
+          // 行下标形式的落点：插到目标行前/后；落在自身原位视为取消（不产生空推送）
+          const effective = drop > cur.fromIndex ? drop - 1 : drop
+          if (effective !== cur.fromIndex) onReorder(cur.fromIndex, drop)
+        }
+      }
+    }
+    cancelDrag()
+  }, [dropIndexAt, onReorder, cancelDrag])
+
+  const active = dragState !== null
+
+  useEffect(() => {
+    if (!active) return
+
+    const onMouseMove = (e: MouseEvent) => {
+      const cur = dragRef.current
+      if (!cur) return
+      if (!cur.dragging) {
+        // 未到 350ms：移动超过阈值视为拖拽开始（不必死等长按）
+        const origin = dragOrigin.current
+        if (!origin) return
+        if (Math.hypot(e.clientX - origin.x, e.clientY - origin.y) < 6) return
+        clearTimer()
+        setDragState(prev => (prev ? { ...prev, dragging: true, clientX: e.clientX, clientY: e.clientY } : null))
+      } else {
+        setDragState(prev => (prev ? { ...prev, clientX: e.clientX, clientY: e.clientY } : null))
+      }
+      const row = document.elementFromPoint(e.clientX, e.clientY)?.closest('[data-step-row]')
+      setDropTargetIndex(row ? dropIndexAt(row, e.clientY) : null)
+    }
+
+    const onMouseUp = (e: MouseEvent) => {
+      const cur = dragRef.current
+      if (!cur) return
+      if (cur.dragging) {
+        // 拖拽中松手 = 落子/取消
+        commitDrop(e.clientX, e.clientY)
+      } else {
+        // 350ms 内原地松手 = 普通点击
+        cancelDrag()
+      }
+    }
+
+    const onClick = (e: MouseEvent) => {
+      // 兜底：mouseup 发生在窗口外等情况时，下一次点击直接结算
+      const cur = dragRef.current
+      if (!cur || !cur.dragging) return
+      commitDrop(e.clientX, e.clientY)
+    }
+
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') cancelDrag()
+    }
+
+    window.addEventListener('mousemove', onMouseMove)
+    window.addEventListener('mouseup', onMouseUp)
+    window.addEventListener('click', onClick, true)
+    window.addEventListener('keydown', onKeyDown)
+    return () => {
+      window.removeEventListener('mousemove', onMouseMove)
+      window.removeEventListener('mouseup', onMouseUp)
+      window.removeEventListener('click', onClick, true)
+      window.removeEventListener('keydown', onKeyDown)
+      document.body.style.userSelect = ''
+    }
+  }, [active, taskId, dropIndexAt, onReorder, cancelDrag, commitDrop])
+
+  useEffect(() => () => clearTimer(), [clearTimer])
+
+  return { dragState, dropTargetIndex, startDrag, cancelDrag }
+}

package/src/client/task-ui-store.ts

@@ -0,0 +1,118 @@
+/**
+ * Task UI Store — 仅管本地 UI 状态（closed、minimized、position、expandedIds、theme）
+ * - 持久化到 localStorage（key: dsh-pm-task-panel-ui）
+ * - 不跨标签页同步（每个标签页独立）
+ * - 启动/刷新强制 closed: true，面板默认不显示
+ */
+import { useSyncExternalStore } from 'react'
+
+const STORAGE_KEY = 'dsh-pm-task-panel-ui'
+
+interface TaskUIState {
+  expandedTaskIds: string[]
+  panelPosition: { x: number; y: number }
+  minimized: boolean
+  closed: boolean
+  theme: string
+}
+
+function defaultPosition(): { x: number; y: number } {
+  if (typeof window !== 'undefined') {
+    return { x: Math.max(16, window.innerWidth - 408), y: 72 }
+  }
+  return { x: 0, y: 0 }
+}
+
+/**
+ * 启动时的初始状态：
+ * - closed 恒为 true（不读取 localStorage 的 closed），刷新后面板隐藏；
+ * - 其余（展开项/位置/主题）可恢复上次会话偏好，minimized 默认折叠成迷你条。
+ */
+function getDefaultUIState(): TaskUIState {
+  if (typeof window !== 'undefined') {
+    try {
+      const saved = localStorage.getItem(STORAGE_KEY)
+      if (saved) {
+        const parsed = JSON.parse(saved)
+        return {
+          expandedTaskIds: Array.isArray(parsed.expandedTaskIds) ? parsed.expandedTaskIds : [],
+          panelPosition: parsed.panelPosition ?? defaultPosition(),
+          minimized: parsed.minimized !== false,
+          closed: true,
+          theme: typeof parsed.theme === 'string' ? parsed.theme : 'native',
+        }
+      }
+    } catch { /* corrupt state — fall through to defaults */ }
+  }
+  return {
+    expandedTaskIds: [],
+    panelPosition: defaultPosition(),
+    minimized: true,
+    closed: true,
+    theme: 'native',
+  }
+}
+
+function persistUI(state: TaskUIState): void {
+  if (typeof window === 'undefined') return
+  try {
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(state))
+  } catch { /* storage full/unavailable — non-fatal */ }
+}
+
+let uiState: TaskUIState = getDefaultUIState()
+const uiListeners = new Set<() => void>()
+
+function setUIState(next: TaskUIState): void {
+  uiState = next
+  persistUI(next)
+  for (const listener of uiListeners) listener()
+}
+
+export const taskUIStore = {
+  subscribe(listener: () => void): () => void {
+    uiListeners.add(listener)
+    return () => { uiListeners.delete(listener) }
+  },
+  getSnapshot(): TaskUIState {
+    return uiState
+  },
+  actions: {
+    toggleTaskExpanded(taskId: string): void {
+      const prev = uiState
+      const ids = prev.expandedTaskIds.includes(taskId)
+        ? prev.expandedTaskIds.filter((id) => id !== taskId)
+        : [...prev.expandedTaskIds, taskId]
+      setUIState({ ...prev, expandedTaskIds: ids })
+    },
+    expandAll(taskIds: string[]): void {
+      setUIState({ ...uiState, expandedTaskIds: taskIds })
+    },
+    setPanelPosition(pos: { x: number; y: number }): void {
+      setUIState({ ...uiState, panelPosition: pos })
+    },
+    open(): void {
+      setUIState({ ...uiState, minimized: false, closed: false })
+    },
+    minimize(): void {
+      setUIState({ ...uiState, minimized: true, closed: false })
+    },
+    close(): void {
+      setUIState({ ...uiState, minimized: true, closed: true })
+    },
+    setTheme(theme: string): void {
+      setUIState({ ...uiState, theme })
+    },
+    reset(): void {
+      setUIState(getDefaultUIState())
+    },
+  },
+}
+
+export function useTaskUI(): TaskUIState {
+  return useSyncExternalStore(taskUIStore.subscribe, taskUIStore.getSnapshot, taskUIStore.getSnapshot)
+}
+
+export function useTaskUIActions() {
+  return taskUIStore.actions
+}

package/src/commands/task-actions.js

@@ -25,15 +25,17 @@ function withTaskSnapshot(config, cwd, sid, store, note) {
   return { kind: 'success', text: `${human}\n\n\`\`\`json\n${payload}\n\`\`\`` }
 }
 
-export function taskCommandDefinition(config) {
+export function taskCommandDefinition(config, ctx) {
   return {
     name: 'task',
     description: '任务面板动作：/task switch <任务id> 切换绑定，/task archive <任务id> 归档，/task unbind 取消当前任务绑定',
     input: { hint: 'switch|archive <任务id> | unbind' },
     handler: (invocation) => {
       try {
-        const cwd = invocation?.agent?.session?.header?.cwd
-        const sid = invocation?.agent?.session?.id
+        const agent = invocation?.agent
+        const sid = agent?.id || agent?.session?.id
+        const session = sid && agent?.ctx ? agent.ctx.sessions?.get(sid) : (agent?.session || null)
+        const cwd = session?.header?.cwd || agent?.session?.header?.cwd
         const raw = (invocation?.rawInput || '').trim()
         const [verb, taskId, ...rest] = raw.split(/\s+/)
 
@@ -56,8 +58,8 @@ export function taskCommandDefinition(config) {
           if (sid) store.removeBinding(sid)
           store.save()
           // 推空 todo/write 清掉输入框上方的宿主任务清单（TaskBridge 空写=清空，不再自动建档）
-          if (invocation?.agent?.session && typeof invocation.agent.session.append === 'function') {
-            invocation.agent.session.append('todo/write', { todos: [] })
+          if (session && typeof session.append === 'function') {
+            session.append('todo/write', { todos: [] })
           }
           const note = '已取消当前任务绑定并清空会话任务清单（需要时可让模型重新规划）'
           return withTaskSnapshot(config, cwd, sid, store, note)
@@ -116,7 +118,7 @@ export function taskCommandDefinition(config) {
           task.lastActiveAt = task.updatedAt
           store.save()
           if (shouldAdoptToHost(config)) {
-            adoptStepsToSession(invocation?.agent?.session, task)
+            adoptStepsToSession(session, task)
           }
           const note = `已更新「${task.title}」步骤（${norm.length} 条）`
           return withTaskSnapshot(config, cwd, sid, store, note)
@@ -134,7 +136,7 @@ export function taskCommandDefinition(config) {
           store.save()
           // 反向接管：切换成功后把任务步骤推成宿主 todo/write（dsh 清单跟随）
           if (shouldAdoptToHost(config)) {
-            adoptStepsToSession(invocation?.agent?.session, task)
+            adoptStepsToSession(session, task)
           }
           const note = `已切换绑定: ${describeTask(task)}${sid ? '' : '（拿不到会话 id，未持久绑定）'}`
           return withTaskSnapshot(config, cwd, sid, store, note)

package/src/commands/tasks.js

@@ -69,14 +69,16 @@ export function renderTaskSnapshot(config, cwd, sid) {
   return { kind: 'success', text: `${humanText}\n\n\`\`\`json\n${payload}\n\`\`\`` }
 }
 
-export function tasksCommandDefinition(config) {
+export function tasksCommandDefinition(config, ctx) {
   return {
     name: 'tasks',
     description: '查看本项目的任务清单（几套任务、进度、涉及文件、当前绑定）',
     handler: (invocation) => {
       try {
-        const cwd = invocation?.agent?.session?.header?.cwd
-        const sid = invocation?.agent?.session?.id
+        const agent = invocation?.agent
+        const sid = agent?.id || agent?.session?.id
+        const session = sid && agent?.ctx ? agent.ctx.sessions?.get(sid) : (agent?.session || null)
+        const cwd = session?.header?.cwd || agent?.session?.header?.cwd
         return renderTaskSnapshot(config, cwd, sid)
       } catch (err) {
         return { kind: 'error', text: `[tasks] ${err?.message || err}` }

package/src/index.js

@@ -10,7 +10,7 @@ import { WatchManager } from './watch.js'
 import { setupLazyIndexing } from './lazy.js'
 import { initTypeScript } from './enhancer.js'
 import { setupTaskbridge } from './setup/taskbridge.js'
-import { listTasksTool, selectTaskTool, archiveTaskTool } from './tools/task-tools.js'
+import { listTasksTool, selectTaskTool, archiveTaskTool, showTaskPanelTool } from './tools/task-tools.js'
 import { tasksCommandDefinition } from './commands/tasks.js'
 import { taskCommandDefinition } from './commands/task-actions.js'
 
@@ -63,12 +63,13 @@ export function apply(ctx, config) {
   ctx.tools.register(listTasksTool(config))
   ctx.tools.register(selectTaskTool(config))
   ctx.tools.register(archiveTaskTool(config))
+  ctx.tools.register(showTaskPanelTool(config))
 
   // /tasks、/task 用户命令（宿主 commands 服务存在时注册，feature-detect 降级）
   try {
     ctx.inject(['commands'], (commandsCtx) => {
-      commandsCtx.commands.register(tasksCommandDefinition(config))
-      commandsCtx.commands.register(taskCommandDefinition(config))
+      commandsCtx.commands.register(tasksCommandDefinition(config, ctx))
+      commandsCtx.commands.register(taskCommandDefinition(config, ctx))
     })
   } catch (err) {
     console.error(`[dsh-project-memory] /tasks,/task registration skipped: ${err.message}`)

package/src/tools/task-tools.js

@@ -145,6 +145,25 @@ export function selectTaskTool(config) {
   })
 }
 
+export function showTaskPanelTool(config) {
+  return defineTool({
+    name: 'show_task_panel',
+    description:
+      'Show the task panel in the UI. Call this when the user asks to see the task list or when you want to display the task panel to the user.',
+    parameters: {},
+    output: { schema: { type: 'string' }, render: (_a, v) => [{ type: 'text', text: v }] },
+    async execute(_args, exec) {
+      const ctx = exec?.ctx
+      if (!ctx) return '无法获取上下文'
+      // 通过 BroadcastChannel 通知客户端打开面板
+      try {
+        ctx.events?.emit?.('dsh:task-panel:show', {})
+      } catch { /* ignore */ }
+      return '已请求打开任务面板。'
+    },
+  })
+}
+
 export function archiveTaskTool(config) {
   return defineTool({
     name: 'archive_task',