oh-my-space 2.0.2 → 2.0.3

package/dist/build-info.json

@@ -1 +1 @@
-{"commit":"ec3457f1257cda10089fec081db65cfe14c37f27","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":"4b2d752a2ebab84cca6b4ce34ec540123c2e9d54","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

@@ -15220,19 +15220,37 @@ var operationMarkers = [
   ["BISECT_LOG", "bisect"],
   ["sequencer", "cherry-pick or revert"]
 ];
+var rootOperationMarkers = operationMarkers.filter(([marker]) => marker !== "sequencer");
+var sourcePathArgs = ["rev-parse", ...operationMarkers.flatMap(([marker]) => ["--git-path", marker])];
+var rootPathArgs = ["rev-parse", ...rootOperationMarkers.flatMap(([marker]) => ["--git-path", marker])];
 function inspectOperations(dir, strict, includeSequencer) {
-  for (const [marker, label] of operationMarkers) {
-    if (!includeSequencer && marker === "sequencer") continue;
-    const path = runGit(dir, ["rev-parse", "--git-path", marker]);
+  const markers = includeSequencer ? operationMarkers : rootOperationMarkers;
+  const lookup = runGit(dir, includeSequencer ? sourcePathArgs : rootPathArgs);
+  const paths = lookup.stdout.trimEnd().split("\n");
+  if (strict && (!lookup.success || lookup.stderr.trim() || paths.length < markers.length)) {
+    return { kind: "unreadable", marker: markers[0][0], access: false };
+  }
+  const batched = lookup.success && paths.length === markers.length;
+  for (let index = 0; index < markers.length; index++) {
+    const [marker, label] = markers[index];
+    let path;
+    if (batched) {
+      path = paths[index].trim();
+    } else {
+      const result = runGit(dir, ["rev-parse", "--git-path", marker]);
+      if (strict && (!result.success || result.stderr.trim())) return { kind: "unreadable", marker, access: false };
+      if (!result.success) continue;
+      path = result.stdout.trim();
+    }
     if (strict) {
-      if (!path.success || path.stderr.trim() || !path.stdout.trim()) return { kind: "unreadable", marker, access: false };
+      if (!path) return { kind: "unreadable", marker, access: false };
       try {
-        lstatSync2(resolve4(dir, path.stdout.trim()));
+        lstatSync2(resolve4(dir, path));
         return { kind: "active", label };
       } catch (error) {
         if (error.code !== "ENOENT") return { kind: "unreadable", marker, access: true };
       }
-    } else if (path.success && existsSync5(resolve4(dir, path.stdout.trim()))) {
+    } else if (existsSync5(resolve4(dir, path))) {
       return { kind: "active", label };
     }
   }
@@ -15495,10 +15513,18 @@ __name(inspectCleanSourceSafety, "inspectCleanSourceSafety");
 // scripts/lib/branch-baseline.ts
 import { existsSync as existsSync7, readFileSync as readFileSync4 } from "node:fs";
 import { join as join6 } from "node:path";
-function readGitConfigValues(repoRoot, content, key) {
-  const r2 = productionGitRunner(repoRoot, ["config", "--file", "-", "--get-all", key], Buffer.from(content));
-  if (!r2.success) return r2.exitCode === 1 ? { ok: true, values: [] } : { ok: false };
-  return { ok: true, values: r2.stdout.split("\n").map((s) => s.trim()).filter((s) => s.length > 0) };
+function readGitConfigValues(entries2, key) {
+  const prefix = `${key}
+`;
+  const values = [];
+  for (const entry of entries2) {
+    if (!entry.startsWith(prefix)) continue;
+    for (const line of entry.slice(prefix.length).split("\n")) {
+      const value = line.trim();
+      if (value) values.push(value);
+    }
+  }
+  return values;
 }
 __name(readGitConfigValues, "readGitConfigValues");
 function countSectionHeaders(content, path) {
@@ -15560,22 +15586,20 @@ function collectSources(repoRoot) {
 }
 __name(collectSources, "collectSources");
 function observeSource(repoRoot, source, path) {
-  const problem = /* @__PURE__ */ __name((message, repair) => ({
+  const problem = /* @__PURE__ */ __name((message) => ({
     ok: false,
     warning: `${source.label} ${message}`,
-    refusal: `${source.label} ${message}${repair ? "; repair it, then retry" : "; retry once Git is idle"}`
+    refusal: `${source.label} ${message}; repair it, then retry`
   }), "problem");
-  if (countSectionHeaders(source.rawContent, path) > 1) return problem(`has duplicate "${path}" submodule sections`, true);
-  if (source.rawContent.trim().length > 0 && !productionGitRunner(repoRoot, ["config", "--file", "-", "--list"], Buffer.from(source.rawContent)).success) {
-    return problem("has invalid Git config syntax", true);
-  }
-  const paths = readGitConfigValues(repoRoot, source.rawContent, `submodule.${path}.path`);
-  if (!paths.ok) return problem("path values could not be read", false);
-  if (paths.values.length > 1) return problem(`has multiple "path" values for "${path}"`, true);
-  const branches = readGitConfigValues(repoRoot, source.rawContent, `submodule.${path}.branch`);
-  if (!branches.ok) return problem("branch values could not be read", false);
-  if (branches.values.length > 1) return problem(`has multiple "branch" values for "${path}"`, true);
-  return { ok: true, source: source.label, branch: branches.values[0] ?? null };
+  if (countSectionHeaders(source.rawContent, path) > 1) return problem(`has duplicate "${path}" submodule sections`);
+  const parsed = productionGitRunner(repoRoot, ["config", "--file", "-", "--null", "--list"], Buffer.from(source.rawContent));
+  if (!parsed.success) return problem("has invalid Git config syntax");
+  const entries2 = parsed.stdout.split("\0");
+  const paths = readGitConfigValues(entries2, `submodule.${path}.path`);
+  if (paths.length > 1) return problem(`has multiple "path" values for "${path}"`);
+  const branches = readGitConfigValues(entries2, `submodule.${path}.branch`);
+  if (branches.length > 1) return problem(`has multiple "branch" values for "${path}"`);
+  return { ok: true, source: source.label, branch: branches[0] ?? null };
 }
 __name(observeSource, "observeSource");
 function observeMetadata(repoRoot, alias) {
@@ -17405,14 +17429,11 @@ function captureContext(root, alias) {
   if (!new RegExp(`^160000 [0-9a-f]{40,64} 0\\t${path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\0$`).test(index.stdout)) {
     throw new Error(`Selected registration is inconsistent; run "oms sync ${alias}" first.`);
   }
-  const keyPattern = `^submodule\\.${path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.`;
+  const keyPrefix = `submodule.${path}.`;
   const snapshots = [];
   for (const args of [["--blob", "HEAD:.gitmodules"], ["--blob", ":.gitmodules"], ["--file", ".gitmodules"], ["--local"]]) {
-    checked(root, ["config", ...args, "--list"], "Cannot inspect selected registration configuration");
-    const result = runGit(root, ["config", ...args, "--null", "--get-regexp", keyPattern]);
-    const absentLocal = args[0] === "--local" && result.exitCode === 1 && !result.stderr.trim();
-    if (!result.success && !absentLocal || result.stderr.trim()) throw new Error("Selected registration information could not be inspected; repair registration with oms sync, then retry.");
-    const entries2 = result.stdout.split("\0").filter(Boolean).sort();
+    const result = checked(root, ["config", ...args, "--null", "--list"], "Cannot inspect selected registration configuration");
+    const entries2 = result.stdout.split("\0").filter((entry) => entry.startsWith(keyPrefix)).sort();
     if (args[0] !== "--local" && !entries2.includes(`submodule.${path}.path
 ${path}`)) throw new Error("Selected registration path changed or is inconsistent; run oms sync first.");
     snapshots.push(JSON.stringify(entries2));

package/package.json

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