dsh-tiddlywiki 0.6.0 → 0.7.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tiddlywiki",
   "description": "TiddlyWiki 5 as the DSH persistent knowledge base: tiddlywiki_* agent tools (search with filters/recent/tags/batch/rename + git sync & conflict resolve), a full TiddlyWiki editor embedded in the GUI center column (same-origin proxy, works over Tailscale/LAN/domain), a quick-note card with draft auto-save & recent-notes picker behind a single knowledge FAB, and git-based sync with auto-commit. Mounts via the official dsh plugin system — no DSH source changes.",
-  "version": "0.6.0",
+  "version": "0.7.2",
   "type": "module",
   "keywords": [
     "dsh",

package/src/host/config.ts

@@ -27,6 +27,13 @@ export interface PluginConfigShape {
     showPanelStatus?: boolean
     /** 是否在界面右下角显示「同步」悬浮按钮（默认 true）。 */
     showSyncButton?: boolean
+    /**
+     * 一键发送给 Agent（TW 笔记 → DSH 会话注入）。
+     * `enabled: false` 时路由 403、TW 端按钮点击提示未启用；`token` 非空时
+     * 路由要求请求头 `x-send-to-agent-token` 与之匹配；`endpoint` 可覆盖
+     * TW 端默认的 `location.origin + /dsh-tiddlywiki`。
+     */
+    sendToAgent?: { enabled?: boolean; endpoint?: string; token?: string }
   }
   uiLanguage?: string
   [key: string]: unknown

package/src/host/routes.ts

@@ -47,6 +47,32 @@ export interface WebServerFace {
   register(route: { kind: 'exact' | 'prefix'; path: string; handler: (req: IncomingMessage, res: ServerResponse) => void }): () => void
 }
 
+/**
+ * Structural face over the DSH `sessionController` service (a subset of
+ * dsh-api-session-controller). Only the methods the agent-send routes need are
+ * declared; the runtime instance is a real Service, never inspected data.
+ */
+export interface SessionControllerFace {
+  prompt(
+    request: { requestId: string; sessionId: string; mode: 'queue' | 'steer'; content: Array<{ type: 'text'; text: string }> },
+    signal: AbortSignal,
+  ): Promise<{ accepted: boolean }>
+  list(
+    request: { cursor?: string },
+    signal: AbortSignal,
+  ): Promise<{
+    items: Array<{
+      sessionId: string
+      updatedAt?: number
+      running?: boolean
+      blank?: boolean
+      parentSessionId?: string
+      cwd?: string
+    }>
+  }>
+  create(request: { cwd?: string; workspaceId?: string }): Promise<{ sessionId: string }>
+}
+
 /** Effective UI visibility flags returned by /status (mirror index.ts). */
 export interface UiDefaultsPublic {
   showQuickNote: boolean
@@ -62,6 +88,13 @@ export interface RouteDeps {
   noteDefaults: () => { tag: string }
   uiDefaults: () => UiDefaultsPublic
   getWikiPath: () => string
+  /** Optional DSH sessionController service (agent-send routes only); resolved
+   *  lazily per request because it may register after webServer appears. */
+  getSessionController: () => SessionControllerFace | undefined
+  /** Whether the one-click send-to-agent feature is enabled (config switch). */
+  sendToAgentEnabled: () => boolean
+  /** Optional shared token that must match `x-send-to-agent-token` when set. */
+  sendToAgentToken: () => string
 }
 
 function readBody(req: IncomingMessage, limit = MAX_BODY_BYTES): Promise<string> {
@@ -229,6 +262,115 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     json(res, { ok: true, ...view, twProxy: TW_PROXY_PATH, git: gitSummary, note: { tag: deps.noteDefaults().tag }, ui: deps.uiDefaults() })
   }
 
+  /**
+   * GET /dsh-tiddlywiki/agent/sessions — visible ordinary sessions for the TW
+   * one-click picker (excludes subagent sessions, activity-descending).
+   */
+  const handleAgentSessions = async (_req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    try {
+      const sc = deps.getSessionController()
+      if (sc === undefined) {
+        json(res, { ok: false, error: 'session service unavailable' }, 503)
+        return
+      }
+      const list = await sc.list({}, AbortSignal.timeout(10_000))
+      const items = (list.items ?? [])
+        .filter((s) => s.parentSessionId === undefined)
+        .map((s) => ({
+          sessionId: s.sessionId,
+          cwd: s.cwd ?? null,
+          running: !!s.running,
+          blank: !!s.blank,
+          updatedAt: s.updatedAt ?? 0,
+        }))
+        .sort((a, b) => b.updatedAt - a.updatedAt)
+      json(res, { ok: true, items })
+    } catch (err) {
+      json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, 500)
+    }
+  }
+
+  /**
+   * POST /dsh-tiddlywiki/agent/send — deliver a note to one agent session as a
+   * queued user message (sessionController.prompt, the same API the GUI chat
+   * input uses). Guards: feature switch, optional shared token, body shape.
+   */
+  const handleAgentSend = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    try {
+      if (!deps.sendToAgentEnabled()) {
+        json(res, { ok: false, error: 'send-to-agent is disabled' }, 403)
+        return
+      }
+      const token = deps.sendToAgentToken().trim()
+      if (token.length > 0) {
+        const got = req.headers['x-send-to-agent-token']
+        const value = typeof got === 'string' ? got : Array.isArray(got) ? got[0] ?? '' : ''
+        if (value !== token) {
+          json(res, { ok: false, error: 'unauthorized' }, 401)
+          return
+        }
+      }
+      const body = JSON.parse(await readBody(req)) as { sessionId?: unknown; text?: unknown }
+      const sessionId = typeof body.sessionId === 'string' && body.sessionId.trim().length > 0 ? body.sessionId.trim() : ''
+      const text = typeof body.text === 'string' && body.text.trim().length > 0 ? body.text.trim() : ''
+      if (sessionId.length === 0 || text.length === 0) {
+        json(res, { ok: false, error: 'sessionId and text are required' }, 400)
+        return
+      }
+      const sc = deps.getSessionController()
+      if (sc === undefined) {
+        json(res, { ok: false, error: 'session service unavailable' }, 503)
+        return
+      }
+      const requestId = `tw-send-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`
+      await sc.prompt(
+        { requestId, sessionId, mode: 'queue', content: [{ type: 'text', text }] },
+        AbortSignal.timeout(20_000),
+      )
+      json(res, { ok: true, requestId, sessionId })
+    } catch (err) {
+      json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, 500)
+    }
+  }
+
+  /**
+   * POST /dsh-tiddlywiki/agent/create — create (or adopt) one ordinary session,
+   * optionally inside a workspace path. The picker uses it for "new workspace /
+   * new session"; the created session's cwd becomes its workspace. The directory
+   * is materialised so a brand-new workspace actually exists on disk.
+   */
+  const handleAgentCreate = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
+    try {
+      if (!deps.sendToAgentEnabled()) {
+        json(res, { ok: false, error: 'send-to-agent is disabled' }, 403)
+        return
+      }
+      const token = deps.sendToAgentToken().trim()
+      if (token.length > 0) {
+        const got = req.headers['x-send-to-agent-token']
+        const value = typeof got === 'string' ? got : Array.isArray(got) ? got[0] ?? '' : ''
+        if (value !== token) {
+          json(res, { ok: false, error: 'unauthorized' }, 401)
+          return
+        }
+      }
+      const body = JSON.parse(await readBody(req)) as { cwd?: unknown }
+      const cwd = typeof body.cwd === 'string' ? body.cwd.trim() : ''
+      const sc = deps.getSessionController()
+      if (sc === undefined) {
+        json(res, { ok: false, error: 'session service unavailable' }, 503)
+        return
+      }
+      if (cwd.length > 0) {
+        await mkdir(cwd, { recursive: true })
+      }
+      const created = await sc.create({ cwd: cwd.length > 0 ? cwd : undefined })
+      json(res, { ok: true, sessionId: created.sessionId, cwd: cwd || null })
+    } catch (err) {
+      json(res, { ok: false, error: err instanceof Error ? err.message : String(err) }, 500)
+    }
+  }
+
   const handleNote = async (req: IncomingMessage, res: ServerResponse): Promise<void> => {
     try {
       const body = JSON.parse(await readBody(req)) as { title?: unknown; tag?: unknown; tags?: unknown; text?: unknown }
@@ -546,6 +688,9 @@ export function registerRoutes(ctx: { webServer: WebServerFace }, deps: RouteDep
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/sync`, handler: (req, res) => { void handleSync(req, res) } }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/upload`, handler: (req, res) => { void handleUpload(req, res) } }),
     ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/restart`, handler: (req, res) => { void handleRestart(req, res) } }),
+    ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/sessions`, handler: (req, res) => { void handleAgentSessions(req, res) } }),
+    ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/send`, handler: (req, res) => { void handleAgentSend(req, res) } }),
+    ctx.webServer.register({ kind: 'exact', path: `${ROUTE_PREFIX}/agent/create`, handler: (req, res) => { void handleAgentCreate(req, res) } }),
     ctx.webServer.register({ kind: 'prefix', path: `${ROUTE_PREFIX}/api`, handler: (req, res) => { void handleApiProxy(req, res) } }),
     ctx.webServer.register({ kind: 'prefix', path: `${TW_PROXY_PREFIX}`, handler: (req, res) => { void handleTwProxy(req, res) } }),
   ]

package/src/index.ts

@@ -22,7 +22,7 @@ import { watch, type FSWatcher } from 'node:fs'
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { AutoCommitter, GitFace } from './host/git.ts'
-import { registerRoutes, type WebServerFace } from './host/routes.ts'
+import { registerRoutes, type SessionControllerFace, type WebServerFace } from './host/routes.ts'
 import { ConfigStore, deepMerge, type PluginConfigShape } from './host/config.ts'
 import { registerAdminRoutes, ensureLanguage, resolveTwRoot, type AdminDeps } from './host/admin.ts'
 import { seedDocNote, DOC_NOTE_TITLE } from './host/seed-notes.ts'
@@ -76,7 +76,7 @@ interface ResolvedConfig {
   port: number
   git: { autoCommit: boolean; debounceMs: number; remote: string; branch: string }
   note: { tag: string }
-  ui: { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean }
+  ui: { showQuickNote: boolean; showPanelStatus: boolean; showSyncButton: boolean; sendToAgent: { enabled: boolean } }
   auth: { username?: string; password?: string }
 }
 
@@ -86,7 +86,7 @@ const DEFAULTS: ResolvedConfig = {
   port: 0,
   git: { autoCommit: true, debounceMs: 60_000, remote: '', branch: 'main' },
   note: { tag: 'inbox' },
-  ui: { showQuickNote: true, showPanelStatus: true, showSyncButton: true },
+  ui: { showQuickNote: true, showPanelStatus: true, showSyncButton: true, sendToAgent: { enabled: true } },
   auth: { username: '', password: '' },
 }
 
@@ -353,6 +353,11 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
   // Routes + settings-panel admin surface (lazy webServer).
   ctx.inject(['webServer'], (webCtx: HostCtx) => {
     const ws = (webCtx as unknown as { webServer: WebServerFace }).webServer
+    // sessionController is a core host service; read it LAZILY per request (via
+    // the plugin root ctx) because it may be registered after webServer, and the
+    // agent routes must work whenever a request actually arrives.
+    const getSessionController = (): SessionControllerFace | undefined =>
+      ctx.get('sessionController') as SessionControllerFace | undefined
     const disposeRoutes = registerRoutes({ webServer: ws }, {
       server,
       getClient: client,
@@ -361,6 +366,12 @@ export function apply(ctx: HostCtx, rawConfig: TiddlywikiConfig = {}): void {
       noteDefaults: () => ({ tag: effectiveNoteTag() }),
       uiDefaults: () => effectiveUi(),
       getWikiPath: () => wikiPath,
+      getSessionController,
+      sendToAgentEnabled: () => eff().ui?.sendToAgent?.enabled !== false,
+      sendToAgentToken: () => {
+        const token = eff().ui?.sendToAgent?.token
+        return typeof token === 'string' ? token : ''
+      },
     })
     const adminDeps: AdminDeps = {
       server,