seaworthycode 1.2.8 → 1.2.10

package/dist/index.js

@@ -782,6 +782,7 @@ var copy = {
   "report.bySeverity": "By severity",
   "report.tierWatermark": (licensedTo) => `\u2693 Pro \xB7 ${licensedTo}`,
   "report.scanProgress.starting": (targetDir) => `\u2693 Scanning ${targetDir}...`,
+  "report.scanProgress.checking": (completed, total, checkName) => `\u2693 Running checks... [${completed}/${total}] ${checkName}`,
   "report.scanProgress.category": (label, count) => count > 0 ? `  \u2693 ${label} \u2014 ${count} issue(s)` : `  \u2693 ${label} \u2713`,
   "report.licenseNotice": (licensedTo) => `Licensed to ${licensedTo}`,
   "report.cta.clean": `\u2713 All clear \u2014 your project is shipshape!`,
@@ -1621,6 +1622,12 @@ var ScanRunner = class {
     };
     const results = [];
     const checkResults = /* @__PURE__ */ new Map();
+    const categoryTotals = /* @__PURE__ */ new Map();
+    for (const check2 of checks) {
+      categoryTotals.set(check2.category, (categoryTotals.get(check2.category) ?? 0) + 1);
+    }
+    const categoryCompleted = /* @__PURE__ */ new Map();
+    let completedCount = 0;
     await runWithConcurrency(
       checks,
       async (check2) => {
@@ -1630,26 +1637,26 @@ var ScanRunner = class {
         } catch (err) {
           console.error(`Check "${check2.id}" failed: ${String(err)}`);
         }
+        options.onCheckComplete?.(++completedCount, checks.length, check2.name);
+        if (options.onCategoryComplete) {
+          const catDone = (categoryCompleted.get(check2.category) ?? 0) + 1;
+          categoryCompleted.set(check2.category, catDone);
+          if (catDone === categoryTotals.get(check2.category)) {
+            let catFindingsCount = 0;
+            for (const c of checks) {
+              if (c.category === check2.category) {
+                catFindingsCount += (checkResults.get(c.id) ?? []).length;
+              }
+            }
+            options.onCategoryComplete(check2.category, catFindingsCount);
+          }
+        }
       },
       concurrency
     );
     for (const check2 of checks) {
       results.push(...checkResults.get(check2.id) ?? []);
     }
-    if (options.onCategoryComplete) {
-      const findingsPerCategory = /* @__PURE__ */ new Map();
-      for (const check2 of checks) {
-        const count = (checkResults.get(check2.id) ?? []).length;
-        findingsPerCategory.set(check2.category, (findingsPerCategory.get(check2.category) ?? 0) + count);
-      }
-      const seen = /* @__PURE__ */ new Set();
-      for (const check2 of checks) {
-        if (!seen.has(check2.category)) {
-          seen.add(check2.category);
-          options.onCategoryComplete(check2.category, findingsPerCategory.get(check2.category) ?? 0);
-        }
-      }
-    }
     ctx.astCache?.clear();
     for (const [, promise] of ctx.bashAstCache ?? []) {
       try {
@@ -15996,9 +16003,9 @@ function createCommand(definition, options) {
 }
 
 // src/commands/scan.ts
-var FREE_SCAN_TIMEOUT_MS = 6e4;
-var PRO_SCAN_TIMEOUT_MS = 6e5;
-function resolveScanTimeoutMs(tier) {
+var FREE_CHECK_IDLE_MS = 6e4;
+var PRO_CHECK_IDLE_MS = 3e5;
+function resolveCheckIdleMs(tier) {
   const env2 = process.env.SEAWORTHY_SCAN_TIMEOUT_MS;
   if (env2) {
     const parsed = Number(env2);
@@ -16006,7 +16013,7 @@ function resolveScanTimeoutMs(tier) {
       return parsed;
     }
   }
-  return tier === "free" ? FREE_SCAN_TIMEOUT_MS : PRO_SCAN_TIMEOUT_MS;
+  return tier === "free" ? FREE_CHECK_IDLE_MS : PRO_CHECK_IDLE_MS;
 }
 var CATEGORY_LABELS = {
   security: getCopy2("cli.category.security"),
@@ -16016,17 +16023,29 @@ var CATEGORY_LABELS = {
   configuration: getCopy2("cli.category.configuration"),
   "data-exposure": getCopy2("cli.category.data-exposure")
 };
-function withTimeout(promise, ms, message) {
-  return new Promise((resolve5, reject) => {
-    const timer = setTimeout(() => reject(new Error(message)), ms);
-    promise.then((value) => {
-      clearTimeout(timer);
-      resolve5(value);
-    }).catch((err) => {
-      clearTimeout(timer);
-      reject(err);
-    });
+function withIdleTimeout(promise, idleMs, message) {
+  let timerId;
+  let rejectFn = () => {
+  };
+  const heartbeat = () => {
+    clearTimeout(timerId);
+    timerId = setTimeout(() => rejectFn(new Error(message)), idleMs);
+  };
+  const wrappedPromise = new Promise((resolve5, reject) => {
+    rejectFn = reject;
+    heartbeat();
+    promise.then(
+      (value) => {
+        clearTimeout(timerId);
+        resolve5(value);
+      },
+      (err) => {
+        clearTimeout(timerId);
+        reject(err);
+      }
+    );
   });
+  return { promise: wrappedPromise, heartbeat };
 }
 function isInsideDirectory(outputPath, targetDir) {
   const resolvedOutput = resolve2(outputPath);
@@ -16058,24 +16077,36 @@ async function executeScan(args, ctx) {
     process.stderr.write(getCopy("report.scanProgress.starting", args.targetDir) + "\n");
   }
   const runner = new ScanRunner();
-  const scanTimeoutMs = resolveScanTimeoutMs(ctx.tier);
-  const result = await withTimeout(
-    runner.run({
-      targetDir: args.targetDir,
-      tier: ctx.tier,
-      llm,
-      maxFileSize: args.maxFileSize,
-      debug: args.debug,
-      baseline: args.baseline,
-      minConfidence: args.minConfidence,
-      onCategoryComplete: showProgress ? (category, count) => {
-        const label = CATEGORY_LABELS[category] ?? category;
-        process.stderr.write(getCopy("report.scanProgress.category", label, count) + "\n");
-      } : void 0
-    }),
-    scanTimeoutMs,
-    getCopy("errors.scan.timed_out", Math.round(scanTimeoutMs / 1e3))
+  const checkIdleMs = resolveCheckIdleMs(ctx.tier);
+  let heartbeat = () => {
+  };
+  const scanPromise = runner.run({
+    targetDir: args.targetDir,
+    tier: ctx.tier,
+    llm,
+    maxFileSize: args.maxFileSize,
+    debug: args.debug,
+    baseline: args.baseline,
+    minConfidence: args.minConfidence,
+    onCheckComplete: (completed, total, checkName) => {
+      heartbeat();
+      if (showProgress) {
+        process.stderr.write(`\r${getCopy("report.scanProgress.checking", completed, total, checkName)}\x1B[K`);
+      }
+    },
+    onCategoryComplete: showProgress ? (category, count) => {
+      const label = CATEGORY_LABELS[category] ?? category;
+      process.stderr.write(`\r\x1B[K${getCopy("report.scanProgress.category", label, count)}
+`);
+    } : void 0
+  });
+  const { promise: timedScanPromise, heartbeat: hb } = withIdleTimeout(
+    scanPromise,
+    checkIdleMs,
+    getCopy("errors.scan.timed_out", Math.round(checkIdleMs / 1e3))
   );
+  heartbeat = hb;
+  const result = await timedScanPromise;
   const reportInput = {
     findings: result.findings,
     targetDir: args.targetDir,