@lumpcode/core 0.0.10 → 0.0.12

package/dist/index.js

@@ -4,7 +4,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { extname, dirname } from 'node:path';
 import * as fs$1 from 'node:fs/promises';
-import { readFile, mkdir, writeFile, stat } from 'node:fs/promises';
+import { readFile, mkdir, writeFile } from 'node:fs/promises';
 import ignore from 'ignore';
 import z from 'zod';
 
@@ -38,18 +38,6 @@ function failure(data) {
     };
 }
 
-function decision(possibilities, defaultValue) {
-    for (const [condition, result] of possibilities) {
-        if (condition()) {
-            return result();
-        }
-    }
-    if (defaultValue) {
-        return defaultValue;
-    }
-    throw new Error('No value found in decision');
-}
-
 /**
  * Wrap an arbitrary string in quotes so it can be safely embedded in
  * a shell command (e.g. the command string passed to `execAsync`).
@@ -64,18 +52,6 @@ function shellSingleQuote(value) {
     return `'${value.split("'").join(`'\\''`)}'`;
 }
 
-/**
- * Wrap a shell fragment so failure does not break a surrounding `&&` chain.
- *
- * Unix: `cmd || true`. Windows cmd.exe: `(cmd || cd .)`.
- */
-function shellBestEffort(command) {
-    if (process.platform === 'win32') {
-        return `(${command} || cd .)`;
-    }
-    return `${command} || true`;
-}
-
 const DEFAULT_WINDOWS_PATHEXT = [
     '.COM',
     '.EXE',
@@ -226,14 +202,6 @@ function createConsoleLogger(input) {
     return makeLogger(prefix);
 }
 
-const noopLogger = {
-    error: () => { },
-    warn: () => { },
-    info: () => { },
-    verbose: () => { },
-    child: () => noopLogger,
-};
-
 function firstNonEmptyLine(value) {
     if (value == null)
         return undefined;
@@ -3165,6 +3133,49 @@ function dump(input, options = {}) {
 	});
 }
 
+/** Returns whether `filePath` is accessible to this process (typically exists). */
+async function pathExists(filePath) {
+    try {
+        await fs$1.access(filePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+
+/** Strip terminal ANSI escapes and other C0 controls js-yaml rejects in literal blocks. */
+function sanitizeHistoryText(value) {
+    return value
+        .replace(/\x1b\[[0-9;]*[A-Za-z]/g, '')
+        .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, '');
+}
+function parseHistoryYamlContent(content) {
+    const parsed = load(content, { schema: YAML11_SCHEMA });
+    if (!Array.isArray(parsed)) {
+        throw new Error('History file must contain a YAML sequence');
+    }
+    return parsed;
+}
+function tryParseHistoryContent(content) {
+    try {
+        return parseHistoryYamlContent(content);
+    }
+    catch (firstError) {
+        const sanitized = sanitizeHistoryText(content);
+        if (sanitized === content) {
+            throw firstError;
+        }
+        return parseHistoryYamlContent(sanitized);
+    }
+}
+function sanitizeHistoryEntry(entry) {
+    return {
+        ...entry,
+        prompt: sanitizeHistoryText(entry.prompt),
+        commandResult: sanitizeHistoryText(entry.commandResult),
+    };
+}
 function historyFormatFromPath(filePath) {
     const ext = extname(filePath).toLowerCase();
     if (ext === '.yaml' || ext === '.yml') {
@@ -3202,7 +3213,8 @@ function dumpHistoryEntries(entries) {
     if (entries.length === 0) {
         return '[]\n';
     }
-    return dump(entries, {
+    const sanitizedEntries = entries.map(sanitizeHistoryEntry);
+    return dump(sanitizedEntries, {
         schema: YAML11_SCHEMA,
         lineWidth: 0,
         noRefs: true,
@@ -3220,11 +3232,7 @@ async function readHistoryFile({ filePath, }) {
     }
     try {
         const content = await readFile(filePath, 'utf-8');
-        const parsed = load(content, { schema: YAML11_SCHEMA });
-        if (!Array.isArray(parsed)) {
-            return failure(`History file ${filePath} must contain a YAML sequence`);
-        }
-        return success(parsed);
+        return success(tryParseHistoryContent(content));
     }
     catch (error) {
         const detail = error instanceof Error ? error.message : String(error);
@@ -3251,7 +3259,7 @@ async function appendHistoryEntry({ filePath, entry, }) {
     if (!formatResult.success) {
         return formatResult;
     }
-    const exists = await stat(filePath).then(() => true).catch(() => false);
+    const exists = await pathExists(filePath);
     let entries;
     if (exists) {
         const readResult = await readHistoryFile({ filePath });
@@ -3264,10 +3272,25 @@ async function appendHistoryEntry({ filePath, entry, }) {
         await mkdir(dirname(filePath), { recursive: true });
         entries = [];
     }
-    entries.push(entry);
+    entries.push(sanitizeHistoryEntry(entry));
     return writeHistoryFile({ filePath, entries });
 }
 
+/** Parses `git log --format='%H %s'` lines into commit hash and subject pairs. */
+function parseGitLogHashSubjectLines(stdout) {
+    return stdout
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean)
+        .map((line) => {
+        const sp = line.indexOf(' ');
+        return {
+            hash: sp === -1 ? line : line.slice(0, sp),
+            subject: sp === -1 ? '' : line.slice(sp + 1),
+        };
+    });
+}
+
 const execAsyncBase = promisify(exec);
 async function execAsync(command, options) {
     const { stdout, stderr, hasErrored } = await execAsyncBase(command, { cwd: options?.cwd })
@@ -3563,8 +3586,8 @@ async function executeStepsForContextList({ baseBranch, branchFn, lumpVariables,
                         entry: postCommandExecFnInput,
                     });
                     if (!appendResult.success) {
-                        stepWalkFailure = failure({ message: appendResult.data });
-                        return;
+                        // TODO: sanitize history appending to avoid this warning for certain commands outputs
+                        logger.warn(`Failed to append history entry to ${keepHistoryFilePath}: ${appendResult.data}`);
                     }
                 }
                 if (postCommandExecFn) {
@@ -3654,7 +3677,7 @@ async function getGitignoresMap({ startDir, stopAtDir }) {
     const stopAtDirParent = path.dirname(stopAtDir);
     while (currentDir !== stopAtDirParent) {
         const gitignorePath = path.join(currentDir, '.gitignore');
-        const hasGitignore = await fs$1.access(gitignorePath).then(() => true).catch(() => false);
+        const hasGitignore = await pathExists(gitignorePath);
         if (hasGitignore) {
             const gitignoreContent = await fs$1.readFile(gitignorePath, 'utf-8');
             gitignores.set(currentDir, ignore().add(gitignoreContent));
@@ -3721,19 +3744,9 @@ async function getContextStatus(params) {
         return 'toDo';
     logger?.verbose(`logResult ${JSON.stringify(logResult.data)}`);
     const logResultOutput = logResult.data.stdout || logResult.data.stderr || '';
-    const matchingHashes = logResultOutput
-        .split('\n')
-        .map((line) => line.trim())
-        .filter((line) => !!line)
-        .map((line) => {
-        const sp = line ? line.indexOf(' ') : -1;
-        return {
-            hash: sp === -1 ? line : line.slice(0, sp),
-            subject: sp === -1 ? '' : line.slice(sp + 1),
-        };
-    })
-        .filter((c) => c.subject === commitMessage)
-        .map((c) => c.hash);
+    const matchingHashes = parseGitLogHashSubjectLines(logResultOutput)
+        .filter((entry) => entry.subject === commitMessage)
+        .map((entry) => entry.hash);
     logger?.verbose(`remoteName ${remoteName}`);
     logger?.verbose(`baseBranch ${baseBranch}`);
     logger?.verbose(`commitMessage ${commitMessage}`);
@@ -3941,5 +3954,5 @@ async function runLump(input) {
     });
 }
 
-export { appendHistoryEntry, collectStepsForContext, contextStatus, contextStatusSchema, createConsoleLogger, decision, defaultGitAddCommandFn, defaultGitCommitCommandFn, defaultGitCommitMessageFn, defaultGitPushCommandFn, defaultSetupWorkspaceFn, defaultSetupWorkspaceFnWithWorktree, defaultTeardownWorkspaceFn, defaultTeardownWorkspaceFnWithWorktree, execAsync, execBinary, executeStepsForContextList, failure, formatExecFailureMessage, getCodeBasePaths, getContextStatus, getToDoContextList, historyFormatFromPath, noopLogger, readHistoryFile, resolveSpawnExecutable, runLump, set, shellBestEffort, shellSingleQuote, success, validateContextListNames, writeHistoryFile };
+export { appendHistoryEntry, collectStepsForContext, contextStatus, contextStatusSchema, createConsoleLogger, defaultGitAddCommandFn, defaultGitCommitCommandFn, defaultGitCommitMessageFn, defaultGitPushCommandFn, defaultSetupWorkspaceFn, defaultSetupWorkspaceFnWithWorktree, defaultTeardownWorkspaceFn, defaultTeardownWorkspaceFnWithWorktree, execAsync, execBinary, executeStepsForContextList, failure, formatExecFailureMessage, getCodeBasePaths, getContextStatus, getToDoContextList, historyFormatFromPath, parseGitLogHashSubjectLines, pathExists, readHistoryFile, resolveSpawnExecutable, runLump, set, shellSingleQuote, success, validateContextListNames, writeHistoryFile };
 //# sourceMappingURL=index.js.map