@cookielab.io/klovi 3.0.0 → 3.2.0

package/dist/cli.js

@@ -58,6 +58,110 @@ var init_plugin_errors = __esm(() => {
   };
 });
 
+// ../../packages/plugin-core/src/resolve-worktree.ts
+import { join } from "node:path";
+import { FileSystem } from "@effect/platform";
+import { Effect } from "effect";
+function stripT3CodeSuffix(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);
+  return { path: parentPath, projectName };
+}
+function resolveGitWorktree(worktreePath) {
+  return Effect.gen(function* () {
+    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")
+      return worktreePath;
+    const content = yield* fs.readFileString(dotGitPath).pipe(Effect.catchAll(() => Effect.succeed("")));
+    if (!content)
+      return worktreePath;
+    const match = GITDIR_WORKTREE_REGEX.exec(content);
+    if (!match?.[1])
+      return worktreePath;
+    const gitdir = match[1];
+    const worktreeIdx = gitdir.indexOf(GIT_WORKTREES_SEGMENT);
+    if (worktreeIdx === -1)
+      return worktreePath;
+    return gitdir.slice(0, worktreeIdx);
+  });
+}
+function lastSegment(path) {
+  const lastSlash = path.lastIndexOf("/");
+  return lastSlash === -1 ? path : path.slice(lastSlash + 1);
+}
+function collectT3CodeEntries(projects) {
+  const entries = [];
+  for (const project of projects) {
+    const stripped = stripT3CodeSuffix(project.resolvedPath);
+    if (stripped) {
+      entries.push({
+        project,
+        originalPath: project.resolvedPath,
+        projectName: stripped.projectName
+      });
+      project.resolvedPath = stripped.path;
+    }
+  }
+  return entries;
+}
+function buildNameMap(projects, t3codeProjects) {
+  const nameToResolvedPaths = new Map;
+  for (const project of projects) {
+    if (t3codeProjects.has(project))
+      continue;
+    const name = lastSegment(project.resolvedPath);
+    if (!name)
+      continue;
+    const existing = nameToResolvedPaths.get(name);
+    if (existing) {
+      if (!existing.includes(project.resolvedPath))
+        existing.push(project.resolvedPath);
+    } else {
+      nameToResolvedPaths.set(name, [project.resolvedPath]);
+    }
+  }
+  return nameToResolvedPaths;
+}
+function resolveEntry(entry, nameMap) {
+  return Effect.gen(function* () {
+    const candidates = nameMap.get(entry.projectName);
+    if (!candidates || candidates.length === 0)
+      return;
+    if (candidates.length === 1) {
+      const resolvedPath = candidates[0];
+      if (resolvedPath)
+        entry.project.resolvedPath = resolvedPath;
+      return;
+    }
+    const resolved = yield* resolveGitWorktree(entry.originalPath);
+    if (candidates.includes(resolved)) {
+      entry.project.resolvedPath = resolved;
+    }
+  });
+}
+function resolveT3CodePaths(projects) {
+  return Effect.gen(function* () {
+    const t3codeEntries = collectT3CodeEntries(projects);
+    if (t3codeEntries.length === 0)
+      return;
+    const t3codeProjects = new Set(t3codeEntries.map((e) => e.project));
+    const nameMap = buildNameMap(projects, t3codeProjects);
+    for (const entry of t3codeEntries) {
+      yield* resolveEntry(entry, nameMap);
+    }
+  });
+}
+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*$/;
+});
+
 // ../../packages/plugin-core/src/session-id.ts
 function encodeSessionId(pluginId, rawSessionId) {
   return `${pluginId}${SESSION_ID_SEPARATOR}${rawSessionId}`;
@@ -75,7 +179,7 @@ function parseSessionId(sessionId) {
 var SESSION_ID_SEPARATOR = "::";
 
 // ../../packages/plugin-core/src/plugin-registry.ts
-import { Effect, Layer } from "effect";
+import { Effect as Effect2, Layer } from "effect";
 function encodeResolvedPath(resolvedPath) {
   if (resolvedPath.startsWith("/")) {
     return resolvedPath.replace(/\//g, "-");
@@ -112,12 +216,13 @@ class PluginRegistry {
     return [...this.plugins.values()].map((entry) => entry.plugin);
   }
   discoverAllProjects() {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const allProjects = [];
       for (const { plugin, configLayer } of this.plugins.values()) {
-        const projects = yield* plugin.discoverProjects.pipe(Effect.provide(configLayer), Effect.catchAll(() => Effect.succeed([])));
+        const projects = yield* plugin.discoverProjects.pipe(Effect2.provide(configLayer), Effect2.catchAll(() => Effect2.succeed([])));
         allProjects.push(...projects);
       }
+      yield* resolveT3CodePaths(allProjects);
       const projectsByPath = new Map;
       for (const project of allProjects) {
         const current = projectsByPath.get(project.resolvedPath);
@@ -147,13 +252,13 @@ class PluginRegistry {
     });
   }
   listAllSessions(project) {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const allSessions = [];
       for (const source of project.sources) {
         const entry = this.plugins.get(source.pluginId);
         if (!entry)
           continue;
-        const sessions = yield* entry.plugin.listSessions(source.nativeId).pipe(Effect.provide(entry.configLayer), Effect.catchAll(() => Effect.succeed([])));
+        const sessions = yield* entry.plugin.listSessions(source.nativeId).pipe(Effect2.provide(entry.configLayer), Effect2.catchAll(() => Effect2.succeed([])));
         allSessions.push(...sessions.map((session) => ({
           ...session,
           sessionId: this.sessionIdEncoder(source.pluginId, session.sessionId),
@@ -167,6 +272,7 @@ class PluginRegistry {
 }
 var init_plugin_registry = __esm(() => {
   init_plugin_config();
+  init_resolve_worktree();
 });
 
 // ../../packages/plugin-core/src/plugin-runtime.ts
@@ -197,19 +303,19 @@ var init_src = __esm(() => {
 });
 
 // ../../packages/plugin-opencode/src/db.ts
-import { join } from "node:path";
-import { FileSystem } from "@effect/platform";
-import { Effect as Effect2 } from "effect";
+import { join as join2 } from "node:path";
+import { FileSystem as FileSystem2 } from "@effect/platform";
+import { Effect as Effect3 } from "effect";
 function getOpenCodeDbPath() {
-  return Effect2.gen(function* () {
+  return Effect3.gen(function* () {
     const config = yield* PluginConfig;
-    return join(config.dataDir, "opencode.db");
+    return join2(config.dataDir, "opencode.db");
   });
 }
 function openOpenCodeDb() {
-  return Effect2.gen(function* () {
+  return Effect3.gen(function* () {
     const dbPath = yield* getOpenCodeDbPath();
-    const fs = yield* FileSystem.FileSystem;
+    const fs = yield* FileSystem2.FileSystem;
     const exists = yield* fs.exists(dbPath);
     if (!exists)
       return null;
@@ -231,7 +337,7 @@ function tryParseJson(value) {
 }
 
 // ../../packages/plugin-opencode/src/discovery.ts
-import { Effect as Effect3 } from "effect";
+import { Effect as Effect4 } from "effect";
 function getColumns(db, tableName) {
   const rows = db.query(`PRAGMA table_info(${tableName})`).all();
   return new Set(rows.map((r) => r.name));
@@ -252,7 +358,7 @@ function inspectSchema(db) {
   };
 }
 function discoverOpenCodeProjects() {
-  return Effect3.gen(function* () {
+  return Effect4.gen(function* () {
     const db = yield* openOpenCodeDb();
     if (!db)
       return [];
@@ -340,7 +446,7 @@ function sessionRowToSummary(db, row) {
   };
 }
 function listOpenCodeSessions(nativeId) {
-  return Effect3.gen(function* () {
+  return Effect4.gen(function* () {
     const db = yield* openOpenCodeDb();
     if (!db)
       return [];
@@ -400,7 +506,7 @@ var init_discovery = __esm(() => {
 });
 
 // ../../packages/plugin-opencode/src/parser.ts
-import { Effect as Effect4 } from "effect";
+import { Effect as Effect5 } from "effect";
 function partToContentBlock(partData, nextToolUseId) {
   switch (partData.type) {
     case "text": {
@@ -595,7 +701,7 @@ function loadSessionFromDb(db, nativeId, sessionId) {
   return { sessionId, project, turns, pluginId: "opencode" };
 }
 function loadOpenCodeSession(nativeId, sessionId) {
-  return Effect4.gen(function* () {
+  return Effect5.gen(function* () {
     const db = yield* openOpenCodeDb();
     if (!db) {
       return emptySession(nativeId, sessionId);
@@ -623,19 +729,19 @@ var init_parser = __esm(() => {
 });
 
 // ../../packages/plugin-opencode/src/config.ts
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 var DEFAULT_OPENCODE_DIR;
 var init_config = __esm(() => {
-  DEFAULT_OPENCODE_DIR = join2(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".local", "share", "opencode");
+  DEFAULT_OPENCODE_DIR = join3(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".local", "share", "opencode");
 });
 
 // ../../packages/plugin-opencode/src/runtime/bun-sqlite.ts
-import { Effect as Effect5, Layer as Layer3 } from "effect";
+import { Effect as Effect6, Layer as Layer3 } from "effect";
 var bunSqliteClient, BunSqliteLayer;
 var init_bun_sqlite = __esm(() => {
   init_src();
   bunSqliteClient = {
-    open: (dbPath, options) => Effect5.try({
+    open: (dbPath, options) => Effect6.try({
       try: () => {
         const sqlite = __require("bun:sqlite");
         return new sqlite.Database(dbPath, {
@@ -643,18 +749,18 @@ var init_bun_sqlite = __esm(() => {
         });
       },
       catch: () => null
-    }).pipe(Effect5.catchAll(() => Effect5.succeed(null)))
+    }).pipe(Effect6.catchAll(() => Effect6.succeed(null)))
   };
   BunSqliteLayer = Layer3.succeed(SqliteClientTag, bunSqliteClient);
 });
 
 // ../../packages/plugin-opencode/src/runtime/node-sqlite.ts
-import { Effect as Effect6, Layer as Layer4 } from "effect";
+import { Effect as Effect7, Layer as Layer4 } from "effect";
 var nodeSqliteClient, NodeSqliteLayer;
 var init_node_sqlite = __esm(() => {
   init_src();
   nodeSqliteClient = {
-    open: (dbPath, options) => Effect6.tryPromise({
+    open: (dbPath, options) => Effect7.tryPromise({
       try: async () => {
         const sqlite = await import("node:sqlite");
         const db = new sqlite.DatabaseSync(dbPath, {
@@ -679,15 +785,15 @@ var init_node_sqlite = __esm(() => {
         };
       },
       catch: () => null
-    }).pipe(Effect6.catchAll(() => Effect6.succeed(null)))
+    }).pipe(Effect7.catchAll(() => Effect7.succeed(null)))
   };
   NodeSqliteLayer = Layer4.succeed(SqliteClientTag, nodeSqliteClient);
 });
 
 // ../../packages/plugin-opencode/src/index.ts
-import { join as join3 } from "node:path";
-import { FileSystem as FileSystem2 } from "@effect/platform";
-import { Effect as Effect7 } from "effect";
+import { join as join4 } from "node:path";
+import { FileSystem as FileSystem3 } from "@effect/platform";
+import { Effect as Effect8 } from "effect";
 var openCodePlugin;
 var init_src2 = __esm(() => {
   init_src();
@@ -700,24 +806,24 @@ var init_src2 = __esm(() => {
     id: "opencode",
     displayName: "OpenCode",
     getDefaultDataDir: () => null,
-    isDataAvailable: Effect7.gen(function* () {
+    isDataAvailable: Effect8.gen(function* () {
       const config = yield* PluginConfig;
-      const fs = yield* FileSystem2.FileSystem;
-      return yield* fs.exists(join3(config.dataDir, "opencode.db")).pipe(Effect7.catchAll(() => Effect7.succeed(false)));
+      const fs = yield* FileSystem3.FileSystem;
+      return yield* fs.exists(join4(config.dataDir, "opencode.db")).pipe(Effect8.catchAll(() => Effect8.succeed(false)));
     }),
-    discoverProjects: discoverOpenCodeProjects().pipe(Effect7.catchAll((err) => Effect7.fail(new PluginError({
+    discoverProjects: discoverOpenCodeProjects().pipe(Effect8.catchAll((err) => Effect8.fail(new PluginError({
       pluginId: "opencode",
       operation: "discoverProjects",
       message: String(err),
       cause: err
     })))),
-    listSessions: (nativeId) => listOpenCodeSessions(nativeId).pipe(Effect7.catchAll((err) => Effect7.fail(new PluginError({
+    listSessions: (nativeId) => listOpenCodeSessions(nativeId).pipe(Effect8.catchAll((err) => Effect8.fail(new PluginError({
       pluginId: "opencode",
       operation: "listSessions",
       message: String(err),
       cause: err
     })))),
-    loadSession: (nativeId, sessionId) => loadOpenCodeSession(nativeId, sessionId).pipe(Effect7.catchAll((err) => Effect7.fail(new PluginError({
+    loadSession: (nativeId, sessionId) => loadOpenCodeSession(nativeId, sessionId).pipe(Effect8.catchAll((err) => Effect8.fail(new PluginError({
       pluginId: "opencode",
       operation: "loadSession",
       message: String(err),
@@ -745,9 +851,9 @@ var init_platform_node = __esm(() => {
 import { execFile } from "node:child_process";
 
 // ../../packages/server/src/effect/bootstrap.ts
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 import { HttpServer } from "@effect/platform";
-import { Cause, Effect as Effect19, Fiber, Layer as Layer8 } from "effect";
+import { Cause, Effect as Effect20, Fiber, Layer as Layer8 } from "effect";
 
 // ../../packages/server/src/effect/platform-bun.ts
 init_src2();
@@ -759,7 +865,7 @@ var makeBunServerLayer = (options) => Layer5.merge(BunHttpServer.layer(options),
 // ../../packages/server/src/effect/plugin-runtime.ts
 init_src();
 import {
-  Effect as Effect8,
+  Effect as Effect9,
   ManagedRuntime
 } from "effect";
 var pluginRuntime = ManagedRuntime.make(BunPluginLayer);
@@ -767,7 +873,7 @@ function setPluginLayer(layer) {
   pluginRuntime = ManagedRuntime.make(layer);
 }
 function runPluginEffect(effect, config) {
-  const provided = effect.pipe(Effect8.provide(makePluginConfigLayer(config)));
+  const provided = effect.pipe(Effect9.provide(makePluginConfigLayer(config)));
   return pluginRuntime.runPromise(provided);
 }
 function runRegistryEffect(effect) {
@@ -781,7 +887,7 @@ class ServerConfig extends Context3.Tag("@klovi/ServerConfig")() {
 }
 
 // ../../packages/server/src/effect/server-services.ts
-import { Context as Context4, Effect as Effect18, Layer as Layer6 } from "effect";
+import { Context as Context4, Effect as Effect19, Layer as Layer6 } from "effect";
 
 // ../../packages/server/src/services/app-services.ts
 init_src();
@@ -789,12 +895,12 @@ import { access, rm } from "node:fs/promises";
 
 // ../../packages/plugin-claude-code/src/index.ts
 init_src();
-import { Effect as Effect12 } from "effect";
+import { Effect as Effect13 } from "effect";
 
 // ../../packages/plugin-claude-code/src/discovery.ts
 init_src();
-import { join as join5 } from "node:path";
-import { Effect as Effect10 } from "effect";
+import { join as join6 } from "node:path";
+import { Effect as Effect11 } from "effect";
 
 // ../../packages/plugin-claude-code/src/command-message.ts
 var COMMAND_ARGS_REGEX = /<command-args>([\s\S]*?)<\/command-args>/;
@@ -826,17 +932,17 @@ function parseCommandMessage(text) {
 
 // ../../packages/plugin-claude-code/src/shared/discovery-utils.ts
 init_src();
-import { join as join4 } from "node:path";
-import { FileSystem as FileSystem3 } from "@effect/platform";
-import { Effect as Effect9 } from "effect";
+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]\//;
 function readDirEntriesSafe(dir) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect9.catchAll(() => Effect9.succeed([])));
+  return Effect10.gen(function* () {
+    const fs = yield* FileSystem4.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect10.catchAll(() => Effect10.succeed([])));
     const entries = [];
     for (const name of names) {
-      const info = yield* fs.stat(join4(dir, name)).pipe(Effect9.catchAll(() => Effect9.succeed(null)));
+      const info = yield* fs.stat(join5(dir, name)).pipe(Effect10.catchAll(() => Effect10.succeed(null)));
       if (info) {
         entries.push({ name, isDirectory: info.type === "Directory" });
       }
@@ -845,19 +951,19 @@ function readDirEntriesSafe(dir) {
   });
 }
 function listFilesBySuffix(dir, suffix) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect9.catchAll(() => Effect9.succeed([])));
+  return Effect10.gen(function* () {
+    const fs = yield* FileSystem4.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect10.catchAll(() => Effect10.succeed([])));
     return names.filter((name) => name.endsWith(suffix));
   });
 }
 function listFilesWithMtime(dir, suffix) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
+  return Effect10.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(join4(dir, fileName)).pipe(Effect9.catchAll(() => Effect9.succeed(null)));
+      const info = yield* fs.stat(join5(dir, fileName)).pipe(Effect10.catchAll(() => Effect10.succeed(null)));
       if (info?.mtime._tag === "Some") {
         results.push({ fileName, mtime: info.mtime.value.toISOString() });
       }
@@ -867,22 +973,22 @@ function listFilesWithMtime(dir, suffix) {
   });
 }
 function readTextPrefix(filePath, maxBytes) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
+  return Effect10.gen(function* () {
+    const fs = yield* FileSystem4.FileSystem;
     const bytes = yield* fs.readFile(filePath);
     const slice = bytes.subarray(0, maxBytes);
     return new TextDecoder().decode(slice);
   });
 }
 function readFileText(filePath) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
+  return Effect10.gen(function* () {
+    const fs = yield* FileSystem4.FileSystem;
     return yield* fs.readFileString(filePath);
   });
 }
 function fileExists(filePath) {
-  return Effect9.gen(function* () {
-    const fs = yield* FileSystem3.FileSystem;
+  return Effect10.gen(function* () {
+    const fs = yield* FileSystem4.FileSystem;
     return yield* fs.exists(filePath);
   });
 }
@@ -928,11 +1034,11 @@ var CWD_SCAN_BYTES = 64 * 1024;
 var SESSION_META_SCAN_BYTES = 1024 * 1024;
 var BRACKETED_TEXT_REGEX = /^\[.+\]$/;
 function inspectProjectSessions(projectDir, sessionFiles) {
-  return Effect10.gen(function* () {
+  return Effect11.gen(function* () {
     const lastActivity = sessionFiles[0]?.mtime || "";
     let resolvedPath = "";
     for (const sessionFile of sessionFiles) {
-      const filePath = join5(projectDir, sessionFile.fileName);
+      const filePath = join6(projectDir, sessionFile.fileName);
       if (!resolvedPath) {
         resolvedPath = yield* extractCwd(filePath);
       }
@@ -941,15 +1047,15 @@ function inspectProjectSessions(projectDir, sessionFiles) {
   });
 }
 function discoverClaudeProjects() {
-  return Effect10.gen(function* () {
+  return Effect11.gen(function* () {
     const config = yield* PluginConfig;
-    const projectsDir = join5(config.dataDir, "projects");
+    const projectsDir = join6(config.dataDir, "projects");
     const entries = yield* readDirEntriesSafe(projectsDir);
     const projects = [];
     for (const entry of entries) {
       if (!entry.isDirectory)
         continue;
-      const projectDir = join5(projectsDir, entry.name);
+      const projectDir = join6(projectsDir, entry.name);
       const sessionFiles = yield* listFilesWithMtime(projectDir, ".jsonl");
       if (sessionFiles.length === 0)
         continue;
@@ -970,13 +1076,13 @@ function discoverClaudeProjects() {
 }
 var PLAN_PREFIX = "Implement the following plan";
 function listClaudeSessions(nativeId) {
-  return Effect10.gen(function* () {
+  return Effect11.gen(function* () {
     const config = yield* PluginConfig;
-    const projectDir = join5(config.dataDir, "projects", nativeId);
+    const projectDir = join6(config.dataDir, "projects", nativeId);
     const files = yield* listFilesBySuffix(projectDir, ".jsonl");
     const sessions = [];
     for (const file of files) {
-      const filePath = join5(projectDir, file);
+      const filePath = join6(projectDir, file);
       const sessionId = file.replace(".jsonl", "");
       const meta = yield* extractSessionMeta(filePath);
       if (meta)
@@ -1003,8 +1109,8 @@ function classifySessionTypes(sessions) {
   }
 }
 function extractCwd(filePath) {
-  return Effect10.gen(function* () {
-    const text = yield* readTextPrefix(filePath, CWD_SCAN_BYTES).pipe(Effect10.catchAll(() => Effect10.succeed("")));
+  return Effect11.gen(function* () {
+    const text = yield* readTextPrefix(filePath, CWD_SCAN_BYTES).pipe(Effect11.catchAll(() => Effect11.succeed("")));
     if (!text)
       return "";
     let cwd = "";
@@ -1053,8 +1159,8 @@ function processMetaLine(obj, meta) {
   }
 }
 function extractSessionMeta(filePath) {
-  return Effect10.gen(function* () {
-    const text = yield* readTextPrefix(filePath, SESSION_META_SCAN_BYTES).pipe(Effect10.catchAll(() => Effect10.succeed("")));
+  return Effect11.gen(function* () {
+    const text = yield* readTextPrefix(filePath, SESSION_META_SCAN_BYTES).pipe(Effect11.catchAll(() => Effect11.succeed("")));
     if (!text)
       return null;
     const meta = {
@@ -1088,12 +1194,12 @@ function extractSessionMeta(filePath) {
 
 // ../../packages/plugin-claude-code/src/parser.ts
 init_src();
-import { join as join6 } from "node:path";
-import { Effect as Effect11 } from "effect";
+import { join as join7 } from "node:path";
+import { Effect as Effect12 } from "effect";
 function loadClaudeSession(nativeId, sessionId) {
-  return Effect11.gen(function* () {
+  return Effect12.gen(function* () {
     const config = yield* PluginConfig;
-    const filePath = join6(config.dataDir, "projects", nativeId, `${sessionId}.jsonl`);
+    const filePath = join7(config.dataDir, "projects", nativeId, `${sessionId}.jsonl`);
     const { rawLines, parseErrors } = yield* readJsonlLines(filePath);
     const subAgentMap = extractSubAgentMap(rawLines);
     const slug = extractSlug(rawLines);
@@ -1122,10 +1228,10 @@ function loadClaudeSession(nativeId, sessionId) {
   });
 }
 function parseSubAgentSession(sessionId, encodedPath, agentId) {
-  return Effect11.gen(function* () {
+  return Effect12.gen(function* () {
     const config = yield* PluginConfig;
-    const filePath = join6(config.dataDir, "projects", encodedPath, sessionId, "subagents", `agent-${agentId}.jsonl`);
-    const parsed = yield* readJsonlLines(filePath).pipe(Effect11.catchAll(() => Effect11.succeed({ rawLines: [], parseErrors: [] })));
+    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 subAgentMap = extractSubAgentMap(parsed.rawLines);
     const turns = buildTurns(parsed.rawLines, parsed.parseErrors);
     for (const turn of turns) {
@@ -1203,7 +1309,7 @@ function findImplSessionId(slug, sessions, currentSessionId) {
   return match?.sessionId;
 }
 function readJsonlLines(filePath) {
-  return Effect11.gen(function* () {
+  return Effect12.gen(function* () {
     const text = yield* readFileText(filePath);
     const rawLines = [];
     const parseErrors = [];
@@ -1349,7 +1455,7 @@ function buildToolCall2(block, toolResults) {
   return toolCall;
 }
 function processContentBlock(block, current, toolResults) {
-  if (block.type === "thinking" && "thinking" in block) {
+  if (block.type === "thinking" && "thinking" in block && block.thinking.trim()) {
     current.contentBlocks.push({ type: "thinking", block: { text: block.thinking } });
   } else if (block.type === "text" && "text" in block && block.text.trim()) {
     current.contentBlocks.push({ type: "text", text: block.text });
@@ -1484,27 +1590,27 @@ function extractToolResult(tr) {
 }
 
 // ../../packages/plugin-claude-code/src/config.ts
-import { join as join7 } from "node:path";
-var DEFAULT_CLAUDE_CODE_DIR = join7(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".claude");
+import { join as join8 } from "node:path";
+var DEFAULT_CLAUDE_CODE_DIR = join8(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".claude");
 // ../../packages/plugin-claude-code/src/index.ts
 var claudeCodePlugin = {
   id: "claude-code",
   displayName: "Claude Code",
   getDefaultDataDir: () => null,
-  isDataAvailable: Effect12.gen(function* () {
+  isDataAvailable: Effect13.gen(function* () {
     const config = yield* PluginConfig;
-    return yield* fileExists(config.dataDir).pipe(Effect12.catchAll(() => Effect12.succeed(false)));
+    return yield* fileExists(config.dataDir).pipe(Effect13.catchAll(() => Effect13.succeed(false)));
   }),
   discoverProjects: discoverClaudeProjects(),
   listSessions: (nativeId) => listClaudeSessions(nativeId),
-  loadSession: (nativeId, sessionId) => loadClaudeSession(nativeId, sessionId).pipe(Effect12.map((r) => r.session), Effect12.catchAll((err) => Effect12.fail(new PluginError({
+  loadSession: (nativeId, sessionId) => loadClaudeSession(nativeId, sessionId).pipe(Effect13.map((r) => r.session), Effect13.catchAll((err) => Effect13.fail(new PluginError({
     pluginId: "claude-code",
     operation: "loadSession",
     message: String(err),
     cause: err
   })))),
-  loadSessionDetail: (nativeId, sessionId) => Effect12.gen(function* () {
-    const [{ session, slug }, sessions] = yield* Effect12.all([
+  loadSessionDetail: (nativeId, sessionId) => Effect13.gen(function* () {
+    const [{ session, slug }, sessions] = yield* Effect13.all([
       loadClaudeSession(nativeId, sessionId),
       listClaudeSessions(nativeId)
     ]);
@@ -1513,7 +1619,7 @@ var claudeCodePlugin = {
       planSessionId: findPlanSessionId(session.turns, slug, sessions, sessionId),
       implSessionId: findImplSessionId(slug, sessions, sessionId)
     };
-  }).pipe(Effect12.catchAll((err) => Effect12.fail(new PluginError({
+  }).pipe(Effect13.catchAll((err) => Effect13.fail(new PluginError({
     pluginId: "claude-code",
     operation: "loadSessionDetail",
     message: String(err),
@@ -1525,38 +1631,38 @@ var claudeCodePlugin = {
 
 // ../../packages/plugin-codex/src/index.ts
 init_src();
-import { Effect as Effect17 } from "effect";
+import { Effect as Effect18 } from "effect";
 
 // ../../packages/plugin-codex/src/discovery.ts
 init_src();
-import { Effect as Effect15 } from "effect";
+import { Effect as Effect16 } from "effect";
 
 // ../../packages/plugin-codex/src/session-index.ts
 init_src();
-import { join as join8 } from "node:path";
-import { FileSystem as FileSystem5 } from "@effect/platform";
-import { Effect as Effect14 } from "effect";
+import { join as join9 } from "node:path";
+import { FileSystem as FileSystem6 } from "@effect/platform";
+import { Effect as Effect15 } from "effect";
 
 // ../../packages/plugin-codex/src/shared/discovery-utils.ts
-import { FileSystem as FileSystem4 } from "@effect/platform";
-import { Effect as Effect13 } from "effect";
+import { FileSystem as FileSystem5 } from "@effect/platform";
+import { Effect as Effect14 } from "effect";
 function readTextPrefix2(filePath, maxBytes) {
-  return Effect13.gen(function* () {
-    const fs = yield* FileSystem4.FileSystem;
+  return Effect14.gen(function* () {
+    const fs = yield* FileSystem5.FileSystem;
     const bytes = yield* fs.readFile(filePath);
     const slice = bytes.subarray(0, maxBytes);
     return new TextDecoder().decode(slice);
   });
 }
 function readFileText2(filePath) {
-  return Effect13.gen(function* () {
-    const fs = yield* FileSystem4.FileSystem;
+  return Effect14.gen(function* () {
+    const fs = yield* FileSystem5.FileSystem;
     return yield* fs.readFileString(filePath);
   });
 }
 function fileExists2(filePath) {
-  return Effect13.gen(function* () {
-    const fs = yield* FileSystem4.FileSystem;
+  return Effect14.gen(function* () {
+    const fs = yield* FileSystem5.FileSystem;
     return yield* fs.exists(filePath);
   });
 }
@@ -1637,8 +1743,8 @@ function inferModelFromPrefix(prefixText) {
   return model;
 }
 function parseSessionMeta(filePath, fileMtimeEpoch) {
-  return Effect14.gen(function* () {
-    const prefix = yield* readTextPrefix2(filePath, FIRST_LINE_SCAN_BYTES).pipe(Effect14.catchAll(() => Effect14.succeed("")));
+  return Effect15.gen(function* () {
+    const prefix = yield* readTextPrefix2(filePath, FIRST_LINE_SCAN_BYTES).pipe(Effect15.catchAll(() => Effect15.succeed("")));
     if (!prefix)
       return null;
     const firstNewline = prefix.indexOf(`
@@ -1665,12 +1771,12 @@ function parseSessionMeta(filePath, fileMtimeEpoch) {
   });
 }
 function walkJsonlFiles(dir, visit) {
-  return Effect14.gen(function* () {
-    const fs = yield* FileSystem5.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect14.catchAll(() => Effect14.succeed([])));
+  return Effect15.gen(function* () {
+    const fs = yield* FileSystem6.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect15.catchAll(() => Effect15.succeed([])));
     for (const name of names) {
-      const fullPath = join8(dir, name);
-      const info = yield* fs.stat(fullPath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+      const fullPath = join9(dir, name);
+      const info = yield* fs.stat(fullPath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
       if (!info)
         continue;
       if (info.type === "Directory") {
@@ -1684,13 +1790,13 @@ function walkJsonlFiles(dir, visit) {
   });
 }
 function scanCodexSessions() {
-  return Effect14.gen(function* () {
+  return Effect15.gen(function* () {
     const config = yield* PluginConfig;
-    const fs = yield* FileSystem5.FileSystem;
-    const sessionsDir = join8(config.dataDir, "sessions");
+    const fs = yield* FileSystem6.FileSystem;
+    const sessionsDir = join9(config.dataDir, "sessions");
     const sessions = [];
-    yield* walkJsonlFiles(sessionsDir, (filePath, _fileName) => Effect14.gen(function* () {
-      const info = yield* fs.stat(filePath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+    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;
       const meta = yield* parseSessionMeta(filePath, fileMtimeEpoch);
       if (!meta)
@@ -1707,12 +1813,12 @@ function scanCodexSessions() {
   });
 }
 function walkForFile(dir, match) {
-  return Effect14.gen(function* () {
-    const fs = yield* FileSystem5.FileSystem;
-    const names = yield* fs.readDirectory(dir).pipe(Effect14.catchAll(() => Effect14.succeed([])));
+  return Effect15.gen(function* () {
+    const fs = yield* FileSystem6.FileSystem;
+    const names = yield* fs.readDirectory(dir).pipe(Effect15.catchAll(() => Effect15.succeed([])));
     for (const name of names) {
-      const fullPath = join8(dir, name);
-      const info = yield* fs.stat(fullPath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+      const fullPath = join9(dir, name);
+      const info = yield* fs.stat(fullPath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
       if (!info)
         continue;
       if (info.type !== "Directory" && match(name))
@@ -1727,16 +1833,16 @@ function walkForFile(dir, match) {
   });
 }
 function findCodexSessionFileById(sessionId) {
-  return Effect14.gen(function* () {
+  return Effect15.gen(function* () {
     const config = yield* PluginConfig;
-    const fs = yield* FileSystem5.FileSystem;
-    const sessionsDir = join8(config.dataDir, "sessions");
+    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)
       return null;
-    const info = yield* fs.stat(filePath).pipe(Effect14.catchAll(() => Effect14.succeed(null)));
+    const info = yield* fs.stat(filePath).pipe(Effect15.catchAll(() => Effect15.succeed(null)));
     return info?.type === "File" ? filePath : null;
   });
 }
@@ -1744,7 +1850,7 @@ function findCodexSessionFileById(sessionId) {
 // ../../packages/plugin-codex/src/discovery.ts
 var SESSION_TITLE_SCAN_BYTES = 256 * 1024;
 function discoverCodexProjects() {
-  return Effect15.gen(function* () {
+  return Effect16.gen(function* () {
     const sessions = yield* scanCodexSessions();
     const byCwd = new Map;
     for (const session of sessions) {
@@ -1795,17 +1901,17 @@ function extractFirstUserMessage(text) {
   return message;
 }
 function listCodexSessions(nativeId) {
-  return Effect15.gen(function* () {
+  return Effect16.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 || "";
       if (!firstMessage) {
-        const prefix = yield* readTextPrefix2(s.filePath, SESSION_TITLE_SCAN_BYTES).pipe(Effect15.catchAll(() => Effect15.succeed("")));
+        const prefix = yield* readTextPrefix2(s.filePath, SESSION_TITLE_SCAN_BYTES).pipe(Effect16.catchAll(() => Effect16.succeed("")));
         firstMessage = extractFirstUserMessage(prefix) || "";
         if (!firstMessage) {
-          const fullText = yield* readFileText2(s.filePath).pipe(Effect15.catchAll(() => Effect15.succeed("")));
+          const fullText = yield* readFileText2(s.filePath).pipe(Effect16.catchAll(() => Effect16.succeed("")));
           firstMessage = extractFirstUserMessage(fullText) || "";
         }
         firstMessage ||= "Codex session";
@@ -1828,7 +1934,7 @@ function listCodexSessions(nativeId) {
 
 // ../../packages/plugin-codex/src/parser.ts
 init_src();
-import { Effect as Effect16 } from "effect";
+import { Effect as Effect17 } from "effect";
 function isKnownModel2(model) {
   return typeof model === "string" && model.length > 0 && model !== "unknown";
 }
@@ -2139,7 +2245,7 @@ function buildCodexTurns(events, model, timestamp) {
   return state.turns;
 }
 function loadCodexSession(_nativeId, sessionId) {
-  return Effect16.gen(function* () {
+  return Effect17.gen(function* () {
     const filePath = yield* findCodexSessionFileById(sessionId);
     if (!filePath) {
       return {
@@ -2186,20 +2292,20 @@ function loadCodexSession(_nativeId, sessionId) {
 }
 
 // ../../packages/plugin-codex/src/config.ts
-import { join as join9 } from "node:path";
-var DEFAULT_CODEX_CLI_DIR = join9(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".codex");
+import { join as join10 } from "node:path";
+var DEFAULT_CODEX_CLI_DIR = join10(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".codex");
 // ../../packages/plugin-codex/src/index.ts
 var codexCliPlugin = {
   id: "codex-cli",
   displayName: "Codex",
   getDefaultDataDir: () => null,
-  isDataAvailable: Effect17.gen(function* () {
+  isDataAvailable: Effect18.gen(function* () {
     const config = yield* PluginConfig;
-    return yield* fileExists2(config.dataDir).pipe(Effect17.catchAll(() => Effect17.succeed(false)));
+    return yield* fileExists2(config.dataDir).pipe(Effect18.catchAll(() => Effect18.succeed(false)));
   }),
   discoverProjects: discoverCodexProjects(),
   listSessions: (nativeId) => listCodexSessions(nativeId),
-  loadSession: (nativeId, sessionId) => loadCodexSession(nativeId, sessionId).pipe(Effect17.catchAll((err) => Effect17.fail(new PluginError({
+  loadSession: (nativeId, sessionId) => loadCodexSession(nativeId, sessionId).pipe(Effect18.catchAll((err) => Effect18.fail(new PluginError({
     pluginId: "codex-cli",
     operation: "loadSession",
     message: String(err),
@@ -2229,7 +2335,7 @@ var BUILTIN_PLUGIN_ID_SET = new Set(BUILTIN_PLUGIN_DESCRIPTORS.map((descriptor)
 // ../../packages/server/src/services/settings.ts
 init_src();
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
-import { dirname, join as join10 } from "node:path";
+import { dirname, join as join11 } from "node:path";
 function createDefaultPluginStates() {
   return Object.fromEntries(BUILTIN_KLOVI_PLUGIN_IDS.map((pluginId) => [pluginId, { enabled: true, dataDir: null }]));
 }
@@ -2262,7 +2368,7 @@ async function loadSettings(path) {
 async function saveSettings(path, settings) {
   const dir = dirname(path);
   await mkdir(dir, { recursive: true });
-  const tmpPath = join10(dir, `.settings-${Date.now()}.tmp`);
+  const tmpPath = join11(dir, `.settings-${Date.now()}.tmp`);
   await writeFile(tmpPath, JSON.stringify(settings, null, 2));
   await rename(tmpPath, path);
 }
@@ -2598,12 +2704,12 @@ async function createRegistry(settings) {
 // ../../packages/server/src/effect/server-services.ts
 class KloviServices extends Context4.Tag("@klovi/KloviServices")() {
 }
-var KloviServicesLive = Layer6.effect(KloviServices, Effect18.gen(function* () {
+var KloviServicesLive = Layer6.effect(KloviServices, Effect19.gen(function* () {
   const config = yield* ServerConfig;
   const { settingsPath } = config;
   const version = config.version === "0.0.0" ? "dev" : config.version;
-  const settings = yield* Effect18.promise(() => loadSettings(settingsPath));
-  let registry = yield* Effect18.promise(() => createRegistry(settings));
+  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);
@@ -2641,7 +2747,7 @@ var KloviServicesLive = Layer6.effect(KloviServices, Effect18.gen(function* () {
 // ../../packages/server/src/effect/bootstrap.ts
 function getDefaultSettingsPath() {
   const home = process.env["HOME"] ?? process.env["USERPROFILE"] ?? "";
-  return join11(home, ".klovi", "settings.json");
+  return join12(home, ".klovi", "settings.json");
 }
 function detectRuntime(requested = "auto") {
   if (requested !== "auto")
@@ -2677,26 +2783,26 @@ async function bootstrapServer(options, makeServe) {
     resolveAddress = resolve;
     rejectAddress = reject;
   });
-  const addressCapture = Layer8.effectDiscard(HttpServer.addressWith((address) => Effect19.sync(() => {
+  const addressCapture = Layer8.effectDiscard(HttpServer.addressWith((address) => Effect20.sync(() => {
     const addr = address;
     resolveAddress(`http://${addr.hostname}:${addr.port}`);
   })));
   const serveLayer = makeServe();
   const fullLayer = Layer8.merge(serveLayer, addressCapture).pipe(Layer8.provide(servicesLayer), Layer8.provide(configLayer), Layer8.provide(platformLayer));
-  const fiber = Effect19.runFork(Layer8.launch(fullLayer));
-  Effect19.runFork(Fiber.join(fiber).pipe(Effect19.catchAllCause((cause) => Effect19.sync(() => rejectAddress(Cause.squash(cause))))));
+  const fiber = Effect20.runFork(Layer8.launch(fullLayer));
+  Effect20.runFork(Fiber.join(fiber).pipe(Effect20.catchAllCause((cause) => Effect20.sync(() => rejectAddress(Cause.squash(cause))))));
   const url = await addressPromise;
   return {
     url,
     stop() {
-      Effect19.runFork(Fiber.interrupt(fiber));
+      Effect20.runFork(Fiber.interrupt(fiber));
     }
   };
 }
 
 // ../../packages/server/src/effect/http-app.ts
 import { HttpRouter, HttpServer as HttpServer2, HttpServerRequest, HttpServerResponse } from "@effect/platform";
-import { Effect as Effect20 } from "effect";
+import { Effect as Effect21 } from "effect";
 
 // ../../packages/server/src/rpc-error.ts
 class RPCError extends Error {
@@ -2712,7 +2818,7 @@ var NON_RPC_KEYS = new Set(["getRegistry", "settingsPath"]);
 function isRPCMethod(method, services) {
   return Object.hasOwn(services, method) && !NON_RPC_KEYS.has(method);
 }
-var rpcHandler = Effect20.gen(function* () {
+var rpcHandler = Effect21.gen(function* () {
   const services = yield* KloviServices;
   const routeParams = yield* HttpRouter.params;
   const req = yield* HttpServerRequest.HttpServerRequest;
@@ -2721,7 +2827,7 @@ var rpcHandler = Effect20.gen(function* () {
     return HttpServerResponse.unsafeJson({ error: "Method name required" }, { status: 400 });
   }
   if (!isRPCMethod(method, services)) {
-    return yield* Effect20.fail(new RPCError(404, `Unknown method: ${method}`));
+    return yield* Effect21.fail(new RPCError(404, `Unknown method: ${method}`));
   }
   let params = {};
   const bodyText = yield* req.text;
@@ -2733,44 +2839,44 @@ var rpcHandler = Effect20.gen(function* () {
     }
   }
   const handler = services[method];
-  return yield* Effect20.tryPromise({
+  return yield* Effect21.tryPromise({
     try: async () => {
       const result = await Promise.resolve(handler(params));
       return HttpServerResponse.unsafeJson(result);
     },
     catch: (err) => err
   });
-}).pipe(Effect20.catchAll((err) => {
+}).pipe(Effect21.catchAll((err) => {
   if (err instanceof RPCError) {
-    return Effect20.succeed(HttpServerResponse.unsafeJson({ error: err.message }, { status: err.status }));
+    return Effect21.succeed(HttpServerResponse.unsafeJson({ error: err.message }, { status: err.status }));
   }
   const message = err instanceof Error ? err.message : "Internal server error";
-  return Effect20.succeed(HttpServerResponse.unsafeJson({ error: message }, { status: 500 }));
+  return Effect21.succeed(HttpServerResponse.unsafeJson({ error: message }, { status: 500 }));
 }));
-var emptyMethodHandler = Effect20.succeed(HttpServerResponse.unsafeJson({ error: "Method name required" }, { status: 400 }));
+var emptyMethodHandler = Effect21.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 = Effect20.succeed(HttpServerResponse.unsafeJson({ error: "Not found" }, { status: 404 }));
-var makeHttpApp = () => makeRpcRouter().pipe(Effect20.catchTag("RouteNotFound", () => notFoundHandler));
+var notFoundHandler = Effect21.succeed(HttpServerResponse.unsafeJson({ error: "Not found" }, { status: 404 }));
+var makeHttpApp = () => makeRpcRouter().pipe(Effect21.catchTag("RouteNotFound", () => notFoundHandler));
 var makeServeLayer = () => makeHttpApp().pipe(HttpServer2.serve());
 
 // src/http-app.ts
 import { HttpServer as HttpServer3 } from "@effect/platform";
-import { Effect as Effect22 } from "effect";
+import { Effect as Effect23 } from "effect";
 
 // src/static-handler.ts
 import { HttpServerRequest as HttpServerRequest2, HttpServerResponse as HttpServerResponse2 } from "@effect/platform";
-import { Effect as Effect21 } from "effect";
-var makeStaticHandler = (staticDir) => Effect21.gen(function* () {
+import { Effect as Effect22 } from "effect";
+var makeStaticHandler = (staticDir) => Effect22.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(Effect21.orElse(() => HttpServerResponse2.file(`${staticDir}/index.html`)), Effect21.orElse(() => Effect21.succeed(HttpServerResponse2.unsafeJson({ error: "Not found" }, { status: 404 }))));
+  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 }))));
 });
 
 // src/http-app.ts
 var makePackageHttpApp = (staticDir) => {
   const router = makeRpcRouter();
-  return router.pipe(Effect22.catchTag("RouteNotFound", () => makeStaticHandler(staticDir)));
+  return router.pipe(Effect23.catchTag("RouteNotFound", () => makeStaticHandler(staticDir)));
 };
 var makePackageServeLayer = (staticDir) => {
   if (!staticDir) {