@prismshadow/penguin-server 0.1.5 → 0.2.0

package/dist/index.js

@@ -55,8 +55,11 @@ CREATE TABLE IF NOT EXISTS sessions (
   approval_mode TEXT NOT NULL DEFAULT 'allow-all',   -- allow-all|deny-all|read-only|always-ask
   title         TEXT,                                -- auto-generated by the model after the first exchange; NULL=not yet (frontend shows "New chat")
   archived_at   TEXT,                                -- archive time; NULL=not archived (shown by default; archived ones move under "Archived")
+  client        TEXT,                                -- creating client: 'web' (created via the Web App) | 'cli' (adopted from a CLI Trace); NULL = legacy row, treated as web
+  has_trace     INTEGER NOT NULL DEFAULT 0,          -- cache: a Trace record exists (set at task start / adoption / subagent registration; lazily backfilled by list hydration)
   created_at    TEXT NOT NULL
-);                                            -- session origin is NOT stored: session_meta in the Trace is the single source of truth (see runtime/session-sources.ts)
+);                                            -- the schedule/subagent SOURCE is NOT stored: session_meta in the Trace is the single source of truth (see runtime/session-sources.ts); "client" is a different, DB-only axis (who created the row)
+CREATE INDEX IF NOT EXISTS idx_sessions_agent_created ON sessions(project_id, agent_id, created_at DESC);
 CREATE TABLE IF NOT EXISTS usage_records (
   id                INTEGER PRIMARY KEY AUTOINCREMENT,
   ts                TEXT NOT NULL,
@@ -133,8 +136,15 @@ function openDatabase(dbPath) {
   db.exec("PRAGMA journal_mode = WAL;");
   db.exec("PRAGMA foreign_keys = ON;");
   db.exec(SCHEMA_SQL);
+  ensureColumn(db, "sessions", "client", "TEXT");
+  ensureColumn(db, "sessions", "has_trace", "INTEGER NOT NULL DEFAULT 0");
   return db;
 }
+function ensureColumn(db, table, column, ddl) {
+  const cols = db.prepare(`PRAGMA table_info(${table})`).all();
+  if (cols.some((c) => c.name === column)) return;
+  db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${ddl}`);
+}
 
 // src/db/repos/agents.ts
 var AgentsRepo = class {
@@ -615,6 +625,8 @@ function mapRow4(r) {
     approvalMode: r.approval_mode,
     title: r.title ?? null,
     archivedAt: r.archived_at ?? null,
+    client: r.client ?? null,
+    hasTrace: r.has_trace === 1,
     createdAt: r.created_at
   };
 }
@@ -625,8 +637,8 @@ var SessionsRepo = class {
   db;
   insert(row) {
     this.db.prepare(
-      `INSERT INTO sessions (session_id, project_id, agent_id, provider, model_id, workspace, approval_mode, title, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      `INSERT INTO sessions (session_id, project_id, agent_id, provider, model_id, workspace, approval_mode, title, client, has_trace, created_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       row.sessionId,
       row.projectId,
@@ -636,14 +648,16 @@ var SessionsRepo = class {
       row.workspace,
       row.approvalMode,
       row.title,
+      row.client ?? null,
+      row.hasTrace ? 1 : 0,
       row.createdAt
     );
   }
   /** Idempotent insert: used when Trace directory discovery backfills a row (concurrent listing discovering the same Session no longer triggers a UNIQUE violation). */
   insertOrIgnore(row) {
     this.db.prepare(
-      `INSERT OR IGNORE INTO sessions (session_id, project_id, agent_id, provider, model_id, workspace, approval_mode, title, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      `INSERT OR IGNORE INTO sessions (session_id, project_id, agent_id, provider, model_id, workspace, approval_mode, title, client, has_trace, created_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       row.sessionId,
       row.projectId,
@@ -653,15 +667,30 @@ var SessionsRepo = class {
       row.workspace,
       row.approvalMode,
       row.title,
+      row.client ?? null,
+      row.hasTrace ? 1 : 0,
       row.createdAt
     );
   }
+  /** Flip the has_trace cache once a Trace record exists (task start / discovery hydration); idempotent. */
+  markHasTrace(sessionId) {
+    this.db.prepare("UPDATE sessions SET has_trace = 1 WHERE session_id = ?").run(sessionId);
+  }
   findById(sessionId) {
     const r = this.db.prepare("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
     return r ? mapRow4(r) : null;
   }
-  listByAgent(projectId, agentId) {
-    const rows = this.db.prepare("SELECT * FROM sessions WHERE project_id = ? AND agent_id = ?").all(projectId, agentId);
+  /**
+   * An Agent's rows, newest first (the list order the sidebar shows; served by
+   * idx_sessions_agent_created). `webOnly` keeps only web-created rows — NULL counts as
+   * web (legacy rows predate the column and the user chose to grandfather them as visible).
+   */
+  listByAgent(projectId, agentId, opts = {}) {
+    const filter = opts.webOnly ? " AND (client IS NULL OR client = 'web')" : "";
+    const rows = this.db.prepare(
+      `SELECT * FROM sessions WHERE project_id = ? AND agent_id = ?${filter}
+         ORDER BY created_at DESC, session_id DESC`
+    ).all(projectId, agentId);
     return rows.map(mapRow4);
   }
   listByProject(projectId) {
@@ -2200,24 +2229,8 @@ async function readItem(deps2, projectId, agentId, name) {
 // src/http/routes/benchmarks.ts
 import { Hono as Hono10 } from "hono";
 var TEXT_PREVIEW_BYTES = 256 * 1024;
-function benchmarksRoutes(deps2) {
-  const app2 = new Hono10();
-  app2.get("/", async (c) => {
-    const projectId = requireValidId(c, "projectId");
-    const agentId = requireValidId(c, "agentId");
-    deps2.projectService.requireProjectAccess(c.var.user.userId, projectId);
-    await deps2.agentConfigService.requireExists(projectId, agentId);
-    return c.json(await deps2.benchmarks.list(projectId, agentId));
-  });
-  app2.get("/:benchmarkId/cases", async (c) => {
-    const projectId = requireValidId(c, "projectId");
-    const agentId = requireValidId(c, "agentId");
-    const benchmarkId = requireValidId(c, "benchmarkId");
-    deps2.projectService.requireProjectAccess(c.var.user.userId, projectId);
-    await deps2.agentConfigService.requireExists(projectId, agentId);
-    return c.json(await deps2.benchmarks.listCases(projectId, agentId, benchmarkId));
-  });
-  app2.get("/:benchmarkId/cases/:caseId/files", async (c) => {
+function listCaseFiles(deps2, material) {
+  return async (c) => {
     const projectId = requireValidId(c, "projectId");
     const agentId = requireValidId(c, "agentId");
     const benchmarkId = requireValidId(c, "benchmarkId");
@@ -2230,11 +2243,14 @@ function benchmarksRoutes(deps2) {
         agentId,
         benchmarkId,
         caseId,
-        c.req.query("path") ?? ""
+        c.req.query("path") ?? "",
+        material
       )
     );
-  });
-  app2.get("/:benchmarkId/cases/:caseId/files/content", async (c) => {
+  };
+}
+function readCaseFile(deps2, material) {
+  return async (c) => {
     const projectId = requireValidId(c, "projectId");
     const agentId = requireValidId(c, "agentId");
     const benchmarkId = requireValidId(c, "benchmarkId");
@@ -2249,6 +2265,7 @@ function benchmarksRoutes(deps2) {
       benchmarkId,
       caseId,
       c.req.query("path") ?? "",
+      material,
       boundedPreview ? { maxBytes: TEXT_PREVIEW_BYTES } : void 0
     );
     return new Response(new Uint8Array(data), {
@@ -2260,7 +2277,29 @@ function benchmarksRoutes(deps2) {
         ...truncated ? { "X-Content-Truncated": "1" } : {}
       }
     });
+  };
+}
+function benchmarksRoutes(deps2) {
+  const app2 = new Hono10();
+  app2.get("/", async (c) => {
+    const projectId = requireValidId(c, "projectId");
+    const agentId = requireValidId(c, "agentId");
+    deps2.projectService.requireProjectAccess(c.var.user.userId, projectId);
+    await deps2.agentConfigService.requireExists(projectId, agentId);
+    return c.json(await deps2.benchmarks.list(projectId, agentId));
   });
+  app2.get("/:benchmarkId/cases", async (c) => {
+    const projectId = requireValidId(c, "projectId");
+    const agentId = requireValidId(c, "agentId");
+    const benchmarkId = requireValidId(c, "benchmarkId");
+    deps2.projectService.requireProjectAccess(c.var.user.userId, projectId);
+    await deps2.agentConfigService.requireExists(projectId, agentId);
+    return c.json(await deps2.benchmarks.listCases(projectId, agentId, benchmarkId));
+  });
+  app2.get("/:benchmarkId/cases/:caseId/files", listCaseFiles(deps2, "statement"));
+  app2.get("/:benchmarkId/cases/:caseId/files/content", readCaseFile(deps2, "statement"));
+  app2.get("/:benchmarkId/cases/:caseId/rubric/files", listCaseFiles(deps2, "rubric"));
+  app2.get("/:benchmarkId/cases/:caseId/rubric/files/content", readCaseFile(deps2, "rubric"));
   return app2;
 }
 
@@ -3005,7 +3044,11 @@ var WorkspaceFilesService = class {
 import fs7 from "fs/promises";
 import path6 from "path";
 import { randomBytes as randomBytes4 } from "crypto";
-import { appendAttachmentLines, attachedFileLine } from "@prismshadow/penguin-core";
+import {
+  appendAttachmentLines,
+  attachedFileLine,
+  modelVisiblePath
+} from "@prismshadow/penguin-core";
 var MAX_ATTACHMENT_BYTES = 10 * 1024 * 1024;
 var MAX_ATTACHMENT_COUNT = 20;
 var MAX_TOTAL_ATTACHMENT_BYTES = 12 * 1024 * 1024;
@@ -3029,21 +3072,21 @@ function truncateBytes(value, maxBytes) {
   return out;
 }
 var MAX_NAME_ATTEMPTS = 16;
-function parseAttachmentPart(part, index) {
+function parseAttachmentPart(part, index, field = "input") {
   const fileName = part.fileName;
   if (typeof fileName !== "string" || fileName.length === 0 || fileName.includes("/") || fileName.includes("\\") || fileName.includes("..") || fileName.includes("\0")) {
     throw badRequest(
-      `input[${index}].fileName must be a non-empty file name without path separators or "..".`
+      `${field}[${index}].fileName must be a non-empty file name without path separators or "..".`
     );
   }
   const dataUrl = part.dataUrl;
   const match = typeof dataUrl === "string" ? /^data:[^,]*;base64,([A-Za-z0-9+/=\s]+)$/.exec(dataUrl) : null;
   if (!match) {
-    throw badRequest(`input[${index}].dataUrl must be a base64 data: URL of the file's bytes.`);
+    throw badRequest(`${field}[${index}].dataUrl must be a base64 data: URL of the file's bytes.`);
   }
   const bytes = Buffer.from(match[1], "base64");
   if (bytes.length === 0) {
-    throw badRequest(`input[${index}].dataUrl decodes to an empty file.`);
+    throw badRequest(`${field}[${index}].dataUrl decodes to an empty file.`);
   }
   if (bytes.length > MAX_ATTACHMENT_BYTES) {
     throw new HttpError(
@@ -3125,7 +3168,13 @@ async function attachFilesToInput(messages, attachments, root, sessionId) {
     await removeAttachments(written);
     throw err;
   }
-  return { input: appendAttachmentLines(messages, written.map(attachedFileLine)), written };
+  return {
+    input: appendAttachmentLines(
+      messages,
+      written.map((filePath) => attachedFileLine(modelVisiblePath(filePath)))
+    ),
+    written
+  };
 }
 
 // src/http/routes/sessions.ts
@@ -3202,6 +3251,20 @@ function parseSteerImages(body) {
   if (!Array.isArray(images)) throw badRequest("images must be an array.");
   return images.map((url, i) => requireImageUrl(url, `images[${i}]`));
 }
+function parseSteerFiles(body) {
+  const files = body.files;
+  if (files === void 0) return [];
+  if (!Array.isArray(files)) throw badRequest("files must be an array.");
+  const attachments = [];
+  files.forEach((item, i) => {
+    if (item === null || typeof item !== "object" || Array.isArray(item)) {
+      throw badRequest(`files[${i}] must be an object.`);
+    }
+    attachments.push(parseAttachmentPart(item, i, "files"));
+    assertAttachmentBudget(attachments);
+  });
+  return attachments;
+}
 function parseGoalField(body) {
   const goal = body.goal;
   if (goal === void 0) return null;
@@ -3228,13 +3291,16 @@ function agentSessionsRoutes(deps2) {
     }
     const rawCounts = c.req.query("counts");
     if (rawCounts !== void 0 && rawCounts !== "1") throw badRequest("counts only accepts 1.");
+    const rawCli = c.req.query("cli");
+    if (rawCli !== void 0 && rawCli !== "1") throw badRequest("cli only accepts 1.");
     const { sessions, counts, workspaceCounts } = await deps2.sessionService.listSessions(
       projectId,
       agentId,
       {
         ...paging ? { paging } : {},
         ...rawCategory !== void 0 ? { category: rawCategory } : {},
-        ...rawCounts !== void 0 ? { withCounts: true } : {}
+        ...rawCounts !== void 0 ? { withCounts: true } : {},
+        ...rawCli !== void 0 ? { includeCli: true } : {}
       }
     );
     return c.json({
@@ -3433,11 +3499,15 @@ function sessionsRoutes(deps2) {
   app2.get("/:sessionId/stream", (c) => {
     const row = resolveSession(c);
     const channel = deps2.channels.get(row.sessionId);
+    const pendingSteering = deps2.manager.pendingSteeringOf(row.sessionId);
     const initialEvents = [
       {
         type: "task_state",
         state: deps2.manager.statusOf(row.sessionId),
-        queued: deps2.manager.pendingFollowUpCount(row.sessionId)
+        queued: deps2.manager.pendingFollowUpCount(row.sessionId),
+        // Undelivered steering rides the snapshot too, so the composer's "steering queued"
+        // hint (and what it says) survives a reload.
+        ...pendingSteering.length > 0 ? { pendingSteering } : {}
       },
       ...deps2.manager.pendingApprovals(row.sessionId).map((p) => ({
         type: "approval_request",
@@ -3493,13 +3563,26 @@ function sessionsRoutes(deps2) {
     const body = await readJson(c);
     const text = typeof body.text === "string" ? body.text.trim() : "";
     const images = parseSteerImages(body);
-    if (!text && images.length === 0) {
-      throw badRequest("text or images must carry the steering message.");
+    const files = parseSteerFiles(body);
+    if (!text && images.length === 0 && files.length === 0) {
+      throw badRequest("text, images or files must carry the steering message.");
+    }
+    const { input, written } = await attachFilesToInput(
+      [...text ? [userText(text)] : [], ...images.map((url) => imageUrlMessage(url))],
+      files,
+      scratchpadDir(deps2.config.root, row.projectId, row.agentId),
+      row.sessionId
+    );
+    try {
+      deps2.manager.steer(row.sessionId, input, {
+        text,
+        images: images.length,
+        files: files.length
+      });
+    } catch (err) {
+      await removeAttachments(written);
+      throw err;
     }
-    deps2.manager.steer(row.sessionId, [
-      ...text ? [userText(text)] : [],
-      ...images.map((url) => imageUrlMessage(url))
-    ]);
     return c.body(null, 202);
   });
   app2.get("/:sessionId/goal", (c) => {
@@ -3962,6 +4045,7 @@ import {
   goalTokenDelta,
   isGoalRoundInput,
   isSessionMeta as isSessionMeta2,
+  parseUserSteeringText,
   stripLeadingMarkerBlocks,
   tracesDir
 } from "@prismshadow/penguin-core";
@@ -4492,6 +4576,11 @@ var EARLY_TITLE_BODY_CHARS = 1e3;
 function agentKey(projectId, agentId) {
   return `${projectId}\0${agentId}`;
 }
+function isDeliveredSteering(msg) {
+  const p = msg.payload;
+  if (msg.type !== "model_msg" || p.type !== "text" || p.role !== "user") return false;
+  return typeof p.text === "string" && parseUserSteeringText(p.text) !== null;
+}
 function runSubagentCall(msg) {
   const p = msg.payload;
   if (msg.type !== "model_msg" || p.type !== "tool_call" || p.name !== "run_subagent") return null;
@@ -4564,6 +4653,10 @@ var SessionManager = class {
   pendingFollowUpCount(sessionId) {
     return this.entries.get(sessionId)?.followUps.length ?? 0;
   }
+  /** Steering messages queued but not yet delivered to the model (display mirror; see RuntimeEntry.pendingSteering). */
+  pendingSteeringOf(sessionId) {
+    return this.entries.get(sessionId)?.pendingSteering ?? [];
+  }
   /**
    * Live tail of a running session: one synthetic `partial_* start` OmniMessage per open
    * streaming fragment, carrying the full accumulated content so far (see live-tail.ts).
@@ -4596,6 +4689,7 @@ var SessionManager = class {
       running: null,
       generation: this.generationOf(row.projectId, row.agentId),
       followUps: [],
+      pendingSteering: [],
       lastActivityMs: Date.now()
     });
   }
@@ -4889,8 +4983,13 @@ var SessionManager = class {
    * publishes). 409 when the Session isn't running a Task (idle / compacting / not loaded)
    * or the run finished in the race window — the caller falls back to submitting a normal
    * task, which carries the same text and images.
+   *
+   * `info` is the queued message's display summary: mirrored on the entry and broadcast via
+   * `task_state` (and the SSE subscribe snapshot) until the delivered `[user_steering]`
+   * message is observed on the stream — that is what keeps the composer's "steering queued"
+   * hint, content included, alive across reloads.
    */
-  steer(sessionId, input) {
+  steer(sessionId, input, info) {
     const entry = this.entries.get(sessionId);
     if (!entry || entry.status !== "running" || !entry.session.steer(input)) {
       throw new HttpError(
@@ -4899,7 +4998,9 @@ var SessionManager = class {
         "This Session has no Task in progress; send the message as a new task instead."
       );
     }
+    entry.pendingSteering.push(info);
     entry.lastActivityMs = Date.now();
+    this.publishState(entry, entry.status);
   }
   /**
    * "Retry now" on the reconnect countdown: skip the in-progress backoff wait and fire
@@ -5114,6 +5215,7 @@ var SessionManager = class {
       running: null,
       generation,
       followUps: [],
+      pendingSteering: [],
       lastActivityMs: Date.now()
     };
     this.entries.set(currentId, entry);
@@ -5126,6 +5228,7 @@ var SessionManager = class {
    * a title): it collects model text for automatic title generation.
    */
   async drive(entry, gen, titleSource) {
+    this.deps.sessions.markHasTrace(entry.sessionId);
     let earlyTitleFired = false;
     let mainBodyChars = 0;
     const ctx = {
@@ -5151,6 +5254,10 @@ var SessionManager = class {
           if (denied) subagentPrompts.delete(denied);
           const settled = settledToolCallId(msg);
           if (settled) subagentPrompts.delete(settled);
+          if (entry.pendingSteering.length > 0 && isDeliveredSteering(msg)) {
+            entry.pendingSteering.shift();
+            this.publishState(entry, entry.status);
+          }
         } else if (isSessionMeta2(msg)) {
           try {
             const child = this.registerChildSession(entry, msg, children);
@@ -5213,6 +5320,7 @@ var SessionManager = class {
       entry.status = "idle";
       entry.abort = null;
       entry.running = null;
+      entry.pendingSteering = [];
       entry.lastActivityMs = Date.now();
       this.publishState(entry, "idle");
       if (titleSource && titleSource.userExcerpt.trim()) {
@@ -5271,6 +5379,8 @@ var SessionManager = class {
       // inserted with defaults (matches the convention for Sessions discovered by the CLI).
       approvalMode: "allow-all",
       title: null,
+      // Spawned by this server's run (client NULL = web); its Trace exists by construction.
+      hasTrace: true,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     this.publishEvent(entry, {
@@ -5291,7 +5401,12 @@ var SessionManager = class {
     return child;
   }
   publishState(entry, state) {
-    this.publishEvent(entry, { type: "task_state", state, queued: entry.followUps.length });
+    this.publishEvent(entry, {
+      type: "task_state",
+      state,
+      queued: entry.followUps.length,
+      ...entry.pendingSteering.length > 0 ? { pendingSteering: entry.pendingSteering } : {}
+    });
   }
   publishEvent(entry, event) {
     this.deps.channels.get(entry.sessionId).publish(event, "server_event");
@@ -6888,7 +7003,13 @@ var BenchmarkService = class {
     for (const entry of entries.filter((item) => item.isDirectory() && item.name.startsWith("CASE-")).sort((a, b) => a.name.localeCompare(b.name))) {
       const fallback = { id: entry.name, title: entry.name };
       try {
-        const statementDir = await this.statementRoot(projectId, agentId, benchmarkId, entry.name);
+        const statementDir = await this.caseMaterialRoot(
+          projectId,
+          agentId,
+          benchmarkId,
+          entry.name,
+          "statement"
+        );
         const realReadme = await fs13.realpath(path12.join(statementDir, "README.md"));
         if (!isWithin(statementDir, realReadme)) throw new Error("README escapes Statement");
         cases.push({
@@ -6901,30 +7022,42 @@ var BenchmarkService = class {
     }
     return { cases };
   }
-  async listCaseFiles(projectId, agentId, benchmarkId, caseId, rel) {
-    const statementDir = await this.statementRoot(projectId, agentId, benchmarkId, caseId);
-    return this.workspaceFiles.list(statementDir, rel);
+  async listCaseFiles(projectId, agentId, benchmarkId, caseId, rel, material) {
+    const materialRoot = await this.caseMaterialRoot(
+      projectId,
+      agentId,
+      benchmarkId,
+      caseId,
+      material
+    );
+    return this.workspaceFiles.list(materialRoot, rel);
   }
-  async readCaseFile(projectId, agentId, benchmarkId, caseId, rel, options) {
-    const statementDir = await this.statementRoot(projectId, agentId, benchmarkId, caseId);
-    return this.workspaceFiles.read(statementDir, rel, options);
+  async readCaseFile(projectId, agentId, benchmarkId, caseId, rel, material, options) {
+    const materialRoot = await this.caseMaterialRoot(
+      projectId,
+      agentId,
+      benchmarkId,
+      caseId,
+      material
+    );
+    return this.workspaceFiles.read(materialRoot, rel, options);
   }
-  async statementRoot(projectId, agentId, benchmarkId, caseId) {
+  async caseMaterialRoot(projectId, agentId, benchmarkId, caseId, material) {
     const benchDir = path12.join(benchmarksDir(this.root, projectId, agentId), benchmarkId);
     const caseDir = path12.join(benchDir, caseId);
-    const statementDir = path12.join(caseDir, "statement");
+    const materialRoot = path12.join(caseDir, material);
     try {
-      const [realBenchDir, realCaseDir, realStatementDir] = await Promise.all([
+      const [realBenchDir, realCaseDir, realMaterialRoot] = await Promise.all([
         fs13.realpath(benchDir),
         fs13.realpath(caseDir),
-        fs13.realpath(statementDir)
+        fs13.realpath(materialRoot)
       ]);
-      if (!isWithin(realBenchDir, realCaseDir) || path12.dirname(realStatementDir) !== realCaseDir || path12.basename(realStatementDir) !== "statement") {
-        throw new Error("Statement path is not canonical");
+      if (!isWithin(realBenchDir, realCaseDir) || path12.dirname(realMaterialRoot) !== realCaseDir || path12.basename(realMaterialRoot) !== material) {
+        throw new Error("Case material is not canonical");
       }
-      return realStatementDir;
+      return realMaterialRoot;
     } catch {
-      throw new HttpError(404, "not_found", "Public Case Statement does not exist.");
+      throw new HttpError(404, "not_found", `Case ${material} does not exist.`);
     }
   }
   async readBenchmark(benchDir, id) {
@@ -7524,11 +7657,19 @@ var SessionService = class {
     return await this.sourceOf(row, hasTrace, traces) ?? "active";
   }
   /**
-   * List: DB ∪ Trace directory discovery, sorted by createdAt descending. Optional
-   * `paging` returns just that slice (the sidebar pages with limit+1 to detect "has
-   * more"); slicing happens before toInfo, so per-request source derivation (lazy
-   * Trace-head reads) stays bounded by the page size. Discovery/adoption still scans
-   * the whole directory — the union and global ordering need every id.
+   * List, sorted by createdAt descending. The default serves **web sessions straight from
+   * the DB** (`client` web/NULL rows) with no Trace directory scanning — the answer to
+   * many-session sidebar reloads re-walking the filesystem on every request (#139). One
+   * lazy discovery walk still runs for a list call that contains rows this process has not
+   * classified yet (no in-process source entry): it supplies the Trace locations for the
+   * one-time head reads and backfills the `has_trace` cache; once every row is classified,
+   * list calls touch only the DB. `includeCli` widens the list to DB ∪ Trace directory
+   * discovery (adopting unmanaged CLI Traces as `client: "cli"` rows), which inherently
+   * scans — that path is opt-in via the "show CLI sessions" preference.
+   *
+   * Optional `paging` returns just that slice (the sidebar pages with limit+1 to detect
+   * "has more"); slicing happens before toInfo, so per-request source derivation (lazy
+   * Trace-head reads) stays bounded by the page size.
    *
    * `category` filters to one sidebar bucket **before** paging, so offset/limit page
    * within the category. Filtering needs each walked row's category (a possible
@@ -7539,20 +7680,32 @@ var SessionService = class {
    * folders (and a workspace group can know its own share) without loading them.
    */
   async listSessions(projectId, agentId, opts = {}) {
-    const { paging, category, withCounts } = opts;
-    const traces = await this.discoverTraces(projectId, agentId);
+    const { paging, category, withCounts, includeCli } = opts;
     const rows = new Map(
-      this.deps.sessions.listByAgent(projectId, agentId).map((r) => [r.sessionId, r])
+      this.deps.sessions.listByAgent(projectId, agentId, { webOnly: !includeCli }).map((r) => [r.sessionId, r])
     );
-    for (const [sessionId, location] of traces) {
-      if (rows.has(sessionId)) continue;
-      const discovered = await this.adoptTraceSession(projectId, agentId, sessionId, location);
-      if (discovered) rows.set(sessionId, discovered);
+    let traces;
+    if (includeCli) {
+      traces = await this.discoverTraces(projectId, agentId);
+      for (const [sessionId, location] of traces) {
+        if (rows.has(sessionId)) continue;
+        const discovered = await this.adoptTraceSession(projectId, agentId, sessionId, location);
+        if (discovered) rows.set(sessionId, discovered);
+      }
+    } else if ([...rows.values()].some((r) => this.deps.sources.get(r.sessionId) === void 0)) {
+      traces = await this.discoverTraces(projectId, agentId);
+      for (const row of rows.values()) {
+        if (!row.hasTrace && traces.has(row.sessionId)) {
+          row.hasTrace = true;
+          this.deps.sessions.markHasTrace(row.sessionId);
+        }
+      }
     }
     const sorted = [...rows.values()].sort(
       (a, b) => b.createdAt.localeCompare(a.createdAt) || b.sessionId.localeCompare(a.sessionId)
     );
-    const toPage = (page) => Promise.all(page.map((row) => this.toInfo(row, traces.has(row.sessionId), traces)));
+    const rowHasTrace = (row) => traces ? traces.has(row.sessionId) : row.hasTrace === true;
+    const toPage = (page) => Promise.all(page.map((row) => this.toInfo(row, rowHasTrace(row), traces)));
     if (category === void 0 && !withCounts) {
       return {
         sessions: await toPage(
@@ -7566,7 +7719,7 @@ var SessionService = class {
     const matched = [];
     for (const row of sorted) {
       if (!withCounts && matched.length >= want) break;
-      const cat = await this.categoryOf(row, traces.has(row.sessionId), traces);
+      const cat = await this.categoryOf(row, rowHasTrace(row), traces);
       counts[cat] += 1;
       if (withCounts) {
         const ws = workspaceCounts[row.workspace] ??= {
@@ -7686,6 +7839,9 @@ var SessionService = class {
       workspace: session.workspaceDir,
       approvalMode: args.approvalMode ?? "allow-all",
       title: null,
+      // Everything created through this service is the Web App's (schedule runs included);
+      // "cli" is stamped only by Trace adoption. NULL means a legacy row, treated as web.
+      client: "web",
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     this.deps.sessions.insert(row);
@@ -7758,6 +7914,10 @@ var SessionService = class {
       // The approval mode for an unmanaged Session (started via the CLI) isn't in the Trace, so it's backfilled with the default value.
       approvalMode: "allow-all",
       title: null,
+      // Adopted = a Trace this server never created, i.e. the CLI's: the default list
+      // (web-only) excludes these rows; the "show CLI sessions" preference includes them.
+      client: "cli",
+      hasTrace: true,
       createdAt: sessionIdCreatedAt(sessionId) ?? meta.timestamp
     };
     this.deps.sessions.insertOrIgnore(row);
@@ -7792,7 +7952,7 @@ import {
   agentsDir as agentsDir3,
   isSessionMeta as isSessionMeta5,
   parseTraceLines as parseTraceLines2,
-  parseUserSteeringText,
+  parseUserSteeringText as parseUserSteeringText2,
   readTraceTolerant as readTraceTolerant2,
   tracesDir as tracesDir3
 } from "@prismshadow/penguin-core";
@@ -7988,7 +8148,7 @@ var TraceService = class {
       const msg = messages[mi];
       const p = msg.payload;
       const hasOrigin = msg.origin !== void 0 && msg.origin.length > 0;
-      const isSteeringText = !hasOrigin && msg.type === "model_msg" && p.type === "text" && p.role === "user" && typeof p.text === "string" && parseUserSteeringText(p.text) !== null;
+      const isSteeringText = !hasOrigin && msg.type === "model_msg" && p.type === "text" && p.role === "user" && typeof p.text === "string" && parseUserSteeringText2(p.text) !== null;
       if (isSteeringText) continuation = true;
       const isImage = !hasOrigin && msg.type === "model_msg" && p.type === "image_url";
       if (!hasOrigin && !isSteeringText && !(isImage && steeringImages)) steeringImages = false;