dsh-session-mng 0.1.2 → 0.1.4

package/lib/state.js

@@ -140,10 +140,31 @@ function headerOf(row, snapshotsById, ctx) {
   return snapshotsById.get(row.sessionId)?.header
 }
 
-/** Whether a header/summary pair describes a subagent session. */
-function isSubagent(header, summary) {
-  if (header?.origin === 'subagent' || summary?.origin === 'subagent') return true
-  return Boolean(header?.parentSession ?? summary?.parentSessionId)
+/**
+ * Classify one session from whatever identifying fields are available.
+ *
+ * Callers pass a stored header, a list summary, or a merged view, so both
+ * field spellings are accepted (`parentSession` on a header, `parentSessionId`
+ * on a summary). Keeping this in one place is what makes the listing, the
+ * delete scope and the move guard agree on what an ordinary fork is: only
+ * delegation (`origin: 'subagent'` or a delegation depth) marks an internal
+ * session. A parent alone is not enough — an ordinary fork carries one too,
+ * and historical forks still record it.
+ */
+export function classifySession(fields) {
+  if (fields?.origin === 'subagent') return 'subagent'
+  if (typeof fields?.delegationDepth === 'number' && fields.delegationDepth >= 1) return 'subagent'
+  const parent = fields?.parentSession ?? fields?.parentSessionId
+  return parent === undefined || parent === null || parent === '' ? 'root' : 'fork'
+}
+
+/** Classify one row of the listing from its header and summary. */
+function classifyKind(header, summary) {
+  return classifySession({
+    origin: header?.origin ?? summary?.origin,
+    delegationDepth: header?.delegationDepth ?? summary?.delegationDepth,
+    parentSession: header?.parentSession ?? summary?.parentSessionId,
+  })
 }
 
 /**
@@ -201,6 +222,7 @@ export async function buildState(ctx, config, options = {}) {
   for (const id of snapshotById.keys()) knownIds.add(id)
   const rows = []
   const missingTitles = []
+  let hiddenSubagents = 0
 
   const pushRow = (base) => {
     const id = base.sessionId
@@ -208,8 +230,11 @@ export async function buildState(ctx, config, options = {}) {
     seen.add(id)
     const header = headerOf(base, snapshotById, ctx)
     const summary = base
-    const subagent = isSubagent(header, summary)
-    if (subagent && !includeSubagents) return
+    const kind = classifyKind(header, summary)
+    if (kind === 'subagent' && !includeSubagents) {
+      hiddenSubagents += 1
+      return
+    }
 
     const cwd = summary.cwd ?? header?.cwd ?? ''
     const workspace =
@@ -234,13 +259,15 @@ export async function buildState(ctx, config, options = {}) {
       running,
       blank: summary.blank === true,
       origin: header?.origin ?? summary.origin,
-      parentSessionId: header?.parentSession ?? summary.parentSessionId,
+      kind,
+      isSubagent: kind === 'subagent',
+      isFork: kind === 'fork',
+      parentSessionId: header?.parentSession ?? summary.parentSessionId ?? null,
       agentPreset: header?.agentPreset ?? '',
       createdAt: header?.createdAt ?? summary.updatedAt ?? 0,
       updatedAt: summary.updatedAt ?? header?.createdAt ?? 0,
       sizeBytes: typeof snapshot?.sizeBytes === 'number' ? snapshot.sizeBytes : 0,
       formatStatus: summary.formatStatus ?? snapshot?.formatStatus,
-      isSubagent: subagent,
     })
   }
 
@@ -268,6 +295,22 @@ export async function buildState(ctx, config, options = {}) {
     if (row.title === '') row.title = titles.get(row.id) ?? ''
   }
 
+  // A fork points at its parent by id only; resolving the title here lets the
+  // list show the relationship without a second round trip. `parentPresent`
+  // lets the client tell "untitled parent" apart from "the parent session is
+  // gone" (possible after the parent is permanently deleted).
+  const titlesById = new Map(rows.map((row) => [row.id, row.title]))
+  const forkCountByParent = new Map()
+  for (const row of rows) {
+    row.parentTitle = row.kind === 'fork' ? (titlesById.get(row.parentSessionId) ?? '') : ''
+    row.parentPresent = row.kind === 'fork' && titlesById.has(row.parentSessionId)
+    if (row.kind !== 'fork' || row.parentSessionId === null) continue
+    forkCountByParent.set(row.parentSessionId, (forkCountByParent.get(row.parentSessionId) ?? 0) + 1)
+  }
+  for (const row of rows) {
+    row.forkCount = forkCountByParent.get(row.id) ?? 0
+  }
+
   const jsonl =
     typeof ctx.sessionPersistence?.locate === 'function' && typeof ctx.sessionPersistence?.stat === 'function'
   const capabilities = {
@@ -282,7 +325,7 @@ export async function buildState(ctx, config, options = {}) {
       title: capabilities.title,
       archive: !row.archived,
       restore: row.archived,
-      move: capabilities.move && !row.live && !row.running && !row.isSubagent && row.parentSessionId === undefined,
+      move: capabilities.move && !row.live && !row.running && row.kind === 'root',
       delete: capabilities.delete && row.archived && !row.live,
       open: true,
     }
@@ -323,6 +366,8 @@ export async function buildState(ctx, config, options = {}) {
       active: rows.filter((row) => !row.archived).length,
       archived: rows.filter((row) => row.archived).length,
       subagents: rows.filter((row) => row.isSubagent).length,
+      hiddenSubagents,
+      forks: rows.filter((row) => row.isFork).length,
       bytes: totalBytes,
     },
     limits: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-mng",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "description": "Session management for DeepSeek Harness: one Settings page for every session — whole-session title generation, archive/restore, cross-workspace move, and permanent deletion of archived sessions.",
   "license": "MIT",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "git+https://github.com/ZilongYang/dsh-session-mng.git"
   },
-  "homepage": "https://github.com/ZilongYang/dsh-session-mng#readme",
+  "homepage": "https://dsh.zlmix.com/session-mng/",
   "bugs": {
     "url": "https://github.com/ZilongYang/dsh-session-mng/issues"
   },
@@ -71,7 +71,8 @@
     "compatibility": {
       "dsh": ">=0.2.0-rc.1 <0.3.0-0",
       "dshReleases": {
-        "0.2.1-rc.2": "compatible"
+        "0.2.1-rc.2": "compatible",
+        "0.2.1-rc.3": "compatible"
       }
     }
   }