oh-my-space 0.11.4 → 0.11.5

package/dist/build-info.json

@@ -1 +1 @@
-{"commit":"60bbfdfcc5f72dce2b2b74508715ddbc723aa3ff"}
+{"commit":"022ade8884c62e549770e73407066671e8caa50a"}

package/dist/oms.js

@@ -14548,7 +14548,7 @@ function loadForSubmodules() {
 __name(loadForSubmodules, "loadForSubmodules");
 
 // scripts/lib/status.ts
-import { existsSync as existsSync5 } from "node:fs";
+import { existsSync as existsSync5, lstatSync, readdirSync } from "node:fs";
 import { relative, resolve as resolve4 } from "node:path";
 function pinState(repoRoot, alias) {
   const r = runGit(repoRoot, ["submodule", "status", "--", submodulePath(alias)]);
@@ -14701,6 +14701,55 @@ function partialRemovalTopology(s) {
   return s.headOid !== null && !s.pathExists !== !s.gitmodulesEntry;
 }
 __name(partialRemovalTopology, "partialRemovalTopology");
+function readAliasDirEntries(repoRoot, alias) {
+  const dir = aliasDir(repoRoot, alias);
+  try {
+    if (!lstatSync(dir).isDirectory()) return { exists: true, kind: "file" };
+    return { exists: true, kind: "dir", entries: readdirSync(dir) };
+  } catch (error) {
+    if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
+      return { exists: false };
+    }
+    return { exists: true, kind: "unreadable" };
+  }
+}
+__name(readAliasDirEntries, "readAliasDirEntries");
+function unreadablePathReason(alias) {
+  return `oms/${alias} could not be read (permission or I/O error). Resolve access to it, then retry.`;
+}
+__name(unreadablePathReason, "unreadablePathReason");
+var TOPOLOGY_REASON = {
+  conflict: "the root gitlink is conflicted. Resolve the root repository conflict first.",
+  inProgressOp: /* @__PURE__ */ __name((op) => `the root repository has a ${op} in progress. Resolve, continue, or abort it first.`, "inProgressOp"),
+  occupiedPath: /* @__PURE__ */ __name((alias) => `oms/${alias} is occupied by a non-submodule path. Move or remove it manually, then retry.`, "occupiedPath"),
+  unreadable: /* @__PURE__ */ __name((alias) => unreadablePathReason(alias), "unreadable")
+};
+function occupiedByNonSubmodule(repoRoot, alias) {
+  if (isRegisteredSubmodule(repoRoot, submodulePath(alias))) return "clear";
+  const dirState = readAliasDirEntries(repoRoot, alias);
+  if (!dirState.exists) return "clear";
+  if (dirState.kind === "unreadable") return "unreadable";
+  if (dirState.kind === "file") return "occupied";
+  return dirState.entries.length > 0 ? "occupied" : "clear";
+}
+__name(occupiedByNonSubmodule, "occupiedByNonSubmodule");
+function assertRootTopologySafe(repoRoot, alias, checks = ["conflict", "inProgressOp", "occupiedPath"]) {
+  const applies = new Set(checks);
+  if (applies.has("conflict") && gitlinkState(repoRoot, alias).conflict) {
+    return { safe: false, reason: TOPOLOGY_REASON.conflict };
+  }
+  if (applies.has("inProgressOp")) {
+    const op = gitOperationInProgress(repoRoot);
+    if (op) return { safe: false, reason: TOPOLOGY_REASON.inProgressOp(op) };
+  }
+  if (applies.has("occupiedPath")) {
+    const occupied = occupiedByNonSubmodule(repoRoot, alias);
+    if (occupied === "unreadable") return { safe: false, reason: TOPOLOGY_REASON.unreadable(alias) };
+    if (occupied === "occupied") return { safe: false, reason: TOPOLOGY_REASON.occupiedPath(alias) };
+  }
+  return { safe: true };
+}
+__name(assertRootTopologySafe, "assertRootTopologySafe");
 function rootFollowupHint(alias, s) {
   if (s.headOid !== null && s.pathExists && !s.conflict && s.moved) {
     return `Run "oms record ${alias}" to record the root pointer update.`;
@@ -15154,13 +15203,9 @@ async function runRecord(alias) {
   const selected = resolution.alias;
   const path = submodulePath(selected);
   const state = gitlinkState(repoRoot, selected);
-  if (state.conflict) {
-    R2.error(`${selected}: the root gitlink is conflicted. Resolve the root repository conflict first.`);
-    return 1;
-  }
-  const rootOp = gitOperationInProgress(repoRoot);
-  if (rootOp) {
-    R2.error(`Root repository has a ${rootOp} in progress. Resolve, continue, or abort it before recording.`);
+  const safety = assertRootTopologySafe(repoRoot, selected, ["conflict", "inProgressOp"]);
+  if (!safety.safe) {
+    R2.error(`${selected}: ${safety.reason}`);
     return 1;
   }
   if (currentBranch(repoRoot) === null) {
@@ -15766,7 +15811,7 @@ async function runInit(options) {
 __name(runInit, "runInit");
 
 // scripts/lib/repo-ops.ts
-import { existsSync as existsSync8, lstatSync, readFileSync as readFileSync4, readdirSync, rmSync as rmSync2, rmdirSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync4, readdirSync as readdirSync2, rmSync as rmSync2, rmdirSync, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join7 } from "node:path";
 function cleanupFailedAdd(repoRoot, alias) {
   const path = submodulePath(alias);
@@ -15865,32 +15910,20 @@ function reconcileGitmodulesMetadata(repoRoot, repo) {
   return changed;
 }
 __name(reconcileGitmodulesMetadata, "reconcileGitmodulesMetadata");
-function readAliasDirEntries(repoRoot, alias) {
-  const dir = aliasDir(repoRoot, alias);
-  try {
-    if (!lstatSync(dir).isDirectory()) return { exists: true, entries: null };
-    return { exists: true, entries: readdirSync(dir) };
-  } catch (error) {
-    if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
-      return { exists: false };
-    }
-    return { exists: true, entries: null };
-  }
-}
-__name(readAliasDirEntries, "readAliasDirEntries");
 function cleanupRestorableAliasDir(repoRoot, alias) {
-  if (submoduleInitialized(repoRoot, alias)) return true;
+  if (submoduleInitialized(repoRoot, alias)) return "ok";
   const dirState = readAliasDirEntries(repoRoot, alias);
-  if (!dirState.exists) return true;
-  if (dirState.entries === null) return false;
+  if (!dirState.exists) return "ok";
+  if (dirState.kind === "unreadable") return "unreadable";
+  if (dirState.kind === "file") return "occupied";
   const entries = dirState.entries;
-  if (entries.length > 0 && entries.some((entry) => entry !== ".DS_Store")) return false;
+  if (entries.length > 0 && entries.some((entry) => entry !== ".DS_Store")) return "occupied";
   try {
     rmSync2(aliasDir(repoRoot, alias), { recursive: true, force: true });
   } catch {
-    return false;
+    return "unremovable";
   }
-  return true;
+  return "ok";
 }
 __name(cleanupRestorableAliasDir, "cleanupRestorableAliasDir");
 function restorePendingRemoval(repo, repoRoot) {
@@ -15911,9 +15944,10 @@ function restorePendingRemoval(repo, repoRoot) {
   }
   const section = headGitmodulesSection(repoRoot, alias);
   if (!section) return unsafe(".gitmodules metadata is not recoverable from HEAD");
-  if (!cleanupRestorableAliasDir(repoRoot, alias)) {
-    return unsafe(`${path} is occupied by a non-submodule path`);
-  }
+  const cleanup = cleanupRestorableAliasDir(repoRoot, alias);
+  if (cleanup === "unreadable") return unsafe(`${path} could not be read (permission or I/O error)`);
+  if (cleanup === "unremovable") return unsafe(`${path} could not be removed (permission or I/O error)`);
+  if (cleanup === "occupied") return unsafe(`${path} is occupied by a non-submodule path`);
   runGit(repoRoot, ["restore", "--source=HEAD", "--staged", "--", ".gitmodules"]);
   if (!state.gitmodulesEntry) insertGitmodulesSection(repoRoot, alias, section);
   const metadataUpdated = reconcileGitmodulesMetadata(repoRoot, repo);
@@ -15944,7 +15978,11 @@ function syncRepo(repo, repoRoot) {
   }
   if (!registered) {
     const dirState = readAliasDirEntries(repoRoot, alias);
-    if (dirState.exists && (dirState.entries === null || dirState.entries.length > 0)) {
+    if (dirState.exists && dirState.kind === "unreadable") {
+      R2.error(`${alias}: ${unreadablePathReason(alias)}`);
+      return "failed";
+    }
+    if (dirState.exists && (dirState.kind === "file" || dirState.entries.length > 0)) {
       R2.error(
         `${alias}: ${path}/ already exists but is not a registered submodule. Move or remove it manually, then retry.`
       );
@@ -16018,6 +16056,11 @@ function unsyncRepo(repo, repoRoot, force) {
   const registered = isRegisteredSubmodule(repoRoot, path);
   const exists = existsSync8(aliasDir(repoRoot, alias));
   if (!registered && !exists) return "nothing-to-remove";
+  const safety = assertRootTopologySafe(repoRoot, alias);
+  if (!safety.safe) {
+    R2.error(`${alias}: ${safety.reason}`);
+    return "failed";
+  }
   if (!force && submoduleInitialized(repoRoot, alias) && isDirty(aliasDir(repoRoot, alias))) {
     R2.error(
       `${alias}: ${path} has uncommitted or untracked changes. Commit, stash, remove them, or pass --force.`
@@ -16038,7 +16081,7 @@ function unsyncRepo(repo, repoRoot, force) {
   }
   try {
     const modulesParent = join7(repoRoot, ".git", "modules", DATA_DIRNAME);
-    if (existsSync8(modulesParent) && readdirSync(modulesParent).length === 0) rmdirSync(modulesParent);
+    if (existsSync8(modulesParent) && readdirSync2(modulesParent).length === 0) rmdirSync(modulesParent);
   } catch {
   }
   if (existsSync8(aliasDir(repoRoot, alias))) {
@@ -16046,7 +16089,7 @@ function unsyncRepo(repo, repoRoot, force) {
   }
   try {
     const parent = join7(repoRoot, DATA_DIRNAME);
-    if (existsSync8(parent) && readdirSync(parent).length === 0) rmdirSync(parent);
+    if (existsSync8(parent) && readdirSync2(parent).length === 0) rmdirSync(parent);
   } catch {
   }
   const gitmodules = join7(repoRoot, ".gitmodules");
@@ -16245,9 +16288,7 @@ async function runUnsync(aliases, options) {
   if (results.length > 1 || options.all) printSummary(results);
   const failed = picked.filter((_, i) => results[i] === "failed").map((r) => r.alias);
   if (failed.length > 0) {
-    R2.error(
-      `Not unsynced: ${failed.join(", ")}. The submodule had uncommitted or untracked changes \u2014 commit/stash/remove them, or re-run with --force.`
-    );
+    R2.error(`Not unsynced: ${failed.join(", ")}. See the per-alias error above for each.`);
   }
   return exitFromResults(results) || topoExit;
 }

package/package.json

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