rename imports for wavesrv

wavesrv/cmd/main-server.go

@@ -25,17 +25,17 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/server"
-	"github.com/commandlinedev/prompt-server/pkg/cmdrunner"
-	"github.com/commandlinedev/prompt-server/pkg/pcloud"
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/rtnstate"
-	"github.com/commandlinedev/prompt-server/pkg/scbase"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/scws"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
-	"github.com/commandlinedev/prompt-server/pkg/wsshell"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/server"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/cmdrunner"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scws"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/wsshell"
 )
 
 type WebFnType = func(http.ResponseWriter, *http.Request)

wavesrv/go.mod

@@ -1,11 +1,11 @@
-module github.com/commandlinedev/prompt-server
+module github.com/wavetermdev/waveterm/wavesrv
 
 go 1.18
 
 require (
+	github.com/wavetermdev/waveterm/waveshell v0.0.0
 	github.com/alessio/shellescape v1.4.1
 	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
-	github.com/commandlinedev/apishell v0.0.0
 	github.com/creack/pty v1.1.18
 	github.com/golang-migrate/migrate/v4 v4.16.2
 	github.com/google/uuid v1.3.0
@@ -25,4 +25,6 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-)
+)
+
+replace github.com/wavetermdev/waveterm/waveshell => ../waveshell

wavesrv/pkg/cmdrunner/cmdrunner.go

@@ -18,18 +18,18 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/shexec"
-	"github.com/commandlinedev/prompt-server/pkg/comp"
-	"github.com/commandlinedev/prompt-server/pkg/dbutil"
-	"github.com/commandlinedev/prompt-server/pkg/pcloud"
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/remote/openai"
-	"github.com/commandlinedev/prompt-server/pkg/scbase"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/comp"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote/openai"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 	"github.com/google/uuid"
 )
 

wavesrv/pkg/cmdrunner/resolver.go

@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 	"github.com/google/uuid"
 )
 

wavesrv/pkg/cmdrunner/shparse.go

@@ -6,10 +6,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/commandlinedev/apishell/pkg/shexec"
-	"github.com/commandlinedev/apishell/pkg/simpleexpand"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/syntax"
 )

wavesrv/pkg/cmdrunner/termopts.go

@@ -5,11 +5,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/shexec"
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 )
 
 // PTERM=MxM,Mx25

wavesrv/pkg/comp/comp.go

@@ -11,10 +11,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/commandlinedev/apishell/pkg/simpleexpand"
-	"github.com/commandlinedev/prompt-server/pkg/shparse"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/shparse"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 	"mvdan.cc/sh/v3/syntax"
 )
 

wavesrv/pkg/comp/simplecomp.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 
 	"github.com/google/uuid"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 )
 
 var globalLock = &sync.Mutex{}

wavesrv/pkg/pcloud/pcloud.go

@@ -15,10 +15,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/commandlinedev/prompt-server/pkg/dbutil"
-	"github.com/commandlinedev/prompt-server/pkg/rtnstate"
-	"github.com/commandlinedev/prompt-server/pkg/scbase"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 )
 
 const PCloudEndpoint = "https://api.getprompt.dev/central"

wavesrv/pkg/pcloud/pclouddata.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/rtnstate"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 )
 
 type NoTelemetryInputType struct {

wavesrv/pkg/remote/openai/openai.go

@@ -6,8 +6,8 @@ import (
 	"io"
 
 	openaiapi "github.com/sashabaranov/go-openai"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 )
 
 // https://github.com/tiktoken-go/tokenizer

wavesrv/pkg/remote/remote.go

@@ -19,13 +19,13 @@ import (
 	"time"
 
 	"github.com/armon/circbuf"
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/shexec"
-	"github.com/commandlinedev/apishell/pkg/statediff"
-	"github.com/commandlinedev/prompt-server/pkg/scbase"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/statediff"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 	"github.com/creack/pty"
 	"github.com/google/uuid"
 	"golang.org/x/mod/semver"

wavesrv/pkg/remote/updatequeue.go

@@ -1,7 +1,7 @@
 package remote
 
 import (
-	"github.com/commandlinedev/apishell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
 )
 
 func startCmdWait(ck base.CommandKey) {

wavesrv/pkg/rtnstate/rtnstate.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/shexec"
-	"github.com/commandlinedev/apishell/pkg/simpleexpand"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 	"mvdan.cc/sh/v3/syntax"
 )
 

wavesrv/pkg/scbase/scbase.go

@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/commandlinedev/apishell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
 	"github.com/google/uuid"
 	"golang.org/x/mod/semver"
 	"golang.org/x/sys/unix"

wavesrv/pkg/scpacket/scpacket.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
 )
 
 const FeCommandPacketStr = "fecmd"

wavesrv/pkg/scws/scws.go

@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/prompt-server/pkg/mapqueue"
-	"github.com/commandlinedev/prompt-server/pkg/remote"
-	"github.com/commandlinedev/prompt-server/pkg/scpacket"
-	"github.com/commandlinedev/prompt-server/pkg/sstore"
-	"github.com/commandlinedev/prompt-server/pkg/wsshell"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/mapqueue"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/wsshell"
 )
 
 const WSStatePacketChSize = 20

wavesrv/pkg/shparse/comp.go

@@ -3,7 +3,7 @@ package shparse
 import (
 	"strings"
 
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 )
 
 const (

wavesrv/pkg/shparse/extend.go

@@ -5,7 +5,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 )
 
 var noEscChars []bool

wavesrv/pkg/shparse/shparse.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/commandlinedev/prompt-server/pkg/utilfn"
+	"github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn"
 )
 
 //