dsh-file-activity 0.5.7 → 0.5.9

package/lib/parts/api.part.js

@@ -1,3 +1,4 @@
+'use strict'
 // ── data access (host routes) ─────────────────────────────────────────
 async function fetchStats(sessionId) {
   const response = await fetch(`/file-activity/api/stats?sessionId=${encodeURIComponent(sessionId)}`)
@@ -5,7 +6,6 @@ async function fetchStats(sessionId) {
   if (json === null || typeof json !== 'object' || json.ok !== true) return null
   return json.value
 }
-
 /** Resolve the session working directory through the sidebar's native API. */
 async function fetchSessionCwd(sessionId) {
   try {
@@ -21,7 +21,6 @@ async function fetchSessionCwd(sessionId) {
     return ''
   }
 }
-
 function postRecord(sessionId, path, op) {
   if (typeof sessionId !== 'string' || sessionId === '' || typeof path !== 'string' || path === '') return
   void fetch('/file-activity/api/record', {
@@ -30,7 +29,6 @@ function postRecord(sessionId, path, op) {
     body: JSON.stringify({ sessionId, path, op }),
   }).catch(() => {})
 }
-
 function postClear(sessionId) {
   void fetch('/file-activity/api/clear', {
     method: 'POST',
@@ -38,12 +36,10 @@ function postClear(sessionId) {
     body: JSON.stringify({ sessionId }),
   }).catch(() => {})
 }
-
 /** Plugin media route URL for a recorded path (authorized per session). */
 function mediaUrlOf(sessionId, path) {
   return `/file-activity/file?${new URLSearchParams({ sessionId, path })}`
 }
-
 /** Plugin text route URL (`as=text`): fs.read-shaped JSON for recorded text. */
 function textUrlOf(sessionId, path) {
   return `/file-activity/file?${new URLSearchParams({ sessionId, path, as: 'text' })}`

package/lib/parts/apply.part.js

@@ -1,99 +1,105 @@
-// ── plugin body ───────────────────────────────────────────────────────
-/**
- * The stylesheet is pure static CSS and must NOT depend on the
- * betterSidebar service: inject it first, unconditionally. If it lived
- * behind the `service === undefined` early return, an HMR rebuild or
- * service reload could leave the already-rendered tab WITHOUT its
- * stylesheet — the raw white-text list you see when the CSS is gone.
- * Each fiber owns its own <style> element and the disposer removes
- * only that element, so a rebuild always keeps at least one copy.
- */
-function injectStyles(ctx) {
-  ctx.effect(() => {
-    if (typeof document === 'undefined' || document === null || typeof document.head === 'undefined') return () => {}
-    const style = document.createElement('style')
-    style.setAttribute('data-dsh-file-activity', 'styles')
-    style.textContent = STYLES
-    document.head.appendChild(style)
-    return () => {
-      if (style.parentNode) style.parentNode.removeChild(style)
-    }
-  }, 'dsh-file-activity: styles')
-}
-
-/** Mount probe: report client activation to the host state (synthetic
- *  session id, invisible in the UI — confirms the client half actually
- *  loaded after a page refresh). */
-function mountProbe() {
-  void fetch('/file-activity/api/record', {
-    method: 'POST',
-    headers: { 'content-type': 'application/json' },
-    body: JSON.stringify({ sessionId: '__probe__', path: 'mounted', op: 'read' }),
-  }).catch(() => {})
-}
-
-/** Register the tab (enabled by default in the Side card settings). */
-function registerTab(ctx, dataStore) {
-  const service = ctx.betterSidebar
+'use strict'
+// ── plugin body (native sidebar extension points) ─────────────────────
+//
+// Everything this half needs comes from Cordis services the HOST provides
+// (issue #187 batch 2): the tab registry, the slot registry, the document
+// preview registry and the right-Sidebar navigation controller. There is no
+// third-party sidebar package in the picture anymore, so the page keeps
+// working on any host that ships those four services.
+//
+// The stylesheet is pure static CSS and must NOT depend on any of them:
+// inject it first, unconditionally. If it lived behind an early return, an HMR
+// rebuild or service reload could leave the already-rendered tab WITHOUT its
+// stylesheet — the raw white-text list you see when the CSS is gone. Each
+// fiber owns its own <style> element and the disposer removes only that
+// element, so a rebuild always keeps at least one copy.
+/** registerTab step one: the tab TYPE (what a file-activity page is). */
+function registerTabType(ctx) {
   ctx.effect(
     () =>
-      service.registerTab({
+      ctx.sidebarRightTabs.register({
         id: TAB_ID,
+        kind: TAB_KIND,
+        // No patterns: this is a page type, opened by kind (ctx.sidebarRight.openTab).
         title: () => strings.title(),
-        icon: (size) => icon.clock(size),
-        order: 15,
-        single: true,
-        settings: {
-          pluginToggles: [
-            {
-              key: 'autoOpen',
-              title: () => (isZh() ? '会话开始时自动打开' : 'Auto-open on session start'),
-              desc: () =>
-                isZh()
-                  ? '每个会话首次打开时自动显示本页（可在侧边栏设置中关闭）'
-                  : 'Opens this tab once per session by default (turn off here)',
-              type: 'switch',
-            },
-          ],
-        },
-        component: (props) => createElement(FileActivityView, { ...props, dataStore }),
+        // Guide entry (issue #266 B): the sidebar's "new tab" page is the guide
+        // tab, and its doors come from `sidebarRightTabs.guide()` — the entries
+        // every registered type contributes. Without one the page was reachable
+        // ONLY through auto-open, so closing its chip made it impossible to
+        // reopen from the UI. Picking the capsule opens this kind in the guide's
+        // place (host GuideBody → actions.openTab(kind, { replaceTab: true })).
+        guide: [
+          {
+            order: 20,
+            title: () => strings.title(),
+            description: () => strings.guideDescription(),
+          },
+        ],
       }),
-    'dsh-file-activity: tab registration',
+    'dsh-file-activity: tab type',
   )
 }
-
-exports.inject = ['betterSidebar']
-
+/** registerTab step two: the body seat (keyed by the definition id). */
+function registerTabBody(ctx, dataStore) {
+  ctx.effect(
+    () =>
+      ctx.slots.inject('sidebar.right.pane.tab', () =>
+        ctx.slots.register({ name: 'sidebar.right.pane.tab', key: TAB_ID }, function (props) {
+          const injected = Object.assign({}, props, { dataStore })
+          return createElement(FileActivityView, injected)
+        }),
+      ),
+    'dsh-file-activity: tab body',
+  )
+}
+/** registerTab step three: the chip title seat (a live, localized label). */
+function registerTabTitle(ctx) {
+  ctx.effect(
+    () =>
+      ctx.slots.inject('sidebar.right.pane.tab.title', () =>
+        ctx.slots.register({ name: 'sidebar.right.pane.tab.title', key: TAB_ID }, () =>
+          createElement('span', { className: 'dfa-chip' }, strings.title()),
+        ),
+      ),
+    'dsh-file-activity: tab title',
+  )
+}
+/**
+ * Run one registration, converting a throw into an observable failure.
+ *
+ * Swallowing is deliberate: the host throws for a taken id or a taken kind, and
+ * letting it escape would fail the WHOLE activation (the stylesheet, the
+ * floating preview and the settings tab would go with it). What must never
+ * happen is a SILENT failure, so the cause is logged, marked on <html> and
+ * rendered as a notice inside the tab body.
+ */
+function guarded(kind, register) {
+  try {
+    register()
+  } catch (error) {
+    markDegraded(kind, error)
+  }
+}
+exports.inject = ['slots', 'sidebarRightTabs', 'documentPreviews', 'sidebarRight']
 exports.apply = function apply(ctx) {
-  // Stylesheet first, unconditionally (HMR pitfall — see injectStyles).
+  // Stylesheet first, unconditionally (HMR pitfall — see the header note).
   injectStyles(ctx)
-  const service = ctx.betterSidebar
-  if (service === undefined) {
-    // 依赖缺失提示（issue #72 同类问题）：dsh-file-activity 的 client 端
-    // 依赖 dsh-better-sidebar 提供侧边栏扩展点，未安装时静默返回会让用户
-    // 以为插件坏了——明确提示安装方式。
-    if (typeof console !== 'undefined' && typeof console.warn === 'function') {
-      console.warn(
-        '[dsh-file-activity] dsh-better-sidebar 未安装：文件活动页签无法挂载。请安装宿主插件：dsh plugin --profile web add dsh-better-sidebar dsh-file-activity',
-      )
-    }
-    return
-  }
-
-  // Per-session data store: { bySession: { [sessionId]: { recent, counts, loading } }, preview }
-  // Each conversation reads/writes only its own bucket, so switching
-  // sessions never leaks another session's file activity into the view.
+  // Failing loudly beats failing silently: a rejected registration (id taken,
+  // kind taken, seat missing) is recorded so the user and the e2e suite can
+  // see WHY the tab never appeared.
+  guarded('tab', () => registerTabType(ctx))
   const dataStore = createStore({ bySession: {}, preview: null })
-  mountProbe()
-
+  registerSharedStore(dataStore)
+  registerTabBody(ctx, dataStore)
+  registerTabTitle(ctx)
+  registerPreviewOverlay(ctx, dataStore)
+  registerSettingsTab(ctx)
+  guarded('previews', () => registerDocumentPreviews(ctx))
   // sidebar operations → host record route
   ctx.effect(() => installFetchInterceptor(), 'dsh-file-activity: sidebar fetch observation')
-  registerTab(ctx, dataStore)
-
   // auto-open once per session (default on)
-  ctx.effect(() => installAutoOpen(ctx, TAB_ID), 'dsh-file-activity: auto-open')
+  ctx.effect(() => installAutoOpen(ctx), 'dsh-file-activity: auto-open')
 }
-
 // Internal functions exposed for the render-path test suite only; inert in
 // the browser bundle (plain properties on the exports object).
 exports.__test = {
@@ -102,10 +108,13 @@ exports.__test = {
   fetchTextContent,
   textUrlOf,
   strings,
+  viewerOf,
   renderPreviewBody,
   previewClickAction,
   isInsideFloating,
   closePreviewOnHidden,
+  autoOpenEnabled,
+  PREVIEW_EXTENSIONS,
   AUTO_CLOSE_MS,
   // Static stylesheet text, so the render-path suite can assert the floating
   // preview body keeps its flex-fill container (issue #111).

package/lib/parts/auto-open.part.js

@@ -1,76 +1,99 @@
+'use strict'
 // ── auto-open (enabled by default) ────────────────────────────────────
-function findTabIn(state, tabId) {
-  const leaves = (node) => (node.kind === 'leaf' ? [node] : (node.children ?? []).flatMap(leaves))
-  for (const node of [state?.splits, state?.bottomSplits]) {
-    if (node === undefined || node === null) continue
-    for (const leaf of leaves(node)) {
-      if ((leaf.tabs ?? []).some((tab) => tab.type === tabId)) return true
-    }
-  }
-  return false
-}
-
-/** Current sidebar snapshot, or null when the service is not ready. */
-function sidebarSnapshot(service) {
+//
+// Native flow: the tab is a PAGE type, so opening it means
+// `ctx.sidebarRight.openTab(kind)` — there is no layout snapshot to inspect
+// and no session id to read from a third-party sidebar service anymore.
+//
+// Timing is the whole problem. The navigation controller throws
+// "sidebarRight: no session surface is mounted" when the right column has not
+// mounted its session surface yet — which is exactly the state during the
+// first paint of a fresh page. The previous third-party sidebar used to answer with a snapshot
+// and the old code simply gave up when it was missing, which is how the tab
+// could silently never auto-open. Here the attempt is RETRIED with the timers
+// until the surface is up, and a permanent failure is recorded through
+// markDegraded() instead of disappearing.
+/** Retry cadence while the right column has not mounted its session surface. */
+const AUTO_OPEN_RETRY_MS = 1000
+/** Give up after this many attempts (~30s) and degrade observably. */
+const AUTO_OPEN_MAX_TRIES = 30
+/**
+ * Pending retry timer id (0 = none).
+ *
+ * There is deliberately NO "already attempted" flag guarding this module: a
+ * rejected registration or an HMR rebuild re-runs apply(), and the second run
+ * must still be able to bring the tab back. `openTab` is idempotent — it
+ * focuses the existing page instead of duplicating it.
+ */
+let autoOpenTimer = 0
+/**
+ * Whether this BROWSER TAB already had its auto-open attempt.
+ *
+ * The native API exposes no "current session id" to a plugin (`openTab`
+ * targets the mounted session, and the layout store is the host's own), so a
+ * per-session marker cannot be written from here. The marker is therefore
+ * per-browser-tab: one attempt per page load, which is exactly the visible
+ * behaviour — the session's tab record itself is persisted host-side, so
+ * revisiting a session that already shows the tab merely focuses it.
+ */
+function isAutoOpenAttempted() {
+  const key = AUTO_OPEN_KEY + 'loaded'
   try {
-    return service.getSnapshot?.()
+    return window.sessionStorage.getItem(key) === '1'
   } catch {
-    return null
-  }
-}
-
-/** The user disabled auto-open for this tab in the sidebar settings. */
-function isAutoOpenDisabled(snapshot, tabId) {
-  const settings = snapshot.prefs?.pluginSettings?.[tabId]
-  return settings !== undefined && settings.autoOpen === false
-}
-
-/** Whether this session was already auto-opened (localStorage marker). */
-function isAutoOpenMarked(sessionId) {
-  try {
-    return Boolean(window.localStorage.getItem(AUTO_OPEN_KEY + sessionId))
-  } catch {
-    return true
+    return false
   }
 }
-
-/** Persist the auto-opened marker for this session. */
-function markAutoOpened(sessionId) {
+/** Mark this browser tab as already attempted. */
+function markAutoOpenAttempted() {
   try {
-    window.localStorage.setItem(AUTO_OPEN_KEY + sessionId, '1')
+    window.sessionStorage.setItem(AUTO_OPEN_KEY + 'loaded', '1')
   } catch {
     // ignore
   }
 }
-
-/** Open the tab once per session unless disabled in the plugin settings. */
-function tryAutoOpen(service, tabId) {
-  const snapshot = sidebarSnapshot(service)
-  if (snapshot === undefined || snapshot === null || snapshot.sessionId === undefined || snapshot.state === undefined)
-    return
-  const sessionId = snapshot.sessionId
-  if (isAutoOpenDisabled(snapshot, tabId)) return
-  if (isAutoOpenMarked(sessionId)) return
-  if (findTabIn(snapshot.state, tabId)) {
-    markAutoOpened(sessionId)
-    return
-  }
+/** The most recent controller refusal, surfaced when retries run out. */
+let lastAutoOpenError = null
+/** One open attempt: true when the controller accepted it. */
+function tryOpenTab(ctx, tries) {
   try {
-    service.openTab({ type: tabId, title: strings.title(), path: '' })
-    markAutoOpened(sessionId)
+    ctx.sidebarRight.openTab(TAB_KIND, { revealIfOpened: false })
+    return true
   } catch (error) {
-    console.error('[dsh-file-activity] auto-open failed:', error)
+    if (tries === 0) lastAutoOpenError = error
+    return false
   }
 }
-
-function installAutoOpen(ctx, tabId) {
-  const service = ctx.betterSidebar
-  tryAutoOpen(service, tabId)
-  let off = () => {}
-  try {
-    off = service.subscribeState?.(() => tryAutoOpen(service, tabId)) ?? off
-  } catch {
-    // service may lack subscribeState on older versions
+/**
+ * Open the tab once the session surface exists, then stop. The tab record
+ * itself is persisted host-side, so a session that already shows it is not
+ * reopened: `openTab` focuses the existing page instead of duplicating it.
+ * @param ctx - client context carrying the navigation controller.
+ * @returns disposer cancelling a pending retry.
+ */
+function installAutoOpen(ctx) {
+  if (!autoOpenEnabled()) return () => {}
+  if (isAutoOpenAttempted()) return () => {}
+  let tries = 0
+  const attempt = () => {
+    tries += 1
+    if (tryOpenTab(ctx, tries - 1)) {
+      autoOpenTimer = 0
+      markAutoOpenAttempted()
+      return
+    }
+    if (tries >= AUTO_OPEN_MAX_TRIES) {
+      autoOpenTimer = 0
+      markDegraded('auto-open', lastAutoOpenError ?? 'sidebarRight: session surface never mounted')
+      return
+    }
+    autoOpenTimer = window.setTimeout(attempt, AUTO_OPEN_RETRY_MS)
+  }
+  attempt()
+  return () => {
+    if (autoOpenTimer !== 0) {
+      window.clearTimeout(autoOpenTimer)
+      autoOpenTimer = 0
+    }
   }
-  return off
 }

package/lib/parts/document-previews.part.js

@@ -0,0 +1,62 @@
+'use strict'
+// ── native document previews (metadata + plain-text renderer) ──────────
+//
+// The HOST owns file content on the native side: a registered preview only
+// declares WHICH suffixes this implementation recognizes and HOW the document
+// owner should deliver the bytes ('text-pages' = paged text window,
+// 'bytes-complete' = whole file). The owner then injects the prepared
+// DocumentContent into the 'sidebar.right.tab.document' seat, keyed by this
+// implementation's id — so the renderer never fetches anything itself
+// (the responsibility split that made 第三方查看器注册表的 matchFileViewer
+// obsolete; its fetchStrategy belonged to the third-party viewer).
+//
+// Scope of the registration: filenames whose suffixes no shipped renderer
+// claims. Anything the host already renders (code / markdown / image / pdf /
+// html) keeps winning: those implementations outrank this one by longest
+// suffix, and a 'fallback' band type (the shipped text preview) still beats
+// nothing-else-matches. This descriptor exists so a recorded log/diff/ndjson
+// file opens with a real renderer instead of the "nothing can view this"
+// notice.
+//
+// Degradation is explicit and observable (issue #187 batch 2): a rejected
+// registration is logged with its cause and marked on <html> so it can never
+// fail silently.
+/** Suffixes this implementation claims (no leading dot; compound is allowed). */
+const PREVIEW_EXTENSIONS = ['log', 'jsonl', 'ndjson', 'diff', 'patch']
+/**
+ * Record an extension-point failure so it is visible to users, tests and e2e.
+ * The <html> markers are `data-dfa-degraded` (which stage failed) plus
+ * `data-dfa-degraded-cause` (why), which makes a missing tab diagnosable from
+ * the page itself instead of only from the browser console.
+ */
+function markDegraded(kind, error) {
+  const message = error instanceof Error ? error.message : String(error)
+  if (typeof console !== 'undefined' && typeof console.error === 'function') {
+    console.error('[dsh-file-activity] ' + kind + ' 注册失败: ' + message)
+  }
+  try {
+    const root = typeof document === 'undefined' ? undefined : document.documentElement
+    if (root !== undefined && root !== null && root.dataset !== undefined) {
+      root.dataset.dfaDegraded = kind
+      root.dataset.dfaDegradedCause = message.slice(0, 200)
+    }
+  } catch {
+    // observation only: a missing document must not break activation
+  }
+}
+/** Register the native document-preview descriptor (metadata only). */
+function registerDocumentPreviews(ctx) {
+  ctx.effect(
+    () =>
+      ctx.documentPreviews.register({
+        id: TAB_ID,
+        extensions: PREVIEW_EXTENSIONS,
+        // 'extension' lets this implementation win over a shipped one on the
+        // same suffix; distinct suffixes keep the shipped renderers in charge.
+        priority: 'extension',
+        title: () => strings.title(),
+        loading: 'text-pages',
+      }),
+    'dsh-file-activity: document previews',
+  )
+}

package/lib/parts/format.part.js

@@ -1,10 +1,10 @@
+'use strict'
 // ── path / time formatting helpers ────────────────────────────────────
 function basenameOf(path) {
   const norm = path.split('\\').join('/')
   const idx = norm.lastIndexOf('/')
   return idx === -1 ? norm : norm.slice(idx + 1)
 }
-
 /** Compact relative time: 刚刚 / N 分钟前 / N 小时前 / N 天前 / MM/DD. */
 function formatRelative(time) {
   if (typeof time !== 'number' || !Number.isFinite(time)) return ''
@@ -19,7 +19,6 @@ function formatRelative(time) {
   const date = new Date(time)
   return `${date.getMonth() + 1}/${date.getDate()}`
 }
-
 /** Local wall-clock HH:MM:SS (used in tooltips; full precision). */
 function formatTime(time) {
   const date = new Date(time)

package/lib/parts/i18n.part.js

@@ -1,3 +1,4 @@
+'use strict'
 // ── i18n ──────────────────────────────────────────────────────────────
 function isZh() {
   try {
@@ -7,7 +8,6 @@ function isZh() {
     return false
   }
 }
-
 const strings = {
   title: () => (isZh() ? '文件活动' : 'File Activity'),
   recent: () => (isZh() ? '最近访问' : 'Recent'),
@@ -43,5 +43,19 @@ const strings = {
     isZh() ? '文件位于工作区外，暂无法读取内容' : 'The file is outside the workspace and cannot be read',
   downloadToView: () => (isZh() ? '下载查看' : 'download to view'),
   clickOutsideToClose: () => (isZh() ? '点击外部关闭' : 'Click outside to close'),
+  guideDescription: () =>
+    isZh()
+      ? '查看 agent 与侧边栏读写过的文件（最近访问 + 目录统计）'
+      : 'Files the agent and the sidebar touched (recent + tree)',
+  autoOpenLabel: () => (isZh() ? '会话开始时自动打开' : 'Auto-open on session start'),
+  autoOpenHint: () =>
+    isZh()
+      ? '每个会话首次打开时自动显示本页；关闭后仍可从侧边栏右上角的「新标签页」手动打开。'
+      : 'Shows this page once per session. When off, open it from the sidebar new-tab control.',
+  tabUnavailable: () => (isZh() ? '侧边栏扩展点不可用' : 'Sidebar extension point unavailable'),
+  tabUnavailableHint: () =>
+    isZh()
+      ? '本插件未能注册页签（宿主原生 API 可能已变更）。原因见浏览器控制台。'
+      : 'This plugin could not register its tab (the host native API may have changed). See the browser console.',
   autoCloseHint: () => (isZh() ? '预览失败，即将自动关闭' : 'Preview failed — closing automatically'),
 }

package/lib/parts/interceptor.part.js

@@ -1,40 +1,29 @@
-// ── fetch interception: sidebar file operations ───────────────────────
-function methodOf(init) {
-  return (init?.method ?? 'GET').toUpperCase()
-}
-
-/** POST body as a plain object (non-string bodies are ignored). */
-function parseBody(init) {
-  return typeof init?.body === 'string' ? JSON.parse(init.body) : {}
-}
-
-/** Record fs.read / fs.write POSTs observed on the sidebar API. */
-function recordSidebarFs(url, init) {
-  if (url.pathname !== '/sidebar/api/fs.read' && url.pathname !== '/sidebar/api/fs.write') return
-  if (methodOf(init) !== 'POST') return
-  const body = parseBody(init)
-  if (typeof body.sessionId !== 'string' || typeof body.path !== 'string') return
-  postRecord(body.sessionId, body.path, url.pathname === '/sidebar/api/fs.write' ? 'write' : 'read')
-}
-
-/** Record sidebar media opens (/sidebar/file?sessionId=...&path=...). */
-function recordMediaOpen(url, init) {
-  if (url.pathname !== '/sidebar/file' || methodOf(init) !== 'GET') return
+'use strict'
+// ── fetch interception: the plugin's own file routes ───────────────────
+//
+// Before the native migration this module also watched the THIRD-PARTY
+// sidebar's routes (/sidebar/api/fs.read|fs.write, /sidebar/file). Those are
+// the host's internal surface now, fed by the host's own file provider and
+// document owner — the plugin neither opens nor owns them, so observing them
+// would record host traffic that is already recorded through the plugin's
+// fs/observed host half. What remains is the plugin's own media/text route,
+// whose reads ARE the user's previews.
+/** Record requests for the plugin's own file route (media + text previews). */
+function recordOwnMediaOpen(url, init) {
+  if (url.pathname !== '/file-activity/file') return
+  if ((init?.method ?? 'GET').toUpperCase() !== 'GET') return
   const sessionId = url.searchParams.get('sessionId')
   const path = url.searchParams.get('path')
   if (sessionId !== null && path !== null) postRecord(sessionId, path, 'read')
 }
-
-/** Observe a resolved fetch URL and record sidebar file operations. */
+/** Observe a resolved fetch URL and record plugin file operations. */
 function observeSidebarFetch(url, init) {
   try {
-    recordSidebarFs(url, init)
-    recordMediaOpen(url, init)
+    recordOwnMediaOpen(url, init)
   } catch {
     // observation must never break the underlying call
   }
 }
-
 function installFetchInterceptor() {
   const original = window.fetch.bind(window)
   window.fetch = (input, init) => {