@cookielab.io/klovi 3.2.0 → 3.3.0

package/dist/cli.js

@@ -17,12 +17,6 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../../packages/plugin-core/src/ids.ts
-var BUILTIN_KLOVI_PLUGIN_IDS;
-var init_ids = __esm(() => {
-  BUILTIN_KLOVI_PLUGIN_IDS = ["claude-code", "codex-cli", "opencode"];
-});
-
 // ../../packages/plugin-core/src/iso-time.ts
 function sortByIsoDesc(items, select) {
   items.sort((a, b) => select(b).localeCompare(select(a)));
@@ -30,8 +24,9 @@ function sortByIsoDesc(items, select) {
 function maxIso(values) {
   let latest = "";
   for (const value of values) {
-    if (value > latest)
+    if (value > latest) {
       latest = value;
+    }
   }
   return latest;
 }
@@ -39,8 +34,9 @@ function epochMsToIso(epochMs) {
   return new Date(epochMs).toISOString();
 }
 function epochSecondsToIso(epochSeconds) {
-  return new Date(epochSeconds * 1000).toISOString();
+  return new Date(epochSeconds * MS_PER_SECOND).toISOString();
 }
+var MS_PER_SECOND = 1000;
 
 // ../../packages/plugin-core/src/plugin-config.ts
 import { Context } from "effect";
@@ -63,8 +59,9 @@ import { join } from "node:path";
 import { FileSystem } from "@effect/platform";
 import { Effect } from "effect";
 function stripT3CodeSuffix(path) {
-  if (!T3CODE_SUFFIX_REGEX.test(path))
+  if (!T3CODE_SUFFIX_REGEX.test(path)) {
     return null;
+  }
   const parentPath = path.replace(T3CODE_SUFFIX_REGEX, "");
   const lastSlash = parentPath.lastIndexOf("/");
   const projectName = lastSlash === -1 ? parentPath : parentPath.slice(lastSlash + 1);
@@ -75,18 +72,22 @@ function resolveGitWorktree(worktreePath) {
     const fs = yield* FileSystem.FileSystem;
     const dotGitPath = join(worktreePath, ".git");
     const info = yield* fs.stat(dotGitPath).pipe(Effect.catchAll(() => Effect.succeed(null)));
-    if (!info || info.type !== "File")
+    if (!info || info.type !== "File") {
       return worktreePath;
+    }
     const content = yield* fs.readFileString(dotGitPath).pipe(Effect.catchAll(() => Effect.succeed("")));
-    if (!content)
+    if (!content) {
       return worktreePath;
+    }
     const match = GITDIR_WORKTREE_REGEX.exec(content);
-    if (!match?.[1])
+    if (!match?.groups?.["gitdir"]) {
       return worktreePath;
-    const gitdir = match[1];
+    }
+    const gitdir = match.groups["gitdir"];
     const worktreeIdx = gitdir.indexOf(GIT_WORKTREES_SEGMENT);
-    if (worktreeIdx === -1)
+    if (worktreeIdx === -1) {
       return worktreePath;
+    }
     return gitdir.slice(0, worktreeIdx);
   });
 }
@@ -112,15 +113,18 @@ function collectT3CodeEntries(projects) {
 function buildNameMap(projects, t3codeProjects) {
   const nameToResolvedPaths = new Map;
   for (const project of projects) {
-    if (t3codeProjects.has(project))
+    if (t3codeProjects.has(project)) {
       continue;
+    }
     const name = lastSegment(project.resolvedPath);
-    if (!name)
+    if (!name) {
       continue;
+    }
     const existing = nameToResolvedPaths.get(name);
     if (existing) {
-      if (!existing.includes(project.resolvedPath))
+      if (!existing.includes(project.resolvedPath)) {
         existing.push(project.resolvedPath);
+      }
     } else {
       nameToResolvedPaths.set(name, [project.resolvedPath]);
     }
@@ -130,12 +134,14 @@ function buildNameMap(projects, t3codeProjects) {
 function resolveEntry(entry, nameMap) {
   return Effect.gen(function* () {
     const candidates = nameMap.get(entry.projectName);
-    if (!candidates || candidates.length === 0)
+    if (!candidates || candidates.length === 0) {
       return;
+    }
     if (candidates.length === 1) {
-      const resolvedPath = candidates[0];
-      if (resolvedPath)
+      const [resolvedPath] = candidates;
+      if (resolvedPath) {
         entry.project.resolvedPath = resolvedPath;
+      }
       return;
     }
     const resolved = yield* resolveGitWorktree(entry.originalPath);
@@ -147,8 +153,9 @@ function resolveEntry(entry, nameMap) {
 function resolveT3CodePaths(projects) {
   return Effect.gen(function* () {
     const t3codeEntries = collectT3CodeEntries(projects);
-    if (t3codeEntries.length === 0)
+    if (t3codeEntries.length === 0) {
       return;
+    }
     const t3codeProjects = new Set(t3codeEntries.map((e) => e.project));
     const nameMap = buildNameMap(projects, t3codeProjects);
     for (const entry of t3codeEntries) {
@@ -158,8 +165,8 @@ function resolveT3CodePaths(projects) {
 }
 var T3CODE_SUFFIX_REGEX, GITDIR_WORKTREE_REGEX, GIT_WORKTREES_SEGMENT = "/.git/worktrees/";
 var init_resolve_worktree = __esm(() => {
-  T3CODE_SUFFIX_REGEX = /\/t3code-[a-f0-9]+$/;
-  GITDIR_WORKTREE_REGEX = /^gitdir:\s*(.+?)\s*$/;
+  T3CODE_SUFFIX_REGEX = /\/t3code-[a-f0-9]+$/u;
+  GITDIR_WORKTREE_REGEX = /^gitdir:\s*(?<gitdir>.+?)\s*$/u;
 });
 
 // ../../packages/plugin-core/src/session-id.ts
@@ -182,9 +189,9 @@ var SESSION_ID_SEPARATOR = "::";
 import { Effect as Effect2, Layer } from "effect";
 function encodeResolvedPath(resolvedPath) {
   if (resolvedPath.startsWith("/")) {
-    return resolvedPath.replace(/\//g, "-");
+    return resolvedPath.replace(/\//gu, "-");
   }
-  return resolvedPath.replace(/[/\\:]/g, "-");
+  return resolvedPath.replace(/[/\\:]/gu, "-");
 }
 
 class PluginRegistry {
@@ -202,14 +209,16 @@ class PluginRegistry {
   }
   getPlugin(id) {
     const entry = this.plugins.get(id);
-    if (!entry)
+    if (!entry) {
       throw new Error(`Plugin not found: ${id}`);
+    }
     return entry.plugin;
   }
   getPluginConfig(id) {
     const entry = this.plugins.get(id);
-    if (!entry)
+    if (!entry) {
       throw new Error(`Plugin not found: ${id}`);
+    }
     return entry.config;
   }
   getAllPlugins() {
@@ -256,8 +265,9 @@ class PluginRegistry {
       const allSessions = [];
       for (const source of project.sources) {
         const entry = this.plugins.get(source.pluginId);
-        if (!entry)
+        if (!entry) {
           continue;
+        }
         const sessions = yield* entry.plugin.listSessions(source.nativeId).pipe(Effect2.provide(entry.configLayer), Effect2.catchAll(() => Effect2.succeed([])));
         allSessions.push(...sessions.map((session) => ({
           ...session,
@@ -294,7 +304,6 @@ var init_sqlite_service = __esm(() => {
 
 // ../../packages/plugin-core/src/index.ts
 var init_src = __esm(() => {
-  init_ids();
   init_plugin_config();
   init_plugin_errors();
   init_plugin_registry();
@@ -317,8 +326,9 @@ function openOpenCodeDb() {
     const dbPath = yield* getOpenCodeDbPath();
     const fs = yield* FileSystem2.FileSystem;
     const exists = yield* fs.exists(dbPath);
-    if (!exists)
+    if (!exists) {
       return null;
+    }
     const client = yield* SqliteClientTag;
     return yield* client.open(dbPath, { readonly: true });
   });
@@ -360,12 +370,14 @@ function inspectSchema(db) {
 function discoverOpenCodeProjects() {
   return Effect4.gen(function* () {
     const db = yield* openOpenCodeDb();
-    if (!db)
+    if (!db) {
       return [];
+    }
     try {
       const schema = inspectSchema(db);
-      if (!schema.hasRequiredTables)
+      if (!schema.hasRequiredTables) {
         return [];
+      }
       if (schema.hasProjectTable) {
         return discoverFromProjectTable(db, schema);
       }
@@ -404,8 +416,9 @@ function discoverFromProjectTable(db, schema) {
 function discoverFromSessions(db, schema) {
   const hasDirectory = schema.sessionColumns.has("directory");
   const hasProjectId = schema.sessionColumns.has("project_id");
-  if (!hasDirectory && !hasProjectId)
+  if (!(hasDirectory || hasProjectId)) {
     return [];
+  }
   const groupCol = hasDirectory ? "directory" : "project_id";
   const rows = db.query(`SELECT ${groupCol} as group_key,
               count(*) as session_count,
@@ -448,12 +461,14 @@ function sessionRowToSummary(db, row) {
 function listOpenCodeSessions(nativeId) {
   return Effect4.gen(function* () {
     const db = yield* openOpenCodeDb();
-    if (!db)
+    if (!db) {
       return [];
+    }
     try {
       const schema = inspectSchema(db);
-      if (!schema.hasRequiredTables)
+      if (!schema.hasRequiredTables) {
         return [];
+      }
       const sessionRows = querySessionRows(db, schema, nativeId);
       return sessionRows.map((row) => sessionRowToSummary(db, row));
     } catch {
@@ -471,23 +486,27 @@ function getSessionPreview(db, sessionId) {
        LIMIT 10`).all(sessionId);
   for (const msg of msgRow) {
     const data = tryParseJson(msg.data);
-    if (!data)
+    if (!data) {
       continue;
+    }
     assignPreviewModel(preview, data);
     assignPreviewFirstMessage(preview, data, db, msg.id);
-    if (preview.firstMessage && preview.model)
+    if (preview.firstMessage && preview.model) {
       break;
+    }
   }
   return preview;
 }
 function assignPreviewModel(preview, data) {
-  if (preview.model || data.role !== "assistant" || !data.modelID)
+  if (preview.model || data.role !== "assistant" || !data.modelID) {
     return;
+  }
   preview.model = data.modelID;
 }
 function assignPreviewFirstMessage(preview, data, db, messageId) {
-  if (preview.firstMessage || data.role !== "user")
+  if (preview.firstMessage || data.role !== "user") {
     return;
+  }
   preview.firstMessage = getFirstUserTextPart(db, messageId);
 }
 function getFirstUserTextPart(db, messageId) {
@@ -495,7 +514,8 @@ function getFirstUserTextPart(db, messageId) {
   for (const part of parts) {
     const partData = tryParseJson(part.data);
     if (partData?.type === "text" && partData.text) {
-      return partData.text.slice(0, 200);
+      const maxPreviewLength = 200;
+      return partData.text.slice(0, maxPreviewLength);
     }
   }
   return "";
@@ -511,8 +531,9 @@ function partToContentBlock(partData, nextToolUseId) {
   switch (partData.type) {
     case "text": {
       const textPart = partData;
-      if (textPart.ignored)
+      if (textPart.ignored) {
         return null;
+      }
       return { type: "text", text: textPart.text };
     }
     case "reasoning": {
@@ -528,7 +549,7 @@ function partToContentBlock(partData, nextToolUseId) {
   }
 }
 function buildToolCall(toolPart, nextToolUseId) {
-  const state = toolPart.state;
+  const { state } = toolPart;
   const toolId = toolPart.callID || nextToolUseId();
   switch (state.status) {
     case "completed":
@@ -556,6 +577,10 @@ function buildToolCall(toolPart, nextToolUseId) {
         result: "[Tool execution was interrupted]",
         isError: true
       };
+    default: {
+      const _exhaustive = state;
+      return _exhaustive;
+    }
   }
 }
 function createUserTurn(text, timestamp, uuid) {
@@ -566,15 +591,15 @@ function createUserTurn(text, timestamp, uuid) {
     text
   };
 }
-function createAssistantTurn(model, timestamp, uuid, contentBlocks, usage, stopReason) {
+function createAssistantTurn(options) {
   return {
     kind: "assistant",
-    uuid,
-    timestamp,
-    model,
-    contentBlocks,
-    usage,
-    stopReason
+    uuid: options.uuid,
+    timestamp: options.timestamp,
+    model: options.model,
+    contentBlocks: options.contentBlocks,
+    usage: options.usage,
+    stopReason: options.stopReason
   };
 }
 function collectUserText(parts) {
@@ -591,14 +616,16 @@ function collectContentBlocks(parts, nextToolUseId) {
   const blocks = [];
   for (const part of parts) {
     const block = partToContentBlock(part, nextToolUseId);
-    if (block)
+    if (block) {
       blocks.push(block);
+    }
   }
   return blocks;
 }
 function tokensToUsage(tokens) {
-  if (!tokens)
+  if (!tokens) {
     return;
+  }
   return {
     inputTokens: tokens.input,
     outputTokens: tokens.output,
@@ -628,12 +655,19 @@ function buildAssistantTurnFromMsg(msg, timestamp, nextToolUseId) {
   const model = data.modelID || "unknown";
   const contentBlocks = collectContentBlocks(msg.parts, nextToolUseId);
   const usage = tokensToUsage(data.tokens) ?? extractStepFinishUsage(msg.parts);
-  return createAssistantTurn(model, timestamp, msg.id, contentBlocks, usage, data.finish);
+  return createAssistantTurn({
+    model,
+    timestamp,
+    uuid: msg.id,
+    contentBlocks,
+    ...usage === undefined ? {} : { usage },
+    ...data.finish === undefined ? {} : { stopReason: data.finish }
+  });
 }
 function buildOpenCodeTurns(messages) {
   let toolUseCounter = 0;
   const nextToolUseId = () => {
-    toolUseCounter++;
+    toolUseCounter += 1;
     return `opencode-tool-${toolUseCounter}`;
   };
   const turns = [];
@@ -768,18 +802,14 @@ var init_node_sqlite = __esm(() => {
           readOnly: options?.readonly ?? true
         });
         return {
-          query(sql) {
+          query: (sql) => {
             const stmt = db.prepare(sql);
             return {
-              all(...params) {
-                return stmt.all(...params);
-              },
-              get(...params) {
-                return stmt.get(...params);
-              }
+              all: (...params) => stmt.all(...params),
+              get: (...params) => stmt.get(...params)
             };
           },
-          close() {
+          close: () => {
             db.close();
           }
         };
@@ -841,7 +871,7 @@ __export(exports_platform_node, {
 import { createServer } from "node:http";
 import { NodeContext, NodeHttpServer } from "@effect/platform-node";
 import { Layer as Layer7 } from "effect";
-var NodePluginLayer, makeNodeServerLayer = (options) => Layer7.merge(NodeHttpServer.layer(() => createServer(), options), NodeContext.layer);
+var NodePluginLayer, makeNodeServerLayer = (options) => Layer7.mergeAll(NodeHttpServer.layer(() => createServer(), options), NodeContext.layer, NodeSqliteLayer);
 var init_platform_node = __esm(() => {
   init_src2();
   NodePluginLayer = Layer7.merge(NodeContext.layer, NodeSqliteLayer);
@@ -851,34 +881,16 @@ var init_platform_node = __esm(() => {
 import { execFile } from "node:child_process";
 
 // ../../packages/server/src/effect/bootstrap.ts
-import { join as join12 } from "node:path";
+import { join as join14 } from "node:path";
 import { HttpServer } from "@effect/platform";
-import { Cause, Effect as Effect20, Fiber, Layer as Layer8 } from "effect";
+import { Cause, Effect as Effect32, Fiber, Layer as Layer8 } from "effect";
 
 // ../../packages/server/src/effect/platform-bun.ts
 init_src2();
 import { BunContext, BunHttpServer } from "@effect/platform-bun";
 import { Layer as Layer5 } from "effect";
 var BunPluginLayer = Layer5.merge(BunContext.layer, BunSqliteLayer);
-var makeBunServerLayer = (options) => Layer5.merge(BunHttpServer.layer(options), BunContext.layer);
-
-// ../../packages/server/src/effect/plugin-runtime.ts
-init_src();
-import {
-  Effect as Effect9,
-  ManagedRuntime
-} from "effect";
-var pluginRuntime = ManagedRuntime.make(BunPluginLayer);
-function setPluginLayer(layer) {
-  pluginRuntime = ManagedRuntime.make(layer);
-}
-function runPluginEffect(effect, config) {
-  const provided = effect.pipe(Effect9.provide(makePluginConfigLayer(config)));
-  return pluginRuntime.runPromise(provided);
-}
-function runRegistryEffect(effect) {
-  return pluginRuntime.runPromise(effect);
-}
+var makeBunServerLayer = (options) => Layer5.mergeAll(BunHttpServer.layer(options), BunContext.layer, BunSqliteLayer);
 
 // ../../packages/server/src/effect/server-config.ts
 import { Context as Context3 } from "effect";
@@ -887,46 +899,51 @@ class ServerConfig extends Context3.Tag("@klovi/ServerConfig")() {
 }
 
 // ../../packages/server/src/effect/server-services.ts
-import { Context as Context4, Effect as Effect19, Layer as Layer6 } from "effect";
+import { Context as Context4, Effect as Effect31, Layer as Layer6 } from "effect";
 
-// ../../packages/server/src/services/app-services.ts
+// ../../packages/server/src/services/auto-discover.ts
 init_src();
-import { access, rm } from "node:fs/promises";
+import { Effect as Effect24 } from "effect";
 
 // ../../packages/plugin-claude-code/src/index.ts
 init_src();
-import { Effect as Effect13 } from "effect";
+import { Effect as Effect12 } from "effect";
 
 // ../../packages/plugin-claude-code/src/discovery.ts
 init_src();
 import { join as join6 } from "node:path";
-import { Effect as Effect11 } from "effect";
+import { Effect as Effect10 } from "effect";
 
 // ../../packages/plugin-claude-code/src/command-message.ts
-var COMMAND_ARGS_REGEX = /<command-args>([\s\S]*?)<\/command-args>/;
-var COMMAND_NAME_REGEX = /<command-name>([\s\S]*?)<\/command-name>/;
-var COMMAND_MESSAGE_TAG_REGEX = /<command-message>[\s\S]*?<\/command-message>/g;
-var COMMAND_NAME_TAG_REGEX = /<command-name>[\s\S]*?<\/command-name>/g;
+var COMMAND_ARGS_REGEX = /<command-args>(?<content>[\s\S]*?)<\/command-args>/u;
+var COMMAND_NAME_REGEX = /<command-name>(?<content>[\s\S]*?)<\/command-name>/u;
+var COMMAND_MESSAGE_TAG_REGEX = /<command-message>[\s\S]*?<\/command-message>/gu;
+var COMMAND_NAME_TAG_REGEX = /<command-name>[\s\S]*?<\/command-name>/gu;
 function cleanCommandMessage(text) {
-  if (!text.includes("<command-message>"))
+  if (!text.includes("<command-message>")) {
     return text;
-  const argsMatch = text.match(COMMAND_ARGS_REGEX);
-  if (argsMatch?.[1])
-    return argsMatch[1].trim();
-  const nameMatch = text.match(COMMAND_NAME_REGEX);
-  if (nameMatch?.[1])
-    return nameMatch[1].trim();
+  }
+  const argsMatch = COMMAND_ARGS_REGEX.exec(text);
+  if (argsMatch?.groups?.["content"]) {
+    return argsMatch.groups["content"].trim();
+  }
+  const nameMatch = COMMAND_NAME_REGEX.exec(text);
+  if (nameMatch?.groups?.["content"]) {
+    return nameMatch.groups["content"].trim();
+  }
   return text.replace(COMMAND_MESSAGE_TAG_REGEX, "").replace(COMMAND_NAME_TAG_REGEX, "").trim();
 }
 function parseCommandMessage(text) {
-  if (!text.includes("<command-message>"))
+  if (!text.includes("<command-message>")) {
     return null;
-  const nameMatch = text.match(COMMAND_NAME_REGEX);
-  const argsMatch = text.match(COMMAND_ARGS_REGEX);
-  const name = nameMatch?.[1]?.trim() ?? "";
-  const args = argsMatch?.[1]?.trim() ?? "";
-  if (!name && !args)
+  }
+  const nameMatch = COMMAND_NAME_REGEX.exec(text);
+  const argsMatch = COMMAND_ARGS_REGEX.exec(text);
+  const name = nameMatch?.groups?.["content"]?.trim() ?? "";
+  const args = argsMatch?.groups?.["content"]?.trim() ?? "";
+  if (!(name || args)) {
     return null;
+  }
   return { name, args };
 }
 
@@ -934,15 +951,15 @@ function parseCommandMessage(text) {
 init_src();
 import { join as join5 } from "node:path";
 import { FileSystem as FileSystem4 } from "@effect/platform";
-import { Effect as Effect10 } from "effect";
-var WINDOWS_DRIVE_LETTER_REGEX = /^[A-Za-z]\//;
+import { Effect as Effect9 } from "effect";
+var WINDOWS_DRIVE_LETTER_REGEX = /^[A-Za-z]\//u;
 function readDirEntriesSafe(dir) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect10.catchAll(() => Effect10.succeed([])));
+    const names = yield* fs.readDirectory(dir).pipe(Effect9.catchAll(() => Effect9.succeed([])));
     const entries = [];
     for (const name of names) {
-      const info = yield* fs.stat(join5(dir, name)).pipe(Effect10.catchAll(() => Effect10.succeed(null)));
+      const info = yield* fs.stat(join5(dir, name)).pipe(Effect9.catchAll(() => Effect9.succeed(null)));
       if (info) {
         entries.push({ name, isDirectory: info.type === "Directory" });
       }
@@ -951,19 +968,19 @@ function readDirEntriesSafe(dir) {
   });
 }
 function listFilesBySuffix(dir, suffix) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect10.catchAll(() => Effect10.succeed([])));
+    const names = yield* fs.readDirectory(dir).pipe(Effect9.catchAll(() => Effect9.succeed([])));
     return names.filter((name) => name.endsWith(suffix));
   });
 }
 function listFilesWithMtime(dir, suffix) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
     const names = yield* listFilesBySuffix(dir, suffix);
     const results = [];
     for (const fileName of names) {
-      const info = yield* fs.stat(join5(dir, fileName)).pipe(Effect10.catchAll(() => Effect10.succeed(null)));
+      const info = yield* fs.stat(join5(dir, fileName)).pipe(Effect9.catchAll(() => Effect9.succeed(null)));
       if (info?.mtime._tag === "Some") {
         results.push({ fileName, mtime: info.mtime.value.toISOString() });
       }
@@ -973,7 +990,7 @@ function listFilesWithMtime(dir, suffix) {
   });
 }
 function readTextPrefix(filePath, maxBytes) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
     const bytes = yield* fs.readFile(filePath);
     const slice = bytes.subarray(0, maxBytes);
@@ -981,26 +998,26 @@ function readTextPrefix(filePath, maxBytes) {
   });
 }
 function readFileText(filePath) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
     return yield* fs.readFileString(filePath);
   });
 }
 function fileExists(filePath) {
-  return Effect10.gen(function* () {
+  return Effect9.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
     return yield* fs.exists(filePath);
   });
 }
 function decodeEncodedPath(encoded) {
   if (encoded.startsWith("-")) {
-    const withSlashes = encoded.slice(1).replace(/-/g, "/");
+    const withSlashes = encoded.slice(1).replace(/-/gu, "/");
     if (process.platform === "win32" && WINDOWS_DRIVE_LETTER_REGEX.test(withSlashes)) {
       return `${withSlashes[0]}:${withSlashes.slice(1)}`;
     }
     return `/${withSlashes}`;
   }
-  return encoded.replace(/-/g, "/");
+  return encoded.replace(/-/gu, "/");
 }
 
 // ../../packages/plugin-claude-code/src/shared/jsonl-utils.ts
@@ -1011,8 +1028,9 @@ function iterateJsonl(text, visitor, options = {}) {
   const end = options.maxLines === undefined ? lines.length : Math.min(lines.length, start + options.maxLines);
   for (let i = start;i < end; i++) {
     const line = lines[i];
-    if (!line || !line.trim())
+    if (!line?.trim()) {
       continue;
+    }
     try {
       const parsed = JSON.parse(line);
       const shouldContinue = visitor({
@@ -1021,8 +1039,9 @@ function iterateJsonl(text, visitor, options = {}) {
         lineIndex: i,
         lineNumber: i + 1
       });
-      if (shouldContinue === false)
+      if (shouldContinue === false) {
         break;
+      }
     } catch (error) {
       options.onMalformed?.(line, i + 1, error);
     }
@@ -1030,11 +1049,13 @@ function iterateJsonl(text, visitor, options = {}) {
 }
 
 // ../../packages/plugin-claude-code/src/discovery.ts
-var CWD_SCAN_BYTES = 64 * 1024;
-var SESSION_META_SCAN_BYTES = 1024 * 1024;
-var BRACKETED_TEXT_REGEX = /^\[.+\]$/;
+var BYTES_PER_KB = 1024;
+var CWD_SCAN_KB = 64;
+var CWD_SCAN_BYTES = CWD_SCAN_KB * BYTES_PER_KB;
+var SESSION_META_SCAN_BYTES = BYTES_PER_KB * BYTES_PER_KB;
+var BRACKETED_TEXT_REGEX = /^\[.+\]$/u;
 function inspectProjectSessions(projectDir, sessionFiles) {
-  return Effect11.gen(function* () {
+  return Effect10.gen(function* () {
     const lastActivity = sessionFiles[0]?.mtime || "";
     let resolvedPath = "";
     for (const sessionFile of sessionFiles) {
@@ -1047,18 +1068,20 @@ function inspectProjectSessions(projectDir, sessionFiles) {
   });
 }
 function discoverClaudeProjects() {
-  return Effect11.gen(function* () {
+  return Effect10.gen(function* () {
     const config = yield* PluginConfig;
     const projectsDir = join6(config.dataDir, "projects");
     const entries = yield* readDirEntriesSafe(projectsDir);
     const projects = [];
     for (const entry of entries) {
-      if (!entry.isDirectory)
+      if (!entry.isDirectory) {
         continue;
+      }
       const projectDir = join6(projectsDir, entry.name);
       const sessionFiles = yield* listFilesWithMtime(projectDir, ".jsonl");
-      if (sessionFiles.length === 0)
+      if (sessionFiles.length === 0) {
         continue;
+      }
       const projectInfo = yield* inspectProjectSessions(projectDir, sessionFiles);
       const resolvedPath = projectInfo.resolvedPath || decodeEncodedPath(entry.name);
       projects.push({
@@ -1076,7 +1099,7 @@ function discoverClaudeProjects() {
 }
 var PLAN_PREFIX = "Implement the following plan";
 function listClaudeSessions(nativeId) {
-  return Effect11.gen(function* () {
+  return Effect10.gen(function* () {
     const config = yield* PluginConfig;
     const projectDir = join6(config.dataDir, "projects", nativeId);
     const files = yield* listFilesBySuffix(projectDir, ".jsonl");
@@ -1085,8 +1108,9 @@ function listClaudeSessions(nativeId) {
       const filePath = join6(projectDir, file);
       const sessionId = file.replace(".jsonl", "");
       const meta = yield* extractSessionMeta(filePath);
-      if (meta)
+      if (meta) {
         sessions.push({ sessionId, pluginId: "claude-code", ...meta });
+      }
     }
     classifySessionTypes(sessions);
     sortByIsoDesc(sessions, (session) => session.timestamp);
@@ -1098,8 +1122,9 @@ function classifySessionTypes(sessions) {
   for (const session of sessions) {
     if (session.firstMessage.startsWith(PLAN_PREFIX)) {
       session.sessionType = "implementation";
-      if (session.slug)
+      if (session.slug) {
         implSlugs.add(session.slug);
+      }
     }
   }
   for (const session of sessions) {
@@ -1109,15 +1134,16 @@ function classifySessionTypes(sessions) {
   }
 }
 function extractCwd(filePath) {
-  return Effect11.gen(function* () {
-    const text = yield* readTextPrefix(filePath, CWD_SCAN_BYTES).pipe(Effect11.catchAll(() => Effect11.succeed("")));
-    if (!text)
+  return Effect10.gen(function* () {
+    const text = yield* readTextPrefix(filePath, CWD_SCAN_BYTES).pipe(Effect10.catchAll(() => Effect10.succeed("")));
+    if (!text) {
       return "";
+    }
     let cwd = "";
     iterateJsonl(text, ({ parsed }) => {
       const obj = parsed;
       if (obj.cwd) {
-        cwd = obj.cwd;
+        ({ cwd } = obj);
         return false;
       }
       return;
@@ -1126,12 +1152,14 @@ function extractCwd(filePath) {
   });
 }
 function extractTextFromContent(content) {
-  if (typeof content === "string")
+  if (typeof content === "string") {
     return content;
+  }
   if (Array.isArray(content)) {
     for (const block of content) {
-      if (block.type === "text" && "text" in block)
+      if (block.type === "text" && "text" in block) {
         return block.text;
+      }
     }
   }
   return "";
@@ -1140,29 +1168,35 @@ function isInternalMessage(text) {
   return text.startsWith("<local-command") || text.startsWith("<command-name") || BRACKETED_TEXT_REGEX.test(text.trim());
 }
 function isMetaComplete(meta) {
-  return !!(meta.timestamp && meta.slug && meta.firstMessage && meta.model && meta.gitBranch);
+  return Boolean(meta.timestamp && meta.slug && meta.firstMessage && meta.model && meta.gitBranch);
 }
 function processMetaLine(obj, meta) {
-  if (obj.timestamp && !meta.timestamp)
+  if (obj.timestamp && !meta.timestamp) {
     meta.timestamp = obj.timestamp;
-  if (obj.slug && !meta.slug)
+  }
+  if (obj.slug && !meta.slug) {
     meta.slug = obj.slug;
-  if (obj.gitBranch && !meta.gitBranch)
+  }
+  if (obj.gitBranch && !meta.gitBranch) {
     meta.gitBranch = obj.gitBranch;
-  if (obj.message?.model && !meta.model)
+  }
+  if (obj.message?.model && !meta.model) {
     meta.model = obj.message.model;
+  }
   if (!meta.firstMessage && obj.type === "user" && !obj.isMeta && obj.message) {
     const raw = extractTextFromContent(obj.message.content);
     if (raw && !isInternalMessage(raw)) {
-      meta.firstMessage = cleanCommandMessage(raw).slice(0, 200);
+      const maxPreviewLength = 200;
+      meta.firstMessage = cleanCommandMessage(raw).slice(0, maxPreviewLength);
     }
   }
 }
 function extractSessionMeta(filePath) {
-  return Effect11.gen(function* () {
-    const text = yield* readTextPrefix(filePath, SESSION_META_SCAN_BYTES).pipe(Effect11.catchAll(() => Effect11.succeed("")));
-    if (!text)
+  return Effect10.gen(function* () {
+    const text = yield* readTextPrefix(filePath, SESSION_META_SCAN_BYTES).pipe(Effect10.catchAll(() => Effect10.succeed("")));
+    if (!text) {
       return null;
+    }
     const meta = {
       timestamp: "",
       slug: "",
@@ -1173,15 +1207,17 @@ function extractSessionMeta(filePath) {
     iterateJsonl(text, ({ parsed }) => {
       const obj = parsed;
       processMetaLine(obj, meta);
-      if (isMetaComplete(meta))
+      if (isMetaComplete(meta)) {
         return false;
+      }
       return;
     }, {
       maxLines: 50,
       onMalformed: () => {}
     });
-    if (!meta.timestamp || !meta.firstMessage)
+    if (!(meta.timestamp && meta.firstMessage)) {
       return null;
+    }
     return {
       timestamp: meta.timestamp,
       slug: meta.slug || "unknown",
@@ -1195,9 +1231,10 @@ function extractSessionMeta(filePath) {
 // ../../packages/plugin-claude-code/src/parser.ts
 init_src();
 import { join as join7 } from "node:path";
-import { Effect as Effect12 } from "effect";
+import { Effect as Effect11 } from "effect";
+var MAX_RAW_LINE_LENGTH = 500;
 function loadClaudeSession(nativeId, sessionId) {
-  return Effect12.gen(function* () {
+  return Effect11.gen(function* () {
     const config = yield* PluginConfig;
     const filePath = join7(config.dataDir, "projects", nativeId, `${sessionId}.jsonl`);
     const { rawLines, parseErrors } = yield* readJsonlLines(filePath);
@@ -1205,8 +1242,9 @@ function loadClaudeSession(nativeId, sessionId) {
     const slug = extractSlug(rawLines);
     const turns = buildTurns(rawLines, parseErrors);
     for (const turn of turns) {
-      if (turn.kind !== "assistant")
+      if (turn.kind !== "assistant") {
         continue;
+      }
       for (const block of turn.contentBlocks) {
         if (block.type === "tool_call" && block.call.name === "Task") {
           const agentId = subAgentMap.get(block.call.toolUseId);
@@ -1228,15 +1266,16 @@ function loadClaudeSession(nativeId, sessionId) {
   });
 }
 function parseSubAgentSession(sessionId, encodedPath, agentId) {
-  return Effect12.gen(function* () {
+  return Effect11.gen(function* () {
     const config = yield* PluginConfig;
     const filePath = join7(config.dataDir, "projects", encodedPath, sessionId, "subagents", `agent-${agentId}.jsonl`);
-    const parsed = yield* readJsonlLines(filePath).pipe(Effect12.catchAll(() => Effect12.succeed({ rawLines: [], parseErrors: [] })));
+    const parsed = yield* readJsonlLines(filePath).pipe(Effect11.catchAll(() => Effect11.succeed({ rawLines: [], parseErrors: [] })));
     const subAgentMap = extractSubAgentMap(parsed.rawLines);
     const turns = buildTurns(parsed.rawLines, parsed.parseErrors);
     for (const turn of turns) {
-      if (turn.kind !== "assistant")
+      if (turn.kind !== "assistant") {
         continue;
+      }
       for (const block of turn.contentBlocks) {
         if (block.type === "tool_call" && block.call.name === "Task") {
           const nestedAgentId = subAgentMap.get(block.call.toolUseId);
@@ -1249,26 +1288,29 @@ function parseSubAgentSession(sessionId, encodedPath, agentId) {
     return { sessionId, project: encodedPath, turns, pluginId: "claude-code" };
   });
 }
-var AGENT_ID_RE = /agentId:\s*(\w+)/;
+var AGENT_ID_RE = /agentId:\s*(?<id>\w+)/u;
 function extractFromProgressEvent(line, map) {
   if (line.type === "progress" && line.parentToolUseID && line.data?.type === "agent_progress" && line.data.agentId) {
     map.set(line.parentToolUseID, line.data.agentId);
   }
 }
 function extractToolResultText(tr) {
-  if (typeof tr.content === "string")
+  if (typeof tr.content === "string") {
     return tr.content;
+  }
   if (Array.isArray(tr.content)) {
     return tr.content.filter((c) => c.type === "text" && ("text" in c)).map((c) => ("text" in c) ? c.text : "").join("");
   }
   return "";
 }
 function extractFromToolResult(line, map) {
-  if (line.type !== "user" || !line.message || !Array.isArray(line.message.content))
+  if (line.type !== "user" || !line.message || !Array.isArray(line.message.content)) {
     return;
+  }
   for (const block of line.message.content) {
-    if (block.type !== "tool_result")
+    if (block.type !== "tool_result") {
       continue;
+    }
     const tr = block;
     const match = AGENT_ID_RE.exec(extractToolResultText(tr));
     if (match?.[1]) {
@@ -1286,30 +1328,34 @@ function extractSubAgentMap(lines) {
 }
 function extractSlug(lines) {
   for (const line of lines) {
-    if (line.slug)
+    if (line.slug) {
       return line.slug;
+    }
   }
   return;
 }
 var PLAN_PREFIX2 = "Implement the following plan";
-var STATUS_RE = /^\[.+\]$/;
+var STATUS_RE = /^\[.+\]$/u;
 function findPlanSessionId(turns, slug, sessions, currentSessionId) {
   const planTurn = turns.find((t) => t.kind === "user" && !STATUS_RE.test(t.text.trim()));
-  if (!planTurn || !planTurn.text.startsWith(PLAN_PREFIX2))
+  if (!planTurn?.text.startsWith(PLAN_PREFIX2)) {
     return;
-  if (!slug)
+  }
+  if (!slug) {
     return;
+  }
   const match = sessions.find((s) => s.slug === slug && s.sessionId !== currentSessionId);
   return match?.sessionId;
 }
 function findImplSessionId(slug, sessions, currentSessionId) {
-  if (!slug)
+  if (!slug) {
     return;
+  }
   const match = sessions.find((s) => s.slug === slug && s.sessionId !== currentSessionId && s.firstMessage.startsWith(PLAN_PREFIX2));
   return match?.sessionId;
 }
 function readJsonlLines(filePath) {
-  return Effect12.gen(function* () {
+  return Effect11.gen(function* () {
     const text = yield* readFileText(filePath);
     const rawLines = [];
     const parseErrors = [];
@@ -1320,9 +1366,9 @@ function readJsonlLines(filePath) {
         parseErrors.push({
           kind: "parse_error",
           uuid: `parse-error-line-${lineNumber}`,
-          timestamp: rawLines[rawLines.length - 1]?.timestamp ?? "",
+          timestamp: rawLines.at(-1)?.timestamp ?? "",
           lineNumber,
-          rawLine: line.length > 500 ? `${line.slice(0, 500)}… (truncated)` : line,
+          rawLine: line.length > MAX_RAW_LINE_LENGTH ? `${line.slice(0, MAX_RAW_LINE_LENGTH)}… (truncated)` : line,
           errorType: "json_parse",
           errorDetails: error instanceof Error ? error.message : undefined
         });
@@ -1332,26 +1378,33 @@ function readJsonlLines(filePath) {
   });
 }
 function isDisplayableLine(l) {
-  if (l.type === "progress")
+  if (l.type === "progress") {
     return false;
-  if (l.type === "file-history-snapshot")
+  }
+  if (l.type === "file-history-snapshot") {
     return false;
-  if (l.type === "summary")
+  }
+  if (l.type === "summary") {
     return false;
-  if (l.isMeta)
+  }
+  if (l.isMeta) {
     return false;
-  if (!l.message)
+  }
+  if (!l.message) {
     return false;
+  }
   return true;
 }
 function collectToolResults(displayable) {
   const toolResults = new Map;
   for (const line of displayable) {
-    if (line.type !== "user" || !line.message)
+    if (line.type !== "user" || !line.message) {
       continue;
-    const content = line.message.content;
-    if (!Array.isArray(content))
+    }
+    const { content } = line.message;
+    if (!Array.isArray(content)) {
       continue;
+    }
     for (const block of content) {
       if (block.type === "tool_result") {
         const tr = block;
@@ -1367,8 +1420,9 @@ function collectToolResults(displayable) {
   return toolResults;
 }
 function extractUserContent(content) {
-  if (typeof content === "string")
+  if (typeof content === "string") {
     return { text: content, attachments: [] };
+  }
   const textBlocks = content.filter((b) => b.type === "text");
   const text = textBlocks.map((b) => ("text" in b) ? b.text : "").join(`
 `);
@@ -1386,25 +1440,29 @@ function extractUserContent(content) {
 function isSkippedUserText(text) {
   return text.startsWith("<local-command") || text.startsWith("<command-name") || text.startsWith("<task-notification") || text.startsWith("<system-reminder");
 }
-var BASH_INPUT_RE = /<bash-input>([\s\S]*?)<\/bash-input>/;
-var BASH_OUTPUT_RE = /^<bash-stdout>([\s\S]*?)<\/bash-stdout>(?:<bash-stderr>([\s\S]*?)<\/bash-stderr>)?$/;
-var IDE_OPENED_FILE_RE = /<ide_opened_file>[\s\S]*?opened the file (.*?) in the IDE[\s\S]*?<\/ide_opened_file>/;
+var BASH_INPUT_RE = /<bash-input>(?<input>[\s\S]*?)<\/bash-input>/u;
+var BASH_OUTPUT_RE = /^<bash-stdout>(?<stdout>[\s\S]*?)<\/bash-stdout>(?:<bash-stderr>(?<stderr>[\s\S]*?)<\/bash-stderr>)?$/u;
+var IDE_OPENED_FILE_RE = /<ide_opened_file>[\s\S]*?opened the file (?<file>.*?) in the IDE[\s\S]*?<\/ide_opened_file>/u;
 function parseSpecialUserContent(text) {
   const bashMatch = BASH_INPUT_RE.exec(text);
-  if (bashMatch?.[1] !== undefined)
-    return { bashInput: bashMatch[1] };
+  if (bashMatch?.groups?.["input"] !== undefined) {
+    return { bashInput: bashMatch.groups["input"] };
+  }
   const outputMatch = BASH_OUTPUT_RE.exec(text);
-  if (outputMatch?.[1] !== undefined)
-    return { bashStdout: outputMatch[1], bashStderr: outputMatch[2] };
+  if (outputMatch?.groups?.["stdout"] !== undefined) {
+    return { bashStdout: outputMatch.groups["stdout"], bashStderr: outputMatch.groups?.["stderr"] };
+  }
   const ideMatch = IDE_OPENED_FILE_RE.exec(text);
-  if (ideMatch?.[1] !== undefined)
-    return { ideOpenedFile: ideMatch[1] };
+  if (ideMatch?.groups?.["file"] !== undefined) {
+    return { ideOpenedFile: ideMatch.groups?.["file"] ?? "" };
+  }
   return null;
 }
 function processUserLine(line) {
-  if (!line.message)
+  if (!line.message) {
     return null;
-  const content = line.message.content;
+  }
+  const { content } = line.message;
   if (Array.isArray(content) && content.every((b) => b.type === "tool_result")) {
     return "tool_result_only";
   }
@@ -1413,19 +1471,20 @@ function processUserLine(line) {
   if (special) {
     return {
       kind: "user",
-      uuid: line.uuid || "",
-      timestamp: line.timestamp || "",
+      uuid: line.uuid ?? "",
+      timestamp: line.timestamp ?? "",
       text: "",
       ...special
     };
   }
-  if (isSkippedUserText(text))
+  if (isSkippedUserText(text)) {
     return null;
+  }
   const command = parseCommandMessage(text);
   return {
     kind: "user",
-    uuid: line.uuid || "",
-    timestamp: line.timestamp || "",
+    uuid: line.uuid ?? "",
+    timestamp: line.timestamp ?? "",
     text: command ? command.args : text,
     command: command ?? undefined,
     attachments: attachments.length > 0 ? attachments : undefined
@@ -1434,9 +1493,9 @@ function processUserLine(line) {
 function createAssistantTurn2(line) {
   return {
     kind: "assistant",
-    uuid: line.uuid || "",
-    timestamp: line.timestamp || "",
-    model: line.message?.model || "",
+    uuid: line.uuid ?? "",
+    timestamp: line.timestamp ?? "",
+    model: line.message?.model ?? "",
     contentBlocks: []
   };
 }
@@ -1465,8 +1524,9 @@ function processContentBlock(block, current, toolResults) {
 }
 function processAssistantLine(line, current, toolResults) {
   const msg = line.message;
-  if (!msg)
+  if (!msg) {
     return;
+  }
   if (msg.usage) {
     current.usage = {
       inputTokens: msg.usage.input_tokens ?? 0,
@@ -1483,20 +1543,22 @@ function processAssistantLine(line, current, toolResults) {
   }
 }
 function flushAssistant(current, turns) {
-  if (current)
+  if (current) {
     turns.push(current);
+  }
   return null;
 }
 function mergeBashTurns(turns) {
   const merged = [];
   for (let i = 0;i < turns.length; i++) {
     const turn = turns[i];
-    if (!turn)
+    if (!turn) {
       continue;
+    }
     const next = turns[i + 1];
     if (turn.kind === "user" && turn.bashInput !== undefined && next?.kind === "user" && next.bashStdout !== undefined) {
       merged.push({ ...turn, bashStdout: next.bashStdout, bashStderr: next.bashStderr });
-      i++;
+      i += 1;
     } else {
       merged.push(turn);
     }
@@ -1505,23 +1567,26 @@ function mergeBashTurns(turns) {
 }
 function handleUserLine(line, currentAssistant, turns) {
   const result = processUserLine(line);
-  if (result === "tool_result_only")
+  if (result === "tool_result_only") {
     return currentAssistant;
+  }
   const flushed = flushAssistant(currentAssistant, turns);
-  if (result)
+  if (result) {
     turns.push(result);
+  }
   return flushed;
 }
 function handleAssistantLine(line, currentAssistant, toolResults, structureErrors) {
-  if (!line.message)
+  if (!line.message) {
     return currentAssistant;
+  }
   if (!Array.isArray(line.message.content)) {
     structureErrors.push({
       kind: "parse_error",
-      uuid: `parse-error-${line.uuid || "unknown"}`,
-      timestamp: line.timestamp || "",
+      uuid: `parse-error-${line.uuid ?? "unknown"}`,
+      timestamp: line.timestamp ?? "",
       lineNumber: 0,
-      rawLine: JSON.stringify(line.message.content).slice(0, 500),
+      rawLine: JSON.stringify(line.message.content).slice(0, MAX_RAW_LINE_LENGTH),
       errorType: "invalid_structure",
       errorDetails: `Assistant message content is ${typeof line.message.content}, expected array`
     });
@@ -1533,13 +1598,14 @@ function handleAssistantLine(line, currentAssistant, toolResults, structureError
 }
 function handleSystemLine(line, currentAssistant, turns) {
   flushAssistant(currentAssistant, turns);
-  if (!line.message)
+  if (!line.message) {
     return null;
+  }
   const text = typeof line.message.content === "string" ? line.message.content : "";
   turns.push({
     kind: "system",
-    uuid: line.uuid || "",
-    timestamp: line.timestamp || "",
+    uuid: line.uuid ?? "",
+    timestamp: line.timestamp ?? "",
     text
   });
   return null;
@@ -1568,8 +1634,9 @@ function buildTurns(lines, parseErrors = []) {
   return mergedTurns;
 }
 function extractToolResult(tr) {
-  if (typeof tr.content === "string")
+  if (typeof tr.content === "string") {
     return { text: tr.content, images: [] };
+  }
   if (Array.isArray(tr.content)) {
     const textParts = [];
     const images = [];
@@ -1597,20 +1664,20 @@ var claudeCodePlugin = {
   id: "claude-code",
   displayName: "Claude Code",
   getDefaultDataDir: () => null,
-  isDataAvailable: Effect13.gen(function* () {
+  isDataAvailable: Effect12.gen(function* () {
     const config = yield* PluginConfig;
-    return yield* fileExists(config.dataDir).pipe(Effect13.catchAll(() => Effect13.succeed(false)));
+    return yield* fileExists(config.dataDir).pipe(Effect12.catchAll(() => Effect12.succeed(false)));
   }),
   discoverProjects: discoverClaudeProjects(),
   listSessions: (nativeId) => listClaudeSessions(nativeId),
-  loadSession: (nativeId, sessionId) => loadClaudeSession(nativeId, sessionId).pipe(Effect13.map((r) => r.session), Effect13.catchAll((err) => Effect13.fail(new PluginError({
+  loadSession: (nativeId, sessionId) => loadClaudeSession(nativeId, sessionId).pipe(Effect12.map((r) => r.session), Effect12.catchAll((err) => Effect12.fail(new PluginError({
     pluginId: "claude-code",
     operation: "loadSession",
     message: String(err),
     cause: err
   })))),
-  loadSessionDetail: (nativeId, sessionId) => Effect13.gen(function* () {
-    const [{ session, slug }, sessions] = yield* Effect13.all([
+  loadSessionDetail: (nativeId, sessionId) => Effect12.gen(function* () {
+    const [{ session, slug }, sessions] = yield* Effect12.all([
       loadClaudeSession(nativeId, sessionId),
       listClaudeSessions(nativeId)
     ]);
@@ -1619,7 +1686,7 @@ var claudeCodePlugin = {
       planSessionId: findPlanSessionId(session.turns, slug, sessions, sessionId),
       implSessionId: findImplSessionId(slug, sessions, sessionId)
     };
-  }).pipe(Effect13.catchAll((err) => Effect13.fail(new PluginError({
+  }).pipe(Effect12.catchAll((err) => Effect12.fail(new PluginError({
     pluginId: "claude-code",
     operation: "loadSessionDetail",
     message: String(err),
@@ -1631,23 +1698,23 @@ var claudeCodePlugin = {
 
 // ../../packages/plugin-codex/src/index.ts
 init_src();
-import { Effect as Effect18 } from "effect";
+import { Effect as Effect17 } from "effect";
 
 // ../../packages/plugin-codex/src/discovery.ts
 init_src();
-import { Effect as Effect16 } from "effect";
+import { Effect as Effect15 } from "effect";
 
 // ../../packages/plugin-codex/src/session-index.ts
 init_src();
 import { join as join9 } from "node:path";
 import { FileSystem as FileSystem6 } from "@effect/platform";
-import { Effect as Effect15 } from "effect";
+import { Effect as Effect14 } from "effect";
 
 // ../../packages/plugin-codex/src/shared/discovery-utils.ts
 import { FileSystem as FileSystem5 } from "@effect/platform";
-import { Effect as Effect14 } from "effect";
+import { Effect as Effect13 } from "effect";
 function readTextPrefix2(filePath, maxBytes) {
-  return Effect14.gen(function* () {
+  return Effect13.gen(function* () {
     const fs = yield* FileSystem5.FileSystem;
     const bytes = yield* fs.readFile(filePath);
     const slice = bytes.subarray(0, maxBytes);
@@ -1655,13 +1722,13 @@ function readTextPrefix2(filePath, maxBytes) {
   });
 }
 function readFileText2(filePath) {
-  return Effect14.gen(function* () {
+  return Effect13.gen(function* () {
     const fs = yield* FileSystem5.FileSystem;
     return yield* fs.readFileString(filePath);
   });
 }
 function fileExists2(filePath) {
-  return Effect14.gen(function* () {
+  return Effect13.gen(function* () {
     const fs = yield* FileSystem5.FileSystem;
     return yield* fs.exists(filePath);
   });
@@ -1675,8 +1742,9 @@ function iterateJsonl2(text, visitor, options = {}) {
   const end = options.maxLines === undefined ? lines.length : Math.min(lines.length, start + options.maxLines);
   for (let i = start;i < end; i++) {
     const line = lines[i];
-    if (!line || !line.trim())
+    if (!line?.trim()) {
       continue;
+    }
     try {
       const parsed = JSON.parse(line);
       const shouldContinue = visitor({
@@ -1685,8 +1753,9 @@ function iterateJsonl2(text, visitor, options = {}) {
         lineIndex: i,
         lineNumber: i + 1
       });
-      if (shouldContinue === false)
+      if (shouldContinue === false) {
         break;
+      }
     } catch (error) {
       options.onMalformed?.(line, i + 1, error);
     }
@@ -1694,7 +1763,10 @@ function iterateJsonl2(text, visitor, options = {}) {
 }
 
 // ../../packages/plugin-codex/src/session-index.ts
-var FIRST_LINE_SCAN_BYTES = 512 * 1024;
+var BYTES_PER_KB2 = 1024;
+var FIRST_LINE_SCAN_KB = 512;
+var FIRST_LINE_SCAN_BYTES = FIRST_LINE_SCAN_KB * BYTES_PER_KB2;
+var MS_PER_SECOND2 = 1000;
 function isCodexSessionMeta(obj) {
   return typeof obj === "object" && obj !== null && "uuid" in obj && "cwd" in obj && "timestamps" in obj && typeof obj.uuid === "string" && typeof obj.cwd === "string";
 }
@@ -1702,12 +1774,13 @@ function isNewFormatMeta(obj) {
   return typeof obj === "object" && obj !== null && "type" in obj && obj.type === "session_meta" && "payload" in obj && typeof obj.payload === "object" && obj.payload !== null && typeof obj.payload.id === "string" && typeof obj.payload.cwd === "string";
 }
 function normalizeSessionMeta(parsed, fileMtimeEpoch) {
-  if (isCodexSessionMeta(parsed))
+  if (isCodexSessionMeta(parsed)) {
     return parsed;
+  }
   if (isNewFormatMeta(parsed)) {
     const { payload } = parsed;
     const isoTimestamp = payload.timestamp || parsed.timestamp;
-    const createdEpoch = isoTimestamp ? new Date(isoTimestamp).getTime() / 1000 : 0;
+    const createdEpoch = isoTimestamp ? new Date(isoTimestamp).getTime() / MS_PER_SECOND2 : 0;
     const updatedEpoch = fileMtimeEpoch ?? createdEpoch;
     return {
       uuid: payload.id,
@@ -1723,11 +1796,13 @@ function isKnownModel(model) {
   return typeof model === "string" && model.length > 0 && model !== "unknown";
 }
 function extractTurnContextModel(parsed) {
-  if (typeof parsed !== "object" || parsed === null)
+  if (typeof parsed !== "object" || parsed === null) {
     return null;
+  }
   const event = parsed;
-  if (event.type !== "turn_context")
+  if (event.type !== "turn_context") {
     return null;
+  }
   return typeof event.payload?.model === "string" ? event.payload.model : null;
 }
 function inferModelFromPrefix(prefixText) {
@@ -1743,42 +1818,49 @@ function inferModelFromPrefix(prefixText) {
   return model;
 }
 function parseSessionMeta(filePath, fileMtimeEpoch) {
-  return Effect15.gen(function* () {
-    const prefix = yield* readTextPrefix2(filePath, FIRST_LINE_SCAN_BYTES).pipe(Effect15.catchAll(() => Effect15.succeed("")));
-    if (!prefix)
+  return Effect14.gen(function* () {
+    const prefix = yield* readTextPrefix2(filePath, FIRST_LINE_SCAN_BYTES).pipe(Effect14.catchAll(() => Effect14.succeed("")));
+    if (!prefix) {
       return null;
+    }
     const firstNewline = prefix.indexOf(`
 `);
     const firstLine = firstNewline === -1 ? prefix : prefix.slice(0, firstNewline);
     const trimmedFirstLine = firstLine.trim();
-    if (!trimmedFirstLine)
+    if (!trimmedFirstLine) {
       return null;
+    }
     try {
       const parsed = JSON.parse(trimmedFirstLine);
       const meta = normalizeSessionMeta(parsed, fileMtimeEpoch);
-      if (!meta)
+      if (!meta) {
         return null;
-      if (isKnownModel(meta.model))
+      }
+      if (isKnownModel(meta.model)) {
         return meta;
+      }
       const inferred = inferModelFromPrefix(prefix);
-      if (isKnownModel(inferred))
+      if (isKnownModel(inferred)) {
         return { ...meta, model: inferred };
-      if (isKnownModel(meta.provider_id))
+      }
+      if (isKnownModel(meta.provider_id)) {
         return { ...meta, model: meta.provider_id };
+      }
       return meta;
     } catch {}
     return null;
   });
 }
 function walkJsonlFiles(dir, visit) {
-  return Effect15.gen(function* () {
+  return Effect14.gen(function* () {
     const fs = yield* FileSystem6.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect15.catchAll(() => Effect15.succeed([])));
+    const names = yield* fs.readDirectory(dir).pipe(Effect14.catchAll(() => Effect14.succeed([])));
     for (const name of names) {
       const fullPath = join9(dir, name);
-      const info = yield* fs.stat(fullPath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
-      if (!info)
+      const info = yield* fs.stat(fullPath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+      if (!info) {
         continue;
+      }
       if (info.type === "Directory") {
         yield* walkJsonlFiles(fullPath, visit);
         continue;
@@ -1790,17 +1872,18 @@ function walkJsonlFiles(dir, visit) {
   });
 }
 function scanCodexSessions() {
-  return Effect15.gen(function* () {
+  return Effect14.gen(function* () {
     const config = yield* PluginConfig;
     const fs = yield* FileSystem6.FileSystem;
     const sessionsDir = join9(config.dataDir, "sessions");
     const sessions = [];
-    yield* walkJsonlFiles(sessionsDir, (filePath, _fileName) => Effect15.gen(function* () {
-      const info = yield* fs.stat(filePath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
-      const fileMtimeEpoch = info?.mtime._tag === "Some" ? info.mtime.value.getTime() / 1000 : undefined;
+    yield* walkJsonlFiles(sessionsDir, (filePath, _fileName) => Effect14.gen(function* () {
+      const info = yield* fs.stat(filePath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+      const fileMtimeEpoch = info?.mtime._tag === "Some" ? info.mtime.value.getTime() / MS_PER_SECOND2 : undefined;
       const meta = yield* parseSessionMeta(filePath, fileMtimeEpoch);
-      if (!meta)
+      if (!meta) {
         return;
+      }
       if (info?.mtime._tag === "Some") {
         sessions.push({
           filePath,
@@ -1813,44 +1896,50 @@ function scanCodexSessions() {
   });
 }
 function walkForFile(dir, match) {
-  return Effect15.gen(function* () {
+  return Effect14.gen(function* () {
     const fs = yield* FileSystem6.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect15.catchAll(() => Effect15.succeed([])));
+    const names = yield* fs.readDirectory(dir).pipe(Effect14.catchAll(() => Effect14.succeed([])));
     for (const name of names) {
       const fullPath = join9(dir, name);
-      const info = yield* fs.stat(fullPath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
-      if (!info)
+      const info = yield* fs.stat(fullPath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+      if (!info) {
         continue;
-      if (info.type !== "Directory" && match(name))
+      }
+      if (info.type !== "Directory" && match(name)) {
         return fullPath;
+      }
       if (info.type === "Directory") {
         const found = yield* walkForFile(fullPath, match);
-        if (found)
+        if (found) {
           return found;
+        }
       }
     }
     return null;
   });
 }
 function findCodexSessionFileById(sessionId) {
-  return Effect15.gen(function* () {
+  return Effect14.gen(function* () {
     const config = yield* PluginConfig;
     const fs = yield* FileSystem6.FileSystem;
     const sessionsDir = join9(config.dataDir, "sessions");
     const exactName = `${sessionId}.jsonl`;
     const suffix = `-${sessionId}.jsonl`;
     const filePath = yield* walkForFile(sessionsDir, (name) => name === exactName || name.endsWith(suffix));
-    if (!filePath)
+    if (!filePath) {
       return null;
-    const info = yield* fs.stat(filePath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
+    }
+    const info = yield* fs.stat(filePath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
     return info?.type === "File" ? filePath : null;
   });
 }
 
 // ../../packages/plugin-codex/src/discovery.ts
-var SESSION_TITLE_SCAN_BYTES = 256 * 1024;
+var BYTES_PER_KB3 = 1024;
+var SESSION_TITLE_SCAN_KB = 256;
+var SESSION_TITLE_SCAN_BYTES = SESSION_TITLE_SCAN_KB * BYTES_PER_KB3;
 function discoverCodexProjects() {
-  return Effect16.gen(function* () {
+  return Effect15.gen(function* () {
     const sessions = yield* scanCodexSessions();
     const byCwd = new Map;
     for (const session of sessions) {
@@ -1865,8 +1954,9 @@ function discoverCodexProjects() {
     for (const [cwd, cwdSessions] of byCwd) {
       let lastActivity = "";
       for (const s of cwdSessions) {
-        if (s.mtime > lastActivity)
+        if (s.mtime > lastActivity) {
           lastActivity = s.mtime;
+        }
       }
       projects.push({
         pluginId: "codex-cli",
@@ -1886,13 +1976,15 @@ function extractFirstUserMessage(text) {
   iterateJsonl2(text, ({ parsed }) => {
     const event = parsed;
     if (event.type === "item.completed" && event.item?.type === "agent_message" && event.item.text) {
-      message = event.item.text.slice(0, 200);
+      const maxPreviewLength = 200;
+      message = event.item.text.slice(0, maxPreviewLength);
       return false;
     }
     if (event.type === "event_msg" && event.payload?.type === "user_message") {
-      const text2 = event.payload.message || event.payload.text;
-      if (typeof text2 === "string" && text2) {
-        message = text2.slice(0, 200);
+      const payloadText = event.payload.message || event.payload.text;
+      if (typeof payloadText === "string" && payloadText) {
+        const maxMsgLength = 200;
+        message = payloadText.slice(0, maxMsgLength);
         return false;
       }
     }
@@ -1901,18 +1993,18 @@ function extractFirstUserMessage(text) {
   return message;
 }
 function listCodexSessions(nativeId) {
-  return Effect16.gen(function* () {
+  return Effect15.gen(function* () {
     const allSessions = yield* scanCodexSessions();
     const matching = allSessions.filter((s) => s.meta.cwd === nativeId);
     const sessions = [];
     for (const s of matching) {
-      let firstMessage = s.meta.name || "";
+      let firstMessage = s.meta.name ?? "";
       if (!firstMessage) {
-        const prefix = yield* readTextPrefix2(s.filePath, SESSION_TITLE_SCAN_BYTES).pipe(Effect16.catchAll(() => Effect16.succeed("")));
-        firstMessage = extractFirstUserMessage(prefix) || "";
+        const prefix = yield* readTextPrefix2(s.filePath, SESSION_TITLE_SCAN_BYTES).pipe(Effect15.catchAll(() => Effect15.succeed("")));
+        firstMessage = extractFirstUserMessage(prefix) ?? "";
         if (!firstMessage) {
-          const fullText = yield* readFileText2(s.filePath).pipe(Effect16.catchAll(() => Effect16.succeed("")));
-          firstMessage = extractFirstUserMessage(fullText) || "";
+          const fullText = yield* readFileText2(s.filePath).pipe(Effect15.catchAll(() => Effect15.succeed("")));
+          firstMessage = extractFirstUserMessage(fullText) ?? "";
         }
         firstMessage ||= "Codex session";
       }
@@ -1934,16 +2026,30 @@ function listCodexSessions(nativeId) {
 
 // ../../packages/plugin-codex/src/parser.ts
 init_src();
-import { Effect as Effect17 } from "effect";
+import { Effect as Effect16 } from "effect";
 function isKnownModel2(model) {
   return typeof model === "string" && model.length > 0 && model !== "unknown";
 }
+function resolveCodexModel(metaInfo, turnContextModel) {
+  if (isKnownModel2(metaInfo?.model)) {
+    return metaInfo.model;
+  }
+  if (isKnownModel2(turnContextModel)) {
+    return turnContextModel;
+  }
+  if (isKnownModel2(metaInfo?.provider_id)) {
+    return metaInfo.provider_id;
+  }
+  return "unknown";
+}
 function extractTurnContextModel2(parsed) {
-  if (typeof parsed !== "object" || parsed === null)
+  if (typeof parsed !== "object" || parsed === null) {
     return null;
+  }
   const event = parsed;
-  if (event.type !== "turn_context")
+  if (event.type !== "turn_context") {
     return null;
+  }
   return typeof event.payload?.model === "string" ? event.payload.model : null;
 }
 function normalizeEventMsg(payload) {
@@ -1951,16 +2057,16 @@ function normalizeEventMsg(payload) {
     case "task_started":
       return { type: "turn.started" };
     case "user_message":
-      return { type: "user_message", text: payload.message || payload.text || "" };
+      return { type: "user_message", text: payload.message ?? payload.text ?? "" };
     case "agent_message":
       return {
         type: "item.completed",
-        item: { type: "agent_message", text: payload.message || payload.text || "" }
+        item: { type: "agent_message", text: payload.message ?? payload.text ?? "" }
       };
     case "agent_reasoning":
       return {
         type: "item.completed",
-        item: { type: "reasoning", text: payload.text || "" }
+        item: { type: "reasoning", text: payload.text ?? "" }
       };
     case "token_count": {
       const src = payload.info?.last_token_usage ?? payload;
@@ -1980,8 +2086,9 @@ function normalizeEventMsg(payload) {
   }
 }
 function parseArguments(args) {
-  if (!args)
+  if (!args) {
     return {};
+  }
   if (typeof args === "string") {
     try {
       return JSON.parse(args);
@@ -1993,7 +2100,7 @@ function parseArguments(args) {
 }
 function normalizeResponseItem(payload) {
   if (payload.type === "function_call" || payload.type === "custom_tool_call") {
-    const name = payload.name || "unknown";
+    const name = payload.name ?? "unknown";
     const args = parseArguments(payload.arguments);
     return {
       type: "item.completed",
@@ -2012,30 +2119,30 @@ function normalizeResponseItem(payload) {
     return {
       type: "tool_output",
       callId: payload.call_id,
-      text: payload.output || ""
+      text: payload.output ?? ""
     };
   }
   return null;
 }
-var OLD_FORMAT_TYPES = new Set([
-  "turn.started",
-  "turn.completed",
-  "item.completed",
-  "thread.started"
-]);
+var OLD_FORMAT_TYPES = new Set(["turn.started", "turn.completed", "item.completed", "thread.started"]);
 function normalizeEvent(raw) {
-  if (typeof raw !== "object" || raw === null || !("type" in raw))
+  if (typeof raw !== "object" || raw === null || !("type" in raw)) {
     return null;
+  }
   const obj = raw;
-  if (OLD_FORMAT_TYPES.has(obj.type))
+  if (OLD_FORMAT_TYPES.has(obj.type)) {
     return raw;
-  const payload = obj.payload;
-  if (!payload)
+  }
+  const { payload } = obj;
+  if (!payload) {
     return null;
-  if (obj.type === "event_msg")
+  }
+  if (obj.type === "event_msg") {
     return normalizeEventMsg(payload);
-  if (obj.type === "response_item")
+  }
+  if (obj.type === "response_item") {
     return normalizeResponseItem(payload);
+  }
   return null;
 }
 function buildToolCallFromItem(item, nextToolUseId) {
@@ -2045,7 +2152,7 @@ function buildToolCallFromItem(item, nextToolUseId) {
         toolUseId: nextToolUseId(),
         name: "command_execution",
         input: { command: item.command },
-        result: item.aggregated_output || "",
+        result: item.aggregated_output ?? "",
         isError: item.exit_code !== undefined && item.exit_code !== 0
       };
     case "file_change":
@@ -2061,7 +2168,7 @@ function buildToolCallFromItem(item, nextToolUseId) {
         toolUseId: nextToolUseId(),
         name: item.tool,
         input: item.arguments,
-        result: item.result || "",
+        result: item.result ?? "",
         isError: false
       };
     case "web_search":
@@ -2108,9 +2215,9 @@ function itemToContentBlock(item, nextToolUseId) {
 }
 function handleTurnStarted(state, event, timestamp, nextUserTurnId) {
   flushAssistant2(state);
-  state.turnCount++;
+  state.turnCount += 1;
   if (state.turnCount > 1) {
-    state.turns.push(createUserTurn2(event.text || "", timestamp, nextUserTurnId()));
+    state.turns.push(createUserTurn2(event.text ?? "", timestamp, nextUserTurnId()));
   }
 }
 function handleTurnCompleted(state, event) {
@@ -2124,13 +2231,14 @@ function handleTurnCompleted(state, event) {
   }
   flushAssistant2(state);
 }
-function handleItemCompleted(state, event, model, timestamp, nextToolUseId, nextAssistantTurnId) {
-  if (!event.item)
+function handleItemCompleted(state, event, ctx) {
+  if (!event.item) {
     return;
+  }
   if (!state.currentAssistant) {
-    state.currentAssistant = createAssistantTurn3(model, timestamp, nextAssistantTurnId());
+    state.currentAssistant = createAssistantTurn3(ctx.model, ctx.timestamp, ctx.nextAssistantTurnId());
   }
-  const block = itemToContentBlock(event.item, nextToolUseId);
+  const block = itemToContentBlock(event.item, ctx.nextToolUseId);
   if (block) {
     state.currentAssistant.contentBlocks.push(block);
   }
@@ -2144,17 +2252,18 @@ function flushAssistant2(state) {
 function handleUserMessage(state, event) {
   for (let i = state.turns.length - 1;i >= 0; i--) {
     const turn = state.turns[i];
-    if (!turn)
+    if (!turn) {
       continue;
+    }
     if (turn.kind === "user" && !turn.text) {
-      turn.text = event.text || "";
+      turn.text = event.text ?? "";
       return;
     }
   }
   if (state.turnCount === 0) {
-    state.turnCount++;
+    state.turnCount += 1;
   }
-  state.turns.push(createUserTurn2(event.text || "", "", "codex-user-first"));
+  state.turns.push(createUserTurn2(event.text ?? "", "", "codex-user-first"));
 }
 function handleUsageUpdate(state, event) {
   if (state.currentAssistant && event.usage) {
@@ -2167,21 +2276,22 @@ function handleUsageUpdate(state, event) {
   }
 }
 function handleToolOutput(state, event) {
-  if (!event.callId)
+  if (!event.callId) {
     return;
+  }
   const toolCall = state.pendingToolCalls.get(event.callId);
   if (toolCall) {
-    toolCall.result = event.text || "";
+    toolCall.result = event.text ?? "";
   }
 }
-function handleGenericToolCall(state, event, model, timestamp, nextToolUseId, nextAssistantTurnId) {
+function handleGenericToolCall(state, event, ctx) {
   if (!state.currentAssistant) {
-    state.currentAssistant = createAssistantTurn3(model, timestamp, nextAssistantTurnId());
+    state.currentAssistant = createAssistantTurn3(ctx.model, ctx.timestamp, ctx.nextAssistantTurnId());
   }
   const toolCall = {
-    toolUseId: event.callId || nextToolUseId(),
-    name: event.toolName || "unknown",
-    input: event.toolInput || {},
+    toolUseId: event.callId ?? ctx.nextToolUseId(),
+    name: event.toolName ?? "unknown",
+    input: event.toolInput ?? {},
     result: "",
     isError: false
   };
@@ -2190,19 +2300,19 @@ function handleGenericToolCall(state, event, model, timestamp, nextToolUseId, ne
   }
   state.currentAssistant.contentBlocks.push({ type: "tool_call", call: toolCall });
 }
-function dispatchEvent(state, event, model, timestamp, nextToolUseId, nextUserTurnId, nextAssistantTurnId) {
+function dispatchEvent(state, event, ctx) {
   switch (event.type) {
     case "turn.started":
-      handleTurnStarted(state, event, timestamp, nextUserTurnId);
+      handleTurnStarted(state, event, ctx.timestamp, ctx.nextUserTurnId);
       break;
     case "turn.completed":
       handleTurnCompleted(state, event);
       break;
     case "item.completed":
       if (event.toolName) {
-        handleGenericToolCall(state, event, model, timestamp, nextToolUseId, nextAssistantTurnId);
+        handleGenericToolCall(state, event, ctx);
       } else {
-        handleItemCompleted(state, event, model, timestamp, nextToolUseId, nextAssistantTurnId);
+        handleItemCompleted(state, event, ctx);
       }
       break;
     case "usage_update":
@@ -2214,6 +2324,8 @@ function dispatchEvent(state, event, model, timestamp, nextToolUseId, nextUserTu
     case "tool_output":
       handleToolOutput(state, event);
       break;
+    default:
+      break;
   }
 }
 function buildCodexTurns(events, model, timestamp) {
@@ -2221,15 +2333,15 @@ function buildCodexTurns(events, model, timestamp) {
   let userTurnCounter = 0;
   let assistantTurnCounter = 0;
   const nextToolUseId = () => {
-    toolUseCounter++;
+    toolUseCounter += 1;
     return `codex-tool-${toolUseCounter}`;
   };
   const nextUserTurnId = () => {
-    userTurnCounter++;
+    userTurnCounter += 1;
     return `codex-user-${userTurnCounter}`;
   };
   const nextAssistantTurnId = () => {
-    assistantTurnCounter++;
+    assistantTurnCounter += 1;
     return `codex-assistant-${assistantTurnCounter}`;
   };
   const state = {
@@ -2238,14 +2350,21 @@ function buildCodexTurns(events, model, timestamp) {
     turnCount: 0,
     pendingToolCalls: new Map
   };
+  const ctx = {
+    model,
+    timestamp,
+    nextToolUseId,
+    nextUserTurnId,
+    nextAssistantTurnId
+  };
   for (const event of events) {
-    dispatchEvent(state, event, model, timestamp, nextToolUseId, nextUserTurnId, nextAssistantTurnId);
+    dispatchEvent(state, event, ctx);
   }
   flushAssistant2(state);
   return state.turns;
 }
 function loadCodexSession(_nativeId, sessionId) {
-  return Effect17.gen(function* () {
+  return Effect16.gen(function* () {
     const filePath = yield* findCodexSessionFileById(sessionId);
     if (!filePath) {
       return {
@@ -2279,7 +2398,7 @@ function loadCodexSession(_nativeId, sessionId) {
       }
     });
     const metaInfo = normalizeSessionMeta(meta);
-    const model = isKnownModel2(metaInfo?.model) ? metaInfo.model : isKnownModel2(turnContextModel) ? turnContextModel : isKnownModel2(metaInfo?.provider_id) ? metaInfo.provider_id : "unknown";
+    const model = resolveCodexModel(metaInfo, turnContextModel);
     const timestamp = metaInfo ? epochSecondsToIso(metaInfo.timestamps.created) : "";
     const turns = buildCodexTurns(events, model, timestamp);
     return {
@@ -2299,13 +2418,13 @@ var codexCliPlugin = {
   id: "codex-cli",
   displayName: "Codex",
   getDefaultDataDir: () => null,
-  isDataAvailable: Effect18.gen(function* () {
+  isDataAvailable: Effect17.gen(function* () {
     const config = yield* PluginConfig;
-    return yield* fileExists2(config.dataDir).pipe(Effect18.catchAll(() => Effect18.succeed(false)));
+    return yield* fileExists2(config.dataDir).pipe(Effect17.catchAll(() => Effect17.succeed(false)));
   }),
   discoverProjects: discoverCodexProjects(),
   listSessions: (nativeId) => listCodexSessions(nativeId),
-  loadSession: (nativeId, sessionId) => loadCodexSession(nativeId, sessionId).pipe(Effect18.catchAll((err) => Effect18.fail(new PluginError({
+  loadSession: (nativeId, sessionId) => loadCodexSession(nativeId, sessionId).pipe(Effect17.catchAll((err) => Effect17.fail(new PluginError({
     pluginId: "codex-cli",
     operation: "loadSession",
     message: String(err),
@@ -2314,77 +2433,1344 @@ var codexCliPlugin = {
   getResumeCommand: (sessionId) => `codex resume ${sessionId}`
 };
 
-// ../../packages/server/src/services/catalog.ts
-init_src2();
-var BUILTIN_PLUGIN_DESCRIPTORS = [
-  {
-    plugin: claudeCodePlugin,
-    defaultDir: DEFAULT_CLAUDE_CODE_DIR
-  },
-  {
-    plugin: codexCliPlugin,
-    defaultDir: DEFAULT_CODEX_CLI_DIR
-  },
-  {
-    plugin: openCodePlugin,
-    defaultDir: DEFAULT_OPENCODE_DIR
+// ../../packages/plugin-cursor/src/index.ts
+init_src();
+import { FileSystem as FileSystem9 } from "@effect/platform";
+import { Effect as Effect23 } from "effect";
+
+// ../../packages/plugin-cursor/src/config.ts
+import { posix, win32 } from "node:path";
+var LEADING_SLASHES_REGEX = /^\/+/u;
+var PATH_SEPARATOR_REGEX = /[:/\\]/gu;
+function getPlatform(options) {
+  return options?.platform ?? process.platform;
+}
+function getEnv(options) {
+  return options?.env ?? process.env;
+}
+function getPathApi(platform) {
+  return platform === "win32" ? win32 : posix;
+}
+function getHomeDir(options) {
+  const platform = getPlatform(options);
+  const env = getEnv(options);
+  if (platform === "win32") {
+    return env["USERPROFILE"] ?? env["HOME"] ?? "";
   }
-];
-var BUILTIN_PLUGIN_ID_SET = new Set(BUILTIN_PLUGIN_DESCRIPTORS.map((descriptor) => descriptor.plugin.id));
+  return env["HOME"] ?? env["USERPROFILE"] ?? "";
+}
+function getDefaultCursorDir(options) {
+  const platform = getPlatform(options);
+  return getPathApi(platform).join(getHomeDir(options), ".cursor");
+}
+function getCursorAppSupportRoot(options) {
+  const platform = getPlatform(options);
+  const env = getEnv(options);
+  const pathApi = getPathApi(platform);
+  if (platform === "darwin") {
+    return pathApi.join(getHomeDir(options), "Library", "Application Support", "Cursor");
+  }
+  if (platform === "win32") {
+    const appData = env["APPDATA"] ?? pathApi.join(getHomeDir(options), "AppData", "Roaming");
+    return pathApi.join(appData, "Cursor");
+  }
+  const xdgConfigHome = env["XDG_CONFIG_HOME"] ?? pathApi.join(getHomeDir(options), ".config");
+  return pathApi.join(xdgConfigHome, "Cursor");
+}
+function getCursorGlobalDbPath(options) {
+  const platform = getPlatform(options);
+  return getPathApi(platform).join(getCursorAppSupportRoot(options), "User", "globalStorage", "state.vscdb");
+}
+function getCursorWorkspaceStorageDir(options) {
+  const platform = getPlatform(options);
+  return getPathApi(platform).join(getCursorAppSupportRoot(options), "User", "workspaceStorage");
+}
+function encodeCursorProjectPath(projectPath) {
+  return projectPath.replace(LEADING_SLASHES_REGEX, "").replace(PATH_SEPARATOR_REGEX, "-");
+}
+var DEFAULT_CURSOR_DIR = getDefaultCursorDir();
 
-// ../../packages/server/src/services/settings.ts
+// ../../packages/plugin-cursor/src/discovery.ts
 init_src();
-import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
-import { dirname, join as join11 } from "node:path";
-function createDefaultPluginStates() {
-  return Object.fromEntries(BUILTIN_KLOVI_PLUGIN_IDS.map((pluginId) => [pluginId, { enabled: true, dataDir: null }]));
-}
-function getDefaultSettings() {
-  return {
-    version: 1,
-    plugins: createDefaultPluginStates(),
-    general: {
-      showSecurityWarning: true
-    },
-    updates: {
-      channel: "stable",
-      checkIntervalHours: 6,
-      autoDownload: true
+import { join as join12 } from "node:path";
+import { fileURLToPath } from "node:url";
+import { Effect as Effect21 } from "effect";
+
+// ../../packages/plugin-cursor/src/db.ts
+init_src();
+import { FileSystem as FileSystem7 } from "@effect/platform";
+import { Effect as Effect18 } from "effect";
+function openCursorDbIfExists(dbPath) {
+  return Effect18.gen(function* () {
+    const fs = yield* FileSystem7.FileSystem;
+    const exists = yield* fs.exists(dbPath).pipe(Effect18.catchAll(() => Effect18.succeed(false)));
+    if (!exists) {
+      return null;
     }
-  };
+    const client = yield* SqliteClientTag;
+    return yield* client.open(dbPath, { readonly: true });
+  });
 }
-async function loadSettings(path) {
-  try {
-    const content = await readFile(path, "utf-8");
-    const parsed = JSON.parse(content);
-    if (parsed["version"] !== 1 || typeof parsed["plugins"] !== "object") {
-      return getDefaultSettings();
-    }
-    return parsed;
-  } catch {
-    return getDefaultSettings();
-  }
+function openCursorGlobalDb() {
+  return openCursorDbIfExists(getCursorGlobalDbPath());
 }
-async function saveSettings(path, settings) {
-  const dir = dirname(path);
-  await mkdir(dir, { recursive: true });
-  const tmpPath = join11(dir, `.settings-${Date.now()}.tmp`);
-  await writeFile(tmpPath, JSON.stringify(settings, null, 2));
-  await rename(tmpPath, path);
+function getCursorWorkspaceStorageDirEffect() {
+  return Effect18.succeed(getCursorWorkspaceStorageDir());
 }
 
-// ../../packages/server/src/services/stats.ts
+// ../../packages/plugin-cursor/src/plans.ts
+import { basename } from "node:path";
+import { Effect as Effect20 } from "effect";
+
+// ../../packages/plugin-cursor/src/shared/discovery-utils.ts
 init_src();
-function emptyStats(projects = 0) {
-  return {
-    projects,
-    sessions: 0,
-    messages: 0,
-    todaySessions: 0,
-    thisWeekSessions: 0,
-    inputTokens: 0,
-    outputTokens: 0,
-    cacheReadTokens: 0,
+import { join as join11 } from "node:path";
+import { FileSystem as FileSystem8 } from "@effect/platform";
+import { Effect as Effect19 } from "effect";
+function readDirEntriesSafe2(dir) {
+  return Effect19.gen(function* () {
+    const fs = yield* FileSystem8.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect19.catchAll(() => Effect19.succeed([])));
+    const entries = [];
+    for (const name of names) {
+      const info = yield* fs.stat(join11(dir, name)).pipe(Effect19.catchAll(() => Effect19.succeed(null)));
+      if (info) {
+        entries.push({ name, isDirectory: info.type === "Directory" });
+      }
+    }
+    return entries;
+  });
+}
+function readFileText3(filePath) {
+  return Effect19.gen(function* () {
+    const fs = yield* FileSystem8.FileSystem;
+    return yield* fs.readFileString(filePath);
+  });
+}
+function fileExists3(filePath) {
+  return Effect19.gen(function* () {
+    const fs = yield* FileSystem8.FileSystem;
+    return yield* fs.exists(filePath).pipe(Effect19.catchAll(() => Effect19.succeed(false)));
+  });
+}
+function listFilesWithMtime2(dir, suffix) {
+  return Effect19.gen(function* () {
+    const fs = yield* FileSystem8.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect19.catchAll(() => Effect19.succeed([])));
+    const results = [];
+    for (const name of names) {
+      if (!name.endsWith(suffix)) {
+        continue;
+      }
+      const info = yield* fs.stat(join11(dir, name)).pipe(Effect19.catchAll(() => Effect19.succeed(null)));
+      if (info?.mtime._tag === "Some") {
+        results.push({ fileName: name, mtime: info.mtime.value.toISOString() });
+      }
+    }
+    sortByIsoDesc(results, (item) => item.mtime);
+    return results;
+  });
+}
+
+// ../../packages/plugin-cursor/src/plans.ts
+var LEADING_NEWLINES_REGEX = /^\n+/u;
+var PLAN_FILE_SUFFIX_REGEX = /\.plan\.md$/u;
+function parseFrontmatterValue(rawValue) {
+  const trimmed = rawValue.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'")) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+}
+function parsePlanFrontmatter(text) {
+  if (!text.startsWith(`---
+`)) {
+    return { body: text, name: "" };
+  }
+  const lines = text.split(`
+`);
+  const endIndex = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+  if (endIndex === -1) {
+    return { body: text, name: "" };
+  }
+  let name = "";
+  for (let i = 1;i < endIndex; i++) {
+    const line = lines[i]?.trim() ?? "";
+    if (!line || line.startsWith("#")) {
+      continue;
+    }
+    const separator = line.indexOf(":");
+    if (separator === -1) {
+      continue;
+    }
+    const key = line.slice(0, separator).trim();
+    const value = parseFrontmatterValue(line.slice(separator + 1));
+    if (key === "name") {
+      name = value;
+    }
+  }
+  return {
+    body: lines.slice(endIndex + 1).join(`
+`).replace(LEADING_NEWLINES_REGEX, ""),
+    name
+  };
+}
+function extractFirstHeading(text) {
+  for (const line of text.split(`
+`)) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("# ")) {
+      return trimmed.slice(2).trim();
+    }
+  }
+  return "";
+}
+function getPlanFallbackName(filePath) {
+  return basename(filePath).replace(PLAN_FILE_SUFFIX_REGEX, "");
+}
+function readPlanDisplayName(filePath) {
+  return readFileText3(filePath).pipe(Effect20.map((text) => {
+    const parsed = parsePlanFrontmatter(text);
+    return parsed.name || extractFirstHeading(parsed.body) || getPlanFallbackName(filePath);
+  }));
+}
+function makeSystemTurn(text, timestamp) {
+  return {
+    kind: "system",
+    uuid: "cursor-plan",
+    timestamp,
+    text
+  };
+}
+function loadCursorPlanSession(plan) {
+  return readFileText3(plan.filePath).pipe(Effect20.map((text) => {
+    const parsed = parsePlanFrontmatter(text);
+    return {
+      sessionId: plan.rawSessionId,
+      project: plan.projectPath,
+      pluginId: "cursor",
+      turns: [makeSystemTurn(parsed.body, plan.timestamp)]
+    };
+  }));
+}
+
+// ../../packages/plugin-cursor/src/shared/json-utils.ts
+function tryParseJson2(value) {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return;
+  }
+}
+
+// ../../packages/plugin-cursor/src/shared/jsonl-utils.ts
+function iterateJsonl3(text, visitor, options = {}) {
+  const lines = text.split(`
+`);
+  const start = Math.max(0, options.startAt ?? 0);
+  const end = options.maxLines === undefined ? lines.length : Math.min(lines.length, start + options.maxLines);
+  for (let i = start;i < end; i++) {
+    const line = lines[i];
+    if (!line?.trim()) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(line);
+      const shouldContinue = visitor({
+        parsed,
+        line,
+        lineIndex: i,
+        lineNumber: i + 1
+      });
+      if (shouldContinue === false) {
+        break;
+      }
+    } catch (error) {
+      options.onMalformed?.(line, i + 1, error);
+    }
+  }
+}
+
+// ../../packages/plugin-cursor/src/shared/text-utils.ts
+function truncate(text, maxLength) {
+  return text.length <= maxLength ? text : `${text.slice(0, maxLength)}...`;
+}
+
+// ../../packages/plugin-cursor/src/discovery.ts
+var SESSION_PREVIEW_MAX_LENGTH = 200;
+function isNonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+function toIsoOrEmpty(epochMs) {
+  return typeof epochMs === "number" && Number.isFinite(epochMs) && epochMs > 0 ? epochMsToIso(epochMs) : "";
+}
+function fileUrlToPath(url) {
+  try {
+    return fileURLToPath(url);
+  } catch {
+    return null;
+  }
+}
+function querySingleValue(db, sql, ...params) {
+  try {
+    const row = db.query(sql).get(...params);
+    return typeof row?.value === "string" ? row.value : null;
+  } catch {
+    return null;
+  }
+}
+function queryKeyValueRow(db, key) {
+  return querySingleValue(db, "SELECT value FROM cursorDiskKV WHERE key = ?", key);
+}
+function queryItemTableRow(db, key) {
+  return querySingleValue(db, "SELECT value FROM ItemTable WHERE key = ?", key);
+}
+function readWorkspaceComposerEntries(db) {
+  const rawValue = queryItemTableRow(db, "composer.composerData");
+  if (!rawValue) {
+    return [];
+  }
+  const parsed = tryParseJson2(rawValue);
+  return Array.isArray(parsed?.allComposers) ? parsed.allComposers : [];
+}
+function extractBubbleUserText(bubble) {
+  return isNonEmptyString(bubble?.text) ? bubble.text.trim() : "";
+}
+function extractFirstUserTextFromConversation(conversation) {
+  if (!Array.isArray(conversation)) {
+    return "";
+  }
+  for (const bubble of conversation) {
+    if (bubble?.type !== 1) {
+      continue;
+    }
+    const text = extractBubbleUserText(bubble);
+    if (text) {
+      return text;
+    }
+  }
+  return "";
+}
+function extractFirstUserTextFromHeaders(db, composerId, headers) {
+  if (!Array.isArray(headers)) {
+    return "";
+  }
+  for (const header of headers) {
+    if (!header?.bubbleId) {
+      continue;
+    }
+    if (header.type !== undefined && header.type !== 1) {
+      continue;
+    }
+    const rawBubble = queryKeyValueRow(db, `bubbleId:${composerId}:${header.bubbleId}`);
+    if (!rawBubble) {
+      continue;
+    }
+    const bubble = tryParseJson2(rawBubble);
+    const text = extractBubbleUserText(bubble);
+    if (text) {
+      return text;
+    }
+  }
+  return "";
+}
+function resolveComposerFirstMessage(globalDb, composer, composerId) {
+  if (globalDb) {
+    const rawComposerData = queryKeyValueRow(globalDb, `composerData:${composerId}`);
+    const parsed = rawComposerData ? tryParseJson2(rawComposerData) : undefined;
+    const fromConversation = extractFirstUserTextFromConversation(parsed?.conversation);
+    if (fromConversation) {
+      return truncate(fromConversation, SESSION_PREVIEW_MAX_LENGTH);
+    }
+    const fromHeaders = extractFirstUserTextFromHeaders(globalDb, composerId, parsed?.fullConversationHeadersOnly);
+    if (fromHeaders) {
+      return truncate(fromHeaders, SESSION_PREVIEW_MAX_LENGTH);
+    }
+  }
+  if (isNonEmptyString(composer.name)) {
+    return composer.name.trim();
+  }
+  if (isNonEmptyString(composer.subtitle)) {
+    return composer.subtitle.trim();
+  }
+  return "Cursor session";
+}
+function resolveComposerSessionType(unifiedMode) {
+  if (unifiedMode === "plan") {
+    return "plan";
+  }
+  if (unifiedMode === "agent") {
+    return "implementation";
+  }
+  return;
+}
+function createComposerSummary(projectPath, workspaceDbPath, composer, globalDb) {
+  if (!isNonEmptyString(composer.composerId)) {
+    return null;
+  }
+  const createdAtMs = typeof composer.createdAt === "number" ? composer.createdAt : 0;
+  if (!createdAtMs) {
+    return null;
+  }
+  const { composerId } = composer;
+  const unifiedMode = composer.unifiedMode ?? composer.forceMode ?? "chat";
+  const firstMessage = resolveComposerFirstMessage(globalDb, composer, composerId);
+  return {
+    kind: "composer",
+    rawSessionId: `composer:${composerId}`,
+    projectPath,
+    composerId,
+    workspaceDbPath,
+    createdAtMs,
+    lastUpdatedAtMs: typeof composer.lastUpdatedAt === "number" ? composer.lastUpdatedAt : createdAtMs,
+    name: composer.name?.trim() ?? "",
+    subtitle: composer.subtitle?.trim() ?? "",
+    unifiedMode,
+    timestamp: toIsoOrEmpty(createdAtMs),
+    firstMessage,
+    slug: composer.name?.trim() || composerId,
+    model: "unknown",
+    gitBranch: "",
+    sessionType: resolveComposerSessionType(unifiedMode)
+  };
+}
+function parseProjectPathFromWorkspaceJson(content) {
+  const parsed = tryParseJson2(content);
+  if (!isNonEmptyString(parsed?.folder)) {
+    return null;
+  }
+  return fileUrlToPath(parsed.folder);
+}
+function findProjectSessions(sessionsByProject, projectPath) {
+  const existing = sessionsByProject.get(projectPath);
+  if (existing) {
+    return existing;
+  }
+  const created = [];
+  sessionsByProject.set(projectPath, created);
+  return created;
+}
+function pushSession(sessionsByProject, session) {
+  findProjectSessions(sessionsByProject, session.projectPath).push(session);
+}
+function readFirstTranscriptUserMessage(text) {
+  let firstMessage = "";
+  iterateJsonl3(text, ({ parsed }) => {
+    const line = parsed;
+    if (line.role !== "user" || !Array.isArray(line.message?.content)) {
+      return;
+    }
+    const parts = line.message.content.filter((block) => block?.type === "text" && isNonEmptyString(block.text)).map((block) => block.text?.trim() ?? "").filter(Boolean);
+    if (parts.length === 0) {
+      return;
+    }
+    firstMessage = truncate(parts.join(`
+
+`), SESSION_PREVIEW_MAX_LENGTH);
+    return false;
+  }, { onMalformed: () => {} });
+  return firstMessage;
+}
+function listTranscriptFiles(agentTranscriptsDir) {
+  return Effect21.gen(function* () {
+    const agentDirs = yield* readDirEntriesSafe2(agentTranscriptsDir);
+    const files = [];
+    for (const entry of agentDirs) {
+      if (!entry.isDirectory) {
+        continue;
+      }
+      const agentId = entry.name;
+      const transcriptDir = join12(agentTranscriptsDir, agentId);
+      const transcriptFiles = yield* listFilesWithMtime2(transcriptDir, ".jsonl");
+      const transcript = transcriptFiles.find((candidate) => candidate.fileName === `${agentId}.jsonl`) ?? transcriptFiles[0];
+      if (!transcript) {
+        continue;
+      }
+      files.push({
+        agentId,
+        filePath: join12(transcriptDir, transcript.fileName),
+        mtimeIso: transcript.mtime
+      });
+    }
+    sortByIsoDesc(files, (item) => item.mtimeIso);
+    return files;
+  });
+}
+function discoverBackgroundAgents(workspaceProjectPaths) {
+  return Effect21.gen(function* () {
+    const config = yield* PluginConfig;
+    const projectsDir = join12(config.dataDir, "projects");
+    const entries = yield* readDirEntriesSafe2(projectsDir);
+    const encodedProjectPaths = new Map(workspaceProjectPaths.map((projectPath) => [encodeCursorProjectPath(projectPath), projectPath]));
+    const agentsById = new Map;
+    for (const entry of entries) {
+      if (!entry.isDirectory) {
+        continue;
+      }
+      const projectPath = encodedProjectPaths.get(entry.name);
+      if (!projectPath) {
+        continue;
+      }
+      const agentTranscriptsDir = join12(projectsDir, entry.name, "agent-transcripts");
+      const transcriptDirExists = yield* fileExists3(agentTranscriptsDir);
+      if (!transcriptDirExists) {
+        continue;
+      }
+      const transcripts = yield* listTranscriptFiles(agentTranscriptsDir);
+      for (const transcript of transcripts) {
+        const text = yield* readFileText3(transcript.filePath).pipe(Effect21.catchAll(() => Effect21.succeed("")));
+        const firstMessage = readFirstTranscriptUserMessage(text) || "Cursor background agent";
+        const timestampMs = new Date(transcript.mtimeIso).getTime();
+        agentsById.set(transcript.agentId, {
+          kind: "agent",
+          rawSessionId: `agent:${transcript.agentId}`,
+          projectPath,
+          agentId: transcript.agentId,
+          filePath: transcript.filePath,
+          timestamp: transcript.mtimeIso,
+          timestampMs,
+          firstMessage,
+          slug: transcript.agentId,
+          model: "unknown",
+          gitBranch: "",
+          sessionType: "implementation"
+        });
+      }
+    }
+    return agentsById;
+  });
+}
+function parsePlanRegistry(rawValue) {
+  if (!rawValue) {
+    return [];
+  }
+  const parsed = tryParseJson2(rawValue);
+  if (!parsed) {
+    return [];
+  }
+  return Object.values(parsed);
+}
+function createPlanSummary(entry, projectPath, filePath, displayName) {
+  if (!(isNonEmptyString(entry.id) && isNonEmptyString(entry.createdBy)) || typeof entry.createdAt !== "number") {
+    return null;
+  }
+  return {
+    kind: "plan",
+    rawSessionId: `plan:${entry.id}`,
+    projectPath,
+    planId: entry.id,
+    filePath,
+    createdAtMs: entry.createdAt,
+    lastUpdatedAtMs: typeof entry.lastUpdatedAt === "number" ? entry.lastUpdatedAt : entry.createdAt,
+    createdBy: entry.createdBy,
+    timestamp: toIsoOrEmpty(entry.createdAt),
+    firstMessage: displayName,
+    slug: entry.id,
+    model: "unknown",
+    gitBranch: "",
+    sessionType: "plan"
+  };
+}
+function discoverMappedPlans(globalDb, composersById, agentsById) {
+  return Effect21.gen(function* () {
+    const plansById = new Map;
+    if (!globalDb) {
+      return plansById;
+    }
+    const entries = parsePlanRegistry(queryItemTableRow(globalDb, "composer.planRegistry"));
+    for (const entry of entries) {
+      const filePath = entry.uri?.fsPath;
+      if (!isNonEmptyString(filePath)) {
+        continue;
+      }
+      const composer = isNonEmptyString(entry.createdBy) ? composersById.get(entry.createdBy) : undefined;
+      const agent = isNonEmptyString(entry.createdBy) ? agentsById.get(entry.createdBy) : undefined;
+      const projectPath = composer?.projectPath ?? agent?.projectPath;
+      if (!projectPath) {
+        continue;
+      }
+      const exists = yield* fileExists3(filePath);
+      if (!exists) {
+        continue;
+      }
+      const displayName = yield* readPlanDisplayName(filePath).pipe(Effect21.catchAll(() => Effect21.succeed("")));
+      const summary = createPlanSummary(entry, projectPath, filePath, displayName || entry.name?.trim() || "");
+      if (!summary) {
+        continue;
+      }
+      plansById.set(summary.planId, summary);
+      if (agent) {
+        agent.sessionType = "plan";
+      }
+    }
+    return plansById;
+  });
+}
+function buildProjects(sessionsByProject) {
+  const projects = [];
+  for (const [projectPath, sessions] of sessionsByProject) {
+    if (sessions.length === 0) {
+      continue;
+    }
+    sortByIsoDesc(sessions, (session) => session.timestamp);
+    projects.push({
+      pluginId: "cursor",
+      nativeId: projectPath,
+      resolvedPath: projectPath,
+      displayName: projectPath,
+      sessionCount: sessions.length,
+      lastActivity: sessions[0]?.timestamp ?? ""
+    });
+  }
+  sortByIsoDesc(projects, (project) => project.lastActivity);
+  return projects;
+}
+function buildCursorIndex() {
+  return Effect21.gen(function* () {
+    const workspaceStorageDir = yield* getCursorWorkspaceStorageDirEffect();
+    const workspaceEntries = yield* readDirEntriesSafe2(workspaceStorageDir);
+    const globalDb = yield* openCursorGlobalDb();
+    const sessionsByProject = new Map;
+    const composersById = new Map;
+    try {
+      const workspaceDescriptors = [];
+      for (const entry of workspaceEntries) {
+        if (!entry.isDirectory) {
+          continue;
+        }
+        const workspaceDir = join12(workspaceStorageDir, entry.name);
+        const workspaceJsonPath = join12(workspaceDir, "workspace.json");
+        const workspaceDbPath = join12(workspaceDir, "state.vscdb");
+        const exists = yield* fileExists3(workspaceJsonPath);
+        if (!exists) {
+          continue;
+        }
+        const projectPath = yield* readFileText3(workspaceJsonPath).pipe(Effect21.map(parseProjectPathFromWorkspaceJson), Effect21.catchAll(() => Effect21.succeed(null)));
+        if (!projectPath) {
+          continue;
+        }
+        workspaceDescriptors.push({ projectPath, workspaceDbPath });
+      }
+      const workspaceProjectPaths = [...new Set(workspaceDescriptors.map((descriptor) => descriptor.projectPath))];
+      for (const descriptor of workspaceDescriptors) {
+        const workspaceDb = yield* openCursorDbIfExists(descriptor.workspaceDbPath);
+        if (!workspaceDb) {
+          continue;
+        }
+        try {
+          const composers = readWorkspaceComposerEntries(workspaceDb);
+          for (const composer of composers) {
+            const summary = createComposerSummary(descriptor.projectPath, descriptor.workspaceDbPath, composer, globalDb);
+            if (!summary) {
+              continue;
+            }
+            composersById.set(summary.composerId, summary);
+            pushSession(sessionsByProject, summary);
+          }
+        } finally {
+          workspaceDb.close();
+        }
+      }
+      const agentsById = yield* discoverBackgroundAgents(workspaceProjectPaths);
+      for (const agent of agentsById.values()) {
+        pushSession(sessionsByProject, agent);
+      }
+      const plansById = yield* discoverMappedPlans(globalDb, composersById, agentsById);
+      for (const plan of plansById.values()) {
+        pushSession(sessionsByProject, plan);
+      }
+      const projects = buildProjects(sessionsByProject);
+      return {
+        projects,
+        sessionsByProject,
+        composersById,
+        agentsById,
+        plansById
+      };
+    } finally {
+      globalDb?.close();
+    }
+  });
+}
+function toSessionSummary(session) {
+  return {
+    sessionId: session.rawSessionId,
+    timestamp: session.timestamp,
+    slug: session.slug,
+    firstMessage: session.firstMessage,
+    model: session.model,
+    gitBranch: session.gitBranch,
+    pluginId: "cursor",
+    sessionType: session.sessionType
+  };
+}
+function discoverCursorProjects() {
+  return buildCursorIndex().pipe(Effect21.map((index) => index.projects));
+}
+function listCursorSessions(nativeId) {
+  return buildCursorIndex().pipe(Effect21.map((index) => {
+    const sessions = index.sessionsByProject.get(nativeId) ?? [];
+    sortByIsoDesc(sessions, (session) => session.timestamp);
+    return sessions.map(toSessionSummary);
+  }));
+}
+
+// ../../packages/plugin-cursor/src/parser.ts
+import { Effect as Effect22 } from "effect";
+var COMPOSER_PREFIX_REGEX = /^composer:/u;
+var AGENT_PREFIX_REGEX = /^agent:/u;
+var PLAN_PREFIX_REGEX = /^plan:/u;
+function makeUserTurn(uuid, timestamp, text) {
+  return {
+    kind: "user",
+    uuid,
+    timestamp,
+    text
+  };
+}
+function makeAssistantTurn(uuid, timestamp, contentBlocks) {
+  return {
+    kind: "assistant",
+    uuid,
+    timestamp,
+    model: "unknown",
+    contentBlocks
+  };
+}
+function makeSystemTurn2(uuid, timestamp, text) {
+  return {
+    kind: "system",
+    uuid,
+    timestamp,
+    text
+  };
+}
+function synthesizedTimestamp(baseTimestampMs, index) {
+  return new Date(baseTimestampMs + index).toISOString();
+}
+function normalizeToolInput(params) {
+  if (typeof params === "string") {
+    const parsed = tryParseJson2(params);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed;
+    }
+    if (parsed !== undefined) {
+      return { value: parsed };
+    }
+    return { raw: params };
+  }
+  if (params && typeof params === "object" && !Array.isArray(params)) {
+    return params;
+  }
+  if (params === undefined) {
+    return {};
+  }
+  return { value: params };
+}
+function normalizeToolResult(result) {
+  if (typeof result === "string") {
+    return result;
+  }
+  if (result === undefined || result === null) {
+    return "";
+  }
+  if (typeof result === "object") {
+    try {
+      return JSON.stringify(result, null, 2);
+    } catch {
+      return String(result);
+    }
+  }
+  return String(result);
+}
+function bubbleToContentBlock(bubble) {
+  const tool = bubble.toolFormerData;
+  if (tool?.name) {
+    const call = {
+      toolUseId: tool.toolCallId ?? bubble.bubbleId ?? tool.name,
+      name: tool.name,
+      input: normalizeToolInput(tool.params),
+      result: normalizeToolResult(tool.result),
+      isError: tool.status !== "completed" && tool.status !== "success"
+    };
+    return { type: "tool_call", call };
+  }
+  const thinkingText = bubble.thinking?.text?.trim();
+  if (thinkingText) {
+    return { type: "thinking", block: { text: thinkingText } };
+  }
+  const text = bubble.text?.trim();
+  if (text) {
+    return { type: "text", text };
+  }
+  return null;
+}
+function buildTurnsFromBubbles(bubbles, baseTimestampMs) {
+  const turns = [];
+  let assistantBlocks = [];
+  const flushAssistant3 = () => {
+    if (assistantBlocks.length === 0) {
+      return;
+    }
+    turns.push(makeAssistantTurn(`cursor-assistant-${turns.length}`, synthesizedTimestamp(baseTimestampMs, turns.length), assistantBlocks));
+    assistantBlocks = [];
+  };
+  for (const bubble of bubbles) {
+    if (bubble.type === 1) {
+      flushAssistant3();
+      turns.push(makeUserTurn(bubble.bubbleId ?? `cursor-user-${turns.length}`, synthesizedTimestamp(baseTimestampMs, turns.length), bubble.text?.trim() ?? ""));
+      continue;
+    }
+    const block = bubbleToContentBlock(bubble);
+    if (block) {
+      assistantBlocks.push(block);
+    }
+  }
+  flushAssistant3();
+  return turns;
+}
+function readComposerBubblesFromHeaders(rawComposerData, queryBubble) {
+  const headers = rawComposerData.fullConversationHeadersOnly;
+  if (!Array.isArray(headers) || headers.length === 0) {
+    return { bubbles: [], partial: false };
+  }
+  const bubbles = [];
+  let partial = false;
+  for (const header of headers) {
+    if (!header?.bubbleId) {
+      partial = true;
+      continue;
+    }
+    const bubble = queryBubble(header.bubbleId);
+    if (!bubble) {
+      partial = true;
+      continue;
+    }
+    bubbles.push(bubble);
+  }
+  return { bubbles, partial };
+}
+function partialCursorSessionNotice(timestamp) {
+  return makeSystemTurn2("cursor-partial-session", timestamp, `**Partial Cursor session**
+Klovi could not reconstruct the full Composer transcript from Cursor state. Showing recovered content only.`);
+}
+function loadCursorComposerSession(summary) {
+  return Effect22.gen(function* () {
+    const globalDb = yield* openCursorGlobalDb();
+    const baseTimestampMs = summary.createdAtMs;
+    try {
+      if (!globalDb) {
+        return {
+          sessionId: summary.rawSessionId,
+          project: summary.projectPath,
+          pluginId: "cursor",
+          turns: [partialCursorSessionNotice(summary.timestamp)]
+        };
+      }
+      const rawComposer = globalDb.query("SELECT value FROM cursorDiskKV WHERE key = ?").get(`composerData:${summary.composerId}`);
+      const composerData = rawComposer ? tryParseJson2(rawComposer.value) : undefined;
+      if (!composerData) {
+        return {
+          sessionId: summary.rawSessionId,
+          project: summary.projectPath,
+          pluginId: "cursor",
+          turns: [partialCursorSessionNotice(summary.timestamp)]
+        };
+      }
+      const queryBubble = (bubbleId) => {
+        try {
+          const row = globalDb.query("SELECT value FROM cursorDiskKV WHERE key = ?").get(`bubbleId:${summary.composerId}:${bubbleId}`);
+          if (!row) {
+            return null;
+          }
+          return tryParseJson2(row.value) ?? null;
+        } catch {
+          return null;
+        }
+      };
+      const fromHeaders = readComposerBubblesFromHeaders(composerData, queryBubble);
+      const inlineConversation = Array.isArray(composerData.conversation) ? composerData.conversation : [];
+      const recoveredBubbles = fromHeaders.bubbles.length > 0 ? fromHeaders.bubbles : inlineConversation;
+      const partial = fromHeaders.partial || fromHeaders.bubbles.length === 0 && inlineConversation.length === 0;
+      const turns = buildTurnsFromBubbles(recoveredBubbles, baseTimestampMs);
+      return {
+        sessionId: summary.rawSessionId,
+        project: summary.projectPath,
+        pluginId: "cursor",
+        turns: partial ? [partialCursorSessionNotice(summary.timestamp), ...turns] : turns
+      };
+    } finally {
+      globalDb?.close();
+    }
+  });
+}
+function loadCursorAgentSession(summary) {
+  return Effect22.gen(function* () {
+    const text = yield* readFileText3(summary.filePath);
+    const turns = [];
+    let turnIndex = 0;
+    iterateJsonl3(text, ({ parsed }) => {
+      const line = parsed;
+      if (!Array.isArray(line.message?.content)) {
+        return;
+      }
+      const textBlocks = line.message.content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text?.trim() ?? "").filter(Boolean);
+      if (textBlocks.length === 0) {
+        return;
+      }
+      const timestamp = synthesizedTimestamp(summary.timestampMs, turnIndex);
+      const content = textBlocks.join(`
+
+`);
+      if (line.role === "user") {
+        turns.push(makeUserTurn(`cursor-agent-user-${turnIndex}`, timestamp, content));
+        turnIndex += 1;
+        return;
+      }
+      if (line.role === "assistant") {
+        turns.push(makeAssistantTurn(`cursor-agent-assistant-${turnIndex}`, timestamp, [{ type: "text", text: content }]));
+        turnIndex += 1;
+      }
+    }, { onMalformed: () => {} });
+    return {
+      sessionId: summary.rawSessionId,
+      project: summary.projectPath,
+      pluginId: "cursor",
+      turns
+    };
+  });
+}
+function loadCursorSession(nativeId, sessionId) {
+  return Effect22.gen(function* () {
+    const index = yield* buildCursorIndex();
+    const session = index.composersById.get(sessionId.replace(COMPOSER_PREFIX_REGEX, "")) ?? index.agentsById.get(sessionId.replace(AGENT_PREFIX_REGEX, "")) ?? index.plansById.get(sessionId.replace(PLAN_PREFIX_REGEX, ""));
+    if (!session || session.projectPath !== nativeId) {
+      return yield* Effect22.fail(new Error(`Cursor session not found: ${sessionId}`));
+    }
+    if (session.kind === "composer") {
+      return yield* loadCursorComposerSession(session);
+    }
+    if (session.kind === "agent") {
+      return yield* loadCursorAgentSession(session);
+    }
+    return yield* loadCursorPlanSession(session);
+  });
+}
+// ../../packages/plugin-cursor/src/index.ts
+var cursorPlugin = {
+  id: "cursor",
+  displayName: "Cursor",
+  getDefaultDataDir: () => null,
+  isDataAvailable: Effect23.gen(function* () {
+    const config = yield* PluginConfig;
+    const fs = yield* FileSystem9.FileSystem;
+    const userDataExists = yield* fileExists3(config.dataDir).pipe(Effect23.catchAll(() => Effect23.succeed(false)));
+    if (userDataExists) {
+      return true;
+    }
+    const globalDbExists = yield* fs.exists(getCursorGlobalDbPath()).pipe(Effect23.catchAll(() => Effect23.succeed(false)));
+    if (globalDbExists) {
+      return true;
+    }
+    return yield* fs.exists(getCursorWorkspaceStorageDir()).pipe(Effect23.catchAll(() => Effect23.succeed(false)));
+  }),
+  discoverProjects: discoverCursorProjects().pipe(Effect23.catchAll((err) => Effect23.fail(new PluginError({
+    pluginId: "cursor",
+    operation: "discoverProjects",
+    message: String(err),
+    cause: err
+  })))),
+  listSessions: (nativeId) => listCursorSessions(nativeId).pipe(Effect23.catchAll((err) => Effect23.fail(new PluginError({
+    pluginId: "cursor",
+    operation: "listSessions",
+    message: String(err),
+    cause: err
+  })))),
+  loadSession: (nativeId, sessionId) => loadCursorSession(nativeId, sessionId).pipe(Effect23.catchAll((err) => Effect23.fail(new PluginError({
+    pluginId: "cursor",
+    operation: "loadSession",
+    message: String(err),
+    cause: err
+  }))))
+};
+
+// ../../packages/server/src/services/catalog.ts
+init_src2();
+var BUILTIN_PLUGIN_DESCRIPTORS = [
+  {
+    plugin: claudeCodePlugin,
+    defaultDir: DEFAULT_CLAUDE_CODE_DIR,
+    defaultEnabled: true
+  },
+  {
+    plugin: codexCliPlugin,
+    defaultDir: DEFAULT_CODEX_CLI_DIR,
+    defaultEnabled: true
+  },
+  {
+    plugin: openCodePlugin,
+    defaultDir: DEFAULT_OPENCODE_DIR,
+    defaultEnabled: true
+  },
+  {
+    plugin: cursorPlugin,
+    defaultDir: DEFAULT_CURSOR_DIR,
+    defaultEnabled: false
+  }
+];
+var BUILTIN_PLUGIN_ID_SET = new Set(BUILTIN_PLUGIN_DESCRIPTORS.map((descriptor) => descriptor.plugin.id));
+
+// ../../packages/server/src/services/registry.ts
+init_src();
+class PluginRegistry2 extends PluginRegistry {
+}
+
+// ../../packages/server/src/services/auto-discover.ts
+function createRegistry(settings) {
+  return Effect24.gen(function* () {
+    const registry = new PluginRegistry2;
+    for (const { plugin, defaultDir, defaultEnabled } of BUILTIN_PLUGIN_DESCRIPTORS) {
+      const pluginSettings = settings?.plugins[plugin.id];
+      const enabled = pluginSettings?.enabled ?? defaultEnabled;
+      if (!enabled) {
+        continue;
+      }
+      const dataDir = pluginSettings?.dataDir ?? defaultDir;
+      const configLayer = makePluginConfigLayer({ dataDir });
+      const available = yield* plugin.isDataAvailable.pipe(Effect24.provide(configLayer), Effect24.catchAll(() => Effect24.succeed(false)));
+      if (available) {
+        registry.register(plugin, { dataDir });
+      }
+    }
+    return registry;
+  });
+}
+
+// ../../packages/server/src/services/onboarding-service.ts
+import { Effect as Effect26 } from "effect";
+
+// ../../packages/server/src/services/settings.ts
+import { dirname, join as join13 } from "node:path";
+import { FileSystem as FileSystem10 } from "@effect/platform";
+import { Effect as Effect25 } from "effect";
+
+// ../../packages/server/src/services/errors.ts
+import { Data as Data2 } from "effect";
+
+class InvalidSessionIdError extends Data2.TaggedError("InvalidSessionIdError") {
+}
+
+class ProjectNotFoundError extends Data2.TaggedError("ProjectNotFoundError") {
+}
+
+class PluginSourceNotFoundError extends Data2.TaggedError("PluginSourceNotFoundError") {
+}
+
+class UnknownPluginError extends Data2.TaggedError("UnknownPluginError") {
+}
+
+class SubAgentNotSupportedError extends Data2.TaggedError("SubAgentNotSupportedError") {
+}
+
+class SettingsWriteError extends Data2.TaggedError("SettingsWriteError") {
+}
+
+// ../../packages/server/src/services/settings.ts
+function createDefaultPluginStates() {
+  return Object.fromEntries(BUILTIN_PLUGIN_DESCRIPTORS.map(({ plugin, defaultEnabled }) => [
+    plugin.id,
+    { enabled: defaultEnabled, dataDir: null }
+  ]));
+}
+function getDefaultSettings() {
+  return {
+    version: 1,
+    plugins: createDefaultPluginStates(),
+    general: {
+      showSecurityWarning: true
+    },
+    updates: {
+      channel: "stable",
+      checkIntervalHours: 6,
+      autoDownload: true
+    }
+  };
+}
+function loadSettings(path) {
+  return Effect25.gen(function* () {
+    const fs = yield* FileSystem10.FileSystem;
+    const content = yield* fs.readFileString(path).pipe(Effect25.catchAll(() => Effect25.succeed(null)));
+    if (content === null) {
+      return getDefaultSettings();
+    }
+    const parsed = yield* Effect25.try({
+      try: () => JSON.parse(content),
+      catch: () => null
+    }).pipe(Effect25.catchAll(() => Effect25.succeed(null)));
+    if (parsed === null || parsed["version"] !== 1 || typeof parsed["plugins"] !== "object") {
+      return getDefaultSettings();
+    }
+    return parsed;
+  });
+}
+function saveSettings(path, settings) {
+  return Effect25.gen(function* () {
+    const fs = yield* FileSystem10.FileSystem;
+    const dir = dirname(path);
+    yield* fs.makeDirectory(dir, { recursive: true }).pipe(Effect25.mapError((cause) => new SettingsWriteError({ path, cause })));
+    const tmpPath = join13(dir, `.settings-${Date.now()}.tmp`);
+    yield* fs.writeFileString(tmpPath, JSON.stringify(settings, null, 2)).pipe(Effect25.mapError((cause) => new SettingsWriteError({ path, cause })));
+    yield* fs.rename(tmpPath, path).pipe(Effect25.mapError((cause) => new SettingsWriteError({ path, cause })));
+  });
+}
+function settingsFileExists(path) {
+  return Effect25.gen(function* () {
+    const fs = yield* FileSystem10.FileSystem;
+    return yield* fs.exists(path).pipe(Effect25.catchAll(() => Effect25.succeed(false)));
+  });
+}
+function deleteSettingsFile(path) {
+  return Effect25.gen(function* () {
+    const fs = yield* FileSystem10.FileSystem;
+    yield* fs.remove(path).pipe(Effect25.catchAll(() => Effect25.void));
+  });
+}
+
+// ../../packages/server/src/services/onboarding-service.ts
+function isFirstLaunch(settingsPath) {
+  return Effect26.gen(function* () {
+    const exists = yield* settingsFileExists(settingsPath);
+    return { firstLaunch: !exists };
+  });
+}
+function completeOnboarding(settingsPath) {
+  return Effect26.gen(function* () {
+    const { firstLaunch } = yield* isFirstLaunch(settingsPath);
+    if (firstLaunch) {
+      yield* saveSettings(settingsPath, getDefaultSettings());
+    }
+    return { ok: true };
+  });
+}
+function resetSettings(settingsPath) {
+  return Effect26.gen(function* () {
+    yield* deleteSettingsFile(settingsPath);
+    return { ok: true };
+  });
+}
+
+// ../../packages/server/src/services/sessions-service.ts
+init_src();
+import { Effect as Effect27 } from "effect";
+function getProjects(registry) {
+  return Effect27.gen(function* () {
+    const projects = yield* registry.discoverAllProjects();
+    return { projects };
+  });
+}
+function getSessions(registry, params) {
+  return Effect27.gen(function* () {
+    const projects = yield* registry.discoverAllProjects();
+    const project = projects.find((p) => p.encodedPath === params.encodedPath);
+    if (!project) {
+      return { sessions: [] };
+    }
+    const sessions = yield* registry.listAllSessions(project);
+    return { sessions };
+  });
+}
+function getSession(registry, params) {
+  return Effect27.gen(function* () {
+    const parsed = parseSessionId(params.sessionId);
+    if (!(parsed.pluginId && parsed.rawSessionId)) {
+      return yield* Effect27.fail(new InvalidSessionIdError({ value: params.sessionId }));
+    }
+    const { pluginId } = parsed;
+    const { rawSessionId } = parsed;
+    const projects = yield* registry.discoverAllProjects();
+    const project = projects.find((p) => p.encodedPath === params.project);
+    if (!project) {
+      return yield* Effect27.fail(new ProjectNotFoundError({ encodedPath: params.project }));
+    }
+    const source = project.sources.find((s) => s.pluginId === pluginId);
+    if (!source) {
+      return yield* Effect27.fail(new PluginSourceNotFoundError({ pluginId, project: params.project }));
+    }
+    const plugin = registry.getPlugin(pluginId);
+    const pluginConfig = registry.getPluginConfig(pluginId);
+    const configLayer = makePluginConfigLayer(pluginConfig);
+    const sessionDetail = plugin.loadSessionDetail ? yield* plugin.loadSessionDetail(source.nativeId, rawSessionId).pipe(Effect27.provide(configLayer), Effect27.catchAll(() => Effect27.succeed(undefined))) : undefined;
+    const session = sessionDetail?.session ?? (yield* plugin.loadSession(source.nativeId, rawSessionId).pipe(Effect27.provide(configLayer), Effect27.catchAll(() => Effect27.die("loadSession failed"))));
+    session.sessionId = encodeSessionId(pluginId, rawSessionId);
+    session.pluginId = pluginId;
+    session.planSessionId = sessionDetail?.planSessionId ? encodeSessionId(pluginId, sessionDetail.planSessionId) : undefined;
+    session.implSessionId = sessionDetail?.implSessionId ? encodeSessionId(pluginId, sessionDetail.implSessionId) : undefined;
+    return { session };
+  });
+}
+function getSubAgent(registry, params) {
+  return Effect27.gen(function* () {
+    const parsed = parseSessionId(params.sessionId);
+    if (!(parsed.pluginId && parsed.rawSessionId)) {
+      return yield* Effect27.fail(new InvalidSessionIdError({ value: params.sessionId }));
+    }
+    const plugin = registry.getPlugin(parsed.pluginId);
+    if (!plugin.loadSubAgentSession) {
+      return yield* Effect27.fail(new SubAgentNotSupportedError({ pluginId: parsed.pluginId }));
+    }
+    const pluginConfig = registry.getPluginConfig(parsed.pluginId);
+    const configLayer = makePluginConfigLayer(pluginConfig);
+    const session = yield* plugin.loadSubAgentSession({
+      sessionId: parsed.rawSessionId,
+      project: params.project,
+      agentId: params.agentId
+    }).pipe(Effect27.provide(configLayer), Effect27.catchAll(() => Effect27.die("loadSubAgentSession failed")));
+    return { session };
+  });
+}
+function projectNameFromPath(fullPath) {
+  const parts = fullPath.split("/").filter(Boolean);
+  return parts.slice(-2).join("/");
+}
+function searchSessions(registry) {
+  return Effect27.gen(function* () {
+    const projects = yield* registry.discoverAllProjects();
+    const perProject = yield* Effect27.forEach(projects, (project) => registry.listAllSessions(project).pipe(Effect27.map((sessions) => ({ project, sessions }))), { concurrency: "unbounded" });
+    const allSessions = [];
+    for (const { project, sessions } of perProject) {
+      const projectName = projectNameFromPath(project.name);
+      for (const session of sessions) {
+        allSessions.push({
+          ...session,
+          encodedPath: project.encodedPath,
+          projectName
+        });
+      }
+    }
+    sortByIsoDesc(allSessions, (session) => session.timestamp);
+    return { sessions: allSessions };
+  });
+}
+
+// ../../packages/server/src/services/settings-service.ts
+import { Effect as Effect28 } from "effect";
+var DEFAULT_CHECK_INTERVAL_HOURS = 6;
+function buildPluginSettingsResponse(settingsPath) {
+  return Effect28.gen(function* () {
+    const settings = yield* loadSettings(settingsPath);
+    const plugins = BUILTIN_PLUGIN_DESCRIPTORS.map(({ plugin, defaultDir, defaultEnabled }) => {
+      const { id } = plugin;
+      const { displayName } = plugin;
+      const pluginConf = settings.plugins[id] ?? { enabled: defaultEnabled, dataDir: null };
+      const defaultDataDir = defaultDir;
+      const isCustomDir = pluginConf.dataDir !== null;
+      return {
+        id,
+        displayName,
+        enabled: pluginConf.enabled,
+        dataDir: pluginConf.dataDir ?? defaultDataDir,
+        defaultDataDir,
+        isCustomDir
+      };
+    });
+    return { plugins };
+  });
+}
+function getPluginSettings(settingsPath) {
+  return buildPluginSettingsResponse(settingsPath);
+}
+function getGeneralSettings(settingsPath) {
+  return Effect28.gen(function* () {
+    const settings = yield* loadSettings(settingsPath);
+    return { showSecurityWarning: settings.general?.showSecurityWarning ?? true };
+  });
+}
+function updateGeneralSettings(settingsPath, params) {
+  return Effect28.gen(function* () {
+    const settings = yield* loadSettings(settingsPath);
+    if (!settings.general) {
+      settings.general = {};
+    }
+    if (params.showSecurityWarning !== undefined) {
+      settings.general.showSecurityWarning = params.showSecurityWarning;
+    }
+    yield* saveSettings(settingsPath, settings);
+    return { showSecurityWarning: settings.general.showSecurityWarning ?? true };
+  });
+}
+function updatePluginSetting(settingsPath, params) {
+  return Effect28.gen(function* () {
+    if (!BUILTIN_PLUGIN_ID_SET.has(params.pluginId)) {
+      return yield* Effect28.fail(new UnknownPluginError({ pluginId: params.pluginId }));
+    }
+    const settings = yield* loadSettings(settingsPath);
+    const descriptor = BUILTIN_PLUGIN_DESCRIPTORS.find(({ plugin }) => plugin.id === params.pluginId);
+    const existing = settings.plugins[params.pluginId] ?? {
+      enabled: descriptor?.defaultEnabled ?? true,
+      dataDir: null
+    };
+    if (params.enabled !== undefined) {
+      existing.enabled = params.enabled;
+    }
+    if (params.dataDir !== undefined) {
+      existing.dataDir = params.dataDir;
+    }
+    settings.plugins[params.pluginId] = existing;
+    yield* saveSettings(settingsPath, settings);
+    return yield* buildPluginSettingsResponse(settingsPath);
+  });
+}
+function getUpdateSettings(settingsPath) {
+  return Effect28.gen(function* () {
+    const settings = yield* loadSettings(settingsPath);
+    return {
+      channel: settings.updates?.channel ?? "stable",
+      checkIntervalHours: settings.updates?.checkIntervalHours ?? DEFAULT_CHECK_INTERVAL_HOURS,
+      autoDownload: settings.updates?.autoDownload ?? true
+    };
+  });
+}
+function updateUpdateSettings(settingsPath, params) {
+  return Effect28.gen(function* () {
+    const settings = yield* loadSettings(settingsPath);
+    if (!settings.updates) {
+      settings.updates = { channel: "stable", checkIntervalHours: 6, autoDownload: true };
+    }
+    if (params.channel !== undefined) {
+      settings.updates.channel = params.channel;
+    }
+    if (params.checkIntervalHours !== undefined) {
+      const clamped = Math.max(1, Math.min(24, Math.round(params.checkIntervalHours)));
+      settings.updates.checkIntervalHours = clamped;
+    }
+    if (params.autoDownload !== undefined) {
+      settings.updates.autoDownload = params.autoDownload;
+    }
+    yield* saveSettings(settingsPath, settings);
+    return {
+      channel: settings.updates.channel,
+      checkIntervalHours: settings.updates.checkIntervalHours,
+      autoDownload: settings.updates.autoDownload
+    };
+  });
+}
+
+// ../../packages/server/src/services/stats-service.ts
+import { Effect as Effect30 } from "effect";
+
+// ../../packages/server/src/services/stats.ts
+init_src();
+import { Effect as Effect29 } from "effect";
+function emptyStats(projects = 0) {
+  return {
+    projects,
+    sessions: 0,
+    messages: 0,
+    todaySessions: 0,
+    thisWeekSessions: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheReadTokens: 0,
     cacheCreationTokens: 0,
     toolCalls: 0,
     models: {}
@@ -2396,26 +3782,31 @@ function toDateString(d) {
 function countRecentSessions(sessions) {
   const today = toDateString(new Date);
   const now = new Date;
-  const weekAgo = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7);
+  const daysPerWeek = 7;
+  const weekAgo = new Date(now.getFullYear(), now.getMonth(), now.getDate() - daysPerWeek);
   const weekAgoStr = toDateString(weekAgo);
   let todaySessions = 0;
   let thisWeekSessions = 0;
   for (const session of sessions) {
     const d = new Date(session.timestamp);
-    if (Number.isNaN(d.getTime()))
+    if (Number.isNaN(d.getTime())) {
       continue;
+    }
     const sessionDay = toDateString(d);
-    if (sessionDay === today)
-      todaySessions++;
-    if (sessionDay >= weekAgoStr)
-      thisWeekSessions++;
+    if (sessionDay === today) {
+      todaySessions += 1;
+    }
+    if (sessionDay >= weekAgoStr) {
+      thisWeekSessions += 1;
+    }
   }
   return { todaySessions, thisWeekSessions };
 }
 function ensureModelUsage(models, model) {
   const existing = models[model];
-  if (existing)
+  if (existing) {
     return existing;
+  }
   const usage = {
     inputTokens: 0,
     outputTokens: 0,
@@ -2428,35 +3819,42 @@ function ensureModelUsage(models, model) {
 function countVisibleMessages(turns) {
   return turns.filter((turn) => turn.kind !== "parse_error").length;
 }
-async function collectSessionsWithProjects(registry, stats) {
-  const projects = await runRegistryEffect(registry.discoverAllProjects()).catch(() => []);
-  stats.projects = projects.length;
-  const sessionsWithProject = [];
-  for (const project of projects) {
-    const sessions = await runRegistryEffect(registry.listAllSessions(project)).catch(() => []);
-    stats.sessions += sessions.length;
-    for (const session of sessions) {
-      sessionsWithProject.push({ project, session });
+function collectSessionsWithProjects(registry, stats) {
+  return Effect29.gen(function* () {
+    const projects = yield* registry.discoverAllProjects();
+    stats.projects = projects.length;
+    const sessionsWithProject = [];
+    for (const project of projects) {
+      const sessions = yield* registry.listAllSessions(project);
+      stats.sessions += sessions.length;
+      for (const session of sessions) {
+        sessionsWithProject.push({ project, session });
+      }
     }
-  }
-  return sessionsWithProject;
+    return sessionsWithProject;
+  });
 }
 function applyRecentSessionStats(stats, sessionsWithProject) {
   const recent = countRecentSessions(sessionsWithProject.map((item) => item.session));
   stats.todaySessions = recent.todaySessions;
   stats.thisWeekSessions = recent.thisWeekSessions;
 }
-async function loadSessionForStats(registry, project, session) {
-  if (!session.pluginId)
-    return null;
-  const source = project.sources.find((item) => item.pluginId === session.pluginId);
-  if (!source)
-    return null;
-  const plugin = registry.getPlugin(session.pluginId);
-  const pluginConfig = registry.getPluginConfig(session.pluginId);
-  const { rawSessionId } = parseSessionId(session.sessionId);
-  const loaded = await runPluginEffect(plugin.loadSession(source.nativeId, rawSessionId), pluginConfig).catch(() => null);
-  return loaded?.turns ?? null;
+function loadSessionForStats(registry, project, session) {
+  return Effect29.gen(function* () {
+    if (!session.pluginId) {
+      return null;
+    }
+    const source = project.sources.find((item) => item.pluginId === session.pluginId);
+    if (!source) {
+      return null;
+    }
+    const plugin = registry.getPlugin(session.pluginId);
+    const pluginConfig = registry.getPluginConfig(session.pluginId);
+    const { rawSessionId } = parseSessionId(session.sessionId);
+    const configLayer = makePluginConfigLayer(pluginConfig);
+    const loaded = yield* plugin.loadSession(source.nativeId, rawSessionId).pipe(Effect29.provide(configLayer), Effect29.catchAll(() => Effect29.succeed(null)));
+    return loaded?.turns ?? null;
+  });
 }
 function applyUsageStats(stats, modelUsage, usage) {
   stats.inputTokens += usage.inputTokens;
@@ -2471,252 +3869,69 @@ function applyUsageStats(stats, modelUsage, usage) {
 function applyTurnStats(stats, turns, fallbackModel) {
   stats.messages += countVisibleMessages(turns);
   for (const turn of turns) {
-    if (turn.kind !== "assistant")
+    if (turn.kind !== "assistant") {
       continue;
+    }
     stats.toolCalls += turn.contentBlocks.filter((block) => block.type === "tool_call").length;
     const modelUsage = ensureModelUsage(stats.models, turn.model || fallbackModel || "unknown");
-    if (!turn.usage)
+    if (!turn.usage) {
       continue;
+    }
     applyUsageStats(stats, modelUsage, turn.usage);
   }
 }
-async function computeStats(registry) {
-  const stats = emptyStats();
-  const sessionsWithProject = await collectSessionsWithProjects(registry, stats);
-  applyRecentSessionStats(stats, sessionsWithProject);
-  for (const item of sessionsWithProject) {
-    const turns = await loadSessionForStats(registry, item.project, item.session);
-    if (!turns)
-      continue;
-    applyTurnStats(stats, turns, item.session.model);
-  }
-  return stats;
+function computeStats(registry) {
+  return Effect29.gen(function* () {
+    const stats = emptyStats();
+    const sessionsWithProject = yield* collectSessionsWithProjects(registry, stats);
+    applyRecentSessionStats(stats, sessionsWithProject);
+    const turnsPerSession = yield* Effect29.forEach(sessionsWithProject, (item) => loadSessionForStats(registry, item.project, item.session).pipe(Effect29.map((turns) => ({ item, turns }))), { concurrency: "unbounded" });
+    for (const { item, turns } of turnsPerSession) {
+      if (!turns) {
+        continue;
+      }
+      applyTurnStats(stats, turns, item.session.model);
+    }
+    return stats;
+  });
 }
 function scanStats(registry) {
   return computeStats(registry);
 }
 
-// ../../packages/server/src/services/app-services.ts
-async function getStats(registry) {
-  const stats = await scanStats(registry);
-  return { stats };
-}
-async function getProjects(registry) {
-  const projects = await runRegistryEffect(registry.discoverAllProjects());
-  return { projects };
-}
-async function getSessions(registry, params) {
-  const projects = await runRegistryEffect(registry.discoverAllProjects());
-  const project = projects.find((p) => p.encodedPath === params.encodedPath);
-  if (!project)
-    return { sessions: [] };
-  const sessions = await runRegistryEffect(registry.listAllSessions(project));
-  return { sessions };
-}
-async function getSession(registry, params) {
-  const parsed = parseSessionId(params.sessionId);
-  if (!parsed.pluginId || !parsed.rawSessionId) {
-    throw new Error("Invalid sessionId format");
-  }
-  const pluginId = parsed.pluginId;
-  const rawSessionId = parsed.rawSessionId;
-  const projects = await runRegistryEffect(registry.discoverAllProjects());
-  const project = projects.find((p) => p.encodedPath === params.project);
-  if (!project)
-    throw new Error("Project not found");
-  const source = project.sources.find((s) => s.pluginId === pluginId);
-  if (!source)
-    throw new Error("Plugin source not found");
-  const plugin = registry.getPlugin(pluginId);
-  const pluginConfig = registry.getPluginConfig(pluginId);
-  const sessionDetail = plugin.loadSessionDetail ? await runPluginEffect(plugin.loadSessionDetail(source.nativeId, rawSessionId), pluginConfig) : undefined;
-  const session = sessionDetail?.session ?? await runPluginEffect(plugin.loadSession(source.nativeId, rawSessionId), pluginConfig);
-  session.sessionId = encodeSessionId(pluginId, rawSessionId);
-  session.pluginId = pluginId;
-  session.planSessionId = sessionDetail?.planSessionId ? encodeSessionId(pluginId, sessionDetail.planSessionId) : undefined;
-  session.implSessionId = sessionDetail?.implSessionId ? encodeSessionId(pluginId, sessionDetail.implSessionId) : undefined;
-  return { session };
-}
-async function getSubAgent(registry, params) {
-  const parsed = parseSessionId(params.sessionId);
-  if (!parsed.pluginId || !parsed.rawSessionId) {
-    throw new Error("Invalid sessionId format");
-  }
-  const plugin = registry.getPlugin(parsed.pluginId);
-  if (!plugin.loadSubAgentSession) {
-    throw new Error(`Sub-agent sessions are not supported by plugin: ${parsed.pluginId}`);
-  }
-  const pluginConfig = registry.getPluginConfig(parsed.pluginId);
-  const session = await runPluginEffect(plugin.loadSubAgentSession({
-    sessionId: parsed.rawSessionId,
-    project: params.project,
-    agentId: params.agentId
-  }), pluginConfig);
-  return { session };
-}
-function projectNameFromPath(fullPath) {
-  const parts = fullPath.split("/").filter(Boolean);
-  return parts.slice(-2).join("/");
-}
-async function searchSessions(registry) {
-  const projects = await runRegistryEffect(registry.discoverAllProjects());
-  const allSessions = [];
-  for (const project of projects) {
-    const sessions = await runRegistryEffect(registry.listAllSessions(project));
-    const projectName = projectNameFromPath(project.name);
-    for (const session of sessions) {
-      allSessions.push({
-        ...session,
-        encodedPath: project.encodedPath,
-        projectName
-      });
-    }
-  }
-  sortByIsoDesc(allSessions, (session) => session.timestamp);
-  return { sessions: allSessions };
-}
-async function buildPluginSettingsResponse(settingsPath) {
-  const settings = await loadSettings(settingsPath);
-  const plugins = BUILTIN_PLUGIN_DESCRIPTORS.map(({ plugin, defaultDir }) => {
-    const id = plugin.id;
-    const displayName = plugin.displayName;
-    const pluginConf = settings.plugins[id] ?? { enabled: true, dataDir: null };
-    const defaultDataDir = defaultDir;
-    const isCustomDir = pluginConf.dataDir !== null;
-    return {
-      id,
-      displayName,
-      enabled: pluginConf.enabled,
-      dataDir: pluginConf.dataDir ?? defaultDataDir,
-      defaultDataDir,
-      isCustomDir
-    };
+// ../../packages/server/src/services/stats-service.ts
+function getStats(registry) {
+  return Effect30.gen(function* () {
+    const stats = yield* scanStats(registry);
+    return { stats };
   });
-  return { plugins };
-}
-function getPluginSettings(settingsPath) {
-  return buildPluginSettingsResponse(settingsPath);
-}
-async function getGeneralSettings(settingsPath) {
-  const settings = await loadSettings(settingsPath);
-  return { showSecurityWarning: settings.general?.showSecurityWarning ?? true };
-}
-async function isFirstLaunch(settingsPath) {
-  try {
-    await access(settingsPath);
-    return { firstLaunch: false };
-  } catch {
-    return { firstLaunch: true };
-  }
-}
-async function completeOnboarding(settingsPath) {
-  const { firstLaunch } = await isFirstLaunch(settingsPath);
-  if (firstLaunch) {
-    await saveSettings(settingsPath, getDefaultSettings());
-  }
-  return { ok: true };
-}
-async function resetSettings(settingsPath) {
-  try {
-    await rm(settingsPath);
-  } catch {}
-  return { ok: true };
-}
-async function updateGeneralSettings(settingsPath, params) {
-  const settings = await loadSettings(settingsPath);
-  if (!settings.general) {
-    settings.general = {};
-  }
-  if (params.showSecurityWarning !== undefined) {
-    settings.general.showSecurityWarning = params.showSecurityWarning;
-  }
-  await saveSettings(settingsPath, settings);
-  return { showSecurityWarning: settings.general.showSecurityWarning ?? true };
-}
-async function updatePluginSetting(settingsPath, params) {
-  if (!BUILTIN_PLUGIN_ID_SET.has(params.pluginId)) {
-    throw new Error(`Unknown plugin: ${params.pluginId}`);
-  }
-  const settings = await loadSettings(settingsPath);
-  const existing = settings.plugins[params.pluginId] ?? { enabled: true, dataDir: null };
-  if (params.enabled !== undefined) {
-    existing.enabled = params.enabled;
-  }
-  if (params.dataDir !== undefined) {
-    existing.dataDir = params.dataDir;
-  }
-  settings.plugins[params.pluginId] = existing;
-  await saveSettings(settingsPath, settings);
-  return buildPluginSettingsResponse(settingsPath);
-}
-async function getUpdateSettings(settingsPath) {
-  const settings = await loadSettings(settingsPath);
-  return {
-    channel: settings.updates?.channel ?? "stable",
-    checkIntervalHours: settings.updates?.checkIntervalHours ?? 6,
-    autoDownload: settings.updates?.autoDownload ?? true
-  };
-}
-async function updateUpdateSettings(settingsPath, params) {
-  const settings = await loadSettings(settingsPath);
-  if (!settings.updates) {
-    settings.updates = { channel: "stable", checkIntervalHours: 6, autoDownload: true };
-  }
-  if (params.channel !== undefined) {
-    settings.updates.channel = params.channel;
-  }
-  if (params.checkIntervalHours !== undefined) {
-    const clamped = Math.max(1, Math.min(24, Math.round(params.checkIntervalHours)));
-    settings.updates.checkIntervalHours = clamped;
-  }
-  if (params.autoDownload !== undefined) {
-    settings.updates.autoDownload = params.autoDownload;
-  }
-  await saveSettings(settingsPath, settings);
-  return {
-    channel: settings.updates.channel,
-    checkIntervalHours: settings.updates.checkIntervalHours,
-    autoDownload: settings.updates.autoDownload
-  };
 }
 
-// ../../packages/server/src/services/registry.ts
-init_src();
-class PluginRegistry2 extends PluginRegistry {
+// ../../packages/server/src/services/version-service.ts
+function makeVersionState(version, commit) {
+  const normalizedVersion = version == null || version === "0.0.0" ? "dev" : version;
+  return { version: normalizedVersion, commit: commit ?? "" };
 }
-
-// ../../packages/server/src/services/auto-discover.ts
-async function createRegistry(settings) {
-  const registry = new PluginRegistry2;
-  for (const { plugin, defaultDir } of BUILTIN_PLUGIN_DESCRIPTORS) {
-    const pluginSettings = settings?.plugins[plugin.id];
-    if (pluginSettings && !pluginSettings.enabled)
-      continue;
-    const dataDir = pluginSettings?.dataDir ?? defaultDir;
-    const available = await runPluginEffect(plugin.isDataAvailable, { dataDir }).catch(() => false);
-    if (available) {
-      registry.register(plugin, { dataDir });
-    }
-  }
-  return registry;
+function getVersion(state) {
+  return { version: state.version, commit: state.commit };
 }
 
 // ../../packages/server/src/effect/server-services.ts
 class KloviServices extends Context4.Tag("@klovi/KloviServices")() {
 }
-var KloviServicesLive = Layer6.effect(KloviServices, Effect19.gen(function* () {
+var KloviServicesLive = Layer6.effect(KloviServices, Effect31.gen(function* () {
   const config = yield* ServerConfig;
   const { settingsPath } = config;
-  const version = config.version === "0.0.0" ? "dev" : config.version;
-  const settings = yield* Effect19.promise(() => loadSettings(settingsPath));
-  let registry = yield* Effect19.promise(() => createRegistry(settings));
-  async function refreshRegistry() {
-    const freshSettings = await loadSettings(settingsPath);
-    registry = await createRegistry(freshSettings);
-  }
+  const versionState = makeVersionState(config.version, config.commit);
+  const settings = yield* loadSettings(settingsPath);
+  let registry = yield* createRegistry(settings);
+  const refreshRegistry = () => Effect31.gen(function* () {
+    const freshSettings = yield* loadSettings(settingsPath);
+    registry = yield* createRegistry(freshSettings);
+  });
   return {
     acceptRisks: () => completeOnboarding(settingsPath),
-    getVersion: () => ({ version, commit: config.commit }),
+    getVersion: () => Effect31.succeed(getVersion(versionState)),
     getStats: () => getStats(registry),
     getProjects: () => getProjects(registry),
     getSessions: (params) => getSessions(registry, params),
@@ -2724,19 +3939,19 @@ var KloviServicesLive = Layer6.effect(KloviServices, Effect19.gen(function* () {
     getSubAgent: (params) => getSubAgent(registry, params),
     searchSessions: () => searchSessions(registry),
     getPluginSettings: () => getPluginSettings(settingsPath),
-    updatePluginSetting: async (params) => {
-      const result = await updatePluginSetting(settingsPath, params);
-      await refreshRegistry();
+    updatePluginSetting: (params) => Effect31.gen(function* () {
+      const result = yield* updatePluginSetting(settingsPath, params);
+      yield* refreshRegistry();
       return result;
-    },
+    }),
     getGeneralSettings: () => getGeneralSettings(settingsPath),
     updateGeneralSettings: (params) => updateGeneralSettings(settingsPath, params),
     isFirstLaunch: () => isFirstLaunch(settingsPath),
-    resetSettings: async () => {
-      const result = await resetSettings(settingsPath);
-      await refreshRegistry();
+    resetSettings: () => Effect31.gen(function* () {
+      const result = yield* resetSettings(settingsPath);
+      yield* refreshRegistry();
       return result;
-    },
+    }),
     getUpdateSettings: () => getUpdateSettings(settingsPath),
     updateUpdateSettings: (params) => updateUpdateSettings(settingsPath, params),
     getRegistry: () => registry,
@@ -2747,12 +3962,13 @@ var KloviServicesLive = Layer6.effect(KloviServices, Effect19.gen(function* () {
 // ../../packages/server/src/effect/bootstrap.ts
 function getDefaultSettingsPath() {
   const home = process.env["HOME"] ?? process.env["USERPROFILE"] ?? "";
-  return join12(home, ".klovi", "settings.json");
+  return join14(home, ".klovi", "settings.json");
 }
 function detectRuntime(requested = "auto") {
-  if (requested !== "auto")
+  if (requested !== "auto") {
     return requested;
-  return typeof globalThis.Bun !== "undefined" ? "bun" : "node";
+  }
+  return typeof globalThis.Bun === "undefined" ? "node" : "bun";
 }
 async function bootstrapServer(options, makeServe) {
   const host = options.host ?? "127.0.0.1";
@@ -2763,8 +3979,7 @@ async function bootstrapServer(options, makeServe) {
   const rt = detectRuntime(options.runtime);
   let platformLayer;
   if (rt === "node") {
-    const { NodePluginLayer: NodePluginLayer2, makeNodeServerLayer: makeNodeServerLayer2 } = await Promise.resolve().then(() => (init_platform_node(), exports_platform_node));
-    setPluginLayer(NodePluginLayer2);
+    const { makeNodeServerLayer: makeNodeServerLayer2 } = await Promise.resolve().then(() => (init_platform_node(), exports_platform_node));
     platformLayer = makeNodeServerLayer2({ host, port });
   } else {
     platformLayer = makeBunServerLayer({ hostname: host, port });
@@ -2783,26 +3998,28 @@ async function bootstrapServer(options, makeServe) {
     resolveAddress = resolve;
     rejectAddress = reject;
   });
-  const addressCapture = Layer8.effectDiscard(HttpServer.addressWith((address) => Effect20.sync(() => {
+  const addressCapture = Layer8.effectDiscard(HttpServer.addressWith((address) => Effect32.gen(function* () {
     const addr = address;
-    resolveAddress(`http://${addr.hostname}:${addr.port}`);
+    const url2 = `http://${addr.hostname}:${addr.port}`;
+    yield* Effect32.log(`Klovi server listening on ${url2}`);
+    resolveAddress(url2);
   })));
   const serveLayer = makeServe();
   const fullLayer = Layer8.merge(serveLayer, addressCapture).pipe(Layer8.provide(servicesLayer), Layer8.provide(configLayer), Layer8.provide(platformLayer));
-  const fiber = Effect20.runFork(Layer8.launch(fullLayer));
-  Effect20.runFork(Fiber.join(fiber).pipe(Effect20.catchAllCause((cause) => Effect20.sync(() => rejectAddress(Cause.squash(cause))))));
+  const fiber = Effect32.runFork(Layer8.launch(fullLayer));
+  Effect32.runFork(Fiber.join(fiber).pipe(Effect32.catchAllCause((cause) => Effect32.sync(() => rejectAddress(Cause.squash(cause))))));
   const url = await addressPromise;
   return {
     url,
-    stop() {
-      Effect20.runFork(Fiber.interrupt(fiber));
+    stop: () => {
+      Effect32.runFork(Fiber.interrupt(fiber));
     }
   };
 }
 
 // ../../packages/server/src/effect/http-app.ts
 import { HttpRouter, HttpServer as HttpServer2, HttpServerRequest, HttpServerResponse } from "@effect/platform";
-import { Effect as Effect21 } from "effect";
+import { Effect as Effect33 } from "effect";
 
 // ../../packages/server/src/rpc-error.ts
 class RPCError extends Error {
@@ -2815,10 +4032,35 @@ class RPCError extends Error {
 
 // ../../packages/server/src/effect/http-app.ts
 var NON_RPC_KEYS = new Set(["getRegistry", "settingsPath"]);
-function isRPCMethod(method, services) {
+function isRpcMethod(method, services) {
   return Object.hasOwn(services, method) && !NON_RPC_KEYS.has(method);
 }
-var rpcHandler = Effect21.gen(function* () {
+function mapDomainErrorToStatus(err) {
+  if (err instanceof InvalidSessionIdError) {
+    return { status: 400, message: "Invalid sessionId format" };
+  }
+  if (err instanceof ProjectNotFoundError) {
+    return { status: 404, message: "Project not found" };
+  }
+  if (err instanceof PluginSourceNotFoundError) {
+    return { status: 404, message: "Plugin source not found" };
+  }
+  if (err instanceof UnknownPluginError) {
+    return { status: 400, message: `Unknown plugin: ${err.pluginId}` };
+  }
+  if (err instanceof SubAgentNotSupportedError) {
+    return { status: 400, message: `Sub-agent sessions are not supported by plugin: ${err.pluginId}` };
+  }
+  if (err instanceof SettingsWriteError) {
+    return { status: 500, message: "Failed to write settings" };
+  }
+  if (err instanceof RPCError) {
+    return { status: err.status, message: err.message };
+  }
+  const message = err instanceof Error ? err.message : "Internal server error";
+  return { status: 500, message };
+}
+var rpcHandler = Effect33.gen(function* () {
   const services = yield* KloviServices;
   const routeParams = yield* HttpRouter.params;
   const req = yield* HttpServerRequest.HttpServerRequest;
@@ -2826,8 +4068,9 @@ var rpcHandler = Effect21.gen(function* () {
   if (!method) {
     return HttpServerResponse.unsafeJson({ error: "Method name required" }, { status: 400 });
   }
-  if (!isRPCMethod(method, services)) {
-    return yield* Effect21.fail(new RPCError(404, `Unknown method: ${method}`));
+  if (!isRpcMethod(method, services)) {
+    const httpNotFound = 404;
+    return yield* Effect33.fail(new RPCError(httpNotFound, `Unknown method: ${method}`));
   }
   let params = {};
   const bodyText = yield* req.text;
@@ -2839,44 +4082,36 @@ var rpcHandler = Effect21.gen(function* () {
     }
   }
   const handler = services[method];
-  return yield* Effect21.tryPromise({
-    try: async () => {
-      const result = await Promise.resolve(handler(params));
-      return HttpServerResponse.unsafeJson(result);
-    },
-    catch: (err) => err
-  });
-}).pipe(Effect21.catchAll((err) => {
-  if (err instanceof RPCError) {
-    return Effect21.succeed(HttpServerResponse.unsafeJson({ error: err.message }, { status: err.status }));
-  }
-  const message = err instanceof Error ? err.message : "Internal server error";
-  return Effect21.succeed(HttpServerResponse.unsafeJson({ error: message }, { status: 500 }));
+  const value = yield* handler(params);
+  return HttpServerResponse.unsafeJson(value);
+}).pipe(Effect33.catchAll((err) => {
+  const { status, message } = mapDomainErrorToStatus(err);
+  return Effect33.succeed(HttpServerResponse.unsafeJson({ error: message }, { status }));
 }));
-var emptyMethodHandler = Effect21.succeed(HttpServerResponse.unsafeJson({ error: "Method name required" }, { status: 400 }));
+var emptyMethodHandler = Effect33.succeed(HttpServerResponse.unsafeJson({ error: "Method name required" }, { status: 400 }));
 var makeRpcRouter = () => HttpRouter.empty.pipe(HttpRouter.post("/api/rpc/", emptyMethodHandler), HttpRouter.post("/api/rpc/:method", rpcHandler));
-var notFoundHandler = Effect21.succeed(HttpServerResponse.unsafeJson({ error: "Not found" }, { status: 404 }));
-var makeHttpApp = () => makeRpcRouter().pipe(Effect21.catchTag("RouteNotFound", () => notFoundHandler));
+var notFoundHandler = Effect33.succeed(HttpServerResponse.unsafeJson({ error: "Not found" }, { status: 404 }));
+var makeHttpApp = () => makeRpcRouter().pipe(Effect33.catchTag("RouteNotFound", () => notFoundHandler));
 var makeServeLayer = () => makeHttpApp().pipe(HttpServer2.serve());
 
 // src/http-app.ts
 import { HttpServer as HttpServer3 } from "@effect/platform";
-import { Effect as Effect23 } from "effect";
+import { Effect as Effect35 } from "effect";
 
 // src/static-handler.ts
 import { HttpServerRequest as HttpServerRequest2, HttpServerResponse as HttpServerResponse2 } from "@effect/platform";
-import { Effect as Effect22 } from "effect";
-var makeStaticHandler = (staticDir) => Effect22.gen(function* () {
+import { Effect as Effect34 } from "effect";
+var makeStaticHandler = (staticDir) => Effect34.gen(function* () {
   const req = yield* HttpServerRequest2.HttpServerRequest;
   const url = new URL(req.url, "http://localhost");
   const filePath = url.pathname === "/" ? "/index.html" : url.pathname;
-  return yield* HttpServerResponse2.file(`${staticDir}${filePath}`).pipe(Effect22.orElse(() => HttpServerResponse2.file(`${staticDir}/index.html`)), Effect22.orElse(() => Effect22.succeed(HttpServerResponse2.unsafeJson({ error: "Not found" }, { status: 404 }))));
+  return yield* HttpServerResponse2.file(`${staticDir}${filePath}`).pipe(Effect34.orElse(() => HttpServerResponse2.file(`${staticDir}/index.html`)), Effect34.orElse(() => Effect34.succeed(HttpServerResponse2.unsafeJson({ error: "Not found" }, { status: 404 }))));
 });
 
 // src/http-app.ts
 var makePackageHttpApp = (staticDir) => {
   const router = makeRpcRouter();
-  return router.pipe(Effect23.catchTag("RouteNotFound", () => makeStaticHandler(staticDir)));
+  return router.pipe(Effect35.catchTag("RouteNotFound", () => makeStaticHandler(staticDir)));
 };
 var makePackageServeLayer = (staticDir) => {
   if (!staticDir) {
@@ -2892,7 +4127,8 @@ function startKloviServer(options = {}) {
 
 // src/server.ts
 function openInBrowser(url) {
-  const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
+  const commands = { darwin: "open", win32: "cmd" };
+  const cmd = commands[process.platform] ?? "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", url] : [url];
   execFile(cmd, args, () => {});
 }
@@ -2904,9 +4140,8 @@ async function startKloviPackageServer(options = {}) {
   }
   return result;
 }
-
 // src/cli.ts
-import { readFile as readFile2 } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import { resolve as resolve2 } from "node:path";
 
 // src/cli-config.ts
@@ -2916,16 +4151,18 @@ var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 3583;
 function resolveStaticDir(baseDir, pathExists = existsSync) {
   const builtPath = resolve(baseDir, "web");
-  if (pathExists(builtPath))
+  if (pathExists(builtPath)) {
     return builtPath;
+  }
   return resolve(baseDir, "../../../packages/ui/dist");
 }
 function parsePort(argv, env) {
   const portArgIndex = argv.indexOf("--port");
   if (portArgIndex !== -1) {
     const value = argv[portArgIndex + 1];
-    if (value !== undefined)
+    if (value !== undefined) {
       return Number(value);
+    }
   }
   return Number(env["KLOVI_PORT"] ?? String(DEFAULT_PORT));
 }
@@ -2942,11 +4179,11 @@ function resolveCliConfig(baseDir, argv = process.argv, env = process.env, pathE
 // src/cli.ts
 var __dir = import.meta.dirname;
 var pkgPath = resolve2(__dir, "../package.json");
-var pkg = JSON.parse(await readFile2(pkgPath, "utf-8"));
+var pkg = JSON.parse(await readFile(pkgPath, "utf-8"));
 var version = pkg["version"] ?? "0.0.0";
 var commit = pkg["commit"] ?? "";
 var config = resolveCliConfig(__dir);
-var server = await startKloviPackageServer({
+await startKloviPackageServer({
   host: config.host,
   port: config.port,
   staticDir: config.staticDir,
@@ -2955,4 +4192,3 @@ var server = await startKloviPackageServer({
   openBrowser: config.openBrowser,
   ...config.settingsPath ? { settingsPath: config.settingsPath } : {}
 });
-console.log(`Klovi server listening on ${server.url}`);