@purveyors/cli 0.14.0 → 0.15.1

package/dist/lib/interactive/watch.d.ts

@@ -2,16 +2,25 @@
  * Watch module for `purvey roast watch`.
  * CLI-only — not exported via package.json subpaths.
  *
- * Monitors a directory for new .alog files, imports them automatically,
+ * Monitors a directory for new .alog files, queues or imports them,
  * and shows a verification table when the session ends (Ctrl+C).
  */
+import { watch } from 'fs';
+import { readFile, access } from 'fs/promises';
 import type { SupabaseClient } from '@supabase/supabase-js';
+import { importRoastFromFile } from '../roast.js';
 import type { MilestoneData, ProcessedRoastData } from '../artisan/types.js';
 export interface WatchSession {
     directory: string;
     coffeeId: number;
     coffeeName: string;
     batchPrefix: string;
+    promptEach?: boolean;
+    autoMatch?: boolean;
+    commitMode?: 'batch' | 'individual';
+    ozIn?: number;
+    roastNotes?: string;
+    roastTargets?: string;
     startedAt: string;
     imports: ImportRecord[];
 }
@@ -19,11 +28,13 @@ export interface ImportRecord {
     fileName: string;
     roastId: number | null;
     batchName: string;
-    status: 'success' | 'failed' | 'needs-review';
+    status: 'pending' | 'success' | 'failed' | 'needs-review';
     error?: string;
     milestones?: MilestoneData;
     phases?: ProcessedRoastData['phases'];
     importedAt: string;
+    selectedCoffeeId?: number;
+    selectedCoffeeName?: string;
     aiMatch?: {
         coffeeName: string;
         confidence: number;
@@ -34,10 +45,33 @@ interface StartWatchOpts {
     coffeeId: number;
     coffeeName: string;
     batchPrefix: string;
+    commitMode?: 'batch' | 'individual';
+    startedAt?: string;
+    resumeImports?: ImportRecord[];
     promptEach?: boolean;
     startSequence?: number;
     autoMatch?: boolean;
+    ozIn?: number;
+    roastNotes?: string;
+    roastTargets?: string;
+}
+export interface StartWatchRuntime {
+    accessImpl?: typeof access;
+    readFileImpl?: typeof readFile;
+    readdirImpl?: (typeof import('fs/promises'))['readdir'];
+    saveWatchSessionImpl?: typeof saveWatchSession;
+    importRoastFromFileImpl?: typeof importRoastFromFile;
+    watchImpl?: typeof watch;
+    addSignalListener?: (signal: 'SIGINT' | 'SIGTERM', listener: () => void) => void;
+    removeSignalListener?: (signal: 'SIGINT' | 'SIGTERM', listener: () => void) => void;
+    debounceMs?: number;
+}
+interface ManualImportRecoveryOptions {
+    ozIn?: number;
+    roastNotes?: string;
+    roastTargets?: string;
 }
+export declare function buildManualImportRecoveryCommand(options?: ManualImportRecoveryOptions): string;
 /** Persist session state to disk after each import. */
 export declare function saveWatchSession(session: WatchSession): Promise<void>;
 /** Load a previously saved watch session. Returns null if none exists. */
@@ -61,6 +95,6 @@ export declare function printVerificationTable(session: WatchSession, autoMatch?
  * @param opts      Watch options
  * @returns         The final WatchSession (all imports recorded)
  */
-export declare function startWatch(supabase: SupabaseClient, userId: string, directory: string, opts: StartWatchOpts): Promise<WatchSession>;
+export declare function startWatch(supabase: SupabaseClient, userId: string, directory: string, opts: StartWatchOpts, runtime?: StartWatchRuntime): Promise<WatchSession>;
 export {};
 //# sourceMappingURL=watch.d.ts.map

package/dist/lib/interactive/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/lib/interactive/watch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK7E,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,cAAc,CAAC;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,MAAM,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAMD,uDAAuD;AACvD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;AAED,0EAA0E;AAC1E,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAQrE;AAID;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1E;AAID,yEAAyE;AACzE,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpD;AAID,8DAA8D;AAC9D,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CASvF;AA8JD;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,YAAY,CAAC,CAiPvB"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/lib/interactive/watch.ts"],"names":[],"mappings":"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"}

package/dist/lib/interactive/watch.js

@@ -2,7 +2,7 @@
  * Watch module for `purvey roast watch`.
  * CLI-only — not exported via package.json subpaths.
  *
- * Monitors a directory for new .alog files, imports them automatically,
+ * Monitors a directory for new .alog files, queues or imports them,
  * and shows a verification table when the session ends (Ctrl+C).
  */
 import { watch } from 'fs';
@@ -11,6 +11,22 @@ import { join, extname } from 'path';
 import { constants } from 'fs';
 import { importRoastFromFile } from '../roast.js';
 import { CONFIG_DIR } from '../config.js';
+function quoteCliArg(value) {
+    return JSON.stringify(value);
+}
+export function buildManualImportRecoveryCommand(options = {}) {
+    let command = 'purvey roast import <file> --coffee-id <id>';
+    if (options.ozIn !== undefined) {
+        command += ` --oz-in ${options.ozIn}`;
+    }
+    if (options.roastNotes !== undefined && options.roastNotes.trim() !== '') {
+        command += ` --roast-notes ${quoteCliArg(options.roastNotes.trim())}`;
+    }
+    if (options.roastTargets !== undefined && options.roastTargets.trim() !== '') {
+        command += ` --roast-targets ${quoteCliArg(options.roastTargets.trim())}`;
+    }
+    return command;
+}
 // ─── Session persistence ──────────────────────────────────────────────────────
 const SESSION_FILE = join(CONFIG_DIR, 'watch-session.json');
 /** Persist session state to disk after each import. */
@@ -97,15 +113,24 @@ function printVerificationTableStandard(imports) {
             const batch = rec.batchName.length > COL_BATCH
                 ? rec.batchName.slice(0, COL_BATCH - 1) + '…'
                 : rec.batchName;
-            const status = rec.status === 'success' ? '✓' : `✗ ${rec.error?.slice(0, 5) ?? 'Error'}`;
+            const status = rec.status === 'success'
+                ? '✓'
+                : rec.status === 'pending'
+                    ? '… queued'
+                    : `✗ ${rec.error?.slice(0, 5) ?? 'Error'}`;
             lines.push(row(file, id, batch, status));
         }
     }
     lines.push(hline('└', '┴', '┘', '─'));
     const succeeded = imports.filter((r) => r.status === 'success').length;
     const failed = imports.filter((r) => r.status === 'failed').length;
+    const pending = imports.filter((r) => r.status === 'pending').length;
     lines.push('');
-    lines.push(`Session: ${imports.length} file${imports.length !== 1 ? 's' : ''} processed, ${succeeded} succeeded, ${failed} failed`);
+    let summary = `Session: ${imports.length} file${imports.length !== 1 ? 's' : ''} processed, ${succeeded} succeeded, ${failed} failed`;
+    if (pending > 0) {
+        summary += `, ${pending} queued`;
+    }
+    lines.push(summary);
     lines.push('');
     process.stderr.write(lines.join('\n') + '\n');
 }
@@ -160,9 +185,11 @@ function printVerificationTableAutoMatch(imports) {
             const conf = confVal.padEnd(COL_CONF);
             const status = rec.status === 'success'
                 ? '✓'
-                : rec.status === 'needs-review'
-                    ? '⚠'
-                    : `✗ ${rec.error?.slice(0, 4) ?? 'Err'}`;
+                : rec.status === 'pending'
+                    ? '…'
+                    : rec.status === 'needs-review'
+                        ? '⚠'
+                        : `✗ ${rec.error?.slice(0, 4) ?? 'Err'}`;
             lines.push(row(file, id, bean, conf, status));
         }
     }
@@ -170,11 +197,15 @@ function printVerificationTableAutoMatch(imports) {
     const succeeded = imports.filter((r) => r.status === 'success').length;
     const failed = imports.filter((r) => r.status === 'failed').length;
     const needsReview = imports.filter((r) => r.status === 'needs-review').length;
+    const pending = imports.filter((r) => r.status === 'pending').length;
     lines.push('');
     let summary = `Session: ${imports.length} file${imports.length !== 1 ? 's' : ''} processed, ${succeeded} succeeded, ${failed} failed`;
     if (needsReview > 0) {
         summary += `, ${needsReview} need${needsReview !== 1 ? '' : 's'} review`;
     }
+    if (pending > 0) {
+        summary += `, ${pending} queued`;
+    }
     lines.push(summary);
     lines.push('');
     process.stderr.write(lines.join('\n') + '\n');
@@ -190,19 +221,27 @@ function printVerificationTableAutoMatch(imports) {
  * @param opts      Watch options
  * @returns         The final WatchSession (all imports recorded)
  */
-export async function startWatch(supabase, userId, directory, opts) {
+export async function startWatch(supabase, userId, directory, opts, runtime = {}) {
+    const accessFile = runtime.accessImpl ?? access;
+    const readFileText = runtime.readFileImpl ?? readFile;
+    const saveSession = runtime.saveWatchSessionImpl ?? saveWatchSession;
+    const importRoast = runtime.importRoastFromFileImpl ?? importRoastFromFile;
+    const watchDirectory = runtime.watchImpl ?? watch;
+    const addSignalListener = runtime.addSignalListener ?? process.on.bind(process);
+    const removeSignalListener = runtime.removeSignalListener ?? process.removeListener.bind(process);
+    const debounceMs = runtime.debounceMs ?? 2000;
     // 1. Validate directory exists
     try {
-        await access(directory, constants.R_OK);
+        await accessFile(directory, constants.R_OK);
     }
     catch {
         throw new Error(`Directory not found or not readable: "${directory}"`);
     }
     // 2. Snapshot existing .alog files so we only react to NEW ones
-    const { readdir } = await import('fs/promises');
+    const readdirEntries = runtime.readdirImpl ?? (await import('fs/promises')).readdir;
     const existingFiles = new Set();
     try {
-        const entries = await readdir(directory);
+        const entries = await readdirEntries(directory);
         for (const entry of entries) {
             if (isAlogFile(entry)) {
                 existingFiles.add(entry);
@@ -212,26 +251,100 @@ export async function startWatch(supabase, userId, directory, opts) {
     catch {
         // Non-fatal — if readdir fails we just won't filter pre-existing files
     }
+    const commitMode = opts.commitMode ?? 'batch';
     // 3. Create session state
     const session = {
         directory,
         coffeeId: opts.coffeeId,
         coffeeName: opts.coffeeName,
         batchPrefix: opts.batchPrefix,
-        startedAt: new Date().toISOString(),
-        imports: [],
+        promptEach: opts.promptEach ?? false,
+        autoMatch: opts.autoMatch ?? false,
+        commitMode,
+        ...(opts.ozIn !== undefined ? { ozIn: opts.ozIn } : {}),
+        ...(opts.roastNotes !== undefined ? { roastNotes: opts.roastNotes } : {}),
+        ...(opts.roastTargets !== undefined ? { roastTargets: opts.roastTargets } : {}),
+        startedAt: opts.startedAt ?? new Date().toISOString(),
+        imports: opts.resumeImports ? [...opts.resumeImports] : [],
     };
     const startSequence = opts.startSequence ?? 0;
     // 4. Debounce map: filename → timeout handle
     const debounceTimers = new Map();
     // Track in-progress files to avoid double-processing
     const processing = new Set();
+    const activeTasks = new Set();
+    const queuedImports = new Map();
+    let shuttingDown = false;
+    for (const record of session.imports) {
+        if (record.status === 'pending' && record.selectedCoffeeId && record.selectedCoffeeName) {
+            queuedImports.set(record.fileName, {
+                record,
+                coffeeId: record.selectedCoffeeId,
+                coffeeName: record.selectedCoffeeName,
+            });
+        }
+    }
+    async function commitQueuedImport(queued) {
+        const { record, coffeeId, coffeeName } = queued;
+        let fileContent = queued.fileContent;
+        if (!fileContent) {
+            const filePath = join(directory, record.fileName);
+            try {
+                await accessFile(filePath, constants.R_OK);
+                fileContent = await readFileText(filePath, 'utf-8');
+            }
+            catch (err) {
+                const errMsg = err instanceof Error ? err.message : 'Unreadable';
+                record.status = 'failed';
+                record.error = errMsg;
+                record.importedAt = new Date().toISOString();
+                queuedImports.delete(record.fileName);
+                await saveSession(session);
+                process.stderr.write(`✗ Failed to read ${record.fileName}: ${errMsg}\n`);
+                return;
+            }
+        }
+        try {
+            const result = await importRoast(supabase, userId, {
+                fileContent,
+                fileName: record.fileName,
+                coffeeId,
+                batchName: record.batchName,
+                ozIn: opts.ozIn,
+                roastNotes: opts.roastNotes,
+                roastTargets: opts.roastTargets,
+            });
+            const milestoneCount = Object.values(result.milestones).filter((v) => v !== undefined && v > 0).length;
+            const tempCount = result.message.match(/(\d+) data points/)?.[1] ?? '?';
+            record.roastId = result.roast_id;
+            record.status = 'success';
+            record.error = undefined;
+            record.milestones = result.milestones;
+            record.phases = result.phases;
+            record.importedAt = new Date().toISOString();
+            record.selectedCoffeeId = coffeeId;
+            record.selectedCoffeeName = coffeeName;
+            queuedImports.delete(record.fileName);
+            await saveSession(session);
+            process.stderr.write(`✓ Imported: ${record.fileName} → Roast #${result.roast_id} (${tempCount} temps, ${milestoneCount} milestones)` +
+                (coffeeName !== opts.coffeeName ? ` [${coffeeName}]` : '') +
+                '\n');
+        }
+        catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            record.status = 'failed';
+            record.error = errMsg;
+            record.importedAt = new Date().toISOString();
+            queuedImports.delete(record.fileName);
+            await saveSession(session);
+            process.stderr.write(`✗ Failed to import ${record.fileName}: ${errMsg}\n`);
+        }
+    }
     // processFile: read, import, record result
     async function processFile(filename) {
-        if (processing.has(filename))
+        if (processing.has(filename) || shuttingDown)
             return;
         processing.add(filename);
-        const filePath = join(directory, filename);
         const sequence = startSequence + session.imports.length + 1;
         const batchName = generateBatchName(opts.batchPrefix, sequence);
         // If promptEach: let user override the bean selection
@@ -245,10 +358,11 @@ export async function startWatch(supabase, userId, directory, opts) {
             effectiveCoffeeId = bean.id;
             effectiveCoffeeName = bean.name;
         }
+        const filePath = join(directory, filename);
         let fileContent;
         try {
-            await access(filePath, constants.R_OK);
-            fileContent = await readFile(filePath, 'utf-8');
+            await accessFile(filePath, constants.R_OK);
+            fileContent = await readFileText(filePath, 'utf-8');
         }
         catch (err) {
             const record = {
@@ -260,7 +374,7 @@ export async function startWatch(supabase, userId, directory, opts) {
                 importedAt: new Date().toISOString(),
             };
             session.imports.push(record);
-            await saveWatchSession(session);
+            await saveSession(session);
             process.stderr.write(`✗ Failed to read ${filename}: ${record.error}\n`);
             processing.delete(filename);
             return;
@@ -281,7 +395,7 @@ export async function startWatch(supabase, userId, directory, opts) {
                     ...(aiResult.aiMatch !== undefined ? { aiMatch: aiResult.aiMatch } : {}),
                 };
                 session.imports.push(record);
-                await saveWatchSession(session);
+                await saveSession(session);
                 const confStr = aiResult.aiMatch !== undefined ? ` (confidence: ${aiResult.aiMatch.confidence}%)` : '';
                 process.stderr.write(`⚠ Needs review: ${filename}${confStr} — ${aiResult.reason}\n`);
                 processing.delete(filename);
@@ -292,46 +406,34 @@ export async function startWatch(supabase, userId, directory, opts) {
             process.stderr.write(`🤖 AI matched: ${filename} → ${effectiveCoffeeName} (${aiResult.aiMatch.confidence}% confidence)\n` +
                 `   Reasoning: ${aiResult.aiMatch.reasoning}\n`);
         }
+        const aiMatchField = opts.autoMatch && !opts.promptEach && aiResult?.aiMatch ? aiResult.aiMatch : undefined;
+        const record = {
+            fileName: filename,
+            roastId: null,
+            batchName,
+            status: 'pending',
+            importedAt: new Date().toISOString(),
+            selectedCoffeeId: effectiveCoffeeId,
+            selectedCoffeeName: effectiveCoffeeName,
+            ...(aiMatchField !== undefined ? { aiMatch: aiMatchField } : {}),
+        };
+        session.imports.push(record);
+        const queued = {
+            record,
+            coffeeId: effectiveCoffeeId,
+            coffeeName: effectiveCoffeeName,
+            fileContent,
+        };
         try {
-            const result = await importRoastFromFile(supabase, userId, {
-                fileContent,
-                fileName: filename,
-                coffeeId: effectiveCoffeeId,
-                batchName,
-            });
-            const milestoneCount = Object.values(result.milestones).filter((v) => v !== undefined && v > 0).length;
-            // Carry aiMatch from the local aiResult (threaded as a local variable, not module state)
-            const aiMatchField = opts.autoMatch && !opts.promptEach && aiResult?.aiMatch ? aiResult.aiMatch : undefined;
-            const record = {
-                fileName: filename,
-                roastId: result.roast_id,
-                batchName,
-                status: 'success',
-                milestones: result.milestones,
-                phases: result.phases,
-                importedAt: new Date().toISOString(),
-                ...(aiMatchField !== undefined ? { aiMatch: aiMatchField } : {}),
-            };
-            session.imports.push(record);
-            await saveWatchSession(session);
-            const tempCount = result.message.match(/(\d+) data points/)?.[1] ?? '?';
-            process.stderr.write(`✓ Imported: ${filename} → Roast #${result.roast_id} (${tempCount} temps, ${milestoneCount} milestones)` +
-                (effectiveCoffeeName !== opts.coffeeName ? ` [${effectiveCoffeeName}]` : '') +
-                '\n');
-        }
-        catch (err) {
-            const errMsg = err instanceof Error ? err.message : String(err);
-            const record = {
-                fileName: filename,
-                roastId: null,
-                batchName,
-                status: 'failed',
-                error: errMsg,
-                importedAt: new Date().toISOString(),
-            };
-            session.imports.push(record);
-            await saveWatchSession(session);
-            process.stderr.write(`✗ Failed to import ${filename}: ${errMsg}\n`);
+            if (commitMode === 'batch') {
+                queuedImports.set(filename, queued);
+                await saveSession(session);
+                process.stderr.write(`… Queued: ${filename} → ${batchName}` +
+                    (effectiveCoffeeName !== opts.coffeeName ? ` [${effectiveCoffeeName}]` : '') +
+                    '\n');
+                return;
+            }
+            await commitQueuedImport(queued);
         }
         finally {
             processing.delete(filename);
@@ -339,7 +441,7 @@ export async function startWatch(supabase, userId, directory, opts) {
     }
     // debounced handler
     function onFileEvent(filename) {
-        if (!isAlogFile(filename))
+        if (!isAlogFile(filename) || shuttingDown)
             return;
         // Skip files that were present when we started
         if (existingFiles.has(filename))
@@ -349,15 +451,20 @@ export async function startWatch(supabase, userId, directory, opts) {
         }
         debounceTimers.set(filename, setTimeout(() => {
             debounceTimers.delete(filename);
-            processFile(filename).catch((err) => {
+            const task = processFile(filename)
+                .catch((err) => {
                 process.stderr.write(`✗ Unexpected error processing ${filename}: ${err instanceof Error ? err.message : String(err)}\n`);
+            })
+                .finally(() => {
+                activeTasks.delete(task);
             });
-        }, 2000));
+            activeTasks.add(task);
+        }, debounceMs));
     }
     // 5. Start fs.watch
     let watcher;
     try {
-        watcher = watch(directory, { persistent: true }, (_eventType, filename) => {
+        watcher = watchDirectory(directory, { persistent: true }, (_eventType, filename) => {
             if (filename)
                 onFileEvent(filename);
         });
@@ -370,30 +477,79 @@ export async function startWatch(supabase, userId, directory, opts) {
         : opts.promptEach
             ? 'prompt-each mode'
             : `coffee: ${opts.coffeeName}`;
-    process.stderr.write(`👁  Watching ${directory} for new .alog files (${modeLabel}, prefix: "${opts.batchPrefix}")...\n`);
+    process.stderr.write(`👁  Watching ${directory} for new .alog files (${modeLabel}, ${commitMode} commit mode, prefix: "${opts.batchPrefix}")...\n`);
     process.stderr.write(`    Press Ctrl+C to stop and view summary.\n\n`);
     // 6. Block until SIGINT, then cleanup and return
-    await new Promise((resolve) => {
-        process.once('SIGINT', () => {
-            // Cancel all pending debounce timers
-            for (const timer of debounceTimers.values()) {
-                clearTimeout(timer);
+    await new Promise((resolve, reject) => {
+        let shutdownPromise = null;
+        let repeatedSignalNoticePrinted = false;
+        const cleanupSignalHandlers = () => {
+            removeSignalListener('SIGINT', onSigint);
+            removeSignalListener('SIGTERM', onSigterm);
+        };
+        const printRepeatedSignalNotice = (signal) => {
+            if (repeatedSignalNoticePrinted)
+                return;
+            repeatedSignalNoticePrinted = true;
+            process.stderr.write(`⏳ Shutdown already in progress (${signal}). Waiting for active imports and queued roasts to finish...\n`);
+        };
+        const shutdown = (signal) => {
+            if (shutdownPromise) {
+                printRepeatedSignalNotice(signal);
+                return shutdownPromise;
             }
-            debounceTimers.clear();
-            watcher.close();
-            process.stderr.write('\n');
-            printVerificationTable(session, opts.autoMatch);
-            // Prompt about unmatched files if in auto-match mode
-            const needsReview = session.imports.filter((r) => r.status === 'needs-review');
-            if (opts.autoMatch && needsReview.length > 0) {
-                process.stderr.write(`⚠  ${needsReview.length} file${needsReview.length !== 1 ? 's need' : ' needs'} manual bean assignment:\n`);
-                for (const rec of needsReview) {
-                    process.stderr.write(`   - ${rec.fileName}\n`);
+            shuttingDown = true;
+            shutdownPromise = (async () => {
+                // Cancel all pending debounce timers
+                for (const timer of debounceTimers.values()) {
+                    clearTimeout(timer);
                 }
-                process.stderr.write(`   Use \`purvey roast import <file> --coffee-id <id>\` to import them manually.\n\n`);
-            }
-            resolve();
-        });
+                debounceTimers.clear();
+                watcher.close();
+                try {
+                    await Promise.allSettled([...activeTasks]);
+                    process.stderr.write('\n');
+                    printVerificationTable(session, opts.autoMatch);
+                    if (commitMode === 'batch' && queuedImports.size > 0) {
+                        process.stderr.write(`🗂  Committing ${queuedImports.size} queued roast${queuedImports.size !== 1 ? 's' : ''}...\n`);
+                        for (const queued of [...queuedImports.values()]) {
+                            await commitQueuedImport(queued);
+                        }
+                        process.stderr.write('\n');
+                        printVerificationTable(session, opts.autoMatch);
+                    }
+                    // Prompt about unmatched files if in auto-match mode
+                    const needsReview = session.imports.filter((r) => r.status === 'needs-review');
+                    if (opts.autoMatch && needsReview.length > 0) {
+                        process.stderr.write(`⚠  ${needsReview.length} file${needsReview.length !== 1 ? 's need' : ' needs'} manual bean assignment:\n`);
+                        for (const rec of needsReview) {
+                            process.stderr.write(`   - ${rec.fileName}\n`);
+                        }
+                        process.stderr.write(`   Use \`${buildManualImportRecoveryCommand({
+                            ozIn: opts.ozIn,
+                            roastNotes: opts.roastNotes,
+                            roastTargets: opts.roastTargets,
+                        })}\` to import them manually.\n\n`);
+                    }
+                    resolve();
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    cleanupSignalHandlers();
+                }
+            })();
+            return shutdownPromise;
+        };
+        const onSigint = () => {
+            void shutdown('SIGINT');
+        };
+        const onSigterm = () => {
+            void shutdown('SIGTERM');
+        };
+        addSignalListener('SIGINT', onSigint);
+        addSignalListener('SIGTERM', onSigterm);
     });
     return session;
 }