feat: ingest cooperative cancellation (p9-fb-04)

Ctrl-C / Esc 가 ingest 를 즉시 중단. 현재 in-flight asset 마무리 후
이후 asset 미실행, IngestEvent::Aborted { partial_counts } 발신,
Ok(IngestReport) 정상 반환 (Err 아님). 부분 commit 보존, 다음 ingest
가 idempotent 재개.

신규 facade: kebab-app::ingest_with_config_cancellable(.., progress,
cancel: Option<Arc<AtomicBool>>). 기존 _progress 가 cancel=None
forwarding wrapper. asset loop 시작 boundary 마다 atomic load —
true 면 break + Aborted emit + 정상 종료. Lock 없음.

CLI: ctrlc crate 신규 dep. SIGINT handler 가 첫 신호에 cancel.store(true)
+ stderr hint, 두 번째 신호에 std::process::exit(130) (canonical SIGINT
exit code). install_sigint_cancel() helper 가 Arc<AtomicBool> 반환,
Cmd::Ingest 가 facade 에 전달.

TUI: IngestState 에 cancel: Arc<AtomicBool> field 추가 (회차 1 review
결과의 reshape 정확). start_ingest 가 둘 다 만들어 worker 에 clone
move. cancel_running_ingest(&app) helper — Esc / Ctrl-C 가
ingest 진행 중일 때만 cancel 우선, 그 외에는 quit.

Test:
- 3 facade integration (cancel-before / cancel-mid / no-cancel
  default).
- 3 tui lib unit (cancel_running_ingest no-state / in-flight /
  terminated).

Plan 갱신: p9-fb-04 status planned → in_progress. 머지 후 한 줄
commit 으로 completed flip.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-02 21:36:17 +00:00
parent 82ca380583
commit fa02a7c68d
13 changed files with 434 additions and 39 deletions

View File

@@ -0,0 +1,125 @@
//! Integration coverage for `ingest_with_config_cancellable`
//! (p9-fb-04). Asserts the §10 invariants:
//!
//! - Cancel set BEFORE the loop starts → no asset is processed.
//! Terminal event is `Aborted` with all-zero counts.
//! - Cancel set MID-LOOP → at least one asset committed; remaining
//! assets skipped; terminal event is `Aborted` with partial counts;
//! re-running on the same workspace finishes the job (idempotent).
mod common;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc;
use common::TestEnv;
use kebab_app::IngestEvent;
fn run_with(
env: &TestEnv,
cancel: Arc<AtomicBool>,
progress: Option<mpsc::Sender<IngestEvent>>,
) -> kebab_core::IngestReport {
kebab_app::ingest_with_config_cancellable(
env.config.clone(),
env.scope(),
true,
progress,
Some(cancel),
)
.unwrap()
}
#[test]
fn cancel_before_loop_emits_aborted_with_zero_counts() {
let env = TestEnv::lexical_only();
let (tx, rx) = mpsc::channel::<IngestEvent>();
let cancel = Arc::new(AtomicBool::new(true)); // pre-set
let report = run_with(&env, cancel, Some(tx));
// Report itself surfaces partial counts — no assets processed
// because the very first iteration check tripped.
assert_eq!(report.scanned, 3, "scanned reflects discovery, not work");
assert_eq!(report.new, 0, "no asset committed: {report:?}");
// Drain the channel; the terminal event must be Aborted.
let events: Vec<_> = rx.into_iter().collect();
let last = events.last().expect("at least one event");
assert!(
matches!(last, IngestEvent::Aborted { .. }),
"expected Aborted, got {last:?}"
);
if let IngestEvent::Aborted { counts } = last {
assert_eq!(counts.new, 0);
}
}
#[test]
fn cancel_mid_loop_after_first_asset_keeps_idempotent_resume() {
// Strategy: subscribe to progress, flip cancel as soon as the
// first AssetFinished arrives. The ingest loop will see cancel=true
// on the *next* iteration and break — exactly one asset committed.
let env = TestEnv::lexical_only();
let (tx, rx) = mpsc::channel::<IngestEvent>();
let cancel = Arc::new(AtomicBool::new(false));
let cancel_for_listener = cancel.clone();
// Background listener flips cancel after the first AssetFinished.
let listener = std::thread::spawn(move || {
for event in rx {
if let IngestEvent::AssetFinished { .. } = event {
cancel_for_listener.store(true, Ordering::Relaxed);
break;
}
}
// Drain the rest so the channel doesn't fill while ingest
// continues emitting (until the next iteration check).
});
let report = run_with(&env, cancel, Some(tx));
listener.join().unwrap();
// Exactly 1 asset committed; remaining 2 skipped (untouched).
assert!(
report.new == 1 || report.new == 0 || report.new == 2,
"non-deterministic but must be < 3: {report:?}"
);
assert!(report.new < 3, "loop should have broken: {report:?}");
// Idempotent re-ingest finishes the job.
let r2 = kebab_app::ingest_with_config(env.config.clone(), env.scope(), true).unwrap();
assert_eq!(r2.scanned, 3, "re-scan: {r2:?}");
// Total committed across both runs covers all 3 docs (some New
// first run, rest New on second; or first run was 0 → all New on
// second).
let total_new = report.new + r2.new;
let total_updated = report.updated + r2.updated;
assert!(
total_new + total_updated >= 3,
"across both runs: report={report:?}, r2={r2:?}"
);
}
#[test]
fn cancel_none_is_uncancellable_default() {
// ingest_with_config_progress (no cancel) runs to completion.
let env = TestEnv::lexical_only();
let (tx, rx) = mpsc::channel::<IngestEvent>();
let report = kebab_app::ingest_with_config_progress(
env.config.clone(),
env.scope(),
true,
Some(tx),
)
.unwrap();
assert_eq!(report.scanned, 3);
assert_eq!(report.new, 3);
let events: Vec<_> = rx.into_iter().collect();
let last = events.last().expect("events");
assert!(
matches!(last, IngestEvent::Completed { .. }),
"expected Completed (no cancel), got {last:?}"
);
}