mcp-perforce-server 2.0.1 → 2.1.1

package/dist/p4/parse.js

@@ -10,6 +10,8 @@ exports.parseChangesOutput = parseChangesOutput;
 exports.parseFilelogOutput = parseFilelogOutput;
 exports.parseClientsOutput = parseClientsOutput;
 exports.parseDiffOutput = parseDiffOutput;
+exports.parseDiff2Output = parseDiff2Output;
+exports.parseDescribeOutput = parseDescribeOutput;
 exports.parseSyncOutput = parseSyncOutput;
 exports.parseResolveOutput = parseResolveOutput;
 exports.parseShelveOutput = parseShelveOutput;
@@ -31,12 +33,21 @@ exports.parseLabelOutput = parseLabelOutput;
 exports.parseSizesOutput = parseSizesOutput;
 exports.parseHaveOutput = parseHaveOutput;
 exports.parseWhereOutput = parseWhereOutput;
+exports.parseFstatOutput = parseFstatOutput;
+exports.parseStreamsOutput = parseStreamsOutput;
+exports.parseStreamOutput = parseStreamOutput;
+exports.parsePrintOutput = parsePrintOutput;
+exports.parseIntegrateOutput = parseIntegrateOutput;
 /**
  * Parse p4 -ztag output into structured data
  */
 function parseZtagOutput(output) {
     const results = [];
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output);
     let currentRecord = {};
     for (const line of lines) {
         const trimmedLine = line.trim();
@@ -66,7 +77,11 @@ function parseZtagOutput(output) {
  */
 function parseInfoOutput(output) {
     const result = {};
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
     for (const line of lines) {
         const trimmedLine = line.trim();
         if (!trimmedLine)
@@ -87,7 +102,11 @@ function parseInfoOutput(output) {
  */
 function parseOpenedOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path#revision - action by user@client (change) type"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+(\w+)\s+by\s+(.+?)@(.+?)\s+\((.+?)\)(?:\s+(.+))?/);
@@ -118,10 +137,16 @@ function parseOpenedOutput(output) {
  */
 function parseChangesOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { trim: true, removeEmpty: true });
     for (const line of lines) {
+        // Remove "info: " prefix if present (from -s flag output)
+        const cleanLine = line.replace(/^info:\s*/, '');
         // Format: "Change 12345 on 2023/01/01 by user@client 'Description...'"
-        const match = line.match(/^Change\s+(\d+)\s+on\s+(\S+)\s+by\s+(.+?)@(.+?)\s+'(.*)'/);
+        const match = cleanLine.match(/^Change\s+(\d+)\s+on\s+(\S+)\s+by\s+(.+?)@(.+?)\s+'(.*)'/);
         if (match) {
             const [, change, date, user, client, description] = match;
             results.push({
@@ -140,7 +165,11 @@ function parseChangesOutput(output) {
  */
 function parseFilelogOutput(output) {
     const results = [];
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output);
     let currentFile = null;
     let currentRevision = null;
     for (const line of lines) {
@@ -187,7 +216,11 @@ function parseFilelogOutput(output) {
  */
 function parseClientsOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "Client clientname 2023/01/01 root /path/to/root 'Description...'"
         const match = line.match(/^Client\s+(\S+)\s+(\S+)\s+root\s+(.+?)\s+'(.*)'/);
@@ -207,7 +240,16 @@ function parseClientsOutput(output) {
  * Parse p4 diff output into structured diff information
  */
 function parseDiffOutput(output) {
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return {
+            files: [],
+            totalFiles: 0,
+            totalAddedLines: 0,
+            totalRemovedLines: 0
+        };
+    }
+    const lines = getNormalizedLines(output);
     const files = [];
     let currentFile = null;
     let diffLines = [];
@@ -259,12 +301,173 @@ function parseDiffOutput(output) {
         totalRemovedLines: files.reduce((sum, file) => sum + (file.removedLines || 0), 0),
     };
 }
+/**
+ * Parse p4 diff2 output for depot-to-depot comparisons
+ */
+function parseDiff2Output(output, summaryOnly = true) {
+    const emptyResult = {
+        differences: [],
+        totalDifferences: 0,
+        summaryOnly,
+    };
+    if (!output || typeof output !== 'string') {
+        return emptyResult;
+    }
+    const lines = getNormalizedLines(output);
+    const differences = [];
+    let currentDiff = null;
+    let currentDiffLines = [];
+    const finalizeCurrentDiff = () => {
+        if (!currentDiff)
+            return;
+        if (!summaryOnly) {
+            const diffText = currentDiffLines.join('\n').trim();
+            if (diffText) {
+                currentDiff.diff = diffText;
+            }
+        }
+        differences.push(currentDiff);
+        currentDiff = null;
+        currentDiffLines = [];
+    };
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        const headerMatch = trimmed.match(/^====\s+(.+?)\s+-\s+(.+?)\s+====(?:\s+(.*))?$/);
+        if (headerMatch) {
+            finalizeCurrentDiff();
+            const [, sourceRaw, targetRaw, differenceTypeRaw] = headerMatch;
+            const sourceInfo = parseDiff2Side(sourceRaw);
+            const targetInfo = parseDiff2Side(targetRaw);
+            currentDiff = {
+                sourceFile: sourceInfo.depotFile,
+                sourceRevision: sourceInfo.revision,
+                sourceType: sourceInfo.type,
+                targetFile: targetInfo.depotFile,
+                targetRevision: targetInfo.revision,
+                targetType: targetInfo.type,
+                differenceType: differenceTypeRaw ? differenceTypeRaw.trim() : 'content',
+            };
+            continue;
+        }
+        if (summaryOnly) {
+            const pairMatch = trimmed.match(/^(.+?#\S+(?:\s+\(.+?\))?)\s+-\s+(.+?#\S+(?:\s+\(.+?\))?)(?:\s+(.*))?$/);
+            if (pairMatch) {
+                finalizeCurrentDiff();
+                const [, sourceRaw, targetRaw, differenceTypeRaw] = pairMatch;
+                const sourceInfo = parseDiff2Side(sourceRaw);
+                const targetInfo = parseDiff2Side(targetRaw);
+                differences.push({
+                    sourceFile: sourceInfo.depotFile,
+                    sourceRevision: sourceInfo.revision,
+                    sourceType: sourceInfo.type,
+                    targetFile: targetInfo.depotFile,
+                    targetRevision: targetInfo.revision,
+                    targetType: targetInfo.type,
+                    differenceType: differenceTypeRaw ? differenceTypeRaw.trim() : 'different',
+                });
+            }
+            continue;
+        }
+        if (!summaryOnly && currentDiff) {
+            currentDiffLines.push(line);
+        }
+    }
+    finalizeCurrentDiff();
+    return {
+        differences: differences,
+        totalDifferences: differences.length,
+        summaryOnly,
+    };
+}
+/**
+ * Parse p4 describe -s output into structured changelist data
+ */
+function parseDescribeOutput(output) {
+    const result = {
+        files: [],
+        description: '',
+        rawText: '',
+    };
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
+    result.rawText = lines
+        .filter((line) => line.trim())
+        .join('\n');
+    let inDescription = false;
+    let inFiles = false;
+    const descriptionLines = [];
+    const files = [];
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            if (inDescription && !inFiles && descriptionLines.length > 0 && descriptionLines[descriptionLines.length - 1] !== '') {
+                descriptionLines.push('');
+            }
+            continue;
+        }
+        const headerMatch = trimmed.match(/^Change\s+(\d+)\s+by\s+(.+?)@(\S+)\s+on\s+(.+?)(?:\s+\*(\w+)\*)?$/);
+        if (headerMatch) {
+            const [, change, user, client, date, status] = headerMatch;
+            result.change = parseInt(change, 10);
+            result.user = user;
+            result.client = client;
+            result.date = date.trim();
+            result.status = status ? status.toLowerCase() : 'submitted';
+            inDescription = true;
+            inFiles = false;
+            continue;
+        }
+        if (/^Affected files\s+\.\.\.$/i.test(trimmed)) {
+            inDescription = false;
+            inFiles = true;
+            continue;
+        }
+        if (/^Differences\s+\.\.\.$/i.test(trimmed)) {
+            inDescription = false;
+            inFiles = false;
+            continue;
+        }
+        if (inFiles && trimmed.startsWith('... ')) {
+            const fileMatch = trimmed.match(/^\.{3}\s+(.+?)#([^\s]+)\s+([^\s]+)(?:\s+\((.+?)\))?$/);
+            if (fileMatch) {
+                const [, depotFile, revisionRaw, action, type] = fileMatch;
+                const numericRevision = parseInt(revisionRaw, 10);
+                files.push({
+                    depotFile,
+                    revision: Number.isNaN(numericRevision) ? revisionRaw : numericRevision,
+                    action,
+                    type: type || undefined,
+                });
+            }
+            continue;
+        }
+        if (inDescription) {
+            descriptionLines.push(trimmed);
+        }
+    }
+    while (descriptionLines.length > 0 && descriptionLines[descriptionLines.length - 1] === '') {
+        descriptionLines.pop();
+    }
+    result.description = descriptionLines.join('\n');
+    result.files = files;
+    result.fileCount = files.length;
+    return result;
+}
 /**
  * Parse p4 sync output into sync records
  */
 function parseSyncOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path#revision - updating /local/path"
         // Format: "//depot/path#revision - added as /local/path" 
@@ -287,7 +490,11 @@ function parseSyncOutput(output) {
  */
 function parseResolveOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "C /path/to/file - merging //depot/path#123"
         const match = line.match(/^([A-Z])\s+(.+?)\s+-\s+(.+)/);
@@ -308,7 +515,11 @@ function parseResolveOutput(output) {
  */
 function parseShelveOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "change 12345 shelved"
         const match = line.match(/^change\s+(\d+)\s+shelved/);
@@ -327,7 +538,11 @@ function parseShelveOutput(output) {
  */
 function parseUnshelveOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path#123 - unshelved"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+unshelved/);
@@ -347,7 +562,11 @@ function parseUnshelveOutput(output) {
  */
 function parseBlameOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "12345: user 2023/01/01 12:34:56: content"
         const match = line.match(/^(\d+):\s+(.+?)\s+(\d{4}\/\d{2}\/\d{2})\s+(\d{2}:\d{2}:\d{2}):\s*(.*)/);
@@ -369,7 +588,11 @@ function parseBlameOutput(output) {
  */
 function parseCopyOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/src#123 - copied to //depot/dst#124"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+copied\s+to\s+(.+?)#(\d+)/);
@@ -391,7 +614,11 @@ function parseCopyOutput(output) {
  */
 function parseMoveOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/old#123 - moved to //depot/new#124"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+moved\s+to\s+(.+?)#(\d+)/);
@@ -413,7 +640,11 @@ function parseMoveOutput(output) {
  */
 function parseGrepOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path:123:matched text here"
         const match = line.match(/^(.+?):(\d+):(.*)/);
@@ -433,7 +664,11 @@ function parseGrepOutput(output) {
  */
 function parseFilesOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path#123 - action change 456 (type text)"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+(\w+)\s+change\s+(\d+)\s+\((.+?)\)/);
@@ -455,7 +690,11 @@ function parseFilesOutput(output) {
  */
 function parseDirsOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Directories are listed one per line
         if (line.startsWith('//')) {
@@ -471,7 +710,11 @@ function parseDirsOutput(output) {
  */
 function parseUsersOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "user <user@domain> (realname) accessed 2023/01/01 12:34:56"
         const match = line.match(/^(\w+)\s+<([^>]+)>\s+\(([^)]+)\)\s+accessed\s+(\d{4}\/\d{2}\/\d{2})\s+(\d{2}:\d{2}:\d{2})/);
@@ -492,7 +735,11 @@ function parseUsersOutput(output) {
  */
 function parseUserOutput(output) {
     const result = {};
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
     for (const line of lines) {
         const colonIndex = line.indexOf(': ');
         if (colonIndex > 0) {
@@ -508,7 +755,11 @@ function parseUserOutput(output) {
  */
 function parseClientOutput(output) {
     const result = {};
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
     for (const line of lines) {
         const colonIndex = line.indexOf(': ');
         if (colonIndex > 0) {
@@ -524,7 +775,11 @@ function parseClientOutput(output) {
  */
 function parseJobsOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "job000001 on 2023/01/01 by user *open* 'Job description'"
         const match = line.match(/^(\w+)\s+on\s+(\d{4}\/\d{2}\/\d{2})\s+by\s+(\w+)\s+(\w+)\s+'(.*)'/);
@@ -546,7 +801,11 @@ function parseJobsOutput(output) {
  */
 function parseJobOutput(output) {
     const result = {};
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
     for (const line of lines) {
         const colonIndex = line.indexOf(': ');
         if (colonIndex > 0) {
@@ -562,7 +821,11 @@ function parseJobOutput(output) {
  */
 function parseFixesOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "job000001 fixed by change 12345 on 2023/01/01 by user@client"
         const match = line.match(/^(\w+)\s+fixed\s+by\s+change\s+(\d+)\s+on\s+(\d{4}\/\d{2}\/\d{2})\s+by\s+(.+)$/);
@@ -583,7 +846,11 @@ function parseFixesOutput(output) {
  */
 function parseLabelsOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "Label labelname 2023/01/01 'Label description'"
         const match = line.match(/^Label\s+(\w+)\s+(\d{4}\/\d{2}\/\d{2})\s+'(.*)'/);
@@ -603,7 +870,11 @@ function parseLabelsOutput(output) {
  */
 function parseLabelOutput(output) {
     const result = {};
-    const lines = output.split('\n');
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
     for (const line of lines) {
         const colonIndex = line.indexOf(': ');
         if (colonIndex > 0) {
@@ -618,8 +889,16 @@ function parseLabelOutput(output) {
  * Parse p4 sizes output into size statistics
  */
 function parseSizesOutput(output) {
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return {
+            totalSize: 0,
+            fileCount: 0,
+            files: []
+        };
+    }
     const result = {};
-    const lines = output.split('\n').filter(line => line.trim());
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         if (line.includes('files,')) {
             // Format: "12345 files, 67890123 bytes"
@@ -637,7 +916,11 @@ function parseSizesOutput(output) {
  */
 function parseHaveOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path#123 - /local/path"
         const match = line.match(/^(.+?)#(\d+)\s+-\s+(.+)/);
@@ -657,7 +940,11 @@ function parseHaveOutput(output) {
  */
 function parseWhereOutput(output) {
     const results = [];
-    const lines = output.split('\n').filter(line => line.trim());
+    // Handle non-string inputs safely
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
     for (const line of lines) {
         // Format: "//depot/path /local/path //depot/path"
         const parts = line.split(/\s+/);
@@ -671,6 +958,105 @@ function parseWhereOutput(output) {
     }
     return results;
 }
+/**
+ * Parse p4 fstat output into records
+ */
+function parseFstatOutput(output) {
+    const records = parseZtagOutput(output);
+    return records.map((record) => ({ ...record }));
+}
+/**
+ * Parse p4 streams output into stream records
+ */
+function parseStreamsOutput(output) {
+    const results = [];
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
+    for (const line of lines) {
+        // Format: "Stream //Depot/main 2025/01/01 owner 'description'"
+        const match = line.match(/^Stream\s+(\S+)\s+(\S+)\s+(\S+)\s+'(.*)'$/);
+        if (match) {
+            const [, stream, date, owner, description] = match;
+            results.push({
+                stream,
+                date,
+                owner,
+                description,
+            });
+        }
+        else if (line.startsWith('//')) {
+            results.push({ stream: line.trim() });
+        }
+    }
+    return results;
+}
+/**
+ * Parse p4 stream output into a stream spec key/value object
+ */
+function parseStreamOutput(output) {
+    const result = {};
+    if (!output || typeof output !== 'string') {
+        return result;
+    }
+    const lines = getNormalizedLines(output);
+    for (const line of lines) {
+        const colonIndex = line.indexOf(':');
+        if (colonIndex > 0) {
+            const key = line.substring(0, colonIndex).trim();
+            const value = line.substring(colonIndex + 1).trim();
+            if (key) {
+                result[key] = value;
+            }
+        }
+    }
+    return result;
+}
+/**
+ * Parse p4 print output content
+ */
+function parsePrintOutput(output) {
+    if (!output || typeof output !== 'string') {
+        return { content: '' };
+    }
+    return {
+        content: getNormalizedLines(output).join('\n').trim(),
+    };
+}
+/**
+ * Parse p4 integrate/merge output into operation records
+ */
+function parseIntegrateOutput(output) {
+    const results = [];
+    if (!output || typeof output !== 'string') {
+        return results;
+    }
+    const lines = getNormalizedLines(output, { removeEmpty: true });
+    for (const line of lines) {
+        // Common formats:
+        // //depot/target#5 - integrate from //depot/source#7
+        // //depot/target#none - branch from //depot/source#1
+        const match = line.match(/^(.+?)#([^\s]+)\s+-\s+(.+?)(?:\s+from\s+(.+?)#([^\s]+))?$/);
+        if (match) {
+            const [, targetFile, targetRevisionRaw, action, sourceFile, sourceRevisionRaw] = match;
+            const targetRevisionNum = parseInt(targetRevisionRaw, 10);
+            const sourceRevisionNum = sourceRevisionRaw ? parseInt(sourceRevisionRaw, 10) : NaN;
+            results.push({
+                targetFile,
+                targetRevision: Number.isNaN(targetRevisionNum) ? targetRevisionRaw : targetRevisionNum,
+                action: action.trim(),
+                sourceFile: sourceFile || undefined,
+                sourceRevision: sourceRevisionRaw
+                    ? Number.isNaN(sourceRevisionNum)
+                        ? sourceRevisionRaw
+                        : sourceRevisionNum
+                    : undefined,
+            });
+        }
+    }
+    return results;
+}
 /**
  * Helper function to convert resolve status to action
  */
@@ -683,6 +1069,53 @@ function getResolveAction(status) {
         default: return 'unknown';
     }
 }
+/**
+ * Strip p4 -s script mode prefixes (info1:, error:, exit:, etc.) from output lines
+ */
+function stripScriptPrefix(line) {
+    const match = line.match(/^(info\d*|text|warning|error|exit):\s?(.*)$/i);
+    if (!match) {
+        return line;
+    }
+    const [, prefix, value] = match;
+    if (prefix.toLowerCase() === 'exit') {
+        return '';
+    }
+    return value;
+}
+function getNormalizedLines(output, options = {}) {
+    if (!output || typeof output !== 'string') {
+        return [];
+    }
+    const { trim = false, removeEmpty = false } = options;
+    const lines = output.split('\n');
+    const normalized = [];
+    for (const rawLine of lines) {
+        const stripped = stripScriptPrefix(rawLine.replace(/\r$/, ''));
+        const value = trim ? stripped.trim() : stripped;
+        if (removeEmpty && value.trim().length === 0) {
+            continue;
+        }
+        normalized.push(value);
+    }
+    return normalized;
+}
+/**
+ * Parse a single side of a diff2 header line
+ */
+function parseDiff2Side(side) {
+    const match = side.trim().match(/^(.+?)#([^\s]+)(?:\s+\((.+?)\))?$/);
+    if (!match) {
+        return { depotFile: side.trim(), revision: 'unknown' };
+    }
+    const [, depotFile, revisionRaw, type] = match;
+    const numericRevision = parseInt(revisionRaw, 10);
+    return {
+        depotFile,
+        revision: Number.isNaN(numericRevision) ? revisionRaw : numericRevision,
+        type: type || undefined,
+    };
+}
 /**
  * Parse individual values with type conversion
  */