fix bug in termscrollback (lastcommand) and fix bug with wrong route

Author: sawka

cmd/wsh/cmd/wshcmd-termscrollback.go

@@ -12,6 +12,7 @@ import (
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
+	"github.com/wavetermdev/waveterm/pkg/wshutil"
 )
 
 var termScrollbackCmd = &cobra.Command{
@@ -75,7 +76,7 @@ func termScrollbackRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	}
 
 	result, err := wshclient.TermGetScrollbackLinesCommand(RpcClient, scrollbackData, &wshrpc.RpcOpts{
-		Route:   fullORef.String(),
+		Route:   wshutil.MakeFeBlockRouteId(fullORef.OID),
 		Timeout: 5000,
 	})
 	if err != nil {

frontend/app/view/term/term-wsh.tsx

@@ -128,13 +128,23 @@ export class TermWshClient extends WshClient {
             }
 
             let startBufferIndex = 0;
+            let endBufferIndex = totalLines;
             if (termWrap.promptMarkers.length > 0) {
-                const lastMarker = termWrap.promptMarkers[termWrap.promptMarkers.length - 1];
-                const markerLine = lastMarker.line;
-                startBufferIndex = totalLines - markerLine;
+                // The last marker is the current prompt, so we want the second-to-last for the previous command
+                // If there's only one marker, use it (edge case for first command)
+                const markerIndex = termWrap.promptMarkers.length > 1
+                    ? termWrap.promptMarkers.length - 2
+                    : termWrap.promptMarkers.length - 1;
+                const commandStartMarker = termWrap.promptMarkers[markerIndex];
+                startBufferIndex = commandStartMarker.line;
+                
+                // End at the last marker (current prompt) if there are multiple markers
+                if (termWrap.promptMarkers.length > 1) {
+                    const currentPromptMarker = termWrap.promptMarkers[termWrap.promptMarkers.length - 1];
+                    endBufferIndex = currentPromptMarker.line;
+                }
             }
 
-            const endBufferIndex = totalLines;
             const lines = bufferLinesToText(buffer, startBufferIndex, endBufferIndex);
 
             let returnLines = lines;