@cjhyy/code-shell-server 0.9.6 → 0.9.8

package/dist/sessions-service.d.ts

@@ -7,6 +7,8 @@ export interface DesktopSessionSummary {
     id: string;
     /** Path to the session file on disk. */
     file: string;
+    /** Durable title/summary; UI-side renamed titles can override it. */
+    title?: string;
     size: number;
     createdAt: number;
     updatedAt: number;
@@ -35,8 +37,10 @@ export interface DiskSessionMeta {
     cwd: string;
     title: string;
     updatedAt: number;
-    /** Session origin — only "desktop" / "automation" are listed (see filter). */
-    origin: "desktop" | "automation";
+    /** Sub-agents are returned only by an explicit parentSessionId query. */
+    origin: "desktop" | "automation" | "subagent";
+    /** Present only when listing the direct children of a session. */
+    parentSessionId?: string;
     /** Normalized durable status for Pet/display consumers. */
     status?: "active" | "paused" | "completed" | "failed" | "cancelled";
     /** Exceptional completed-run boundary; absent means a normal final answer. */
@@ -51,16 +55,18 @@ export interface ListDiskSessionsResult {
     nextCursor: string | null;
 }
 /**
- * List top-level (non-sub-agent) sessions from disk, newest first, paginated.
+ * List sessions from disk, newest first, paginated. The default catalog is
+ * top-level only; parentSessionId selects direct children for transcript views.
  * Filter on state.json `parentSessionId`:
  *   - key absent  → legacy → skip (存量 not auto-rebuilt)
- *   - null / ""   → top-level → show
- *   - non-empty   → sub-agent → filter out
+ *   - null / ""   → top-level → show only in the default catalog
+ *   - non-empty   → sub-agent → show only for the matching parent query
  */
 export declare function listDiskSessions(opts: {
     limit: number;
     cursor?: string;
     includeArchived?: boolean;
+    parentSessionId?: string;
 }, baseDir?: string): Promise<ListDiskSessionsResult>;
 /**
  * Set (number) or clear (undefined) a session's durable archival marker on

package/dist/sessions-service.js

@@ -8,6 +8,7 @@ import * as path from "node:path";
 const SAFE_ID = /^[A-Za-z0-9_.-]+$/;
 const QUICK_CHAT_SESSION_PREFIX = "qchat-";
 const PANEL_TASK_SESSION_PREFIX = "panel-task-";
+const MAX_HISTORY_STATE_BYTES = 2 * 1024 * 1024;
 function isQuickChatSessionId(id) {
     return id.startsWith(QUICK_CHAT_SESSION_PREFIX);
 }
@@ -17,32 +18,17 @@ function isInternalEphemeralSessionId(id) {
 export async function listSessions(baseDir = sessionsRoot()) {
     try {
         const entries = await fs.readdir(baseDir, { withFileTypes: true });
-        const summaries = [];
-        for (const e of entries) {
-            if (!e.isFile())
-                continue;
-            if (!e.name.endsWith(".jsonl") && !e.name.endsWith(".json"))
-                continue;
-            const id = e.name.replace(/\.jsonl?$/, "");
-            if (isInternalEphemeralSessionId(id))
-                continue;
-            const full = path.join(baseDir, e.name);
-            try {
-                const st = await fs.stat(full);
-                summaries.push({
-                    id,
-                    file: full,
-                    size: st.size,
-                    createdAt: st.birthtimeMs || st.mtimeMs,
-                    updatedAt: st.mtimeMs,
-                });
-            }
-            catch {
-                // Skip files we cannot stat (race with delete, permissions).
+        // Prefer the current directory layout when a migration left a flat copy.
+        const candidates = entries.sort((a, b) => Number(b.isDirectory()) - Number(a.isDirectory()));
+        const summaries = new Map();
+        for (let offset = 0; offset < candidates.length; offset += 32) {
+            const batch = await Promise.all(candidates.slice(offset, offset + 32).map((entry) => readHistorySummary(entry, baseDir)));
+            for (const summary of batch) {
+                if (summary && !summaries.has(summary.id))
+                    summaries.set(summary.id, summary);
             }
         }
-        summaries.sort((a, b) => b.updatedAt - a.updatedAt);
-        return summaries;
+        return [...summaries.values()].sort((a, b) => b.updatedAt - a.updatedAt || a.id.localeCompare(b.id));
     }
     catch (e) {
         if (e.code === "ENOENT")
@@ -50,6 +36,66 @@ export async function listSessions(baseDir = sessionsRoot()) {
         throw e;
     }
 }
+async function readHistorySummary(entry, baseDir) {
+    const directory = entry.isDirectory();
+    if (!directory && (!entry.isFile() || !/\.jsonl?$/.test(entry.name)))
+        return null;
+    const id = directory ? entry.name : entry.name.replace(/\.jsonl?$/, "");
+    if (!SAFE_ID.test(id) ||
+        id.startsWith(".") ||
+        id.includes("..") ||
+        id.length > 128 ||
+        isInternalEphemeralSessionId(id))
+        return null;
+    try {
+        const file = path.join(baseDir, entry.name, ...(directory ? ["state.json"] : []));
+        const info = await fs.lstat(file);
+        if (!info.isFile() || info.isSymbolicLink())
+            return null;
+        const summary = {
+            id,
+            file,
+            size: info.size,
+            createdAt: info.birthtimeMs || info.mtimeMs,
+            updatedAt: info.mtimeMs,
+        };
+        if (!directory)
+            return summary;
+        if (info.size > MAX_HISTORY_STATE_BYTES)
+            return null;
+        const state = JSON.parse(await fs.readFile(file, "utf8"));
+        if (!state || typeof state !== "object" || Array.isArray(state))
+            return null;
+        // History includes archived/legacy sessions, but internal conversations
+        // and temporary forks must stay out of the user-facing catalog.
+        if (state.ephemeral === true || state.kind === "pet" || state.parentSessionId)
+            return null;
+        const title = typeof state.title === "string" && state.title ? state.title : state.summary;
+        if (typeof title === "string" && title)
+            summary.title = title.slice(0, 1024);
+        if (typeof state.startedAt === "number" && Number.isFinite(new Date(state.startedAt).getTime()))
+            summary.createdAt = state.startedAt;
+        const transcript = path.join(baseDir, id, "transcript.jsonl");
+        try {
+            const transcriptInfo = await fs.lstat(transcript);
+            if (!transcriptInfo.isFile() || transcriptInfo.isSymbolicLink())
+                return null;
+            summary.file = transcript;
+            summary.size += transcriptInfo.size;
+            summary.updatedAt = Math.max(info.mtimeMs, transcriptInfo.mtimeMs);
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                throw error;
+            // A newly persisted session may not have a transcript yet.
+        }
+        return summary;
+    }
+    catch {
+        // One corrupt/unreadable session or a concurrent delete cannot hide the rest.
+        return null;
+    }
+}
 /**
  * Remove a session's on-disk data. Modern sessions are a directory
  * `<sessionsDir>/<id>/` (transcript.jsonl + state.json — see core
@@ -147,13 +193,23 @@ function decodeDiskSessionCursor(value) {
     return Number.isFinite(mtime) ? { mtime, id: match[2] } : null;
 }
 /**
- * List top-level (non-sub-agent) sessions from disk, newest first, paginated.
+ * List sessions from disk, newest first, paginated. The default catalog is
+ * top-level only; parentSessionId selects direct children for transcript views.
  * Filter on state.json `parentSessionId`:
  *   - key absent  → legacy → skip (存量 not auto-rebuilt)
- *   - null / ""   → top-level → show
- *   - non-empty   → sub-agent → filter out
+ *   - null / ""   → top-level → show only in the default catalog
+ *   - non-empty   → sub-agent → show only for the matching parent query
  */
 export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
+    const parentSessionId = opts.parentSessionId;
+    if (parentSessionId !== undefined &&
+        (typeof parentSessionId !== "string" ||
+            !SAFE_ID.test(parentSessionId) ||
+            parentSessionId.length > 128 ||
+            parentSessionId === "." ||
+            parentSessionId.includes(".."))) {
+        throw new Error("invalid parent session id");
+    }
     // Async fs throughout: this is an IPC handler on the Electron main thread
     // (sessions:listDisk). The previous synchronous statSync/readFileSync loops
     // never yielded the event loop and froze the UI while enumerating sessions.
@@ -219,13 +275,22 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
             continue;
         if (!("parentSessionId" in state))
             continue; // legacy → skip
-        if (state.parentSessionId)
-            continue; // sub-agent (non-empty) → filter
-        // Only desktop + automation belong in the desktop sidebar. tui / missing
-        // origin are filtered out (tui shares ~/.code-shell; legacy has no origin).
+        if (parentSessionId !== undefined) {
+            if (state.parentSessionId !== parentSessionId)
+                continue;
+        }
+        else if (state.parentSessionId) {
+            continue;
+        }
+        // Only desktop + automation belong in the desktop sidebar. Targeted
+        // queries additionally expose subagent origin. tui / missing origins stay
+        // filtered out (tui shares ~/.code-shell; legacy has no origin).
         const origin = state.origin;
-        if (origin !== "desktop" && origin !== "automation")
+        if (origin !== "desktop" &&
+            origin !== "automation" &&
+            !(parentSessionId !== undefined && origin === "subagent")) {
             continue;
+        }
         // Skip sessions whose project root has been deleted. Listing them led the
         // renderer's disk-rebuild to call createRepoForCwd → the deleted project
         // reappeared in the sidebar, and any subsequent write under that cwd
@@ -233,7 +298,9 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
         // is intentionally NOT filtered here — the renderer handles that via
         // isNoRepoCwd. (deleted-project resurrection)
         const cwdStr = typeof state.cwd === "string" ? state.cwd : "";
-        if (cwdStr && !(await pathExists(cwdStr)))
+        // A child transcript remains useful after its temporary worktree is gone;
+        // targeted reads do not rebuild projects in the sidebar.
+        if (parentSessionId === undefined && cwdStr && !(await pathExists(cwdStr)))
             continue;
         // Archived sessions are hidden from the default catalog. Filtering happens
         // before the push (like every other skip above), so the mtime cursor —
@@ -254,6 +321,7 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
                 (typeof state.summary === "string" && state.summary ? state.summary : id),
             updatedAt: mtime,
             origin,
+            ...(parentSessionId !== undefined ? { parentSessionId } : {}),
             status: state.status === "active" || state.status === "paused" || state.status === "completed"
                 ? state.status
                 : state.status === "aborted_streaming" || state.status === "aborted_tools"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "description": "CodeShell server transport layer — mobile remote HTTP/WS host, pairing, passcode gate, tunnel, rooms, uploads, and session/attachment services. Electron-free; precursor of the auth gateway.",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,9 +39,9 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.6",
-    "@cjhyy/code-shell-core": "0.9.6",
-    "@cjhyy/code-shell-web": "0.9.6",
+    "@cjhyy/code-shell-capability-coding": "0.9.8",
+    "@cjhyy/code-shell-core": "0.9.8",
+    "@cjhyy/code-shell-web": "0.9.8",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0"
   },