oh-my-space 2.0.0 → 2.0.1

package/dist/build-info.json

@@ -1 +1 @@
-{"commit":"b2a86e8876ac76ffc8e4daed8146f82fe93613d1","skills":{"oms-branch":{"version":"1.2.0","omsVersion":">=1.0.0-0"},"oms-pointer":{"version":"1.2.0","omsVersion":">=1.0.0-0"},"oms-workspace":{"version":"1.4.0","omsVersion":">=1.2.0-0"}}}
+{"commit":"58af8b34c6d2801ea9900e8ff4275d3c2e70c1d6","skills":{"oms-branch":{"version":"1.2.0","omsVersion":">=1.0.0-0"},"oms-pointer":{"version":"1.2.0","omsVersion":">=1.0.0-0"},"oms-workspace":{"version":"1.4.0","omsVersion":">=1.2.0-0"}}}

package/dist/oms.js

@@ -18591,6 +18591,7 @@ function makePlan(root, repo, baseArg) {
   const matches = refs.filter((entry) => requested.startsWith("refs/") ? entry.ref === requested : entry.ref === `refs/heads/${requested}` || entry.ref === `refs/remotes/${requested}`);
   if (matches.length !== 1 || matches[0].symbolic) throw new Error(`Comparison base ${JSON.stringify(requested)} is missing, ambiguous, or symbolic. Supply an existing direct local or remote-tracking branch with --base; no refs were refreshed.`);
   const base = matches[0];
+  let limitedHistory = false;
   const branches = refs.filter((entry) => entry.ref.startsWith("refs/heads/")).map((entry) => {
     const name = entry.ref.slice("refs/heads/".length);
     const reasons = [...safety.protected.get(name) ?? []];
@@ -18598,11 +18599,14 @@ function makePlan(root, repo, baseArg) {
     if (entry.symbolic) reasons.push("symbolic local branch ref");
     if (!reasons.length) {
       const reason = ancestry(dir, entry.oid, base.oid, safety.shallow);
-      if (reason) reasons.push(reason);
+      if (reason) {
+        reasons.push(reason);
+        if (safety.shallow) limitedHistory = true;
+      }
     }
     return Object.freeze({ ...entry, name, reasons: Object.freeze(reasons) });
   }).sort((a2, b) => a2.name < b.name ? -1 : a2.name > b.name ? 1 : 0);
-  return Object.freeze({ alias: repo.alias, context, base, branches: Object.freeze(branches) });
+  return Object.freeze({ alias: repo.alias, context, base, branches: Object.freeze(branches), limitedHistory });
 }
 __name(makePlan, "makePlan");
 function execute(root, repo, plan) {
@@ -18700,24 +18704,26 @@ async function runBranchClean(aliasArg, options) {
   const wasInitialized = submoduleInitialized(repoRoot, repo.alias);
   const preparation = await prepareAlias(repoRoot, repo, { command: "branch clean", topologyOffer: false });
   if (!preparation.ok) return preparation.code;
-  const effects = wasInitialized ? "Preparation: the source was already initialized; no initialization was needed." : "Preparation initialized the registered source; fetched data, baseline branch creation or attachment, and tracking configuration remain even if cleanup is declined.";
+  const effects = wasInitialized ? void 0 : "Preparation initialized the registered source; fetched data, baseline branch creation or attachment, and tracking configuration remain even if cleanup is declined.";
   let plan;
   try {
     plan = makePlan(repoRoot, repo, options.base);
   } catch (error) {
     log.error(error instanceof Error ? error.message : String(error));
-    log.info(effects);
+    if (effects) log.info(effects);
     return 1;
   }
-  log.info(`Cleanup ${plan.alias}: comparison base ${plan.base.ref} ${plan.base.oid} (local/cached refs; not refreshed).`);
-  log.info(effects);
-  log.warn("Do not mutate source branches, worktrees, or configuration through other Git or IDE operations from confirmation waiting through completion. Commit-value transactions do not atomically protect ref type, generation, occupancy, metadata, or configuration; same-name recreation and movement away and back to the same OID are not distinguished.");
-  for (const branch of plan.branches) log.info(`${branch.reasons.length ? "Excluded" : "Candidate"}: ${branch.name} ${branch.oid}${branch.reasons.length ? ` \u2014 ${branch.reasons.join(", ")}` : ""}`);
   const candidates = plan.branches.filter((branch) => !branch.reasons.length);
   if (!candidates.length) {
-    log.info("No eligible merged local branches to clean.");
+    log.info(`${plan.alias}: no eligible merged local branches to clean.`);
+    if (effects) log.info(effects);
+    if (plan.limitedHistory) log.warn("Ancestry could not be proven with limited shallow history; deepen or repair history explicitly, then rerun.");
     return 0;
   }
+  log.info(`Cleanup ${plan.alias}: comparison base ${plan.base.ref} ${plan.base.oid} (local/cached refs; not refreshed).`);
+  if (effects) log.info(effects);
+  log.warn("Do not mutate source branches, worktrees, or configuration through other Git or IDE operations from confirmation waiting through completion. Commit-value transactions do not atomically protect ref type, generation, occupancy, metadata, or configuration; same-name recreation and movement away and back to the same OID are not distinguished.");
+  for (const branch of plan.branches) log.info(`${branch.reasons.length ? "Excluded" : "Candidate"}: ${branch.name} ${branch.oid}${branch.reasons.length ? ` \u2014 ${branch.reasons.join(", ")}` : ""}`);
   const rerun = `oms branch clean ${shq2(repo.alias)}${options.base !== void 0 ? ` --base ${shq2(options.base)}` : ""}`;
   if (!canPrompt()) {
     log.error(`No branches deleted. Rerun in an interactive terminal: ${rerun}`);
@@ -18726,7 +18732,7 @@ async function runBranchClean(aliasArg, options) {
   const confirmed = await guardedConfirm({ message: `Delete these ${candidates.length} merged local branches in ${repo.alias}?`, initialValue: false });
   if (isCancel2(confirmed) || !confirmed) {
     cancel("Cleanup declined or cancelled; no branches deleted.");
-    log.info(effects);
+    if (effects) log.info(effects);
     return 1;
   }
   const outcomes = execute(repoRoot, repo, plan);
@@ -20223,36 +20229,16 @@ fresh clone has no deletable local branch. Partial registration is refused with
 Deletion remains local to the submodule and never changes root topology.
 `;
 var branchCleanHelp = `
-Clean merged local branches in one source repository. Omit the alias for interactive selection.
-OMS does not accept --all, --force, or --yes.
-
-Base:
-  The default is the local oms.yaml branch, or the local branch named by cached origin/HEAD.
-  OMS has no default named main and no remote fallback.
-  --base selects an existing direct local or remote-tracking branch. Protected baselines still apply.
-  OMS does not refresh refs or reconcile remotes after preparation.
-
-Safety:
-  - OMS displays the base, branch tips, exclusions, and preparation effects before one confirmation.
-  - Confirmation defaults to No. Candidates require an interactive terminal.
-  - Only proven ancestry qualifies, including in shallow repositories.
-  - OMS excludes the current branch, local base, protected baselines, and branches in any worktree.
-  - OMS refuses unsafe source state, inconsistent registration, and unreliable inspection.
-  - Initialization, fetched data, baseline attachment or creation, and tracking settings remain after decline.
-  - Stop other Git or IDE changes to source branches, worktrees, and configuration from confirmation waiting until cleanup finishes.
-  - Commit checks do not lock all repository state. Concurrent recreation can lose branch settings.
-
-Results:
-  OMS prints recovery commands. Completed deletions remain after partial failure, including configuration failure.
-  OMS does not retry with force or restore deleted branches automatically.
-  After preparation, OMS preserves remote refs, source HEAD/files/index, root tracked state, and recorded commits.
-  Exit codes: 0 complete or empty batch | 1 refusal/decline/cancel | 2 initialization failure or incomplete batch
-
 Examples:
   $ oms branch clean api
   $ oms branch clean api --base origin/develop
 
-Full rules for refs, source state, revalidation, concurrency, shallow history, and recovery:
+Deletes local branches only, with interactive confirmation that defaults to No.
+The default base is the configured local branch, or the local branch named by
+cached origin/HEAD. Refs are not refreshed after preparation.
+OMS initializes existing registrations when needed; those effects remain on decline.
+
+Detailed safety and recovery:
   https://github.com/divlook/oh-my-space/blob/HEAD/docs/how-oms-works.md#merged-branch-cleanup-safety
 `;
 var treeHelp = `
@@ -20752,7 +20738,7 @@ branchCommand.command("delete").description(
 ).argument("[alias]", "declared source alias (omit to pick interactively)").argument("[branch]", "local branch name (omit to pick from deletable local branches)").option("-f, --force", "force-delete with git branch -D (still respects protected branches)").addHelpText("after", `${branchDeleteHelp}${workspaceContextHelp}${exitHelp}`).action(async (alias, branch, options) => {
   await exitWith(runBranchDelete(alias, branch, options));
 });
-branchCommand.command("clean").description("Confirm deletion of merged local branches in one source repository.").argument("[alias]", "declared source alias (omit to pick interactively)").option("--base <ref>", "existing local or remote-tracking comparison branch").addHelpText("after", `${branchCleanHelp}${workspaceContextHelp}`).action(async (alias, options) => {
+branchCommand.command("clean").description("Confirm deletion of merged local branches in one source repository.").argument("[alias]", "declared source alias (omit to pick interactively)").option("--base <ref>", "existing local or remote-tracking comparison branch").addHelpText("after", branchCleanHelp).action(async (alias, options) => {
   await exitWith(runBranchClean(alias, options));
 });
 var treeCommand = program2.command("tree").description("Create, list, or remove a disposable per-task checkout of a source repository.").addHelpText("after", `${treeHelp}${workspaceContextHelp}${exitHelp}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-space",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Manage multi-repo workspaces with Git submodules.",
   "license": "MIT",
   "homepage": "https://github.com/divlook/oh-my-space",