@aixle/insights 0.2.0 → 0.2.2-staging

package/dist/sync.js

@@ -11,6 +11,7 @@ import { postEvent, postEvents } from "./client.js";
 import { getCostWarning } from "./pricing.js";
 import { acquireSyncLock } from "./lock.js";
 import { getGitRemoteForPath, lookupProjectByRemote, } from "./lib/index.js";
+import { isRepoPathWithinRoot, normalizeRepoPathCandidate, } from "./lib/repo-path-safety.js";
 import { mcpLog } from "./log.js";
 /** Prefix for Claude Code session keys in shared MCP state. */
 export const CLAUDE_STATE_PREFIX = "claude_code:";
@@ -102,9 +103,9 @@ function explicitProjectId(projectId, projectIdSource) {
         ? projectId
         : undefined;
 }
-async function resolveProjectIdForRepoPathCached(repoPath, host, token, verbose, cache) {
-    const normalized = repoPath?.trim();
-    if (!normalized)
+async function resolveProjectIdForRepoPathCached(repoPath, host, token, verbose, cache, allowInsecureHttp = false) {
+    const normalized = normalizeRepoPathCandidate(repoPath);
+    if (normalized === null)
         return null;
     if (cache.has(normalized))
         return cache.get(normalized) ?? null;
@@ -113,25 +114,35 @@ async function resolveProjectIdForRepoPathCached(repoPath, host, token, verbose,
         cache.set(normalized, null);
         return null;
     }
-    const result = await lookupProjectByRemote(canonicalRemote, host, token, verbose);
+    const result = await lookupProjectByRemote(canonicalRemote, host, token, verbose, allowInsecureHttp);
     const projectId = result && typeof result === "object" && "project_id" in result ? result.project_id : null;
     cache.set(normalized, projectId);
     return projectId;
 }
+/**
+ * The repo path for a Cursor payload, normalized and safe to hand to project
+ * resolution. Returns an absolute, `..`-collapsed path or undefined.
+ *
+ * `workspace_folder` comes from the workspace's own `workspace.json` and
+ * `workspace` from a composer `uri.fsPath` or the `state.vscdb` path — all
+ * untrusted. When the preferred field is unusable we fall through to the other
+ * rather than giving up. See DB90DV-547.
+ */
 export function cursorRepoPathFromPayload(payload) {
     const metadata = payload.metadata;
     if (!metadata)
         return undefined;
-    if (typeof metadata.workspace_folder === "string" && metadata.workspace_folder.length > 0) {
-        return metadata.workspace_folder;
-    }
-    if (typeof metadata.workspace === "string" && metadata.workspace.length > 0) {
-        return metadata.workspace;
+    for (const candidate of [metadata.workspace_folder, metadata.workspace]) {
+        if (typeof candidate !== "string")
+            continue;
+        const normalized = normalizeRepoPathCandidate(candidate);
+        if (normalized !== null)
+            return normalized;
     }
     return undefined;
 }
 async function runClaudeSlice(options) {
-    const { token, host, dryRun, verbose, projectId, pricing } = options;
+    const { token, host, dryRun, verbose, projectId, pricing, allowInsecureHttp = false } = options;
     const appDir = options.appDir ?? getAppDir();
     const backoffKey = credentialStateKey(host, token);
     const errors = [];
@@ -194,14 +205,16 @@ async function runClaudeSlice(options) {
             mcpLog.info("sync_noise_skip", { tool: "claude_code", reason: "local_command_noise" }, false);
             continue;
         }
-        // When scopeDir is set, skip turns from other directories.
+        // When scopeDir is set, skip turns from other directories. `turn.cwd` is an
+        // arbitrary string from a transcript JSONL, so a plain prefix match would
+        // accept `<scopeDir>/../../elsewhere` (DB90DV-547).
         if (scopeDir) {
-            const cwd = turn.cwd?.trim();
-            const inScope = cwd && (cwd === scopeDir || cwd.startsWith(scopeDir + "/"));
+            const cwd = normalizeRepoPathCandidate(turn.cwd);
+            const inScope = cwd !== null && isRepoPathWithinRoot(cwd, scopeDir);
             if (!inScope) {
                 totalSkipped++;
                 if (verbose) {
-                    console.log(`[verbose] Skipping Claude turn ${turn.turnId} — cwd=${cwd ?? "(none)"} not under scopeDir=${scopeDir}`);
+                    console.log(`[verbose] Skipping Claude turn ${turn.turnId} — cwd=${turn.cwd ?? "(none)"} not under scopeDir=${scopeDir}`);
                 }
                 continue;
             }
@@ -222,13 +235,16 @@ async function runClaudeSlice(options) {
         // effectively one network call per unique cwd per sync.
         const resolvedProjectId = scopeDir
             ? (projectId ??
-                (await resolveProjectIdForRepoPathCached(turn.cwd, host, token, verbose, projectLookupCache)) ??
+                (await resolveProjectIdForRepoPathCached(turn.cwd, host, token, verbose, projectLookupCache, allowInsecureHttp)) ??
                 undefined)
             : (explicitProject ??
-                (await resolveProjectIdForRepoPathCached(turn.cwd, host, token, verbose, projectLookupCache)) ??
+                (await resolveProjectIdForRepoPathCached(turn.cwd, host, token, verbose, projectLookupCache, allowInsecureHttp)) ??
                 undefined);
-        const payload = mapClaudeTranscriptTurn(turn, { projectId: resolvedProjectId, pricing });
-        if (verbose && payload.cost_usd === null) {
+        const payloads = mapClaudeTranscriptTurn(turn, { projectId: resolvedProjectId, pricing });
+        if (!payloads?.length)
+            continue;
+        const parentPayload = payloads[0];
+        if (verbose && parentPayload?.cost_usd === null) {
             if (!turn.model) {
                 if (turn.tokensIn > 0 || turn.tokensOut > 0) {
                     console.warn(`[warn] Claude turn ${turn.turnId} has usage but no model — cost_usd will be null`);
@@ -241,45 +257,53 @@ async function runClaudeSlice(options) {
             }
         }
         if (dryRun) {
-            console.log(`[dry-run] Would send Claude turn ${turn.turnId}:`);
-            console.log(JSON.stringify(payload, null, 2));
-            totalSent++;
+            for (const payload of payloads) {
+                console.log(`[dry-run] Would send Claude ${payload.event_type} ${payload.metadata.session_id}:`);
+                console.log(JSON.stringify(payload, null, 2));
+            }
+            totalSent += payloads.length;
             continue;
         }
-        if (verbose) {
-            console.log(`[verbose] Sending Claude turn ${turn.turnId} (${turn.tokensIn + turn.tokensOut} tokens)`);
-        }
-        const ok = await postEvent(payload, host, token, {
-            on429: (retryAfter, quotaExceeded) => {
-                const currentBackoff = backoffUntilByCredential.get(backoffKey);
-                const nextBackoff = new Date(Math.max(currentBackoff?.getTime() ?? 0, Date.now() + retryAfter * 1000));
-                backoffUntilByCredential.set(backoffKey, nextBackoff);
-                shouldStopForBackoff = true;
-                const reason = quotaExceeded ? "Monthly quota exceeded" : "Rate limited";
-                mcpLog.warn("sync_rate_limit_pause", {
-                    tool: "claude_code",
-                    retry_until: nextBackoff.toISOString(),
-                    quota_exceeded: quotaExceeded,
-                }, true);
-                console.warn(`[aixle-insights] ${reason}. Pausing until ${nextBackoff.toISOString()}.`);
-                // Persist backoff to state so it survives process restarts
-                state = { ...state, rate_limited_until: nextBackoff.toISOString() };
-                writeState(state, appDir, host, token);
-            },
-        });
-        if (ok) {
+        let allOk = true;
+        for (const payload of payloads) {
+            if (verbose) {
+                console.log(`[verbose] Sending Claude ${payload.event_type} ${payload.metadata.session_id}`);
+            }
+            const ok = await postEvent(payload, host, token, {
+                on429: (retryAfter, quotaExceeded) => {
+                    const currentBackoff = backoffUntilByCredential.get(backoffKey);
+                    const nextBackoff = new Date(Math.max(currentBackoff?.getTime() ?? 0, Date.now() + retryAfter * 1000));
+                    backoffUntilByCredential.set(backoffKey, nextBackoff);
+                    shouldStopForBackoff = true;
+                    const reason = quotaExceeded ? "Monthly quota exceeded" : "Rate limited";
+                    mcpLog.warn("sync_rate_limit_pause", {
+                        tool: "claude_code",
+                        retry_until: nextBackoff.toISOString(),
+                        quota_exceeded: quotaExceeded,
+                    }, true);
+                    console.warn(`[aixle-insights] ${reason}. Pausing until ${nextBackoff.toISOString()}.`);
+                    // Persist backoff to state so it survives process restarts
+                    state = { ...state, rate_limited_until: nextBackoff.toISOString() };
+                    writeState(state, appDir, host, token);
+                },
+            });
+            if (!ok) {
+                allOk = false;
+                totalFailed++;
+                errors.push(`Failed to post Claude ${payload.event_type} for turn ${turn.turnId}`);
+                mcpLog.error("sync_ingest_final_failure", { tool: "claude_code", session_id: turn.turnId }, true);
+                break;
+            }
+        }
+        if (allOk) {
+            totalSent += payloads.length;
             state = markSessionSent(state, sKey, turn.fileSize);
             writeState(state, appDir, host, token);
-            totalSent++;
         }
-        else {
-            totalFailed++;
-            errors.push(`Failed to post Claude turn ${turn.turnId}`);
-            mcpLog.error("sync_ingest_final_failure", { tool: "claude_code", session_id: turn.turnId }, true);
-            if (shouldStopForBackoff) {
-                break;
-            }
+        else if (shouldStopForBackoff) {
+            break;
         }
+        // Non-backoff failure: continue to next turn (failed turn will retry next sync)
     }
     const result = { sent: totalSent, failed: totalFailed, skipped: totalSkipped };
     const currentBackoff = backoffUntilByCredential.get(backoffKey);
@@ -290,7 +314,7 @@ async function runClaudeSlice(options) {
     return result;
 }
 async function runCursorSlice(params) {
-    const { token, host, dryRun, verbose, projectId, projectIdSource, projectLookupToken, appDir, cursorBaseDir, cursorTranscriptProjectDirs, scopeDir, fullScan = false, cursorPricing = resolveCursorPricing(undefined, appDir), } = params;
+    const { token, host, dryRun, verbose, projectId, projectIdSource, projectLookupToken, allowInsecureHttp = false, appDir, cursorBaseDir, cursorTranscriptProjectDirs, scopeDir, fullScan = false, cursorPricing = resolveCursorPricing(undefined, appDir), } = params;
     const backoffKey = credentialStateKey(host, token);
     // Read state first so we can restore a persisted rate-limit backoff from a prior process.
     const stateBefore = readState(appDir, host, token);
@@ -331,6 +355,7 @@ async function runCursorSlice(params) {
         host,
         token,
         projectLookupToken: lookupToken,
+        allowInsecureHttp,
         verbose,
         cursorBaseDir,
         cursorTranscriptProjectDirs,
@@ -341,11 +366,11 @@ async function runCursorSlice(params) {
             const inScope = [];
             for (const payload of group.payloads) {
                 const ws = cursorRepoPathFromPayload(payload);
-                if (ws && (ws === scopeDir || ws.startsWith(scopeDir + "/"))) {
+                if (ws && isRepoPathWithinRoot(ws, scopeDir)) {
                     // Same fallback as Claude: when the pre-resolved projectId is null, do a
                     // per-payload lookup from the payload's workspace. Cache dedupes by path.
                     const resolved = projectId ??
-                        (await resolveProjectIdForRepoPathCached(ws, host, lookupToken, verbose, projectLookupCache));
+                        (await resolveProjectIdForRepoPathCached(ws, host, lookupToken, verbose, projectLookupCache, allowInsecureHttp));
                     if (resolved)
                         payload.project_id = resolved;
                     else
@@ -365,7 +390,7 @@ async function runCursorSlice(params) {
                 continue;
             for (const payload of group.payloads) {
                 const repoPath = cursorRepoPathFromPayload(payload);
-                const resolvedProjectId = await resolveProjectIdForRepoPathCached(repoPath, host, lookupToken, verbose, projectLookupCache);
+                const resolvedProjectId = await resolveProjectIdForRepoPathCached(repoPath, host, lookupToken, verbose, projectLookupCache, allowInsecureHttp);
                 if (resolvedProjectId)
                     payload.project_id = resolvedProjectId;
                 else
@@ -438,7 +463,7 @@ async function runCursorSlice(params) {
                     totalSkipped++;
                     continue;
                 }
-                const ok = await postEvent(payload, host, token, { on429 });
+                const ok = await postEvent(payload, host, token, { on429, allowInsecureHttp });
                 if (ok) {
                     totalSent++;
                     const turnId = payload.metadata.session_id;
@@ -455,7 +480,7 @@ async function runCursorSlice(params) {
             }
             continue;
         }
-        const batchResult = await postEvents(group.payloads, host, token, { on429 });
+        const batchResult = await postEvents(group.payloads, host, token, { on429, allowInsecureHttp });
         totalSent += batchResult.sent;
         totalFailed += batchResult.failed;
         if (batchResult.failed > 0) {
@@ -501,10 +526,11 @@ async function runCursorSlice(params) {
                 state: stateMut,
                 host,
                 token,
+                allowInsecureHttp,
                 on429,
                 resolveProjectId: explicitProject
                     ? undefined
-                    : (workspace) => resolveProjectIdForRepoPathCached(workspace, host, lookupToken, verbose, projectLookupCache),
+                    : (workspace) => resolveProjectIdForRepoPathCached(workspace, host, lookupToken, verbose, projectLookupCache, allowInsecureHttp),
                 verbose,
             });
             totalSent += hooksResult.sent;
@@ -590,6 +616,7 @@ export async function syncTelemetryTools(options) {
                 dryRun,
                 verbose,
                 projectId,
+                allowInsecureHttp: credentials.insecureHttpAllowed === true,
                 pricing,
                 appDir,
                 transcriptBaseDirs: options.transcriptBaseDirs,
@@ -606,6 +633,7 @@ export async function syncTelemetryTools(options) {
                 projectId,
                 projectIdSource,
                 projectLookupToken,
+                allowInsecureHttp: credentials.insecureHttpAllowed === true,
                 appDir,
                 cursorBaseDir: options.cursorBaseDir,
                 cursorTranscriptProjectDirs: options.cursorTranscriptProjectDirs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aixle/insights",
-  "version": "0.2.0",
+  "version": "0.2.2-staging",
   "description": "stdio MCP server for AI coding-assistant telemetry — Claude transcript sync + Cursor SQLite ingest.",
   "type": "module",
   "bin": {
@@ -43,6 +43,7 @@
   "scripts": {
     "build": "tsc && node -e \"const{mkdirSync,copyFileSync}=require('fs');mkdirSync('dist/hooks',{recursive:true});copyFileSync('src/hooks/hook-forwarder.mjs','dist/hooks/hook-forwarder.mjs');\"",
     "test": "vitest run",
+    "lint": "eslint . --max-warnings 0",
     "verify:cursor-dry-run": "tsx scripts/verify-cursor-dry-run.ts",
     "audit:local-stores": "tsx scripts/audit-local-stores.ts",
     "dev": "tsx src/cli.ts",
@@ -51,7 +52,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "better-sqlite3": "^12.9.0",
-    "glob": "^10.5.0",
+    "glob": "^13.0.6",
     "zod": "^3.23.0 || ^4.0.0"
   },
   "optionalDependencies": {
@@ -60,6 +61,9 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.8",
     "@types/node": "^24",
+    "@typescript-eslint/parser": "^8.65.0",
+    "eslint": "^10.8.0",
+    "eslint-plugin-security": "^4.0.1",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "vitest": "^4.1.0"