@costrict/csc 4.1.12 → 4.2.0

package/dist/cli.js

@@ -669,6 +669,12 @@ var init_protectedNamespace = () => {};
 // src/utils/envUtils.ts
 import { homedir } from "os";
 import { join } from "path";
+function getLegacyConfigHomeDir() {
+  if (process.env.COSTRICT_CONFIG_DIR || process.env.CLAUDE_CONFIG_DIR) {
+    return;
+  }
+  return join(homedir(), LEGACY_CONFIG_DIR_NAME).normalize("NFC");
+}
 function getTeamsDir() {
   return join(getCostrictConfigHomeDir(), "teams");
 }
@@ -82320,8 +82326,8 @@ var init_credentials = __esm(() => {
 import { createRequire } from "module";
 function getVersion() {
   try {
-    if (typeof MACRO !== "undefined" && "4.1.12")
-      return "4.1.12";
+    if (typeof MACRO !== "undefined" && "4.2.0")
+      return "4.2.0";
   } catch {}
   try {
     const require2 = createRequire(import.meta.url);
@@ -91529,6 +91535,16 @@ function sanitizePath2(name) {
 function getProjectsDir() {
   return join9(getClaudeConfigHomeDir(), "projects");
 }
+function getAllProjectsDirs() {
+  const primary = getProjectsDir();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join9(legacyHome, "projects");
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 function getProjectDir2(projectDir) {
   return join9(getProjectsDir(), sanitizePath2(projectDir));
 }
@@ -91550,14 +91566,16 @@ async function findProjectDir(projectPath) {
       return;
     }
     const prefix = sanitized.slice(0, MAX_SANITIZED_LENGTH2);
-    const projectsDir = getProjectsDir();
-    try {
-      const dirents = await readdir2(projectsDir, { withFileTypes: true });
-      const match = dirents.find((d) => d.isDirectory() && d.name.startsWith(prefix + "-"));
-      return match ? join9(projectsDir, match.name) : undefined;
-    } catch {
-      return;
+    const allDirs = getAllProjectsDirs();
+    for (const projectsDir of allDirs) {
+      try {
+        const dirents = await readdir2(projectsDir, { withFileTypes: true });
+        const match = dirents.find((d) => d.isDirectory() && d.name.startsWith(prefix + "-"));
+        if (match)
+          return join9(projectsDir, match.name);
+      } catch {}
     }
+    return;
   }
 }
 function compactBoundaryMarker() {
@@ -183770,7 +183788,7 @@ async function fetchCoStrictModels(baseUrl, accessToken) {
       headers: {
         Authorization: `Bearer ${accessToken}`,
         Accept: "application/json",
-        "User-Agent": `csc/${"4.1.12"}`
+        "User-Agent": `csc/${"4.2.0"}`
       },
       signal: controller.signal
     });
@@ -187356,7 +187374,7 @@ var init_auth7 = __esm(() => {
 
 // src/utils/userAgent.ts
 function getClaudeCodeUserAgent() {
-  return `costrict/${"4.1.12"}`;
+  return `costrict/${"4.2.0"}`;
 }
 
 // src/utils/workloadContext.ts
@@ -187378,7 +187396,7 @@ function getUserAgent() {
   const clientApp = process.env.CLAUDE_AGENT_SDK_CLIENT_APP ? `, client-app/${process.env.CLAUDE_AGENT_SDK_CLIENT_APP}` : "";
   const workload = getWorkload();
   const workloadSuffix = workload ? `, workload/${workload}` : "";
-  return `csc/${"4.1.12"}`;
+  return `csc/${"4.2.0"}`;
 }
 function getMCPUserAgent() {
   const parts = [];
@@ -187392,7 +187410,7 @@ function getMCPUserAgent() {
     parts.push(`client-app/${process.env.CLAUDE_AGENT_SDK_CLIENT_APP}`);
   }
   const suffix = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-  return `csc/${"4.1.12"}${suffix}`;
+  return `csc/${"4.2.0"}${suffix}`;
 }
 function getWebFetchUserAgent() {
   return `Claude-User (${getClaudeCodeUserAgent()}; +https://support.anthropic.com/)`;
@@ -187512,7 +187530,7 @@ var init_user = __esm(() => {
       deviceId,
       sessionId: getSessionId(),
       email: getEmail(),
-      appVersion: "4.1.12",
+      appVersion: "4.2.0",
       platform: getHostPlatformForAnalytics(),
       organizationUuid,
       accountUuid,
@@ -196789,7 +196807,7 @@ var init_metadata = __esm(() => {
   COMPOUND_OPERATOR_REGEX = /\s*(?:&&|\|\||[;|])\s*/;
   WHITESPACE_REGEX = /\s+/;
   getVersionBase = memoize_default(() => {
-    const match = "4.1.12".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
+    const match = "4.2.0".match(/^\d+\.\d+\.\d+(?:-[a-z]+)?/);
     return match ? match[0] : undefined;
   });
   buildEnvContext = memoize_default(async () => {
@@ -196829,9 +196847,9 @@ var init_metadata = __esm(() => {
       isGithubAction: isEnvTruthy(process.env.GITHUB_ACTIONS),
       isClaudeCodeAction: isEnvTruthy(process.env.CLAUDE_CODE_ACTION),
       isClaudeAiAuth: isClaudeAISubscriber(),
-      version: "4.1.12",
+      version: "4.2.0",
       versionBase: getVersionBase(),
-      buildTime: "2026-06-08T13:08:39.119Z",
+      buildTime: "2026-06-09T13:06:56.679Z",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -197502,7 +197520,7 @@ function initialize1PEventLogging() {
   const platform6 = getPlatform();
   const attributes = {
     [import_semantic_conventions4.ATTR_SERVICE_NAME]: "claude-code",
-    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "4.1.12"
+    [import_semantic_conventions4.ATTR_SERVICE_VERSION]: "4.2.0"
   };
   if (platform6 === "wsl") {
     const wslVersion = getWslVersion();
@@ -197529,7 +197547,7 @@ function initialize1PEventLogging() {
       })
     ]
   });
-  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.anthropic.claude_code.events", "4.1.12");
+  firstPartyEventLogger = firstPartyEventLoggerProvider.getLogger("com.anthropic.claude_code.events", "4.2.0");
 }
 async function reinitialize1PEventLoggingIfConfigChanged() {
   if (!is1PEventLoggingEnabled() || !firstPartyEventLoggerProvider) {
@@ -198276,6 +198294,18 @@ function getMemoryBaseDir() {
   }
   return getClaudeConfigHomeDir();
 }
+function getAllMemoryBaseDirs() {
+  if (getCostrictEnv("REMOTE_MEMORY_DIR")) {
+    return [getMemoryBaseDir()];
+  }
+  const primary = getMemoryBaseDir();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  if (primary === legacyHome)
+    return [primary];
+  return [primary, legacyHome];
+}
 function validateMemoryPath(raw, expandTilde) {
   if (!raw) {
     return;
@@ -198308,6 +198338,13 @@ function hasAutoMemPathOverride() {
 function getAutoMemBase() {
   return findCanonicalGitRoot(getProjectRoot()) ?? getProjectRoot();
 }
+function getAllAutoMemPaths() {
+  const override = getAutoMemPathOverride() ?? getAutoMemPathSetting();
+  if (override)
+    return [getAutoMemPath()];
+  const primary = getAutoMemPath();
+  return getAllMemoryBaseDirs().map((base2) => join26(base2, "projects", sanitizePath2(getAutoMemBase()), AUTO_MEM_DIRNAME) + sep4).filter((p2) => p2 === primary || p2 !== primary);
+}
 function getAutoMemEntrypoint() {
   return join26(getAutoMemPath(), AUTO_MEM_ENTRYPOINT_NAME);
 }
@@ -198967,14 +199004,24 @@ function getConfigBackupDir() {
 function findMostRecentBackup(file2) {
   const fs12 = getFsImplementation();
   const fileBase = basename4(file2);
-  const backupDir = getConfigBackupDir();
-  try {
-    const backups = fs12.readdirStringSync(backupDir).filter((f4) => f4.startsWith(`${fileBase}.backup.`)).sort();
-    const mostRecent = backups.at(-1);
-    if (mostRecent) {
-      return join27(backupDir, mostRecent);
+  const primaryBackupDir = getConfigBackupDir();
+  const backupDirs = [primaryBackupDir];
+  const legacyHome = getLegacyConfigHomeDir();
+  if (legacyHome) {
+    const legacyBackupDir = join27(legacyHome, "backups");
+    if (legacyBackupDir !== primaryBackupDir) {
+      backupDirs.push(legacyBackupDir);
     }
-  } catch {}
+  }
+  for (const backupDir of backupDirs) {
+    try {
+      const backups = fs12.readdirStringSync(backupDir).filter((f4) => f4.startsWith(`${fileBase}.backup.`)).sort();
+      const mostRecent = backups.at(-1);
+      if (mostRecent) {
+        return join27(backupDir, mostRecent);
+      }
+    } catch {}
+  }
   const fileDir = dirname13(file2);
   try {
     const backups = fs12.readdirStringSync(fileDir).filter((f4) => f4.startsWith(`${fileBase}.backup.`)).sort();
@@ -199222,7 +199269,7 @@ function getMemoryPath(memoryType) {
   const cwd2 = getOriginalCwd();
   switch (memoryType) {
     case "User":
-      return join27(getClaudeConfigHomeDir(), "CLAUDE.md");
+      return join27(getClaudeConfigHomeDir(), PRIMARY_INSTRUCTION_FILE);
     case "Local":
       return join27(cwd2, "CLAUDE.local.md");
     case "Project":
@@ -199258,6 +199305,7 @@ var init_config4 = __esm(() => {
   init_diagLogs();
   init_env();
   init_envUtils();
+  init_branding();
   init_errors();
   init_file();
   init_fsOperations();
@@ -220643,6 +220691,20 @@ function getPluginsDirectory() {
   }
   return join36(getClaudeConfigHomeDir(), getPluginsDirectoryName());
 }
+function getAllPluginsDirs() {
+  if (process.env.CLAUDE_CODE_PLUGIN_CACHE_DIR) {
+    return [getPluginsDirectory()];
+  }
+  const dirName = getPluginsDirectoryName();
+  const primary = join36(getClaudeConfigHomeDir(), dirName);
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join36(legacyHome, dirName);
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 function getPluginSeedDirs() {
   const raw = process.env.CLAUDE_CODE_PLUGIN_SEED_DIR;
   if (!raw)
@@ -259189,6 +259251,11 @@ var init_costrictmd = __esm(() => {
     if (isSettingSourceEnabled("userSettings")) {
       const userClaudeMd = getMemoryPath("User");
       result.push(...await processMemoryFile(userClaudeMd, "User", processedPaths, true));
+      const legacyConfigHome = getLegacyConfigHomeDir();
+      if (legacyConfigHome) {
+        const legacyUserClaudeMd = join48(legacyConfigHome, LEGACY_INSTRUCTION_FILE);
+        result.push(...await processMemoryFile(legacyUserClaudeMd, "User", processedPaths, true));
+      }
       const userClaudeRulesDir = getUserClaudeRulesDir();
       result.push(...await processMdRules({
         rulesDir: userClaudeRulesDir,
@@ -259197,6 +259264,16 @@ var init_costrictmd = __esm(() => {
         includeExternal: true,
         conditionalRule: false
       }));
+      if (legacyConfigHome) {
+        const legacyUserRulesDir = join48(legacyConfigHome, "rules");
+        result.push(...await processMdRules({
+          rulesDir: legacyUserRulesDir,
+          type: "User",
+          processedPaths,
+          includeExternal: true,
+          conditionalRule: false
+        }));
+      }
     }
     const dirs = [];
     const originalCwd = getOriginalCwd();
@@ -362878,7 +362955,7 @@ function getTelemetryAttributes() {
     attributes["session.id"] = sessionId;
   }
   if (shouldIncludeAttribute("OTEL_METRICS_INCLUDE_VERSION")) {
-    attributes["app.version"] = "4.1.12";
+    attributes["app.version"] = "4.2.0";
   }
   const oauthAccount = getOauthAccountInfo();
   if (oauthAccount) {
@@ -395346,7 +395423,7 @@ function initLangfuse() {
       flushInterval: parseInt(process.env.LANGFUSE_FLUSH_INTERVAL ?? "10", 10),
       mask: maskFn,
       environment: process.env.LANGFUSE_TRACING_ENVIRONMENT ?? "development",
-      release: "4.1.12",
+      release: "4.2.0",
       exportMode: process.env.LANGFUSE_EXPORT_MODE ?? "batched",
       timeout: parseInt(process.env.LANGFUSE_TIMEOUT ?? "5", 10)
     });
@@ -432287,7 +432364,7 @@ function initSentry() {
   }
   init3({
     dsn,
-    release: typeof MACRO !== "undefined" ? "4.1.12" : undefined,
+    release: typeof MACRO !== "undefined" ? "4.2.0" : undefined,
     environment: typeof BUILD_ENV !== "undefined" ? BUILD_ENV : "production",
     maxBreadcrumbs: 20,
     sampleRate: 1,
@@ -459783,7 +459860,7 @@ async function initializeBetaTracing(resource) {
   });
   import_api_logs5.logs.setGlobalLoggerProvider(loggerProvider);
   setLoggerProvider(loggerProvider);
-  const eventLogger = import_api_logs5.logs.getLogger("com.anthropic.claude_code.events", "4.1.12");
+  const eventLogger = import_api_logs5.logs.getLogger("com.anthropic.claude_code.events", "4.2.0");
   setEventLogger(eventLogger);
   process.on("beforeExit", async () => {
     await loggerProvider?.forceFlush();
@@ -459823,7 +459900,7 @@ async function initializeTelemetry() {
   const platform7 = getPlatform();
   const baseAttributes = {
     [import_semantic_conventions16.ATTR_SERVICE_NAME]: "claude-code",
-    [import_semantic_conventions16.ATTR_SERVICE_VERSION]: "4.1.12"
+    [import_semantic_conventions16.ATTR_SERVICE_VERSION]: "4.2.0"
   };
   if (platform7 === "wsl") {
     const wslVersion = getWslVersion();
@@ -459868,7 +459945,7 @@ async function initializeTelemetry() {
       } catch {}
     };
     registerCleanup(shutdownTelemetry2);
-    return meterProvider2.getMeter("com.anthropic.claude_code", "4.1.12");
+    return meterProvider2.getMeter("com.anthropic.claude_code", "4.2.0");
   }
   const meterProvider = new MeterProvider({
     resource,
@@ -459888,7 +459965,7 @@ async function initializeTelemetry() {
       });
       import_api_logs5.logs.setGlobalLoggerProvider(loggerProvider);
       setLoggerProvider(loggerProvider);
-      const eventLogger = import_api_logs5.logs.getLogger("com.anthropic.claude_code.events", "4.1.12");
+      const eventLogger = import_api_logs5.logs.getLogger("com.anthropic.claude_code.events", "4.2.0");
       setEventLogger(eventLogger);
       logForDebugging("[3P telemetry] Event logger set successfully");
       process.on("beforeExit", async () => {
@@ -459950,7 +460027,7 @@ Current timeout: ${timeoutMs}ms
     }
   };
   registerCleanup(shutdownTelemetry);
-  return meterProvider.getMeter("com.anthropic.claude_code", "4.1.12");
+  return meterProvider.getMeter("com.anthropic.claude_code", "4.2.0");
 }
 async function flushTelemetry() {
   const meterProvider = getMeterProvider();
@@ -461007,7 +461084,7 @@ async function installGlobalPackage(specificVersion) {
     logError3(new AutoUpdaterError("Another process is currently installing an update"));
     logEvent("tengu_auto_updater_lock_contention", {
       pid: process.pid,
-      currentVersion: "4.1.12"
+      currentVersion: "4.2.0"
     });
     return { status: "in_progress" };
   }
@@ -461016,7 +461093,7 @@ async function installGlobalPackage(specificVersion) {
     if (!env4.isRunningWithBun() && env4.isNpmFromWindowsPath()) {
       logError3(new Error("Windows NPM detected in WSL environment"));
       logEvent("tengu_auto_updater_windows_npm_in_wsl", {
-        currentVersion: "4.1.12"
+        currentVersion: "4.2.0"
       });
       return {
         status: "install_failed",
@@ -461562,7 +461639,7 @@ function detectLinuxGlobPatternWarnings() {
 }
 async function getDoctorDiagnostic() {
   const installationType = await getCurrentInstallationType();
-  const version5 = typeof MACRO !== "undefined" ? "4.1.12" : "unknown";
+  const version5 = typeof MACRO !== "undefined" ? "4.2.0" : "unknown";
   const installationPath = await getInstallationPath();
   const invokedBinary = getInvokedBinary();
   const multipleInstallations = await detectMultipleInstallations();
@@ -465149,7 +465226,7 @@ var init_validate3 = __esm(() => {
 });
 
 // src/keybindings/loadUserBindings.ts
-import { readFileSync as readFileSync21 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync21 } from "fs";
 import { readFile as readFile19, stat as stat17 } from "fs/promises";
 import { dirname as dirname31, join as join63 } from "path";
 function isKeybindingCustomizationEnabled() {
@@ -465184,7 +465261,22 @@ async function loadKeybindings() {
   if (!isKeybindingCustomizationEnabled()) {
     return { bindings: defaultBindings, warnings: [] };
   }
-  const userPath = getKeybindingsPath();
+  const primaryPath = getKeybindingsPath();
+  let userPath = primaryPath;
+  try {
+    await stat17(primaryPath);
+  } catch {
+    const legacyHome = getLegacyConfigHomeDir();
+    if (legacyHome) {
+      const legacyPath = join63(legacyHome, "keybindings.json");
+      if (legacyPath !== primaryPath) {
+        try {
+          await stat17(legacyPath);
+          userPath = legacyPath;
+        } catch {}
+      }
+    }
+  }
   try {
     const content = await readFile19(userPath, "utf-8");
     const parsed = jsonParse(content);
@@ -465270,7 +465362,17 @@ function loadKeybindingsSyncWithWarnings() {
     cachedWarnings = [];
     return { bindings: cachedBindings, warnings: cachedWarnings };
   }
-  const userPath = getKeybindingsPath();
+  const primaryPath = getKeybindingsPath();
+  let userPath = primaryPath;
+  if (!existsSync14(primaryPath)) {
+    const legacyHome = getLegacyConfigHomeDir();
+    if (legacyHome) {
+      const legacyPath = join63(legacyHome, "keybindings.json");
+      if (legacyPath !== primaryPath && existsSync14(legacyPath)) {
+        userPath = legacyPath;
+      }
+    }
+  }
   try {
     const content = readFileSync21(userPath, "utf-8");
     const parsed = jsonParse(content);
@@ -499635,7 +499737,7 @@ async function setupSdkMcpClients(sdkMcpConfigs, sendMcpMessage) {
     const client8 = new Client3({
       name: "claude-code",
       title: "CoStrict",
-      version: "4.1.12",
+      version: "4.2.0",
       description: "CoStrict agentic coding tool",
       websiteUrl: PRODUCT_URL
     }, {
@@ -500005,7 +500107,7 @@ var init_client16 = __esm(() => {
       const client8 = new Client3({
         name: "claude-code",
         title: "CoStrict",
-        version: "4.1.12",
+        version: "4.2.0",
         description: "CoStrict agentic coding tool",
         websiteUrl: PRODUCT_URL
       }, {
@@ -501373,7 +501475,7 @@ function getInstallationEnv() {
   return;
 }
 function getClaudeCodeVersion() {
-  return "4.1.12";
+  return "4.2.0";
 }
 async function getInstalledVSCodeExtensionVersion(command4) {
   const { stdout } = await execFileNoThrow2(command4, ["--list-extensions", "--show-versions"], {
@@ -502737,8 +502839,8 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
     const maxVersion = await getMaxVersion();
     if (maxVersion && gt(version6, maxVersion)) {
       logForDebugging(`Native installer: maxVersion ${maxVersion} is set, capping update from ${version6} to ${maxVersion}`);
-      if (gte2("4.1.12", maxVersion)) {
-        logForDebugging(`Native installer: current version ${"4.1.12"} is already at or above maxVersion ${maxVersion}, skipping update`);
+      if (gte2("4.2.0", maxVersion)) {
+        logForDebugging(`Native installer: current version ${"4.2.0"} is already at or above maxVersion ${maxVersion}, skipping update`);
         logEvent("tengu_native_update_skipped_max_version", {
           latency_ms: Date.now() - startTime2,
           max_version: maxVersion,
@@ -502749,7 +502851,7 @@ async function updateLatest(channelOrVersion, forceReinstall = false) {
       version6 = maxVersion;
     }
   }
-  if (!forceReinstall && version6 === "4.1.12" && await versionIsAvailable(version6) && await isPossibleClaudeBinary(executablePath)) {
+  if (!forceReinstall && version6 === "4.2.0" && await versionIsAvailable(version6) && await isPossibleClaudeBinary(executablePath)) {
     logForDebugging(`Found ${version6} at ${executablePath}, skipping install`);
     logEvent("tengu_native_update_complete", {
       latency_ms: Date.now() - startTime2,
@@ -538269,7 +538371,7 @@ async function applySnapshot(state3, targetSnapshot) {
   return filesChanged;
 }
 async function checkOriginFileChanged(originalFile, backupFileName, originalStatsHint) {
-  const backupPath = resolveBackupPath(backupFileName);
+  const backupPath = await resolveBackupPathForRead(backupFileName);
   let originalStats = originalStatsHint ?? null;
   if (!originalStats) {
     try {
@@ -538318,7 +538420,7 @@ async function computeDiffStatsForFile(originalFile, backupFileName) {
   let insertions = 0;
   let deletions = 0;
   try {
-    const backupPath = backupFileName ? resolveBackupPath(backupFileName) : undefined;
+    const backupPath = backupFileName ? await resolveBackupPathForRead(backupFileName) : undefined;
     const [originalContent, backupContent] = await Promise.all([
       readFileAsyncOrNull(originalFile),
       backupPath ? readFileAsyncOrNull(backupPath) : null
@@ -538357,6 +538459,25 @@ function resolveBackupPath(backupFileName, sessionId) {
   const configDir = getClaudeConfigHomeDir();
   return join93(configDir, "file-history", sessionId || getSessionId(), backupFileName);
 }
+async function resolveBackupPathForRead(backupFileName, sessionId) {
+  const sid = sessionId || getSessionId();
+  const primary = join93(getClaudeConfigHomeDir(), "file-history", sid, backupFileName);
+  try {
+    await stat22(primary);
+    return primary;
+  } catch {}
+  const legacyHome = getLegacyConfigHomeDir();
+  if (legacyHome) {
+    const legacy = join93(legacyHome, "file-history", sid, backupFileName);
+    if (legacy !== primary) {
+      try {
+        await stat22(legacy);
+        return legacy;
+      } catch {}
+    }
+  }
+  return primary;
+}
 async function createBackup(filePath, version6) {
   if (filePath === null) {
     return { backupFileName: null, version: version6, backupTime: new Date };
@@ -538392,7 +538513,7 @@ async function createBackup(filePath, version6) {
   };
 }
 async function restoreBackup(filePath, backupFileName) {
-  const backupPath = resolveBackupPath(backupFileName);
+  const backupPath = await resolveBackupPathForRead(backupFileName);
   let backupStats;
   try {
     backupStats = await stat22(backupPath);
@@ -538489,7 +538610,7 @@ async function copyFileHistoryForResume(log5) {
     await Promise.allSettled(fileHistorySnapshots.map(async (snapshot2) => {
       const backupEntries = Object.values(snapshot2.trackedFileBackups).filter((backup) => backup.backupFileName !== null);
       const results = await Promise.allSettled(backupEntries.map(async ({ backupFileName }) => {
-        const oldBackupPath = resolveBackupPath(backupFileName, previousSessionId);
+        const oldBackupPath = await resolveBackupPathForRead(backupFileName, previousSessionId);
         const newBackupPath = join93(newBackupDir, backupFileName);
         try {
           await link2(oldBackupPath, newBackupPath);
@@ -538546,12 +538667,12 @@ async function notifyVscodeSnapshotFilesUpdated(oldState, newState) {
     }
     let oldContent = null;
     if (oldBackup?.backupFileName) {
-      const backupPath = resolveBackupPath(oldBackup.backupFileName);
+      const backupPath = await resolveBackupPathForRead(oldBackup.backupFileName);
       oldContent = await readFileAsyncOrNull(backupPath);
     }
     let newContent = null;
     if (newBackup?.backupFileName) {
-      const backupPath = resolveBackupPath(newBackup.backupFileName);
+      const backupPath = await resolveBackupPathForRead(newBackup.backupFileName);
       newContent = await readFileAsyncOrNull(backupPath);
     }
     if (oldContent !== newContent) {
@@ -539371,12 +539492,15 @@ function getPlanSlug(sessionId) {
   let slug = cache6.get(id);
   if (!slug) {
     const plansDir = getPlansDirectory();
+    const legacyDir = getLegacyPlansDirectory();
     for (let i6 = 0;i6 < MAX_SLUG_RETRIES; i6++) {
       slug = generateWordSlug();
       const filePath = join94(plansDir, `${slug}.md`);
-      if (!getFsImplementation().existsSync(filePath)) {
-        break;
-      }
+      if (getFsImplementation().existsSync(filePath))
+        continue;
+      if (legacyDir && getFsImplementation().existsSync(join94(legacyDir, `${slug}.md`)))
+        continue;
+      break;
     }
     setPlanSlugCacheEntry(id, slug);
   }
@@ -539395,10 +539519,32 @@ function getPlanFilePath(agentId) {
   }
   return join94(getPlansDirectory(), `${planSlug}-agent-${agentId}.md`);
 }
+function getLegacyPlansDirectory() {
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return;
+  const legacyPlans = join94(legacyHome, "plans");
+  if (legacyPlans === getPlansDirectory())
+    return;
+  return legacyPlans;
+}
 function getPlan(agentId) {
   const filePath = getPlanFilePath(agentId);
   try {
     return getFsImplementation().readFileSync(filePath, { encoding: "utf-8" });
+  } catch (error97) {
+    if (!isENOENT(error97)) {
+      logError3(error97);
+      return null;
+    }
+  }
+  const legacyDir = getLegacyPlansDirectory();
+  if (!legacyDir)
+    return null;
+  const planSlug = getPlanSlug(getSessionId());
+  const legacyPath = agentId ? join94(legacyDir, `${planSlug}-agent-${agentId}.md`) : join94(legacyDir, `${planSlug}.md`);
+  try {
+    return getFsImplementation().readFileSync(legacyPath, { encoding: "utf-8" });
   } catch (error97) {
     if (isENOENT(error97))
       return null;
@@ -539600,6 +539746,16 @@ async function getSessionEnvDirPath() {
   await mkdir23(sessionEnvDir, { recursive: true });
   return sessionEnvDir;
 }
+function getAllSessionEnvDirPaths() {
+  const primary = join95(getClaudeConfigHomeDir(), "session-env", getSessionId());
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join95(legacyHome, "session-env", getSessionId());
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 async function getHookEnvFilePath(hookEvent, hookIndex) {
   const prefix = hookEvent.toLowerCase();
   return join95(await getSessionEnvDirPath(), `${prefix}-hook-${hookIndex}.sh`);
@@ -539644,31 +539800,33 @@ async function getSessionEnvironmentScript() {
       }
     }
   }
-  const sessionEnvDir = await getSessionEnvDirPath();
-  try {
-    const files2 = await readdir12(sessionEnvDir);
-    const hookFiles = files2.filter((f4) => HOOK_ENV_REGEX.test(f4)).sort(sortHookEnvFiles);
-    for (const file3 of hookFiles) {
-      const filePath = join95(sessionEnvDir, file3);
-      try {
-        const content = (await readFile26(filePath, "utf8")).trim();
-        if (content) {
-          scripts.push(content);
-        }
-      } catch (e4) {
-        const code = getErrnoCode(e4);
-        if (code !== "ENOENT") {
-          logForDebugging(`Failed to read hook file ${filePath}: ${errorMessage(e4)}`);
+  const allSessionEnvDirs = getAllSessionEnvDirPaths();
+  for (const sessionEnvDir of allSessionEnvDirs) {
+    try {
+      const files2 = await readdir12(sessionEnvDir);
+      const hookFiles = files2.filter((f4) => HOOK_ENV_REGEX.test(f4)).sort(sortHookEnvFiles);
+      for (const file3 of hookFiles) {
+        const filePath = join95(sessionEnvDir, file3);
+        try {
+          const content = (await readFile26(filePath, "utf8")).trim();
+          if (content) {
+            scripts.push(content);
+          }
+        } catch (e4) {
+          const code = getErrnoCode(e4);
+          if (code !== "ENOENT") {
+            logForDebugging(`Failed to read hook file ${filePath}: ${errorMessage(e4)}`);
+          }
         }
       }
-    }
-    if (hookFiles.length > 0) {
-      logForDebugging(`Session environment loaded from ${hookFiles.length} hook file(s)`);
-    }
-  } catch (e4) {
-    const code = getErrnoCode(e4);
-    if (code !== "ENOENT") {
-      logForDebugging(`Failed to load session environment from hooks: ${errorMessage(e4)}`);
+      if (hookFiles.length > 0) {
+        logForDebugging(`Session environment loaded from ${hookFiles.length} hook file(s) in ${sessionEnvDir}`);
+      }
+    } catch (e4) {
+      const code = getErrnoCode(e4);
+      if (code !== "ENOENT") {
+        logForDebugging(`Failed to load session environment from hooks in ${sessionEnvDir}: ${errorMessage(e4)}`);
+      }
     }
   }
   if (scripts.length === 0) {
@@ -540896,41 +541054,53 @@ import { join as join98 } from "path";
 function getSessionsDir() {
   return join98(getClaudeConfigHomeDir(), "sessions");
 }
+function getAllSessionsDirs() {
+  const primary = getSessionsDir();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join98(legacyHome, "sessions");
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 async function listAllLiveSessions() {
-  const dir = getSessionsDir();
-  let files2;
-  try {
-    files2 = await readdir13(dir);
-  } catch (e4) {
-    if (!isFsInaccessible(e4)) {
-      logForDebugging(`[udsClient] readdir failed: ${errorMessage(e4)}`);
-    }
-    return [];
-  }
+  const dirs = getAllSessionsDirs();
   const results = [];
-  for (const file3 of files2) {
-    if (!/^\d+\.json$/.test(file3))
-      continue;
-    const pid = parseInt(file3.slice(0, -5), 10);
-    if (!isProcessRunning(pid)) {
+  for (const dir of dirs) {
+    let files2;
+    try {
+      files2 = await readdir13(dir);
+    } catch (e4) {
+      if (!isFsInaccessible(e4)) {
+        logForDebugging(`[udsClient] readdir failed for ${dir}: ${errorMessage(e4)}`);
+      }
       continue;
     }
-    try {
-      const raw = await readFile28(join98(dir, file3), "utf8");
-      const data = jsonParse(raw);
-      results.push({
-        pid,
-        sessionId: data.sessionId,
-        cwd: data.cwd,
-        startedAt: data.startedAt,
-        kind: data.kind,
-        name: data.name,
-        messagingSocketPath: data.messagingSocketPath,
-        entrypoint: data.entrypoint,
-        bridgeSessionId: data.bridgeSessionId,
-        alive: true
-      });
-    } catch {}
+    for (const file3 of files2) {
+      if (!/^\d+\.json$/.test(file3))
+        continue;
+      const pid = parseInt(file3.slice(0, -5), 10);
+      if (!isProcessRunning(pid)) {
+        continue;
+      }
+      try {
+        const raw = await readFile28(join98(dir, file3), "utf8");
+        const data = jsonParse(raw);
+        results.push({
+          pid,
+          sessionId: data.sessionId,
+          cwd: data.cwd,
+          startedAt: data.startedAt,
+          kind: data.kind,
+          name: data.name,
+          messagingSocketPath: data.messagingSocketPath,
+          entrypoint: data.entrypoint,
+          bridgeSessionId: data.bridgeSessionId,
+          alive: true
+        });
+      } catch {}
+    }
   }
   return results;
 }
@@ -557525,7 +557695,7 @@ function registerMCPSkillBuilders(b6) {
 var builders = null;
 
 // src/skills/loadSkillsDir.ts
-import { existsSync as existsSync14 } from "fs";
+import { existsSync as existsSync15 } from "fs";
 import { realpath as realpath9 } from "fs/promises";
 import { homedir as homedir31 } from "os";
 import {
@@ -558024,7 +558194,7 @@ var init_loadSkillsDir = __esm(() => {
       const additionalSkillsNested2 = await Promise.all(additionalDirs.map((dir) => {
         const costrictSkillsDir = join104(dir, CONFIG_DIR_NAME, "skills");
         const legacySkillsDir = join104(dir, LEGACY_CONFIG_DIR_NAME, "skills");
-        const skillsDir = existsSync14(costrictSkillsDir) ? costrictSkillsDir : legacySkillsDir;
+        const skillsDir = existsSync15(costrictSkillsDir) ? costrictSkillsDir : legacySkillsDir;
         return loadSkillsFromSkillsDir(skillsDir, "projectSettings");
       }));
       return additionalSkillsNested2.flat().map((s) => s.skill);
@@ -558045,7 +558215,7 @@ var init_loadSkillsDir = __esm(() => {
       projectSettingsEnabled ? Promise.all(additionalDirs.map((dir) => {
         const costrictSkillsDir = join104(dir, CONFIG_DIR_NAME, "skills");
         const legacySkillsDir = join104(dir, LEGACY_CONFIG_DIR_NAME, "skills");
-        const skillsDir = existsSync14(costrictSkillsDir) ? costrictSkillsDir : legacySkillsDir;
+        const skillsDir = existsSync15(costrictSkillsDir) ? costrictSkillsDir : legacySkillsDir;
         return loadSkillsFromSkillsDir(skillsDir, "projectSettings");
       })) : Promise.resolve([]),
       skillsLocked ? Promise.resolve([]) : loadSkillsFromCommandsDir(cwd2)
@@ -580858,7 +581028,7 @@ To complete your request, I need to fetch content from the redirected URL. Pleas
 
 // src/utils/listSessionsImpl.ts
 import { readdir as readdir14, stat as stat27 } from "fs/promises";
-import { basename as basename28, join as join109 } from "path";
+import { join as join109 } from "path";
 function parseSessionInfoFromLite(sessionId, lite, projectPath) {
   const { head, tail, mtime, size } = lite;
   const firstNewline = head.indexOf(`
@@ -580897,13 +581067,14 @@ function parseSessionInfoFromLite(sessionId, lite, projectPath) {
     createdAt
   };
 }
-async function listCandidates(projectDir, doStat, projectPath) {
+async function listCandidates(projectDir, doStat, projectPath, source) {
   let names;
   try {
     names = await readdir14(projectDir);
   } catch {
     return [];
   }
+  const src = source ?? "primary";
   const results = await Promise.all(names.map(async (name3) => {
     if (!name3.endsWith(".jsonl"))
       return null;
@@ -580912,10 +581083,16 @@ async function listCandidates(projectDir, doStat, projectPath) {
       return null;
     const filePath = join109(projectDir, name3);
     if (!doStat)
-      return { sessionId, filePath, mtime: 0, projectPath };
+      return { sessionId, filePath, mtime: 0, projectPath, source: src };
     try {
       const s = await stat27(filePath);
-      return { sessionId, filePath, mtime: s.mtime.getTime(), projectPath };
+      return {
+        sessionId,
+        filePath,
+        mtime: s.mtime.getTime(),
+        projectPath,
+        source: src
+      };
     } catch {
       return null;
     }
@@ -580934,8 +581111,12 @@ async function readCandidate(c7) {
   return info2;
 }
 function compareDesc(a5, b6) {
+  if (a5.sessionId === b6.sessionId)
+    return a5.source === "primary" ? -1 : 1;
   if (b6.mtime !== a5.mtime)
     return b6.mtime - a5.mtime;
+  if (a5.source !== b6.source)
+    return a5.source === "primary" ? -1 : 1;
   return b6.sessionId < a5.sessionId ? -1 : b6.sessionId > a5.sessionId ? 1 : 0;
 }
 async function applySortAndLimit(candidates, limit, offset) {
@@ -580968,11 +581149,21 @@ async function applySortAndLimit(candidates, limit, offset) {
 async function readAllAndSort(candidates) {
   const all4 = await Promise.all(candidates.map(readCandidate));
   const byId = new Map;
-  for (const s of all4) {
+  const sourceById = new Map;
+  for (let i6 = 0;i6 < all4.length; i6++) {
+    const s = all4[i6];
     if (!s)
       continue;
+    const source = candidates[i6]?.source ?? "primary";
     const existing = byId.get(s.sessionId);
-    if (!existing || s.lastModified > existing.lastModified) {
+    const existingSource = sourceById.get(s.sessionId);
+    if (!existing) {
+      byId.set(s.sessionId, s);
+      sourceById.set(s.sessionId, source);
+    } else if (source === "primary" && existingSource === "legacy") {
+      byId.set(s.sessionId, s);
+      sourceById.set(s.sessionId, source);
+    } else if (source === existingSource && s.lastModified > existing.lastModified) {
       byId.set(s.sessionId, s);
     }
   }
@@ -580996,9 +581187,9 @@ async function gatherProjectCandidates(dir, includeWorktrees, doStat) {
     const projectDir = await findProjectDir(canonicalDir);
     if (!projectDir)
       return [];
-    return listCandidates(projectDir, doStat, canonicalDir);
+    return listCandidates(projectDir, doStat, canonicalDir, "primary");
   }
-  const projectsDir = getProjectsDir();
+  const allProjectsDirs = getAllProjectsDirs();
   const caseInsensitive = process.platform === "win32";
   const indexed = worktreePaths.map((wt) => {
     const sanitized = sanitizePath2(wt);
@@ -581008,50 +581199,51 @@ async function gatherProjectCandidates(dir, includeWorktrees, doStat) {
     };
   });
   indexed.sort((a5, b6) => b6.prefix.length - a5.prefix.length);
-  let allDirents;
-  try {
-    allDirents = await readdir14(projectsDir, { withFileTypes: true });
-  } catch {
-    const projectDir = await findProjectDir(canonicalDir);
-    if (!projectDir)
-      return [];
-    return listCandidates(projectDir, doStat, canonicalDir);
-  }
   const all4 = [];
-  const seenDirs = new Set;
   const canonicalProjectDir = await findProjectDir(canonicalDir);
   if (canonicalProjectDir) {
-    const dirBase = basename28(canonicalProjectDir);
-    seenDirs.add(caseInsensitive ? dirBase.toLowerCase() : dirBase);
-    all4.push(...await listCandidates(canonicalProjectDir, doStat, canonicalDir));
+    all4.push(...await listCandidates(canonicalProjectDir, doStat, canonicalDir, "primary"));
   }
-  for (const dirent of allDirents) {
-    if (!dirent.isDirectory())
-      continue;
-    const dirName = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
-    if (seenDirs.has(dirName))
+  for (let pi = 0;pi < allProjectsDirs.length; pi++) {
+    const projectsDir = allProjectsDirs[pi];
+    const source = pi === 0 ? "primary" : "legacy";
+    let allDirents;
+    try {
+      allDirents = await readdir14(projectsDir, { withFileTypes: true });
+    } catch {
       continue;
-    for (const { path: wtPath, prefix } of indexed) {
-      const isMatch = dirName === prefix || prefix.length >= MAX_SANITIZED_LENGTH2 && dirName.startsWith(prefix + "-");
-      if (isMatch) {
-        seenDirs.add(dirName);
-        all4.push(...await listCandidates(join109(projectsDir, dirent.name), doStat, wtPath));
-        break;
+    }
+    for (const dirent of allDirents) {
+      if (!dirent.isDirectory())
+        continue;
+      const dirName = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
+      for (const { path: wtPath, prefix } of indexed) {
+        const isMatch = dirName === prefix || prefix.length >= MAX_SANITIZED_LENGTH2 && dirName.startsWith(prefix + "-");
+        if (isMatch) {
+          all4.push(...await listCandidates(join109(projectsDir, dirent.name), doStat, wtPath, source));
+          break;
+        }
       }
     }
   }
   return all4;
 }
 async function gatherAllCandidates(doStat) {
-  const projectsDir = getProjectsDir();
-  let dirents;
-  try {
-    dirents = await readdir14(projectsDir, { withFileTypes: true });
-  } catch {
-    return [];
+  const allProjectsDirs = getAllProjectsDirs();
+  const all4 = [];
+  for (let pi = 0;pi < allProjectsDirs.length; pi++) {
+    const projectsDir = allProjectsDirs[pi];
+    const source = pi === 0 ? "primary" : "legacy";
+    let dirents;
+    try {
+      dirents = await readdir14(projectsDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    const perProject = await Promise.all(dirents.filter((d4) => d4.isDirectory()).map((d4) => listCandidates(join109(projectsDir, d4.name), doStat, undefined, source)));
+    all4.push(...perProject.flat());
   }
-  const perProject = await Promise.all(dirents.filter((d4) => d4.isDirectory()).map((d4) => listCandidates(join109(projectsDir, d4.name), doStat)));
-  return perProject.flat();
+  return all4;
 }
 async function listSessionsImpl(options) {
   const { dir, limit, offset, includeWorktrees } = options ?? {};
@@ -588399,7 +588591,7 @@ var init_localValidate = __esm(() => {
 
 // src/services/SessionMemory/multiStore.ts
 import {
-  existsSync as existsSync15,
+  existsSync as existsSync16,
   mkdirSync as mkdirSync7,
   openSync as openSync4,
   readdirSync as readdirSync6,
@@ -588412,7 +588604,7 @@ import {
   writeFileSync as writeFileSync10
 } from "fs";
 import { homedir as homedir32 } from "os";
-import { basename as basename29, join as join111 } from "path";
+import { basename as basename28, join as join111 } from "path";
 function getBaseDir() {
   const configDir = process.env["CLAUDE_CONFIG_DIR"] ?? join111(homedir32(), ".claude");
   if (_baseDirCache && _baseDirCache.configDir === configDir) {
@@ -588450,13 +588642,13 @@ function validateStoreName(store) {
   if (store.startsWith(".")) {
     throw new Error(`Invalid store name: "${store}" must not start with ".".`);
   }
-  if (basename29(store) !== store) {
+  if (basename28(store) !== store) {
     throw new Error(`Invalid store name: "${store}" is path-like and would escape the base directory.`);
   }
 }
 function listStores() {
   const baseDir = getBaseDir();
-  if (!existsSync15(baseDir))
+  if (!existsSync16(baseDir))
     return [];
   return readdirSync6(baseDir, { withFileTypes: true }).filter((d4) => d4.isDirectory() && !d4.name.endsWith(".archived")).map((d4) => d4.name).sort();
 }
@@ -588464,7 +588656,7 @@ function getEntryBounded(store, key6, maxBytes) {
   validateStoreName(store);
   validateKey(key6);
   const entryPath = getEntryPath(store, key6);
-  if (!existsSync15(entryPath))
+  if (!existsSync16(entryPath))
     return null;
   const stat30 = statSync11(entryPath);
   const total = stat30.size;
@@ -588490,7 +588682,7 @@ function getEntryBounded(store, key6, maxBytes) {
 function listEntriesBounded(store, maxEntries) {
   validateStoreName(store);
   const storeDir = getStoreDir(store);
-  if (!existsSync15(storeDir))
+  if (!existsSync16(storeDir))
     return { entries: [], truncated: false };
   const top = [];
   let totalMd = 0;
@@ -589027,7 +589219,7 @@ import {
 import {
   readFileSync as readFileSync26,
   writeFileSync as writeFileSync11,
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   mkdirSync as mkdirSync8,
   chmodSync as chmodSync4,
   renameSync as renameSync3,
@@ -589053,11 +589245,11 @@ async function getOrCreatePassphrase() {
   if (envVal)
     return envVal;
   const passphraseFile = getPassphraseFilePath();
-  if (existsSync16(passphraseFile)) {
+  if (existsSync17(passphraseFile)) {
     return readFileSync26(passphraseFile, "utf8").trim();
   }
   const claudeDir = getClaudeDir();
-  if (!existsSync16(claudeDir)) {
+  if (!existsSync17(claudeDir)) {
     mkdirSync8(claudeDir, { recursive: true });
   }
   const generated = randomBytes14(32).toString("hex");
@@ -589113,7 +589305,7 @@ function decrypt2(record4, key6, entryKey) {
 }
 async function readVaultFile() {
   const filePath = getVaultFilePath();
-  if (!existsSync16(filePath))
+  if (!existsSync17(filePath))
     return {};
   let raw;
   try {
@@ -601598,13 +601790,13 @@ __export(exports_projectContext, {
 import { execFileSync as execFileSync5 } from "child_process";
 import { createHash as createHash25 } from "crypto";
 import {
-  existsSync as existsSync17,
+  existsSync as existsSync18,
   mkdirSync as mkdirSync9,
   readFileSync as readFileSync27,
   realpathSync as realpathSync6,
   writeFileSync as writeFileSync12
 } from "fs";
-import { basename as basename30, join as join116, resolve as resolve41 } from "path";
+import { basename as basename29, join as join116, resolve as resolve41 } from "path";
 function getSkillLearningRootDir() {
   return join116(getClaudeConfigHomeDir(), "skill-learning");
 }
@@ -601671,7 +601863,7 @@ function resolveContext(cwd2) {
       cwd: cwd2,
       projectRoot,
       identity: `claude-project-dir:${projectRoot}`,
-      projectName: basename30(projectRoot) || "project"
+      projectName: basename29(projectRoot) || "project"
     });
   }
   const gitRemote = git(["remote", "get-url", "origin"], cwd2);
@@ -601697,7 +601889,7 @@ function resolveContext(cwd2) {
       cwd: cwd2,
       projectRoot,
       identity: `git-root:${projectRoot}`,
-      projectName: basename30(projectRoot) || "project"
+      projectName: basename29(projectRoot) || "project"
     });
   }
   return buildContext({
@@ -601740,7 +601932,7 @@ function persistProjectContext(context25) {
   writeJson(getProjectContextPath(context25.projectId), record4);
 }
 function readProjectsRegistry(path27) {
-  if (!existsSync17(path27)) {
+  if (!existsSync18(path27)) {
     return {
       version: REGISTRY_VERSION,
       updatedAt: new Date(0).toISOString(),
@@ -602793,8 +602985,8 @@ import {
   rm as rm7,
   writeFile as writeFile37
 } from "fs/promises";
-import { existsSync as existsSync18 } from "fs";
-import { basename as basename31, dirname as dirname53, join as join119 } from "path";
+import { existsSync as existsSync19 } from "fs";
+import { basename as basename30, dirname as dirname53, join as join119 } from "path";
 async function compareExistingArtifacts(kind, draft, rootsOrSkills) {
   const existing = rootsOrSkills.length > 0 && typeof rootsOrSkills[0] === "string" ? await loadExistingArtifacts(kind, rootsOrSkills) : rootsOrSkills;
   const draftTerms = terms(`${draft.name} ${draft.description} ${draft.content}`);
@@ -602811,7 +603003,7 @@ async function loadExistingArtifacts(kind, roots) {
     return loadExistingSkills(roots);
   const results = [];
   for (const root6 of roots) {
-    if (!existsSync18(root6))
+    if (!existsSync19(root6))
       continue;
     await collectArtifactFiles(root6, results);
   }
@@ -602905,7 +603097,7 @@ async function applySkillLifecycleDecision(decision, options = {}) {
 async function loadExistingSkills(roots) {
   const skills = [];
   for (const root6 of roots) {
-    if (!existsSync18(root6))
+    if (!existsSync19(root6))
       continue;
     await collectSkillFiles(root6, skills);
   }
@@ -602914,7 +603106,7 @@ async function loadExistingSkills(roots) {
 async function archiveSkill(skill, reason, replacement, options = {}) {
   const skillDir = dirname53(skill.path);
   const archiveRoot = options.archiveRoot ?? join119(dirname53(skillDir), ".archive");
-  const archivedPath = join119(archiveRoot, `${basename31(skillDir)}-${timestamp(options.now)}`);
+  const archivedPath = join119(archiveRoot, `${basename30(skillDir)}-${timestamp(options.now)}`);
   await mkdir34(archiveRoot, { recursive: true });
   await rename7(skillDir, archivedPath);
   const manifestPath = await writeReplacementManifest(options.manifestRoot ?? archivedPath, {
@@ -602935,7 +603127,7 @@ async function deleteSkill(skill, reason, replacement, options = {}) {
     throw new Error("Hard delete requires allowHardDelete=true");
   }
   const skillDir = dirname53(skill.path);
-  const content = existsSync18(skill.path) ? await readFile41(skill.path, "utf8") : "";
+  const content = existsSync19(skill.path) ? await readFile41(skill.path, "utf8") : "";
   const manifestRoot = options.manifestRoot ?? join119(dirname53(skillDir), ".tombstones");
   const manifestPath = await writeReplacementManifest(manifestRoot, {
     oldSkill: skill.name,
@@ -603006,7 +603198,7 @@ async function collectSkillFiles(root6, results) {
     if (entry.isFile() && entry.name === "SKILL.md") {
       const content = await readFile41(full, "utf8");
       results.push({
-        name: parseFrontmatter2(content, "name") ?? basename31(dirname53(full)),
+        name: parseFrontmatter2(content, "name") ?? basename30(dirname53(full)),
         description: parseFrontmatter2(content, "description") ?? "",
         path: full,
         content
@@ -603070,7 +603262,7 @@ var init_skillLifecycle = __esm(() => {
 
 // src/services/skillLearning/commandGenerator.ts
 import { mkdir as mkdir35, writeFile as writeFile38 } from "fs/promises";
-import { existsSync as existsSync19 } from "fs";
+import { existsSync as existsSync20 } from "fs";
 import { join as join120 } from "path";
 function generateCommandDraft(instincts, options) {
   if (instincts.length === 0) {
@@ -603101,7 +603293,7 @@ function generateCommandDraft(instincts, options) {
 async function writeLearnedCommand(draft) {
   await mkdir35(draft.outputPath, { recursive: true });
   const filePath = join120(draft.outputPath, `${draft.name}.md`);
-  if (existsSync19(filePath))
+  if (existsSync20(filePath))
     return filePath;
   await writeFile38(filePath, draft.content, "utf8");
   clearCommandsCache();
@@ -603194,7 +603386,7 @@ var init_commandGenerator = __esm(() => {
 
 // src/services/skillLearning/agentGenerator.ts
 import { mkdir as mkdir36, writeFile as writeFile39 } from "fs/promises";
-import { existsSync as existsSync20 } from "fs";
+import { existsSync as existsSync21 } from "fs";
 import { join as join121 } from "path";
 function generateAgentDraft(instincts, options) {
   if (instincts.length === 0) {
@@ -603225,7 +603417,7 @@ function generateAgentDraft(instincts, options) {
 async function writeLearnedAgent(draft) {
   await mkdir36(draft.outputPath, { recursive: true });
   const filePath = join121(draft.outputPath, `${draft.name}.md`);
-  if (existsSync20(filePath))
+  if (existsSync21(filePath))
     return filePath;
   await writeFile39(filePath, draft.content, "utf8");
   clearCommandsCache();
@@ -603390,7 +603582,7 @@ var init_evolution = __esm(() => {
 
 // src/services/skillLearning/promotion.ts
 import { readdir as readdir18 } from "fs/promises";
-import { existsSync as existsSync21 } from "fs";
+import { existsSync as existsSync22 } from "fs";
 import { join as join122 } from "path";
 function recordSessionPromoted(id) {
   sessionPromotedIds.add(id);
@@ -603466,7 +603658,7 @@ async function checkPromotion(options = {}) {
 async function loadAllProjectInstincts(rootDir) {
   const root6 = getSkillLearningRoot(rootDir ? { rootDir } : undefined);
   const projectsRoot = join122(root6, "projects");
-  if (!existsSync21(projectsRoot))
+  if (!existsSync22(projectsRoot))
     return [];
   const entries = await readdir18(projectsRoot, { withFileTypes: true });
   const instincts = [];
@@ -603525,7 +603717,7 @@ __export(exports_runtimeObserver, {
   getRuntimeTurn: () => getRuntimeTurn,
   RUNTIME_SESSION_ID: () => RUNTIME_SESSION_ID
 });
-import { existsSync as existsSync22 } from "fs";
+import { existsSync as existsSync23 } from "fs";
 import { join as join123 } from "path";
 function resetRuntimeLLMBookkeeping() {
   llmCallsThisSession = 0;
@@ -603632,7 +603824,7 @@ async function autoEvolveLearnedSkills(options) {
     if (outcome.action === "append-evidence")
       continue;
     const draft = outcome.draft;
-    if (existsSync22(join123(draft.outputPath, "SKILL.md")))
+    if (existsSync23(join123(draft.outputPath, "SKILL.md")))
       continue;
     const existing = await compareExistingArtifacts("skill", draft, skillRoots);
     const decision = decideSkillLifecycle(draft, existing);
@@ -605859,11 +606051,11 @@ var init_memoryTypes = __esm(() => {
 
 // src/memdir/memoryScan.ts
 import { readdir as readdir19 } from "fs/promises";
-import { basename as basename32, join as join124 } from "path";
+import { basename as basename31, join as join124 } from "path";
 async function scanMemoryFiles(memoryDir, signal) {
   try {
     const entries = await readdir19(memoryDir, { recursive: true });
-    const mdFiles = entries.filter((f4) => f4.endsWith(".md") && basename32(f4) !== "MEMORY.md");
+    const mdFiles = entries.filter((f4) => f4.endsWith(".md") && basename31(f4) !== "MEMORY.md");
     const headerResults = await Promise.allSettled(mdFiles.map(async (relativePath) => {
       const filePath = join124(memoryDir, relativePath);
       const { content, mtimeMs } = await readFileInRange(filePath, 0, FRONTMATTER_MAX_LINES, undefined, signal);
@@ -605970,7 +606162,7 @@ __export(exports_extractMemories, {
   drainPendingExtraction: () => drainPendingExtraction,
   createAutoMemCanUseTool: () => createAutoMemCanUseTool
 });
-import { basename as basename33 } from "path";
+import { basename as basename32 } from "path";
 function isModelVisibleMessage(message2) {
   return message2.type === "user" || message2.type === "assistant";
 }
@@ -606155,7 +606347,7 @@ function initExtractMemories() {
       } else {
         logForDebugging("[extractMemories] no memories saved this run");
       }
-      const memoryPaths = writtenPaths.filter((p2) => basename33(p2) !== ENTRYPOINT_NAME);
+      const memoryPaths = writtenPaths.filter((p2) => basename32(p2) !== ENTRYPOINT_NAME);
       const teamCount = 0;
       logEvent("tengu_extract_memories_extraction", {
         input_tokens: result.totalUsage.input_tokens,
@@ -607155,7 +607347,7 @@ var init_queue = __esm(() => {
 
 // src/services/rawDump/spawn.ts
 import { spawn as spawn10 } from "child_process";
-import { existsSync as existsSync23 } from "fs";
+import { existsSync as existsSync24 } from "fs";
 import path29 from "path";
 import { fileURLToPath as fileURLToPath8 } from "url";
 function resolveWorkerPath() {
@@ -607175,11 +607367,11 @@ function resolveWorkerPath() {
 }
 function resolveRuntime() {
   const execPath2 = process.execPath;
-  const basename34 = path29.basename(execPath2).toLowerCase();
-  if (basename34.startsWith("bun")) {
+  const basename33 = path29.basename(execPath2).toLowerCase();
+  if (basename33.startsWith("bun")) {
     return { entry: execPath2, isBun: true };
   }
-  if (basename34.startsWith("node")) {
+  if (basename33.startsWith("node")) {
     return { entry: execPath2, isBun: false };
   }
   if (typeof Bun !== "undefined" && Bun.which) {
@@ -607195,7 +607387,7 @@ function resolveRuntime() {
 function spawnBatchWorker() {
   const workerPath = resolveWorkerPath();
   const runtime = resolveRuntime();
-  if (!existsSync23(workerPath) || !runtime) {
+  if (!existsSync24(workerPath) || !runtime) {
     return false;
   }
   const args = runtime.isBun ? ["run", workerPath] : [workerPath];
@@ -607763,19 +607955,30 @@ var init_git2 = __esm(() => {
 
 // src/services/rawDump/history.ts
 import { promises as fs25 } from "fs";
-import os15 from "os";
 import path32 from "path";
+async function resolveHistoryFilePath() {
+  try {
+    const s = await fs25.stat(HISTORY_FILE);
+    return { path: HISTORY_FILE, mtimeMs: Number(s.mtimeMs), size: Number(s.size) };
+  } catch {}
+  if (LEGACY_HISTORY_FILE) {
+    try {
+      const s = await fs25.stat(LEGACY_HISTORY_FILE);
+      return { path: LEGACY_HISTORY_FILE, mtimeMs: Number(s.mtimeMs), size: Number(s.size) };
+    } catch {}
+  }
+  return null;
+}
 async function loadHistory() {
   const items = [];
-  let fileStat = null;
-  try {
-    fileStat = await fs25.stat(HISTORY_FILE);
-  } catch {
+  const resolved = await resolveHistoryFilePath();
+  if (!resolved) {
     cache6 = null;
     return [];
   }
+  const { path: historyFile, mtimeMs, size } = resolved;
   try {
-    const content = await fs25.readFile(HISTORY_FILE, "utf-8");
+    const content = await fs25.readFile(historyFile, "utf-8");
     const lines2 = content.split(`
 `);
     for (const line of lines2) {
@@ -607790,45 +607993,46 @@ async function loadHistory() {
     return cache6?.items ?? [];
   }
   cache6 = {
-    mtime: fileStat.mtimeMs,
-    size: fileStat.size,
+    mtime: mtimeMs,
+    size,
     items
   };
   return cache6.items;
 }
 async function autoLoadHistory() {
-  let fileStat = null;
-  try {
-    fileStat = await fs25.stat(HISTORY_FILE);
-  } catch {
+  const resolved = await resolveHistoryFilePath();
+  if (!resolved) {
     if (cache6) {
       return null;
     }
     return [];
   }
-  if (cache6 && cache6.mtime === fileStat.mtimeMs && cache6.size === fileStat.size) {
+  if (cache6 && cache6.mtime === resolved.mtimeMs && cache6.size === resolved.size) {
     return cache6.items;
   }
   return await loadHistory();
 }
 async function getProjectDirs() {
   if (cache6) {
-    let fileStat = null;
-    try {
-      fileStat = await fs25.stat(HISTORY_FILE);
-    } catch {
+    const resolved = await resolveHistoryFilePath();
+    if (!resolved) {
       return [...new Set(cache6.items.map((item) => item.project))];
     }
-    if (fileStat.mtimeMs === cache6.mtime && fileStat.size === cache6.size) {
+    if (resolved.mtimeMs === cache6.mtime && resolved.size === cache6.size) {
       return [...new Set(cache6.items.map((item) => item.project))];
     }
   }
   const items = await loadHistory();
   return [...new Set(items.map((item) => item.project))];
 }
-var HISTORY_FILE, cache6 = null;
+var HISTORY_FILE, LEGACY_HISTORY_FILE, cache6 = null;
 var init_history = __esm(() => {
-  HISTORY_FILE = path32.join(os15.homedir(), ".claude", "history.jsonl");
+  init_envUtils();
+  HISTORY_FILE = path32.join(getClaudeConfigHomeDir(), "history.jsonl");
+  LEGACY_HISTORY_FILE = (() => {
+    const legacy = getLegacyConfigHomeDir();
+    return legacy ? path32.join(legacy, "history.jsonl") : null;
+  })();
 });
 
 // src/services/rawDump/parse.ts
@@ -608428,7 +608632,7 @@ var init_statistics = __esm(() => {
 // src/services/rawDump/worker.ts
 import { promises as fs27 } from "fs";
 import { createHash as createHash27 } from "crypto";
-import os16 from "os";
+import os15 from "os";
 import path34 from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
 async function getCachedRepoInfo(directory) {
@@ -608811,7 +609015,7 @@ async function uploadSummary(payload, authData) {
     client_ide: "cli",
     client_version: authData.version,
     client_os: detectOs(),
-    client_os_version: os16.release(),
+    client_os_version: os15.release(),
     caller: process.env.CSC_RAW_DUMP_CALLER || "chat"
   };
   await uploadReport(authData, "/raw-store/task-summary", body);
@@ -609137,7 +609341,7 @@ var init_worker = __esm(() => {
 
 // src/services/rawDump/timerWorker.ts
 import { promises as fs28 } from "fs";
-import os17 from "os";
+import os16 from "os";
 import path35 from "path";
 async function acquireTimerLock() {
   try {
@@ -609212,7 +609416,7 @@ var init_timerWorker = __esm(() => {
   init_logger6();
   init_worker();
   log9 = createLogger("timer");
-  TIMER_LOCK_FILE = path35.join(os17.homedir(), ".claude", "raw-dump", "csc-timer.lock");
+  TIMER_LOCK_FILE = path35.join(os16.homedir(), ".claude", "raw-dump", "csc-timer.lock");
   scriptPath2 = process.argv[1] || "";
   if (scriptPath2.endsWith("timerWorker.ts") || scriptPath2.endsWith("timerWorker.js")) {
     startTimerWorker();
@@ -609472,7 +609676,7 @@ __export(exports_skillGapStore, {
   promoteGapToDraft: () => promoteGapToDraft,
   findGapKeyByDraftPath: () => findGapKeyByDraftPath
 });
-import { existsSync as existsSync24 } from "fs";
+import { existsSync as existsSync25 } from "fs";
 import { mkdir as mkdir37, readFile as readFile43, rename as rename8, writeFile as writeFile40 } from "fs/promises";
 import { createHash as createHash28 } from "crypto";
 import { dirname as dirname54, join as join126 } from "path";
@@ -609615,7 +609819,7 @@ async function writeSkillGapDraft(gap, project) {
     description: "Draft learned skill candidate. Promote after repeated evidence or explicit user correction."
   });
   const skillFile = join126(draft.outputPath, "SKILL.md");
-  if (!existsSync24(skillFile)) {
+  if (!existsSync25(skillFile)) {
     await writeLearnedSkill({
       ...draft,
       content: draft.content + `
@@ -609636,7 +609840,7 @@ async function writeActiveSkillForGap(gap, project) {
     description: buildGapAction(gap.prompt)
   });
   const skillFile = join126(draft.outputPath, "SKILL.md");
-  if (!existsSync24(skillFile)) {
+  if (!existsSync25(skillFile)) {
     await writeLearnedSkill(draft);
   }
   return { type: "active", name: draft.name, skillPath: skillFile };
@@ -610147,6 +610351,16 @@ import { join as join128 } from "path";
 function getSessionsDir2() {
   return join128(getClaudeConfigHomeDir(), "sessions");
 }
+function getAllSessionsDirs2() {
+  const primary = getSessionsDir2();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join128(legacyHome, "sessions");
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 function envSessionKind() {
   if (true) {
     const k5 = process.env.CLAUDE_CODE_SESSION_KIND;
@@ -610215,18 +610429,21 @@ async function updateSessionActivity(patch) {
   await updatePidFile({ ...patch, updatedAt: Date.now() });
 }
 async function countConcurrentSessions() {
-  const dir = getSessionsDir2();
-  let files2;
-  try {
-    files2 = await readdir20(dir);
-  } catch (e4) {
-    if (!isFsInaccessible(e4)) {
-      logForDebugging(`[concurrentSessions] readdir failed: ${errorMessage(e4)}`);
+  const dirs = getAllSessionsDirs2();
+  let files2 = [];
+  for (const dir of dirs) {
+    try {
+      const entries = await readdir20(dir);
+      files2.push(...entries.map((f4) => `${dir}/${f4}`));
+    } catch (e4) {
+      if (!isFsInaccessible(e4)) {
+        logForDebugging(`[concurrentSessions] readdir failed for ${dir}: ${errorMessage(e4)}`);
+      }
     }
-    return 0;
   }
   let count3 = 0;
-  for (const file3 of files2) {
+  for (const fullPath of files2) {
+    const file3 = fullPath.split("/").pop();
     if (!/^\d+\.json$/.test(file3))
       continue;
     const pid = parseInt(file3.slice(0, -5), 10);
@@ -610237,7 +610454,7 @@ async function countConcurrentSessions() {
     if (isProcessRunning(pid)) {
       count3++;
     } else if (getPlatform() !== "wsl") {
-      unlink17(join128(dir, file3)).catch(() => {});
+      unlink17(fullPath).catch(() => {});
     }
   }
   return count3;
@@ -618755,22 +618972,22 @@ var init_attachments2 = __esm(() => {
 });
 
 // src/utils/plugins/loadPluginCommands.ts
-import { basename as basename35, dirname as dirname57, join as join133 } from "path";
+import { basename as basename34, dirname as dirname57, join as join133 } from "path";
 function isSkillFile2(filePath) {
-  return /^skill\.md$/i.test(basename35(filePath));
+  return /^skill\.md$/i.test(basename34(filePath));
 }
 function getCommandNameFromFile(filePath, baseDir, pluginName) {
   const isSkill = isSkillFile2(filePath);
   if (isSkill) {
     const skillDirectory = dirname57(filePath);
     const parentOfSkillDir = dirname57(skillDirectory);
-    const commandBaseName = basename35(skillDirectory);
+    const commandBaseName = basename34(skillDirectory);
     const relativePath = parentOfSkillDir.startsWith(baseDir) ? parentOfSkillDir.slice(baseDir.length).replace(/^\//, "") : "";
     const namespace = relativePath ? relativePath.split("/").join(":") : "";
     return namespace ? `${pluginName}:${namespace}:${commandBaseName}` : `${pluginName}:${commandBaseName}`;
   } else {
     const fileDirectory = dirname57(filePath);
-    const commandBaseName = basename35(filePath).replace(/\.md$/, "");
+    const commandBaseName = basename34(filePath).replace(/\.md$/, "");
     const relativePath = fileDirectory.startsWith(baseDir) ? fileDirectory.slice(baseDir.length).replace(/^\//, "") : "";
     const namespace = relativePath ? relativePath.split("/").join(":") : "";
     return namespace ? `${pluginName}:${namespace}:${commandBaseName}` : `${pluginName}:${commandBaseName}`;
@@ -618807,7 +619024,7 @@ function transformPluginSkillFiles(files2) {
     if (skillFiles.length > 0) {
       const skillFile = skillFiles[0];
       if (skillFiles.length > 1) {
-        logForDebugging(`Multiple skill files found in ${dir}, using ${basename35(skillFile.filePath)}`);
+        logForDebugging(`Multiple skill files found in ${dir}, using ${basename34(skillFile.filePath)}`);
       }
       result.push(skillFile);
     } else {
@@ -618954,7 +619171,7 @@ async function loadSkillsFromDirectory(skillsPath, pluginName, sourceName, plugi
     }
     try {
       const { frontmatter, content: markdownContent } = parseFrontmatter(directSkillContent, directSkillPath);
-      const skillName = `${pluginName}:${basename35(skillsPath)}`;
+      const skillName = `${pluginName}:${basename34(skillsPath)}`;
       const file3 = {
         filePath: directSkillPath,
         baseDir: dirname57(directSkillPath),
@@ -619100,7 +619317,7 @@ var init_loadPluginCommands = __esm(() => {
                 }
               }
               if (!commandName) {
-                commandName = `${plugin.name}:${basename35(commandPath).replace(/\.md$/, "")}`;
+                commandName = `${plugin.name}:${basename34(commandPath).replace(/\.md$/, "")}`;
               }
               const finalFrontmatter = metadataOverride ? {
                 ...frontmatter,
@@ -619244,7 +619461,7 @@ import {
   writeFile as writeFile43
 } from "fs/promises";
 import { tmpdir as tmpdir13 } from "os";
-import { basename as basename36, dirname as dirname58, join as join134 } from "path";
+import { basename as basename35, dirname as dirname58, join as join134 } from "path";
 function isPluginZipCacheEnabled() {
   return isEnvTruthy(process.env.CLAUDE_CODE_PLUGIN_USE_ZIP_CACHE);
 }
@@ -619309,7 +619526,7 @@ async function cleanupSessionPluginCache() {
 async function atomicWriteToZipCache(targetPath, data) {
   const dir = dirname58(targetPath);
   await getFsImplementation().mkdir(dir);
-  const tmpName = `.${basename36(targetPath)}.tmp.${randomBytes17(4).toString("hex")}`;
+  const tmpName = `.${basename35(targetPath)}.tmp.${randomBytes17(4).toString("hex")}`;
   const tmpPath = join134(dir, tmpName);
   try {
     if (typeof data === "string") {
@@ -620016,13 +620233,47 @@ var init_officialMarketplaceGcs = __esm(() => {
 
 // src/utils/plugins/marketplaceManager.ts
 import { writeFile as writeFile46 } from "fs/promises";
-import { basename as basename37, dirname as dirname60, isAbsolute as isAbsolute28, join as join137, resolve as resolve44, sep as sep28 } from "path";
+import { basename as basename36, dirname as dirname60, isAbsolute as isAbsolute28, join as join137, resolve as resolve44, sep as sep28 } from "path";
 function getKnownMarketplacesFile() {
   return join137(getPluginsDirectory(), "known_marketplaces.json");
 }
 function getMarketplacesCacheDir() {
   return join137(getPluginsDirectory(), "marketplaces");
 }
+async function readKnownMarketplacesFromAllDirs() {
+  const fs29 = getFsImplementation();
+  const dirs = getAllPluginsDirs();
+  let merged = {};
+  let primaryFile = "";
+  for (const dir of dirs) {
+    const filePath = join137(dir, "known_marketplaces.json");
+    try {
+      const content = await fs29.readFile(filePath, { encoding: "utf-8" });
+      const data = jsonParse(content);
+      const parsed = KnownMarketplacesFileSchema().safeParse(data);
+      if (parsed.success) {
+        if (!primaryFile) {
+          primaryFile = filePath;
+          merged = parsed.data;
+        } else {
+          for (const [name3, entry] of Object.entries(parsed.data)) {
+            if (!(name3 in merged)) {
+              merged[name3] = entry;
+              logForDebugging(`Found marketplace '${name3}' in legacy known_marketplaces.json`);
+            }
+          }
+        }
+      }
+    } catch (e4) {
+      if (!isENOENT(e4)) {
+        logForDebugging(`Failed to read known_marketplaces.json from ${filePath}: ${errorMessage(e4)}`, { level: "warn" });
+      }
+    }
+  }
+  if (!primaryFile)
+    return null;
+  return { config: merged, sourceFile: primaryFile };
+}
 function clearMarketplacesCache() {
   getMarketplace.cache?.clear?.();
 }
@@ -620079,9 +620330,13 @@ async function loadKnownMarketplacesConfig() {
       });
       throw new ConfigParseError(errorMsg, configFile, data);
     }
-    return parsed.data;
+    const merged = await mergeWithLegacyKnownMarketplaces(parsed.data);
+    return merged;
   } catch (error97) {
     if (isENOENT(error97)) {
+      const legacyResult = await readKnownMarketplacesFromAllDirs();
+      if (legacyResult)
+        return legacyResult.config;
       return {};
     }
     if (error97 instanceof ConfigParseError) {
@@ -620094,6 +620349,35 @@ async function loadKnownMarketplacesConfig() {
     throw new Error(errorMsg);
   }
 }
+async function mergeWithLegacyKnownMarketplaces(primary) {
+  const dirs = getAllPluginsDirs();
+  const legacyDirs = dirs.slice(1);
+  if (legacyDirs.length === 0)
+    return primary;
+  const fs29 = getFsImplementation();
+  const merged = { ...primary };
+  for (const dir of legacyDirs) {
+    const filePath = join137(dir, "known_marketplaces.json");
+    try {
+      const content = await fs29.readFile(filePath, { encoding: "utf-8" });
+      const data = jsonParse(content);
+      const parsed = KnownMarketplacesFileSchema().safeParse(data);
+      if (parsed.success) {
+        for (const [name3, entry] of Object.entries(parsed.data)) {
+          if (!(name3 in merged)) {
+            merged[name3] = entry;
+            logForDebugging(`Found marketplace '${name3}' in legacy known_marketplaces.json (${filePath})`);
+          }
+        }
+      }
+    } catch (e4) {
+      if (!isENOENT(e4)) {
+        logForDebugging(`Failed to read legacy known_marketplaces.json from ${filePath}: ${errorMessage(e4)}`, { level: "warn" });
+      }
+    }
+  }
+  return merged;
+}
 async function loadKnownMarketplacesConfigSafe() {
   try {
     return await loadKnownMarketplacesConfig();
@@ -620597,7 +620881,7 @@ Technical details: ${error97.message}`);
   });
 }
 function getCachePathForSource(source) {
-  const tempName = source.source === "github" ? source.repo.replace("/", "-") : source.source === "npm" ? source.package.replace("@", "").replace("/", "-") : source.source === "file" ? basename37(source.path).replace(".json", "") : source.source === "directory" ? basename37(source.path) : "temp_" + Date.now();
+  const tempName = source.source === "github" ? source.repo.replace("/", "-") : source.source === "npm" ? source.package.replace("@", "").replace("/", "-") : source.source === "file" ? basename36(source.path).replace(".json", "") : source.source === "directory" ? basename36(source.path) : "temp_" + Date.now();
   return tempName;
 }
 async function parseFileWithSchema(filePath, schema) {
@@ -620920,22 +621204,23 @@ async function readCachedMarketplace(installLocation) {
 }
 async function getMarketplaceCacheOnly(name3) {
   const fs29 = getFsImplementation();
-  const configFile = getKnownMarketplacesFile();
-  try {
-    const content = await fs29.readFile(configFile, { encoding: "utf-8" });
-    const config9 = jsonParse(content);
-    const entry = config9[name3];
-    if (!entry) {
-      return null;
-    }
-    return await readCachedMarketplace(entry.installLocation);
-  } catch (error97) {
-    if (isENOENT(error97)) {
-      return null;
+  const dirs = getAllPluginsDirs();
+  for (const dir of dirs) {
+    const configFile = join137(dir, "known_marketplaces.json");
+    try {
+      const content = await fs29.readFile(configFile, { encoding: "utf-8" });
+      const config9 = jsonParse(content);
+      const entry = config9[name3];
+      if (entry) {
+        return await readCachedMarketplace(entry.installLocation);
+      }
+    } catch (error97) {
+      if (!isENOENT(error97)) {
+        logForDebugging(`Failed to read cached marketplace from ${configFile}: ${errorMessage(error97)}`, { level: "warn" });
+      }
     }
-    logForDebugging(`Failed to read cached marketplace ${name3}: ${errorMessage(error97)}`, { level: "warn" });
-    return null;
   }
+  return null;
 }
 async function getPluginByIdCacheOnly(pluginId) {
   const { name: pluginName, marketplace: marketplaceName } = parsePluginIdentifier(pluginId);
@@ -620943,29 +621228,35 @@ async function getPluginByIdCacheOnly(pluginId) {
     return null;
   }
   const fs29 = getFsImplementation();
-  const configFile = getKnownMarketplacesFile();
-  try {
-    const content = await fs29.readFile(configFile, { encoding: "utf-8" });
-    const config9 = jsonParse(content);
-    const marketplaceConfig = config9[marketplaceName];
-    if (!marketplaceConfig) {
-      return null;
-    }
-    const marketplace = await getMarketplaceCacheOnly(marketplaceName);
-    if (!marketplace) {
-      return null;
-    }
-    const plugin = marketplace.plugins.find((p2) => p2.name === pluginName);
-    if (!plugin) {
-      return null;
-    }
-    return {
-      entry: plugin,
-      marketplaceInstallLocation: marketplaceConfig.installLocation
-    };
-  } catch {
+  const dirs = getAllPluginsDirs();
+  let marketplaceConfig;
+  for (const dir of dirs) {
+    const configFile = join137(dir, "known_marketplaces.json");
+    try {
+      const content = await fs29.readFile(configFile, { encoding: "utf-8" });
+      const config9 = jsonParse(content);
+      const entry = config9[marketplaceName];
+      if (entry) {
+        marketplaceConfig = entry;
+        break;
+      }
+    } catch {}
+  }
+  if (!marketplaceConfig) {
+    return null;
+  }
+  const marketplace = await getMarketplaceCacheOnly(marketplaceName);
+  if (!marketplace) {
+    return null;
+  }
+  const plugin = marketplace.plugins.find((p2) => p2.name === pluginName);
+  if (!plugin) {
     return null;
   }
+  return {
+    entry: plugin,
+    marketplaceInstallLocation: marketplaceConfig.installLocation
+  };
 }
 async function getPluginById(pluginId) {
   const cached8 = await getPluginByIdCacheOnly(pluginId);
@@ -621305,19 +621596,20 @@ function cleanupLegacyCache(v2Data) {
 }
 function readInstalledPluginsFileRaw() {
   const fs29 = getFsImplementation();
-  const filePath = getInstalledPluginsFilePath();
-  let fileContent;
-  try {
-    fileContent = fs29.readFileSync(filePath, { encoding: "utf-8" });
-  } catch (e4) {
-    if (isENOENT(e4)) {
-      return null;
+  const dirs = getAllPluginsDirs();
+  for (const dir of dirs) {
+    const filePath = join138(dir, "installed_plugins.json");
+    try {
+      const fileContent = fs29.readFileSync(filePath, { encoding: "utf-8" });
+      const data = jsonParse(fileContent);
+      const version6 = typeof data?.version === "number" ? data.version : 1;
+      return { version: version6, data };
+    } catch (e4) {
+      if (!isENOENT(e4))
+        throw e4;
     }
-    throw e4;
   }
-  const data = jsonParse(fileContent);
-  const version6 = typeof data?.version === "number" ? data.version : 1;
-  return { version: version6, data };
+  return null;
 }
 function migrateV1ToV2(v1Data) {
   const v2Plugins = {};
@@ -621340,14 +621632,13 @@ function loadInstalledPluginsV2() {
   if (installedPluginsCacheV2 !== null) {
     return installedPluginsCacheV2;
   }
-  const filePath = getInstalledPluginsFilePath();
   try {
     const rawData = readInstalledPluginsFileRaw();
     if (rawData) {
       if (rawData.version === 2) {
         const validated = InstalledPluginsFileSchemaV2().parse(rawData.data);
         installedPluginsCacheV2 = validated;
-        logForDebugging(`Loaded ${Object.keys(validated.plugins).length} installed plugins from ${filePath}`);
+        logForDebugging(`Loaded ${Object.keys(validated.plugins).length} installed plugins (v2)`);
         return validated;
       }
       const v1Validated = InstalledPluginsFileSchemaV1().parse(rawData.data);
@@ -622037,7 +622328,7 @@ import {
   stat as stat37,
   symlink as symlink3
 } from "fs/promises";
-import { basename as basename38, dirname as dirname63, join as join140, relative as relative24, resolve as resolve46, sep as sep30 } from "path";
+import { basename as basename37, dirname as dirname63, join as join140, relative as relative24, resolve as resolve46, sep as sep30 } from "path";
 function getPluginCachePath() {
   return join140(getPluginsDirectory(), "cache");
 }
@@ -623400,7 +623691,7 @@ async function loadSessionOnlyPlugins(sessionPluginPaths) {
         });
         continue;
       }
-      const dirName = basename38(resolvedPath);
+      const dirName = basename37(resolvedPath);
       const { plugin, errors: pluginErrors } = await createPluginFromPath(resolvedPath, `${dirName}@inline`, true, dirName);
       plugin.source = `${plugin.name}@inline`;
       plugin.repository = `${plugin.name}@inline`;
@@ -623572,7 +623863,7 @@ var init_pluginLoader = __esm(() => {
 });
 
 // src/utils/plugins/loadPluginOutputStyles.ts
-import { basename as basename39 } from "path";
+import { basename as basename38 } from "path";
 async function loadOutputStylesFromDirectory(outputStylesPath, pluginName, loadedPaths) {
   const styles5 = [];
   await walkPluginMarkdown(outputStylesPath, async (fullPath) => {
@@ -623590,7 +623881,7 @@ async function loadOutputStyleFromFile(filePath, pluginName, loadedPaths) {
   try {
     const content = await fs29.readFile(filePath, { encoding: "utf-8" });
     const { frontmatter, content: markdownContent } = parseFrontmatter(content, filePath);
-    const fileName = basename39(filePath, ".md");
+    const fileName = basename38(filePath, ".md");
     const baseStyleName = frontmatter.name || fileName;
     const name3 = `${pluginName}:${baseStyleName}`;
     const description = coerceDescriptionToString(frontmatter.description, name3) ?? extractDescriptionFromMarkdown(markdownContent, `Output style from ${pluginName} plugin`);
@@ -623671,7 +623962,7 @@ var init_loadPluginOutputStyles = __esm(() => {
 });
 
 // src/outputStyles/loadOutputStylesDir.ts
-import { basename as basename40 } from "path";
+import { basename as basename39 } from "path";
 var getOutputStyleDirStyles;
 var init_loadOutputStylesDir = __esm(() => {
   init_memoize();
@@ -623685,7 +623976,7 @@ var init_loadOutputStylesDir = __esm(() => {
       const markdownFiles = await loadMarkdownFilesForSubdir("output-styles", cwd2);
       const styles5 = markdownFiles.map(({ filePath, frontmatter, content, source }) => {
         try {
-          const fileName = basename40(filePath);
+          const fileName = basename39(filePath);
           const styleName = fileName.replace(/\.md$/, "");
           const name3 = frontmatter["name"] || styleName;
           const description = coerceDescriptionToString(frontmatter["description"], styleName) ?? extractDescriptionFromMarkdown(content, `Custom ${styleName} output style`);
@@ -631971,6 +632262,16 @@ import { join as join145 } from "path";
 function getPasteStoreDir() {
   return join145(getClaudeConfigHomeDir(), PASTE_STORE_DIR);
 }
+function getPasteStoreDirs() {
+  const primary = getPasteStoreDir();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join145(legacyHome, PASTE_STORE_DIR);
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 function hashPastedText(content) {
   return createHash31("sha256").update(content).digest("hex").slice(0, 16);
 }
@@ -631989,15 +632290,18 @@ async function storePastedText(hash4, content) {
   }
 }
 async function retrievePastedText(hash4) {
-  try {
-    const pastePath = getPastePath(hash4);
-    return await readFile55(pastePath, { encoding: "utf8" });
-  } catch (error97) {
-    if (!isENOENT(error97)) {
-      logForDebugging(`Failed to retrieve paste ${hash4}: ${error97}`);
+  const dirs = getPasteStoreDirs();
+  for (const dir of dirs) {
+    try {
+      const pastePath = join145(dir, `${hash4}.txt`);
+      return await readFile55(pastePath, { encoding: "utf8" });
+    } catch (error97) {
+      if (!isENOENT(error97)) {
+        logForDebugging(`Failed to retrieve paste ${hash4}: ${error97}`);
+      }
     }
-    return null;
   }
+  return null;
 }
 async function cleanupOldPastes(cutoffDate) {
   const pasteDir = getPasteStoreDir();
@@ -632074,8 +632378,8 @@ async function* makeLogEntryReader() {
     yield pendingEntries[i6];
   }
   const historyPath = join146(getClaudeConfigHomeDir(), "history.jsonl");
-  try {
-    for await (const line of readLinesReverse(historyPath)) {
+  async function* readHistoryLines(filePath) {
+    for await (const line of readLinesReverse(filePath)) {
       try {
         const entry = deserializeLogEntry(line);
         if (entry.sessionId === currentSession && skippedTimestamps.has(entry.timestamp)) {
@@ -632086,9 +632390,31 @@ async function* makeLogEntryReader() {
         logForDebugging(`Failed to parse history line: ${error97}`);
       }
     }
+  }
+  try {
+    for await (const entry of readHistoryLines(historyPath)) {
+      yield entry;
+    }
   } catch (e4) {
     const code = getErrnoCode(e4);
     if (code === "ENOENT") {
+      const legacyHome = getLegacyConfigHomeDir();
+      if (legacyHome) {
+        const legacyPath = join146(legacyHome, "history.jsonl");
+        if (legacyPath !== historyPath) {
+          try {
+            for await (const entry of readHistoryLines(legacyPath)) {
+              yield entry;
+            }
+          } catch (e22) {
+            const code2 = getErrnoCode(e22);
+            if (code2 === "ENOENT")
+              return;
+            throw e22;
+          }
+          return;
+        }
+      }
       return;
     }
     throw e4;
@@ -633870,7 +634196,7 @@ var init_renderPlaceholder = __esm(() => {
 });
 
 // src/hooks/usePasteHandler.ts
-import { basename as basename41 } from "path";
+import { basename as basename40 } from "path";
 function usePasteHandler({
   onPaste,
   onInput,
@@ -633921,7 +634247,7 @@ function usePasteHandler({
             const validImages = results.filter((r4) => r4 !== null);
             if (validImages.length > 0) {
               for (const imageData of validImages) {
-                const filename = basename41(imageData.path);
+                const filename = basename40(imageData.path);
                 onImagePaste2(imageData.base64, imageData.mediaType, filename, imageData.dimensions, imageData.path);
               }
               const nonImageLines = lines2.filter((line) => !isImageFilePath(line));
@@ -634388,7 +634714,7 @@ var init_TextInput = __esm(() => {
 });
 
 // src/utils/suggestions/directoryCompletion.ts
-import { basename as basename42, dirname as dirname66, join as join147, sep as sep31 } from "path";
+import { basename as basename41, dirname as dirname66, join as join147, sep as sep31 } from "path";
 function parsePartialPath(partialPath, basePath) {
   if (!partialPath) {
     const directory2 = basePath || getCwd();
@@ -634399,7 +634725,7 @@ function parsePartialPath(partialPath, basePath) {
     return { directory: resolved, prefix: "" };
   }
   const directory = dirname66(resolved);
-  const prefix = basename42(partialPath);
+  const prefix = basename41(partialPath);
   return { directory, prefix };
 }
 async function scanDirectory(dirPath) {
@@ -635179,7 +635505,7 @@ function parseAutofixArgs(raw) {
 }
 
 // src/commands/autofix-pr/skillDetect.ts
-import { existsSync as existsSync25 } from "fs";
+import { existsSync as existsSync26 } from "fs";
 import { join as join148 } from "path";
 function detectAutofixSkills(cwd2) {
   const candidates = [
@@ -635187,7 +635513,7 @@ function detectAutofixSkills(cwd2) {
     ".claude/skills/autofix.md",
     ".claude/skills/autofix-pr/SKILL.md"
   ];
-  return candidates.filter((rel) => existsSync25(join148(cwd2, rel)));
+  return candidates.filter((rel) => existsSync26(join148(cwd2, rel)));
 }
 function formatSkillsHint(skills) {
   if (skills.length === 0)
@@ -635711,7 +636037,7 @@ var init_btw2 = __esm(() => {
 
 // src/commands/issue/index.ts
 import {
-  existsSync as existsSync26,
+  existsSync as existsSync27,
   mkdirSync as mkdirSync10,
   readdirSync as readdirSync7,
   readFileSync as readFileSync30,
@@ -635773,7 +636099,7 @@ async function repoHasIssuesEnabled(owner, repo) {
 }
 function detectIssueTemplate(cwd2) {
   const templateDir = join149(cwd2, ".github", "ISSUE_TEMPLATE");
-  if (!existsSync26(templateDir))
+  if (!existsSync27(templateDir))
     return null;
   try {
     const files2 = readdirSync7(templateDir).filter((f4) => f4.endsWith(".md") || f4.endsWith(".yml") || f4.endsWith(".yaml"));
@@ -635794,7 +636120,7 @@ function getTranscriptSummary(maxTurns = 5) {
     const sessionId = getSessionId();
     const projectDir = getSessionProjectDir();
     const logPath = projectDir ? join149(projectDir, `${sessionId}.jsonl`) : join149(getClaudeConfigHomeDir(), "projects", sanitizePath2(getOriginalCwd()), `${sessionId}.jsonl`);
-    if (!existsSync26(logPath))
+    if (!existsSync27(logPath))
       return "(no session log found)";
     const lines2 = readFileSync30(logPath, "utf8").trim().split(`
 `).filter(Boolean);
@@ -636176,7 +636502,7 @@ function Feedback({
       platform: env4.platform,
       gitRepo: envInfo.isGit,
       terminal: env4.terminal,
-      version: "4.1.12",
+      version: "4.2.0",
       transcript: normalizeMessagesForAPI(messages),
       errors: sanitizedErrors,
       lastApiRequest: getLastAPIRequest(),
@@ -636361,7 +636687,7 @@ function Feedback({
                       ", ",
                       env4.terminal,
                       ", v",
-                      "4.1.12"
+                      "4.2.0"
                     ]
                   })
                 ]
@@ -636467,7 +636793,7 @@ ${sanitizedDescription}
 ` + `**Environment Info**
 ` + `- Platform: ${env4.platform}
 ` + `- Terminal: ${env4.terminal}
-` + `- Version: ${"4.1.12"}
+` + `- Version: ${"4.2.0"}
 ` + `- Feedback ID: ${feedbackId}
 ` + `
 **Errors**
@@ -638668,7 +638994,7 @@ function buildPrimarySection() {
     children: "/rename to add a name"
   });
   return [
-    { label: "Version", value: "4.1.12" },
+    { label: "Version", value: "4.2.0" },
     { label: "Session name", value: nameValue },
     { label: "Session ID", value: sessionId },
     { label: "cwd", value: getCwd() },
@@ -641472,7 +641798,7 @@ function Config({
         }
       })
     }) : showSubmenu === "ChannelDowngrade" ? /* @__PURE__ */ jsx_runtime191.jsx(ChannelDowngradeDialog, {
-      currentVersion: "4.1.12",
+      currentVersion: "4.2.0",
       onChoice: (choice) => {
         setShowSubmenu(null);
         setTabsHidden(false);
@@ -641484,7 +641810,7 @@ function Config({
           autoUpdatesChannel: "stable"
         };
         if (choice === "stay") {
-          newSettings.minimumVersion = "4.1.12";
+          newSettings.minimumVersion = "4.2.0";
         }
         updateSettingsForSource("userSettings", newSettings);
         setSettingsData((prev) => ({
@@ -645921,31 +646247,42 @@ var init_versions5 = __esm(() => {
 
 // src/components/memory/MemoryFileSelector.tsx
 import { mkdir as mkdir46 } from "fs/promises";
-import { join as join154 } from "path";
+import { basename as basename42, join as join154 } from "path";
 function MemoryFileSelector({ onSelect, onCancel }) {
   const existingMemoryFiles = import_react133.use(getMemoryFiles());
-  const userMemoryPath = join154(getClaudeConfigHomeDir(), "CLAUDE.md");
-  const projectMemoryPath = join154(getOriginalCwd(), "CLAUDE.md");
-  const hasUserMemory = existingMemoryFiles.some((f4) => f4.path === userMemoryPath);
-  const hasProjectMemory = existingMemoryFiles.some((f4) => f4.path === projectMemoryPath);
+  const userMemoryPath = join154(getClaudeConfigHomeDir(), PRIMARY_INSTRUCTION_FILE);
+  const legacyConfigHome = getLegacyConfigHomeDir();
+  const legacyUserMemoryPath = legacyConfigHome ? join154(legacyConfigHome, LEGACY_INSTRUCTION_FILE) : null;
+  const hasPrimaryUserMemory = existingMemoryFiles.some((f4) => f4.path === userMemoryPath);
+  const hasLegacyUserMemory = existingMemoryFiles.some((f4) => legacyUserMemoryPath !== null && f4.path === legacyUserMemoryPath);
+  const resolvedUserMemoryPath = hasPrimaryUserMemory ? userMemoryPath : hasLegacyUserMemory && legacyUserMemoryPath ? legacyUserMemoryPath : userMemoryPath;
+  const projectMemoryPath = join154(getOriginalCwd(), PRIMARY_INSTRUCTION_FILE);
+  const legacyProjectMemoryPath = join154(getOriginalCwd(), LEGACY_INSTRUCTION_FILE);
+  const hasPrimaryProjectMemory = existingMemoryFiles.some((f4) => f4.path === projectMemoryPath);
+  const hasLegacyProjectMemory = existingMemoryFiles.some((f4) => f4.path === legacyProjectMemoryPath);
+  const resolvedProjectMemoryPath = hasPrimaryProjectMemory ? projectMemoryPath : hasLegacyProjectMemory ? legacyProjectMemoryPath : projectMemoryPath;
   const allMemoryFiles = [
-    ...existingMemoryFiles.filter((f4) => f4.type !== "AutoMem" && f4.type !== "TeamMem").map((f4) => ({ ...f4, exists: true })),
-    ...hasUserMemory ? [] : [
-      {
-        path: userMemoryPath,
-        type: "User",
-        content: "",
-        exists: false
-      }
-    ],
-    ...hasProjectMemory ? [] : [
-      {
-        path: projectMemoryPath,
-        type: "Project",
-        content: "",
-        exists: false
-      }
-    ]
+    ...existingMemoryFiles.filter((f4) => {
+      if (f4.type === "AutoMem" || f4.type === "TeamMem")
+        return false;
+      if (f4.type === "User" && (f4.path === userMemoryPath || legacyUserMemoryPath !== null && f4.path === legacyUserMemoryPath))
+        return false;
+      if (f4.type === "Project" && (f4.path === projectMemoryPath || f4.path === legacyProjectMemoryPath))
+        return false;
+      return true;
+    }).map((f4) => ({ ...f4, exists: true })),
+    {
+      path: resolvedUserMemoryPath,
+      type: "User",
+      content: "",
+      exists: hasPrimaryUserMemory || hasLegacyUserMemory
+    },
+    {
+      path: resolvedProjectMemoryPath,
+      type: "Project",
+      content: "",
+      exists: hasPrimaryProjectMemory || hasLegacyProjectMemory
+    }
   ];
   const depths = new Map;
   const memoryOptions = allMemoryFiles.map((file3) => {
@@ -645955,9 +646292,9 @@ function MemoryFileSelector({ onSelect, onCancel }) {
     depths.set(file3.path, depth);
     const indent = depth > 0 ? "  ".repeat(depth - 1) : "";
     let label;
-    if (file3.type === "User" && !file3.isNested && file3.path === userMemoryPath) {
+    if (file3.type === "User" && !file3.isNested && file3.path === resolvedUserMemoryPath) {
       label = `User memory`;
-    } else if (file3.type === "Project" && !file3.isNested && file3.path === projectMemoryPath) {
+    } else if (file3.type === "Project" && !file3.isNested && file3.path === resolvedProjectMemoryPath) {
       label = `Project memory`;
     } else if (depth > 0) {
       label = `${indent}L ${displayPath}${existsLabel}`;
@@ -645967,9 +646304,9 @@ function MemoryFileSelector({ onSelect, onCancel }) {
     let description;
     const isGit = projectIsInGitRepo(getOriginalCwd());
     if (file3.type === "User" && !file3.isNested) {
-      description = "Saved in ~/.costrict/AGENTS.md";
-    } else if (file3.type === "Project" && !file3.isNested && file3.path === projectMemoryPath) {
-      description = `${isGit ? "Checked in at" : "Saved in"} ./CLAUDE.md`;
+      description = `Saved in ~/${basename42(resolvedUserMemoryPath)}`;
+    } else if (file3.type === "Project" && !file3.isNested && file3.path === resolvedProjectMemoryPath) {
+      description = `${isGit ? "Checked in at" : "Saved in"} ./${basename42(resolvedProjectMemoryPath)}`;
     } else if (file3.parent) {
       description = "@-imported";
     } else if (file3.isNested) {
@@ -646119,6 +646456,7 @@ var init_MemoryFileSelector = __esm(() => {
   init_AppState();
   init_agentMemory();
   init_browser2();
+  init_branding();
   init_costrictmd();
   init_envUtils();
   init_file();
@@ -646922,7 +647260,7 @@ function HelpV2({ onClose, commands: commands7 }) {
       color: "professionalBlue",
       children: [
         /* @__PURE__ */ jsx_runtime218.jsx(Tabs, {
-          title: process.env.USER_TYPE === "sf" ? "/help" : `CoStrict v${"4.1.12"}`,
+          title: process.env.USER_TYPE === "sf" ? "/help" : `CoStrict v${"4.2.0"}`,
           color: "professionalBlue",
           defaultTab: "general",
           children: tabs
@@ -725920,7 +726258,7 @@ var init_panel = __esm(() => {
 // src/commands/break-cache/index.ts
 import {
   appendFileSync as appendFileSync4,
-  existsSync as existsSync27,
+  existsSync as existsSync28,
   mkdirSync as mkdirSync11,
   readFileSync as readFileSync31,
   unlinkSync as unlinkSync8,
@@ -725976,8 +726314,8 @@ async function callBreakCache(args) {
   const alwaysPath = getBreakCacheAlwaysPath();
   if (scope === "status") {
     const stats = readStats();
-    const onceActive = existsSync27(markerPath);
-    const alwaysActive = existsSync27(alwaysPath);
+    const onceActive = existsSync28(markerPath);
+    const alwaysActive = existsSync28(alwaysPath);
     return {
       type: "text",
       value: [
@@ -725995,11 +726333,11 @@ async function callBreakCache(args) {
   }
   if (scope === "off") {
     let cleared = false;
-    if (existsSync27(markerPath)) {
+    if (existsSync28(markerPath)) {
       unlinkSync8(markerPath);
       cleared = true;
     }
-    if (existsSync27(alwaysPath)) {
+    if (existsSync28(alwaysPath)) {
       unlinkSync8(alwaysPath);
       cleared = true;
     }
@@ -726010,7 +726348,7 @@ async function callBreakCache(args) {
     };
   }
   if (scope === "--clear") {
-    if (existsSync27(markerPath)) {
+    if (existsSync28(markerPath)) {
       unlinkSync8(markerPath);
       return {
         type: "text",
@@ -738502,7 +738840,7 @@ function getAllReleaseNotes(changelogContent = getStoredChangelogFromMemory()) {
     return [];
   }
 }
-async function checkForReleaseNotes(lastSeenVersion, currentVersion = "4.1.12") {
+async function checkForReleaseNotes(lastSeenVersion, currentVersion = "4.2.0") {
   if (process.env.USER_TYPE === "sf") {
     const changelog = "";
     if (changelog) {
@@ -738529,7 +738867,7 @@ async function checkForReleaseNotes(lastSeenVersion, currentVersion = "4.1.12")
     releaseNotes
   };
 }
-function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "4.1.12") {
+function checkForReleaseNotesSync(lastSeenVersion, currentVersion = "4.2.0") {
   if (process.env.USER_TYPE === "sf") {
     const changelog = "";
     if (changelog) {
@@ -741286,7 +741624,7 @@ function isNotLoggedIn() {
   return true;
 }
 function getLogoDisplayData() {
-  const version6 = process.env.DEMO_VERSION ?? "4.1.12";
+  const version6 = process.env.DEMO_VERSION ?? "4.2.0";
   const serverUrl = getDirectConnectServerUrl();
   const displayPath = process.env.DEMO_VERSION ? "/code/claude" : getDisplayPath(getCwd());
   const cwd2 = serverUrl ? `${displayPath} in ${serverUrl.replace(/^https?:\/\//, "")}` : displayPath;
@@ -741809,7 +742147,7 @@ var cachedSystemTheme2;
 // src/components/matrix-tactical/MatrixWelcome.tsx
 import { basename as basename47 } from "path";
 function MatrixWelcome({
-  version: version6 = "4.1.12",
+  version: version6 = "4.2.0",
   projectName,
   cwd: cwd2,
   modelDisplayName,
@@ -742442,13 +742780,13 @@ function LogoV2() {
   const { hasReleaseNotes } = checkForReleaseNotesSync(config10.lastReleaseNotesSeen);
   import_react166.useEffect(() => {
     const currentConfig = getGlobalConfig();
-    if (currentConfig.lastReleaseNotesSeen === "4.1.12") {
+    if (currentConfig.lastReleaseNotesSeen === "4.2.0") {
       return;
     }
     saveGlobalConfig((current2) => {
-      if (current2.lastReleaseNotesSeen === "4.1.12")
+      if (current2.lastReleaseNotesSeen === "4.2.0")
         return current2;
-      return { ...current2, lastReleaseNotesSeen: "4.1.12" };
+      return { ...current2, lastReleaseNotesSeen: "4.2.0" };
     });
     if (showOnboarding) {
       incrementProjectOnboardingSeenCount();
@@ -751968,7 +752306,7 @@ var init_session4 = __esm(() => {
 
 // src/commands/share/index.ts
 import {
-  existsSync as existsSync28,
+  existsSync as existsSync29,
   mkdtempSync as mkdtempSync2,
   readFileSync as readFileSync32,
   rmSync as rmSync6,
@@ -752161,7 +752499,7 @@ var init_share = __esm(() => {
           mask_secrets: String(opts.maskSecrets),
           summary_only: String(opts.summaryOnly)
         });
-        if (!existsSync28(logPath)) {
+        if (!existsSync29(logPath)) {
           logEvent("tengu_share_failed", {
             reason: "log_not_found"
           });
@@ -764013,7 +764351,7 @@ async function captureMemoryDiagnostics(trigger, dumpNumber = 0) {
     smapsRollup,
     platform: process.platform,
     nodeVersion: process.version,
-    ccVersion: "4.1.12"
+    ccVersion: "4.2.0"
   };
 }
 async function performHeapDump(trigger = "manual", dumpNumber = 0) {
@@ -764128,7 +764466,7 @@ var init_mock_limits = __esm(() => {
 var call53 = async () => {
   return {
     type: "text",
-    value: `${"4.1.12"} (built ${"2026-06-08T13:08:39.119Z"})`
+    value: `${"4.2.0"} (built ${"2026-06-09T13:06:56.679Z"})`
   };
 }, version6, version_default;
 var init_version2 = __esm(() => {
@@ -765258,7 +765596,7 @@ var init_reset_limits = __esm(() => {
 });
 
 // src/commands/perf-issue/index.ts
-import { existsSync as existsSync29, mkdirSync as mkdirSync12, readFileSync as readFileSync34, writeFileSync as writeFileSync19 } from "fs";
+import { existsSync as existsSync30, mkdirSync as mkdirSync12, readFileSync as readFileSync34, writeFileSync as writeFileSync19 } from "fs";
 import { join as join170 } from "path";
 import { homedir as homedir42 } from "os";
 function lookupCostRates(model) {
@@ -765580,7 +765918,7 @@ var init_perf_issue = __esm(() => {
           const ext = format6 === "json" ? "json" : format6 === "csv" ? "csv" : "md";
           const reportPath = join170(dir, `perf-${stamp}-${sessionId.slice(0, 8)}.${ext}`);
           const logPath = getTranscriptPath3();
-          const hasLog = existsSync29(logPath);
+          const hasLog = existsSync30(logPath);
           let analyzed = null;
           if (hasLog) {
             try {
@@ -767422,28 +767760,40 @@ import { randomUUID as randomUUID45 } from "crypto";
 function getSessionsDir3() {
   return join174(getClaudeConfigHomeDir(), "sessions");
 }
+function getAllSessionsDirs3() {
+  const primary = getSessionsDir3();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join174(legacyHome, "sessions");
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 async function listLiveSessions() {
-  const dir = getSessionsDir3();
-  let files3;
-  try {
-    files3 = await readdir32(dir);
-  } catch {
-    return [];
-  }
+  const dirs = getAllSessionsDirs3();
   const sessions = [];
-  for (const file3 of files3) {
-    if (!/^\d+\.json$/.test(file3))
-      continue;
-    const pid = parseInt(file3.slice(0, -5), 10);
-    if (!isProcessRunning(pid)) {
-      unlink23(join174(dir, file3)).catch(() => {});
+  for (const dir of dirs) {
+    let files3;
+    try {
+      files3 = await readdir32(dir);
+    } catch {
       continue;
     }
-    try {
-      const raw = await readFile67(join174(dir, file3), "utf-8");
-      const entry = jsonParse(raw);
-      sessions.push(entry);
-    } catch {}
+    for (const file3 of files3) {
+      if (!/^\d+\.json$/.test(file3))
+        continue;
+      const pid = parseInt(file3.slice(0, -5), 10);
+      if (!isProcessRunning(pid)) {
+        unlink23(join174(dir, file3)).catch(() => {});
+        continue;
+      }
+      try {
+        const raw = await readFile67(join174(dir, file3), "utf-8");
+        const entry = jsonParse(raw);
+        sessions.push(entry);
+      } catch {}
+    }
   }
   return sessions;
 }
@@ -770454,8 +770804,8 @@ var init_tag2 = __esm(() => {
 import { createRequire as createRequire4 } from "module";
 function getVersion2() {
   try {
-    if (typeof MACRO !== "undefined" && "4.1.12")
-      return "4.1.12";
+    if (typeof MACRO !== "undefined" && "4.2.0")
+      return "4.2.0";
   } catch {}
   try {
     const require3 = createRequire4(import.meta.url);
@@ -772757,6 +773107,16 @@ async function withStatsCacheLock(fn) {
 function getStatsCachePath() {
   return join182(getClaudeConfigHomeDir(), STATS_CACHE_FILENAME);
 }
+function getStatsCachePaths() {
+  const primary = getStatsCachePath();
+  const legacyHome = getLegacyConfigHomeDir();
+  if (!legacyHome)
+    return [primary];
+  const legacy = join182(legacyHome, STATS_CACHE_FILENAME);
+  if (primary === legacy)
+    return [primary];
+  return [primary, legacy];
+}
 function getEmptyCache() {
   return {
     version: STATS_CACHE_VERSION,
@@ -772797,37 +773157,43 @@ function migrateStatsCache(parsed) {
 }
 async function loadStatsCache() {
   const fs30 = getFsImplementation();
-  const cachePath = getStatsCachePath();
-  try {
-    const content = await fs30.readFile(cachePath, { encoding: "utf-8" });
-    const parsed = jsonParse(content);
-    if (parsed.version !== STATS_CACHE_VERSION) {
-      const migrated = migrateStatsCache(parsed);
-      if (!migrated) {
-        logForDebugging(`Stats cache version ${parsed.version} not migratable (expected ${STATS_CACHE_VERSION}), returning empty cache`);
+  const cachePaths = getStatsCachePaths();
+  for (const cachePath of cachePaths) {
+    try {
+      const content = await fs30.readFile(cachePath, { encoding: "utf-8" });
+      const parsed = jsonParse(content);
+      if (parsed.version !== STATS_CACHE_VERSION) {
+        const migrated = migrateStatsCache(parsed);
+        if (!migrated) {
+          logForDebugging(`Stats cache version ${parsed.version} not migratable (expected ${STATS_CACHE_VERSION}), returning empty cache`);
+          return getEmptyCache();
+        }
+        logForDebugging(`Migrated stats cache from v${parsed.version} to v${STATS_CACHE_VERSION}`);
+        await saveStatsCache(migrated);
+        if (!migrated.shotDistribution) {
+          logForDebugging("Migrated stats cache missing shotDistribution, forcing recomputation");
+          return getEmptyCache();
+        }
+        return migrated;
+      }
+      if (!Array.isArray(parsed.dailyActivity) || !Array.isArray(parsed.dailyModelTokens) || typeof parsed.totalSessions !== "number" || typeof parsed.totalMessages !== "number") {
+        logForDebugging(`Stats cache has invalid structure in ${cachePath}, returning empty cache`);
         return getEmptyCache();
       }
-      logForDebugging(`Migrated stats cache from v${parsed.version} to v${STATS_CACHE_VERSION}`);
-      await saveStatsCache(migrated);
-      if (!migrated.shotDistribution) {
-        logForDebugging("Migrated stats cache missing shotDistribution, forcing recomputation");
+      if (!parsed.shotDistribution) {
+        logForDebugging("Stats cache missing shotDistribution, forcing recomputation");
         return getEmptyCache();
       }
-      return migrated;
-    }
-    if (!Array.isArray(parsed.dailyActivity) || !Array.isArray(parsed.dailyModelTokens) || typeof parsed.totalSessions !== "number" || typeof parsed.totalMessages !== "number") {
-      logForDebugging("Stats cache has invalid structure, returning empty cache");
-      return getEmptyCache();
-    }
-    if (!parsed.shotDistribution) {
-      logForDebugging("Stats cache missing shotDistribution, forcing recomputation");
+      return parsed;
+    } catch (error97) {
+      if (cachePath !== cachePaths[cachePaths.length - 1]) {
+        continue;
+      }
+      logForDebugging(`Failed to load stats cache: ${errorMessage(error97)}`);
       return getEmptyCache();
     }
-    return parsed;
-  } catch (error97) {
-    logForDebugging(`Failed to load stats cache: ${errorMessage(error97)}`);
-    return getEmptyCache();
   }
+  return getEmptyCache();
 }
 async function saveStatsCache(cache10) {
   const fs30 = getFsImplementation();
@@ -773691,38 +774057,50 @@ async function processSessionFiles(sessionFiles, options = {}) {
   };
 }
 async function getAllSessionFiles() {
-  const projectsDir = getProjectsDir2();
+  const allProjectsDirs = getAllProjectsDirs();
   const fs30 = getFsImplementation();
-  let allEntries;
-  try {
-    allEntries = await fs30.readdir(projectsDir);
-  } catch (e4) {
-    if (isENOENT(e4))
-      return [];
-    throw e4;
-  }
-  const projectDirs = allEntries.filter((dirent) => dirent.isDirectory()).map((dirent) => join184(projectsDir, dirent.name));
-  const projectResults = await Promise.all(projectDirs.map(async (projectDir) => {
+  const seenKeys = new Set;
+  const allFiles = [];
+  for (const projectsDir of allProjectsDirs) {
+    let allEntries;
     try {
-      const entries = await fs30.readdir(projectDir);
-      const mainFiles = entries.filter((dirent) => dirent.isFile() && dirent.name.endsWith(".jsonl")).map((dirent) => join184(projectDir, dirent.name));
-      const sessionDirs = entries.filter((dirent) => dirent.isDirectory());
-      const subagentResults = await Promise.all(sessionDirs.map(async (sessionDir) => {
-        const subagentsDir = join184(projectDir, sessionDir.name, "subagents");
-        try {
-          const subagentEntries = await fs30.readdir(subagentsDir);
-          return subagentEntries.filter((dirent) => dirent.isFile() && dirent.name.endsWith(".jsonl") && dirent.name.startsWith("agent-")).map((dirent) => join184(subagentsDir, dirent.name));
-        } catch {
-          return [];
-        }
-      }));
-      return [...mainFiles, ...subagentResults.flat()];
-    } catch (error97) {
-      logForDebugging(`Failed to read project directory ${projectDir}: ${errorMessage(error97)}`);
-      return [];
+      allEntries = await fs30.readdir(projectsDir);
+    } catch (e4) {
+      if (isENOENT(e4))
+        continue;
+      throw e4;
     }
-  }));
-  return projectResults.flat();
+    const projectNames = allEntries.filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+    const projectResults = await Promise.all(projectNames.map(async (projectName) => {
+      const projectDir = join184(projectsDir, projectName);
+      try {
+        const entries = await fs30.readdir(projectDir);
+        const mainFiles = entries.filter((dirent) => dirent.isFile() && dirent.name.endsWith(".jsonl")).map((dirent) => join184(projectDir, dirent.name));
+        const sessionDirs = entries.filter((dirent) => dirent.isDirectory());
+        const subagentResults = await Promise.all(sessionDirs.map(async (sessionDir) => {
+          const subagentsDir = join184(projectDir, sessionDir.name, "subagents");
+          try {
+            const subagentEntries = await fs30.readdir(subagentsDir);
+            return subagentEntries.filter((dirent) => dirent.isFile() && dirent.name.endsWith(".jsonl") && dirent.name.startsWith("agent-")).map((dirent) => join184(subagentsDir, dirent.name));
+          } catch {
+            return [];
+          }
+        }));
+        return [...mainFiles, ...subagentResults.flat()];
+      } catch (error97) {
+        logForDebugging(`Failed to read project directory ${projectDir}: ${errorMessage(error97)}`);
+        return [];
+      }
+    }));
+    for (const file3 of projectResults.flat()) {
+      const key6 = file3.replace(projectsDir + sep37, "");
+      if (!seenKeys.has(key6)) {
+        seenKeys.add(key6);
+        allFiles.push(file3);
+      }
+    }
+  }
+  return allFiles;
 }
 function cacheToStats(cache10, todayStats) {
   const dailyActivityMap = new Map;
@@ -774119,6 +774497,7 @@ var init_stats = __esm(() => {
   init_json();
   init_messages5();
   init_sessionStorage();
+  init_sessionStoragePortable();
   init_shellToolUtils();
   init_slowOperations();
   init_statsCache();
@@ -775210,7 +775589,7 @@ var init_oauth_refresh = __esm(() => {
 });
 
 // src/commands/debug-tool-call/index.ts
-import { existsSync as existsSync30, readFileSync as readFileSync36 } from "fs";
+import { existsSync as existsSync31, readFileSync as readFileSync36 } from "fs";
 import { join as join185 } from "path";
 function getTranscriptPath4() {
   const sessionId = getSessionId();
@@ -775301,7 +775680,7 @@ var init_debug_tool_call = __esm(() => {
         const n4 = args.trim() ? parseInt(args.trim(), 10) : DEFAULT_N;
         const count3 = Number.isFinite(n4) && n4 > 0 ? n4 : DEFAULT_N;
         const logPath = getTranscriptPath4();
-        if (!existsSync30(logPath)) {
+        if (!existsSync31(logPath)) {
           return {
             type: "text",
             value: [
@@ -780616,7 +780995,7 @@ function generateHtmlReport(data, insights) {
 </html>`;
 }
 function buildExportData(data, insights, facets, remoteStats) {
-  const version7 = typeof MACRO !== "undefined" ? "4.1.12" : "unknown";
+  const version7 = typeof MACRO !== "undefined" ? "4.2.0" : "unknown";
   const remote_hosts_collected = remoteStats?.hosts.filter((h5) => h5.sessionCount > 0).map((h5) => h5.name);
   const facets_summary = {
     total: facets.size,
@@ -780660,27 +781039,33 @@ function buildExportData(data, insights, facets, remoteStats) {
   };
 }
 async function scanAllSessions() {
-  const projectsDir = getProjectsDir2();
-  let dirents;
-  try {
-    dirents = await readdir38(projectsDir, { withFileTypes: true });
-  } catch {
-    return [];
-  }
-  const projectDirs = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => join189(projectsDir, dirent.name));
+  const allProjectsDirs = getAllProjectsDirs();
+  const seenIds = new Set;
   const allSessions = [];
-  for (let i6 = 0;i6 < projectDirs.length; i6++) {
-    const sessionFiles = await getSessionFilesWithMtime(projectDirs[i6]);
-    for (const [sessionId, fileInfo] of sessionFiles) {
-      allSessions.push({
-        sessionId,
-        path: fileInfo.path,
-        mtime: fileInfo.mtime,
-        size: fileInfo.size
-      });
+  for (const projectsDir of allProjectsDirs) {
+    let dirents;
+    try {
+      dirents = await readdir38(projectsDir, { withFileTypes: true });
+    } catch {
+      continue;
     }
-    if (i6 % 10 === 9) {
-      await new Promise((resolve54) => setImmediate(resolve54));
+    const projectDirs = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => join189(projectsDir, dirent.name));
+    for (let i6 = 0;i6 < projectDirs.length; i6++) {
+      const sessionFiles = await getSessionFilesWithMtime(projectDirs[i6]);
+      for (const [sessionId, fileInfo] of sessionFiles) {
+        if (seenIds.has(sessionId))
+          continue;
+        seenIds.add(sessionId);
+        allSessions.push({
+          sessionId,
+          path: fileInfo.path,
+          mtime: fileInfo.mtime,
+          size: fileInfo.size
+        });
+      }
+      if (i6 % 10 === 9) {
+        await new Promise((resolve54) => setImmediate(resolve54));
+      }
     }
   }
   allSessions.sort((a5, b6) => b6.mtime - a5.mtime);
@@ -780900,6 +781285,7 @@ var init_insights = __esm(() => {
   init_messages5();
   init_model();
   init_sessionStorage();
+  init_sessionStoragePortable();
   init_slowOperations();
   init_stringUtils();
   init_systemPromptType();
@@ -784102,15 +784488,28 @@ async function loadAllProjectsMessageLogs(limit, options) {
   return result.logs;
 }
 async function loadAllProjectsMessageLogsFull(limit) {
-  const projectsDir = getProjectsDir2();
-  let dirents;
-  try {
-    dirents = await readdir39(projectsDir, { withFileTypes: true });
-  } catch {
-    return [];
+  const allProjectsDirs = getAllProjectsDirs();
+  const caseInsensitive = process.platform === "win32";
+  const seenDirs = new Set;
+  const uniqueProjectDirs = [];
+  for (const projectsDir of allProjectsDirs) {
+    let dirents;
+    try {
+      dirents = await readdir39(projectsDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const dirent of dirents) {
+      if (!dirent.isDirectory())
+        continue;
+      const key6 = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
+      if (seenDirs.has(key6))
+        continue;
+      seenDirs.add(key6);
+      uniqueProjectDirs.push(join190(projectsDir, dirent.name));
+    }
   }
-  const projectDirs = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => join190(projectsDir, dirent.name));
-  const logsPerProject = await Promise.all(projectDirs.map((projectDir) => getLogsWithoutIndex(projectDir, limit)));
+  const logsPerProject = await Promise.all(uniqueProjectDirs.map((projectDir) => getLogsWithoutIndex(projectDir, limit)));
   const allLogs = logsPerProject.flat();
   const deduped = new Map;
   for (const log12 of allLogs) {
@@ -784127,17 +784526,26 @@ async function loadAllProjectsMessageLogsFull(limit) {
   return sorted;
 }
 async function loadAllProjectsMessageLogsProgressive(limit, initialEnrichCount = INITIAL_ENRICH_COUNT) {
-  const projectsDir = getProjectsDir2();
-  let dirents;
-  try {
-    dirents = await readdir39(projectsDir, { withFileTypes: true });
-  } catch {
-    return { logs: [], allStatLogs: [], nextIndex: 0 };
-  }
-  const projectDirs = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => join190(projectsDir, dirent.name));
+  const allProjectsDirs = getAllProjectsDirs();
+  const caseInsensitive = process.platform === "win32";
+  const seenDirs = new Set;
   const rawLogs = [];
-  for (const projectDir of projectDirs) {
-    rawLogs.push(...await getSessionFilesLite(projectDir, limit));
+  for (const projectsDir of allProjectsDirs) {
+    let dirents;
+    try {
+      dirents = await readdir39(projectsDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const dirent of dirents) {
+      if (!dirent.isDirectory())
+        continue;
+      const key6 = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
+      if (seenDirs.has(key6))
+        continue;
+      seenDirs.add(key6);
+      rawLogs.push(...await getSessionFilesLite(join190(projectsDir, dirent.name), limit));
+    }
   }
   const sorted = deduplicateLogsBySessionId(rawLogs);
   const { logs: logs3, nextIndex } = await enrichLogs(sorted, 0, initialEnrichCount);
@@ -784161,7 +784569,6 @@ async function loadSameRepoMessageLogsProgressive(worktreePaths, limit, initialE
   return { logs: logs3, allStatLogs, nextIndex };
 }
 async function getStatOnlyLogsForWorktrees(worktreePaths, limit) {
-  const projectsDir = getProjectsDir2();
   if (worktreePaths.length <= 1) {
     const cwd2 = getOriginalCwd();
     const projectDir = getProjectDir3(cwd2);
@@ -784176,30 +784583,37 @@ async function getStatOnlyLogsForWorktrees(worktreePaths, limit) {
     };
   });
   indexed.sort((a5, b6) => b6.prefix.length - a5.prefix.length);
+  const allProjectsDirs = getAllProjectsDirs();
   const allLogs = [];
   const seenDirs = new Set;
-  let allDirents;
-  try {
-    allDirents = await readdir39(projectsDir, { withFileTypes: true });
-  } catch (e4) {
-    logForDebugging(`Failed to read projects dir ${projectsDir}, falling back to current project: ${e4}`);
-    const projectDir = getProjectDir3(getOriginalCwd());
-    return getSessionFilesLite(projectDir, limit, getOriginalCwd());
-  }
-  for (const dirent of allDirents) {
-    if (!dirent.isDirectory())
-      continue;
-    const dirName = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
-    if (seenDirs.has(dirName))
+  let anyDirReadable = false;
+  for (const projectsDir of allProjectsDirs) {
+    let allDirents;
+    try {
+      allDirents = await readdir39(projectsDir, { withFileTypes: true });
+      anyDirReadable = true;
+    } catch {
       continue;
-    for (const { path: wtPath, prefix } of indexed) {
-      if (dirName === prefix || dirName.startsWith(prefix + "-")) {
-        seenDirs.add(dirName);
-        allLogs.push(...await getSessionFilesLite(join190(projectsDir, dirent.name), undefined, wtPath));
-        break;
+    }
+    for (const dirent of allDirents) {
+      if (!dirent.isDirectory())
+        continue;
+      const dirName = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
+      if (seenDirs.has(dirName))
+        continue;
+      for (const { path: wtPath, prefix } of indexed) {
+        if (dirName === prefix || dirName.startsWith(prefix + "-")) {
+          seenDirs.add(dirName);
+          allLogs.push(...await getSessionFilesLite(join190(projectsDir, dirent.name), undefined, wtPath));
+          break;
+        }
       }
     }
   }
+  if (!anyDirReadable) {
+    const projectDir = getProjectDir3(getOriginalCwd());
+    return getSessionFilesLite(projectDir, limit, getOriginalCwd());
+  }
   return deduplicateLogsBySessionId(allLogs);
 }
 async function getAgentTranscript(agentId) {
@@ -784776,7 +785190,7 @@ var init_sessionStorage = __esm(() => {
   init_settings2();
   init_slowOperations();
   init_uuid();
-  VERSION9 = typeof MACRO !== "undefined" ? "4.1.12" : "unknown";
+  VERSION9 = typeof MACRO !== "undefined" ? "4.2.0" : "unknown";
   MAX_TOMBSTONE_REWRITE_BYTES = 50 * 1024 * 1024;
   SKIP_FIRST_PROMPT_PATTERN2 = /^(?:\s*<[a-z][\w-]*[\s>]|\[Request interrupted by user[^\]]*\])/;
   EPHEMERAL_PROGRESS_TYPES = new Set([
@@ -785036,7 +785450,13 @@ async function loadMemoryPrompt() {
     logMemoryDirCounts(autoDir, {
       memory_type: "auto"
     });
-    return buildMemoryLines("auto memory", autoDir, extraGuidelines, skipIndex).join(`
+    const allPaths = getAllAutoMemPaths();
+    const legacyPath = allPaths.length > 1 ? allPaths[1] : undefined;
+    const baseLines = buildMemoryLines("auto memory", autoDir, extraGuidelines, skipIndex);
+    if (legacyPath) {
+      baseLines.push("", `## Legacy memory directory`, `If no memories are found in the primary directory above, also check: \`${legacyPath}\``, `This directory may contain memories from a previous Claude installation.`);
+    }
+    return baseLines.join(`
 `);
   }
   logEvent("tengu_memdir_disabled", {
@@ -786078,7 +786498,7 @@ var init_filesystem = __esm(() => {
   });
   getBundledSkillsRoot = memoize_default(function getBundledSkillsRoot2() {
     const nonce = randomBytes24(16).toString("hex");
-    return join193(getCostrictTempDir(), "bundled-skills", "4.1.12", nonce);
+    return join193(getCostrictTempDir(), "bundled-skills", "4.2.0", nonce);
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
 });
@@ -792275,7 +792695,7 @@ function computeFingerprint(messageText, version7) {
 }
 function computeFingerprintFromMessages(messages) {
   const firstMessageText = extractFirstMessageText(messages);
-  return computeFingerprint(firstMessageText, "4.1.12");
+  return computeFingerprint(firstMessageText, "4.2.0");
 }
 var FINGERPRINT_SALT = "59cf53e54c78";
 var init_fingerprint = () => {};
@@ -792685,7 +793105,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-06-08T13:08:39.119Z").getTime();
+  const buildTime = new Date("2026-06-09T13:06:56.679Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -803198,7 +803618,7 @@ var init_provider4 = __esm(() => {
 
 // src/services/api/claude.ts
 import { randomUUID as randomUUID56 } from "crypto";
-import { existsSync as existsSync31, unlinkSync as unlinkSync10 } from "fs";
+import { existsSync as existsSync32, unlinkSync as unlinkSync10 } from "fs";
 function getExtraBodyParams(betaHeaders) {
   const extraBodyStr = process.env.CLAUDE_CODE_EXTRA_BODY;
   let result = {};
@@ -803754,14 +804174,14 @@ To invoke any tool listed above, use ExecuteExtraTool with {"tool_name": "<name>
   {
     const onceMarker = getBreakCacheMarkerPath();
     const alwaysFlag = getBreakCacheAlwaysPath();
-    const shouldBreak = existsSync31(onceMarker) || existsSync31(alwaysFlag);
+    const shouldBreak = existsSync32(onceMarker) || existsSync32(alwaysFlag);
     if (shouldBreak) {
       const nonce = randomUUID56();
       systemPrompt2 = asSystemPrompt([
         ...systemPrompt2,
         `<!-- cache-break nonce: ${nonce} -->`
       ]);
-      if (existsSync31(onceMarker)) {
+      if (existsSync32(onceMarker)) {
         try {
           unlinkSync10(onceMarker);
         } catch {}
@@ -805181,7 +805601,7 @@ async function sideQuery(opts) {
     betas.push(STRUCTURED_OUTPUTS_BETA_HEADER);
   }
   const messageText = extractFirstUserMessageText(messages);
-  const fingerprint = computeFingerprint(messageText, "4.1.12");
+  const fingerprint = computeFingerprint(messageText, "4.2.0");
   const attributionHeader = getAttributionHeader(fingerprint);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
@@ -808556,7 +808976,7 @@ function buildSystemInitMessage(inputs) {
     slash_commands: inputs.commands.filter((c7) => c7.userInvocable !== false).map((c7) => c7.name),
     apiKeySource: getAnthropicApiKeyWithSource().source,
     betas: getSdkBetas(),
-    claude_code_version: "4.1.12",
+    claude_code_version: "4.2.0",
     output_style: outputStyle2,
     agents: inputs.agents.map((agent) => agent.agentType),
     skills: inputs.skills.filter((s) => s.userInvocable !== false).map((skill) => skill.name),
@@ -812125,7 +812545,7 @@ var init_api7 = () => {};
 // packages/weixin/src/accounts.ts
 import {
   chmodSync as chmodSync5,
-  existsSync as existsSync32,
+  existsSync as existsSync33,
   mkdirSync as mkdirSync16,
   readFileSync as readFileSync39,
   unlinkSync as unlinkSync11,
@@ -812135,7 +812555,7 @@ import { homedir as homedir49 } from "os";
 import { join as join198 } from "path";
 function getStateDir() {
   const dir = process.env.WEIXIN_STATE_DIR || join198(homedir49(), ".claude", "channels", "weixin");
-  if (!existsSync32(dir)) {
+  if (!existsSync33(dir)) {
     mkdirSync16(dir, { recursive: true });
   }
   return dir;
@@ -812145,7 +812565,7 @@ function accountPath() {
 }
 function loadAccount() {
   const path45 = accountPath();
-  if (!existsSync32(path45))
+  if (!existsSync33(path45))
     return null;
   try {
     return JSON.parse(readFileSync39(path45, "utf-8"));
@@ -812160,7 +812580,7 @@ function saveAccount(data) {
 }
 function clearAccount() {
   const path45 = accountPath();
-  if (existsSync32(path45)) {
+  if (existsSync33(path45)) {
     unlinkSync11(path45);
   }
 }
@@ -812261,7 +812681,7 @@ var init_login3 = __esm(() => {
 });
 
 // packages/weixin/src/pairing.ts
-import { existsSync as existsSync33, readFileSync as readFileSync40, writeFileSync as writeFileSync23 } from "fs";
+import { existsSync as existsSync34, readFileSync as readFileSync40, writeFileSync as writeFileSync23 } from "fs";
 import { join as join199 } from "path";
 function configPath() {
   return join199(getStateDir(), "access.json");
@@ -812271,7 +812691,7 @@ function pendingPath() {
 }
 function loadPending() {
   const path45 = pendingPath();
-  if (!existsSync33(path45))
+  if (!existsSync34(path45))
     return {};
   try {
     return JSON.parse(readFileSync40(path45, "utf-8"));
@@ -812284,7 +812704,7 @@ function savePending(data) {
 }
 function loadAccessConfig() {
   const path45 = configPath();
-  if (!existsSync33(path45)) {
+  if (!existsSync34(path45)) {
     return { policy: "pairing", allowFrom: [] };
   }
   try {
@@ -812349,7 +812769,7 @@ import {
   createHash as createHash34,
   randomBytes as randomBytes27
 } from "crypto";
-import { existsSync as existsSync34, mkdirSync as mkdirSync17, readFileSync as readFileSync41, writeFileSync as writeFileSync24 } from "fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync17, readFileSync as readFileSync41, writeFileSync as writeFileSync24 } from "fs";
 import { tmpdir as tmpdir19 } from "os";
 import { basename as basename55, extname as extname16, join as join200 } from "path";
 function encryptAesEcb(plaintext, key6) {
@@ -812438,7 +812858,7 @@ function guessMediaType(filePath) {
 }
 async function downloadRemoteToTemp(url4, destDir) {
   const dir = destDir || join200(tmpdir19(), "weixin-downloads");
-  if (!existsSync34(dir))
+  if (!existsSync35(dir))
     mkdirSync17(dir, { recursive: true });
   const response3 = await fetch(url4);
   if (!response3.ok)
@@ -812637,7 +813057,7 @@ var init_permissions7 = __esm(() => {
 });
 
 // packages/weixin/src/monitor.ts
-import { existsSync as existsSync35, mkdirSync as mkdirSync18, readFileSync as readFileSync42, writeFileSync as writeFileSync25 } from "fs";
+import { existsSync as existsSync36, mkdirSync as mkdirSync18, readFileSync as readFileSync42, writeFileSync as writeFileSync25 } from "fs";
 import { tmpdir as tmpdir20 } from "os";
 import { basename as basename56, join as join201 } from "path";
 function getContextToken(userId) {
@@ -812648,7 +813068,7 @@ function cursorPath() {
 }
 function loadCursor() {
   const path45 = cursorPath();
-  if (existsSync35(path45))
+  if (existsSync36(path45))
     return readFileSync42(path45, "utf-8").trim();
   return "";
 }
@@ -812697,7 +813117,7 @@ async function downloadMedia(item, cdnBaseUrl) {
       cdnBaseUrl
     });
     const dir = join201(tmpdir20(), "weixin-media");
-    if (!existsSync35(dir))
+    if (!existsSync36(dir))
       mkdirSync18(dir, { recursive: true });
     const rawFileName = item.file_item?.file_name || `${Date.now()}${ext}`;
     const fileName = basename56(rawFileName);
@@ -812868,7 +813288,7 @@ var init_monitor2 = __esm(() => {
 });
 
 // packages/weixin/src/server.ts
-import { existsSync as existsSync36 } from "fs";
+import { existsSync as existsSync37 } from "fs";
 function formatPermissionRequestMessage(request3) {
   return [
     "CoStrict needs your approval.",
@@ -812961,7 +813381,7 @@ function createWeixinMcpServer(version7) {
         try {
           if (files3 && files3.length > 0) {
             for (const [index2, filePath] of files3.entries()) {
-              if (!existsSync36(filePath)) {
+              if (!existsSync37(filePath)) {
                 return {
                   content: [
                     { type: "text", text: `File not found: ${filePath}` }
@@ -813411,7 +813831,7 @@ function appendToLog(path45, message2) {
     cwd: getFsImplementation().cwd(),
     userType: process.env.USER_TYPE,
     sessionId: getSessionId(),
-    version: "4.1.12"
+    version: "4.2.0"
   };
   getLogWriter(path45).write(messageWithTimestamp);
 }
@@ -813521,7 +813941,7 @@ import { execFile as execFile16, spawn as spawn14 } from "child_process";
 import { createHash as createHash35 } from "crypto";
 import { createWriteStream as createWriteStream4, promises as fsp2 } from "fs";
 import fs30 from "fs";
-import os18 from "os";
+import os17 from "os";
 import path45 from "path";
 function getCloudBaseUrl() {
   const raw = getCoStrictBaseURL().replace(/\/$/, "");
@@ -813531,7 +813951,7 @@ function getCloudBaseUrl() {
 }
 function csCloudBin() {
   const ext = process.platform === "win32" ? ".exe" : "";
-  const binDir = path45.join(os18.homedir(), ".costrict", "bin");
+  const binDir = path45.join(os17.homedir(), ".costrict", "bin");
   return path45.join(binDir, `cs-cloud${ext}`);
 }
 function getReleasePlatform() {
@@ -813637,7 +814057,7 @@ async function extractBinary(archive, outDir, url4) {
   }
 }
 async function downloadToTemp(url4, expectedSha256, totalSize) {
-  const tmp = path45.join(os18.tmpdir(), `cs-cloud-download-${Date.now()}`);
+  const tmp = path45.join(os17.tmpdir(), `cs-cloud-download-${Date.now()}`);
   const res = await fetch(url4);
   if (!res.ok)
     throw new Error(`download failed: ${res.status}`);
@@ -833959,7 +834379,7 @@ function buildStatusLineCommandInput(permissionMode, exceeds200kTokens, settings
       project_dir: getOriginalCwd(),
       added_dirs: addedDirs
     },
-    version: "4.1.12",
+    version: "4.2.0",
     output_style: {
       name: outputStyleName
     },
@@ -844582,9 +845002,9 @@ globstar while`, t, d4, e4, u6, m3), this.matchOne(t.slice(d4), e4.slice(u6), s)
     Wt.LRUCache = undefined;
     var er = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date, as = new Set, ge2 = typeof process == "object" && process ? process : {}, ls = (n4, t, e4, s) => {
       typeof ge2.emitWarning == "function" ? ge2.emitWarning(n4, t, e4, s) : console.error(`[${e4}] ${t}: ${n4}`);
-    }, Lt = globalThis.AbortController, os19 = globalThis.AbortSignal;
+    }, Lt = globalThis.AbortController, os18 = globalThis.AbortSignal;
     if (typeof Lt > "u") {
-      os19 = class {
+      os18 = class {
         onabort;
         _onabort = [];
         reason;
@@ -844596,7 +845016,7 @@ globstar while`, t, d4, e4, u6, m3), this.matchOne(t.slice(d4), e4.slice(u6), s)
         constructor() {
           t();
         }
-        signal = new os19;
+        signal = new os18;
         abort(e4) {
           if (!this.signal.aborted) {
             this.signal.reason = e4, this.signal.aborted = true;
@@ -847412,83 +847832,89 @@ async function tryRmdir(dirPath, fsImpl) {
 async function cleanupOldSessionFiles() {
   const cutoffDate = getCutoffDate();
   const result = { messages: 0, errors: 0 };
-  const projectsDir = getProjectsDir2();
+  const allProjectsDirs = getAllProjectsDirs();
   const fsImpl = getFsImplementation();
-  let projectDirents;
-  try {
-    projectDirents = await fsImpl.readdir(projectsDir);
-  } catch {
-    return result;
-  }
-  for (const projectDirent of projectDirents) {
-    if (!projectDirent.isDirectory())
-      continue;
-    const projectDir = join206(projectsDir, projectDirent.name);
-    let entries;
+  const seenProjectNames = new Set;
+  for (const projectsDir of allProjectsDirs) {
+    let projectDirents;
     try {
-      entries = await fsImpl.readdir(projectDir);
+      projectDirents = await fsImpl.readdir(projectsDir);
     } catch {
-      result.errors++;
       continue;
     }
-    for (const entry of entries) {
-      if (entry.isFile()) {
-        if (!entry.name.endsWith(".jsonl") && !entry.name.endsWith(".cast")) {
-          continue;
-        }
-        try {
-          if (await unlinkIfOld(join206(projectDir, entry.name), cutoffDate, fsImpl)) {
-            result.messages++;
+    for (const projectDirent of projectDirents) {
+      if (!projectDirent.isDirectory())
+        continue;
+      if (seenProjectNames.has(projectDirent.name))
+        continue;
+      seenProjectNames.add(projectDirent.name);
+      const projectDir = join206(projectsDir, projectDirent.name);
+      let entries;
+      try {
+        entries = await fsImpl.readdir(projectDir);
+      } catch {
+        result.errors++;
+        continue;
+      }
+      for (const entry of entries) {
+        if (entry.isFile()) {
+          if (!entry.name.endsWith(".jsonl") && !entry.name.endsWith(".cast")) {
+            continue;
           }
-        } catch {
-          result.errors++;
-        }
-      } else if (entry.isDirectory()) {
-        const sessionDir = join206(projectDir, entry.name);
-        const toolResultsDir = join206(sessionDir, TOOL_RESULTS_SUBDIR);
-        let toolDirs;
-        try {
-          toolDirs = await fsImpl.readdir(toolResultsDir);
-        } catch {
-          await tryRmdir(sessionDir, fsImpl);
-          continue;
-        }
-        for (const toolEntry of toolDirs) {
-          if (toolEntry.isFile()) {
-            try {
-              if (await unlinkIfOld(join206(toolResultsDir, toolEntry.name), cutoffDate, fsImpl)) {
-                result.messages++;
-              }
-            } catch {
-              result.errors++;
-            }
-          } else if (toolEntry.isDirectory()) {
-            const toolDirPath = join206(toolResultsDir, toolEntry.name);
-            let toolFiles;
-            try {
-              toolFiles = await fsImpl.readdir(toolDirPath);
-            } catch {
-              continue;
+          try {
+            if (await unlinkIfOld(join206(projectDir, entry.name), cutoffDate, fsImpl)) {
+              result.messages++;
             }
-            for (const tf of toolFiles) {
-              if (!tf.isFile())
-                continue;
+          } catch {
+            result.errors++;
+          }
+        } else if (entry.isDirectory()) {
+          const sessionDir = join206(projectDir, entry.name);
+          const toolResultsDir = join206(sessionDir, TOOL_RESULTS_SUBDIR);
+          let toolDirs;
+          try {
+            toolDirs = await fsImpl.readdir(toolResultsDir);
+          } catch {
+            await tryRmdir(sessionDir, fsImpl);
+            continue;
+          }
+          for (const toolEntry of toolDirs) {
+            if (toolEntry.isFile()) {
               try {
-                if (await unlinkIfOld(join206(toolDirPath, tf.name), cutoffDate, fsImpl)) {
+                if (await unlinkIfOld(join206(toolResultsDir, toolEntry.name), cutoffDate, fsImpl)) {
                   result.messages++;
                 }
               } catch {
                 result.errors++;
               }
+            } else if (toolEntry.isDirectory()) {
+              const toolDirPath = join206(toolResultsDir, toolEntry.name);
+              let toolFiles;
+              try {
+                toolFiles = await fsImpl.readdir(toolDirPath);
+              } catch {
+                continue;
+              }
+              for (const tf of toolFiles) {
+                if (!tf.isFile())
+                  continue;
+                try {
+                  if (await unlinkIfOld(join206(toolDirPath, tf.name), cutoffDate, fsImpl)) {
+                    result.messages++;
+                  }
+                } catch {
+                  result.errors++;
+                }
+              }
+              await tryRmdir(toolDirPath, fsImpl);
             }
-            await tryRmdir(toolDirPath, fsImpl);
           }
+          await tryRmdir(toolResultsDir, fsImpl);
+          await tryRmdir(sessionDir, fsImpl);
         }
-        await tryRmdir(toolResultsDir, fsImpl);
-        await tryRmdir(sessionDir, fsImpl);
       }
+      await tryRmdir(projectDir, fsImpl);
     }
-    await tryRmdir(projectDir, fsImpl);
   }
   return result;
 }
@@ -847740,7 +848166,7 @@ var init_cleanup3 = __esm(() => {
   init_log3();
   init_nativeInstaller();
   init_pasteStore();
-  init_sessionStorage();
+  init_sessionStoragePortable();
   init_allErrors();
   init_settings2();
   init_toolResultStorage();
@@ -847813,7 +848239,7 @@ __export(exports_registerProtocol, {
   MACOS_BUNDLE_ID: () => MACOS_BUNDLE_ID
 });
 import { promises as fs32 } from "fs";
-import * as os19 from "os";
+import * as os18 from "os";
 import * as path47 from "path";
 function linuxDesktopPath() {
   return path47.join(getXDGDataHome(), "applications", DESKTOP_FILE_NAME);
@@ -848009,7 +848435,7 @@ var init_registerProtocol = __esm(() => {
   init_settings2();
   init_which();
   init_xdg();
-  MACOS_APP_DIR = path47.join(os19.homedir(), "Applications", MACOS_APP_NAME);
+  MACOS_APP_DIR = path47.join(os18.homedir(), "Applications", MACOS_APP_NAME);
   MACOS_SYMLINK_PATH = path47.join(MACOS_APP_DIR, "Contents", "MacOS", "claude");
   WINDOWS_REG_KEY = `HKEY_CURRENT_USER\\Software\\Classes\\${DEEP_LINK_PROTOCOL}`;
   WINDOWS_COMMAND_KEY = `${WINDOWS_REG_KEY}\\shell\\open\\command`;
@@ -852219,7 +852645,7 @@ async function submitTranscriptShare(messages, trigger, appearanceId) {
     } catch {}
     const data = {
       trigger,
-      version: "4.1.12",
+      version: "4.2.0",
       platform: process.platform,
       transcript,
       subagentTranscripts: Object.keys(subagentTranscripts).length > 0 ? subagentTranscripts : undefined,
@@ -853461,7 +853887,7 @@ function getReleaseType(current2, latest) {
   return "patch";
 }
 async function checkNewAutoUpdate(callbacks) {
-  const currentVersion = "4.1.12";
+  const currentVersion = "4.2.0";
   logForDebugging(`[newAutoUpdater] checking, current: ${currentVersion}`);
   if (isNewAutoUpdaterDisabled()) {
     return { action: "skip", currentVersion, latestVersion: null };
@@ -864306,7 +864732,7 @@ function WelcomeV2() {
               dimColor: true,
               children: [
                 "v",
-                "4.1.12",
+                "4.2.0",
                 " "
               ]
             })
@@ -864372,7 +864798,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "4.1.12",
+              "4.2.0",
               " "
             ]
           })
@@ -864474,7 +864900,7 @@ function AppleTerminalWelcomeV2({ theme: theme2, welcomeMessage }) {
               dimColor: true,
               children: [
                 "v",
-                "4.1.12",
+                "4.2.0",
                 " "
               ]
             })
@@ -864540,7 +864966,7 @@ function AppleTerminalWelcomeV2({ theme: theme2, welcomeMessage }) {
             dimColor: true,
             children: [
               "v",
-              "4.1.12",
+              "4.2.0",
               " "
             ]
           })
@@ -865490,7 +865916,7 @@ function completeOnboarding() {
   saveGlobalConfig((current2) => ({
     ...current2,
     hasCompletedOnboarding: true,
-    lastOnboardingVersion: "4.1.12"
+    lastOnboardingVersion: "4.2.0"
   }));
 }
 function showDialog(root6, renderer) {
@@ -866841,7 +867267,7 @@ function registerWeixinBuiltinPlugin() {
   registerBuiltinPlugin({
     name: "weixin",
     description: "WeChat channel integration. Enables inbound WeChat messages via channels and provides reply/send_typing MCP tools. Configure with `ccb weixin login` and enable for a session with `--channels plugin:weixin@builtin`.",
-    version: "4.1.12",
+    version: "4.2.0",
     defaultEnabled: true,
     mcpServers: {
       weixin: {
@@ -878483,7 +878909,7 @@ var init_SSHProbe = __esm(() => {
 });
 
 // src/ssh/SSHDeploy.ts
-import { existsSync as existsSync37 } from "fs";
+import { existsSync as existsSync38 } from "fs";
 import { resolve as resolve57 } from "path";
 async function runSshCommand(host, command11, timeoutMs = SSH_TIMEOUT_MS) {
   const proc = Bun.spawn(["ssh", "-o", "ConnectTimeout=10", host, command11], {
@@ -878505,10 +878931,10 @@ async function runSshCommand(host, command11, timeoutMs = SSH_TIMEOUT_MS) {
 function findLocalBinary() {
   const projectRoot = resolve57(import.meta.dir, "../..");
   const distPath = resolve57(projectRoot, "dist/cli.js");
-  if (existsSync37(distPath))
+  if (existsSync38(distPath))
     return distPath;
   const devPath = resolve57(projectRoot, "src/entrypoints/cli.tsx");
-  if (existsSync37(devPath))
+  if (existsSync38(devPath))
     return devPath;
   throw new Error("Cannot find local CLI binary to deploy. Run `bun run build` first.");
 }
@@ -879150,7 +879576,7 @@ async function startMCPServer(cwd3, debug5, verbose) {
   setCwd(cwd3);
   const server2 = new Server({
     name: "claude/tengu",
-    version: "4.1.12"
+    version: "4.2.0"
   }, {
     capabilities: {
       tools: {}
@@ -881428,7 +881854,7 @@ function createHealthRoutes(sessionManager) {
     const uptime2 = process.uptime() * 1000;
     return c7.json({
       status: "ok",
-      version: "4.1.12",
+      version: "4.2.0",
       uptime_ms: Math.round(uptime2),
       active_sessions: sessionManager.getActiveCount()
     });
@@ -881689,7 +882115,7 @@ function getMacroDefines() {
     commit = execSync3("git rev-parse --short HEAD", { encoding: "utf-8", cwd: __dirname }).trim();
   } catch {}
   return {
-    "MACRO.VERSION": JSON.stringify("4.1.12"),
+    "MACRO.VERSION": JSON.stringify("4.2.0"),
     "MACRO.BUILD_TIME": JSON.stringify(new Date().toISOString()),
     "MACRO.COMMIT": JSON.stringify(commit),
     "MACRO.FEEDBACK_CHANNEL": JSON.stringify(""),
@@ -882698,7 +883124,7 @@ var init_question = __esm(() => {
 
 // src/server/transcriptReader.ts
 import { readFile as readFile85, readdir as readdir45, stat as stat57 } from "fs/promises";
-import { existsSync as existsSync38 } from "fs";
+import { existsSync as existsSync39 } from "fs";
 import { join as join223 } from "path";
 function normalizeToolName(name3) {
   return TOOL_NAME_MAP[name3] ?? name3.toLowerCase();
@@ -882788,25 +883214,27 @@ async function resolveTranscriptPathUncached(sessionId2, cwd4) {
   if (cwd4) {
     const projectDir = getProjectDir2(cwd4);
     const direct = join223(projectDir, `${sessionId2}.jsonl`);
-    if (existsSync38(direct))
+    if (existsSync39(direct))
       return direct;
   }
   const found = await findProjectDir(cwd4 ?? process.cwd());
   if (found) {
     const direct = join223(found, `${sessionId2}.jsonl`);
-    if (existsSync38(direct))
+    if (existsSync39(direct))
       return direct;
   }
-  const projectsDir = getProjectsDir();
+  const allProjectsDirs = getAllProjectsDirs();
   const target = `${sessionId2}.jsonl`;
-  try {
-    const dirs = await readdir45(projectsDir);
-    for (const dir of dirs) {
-      const candidate = join223(projectsDir, dir, target);
-      if (existsSync38(candidate))
-        return candidate;
-    }
-  } catch {}
+  for (const projectsDir of allProjectsDirs) {
+    try {
+      const dirs = await readdir45(projectsDir);
+      for (const dir of dirs) {
+        const candidate = join223(projectsDir, dir, target);
+        if (existsSync39(candidate))
+          return candidate;
+      }
+    } catch {}
+  }
   return null;
 }
 function parseEntry(line) {
@@ -882891,7 +883319,7 @@ async function findSubagentTranscriptPathUncached(agentId, cwd4) {
     const meta5 = await readAgentMeta(metaPath);
     if (meta5?.parent_session_id) {
       const direct = join223(projectDir, meta5.parent_session_id, "subagents", fileName);
-      if (existsSync38(direct)) {
+      if (existsSync39(direct)) {
         const s = await stat57(direct);
         if (s.isFile() && s.size > 0)
           return direct;
@@ -882946,17 +883374,19 @@ async function findSubagentTranscriptPathUncached(agentId, cwd4) {
         return hit2;
     }
   }
-  const projectsDir = getProjectsDir();
-  let dirs;
-  try {
-    dirs = await readdir45(projectsDir);
-  } catch {
-    return null;
-  }
-  for (const dir of dirs) {
-    const hit = await searchProject(join223(projectsDir, dir));
-    if (hit)
-      return hit;
+  const allProjectsDirs = getAllProjectsDirs();
+  for (const projectsDir of allProjectsDirs) {
+    let dirs;
+    try {
+      dirs = await readdir45(projectsDir);
+    } catch {
+      continue;
+    }
+    for (const dir of dirs) {
+      const hit = await searchProject(join223(projectsDir, dir));
+      if (hit)
+        return hit;
+    }
   }
   return null;
 }
@@ -882977,7 +883407,7 @@ async function readSessionMessages(opts) {
   const includeSystem = opts.includeSystem ?? false;
   const path49 = await resolveTranscriptPath(opts.sessionId, opts.cwd);
   let mainMessages = [];
-  if (path49 && existsSync38(path49)) {
+  if (path49 && existsSync39(path49)) {
     const raw2 = await readFile85(path49, "utf-8");
     const lines2 = raw2.split(`
 `).filter(Boolean);
@@ -883090,7 +883520,7 @@ function extractPlainTextContent(content) {
 }
 async function readSessionTodos(opts) {
   const path49 = await resolveTranscriptPath(opts.sessionId, opts.cwd);
-  if (!path49 || !existsSync38(path49))
+  if (!path49 || !existsSync39(path49))
     return [];
   const raw2 = await readFile85(path49, "utf-8");
   const lines2 = raw2.split(`
@@ -883226,7 +883656,7 @@ function parseTaskNotificationXml(xml) {
 }
 async function readSessionTasks(opts) {
   const path49 = await resolveTranscriptPath(opts.sessionId, opts.cwd);
-  if (!path49 || !existsSync38(path49))
+  if (!path49 || !existsSync39(path49))
     return [];
   const raw2 = await readFile85(path49, "utf-8");
   const lines2 = raw2.split(`
@@ -883349,10 +883779,17 @@ function hasActiveStream(sessionID) {
 function consumeStreamedTurn(sessionID) {
   if (streamedSessions.has(sessionID)) {
     streamedSessions.delete(sessionID);
+    completedStreamMessages.delete(sessionID);
     return true;
   }
   return false;
 }
+function getStreamMessageInfo(sessionID) {
+  const active4 = states.get(sessionID);
+  if (active4)
+    return { messageID: active4.messageID, modelID: active4.modelID };
+  return completedStreamMessages.get(sessionID);
+}
 function registerAgentSession(sessionID, toolUseID, agentSessionID) {
   let sessionMap = pendingAgentSessions.get(sessionID);
   if (!sessionMap) {
@@ -883668,6 +884105,10 @@ function processStreamEvent(sessionID, event) {
           sessionTools.clear();
         }
       }
+      completedStreamMessages.set(sessionID, {
+        messageID: state4.messageID,
+        modelID: state4.modelID
+      });
       resetStreamState(sessionID);
       streamedSessions.add(sessionID);
       break;
@@ -883723,11 +884164,12 @@ function normalizeToolName2(name3) {
   };
   return map5[name3] ?? name3.toLowerCase();
 }
-var states, streamedSessions, completedTools, pendingAgentSessions, SUBTITLE_KEYS;
+var states, streamedSessions, completedTools, completedStreamMessages, pendingAgentSessions, SUBTITLE_KEYS;
 var init_streamStateTracker = __esm(() => {
   states = new Map;
   streamedSessions = new Set;
   completedTools = new Map;
+  completedStreamMessages = new Map;
   pendingAgentSessions = new Map;
   SUBTITLE_KEYS = {
     read: ["file_path"],
@@ -883927,6 +884369,7 @@ function handleAssistantMessage(msg, ctx) {
   const isApiError = isApiErrorContent(rawContent2);
   const agentId = msg.agent_id || getActiveSubagentId(ctx);
   const emitSessionID = agentId && ctx.getActiveSubagents().has(agentId) ? agentId : ctx.sessionId;
+  const streamInfo = getStreamMessageInfo(emitSessionID);
   const wasStreamed = hasActiveStream(emitSessionID) || consumeStreamedTurn(emitSessionID);
   if (msg.uuid) {
     ctx.pushBufferMessage({
@@ -883940,6 +884383,33 @@ function handleAssistantMessage(msg, ctx) {
     });
   }
   if (wasStreamed) {
+    if (isApiError) {
+      const apiError = buildErrorFromContent(rawContent2);
+      ctx.emitOpencodeEvent("message.updated", {
+        sessionID: emitSessionID,
+        info: {
+          id: streamInfo?.messageID ?? msg.uuid ?? randomUUID82(),
+          role: "assistant",
+          modelID: streamInfo?.modelID ?? msg.model ?? ctx.getModel() ?? "",
+          providerID: msg.provider_id ?? ctx.getProviderId(),
+          time: { completed: msg.timestamp ? new Date(msg.timestamp).getTime() : Date.now() },
+          parentID: msg.parentUuid ?? null,
+          error: apiError
+        }
+      });
+      ctx.emitOpencodeEvent("session.error", {
+        sessionID: emitSessionID,
+        error: {
+          subtype: "api_error",
+          level: "error",
+          message: apiError.data.message,
+          statusCode: apiError.data.statusCode,
+          isRetryable: apiError.data.isRetryable,
+          name: apiError.name,
+          data: apiError.data
+        }
+      });
+    }
     if (Array.isArray(rawContent2)) {
       for (const block of rawContent2) {
         const b6 = block;
@@ -883997,6 +884467,21 @@ function handleAssistantMessage(msg, ctx) {
       ...isApiError ? { error: buildErrorFromContent(rawContent2) } : {}
     }
   });
+  if (isApiError) {
+    const apiError = buildErrorFromContent(rawContent2);
+    ctx.emitOpencodeEvent("session.error", {
+      sessionID: emitSessionID,
+      error: {
+        subtype: "api_error",
+        level: "error",
+        message: apiError.data.message,
+        statusCode: apiError.data.statusCode,
+        isRetryable: apiError.data.isRetryable,
+        name: apiError.name,
+        data: apiError.data
+      }
+    });
+  }
   if (Array.isArray(rawContent2)) {
     for (const block of rawContent2) {
       const part = buildPartFromContentBlock(block, assistantMsgID, emitSessionID);
@@ -884209,6 +884694,7 @@ function handleResultMessage(msg, ctx) {
   ctx.emitOpencodeEvent("session.result", {
     sessionID: ctx.sessionId,
     subtype: msg.subtype ?? "success",
+    isError: msg.is_error,
     costUsd: msg.cost_usd,
     usage: msg.usage,
     stopReason: msg.stop_reason
@@ -885292,7 +885778,7 @@ __export(exports_sessionHandle, {
 import { spawn as spawn17 } from "child_process";
 import { createInterface as createInterface4 } from "readline";
 import { readdir as readdir46, readFile as readFile86 } from "fs/promises";
-import { existsSync as existsSync39 } from "fs";
+import { existsSync as existsSync40 } from "fs";
 import { join as join225 } from "path";
 var SessionHandle;
 var init_sessionHandle = __esm(() => {
@@ -885498,7 +885984,7 @@ var init_sessionHandle = __esm(() => {
     async buildSubagentIndex() {
       const projectDir = getProjectDir2(this.cwd);
       const sessionDir = join225(projectDir, this.sessionId, "subagents");
-      if (!existsSync39(sessionDir))
+      if (!existsSync40(sessionDir))
         return;
       try {
         const entries = await readdir46(sessionDir);
@@ -886062,7 +886548,7 @@ __export(exports_sessionManager, {
   SessionManager: () => SessionManager
 });
 import { readFile as readFile87, writeFile as writeFile78, mkdir as mkdir70, rm as rm15 } from "fs/promises";
-import { existsSync as existsSync40, statSync as statSync14 } from "fs";
+import { existsSync as existsSync41, statSync as statSync14 } from "fs";
 import { join as join226, resolve as resolve58, isAbsolute as isAbsolute31 } from "path";
 
 class SessionManager {
@@ -886096,7 +886582,7 @@ class SessionManager {
   }
   async loadIndex() {
     const path49 = this.getIndexPath();
-    if (!existsSync40(path49))
+    if (!existsSync41(path49))
       return;
     try {
       const raw2 = await readFile87(path49, "utf-8");
@@ -886122,7 +886608,7 @@ class SessionManager {
       };
     }
     const dir = getClaudeConfigHomeDir();
-    if (!existsSync40(dir)) {
+    if (!existsSync41(dir)) {
       await mkdir70(dir, { recursive: true });
     }
     try {
@@ -886229,7 +886715,7 @@ class SessionManager {
     if (!isAbsolute31(cwd4)) {
       cwd4 = resolve58(process.cwd(), cwd4);
     }
-    if (!existsSync40(cwd4) || !statSync14(cwd4).isDirectory()) {
+    if (!existsSync41(cwd4) || !statSync14(cwd4).isDirectory()) {
       throw new Error(`Working directory does not exist: ${cwd4}`);
     }
     if (this._warmPool.length > 0 && !opts.resumeSessionId && !opts.silent && this._warmPool[0].systemPrompt === opts.systemPrompt) {
@@ -886399,14 +886885,14 @@ class SessionManager {
     const jsonlPath = join226(projectDir, sessionId2 + ".jsonl");
     const sessionDir = join226(projectDir, sessionId2);
     try {
-      if (existsSync40(jsonlPath)) {
+      if (existsSync41(jsonlPath)) {
         await rm15(jsonlPath, { force: true });
       }
     } catch (err2) {
       logError3(err2);
     }
     try {
-      if (existsSync40(sessionDir)) {
+      if (existsSync41(sessionDir)) {
         await rm15(sessionDir, { recursive: true, force: true });
       }
     } catch (err2) {
@@ -887220,7 +887706,7 @@ __export(exports_update, {
 });
 async function update() {
   logEvent("tengu_update_check", {});
-  writeToStdout(`Current version: ${"4.1.12"}
+  writeToStdout(`Current version: ${"4.2.0"}
 `);
   const channel5 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
   writeToStdout(`Checking for updates to ${channel5} version...
@@ -887295,8 +887781,8 @@ async function update() {
       writeToStdout(`CoStrict is managed by Homebrew.
 `);
       const latest = await getLatestVersion(channel5);
-      if (latest && !gte2("4.1.12", latest)) {
-        writeToStdout(`Update available: ${"4.1.12"} \u2192 ${latest}
+      if (latest && !gte2("4.2.0", latest)) {
+        writeToStdout(`Update available: ${"4.2.0"} \u2192 ${latest}
 `);
         writeToStdout(`
 `);
@@ -887312,8 +887798,8 @@ async function update() {
       writeToStdout(`CoStrict is managed by winget.
 `);
       const latest = await getLatestVersion(channel5);
-      if (latest && !gte2("4.1.12", latest)) {
-        writeToStdout(`Update available: ${"4.1.12"} \u2192 ${latest}
+      if (latest && !gte2("4.2.0", latest)) {
+        writeToStdout(`Update available: ${"4.2.0"} \u2192 ${latest}
 `);
         writeToStdout(`
 `);
@@ -887329,8 +887815,8 @@ async function update() {
       writeToStdout(`CoStrict is managed by apk.
 `);
       const latest = await getLatestVersion(channel5);
-      if (latest && !gte2("4.1.12", latest)) {
-        writeToStdout(`Update available: ${"4.1.12"} \u2192 ${latest}
+      if (latest && !gte2("4.2.0", latest)) {
+        writeToStdout(`Update available: ${"4.2.0"} \u2192 ${latest}
 `);
         writeToStdout(`
 `);
@@ -887395,11 +887881,11 @@ async function update() {
 `);
         await gracefulShutdown(1);
       }
-      if (result2.latestVersion === "4.1.12") {
-        writeToStdout(source_default.green(`CoStrict is up to date (${"4.1.12"})`) + `
+      if (result2.latestVersion === "4.2.0") {
+        writeToStdout(source_default.green(`CoStrict is up to date (${"4.2.0"})`) + `
 `);
       } else {
-        writeToStdout(source_default.green(`Successfully updated from ${"4.1.12"} to version ${result2.latestVersion}`) + `
+        writeToStdout(source_default.green(`Successfully updated from ${"4.2.0"} to version ${result2.latestVersion}`) + `
 `);
         regenerateCompletionCache();
       }
@@ -887459,12 +887945,12 @@ async function update() {
 `);
     await gracefulShutdown(1);
   }
-  if (latestVersion === "4.1.12") {
-    writeToStdout(source_default.green(`CoStrict is up to date (${"4.1.12"})`) + `
+  if (latestVersion === "4.2.0") {
+    writeToStdout(source_default.green(`CoStrict is up to date (${"4.2.0"})`) + `
 `);
     await gracefulShutdown(0);
   }
-  writeToStdout(`New version available: ${latestVersion} (current: ${"4.1.12"})
+  writeToStdout(`New version available: ${latestVersion} (current: ${"4.2.0"})
 `);
   writeToStdout(`Installing update...
 `);
@@ -887509,7 +887995,7 @@ async function update() {
   logForDebugging(`update: Installation status: ${result.status}`);
   switch (result.status) {
     case "success":
-      writeToStdout(source_default.green(`Successfully updated from ${"4.1.12"} to version ${latestVersion}`) + `
+      writeToStdout(source_default.green(`Successfully updated from ${"4.2.0"} to version ${latestVersion}`) + `
 `);
       regenerateCompletionCache();
       break;
@@ -889721,7 +890207,7 @@ ${assistantAddendum}` : assistantAddendum;
       }
     }
     logForDiagnosticsNoPII("info", "started", {
-      version: "4.1.12",
+      version: "4.2.0",
       is_native_binary: isInBundledMode()
     });
     registerCleanup(async () => {
@@ -890200,7 +890686,7 @@ Session: ${directConnectConfig.sessionId}`, "info");
           sshSession = await createSSHSession2({
             host: _pendingSSH.host,
             cwd: _pendingSSH.cwd,
-            localVersion: "4.1.12",
+            localVersion: "4.2.0",
             permissionMode: _pendingSSH.permissionMode,
             dangerouslySkipPermissions: _pendingSSH.dangerouslySkipPermissions,
             extraCliArgs: _pendingSSH.extraCliArgs,
@@ -890672,7 +891158,7 @@ Usage: csc --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("4.1.12 (CoStrict)", "-v, --version", "Output the version number");
+  }).version("4.2.0 (CoStrict)", "-v, --version", "Output the version number");
   program2.addOption(new Option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)").hideHelp());
   program2.addOption(new Option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.").hideHelp());
   if (canUserConfigureAdvisor()) {
@@ -891386,10 +891872,10 @@ if (process.env.CLAUDE_CODE_REMOTE === "true") {
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    const d4 = new Date("2026-06-08T13:08:39.119Z");
+    const d4 = new Date("2026-06-09T13:06:56.679Z");
     const p2 = (n4) => String(n4).padStart(2, "0");
     const buildTime = `${d4.getFullYear()}/${p2(d4.getMonth() + 1)}/${p2(d4.getDate())} ${p2(d4.getHours())}:${p2(d4.getMinutes())}:${p2(d4.getSeconds())}`;
-    console.log(`${"4.1.12"} (commit: ${"f8bae4ac"}, built: ${buildTime})`);
+    console.log(`${"4.2.0"} (commit: ${"7a005509b"}, built: ${buildTime})`);
     return;
   }
   const { profileCheckpoint: profileCheckpoint2 } = await Promise.resolve().then(() => (init_startupProfiler(), exports_startupProfiler));
@@ -891429,7 +891915,7 @@ async function main2() {
       registerPermissionHandler(server2, handler) {
         server2.setNotificationHandler(ChannelPermissionRequestNotificationSchema2(), async (notification) => handler(notification.params));
       }
-    }, "4.1.12");
+    }, "4.2.0");
     return;
   }
   if (args[0] === "--daemon-worker" || args[0]?.startsWith("--daemon-worker=")) {
@@ -891527,5 +892013,5 @@ async function main2() {
 }
 main2();
 
-//# debugId=41AA902614062E5464756E2164756E21
+//# debugId=0333D287AA838AF764756E2164756E21
 //# sourceMappingURL=cli.js.map