@lumpcode/core 0.0.16 → 0.1.0

package/dist/index.js

@@ -3745,6 +3745,27 @@ async function collectStepsForContext(params) {
     return collectedSteps;
 }
 
+async function runOptionalGitCommand(input) {
+    const { label, getCommand, cwd, logger } = input;
+    try {
+        const command = await getCommand();
+        if (command == null || command === '') {
+            return 'ok';
+        }
+        const result = await execAsync(command, { cwd });
+        logger.verbose(`${label} ${JSON.stringify(result)}`);
+        if (!result.success) {
+            logger.error(formatExecFailureMessage({ label, failure: result }));
+            return 'failed';
+        }
+        return 'ok';
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger.error(`Failed to run ${label}: ${message}`);
+        return 'failed';
+    }
+}
 async function executeStepsForContextList({ baseBranch, branchFn, lumpVariables, contextList, gitAddCommandFn, gitCommitCommandFn, gitPushCommandFn, gitCommitMessageFn, projectRoot, steps, setupFn, setupWorkspaceFn, teardownFn, teardownWorkspaceFn, getKeepHistoryFilePathFn, logger: loggerInput, signal, }) {
     const logger = loggerInput ?? createConsoleLogger({});
     const contextNames = contextList.map(context => context.name);
@@ -3943,39 +3964,39 @@ async function executeStepsForContextList({ baseBranch, branchFn, lumpVariables,
                 ...injectedGitAndWorkspaceFnsInput,
                 context,
             };
-            const gitAddCommand = await execAsync(gitAddCommandFn(perContextInput), { cwd: workspacePath });
-            logger.verbose(`gitAddCommand ${JSON.stringify(gitAddCommand)}`);
-            if (!gitAddCommand.success) {
+            const addOutcome = await runOptionalGitCommand({
+                label: `git add for context ${context.name}`,
+                getCommand: () => gitAddCommandFn(perContextInput),
+                cwd: workspacePath,
+                logger,
+            });
+            if (addOutcome === 'failed') {
                 runFailure = {
                     success: false,
                     data: {
-                        message: `Failed to add the changes for context ${context.name}: ${gitAddCommand.data.message}`,
+                        message: `Failed to add the changes for context ${context.name}`,
                     },
                 };
                 break;
             }
             const commitMessage = gitCommitMessageFn({ context, lumpVariables, baseBranch });
-            const commitCommand = await execAsync(gitCommitCommandFn({
-                ...perContextInput,
-                commitMessage,
-            }), { cwd: workspacePath });
-            logger.verbose(`commitCommand ${JSON.stringify(commitCommand)}`);
-            if (!commitCommand.success) {
-                logger.error(formatExecFailureMessage({
-                    label: `git commit for context ${context.name}`,
-                    failure: commitCommand,
-                }));
-            }
+            await runOptionalGitCommand({
+                label: `git commit for context ${context.name}`,
+                getCommand: () => gitCommitCommandFn({
+                    ...perContextInput,
+                    commitMessage,
+                }),
+                cwd: workspacePath,
+                logger,
+            });
         }
         if (!runFailure) {
-            const pushCommand = await execAsync(gitPushCommandFn(injectedGitAndWorkspaceFnsInput), { cwd: workspacePath });
-            logger.verbose(`pushCommand ${JSON.stringify(pushCommand)}`);
-            if (!pushCommand.success) {
-                logger.error(formatExecFailureMessage({
-                    label: `git push on branch ${branchName}`,
-                    failure: pushCommand,
-                }));
-            }
+            await runOptionalGitCommand({
+                label: `git push on branch ${branchName}`,
+                getCommand: () => gitPushCommandFn(injectedGitAndWorkspaceFnsInput),
+                cwd: workspacePath,
+                logger,
+            });
         }
     }
     finally {
@@ -4091,17 +4112,32 @@ async function scanDirectory({ dirPath, allPaths, gitignoresMap, projectRoot, lo
     }
 }
 
+/**
+ * Refreshes remote-tracking refs for status / planning (one network fetch).
+ * Uses `--no-write-fetch-head` so concurrent preflight/pull paths are safer.
+ */
+const refreshRemoteTrackingRefs = async (input) => {
+    const { projectRoot, remoteName = 'origin' } = input;
+    const result = await execAsync(`git fetch --prune --no-write-fetch-head ${remoteName}`, { cwd: projectRoot });
+    if (!result.success) {
+        return failure(result.data.message);
+    }
+    return success(undefined);
+};
+
 async function getContextStatus(params) {
-    const { contextName, gitCommitMessageFn, projectRoot, baseBranch, lumpVariables: lumpVariablesInput, contextVariables = {}, remoteName = "origin", logger, } = params;
+    const { contextName, gitCommitMessageFn, projectRoot, baseBranch, lumpVariables: lumpVariablesInput, contextVariables = {}, remoteName = "origin", logger, skipFetch = false, } = params;
     const lumpVariables = (lumpVariablesInput ?? {});
     const commitMessage = gitCommitMessageFn({
         context: { name: contextName, variables: contextVariables },
         lumpVariables,
         baseBranch,
     });
-    const fetchAll = await execAsync(`git fetch --all --prune`, { cwd: projectRoot });
-    if (!fetchAll.success)
-        return 'toDo';
+    if (!skipFetch) {
+        const fetchResult = await refreshRemoteTrackingRefs({ projectRoot, remoteName });
+        if (!fetchResult.success)
+            return 'toDo';
+    }
     const logResult = await execAsync(`git log --remotes=${remoteName} -F --grep=${shellSingleQuote(commitMessage)} --format=${shellSingleQuote('%H %s')}`, { cwd: projectRoot });
     if (!logResult.success)
         return 'toDo';
@@ -4110,6 +4146,7 @@ async function getContextStatus(params) {
     const matchingHashes = parseGitLogHashSubjectLines(logResultOutput)
         .filter((entry) => entry.subject === commitMessage)
         .map((entry) => entry.hash);
+    logger?.verbose(`contextName ${contextName}`);
     logger?.verbose(`remoteName ${remoteName}`);
     logger?.verbose(`baseBranch ${baseBranch}`);
     logger?.verbose(`commitMessage ${commitMessage}`);
@@ -4164,7 +4201,7 @@ function validateContextListNames(contextList) {
 }
 
 async function getToDoContextList(params) {
-    const { getContextListFn, lumpVariables, gitCommitMessageFn, projectRoot, baseBranch, logger } = params;
+    const { getContextListFn, lumpVariables, gitCommitMessageFn, projectRoot, baseBranch, logger, refreshRemoteTrackingRefsFn = refreshRemoteTrackingRefs, } = params;
     const codeBasePathsResult = await getCodeBasePaths({ cwd: projectRoot, logger });
     if (!codeBasePathsResult.success) {
         return failure({
@@ -4182,21 +4219,28 @@ async function getToDoContextList(params) {
     const allCtxNames = contextList.flatMap(context => [context.name, ...(context.options?.dependsOnContexts ?? [])]);
     const allCtxNamesSet = new Set(allCtxNames);
     const allCtxNamesList = Array.from(allCtxNamesSet);
-    const contextStatusList = await Promise.all(allCtxNamesList.map((contextName) => {
-        return getContextStatus({
-            contextName: contextName,
+    const refreshResult = await refreshRemoteTrackingRefsFn({ projectRoot });
+    let contextStatusMap;
+    if (!refreshResult.success) {
+        logger?.warn(`Failed to refresh remote-tracking refs for context status; treating contexts as toDo: ${refreshResult.data}`);
+        contextStatusMap = new Map(allCtxNamesList.map((name) => [name, 'toDo']));
+    }
+    else {
+        const contextStatusList = await Promise.all(allCtxNamesList.map((contextName) => getContextStatus({
+            contextName,
             contextVariables: {}, // TODO: Remove contextVariables from getContextStatus, really not needed
             gitCommitMessageFn,
             lumpVariables,
             projectRoot,
             baseBranch,
             logger,
-        });
-    }));
-    const contextStatusMap = new Map(allCtxNamesList.map((contextName, i) => [contextName, contextStatusList[i]]));
+            skipFetch: true,
+        })));
+        contextStatusMap = new Map(allCtxNamesList.map((contextName, i) => [contextName, contextStatusList[i]]));
+    }
     const contextListToDo = contextList
-        .filter((context, contextIndex) => {
-        const contextStatus = contextStatusList[contextIndex];
+        .filter((context) => {
+        const contextStatus = contextStatusMap.get(context.name);
         if (contextStatus && contextStatus !== 'toDo')
             return false;
         const deps = context.options?.dependsOnContexts;
@@ -4262,7 +4306,7 @@ const defaultSetupWorkspaceFnWithWorktree = async (input) => {
 };
 
 async function runLump(input) {
-    const { baseBranch, branchFn, lumpVariables: lumpVariablesInput, getContextListFn, gitAddCommandFn = defaultGitAddCommandFn, gitCommitCommandFn = defaultGitCommitCommandFn, gitCommitMessageFn = defaultGitCommitMessageFn, gitPushCommandFn = defaultGitPushCommandFn, numberOfContextsPerBranch = 1, projectRoot, steps, setupFn = () => ({ contextRunState: {} }), setupWorkspaceFn = defaultSetupWorkspaceFn, teardownFn = () => undefined, teardownWorkspaceFn = defaultTeardownWorkspaceFn, getKeepHistoryFilePathFn = () => undefined, logger: loggerInput, signal, } = input;
+    const { baseBranch, branchFn, lumpVariables: lumpVariablesInput, getContextListFn, gitAddCommandFn = defaultGitAddCommandFn, gitCommitCommandFn = defaultGitCommitCommandFn, gitCommitMessageFn = defaultGitCommitMessageFn, gitPushCommandFn = defaultGitPushCommandFn, numberOfContextsPerBranch = 1, projectRoot, steps, setupFn = () => ({ contextRunState: {} }), setupWorkspaceFn = defaultSetupWorkspaceFn, teardownFn = () => undefined, teardownWorkspaceFn = defaultTeardownWorkspaceFn, getKeepHistoryFilePathFn = () => undefined, logger: loggerInput, signal, refreshRemoteTrackingRefsFn, } = input;
     const lumpVariables = (lumpVariablesInput ?? {});
     const logger = loggerInput ?? createConsoleLogger({});
     const contextListToDoResult = await getToDoContextList({
@@ -4272,6 +4316,7 @@ async function runLump(input) {
         baseBranch,
         gitCommitMessageFn,
         logger,
+        refreshRemoteTrackingRefsFn,
     });
     if (!contextListToDoResult.success) {
         return set(contextListToDoResult, ['data', 'message'], "Error in runLump: Failed to get to do context list. Original Error: " + contextListToDoResult.data.message);
@@ -4318,5 +4363,5 @@ async function runLump(input) {
     });
 }
 
-export { appendHistoryEntry, collectStepsForContext, contextStatus, createConsoleLogger, defaultGitAddCommandFn, defaultGitCommitCommandFn, defaultGitCommitMessageFn, defaultGitPushCommandFn, defaultSetupWorkspaceFn, defaultSetupWorkspaceFnWithWorktree, defaultTeardownWorkspaceFn, defaultTeardownWorkspaceFnWithWorktree, execAsync, execBinary, executeStepsForContextList, failure, formatExecFailureMessage, getCodeBasePaths, getContextStatus, getToDoContextList, historyFormatFromPath, isProcessAlive, killProcessTree, nodeErrnoCode, parseGitLogHashSubjectLines, pathExists, readHistoryFile, resolveSpawnExecutable, runLump, set, shellSingleQuote, success, validateContextListNames, windowsNpmCmdShimBody, writeHistoryFile };
+export { appendHistoryEntry, collectStepsForContext, contextStatus, createConsoleLogger, defaultGitAddCommandFn, defaultGitCommitCommandFn, defaultGitCommitMessageFn, defaultGitPushCommandFn, defaultSetupWorkspaceFn, defaultSetupWorkspaceFnWithWorktree, defaultTeardownWorkspaceFn, defaultTeardownWorkspaceFnWithWorktree, execAsync, execBinary, executeStepsForContextList, failure, formatExecFailureMessage, getCodeBasePaths, getContextStatus, getToDoContextList, historyFormatFromPath, isProcessAlive, killProcessTree, nodeErrnoCode, parseGitLogHashSubjectLines, pathExists, readHistoryFile, refreshRemoteTrackingRefs, resolveSpawnExecutable, runLump, set, shellSingleQuote, success, validateContextListNames, windowsNpmCmdShimBody, writeHistoryFile };
 //# sourceMappingURL=index.js.map