Skip to content

feat: bind cloud plans to provider account scope #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
seonghobae wants to merge 2 commits into from
Closed

feat: bind cloud plans to provider account scope #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13823ff
feat: bind cloud plans to provider account scope
seonghobae Jul 29, 2026
de597fc
Merge branch 'feat/private-review-dossier' into feat/capacity-account…
seonghobae Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions docs/superpowers/specs/2026-07-21-cloud-capacity-evidence-design.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@ Google Workspace pooled-storage accounts can return organization-wide limit and
therefore includes `google-capacity-may-reflect-pooled-organization-storage` as a notice rather than
mislabeling the figures as necessarily personal.

## Account-scope binding

Capacity schema v3 carries an optional provider-authoritative account scope. Apple's exact native
quota response binds iCloud to `personal`. Microsoft Graph maps `driveType=personal` to `personal`,
`business` to `organization`, and `documentLibrary` to `shared`. Google Drive quota does not classify
personal versus pooled organization storage precisely enough, so its scope remains unknown.

DiskSage collects capacity before constructing the plan. When discovery reported an unknown scope,
the provider scope refines the selected cloud root before review and decision fingerprints are
calculated. A provider mismatch or conflict with an already-known root scope fails closed. An
unavailable response or a provider without authoritative scope preserves the discovery result
instead of guessing.

The CLI and Tauri application use the same binding rule. A plan, its human review, and a subsequent
copy reuse the same bounded capacity snapshot, so a second provider call cannot silently change the
destination policy between fingerprint verification and receipt creation.

## Decision gate

The default reserve is 1 GiB. A candidate is copy-eligible only when a fresh provider snapshot proves
Expand All @@ -41,8 +58,9 @@ the same exact byte-plus-reserve comparison still gates the copy. A zero remaini

The plan-level assessment uses the total potentially reclaimable candidate bytes. A plan may report
that the full batch does not fit even though a smaller individual candidate can fit; the copy command
therefore obtains a fresh snapshot and evaluates that exact candidate immediately before copying.
Adopting an already-present cloud object does not upload bytes and skips this capacity gate.
therefore re-evaluates that exact candidate against the plan's freshly collected, root-bound
snapshot immediately before copying. Adopting an already-present cloud object does not upload bytes
and skips this capacity gate.

No capacity check authorizes deletion. DiskSage still retains the source until copy hash verification,
provider sync attestation, immutable receipt validation, and an explicit local-eviction confirmation
Expand Down
173 changes: 111 additions & 62 deletions src-tauri/src/bin/disksage-cloud-plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ use std::io::Write;
use std::path::{Path, PathBuf};

#[cfg(not(coverage))]
use disksage_lib::cloud::{self, ArchiveKind, CloudPlanOptions, CloudProvider, CloudRoot};
use disksage_lib::cloud::{
self, ArchiveKind, CloudAccountScope, CloudPlanOptions, CloudProvider, CloudRoot,
};
#[cfg(not(coverage))]
use disksage_lib::cloud_eviction::{self, CloudEvictionResult, CloudSourceEvictionApproval};
#[cfg(not(coverage))]
Expand Down Expand Up @@ -538,11 +540,12 @@ fn validate_action_args(args: &Args) -> Result<(), String> {
|| adoption_action
|| attestation_action
|| eviction_action
|| review_action
|| exact_duplicate_review
|| args.export_naruon_lineage.is_some())
{
return Err("capacity verification은 plan 또는 copy action에서만 사용할 수 있음".into());
return Err(
"capacity verification은 plan, review 또는 copy action에서만 사용할 수 있음".into(),
);
}
if args
.provider_object_id
Expand Down Expand Up @@ -1547,52 +1550,32 @@ fn collect_root_capacity(
}

#[cfg(not(coverage))]
fn verified_capacity_for_bytes(
root: &CloudRoot,
oauth_connections: Option<&Path>,
requested_bytes: u64,
largest_candidate_bytes: u64,
reserve_mib: u64,
) -> Result<provider_capacity::CloudCapacityAssessment, String> {
let reserve_bytes = reserve_mib.saturating_mul(1024 * 1024);
let observed_at_ms = cloud::system_now_ms();
let snapshot = match collect_root_capacity(root, oauth_connections, observed_at_ms) {
Ok(snapshot) => snapshot,
Err(error) => provider_capacity::unavailable_capacity_from_error(
root.provider,
observed_at_ms,
&error,
),
};
Ok(provider_capacity::assess_capacity(
snapshot,
requested_bytes,
largest_candidate_bytes,
reserve_bytes,
))
}

#[cfg(not(coverage))]
fn attach_verified_capacity(
fn attach_capacity_snapshot(
report: &mut cloud::CloudPlanReport,
root: &CloudRoot,
oauth_connections: Option<&Path>,
snapshot: provider_capacity::CloudCapacitySnapshot,
reserve_mib: u64,
) -> Result<(), String> {
if snapshot.provider != report.cloud_root.provider
|| snapshot.account_scope.is_some_and(|scope| {
report.cloud_root.account_scope != CloudAccountScope::Unknown
&& report.cloud_root.account_scope != scope
})
{
return Err("cloud-capacity-root-binding-mismatch".into());
}
let largest_candidate_bytes = report
.candidates
.iter()
.filter(|candidate| candidate.blocked_reason.is_none())
.map(|candidate| candidate.bytes)
.max()
.unwrap_or_default();
let assessment = verified_capacity_for_bytes(
root,
oauth_connections,
let assessment = provider_capacity::assess_capacity(
snapshot,
report.potentially_reclaimable_bytes,
largest_candidate_bytes,
reserve_mib,
)?;
reserve_mib.saturating_mul(1024 * 1024),
);
report
.notices
.retain(|notice| notice != "cloud-quota-unverified");
Expand All @@ -1614,6 +1597,36 @@ fn attach_verified_capacity(
Ok(())
}

#[cfg(not(coverage))]
fn plan_with_optional_capacity(
source: &cloud::CloudSourceSnapshot,
root: &CloudRoot,
verify_capacity: bool,
oauth_connections: Option<&Path>,
reserve_mib: u64,
) -> Result<(CloudRoot, cloud::CloudPlanReport), String> {
if !verify_capacity {
return Ok((
root.clone(),
cloud::plan_cloud_archive_from_snapshot(source, root),
));
}
let observed_at_ms = cloud::system_now_ms();
let capacity_snapshot = match collect_root_capacity(root, oauth_connections, observed_at_ms) {
Ok(snapshot) => snapshot,
Err(error) => provider_capacity::unavailable_capacity_from_error(
root.provider,
observed_at_ms,
&error,
),
};
let refined_root =
provider_capacity::root_with_verified_capacity_scope(root, &capacity_snapshot)?;
let mut report = cloud::plan_cloud_archive_from_snapshot(source, &refined_root);
attach_capacity_snapshot(&mut report, capacity_snapshot, reserve_mib)?;
Ok((refined_root, report))
}

#[cfg(not(coverage))]
fn collect_receipt_sync_evidence(
receipt: &CloudCopyReceipt,
Expand Down Expand Up @@ -1938,15 +1951,13 @@ fn run() -> Result<(), String> {
if args.all_readable_roots {
let mut summaries = Vec::with_capacity(selected_roots.len());
for selected in &selected_roots {
let mut report = cloud::plan_cloud_archive_from_snapshot(&snapshot, selected);
if args.verify_capacity {
attach_verified_capacity(
&mut report,
selected,
args.oauth_connections.as_deref(),
args.capacity_reserve_mib,
)?;
}
let (_, report) = plan_with_optional_capacity(
&snapshot,
selected,
args.verify_capacity,
args.oauth_connections.as_deref(),
args.capacity_reserve_mib,
)?;
summaries.push(match args.review_reason_set.as_deref() {
Some(reasons) => review_batch_summary(&report, reasons)?,
None => decision_summary(&report),
Expand Down Expand Up @@ -1986,15 +1997,14 @@ fn run() -> Result<(), String> {
.into_iter()
.next()
.ok_or_else(|| "선택된 클라우드 루트가 없음".to_string())?;
let mut report = cloud::plan_cloud_archive_from_snapshot(&snapshot, &selected);
if args.verify_capacity {
attach_verified_capacity(
&mut report,
&selected,
args.oauth_connections.as_deref(),
args.capacity_reserve_mib,
)?;
}
let capacity_required_for_plan = args.verify_capacity || args.copy_fingerprint.is_some();
let (selected, report) = plan_with_optional_capacity(
&snapshot,
&selected,
capacity_required_for_plan,
args.oauth_connections.as_deref(),
args.capacity_reserve_mib,
)?;
if let (Some(redundant_prefix), Some(kind)) = (
args.exact_duplicate_review_prefix.as_deref(),
args.exact_duplicate_kind,
Expand Down Expand Up @@ -2091,13 +2101,17 @@ fn run() -> Result<(), String> {
None
};
if !adopt_existing {
let assessment = verified_capacity_for_bytes(
&selected,
args.oauth_connections.as_deref(),
let capacity_snapshot = report
.capacity
.as_ref()
.map(|assessment| assessment.snapshot.clone())
.ok_or_else(|| "cloud-capacity-verification-required".to_string())?;
let assessment = provider_capacity::assess_capacity(
capacity_snapshot,
candidate.bytes,
candidate.bytes,
args.capacity_reserve_mib,
)?;
args.capacity_reserve_mib.saturating_mul(1024 * 1024),
);
if assessment.can_fit != Some(true) {
return Err(if assessment.blockers.is_empty() {
"cloud-capacity-verification-required".into()
Expand Down Expand Up @@ -3168,6 +3182,27 @@ mod tests {
copy.oauth_connections = Some(PathBuf::from("/connections.json"));
assert!(validate_action_args(&copy).is_ok());

let review = parse_args(
&[
"--verify-capacity".into(),
"--review-candidate-fingerprint".into(),
"c".repeat(64),
"--review-fingerprint".into(),
"d".repeat(64),
"--review-disposition".into(),
"approved".into(),
"--reviewed-by".into(),
"human:test".into(),
"--review-rationale".into(),
"provider scope and embedded metadata reviewed".into(),
"--review-dir".into(),
"/reviews".into(),
],
Path::new("/h"),
)
.unwrap();
assert!(validate_action_args(&review).is_ok());

let mut adoption = copy.clone();
adoption.copy_fingerprint = None;
adoption.adopt_existing_fingerprint = Some("b".repeat(64));
Expand All @@ -3189,7 +3224,16 @@ mod tests {
access_issue: None,
};

let assessment = verified_capacity_for_bytes(&root, None, 10, 10, 1).unwrap();
let observed_at_ms = cloud::system_now_ms();
let snapshot = match collect_root_capacity(&root, None, observed_at_ms) {
Ok(snapshot) => snapshot,
Err(error) => provider_capacity::unavailable_capacity_from_error(
root.provider,
observed_at_ms,
&error,
),
};
let assessment = provider_capacity::assess_capacity(snapshot, 10, 10, 1024 * 1024);

assert_eq!(assessment.can_fit, None);
assert_eq!(
Expand Down Expand Up @@ -3224,7 +3268,12 @@ mod tests {
notices: vec!["dry-run-only".into(), "cloud-quota-unverified".into()],
};

attach_verified_capacity(&mut report, &root, None, 1024).unwrap();
let snapshot = provider_capacity::unavailable_capacity_from_error(
CloudProvider::Onedrive,
1,
"provider-capacity-oauth-connections-required",
);
attach_capacity_snapshot(&mut report, snapshot, 1024).unwrap();

let assessment = report.capacity.unwrap();
assert_eq!(assessment.can_fit, None);
Expand Down
Loading
Loading