@costrict/csc 4.2.8 → 4.2.10-beta

package/dist/services/rawDump/batchWorker.js

@@ -459,8 +459,38 @@ async function appendDeadLetter(entry) {
 import { promises as fs9 } from "fs";
 import { createHash as createHash2 } from "crypto";
 import os2 from "os";
-import path11 from "path";
+import path12 from "path";
+
+// src/utils/clientVersion.ts
+import { readFileSync as readFileSync2 } from "fs";
+import path4 from "path";
 import { fileURLToPath } from "url";
+var cached = null;
+function getClientVersion() {
+  if (cached)
+    return cached;
+  try {
+    if ("4.2.10-beta") {
+      cached = "4.2.10-beta";
+      return cached;
+    }
+  } catch {}
+  let dir = path4.dirname(fileURLToPath(import.meta.url));
+  for (let i = 0;i < 6; i++) {
+    try {
+      const pkg = JSON.parse(readFileSync2(path4.join(dir, "package.json"), "utf-8"));
+      if (typeof pkg.version === "string" && pkg.version) {
+        cached = pkg.version;
+        return cached;
+      }
+    } catch {}
+    const parent = path4.dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return "unknown";
+}
 
 // src/costrict/provider/credentials.ts
 import { promises as fs3 } from "fs";
@@ -505,21 +535,7 @@ async function saveCoStrictCredentials(credentials) {
 }
 
 // src/costrict/provider/oauth-params.ts
-import { createRequire } from "module";
-function getVersion() {
-  try {
-    if (typeof MACRO !== "undefined" && "4.2.8")
-      return "4.2.8";
-  } catch {}
-  try {
-    const require2 = createRequire(import.meta.url);
-    const pkg = require2("../../../package.json");
-    return pkg.version;
-  } catch {
-    return "1.0.0";
-  }
-}
-var COSTRICT_PLUGIN_VERSION = `costrict-cli-${getVersion()}`;
+var COSTRICT_PLUGIN_VERSION = `costrict-cli-${getClientVersion()}`;
 function buildOAuthParams(includeMachineCode, machineId, state) {
   const params = [];
   if (includeMachineCode) {
@@ -595,7 +611,7 @@ async function refreshCoStrictToken(params) {
 // src/services/rawDump/git.ts
 import { execFile } from "child_process";
 import { realpathSync } from "fs";
-import path4 from "path";
+import path5 from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var TRUNK_BRANCHES = ["origin/main", "origin/master", "main", "master"];
@@ -633,7 +649,7 @@ function computeRepoRelativePath(gitRoot, workDir) {
     return "";
   const root = tryRealpath(gitRoot);
   const dir = tryRealpath(workDir);
-  const rel = path4.relative(root, dir);
+  const rel = path5.relative(root, dir);
   if (rel === "")
     return ".";
   if (rel.startsWith(".."))
@@ -644,7 +660,7 @@ function tryRealpath(p) {
   try {
     return realpathSync(p);
   } catch {
-    return path4.resolve(p);
+    return path5.resolve(p);
   }
 }
 async function getBranchAncestry(cwd) {
@@ -754,10 +770,10 @@ function toCommitComment(subject) {
 }
 
 // src/services/rawDump/activeSessions.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync, renameSync, realpathSync as realpathSync2 } from "fs";
-import path5 from "path";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync, renameSync, realpathSync as realpathSync2 } from "fs";
+import path6 from "path";
 var log2 = createLogger("activeSessions");
-var ACTIVE_SESSIONS_FILE = path5.join(getRawDumpDir(), "csc-active-sessions.json");
+var ACTIVE_SESSIONS_FILE = path6.join(getRawDumpDir(), "csc-active-sessions.json");
 var DEFAULT_WINDOW_MS = 30 * 60 * 1000;
 var FUTURE_TOLERANCE_MS = 5 * 60 * 1000;
 var MAX_ACTIVE_SESSION_IDS = 64;
@@ -777,16 +793,16 @@ function normalizeCwd(p) {
   try {
     resolved = realpathSync2(p);
   } catch {
-    resolved = path5.resolve(p);
+    resolved = path6.resolve(p);
   }
-  if (resolved.length > 1 && resolved.endsWith(path5.sep)) {
+  if (resolved.length > 1 && resolved.endsWith(path6.sep)) {
     resolved = resolved.slice(0, -1);
   }
   return resolved;
 }
 function readMap() {
   try {
-    const text = readFileSync2(ACTIVE_SESSIONS_FILE, "utf-8");
+    const text = readFileSync3(ACTIVE_SESSIONS_FILE, "utf-8");
     const parsed = JSON.parse(text);
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
@@ -815,7 +831,7 @@ function getActiveSessionIds(cwd, atMs) {
 
 // src/services/rawDump/localStorage.ts
 import { promises as fs4 } from "fs";
-import path6 from "path";
+import path7 from "path";
 var DEFAULT_LOCAL_DIR = getRawDumpDir();
 var RAW_DUMP_MODE = {
   DISABLED: 0,
@@ -864,12 +880,12 @@ async function writeLocalDump(type, body) {
     endpoint = "/raw-store/task-summary";
   } else if (type == "conversation") {
     ymd = getDateFromTimestamp(getTimestampField("conversation", body));
-    subdir = path6.join(ymd, body.task_id);
+    subdir = path7.join(ymd, body.task_id);
     fname = body.request_id;
     endpoint = "/raw-store/task-conversation";
   } else if (type == "commit") {
     ymd = getDateFromTimestamp(getTimestampField("commit", body));
-    subdir = path6.join(normalizeProjectPath2(body.repo_addr), normalizeProjectPath2(body.repo_branch), ymd);
+    subdir = path7.join(normalizeProjectPath2(body.repo_addr), normalizeProjectPath2(body.repo_branch), ymd);
     fname = body.commit_id;
     endpoint = "/raw-store/commit";
   } else if (type == "statistics") {
@@ -881,7 +897,7 @@ async function writeLocalDump(type, body) {
     fname = `${h}-${m}-${s}`;
     endpoint = "/raw-store/statistics";
   } else if (type == "raw") {
-    subdir = path6.join(normalizeProjectPath2(body.project), body.session_id);
+    subdir = path7.join(normalizeProjectPath2(body.project), body.session_id);
     fname = String(body.start_cursor);
     endpoint = "/raw-store/raw-log";
   } else {
@@ -889,9 +905,9 @@ async function writeLocalDump(type, body) {
     fname = "unknown";
     endpoint = "unknown";
   }
-  const dumpDir = path6.join(dir, type, subdir);
+  const dumpDir = path7.join(dir, type, subdir);
   const filename = `${fname}.json`;
-  const filePath = path6.join(dumpDir, filename);
+  const filePath = path7.join(dumpDir, filename);
   const payload = {
     _dumpMeta: {
       type,
@@ -907,15 +923,15 @@ async function writeLocalDump(type, body) {
 
 // src/services/rawDump/queue.ts
 import { promises as fs6 } from "fs";
-import path8 from "path";
+import path9 from "path";
 
 // src/services/rawDump/lock.ts
 import { promises as fs5 } from "fs";
-import path7 from "path";
+import path8 from "path";
 var LOCK_INFO_FILE = "lock.json";
 async function isHolderAlive(lockDir) {
   try {
-    const text = await fs5.readFile(path7.join(lockDir, LOCK_INFO_FILE), "utf-8");
+    const text = await fs5.readFile(path8.join(lockDir, LOCK_INFO_FILE), "utf-8");
     const info = JSON.parse(text);
     if (!info.pid || typeof info.pid !== "number")
       return false;
@@ -952,7 +968,7 @@ async function acquireLock(lockDir, info) {
       return false;
     }
     try {
-      await fs5.writeFile(path7.join(lockDir, LOCK_INFO_FILE), JSON.stringify(info), "utf-8");
+      await fs5.writeFile(path8.join(lockDir, LOCK_INFO_FILE), JSON.stringify(info), "utf-8");
       return true;
     } catch {
       await releaseLock(lockDir);
@@ -967,8 +983,8 @@ async function releaseLock(lockDir) {
 }
 
 // src/services/rawDump/queue.ts
-var QUEUE_FILE = path8.join(getRawDumpDir(), "csc-work-queue.jsonl");
-var QUEUE_LOCK_DIR = path8.join(getRawDumpDir(), "csc-work-queue.lock.d");
+var QUEUE_FILE = path9.join(getRawDumpDir(), "csc-work-queue.jsonl");
+var QUEUE_LOCK_DIR = path9.join(getRawDumpDir(), "csc-work-queue.lock.d");
 var MAX_ATTEMPTS = 4;
 var queue = [];
 var queueLoaded = false;
@@ -1009,8 +1025,8 @@ async function releaseQueueLock() {
 
 // src/services/rawDump/history.ts
 import { promises as fs7 } from "fs";
-import path9 from "path";
-var HISTORY_FILE = path9.join(getCscDir(), "history.jsonl");
+import path10 from "path";
+var HISTORY_FILE = path10.join(getCscDir(), "history.jsonl");
 var cache = null;
 async function loadHistory() {
   const items = [];
@@ -1076,7 +1092,7 @@ async function getProjectDirs() {
 
 // src/services/rawDump/session.ts
 import { promises as fs8 } from "fs";
-import path10 from "path";
+import path11 from "path";
 
 // src/services/rawDump/parse.ts
 function buildFlows(events) {
@@ -1560,9 +1576,9 @@ function parseSession(cacheConversations, events) {
   flows.forEach((flow) => {
     const convResults = splitFlowToConversations(flow);
     convResults.forEach((conversation) => {
-      const cached = cacheConversations.find((c) => c.id === conversation.id);
-      if (cached && cached.events.length === conversation.events.length) {
-        conversations.push(cached);
+      const cached2 = cacheConversations.find((c) => c.id === conversation.id);
+      if (cached2 && cached2.events.length === conversation.events.length) {
+        conversations.push(cached2);
       } else {
         conversations.push(conversation);
       }
@@ -1628,8 +1644,8 @@ function cleanupOldSessions() {
 async function getParsedSession(taskDir, sessionId) {
   const sessionDir = getSessionDirectory(taskDir);
   const cacheKey = `${sessionDir}:${sessionId}`;
-  const cached = sessionMessagesCache.get(cacheKey);
-  const sessionFile = path10.join(sessionDir, `${sessionId}.jsonl`);
+  const cached2 = sessionMessagesCache.get(cacheKey);
+  const sessionFile = path11.join(sessionDir, `${sessionId}.jsonl`);
   let stats;
   try {
     stats = await fs8.stat(sessionFile);
@@ -1643,19 +1659,19 @@ async function getParsedSession(taskDir, sessionId) {
       parsedSession: parseSession([], [])
     };
   }
-  const needsReanalysis = !cached || cached.fileTimestamp !== stats.mtimeMs || cached.fileSize !== stats.size || !cached.parsedSession;
-  if (!needsReanalysis && cached) {
+  const needsReanalysis = !cached2 || cached2.fileTimestamp !== stats.mtimeMs || cached2.fileSize !== stats.size || !cached2.parsedSession;
+  if (!needsReanalysis && cached2) {
     log3.debug("using cached parsed session", { sessionId });
-    return cached;
+    return cached2;
   }
   cleanupOldSessions();
   const start = Date.now();
-  const messages = cached?.messages ?? await loadSessionMessages(sessionFile);
+  const messages = cached2?.messages ?? await loadSessionMessages(sessionFile);
   const elapsed = Date.now() - start;
   if (elapsed > 100) {
     log3.info("loadSessionMessages slow", { sessionId, elapsedMs: elapsed });
   }
-  const cachedConvs = cached?.parsedSession?.conversations ?? [];
+  const cachedConvs = cached2?.parsedSession?.conversations ?? [];
   const parsedSession = parseSession(cachedConvs, messages);
   sessionMessagesCache.set(cacheKey, {
     sessionJsonlFileName: sessionFile,
@@ -1812,9 +1828,9 @@ function capToolEventsPayload(events) {
 var repoInfoCache = new Map;
 var REPO_CACHE_TTL_MS = 60000;
 async function getCachedRepoInfo(directory) {
-  const cached = repoInfoCache.get(directory);
-  if (cached && Date.now() - cached.ts < REPO_CACHE_TTL_MS) {
-    return cached.repoInfo;
+  const cached2 = repoInfoCache.get(directory);
+  if (cached2 && Date.now() - cached2.ts < REPO_CACHE_TTL_MS) {
+    return cached2.repoInfo;
   }
   const repoInfo = await getRepoInfo(directory);
   repoInfoCache.set(directory, { repoInfo, ts: Date.now() });
@@ -2019,12 +2035,7 @@ async function auth() {
   headers.set("Content-Type", "application/json");
   headers.set("HTTP-Referer", "https://github.com/zgsm-ai/costrict-cli");
   headers.set("X-Title", "CoStrict-CLI");
-  let version = "unknown";
-  try {
-    const pkgPath = path11.resolve(fileURLToPath(import.meta.url), "../../package.json");
-    const pkg = JSON.parse(await fs9.readFile(pkgPath, "utf-8"));
-    version = pkg.version ?? "unknown";
-  } catch {}
+  const version = getClientVersion();
   headers.set("X-Costrict-Version", `csc-${version}`);
   const clientId = creds.machine_id || process.env.CSC_MACHINE_ID || "unknown";
   headers.set("zgsm-client-id", clientId);
@@ -2060,15 +2071,10 @@ async function authWithFallback() {
   try {
     return await auth();
   } catch (err) {
-    let version = "unknown";
-    try {
-      const pkgPath = path11.resolve(fileURLToPath(import.meta.url), "../../package.json");
-      const pkg = JSON.parse(await fs9.readFile(pkgPath, "utf-8"));
-      version = pkg.version ?? "unknown";
-    } catch {}
+    const version = getClientVersion();
     let deviceId = process.env.CSC_DEVICE_ID;
     if (!deviceId) {
-      const deviceIdFile = path11.join(getLocalDumpDir(), "device-id");
+      const deviceIdFile = path12.join(getLocalDumpDir(), "device-id");
       try {
         deviceId = (await fs9.readFile(deviceIdFile, "utf-8")).trim();
       } catch {}
@@ -2108,7 +2114,7 @@ async function authWithFallback() {
 async function uploadRaw(sessionId, directory, authData) {
   const normalizedProject = normalizeProjectPath2(directory);
   const stateKey = `${normalizedProject}/${sessionId}`;
-  const filePath = path11.join(CSC_DIR, "projects", normalizedProject, `${sessionId}.jsonl`);
+  const filePath = path12.join(CSC_DIR, "projects", normalizedProject, `${sessionId}.jsonl`);
   const lastReportedCount = state_raw.logs[stateKey] ?? 0;
   let fileContent;
   try {
@@ -2586,9 +2592,9 @@ if (scriptPath.endsWith("worker.ts") || scriptPath.endsWith("worker.js")) {
 }
 
 // src/services/rawDump/timerWorker.ts
-import path12 from "path";
+import path13 from "path";
 var log6 = createLogger("timer");
-var TIMER_LOCK_DIR = path12.join(getRawDumpDir(), "csc-timer.lock.d");
+var TIMER_LOCK_DIR = path13.join(getRawDumpDir(), "csc-timer.lock.d");
 var isRunning = false;
 async function acquireTimerLock() {
   return acquireLock(TIMER_LOCK_DIR, {
@@ -2653,10 +2659,10 @@ if (scriptPath2.endsWith("timerWorker.ts") || scriptPath2.endsWith("timerWorker.
 
 // src/services/rawDump/parentHeartbeat.ts
 import { promises as fs10 } from "fs";
-import path13 from "path";
+import path14 from "path";
 var HEARTBEAT_STALE_MS = 15000;
 function getParentHeartbeatPath(pid) {
-  return path13.join(getRawDumpDir(), `csc-parent-heartbeat-${pid}.json`);
+  return path14.join(getRawDumpDir(), `csc-parent-heartbeat-${pid}.json`);
 }
 async function readParentHeartbeat(pid) {
   try {
@@ -2790,5 +2796,5 @@ export {
   startBatchWorker
 };
 
-//# debugId=DEF8126068895F0964756E2164756E21
+//# debugId=90ACB77FEE54E34264756E2164756E21
 //# sourceMappingURL=batchWorker.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@costrict/csc",
-  "version": "4.2.8",
+  "version": "4.2.10-beta",
   "description": "costrict",
   "type": "module",
   "author": "costrict",