tradeblocks-mcp 2.2.4 → 2.2.6

package/README.md

@@ -147,8 +147,29 @@ tradeblocks-mcp ~/backtests
 # HTTP mode
 tradeblocks-mcp --http ~/backtests
 tradeblocks-mcp --http --port 8080 ~/backtests
+
+# Separate CSV blocks from DuckDB storage
+tradeblocks-mcp --directory ./data --blocks-dir ~/backtests
 ```
 
+### Options
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--http` | Start HTTP server instead of stdio | stdio |
+| `--port <n>` | HTTP server port | 3100 |
+| `--blocks-dir <path>` | Directory containing CSV block folders | same as data directory |
+| `--market-db <path>` | Path to market.duckdb | `<directory>/market.duckdb` |
+| `--no-auth` | Disable authentication (HTTP mode) | auth enabled |
+
+### Environment Variables
+
+| Variable | Description |
+|----------|-------------|
+| `BLOCKS_DIRECTORY` | Default data directory if not specified as argument |
+| `TRADEBLOCKS_BLOCKS_DIR` | Directory for CSV block folders (overridden by `--blocks-dir`) |
+| `MARKET_DB_PATH` | Path to market.duckdb (overridden by `--market-db`) |
+
 ## Docker Deployment
 
 Run the MCP server in a container for remote/server deployments.
@@ -175,7 +196,7 @@ docker build -t tradeblocks-mcp .
 docker compose up -d
 ```
 
-Place your block folders (each containing CSV files) in the `data/` directory. The container runs in HTTP mode on port 3100 by default. See [Authentication](#authentication) below for configuring credentials.
+Place your block folders (each containing CSV files) in the `data/` directory, or use `--blocks-dir` to point at a separate folder. The container runs in HTTP mode on port 3100 by default. See [Authentication](#authentication) below for configuring credentials.
 
 Connect any MCP client to `http://<your-host>:3100/mcp`. How you expose this endpoint (reverse proxy, tunnel, VPN, etc.) is up to you.
 

package/dist/{chunk-O6FQQRJV.js → chunk-FIKAXL2L.js}

@@ -807,14 +807,18 @@ async function getConnection(dataDir) {
     if (isLockError(errorMessage)) {
       const recovered = await tryRecoverLockByTerminatingStaleProcess(errorMessage, dbPath, forceRecovery);
       if (recovered) {
-        try {
-          return await openReadWriteConnection(dbPath, threads, memoryLimit);
-        } catch (recoveryError) {
-          resetConnectionState();
-          const recoveryMessage = recoveryError instanceof Error ? recoveryError.message : String(recoveryError);
-          throw new Error(
-            `Failed to initialize DuckDB at ${dbPath} after lock recovery: ${recoveryMessage}`
-          );
+        for (let attempt = 0; attempt < 3; attempt++) {
+          await new Promise((r) => setTimeout(r, 500 * (attempt + 1)));
+          try {
+            return await openReadWriteConnection(dbPath, threads, memoryLimit);
+          } catch (retryError) {
+            const retryMsg = retryError instanceof Error ? retryError.message : String(retryError);
+            if (attempt < 2 && isLockError(retryMsg)) continue;
+            resetConnectionState();
+            throw new Error(
+              `Failed to initialize DuckDB at ${dbPath} after lock recovery: ${retryMsg}`
+            );
+          }
         }
       }
     }
@@ -857,8 +861,8 @@ async function closeConnection() {
 async function upgradeToReadWrite(dataDir, options) {
   if (connectionMode === "read_write" && connection) return connection;
   await closeConnection();
-  const maxRetries = 2;
-  const retryDelayMs = 500;
+  const maxRetries = 4;
+  const retryDelayMs = 1e3;
   let lastError = null;
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     try {
@@ -22612,13 +22616,16 @@ async function detectBlockChanges(conn, baseDir) {
   const folderNames = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    if (entry.name.startsWith(".")) continue;
-    if (entry.name === "_marketdata") continue;
+    if (entry.name.startsWith(".") || entry.name.startsWith("_")) continue;
+    if (entry.name.includes(".")) continue;
     const blockId = entry.name;
     folderNames.add(blockId);
     const blockPath = path4.join(baseDir, blockId);
     if (!syncedBlockIds.has(blockId)) {
-      toSync.push(blockId);
+      const tradelog = await findTradelogFile(blockPath);
+      if (tradelog) {
+        toSync.push(blockId);
+      }
       continue;
     }
     const tradelogFilename = await findTradelogFile(blockPath);
@@ -22677,11 +22684,19 @@ async function cleanupDeletedBlocks(conn, deletedBlockIds) {
 }
 
 // src/sync/index.ts
+var _blocksDir = null;
+function setBlocksDir(dir) {
+  _blocksDir = dir;
+}
+function getBlocksDir(baseDir) {
+  return _blocksDir ?? baseDir;
+}
 async function syncAllBlocks(baseDir) {
   const conn = await getConnection(baseDir);
+  const blocksDir = getBlocksDir(baseDir);
   const results = [];
   const errors = [];
-  const { toSync, toDelete } = await detectBlockChanges(conn, baseDir);
+  const { toSync, toDelete } = await detectBlockChanges(conn, blocksDir);
   for (const blockId of toDelete) {
     try {
       await cleanupDeletedBlocks(conn, [blockId]);
@@ -22692,7 +22707,7 @@ async function syncAllBlocks(baseDir) {
     }
   }
   for (const blockId of toSync) {
-    const blockPath = path5.join(baseDir, blockId);
+    const blockPath = path5.join(blocksDir, blockId);
     const result = await syncBlockInternal(conn, blockId, blockPath);
     results.push(result);
     if (result.status === "error" && result.error) {
@@ -22710,7 +22725,8 @@ async function syncAllBlocks(baseDir) {
 }
 async function syncBlock(blockId, baseDir) {
   const conn = await getConnection(baseDir);
-  const blockPath = path5.join(baseDir, blockId);
+  const blocksDir = getBlocksDir(baseDir);
+  const blockPath = path5.join(blocksDir, blockId);
   try {
     await fs6.access(blockPath);
   } catch {
@@ -22756,6 +22772,8 @@ export {
   normalizeTicker,
   resolveTradeTicker,
   marketTickerDateKey,
+  setBlocksDir,
+  getBlocksDir,
   syncAllBlocks,
   syncBlock
 };
@@ -22770,4 +22788,4 @@ decimal.js/decimal.mjs:
    *  MIT Licence
    *)
 */
-//# sourceMappingURL=chunk-O6FQQRJV.js.map
+//# sourceMappingURL=chunk-FIKAXL2L.js.map