Nick: improvements

Author: nickscamara

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firecrawl-cli",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Command-line interface for Firecrawl. Scrape, crawl, and extract data from any website directly from your terminal.",
   "main": "dist/index.js",
   "bin": {

src/commands/interact.ts

@@ -54,13 +54,11 @@ export async function handleInteractExecute(
     const { apiKey, apiUrl } = resolveApiConfig(options);
 
     const stored = loadInteractSession();
-    if (!options.scrapeId && stored) {
-      process.stderr.write(
-        `Using scrape ${scrapeId}` +
-          (stored.url ? ` (${stored.url})` : '') +
-          '\n'
-      );
-    }
+    const storedUrl =
+      stored?.url && stored.scrapeId === scrapeId ? stored.url : undefined;
+    process.stderr.write(
+      `Using scrape ${scrapeId}` + (storedUrl ? ` (${storedUrl})` : '') + '\n'
+    );
 
     const body: Record<string, unknown> = { origin: 'cli', integration: 'cli' };
 

src/commands/scrape.ts

@@ -11,7 +11,10 @@ import type {
 } from '../types/scrape';
 import { getClient } from '../utils/client';
 import { handleScrapeOutput, writeOutput } from '../utils/output';
-import { saveInteractSession } from '../utils/interact-session';
+import {
+  saveInteractSession,
+  clearInteractSession,
+} from '../utils/interact-session';
 import { getOrigin } from '../utils/url';
 import { executeMap } from './map';
 import { getStatus } from './status';
@@ -125,14 +128,18 @@ export async function executeScrape(
 
     const scrapeId = result?.metadata?.scrapeId;
     if (scrapeId) {
+      process.stderr.write(`Scrape ID: ${scrapeId}\n`);
       try {
         saveInteractSession({
           scrapeId,
           url: options.url,
           createdAt: new Date().toISOString(),
         });
       } catch {
-        // Non-critical — don't fail the scrape
+        process.stderr.write(
+          `Warning: Could not save scrape session. ` +
+            `Use --scrape-id ${scrapeId} with interact.\n`
+        );
       }
     }
 
@@ -248,13 +255,16 @@ export async function handleMultiScrapeCommand(
 
   await Promise.all(promises);
 
+  clearInteractSession();
   process.stderr.write(
     `\nCompleted: ${completedCount - errorCount}/${total} succeeded`
   );
   if (errorCount > 0) {
     process.stderr.write(`, ${errorCount} failed`);
   }
-  process.stderr.write('\n');
+  process.stderr.write(
+    '\nTip: Use --scrape-id <id> with interact to target a specific scrape.\n'
+  );
 
   if (errorCount === total) {
     process.exit(1);

src/utils/interact-session.ts

@@ -73,14 +73,26 @@ export function clearInteractSession(): void {
   }
 }
 
+const SESSION_STALE_MS = 10 * 60 * 1000; // 10 minutes
+
 /**
  * Resolve scrape ID from explicit override or stored session
  */
 export function getScrapeId(overrideId?: string): string {
   if (overrideId) return overrideId;
 
   const stored = loadInteractSession();
-  if (stored) return stored.scrapeId;
+  if (stored) {
+    const ageMs = Date.now() - new Date(stored.createdAt).getTime();
+    if (ageMs > SESSION_STALE_MS) {
+      const mins = Math.round(ageMs / 60_000);
+      process.stderr.write(
+        `Warning: Last scrape session is ${mins}m old and may have expired. ` +
+          `Re-scrape or pass --scrape-id explicitly.\n`
+      );
+    }
+    return stored.scrapeId;
+  }
 
   throw new Error(
     'No active scrape session. Scrape a URL first:\n' +