@ozyman42/ozy-cli 0.4.6-linux-x64.0 → 0.4.6

package/dist/modules/cli/git/impl.js

@@ -0,0 +1,124 @@
+import { implementing } from "effective-modules";
+import { cliModules } from "..";
+import { commonModules } from "@/modules/common";
+import { $ } from 'bun';
+import { Effect, Option, pipe } from "effect";
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+import { SSH_KEYGEN_CMD_PATH, STANDARD_REMOTE_PREFIX } from "@/common/constants";
+import { Gitmodules } from "./submodule/gitmodules";
+import { readGitState } from "./submodule/git-state";
+import { fixGitConfig, fixModuleDirs, fixIndexGitlinks } from "./submodule/fix";
+import { printSyncState, printFixes } from "./submodule/printer";
+export class GitImpl extends implementing(cliModules.Git).uses(commonModules.OSPlatform, commonModules.SSHConfig) {
+    parseOwnerRepo(remote) {
+        const sshMatch = remote.match(/^git@[^:]+:([^/]+)\/(.+?)(?:\.git)?$/);
+        if (sshMatch)
+            return Effect.succeed({ owner: sshMatch[1], repo: sshMatch[2] });
+        const httpsMatch = remote.match(/^https?:\/\/[^/]+\/([^/]+)\/(.+?)(?:\.git)?$/);
+        if (httpsMatch)
+            return Effect.succeed({ owner: httpsMatch[1], repo: httpsMatch[2] });
+        return Effect.fail(`Cannot parse owner/repo from remote: ${remote}`);
+    }
+    *resolveOwnerAndRepo(maybeOwnerAndRepo) {
+        if (Option.isSome(maybeOwnerAndRepo)) {
+            const parts = maybeOwnerAndRepo.value.split('/');
+            const [owner, repo] = parts;
+            if (parts.length !== 2 || !owner || !repo)
+                return yield* Effect.fail(`Cannot parse remote error: Expected "owner/repo", got "${maybeOwnerAndRepo.value}"`);
+            return { owner, repo };
+        }
+        if (!(yield* this.isGitRepository())) {
+            yield* Effect.fail(`not in git repo: Current directory is not a git repository`);
+        }
+        const remoteOption = yield* this.getRemoteOrigin();
+        if (Option.isNone(remoteOption)) {
+            return yield* Effect.fail(`no remote origin: No remote.origin.url — pass owner/repo as argument to clone instead`);
+        }
+        return yield* this.parseOwnerRepo(remoteOption.value);
+    }
+    *isGitRepository() {
+        return yield* pipe(Effect.tryPromise(async () => {
+            await $ `git rev-parse --is-inside-work-tree`.quiet();
+            return true;
+        }), Effect.catchTag("UnknownError", () => Effect.succeed(false)));
+    }
+    *getRemoteOrigin() {
+        return yield* pipe(Effect.tryPromise(async () => {
+            return Option.some((await $ `git config --get remote.origin.url`.quiet()).text().trim());
+        }), Effect.catchTag("UnknownError", () => Effect.succeed(Option.none())));
+    }
+    *clone(owner, repo) {
+        const result = Bun.spawnSync(['git', 'clone', '--recurse-submodules', `${STANDARD_REMOTE_PREFIX}${owner}/${repo}.git`], { stdout: 'inherit', stderr: 'inherit' });
+        if (result.exitCode !== 0)
+            return yield* Effect.fail(`git clone failed with exit code ${result.exitCode}`);
+        process.chdir(`./${repo}`);
+    }
+    *setLocalConfig(key, value) {
+        yield* Effect.tryPromise({
+            try: async () => { await $ `git config --local ${key} ${value}`.quiet(); },
+            catch: (e) => `git config ${key}: ${e instanceof Error ? e.message : String(e)}`,
+        });
+    }
+    *configureRepo({ dir, remoteURL, user, pubkeyPath }) {
+        yield* Effect.log(`Configuring ${dir}`);
+        yield* Effect.tryPromise({
+            try: async () => {
+                const configs = [
+                    ['remote.origin.url', remoteURL],
+                    ['user.name', user.name],
+                    ['user.email', user.email],
+                    ['user.signingkey', pubkeyPath],
+                    ['gpg.format', 'ssh'],
+                    ['gpg.ssh.program', SSH_KEYGEN_CMD_PATH],
+                    ['commit.gpgsign', 'true'],
+                    ['tag.gpgsign', 'true'],
+                ];
+                for (const [k, v] of configs) {
+                    const r = Bun.spawnSync(['git', 'config', '--local', k, v], { cwd: dir, stdout: 'pipe', stderr: 'pipe' });
+                    if (r.exitCode !== 0) {
+                        const err = new TextDecoder().decode(r.stderr);
+                        throw new Error(`git config ${k} failed: ${err.trim()}`);
+                    }
+                }
+            },
+            catch: (e) => e instanceof Error ? e.message : String(e),
+        });
+    }
+    *syncSubmoduleState(repoRoot, topLevelRoot) {
+        const gitmodules = yield* Gitmodules.fromRepoRoot(repoRoot);
+        if (gitmodules.list.length === 0)
+            return gitmodules;
+        const submodulePaths = gitmodules.list.map(m => m.path);
+        const state = yield* readGitState(repoRoot, submodulePaths);
+        printSyncState(gitmodules, state);
+        const fixResults = yield* Effect.all([
+            fixGitConfig(repoRoot, gitmodules),
+            fixModuleDirs(repoRoot, gitmodules, state.moduleDirs, state.orphanModuleDirs, topLevelRoot),
+            fixIndexGitlinks(repoRoot, gitmodules, state.index),
+        ], { concurrency: "unbounded" });
+        printFixes(fixResults.flat());
+        return gitmodules;
+    }
+    *setupRepo(input) {
+        yield* this.setupRepoAt(input, input.dir);
+    }
+    *setupRepoAt(input, topLevelRoot) {
+        yield* this.configureRepo(input);
+        if (!existsSync(resolve(input.dir, '.gitmodules')))
+            return;
+        const gitmodules = yield* this.syncSubmoduleState(input.dir, topLevelRoot);
+        for (const m of gitmodules.list) {
+            const subDir = resolve(input.dir, m.path);
+            if (!existsSync(subDir))
+                continue;
+            yield* this.setupRepoAt({
+                dir: subDir,
+                remoteURL: m.url,
+                user: input.user,
+                pubkeyPath: input.pubkeyPath
+            }, topLevelRoot);
+        }
+    }
+}
+//# sourceMappingURL=impl.js.map

package/dist/modules/cli/git/impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../../../../../../src/modules/cli/git/impl.ts"],"names":[],"mappings":"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"}

package/dist/modules/cli/git/interface.js

@@ -0,0 +1,3 @@
+import {} from "effective-modules";
+import { Option } from "effect";
+//# sourceMappingURL=interface.js.map

package/dist/modules/cli/git/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../../../../src/modules/cli/git/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC"}

package/dist/modules/cli/git/submodule/fix.js

@@ -0,0 +1,257 @@
+import { existsSync, statSync } from "node:fs";
+import { readFile, writeFile, rename, mkdir, rm } from "node:fs/promises";
+import { resolve, join, dirname, relative } from "node:path";
+import { Effect } from "effect";
+import { resolveGitDir } from "./resolve-git-dir";
+function parseConfigSubmoduleValues(content) {
+    const entries = new Map();
+    let current = null;
+    for (const line of content.split("\n")) {
+        const headerMatch = line.match(/^\[submodule "(.+)"\]$/);
+        if (headerMatch) {
+            current = {};
+            entries.set(headerMatch[1], current);
+            continue;
+        }
+        if (!current)
+            continue;
+        const kvMatch = line.match(/^\s+(\w+)\s*=\s*(.+)$/);
+        if (!kvMatch)
+            continue;
+        const [, key, value] = kvMatch;
+        if (key === "url" || key === "path")
+            current[key] = value.trim();
+    }
+    return entries;
+}
+// Drops any stanza whose name isn't a valid submodule, is a stale duplicate, or
+// has url/path values that no longer match .gitmodules — so it can be re-added fresh.
+function removeExtraConfigSubmodules(content, modules) {
+    const byName = new Map(modules.list.map((m) => [m.name, m]));
+    const existingValues = parseConfigSubmoduleValues(content);
+    const staleNames = new Set();
+    for (const [name, values] of existingValues) {
+        const m = byName.get(name);
+        if (!m || values.url !== m.url || values.path !== m.path)
+            staleNames.add(name);
+    }
+    const removed = [];
+    const seen = new Set();
+    const output = [];
+    let dropping = false;
+    for (const line of content.split("\n")) {
+        const submoduleMatch = line.match(/^\[submodule "(.+)"\]$/);
+        if (submoduleMatch) {
+            const name = submoduleMatch[1];
+            if (!staleNames.has(name) && !seen.has(name)) {
+                seen.add(name);
+                dropping = false;
+            }
+            else {
+                removed.push(name);
+                dropping = true;
+            }
+        }
+        else if (/^\[/.test(line)) {
+            dropping = false;
+        }
+        if (!dropping)
+            output.push(line);
+    }
+    return { result: output.join("\n"), removed };
+}
+async function spawnGit(args, cwd) {
+    const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "pipe" });
+    const code = await proc.exited;
+    if (code !== 0) {
+        const err = await new Response(proc.stderr).text();
+        throw new Error(`git ${args.join(" ")} exited with code ${code}\n${err.trim()}`);
+    }
+}
+export function fixGitConfig(repoRoot, modules) {
+    return Effect.tryPromise({
+        try: async () => {
+            const gitDir = await resolveGitDir(repoRoot);
+            const configPath = resolve(gitDir, "config");
+            const content = await readFile(configPath, "utf8");
+            const { result: afterRemoval, removed } = removeExtraConfigSubmodules(content, modules);
+            const existingNames = new Set([...afterRemoval.matchAll(/^\[submodule "(.+)"\]$/gm)].map((m) => m[1]));
+            const missing = modules.list.filter((m) => !existingNames.has(m.name));
+            let result = afterRemoval;
+            for (const m of missing) {
+                if (!result.endsWith("\n"))
+                    result += "\n";
+                result += `[submodule "${m.name}"]\n\tactive = true\n\turl = ${m.url}\n\tpath = ${m.path}\n`;
+            }
+            if (removed.length === 0 && missing.length === 0)
+                return [];
+            await writeFile(configPath, result, "utf8");
+            return [
+                ...removed.map((name) => ({ location: [".git", "config", name], action: "deleted" })),
+                ...missing.map((m) => ({ location: [".git", "config", m.name], action: "synced" })),
+            ];
+        },
+        catch: (e) => e instanceof Error ? e.message : String(e),
+    });
+}
+const GIT_MODULES_MARKER = ".git/modules/";
+// A stale redirect's leading "../" prefix can be wrong after a path rename, but the
+// suffix starting at ".git/modules/" always describes a location under the single
+// top-level .git, at any nesting depth — so anchor on that marker instead of trusting
+// the relative resolution.
+function recoverStaleGitDirTarget(redirectContent, topLevelRoot) {
+    const match = redirectContent.match(/^gitdir:\s*(.+)$/m);
+    if (!match)
+        return undefined;
+    const idx = match[1].indexOf(GIT_MODULES_MARKER);
+    if (idx === -1)
+        return undefined;
+    return resolve(topLevelRoot, match[1].slice(idx).trim());
+}
+// Moves existing git data into moduleGitDir instead of abandoning it, whether it's a
+// standalone clone's literal .git directory, or a redirect file (even a stale one
+// left over from a path rename) pointing at git data that still exists.
+async function migrateExistingGitDir(workingTreeDir, moduleGitDir, topLevelRoot) {
+    const dotGit = join(workingTreeDir, ".git");
+    if (!existsSync(dotGit))
+        return false;
+    if (statSync(dotGit).isDirectory()) {
+        await mkdir(dirname(moduleGitDir), { recursive: true });
+        await rename(dotGit, moduleGitDir);
+        return true;
+    }
+    const content = await readFile(dotGit, "utf8");
+    const target = recoverStaleGitDirTarget(content, topLevelRoot);
+    if (!target || target === moduleGitDir || !existsSync(target))
+        return false;
+    await mkdir(dirname(moduleGitDir), { recursive: true });
+    await rename(target, moduleGitDir);
+    return true;
+}
+export function fixModuleDirs(repoRoot, modules, moduleDirs, orphanModuleDirs, topLevelRoot) {
+    return Effect.tryPromise({
+        try: async () => {
+            const fixes = [];
+            const modulesRoot = resolve(await resolveGitDir(repoRoot), "modules");
+            // Establish each module's git dir (migrating existing data if any exists
+            // anywhere) before the orphan cleanup below runs, so nothing real gets deleted
+            // out from under a path rename.
+            for (const m of modules.list) {
+                const workingTreeDir = resolve(repoRoot, m.path);
+                const moduleGitDir = join(modulesRoot, m.path);
+                if (!existsSync(workingTreeDir))
+                    continue;
+                const alreadyEstablished = existsSync(moduleGitDir);
+                let freshlyCloned = false;
+                if (!alreadyEstablished) {
+                    const migrated = await migrateExistingGitDir(workingTreeDir, moduleGitDir, topLevelRoot);
+                    if (migrated) {
+                        fixes.push({ location: [".git", "modules", ...m.path.split("/")], action: "synced", detail: "migrated" });
+                    }
+                    else {
+                        await mkdir(dirname(moduleGitDir), { recursive: true });
+                        await spawnGit(["clone", "--bare", m.url, moduleGitDir], repoRoot);
+                        fixes.push({ location: [".git", "modules", ...m.path.split("/")], action: "synced", detail: "initialized" });
+                        freshlyCloned = true;
+                    }
+                }
+                if (freshlyCloned) {
+                    const configFile = join(moduleGitDir, "config");
+                    const worktree = relative(moduleGitDir, workingTreeDir);
+                    await spawnGit(["config", "-f", configFile, "core.bare", "false"], repoRoot);
+                    await spawnGit(["config", "-f", configFile, "core.worktree", worktree], repoRoot);
+                }
+                // A bare clone (whether just made above, or left over from a prior buggy
+                // run) never gets an index — populate it from HEAD whenever it's missing,
+                // not only right after we ourselves created it.
+                if (!existsSync(join(moduleGitDir, "index"))) {
+                    const headCheck = Bun.spawn(["git", "--git-dir", moduleGitDir, "rev-parse", "--verify", "HEAD"], { stdout: "ignore", stderr: "ignore" });
+                    if ((await headCheck.exited) !== 0)
+                        await spawnGit(["--git-dir", moduleGitDir, "fetch", "origin"], repoRoot);
+                    await spawnGit(["--git-dir", moduleGitDir, "read-tree", "HEAD"], repoRoot);
+                    fixes.push({ location: [".git", "modules", ...m.path.split("/")], action: "synced", detail: "populated index" });
+                }
+                // Always re-point the working tree's .git redirect — never assume an
+                // existing file is already correct.
+                const dotGit = join(workingTreeDir, ".git");
+                const rel = relative(workingTreeDir, moduleGitDir);
+                const desired = `gitdir: ${rel}\n`;
+                const current = existsSync(dotGit) && !statSync(dotGit).isDirectory()
+                    ? await readFile(dotGit, "utf8")
+                    : undefined;
+                if (current !== desired) {
+                    await writeFile(dotGit, desired, "utf8");
+                    fixes.push({ location: [...m.path.split("/"), ".git"], action: "synced" });
+                }
+            }
+            const gmByPath = new Map(modules.list.map((m) => [m.path, m]));
+            for (const d of moduleDirs) {
+                const gm = gmByPath.get(d.relativePath);
+                if (!gm && existsSync(join(modulesRoot, d.relativePath))) {
+                    await rm(join(modulesRoot, d.relativePath), { recursive: true, force: true });
+                    fixes.push({ location: [".git", "modules", ...d.relativePath.split("/")], action: "deleted" });
+                }
+            }
+            for (const rel of orphanModuleDirs) {
+                if (existsSync(join(modulesRoot, rel))) {
+                    await rm(join(modulesRoot, rel), { recursive: true, force: true });
+                    fixes.push({ location: [".git", "modules", ...rel.split("/")], action: "deleted" });
+                }
+            }
+            for (const m of modules.list) {
+                const moduleGitDir = join(modulesRoot, m.path);
+                if (!existsSync(moduleGitDir))
+                    continue;
+                const configFile = join(moduleGitDir, "config");
+                const readConfig = (key) => Bun.spawn(["git", "config", "-f", configFile, key], { cwd: repoRoot, stdout: "pipe", stderr: "pipe" });
+                const [currentUrl, currentWorktree] = await Promise.all([
+                    new Response(readConfig("remote.origin.url").stdout).text().then(t => t.trim()),
+                    new Response(readConfig("core.worktree").stdout).text().then(t => t.trim()),
+                ]);
+                const worktree = relative(moduleGitDir, resolve(repoRoot, m.path));
+                if (currentUrl !== m.url) {
+                    await spawnGit(["config", "-f", configFile, "remote.origin.url", m.url], repoRoot);
+                    fixes.push({ location: [".git", "modules", ...m.path.split("/"), "config"], action: "synced", detail: "remote.origin.url" });
+                }
+                if (currentWorktree !== worktree) {
+                    await spawnGit(["config", "-f", configFile, "core.worktree", worktree], repoRoot);
+                    fixes.push({ location: [".git", "modules", ...m.path.split("/"), "config"], action: "synced", detail: "core.worktree" });
+                }
+            }
+            return fixes;
+        },
+        catch: (e) => e instanceof Error ? e.message : String(e),
+    });
+}
+export function fixIndexGitlinks(repoRoot, modules, currentIndex) {
+    return Effect.tryPromise({
+        try: async () => {
+            const currentShas = new Map(currentIndex.map((e) => [e.path, e.commit]));
+            const validPaths = new Set(modules.list.map((m) => m.path));
+            const fixes = [];
+            for (const entry of currentIndex) {
+                if (!validPaths.has(entry.path)) {
+                    await spawnGit(["update-index", "--force-remove", entry.path], repoRoot);
+                    fixes.push({ location: [".git", "index"], action: "deleted", detail: entry.path });
+                }
+            }
+            for (const m of modules.list) {
+                const workingTree = resolve(repoRoot, m.path);
+                if (!existsSync(workingTree))
+                    continue;
+                const shaProc = Bun.spawn(["git", "rev-parse", "HEAD"], { cwd: workingTree, stdout: "pipe", stderr: "pipe" });
+                const sha = (await new Response(shaProc.stdout).text()).trim();
+                if (!/^[0-9a-f]{40}$/.test(sha))
+                    continue;
+                const current = currentShas.get(m.path);
+                await spawnGit(["update-index", "--add", "--cacheinfo", `160000,${sha},${m.path}`], repoRoot);
+                if (current !== sha) {
+                    fixes.push({ location: [".git", "index"], action: "synced", detail: `${m.path}: ${sha.slice(0, 8)}` });
+                }
+            }
+            return fixes;
+        },
+        catch: (e) => e instanceof Error ? e.message : String(e),
+    });
+}
+//# sourceMappingURL=fix.js.map

package/dist/modules/cli/git/submodule/fix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/fix.ts"],"names":[],"mappings":"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"}

package/dist/modules/cli/git/submodule/git-state.js

@@ -0,0 +1,154 @@
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { resolve, join } from "node:path";
+import { Effect, Option } from "effect";
+import { resolveGitDir } from "./resolve-git-dir";
+// --- parsers ---
+function parseGitConfig(content) {
+    const entries = [];
+    let current = null;
+    for (const line of content.split("\n")) {
+        const headerMatch = line.match(/^\[submodule "(.+)"\]$/);
+        if (headerMatch) {
+            if (current?.name)
+                entries.push(current);
+            current = { name: headerMatch[1] };
+            continue;
+        }
+        if (!current)
+            continue;
+        const kvMatch = line.match(/^\s+(\w+)\s*=\s*(.+)$/);
+        if (!kvMatch)
+            continue;
+        const [, key, value] = kvMatch;
+        if (key === "url")
+            current.url = value.trim();
+        else if (key === "path")
+            current.path = value.trim();
+        else if (key === "active")
+            current.active = value.trim() === "true";
+    }
+    if (current?.name)
+        entries.push(current);
+    return entries;
+}
+function parseIndexGitlinks(output) {
+    return output
+        .split("\n")
+        .filter((l) => l.startsWith("160000 "))
+        .map((line) => {
+        const match = line.match(/^160000 ([0-9a-f]{40}) \d\t(.+)$/);
+        if (!match)
+            throw new Error(`Unexpected ls-files line: ${line}`);
+        return { commit: match[1], path: match[2] };
+    });
+}
+/**
+ * Recursively scans .git/modules/, returning:
+ * - gitDirs: paths of real git dirs (contain a HEAD file)
+ * - orphanDirs: paths that are neither a git dir nor a prefix of any known module path
+ */
+function scanModuleDirs(root, modulePaths, rel = "") {
+    const gitDirs = [];
+    const orphanDirs = [];
+    if (!existsSync(root))
+        return { gitDirs, orphanDirs };
+    for (const entry of readdirSync(root)) {
+        const abs = join(root, entry);
+        if (!statSync(abs).isDirectory())
+            continue;
+        const relPath = rel ? `${rel}/${entry}` : entry;
+        if (existsSync(join(abs, "HEAD"))) {
+            gitDirs.push(relPath);
+        }
+        else {
+            const isPrefix = [...modulePaths].some((p) => p.startsWith(relPath + "/"));
+            if (isPrefix) {
+                const sub = scanModuleDirs(abs, modulePaths, relPath);
+                gitDirs.push(...sub.gitDirs);
+                orphanDirs.push(...sub.orphanDirs);
+            }
+            else {
+                orphanDirs.push(relPath);
+            }
+        }
+    }
+    return { gitDirs, orphanDirs };
+}
+async function readModuleDirRemoteUrl(abs) {
+    const configPath = join(abs, "config");
+    if (!existsSync(configPath))
+        return Option.none();
+    const content = await readFile(configPath, "utf8");
+    const match = content.match(/\[remote "origin"\][^\[]*\n\s+url\s*=\s*(.+)/);
+    return match?.[1] ? Option.some(match[1].trim()) : Option.none();
+}
+async function spawnGitInDir(args, cwd) {
+    const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "pipe" });
+    const [code, out, err] = await Promise.all([
+        proc.exited,
+        new Response(proc.stdout).text(),
+        new Response(proc.stderr).text(),
+    ]);
+    return code === 0 ? out.trim() : { error: err.trim().split("\n")[0] };
+}
+async function readWorkingTreeEntry(repoRoot, subPath) {
+    const workingTreeAbs = join(repoRoot, subPath);
+    const dotGit = join(workingTreeAbs, ".git");
+    let type;
+    let gitdirTarget;
+    if (!existsSync(dotGit)) {
+        type = "missing";
+    }
+    else if (statSync(dotGit).isDirectory()) {
+        type = "dir";
+    }
+    else {
+        type = "file";
+        const content = await readFile(dotGit, "utf8");
+        const match = content.match(/^gitdir:\s*(.+)$/m);
+        gitdirTarget = match?.[1].trim();
+    }
+    if (!existsSync(workingTreeAbs))
+        return { path: subPath, type, gitdirTarget };
+    const [remote, headCommit] = await Promise.all([
+        spawnGitInDir(["remote", "get-url", "origin"], workingTreeAbs),
+        spawnGitInDir(["rev-parse", "HEAD"], workingTreeAbs),
+    ]);
+    return { path: subPath, type, gitdirTarget, remote, headCommit };
+}
+// --- main reader ---
+export function readGitState(repoRoot, extraPaths = []) {
+    return Effect.tryPromise({
+        try: async () => {
+            const gitDir = await resolveGitDir(repoRoot);
+            const [configContent, lsOutput] = await Promise.all([
+                readFile(resolve(gitDir, "config"), "utf8"),
+                new Response(Bun.spawn(["git", "ls-files", "--stage"], { cwd: repoRoot, stdout: "pipe" }).stdout).text(),
+            ]);
+            const config = parseGitConfig(configContent);
+            const index = parseIndexGitlinks(lsOutput);
+            const modulePaths = new Set(extraPaths);
+            const modulesRoot = resolve(gitDir, "modules");
+            const { gitDirs: moduleDirPaths, orphanDirs: orphanModuleDirs } = scanModuleDirs(modulesRoot, modulePaths);
+            const moduleDirs = await Promise.all(moduleDirPaths.map(async (rel) => {
+                const remoteUrlOption = await readModuleDirRemoteUrl(join(modulesRoot, rel));
+                return {
+                    relativePath: rel,
+                    remoteUrl: Option.isSome(remoteUrlOption) ? remoteUrlOption.value : undefined,
+                };
+            }));
+            const allPaths = [
+                ...new Set([
+                    ...index.map((e) => e.path),
+                    ...config.flatMap((e) => (e.path ? [e.path] : [])),
+                    ...extraPaths,
+                ]),
+            ];
+            const workingTree = await Promise.all(allPaths.map((p) => readWorkingTreeEntry(repoRoot, p)));
+            return { config, moduleDirs, orphanModuleDirs, index, workingTree };
+        },
+        catch: (e) => e instanceof Error ? e.message : String(e),
+    });
+}
+//# sourceMappingURL=git-state.js.map

package/dist/modules/cli/git/submodule/git-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-state.js","sourceRoot":"","sources":["../../../../../../../../src/modules/cli/git/submodule/git-state.ts"],"names":[],"mappings":"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"}