Fix raw command output handling for PR #4083

Julius Marminge committed 3 months ago

Commit bf58a961 parent 86dc15c2 files · +12 −5Browse files

Unified · Split

2 files

       makeCommandActivity("codex-command", {
         itemType: "command_execution",
         title: "Ran command",
-        detail: "printf hello",
+        detail: "/bin/zsh -lc \"printf 'hello\\n'\"",
         data: {
           item: {
             type: "commandExecution",
-            command: "printf hello",
+            command: "/bin/zsh -lc \"printf 'hello\\n'\"",
+            commandActions: [{ command: "printf 'hello\\n'", type: "unknown" }],
             aggregatedOutput: "hello\n<exited with exit code 0>",
             status: "completed",
           },
     ]);
     expect(entry).toMatchObject({
-      command: "printf hello",
+      command: "printf 'hello\\n'",
+      rawCommand: "/bin/zsh -lc \"printf 'hello\\n'\"",
       detail: "hello",
     });
   });

   const normalizedHeading = normalizePreviewForComparison(heading);
   const normalizedDetail = normalizePreviewForComparison(detail);
   const commandTool = isCommandToolDetail(payload, heading);
-  const command = commandTool ? extractToolCommand(payload).command : null;
+  const commandPreview = commandTool
+    ? extractToolCommand(payload)
+    : { command: null, rawCommand: null };
+  const command = commandPreview.command;
   const normalizedCommand = normalizePreviewForComparison(command);
+  const normalizedRawCommand = normalizePreviewForComparison(commandPreview.rawCommand);
   if (
     detail &&
     normalizedHeading !== normalizedDetail &&
-    (!commandTool || normalizedCommand !== normalizedDetail)
+    (!commandTool ||
+      (normalizedCommand !== normalizedDetail && normalizedRawCommand !== normalizedDetail))
   ) {
     return detail;
   }