Spaces:
Paused
Paused
File size: 6,717 Bytes
4efde5d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | import { extractToolData, extractCommand, extractCommandOutput, extractExitCode, extractSessionName } from '../utils';
export interface CommandData {
command: string | null;
output: string | null;
exitCode: number | null;
sessionName: string | null;
cwd: string | null;
completed: boolean | null;
success?: boolean;
timestamp?: string;
}
const parseContent = (content: any): any => {
if (typeof content === 'string') {
try {
return JSON.parse(content);
} catch (e) {
return content;
}
}
return content;
};
const extractFromNewFormat = (content: any): CommandData => {
const parsedContent = parseContent(content);
if (!parsedContent || typeof parsedContent !== 'object') {
return { command: null, output: null, exitCode: null, sessionName: null, cwd: null, completed: null, success: undefined, timestamp: undefined };
}
if ('tool_execution' in parsedContent && typeof parsedContent.tool_execution === 'object') {
const toolExecution = parsedContent.tool_execution;
const args = toolExecution.arguments || {};
// Handle the case where result.output is a string (like in your example)
let output = toolExecution.result?.output;
let parsedOutput: any = {};
if (typeof output === 'string') {
// First try to parse it as JSON
try {
parsedOutput = JSON.parse(output);
// If parsing succeeds, extract the actual output from the nested structure
if (parsedOutput && typeof parsedOutput === 'object') {
// Look for output in common nested structures
output = parsedOutput.output || parsedOutput.message || parsedOutput.content || output;
}
} catch (e) {
// If it's not JSON, treat it as plain text output
output = output;
}
} else if (typeof output === 'object' && output !== null) {
parsedOutput = output;
// Extract output from object structure
output = (output as any).output || (output as any).message || (output as any).content || null;
}
const extractedData = {
command: args.command || null,
output: output || parsedOutput?.output || null,
exitCode: parsedOutput?.exit_code || null,
sessionName: args.session_name || parsedOutput?.session_name || null,
cwd: parsedOutput?.cwd || null,
completed: parsedOutput?.completed || null,
success: toolExecution.result?.success,
timestamp: toolExecution.execution_details?.timestamp
};
return extractedData;
}
if ('role' in parsedContent && 'content' in parsedContent) {
return extractFromNewFormat(parsedContent.content);
}
return { command: null, output: null, exitCode: null, sessionName: null, cwd: null, completed: null, success: undefined, timestamp: undefined };
};
const extractFromLegacyFormat = (content: any): Omit<CommandData, 'success' | 'timestamp'> => {
const toolData = extractToolData(content);
if (toolData.toolResult) {
const args = toolData.arguments || {};
return {
command: toolData.command || args.command || null,
output: toolData.toolResult.toolOutput || null,
exitCode: null,
sessionName: args.session_name || null,
cwd: null,
completed: null
};
}
const legacyCommand = extractCommand(content);
return {
command: legacyCommand,
output: null,
exitCode: null,
sessionName: null,
cwd: null,
completed: null
};
};
export function extractCommandData(
assistantContent: any,
toolContent: any,
isSuccess: boolean,
toolTimestamp?: string,
assistantTimestamp?: string
): {
command: string | null;
output: string | null;
exitCode: number | null;
sessionName: string | null;
cwd: string | null;
completed: boolean | null;
actualIsSuccess: boolean;
actualToolTimestamp?: string;
actualAssistantTimestamp?: string;
} {
let command: string | null = null;
let output: string | null = null;
let exitCode: number | null = null;
let sessionName: string | null = null;
let cwd: string | null = null;
let completed: boolean | null = null;
let actualIsSuccess = isSuccess;
let actualToolTimestamp = toolTimestamp;
let actualAssistantTimestamp = assistantTimestamp;
const assistantNewFormat = extractFromNewFormat(assistantContent);
const toolNewFormat = extractFromNewFormat(toolContent);
if (assistantNewFormat.command || assistantNewFormat.output) {
command = assistantNewFormat.command;
output = assistantNewFormat.output;
exitCode = assistantNewFormat.exitCode;
sessionName = assistantNewFormat.sessionName;
cwd = assistantNewFormat.cwd;
completed = assistantNewFormat.completed;
if (assistantNewFormat.success !== undefined) {
actualIsSuccess = assistantNewFormat.success;
}
if (assistantNewFormat.timestamp) {
actualAssistantTimestamp = assistantNewFormat.timestamp;
}
} else if (toolNewFormat.command || toolNewFormat.output) {
command = toolNewFormat.command;
output = toolNewFormat.output;
exitCode = toolNewFormat.exitCode;
sessionName = toolNewFormat.sessionName;
cwd = toolNewFormat.cwd;
completed = toolNewFormat.completed;
if (toolNewFormat.success !== undefined) {
actualIsSuccess = toolNewFormat.success;
}
if (toolNewFormat.timestamp) {
actualToolTimestamp = toolNewFormat.timestamp;
}
} else {
const assistantLegacy = extractFromLegacyFormat(assistantContent);
const toolLegacy = extractFromLegacyFormat(toolContent);
command = assistantLegacy.command || toolLegacy.command;
output = assistantLegacy.output || toolLegacy.output;
sessionName = assistantLegacy.sessionName || toolLegacy.sessionName;
}
if (!command) {
const rawCommand = extractCommand(assistantContent) || extractCommand(toolContent);
command = rawCommand
?.replace(/^suna@computer:~\$\s*/g, '')
?.replace(/\\n/g, '')
?.replace(/\n/g, '')
?.trim() || null;
}
if (!output && toolContent) {
output = extractCommandOutput(toolContent);
}
if (exitCode === null && toolContent) {
exitCode = extractExitCode(toolContent);
}
if (!sessionName) {
sessionName = extractSessionName(assistantContent) || extractSessionName(toolContent);
}
if (output && typeof output === 'string' && output.includes('exit_code=') && exitCode === null) {
const exitCodeMatch = output.match(/exit_code=(\d+)/);
if (exitCodeMatch) {
exitCode = parseInt(exitCodeMatch[1], 10);
}
}
return {
command,
output,
exitCode,
sessionName,
cwd,
completed,
actualIsSuccess,
actualToolTimestamp,
actualAssistantTimestamp
};
} |