diff --git a/README.md b/README.md index b98c18301e09c5938bd67a0bb79dd8dbe3abfa1f..39fec806a2d299dffefb039404aeae11ea37e55e 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ OpenCode is a Go-based CLI application that brings AI assistance to your termina ```bash # Install the latest version -curl -fsSL https://raw.githubusercontent.com/opencode-ai/opencode/refs/heads/main/install | bash +curl -fsSL https://raw.githubusercontent.com/charmbracelet/crush/refs/heads/main/install | bash # Install a specific version -curl -fsSL https://raw.githubusercontent.com/opencode-ai/opencode/refs/heads/main/install | VERSION=0.1.0 bash +curl -fsSL https://raw.githubusercontent.com/charmbracelet/crush/refs/heads/main/install | VERSION=0.1.0 bash ``` ### Using Homebrew (macOS and Linux) @@ -59,7 +59,7 @@ paru -S opencode-ai-bin ### Using Go ```bash -go install github.com/opencode-ai/opencode@latest +go install github.com/charmbracelet/crush@latest ``` ## Configuration @@ -613,7 +613,7 @@ You can also configure a self-hosted model in the configuration file under the ` ```bash # Clone the repository -git clone https://github.com/opencode-ai/opencode.git +git clone https://github.com/charmbracelet/crush.git cd opencode # Build diff --git a/Taskfile.yaml b/Taskfile.yaml index e2f59da4161a904051601ef5fc5e6176fe75910b..7e181d84513bc1abc5d5a32807f88a75898633ea 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -8,6 +8,11 @@ tasks: cmds: - golangci-lint run + lint-fix: + desc: Run base linters and fix issues + cmds: + - golangci-lint run --fix + test: desc: Run tests cmds: diff --git a/cmd/root.go b/cmd/root.go index 160be9dbec092493a6607326f9b9ea5304004d50..9a8748f5252773176b490b172fd8c14c26e7bc12 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -8,15 +8,15 @@ import ( "time" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/opencode-ai/opencode/internal/app" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/db" - "github.com/opencode-ai/opencode/internal/format" - "github.com/opencode-ai/opencode/internal/llm/agent" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/tui" - "github.com/opencode-ai/opencode/internal/version" + "github.com/charmbracelet/crush/internal/app" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/db" + "github.com/charmbracelet/crush/internal/format" + "github.com/charmbracelet/crush/internal/llm/agent" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/tui" + "github.com/charmbracelet/crush/internal/version" "github.com/spf13/cobra" ) diff --git a/cmd/schema/main.go b/cmd/schema/main.go index 429267bc9519f62b1376ecb8cf4089d93a0b09f1..b638fb7a0d2b113304c4338779332bd6ad2d7bf9 100644 --- a/cmd/schema/main.go +++ b/cmd/schema/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" ) // JSONSchemaType represents a JSON Schema type diff --git a/go.mod b/go.mod index edb43f7075b9959941ac398c85fafb9d6d6e4610..8123d187820eb1b4873428b7e61249b55c960ff1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/opencode-ai/opencode +module github.com/charmbracelet/crush go 1.24.0 @@ -76,7 +76,6 @@ require ( github.com/charmbracelet/x/term v0.2.1 // indirect github.com/charmbracelet/x/windows v0.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/disintegration/imaging v1.6.2 github.com/dlclark/regexp2 v1.11.4 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect diff --git a/go.sum b/go.sum index 0811dc5e595582b364af04758a219f2cbe634441..7af16ab0ae6cbea3532270af03847e6e747cfdff 100644 --- a/go.sum +++ b/go.sum @@ -102,8 +102,6 @@ github.com/disintegration/gift v1.1.2 h1:9ZyHJr+kPamiH10FX3Pynt1AxFUob812bU9Wt4G github.com/disintegration/gift v1.1.2/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec h1:YrB6aVr9touOt75I9O1SiancmR2GMg45U9UYf0gtgWg= github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec/go.mod h1:K0KBFIr1gWu/C1Gp10nFAcAE4hsB7JxE6OgLijrJ8Sk= -github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= -github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= @@ -282,7 +280,6 @@ golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= -golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY= golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= diff --git a/install b/install index b58aa14e23364f702ada60a8db2c0403b9956fec..8d394d34b930e9d9afe8c359c5a0ae52cfa00e76 100755 --- a/install +++ b/install @@ -40,15 +40,15 @@ INSTALL_DIR=$HOME/.opencode/bin mkdir -p "$INSTALL_DIR" if [ -z "$requested_version" ]; then - url="https://github.com/opencode-ai/opencode/releases/latest/download/$filename" - specific_version=$(curl -s https://api.github.com/repos/opencode-ai/opencode/releases/latest | awk -F'"' '/"tag_name": "/ {gsub(/^v/, "", $4); print $4}') + url="https://github.com/charmbracelet/crush/releases/latest/download/$filename" + specific_version=$(curl -s https://api.github.com/repos/charmbracelet/crush/releases/latest | awk -F'"' '/"tag_name": "/ {gsub(/^v/, "", $4); print $4}') if [[ $? -ne 0 ]]; then echo "${RED}Failed to fetch version information${NC}" exit 1 fi else - url="https://github.com/opencode-ai/opencode/releases/download/v${requested_version}/$filename" + url="https://github.com/charmbracelet/crush/releases/download/v${requested_version}/$filename" specific_version=$requested_version fi diff --git a/internal/app/app.go b/internal/app/app.go index 9ebb00ea9bfe6823ec6f02bfd1f6111f6ec58adf..29c77308111e09f8174ea7f7ceddd30948db8cf1 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -9,16 +9,16 @@ import ( "sync" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/db" - "github.com/opencode-ai/opencode/internal/format" - "github.com/opencode-ai/opencode/internal/history" - "github.com/opencode-ai/opencode/internal/llm/agent" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/permission" - "github.com/opencode-ai/opencode/internal/session" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/db" + "github.com/charmbracelet/crush/internal/format" + "github.com/charmbracelet/crush/internal/history" + "github.com/charmbracelet/crush/internal/llm/agent" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/permission" + "github.com/charmbracelet/crush/internal/session" ) type App struct { diff --git a/internal/app/lsp.go b/internal/app/lsp.go index c04cc42398423d88e9277ce57cddc54ebcc8a66a..a056676e1672454adba6d63dd7b7042cc47f6855 100644 --- a/internal/app/lsp.go +++ b/internal/app/lsp.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/lsp/watcher" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/lsp/watcher" ) func (app *App) initLSPClients(ctx context.Context) { diff --git a/internal/config/config.go b/internal/config/config.go index 5a0905bba239c0d7c79f669801ef9b3a5caa9cf9..5ed55552d9d4f07c4d4e00f8d7980880d05e8a34 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/logging" "github.com/spf13/viper" ) diff --git a/internal/db/connect.go b/internal/db/connect.go index b8fcb736261adc9b5e6c06cd02a8364eec87acea..3881dd34bdc16a9a893d24377eafcd1f59e7aace 100644 --- a/internal/db/connect.go +++ b/internal/db/connect.go @@ -9,8 +9,8 @@ import ( _ "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" "github.com/pressly/goose/v3" ) diff --git a/internal/diff/diff.go b/internal/diff/diff.go index 58545566e9035ed4122e103ed624972fa27ce4f2..89087ecc7594c6feab222c5b7ea288db1ac112e4 100644 --- a/internal/diff/diff.go +++ b/internal/diff/diff.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/aymanbagabas/go-udiff" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/highlight" + "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/highlight" - "github.com/opencode-ai/opencode/internal/tui/styles" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/internal/fileutil/fileutil.go b/internal/fileutil/fileutil.go index 125979df7b98247dcde89980671fddf851dfb2ef..94013b7f3e27abb9e4240d62e72176d1f8576067 100644 --- a/internal/fileutil/fileutil.go +++ b/internal/fileutil/fileutil.go @@ -11,7 +11,7 @@ import ( "github.com/bmatcuk/doublestar/v4" "github.com/charlievieth/fastwalk" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/logging" ignore "github.com/sabhiram/go-gitignore" ) diff --git a/internal/highlight/highlight.go b/internal/highlight/highlight.go index 6517357a1b2a789d0f49ab13dbc5a0cc9e92bfed..3b9c7643cf0d6b281c5eb66523cb97ee4197faf6 100644 --- a/internal/highlight/highlight.go +++ b/internal/highlight/highlight.go @@ -9,7 +9,7 @@ import ( "github.com/alecthomas/chroma/v2/formatters" "github.com/alecthomas/chroma/v2/lexers" chromaStyles "github.com/alecthomas/chroma/v2/styles" - "github.com/opencode-ai/opencode/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/styles" ) func SyntaxHighlight(source, fileName string, bg color.Color) (string, error) { diff --git a/internal/history/file.go b/internal/history/file.go index 9cdb2e47b2736b1800232f853682c125533d97e1..cf1b92bd436f93e49757dfe1ee6b8cddeef891d3 100644 --- a/internal/history/file.go +++ b/internal/history/file.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/charmbracelet/crush/internal/db" + "github.com/charmbracelet/crush/internal/pubsub" "github.com/google/uuid" - "github.com/opencode-ai/opencode/internal/db" - "github.com/opencode-ai/opencode/internal/pubsub" ) const ( diff --git a/internal/llm/agent/agent-tool.go b/internal/llm/agent/agent-tool.go index 781720ded69e625bed44eb5baa30b879b28e94ca..de4a86ac36d62ef0990a58d6abeb9a53572bc215 100644 --- a/internal/llm/agent/agent-tool.go +++ b/internal/llm/agent/agent-tool.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/session" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/session" ) type agentTool struct { diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index 511cf62996bd6e0d506a428344f34d89e515c82a..9120c76aff8d5efa7161b4fab73577d31991e07a 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -8,16 +8,16 @@ import ( "sync" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/llm/prompt" - "github.com/opencode-ai/opencode/internal/llm/provider" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/permission" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/session" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/prompt" + "github.com/charmbracelet/crush/internal/llm/provider" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/permission" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/session" ) // Common errors diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go index 2375606416e144db5ada7b0ab4309c7987aa8080..32ce8287a257438f01fbb6f52770677cb18b3b30 100644 --- a/internal/llm/agent/mcp-tools.go +++ b/internal/llm/agent/mcp-tools.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/permission" - "github.com/opencode-ai/opencode/internal/version" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/permission" + "github.com/charmbracelet/crush/internal/version" "github.com/mark3labs/mcp-go/client" "github.com/mark3labs/mcp-go/mcp" diff --git a/internal/llm/agent/tools.go b/internal/llm/agent/tools.go index e6b0119aef3e9ebc0cf9fe12c9c4d45767245aa8..763f53ea6f2246f2acae3f8c2907abf8be34a1d0 100644 --- a/internal/llm/agent/tools.go +++ b/internal/llm/agent/tools.go @@ -3,12 +3,12 @@ package agent import ( "context" - "github.com/opencode-ai/opencode/internal/history" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/permission" - "github.com/opencode-ai/opencode/internal/session" + "github.com/charmbracelet/crush/internal/history" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/permission" + "github.com/charmbracelet/crush/internal/session" ) func CoderAgentTools( diff --git a/internal/llm/models/local.go b/internal/llm/models/local.go index 6ff8391b48acf2d8553631b7a15ce9b758d0b480..3a50fdf48fe86167600eceee3cce26b6caac900e 100644 --- a/internal/llm/models/local.go +++ b/internal/llm/models/local.go @@ -11,7 +11,7 @@ import ( "strings" "unicode" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/logging" "github.com/spf13/viper" ) diff --git a/internal/llm/prompt/coder.go b/internal/llm/prompt/coder.go index 495f2406a435fec54cfea9ac4abffd4e839c28e8..085dc9bec55b2b1def04082fed66b5859c676fce 100644 --- a/internal/llm/prompt/coder.go +++ b/internal/llm/prompt/coder.go @@ -8,9 +8,9 @@ import ( "runtime" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/llm/tools" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/tools" ) func CoderPrompt(provider models.ModelProvider) string { diff --git a/internal/llm/prompt/prompt.go b/internal/llm/prompt/prompt.go index 8cdbdfc269cad3be04bd471d1d39756254541c74..0e46806895d78b09cbe8c1249eadd2b755ca5d56 100644 --- a/internal/llm/prompt/prompt.go +++ b/internal/llm/prompt/prompt.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/logging" ) func GetAgentPrompt(agentName config.AgentName, provider models.ModelProvider) string { diff --git a/internal/llm/prompt/prompt_test.go b/internal/llm/prompt/prompt_test.go index bcd9e20993a4e0b4555d9dc82e46330938223b72..a350c55a32260173dabd56e22d9e514e97b3e5a3 100644 --- a/internal/llm/prompt/prompt_test.go +++ b/internal/llm/prompt/prompt_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/opencode-ai/opencode/internal/config" + "github.com/charmbracelet/crush/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/llm/prompt/summarizer.go b/internal/llm/prompt/summarizer.go index cbdadecaecb56fba6c773e8db2aa0ad9963aa2fd..87a0f95c66af8b51d07a3a4e792c07dea7dab503 100644 --- a/internal/llm/prompt/summarizer.go +++ b/internal/llm/prompt/summarizer.go @@ -1,6 +1,6 @@ package prompt -import "github.com/opencode-ai/opencode/internal/llm/models" +import "github.com/charmbracelet/crush/internal/llm/models" func SummarizerPrompt(_ models.ModelProvider) string { return `You are a helpful AI assistant tasked with summarizing conversations. diff --git a/internal/llm/prompt/task.go b/internal/llm/prompt/task.go index 2e52ce5d3e85ed99c66bba779d05df5ae48719cc..1ec3c9bc82b6568158483cc2913a9b9e8c5fdc56 100644 --- a/internal/llm/prompt/task.go +++ b/internal/llm/prompt/task.go @@ -3,7 +3,7 @@ package prompt import ( "fmt" - "github.com/opencode-ai/opencode/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/models" ) func TaskPrompt(_ models.ModelProvider) string { diff --git a/internal/llm/prompt/title.go b/internal/llm/prompt/title.go index 95648152028513f8f06c73077f249193f88421ff..03e47288507fa66bb88605bff4b2194b889cc3f7 100644 --- a/internal/llm/prompt/title.go +++ b/internal/llm/prompt/title.go @@ -1,6 +1,6 @@ package prompt -import "github.com/opencode-ai/opencode/internal/llm/models" +import "github.com/charmbracelet/crush/internal/llm/models" func TitlePrompt(_ models.ModelProvider) string { return `you will generate a short title based on the first message a user begins a conversation with diff --git a/internal/llm/provider/anthropic.go b/internal/llm/provider/anthropic.go index 4b558e2fb18fe411e1dfbbc3652a2246375a9929..77edc8e0519e6f82b0c807626dfebbcd5c09d3a4 100644 --- a/internal/llm/provider/anthropic.go +++ b/internal/llm/provider/anthropic.go @@ -12,11 +12,11 @@ import ( "github.com/anthropics/anthropic-sdk-go" "github.com/anthropics/anthropic-sdk-go/bedrock" "github.com/anthropics/anthropic-sdk-go/option" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" ) type anthropicOptions struct { diff --git a/internal/llm/provider/bedrock.go b/internal/llm/provider/bedrock.go index 9fa3ca87f984147a3137fa013484b453d37d9687..8d3a86198aab5a38742e33b167f2545efd808873 100644 --- a/internal/llm/provider/bedrock.go +++ b/internal/llm/provider/bedrock.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/message" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/message" ) type bedrockOptions struct { diff --git a/internal/llm/provider/gemini.go b/internal/llm/provider/gemini.go index 96cf02a8b311bb5fa536394452fe9cb05713faaa..57a81d9af0dbc97db992d43f246c4cde8e9927a4 100644 --- a/internal/llm/provider/gemini.go +++ b/internal/llm/provider/gemini.go @@ -9,11 +9,11 @@ import ( "strings" "time" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" "github.com/google/uuid" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" "google.golang.org/genai" ) diff --git a/internal/llm/provider/openai.go b/internal/llm/provider/openai.go index 8a561c77bfe53e5aafabf773ff2e57c80273558a..672ef1eb6b36bf65a8db8491cefbe83e8272845a 100644 --- a/internal/llm/provider/openai.go +++ b/internal/llm/provider/openai.go @@ -8,14 +8,14 @@ import ( "io" "time" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" "github.com/openai/openai-go" "github.com/openai/openai-go/option" "github.com/openai/openai-go/shared" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" ) type openaiOptions struct { diff --git a/internal/llm/provider/provider.go b/internal/llm/provider/provider.go index 08175450a6d85953e996c08f436982a1981053b6..558eec31059ecb068897fe09397813bbaafe6afd 100644 --- a/internal/llm/provider/provider.go +++ b/internal/llm/provider/provider.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/message" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/message" ) type EventType string diff --git a/internal/llm/provider/vertexai.go b/internal/llm/provider/vertexai.go index 2a13a957204e90debf6f00c920c9c3b55b74a27d..fe2de2f4588f9dbe583e4f8af85e61eea67d5648 100644 --- a/internal/llm/provider/vertexai.go +++ b/internal/llm/provider/vertexai.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/logging" "google.golang.org/genai" ) diff --git a/internal/llm/tools/bash.go b/internal/llm/tools/bash.go index 7231e1d2a22860b7ead26775e38ad6cb99a26f63..33e703cca4d559ea32d97786c191dcae49855c43 100644 --- a/internal/llm/tools/bash.go +++ b/internal/llm/tools/bash.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/tools/shell" - "github.com/opencode-ai/opencode/internal/permission" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/tools/shell" + "github.com/charmbracelet/crush/internal/permission" ) type BashParams struct { diff --git a/internal/llm/tools/diagnostics.go b/internal/llm/tools/diagnostics.go index b4c5941c41ad98cae9b95558d31c055016fcc018..89ad484c134a30fa4b18526e64a25e37cc0912eb 100644 --- a/internal/llm/tools/diagnostics.go +++ b/internal/llm/tools/diagnostics.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/lsp/protocol" ) type DiagnosticsParams struct { diff --git a/internal/llm/tools/edit.go b/internal/llm/tools/edit.go index a5f0687cb5a43aa9a78f8b51815bfabe2b12e3f2..2411187c1b5e6b93cc9f7fff4cdfa4b2014bbca8 100644 --- a/internal/llm/tools/edit.go +++ b/internal/llm/tools/edit.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/diff" - "github.com/opencode-ai/opencode/internal/history" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/permission" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/history" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/permission" ) type EditParams struct { diff --git a/internal/llm/tools/fetch.go b/internal/llm/tools/fetch.go index 863532a0b832cdf6137d9be086469602dce32a3c..105733dc680ef40efb57a2ecb735af1e6b1463ea 100644 --- a/internal/llm/tools/fetch.go +++ b/internal/llm/tools/fetch.go @@ -11,8 +11,8 @@ import ( md "github.com/JohannesKaufmann/html-to-markdown" "github.com/PuerkitoBio/goquery" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/permission" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/permission" ) type FetchParams struct { diff --git a/internal/llm/tools/glob.go b/internal/llm/tools/glob.go index 5726c612ef8de79fbf05e227bdedb346b48e7add..98d908c7d18b72a7590eb8e613bbff00a6d772d6 100644 --- a/internal/llm/tools/glob.go +++ b/internal/llm/tools/glob.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/fileutil" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/logging" ) const ( diff --git a/internal/llm/tools/grep.go b/internal/llm/tools/grep.go index f20d61ef1ed44f50235f4ba19b8ea44ba7043eb6..f13bb194483af51c56e3fc7e20bed1bcc2f35957 100644 --- a/internal/llm/tools/grep.go +++ b/internal/llm/tools/grep.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/fileutil" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/fileutil" ) type GrepParams struct { diff --git a/internal/llm/tools/ls.go b/internal/llm/tools/ls.go index 383fc50507585382ec2611a03ac0d2c58f4e09b4..81539abe8db1ce2ccde5b8261d34474ab77ea076 100644 --- a/internal/llm/tools/ls.go +++ b/internal/llm/tools/ls.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/fileutil" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/fileutil" ) type LSParams struct { diff --git a/internal/llm/tools/patch.go b/internal/llm/tools/patch.go index dcd3027b548e11699bbac0a0b641b6b8c6eafa38..f66017e25cd647190421eda40c5628b24bd1b58c 100644 --- a/internal/llm/tools/patch.go +++ b/internal/llm/tools/patch.go @@ -8,12 +8,12 @@ import ( "path/filepath" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/diff" - "github.com/opencode-ai/opencode/internal/history" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/permission" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/history" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/permission" ) type PatchParams struct { diff --git a/internal/llm/tools/shell/shell.go b/internal/llm/tools/shell/shell.go index cc127cd0cab5cde909e8c1fe9760c4bbefd57f8f..0f0f88afced34a53fef34cfda83aec637ca02f5b 100644 --- a/internal/llm/tools/shell/shell.go +++ b/internal/llm/tools/shell/shell.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/opencode-ai/opencode/internal/config" + "github.com/charmbracelet/crush/internal/config" ) type PersistentShell struct { diff --git a/internal/llm/tools/view.go b/internal/llm/tools/view.go index 6d800ce6ee27902a5c99767b9954e91f2c650428..0c4652933c9b0a3e8be1b7b97a257433435993af 100644 --- a/internal/llm/tools/view.go +++ b/internal/llm/tools/view.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/lsp" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/lsp" ) type ViewParams struct { diff --git a/internal/llm/tools/write.go b/internal/llm/tools/write.go index decc51e472bf1216698ab77f5d408aab816eb028..9dadc068e5517b4eb07a8c434e4d024d6e5cb78b 100644 --- a/internal/llm/tools/write.go +++ b/internal/llm/tools/write.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/diff" - "github.com/opencode-ai/opencode/internal/history" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/permission" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/history" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/permission" ) type WriteParams struct { diff --git a/internal/logging/writer.go b/internal/logging/writer.go index 50f3367db015af253869262ce139d4d36c962254..8775f3752d52f3141e1cf51a11a734c3c6e523b1 100644 --- a/internal/logging/writer.go +++ b/internal/logging/writer.go @@ -8,8 +8,8 @@ import ( "sync" "time" + "github.com/charmbracelet/crush/internal/pubsub" "github.com/go-logfmt/logfmt" - "github.com/opencode-ai/opencode/internal/pubsub" ) const ( diff --git a/internal/lsp/client.go b/internal/lsp/client.go index d115b2404b798a7e69f378799eb9b01725ebed7c..73310fda54c94f817467b9f2eb5439d184ca794d 100644 --- a/internal/lsp/client.go +++ b/internal/lsp/client.go @@ -14,9 +14,9 @@ import ( "sync/atomic" "time" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp/protocol" ) type Client struct { diff --git a/internal/lsp/handlers.go b/internal/lsp/handlers.go index e24945b423f5339c0e10319e466f8b0b098fd8d4..9eb258d761ee36a909cddec16b72b2a3d933a5b4 100644 --- a/internal/lsp/handlers.go +++ b/internal/lsp/handlers.go @@ -3,10 +3,10 @@ package lsp import ( "encoding/json" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp/protocol" - "github.com/opencode-ai/opencode/internal/lsp/util" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/lsp/util" ) // Requests diff --git a/internal/lsp/language.go b/internal/lsp/language.go index 89bb8f859ee81471dcf3a2de4bf0157257026418..87d209f1dbc51eafbde4d85b0ce6001dd17729b5 100644 --- a/internal/lsp/language.go +++ b/internal/lsp/language.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/opencode-ai/opencode/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/lsp/protocol" ) func DetectLanguageID(uri string) protocol.LanguageKind { diff --git a/internal/lsp/methods.go b/internal/lsp/methods.go index d4f6d1c6c1aa7e782c7952b354a79389c07c4e8c..afd087c1b86d5242e845e419c47234de11ce467f 100644 --- a/internal/lsp/methods.go +++ b/internal/lsp/methods.go @@ -4,7 +4,7 @@ package lsp import ( "context" - "github.com/opencode-ai/opencode/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/lsp/protocol" ) // Implementation sends a textDocument/implementation request to the LSP server. diff --git a/internal/lsp/transport.go b/internal/lsp/transport.go index 9b07d53c9617537baa7b10a880af0537cdc8d7e1..c3d5d762feeccaaa363a189fd8014b705a583681 100644 --- a/internal/lsp/transport.go +++ b/internal/lsp/transport.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" ) // Write writes an LSP message to the given writer diff --git a/internal/lsp/util/edit.go b/internal/lsp/util/edit.go index 5440e2f6ceb046d9f79481cb38ea8e2c2843f55e..a67fab0a6a14e788f99a453a8488c5210f4d57d1 100644 --- a/internal/lsp/util/edit.go +++ b/internal/lsp/util/edit.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/opencode-ai/opencode/internal/lsp/protocol" + "github.com/charmbracelet/crush/internal/lsp/protocol" ) func applyTextEdits(uri protocol.DocumentUri, edits []protocol.TextEdit) error { diff --git a/internal/lsp/watcher/watcher.go b/internal/lsp/watcher/watcher.go index 1b68dc68df719d2128bfb1fe04028115a14e51b0..3b8c36d963b88c1c4b60ef23a5c7cd9c26af4025 100644 --- a/internal/lsp/watcher/watcher.go +++ b/internal/lsp/watcher/watcher.go @@ -10,11 +10,11 @@ import ( "time" "github.com/bmatcuk/doublestar/v4" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/lsp/protocol" "github.com/fsnotify/fsnotify" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/lsp" - "github.com/opencode-ai/opencode/internal/lsp/protocol" ) // WorkspaceWatcher manages LSP file watching diff --git a/internal/message/content.go b/internal/message/content.go index a4f636e582033173b17285122c2f00ae6e488190..383134b596e62a5fc18b2c8404d770fc6a2d4112 100644 --- a/internal/message/content.go +++ b/internal/message/content.go @@ -5,7 +5,7 @@ import ( "slices" "time" - "github.com/opencode-ai/opencode/internal/llm/models" + "github.com/charmbracelet/crush/internal/llm/models" ) type MessageRole string diff --git a/internal/message/message.go b/internal/message/message.go index 6e0fd40b4946a709cf10dc55d1d422447c03a23f..9e241a0b011ee6277402709fdd8be3aefb5df6fe 100644 --- a/internal/message/message.go +++ b/internal/message/message.go @@ -7,10 +7,10 @@ import ( "fmt" "time" + "github.com/charmbracelet/crush/internal/db" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/pubsub" "github.com/google/uuid" - "github.com/opencode-ai/opencode/internal/db" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/pubsub" ) type CreateMessageParams struct { diff --git a/internal/permission/permission.go b/internal/permission/permission.go index 3532f5be685608f2dbb0e992924b4606f2db96d8..6790e1d208c02f24a9640b464f0253ef69cfcc77 100644 --- a/internal/permission/permission.go +++ b/internal/permission/permission.go @@ -6,9 +6,9 @@ import ( "slices" "sync" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/pubsub" "github.com/google/uuid" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/pubsub" ) var ErrorPermissionDenied = errors.New("permission denied") diff --git a/internal/session/session.go b/internal/session/session.go index c6e7f60bfbfe52e54071183b0cc9f399363904d6..d988dac3414fa7dd00d13b375e1309f8d6c515dd 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" + "github.com/charmbracelet/crush/internal/db" + "github.com/charmbracelet/crush/internal/pubsub" "github.com/google/uuid" - "github.com/opencode-ai/opencode/internal/db" - "github.com/opencode-ai/opencode/internal/pubsub" ) type Session struct { diff --git a/internal/tui/components/anim/anim.go b/internal/tui/components/anim/anim.go index c39de0d899a1b4eaf3896ea32b02883374af1195..0bd7a7753f114c7bfb6c8f9898772c49ae8f7d80 100644 --- a/internal/tui/components/anim/anim.go +++ b/internal/tui/components/anim/anim.go @@ -9,11 +9,11 @@ import ( "github.com/charmbracelet/bubbles/v2/spinner" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" "github.com/google/uuid" "github.com/lucasb-eyer/go-colorful" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const ( diff --git a/internal/tui/components/chat/chat.go b/internal/tui/components/chat/chat.go index 3be9a9fd913f33cdce167e283c88275ffed14ad9..778d36b10d11a804be7ca0c65b23e632d745f3ab 100644 --- a/internal/tui/components/chat/chat.go +++ b/internal/tui/components/chat/chat.go @@ -5,16 +5,16 @@ import ( "time" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/app" + "github.com/charmbracelet/crush/internal/llm/agent" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/components/chat/messages" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/app" - "github.com/opencode-ai/opencode/internal/llm/agent" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/components/chat/messages" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/util" ) type SendMsg struct { diff --git a/internal/tui/components/chat/editor/editor.go b/internal/tui/components/chat/editor/editor.go index aae5d3ec5b0c51c99f328ebb489af06c537adbe8..d8ae8d71d6dfe4038c73fe6e0bd1b686c0c071e5 100644 --- a/internal/tui/components/chat/editor/editor.go +++ b/internal/tui/components/chat/editor/editor.go @@ -11,17 +11,17 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/textarea" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/app" + "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/completions" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/app" - "github.com/opencode-ai/opencode/internal/fileutil" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/completions" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type FileCompletionItem struct { diff --git a/internal/tui/components/chat/editor/keys.go b/internal/tui/components/chat/editor/keys.go index 69bffd81c1ad1214be49d73bab2e36d019a87ba4..a53e18245cab3e330a54ebbf00d4b12ec3f4e7b7 100644 --- a/internal/tui/components/chat/editor/keys.go +++ b/internal/tui/components/chat/editor/keys.go @@ -2,7 +2,7 @@ package editor import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type EditorKeyMap struct { diff --git a/internal/tui/components/chat/messages/messages.go b/internal/tui/components/chat/messages/messages.go index f04fe6a08a97175d2c69a01f75096394a2d3aef5..f35e1af9dd542f6225d7adad8e26256d55a9e919 100644 --- a/internal/tui/components/chat/messages/messages.go +++ b/internal/tui/components/chat/messages/messages.go @@ -8,15 +8,15 @@ import ( "github.com/charmbracelet/bubbles/v2/spinner" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/llm/models" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/llm/models" - - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/tui/components/anim" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" + + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/tui/components/anim" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" ) // MessageCmp defines the interface for message components in the chat interface. diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go index c67d2bbed7c8793969400459e81325b5c92cdf56..eda0565d26c1113d1b856b51cc254fde4dac1bc6 100644 --- a/internal/tui/components/chat/messages/renderer.go +++ b/internal/tui/components/chat/messages/renderer.go @@ -7,15 +7,15 @@ import ( "strings" "time" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/highlight" + "github.com/charmbracelet/crush/internal/llm/agent" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/lipgloss/v2/tree" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/diff" - "github.com/opencode-ai/opencode/internal/highlight" - "github.com/opencode-ai/opencode/internal/llm/agent" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/tui/styles" ) // responseContextHeight limits the number of lines displayed in tool output diff --git a/internal/tui/components/chat/messages/tool.go b/internal/tui/components/chat/messages/tool.go index fa9de764ee20a90b4680e8495eb57bc64e028f4c..94bff77c4c9fb85a72a5f8230bf38edba303c8c7 100644 --- a/internal/tui/components/chat/messages/tool.go +++ b/internal/tui/components/chat/messages/tool.go @@ -5,13 +5,13 @@ import ( "github.com/charmbracelet/bubbles/v2/spinner" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/tui/components/anim" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/tui/components/anim" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) // ToolCallCmp defines the interface for tool call components in the chat interface. diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index d75b70f596b9c7564846bc5962d31f1d519cbdf4..425b1468a50a5590ca23f100b61f79e8e3802867 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -5,17 +5,17 @@ import ( "strings" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/logo" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" + "github.com/charmbracelet/crush/internal/version" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/logo" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" - "github.com/opencode-ai/opencode/internal/version" ) const ( diff --git a/internal/tui/components/completions/completions.go b/internal/tui/components/completions/completions.go index 392af550050407cf321578fa6906740ee13c1169..625c49caba3ca070d07902845e82478d8064274e 100644 --- a/internal/tui/components/completions/completions.go +++ b/internal/tui/components/completions/completions.go @@ -3,10 +3,10 @@ package completions import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type Completion struct { diff --git a/internal/tui/components/completions/item.go b/internal/tui/components/completions/item.go index 324c07249bc784366e33f717d5a59d20b2eff7bf..ceab34a5ccbb58ce318b57764a51e4fcc407d2ce 100644 --- a/internal/tui/components/completions/item.go +++ b/internal/tui/components/completions/item.go @@ -4,12 +4,12 @@ import ( "image/color" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" "github.com/rivo/uniseg" ) diff --git a/internal/tui/components/completions/keys.go b/internal/tui/components/completions/keys.go index c135df01bfe4774d9bef57da4b6cfc28e4034405..41bdeb384f79ea6d81ce45d12c5555ac32c04038 100644 --- a/internal/tui/components/completions/keys.go +++ b/internal/tui/components/completions/keys.go @@ -2,7 +2,7 @@ package completions import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/components/core/helpers.go b/internal/tui/components/core/helpers.go index 69b538976f9a2428f7eb369fc16c6aec3d9fd94d..eda256e2a82b54099d92ee9caea6c9e6c05d6088 100644 --- a/internal/tui/components/core/helpers.go +++ b/internal/tui/components/core/helpers.go @@ -4,9 +4,9 @@ import ( "image/color" "strings" + "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/tui/styles" ) func Section(text string, width int) string { diff --git a/internal/tui/components/core/list/keys.go b/internal/tui/components/core/list/keys.go index 46b6cf2b01d67e097799de0df11c34b3efa436f6..c5368354c06357a6a9b209f1896f336c97f4ea13 100644 --- a/internal/tui/components/core/list/keys.go +++ b/internal/tui/components/core/list/keys.go @@ -2,7 +2,7 @@ package list import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/components/core/list/list.go b/internal/tui/components/core/list/list.go index 8f22ccc7c8f73b16ff47f85882e1ee4bc3e2c8bf..6cb2756aee506fdc5b421597675d47402a7f61c2 100644 --- a/internal/tui/components/core/list/list.go +++ b/internal/tui/components/core/list/list.go @@ -10,11 +10,11 @@ import ( "github.com/charmbracelet/bubbles/v2/spinner" "github.com/charmbracelet/bubbles/v2/textinput" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/anim" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/anim" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" "github.com/sahilm/fuzzy" ) diff --git a/internal/tui/components/core/status/keys.go b/internal/tui/components/core/status/keys.go index 1c7a794ba96c1618cdef986c48ff36c492d1bacf..f2572ed1745a927aa0158c45ae1ba3228a67446f 100644 --- a/internal/tui/components/core/status/keys.go +++ b/internal/tui/components/core/status/keys.go @@ -2,7 +2,7 @@ package status import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/components/core/status/status.go b/internal/tui/components/core/status/status.go index a85ef26e21be723f0ae3dcf7a69f50a9cff11fa7..796d2edf634a08d1b3fbf42d67c0ff818de59b75 100644 --- a/internal/tui/components/core/status/status.go +++ b/internal/tui/components/core/status/status.go @@ -5,11 +5,11 @@ import ( "github.com/charmbracelet/bubbles/v2/help" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" ) type StatusCmp interface { diff --git a/internal/tui/components/dialog/init.go b/internal/tui/components/dialog/init.go index 261516b787cca0a9b0142146652b7a41ec7d41c0..0abf3af80fadae6d4fad1b9154a969810286cc2a 100644 --- a/internal/tui/components/dialog/init.go +++ b/internal/tui/components/dialog/init.go @@ -5,8 +5,8 @@ import ( tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" ) // InitDialogCmp is a component that asks the user if they want to initialize the project. diff --git a/internal/tui/components/dialog/permission.go b/internal/tui/components/dialog/permission.go index 241dcca1ad3bbd52c97d2ba8306cb32a398a003a..7ecc923e494d4680085ba33459d65dc0516c0539 100644 --- a/internal/tui/components/dialog/permission.go +++ b/internal/tui/components/dialog/permission.go @@ -7,13 +7,13 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/viewport" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/permission" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/diff" - "github.com/opencode-ai/opencode/internal/llm/tools" - "github.com/opencode-ai/opencode/internal/permission" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type PermissionAction string diff --git a/internal/tui/components/dialogs/commands/arguments.go b/internal/tui/components/dialogs/commands/arguments.go index f08436d299a1f825dd7f525dd5290e7af9a8ed14..1128acf21b031ab914662f6686ffc9f57b9b7653 100644 --- a/internal/tui/components/dialogs/commands/arguments.go +++ b/internal/tui/components/dialogs/commands/arguments.go @@ -8,10 +8,10 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/textinput" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/commands/commands.go b/internal/tui/components/dialogs/commands/commands.go index 90ca45fa8a801bd8122fb0ebee9e855e46c08092..718b49599a3267151e459653fd28861db0acf24f 100644 --- a/internal/tui/components/dialogs/commands/commands.go +++ b/internal/tui/components/dialogs/commands/commands.go @@ -6,13 +6,13 @@ import ( tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/completions" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/completions" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/commands/item.go b/internal/tui/components/dialogs/commands/item.go index bc8c11edc2ead5ae52a6c83a678c4df8807e1be5..b0db2c9c35424eb7f3ef9ddc2b20d85efcd7e6a4 100644 --- a/internal/tui/components/dialogs/commands/item.go +++ b/internal/tui/components/dialogs/commands/item.go @@ -2,12 +2,12 @@ package commands import ( tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/x/ansi" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type ItemSection interface { diff --git a/internal/tui/components/dialogs/commands/keys.go b/internal/tui/components/dialogs/commands/keys.go index 9b80591678b97af6c70aa2794e9e980d229fe441..96df76a20ef4764f201abd504fea2ee15270c76d 100644 --- a/internal/tui/components/dialogs/commands/keys.go +++ b/internal/tui/components/dialogs/commands/keys.go @@ -2,7 +2,7 @@ package commands import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type CommandsDialogKeyMap struct { diff --git a/internal/tui/components/dialogs/commands/loader.go b/internal/tui/components/dialogs/commands/loader.go index 92064394fa7b9f832dce7d9fd82b20a24e1127c2..447d7c6412c191934563f7351630d6832424846b 100644 --- a/internal/tui/components/dialogs/commands/loader.go +++ b/internal/tui/components/dialogs/commands/loader.go @@ -9,8 +9,8 @@ import ( "strings" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/dialogs.go b/internal/tui/components/dialogs/dialogs.go index 58a25ae446309ca3f33bfb1aafc407453fff61f6..9153500a724915e858d18ab449c3b16ced39a548 100644 --- a/internal/tui/components/dialogs/dialogs.go +++ b/internal/tui/components/dialogs/dialogs.go @@ -4,8 +4,8 @@ import ( "slices" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/util" ) type DialogID string diff --git a/internal/tui/components/dialogs/filepicker/filepicker.go b/internal/tui/components/dialogs/filepicker/filepicker.go index 1a427a2a19751c3a5888d0b44eea00cb84042d3f..6b67e309e66c4455835c2315062c6c4f9081a169 100644 --- a/internal/tui/components/dialogs/filepicker/filepicker.go +++ b/internal/tui/components/dialogs/filepicker/filepicker.go @@ -8,12 +8,12 @@ import ( "github.com/charmbracelet/bubbles/v2/help" "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/components/image" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/components/image" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/filepicker/keys.go b/internal/tui/components/dialogs/filepicker/keys.go index f8b18a93534853073be473e1aba6ce5332f0d488..0143eaaddd0b938c458c5f5995497cb94d782735 100644 --- a/internal/tui/components/dialogs/filepicker/keys.go +++ b/internal/tui/components/dialogs/filepicker/keys.go @@ -2,7 +2,7 @@ package filepicker import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) // KeyMap defines keyboard bindings for dialog management. diff --git a/internal/tui/components/dialogs/keys.go b/internal/tui/components/dialogs/keys.go index a3b68acb6e4d6b1773aa84933668f94bbc6a4e16..83334cf4c9c315151f915d75be9470de21cff961 100644 --- a/internal/tui/components/dialogs/keys.go +++ b/internal/tui/components/dialogs/keys.go @@ -2,7 +2,7 @@ package dialogs import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) // KeyMap defines keyboard bindings for dialog management. diff --git a/internal/tui/components/dialogs/models/keys.go b/internal/tui/components/dialogs/models/keys.go index 17d21193edaf6b6bfa1ec4f53a9e91b8fba28b80..94c08e37afa6002f3b4258c5ef8377cf62b368f0 100644 --- a/internal/tui/components/dialogs/models/keys.go +++ b/internal/tui/components/dialogs/models/keys.go @@ -2,7 +2,7 @@ package models import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/components/dialogs/models/models.go b/internal/tui/components/dialogs/models/models.go index 8cb19998b87891c560971ff37d734b7858a59ee6..f8d23006929fa42cfb5d1a6d2841080d2541b330 100644 --- a/internal/tui/components/dialogs/models/models.go +++ b/internal/tui/components/dialogs/models/models.go @@ -6,16 +6,16 @@ import ( "github.com/charmbracelet/bubbles/v2/help" "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/tui/components/completions" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/commands" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/config" - "github.com/opencode-ai/opencode/internal/llm/models" - "github.com/opencode-ai/opencode/internal/tui/components/completions" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/commands" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/quit/keys.go b/internal/tui/components/dialogs/quit/keys.go index 426bcc6c38b03257e81088fd7a2c6534e4facb6e..12773f1ad452963364546f21161361060845811c 100644 --- a/internal/tui/components/dialogs/quit/keys.go +++ b/internal/tui/components/dialogs/quit/keys.go @@ -2,7 +2,7 @@ package quit import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) // KeyMap defines the keyboard bindings for the quit dialog. diff --git a/internal/tui/components/dialogs/quit/quit.go b/internal/tui/components/dialogs/quit/quit.go index d370be34a2e5283deb37f7ea0a397d9817515671..da0d5baa76efe58c12521d7b19419aa84df2aff4 100644 --- a/internal/tui/components/dialogs/quit/quit.go +++ b/internal/tui/components/dialogs/quit/quit.go @@ -3,11 +3,11 @@ package quit import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const ( diff --git a/internal/tui/components/dialogs/sessions/keys.go b/internal/tui/components/dialogs/sessions/keys.go index 91cc069c18804e0bdde3557f9a24f54dceb9cdc8..0affd6a872251ae28a370c2bb62a007f0821be19 100644 --- a/internal/tui/components/dialogs/sessions/keys.go +++ b/internal/tui/components/dialogs/sessions/keys.go @@ -2,7 +2,7 @@ package sessions import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/components/dialogs/sessions/sessions.go b/internal/tui/components/dialogs/sessions/sessions.go index 31a8c8c2bf916db16333f5b152ac78a0e4b98d30..37c7d12d8c846a83f4a778ca87cc404a51a065f3 100644 --- a/internal/tui/components/dialogs/sessions/sessions.go +++ b/internal/tui/components/dialogs/sessions/sessions.go @@ -4,15 +4,15 @@ import ( "github.com/charmbracelet/bubbles/v2/help" "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/completions" + "github.com/charmbracelet/crush/internal/tui/components/core" + "github.com/charmbracelet/crush/internal/tui/components/core/list" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/completions" - "github.com/opencode-ai/opencode/internal/tui/components/core" - "github.com/opencode-ai/opencode/internal/tui/components/core/list" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) const SessionsDialogID dialogs.DialogID = "sessions" diff --git a/internal/tui/components/image/load.go b/internal/tui/components/image/load.go index 67308ef41be5c95aa7985366ad247674161dc7bc..25fb4bc82908b4d818efab199356d8a5b9bfe87d 100644 --- a/internal/tui/components/image/load.go +++ b/internal/tui/components/image/load.go @@ -3,6 +3,7 @@ package image import ( + "context" "image" "image/png" "io" @@ -28,8 +29,8 @@ func loadURL(url string) tea.Cmd { var err error if strings.HasPrefix(url, "http") { - var resp *http.Response - resp, err = http.Get(url) + var resp *http.Request + resp, err = http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil) r = resp.Body } else { r, err = os.Open(url) diff --git a/internal/tui/components/logo/logo.go b/internal/tui/components/logo/logo.go index 0ef19e1dd83259c389715d8cd9bcd88d7777957c..4b044c9dbd45284c72b7d03636d7399555e5f388 100644 --- a/internal/tui/components/logo/logo.go +++ b/internal/tui/components/logo/logo.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/MakeNowJust/heredoc" + "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/slice" - "github.com/opencode-ai/opencode/internal/tui/styles" ) // letterform represents a letterform. It can be stretched horizontally by diff --git a/internal/tui/components/logs/details.go b/internal/tui/components/logs/details.go index 09ddef9c0421a73d5c6a491e8897ea4cda673982..9951b1441bcd3a16c75689e80c25b16f90291cda 100644 --- a/internal/tui/components/logs/details.go +++ b/internal/tui/components/logs/details.go @@ -8,11 +8,11 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/viewport" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type DetailComponent interface { diff --git a/internal/tui/components/logs/table.go b/internal/tui/components/logs/table.go index b36d2d967c01c2bb8c23d23de7049768fea9cb47..fa2cd9dd7d9d42afe31b18215edc48a386655051 100644 --- a/internal/tui/components/logs/table.go +++ b/internal/tui/components/logs/table.go @@ -7,11 +7,11 @@ import ( "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/bubbles/v2/table" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/pubsub" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/pubsub" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" ) type TableComponent interface { diff --git a/internal/tui/keys.go b/internal/tui/keys.go index 4a9d0f81d600e8fb5701cc8555241723b2188d74..f41d5d4f328de0f2020226a5f146e7dc8a8dcaca 100644 --- a/internal/tui/keys.go +++ b/internal/tui/keys.go @@ -2,7 +2,7 @@ package tui import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/layout/container.go b/internal/tui/layout/container.go index 523540088d7b779b6f1ec0053476b5938ef354af..da13516250c57488221d7696c8fadceec15400a3 100644 --- a/internal/tui/layout/container.go +++ b/internal/tui/layout/container.go @@ -3,9 +3,9 @@ package layout import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type Container interface { diff --git a/internal/tui/layout/split.go b/internal/tui/layout/split.go index 88ee9051b920cf96ece4942133cda6d959c0af8d..98b656aa0661a1199e532cebbf97681f1790b723 100644 --- a/internal/tui/layout/split.go +++ b/internal/tui/layout/split.go @@ -3,9 +3,9 @@ package layout import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) type LayoutPanel string diff --git a/internal/tui/page/chat/chat.go b/internal/tui/page/chat/chat.go index ce5a38a3454d26c77cb5ceb209cd7d41ac216b23..05a12a9a23c57b96a115558a820ab729269bb67f 100644 --- a/internal/tui/page/chat/chat.go +++ b/internal/tui/page/chat/chat.go @@ -5,17 +5,17 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" - "github.com/opencode-ai/opencode/internal/app" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/message" - "github.com/opencode-ai/opencode/internal/session" - "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/chat/editor" - "github.com/opencode-ai/opencode/internal/tui/components/chat/sidebar" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/commands" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/page" - "github.com/opencode-ai/opencode/internal/tui/util" + "github.com/charmbracelet/crush/internal/app" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/message" + "github.com/charmbracelet/crush/internal/session" + "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/chat/editor" + "github.com/charmbracelet/crush/internal/tui/components/chat/sidebar" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/commands" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/page" + "github.com/charmbracelet/crush/internal/tui/util" ) var ChatPage page.PageID = "chat" diff --git a/internal/tui/page/chat/keys.go b/internal/tui/page/chat/keys.go index 8441e23b02fd16c70d80ad6258633b3e9756d885..8d11d4cae5297e8e6b765e841bf1e035940b707a 100644 --- a/internal/tui/page/chat/keys.go +++ b/internal/tui/page/chat/keys.go @@ -2,7 +2,7 @@ package chat import ( "github.com/charmbracelet/bubbles/v2/key" - "github.com/opencode-ai/opencode/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/layout" ) type KeyMap struct { diff --git a/internal/tui/page/logs.go b/internal/tui/page/logs.go index e94fa5d12837a4d823804f8c8617ec42cc3a25ba..b66df829713e9aa5f72bd4797f36267e8cc23e7a 100644 --- a/internal/tui/page/logs.go +++ b/internal/tui/page/logs.go @@ -3,11 +3,11 @@ package page import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/tui/components/logs" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/tui/components/logs" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) var LogsPage PageID = "logs" diff --git a/internal/tui/tui.go b/internal/tui/tui.go index 2477fb7022b3904875d3e4dc31467b9510273dcb..58405d81fa8ee94b6d369702987fd19c7d0a9d1d 100644 --- a/internal/tui/tui.go +++ b/internal/tui/tui.go @@ -5,24 +5,24 @@ import ( "github.com/charmbracelet/bubbles/v2/key" tea "github.com/charmbracelet/bubbletea/v2" + "github.com/charmbracelet/crush/internal/app" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/pubsub" + cmpChat "github.com/charmbracelet/crush/internal/tui/components/chat" + "github.com/charmbracelet/crush/internal/tui/components/completions" + "github.com/charmbracelet/crush/internal/tui/components/core/status" + "github.com/charmbracelet/crush/internal/tui/components/dialogs" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/commands" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/filepicker" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/models" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/quit" + "github.com/charmbracelet/crush/internal/tui/components/dialogs/sessions" + "github.com/charmbracelet/crush/internal/tui/layout" + "github.com/charmbracelet/crush/internal/tui/page" + "github.com/charmbracelet/crush/internal/tui/page/chat" + "github.com/charmbracelet/crush/internal/tui/styles" + "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/lipgloss/v2" - "github.com/opencode-ai/opencode/internal/app" - "github.com/opencode-ai/opencode/internal/logging" - "github.com/opencode-ai/opencode/internal/pubsub" - cmpChat "github.com/opencode-ai/opencode/internal/tui/components/chat" - "github.com/opencode-ai/opencode/internal/tui/components/completions" - "github.com/opencode-ai/opencode/internal/tui/components/core/status" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/commands" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/filepicker" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/models" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/quit" - "github.com/opencode-ai/opencode/internal/tui/components/dialogs/sessions" - "github.com/opencode-ai/opencode/internal/tui/layout" - "github.com/opencode-ai/opencode/internal/tui/page" - "github.com/opencode-ai/opencode/internal/tui/page/chat" - "github.com/opencode-ai/opencode/internal/tui/styles" - "github.com/opencode-ai/opencode/internal/tui/util" ) // appModel represents the main application model that manages pages, dialogs, and UI state. diff --git a/internal/version/version.go b/internal/version/version.go index eefccec25dd3699f71767c330fd2c453ace9f7fa..a762fc8a47d9f4b837a53210408a0415546ab2af 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -5,7 +5,7 @@ import "runtime/debug" // Build-time parameters set via -ldflags var Version = "unknown" -// A user may install pug using `go install github.com/opencode-ai/opencode@latest`. +// A user may install pug using `go install github.com/charmbracelet/crush@latest`. // without -ldflags, in which case the version above is unset. As a workaround // we use the embedded build version that *is* set when using `go install` (and // is only set for `go install` and not for `go build`). diff --git a/main.go b/main.go index 031ce3c9ed037cd5b34aa521f62bc9ca03b6ac5d..a5305d08d7ae3ede818568d5cf825d1ce52bbf61 100644 --- a/main.go +++ b/main.go @@ -6,8 +6,8 @@ import ( _ "net/http/pprof" // profiling - "github.com/opencode-ai/opencode/cmd" - "github.com/opencode-ai/opencode/internal/logging" + "github.com/charmbracelet/crush/cmd" + "github.com/charmbracelet/crush/internal/logging" ) func main() {