mulmoclaude 0.9.3 → 0.9.4

package/server/workspace/chat-index/summarizer.ts

@@ -39,11 +39,18 @@ const SUMMARY_SCHEMA = {
   required: ["title", "summary", "keywords"],
 };
 
-// Model used for summarization. Sonnet, not haiku: the title is the
-// primary way a user finds a past chat, so a weak title makes the
-// history list unusable. One cheap structured call per session is
-// negligible next to the agent turns it summarizes.
-const SUMMARY_MODEL = "sonnet";
+// Default model used when a caller doesn't specify one. Sonnet, not
+// haiku: the title is the primary way a user finds a past chat, so a
+// weak title makes the history list unusable. Since #1944 the model
+// is user-selectable from Settings → Chat index — "off" disables the
+// indexer, "haiku" / "sonnet" pick the model here — so this constant
+// is only the internal fallback when the indexer runs without a
+// model override (e.g. a manual rebuild triggered before the setting
+// resolves).
+const DEFAULT_SUMMARY_MODEL = "sonnet";
+// Explicit union so a bad string from the settings layer can't reach
+// the CLI unchecked. Mirror in `AppSettings.chatIndex` (server/system/config.ts).
+export type SummaryModel = "haiku" | "sonnet";
 
 // Prompt-building constants. Sized for Sonnet's large context: the
 // window is wide enough to carry a long, topic-shifting session's
@@ -68,7 +75,7 @@ const MAX_BUDGET_USD = 0.4;
 // Any module that wants to drive the summarizer — including the
 // indexer — takes a SummarizeFn so tests can supply a deterministic
 // fake. Production path is `defaultSummarize` below.
-export type SummarizeFn = (input: string) => Promise<SummaryResult>;
+export type SummarizeFn = (input: string, opts?: { model?: SummaryModel }) => Promise<SummaryResult>;
 
 interface JsonlEntry {
   source?: string;
@@ -184,7 +191,7 @@ export async function loadJsonlInput(jsonlPath: string): Promise<string> {
 
 // --- spawn layer ----------------------------------------------------
 
-function spawnClaudeSummarize(input: string, timeoutMs: number): Promise<string> {
+function spawnClaudeSummarize(input: string, timeoutMs: number, model: SummaryModel): Promise<string> {
   return new Promise((resolve, reject) => {
     const args = [
       "--print",
@@ -192,7 +199,7 @@ function spawnClaudeSummarize(input: string, timeoutMs: number): Promise<string>
       "--output-format",
       "json",
       "--model",
-      SUMMARY_MODEL,
+      model,
       "--max-budget-usd",
       String(MAX_BUDGET_USD),
       "--json-schema",
@@ -252,7 +259,8 @@ function spawnClaudeSummarize(input: string, timeoutMs: number): Promise<string>
 // Production SummarizeFn: prepare the input from a jsonl path and
 // drive the CLI. Tests inject their own SummarizeFn that bypasses
 // the CLI entirely.
-export const defaultSummarize: SummarizeFn = async (input: string) => {
-  const stdout = await spawnClaudeSummarize(input, DEFAULT_TIMEOUT_MS);
+export const defaultSummarize: SummarizeFn = async (input, opts) => {
+  const model: SummaryModel = opts?.model ?? DEFAULT_SUMMARY_MODEL;
+  const stdout = await spawnClaudeSummarize(input, DEFAULT_TIMEOUT_MS, model);
   return parseClaudeJsonResult(stdout);
 };

package/server/workspace/collections/index.ts

@@ -8,7 +8,7 @@ export {
   type LoadedCollection,
 } from "@mulmoclaude/core/collection/server";
 export { validateCollectionRecords, validateRecordObject, COMPUTED_TYPES, type RecordIssue } from "@mulmoclaude/core/collection/server";
-export { enrichItems } from "@mulmoclaude/core/collection/server";
+export { enrichItems, computeCollectionIcon } from "@mulmoclaude/core/collection/server";
 export { deleteCollection, deleteCollectionRefusalMessage, type DeleteCollectionResult } from "@mulmoclaude/core/collection/server";
 export { deleteCustomView, type DeleteViewResult } from "@mulmoclaude/core/collection/server";
 export {

package/server/workspace/journal/archivist-cli.ts

@@ -4,7 +4,12 @@ import { spawn } from "node:child_process";
 import { CLI_SUBPROCESS_TIMEOUT_MS } from "../../utils/time.js";
 import { claudeBinPath, ClaudeCliNotFoundError } from "../../utils/claudeBin.js";
 
-export type Summarize = (systemPrompt: string, userPrompt: string) => Promise<string>;
+// User-selectable model for the archivist CLI call. `journalMode`
+// widens to `"off"` too; the entry-point (`maybeRunJournal`) filters
+// that out before we get here — this union is intentionally narrow so
+// a bad string can't reach `--model`.
+export type JournalSummaryModel = "haiku" | "sonnet";
+export type Summarize = (systemPrompt: string, userPrompt: string, opts?: { model?: JournalSummaryModel }) => Promise<string>;
 
 const CLI_TIMEOUT_MS = CLI_SUBPROCESS_TIMEOUT_MS;
 
@@ -28,9 +33,18 @@ export class ClaudeCliFailedError extends Error {
 }
 
 // Pipe the combined prompt via stdin to dodge shell-argv limits for large day excerpts.
-export const runClaudeCli: Summarize = async (systemPrompt, userPrompt) =>
+export const runClaudeCli: Summarize = async (systemPrompt, userPrompt, opts) =>
   new Promise((resolve, reject) => {
-    const child = spawn(claudeBinPath(), ["-p", "--output-format", "text"], {
+    // `opts?.model` is threaded from `Settings → Journal` via
+    // maybeRunJournal so the user's model choice reaches the CLI.
+    // When undefined we omit the flag entirely and let the CLI use
+    // its own default — preserves the pre-#1944 archivist behaviour
+    // for direct-CLI callers that don't specify a model.
+    const args = ["-p", "--output-format", "text"];
+    if (opts?.model) {
+      args.push("--model", opts.model);
+    }
+    const child = spawn(claudeBinPath(), args, {
       stdio: ["pipe", "pipe", "pipe"],
     });
 

package/server/workspace/journal/dailyPass.ts

@@ -74,17 +74,24 @@ export async function buildDailyPassPlan(state: JournalState, deps: DailyPassDep
   const { dirty } = findDirtySessions(eligible, state.processedSessions);
   if (dirty.length === 0) return null;
 
-  const perSessionExcerpts = await loadDirtySessionExcerpts(chatDir, dirty, workspaceRoot);
+  const dirtyMetaById = new Map(eligible.map((sessionMeta) => [sessionMeta.id, sessionMeta]));
+  const { journalDirty, silentlyProcessed } = await partitionDirtyByOrigin(dirty, dirtyMetaById, workspaceRoot);
+
+  const perSessionExcerpts = await loadDirtySessionExcerpts(chatDir, journalDirty, workspaceRoot);
   const { dayBuckets, sessionToDays } = buildDayBuckets(perSessionExcerpts);
 
   const existingTopics = await readAllTopics(workspaceRoot);
   const newTopicsSeen = new Set<string>(state.knownTopics);
   // Do NOT bump lastDailyRunAt here — outer runner does it after optimization, so partial progress isn't a complete pass.
+  // Silently mark origin-filtered dirty sessions as processed at their current
+  // mtime so they don't reappear as dirty on every pass. Without this, a
+  // workspace with many automation sessions pays an O(N) meta re-read on
+  // every hourly run.
   const initialNextState: JournalState = {
     ...state,
+    processedSessions: applyProcessed(state.processedSessions, silentlyProcessed),
     knownTopics: [...newTopicsSeen].sort(),
   };
-  const dirtyMetaById = new Map(eligible.map((sessionMeta) => [sessionMeta.id, sessionMeta]));
   const orderedDays = [...dayBuckets.keys()].sort();
 
   return {
@@ -422,6 +429,49 @@ export function advanceJournalState(prev: JournalState, justCompleted: readonly
 }
 
 // Malformed sessions are logged and skipped so one bad jsonl can't crash the pass.
+// Origins the journal pass intentionally skips (mirror of the chat-index
+// filter added in #1944). `system` sessions are hidden host workers
+// (thumbnail generation, background exports); `scheduler` sessions are
+// automation-driven with prompts the user did not author. Neither
+// surfaces content worth summarising into a personal daily journal.
+const NON_INDEXED_ORIGINS: ReadonlySet<string> = new Set(["system", "scheduler"]);
+
+async function isEligibleForJournalByOrigin(sessionId: string, workspaceRoot: string): Promise<boolean> {
+  try {
+    const meta = await readSessionMetaIO(sessionId, workspaceRoot);
+    if (meta && typeof meta.origin === "string" && NON_INDEXED_ORIGINS.has(meta.origin)) return false;
+  } catch {
+    // meta unreadable → treat as eligible; the excerpt loader will
+    // still bail if the jsonl itself is malformed.
+  }
+  return true;
+}
+
+interface DirtyPartition {
+  journalDirty: string[];
+  // origin-filtered dirty sessions — marked processed at their current mtime
+  // so the next pass doesn't re-inspect them.
+  silentlyProcessed: SessionFileMeta[];
+}
+
+async function partitionDirtyByOrigin(
+  dirty: readonly string[],
+  dirtyMetaById: ReadonlyMap<string, SessionFileMeta>,
+  workspaceRoot: string,
+): Promise<DirtyPartition> {
+  const journalDirty: string[] = [];
+  const silentlyProcessed: SessionFileMeta[] = [];
+  for (const sessionId of dirty) {
+    if (await isEligibleForJournalByOrigin(sessionId, workspaceRoot)) {
+      journalDirty.push(sessionId);
+      continue;
+    }
+    const meta = dirtyMetaById.get(sessionId);
+    if (meta) silentlyProcessed.push(meta);
+  }
+  return { journalDirty, silentlyProcessed };
+}
+
 async function loadDirtySessionExcerpts(chatDir: string, dirty: readonly string[], workspaceRoot: string): Promise<Map<string, Map<string, SessionExcerpt>>> {
   const perSession = new Map<string, Map<string, SessionExcerpt>>();
   for (const sessionId of dirty) {

package/server/workspace/journal/index.ts

@@ -15,9 +15,10 @@ import { readState, writeState, isDailyDue, isOptimizationDue } from "./state.js
 import { runDailyPass } from "./dailyPass.js";
 import { runOptimizationPass } from "./optimizationPass.js";
 import { buildIndexMarkdown, type IndexTopicEntry, type IndexDailyEntry } from "./indexFile.js";
-import { runClaudeCli, ClaudeCliNotFoundError, type Summarize } from "./archivist-cli.js";
+import { runClaudeCli, ClaudeCliNotFoundError, type Summarize, type JournalSummaryModel } from "./archivist-cli.js";
 import { extractFirstH1 } from "../../../src/utils/markdown/extractFirstH1.js";
 import { log } from "../../system/logger/index.js";
+import { journalMode as resolveJournalMode, loadSettings, type JournalMode } from "../../system/config.js";
 
 export { extractFirstH1 };
 
@@ -39,14 +40,24 @@ export interface MaybeRunJournalOptions {
   activeSessionIds?: ReadonlySet<string>;
   // Bypass the interval gate; the disable flags (CLI missing, in-process lock) still apply.
   force?: boolean;
+  // Injectable journal mode — defaults to `journalMode(loadSettings())`
+  // when omitted. "off" short-circuits before any lock / state read;
+  // "haiku" / "sonnet" pick the model the archivist CLI spawns. Tests
+  // and the force-run switch inject this directly; production callers
+  // (turn-end hook, scheduled task) let the resolver pick it up.
+  mode?: JournalMode;
 }
 
 export async function maybeRunJournal(opts: MaybeRunJournalOptions = {}): Promise<void> {
   if (disabled) return;
   if (running) return;
+  // Config-driven kill switch. Resolve at entry time so a settings edit
+  // takes effect on the very next turn without a server restart.
+  const mode = opts.mode ?? resolveJournalMode(loadSettings());
+  if (mode === "off") return;
   running = true;
   try {
-    await runJournalPass(opts);
+    await runJournalPass(opts, mode);
   } catch (err) {
     if (err instanceof ClaudeCliNotFoundError) {
       disabled = true;
@@ -61,9 +72,14 @@ export async function maybeRunJournal(opts: MaybeRunJournalOptions = {}): Promis
   }
 }
 
-async function runJournalPass(opts: MaybeRunJournalOptions): Promise<void> {
+async function runJournalPass(opts: MaybeRunJournalOptions, model: JournalSummaryModel): Promise<void> {
   const workspaceRoot = opts.workspaceRoot ?? defaultWorkspacePath;
-  const summarize = opts.summarize ?? runClaudeCli;
+  // Pre-bind the model into the summarize callable so every layer
+  // downstream (dailyPass / optimizationPass / memoryExtractor) picks
+  // the user-selected model without threading the parameter through
+  // half a dozen call sites.
+  const rawSummarize = opts.summarize ?? runClaudeCli;
+  const summarize: Summarize = (sys, user) => rawSummarize(sys, user, { model });
   const activeSessionIds = opts.activeSessionIds ?? new Set<string>();
 
   const state = await readState(workspaceRoot);

package/src/App.vue

@@ -386,6 +386,7 @@ import ConfirmModal from "./components/ConfirmModal.vue";
 import { useNotifications } from "./composables/useNotifications";
 import { collectionNotifiedSeverities } from "./utils/collections/notifiedItems";
 import { installCollectionAppBindings } from "./composables/collections/uiHost";
+import { useDynamicShortcutIcons } from "./composables/collections/useDynamicShortcutIcons";
 import type { CollectionsListResponse } from "@mulmoclaude/core/collection";
 import { useHealth } from "./composables/useHealth";
 import { useSessionHistory } from "./composables/useSessionHistory";
@@ -1261,6 +1262,10 @@ installCollectionAppBindings({
   startNewChatDraft: (prompt: string, role?: string) => startNewChatDraft(prompt, role),
   notifiedSeverities: (slug: string) => collectionNotifiedSeverities(notifierEntries.value, slug),
 });
+// Keep pinned collection-launcher icons that declare `dynamicIcon` live —
+// mounted here (not inside CollectionsIndexView) so it runs regardless of
+// which page is open.
+useDynamicShortcutIcons();
 // Plugin Views that need to tag background work with the current
 // session (e.g. MulmoScript generations) inject this.
 provideActiveSession(activeSession);

package/src/components/FileTree.vue

@@ -51,13 +51,14 @@
            not as a global overlay. -->
       <div v-if="loadingChildren" class="px-2 py-1 text-xs text-gray-400">{{ t("common.loading") }}</div>
       <FileTree
-        v-for="child in loadedChildren"
+        v-for="child in visibleChildren"
         :key="child.path"
         :node="child"
         :selected-path="selectedPath"
         :recent-paths="recentPaths"
         :children-by-path="childrenByPath"
         :sort-mode="sortMode"
+        :show-hidden-system="showHiddenSystem"
         @select="(p) => emit('select', p)"
         @load-children="(p) => emit('loadChildren', p)"
         @create-file="(args) => emit('createFile', args)"
@@ -95,6 +96,7 @@ import { useI18n } from "vue-i18n";
 import { useExpandedDirs } from "../composables/useExpandedDirs";
 import { sortChildren } from "../utils/files/sortChildren";
 import { descriptorForPath, EDIT_POLICY_ICON_COLOR } from "../config/systemFileDescriptors";
+import { isVisibleTopLevel } from "../config/visibleWorkspaceDirs";
 import { normaliseNewFileSlug, policyForFolder } from "../config/createFilePolicy";
 import type { FileSortMode } from "../composables/useFileSortMode";
 import type { TreeNode } from "../types/fileTree";
@@ -118,6 +120,14 @@ const props = defineProps<{
   // show spinner. Array = loaded.
   childrenByPath: Map<string, TreeNode[] | null>;
   sortMode: FileSortMode;
+  // When false, top-level "system" dirs (`conversations/`, `feeds/`,
+  // `.git/`, ad-hoc automation buckets) are filtered out — only
+  // recognised user-content buckets (data / artifacts / config) stay
+  // visible at the workspace root. Filter only fires when this
+  // component IS the root (`node.path === ""`); nested instances
+  // still receive the prop so the recursion carries it, but they
+  // don't apply the filter themselves.
+  showHiddenSystem: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -143,6 +153,16 @@ const cached = computed(() => props.childrenByPath.get(props.node.path));
 const loadingChildren = computed(() => cached.value === null);
 const loadedChildren = computed(() => (Array.isArray(cached.value) ? sortChildren(cached.value, props.sortMode) : []));
 
+// Root-only filter: hide non-whitelisted top-level dirs unless the
+// user has toggled "show system files" on. Any depth other than
+// the workspace root is a pass-through.
+const isWorkspaceRoot = computed(() => props.node.path === "");
+const visibleChildren = computed(() => {
+  if (!isWorkspaceRoot.value) return loadedChildren.value;
+  if (props.showHiddenSystem) return loadedChildren.value;
+  return loadedChildren.value.filter((child) => child.type === "dir" && isVisibleTopLevel(child.name));
+});
+
 // Kick off a fetch if the dir is expanded but its children haven't
 // been requested yet. Covers two scenarios:
 //   1. User just toggled open → onToggle already emits, but watching

package/src/components/FileTreePane.vue

@@ -1,30 +1,42 @@
 <template>
   <div class="w-72 flex-shrink-0 border-r border-gray-200 overflow-y-auto p-2 bg-gray-50">
-    <div class="flex justify-end items-center gap-2 pb-1 text-xs">
-      <span class="text-gray-400">{{ t("fileTreePane.sort") }}</span>
-      <div class="flex border border-gray-300 rounded overflow-hidden">
-        <button
-          type="button"
-          class="h-8 px-2.5 flex items-center gap-1 transition-colors"
-          :class="sortMode === 'name' ? 'bg-blue-50 text-blue-700 font-medium' : 'bg-white text-gray-500 hover:bg-gray-50'"
-          :aria-pressed="sortMode === 'name'"
-          :title="t('fileTreePane.sortByName')"
-          data-testid="file-sort-name"
-          @click="emit('update:sortMode', 'name')"
-        >
-          {{ t("fileTreePane.name") }}
-        </button>
-        <button
-          type="button"
-          class="h-8 px-2.5 flex items-center gap-1 transition-colors"
-          :class="sortMode === 'recent' ? 'bg-blue-50 text-blue-700 font-medium' : 'bg-white text-gray-500 hover:bg-gray-50'"
-          :aria-pressed="sortMode === 'recent'"
-          :title="t('fileTreePane.sortByRecent')"
-          data-testid="file-sort-recent"
-          @click="emit('update:sortMode', 'recent')"
-        >
-          {{ t("fileTreePane.recent") }}
-        </button>
+    <div class="flex flex-wrap justify-end items-center gap-x-3 gap-y-1 pb-1 text-xs">
+      <label class="flex items-center gap-1 text-gray-500 cursor-pointer select-none" :title="t('fileTreePane.showSystemFilesTitle')">
+        <input
+          type="checkbox"
+          class="h-3.5 w-3.5"
+          data-testid="file-tree-show-system-toggle"
+          :checked="showHiddenSystem"
+          @change="(e) => emit('update:showHiddenSystem', (e.target as HTMLInputElement).checked)"
+        />
+        {{ t("fileTreePane.showSystemFiles") }}
+      </label>
+      <div class="flex items-center gap-2">
+        <span class="text-gray-400">{{ t("fileTreePane.sort") }}</span>
+        <div class="flex border border-gray-300 rounded overflow-hidden">
+          <button
+            type="button"
+            class="h-8 px-2.5 flex items-center gap-1 transition-colors"
+            :class="sortMode === 'name' ? 'bg-blue-50 text-blue-700 font-medium' : 'bg-white text-gray-500 hover:bg-gray-50'"
+            :aria-pressed="sortMode === 'name'"
+            :title="t('fileTreePane.sortByName')"
+            data-testid="file-sort-name"
+            @click="emit('update:sortMode', 'name')"
+          >
+            {{ t("fileTreePane.name") }}
+          </button>
+          <button
+            type="button"
+            class="h-8 px-2.5 flex items-center gap-1 transition-colors"
+            :class="sortMode === 'recent' ? 'bg-blue-50 text-blue-700 font-medium' : 'bg-white text-gray-500 hover:bg-gray-50'"
+            :aria-pressed="sortMode === 'recent'"
+            :title="t('fileTreePane.sortByRecent')"
+            data-testid="file-sort-recent"
+            @click="emit('update:sortMode', 'recent')"
+          >
+            {{ t("fileTreePane.recent") }}
+          </button>
+        </div>
       </div>
     </div>
     <div v-if="treeError" class="p-2 text-xs text-red-600">
@@ -38,6 +50,7 @@
       :recent-paths="recentPaths"
       :children-by-path="childrenByPath"
       :sort-mode="sortMode"
+      :show-hidden-system="showHiddenSystem"
       @select="emit('select', $event)"
       @load-children="emit('loadChildren', $event)"
       @create-file="emit('createFile', $event)"
@@ -55,6 +68,7 @@
         :recent-paths="emptySet"
         :children-by-path="childrenByPath"
         :sort-mode="sortMode"
+        show-hidden-system
         @select="emit('select', $event)"
         @load-children="emit('loadChildren', $event)"
       />
@@ -78,12 +92,14 @@ defineProps<{
   selectedPath: string | null;
   recentPaths: Set<string>;
   sortMode: FileSortMode;
+  showHiddenSystem: boolean;
 }>();
 
 const emit = defineEmits<{
   select: [path: string];
   loadChildren: [path: string];
   "update:sortMode": [mode: FileSortMode];
+  "update:showHiddenSystem": [next: boolean];
   createFile: [args: { folder: string; filename: string; resolve: (ok: boolean, error?: string) => void }];
 }>();
 

package/src/components/FilesView.vue

@@ -9,9 +9,11 @@
       :selected-path="selectedPath"
       :recent-paths="recentPaths"
       :sort-mode="sortMode"
+      :show-hidden-system="showHiddenSystem"
       @select="selectFile"
       @load-children="loadDirChildren"
       @update:sort-mode="setSortMode"
+      @update:show-hidden-system="setShowHiddenSystem"
       @create-file="handleCreateFile"
     />
     <!-- Content pane -->
@@ -72,6 +74,7 @@ import { useFileTree } from "../composables/useFileTree";
 import { useFileSelection, isValidFilePath, readPathMatch } from "../composables/useFileSelection";
 import { useMarkdownMode } from "../composables/useMarkdownMode";
 import { useFileSortMode } from "../composables/useFileSortMode";
+import { useShowHiddenSystemFiles } from "../composables/useShowHiddenSystemFiles";
 import { useContentDisplay } from "../composables/useContentDisplay";
 import { useMarkdownLinkHandler } from "../composables/useMarkdownLinkHandler";
 import { apiPost, apiPut } from "../utils/api";
@@ -100,6 +103,7 @@ const { selectedPath, content, contentLoading, contentError, loadContent, select
 const { mdRawMode, toggleMdRaw } = useMarkdownMode();
 
 const { sortMode, setSortMode } = useFileSortMode();
+const { showHiddenSystem, setShowHiddenSystem } = useShowHiddenSystemFiles();
 
 const { isMarkdown, isHtml, isJson, isJsonl, sandboxedHtml, htmlPreviewUrl, jsonTokens, jsonlLines, mdFrontmatter } = useContentDisplay(selectedPath, content);
 

package/src/components/RemoteHostControl.vue

@@ -52,6 +52,20 @@
       </div>
 
       <p v-if="error" class="mt-2 text-red-600 break-words" data-testid="remote-host-error">{{ error }}</p>
+
+      <div class="mt-3 pt-2 border-t border-gray-100 text-[11px] leading-snug text-gray-600 space-y-2" data-testid="remote-host-help">
+        <p>{{ t("remoteHost.description") }}</p>
+        <i18n-t keypath="remoteHost.howTo" tag="p" scope="global">
+          <template #url>
+            <a :href="MOBILE_URL" target="_blank" rel="noopener noreferrer" class="font-mono text-blue-600 hover:underline break-all">{{ MOBILE_URL }}</a>
+          </template>
+        </i18n-t>
+        <i18n-t keypath="remoteHost.customViewHint" tag="p" scope="global">
+          <template #keyword>
+            <code class="px-1 py-0.5 rounded bg-gray-100 text-gray-800">custom remote view</code>
+          </template>
+        </i18n-t>
+      </div>
     </div>
   </div>
 </template>
@@ -82,6 +96,10 @@ interface StatusResponse {
 
 const { t } = useI18n();
 
+// Mobile companion PWA. Shown in the popover as help text; not fetched from
+// this desktop app, so no runtime env override is needed.
+const MOBILE_URL = "https://mulmoserver.web.app";
+
 const open = ref(false);
 const busy = ref(false);
 const error = ref<string | null>(null);

package/src/components/SessionHistoryPanel.vue

@@ -35,7 +35,8 @@
         :key="session.id"
         tabindex="0"
         role="button"
-        :aria-label="t('sessionHistoryPanel.openRowAria', { preview: session.preview || t('sessionHistoryPanel.noMessages') })"
+        :aria-label="t('sessionHistoryPanel.openRowAria', { preview: primaryText(session) })"
+        :title="primaryText(session)"
         class="relative cursor-pointer rounded p-2 text-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-400"
         :class="rowClasses(session)"
         :data-testid="`session-item-${session.id}`"
@@ -91,20 +92,22 @@
             {{ t("sessionHistoryPanel.delete") }}
           </button>
         </div>
-        <div class="flex items-center gap-1.5">
-          <SessionRoleIcon :session="session" :roles="roles" size="sm" />
-          <p class="truncate flex-1 min-w-0" :class="previewClasses(session)">
-            {{ session.preview || t("sessionHistoryPanel.noMessages") }}
+        <!-- Primary line prefers the AI-generated summary (chat indexer,
+             #123) when present — it's typically more informative than
+             the first user message. Fall back to the first user message,
+             then to a "no messages" placeholder. `line-clamp-2` lets a
+             summary wrap so more of it is readable at a glance; the raw
+             first-message fallback stays on a single line via `truncate`
+             so short prompts don't disturb row heights. -->
+        <div class="flex items-start gap-1.5">
+          <SessionRoleIcon :session="session" :roles="roles" size="sm" class="flex-shrink-0 mt-0.5" />
+          <p class="flex-1 min-w-0" :class="[previewClasses(session), sessionHasVisibleSummary(session) ? 'line-clamp-2' : 'truncate']">
+            {{ primaryText(session) }}
           </p>
-          <span v-if="isSessionRunning(session)" class="flex-shrink-0 flex items-center" :aria-label="t('sessionHistoryPanel.running')">
+          <span v-if="isSessionRunning(session)" class="flex-shrink-0 flex items-center mt-0.5" :aria-label="t('sessionHistoryPanel.running')">
             <span class="w-1.5 h-1.5 rounded-full bg-yellow-400 animate-pulse" />
           </span>
         </div>
-        <!-- Optional second line: AI-generated summary of the
-             session, populated by the chat indexer (#123). -->
-        <p v-if="session.summary" class="text-xs text-gray-500 truncate mt-0.5">
-          {{ session.summary }}
-        </p>
       </div>
     </div>
   </div>
@@ -118,6 +121,7 @@ import type { SessionSummary, SessionOrigin } from "../types/session";
 import { SESSION_ORIGINS } from "../types/session";
 import { HISTORY_FILTERS, HISTORY_FILTER_ORDER, type HistoryFilter } from "../config/historyFilters";
 import { isLongRunningConversation } from "../utils/session/longRunning";
+import { resolveSessionPrimaryText, sessionHasVisibleSummary } from "../utils/session/sessionPreview";
 import { formatDate } from "../utils/format/date";
 import SessionRoleIcon from "./SessionRoleIcon.vue";
 import FilterChip from "./FilterChip.vue";
@@ -199,6 +203,15 @@ function previewClasses(session: SessionSummary): string {
   return "text-gray-700";
 }
 
+// Primary line resolution: prefer the AI summary (trim + whitespace
+// guarded so a summarizer returning "   " doesn't blank the row) →
+// first user message → localised placeholder. Same call is used for
+// visible text, aria-label, and the hover title so all three stay in
+// lockstep.
+function primaryText(session: SessionSummary): string {
+  return resolveSessionPrimaryText(session) ?? t("sessionHistoryPanel.noMessages");
+}
+
 // ── Row action menu ─────────────────────────────────────────
 //
 // Only one popover is open at a time, tracked by session id. A